3513 files changed, 64514 insertions, 298998 deletions

diff --git a/.hgignore b/.hgignore
deleted file mode 100644
index 9cae9ff14..000000000
--- a/.hgignore
+++ /dev/null
@@ -1,17 +0,0 @@
-# Shackra is using hg-git because mercurial is cool and Git sucks, so, DO NOT REMOVE THIS FILE PLEASE! 
-# God bless you ;)
-syntax: glob
-*.log
-*~
-\#*\#
-src/*
-pkg/*
-*.pkg.tar.*
-*.src.tar.*
-*.log
-*.gz
-*.tar.*
-*/src-libre/*
-*/pkg-libre/*
-*.orig
-*.bck
\ No newline at end of file
diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD
index b4c2ff3af..a510a3e0f 100644
--- a/community/0ad/PKGBUILD
+++ b/community/0ad/PKGBUILD
@@ -1,16 +1,18 @@
-# $Id: PKGBUILD 103111 2013-12-26 13:52:36Z svenstaro $
+# $Id: PKGBUILD 105861 2014-02-16 16:38:12Z bpiotrowski $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
 # Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>
 pkgname=0ad
 pkgver=a15
 _pkgver=0.0.15-alpha
-pkgrel=1
+pkgrel=3
 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
 arch=('i686' 'x86_64')
 url="http://play0ad.com/"
 license=('GPL2' 'CCPL')
-depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu' 'gloox' 'miniupnpc' 'libsm')
+depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis'
+         'libxml2' 'openal' 'sdl' 'wxgtk2.8' 'zlib' 'libgl' '0ad-data' 'glu'
+         'gloox' 'miniupnpc' 'libsm')
 makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2')
 source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz")
 md5sums=('a651d81eb9b31da01e376ddaa597e954')
@@ -20,9 +22,9 @@ build() {
 
   unset CPPFLAGS # for le spidermonkey
 
+  export WX_CONFIG=/usr/bin/wx-config-2.8
   ./update-workspaces.sh \
       --with-system-enet \
-      --with-system-miniupnpc \
       --bindir=/usr/bin \
       --libdir=/usr/lib/0ad \
       --datadir=/usr/share/${pkgname}/data
@@ -34,10 +36,14 @@ build() {
 
 package() {
   install -d "${pkgdir}"/usr/{bin,lib/0ad}
-  install -Dm755 "${srcdir}"/${pkgname}-${_pkgver}/binaries/system/pyrogenesis "${pkgdir}/usr/bin"
-  install -Dm755 "${srcdir}"/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} "${pkgdir}/usr/lib/0ad"
+  cd "$srcdir/$pkgname-$_pkgver"
 
-  install -Dm755 "${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-  install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  install -Dm755 binaries/system/pyrogenesis "${pkgdir}/usr/bin"
+  install -Dm755 binaries/system/*.so{,.1.0} "${pkgdir}/usr/lib/0ad"
+
+  install -Dm755 build/resources/${pkgname}.sh "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm644 build/resources/${pkgname}.desktop \
+    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 build/resources/${pkgname}.png \
+    "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
 }
diff --git a/community/acpi/PKGBUILD b/community/acpi/PKGBUILD
index 9ea5236c1..035cfaa00 100644
--- a/community/acpi/PKGBUILD
+++ b/community/acpi/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 148027 2012-01-30 03:41:28Z dan $
+# $Id: PKGBUILD 103278 2014-01-02 12:22:39Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=acpi
-pkgver=1.6
-pkgrel=1.1
-pkgdesc="Linux ACPI client providing battery, AC power, and thermal readings"
+pkgver=1.7
+pkgrel=1
+pkgdesc='Client for battery, power, and thermal readings'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://sourceforge.net/projects/acpiclient"
-depends=('glibc')
-source=(http://downloads.sourceforge.net/acpiclient/$pkgname-$pkgver.tar.gz)
+url='http://sourceforge.net/projects/acpiclient/'
 license=('GPL2')
-sha256sums=('ed61d20400c4fd3965dde9b49ab3ac74da02f8eca1a55454f7a1ac3fa1fd5c31')
+depends=('glibc')
+source=("http://downloads.sourceforge.net/acpiclient/$pkgname-$pkgver.tar.gz")
+sha256sums=('d7a504b61c716ae5b7e81a0c67a50a51f06c7326f197b66a4b823de076a35005')
 
 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/acpid/PKGBUILD b/community/acpid/PKGBUILD
index 4ae84bafd..12f4ccbf1 100644
--- a/community/acpid/PKGBUILD
+++ b/community/acpid/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97250 2013-09-15 20:35:17Z seblu $
+# $Id: PKGBUILD 104282 2014-01-16 21:18:23Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
 # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
 
 pkgname=acpid
-pkgver=2.0.20
+pkgver=2.0.21
 pkgrel=1
 pkgdesc='A daemon for delivering ACPI power management events with netlink support'
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ source=("http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.ta
         'acpid.service'
         'anything'
         'handler.sh')
-md5sums=('1b740e6419cf45aaeb2bd78d589f27f9'
+md5sums=('252bb4b3a8053227e743e267d98b8a52'
          'd11700eb136e0489835ddaf977a7905b'
          '79cc7a9dceacdeffd51f070c2ba5f023'
          '2d37b98d6e74bab815604b8b48c6cfd4'
diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD
index 4d450a170..8787dd667 100755
--- a/community/aegisub/PKGBUILD
+++ b/community/aegisub/PKGBUILD
@@ -1,42 +1,33 @@
-# $Id: PKGBUILD 99199 2013-10-25 12:58:18Z giovanni $
+# $Id: PKGBUILD 105243 2014-02-03 10:40:39Z alucryd $
 # 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=5
+pkgver=3.1.2
+pkgrel=1
 pkgdesc="A general-purpose subtitle editor with ASS/SSA support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.aegisub.org"
 license=('GPL' 'BSD')
-depends=('desktop-file-utils' 'ffms2' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9')
-makedepends=('mesa')
+depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'lua51' 'wxgtk')
+makedepends=('boost' 'intltool' 'mesa')
 install="${pkgname}.install"
-source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz"
-        'wxgtk2.9.5.patch')
-sha256sums=('7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a'
-            '8aed8aaf4773e4a315f9336d3ea4af2c46b9e84c4e651c202e0a70a6cd9e499c')
-
-prepare() {
-  cd ${pkgname}/${pkgname}
-
-  patch -Np2 -i ../../wxgtk2.9.5.patch
-}
+source=("http://ftp.aegisub.org/pub/archives/releases/source/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('36ebfd05cc642b050da1e91ce2d2082b317a37bdfab109e191f861170d7cff86')
 
 build() {
-  cd ${pkgname}/${pkgname}
+  cd ${pkgname}-${pkgver}/${pkgname}
 
-  ./configure --prefix='/usr' --without-{portaudio,openal,oss} --with-wxdir='/usr/include/wx-2.9' --with-wx-config='/usr/bin/wx-config-2.9'
+  ./configure --prefix='/usr' --without-{portaudio,openal,oss}
   make
 }
 
 package() {
-  cd ${pkgname}/${pkgname}
+  cd ${pkgname}-${pkgver}/${pkgname}
 
   make DESTDIR="${pkgdir}" install
 
-# License
   install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub
   install -m 644 LICENCE "${pkgdir}"/usr/share/licenses/aegisub/LICENSE
 }
diff --git a/community/aegisub/wxgtk2.9.5.patch b/community/aegisub/wxgtk2.9.5.patch
deleted file mode 100644
index b50fac01b..000000000
--- a/community/aegisub/wxgtk2.9.5.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/aegisub/src/utils.cpp
-+++ b/aegisub/src/utils.cpp
-@@ -121,8 +121,7 @@ void RestartAegisub() {
- 	config::opt->Flush();
- 
- #if defined(__WXMSW__)
--	wxStandardPaths stand;
--	wxExecute("\"" + stand.GetExecutablePath() + "\"");
-+	wxExecute("\"" + wxStandardPaths::Get().GetExecutablePath() + "\"");
- #elif defined(__WXMAC__)
- 	std::string bundle_path = agi::util::OSX_GetBundlePath();
- 	std::string helper_path = agi::util::OSX_GetBundleAuxillaryExecutablePath("restart-helper");
-@@ -132,8 +131,7 @@ void RestartAegisub() {
- 	LOG_I("util/restart/exec") << exec;
- 	wxExecute(exec);
- #else
--	wxStandardPaths stand;
--	wxExecute(stand.GetExecutablePath());
-+	wxExecute(wxStandardPaths::Get().GetExecutablePath());
- #endif
- }
- 
---- a/aegisub/src/menu.cpp
-+++ b/aegisub/src/menu.cpp
-@@ -457,11 +457,11 @@ namespace menu {
- 		window->Bind(wxEVT_COMMAND_MENU_SELECTED, &CommandManager::OnMenuClick, &menu->cm);
- 		window->SetMenuBar(menu.get());
- 
--#ifdef __WXGTK__
--		// GTK silently swallows keypresses for accelerators whose associated
--		// menu items are disabled. As we don't update the menu until it's
--		// opened, this means that conditional hotkeys don't work if the menu
--		// hasn't been opened since they became valid.
-+#if defined(__WXGTK__) && !wxCHECK_VERSION(2, 9, 5)
-+		// Older versions of wxGTK silently swallow keypresses for accelerators
-+		// whose associated menu items are disabled. As we don't update the
-+		// menu until it's opened, this means that conditional hotkeys don't
-+		// work if the menu hasn't been opened since they became valid.
- 		//
- 		// To work around this, we completely disable accelerators from menu
- 		// item. wxGTK doesn't expose any way to do this other that at wx
diff --git a/community/afpfs-ng/PKGBUILD b/community/afpfs-ng/PKGBUILD
index c51c117fc..1811a1df7 100644
--- a/community/afpfs-ng/PKGBUILD
+++ b/community/afpfs-ng/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99034 2013-10-22 19:25:28Z idevolder $
+# $Id: PKGBUILD 103906 2014-01-13 17:16:36Z andyrtr $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: slubman <slubman.dndd@laposte.net>
 
 pkgname=afpfs-ng
 pkgver=0.8.1
-pkgrel=7
+pkgrel=8
 pkgdesc="A client for the Apple Filing Protocol (AFP)"
 url="http://alexthepuffin.googlepages.com/"
 license=('GPL')
diff --git a/community/alure/PKGBUILD b/community/alure/PKGBUILD
index da9ad5247..ad3937dc3 100644
--- a/community/alure/PKGBUILD
+++ b/community/alure/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=alure
 pkgver=1.2
-pkgrel=2.1
+pkgrel=3
 pkgdesc='Utility library to help manage common tasks with OpenAL applications.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://kcat.strangesoft.net/alure.html'
@@ -17,14 +17,22 @@ optdepends=('libsndfile: for uncompressed audio support'
             'dumb: for IT, XM, S3M and MOD support'
             'fluidsynth: for SoundFont 2 support')
 source=("http://kcat.strangesoft.net/alure-releases/${pkgname}-${pkgver}.tar.bz2"
-        'unistd.patch')
+        'unistd.patch'
+        build.patch)
 md5sums=('3088aba074ad02d95ea51e705053b9f5'
-         '17d3f8b4dc423cac64772e5694739fce')
+         '17d3f8b4dc423cac64772e5694739fce'
+         '6a8dfd62ccae920d393b4202736aba46')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../build.patch
 
+  test "$CARCH" = "mips64el" &&
   patch -Np0 -i "$srcdir/unistd.patch"
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   cmake . -DCMAKE_INSTALL_PREFIX=/usr
   make
diff --git a/community/alure/build.patch b/community/alure/build.patch
new file mode 100644
index 000000000..6da41c0dd
--- /dev/null
+++ b/community/alure/build.patch
@@ -0,0 +1,12 @@
+diff -rupN a/src/codec_fluidsynth.cpp b/src/codec_fluidsynth.cpp
+--- a/src/codec_fluidsynth.cpp	2011-07-29 08:37:48.000000000 +0000
++++ b/src/codec_fluidsynth.cpp	2014-01-03 10:42:13.280792235 +0000
+@@ -32,7 +32,7 @@
+ #endif
+ 
+ #include <istream>
+-
++#include <unistd.h>
+ #include <fluidsynth.h>
+ 
+ 
diff --git a/community/argyllcms/PKGBUILD b/community/argyllcms/PKGBUILD
index 21110bd41..4c7d808b3 100644
--- a/community/argyllcms/PKGBUILD
+++ b/community/argyllcms/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 102451 2013-12-11 14:31:37Z tredaelli $
+# $Id: PKGBUILD 105726 2014-02-14 14:17:13Z 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.2
+pkgver=1.6.3
 _pkgver="V${pkgver}"
 pkgrel=1
 pkgdesc="An ICC compatible color management system with support for different colorimeter hardware"
 arch=(i686 x86_64)
 depends=('libxss' 'libxinerama' 'libxxf86vm' 'libxrandr')
 makedepends=('ftjam' 'zip' 'unzip')
+# You need to fake an UserAgent or it doesn't download
 source=(http://www.argyllcms.com/${_pkgname}_${_pkgver}_src.zip)
 url="http://www.argyllcms.com/"
 license=("GPL" "AGPL")
 install=${pkgname}.install
-sha256sums=('c21591d5615a584df438ecbfe7858fde571f6066e56da436c541d08ca899ac9f')
+sha256sums=('188beaa03dd2459403415023f8f8f9aab362bf3062a9822b3622dde6902e4b84')
 
 build() {
   cd ${_pkgname}_${_pkgver}
diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD
index 60f5d78b3..e2f24a7d1 100644
--- a/community/aria2/PKGBUILD
+++ b/community/aria2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103183 2013-12-28 20:42:34Z bpiotrowski $
+# $Id: PKGBUILD 103391 2014-01-05 15:54:47Z 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.2
+pkgver=1.18.3
 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=('b4c99eea9e11d265ed90ab685571f7328a20f5c5a438da93ecdba0959170f460')
+sha256sums=('014706c67406be380384484635ca2e811b405c876f0bbcf7a31be79df392d84d')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/ario/PKGBUILD b/community/ario/PKGBUILD
index 6012f53a3..55f748ee9 100644
--- a/community/ario/PKGBUILD
+++ b/community/ario/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99673 2013-10-30 22:56:21Z allan $
+# $Id: PKGBUILD 103907 2014-01-13 17:16:37Z andyrtr $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=ario
 pkgver=1.5.1
-pkgrel=2.1
+pkgrel=3
 pkgdesc="A GTK client for MPD (Music player daemon) inspired by Rhythmbox but much lighter and faster"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ario-player.sourceforge.net/"
@@ -13,13 +13,17 @@ makedepends=('intltool' 'perl-xml-parser')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname-player/$pkgname-$pkgver.tar.gz
-	ario-1.5.1-glib.patch)
+        glib.patch)
 sha256sums=('0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e'
-	    '2e42992e7ed0be590278198b75bc9a7259cdfdde4de41a38ddbf2f093ccda930')
+            '16481cc5fe3fb52ee36bae63522e319193285542fe0c8ab4281ecc5794a82184')
+
+prepare() {
+  cd "${srcdir}/$pkgname-$pkgver"
+  patch -p1 -i ../glib.patch
+}
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
-  patch -Np1 -i ${srcdir}/ario-1.5.1-glib.patch
   ./configure --prefix=/usr --sysconfdir=/etc
   make
  }
diff --git a/community/ario/glib.patch b/community/ario/glib.patch
new file mode 100644
index 000000000..15b96074b
--- /dev/null
+++ b/community/ario/glib.patch
@@ -0,0 +1,24 @@
+diff -rupN a/src/ario-profiles.c b/src/ario-profiles.c
+--- a/src/ario-profiles.c	2011-05-17 17:54:49.000000000 +0000
++++ b/src/ario-profiles.c	2013-12-25 10:52:06.668807328 +0000
+@@ -22,7 +22,7 @@
+ #include <config.h>
+ #include <stdlib.h>
+ #include <libxml/parser.h>
+-#include <glib/gi18n.h>
++#include <glib.h>
+ #include "ario-util.h"
+ #include "ario-debug.h"
+ 
+diff -rupN a/src/ario-profiles.h b/src/ario-profiles.h
+--- a/src/ario-profiles.h	2011-05-17 17:54:49.000000000 +0000
++++ b/src/ario-profiles.h	2013-12-25 10:50:47.839363409 +0000
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_PROFILES_H
+ #define __ARIO_PROFILES_H
+ 
+-#include <glib/gslist.h>
++#include <glib.h>
+ #include "servers/ario-server.h"
+ 
+ G_BEGIN_DECLS
diff --git a/community/ascii/PKGBUILD b/community/ascii/PKGBUILD
index c4b1c55bc..c0b82490c 100644
--- a/community/ascii/PKGBUILD
+++ b/community/ascii/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=ascii
-pkgver=3.12
+pkgver=3.14
 pkgrel=1
 pkgdesc="Utility for conversion between various byte representations and the ASCII character table"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url="http://www.catb.org/~esr/ascii"
 license=('BSD')
 depends=('glibc')
 source=("http://www.catb.org/~esr/ascii/ascii-${pkgver}.tar.gz")
-md5sums=('d06267813ac83ed511b7330f43fcc4ee')
+sha256sums=('7f0e3fbfe318a372428a1117ec9527ec0a88946323c8b15dc86634a11989bcd1')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/augeas/PKGBUILD b/community/augeas/PKGBUILD
index d990b72ed..8b53ffec1 100644
--- a/community/augeas/PKGBUILD
+++ b/community/augeas/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 100130 2013-11-01 20:20:20Z spupykin $
+# $Id: PKGBUILD 105015 2014-01-30 08:53:11Z spupykin $
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 # Contributor: Jon Nordby <jononor@gmail.com>
 
 pkgname=augeas
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
 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')
 source=(http://download.augeas.net/augeas-$pkgver.tar.gz{,.sig})
-md5sums=('520ce983457ff9ffa3816bc41a9f328b'
+md5sums=('dce2f52cbd20f72c7da48e014ad48076'
          'SKIP')
 
 build() {
diff --git a/community/autofs/PKGBUILD b/community/autofs/PKGBUILD
index f6cfa98e9..d1be9b8cd 100644
--- a/community/autofs/PKGBUILD
+++ b/community/autofs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103218 2013-12-30 14:30:57Z lfleischer $
+# $Id: PKGBUILD 103697 2014-01-10 07:48:01Z bgyorgy $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Dale Blount <dale@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=autofs
 pkgver=5.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc='A kernel-based automounter for Linux.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://freshmeat.net/projects/autofs'
@@ -14,15 +14,24 @@ license=('GPL2')
 depends=('libxml2')
 makedepends=('libldap' 'krb5' 'kmod')
 optdepends=('krb5: for LDAP support')
-backup=('etc/default/autofs'
-        'etc/autofs/auto.master'
-        'etc/autofs/auto.misc')
+backup=('etc/autofs/auto.master'
+        'etc/autofs/auto.misc'
+        'etc/autofs/auto.net'
+        'etc/autofs/auto.smb'
+        'etc/autofs/autofs_ldap_auth.conf'
+        'etc/default/autofs')
 options=(!makeflags)
-source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('32c41fb4e3439f18400468e84dc82fbbd4b14156bef6b9a7f09196ecd9299d52')
+source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.xz"
+        "git-fixes.patch")
+sha256sums=('32c41fb4e3439f18400468e84dc82fbbd4b14156bef6b9a7f09196ecd9299d52'
+            '09c41a73db6a352cb04b51795591e5ae1c4a3fff37257fc8bb117020fa0e2724')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Apply fixes from git
+  patch -Np1 -i "${srcdir}/git-fixes.patch"
+
   sed -i -e 's|/etc/auto.misc|/etc/autofs/auto.misc|' \
          -e 's|/etc/auto.master.d|/etc/autofs/auto.master.d|' samples/auto.master
 }
diff --git a/community/autofs/git-fixes.patch b/community/autofs/git-fixes.patch
new file mode 100644
index 000000000..fd096193f
--- /dev/null
+++ b/community/autofs/git-fixes.patch
@@ -0,0 +1,777 @@
+diff --git a/CHANGELOG b/CHANGELOG
+index 62dac81..a9263c8 100644
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -1,3 +1,17 @@
++??/??/20?? autofs-5.0.9
++=======================
++- fix undefined authtype_requires_creds err if ldap enabled but without sasl.
++- fix master map type check.
++- fix task manager not getting signaled.
++- allow --with-systemd to take a path arg.
++- fix WITH_LIBTIRPC function name.
++- fix ipv6 libtirpc getport.
++- fix ipv6 link local address handling.
++- fix fix ipv6 libtirpc getport.
++- get_nfs_info() should query portmapper if port is not given.
++- fix rpc_portmap_getport() proto not set.
++- fix protmap not trying proto v2.
++
+ 17/10/2013 autofs-5.0.8
+ =======================
+ - fix nobind sun escaped map entries.
+diff --git a/aclocal.m4 b/aclocal.m4
+index 3e6f223..2115204 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -229,8 +229,10 @@ dnl Check the location of the systemd unit files directory
+ dnl --------------------------------------------------------------------------
+ AC_DEFUN([AF_WITH_SYSTEMD],
+ [AC_ARG_WITH(systemd,
+-[  --with-systemd         install systemd unit file if systemd unit directory
+-			  is found on system],
++[  --with-systemd@<:@=systemddir@:>@  install systemd unit file.  If 'yes'
++			  probe the system for unit directory.
++			  If a path is specified, assume that
++			  is a valid install path.],
+ [if test "$withval" = yes; then
+   if test -z "$systemddir"; then
+     AC_MSG_CHECKING([location of the systemd unit files directory])
+@@ -247,6 +249,10 @@ AC_DEFUN([AF_WITH_SYSTEMD],
+   else
+     AC_MSG_RESULT(not found)
+   fi
++else
++ if test "$withval" != no; then
++  systemddir=$withval
++ fi
+ fi])
+ ])
+ 
+@@ -435,7 +441,7 @@ CFLAGS="$af_check_libtirpc_save_cflags"
+ LDFLAGS="$af_check_libtirpc_save_ldflags"
+ ])
+ 
+-AC_DEFUN([AM_WITH_LIBTIRPC],
++AC_DEFUN([AF_WITH_LIBTIRPC],
+ [AC_MSG_CHECKING([if libtirpc is requested and available])
+ AC_ARG_WITH(libtirpc,
+ [  --with-libtirpc         use libtirpc if available],
+diff --git a/configure b/configure
+index 2c2e312..4e1743d 100755
+--- a/configure
++++ b/configure
+@@ -1372,8 +1372,10 @@ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+   --with-path=PATH	  look in PATH for binaries needed by the automounter
+-  --with-systemd         install systemd unit file if systemd unit directory
+-			  is found on system
++  --with-systemd[=systemddir]  install systemd unit file.  If 'yes'
++			  probe the system for unit directory.
++			  If a path is specified, assume that
++			  is a valid install path.
+   --with-confdir=DIR	  use DIR for autofs configuration files
+   --with-mapdir=PATH	  look in PATH for mount maps used by the automounter
+   --with-fifodir=PATH	   use PATH as the directory for fifos used by the automounter
+@@ -2260,6 +2262,10 @@ $as_echo "$systemddir" >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+ $as_echo "not found" >&6; }
+   fi
++else
++ if test "$withval" != no; then
++  systemddir=$withval
++ fi
+ fi
+ fi
+ 
+diff --git a/configure.in b/configure.in
+index 5f29163..1eeb8dc 100644
+--- a/configure.in
++++ b/configure.in
+@@ -124,7 +124,7 @@ AC_SUBST(flagdir)
+ #
+ # Use libtirpc
+ #
+-AM_WITH_LIBTIRPC()
++AF_WITH_LIBTIRPC()
+ AC_SUBST(TIRPCLIB)
+ 
+ #
+diff --git a/daemon/lookup.c b/daemon/lookup.c
+index e3d9536..7fea942 100644
+--- a/daemon/lookup.c
++++ b/daemon/lookup.c
+@@ -171,14 +171,22 @@ int lookup_nss_read_master(struct master *master, time_t age)
+ 			char source[10];
+ 
+ 			memset(source, 0, 10);
+-			if (!strncmp(name, "file:", 5) ||
+-			    !strncmp(name, "yp:", 3) ||
+-			    !strncmp(name, "nis:", 4) ||
+-			    !strncmp(name, "nisplus:", 8) ||
+-			    !strncmp(name, "ldap:", 5) ||
+-			    !strncmp(name, "ldaps:", 6) ||
+-			    !strncmp(name, "sss:", 4) ||
+-			    !strncmp(name, "dir:", 4)) {
++			if ((!strncmp(name, "file", 4) &&
++				 (name[4] == ',' || name[4] == ':')) ||
++			    (!strncmp(name, "yp", 3) &&
++				 (name[3] == ',' || name[3] == ':')) ||
++			    (!strncmp(name, "nis", 3) &&
++				 (name[3] == ',' || name[3] == ':')) ||
++			    (!strncmp(name, "nisplus", 7) &&
++				 (name[7] == ',' || name[7] == ':')) ||
++			    (!strncmp(name, "ldap", 4) &&
++				 (name[4] == ',' || name[4] == ':')) ||
++			    (!strncmp(name, "ldaps", 5) &&
++				 (name[5] == ',' || name[5] == ':')) ||
++			    (!strncmp(name, "sss", 3) ||
++				 (name[3] == ',' || name[3] == ':')) ||
++			    (!strncmp(name, "dir", 3) &&
++				 (name[3] == ',' || name[3] == ':'))) {
+ 				strncpy(source, name, tmp - name);
+ 
+ 				/*
+diff --git a/daemon/state.c b/daemon/state.c
+index 8d81788..3174a9c 100644
+--- a/daemon/state.c
++++ b/daemon/state.c
+@@ -818,13 +818,13 @@ done:
+ 		new = st_alloc_task(ap, state);
+ 		if (new)
+ 			list_add(&new->list, head);
+-		/* Added to empty state queue, kick state machine */
+-		signaled = 1;
+-		status = pthread_cond_signal(&cond);
+-		if (status)
+-			fatal(status);
+ 	}
+ 
++	signaled = 1;
++	status = pthread_cond_signal(&cond);
++	if (status)
++		fatal(status);
++
+ 	return 1;
+ }
+ 
+diff --git a/include/automount.h b/include/automount.h
+index 71787a5..396391c 100644
+--- a/include/automount.h
++++ b/include/automount.h
+@@ -335,6 +335,7 @@ size_t _strlen(const char *str, size_t max);
+ int cat_path(char *buf, size_t len, const char *dir, const char *base);
+ int ncat_path(char *buf, size_t len,
+               const char *dir, const char *base, size_t blen);
++int _strncmp(const char *s1, const char *s2, size_t n);
+ 
+ /* Core automount definitions */
+ 
+diff --git a/lib/cat_path.c b/lib/cat_path.c
+index 60669db..c386b33 100644
+--- a/lib/cat_path.c
++++ b/lib/cat_path.c
+@@ -87,3 +87,12 @@ int ncat_path(char *buf, size_t len,
+ 	return cat_path(buf, len, dir, name);
+ }
+ 
++/* Compare first n bytes of s1 and s2 and that n == strlen(s1) */
++int _strncmp(const char *s1, const char *s2, size_t n)
++{
++	size_t len = strlen(s1);
++
++	if (n != len)
++		return n - len;
++	return strncmp(s1, s2, n);
++}
+diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
+index 46b3e8d..5d6ead0 100644
+--- a/lib/rpc_subs.c
++++ b/lib/rpc_subs.c
+@@ -234,6 +234,29 @@ static int rpc_do_create_client(struct sockaddr *addr, struct conn_info *info, i
+ 
+ 	return 0;
+ }
++static int rpc_getport(struct conn_info *info,
++		       struct pmap *parms, CLIENT *client,
++		       unsigned short *port)
++{
++	enum clnt_stat status;
++
++	/*
++	 * Check to see if server is up otherwise a getport will take
++	 * forever to timeout.
++	 */
++	status = clnt_call(client, PMAPPROC_NULL,
++			 (xdrproc_t) xdr_void, 0, (xdrproc_t) xdr_void, 0,
++			 info->timeout);
++
++	if (status == RPC_SUCCESS) {
++		status = clnt_call(client, PMAPPROC_GETPORT,
++				 (xdrproc_t) xdr_pmap, (caddr_t) parms,
++				 (xdrproc_t) xdr_u_short, (caddr_t) port,
++				 info->timeout);
++	}
++
++	return status;
++}
+ #else
+ static int rpc_do_create_client(struct sockaddr *addr, struct conn_info *info, int *fd, CLIENT **client)
+ {
+@@ -267,9 +290,6 @@ static int rpc_do_create_client(struct sockaddr *addr, struct conn_info *info, i
+ 		laddr = (struct sockaddr *) &in4_laddr;
+ 		in4_raddr->sin_port = htons(info->port);
+ 		slen = sizeof(struct sockaddr_in);
+-		/* Use rpcbind v2 for AF_INET */
+-		if (info->program == rpcb_prog)
+-			info->version = PMAPVERS;
+ 	} else if (addr->sa_family == AF_INET6) {
+ 		struct sockaddr_in6 *in6_raddr = (struct sockaddr_in6 *) addr;
+ 		in6_laddr.sin6_family = AF_INET6;
+@@ -324,6 +344,255 @@ static int rpc_do_create_client(struct sockaddr *addr, struct conn_info *info, i
+ 
+ 	return 0;
+ }
++
++/*
++ * Thankfully nfs-utils had already dealt with this.
++ * Thanks to Chuck Lever for his nfs-utils patch series, much of
++ * which is used here.
++ */
++static pthread_mutex_t proto_mutex = PTHREAD_MUTEX_INITIALIZER;
++
++static enum clnt_stat rpc_get_netid(const sa_family_t family,
++				    const int protocol, char **netid)
++{
++	char *nc_protofmly, *nc_proto, *nc_netid;
++	struct netconfig *nconf;
++	struct protoent *proto;
++	void *handle;
++
++	switch (family) {
++	case AF_LOCAL:
++	case AF_INET:
++		nc_protofmly = NC_INET;
++		break;
++	case AF_INET6:
++		nc_protofmly = NC_INET6;
++		break;
++	default:
++		return RPC_UNKNOWNPROTO;
++        }
++
++	pthread_mutex_lock(&proto_mutex);
++	proto = getprotobynumber(protocol);
++	if (!proto) {
++		pthread_mutex_unlock(&proto_mutex);
++		return RPC_UNKNOWNPROTO;
++	}
++	nc_proto = strdup(proto->p_name);
++	pthread_mutex_unlock(&proto_mutex);
++	if (!nc_proto)
++		return RPC_SYSTEMERROR;
++
++	handle = setnetconfig();
++	while ((nconf = getnetconfig(handle)) != NULL) {
++		if (nconf->nc_protofmly != NULL &&
++		    strcmp(nconf->nc_protofmly, nc_protofmly) != 0)
++			continue;
++		if (nconf->nc_proto != NULL &&
++		    strcmp(nconf->nc_proto, nc_proto) != 0)
++			continue;
++
++		nc_netid = strdup(nconf->nc_netid);
++		if (!nc_netid) {
++			free(nc_proto);
++			return RPC_SYSTEMERROR;
++		}
++
++		*netid = nc_netid;
++	}
++	endnetconfig(handle);
++	free(nc_proto);
++
++	return RPC_SUCCESS;
++}
++
++static char *rpc_sockaddr2universal(const struct sockaddr *addr)
++{
++	const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *) addr;
++	const struct sockaddr_un *sun = (const struct sockaddr_un *) addr;
++	const struct sockaddr_in *sin = (const struct sockaddr_in *) addr;
++	char buf[INET6_ADDRSTRLEN + 8 /* for port information */];
++	uint16_t port;
++	size_t count;
++	char *result;
++	int len;
++
++	switch (addr->sa_family) {
++	case AF_LOCAL:
++		return strndup(sun->sun_path, sizeof(sun->sun_path));
++	case AF_INET:
++		if (inet_ntop(AF_INET, (const void *)&sin->sin_addr.s_addr,
++					buf, (socklen_t)sizeof(buf)) == NULL)
++			goto out_err;
++		port = ntohs(sin->sin_port);
++		break;
++	case AF_INET6:
++		if (inet_ntop(AF_INET6, (const void *)&sin6->sin6_addr,
++					buf, (socklen_t)sizeof(buf)) == NULL)
++			goto out_err;
++		port = ntohs(sin6->sin6_port);
++		break;
++	default:
++		goto out_err;
++	}
++
++	count = sizeof(buf) - strlen(buf);
++	len = snprintf(buf + strlen(buf), count, ".%u.%u",
++			(unsigned)(port >> 8), (unsigned)(port & 0xff));
++	/* before glibc 2.0.6, snprintf(3) could return -1 */
++	if (len < 0 || (size_t)len > count)
++		goto out_err;
++
++	result = strdup(buf);
++	return result;
++
++out_err:
++        return NULL;
++}
++
++static int rpc_universal2port(const char *uaddr)
++{
++	char *addrstr;
++	char *p, *endptr;
++	unsigned long portlo, porthi;
++	int port = -1;
++
++	addrstr = strdup(uaddr);
++	if (!addrstr)
++		return -1;
++
++	p = strrchr(addrstr, '.');
++	if (!p)
++		goto out;
++
++	portlo = strtoul(p + 1, &endptr, 10);
++	if (*endptr != '\0' || portlo > 255)
++		goto out;
++	*p = '\0';
++
++        p = strrchr(addrstr, '.');
++        if (!p)
++                goto out;
++
++        porthi = strtoul(p + 1, &endptr, 10);
++        if (*endptr != '\0' || porthi > 255)
++                goto out;
++        *p = '\0';
++
++        port = (porthi << 8) | portlo;
++
++out:
++	free(addrstr);
++	return port;
++}
++
++static enum clnt_stat rpc_rpcb_getport(CLIENT *client,
++				       struct rpcb *parms,
++				       struct timeval timeout,
++				       unsigned short *port)
++{
++	rpcvers_t rpcb_version;
++	struct rpc_err rpcerr;
++	int s_port = 0;
++
++	for (rpcb_version = RPCBVERS_4;
++	     rpcb_version >= RPCBVERS_3;
++	     rpcb_version--) {
++		enum clnt_stat status;
++		char *uaddr = NULL;
++
++		CLNT_CONTROL(client, CLSET_VERS, (void *) &rpcb_version);
++		status = CLNT_CALL(client, (rpcproc_t) RPCBPROC_GETADDR,
++				  (xdrproc_t) xdr_rpcb, (void *) parms,
++				  (xdrproc_t) xdr_wrapstring, (void *) &uaddr,
++				  timeout);
++
++		switch (status) {
++		case RPC_SUCCESS:
++			if ((uaddr == NULL) || (uaddr[0] == '\0'))
++				return RPC_PROGNOTREGISTERED;
++
++			s_port = rpc_universal2port(uaddr);
++			xdr_free((xdrproc_t) xdr_wrapstring, (char *) &uaddr);
++			if (s_port == -1) {
++				return RPC_N2AXLATEFAILURE;
++			}
++			*port = s_port;
++			return RPC_SUCCESS;
++
++		case RPC_PROGVERSMISMATCH:
++			clnt_geterr(client, &rpcerr);
++			if (rpcerr.re_vers.low > RPCBVERS4)
++				return status;
++			continue;
++
++		case RPC_PROGUNAVAIL:
++			continue;
++
++		case RPC_PROGNOTREGISTERED:
++			continue;
++
++		default:
++			/* Most likely RPC_TIMEDOUT or RPC_CANTRECV */
++			return status;
++		}
++	}
++
++	return RPC_PROGNOTREGISTERED;
++}
++
++static enum clnt_stat rpc_getport(struct conn_info *info,
++				  struct pmap *parms, CLIENT *client,
++				  unsigned short *port)
++{
++	enum clnt_stat status;
++	struct sockaddr *paddr, addr;
++	struct rpcb rpcb_parms;
++	char *netid, *raddr;
++
++	if (info->addr)
++		paddr = info->addr;
++	else {
++		if (!clnt_control(client, CLGET_SERVER_ADDR, (char *) &addr))
++			return RPC_UNKNOWNADDR;
++		paddr = &addr;
++	}
++
++	netid = NULL;
++	status = rpc_get_netid(paddr->sa_family, info->proto, &netid);
++	if (status != RPC_SUCCESS)
++		return status;
++
++	raddr = rpc_sockaddr2universal(paddr);
++	if (!raddr) {
++		free(netid);
++		return RPC_UNKNOWNADDR;
++	}
++
++	memset(&rpcb_parms, 0, sizeof(rpcb_parms));
++	rpcb_parms.r_prog   = parms->pm_prog;
++	rpcb_parms.r_vers   = parms->pm_vers;
++	rpcb_parms.r_netid  = netid;
++	rpcb_parms.r_addr   = raddr;
++	rpcb_parms.r_owner  = "";
++
++	status = rpc_rpcb_getport(client, &rpcb_parms, info->timeout, port);
++
++	free(netid);
++	free(raddr);
++
++	if (status == RPC_PROGNOTREGISTERED) {
++		/* Last chance, version 2 uses a different procedure */
++		rpcvers_t rpcb_version = PMAPVERS;
++		CLNT_CONTROL(client, CLSET_VERS, (void *) &rpcb_version);
++		status = clnt_call(client, PMAPPROC_GETPORT,
++				  (xdrproc_t) xdr_pmap, (caddr_t) parms,
++				  (xdrproc_t) xdr_u_short, (caddr_t) port,
++				  info->timeout);
++	}
++
++	return status;
++}
+ #endif
+ 
+ #if defined(HAVE_GETRPCBYNAME) || defined(HAVE_GETSERVBYNAME)
+@@ -380,7 +649,7 @@ static unsigned short rpc_getrpcbport(const int proto)
+ done:
+ 	pthread_mutex_unlock(&rpcb_mutex);
+ #endif
+-	return (unsigned short) PMAPPORT;
++	return (unsigned short) htons(PMAPPORT);
+ }
+ 
+ /*
+@@ -412,6 +681,12 @@ static int create_client(struct conn_info *info, CLIENT **client)
+ 			goto done;
+ 		if (ret == -EHOSTUNREACH)
+ 			goto out_close;
++		if (ret == -EINVAL) {
++			char buf[MAX_ERR_BUF];
++			char *estr = strerror_r(-ret, buf, MAX_ERR_BUF);
++			error(LOGOPT_ANY, "connect() failed: %s", estr);
++			goto out_close;
++		}
+ 
+ 		if (!info->client && fd != RPC_ANYSOCK) {
+ 			close(fd);
+@@ -618,6 +893,8 @@ int rpc_portmap_getport(struct conn_info *info,
+ 
+ 	memset(&pmap_info, 0, sizeof(struct conn_info));
+ 
++	pmap_info.proto = proto;
++
+ 	if (proto == IPPROTO_TCP)
+ 		pmap_info.timeout.tv_sec = PMAP_TOUT_TCP;
+ 	else
+@@ -647,20 +924,7 @@ int rpc_portmap_getport(struct conn_info *info,
+ 			return ret;
+ 	}
+ 
+-	/*
+-	 * Check to see if server is up otherwise a getport will take
+-	 * forever to timeout.
+-	 */
+-	status = clnt_call(client, PMAPPROC_NULL,
+-			 (xdrproc_t) xdr_void, 0, (xdrproc_t) xdr_void, 0,
+-			 pmap_info.timeout);
+-
+-	if (status == RPC_SUCCESS) {
+-		status = clnt_call(client, PMAPPROC_GETPORT,
+-				 (xdrproc_t) xdr_pmap, (caddr_t) parms,
+-				 (xdrproc_t) xdr_u_short, (caddr_t) port,
+-				 pmap_info.timeout);
+-	}
++	status = rpc_getport(&pmap_info, parms, client, port);
+ 
+ 	if (!info->client) {
+ 		/*
+@@ -867,6 +1131,11 @@ static int rpc_get_exports_proto(struct conn_info *info, exports *exp)
+ 	clnt_control(client, CLSET_RETRY_TIMEOUT, (char *) &info->timeout);
+ 
+ 	client->cl_auth = authunix_create_default();
++	if (client->cl_auth == NULL) {
++		error(LOGOPT_ANY, "auth create failed");
++		clnt_destroy(client);
++		return 0;
++	}
+ 
+ 	vers_entry = 0;
+ 	while (1) {
+diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
+index 2ab1e8c..04b1da7 100644
+--- a/modules/lookup_ldap.c
++++ b/modules/lookup_ldap.c
+@@ -846,20 +846,20 @@ int get_property(unsigned logopt, xmlNodePtr node, const char *prop, char **valu
+ 	return 0;
+ }
+ 
+-#ifdef WITH_SASL
+ /*
+  *  For plain text, login and digest-md5 authentication types, we need
+  *  user and password credentials.
+  */
+ int authtype_requires_creds(const char *authtype)
+ {
++#ifdef WITH_SASL
+ 	if (!strncmp(authtype, "PLAIN", strlen("PLAIN")) ||
+ 	    !strncmp(authtype, "DIGEST-MD5", strlen("DIGEST-MD5")) ||
+ 	    !strncmp(authtype, "LOGIN", strlen("LOGIN")))
+ 		return 1;
++#endif
+ 	return 0;
+ }
+-#endif
+ 
+ /*
+  *  Returns:
+diff --git a/modules/mount_autofs.c b/modules/mount_autofs.c
+index 319f2e4..61aec70 100644
+--- a/modules/mount_autofs.c
++++ b/modules/mount_autofs.c
+@@ -116,17 +116,17 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name,
+ 			while (*comma != '\0' && *comma != ',')
+ 				comma++;
+ 
+-			if (strncmp(cp, "nobrowse", 8) == 0)
++			if (_strncmp(cp, "nobrowse", 8) == 0)
+ 				ghost = 0;
+-			else if (strncmp(cp, "nobind", 6) == 0)
++			else if (_strncmp(cp, "nobind", 6) == 0)
+ 				nobind = 1;
+-			else if (strncmp(cp, "browse", 6) == 0)
++			else if (_strncmp(cp, "browse", 6) == 0)
+ 				ghost = 1;
+-			else if (strncmp(cp, "symlink", 7) == 0)
++			else if (_strncmp(cp, "symlink", 7) == 0)
+ 				symlnk = 1;
+-			else if (strncmp(cp, "hosts", 5) == 0)
++			else if (_strncmp(cp, "hosts", 5) == 0)
+ 				hosts = 1;
+-			else if (strncmp(cp, "timeout=", 8) == 0) {
++			else if (_strncmp(cp, "timeout=", 8) == 0) {
+ 				char *val = strchr(cp, '=');
+ 				unsigned tout;
+ 				if (val) {
+diff --git a/modules/mount_bind.c b/modules/mount_bind.c
+index 2b70104..a70bf3a 100644
+--- a/modules/mount_bind.c
++++ b/modules/mount_bind.c
+@@ -107,7 +107,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
+ 				end--;
+ 
+ 			o_len = end - cp + 1;
+-			if (strncmp("symlink", cp, o_len) == 0)
++			if (_strncmp("symlink", cp, o_len) == 0)
+ 				symlnk = 1;
+ 		}
+ 	}
+diff --git a/modules/mount_ext2.c b/modules/mount_ext2.c
+index 1edf347..1bc429d 100644
+--- a/modules/mount_ext2.c
++++ b/modules/mount_ext2.c
+@@ -77,7 +77,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
+ 
+ 	if (options && options[0]) {
+ 		for (p = options; (p1 = strchr(p, ',')); p = p1)
+-			if (!strncmp(p, "ro", p1 - p) && ++p1 - p == sizeof("ro"))
++			if (!_strncmp(p, "ro", p1 - p) && ++p1 - p == sizeof("ro"))
+ 				ro = 1;
+ 		if (!strcmp(p, "ro"))
+ 			ro = 1;
+diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
+index 5a582ef..315fc99 100644
+--- a/modules/mount_nfs.c
++++ b/modules/mount_nfs.c
+@@ -126,32 +126,32 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
+ 
+ 			o_len = end - cp + 1;
+ 
+-			if (strncmp("proto=rdma", cp, o_len) == 0 ||
+-				   strncmp("rdma", cp, o_len) == 0)
++			if (_strncmp("proto=rdma", cp, o_len) == 0 ||
++				   _strncmp("rdma", cp, o_len) == 0)
+ 				rdma = 1;
+ 
+-			if (strncmp("nosymlink", cp, o_len) == 0) {
++			if (_strncmp("nosymlink", cp, o_len) == 0) {
+ 				warn(ap->logopt, MODPREFIX
+ 				     "the \"nosymlink\" option is depricated "
+ 				     "and will soon be removed, "
+ 				     "use the \"nobind\" option instead");
+ 				nosymlink = 1;
+-			} else if (strncmp("nobind", cp, o_len) == 0) {
++			} else if (_strncmp("nobind", cp, o_len) == 0) {
+ 				nobind = 1;
+-			} else if (strncmp("no-use-weight-only", cp, o_len) == 0) {
++			} else if (_strncmp("no-use-weight-only", cp, o_len) == 0) {
+ 				flags &= ~MOUNT_FLAG_USE_WEIGHT_ONLY;
+-			} else if (strncmp("use-weight-only", cp, o_len) == 0) {
++			} else if (_strncmp("use-weight-only", cp, o_len) == 0) {
+ 				flags |= MOUNT_FLAG_USE_WEIGHT_ONLY;
+ 			} else {
+-				if (strncmp("vers=4", cp, o_len) == 0 ||
+-				    strncmp("nfsvers=4", cp, o_len) == 0)
++				if (_strncmp("vers=4", cp, o_len) == 0 ||
++				    _strncmp("nfsvers=4", cp, o_len) == 0)
+ 					vers = NFS4_VERS_MASK | TCP_SUPPORTED;
+-				else if (strncmp("vers=3", cp, o_len) == 0 ||
+-					 strncmp("nfsvers=3", cp, o_len) == 0) {
++				else if (_strncmp("vers=3", cp, o_len) == 0 ||
++					 _strncmp("nfsvers=3", cp, o_len) == 0) {
+ 					vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK);
+ 					vers |= NFS3_REQUESTED;
+-				} else if (strncmp("vers=2", cp, o_len) == 0 ||
+-					 strncmp("nfsvers=2", cp, o_len) == 0) {
++				} else if (_strncmp("vers=2", cp, o_len) == 0 ||
++					 _strncmp("nfsvers=2", cp, o_len) == 0) {
+ 					vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK);
+ 					vers |= NFS2_REQUESTED;
+ 				} else if (strstr(cp, "port=") == cp &&
+@@ -164,16 +164,16 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
+ 					if (port < 0)
+ 						port = 0;
+ 					port_opt = cp;
+-				} else if (strncmp("proto=udp", cp, o_len) == 0 ||
+-					   strncmp("udp", cp, o_len) == 0) {
++				} else if (_strncmp("proto=udp", cp, o_len) == 0 ||
++					   _strncmp("udp", cp, o_len) == 0) {
+ 					vers &= ~TCP_SUPPORTED;
+-				} else if (strncmp("proto=tcp", cp, o_len) == 0 ||
+-					   strncmp("tcp", cp, o_len) == 0) {
++				} else if (_strncmp("proto=tcp", cp, o_len) == 0 ||
++					   _strncmp("tcp", cp, o_len) == 0) {
+ 					vers &= ~UDP_SUPPORTED;
+ 				}
+ 				/* Check for options that also make sense
+ 				   with bind mounts */
+-				else if (strncmp("ro", cp, o_len) == 0)
++				else if (_strncmp("ro", cp, o_len) == 0)
+ 					ro = 1;
+ 				/* and jump over trailing white space */
+ 				memcpy(nfsp, cp, comma - cp + 1);
+diff --git a/modules/parse_sun.c b/modules/parse_sun.c
+index 30820b5..9a877c8 100644
+--- a/modules/parse_sun.c
++++ b/modules/parse_sun.c
+@@ -511,29 +511,29 @@ static int sun_mount(struct autofs_point *ap, const char *root,
+ 			while (*comma != '\0' && *comma != ',')
+ 				comma++;
+ 
+-			if (strncmp("fstype=", cp, 7) == 0) {
++			if (_strncmp("fstype=", cp, 7) == 0) {
+ 				int typelen = comma - (cp + 7);
+ 				fstype = alloca(typelen + 1);
+ 				memcpy(fstype, cp + 7, typelen);
+ 				fstype[typelen] = '\0';
+-			} else if (strncmp("nonstrict", cp, 9) == 0) {
++			} else if (_strncmp("nonstrict", cp, 9) == 0) {
+ 				nonstrict = 1;
+-			} else if (strncmp("strict", cp, 6) == 0) {
++			} else if (_strncmp("strict", cp, 6) == 0) {
+ 				nonstrict = 0;
+-			} else if (strncmp("nobrowse", cp, 8) == 0 ||
+-				   strncmp("browse", cp, 6) == 0 ||
+-				   strncmp("timeout=", cp, 8) == 0) {
++			} else if (_strncmp("nobrowse", cp, 8) == 0 ||
++				   _strncmp("browse", cp, 6) == 0 ||
++				   _strncmp("timeout=", cp, 8) == 0) {
+ 				if (strcmp(fstype, "autofs") == 0 ||
+ 				    strstr(cp, "fstype=autofs")) {
+ 					memcpy(np, cp, comma - cp + 1);
+ 					np += comma - cp + 1;
+ 				}
+-			} else if (strncmp("no-use-weight-only", cp, 18) == 0) {
++			} else if (_strncmp("no-use-weight-only", cp, 18) == 0) {
+ 				use_weight_only = -1;
+-			} else if (strncmp("use-weight-only", cp, 15) == 0) {
++			} else if (_strncmp("use-weight-only", cp, 15) == 0) {
+ 				use_weight_only = MOUNT_FLAG_USE_WEIGHT_ONLY;
+-			} else if (strncmp("bg", cp, 2) == 0 ||
+-				   strncmp("nofg", cp, 4) == 0) {
++			} else if (_strncmp("bg", cp, 2) == 0 ||
++				   _strncmp("nofg", cp, 4) == 0) {
+ 				continue;
+ 			} else {
+ 				memcpy(np, cp, comma - cp + 1);
+@@ -862,7 +862,7 @@ static int validate_location(unsigned int logopt, char *loc)
+ 			    *ptr == '-' || *ptr == '.' || *ptr == '_' ||
+ 			    *ptr == ',' || *ptr == '(' || *ptr == ')' ||
+ 			    *ptr == '#' || *ptr == '@' || *ptr == ':' ||
+-			    *ptr == '[' || *ptr == ']')) {
++			    *ptr == '[' || *ptr == ']' || *ptr == '%')) {
+ 				error(logopt, "invalid character \"%c\" "
+ 				      "found in location %s", *ptr, loc);
+ 				return 0;
+diff --git a/modules/replicated.c b/modules/replicated.c
+index 5fdd9d9..2463235 100644
+--- a/modules/replicated.c
++++ b/modules/replicated.c
+@@ -444,9 +444,12 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host,
+ 		      host->name, proto, version);
+ 
+ 	rpc_info->proto = proto;
+-	if (port < 0)
+-		rpc_info->port = NFS_PORT;
+-	else if (port > 0)
++	if (port < 0) {
++		if (version & NFS4_REQUESTED)
++			rpc_info->port = NFS_PORT;
++		else
++			port = 0;
++	} else if (port > 0)
+ 		rpc_info->port = port;
+ 
+ 	memset(&parms, 0, sizeof(struct pmap));
diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD
index 37045a227..c677e53cb 100644
--- a/community/bind/PKGBUILD
+++ b/community/bind/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 100668 2013-11-08 00:08:48Z seblu $
+# $Id: PKGBUILD 105129 2014-02-01 10:10:45Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
 
 pkgname=bind
-_pkgver=9.9.4-P1
-pkgver=${_pkgver//-/.}
+_pkgver=9.9.5
+pkgver=9.9.5
 pkgrel=1
 pkgdesc='The ISC BIND nameserver'
 url='http://www.isc.org/software/bind/'
@@ -26,7 +26,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"{,.asc}
         'named.logrotate'
         'localhost.zone'
         '127.0.0.zone')
-sha1sums=('35dd28de21626fd6327230c38d0f164dd2263bed'
+sha1sums=('f3fe8000628ec57f332aec1ad9587b767208a38f'
           'SKIP'
           '029f89c49550c40ec7a95116b6a33f0e5a041094'
           'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
diff --git a/community/bip/PKGBUILD b/community/bip/PKGBUILD
new file mode 100644
index 000000000..52879dd91
--- /dev/null
+++ b/community/bip/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 104918 2014-01-28 11:06:38Z flexiondotorg $
+# Maintainer: Martin Wimpress <code@flexion.org>
+
+pkgname=bip
+pkgver=0.8.9
+pkgrel=1
+pkgdesc="Multiuser IRC proxy that supports replaying of logged conversations."
+arch=('i686' 'x86_64')
+url="http://bip.milkypond.org/"
+license=('GPL')
+depends=('openssl')
+source=("http://pkgs.fedoraproject.org/repo/pkgs/${pkgname}/${pkgname}-${pkgver}.tar.gz/04158ad020db221ed87cdc03660ef6c9//$pkgname-$pkgver.tar.gz"
+        ${pkgname}.service)
+md5sums=('04158ad020db221ed87cdc03660ef6c9'
+         'e9a445ed7b0cf12e57d77cf42021160c')
+install=${pkgname}.install
+
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    # Don't treat warnings as errors.
+    sed -i 's/-Werror//g' Makefile.in
+    # Make the sample configuration reflect the PKGBUILD defaults
+    sed -i 's:/var/proxy/logs:/var/log/bip:' samples/$pkgname.conf
+}
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure --prefix=/usr
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+    install -D -m755 ${srcdir}/${pkgname}-${pkgver}/scripts/bipgenconfig "${pkgdir}"/usr/bin/bipgenconfig
+    install -D -m644 ${srcdir}/${pkgname}-${pkgver}/samples/$pkgname.conf "${pkgdir}"/usr/share/$pkgname/$pkgname.conf.sample
+    install -D -m644 ${srcdir}/${pkgname}-${pkgver}/samples/$pkgname.vim "${pkgdir}"/usr/share/vim/syntax/$pkgname.vim
+    install -D -m 0644 ../${pkgname}.service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+}
diff --git a/community/bip/bip.install b/community/bip/bip.install
new file mode 100644
index 000000000..5c7857aff
--- /dev/null
+++ b/community/bip/bip.install
@@ -0,0 +1,27 @@
+post_install() {
+    if ! getent passwd bip > /dev/null; then
+        echo "==> Creating bip user"
+        usr/bin/useradd --comment "Bip IRC Proxy" --shell /bin/sh --home /var/lib/bip --system --user-group bip
+    fi
+    
+    mkdir -p /var/run/bip 2 > /dev/null
+    chown -R bip:bip /var/run/bip
+    
+    mkdir -p /var/log/bip 2 > /dev/null
+    chown -R bip:bip /var/log/bip
+    systemctl daemon-reload
+}
+
+post_upgrade() {
+    post_install
+}
+
+pre_remove() {
+    systemctl stop bip
+    echo "==> Removing bip user and group"
+    userdel bip
+    if getent group bip > /dev/null; then
+        groupdel bip
+    fi
+    rm -rf /var/run/bip
+}
diff --git a/community/bip/bip.service b/community/bip/bip.service
new file mode 100644
index 000000000..299866088
--- /dev/null
+++ b/community/bip/bip.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Bip IRC Proxy Server
+After=network.target
+ConditionPathExists=/etc/bip.conf
+
+[Service]
+User=bip
+Type=forking
+PIDFile=/var/run/bip/bip.pid
+ExecStart=/usr/bin/bip -f /etc/bip.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD
index 24a8d44e8..a3d3c0cbe 100644
--- a/community/bitcoin/PKGBUILD
+++ b/community/bitcoin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 102409 2013-12-10 14:39:27Z tredaelli $
+# $Id: PKGBUILD 105855 2014-02-16 14:27:32Z bpiotrowski $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: shahid <helllamer@gmail.com>
 
 pkgbase=bitcoin
 pkgname=('bitcoin-daemon' 'bitcoin-qt')
 pkgver=0.8.6
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.bitcoin.org/"
 makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc')
diff --git a/community/bmake/PKGBUILD b/community/bmake/PKGBUILD
index 27475c9c4..a0c30709c 100644
--- a/community/bmake/PKGBUILD
+++ b/community/bmake/PKGBUILD
@@ -3,14 +3,16 @@
 # Contributor: Imanol Celaya <ilcra1989@gmail.com>
 
 pkgname=bmake
-pkgver=20131001
-pkgrel=2
+pkgver=20140214
+pkgrel=1
 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')
+sha256sums=('0f7ecadb6dcd5e4902a03137daba6fd7756f54e82942b524f3b38d7406b6d83e')
+sha256sums=('2ec1771a800431c26361659ab0f96ec5c2536e85b46564eb69fa75a4b12886de')
 
 prepare() {
     cd "$srcdir/$pkgname"
diff --git a/community/bti/PKGBUILD b/community/bti/PKGBUILD
index 26072c4b7..c629c7a3f 100644
--- a/community/bti/PKGBUILD
+++ b/community/bti/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 94095 2013-07-14 11:36:26Z jlichtblau $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# $Id: PKGBUILD 105299 2014-02-04 18:30:49Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: uvok <uvok at online dot de>
 # Contributor: Urist <9362773 at gmail.com>
 
 pkgname=bti
-pkgver=033
+pkgver=034
 pkgrel=1
 pkgdesc='Console client for Twitter and identi.ca'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://gregkh.github.com/bti/'
 license=('GPL')
 depends=('pcre' 'libxml2' 'curl' 'liboauth' 'json-c')
-makedepends=('git')
 source=(http://www.kernel.org/pub/software/web/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('a3d9d8a86a718a4820387c75ac2af24fecfe754ee562163d700acb7cf795d753')
+sha256sums=('8b4a1a11f529f83956468acadaea9d11db4f03e82afe07fecb84b2d00e9eae83')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
   ./configure --prefix=/usr
 
   make
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
   
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD
index 7b6ef15b7..fcb5c00c0 100644
--- a/community/busybox/PKGBUILD
+++ b/community/busybox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 93409 2013-07-03 10:50:24Z spupykin $
+# $Id: PKGBUILD 104422 2014-01-20 13:27:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jens Pranaitis <jens@jenux.homelinux.org>
 
 pkgname=busybox
-pkgver=1.21.1
+pkgver=1.22.1
 pkgrel=1
 pkgdesc="Utilities for rescue and embedded systems"
 arch=("i686" "x86_64" 'mips64el')
@@ -13,8 +13,8 @@ makedepends=("make" "gcc" "sed" "ncurses")
 source=($url/downloads/$pkgname-$pkgver.tar.bz2
 	config)
 install=busybox.install
-md5sums=('795394f83903b5eec6567d51eebb417e'
-         '3fbd88dc6327ff0455c17409efdbab79')
+md5sums=('337d1a15ab1cb1d4ed423168b1eb7d7e'
+         'e7c697e37b2120f0e0a354c48180cde4')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/busybox/config b/community/busybox/config
index b89c59b12..276cf9f63 100644
--- a/community/busybox/config
+++ b/community/busybox/config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.21.1
-# Wed Jul  3 14:35:32 2013
+# Busybox version: 1.22.0
+# Fri Jan  3 01:07:04 2014
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -135,7 +135,14 @@ CONFIG_FEATURE_SEAMLESS_Z=y
 CONFIG_AR=y
 CONFIG_FEATURE_AR_LONG_FILENAMES=y
 CONFIG_FEATURE_AR_CREATE=y
+CONFIG_UNCOMPRESS=y
+CONFIG_GUNZIP=y
 CONFIG_BUNZIP2=y
+CONFIG_UNLZMA=y
+CONFIG_FEATURE_LZMA_FAST=y
+CONFIG_LZMA=y
+CONFIG_UNXZ=y
+CONFIG_XZ=y
 CONFIG_BZIP2=y
 CONFIG_CPIO=y
 CONFIG_FEATURE_CPIO_O=y
@@ -143,7 +150,6 @@ CONFIG_FEATURE_CPIO_O=y
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
 CONFIG_GZIP=y
 # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
 CONFIG_GZIP_FAST=0
@@ -163,12 +169,6 @@ CONFIG_FEATURE_TAR_TO_COMMAND=y
 CONFIG_FEATURE_TAR_UNAME_GNAME=y
 # CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
 # CONFIG_FEATURE_TAR_SELINUX is not set
-CONFIG_UNCOMPRESS=y
-CONFIG_UNLZMA=y
-CONFIG_FEATURE_LZMA_FAST=y
-CONFIG_LZMA=y
-CONFIG_UNXZ=y
-CONFIG_XZ=y
 CONFIG_UNZIP=y
 
 #
@@ -186,6 +186,7 @@ CONFIG_GROUPS=y
 CONFIG_TEST=y
 CONFIG_FEATURE_TEST_64=y
 CONFIG_TOUCH=y
+CONFIG_FEATURE_TOUCH_NODEREF=y
 CONFIG_FEATURE_TOUCH_SUSV3=y
 CONFIG_TR=y
 CONFIG_FEATURE_TR_CLASSES=y
@@ -363,7 +364,16 @@ CONFIG_WHICH=y
 #
 # Editors
 #
+CONFIG_AWK=y
+# CONFIG_FEATURE_AWK_LIBM is not set
+CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+CONFIG_FEATURE_DIFF_DIR=y
+CONFIG_ED=y
 CONFIG_PATCH=y
+CONFIG_SED=y
 CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=4096
 # CONFIG_FEATURE_VI_8BIT is not set
@@ -378,14 +388,6 @@ CONFIG_FEATURE_VI_SETOPTS=y
 CONFIG_FEATURE_VI_SET=y
 CONFIG_FEATURE_VI_WIN_RESIZE=y
 CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_AWK=y
-# CONFIG_FEATURE_AWK_LIBM is not set
-CONFIG_CMP=y
-CONFIG_DIFF=y
-# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
-CONFIG_FEATURE_DIFF_DIR=y
-CONFIG_ED=y
-CONFIG_SED=y
 CONFIG_FEATURE_ALLOW_EXEC=y
 
 #
@@ -528,6 +530,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 # Linux System Utilities
 #
 CONFIG_BLOCKDEV=y
+CONFIG_FSTRIM=y
 CONFIG_MDEV=y
 CONFIG_FEATURE_MDEV_CONF=y
 CONFIG_FEATURE_MDEV_RENAME=y
@@ -614,26 +617,27 @@ CONFIG_VOLUMEID=y
 #
 # Filesystem/Volume identification
 #
-CONFIG_FEATURE_VOLUMEID_EXT=y
 CONFIG_FEATURE_VOLUMEID_BTRFS=y
-CONFIG_FEATURE_VOLUMEID_REISERFS=y
-CONFIG_FEATURE_VOLUMEID_FAT=y
+CONFIG_FEATURE_VOLUMEID_CRAMFS=y
 CONFIG_FEATURE_VOLUMEID_EXFAT=y
+CONFIG_FEATURE_VOLUMEID_EXT=y
+CONFIG_FEATURE_VOLUMEID_F2FS=y
+CONFIG_FEATURE_VOLUMEID_FAT=y
 CONFIG_FEATURE_VOLUMEID_HFS=y
+CONFIG_FEATURE_VOLUMEID_ISO9660=y
 CONFIG_FEATURE_VOLUMEID_JFS=y
-CONFIG_FEATURE_VOLUMEID_XFS=y
+CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
+CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
+CONFIG_FEATURE_VOLUMEID_LUKS=y
 CONFIG_FEATURE_VOLUMEID_NILFS=y
 CONFIG_FEATURE_VOLUMEID_NTFS=y
-CONFIG_FEATURE_VOLUMEID_ISO9660=y
-CONFIG_FEATURE_VOLUMEID_UDF=y
-CONFIG_FEATURE_VOLUMEID_LUKS=y
-CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
-CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_OCFS2=y
+CONFIG_FEATURE_VOLUMEID_REISERFS=y
 CONFIG_FEATURE_VOLUMEID_ROMFS=y
 CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
 CONFIG_FEATURE_VOLUMEID_SYSV=y
-CONFIG_FEATURE_VOLUMEID_OCFS2=y
-CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
+CONFIG_FEATURE_VOLUMEID_UDF=y
+CONFIG_FEATURE_VOLUMEID_XFS=y
 
 #
 # Miscellaneous Utilities
@@ -651,6 +655,7 @@ CONFIG_FEATURE_LESS_REGEXP=y
 # CONFIG_FEATURE_LESS_LINENUMS is not set
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
+CONFIG_RFKILL=y
 CONFIG_SETSERIAL=y
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
@@ -658,6 +663,7 @@ CONFIG_UBIMKVOL=y
 CONFIG_UBIRMVOL=y
 CONFIG_UBIRSVOL=y
 CONFIG_UBIUPDATEVOL=y
+CONFIG_WALL=y
 CONFIG_ADJTIMEX=y
 # CONFIG_BBCONFIG is not set
 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
@@ -714,7 +720,6 @@ CONFIG_MOUNTPOINT=y
 CONFIG_MT=y
 CONFIG_RAIDAUTORUN=y
 CONFIG_READAHEAD=y
-CONFIG_RFKILL=y
 CONFIG_RUNLEVEL=y
 CONFIG_RX=y
 CONFIG_SETSID=y
@@ -725,7 +730,6 @@ CONFIG_TIME=y
 CONFIG_TIMEOUT=y
 CONFIG_TTYSIZE=y
 CONFIG_VOLNAME=y
-CONFIG_WALL=y
 CONFIG_WATCHDOG=y
 
 #
diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD
index 669983619..30cc37e56 100644
--- a/community/c++-gtk-utils/PKGBUILD
+++ b/community/c++-gtk-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 102095 2013-12-05 08:00:44Z giovanni $
+# $Id: PKGBUILD 105838 2014-02-16 09:04:54Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=c++-gtk-utils
-pkgver=2.0.21
+pkgver=2.0.22
 pkgrel=1
 pkgdesc="Classes and functions for programming in GTK+"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL2.1')
 depends=('gtk3')
 options=('!docs' '!emptydirs')
 source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('98f5f211907c89dd978255e48d31a9ca')
+md5sums=('c00afed7f58c6d71e38d226f9447266a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/cairo-dock-plugins/PKGBUILD b/community/cairo-dock-plugins/PKGBUILD
index 19d1e76af..e5e736130 100755
--- a/community/cairo-dock-plugins/PKGBUILD
+++ b/community/cairo-dock-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99702 2013-10-30 23:07:09Z alucryd $
+# $Id: PKGBUILD 105391 2014-02-06 16:23:43Z andyrtr $
 # Maintainer: Maxime Gauduin <alucryd at gmail dot com>
 # Contributor: Tofe <chris dot chapuis at gmail dot com>
 # Contributor: zhuqin <zhuqin83 at gmail dot com>
@@ -7,7 +7,7 @@
 
 pkgname=cairo-dock-plugins
 pkgver=3.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Plugins for Cairo-Dock'
 arch=('i686' 'x86_64')
 url="https://launchpad.net/${pkgname%-*}-plug-ins"
diff --git a/community/calc/PKGBUILD b/community/calc/PKGBUILD
index 9ca661ed0..6c5e3ee9f 100644
--- a/community/calc/PKGBUILD
+++ b/community/calc/PKGBUILD
@@ -1,62 +1,28 @@
-# $Id: PKGBUILD 93457 2013-07-03 13:50:16Z spupykin $
+# $Id: PKGBUILD 104409 2014-01-20 11:01:07Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=calc
-pkgver=2.12.4.8
+pkgver=2.12.4.13
 pkgrel=1
 pkgdesc="console calculator"
 arch=(i686 x86_64 'mips64el')
 url="http://www.isthe.com/chongo/tech/comp/calc/"
 license=('GPL')
-depends=(glibc)
+depends=('readline')
+makedepends=('chrpath')
 #source=(http://switch.dl.sf.net/sourceforge/calc/calc-$pkgver.tar.bz2)
 source=(http://www.isthe.com/chongo/src/calc/calc-$pkgver.tar.bz2)
-md5sums=('38694f375e172f0b830d4dbf9d6f2dcc')
+md5sums=('7955e52ebd6b4f8482ef2b31c490eb35')
 
 build() {
   cd $srcdir/calc-$pkgver
-
-  patch -p0 Makefile <<EOF
-1146c1146
-< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib
----
-> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR}
-1180c1180
-< DEFAULT_LIB_INSTALL_PATH= \${PWD}:\${LIBDIR}:/usr/local/lib
----
-> DEFAULT_LIB_INSTALL_PATH= \${PWD}:\${LIBDIR}
-1233c1233
-< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib
----
-> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR}
-1275c1275
-< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib
----
-> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR}
-1312c1312
-< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib
----
-> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR}
-1350c1350
-< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib
----
-> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR}
-1406c1406
-< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib
----
-> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR}
-1443c1443
-< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib
----
-> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR}
-EOF
-
-  make -j1
+  make USE_READLINE="-DUSE_READLINE" READLINE_LIB="-lreadline" READLINE_EXTRAS="-lhistory -lncurses" -j1
 }
 
 package() {
   cd $srcdir/calc-$pkgver
   make T=$pkgdir install
   mv $pkgdir/usr/bin/cscript $pkgdir/usr/share/calc/
+  chrpath -d $pkgdir/usr/bin/calc
 }
diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD
index ff78a7dcd..70a109677 100644
--- a/community/cantata/PKGBUILD
+++ b/community/cantata/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 101406 2013-11-24 23:10:10Z cinelli $
+# $Id: PKGBUILD 103640 2014-01-08 16:42:15Z bgyorgy $
 # Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Mcder3 <mcder3[at]gmail[dot]com>
 # Contributor: MisterFred <mister.fred[at]free[dot]fr>
 
 pkgname=cantata
-pkgver=1.1.3
+pkgver=1.2.2
 pkgdesc="A KDE client for the music player daemon (MPD)"
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde-apps.org/content/show.php/Cantata?content=147733"
 license=('GPL')
-depends=('kdebase-runtime' 'libmtp' 'libcddb' 'libmusicbrainz5' 'mpg123' 'taglib-extras')
+depends=('kdebase-runtime' 'libmtp' 'libcddb' 'libmusicbrainz5' 'mpg123' 'qjson' 'taglib-extras')
 optdepends=('perl-uri: dynamic playlist'
 	    'mpd: playback')
 makedepends=('cmake' 'automoc4')
 install="$pkgname.install"
 source=("http://cantata.googlecode.com/files/$pkgname-$pkgver.tar.bz2")
-md5sums=('22691c1ba9e0f94200f6cdb849be726a')
+sha1sums=('89d84736ba4a43be7dc892af6fcbad5957075e19')
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   mkdir build
@@ -25,7 +26,7 @@ build() {
   cmake . \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
-    -DENABLE_PHONON=ON
+    -DENABLE_HTTP_STREAM_PLAYBACK=ON
 
   make
 }
diff --git a/community/caps/PKGBUILD b/community/caps/PKGBUILD
index b6000f4fa..ed8be7116 100644
--- a/community/caps/PKGBUILD
+++ b/community/caps/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 96214 2013-08-21 19:31:33Z speps $
+# $Id: PKGBUILD 104536 2014-01-22 13:01:55Z speps $
 # Maintainer : speps <speps at aur dot archlinux dot org>
 # Contributor: DonVla <donvla@users.sourceforge.net>
 
 pkgname=caps
-pkgver=0.9.10
+pkgver=0.9.16
 pkgrel=1
 pkgdesc="The LADSPA C* Audio Plugin Suite"
 arch=('i686' 'x86_64')
@@ -12,20 +12,20 @@ license=('GPL3')
 groups=('ladspa-plugins')
 depends=('ladspa')
 source=("http://quitte.de/dsp/caps_$pkgver.tar.bz2")
-md5sums=('dac87bf3a967b6f6ddcea1d90b6f4808')
+md5sums=('85e79596f22636b154b152efe54d05ce')
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   # use a minimum of optimization required to build
   export _CFLAGS='-msse -mfpmath=sse'
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make
 }
  
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make PREFIX="$pkgdir/usr" install
 }
diff --git a/community/ccfits/PKGBUILD b/community/ccfits/PKGBUILD
new file mode 100644
index 000000000..7ab94bfd9
--- /dev/null
+++ b/community/ccfits/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z  $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: <clu>
+# Contributor: Jose San Juan <sanjuan@tng.iac.es>
+
+pkgname=ccfits
+pkgver=2.4
+pkgrel=4
+pkgdesc="Object Oriented Interface to the CFITSIO Library"
+arch=('i686' 'x86_64')
+url="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/"
+license=('custom')
+depends=('cfitsio')
+source=(http://heasarc.gsfc.nasa.gov/docs/software/fitsio/${pkgname}/CCfits-${pkgver}.tar.gz)
+md5sums=('dd9a11d964590dd5f3fd5a3491b2c1ce')
+
+build() {
+  cd "${srcdir}"/CCfits
+
+  ./configure --with-cfitsio-libdir=/usr/lib --prefix=/usr
+  make 
+}
+
+package() {
+  cd "${srcdir}"/CCfits
+
+  make DESTDIR="${pkgdir}" install
+
+#install license
+  install -D -m644 License.txt "${pkgdir}/usr/share/licenses/$pkgname/License.txt"
+}
diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD
index f8328af12..0b5fec4d5 100644
--- a/community/ccid/PKGBUILD
+++ b/community/ccid/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 102093 2013-12-05 07:50:08Z giovanni $
+# $Id: PKGBUILD 105836 2014-02-16 08:59:50Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=ccid
-pkgver=1.4.14
+pkgver=1.4.15
 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"
 license=('LGPL' 'GPL')
-depends=('pcsclite' 'libusbx')
+depends=('pcsclite' 'libusbx' 'flex')
 makedepends=('pkg-config')
 backup=(etc/reader.conf.d/libccidtwin)
-source=("https://alioth.debian.org/frs/download.php/file/3971/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('4596f82e85e2996f7877e892b5c18382')
+source=("https://alioth.debian.org/frs/download.php/file/3989/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('c195333c953f5530bc04a194b5ac1b71')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/cgal/PKGBUILD b/community/cgal/PKGBUILD
new file mode 100644
index 000000000..eba147901
--- /dev/null
+++ b/community/cgal/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 105550 2014-02-10 04:57:25Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: Dmitriy Morozov <foxcub>
+
+pkgname=cgal
+pkgver=4.3
+pkgrel=2
+_pkgid=32995
+pkgdesc="Computational Geometry Algorithms Library"
+arch=('i686' 'x86_64')
+url="http://www.cgal.org"
+license=('GPL' 'LGPL')
+source=(http://gforge.inria.fr/frs/download.php/$_pkgid/CGAL-$pkgver.tar.xz)
+depends=('mpfr' 'boost-libs' 'gmp' 'mesa' 'glu')
+optdepends=('qt4: for CGAL_Qt4'
+            'eigen: for some packages, see the CGAL manual')
+makedepends=('cmake' 'qt4' 'eigen' 'boost')
+md5sums=('c0af5e3a56300b0c92ebd3a1f0df9149')
+
+# consider building with swig for python stuff
+
+build() {
+  cd "$srcdir/CGAL-$pkgver"
+  mkdir build
+  cd build
+  cmake ../ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/CGAL-$pkgver/build"
+  make install DESTDIR="$pkgdir"
+
+  # The tarball still has all theese licenses included
+  for _license in LICENSE{,.FREE_USE,.GPL,.LGPL}; do
+    install -D -m644 "$srcdir/CGAL-$pkgver/$_license" "$pkgdir/usr/share/licenses/$pkgname/$_license"
+  done
+}
diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD
index 6e2356a17..92131c0ad 100644
--- a/community/cgit/PKGBUILD
+++ b/community/cgit/PKGBUILD
@@ -1,44 +1,44 @@
-# $Id: PKGBUILD 95633 2013-08-15 09:46:14Z spupykin $
+# $Id: PKGBUILD 104414 2014-01-20 11:04:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Current Maintainer:  Patrick Palka <patrick@parcs.ath.cx>
-# Previous Maintainer:  Loui Chang <louipc.ist at gmail com>
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Patrick Palka <patrick@parcs.ath.cx>
+# Contributor: Loui Chang <louipc.ist at gmail com>
 # Contributor: Andreas Baumann <abaumann at yahoo dot com>
-# Development: http://closure.ath.cx/aur-dev
 
 pkgname=cgit
-pkgver=0.9.2
-_gitver=1.8.3
-pkgrel=2
+pkgver=0.10
+pkgrel=1
 pkgdesc="A web interface for git written in plain C"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://hjemli.net/git/cgit"
+url="http://git.zx2c4.com/cgit/"
 license=('GPL2')
-depends=('openssl')
+depends=('openssl' 'luajit')
 makedepends=('zlib' 'curl' 'asciidoc')
 install=cgit.install
 source=("http://git.zx2c4.com/cgit/snapshot/cgit-$pkgver.tar.xz"
-	"git-${_gitver}.tar.gz::https://github.com/git/git/archive/v${_gitver}.tar.gz"
 	"apache.example.conf")
-md5sums=('fe11018eff8d79caad112f4fac64b90f'
-         '73224d3dc86c4999cc49484b49c9acc4'
+md5sums=('19944c17ecea1b1d1944718ce8ce6b61'
          'bd5696bea0654bfcf98f249b1a36737d')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+  make get-git
+}
+
 build() {
   cd "$pkgname-$pkgver"
-  _cgit_gitver=`grep 'GIT_VER = ' Makefile | cut -f3 -d\ `
-  [ "x${_gitver}" == "x${_cgit_gitver}" ] || { msg "Bad git version"; return 1; }
-  rm -rf git/*
-  mv ../git-${_gitver}/* git/
   make
   make doc-man
 }
 
 package() {
   cd "$pkgname-$pkgver"
-  make CGIT_SCRIPT_PATH=/usr/share/webapps/cgit DESTDIR="$pkgdir" install install-man
+
+  make CGIT_SCRIPT_PATH=/usr/share/webapps/cgit DESTDIR="$pkgdir" prefix=/usr install install-man
+
   install -vd "$pkgdir/var/cache/$pkgname"
-  install -vDm0644 $srcdir/apache.example.conf $pkgdir/etc/webapps/cgit/apache.example.conf
-  mkdir -p $pkgdir/usr/lib/cgit
-  mv $pkgdir/usr/share/webapps/cgit/cgit.cgi $pkgdir/usr/lib/cgit
-  ln -sf ../../../lib/cgit/cgit.cgi $pkgdir/usr/share/webapps/cgit/cgit.cgi
+  install -vDm0644 "$srcdir/apache.example.conf" "$pkgdir/etc/webapps/cgit/apache.example.conf"
+  mkdir -p "$pkgdir/usr/lib/cgit"
+  mv "$pkgdir/usr/share/webapps/cgit/cgit.cgi" "$pkgdir/usr/lib/cgit"
+  ln -sf ../../../lib/cgit/cgit.cgi "$pkgdir/usr/share/webapps/cgit/cgit.cgi"
 }
diff --git a/community/cgit/cgit.install b/community/cgit/cgit.install
index 7d696ada9..d45792886 100644
--- a/community/cgit/cgit.install
+++ b/community/cgit/cgit.install
@@ -1,7 +1,5 @@
 post_install() {
-   echo -n "Setting ownership of /var/cache/cgit to http:http ... "
    chown -v http:http var/cache/cgit
-   echo "done."
-   echo -n "cgit looks at /etc/cgitrc for configuration. there is "
-   echo "an example configuration file in its manpage."
+   echo "==> cgit looks at /etc/cgitrc for configuration. There is"
+   echo "==> an example configuration file in the cgitrc(5) man page."
 }
diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD
index d5030ee63..0dc231df3 100644
--- a/community/chmsee/PKGBUILD
+++ b/community/chmsee/PKGBUILD
@@ -1,52 +1,47 @@
-# $Id: PKGBUILD 96436 2013-08-28 21:03:26Z lcarlier $
+# $Id: PKGBUILD 103375 2014-01-04 11:27:06Z bpiotrowski $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: dionydonny <dionydonny@gmail.com>
 # Contributor: Ermanno <erm67@yahoo.it>
 
 pkgname=chmsee
 pkgver=2.0.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner."
 url="http://chmsee.googlecode.com/"
 license=('GPL')
-depends=('xulrunner>21.0' 'xulrunner<24.0' 'chmlib' 'desktop-file-utils')
+depends=('xulrunner>21.0' 'xulrunner<27.0' 'chmlib' 'desktop-file-utils')
 makedepends=('python2')
-#source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver
-#source=(https://github.com/jungleji/chmsee/archive/b2a3c2ad32bfe9db067665ea1928d7e130d1b5e7.zip
-source=(https://chmsee.googlecode.com/files/${pkgname}-${pkgver}.tar.gz
+source=(https://chmsee.googlecode.com/files/$pkgname-$pkgver.tar.gz
         chmsee)
 install=chmsee.install
 md5sums=('c6a6ce009395c72ecf0530500ecda37c'
          '1787edd1de8aa75bd9fa75a5ab319e85')
 
-build() {
-  cd ${srcdir}/chmsee-*/src
+prepare() {
+  cd $pkgname-$pkgver
+  sed -i -e 's/^\(MaxVersion=\).*/\126.*/' application.ini
+}
 
+build() {
+  cd $pkgname-$pkgver/src
   cp Makefile.arch Makefile
-  #sed -i -e 's/17.*/18.0/g' ../application.ini
-  #sed -i -e 's/21.*/22.*/g' ../application.ini
-
-  # xpcom has been merged into xul in xulrunner 22.0
-  # sed -i -e 's/-lxpcom/-lxul/' common.mk
-
   make -j1
 }
 
 package() {
-  cd ${srcdir}/chmsee-*
+  cd $pkgname-$pkgver
 
-  install -d ${pkgdir}/usr/share/chmsee
-  cp -a * ${pkgdir}/usr/share/chmsee
-  rm -r ${pkgdir}/usr/share/chmsee/src
+  install -d "$pkgdir"/usr/share/chmsee
+  cp -a * "$pkgdir"/usr/share/chmsee
+  rm -r "$pkgdir"/usr/share/chmsee/src
   install -Dm644 data/chmsee.desktop.in \
-    ${pkgdir}/usr/share/applications/chmsee.desktop
+    "$pkgdir"/usr/share/applications/chmsee.desktop
+
   # Fix FS#25152
-  sed -i -e 's/_//g' ${pkgdir}/usr/share/applications/chmsee.desktop
-  #
-  install -d ${pkgdir}/usr/share/pixmaps
-  install -Dm644 data/chmsee-icon.png ${pkgdir}/usr/share/pixmaps
-  install -Dm755 ${srcdir}/chmsee ${pkgdir}/usr/bin/chmsee
-#  install -d ${pkgdir}/usr/share/icons
-#  cp -a data/icons/* ${pkgdir}/usr/share/icons/
+  sed -i -e 's/_//g' "$pkgdir"/usr/share/applications/chmsee.desktop
+
+  install -d "$pkgdir"/usr/share/pixmaps
+  install -Dm644 data/chmsee-icon.png "$pkgdir"/usr/share/pixmaps
+  install -Dm755 ${srcdir}/chmsee "$pkgdir"/usr/bin/chmsee
 }
diff --git a/community/chntpw/PKGBUILD b/community/chntpw/PKGBUILD
index 6991ac9d9..1801df6bd 100644
--- a/community/chntpw/PKGBUILD
+++ b/community/chntpw/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 64647 2012-02-17 13:33:11Z lfleischer $
+# $Id: PKGBUILD 105665 2014-02-13 09:45:47Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=chntpw
-pkgver=110511
-pkgrel=2
-pkgdesc='Offline NT Password Editor - reset passwords in a Windows NT SAM user database file.'
+pkgver=140201
+pkgrel=1
+pkgdesc='Offline NT Password Editor - reset passwords in a Windows NT SAM user database file'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pogostick.net/~pnh/ntpasswd/'
 license=('GPL' 'LGPL')
 makedepends=('openssl')
 source=("http://pogostick.net/~pnh/ntpasswd/${pkgname}-source-${pkgver}.zip")
-md5sums=('a3fb358d1adec589cd6bc8dedf68896c')
+md5sums=('d60bc657206b07ad84d926649d6417dc')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's/^CFLAGS= \(.*\) -m32 $/CFLAGS= \1/' Makefile
+}
 
-  [ "$CARCH" != "i686" ] && sed -i "s|CFLAGS= -DUSEOPENSSL -g -I. -I\$(OSSLINC) -Wall -m32|CFLAGS= -DUSEOPENSSL -g -I. -I\$(OSSLINC) -Wall|" Makefile
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make
 }
 
diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD
index e54a0f628..3446c4752 100644
--- a/community/chrony/PKGBUILD
+++ b/community/chrony/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99445 2013-10-29 00:06:24Z thestinger $
+# $Id: PKGBUILD 105122 2014-01-31 23:52:20Z thestinger $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Daniel Micay <danielmicay@gmail.com>
 # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
@@ -8,8 +8,8 @@
 # Contributor: Elisamuel Resto <ryuji@simplysam.us>
 
 pkgname=chrony
-pkgver=1.29
-pkgrel=2
+pkgver=1.29.1
+pkgrel=1
 pkgdesc='Lightweight NTP client and server'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://chrony.tuxfamily.org/"
@@ -19,7 +19,7 @@ depends=('readline' 'libcap')
 backup=('etc/chrony.conf')
 source=(http://download.tuxfamily.org/chrony/${pkgname}-${pkgver}.tar.gz
         service)
-sha256sums=('c685f072ba0663ab026a7f56870ab2c246bd97ca4629dd2e1899617bd16ad39b'
+sha256sums=('658c9bb4d8c8d8ec7d0908429aa266e5f8413ba86bd4acbfd2f9669f6065af27'
             'bef4305fa7e5828e1a1fd43aa8e631f22f21902f6cdc2d3b5b41a57bd9a175dc')
 
 build() {
diff --git a/community/cinnamon-settings-daemon/PKGBUILD b/community/cinnamon-settings-daemon/PKGBUILD
index 834e131c7..42ee3ef43 100644
--- a/community/cinnamon-settings-daemon/PKGBUILD
+++ b/community/cinnamon-settings-daemon/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id$
+# $Id: PKGBUILD 103670 2014-01-09 06:32:51Z fyan $
 # Maintainer: Alexandre Filgueira (faidoc) <alexfilgueira@antergos.com>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=cinnamon-settings-daemon
 pkgver=2.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="The Cinnamon Settings daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('cinnamon-desktop' 'ibus' 'libcanberra-pulse' 'librsvg' 'nss' 'pulseaudio-alsa' 'upower')
+depends=('cinnamon-desktop' 'libibus' 'libcanberra-pulse' 'librsvg' 'nss' 'pulseaudio-alsa' 'upower' 'libnotify')
 makedepends=('intltool' 'docbook-xsl' 'gnome-common')
 options=('!emptydirs')
 install=cinnamon-settings-daemon.install
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index 9507b9290..77c9902bd 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 101561 2013-11-28 01:14:22Z faidoc $
+# $Id: PKGBUILD 103395 2014-01-05 16:56:22Z bgyorgy $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
@@ -6,7 +6,7 @@
 
 pkgname=cinnamon
 pkgver=2.0.14
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cinnamon.linuxmint.com/"
@@ -14,7 +14,7 @@ license=('GPL2')
 depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-session'
          'cinnamon-translations' 'cjs' 'clutter-gtk' 'gconf' 'gnome-icon-theme'
          'gnome-menus' 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring'
-         'librsvg' 'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow'
+         'librsvg' 'networkmanager' 'muffin' 'python2-dbus' 'python2-pillow'
          'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk'
          'cinnamon-control-center' 'cinnamon-screensaver' 'libgnomekbd'
          'network-manager-applet' 'nemo' 'polkit-gnome')
@@ -25,11 +25,13 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/
         "cinnamon-gstreamer1.patch"
         "keyboard_applet.patch"
         "input_keybindings.patch"
+        "gtk3-lock-dialog.patch"
         "org.archlinux.pkexec.cinnamon-settings-users.policy")
 sha256sums=('447f65ceb22a40717656d3d708d16ad450802298d783b23004b6e8d3c8d7da85'
             '2e10ba71fd9ba40afd7e9492b2fc0d5bcc27874bcde543cfd8a47ad20c52354a'
             '6acb07393105ddced8a4c3c869a596350d1a7d81a808ca5307d2ad770653a9d3'
             'e28c40eb844105154fa6106f5b4de3151a22805b3a7b2f84be9ea6c15cec3de6'
+            'e10dd01201b9274b45a6c94319d4eb1e9ff800e63f10a3d5e42fc9f3a87e337c'
             '371beac9e55d36f7629d2fc5cb40d6a3e6c0f4aac014f6fefdcd6743b5194b23')
 
 prepare() {
@@ -48,9 +50,11 @@ prepare() {
   # Port to GStreamer 1.0. Also backports some recorder bugfixes
   patch -Np1 -i ../cinnamon-gstreamer1.patch
 
+  # Port Lock screen dialog to GTK+ 3
+  patch -Np1 -i ../gtk3-lock-dialog.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
+  sed -i 's/cinnamon-fallback-mount-helper;/polkit-gnome-authentication-agent-1;/' 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
@@ -87,10 +91,6 @@ package() {
   cd ${srcdir}/Cinnamon*
   make DESTDIR="${pkgdir}" install
 
-  # 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" \
                  "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.cinnamon-settings-users.policy"
diff --git a/community/cinnamon/gtk3-lock-dialog.patch b/community/cinnamon/gtk3-lock-dialog.patch
new file mode 100644
index 000000000..36f0d4469
--- /dev/null
+++ b/community/cinnamon/gtk3-lock-dialog.patch
@@ -0,0 +1,418 @@
+commit 7bb5af86b404d3e89f92019dba224e6fe258f7ea
+Author: Balló György <ballogyor@gmail.com>
+Date:   Sun Jan 5 16:54:41 2014 +0100
+
+    Port Lock screen dialog to GTK+ 3
+
+diff --git a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade
+deleted file mode 100644
+index a4200f9..0000000
+--- a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade
++++ /dev/null
+@@ -1,165 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<glade-interface>
+-  <!-- interface-requires gtk+ 2.24 -->
+-  <!-- interface-naming-policy project-wide -->
+-  <widget class="GtkDialog" id="main_dialog">
+-    <property name="can_focus">False</property>
+-    <property name="border_width">6</property>
+-    <property name="type_hint">dialog</property>
+-    <child internal-child="vbox">
+-      <widget class="GtkVBox" id="dialog-vbox1">
+-        <property name="visible">True</property>
+-        <property name="can_focus">False</property>
+-        <property name="spacing">6</property>
+-        <child internal-child="action_area">
+-          <widget class="GtkHButtonBox" id="dialog-action_area1">
+-            <property name="visible">True</property>
+-            <property name="can_focus">False</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <widget class="GtkButton" id="button_cancel">
+-                <property name="label">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_action_appearance">False</property>
+-                <property name="use_stock">True</property>
+-              </widget>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <widget class="GtkButton" id="button_ok">
+-                <property name="label">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_action_appearance">False</property>
+-                <property name="use_stock">True</property>
+-              </widget>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </widget>
+-          <packing>
+-            <property name="expand">False</property>
+-            <property name="fill">True</property>
+-            <property name="padding">3</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
+-          </packing>
+-        </child>
+-        <child>
+-          <widget class="GtkImage" id="image_face">
+-            <property name="visible">True</property>
+-            <property name="can_focus">False</property>
+-            <property name="stock">gtk-missing-image</property>
+-          </widget>
+-          <packing>
+-            <property name="expand">False</property>
+-            <property name="fill">True</property>
+-            <property name="padding">3</property>
+-            <property name="position">1</property>
+-          </packing>
+-        </child>
+-        <child>
+-          <widget class="GtkLabel" id="label_description">
+-            <property name="visible">True</property>
+-            <property name="can_focus">False</property>
+-            <property name="label" translatable="yes">label</property>
+-          </widget>
+-          <packing>
+-            <property name="expand">False</property>
+-            <property name="fill">True</property>
+-            <property name="padding">3</property>
+-            <property name="position">2</property>
+-          </packing>
+-        </child>
+-        <child>
+-          <widget class="GtkHBox" id="hbox1">
+-            <property name="visible">True</property>
+-            <property name="can_focus">False</property>
+-            <child>
+-              <widget class="GtkLabel" id="label_away_message">
+-                <property name="visible">True</property>
+-                <property name="can_focus">False</property>
+-                <property name="label" translatable="yes">label</property>
+-              </widget>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">True</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <widget class="GtkHBox" id="hbox3">
+-                <property name="visible">True</property>
+-                <property name="can_focus">False</property>
+-                <child>
+-                  <widget class="GtkLabel" id="label1">
+-                    <property name="visible">True</property>
+-                    <property name="can_focus">False</property>
+-                    <property name="label" translatable="yes">&lt;b&gt;"&lt;/b&gt;</property>
+-                    <property name="use_markup">True</property>
+-                  </widget>
+-                  <packing>
+-                    <property name="expand">False</property>
+-                    <property name="fill">True</property>
+-                    <property name="position">0</property>
+-                  </packing>
+-                </child>
+-                <child>
+-                  <widget class="GtkEntry" id="entry_away_message">
+-                    <property name="visible">True</property>
+-                    <property name="can_focus">True</property>
+-                    <property name="invisible_char">●</property>
+-                    <property name="invisible_char_set">True</property>
+-                    <property name="primary_icon_activatable">False</property>
+-                    <property name="secondary_icon_activatable">False</property>
+-                    <property name="primary_icon_sensitive">True</property>
+-                    <property name="secondary_icon_sensitive">True</property>
+-                  </widget>
+-                  <packing>
+-                    <property name="expand">True</property>
+-                    <property name="fill">True</property>
+-                    <property name="position">1</property>
+-                  </packing>
+-                </child>
+-                <child>
+-                  <widget class="GtkLabel" id="label2">
+-                    <property name="visible">True</property>
+-                    <property name="can_focus">False</property>
+-                    <property name="label" translatable="yes">&lt;b&gt;"&lt;/b&gt;</property>
+-                    <property name="use_markup">True</property>
+-                  </widget>
+-                  <packing>
+-                    <property name="expand">False</property>
+-                    <property name="fill">True</property>
+-                    <property name="position">2</property>
+-                  </packing>
+-                </child>
+-              </widget>
+-              <packing>
+-                <property name="expand">True</property>
+-                <property name="fill">True</property>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </widget>
+-          <packing>
+-            <property name="expand">True</property>
+-            <property name="fill">True</property>
+-            <property name="padding">3</property>
+-            <property name="position">3</property>
+-          </packing>
+-        </child>
+-      </widget>
+-    </child>
+-  </widget>
+-</glade-interface>
+diff --git a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
+index f6f3ad1..72cdf4f 100755
+--- a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
++++ b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
+@@ -3,8 +3,7 @@
+ import sys
+ import os
+ import gettext
+-import gtk
+-import gtk.glade   
++from gi.repository import Gtk
+ import pwd
+ import socket
+ 
+@@ -25,32 +24,32 @@ class MainWindow:
+         if real_name == "":
+             real_name = username        
+ 
+-        gladefile = "/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade"
+-        self.wTree = gtk.glade.XML(gladefile, "main_dialog")        
++        self.builder = Gtk.Builder()
++        self.builder.add_from_file("/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui")
+         
+-        self.window = self.wTree.get_widget("main_dialog")        
+-        self.button_cancel = self.wTree.get_widget("button_cancel")
+-        self.button_ok = self.wTree.get_widget("button_ok")                        
+-        self.entry = self.wTree.get_widget("entry_away_message")
+-        self.image = self.wTree.get_widget("image_face")
++        self.window = self.builder.get_object("main_dialog")
++        self.button_cancel = self.builder.get_object("button_cancel")
++        self.button_ok = self.builder.get_object("button_ok")
++        self.entry = self.builder.get_object("entry_away_message")
++        self.image = self.builder.get_object("image_face")
+                     
+         self.window.set_title(_("Lock screen"))
+         self.window.set_icon_from_file("/usr/lib/cinnamon-settings/data/icons/screensaver.svg")
+                 
+-        self.wTree.get_widget("label_description").set_markup("<i>%s</i>" % _("Please type an away message for the lock screen"))
+-        self.wTree.get_widget("label_away_message").set_markup("<b>%s: </b>" % real_name)        
++        self.builder.get_object("label_description").set_markup("<i>%s</i>" % _("Please type an away message for the lock screen"))
++        self.builder.get_object("label_away_message").set_markup("<b>%s: </b>" % real_name)
+         
+         if os.path.exists("%s/.face" % home_dir):
+             self.image.set_from_file("%s/.face" % home_dir)
+         else:
+             self.image.set_from_file("/usr/share/pixmaps/nobody.png")
+         
+-        self.window.connect("destroy", gtk.main_quit)
+-        self.button_cancel.connect("clicked", gtk.main_quit)
++        self.window.connect("destroy", Gtk.main_quit)
++        self.button_cancel.connect("clicked", Gtk.main_quit)
+         self.button_ok.connect('clicked', self.lock_screen)
+         self.entry.connect('activate', self.lock_screen)
+         
+-        self.wTree.get_widget("dialog-action_area1").set_focus_chain((self.button_ok, self.button_cancel))
++        self.builder.get_object("dialog-action_area1").set_focus_chain((self.button_ok, self.button_cancel))
+           
+         self.window.show()                    
+         
+@@ -60,8 +59,8 @@ class MainWindow:
+             os.system("cinnamon-screensaver-command --lock --away-message \"%s\" &" % self.entry.get_text())
+         else:
+             os.system("cinnamon-screensaver-command --lock &")
+-        gtk.main_quit()
++        Gtk.main_quit()
+    
+ if __name__ == "__main__":    
+     MainWindow()
+-    gtk.main()
++    Gtk.main()
+diff --git a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui
+new file mode 100644
+index 0000000..30700b9
+--- /dev/null
++++ b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui
+@@ -0,0 +1,165 @@
++<?xml version="1.0"?>
++<interface>
++  <!-- interface-requires gtk+ 2.24 -->
++  <!-- interface-naming-policy project-wide -->
++  <object class="GtkDialog" id="main_dialog">
++    <property name="can_focus">False</property>
++    <property name="border_width">6</property>
++    <property name="type_hint">dialog</property>
++    <child internal-child="vbox">
++      <object class="GtkVBox" id="dialog-vbox1">
++        <property name="visible">True</property>
++        <property name="can_focus">False</property>
++        <property name="spacing">6</property>
++        <child internal-child="action_area">
++          <object class="GtkHButtonBox" id="dialog-action_area1">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="button_cancel">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_action_appearance">False</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="button_ok">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_action_appearance">False</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
++            <property name="padding">3</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkImage" id="image_face">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="stock">gtk-missing-image</property>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
++            <property name="padding">3</property>
++            <property name="position">1</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkLabel" id="label_description">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes">label</property>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
++            <property name="padding">3</property>
++            <property name="position">2</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkHBox" id="hbox1">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <child>
++              <object class="GtkLabel" id="label_away_message">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">label</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkHBox" id="hbox3">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <child>
++                  <object class="GtkLabel" id="label1">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">&lt;b&gt;"&lt;/b&gt;</property>
++                    <property name="use_markup">True</property>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
++                    <property name="position">0</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkEntry" id="entry_away_message">
++                    <property name="visible">True</property>
++                    <property name="can_focus">True</property>
++                    <property name="invisible_char">&#x25CF;</property>
++                    <property name="invisible_char_set">True</property>
++                    <property name="primary_icon_activatable">False</property>
++                    <property name="secondary_icon_activatable">False</property>
++                    <property name="primary_icon_sensitive">True</property>
++                    <property name="secondary_icon_sensitive">True</property>
++                  </object>
++                  <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
++                    <property name="position">1</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkLabel" id="label2">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">&lt;b&gt;"&lt;/b&gt;</property>
++                    <property name="use_markup">True</property>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
++                    <property name="position">2</property>
++                  </packing>
++                </child>
++              </object>
++              <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">True</property>
++            <property name="fill">True</property>
++            <property name="padding">3</property>
++            <property name="position">3</property>
++          </packing>
++        </child>
++      </object>
++    </child>
++  </object>
++</interface>
diff --git a/community/clamz/PKGBUILD b/community/clamz/PKGBUILD
index 6cab64df8..8c3e452d3 100644
--- a/community/clamz/PKGBUILD
+++ b/community/clamz/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 57215 2011-10-24 18:32:20Z lfleischer $
+# $Id: PKGBUILD 103908 2014-01-13 17:16:39Z andyrtr $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=clamz
 pkgver=0.5
-pkgrel=1.1
+pkgrel=2
 pkgdesc="Command-line program to download MP3 files from Amazon.com's music store."
 arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/clamz/'
diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD
index ff7aafaca..f853bab21 100644
--- a/community/clanlib/PKGBUILD
+++ b/community/clanlib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 99713 2013-10-30 23:11:42Z allan $
+# $Id: PKGBUILD 104636 2014-01-23 16:30:34Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=clanlib
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=1
 pkgdesc="A multi-platform game development library."
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,8 +10,8 @@ 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')
-source=(clanlib-${pkgver}.tar.gz::https://github.com/sphair/ClanLib/archive/3.0.0.tar.gz)
-md5sums=('bfbfd7cc89be12f02c3994d4fcdd49f3')
+source=(http://www.clanlib.org/download/releases-3.0/ClanLib-${pkgver}.tgz)
+md5sums=('29f2ce542019c6d5d8793cdf4811e4f9')
 
 build() { 
 	cd ${srcdir}/ClanLib-${pkgver}
diff --git a/community/clearsilver/PKGBUILD b/community/clearsilver/PKGBUILD
index 3b9f09e1e..270acf835 100644
--- a/community/clearsilver/PKGBUILD
+++ b/community/clearsilver/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 102895 2013-12-23 15:16:31Z spupykin $
+# $Id: PKGBUILD 104882 2014-01-28 03:34:09Z td123 $
 # 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=12
+pkgrel=13
 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/cmus/PKGBUILD b/community/cmus/PKGBUILD
index b611c8908..6a17da8dc 100644
--- a/community/cmus/PKGBUILD
+++ b/community/cmus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97815 2013-09-30 02:36:29Z xyne $
+# $Id: PKGBUILD 104366 2014-01-19 16:29:30Z bpiotrowski $
 # Maintainer: Xyne <ca dot archlinux at xyne, backwards>
 # Contributor:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=cmus
 pkgver=2.5.0
-pkgrel=4
+pkgrel=5
 pkgdesc='Very feature-rich ncurses-based music player'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cmus.sourceforge.net/"
diff --git a/community/codeblocks/PKGBUILD b/community/codeblocks/PKGBUILD
index fe480af51..f945efbd2 100644
--- a/community/codeblocks/PKGBUILD
+++ b/community/codeblocks/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103157 2013-12-28 06:25:03Z bpiotrowski $
+# $Id: PKGBUILD 103790 2014-01-11 20:08:22Z eric $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Robert Hollencamp <rhollencamp@gmail.com>
 # Contributor: Daniel J Griffiths <griffithsdj@inbox.com>
@@ -6,13 +6,13 @@
 
 pkgname=codeblocks
 pkgver=13.12
-pkgrel=1
+pkgrel=2
 pkgdesc='Open source and cross-platform C/C++ IDE'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.codeblocks.org'
 license=('GPL3')
 depends=('boost-libs' 'bzip2' 'desktop-file-utils' 'gamin' 'gtk-update-icon-cache'
-         'hicolor-icon-theme' 'hunspell' 'shared-mime-info' 'wxgtk' 'libsm')
+         'hicolor-icon-theme' 'hunspell' 'shared-mime-info' 'wxgtk2.8' 'libsm')
 makedepends=('boost' 'zip')
 install=codeblocks.install
 source=(http://download.berlios.de/$pkgname/${pkgname}_${pkgver}-1.tar.gz)
@@ -20,6 +20,7 @@ md5sums=('4b450f620d9f1875ecf6882ab3c11402')
 
 build() {
   cd $pkgname-$pkgver
+  export WX_CONFIG_PATH=/usr/bin/wx-config-2.8
   ./configure --prefix=/usr --with-contrib-plugins=all
   make 
 }
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index f9328104c..133830cd5 100644
--- a/community/collectd/PKGBUILD
+++ b/community/collectd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99715 2013-10-30 23:12:24Z allan $
+# $Id: PKGBUILD 103909 2014-01-13 17:16:40Z andyrtr $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Gerhard Brauer <gerhard.brauer@web.de>
 
 pkgname=collectd
 pkgver=5.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Daemon which collects system performance statistics periodically'
 url='http://collectd.org/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -61,7 +61,6 @@ build() {
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--sbindir=/usr/bin \
-		--disable-static \
 		--with-python=/usr/bin/python2
 	make all
 }
diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD
index 4bf3244cc..1edfee031 100644
--- a/community/connman/PKGBUILD
+++ b/community/connman/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 102949 2013-12-24 22:58:06Z dwallace $
+#$Id: PKGBUILD 105262 2014-02-03 16:31:33Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com>
 
 pkgname=connman
-pkgver=1.20
+pkgver=1.21
 pkgrel=1
 pkgdesc="Wireless LAN network manager"
 url="http://connman.net/"
@@ -15,9 +15,9 @@ optdepends=('bluez: Support for Bluetooth devices'
             'wpa_supplicant: For WiFi devices'
             'pptpclient: for ppp support')
 makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn' 'ppp')
-source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.xz"
         'allow_group_network.diff')
-md5sums=('5e4c7b61321994a772ddccbb5835684d'
+md5sums=('483633162b819c8b99fec970f92e311d'
          'a8d22ee089fb0ed725130d16ad393047')
 
 prepare(){
diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD
index 610f58c41..a653f603c 100644
--- a/community/converseen/PKGBUILD
+++ b/community/converseen/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102097 2013-12-05 08:05:48Z giovanni $
+# $Id: PKGBUILD 105507 2014-02-09 12:50:32Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: archtux <antonio.arias99999 at gmail.com>
 
 pkgname=converseen
-pkgver=0.6.6
+pkgver=0.6.7
 pkgrel=1
 pkgdesc="The batch image converter and resizer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -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=('500c5aedec23a13e119ad0ece1ebca1d')
+md5sums=('325fbb2dafeae826efe1c2b8fdca823c')
 
 build() {
   cd "${srcdir}"
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index 28fb38e4b..4f834922d 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 98518 2013-10-12 16:47:42Z jelle $
+# $Id: PKGBUILD 103687 2014-01-09 16:14:18Z jelle $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=cppcheck
-pkgver=1.62.1
-pkgrel=1
+pkgver=1.63.1
+pkgrel=2
 pkgdesc="A tool for static C/C++ code analysis"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cppcheck.wiki.sourceforge.net/"
@@ -11,18 +11,17 @@ license=('GPL')
 depends=('qt5-base')
 makedepends=('docbook-xsl')
 source=(https://github.com/danmar/cppcheck/archive/${pkgver}.tar.gz)
-sha1sums=('2494a603bd505cc6ae5bd67286410a66cf7996b2')
-
+sha1sums=('19ad7251603356a82dc75a836dfad9629a3d12a0')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
-   make
+   make CFGDIR=/usr/share/cppcheck/cfg
    make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-1.78.1/manpages/docbook.xsl man
 
    cd gui
    export HAVE_RULES=yes 
    qmake
-   make
+   make 
 }
 
 package() {
@@ -32,4 +31,8 @@ package() {
    install -D -p -m 644 cppcheck.1 "${pkgdir}"/usr/share/man/man1/cppcheck.1
 
    install -m755 gui/cppcheck-gui "${pkgdir}"/usr/bin
+
+   for _f in cfg/*; do
+     install -D -p -m 644 $_f "${pkgdir}"/usr/share/"${pkgname}"/$_f
+   done
 }
diff --git a/community/cuetools/PKGBUILD b/community/cuetools/PKGBUILD
index 0b2f938e0..09cb60a01 100644
--- a/community/cuetools/PKGBUILD
+++ b/community/cuetools/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 98850 2013-10-20 09:41:43Z stativ $
+# $Id: PKGBUILD 103244 2013-12-31 11:13:25Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=cuetools
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Cue and toc file parsers and utilities"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/svend/cuetools"
@@ -10,14 +10,16 @@ url="https://github.com/svend/cuetools"
 license=('GPL')
 depends=('glibc')
 source=("https://github.com/svend/cuetools/archive/${pkgver}.tar.gz"
-	"fix_build_with_automake-1.12.diff")
+        "cuetag-fix_spaces.diff" "fix_build_with_automake-1.12.diff")
 md5sums=('4492dae2b3f9e077f6455a1f1cddef3b'
+         '60f4aba26e529e48dbedd2adef917117'
          '67a3b32711d1a1f508be6ed0f1bdadf3')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   patch -Np1 < "$srcdir/fix_build_with_automake-1.12.diff" || true
+  patch -Np1 < "$srcdir/cuetag-fix_spaces.diff" || true
 
   aclocal
   autoheader
diff --git a/community/cuetools/cuetag-fix_spaces.diff b/community/cuetools/cuetag-fix_spaces.diff
new file mode 100644
index 000000000..f240e9d37
--- /dev/null
+++ b/community/cuetools/cuetag-fix_spaces.diff
@@ -0,0 +1,46 @@
+From 21ee6cc40f02693928efbc4f3beeb681950c16b5 Mon Sep 17 00:00:00 2001
+From: Svend Sorensen <svend@ciffer.net>
+Date: Sat, 23 Nov 2013 17:23:01 -0800
+Subject: [PATCH] cuetag: Fix handling of spaces in file names
+
+Fixes #14
+---
+ src/tools/cuetag.sh | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/tools/cuetag.sh b/src/tools/cuetag.sh
+index f26fa20..448920f 100755
+--- a/src/tools/cuetag.sh
++++ b/src/tools/cuetag.sh
+@@ -182,16 +182,15 @@ main()
+ 	ntrack=$(cueprint -d '%N' "$cue_file")
+ 	trackno=1
+ 
+-	FILES= FIELDS=
++	NUM_FILES=0 FIELDS=
+ 	for arg in "$@"; do
+ 		case "$arg" in
+-			*.*) FILES="$FILES $arg";;
++			*.*) NUM_FILES=$(expr $NUM_FILES + 1);;
+ 			*) FIELDS="$FIELDS $arg";;
+ 		esac
+ 	done
+ 
+-	set -- $FILES
+-	if [ $# -ne $ntrack ]; then
++	if [ $NUM_FILES -ne $ntrack ]; then
+ 		echo "warning: number of files does not match number of tracks"
+ 	fi
+ 
+@@ -209,7 +208,7 @@ main()
+ 		*.[Tt][Xx][Tt])
+ 			vorbis $trackno "$file"
+ 			;;
+-		*)
++		*.*)
+ 			echo "$file: uknown file type"
+ 			;;
+ 		esac
+-- 
+1.8.5.1
+
diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD
index ac6ae0c6b..3171442d3 100644
--- a/community/cython/PKGBUILD
+++ b/community/cython/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 98721 2013-10-17 12:42:56Z spupykin $
+# $Id: PKGBUILD 105633 2014-02-12 12:40:59Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Igor Scabini <furester @ gmail.com>
 
 pkgname=('cython' 'cython2')
 pkgbase=cython
-pkgver=0.19.2
+pkgver=0.20.1
 pkgrel=1
 pkgdesc="C-Extensions for Python "
 arch=(i686 x86_64 'mips64el')
@@ -12,14 +12,10 @@ url="http://www.cython.org"
 license=('APACHE')
 makedepends=('python-setuptools' 'python2-setuptools')
 source=("http://cython.org/release/Cython-$pkgver.tar.gz")
-md5sums=('4af1218346510b464c0a6bf15500d0e2')
-
-build() {
-  true
-}
+md5sums=('52431696c64e618036537c4d9aa79d99')
 
 package_cython() {
-  depends=('python')
+  depends=('python' 'python-setuptools')
 
   cd $srcdir/Cython-$pkgver
   python setup.py install --root=$pkgdir
@@ -28,7 +24,7 @@ package_cython() {
 }
 
 package_cython2() {
-  depends=('python2')
+  depends=('python2' 'python2-setuptools')
 
   cd $srcdir/Cython-$pkgver
   python2 setup.py install --root=$pkgdir
diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD
index 9776702f8..e31faa832 100644
--- a/community/darkstat/PKGBUILD
+++ b/community/darkstat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 95671 2013-08-15 12:15:55Z spupykin $
+# $Id: PKGBUILD 104831 2014-01-27 09:59:59Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=darkstat
-pkgver=3.0.716
-pkgrel=2
+pkgver=3.0.718
+pkgrel=1
 pkgdesc="Network statistics gatherer (packet sniffer)"
 url="http://dmr.ath.cx/net/darkstat/"
 license=("GPL")
@@ -14,7 +14,7 @@ source=(http://dmr.ath.cx/net/darkstat/darkstat-$pkgver.tar.bz2
 	darkstat.service
 	darkstat.conf)
 install=darkstat.install
-md5sums=('f334d3b8acd45cd06b5929a249abebe2'
+md5sums=('1fb31ac01d4689493c917fa622a002e7'
          'e28c56657502ce3e62c1fc6bf5ce59f7'
          'aa9a9effd1e8f08860afcd6439fc94c5')
 options=(!makeflags !distcc)
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index e3181d4ed..143fdfcb7 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 103146 2013-12-27 15:54:52Z spupykin $
+# $Id: PKGBUILD 105573 2014-02-10 13:31:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Christian Himpel <chressie at gmail dot com>
 # Contributor: Johannes Hanika <hanatos at gmail dot com>
 
 pkgname=darktable
-pkgver=1.4
+pkgver=1.4.1
 _pkgver=1.4
 pkgrel=1
 pkgdesc="Utility to organize and develop raw images"
@@ -18,7 +18,7 @@ makedepends=('intltool>=0.40' 'cmake' 'librsvg')
 optdepends=('librsvg')
 install=darktable.install
 source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz)
-md5sums=('896416931ded4579f528cd11edad470c')
+md5sums=('78252618bb7b1df30109ef5484d46f3c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/dart/PKGBUILD b/community/dart/PKGBUILD
index d4ad316cc..f353194ca 100644
--- a/community/dart/PKGBUILD
+++ b/community/dart/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 100999 2013-11-14 15:05:53Z arodseth $
+# $Id: PKGBUILD 105737 2014-02-14 17:58:11Z 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>
@@ -6,7 +6,7 @@
 # Contributor: Julien Nicoulaud <julien.nicoulaud@gmail.com>
 
 pkgname=dart
-pkgver=1.0
+pkgver=1.1.3
 pkgrel=1
 pkgdesc='The dart programming language SDK'
 arch=('x86_64' 'i686')
@@ -17,14 +17,14 @@ makedepends=('setconf')
 options=('!strip')
 
 if [[ $CARCH == x86_64 ]]; then
-  source=("http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-x64-release.zip"
-          "license.html::https://code.google.com/intl/no/google_bsd_license.html")
-  sha256sums=('9bc14660399c3570fddd262eb9aa11b3e6e19b7a3c547d3b10d60ad905c52c9b'
+  source=("$pkgname-$pkgver-64.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-x64-release.zip"
+          'license.html::https://code.google.com/intl/no/google_bsd_license.html')
+  sha256sums=('5019225dd58ffba9ae726f100993345e2801f7b59f6b49edbb5020ec3621e67a'
             'de16a5ac94310b1bdfc27a2a6d620531172bb31af894caeced37af41fb8e2650')
 else
-  source=("http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-ia32-release.zip"
-          "license.html::https://code.google.com/intl/no/google_bsd_license.html")
-  sha256sums=('131afed9a220b2035375aee71e6b791248e6de51ee2612a21be3f6797e5bbfe6'
+  source=("$pkgname-$pkgver-32.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-ia32-release.zip"
+          'license.html::https://code.google.com/intl/no/google_bsd_license.html')
+  sha256sums=('de33b20167727d50903c1cf33d86320472d728f93641ec37a541a233e377acc4'
             'de16a5ac94310b1bdfc27a2a6d620531172bb31af894caeced37af41fb8e2650')
 fi
 
diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD
index 388b6a5db..10925c65a 100644
--- a/community/dbmail/PKGBUILD
+++ b/community/dbmail/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102778 2013-12-19 17:41:26Z spupykin $
+# $Id: PKGBUILD 105591 2014-02-10 18:05:32Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com>
 
 pkgname=dbmail
-pkgver=3.1.8
+pkgver=3.1.10
 pkgrel=2
 pkgdesc="Fast and scalable sql based mail services"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD
index 817547e0b..bf8e3e027 100644
--- a/community/deadbeef/PKGBUILD
+++ b/community/deadbeef/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 103173 2013-12-28 18:20:21Z lfleischer $
+# $Id: PKGBUILD 105335 2014-02-05 13:36:53Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
 
 pkgname=deadbeef
-pkgver=0.6.0
+pkgver=0.6.1
 pkgrel=1
 pkgdesc='A GTK+ audio player for GNU/Linux.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,8 @@ url='http://deadbeef.sourceforge.net'
 license=('GPL2')
 depends=('gtk3' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb'
-             'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip' 'libsamplerate')
+             'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip' 'libsamplerate'
+             'ffmpeg')
 [ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
 optdepends=('libsamplerate: for Resampler plugin'
             'libvorbis: for Ogg Vorbis playback'
@@ -28,10 +29,11 @@ optdepends=('libsamplerate: for Resampler plugin'
             'pulseaudio: for PulseAudio output plugin'
             'libx11: for global hotkeys plugin'
             'zlib: for Audio Overload plugin'
-            'libzip: for vfs_zip plugin')
+            'libzip: for vfs_zip plugin'
+            'ffmpeg: for ffmpeg plugin')
 install='deadbeef.install'
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('f1bbb1a0164ed7bcba9c0c8cd1dddcb5')
+md5sums=('dab446bde519ae95581885ff63a418c7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/deadbeef/deadbeef.install b/community/deadbeef/deadbeef.install
index fcdbf15fb..eaf1b9a69 100644
--- a/community/deadbeef/deadbeef.install
+++ b/community/deadbeef/deadbeef.install
@@ -7,11 +7,6 @@ post_install() {
 
 post_upgrade() {
   post_install
-
-  cat <<EOF
-==> ffmpeg support was disabled in this deadbeef release due to
-==> incompatibilities with ffmpeg 0.11. It might be re-introduced soon.
-EOF
 }
 
 post_remove() {
diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD
index b2dfe16cd..a461cfc56 100644
--- a/community/devil/PKGBUILD
+++ b/community/devil/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99728 2013-10-30 23:21:11Z allan $
+# $Id: PKGBUILD 103318 2014-01-03 10:52:34Z bpiotrowski $
 # Maintainer: Laurent Carlier <lordheavym@gmail.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: TheHoff <forums>
 
 pkgname=devil
 pkgver=1.7.8
-pkgrel=17
+pkgrel=18
 pkgdesc="Library for reading several different image formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openil.sourceforge.net/"
diff --git a/community/dispcalgui/PKGBUILD b/community/dispcalgui/PKGBUILD
index 9d745438d..575707a27 100644
--- a/community/dispcalgui/PKGBUILD
+++ b/community/dispcalgui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99412 2013-10-28 11:55:41Z tredaelli $
+# $Id: PKGBUILD 105728 2014-02-14 14:41:06Z 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.5.3.1
+pkgver=1.7.5.7
 pkgrel=1
 pkgdesc="A GUI frontend for several utilities from the open source color management system Argyll CMS"
 arch=('i686' 'x86_64')
@@ -14,11 +14,14 @@ makedepends=('libx11' 'libxrandr' 'libxinerama' 'libxxf86vm' 'python2-setuptools
 depends=('argyllcms' 'wxpython' 'hicolor-icon-theme' 'desktop-file-utils' 'python2-numpy')
 optdepends=('gksu: For running as root')
 install=${pkgname}.install
-source=("http://downloads.sourceforge.net/project/dispcalgui/release/${pkgver}/dispcalGUI-${pkgver}.tar.gz")
-md5sums=('1b7542ecee8f39a49b90197613a46a73')
+source=("http://downloads.sourceforge.net/project/dispcalgui/release/${pkgver}/dispcalGUI-${pkgver}.tar.gz"
+        dispcalGUI-1.5.3.1-wxgtk3.patch)
+md5sums=('7a66051d244f1b734448a865b50fae01'
+         'b8001e5cbbb849f9ba95e0ef9fb1d073')
 
 prepare() {
   cd "${srcdir}"/dispcalGUI-${pkgver}
+  patch -p1 -i "$srcdir"/dispcalGUI-1.5.3.1-wxgtk3.patch
   find . -name "*.py" -exec sed -i 's!/usr/bin/env python!/usr/bin/env python2!g' {} +
 }
 
diff --git a/community/dispcalgui/dispcalGUI-1.5.3.1-wxgtk3.patch b/community/dispcalgui/dispcalGUI-1.5.3.1-wxgtk3.patch
new file mode 100644
index 000000000..e5c556031
--- /dev/null
+++ b/community/dispcalgui/dispcalGUI-1.5.3.1-wxgtk3.patch
@@ -0,0 +1,16 @@
+--- a/dispcalGUI/dispcalGUI.py
++++ b/dispcalGUI/dispcalGUI.py
+@@ -1544,9 +1544,10 @@
+ 		for lstr, lcode in llist:
+ 			menuitem = languages.Append(-1, "&" + lstr, kind=wx.ITEM_RADIO)
+ 			if (lcode.upper().replace("EN", "US") in flagart.catalog):
+-				menuitem.SetBitmap(
+-					flagart.catalog[lcode.upper().replace("EN", 
+-														  "US")].getBitmap())
++				bitmap = flagart.catalog[lcode.upper().replace("EN",
++															   "US")].getBitmap()
++				if menuitem.GetKind() == wx.ITEM_NORMAL:
++					menuitem.SetBitmap(bitmap)
+ 			if lang.getcode() == lcode:
+ 				menuitem.Check()
+ 				font = menuitem.Font
diff --git a/community/docker/PKGBUILD b/community/docker/PKGBUILD
index 9215782e4..d8cd387e3 100644
--- a/community/docker/PKGBUILD
+++ b/community/docker/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 102652 2013-12-17 09:06:19Z seblu $
+# $Id: PKGBUILD 105357 2014-02-05 21:59:10Z seblu $
 # Maintainer: Sébastien "Seblu" Luttringer
 
 pkgname=docker
-pkgver=0.7.2
+_truever=0.8.0
+pkgver=${_truever%.*}
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -10,11 +11,12 @@ arch=('x86_64')
 url='http://www.docker.io/'
 license=('Apache')
 depends=('bridge-utils' 'iproute2' 'device-mapper' 'lxc' 'sqlite' 'systemd')
-makedepends=('git' 'go')
+makedepends=('git' 'go' 'btrfs-progs')
+optdepends=('btrfs-progs: btrfs backend support')
 # don't strip binaries! A sha1 is used to check binary consistency.
 options=('!strip')
 install=$pkgname.install
-source=("git+https://github.com/dotcloud/docker.git#tag=v$pkgver")
+source=("git+https://github.com/dotcloud/docker.git#tag=v$_truever")
 md5sums=('SKIP')
 # magic harcoded path
 _magic=src/github.com/dotcloud
@@ -38,8 +40,8 @@ check() {
 
 package() {
   cd "$_magic/docker"
-  install -Dm755 "bundles/$pkgver/dynbinary/docker-$pkgver" "$pkgdir/usr/bin/docker"
-  install -Dm755 "bundles/$pkgver/dynbinary/dockerinit-$pkgver" "$pkgdir/usr/lib/docker/dockerinit"
+  install -Dm755 "bundles/$_truever/dynbinary/docker-$_truever" "$pkgdir/usr/bin/docker"
+  install -Dm755 "bundles/$_truever/dynbinary/dockerinit-$_truever" "$pkgdir/usr/lib/docker/dockerinit"
   # completion
   install -Dm644 "contrib/completion/bash/docker" "$pkgdir/usr/share/bash-completion/completions/docker"
   install -Dm644 "contrib/completion/zsh/_docker" "$pkgdir/usr/share/zsh/site-functions/_docker"
diff --git a/community/docker/docker.service b/community/docker/docker.service
deleted file mode 100644
index b96d19ddb..000000000
--- a/community/docker/docker.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Docker Application Container Engine
-Documentation=http://docs.docker.io
-After=network.target
-
-[Service]
-ExecStartPre=/usr/bin/mount --make-rprivate /
-ExecStart=/usr/bin/docker -d
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/dolphin-emu/PKGBUILD b/community/dolphin-emu/PKGBUILD
index 1dbe03bb0..db96fd674 100644
--- a/community/dolphin-emu/PKGBUILD
+++ b/community/dolphin-emu/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=dolphin-emu
 pkgver=4.0.2
-pkgrel=1
+pkgrel=4
 epoch=1
 pkgdesc='A Gamecube / Wii / Triforce emulator'
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url='http://dolphin-emu.org'
 license=('GPL2')
 
 makedepends=('cmake' 'git' 'opencl-headers')
-depends=('bluez-libs' 'ffmpeg' 'glew' 'libao' 'miniupnpc' 'openal' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk2.9')
+depends=('bluez-libs' 'ffmpeg' 'glew' 'libao' 'miniupnpc' 'openal' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk')
 optdepends=('pulseaudio: PulseAudio backend')
 
 source=("${pkgname%-*}::git+https://code.google.com/p/dolphin-emu/#tag=${pkgver}"
diff --git a/community/dos2unix/PKGBUILD b/community/dos2unix/PKGBUILD
index 9de493d2e..ee7ee3070 100644
--- a/community/dos2unix/PKGBUILD
+++ b/community/dos2unix/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83060 2013-01-27 09:35:12Z bpiotrowski $
+# $Id: PKGBUILD 103260 2013-12-31 20:20:56Z jelle $
 # Maintainer:  Bartłomiej Piotrowski
 # Contributor: Renato Garcia <fgar.renatoATgmailDOTcom>
 # Contributor: Gerson E. Ruotolo <gersonruotolo@globo.com>
 
 pkgname=dos2unix
-pkgver=6.0.3
+pkgver=6.0.4
 pkgrel=1
 pkgdesc='Text file format converter'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('glibc')
 makedepends=('perl')
 conflicts=('hd2u')
 source=("http://waterlan.home.xs4all.nl/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('f5268c5b28a1983537210c72b3fd43f4aad17a8dacb6727b615b56dca2ef9a04')
+sha256sums=('66bd224d4a7fbe13a3b61aa7083b5ef74cf6448a3670606c669f46a84bb9b37a')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/dunst/PKGBUILD b/community/dunst/PKGBUILD
index c6cf9a28f..be3a98ef4 100644
--- a/community/dunst/PKGBUILD
+++ b/community/dunst/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 88586 2013-04-20 15:35:54Z dwallace $
+# $Id: PKGBUILD 103648 2014-01-08 18:46:24Z bgyorgy $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: feuri
 
 pkgname=dunst
 pkgver=1.0.0
-pkgrel=1
-pkgdesc="a dmenu-ish notification system "
+pkgrel=2
+pkgdesc="Customizable and lightweight notification-daemon"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://knopwob.github.com/dunst"
-license=(MIT)
+url="http://www.knopwob.org/dunst/"
+license=(BSD)
 depends=(libxinerama libxss libxdg-basedir pango)
-optdepends=("libnotify: notify-send"
-            "dbus: start dunst on demand")
-makedepends=(libnotify dbus 'perl')
+makedepends=(libnotify)
 provides=(notification-daemon)
-source=("${pkgname}-${pkgver}.tar.bz2::http://www.knopwob.org/public/dunst-release/$pkgname-$pkgver.tar.bz2")
+source=("http://www.knopwob.org/public/dunst-release/$pkgname-$pkgver.tar.bz2")
+md5sums=('bb5fee3cdf6ee30f7e11b7edd35e6723')
 
 build() {
 	make -C "$srcdir/$pkgname-$pkgver" X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
@@ -24,5 +23,5 @@ package() {
 	make -C "$pkgname-$pkgver" DESTDIR="${pkgdir}" PREFIX=/usr install
 	install -Dm644 "${srcdir}/$pkgname-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+
 # vim:set ts=2 sw=2 et:
-md5sums=('bb5fee3cdf6ee30f7e11b7edd35e6723')
diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD
index 537eb1c89..d756f7ab1 100644
--- a/community/duplicity/PKGBUILD
+++ b/community/duplicity/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 96719 2013-09-03 12:45:13Z lfleischer $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# $Id: PKGBUILD 105459 2014-02-08 15:39:11Z bgyorgy $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 
 pkgname=duplicity
-pkgver=0.6.22
-pkgrel=1
+pkgver=0.6.23
+pkgrel=3
 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.nongnu.org/duplicity/'
 license=('GPL')
-depends=('gnupg' 'librsync' 'ncftp' 'python2-paramiko')
+depends=('gnupg' 'librsync' 'ncftp' 'python2-paramiko' 'python2-lockfile')
 optdepends=('lftp: FTPS backend'
             'python2-boto: Amazon S3 backend'
             'python2-gobject: GIO backend'
@@ -18,9 +19,18 @@ optdepends=('lftp: FTPS backend'
             'python2-httplib2: Ubuntu One backend'
             'python2-oauthlib: Ubuntu One backend'
             'rsync: rsync backend')
-source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
-md5sums=('5b035359a6bb7b2f3f3b9829c6c071e1'
-         'SKIP')
+source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+        "gpg-encode.patch")
+md5sums=('ae0e84446bcf114735de1057ed53c977'
+         'SKIP'
+         '366555c73aeebf7f15f6f37ec65176ce')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Fix gpg encrypted backup (FS#38838, upstream revision 961, will be fixed in 0.6.24).
+  patch -Np0 -i ../gpg-encode.patch
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/duplicity/gpg-encode.patch b/community/duplicity/gpg-encode.patch
new file mode 100644
index 000000000..f9159a3ca
--- /dev/null
+++ b/community/duplicity/gpg-encode.patch
@@ -0,0 +1,216 @@
+=== modified file 'bin/duplicity'
+--- bin/duplicity	2014-01-21 21:04:27 +0000
++++ bin/duplicity	2014-02-05 02:57:13 +0000
+@@ -27,7 +27,7 @@
+ # Please send mail to me or the mailing list if you find bugs or have
+ # any suggestions.
+ 
+-import getpass, gzip, os, sys, time, types
++import gzip, os, sys, time, types
+ import traceback, platform, statvfs, resource, re
+ import threading
+ from datetime import datetime
+@@ -37,9 +37,6 @@
+ if os.path.exists(os.path.join(pwd, "../duplicity")):
+     sys.path.insert(0, os.path.abspath(os.path.join(pwd, "../.")))
+ 
+-import gettext
+-gettext.install('duplicity', codeset='utf8')
+-
+ from duplicity import log
+ log.setup()
+ 
+@@ -65,6 +62,13 @@
+ # If exit_val is not None, exit with given value at end.
+ exit_val = None
+ 
++def getpass_safe(message):
++    # getpass() in Python 2.x will call str() on our prompt.  So we can't pass
++    # in non-ascii characters.
++    import getpass, locale
++    message = message.encode(locale.getpreferredencoding(), 'replace')
++    return getpass.getpass(message)
++
+ def get_passphrase(n, action, for_signing = False):
+     """
+     Check to make sure passphrase is indeed needed, then get
+@@ -160,19 +164,19 @@
+                     if use_cache and globals.gpg_profile.signing_passphrase:
+                         pass1 = globals.gpg_profile.signing_passphrase
+                     else:
+-                        pass1 = getpass.getpass(_("GnuPG passphrase for signing key:")+" ")
++                        pass1 = getpass_safe(_("GnuPG passphrase for signing key:")+" ")
+                 else:
+                     if use_cache and globals.gpg_profile.passphrase:
+                         pass1 = globals.gpg_profile.passphrase
+                     else:
+-                        pass1 = getpass.getpass(_("GnuPG passphrase:")+" ")
++                        pass1 = getpass_safe(_("GnuPG passphrase:")+" ")
+ 
+             if n == 1:
+                 pass2 = pass1
+             elif for_signing:
+-                pass2 = getpass.getpass(_("Retype passphrase for signing key to confirm: "))
++                pass2 = getpass_safe(_("Retype passphrase for signing key to confirm: "))
+             else:
+-                pass2 = getpass.getpass(_("Retype passphrase to confirm: "))
++                pass2 = getpass_safe(_("Retype passphrase to confirm: "))
+ 
+             if not pass1 == pass2:
+                 print _("First and second passphrases do not match!  Please try again.")
+
+=== modified file 'bin/rdiffdir'
+--- bin/rdiffdir	2013-12-27 06:39:00 +0000
++++ bin/rdiffdir	2014-02-05 02:57:13 +0000
+@@ -27,9 +27,6 @@
+ 
+ import sys, getopt, gzip, os
+ 
+-import gettext
+-gettext.install('duplicity', codeset='utf8')
+-
+ from duplicity import diffdir
+ from duplicity import patchdir
+ from duplicity import log
+
+=== added directory 'testing/overrides'
+=== added file 'testing/overrides/gettext.py'
+--- testing/overrides/gettext.py	1970-01-01 00:00:00 +0000
++++ testing/overrides/gettext.py	2014-02-05 02:57:13 +0000
+@@ -0,0 +1,34 @@
++# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf8 -*-
++#
++# Copyright 2014 Michael Terry <mike@mterry.name>
++#
++# This file is part of duplicity.
++#
++# Duplicity 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.
++#
++# Duplicity 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 duplicity; if not, write to the Free Software Foundation,
++# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++
++# This is just a small override to the system gettext.py which allows us to
++# always return a string with fancy unicode characters, which will notify us
++# if we ever get a unicode->ascii translation by accident.
++
++def translation(*args, **kwargs):
++    class Translation:
++        ZWSP = u"​" # ZERO WIDTH SPACE, basically an invisible space separator
++        def install(self, **kwargs):
++            import __builtin__
++            __builtin__.__dict__['_'] = lambda x: x + self.ZWSP
++        def ungettext(self, one, more, n):
++            if n == 1: return one + self.ZWSP
++            else:      return more + self.ZWSP
++    return Translation()
+
+=== modified file 'testing/run-tests'
+--- testing/run-tests	2011-11-24 01:49:53 +0000
++++ testing/run-tests	2014-02-05 02:57:13 +0000
+@@ -25,9 +25,9 @@
+ 
+ THISDIR=$(pwd)
+ export TZ=US/Central
+-export LANG=
++export LANG=en_US.UTF-8
+ # up for 'duplicity' module and here for 'helper.py'
+-export PYTHONPATH="$(dirname $THISDIR):$THISDIR/helpers"
++export PYTHONPATH="$THISDIR/overrides:$(dirname $THISDIR):$THISDIR/helpers"
+ export GNUPGHOME="$THISDIR/gnupg"
+ export PATH="$(dirname $THISDIR)/bin:$PATH"
+ 
+
+=== modified file 'testing/tests/finaltest.py'
+--- testing/tests/finaltest.py	2012-11-24 19:45:09 +0000
++++ testing/tests/finaltest.py	2014-02-05 02:57:13 +0000
+@@ -20,6 +20,7 @@
+ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 
+ import helper
++import pexpect
+ import sys, os, unittest
+ 
+ import duplicity.backend
+@@ -50,7 +51,8 @@
+     """
+     Test backup/restore using duplicity binary
+     """
+-    def run_duplicity(self, arglist, options = [], current_time = None):
++    def run_duplicity(self, arglist, options = [], current_time = None,
++                      passphrase_input = None):
+         """Run duplicity binary with given arguments and options"""
+         options.append("--archive-dir testfiles/cache")
+         cmd_list = ["duplicity"]
+@@ -62,22 +64,23 @@
+         cmd_list.extend(arglist)
+         cmdline = " ".join(cmd_list)
+         #print "Running '%s'." % cmdline
+-        if not os.environ.has_key('PASSPHRASE'):
++        if passphrase_input is None and not os.environ.has_key('PASSPHRASE'):
+             os.environ['PASSPHRASE'] = 'foobar'
+-        return_val = os.system(cmdline)
++        (output, return_val) = pexpect.run(cmdline, withexitstatus=True,
++            events={'passphrase.*:': passphrase_input}) 
+         if return_val:
+             raise CmdError(return_val)
+ 
+-    def backup(self, type, input_dir, options = [], current_time = None):
++    def backup(self, type, input_dir, options = [], **kwargs):
+         """Run duplicity backup to default directory"""
+         options = options[:]
+         if type == "full":
+             options.insert(0, 'full')
+         args = [input_dir, "'%s'" % backend_url]
+-        self.run_duplicity(args, options, current_time)
++        self.run_duplicity(args, options, **kwargs)
+ 
+     def restore(self, file_to_restore = None, time = None, options = [],
+-                current_time = None):
++                **kwargs):
+         options = options[:] # just nip any mutability problems in bud
+         assert not os.system("rm -rf testfiles/restore_out")
+         args = ["'%s'" % backend_url, "testfiles/restore_out"]
+@@ -85,17 +88,17 @@
+             options.extend(['--file-to-restore', file_to_restore])
+         if time:
+             options.extend(['--restore-time', str(time)])
+-        self.run_duplicity(args, options, current_time)
++        self.run_duplicity(args, options, **kwargs)
+ 
+     def verify(self, dirname, file_to_verify = None, time = None, options = [],
+-               current_time = None):
++               **kwargs):
+         options = ["verify"] + options[:]
+         args = ["'%s'" % backend_url, dirname]
+         if file_to_verify:
+             options.extend(['--file-to-restore', file_to_verify])
+         if time:
+             options.extend(['--restore-time', str(time)])
+-        self.run_duplicity(args, options, current_time)
++        self.run_duplicity(args, options, **kwargs)
+ 
+     def deltmp(self):
+         """Delete temporary directories"""
+@@ -255,6 +258,12 @@
+         assert chain.start_time == 30000, chain.start_time
+         assert chain.end_time == 40000, chain.end_time
+ 
++    def test_piped_password(self):
++        """Make sure that prompting for a password works"""
++        self.backup("full", "testfiles/empty_dir",
++                    passphrase_input="foobar\nfoobar\n")
++        self.restore(passphrase_input="foobar\n")
++
+ class FinalTest1(FinalTest, unittest.TestCase):
+     def setUp(self):
+         assert not os.system("tar xzf testfiles.tar.gz > /dev/null 2>&1")
+
diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD
index cb43d7cf8..2272dff16 100644
--- a/community/dwdiff/PKGBUILD
+++ b/community/dwdiff/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 98737 2013-10-17 14:01:43Z andyrtr $
+# $Id: PKGBUILD 103699 2014-01-10 10:25:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=dwdiff
-pkgver=2.0.4
-pkgrel=5
+pkgver=2.0.9
+pkgrel=1
 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"
 depends=('diffutils' 'icu')
 license=('GPL')
 source=("http://os.ghalkes.nl/dist/$pkgname-$pkgver.tgz")
-md5sums=('1bb69cbfb76583f69c6912f925fc4cec')
+md5sums=('f8364e1257011cc9dfe349775a651606')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/elasticsearch/PKGBUILD b/community/elasticsearch/PKGBUILD
index edcc42159..eb45c7f30 100644
--- a/community/elasticsearch/PKGBUILD
+++ b/community/elasticsearch/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 102806 2013-12-20 13:45:23Z mtorromeo $
+# $Id: PKGBUILD 105667 2014-02-13 10:14:53Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost>
 # Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer>
 
 pkgname=elasticsearch
-pkgver=0.90.8
-pkgrel=2
+pkgver=1.0.0
+pkgrel=1
 pkgdesc="Distributed RESTful search engine built on top of Lucene"
 arch=('i686' 'x86_64')
 url="http://www.elasticsearch.org/"
@@ -15,7 +15,9 @@ install='elasticsearch.install'
 source=(
   "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
   elasticsearch.service
+  elasticsearch@.service
   elasticsearch-tmpfile.conf
+  elasticsearch-sysctl.conf
 )
 
 backup=('etc/elasticsearch/elasticsearch.yml'
@@ -34,7 +36,7 @@ prepare() {
     done
   done
 
-  sed 's|$ES_HOME/lib|/usr/lib/elasticsearch|g' -i bin/elasticsearch.in.sh
+  sed 's|$ES_HOME/lib|/usr/lib/elasticsearch|g' -i bin/elasticsearch.in.sh bin/plugin
 
   echo -e '\nJAVA_OPTS="$JAVA_OPTS -Des.path.conf=/etc/elasticsearch"' >> bin/elasticsearch.in.sh
 
@@ -66,10 +68,14 @@ package() {
   install -Dm644 bin/elasticsearch.in.sh "$pkgdir/usr/share/elasticsearch/elasticsearch.in.sh"
 
   install -Dm644 "$srcdir/elasticsearch.service" "$pkgdir/usr/lib/systemd/system/elasticsearch.service"
+  install -Dm644 "$srcdir/elasticsearch@.service" "$pkgdir/usr/lib/systemd/system/elasticsearch@.service"
 
   install -Dm644 "$srcdir/elasticsearch-tmpfile.conf" "$pkgdir/usr/lib/tmpfiles.d/elasticsearch.conf"
+  install -Dm644 "$srcdir/elasticsearch-sysctl.conf" "$pkgdir/usr/lib/sysctl.d/elasticsearch.conf"
 }
 
-sha256sums=('4006e9aa9382f386e79a1c44a14c1aef34765eb5480fb6b29a2facf62ab3a321'
-            '09a4027780d73103c26f311c64774dcbc47b5e1d54789c1f2d9c697f518f2eeb'
-            '48b5a876e14819270c85f8ca626a011e01d10a2728758ced9a4d5bcf5c1fd23f')
+sha256sums=('0150bc7609c885eb2868bd27b817051e08b4bbe50a8aad5a51698c43283cd51b'
+            'ab13ccda28bf90a10b570e095afc47ddef68da7e45546b2d45e74722c9095f0a'
+            'a04ac09172158611a03dda096b670fe6586ae11b6b3d4de7965ed2b90cb3319f'
+            '48b5a876e14819270c85f8ca626a011e01d10a2728758ced9a4d5bcf5c1fd23f'
+            'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c')
diff --git a/community/elasticsearch/elasticsearch-sysctl.conf b/community/elasticsearch/elasticsearch-sysctl.conf
new file mode 100644
index 000000000..32da2c91c
--- /dev/null
+++ b/community/elasticsearch/elasticsearch-sysctl.conf
@@ -0,0 +1 @@
+vm.max_map_count=262144
\ No newline at end of file
diff --git a/community/elasticsearch/elasticsearch.service b/community/elasticsearch/elasticsearch.service
index 28364b878..4121332af 100644
--- a/community/elasticsearch/elasticsearch.service
+++ b/community/elasticsearch/elasticsearch.service
@@ -1,12 +1,15 @@
 [Unit]
 Description=ElasticSearch
+Documentation=http://www.elasticsearch.org
 After=network.target
 
 [Service]
 User=elasticsearch
 Type=forking
 PIDFile=/run/elasticsearch/elasticsearch.pid
-ExecStart=/usr/bin/elasticsearch -p /run/elasticsearch/elasticsearch.pid
+ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/elasticsearch.pid
+LimitNOFILE=65535
+TimeoutStopSec=20
 Restart=on-failure
 
 [Install]
diff --git a/community/elasticsearch/elasticsearch@.service b/community/elasticsearch/elasticsearch@.service
new file mode 100644
index 000000000..093f7df59
--- /dev/null
+++ b/community/elasticsearch/elasticsearch@.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=ElasticSearch
+Documentation=http://www.elasticsearch.org
+After=network.target
+
+[Service]
+User=elasticsearch
+Type=forking
+PIDFile=/run/elasticsearch/%I.pid
+ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/%I.pid -Des.config=/etc/elasticsearch/%I.yml
+LimitNOFILE=65535
+TimeoutStopSec=20
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD
index 5d1d861f5..4a1ca91a7 100644
--- a/community/electricsheep/PKGBUILD
+++ b/community/electricsheep/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 102244 2013-12-07 10:36:28Z bpiotrowski $
+# $Id: PKGBUILD 103792 2014-01-11 20:08:25Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=electricsheep
 pkgver=2.7b33
-pkgrel=12
+pkgrel=14
 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://community.electricsheep.org/"
 license=('GPL')
-depends=('curl' 'flam3' 'ffmpeg' 'wxgtk2.9' 'lua51' 'libgtop' 'boost-libs' 'freeglut' 'glee')
+depends=('curl' 'flam3' 'ffmpeg' 'wxgtk' 'lua51' 'libgtop' 'boost-libs' 'freeglut' 'glee')
 makedepends=('boost' 'mesa' 'glu' 'tinyxml')
 optdepends=('xscreensaver: to use electricsheep with xscreensaver')
 options=('!emptydirs')
@@ -36,7 +36,6 @@ mksource() {
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  sed -i 's/wx-config/wx-config-2.9/g' configure.ac
   sed -i -e 's/AM_PROG_CC_STDC/AC_PROG_CC/' configure.ac
   sed -i '12 i\
 #include <cstdio>' Common/Singleton.h
diff --git a/community/enet/PKGBUILD b/community/enet/PKGBUILD
index 2a204e520..7f518f162 100644
--- a/community/enet/PKGBUILD
+++ b/community/enet/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99737 2013-10-30 23:24:24Z allan $
+# $Id: PKGBUILD 103880 2014-01-13 09:10:15Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Bj?indeijer <bjorn@lindeijer.nl>
 
 pkgname=enet
-pkgver=1.3.9
+pkgver=1.3.11
 pkgrel=1
 pkgdesc='A relatively thin, simple and robust network communication layer on top of UDP.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url='http://enet.bespin.org/'
 license=('custom')
 depends=('glibc')
 source=("http://enet.bespin.org/download/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('c188e380024f346758376290ad80a1c89e206171')
+sha1sums=('f1b2e49aa2bbdd7d75e889f3f6d3b0c1a56b6080')
 
 build() {
   cd "${pkgname}-${pkgver}"
diff --git a/community/erlang-nox/PKGBUILD b/community/erlang-nox/PKGBUILD
index c90038f3c..aeef7e0ff 100644
--- a/community/erlang-nox/PKGBUILD
+++ b/community/erlang-nox/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102627 2013-12-16 21:55:26Z arodseth $
+# $Id: PKGBUILD 105465 2014-02-08 18:44:33Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Lukas Fleischer <archlinux@cryptocrack.de>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
@@ -7,8 +7,8 @@
 # Contributor: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
 
 pkgname=erlang-nox
-pkgver=R16B03
-pkgrel=2
+pkgver=R16B03_1
+pkgrel=1
 pkgdesc='General-purpose concurrent functional programming language developed by Ericsson (headless version)'
 arch=('x86_64' 'i686')
 url='http://www.erlang.org/'
@@ -25,27 +25,27 @@ source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz"
         'epmd.service'
         'epmd.socket'
         'epmd.conf')
-sha256sums=('6133b3410681a5c934e54c76eee1825f96dead8d6a12c31a64f6e160daf0bb06'
-            'a2038d32e7c940d5d04f7338406e11b723cac0d26e82d7834596105eea492452'
+sha256sums=('17ce53459bc5ceb34fc2da412e15ac8c23835a15fbd84e62c8d1852704747ee7'
+            '0f31bc7d7215aa4b6834b1a565cd7d6e3173e3b392fb870254bae5136499c39d'
             'b121ec9053fb37abca5f910a81c526f93ec30fe13b574a12209223b346886a9e'
             '998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34'
             '78ce5e67b21758c767d727e56b20502f75dc4385ff9b6c6db312d8e8506f2df2')
 
 build() {
-  cd "otp_src_${pkgver/_1/}"
+  cd "otp_src_${pkgver/_/-}"
 
   ./configure --prefix=/usr --enable-smp-support --with-odbc
   make
 }
 
 package() {
-  cd "otp_src_${pkgver/_1/}"
+  cd "otp_src_${pkgver/_/-}"
 
   make DESTDIR="$pkgdir" install
 
   # Documentation
   install -d "$pkgdir/usr/share/doc/erlang"
-  install -m0644 "$srcdir/otp_src_${pkgver/_1/}/README.md" \
+  install -m0644 "$srcdir/otp_src_${pkgver/_/-}/README.md" \
     "$srcdir"/{README,COPYRIGHT} \
     "$pkgdir/usr/share/doc/erlang"
 
@@ -54,7 +54,7 @@ package() {
   cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang"
 
   # License
-  install -Dm0644 "$srcdir/otp_src_${pkgver/_1/}/EPLICENCE" \
+  install -Dm0644 "$srcdir/otp_src_${pkgver/_/-}/EPLICENCE" \
     "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
 
   # Remove files that are packaged as erlang-unixodbc
diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD
index 729afd716..09df10d21 100644
--- a/community/erlang/PKGBUILD
+++ b/community/erlang/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102626 2013-12-16 21:55:05Z arodseth $
+# $Id: PKGBUILD 105463 2014-02-08 18:29:03Z arodseth $
 # Maintainer: Lukas Fleischer <archlinux@cryptocrack.de>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
@@ -8,26 +8,26 @@
 
 pkgbase=erlang
 pkgname=('erlang' 'erlang-unixodbc')
-pkgver=R16B03
-pkgrel=2
+pkgver=R16B03_1
+pkgrel=1
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.erlang.org/'
 license=('custom')
-makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc' 'wxgtk' 'wxgtk2.9')
+makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc' 'wxgtk' 'glu')
 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'
         'epmd.socket'
         'epmd.conf')
-sha256sums=('6133b3410681a5c934e54c76eee1825f96dead8d6a12c31a64f6e160daf0bb06'
-            'a2038d32e7c940d5d04f7338406e11b723cac0d26e82d7834596105eea492452'
+sha256sums=('17ce53459bc5ceb34fc2da412e15ac8c23835a15fbd84e62c8d1852704747ee7'
+            '0f31bc7d7215aa4b6834b1a565cd7d6e3173e3b392fb870254bae5136499c39d'
             'b121ec9053fb37abca5f910a81c526f93ec30fe13b574a12209223b346886a9e'
             '998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34'
             '78ce5e67b21758c767d727e56b20502f75dc4385ff9b6c6db312d8e8506f2df2')
 
 build() {
-  cd "otp_src_${pkgver/_1/}"
+  cd "otp_src_${pkgver/_/-}"
 
   ./configure --prefix=/usr --enable-smp-support --with-odbc
   make
@@ -35,20 +35,20 @@ build() {
 
 package_erlang() {
   pkgdesc='General-purpose concurrent functional programming language developed by Ericsson'
-  depends=('ncurses' 'glu' 'wxgtk' 'wxgtk2.9' 'openssl')
+  depends=('ncurses' 'glu' 'wxgtk' 'openssl')
   optdepends=('erlang-unixodbc: database support'
               'java-environment: for Java support'
               'lksctp-tools: for SCTP support')
   provides=('erlang-nox')
   conflicts=('erlang-nox')
 
-  cd "otp_src_${pkgver/_1/}"
+  cd "otp_src_${pkgver/_/-}"
 
   make DESTDIR="$pkgdir" install
 
   # Documentation
   install -d "$pkgdir/usr/share/doc/erlang"
-  install -m0644 "$srcdir/otp_src_${pkgver/_1/}/README.md" \
+  install -m0644 "$srcdir/otp_src_${pkgver/_/-}/README.md" \
     "$srcdir"/{README,COPYRIGHT} \
     "$pkgdir/usr/share/doc/erlang"
 
@@ -57,7 +57,7 @@ package_erlang() {
   cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang/"
 
   # License
-  install -Dm0644 "$srcdir/otp_src_${pkgver/_1/}/EPLICENCE" \
+  install -Dm0644 "$srcdir/otp_src_${pkgver/_/-}/EPLICENCE" \
     "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
 
   # Move over files that will be packaged as erlang-unixodbc
@@ -82,7 +82,7 @@ package_erlang-unixodbc() {
   mv "$srcdir/odbc.3.gz" "$pkgdir/usr/lib/erlang/man/man3/"
 
   # License
-  install -Dm0644 "$srcdir/otp_src_${pkgver/_1/}/EPLICENCE" \
+  install -Dm0644 "$srcdir/otp_src_${pkgver/_/-}/EPLICENCE" \
     "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
 }
 
diff --git a/community/ettercap/PKGBUILD b/community/ettercap/PKGBUILD
index 614d786da..adaf8d9e0 100644
--- a/community/ettercap/PKGBUILD
+++ b/community/ettercap/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99738 2013-10-30 23:24:51Z allan $
+# $Id: PKGBUILD 103822 2014-01-11 20:36:36Z bgyorgy $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=ettercap
 pkgname=('ettercap' 'ettercap-gtk')
 pkgver=0.8.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ettercap.github.com/ettercap/"
 license=('GPL')
@@ -48,25 +48,8 @@ package_ettercap-gtk() {
   backup=('etc/ettercap/etter.conf')
   conflicts=('ettercap')
   provides=('ettercap')
-  optdepends=('polkit-gnome')
-  install='ettercap-gtk.install'
+  optdepends=('polkit: to run ettercap directly from menu')
 
-  install -d $pkgdir/usr/share/polkit-1/actions/
   cd "${srcdir}"/${pkgbase}-${pkgver}-gtk/build
   make DESTDIR="${pkgdir}" install
-
-#install -Dm644 "${srcdir}/ettercap.desktop" "${pkgdir}/usr/share/applications/ettercap.desktop"
-#install -Dm644 "${srcdir}/${pkgbase}-${pkgver}-gtk/desktop/ettercap.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/ettercap.svg"
-
-  # Install policy file
-  #install -Dm644 "${srcdir}/org.archlinux.pkexec.ettercap.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.ettercap.policy"
-
-  # We need rename the original script
-  #mv "${pkgdir}/usr/bin/ettercap" "${pkgdir}/usr/bin/ettercap.elf"
-
-  # Install launcher script
-  #echo '#!/bin/sh' > ${pkgdir}/usr/bin/ettercap
-  #echo 'pkexec --disable-internal-agent "/usr/bin/ettercap.elf" "$@"' >> ${pkgdir}/usr/bin/ettercap
-  #chmod 755 ${pkgdir}/usr/bin/ettercap
-
 }
diff --git a/community/ettercap/ettercap-gtk.install b/community/ettercap/ettercap-gtk.install
deleted file mode 100644
index e8f6bed8f..000000000
--- a/community/ettercap/ettercap-gtk.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  echo 'If you use a lightweight windowmanager, remember to run'
-  echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable'
-  echo 'graphical authentication, which may be needed for pkexec to work.'
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD
index 9cf53929f..d519edf26 100644
--- a/community/fcitx-mozc/PKGBUILD
+++ b/community/fcitx-mozc/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 100541 2013-11-05 17:38:22Z fyan $
+# $Id: PKGBUILD 103671 2014-01-09 06:33:11Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
 ## Mozc compile option
 _bldtype=Release
 
-_zipcoderel=201310
+_zipcoderel=201312
 _protobuf_ver=2.5.0
-_gyp_rev=1774
+_gyp_rev=1828
 
 _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.12.1599.102
+pkgver=1.13.1651.102
 _patchver=${pkgver}.1
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/mozc/"
 license=('custom')
@@ -23,9 +23,9 @@ depends=('qt4' 'fcitx' 'zinnia')
 makedepends=('pkg-config' 'python2' 'gtest' 'curl' 'gtk2' 'mesa' 'svn')
 replaces=('mozc-fcitx')
 conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx')
-source=(svn+http://mozc.googlecode.com/svn#revision=$_revision
+source=(mozc::svn+http://mozc.googlecode.com/svn/trunk/src#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/x-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
@@ -41,7 +41,7 @@ build() {
   CFLAGS="${CFLAGS} -I/usr/include/qt4 -fvisibility=hidden"
   CXXFLAGS="${CXXFLAGS} -I/usr/include/qt4 -fvisibility=hidden"
 
-  cd svn/trunk/src
+  cd mozc
   
   # Apply fcitx patch
   rm unix/fcitx -rf
@@ -57,7 +57,7 @@ build() {
 
   # Generate zip code seed
   msg "Generating zip code seed..."
-  python2 dictionary/gen_zip_code_seed.py --zip_code="${srcdir}/KEN_ALL.CSV" --jigyosyo="${srcdir}/JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt
+  python2 dictionary/gen_zip_code_seed.py --zip_code="${srcdir}/x-ken-all.csv" --jigyosyo="${srcdir}/JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt
   msg "Done."
 
   # Copy gyp
@@ -81,7 +81,7 @@ build() {
 }
 
 package() {
-  cd svn/trunk/src
+  cd mozc
   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"
 
@@ -114,8 +114,8 @@ package() {
 
 sha512sums=('SKIP'
             'SKIP'
-            'f4ba607dc8d8ad6b12fbf47e6a9b56e1dee5552db65bb6a21e55b3db8567601df4e916f88ee039bb4f84dd7ad9994ad9e7b494fbb06d14b8ce6c8ca316e3a571'
-            '551fd2ee44a0cdf317885351528d5248fc56c261e73b793ac46c8f043a6f5461e1e4400df67cd151a01891217185fc12993a6a0d727d9f8217947d9b23d7b69c'
+            'f05c779257c8bc6e51ba8ab9fddec918a6de29d45c756bd3b83d42cb99265ada85313e980518096338ebcadcd0fe6433cbd9ad20a74f4116975eb7c168b72d81'
+            '87e8733cfc11528fa698b0a48f4e89c0dd02e2d79c804025219531fad4776cfcba720d720003d83a65401b4631c9ae1adc3395d18965066d232a76794ae3d54f'
             '5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee'
-            'e6a5a21520e36aa6cd27295c5a1b050a8f1a8dccf82918b0b57f17c79393c8b527c3f70dbfa2de0af42d3f85eac3095ef476a067fb24dbc2fa325c1f6a1138cc'
+            'cd879029d87fd80a70796bd83ac67decbb58b181acafcee22110cb46a50c371c82b67babcfe80b1c05fa9beef3d3a7ddd580105a70c411795cf8c9ef745661e2'
             '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a')
diff --git a/community/fdkaac/PKGBUILD b/community/fdkaac/PKGBUILD
new file mode 100644
index 000000000..4fb2b731a
--- /dev/null
+++ b/community/fdkaac/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 105355 2014-02-05 21:53:04Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: PelPix <kylebloss@pelpix.info>
+
+pkgname=fdkaac
+pkgver=0.5.1
+pkgrel=2
+pkgdesc='Command line encoder frontend for libfdk-aac'
+arch=('i686' 'x86_64')
+url="https://github.com/nu774/${pkgname}"
+license=('custom')
+depends=('libfdk-aac')
+source=("${url}/archive/v${pkgver}.tar.gz")
+sha256sums=('95d6e9675ab03f42aa3cb642a686ffaced782a7b440563bd37ef2d4517391348')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  autoreconf -if
+  ./configure --prefix='/usr' --disable-rpath
+
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+
+  install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -m 644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/ffms2/PKGBUILD b/community/ffms2/PKGBUILD
index 74d0e96b1..9223888cc 100644
--- a/community/ffms2/PKGBUILD
+++ b/community/ffms2/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 99739 2013-10-30 23:25:12Z allan $$
+# $Id: PKGBUILD 105637 2014-02-12 15:41:55Z alucryd $$
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 
 pkgname=ffms2
 pkgver=2.19
-pkgrel=1
-pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access"
+pkgrel=2
+pkgdesc='A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access'
 arch=('i686' 'x86_64')
-url="https://github.com/FFMS/ffms2"
-license=('MIT')
+url='https://github.com/FFMS/ffms2'
+license=('GPL')
 depends=('ffmpeg')
-replaces=('ffmpegsource')
+provides=('vapoursynth-plugin-ffms2')
 source=("https://github.com/FFMS/ffms2/archive/${pkgver}.tar.gz")
 sha256sums=('6f1379514f03a14092fdfc9941960a9b86f5b78d86f9e000eeddf3bf50d42811')
 
 build() {
   cd ${pkgname}-${pkgver}
 
-  ./configure --prefix='/usr' --enable-shared --disable-static
+  ./configure --prefix='/usr' --enable-shared --disable-static --enable-avresample
   make
 }
 
@@ -25,9 +25,8 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 
-# License
-  install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname}
-  install -m 644 {,"${pkgdir}"/usr/share/licenses/${pkgname}/}COPYING
+  install -dm 755 "${pkgdir}"/usr/lib/vapoursynth
+  ln -s ../libffms2.so "${pkgdir}"/usr/lib/vapoursynth/
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD
index e2c69f28e..8e23f62bb 100644
--- a/community/filezilla/PKGBUILD
+++ b/community/filezilla/PKGBUILD
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD 95254 2013-08-07 20:59:40Z bluewind $
+# $Id: PKGBUILD 105647 2014-02-12 18:26:37Z bluewind $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=filezilla
-pkgver=3.7.3
+pkgver=3.7.4.1
 pkgrel=1
 pkgdesc="Fast and reliable FTP, FTPS and SFTP client"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://filezilla-project.org/"
 license=('GPL')
-depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme' 'sqlite')
+depends=('dbus-core' 'xdg-utils' 'wxgtk2.8' 'libidn' 'hicolor-icon-theme' 'sqlite' 'gnutls')
 install=filezilla.install
 source=("http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/${pkgver}/FileZilla_${pkgver}_src.tar.bz2")
 
 build() {
   cd "${pkgname}-${pkgver}"
-   ./autogen.sh
+  export WX_CONFIG_PATH='/usr/bin/wx-config-2.8'
+  export WXRC='/usr/bin/wxrc-2.8'
+  ./autogen.sh
   ./configure \
     --prefix=/usr \
     --disable-manualupdatecheck \
@@ -31,4 +33,4 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('df7828739a852ac3adbc1c010303115d')
+md5sums=('e6c24c4ddc0fe5470fe890b5b2f5b49a')
diff --git a/community/flickcurl/PKGBUILD b/community/flickcurl/PKGBUILD
index cd21e0fe9..a0e19b885 100644
--- a/community/flickcurl/PKGBUILD
+++ b/community/flickcurl/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 100106 2013-11-01 17:15:29Z spupykin $
+# $Id: PKGBUILD 103303 2014-01-02 22:42:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=flickcurl
-pkgver=1.24
-pkgrel=2
+pkgver=1.25
+pkgrel=1
 pkgdesc="C library for the Flickr API"
 arch=(i686 x86_64 'mips64el')
 url="http://librdf.org/flickcurl/"
 license=('GPL')
 depends=('raptor' 'curl')
 source=(http://download.dajobe.org/flickcurl/flickcurl-$pkgver.tar.gz)
-md5sums=('7cf6a627465471d76a5f4dc31099d9cf')
+md5sums=('9598526f2b9a0a4619d1f1563300e72a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD
index 0c9058a7d..e7f9ffa3b 100644
--- a/community/freeradius/PKGBUILD
+++ b/community/freeradius/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100324 2013-11-02 09:25:51Z spupykin $
+# $Id: PKGBUILD 103884 2014-01-13 10:05:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jason R Begley (jayray@digitalgoat.com>
 
 pkgname=freeradius
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The premier open source RADIUS server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freeradius.org/"
diff --git a/community/fswebcam/PKGBUILD b/community/fswebcam/PKGBUILD
index f85c65c46..4ea8fd0a9 100644
--- a/community/fswebcam/PKGBUILD
+++ b/community/fswebcam/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 93773 2013-07-10 07:27:13Z bpiotrowski $
+# $Id: PKGBUILD 105615 2014-02-11 18:34:43Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Philipp Robbel <robbel@gmail.com>
 
 pkgname=fswebcam
-pkgver=20110717
-pkgrel=3
+pkgver=20140113
+pkgrel=1
 pkgdesc="Tiny and flexible webcam app."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.firestorm.cx/fswebcam"
 license=('GPL')
 depends=('gd')
 backup=("etc/$pkgname.conf")
-source=("$url/files/$pkgname-$pkgver.tar.gz")
-md5sums=('6e09f1f31cf7cd0ac1d4d688a0acbe41')
+source=("$url/files/$pkgname-$pkgver.tar.xz")
+md5sums=('1bfdb21904e816f100370ec8f4df986b')
+sha1sums=('6c1f3e3c8cf3189f0e2a5d4f8c9534c855c02e0a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/galculator/PKGBUILD b/community/galculator/PKGBUILD
index 3cba40d6c..c1e5219fc 100644
--- a/community/galculator/PKGBUILD
+++ b/community/galculator/PKGBUILD
@@ -1,31 +1,51 @@
-# $Id: PKGBUILD 92890 2013-06-18 08:47:35Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
+# $Id: PKGBUILD 104578 2014-01-23 04:23:17Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
-pkgname=galculator
+pkgbase=galculator
+pkgname=(galculator galculator-gtk2)
 pkgver=2.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc='GTK+ based scientific calculator'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://galculator.sourceforge.net/'
 license=('GPL')
-depends=('gtk3' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils')
+depends=('gtk3' 'gtk2')
 makedepends=('intltool')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2)
 sha256sums=('23e7e8d02ec49bf06e061e7fa56c779fd0f353ec294c30fd88858786d8e4a79b')
 
 build() {
+  # GTK3 version
+  cd $pkgname-$pkgver
+  [ -e gtk3 ] || mkdir gtk3
+  cd gtk3
+  ../configure --prefix=/usr
+  make
+
+  # GTK2 version
   cd $srcdir/$pkgname-$pkgver
-  
-  LDFLAGS+=' -lm'
-  ./configure --prefix=/usr
+  [ -e gtk2 ] || mkdir gtk2
+  cd gtk2
+  ../configure --prefix=/usr --disable-gtk3
   make
 }
 
-package() {
-  cd $srcdir/$pkgname-$pkgver
+package_galculator() {
+  depends=('gtk3')
+
+  cd $pkgbase-$pkgver/gtk3
+  make DESTDIR="$pkgdir" install
+}
+
+package_galculator-gtk2() {
+  pkgdesc+=' (GTK2 version)'
+  depends=('gtk2')
+  conflicts=('galculator')
 
+  cd $pkgbase-$pkgver/gtk2
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/galculator/galculator.install b/community/galculator/galculator.install
index fe845ffb1..1a05f573e 100644
--- a/community/galculator/galculator.install
+++ b/community/galculator/galculator.install
@@ -1,11 +1,11 @@
 post_install() {
-  update-desktop-database -q
-  [[ -e /usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
   post_install
 }
+
 post_remove() {
   post_install
 }
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index c80f85c19..347487bad 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 101792 2013-12-01 09:52:05Z andyrtr $
+# $Id: PKGBUILD 104508 2014-01-22 06:40:19Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor : sebikul <sebikul@gmail.com>
 
@@ -15,8 +15,8 @@ _components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb
          '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.5.1
-pkgrel=2
+pkgver=3.5.2
+pkgrel=1
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gambas.sourceforge.net/"
@@ -31,7 +31,7 @@ makedepends=('intltool' 'mariadb' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-uti
 	 'gmime')
 options=('!emptydirs' 'libtool')
 source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('40f9057cd3686020fbe66a043a2ea400')
+md5sums=('685b7214453c1ae9133a46411b12ed8d')
 
 create_dirs() {
   install -dm755 ${pkgdir}/usr/lib/gambas3
diff --git a/community/gambit-c/PKGBUILD b/community/gambit-c/PKGBUILD
new file mode 100644
index 000000000..e4eef8645
--- /dev/null
+++ b/community/gambit-c/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Christian Babeux <christian.babeux@0x80.ca>
+
+_distname=gambc-v4_7_1
+pkgname=gambit-c
+pkgver=4.7.1
+pkgrel=2
+pkgdesc='Scheme R5RS interpreter and compiler (via C)'
+arch=('x86_64' 'i686')
+url='http://dynamo.iro.umontreal.ca/wiki/index.php/Main_Page'
+license=('LGPL2.1' 'Apache')
+install="$pkgname.install"
+source=(http://www.iro.umontreal.ca/~gambit/download/gambit/v4.7/source/${_distname}.tgz)
+sha256sums=('6b7d58f1e28169d2c873386a1cf7e321e96d23ffd4b3238b105d66ca6bdd7472')
+
+build() {
+  cd "$_distname"
+
+  ./configure --prefix=/usr --docdir=/usr/share/doc/gambit-c \
+    --infodir=/usr/share/info --libdir=/usr/lib/gambit-c \
+    --enable-gcc-opts --enable-single-host
+  make
+}
+
+package() {
+  make -C "$_distname" install DESTDIR="$pkgdir"
+  # gsc conflicts with the one provided by ghostscript
+  mv "$pkgdir/usr/bin/gsc" "$pkgdir/usr/bin/gambitc"
+  ln -sf /usr/bin/gambitc "$pkgdir/usr/bin/gsc-script"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/gambit-c/gambit-c.install b/community/gambit-c/gambit-c.install
new file mode 100644
index 000000000..ed08d59db
--- /dev/null
+++ b/community/gambit-c/gambit-c.install
@@ -0,0 +1,16 @@
+_infodir=/usr/share/info
+_iinfoargs="$_infodir/gambit-c.info.gz $_infodir/dir"
+
+post_install() {
+  install-info ${_iinfoargs}
+}
+
+post_upgrade() {
+  post_install $@
+}
+
+pre_remove() {
+  install-info --delete ${_iinfoargs}
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/gcompris/PKGBUILD b/community/gcompris/PKGBUILD
index 93e6f1412..fc8972627 100644
--- a/community/gcompris/PKGBUILD
+++ b/community/gcompris/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 100632 2013-11-06 16:42:49Z foutrelis $
+# $Id: PKGBUILD 103779 2014-01-11 14:29:12Z bgyorgy $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx.de>
 
 pkgname=gcompris
 pkgver=13.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' 'librsvg' 'python2-pysqlite' 'gstreamer0.10-base-plugins')
+depends=('pygtk' 'librsvg' 'gstreamer0.10-base-plugins')
 optdepends=('gnucap: for computer simulation within the electricity activity'
             'tuxpaint: for the painting activity')
-makedepends=('texinfo' 'texi2html' 'intltool' 'gettext')
+makedepends=('texinfo' 'texi2html' 'intltool')
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
 sha256sums=('418dad2c8f0fc90e16e97ab67b6700e3af5f33ae05d83f28f3b1117183f88c57')
 
@@ -30,7 +30,7 @@ build() {
 }
 
 package() {
-  depends+=("gcompris-data=$pkgver-$pkgrel")
+  depends+=("gcompris-data=$pkgver")
 
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install-exec
diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD
index 52450d1dd..bb1b0a372 100644
--- a/community/gdal/PKGBUILD
+++ b/community/gdal/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 102765 2013-12-19 13:49:34Z fyan $
+# $Id: PKGBUILD 103623 2014-01-08 12:17:02Z bgyorgy $
 # 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=6
+pkgver=1.10.1
+pkgrel=1
 pkgdesc="A translator library for raster geospatial data formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gdal.org/"
 license=('custom')
-depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf'  'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs')
+depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf' 'poppler' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs')
 makedepends=('perl' 'swig' 'chrpath')
 optdepends=('postgresql: postgresql database support'
             'mariadb: mariadb database support'
@@ -19,7 +19,7 @@ optdepends=('postgresql: postgresql database support'
 changelog=$pkgname.changelog
 source=(http://download.osgeo.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
         gdal-1.5.1-python-install.patch)
-sha256sums=('1a9ca12bcc3a55f66bcd6654d5ff12eeddb3a26b622dd7c8872febb4f5a97487'
+sha256sums=('9984f0314c0bd831eb59fb646c2bc5e13cf1378be4f51499045166cbe62be6ea'
             '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6')
 
 build() {
@@ -39,7 +39,7 @@ build() {
 
   ./configure --prefix=/usr --with-netcdf --with-libtiff --with-sqlite3 \
               --with-geotiff --with-mysql --with-python --without-libtool --with-curl \
-              --with-hdf5 --with-perl --with-geos --with-png
+              --with-hdf5 --with-perl --with-geos --with-png --with-poppler
 
 # workaround for bug #13646
   sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt
diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD
index 3ed37cf9a..01aeea0fe 100644
--- a/community/gdc/PKGBUILD
+++ b/community/gdc/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=('gdc' 'libgphobos-devel')
 pkgver=4.8.2
-pkgrel=3
+pkgrel=5
 arch=('i686' 'x86_64')
 url="https://github.com/D-Programming-GDC/GDC"
 license=('GPL')
@@ -17,7 +17,7 @@ source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz
         folders.diff)
 sha256sums=('e4e2202b15f8ba323f88c65de0e4190b0630a4b2e70b0653526b31e946877ead'
             'SKIP'
-            '88a1f1315633e9dde18637ff5239898abd94dca9a39fdb211a66555dd84c2fec')
+            '82f1ba0825164a74660bd5008d8f3acae1bacc3271c86475efc1601fe0da73c4')
 
 groups=('dlang' 'dlang-gdc')
 conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git')
@@ -72,7 +72,7 @@ package_gdc()
     depends=('gcc' 'binutils')
     optdepends=('libgphobos-devel: D standard library, GDC version')
     provides=("d-compiler")
-    pkgdesc="Compiler for D programming language wich uses gcc backend"
+    pkgdesc="Compiler for D programming language which uses gcc backend (2.064.2 frontend version)"
  
     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/$pkgver/cc1d
@@ -86,20 +86,21 @@ package_libgphobos-devel()
     depends=('gdc')
 
     # druntime
-    install -D $srcdir/gdc/libphobos/libdruntime/object.di $pkgdir/usr/include/dlang/gdc/$pkgver/object.di
-    cp -r $srcdir/gdc/libphobos/libdruntime/core $pkgdir/usr/include/dlang/gdc/$pkgver/core
-    cp -r $srcdir/gdc/libphobos/libdruntime/gcc $pkgdir/usr/include/dlang/gdc/$pkgver/gcc
+    install -D $srcdir/gdc/libphobos/libdruntime/object.di $pkgdir/usr/include/dlang/gdc/object.di
+    install -D $srcdir/gdc/libphobos/libdruntime/__entrypoint.di ${pkgdir}/usr/include/dlang/gdc/__entrypoint.di
+    cp -r $srcdir/gdc/libphobos/libdruntime/core $pkgdir/usr/include/dlang/gdc/core
+    cp -r $srcdir/gdc/libphobos/libdruntime/gcc $pkgdir/usr/include/dlang/gdc/gcc
 
     # workaround for auto-generated libbacktrace issue
 	# script needs to be re-written to first call normal gcc instalaltion targets to
 	# avoid such problems in future
-	cp $srcdir/gcc-build/$CHOST/libphobos/libdruntime/gcc/libbacktrace.d $pkgdir/usr/include/dlang/gdc/$pkgver/gcc
-	rm $pkgdir/usr/include/dlang/gdc/$pkgver/gcc/libbacktrace.d.in
+	cp $srcdir/gcc-build/$CHOST/libphobos/libdruntime/gcc/libbacktrace.d $pkgdir/usr/include/dlang/gdc/gcc/
+	rm $pkgdir/usr/include/dlang/gdc/gcc/libbacktrace.d.in
 
     # phobos
-    cp $srcdir/gdc/libphobos/src/crc32.d ${pkgdir}/usr/include/dlang/gdc/$pkgver/crc32.d
-    cp -r $srcdir/gdc/libphobos/src/std ${pkgdir}/usr/include/dlang/gdc/$pkgver/std
-    cp -r $srcdir/gdc/libphobos/src/etc ${pkgdir}/usr/include/dlang/gdc/$pkgver/etc
+    cp $srcdir/gdc/libphobos/src/crc32.d ${pkgdir}/usr/include/dlang/gdc/
+    cp -r $srcdir/gdc/libphobos/src/std ${pkgdir}/usr/include/dlang/gdc/std
+    cp -r $srcdir/gdc/libphobos/src/etc ${pkgdir}/usr/include/dlang/gdc/etc
 
     install -D -m644 $srcdir/gcc-build/$CHOST/libphobos/src/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a
 }
diff --git a/community/gdc/folders.diff b/community/gdc/folders.diff
index 05fc9991a..625d844b0 100644
--- a/community/gdc/folders.diff
+++ b/community/gdc/folders.diff
@@ -1,5 +1,22 @@
+diff --git a/libphobos/configure.ac b/libphobos/configure.ac
+index 51d9b86..6ff04f1 100644
+--- a/libphobos/configure.ac
++++ b/libphobos/configure.ac
+@@ -239,9 +239,9 @@ else
+ fi
+ 
+ if test "${gdc_host}" != "${gdc_target}"; then
+-    gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/d
++    gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/dlang
+ else
+-    gdc_include_dir='${prefix}'/include/d/${d_gcc_ver}
++    gdc_include_dir='${prefix}'/include/dlang/gdc
+ fi
+ AC_SUBST(gdc_include_dir)
+ AC_ARG_WITH([cross-host],
+
 diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in
-index 9570bf3..52addc0 100644
+index 17e5c45..8a656b1 100644
 --- a/gcc/d/Make-lang.in
 +++ b/gcc/d/Make-lang.in
 @@ -25,10 +25,10 @@ D_TARGET_INSTALL_NAME = $(target_alias)-$(shell echo gdc|sed '$(program_transfor
@@ -7,27 +24,11 @@ index 9570bf3..52addc0 100644
  # This should be configured
  ifeq ($(host), $(target))
 -  D_include_dir = `echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/d/$(version)
-+  D_include_dir = `echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/dlang/gdc/$(version)
++  D_include_dir = `echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/dlang/gdc
    gcc_d_include_dir = $(libsubdir)/$(unlibsubdir)/..$(D_include_dir)
  else
 -  gcc_d_include_dir = $(libsubdir)/include/d
 +  gcc_d_include_dir = $(libsubdir)/include/dlang/gdc
  endif
- 
- 
-diff --git a/libphobos/configure.ac b/libphobos/configure.ac
-index dfb8fec..0b88ff4 100644
---- a/libphobos/configure.ac
-+++ b/libphobos/configure.ac
-@@ -220,9 +220,9 @@ dnl (# Default case for install directory for include files.) and on
- # will have to modify gcc/configure.ac ..
- # For now, basic workaround for cross compilers ..
- if test "${host}" != "${build}"; then
--    gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/d
-+    gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/dlang/
- else
--    gdc_include_dir='${prefix}'/include/d/${d_gcc_ver}
-+    gdc_include_dir='${prefix}'/include/dlang/gdc/${d_gcc_ver}
- fi
- AC_SUBST(gdc_include_dir)
- AC_ARG_WITH([cross-host],
+
+
diff --git a/community/gearmand/PKGBUILD b/community/gearmand/PKGBUILD
index f0f325628..894a79528 100644
--- a/community/gearmand/PKGBUILD
+++ b/community/gearmand/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 102452 2013-12-11 14:33:31Z mtorromeo $
+# $Id: PKGBUILD 105677 2014-02-13 14:56:45Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Lev Lybin <lev.lybin@gmail.com>
 # Contributor: Vadym Abramchuk <abramm@gmail.com>
 # Contributor: John Gerritse <reaphsharc@gmail.com>
 
 pkgname=gearmand
-pkgver=1.1.11
+pkgver=1.1.12
 pkgrel=1
 pkgdesc="Distributed job queue server."
 arch=('i686' 'x86_64')
@@ -45,6 +45,6 @@ package() {
   install -Dm644 gearmand.conf "$pkgdir/etc/gearmand.conf"
 }
 
-sha256sums=('a175cbdeabe8102796418a516532adad58abd5e355365c78b6a234e544655825'
+sha256sums=('973d7a3523141a84c7b757c6f243febbc89a3631e919b532c056c814d8738acb'
             'dee38ad4e614969047253b8c4996b8cdf33c981b0df215b6627356fd4cbafa33'
             '6c14fdcd94105338e13bdd59dbed4f9b77430a517b2c125ac2e6d3bc43bdf506')
diff --git a/community/geary/PKGBUILD b/community/geary/PKGBUILD
index 7a1f56786..400936f8a 100755
--- a/community/geary/PKGBUILD
+++ b/community/geary/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 102595 2013-12-16 08:40:54Z alucryd $
-# Maintainer: Maxime Gauduin <alucryd at gmail dot com>
+# $Id: PKGBUILD 105421 2014-02-07 11:42:11Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor : sebikul <sebikul@gmail.com>
 # Contributor : Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=geary
-pkgver=0.5.0
-pkgrel=1
+pkgver=0.5.1
+pkgrel=2
 pkgdesc='A lightweight email client for the GNOME desktop'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.yorba.org/projects/geary/'
 license=('GPL3')
-depends=('desktop-file-utils' 'gmime' 'libcanberra' 'libgee' 'libnotify' 'webkitgtk')
+depends=('gmime' 'gnome-keyring' 'libcanberra' 'libgee' 'libnotify' 'webkitgtk')
 makedepends=('cmake' 'gobject-introspection' 'intltool' 'vala')
 install="${pkgname}.install"
 source=("https://download.gnome.org/sources/${pkgname}/${pkgver%.?}/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('7f3f442b2b7349e339b380de474d94e9a8ad625d16277277ea500747c3b7a5af')
+sha256sums=('12561187c7d2b8aa1115ca52d8959270ff38dd6db774df1cd39c9719a76bb1d1')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/geda-gaf/ChangeLog b/community/geda-gaf/ChangeLog
index e5b3226a9..a9c6f92d3 100644
--- a/community/geda-gaf/ChangeLog
+++ b/community/geda-gaf/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-24 Kyle Keen <keenerd@gmail.com>
+	* 1.8.2-1
+	- Version bump
+
 2013-09-17 Kyle Keen <keenerd@gmail.com>
 	* 1.8.1-3
 	- Update url
diff --git a/community/geda-gaf/PKGBUILD b/community/geda-gaf/PKGBUILD
index ac4362130..938f113f6 100644
--- a/community/geda-gaf/PKGBUILD
+++ b/community/geda-gaf/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99104 2013-10-24 12:53:47Z kkeen $
+# $Id: PKGBUILD 104743 2014-01-25 15:14:59Z 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=4
+pkgver=1.8.2
+pkgrel=1
 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/"
@@ -17,7 +17,7 @@ optdepends=('python2: for two of the commands (garchive, tragesym)'
 replaces=('geda-suite' 'geda-libs')
 install=geda-gaf.install
 source=(http://ftp.geda-project.org/geda-gaf/stable/v1.8/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('3c5ef297e403b493fdf7a5d47bbeeb73')
+md5sums=('fa8a807615decf47027e22a217dd0ded')
 
 build ()
 {
diff --git a/community/geos/PKGBUILD b/community/geos/PKGBUILD
index c86c15bb8..44d2377a5 100644
--- a/community/geos/PKGBUILD
+++ b/community/geos/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99758 2013-10-30 23:32:00Z allan $
+# $Id: PKGBUILD 103320 2014-01-03 10:52:48Z bpiotrowski $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=geos
 pkgver=3.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="C++ port of the Java Topology Suite"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://trac.osgeo.org/geos/"
diff --git a/community/gimp-ufraw/PKGBUILD b/community/gimp-ufraw/PKGBUILD
index 5adf7b8b2..969390369 100644
--- a/community/gimp-ufraw/PKGBUILD
+++ b/community/gimp-ufraw/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90037 2013-05-06 19:37:26Z foutrelis $
+# $Id: PKGBUILD 104795 2014-01-26 12:17:33Z andyrtr $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Martin Sugioarto <nakal@web.de>
 
 pkgname=gimp-ufraw
 pkgver=0.19
-pkgrel=2
+pkgrel=3
 pkgdesc='Converter for raw files; utility and GIMP plugin'
 url='http://ufraw.sourceforge.net/'
 arch=('x86_64' 'i686')
diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD
index 80f832fe0..75cddd629 100644
--- a/community/glfw/PKGBUILD
+++ b/community/glfw/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98064 2013-10-05 08:59:45Z svenstaro $
+# $Id: PKGBUILD 103691 2014-01-09 23:58:47Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: philefou <tuxication AT gmail DOT com>
 # Contributor: lindquist <tomas@famolsen.dk>
@@ -7,7 +7,7 @@
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=glfw
-pkgver=3.0.3
+pkgver=3.0.4
 pkgrel=1
 pkgdesc="A free, open source, portable framework for OpenGL application development"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ license=('custom:ZLIB')
 depends=('libgl' 'libxrandr' 'glu' 'xorg-xinput')
 makedepends=('mesa' 'cmake' 'doxygen')
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('623977c096b28c25528e3c958e9fb3fd')
+md5sums=('133a9faed6f1fbd527551a7e42aeb4f9')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gloox/PKGBUILD b/community/gloox/PKGBUILD
index e9d48d351..38e01c866 100644
--- a/community/gloox/PKGBUILD
+++ b/community/gloox/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100444 2013-11-04 12:11:53Z spupykin $
+# $Id: PKGBUILD 103910 2014-01-13 17:16:40Z andyrtr $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 
 pkgname=gloox
 pkgver=1.0.9
-pkgrel=1
+pkgrel=3
 pkgdesc="C++ libraries for development of Jabber client/component/server"
 arch=(i686 x86_64 'mips64el')
 url="http://camaya.net/gloox"
diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD
index 7a5ca0534..c7d4a4f36 100644
--- a/community/glusterfs/PKGBUILD
+++ b/community/glusterfs/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 102127 2013-12-05 14:49:23Z spupykin $
+# $Id: PKGBUILD 103705 2014-01-10 10:51:26Z 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.1
+pkgver=3.4.2
 _basever=`echo $pkgver | cut -f1-2 -d.`
-pkgrel=2
+pkgrel=1
 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.'
 arch=(i686 x86_64 mips64el)
 url='http://www.gluster.org/'
@@ -15,7 +15,7 @@ license=(GPL2 LGPL3)
 depends=(fuse python2 libxml2)
 makedepends=(flex bison)
 source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz)
-md5sums=('dce3d066b7351b360454ea9ca4cabe4c')
+md5sums=('7c05304a9aca3c85ff27458461783623')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD
index ef4e533f1..c36348ce4 100644
--- a/community/gmerlin/PKGBUILD
+++ b/community/gmerlin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99767 2013-10-30 23:35:23Z allan $
+# $Id: PKGBUILD 104368 2014-01-19 16:29:32Z bpiotrowski $
 # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
 
 pkgname=gmerlin
 pkgver=1.2.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Multimedia architecture for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openmovieeditor.sourceforge.net/HomePage"
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index a0a3a160f..e0339fde1 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102358 2013-12-09 12:50:15Z spupykin $
+# $Id: PKGBUILD 105557 2014-02-10 11:18:20Z 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.8.0
+pkgver=1.5.8.3
 pkgrel=1
 arch=("i686" "x86_64" "mips64el")
 url="http://gmic.sourceforge.net"
@@ -15,20 +15,20 @@ 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=('286d99392a80aaaf2dbcda2ec95f021e'
+md5sums=('ee80a2dc1a2441a6c0adf92e9bea623b'
          '120319b0d6c81c5af186abe2281b79ca')
 
 prepare() {
   cd "${srcdir}/gmic-${pkgver}"
   patch -p1 -i "${srcdir}/opencv-buildfix.patch"
-  find "${srcdir}/gmic-${pkgver}/zart" -type f -execdir chmod 644 '{}' \;
-  find "${srcdir}/gmic-${pkgver}/zart" -type d -execdir chmod 755 '{}' \;
-  sed -i 's|qmake zart.pro|qmake-qt4 zart.pro|' src/Makefile
+  sed -i 's|qmake zart.pro|qmake-qt4 zart.pro|g' src/Makefile
+  sed -i 's|/usr/bin/qmake|/usr/bin/qmake-qt4|g' zart/Makefile
 }
 
 build() {
   cd "${srcdir}/gmic-${pkgver}"
   make -C src all
+  make -C zart all
 }
 
 package_gmic() {
@@ -47,9 +47,8 @@ package_zart() {
   depends=("opencv" "fftw" "qt4")
 
   cd "${srcdir}/gmic-${pkgver}"
-  make -C src install DESTDIR="$pkgdir" USR="/usr"
+  install -Dm755 zart/zart "${pkgdir}/usr/bin/zart"
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  rm -rf "${pkgdir}/usr/"{bin/gmic,include,lib,share/{man,bash-completion}}
 }
 
 package_gimp-plugin-gmic() {
diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD
index f2ef8ee2d..06eb7ecb3 100644
--- a/community/gnome-commander/PKGBUILD
+++ b/community/gnome-commander/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103047 2013-12-25 19:18:23Z jlichtblau $
+# $Id: PKGBUILD 104056 2014-01-14 22:32:49Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
@@ -6,18 +6,19 @@
 # Contributor: Johannes Sjolund <j.sjolund@gmail.com>
 
 pkgname=gnome-commander
-pkgver=1.2.8.16
+pkgver=1.2.8.17
 pkgrel=1
 pkgdesc='Graphical two-pane filemanager for Gnome'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.nongnu.org/gcmd/'
+url='http://gcmd.github.io/'
 license=('GPL')
 depends=('libgnomeui' 'gnome-vfs' 'gconf' 'python2' 'libsm')
-makedepends=('perlxml' 'gnome-doc-utils' 'intltool')
+makedepends=('perl-xml-parser' 'gnome-doc-utils' 'intltool')
 install=$pkgname.install
+changelog=$pkgname.changelog
 source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz
 	      gnome-commander-1.2.8.15-build.patch)
-sha256sums=('84d653fab2eaec233b6d899f339099c2fa2d2d5cbdb7a33bd7022c34ed901347'
+sha256sums=('135033ad2073c9d6fee51a52f1e7a56358b8e3a6fa46d64188dc3feebfe00606'
 	          '856e9c1a17acbb97772ed93d01d81746098e03f5c06375cc976fc784a0011088')
 
 # mips64el patch
diff --git a/community/gnome-commander/gnome-commander.changelog b/community/gnome-commander/gnome-commander.changelog
new file mode 100644
index 000000000..a562c5ae7
--- /dev/null
+++ b/community/gnome-commander/gnome-commander.changelog
@@ -0,0 +1,2 @@
+2014-01-14 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
+	* gnome-commander 1.2.8.17-1
diff --git a/community/gnome-do/PKGBUILD b/community/gnome-do/PKGBUILD
index eea49c48f..93f8ff58a 100644
--- a/community/gnome-do/PKGBUILD
+++ b/community/gnome-do/PKGBUILD
@@ -1,30 +1,23 @@
-# $Id: PKGBUILD 99772 2013-10-30 23:37:16Z allan $
+# $Id: PKGBUILD 105487 2014-02-09 06:17:37Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Doehni <dohny@gmx.de>
 
 pkgname=gnome-do
-pkgver=0.9
-pkgrel=2
+pkgver=0.95.1
+pkgrel=1
 pkgdesc="Quickly search for many items present on your desktop or the web, and perform useful actions on those items"
 arch=('i686' 'x86_64')
-url="http://do.davebsd.com/"
+url="https://launchpad.net/do"
 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')
+depends=('gconf-sharp' 'gnome-desktop2' 'gnome-keyring-sharp' 'mono-addins' 'notify-sharp' 'gkeyfile-sharp' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('intltool' 'gio-sharp')
 install=$pkgname.install
-source=(http://launchpad.net/do/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz
-        gio-gnomedesktop.patch)
-md5sums=('d360e56953915d9585c0ee71f433129c'
-         'e9ac5e4510c1475d61a20c5d94594d98')
+source=(http://launchpad.net/do/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz)
+md5sums=('1f61376718d75d3defcdf81958754296')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
-  # https://code.launchpad.net/~ballogy/do/gio-gnomedesktop-port/+merge/95842
-  patch -Np1 -i "$srcdir/gio-gnomedesktop.patch"
-
-  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc \
               --disable-schemas-install \
               --with-gconf-schema-file-dir=/usr/share/gconf/schemas
@@ -33,6 +26,5 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/gnome-do/gio-gnomedesktop.patch b/community/gnome-do/gio-gnomedesktop.patch
deleted file mode 100644
index 358b0b731..000000000
--- a/community/gnome-do/gio-gnomedesktop.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-diff -Naur gnome-do-0.9.orig/configure.ac gnome-do-0.9/configure.ac
---- gnome-do-0.9.orig/configure.ac	2012-03-04 08:46:12.000000000 +0100
-+++ gnome-do-0.9/configure.ac	2012-06-24 19:31:49.150955445 +0200
-@@ -60,17 +60,29 @@
- PKG_CHECK_MODULES([GCONF_SHARP_20], [gconf-sharp-2.0])
- PKG_CHECK_MODULES([GLADE_SHARP_20], [glade-sharp-2.0])
- PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
-+
-+dnl gio-sharp is an unstable api library
-+PKG_CHECK_MODULES([GIO_SHARP], [gio-sharp-2.0])
-+files="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0`"
-+for file in $files; do
-+	GIO_SHARP_SOURCE_ASSEMBLIES="$GIO_SHARP_SOURCE_ASSEMBLIES $file"
-+	GIO_SHARP_ASSEMBLIES="$GIO_SHARP_ASSEMBLIES $top_srcdir/build/$(basename $file)"
-+	[[ -r "$file.config" ]] && GIO_SHARP_SOURCE_ASSEMBLIES="$GIO_SHARP_SOURCE_ASSEMBLIES $file.config"
-+	[[ -r "$file.config" ]] && GIO_SHARP_ASSEMBLIES="$GIO_SHARP_ASSEMBLIES $top_srcdir/build/$(basename $file).config"
-+
-+	GIO_SHARP_LIBS="$GIO_SHARP_LIBS -r:$top_srcdir/build/$(basename $file)"
-+done
-+AC_SUBST([GIO_SHARP_SOURCE_ASSEMBLIES])
-+AC_SUBST([GIO_SHARP_ASSEMBLIES])
-+AC_SUBST([GIO_SHARP_LIBS])
-+
- PKG_CHECK_MODULES([GNOME_DESKTOP_SHARP_20], [gnome-desktop-sharp-2.0])
- PKG_CHECK_MODULES([GNOME_KEYRING_SHARP], [gnome-keyring-sharp-1.0])
--PKG_CHECK_MODULES([GNOME_SHARP_20], [gnome-sharp-2.0])
--PKG_CHECK_MODULES([GNOME_VFS_SHARP_20], [gnome-vfs-sharp-2.0])
- PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
--PKG_CHECK_MODULES([LIBRSVG_SHARP], [rsvg2-sharp-2.0])
- PKG_CHECK_MODULES([MONO_ADDINS], [mono-addins])
- PKG_CHECK_MODULES([MONO_ADDINS_GUI], [mono-addins-gui])
- PKG_CHECK_MODULES([MONO_ADDINS_SETUP], [mono-addins-setup])
- PKG_CHECK_MODULES([NOTIFY_SHARP], [notify-sharp])
--PKG_CHECK_MODULES([WNCK_SHARP_10], [wnck-sharp-1.0])
- 
- 
- AC_SUBST([GCONF_SHARP_20_LIBS])
-@@ -78,10 +90,7 @@
- AC_SUBST([GLIB_SHARP_20_LIBS])
- AC_SUBST([GNOME_DESKTOP_SHARP_20_LIBS])
- AC_SUBST([GNOME_KEYRING_SHARP_LIBS])
--AC_SUBST([GNOME_SHARP_20_LIBS])
--AC_SUBST([GNOME_VFS_SHARP_20_LIBS])
- AC_SUBST([GTK_SHARP_20_LIBS])
--AC_SUBST([LIBRSVG_SHARP_LIBS])
- AC_SUBST([MONO_ADDINS_LIBS])
- AC_SUBST([MONO_ADDINS_GUI_LIBS])
- AC_SUBST([MONO_ADDINS_SETUP_LIBS])
-diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/Do.Platform.Linux.dll.config.in gnome-do-0.9/Do.Platform.Linux/Do.Platform.Linux.dll.config.in
---- gnome-do-0.9.orig/Do.Platform.Linux/Do.Platform.Linux.dll.config.in	2012-01-14 14:49:58.000000000 +0100
-+++ gnome-do-0.9/Do.Platform.Linux/Do.Platform.Linux.dll.config.in	2012-06-24 19:31:49.124289904 +0200
-@@ -1,3 +1,4 @@
- <configuration>
- 	<dllmap dll="libdo" target="@expanded_libdir@/@PACKAGE@/libdo.so"/>
-+	<dllmap dll="gnome-desktop-2" target="libgnome-desktop-2.so.17"/>
- </configuration>
-diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/Makefile.am gnome-do-0.9/Do.Platform.Linux/Makefile.am
---- gnome-do-0.9.orig/Do.Platform.Linux/Makefile.am	2012-01-14 14:49:58.000000000 +0100
-+++ gnome-do-0.9/Do.Platform.Linux/Makefile.am	2012-06-24 19:31:49.127623096 +0200
-@@ -27,6 +27,8 @@
- 	src/Do.Platform/Do.Platform.Linux/KeyBindingService.cs \
- 	src/Do.Universe/ApplicationItem.cs \
- 	src/Do.Universe/CategoryItem.cs \
-+	src/Do.Universe/Desktop.cs \
-+	src/Do.Universe/DesktopThumbnailSize.cs \
- 	src/Do.Universe/NullApplicationItem.cs \
- 	src/Do.Universe/FileItem.cs \
- 	src/Do.Universe/ApplicationItemSource.cs \
-@@ -54,7 +56,7 @@
- 	Mono.Posix \
- 	$(GTK_SHARP_20_LIBS) \
- 	$(GNOME_KEYRING_SHARP_LIBS) \
--	$(GNOME_SHARP_20_LIBS) \
-+	$(GIO_SHARP_LIBS) \
- 	$(GNOME_DESKTOP_SHARP_20_LIBS) \
- 	$(GCONF_SHARP_20_LIBS) \
- 	$(MONO_ADDINS_LIBS) \
-diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs gnome-do-0.9/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs
---- gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs	2012-01-14 14:49:58.000000000 +0100
-+++ gnome-do-0.9/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs	2012-06-24 19:31:49.130956287 +0200
-@@ -166,7 +166,8 @@
- 		
- 		string AutoStartUri {
- 			get {
--				return Gnome.Vfs.Uri.GetUriFromLocalPath (AutoStartFileName);
-+				var uri = new Uri(AutoStartFileName).ToString();
-+				return uri;
- 			}
- 		}
- 		
-diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/Desktop.cs gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/Desktop.cs
---- gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/Desktop.cs	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/Desktop.cs	2012-06-24 19:31:49.134289478 +0200
-@@ -0,0 +1,76 @@
-+// This file was generated by the Gtk# code generator.
-+// Any changes made will be lost if regenerated.
-+
-+namespace Gnome {
-+
-+	using System;
-+	using System.Runtime.InteropServices;
-+
-+#region Autogenerated code
-+	public class Desktop {
-+
-+		[DllImport("gnome-desktop-2")]
-+		static extern void gnome_desktop_prepend_terminal_to_vector(out int argc, IntPtr argv);
-+
-+		public static int PrependTerminalToVector(string argv) {
-+			int argc;
-+			gnome_desktop_prepend_terminal_to_vector(out argc, GLib.Marshaller.StringToPtrGStrdup(argv));
-+			return argc;
-+		}
-+
-+		[DllImport("gnome-desktop-2")]
-+		static extern bool gnome_desktop_thumbnail_has_uri(IntPtr pixbuf, IntPtr uri);
-+
-+		public static bool ThumbnailHasUri(Gdk.Pixbuf pixbuf, string uri) {
-+			IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri);
-+			bool raw_ret = gnome_desktop_thumbnail_has_uri(pixbuf == null ? IntPtr.Zero : pixbuf.Handle, native_uri);
-+			bool ret = raw_ret;
-+			GLib.Marshaller.Free (native_uri);
-+			return ret;
-+		}
-+
-+		[DllImport("gnome-desktop-2")]
-+		static extern IntPtr gnome_desktop_thumbnail_scale_down_pixbuf(IntPtr pixbuf, int dest_width, int dest_height);
-+
-+		public static Gdk.Pixbuf ThumbnailScaleDownPixbuf(Gdk.Pixbuf pixbuf, int dest_width, int dest_height) {
-+			IntPtr raw_ret = gnome_desktop_thumbnail_scale_down_pixbuf(pixbuf == null ? IntPtr.Zero : pixbuf.Handle, dest_width, dest_height);
-+			Gdk.Pixbuf ret = GLib.Object.GetObject(raw_ret) as Gdk.Pixbuf;
-+			return ret;
-+		}
-+
-+		[DllImport("gnome-desktop-2")]
-+		static extern IntPtr gnome_desktop_thumbnail_path_for_uri(IntPtr uri, int size);
-+
-+		public static string ThumbnailPathForUri(string uri, Gnome.DesktopThumbnailSize size) {
-+			IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri);
-+			IntPtr raw_ret = gnome_desktop_thumbnail_path_for_uri(native_uri, (int) size);
-+			string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
-+			GLib.Marshaller.Free (native_uri);
-+			return ret;
-+		}
-+
-+		[DllImport("gnome-desktop-2")]
-+		static extern bool gnome_desktop_thumbnail_is_valid(IntPtr pixbuf, IntPtr uri, IntPtr mtime);
-+
-+		public static bool ThumbnailIsValid(Gdk.Pixbuf pixbuf, string uri, System.DateTime mtime) {
-+			IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri);
-+			bool raw_ret = gnome_desktop_thumbnail_is_valid(pixbuf == null ? IntPtr.Zero : pixbuf.Handle, native_uri, GLib.Marshaller.DateTimeTotime_t (mtime));
-+			bool ret = raw_ret;
-+			GLib.Marshaller.Free (native_uri);
-+			return ret;
-+		}
-+
-+		[DllImport("gnome-desktop-2")]
-+		static extern IntPtr gnome_desktop_thumbnail_md5(IntPtr uri);
-+
-+		public static string ThumbnailMd5(string uri) {
-+			IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri);
-+			IntPtr raw_ret = gnome_desktop_thumbnail_md5(native_uri);
-+			string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
-+			GLib.Marshaller.Free (native_uri);
-+			return ret;
-+		}
-+
-+#endregion
-+	}
-+}
-diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs
---- gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs	2012-06-24 19:31:49.137622670 +0200
-@@ -0,0 +1,16 @@
-+// This file was generated by the Gtk# code generator.
-+// Any changes made will be lost if regenerated.
-+
-+namespace Gnome {
-+
-+	using System;
-+	using System.Runtime.InteropServices;
-+
-+#region Autogenerated code
-+	public enum DesktopThumbnailSize {
-+
-+		Normal,
-+		Large,
-+	}
-+#endregion
-+}
-diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/FileItem.cs gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/FileItem.cs
---- gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/FileItem.cs	2012-01-14 14:49:58.000000000 +0100
-+++ gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/FileItem.cs	2012-06-24 19:31:49.140955864 +0200
-@@ -63,8 +63,6 @@
- 
- 		static FileItem ()
- 		{
--			Gnome.Vfs.Vfs.Initialize ();
--
- 			// Initialize SpecialFolderIcons by expanding paths in
- 			// SpecialFolderIconsXDG.
- 			//
-@@ -130,7 +128,11 @@
- 		}
- 
- 		public string MimeType {
--			get { return Gnome.Vfs.Global.GetMimeType (Path); }
-+			get {
-+				GLib.File file = GLib.FileFactory.NewFromCommandlineArg(Path);
-+				var info = file.QueryInfo ("standard::content-type", GLib.FileQueryInfoFlags.None, null);
-+				return info.ContentType;
-+			}
- 		}
- 
- 		public override string Icon {
-@@ -142,8 +144,8 @@
- 				icon = MaybeGetSpecialFolderIconForPath (Path);
- 				if (icon != null) return icon;
- 
--				string large_thumb = Thumbnail.PathForUri (Uri, ThumbnailSize.Large);
--				string normal_thumb = Thumbnail.PathForUri (Uri, ThumbnailSize.Normal);
-+				string large_thumb = Desktop.ThumbnailPathForUri (Uri, DesktopThumbnailSize.Large);
-+				string normal_thumb = Desktop.ThumbnailPathForUri (Uri, DesktopThumbnailSize.Normal);
- 
- 				// Generating the thumbnail ourself is too slow for large files.
- 				// Suggestion: generate thumbnails asynchronously. Banshee's
-diff -Naur gnome-do-0.9.orig/Makefile.am gnome-do-0.9/Makefile.am
---- gnome-do-0.9.orig/Makefile.am	2012-01-14 14:49:58.000000000 +0100
-+++ gnome-do-0.9/Makefile.am	2012-06-24 19:31:56.837297364 +0200
-@@ -2,6 +2,22 @@
- 
- ACLOCAL_AMFLAGS = -I m4 -I m4/shamrock
- 
-+# Install copied assemblies to our libdir
-+copiedlibsdir = $(pkglibdir)
-+copiedlibs_DATA = \
-+	$(GIO_SHARP_ASSEMBLIES)
-+
-+$(GIO_SHARP_ASSEMBLIES): $(GIO_SHARP_SOURCE_ASSEMBLIES) 
-+	@mkdir -p $(top_builddir)/build
-+	@for file in $@ ; do \
-+		for source in $? ; do \
-+			if [ $$(basename $$source) == $$(basename $$file) ] ; then \
-+				echo " CP " $$(basename $$file) ; \
-+				cp $$source $$file ; \
-+			fi ;\
-+		done ; \
-+	done
-+
- SUBDIRS = \
- 	. \
- 	data \
diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD
index c44dd68ba..c69f64577 100644
--- a/community/gnunet-gtk/PKGBUILD
+++ b/community/gnunet-gtk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99780 2013-10-30 23:40:28Z allan $
+# $Id: PKGBUILD 103912 2014-01-13 17:16:43Z andyrtr $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: wahnby <wahnby@yahoo.fr>
 
 pkgname=gnunet-gtk
-pkgver=0.9.5
-pkgrel=2
+pkgver=0.10.0
+pkgrel=1
 pkgdesc="A frontend for GNUnet"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gnunet.org"
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('gnunet' 'glade' 'adns')
 makedepends=('pkgconfig')
 source=(ftp://ftp.gnu.org/gnu/gnunet/$pkgname-$pkgver.tar.gz)
-md5sums=('2e48a1e92de99b14c936a270bb05309a')
+md5sums=('1a036f1956460cc1ea4c34f1b19bb6b1')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD
index e0f871c9b..924c6b61d 100644
--- a/community/gnunet/PKGBUILD
+++ b/community/gnunet/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id: PKGBUILD 99779 2013-10-30 23:40:06Z allan $
+# $Id: PKGBUILD 105576 2014-02-10 13:48:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: wahnby <wahnby@yahoo.fr>
 
 pkgname=gnunet
-pkgver=0.9.5_a
+pkgver=0.10.0
 pkgrel=2
 pkgdesc="A framework for secure peer-to-peer networking"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gnunet.org"
 license=('GPL')
-depends=('gmp' 'libgcrypt' 'libextractor' 'sqlite' 'curl'
+depends=('gmp' 'libgcrypt' 'libextractor' 'sqlite' 'gnurl'
 	 'libmicrohttpd' 'libunistring' 'libidn')
-makedepends=('gettext' 'pkgconfig')
+makedepends=('gettext' 'pkgconfig'
+	     'bluez-libs' 'python' 'glpk' 'libpulse')
+optdepends=('bluez-libs'
+	    'python'
+	    'glpk'
+	    'libpulse')
 backup=(etc/gnunetd.conf)
 options=('!makeflags')
 install=gnunet.install
 source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-${pkgver/_/}.tar.gz
 	gnunet.service
 	defaults.conf)
-md5sums=('b0e204cf9711f9799baaeb477992e66a'
+md5sums=('8bff8280c90780b17786fd8b95f12f72'
          '54cce3d2415d95b2e5bd1bd88db3a0ea'
          '0fe23b2ca5b3fc47a0b5645e04406da0')
 
diff --git a/community/gnurl/PKGBUILD b/community/gnurl/PKGBUILD
new file mode 100644
index 000000000..d4e36360c
--- /dev/null
+++ b/community/gnurl/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 105578 2014-02-10 13:48:16Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=gnurl
+pkgver=7.34.0
+pkgrel=1
+pkgdesc="fork of libcurl, which is mostly for GNUnet"
+arch=(i686 x86_64)
+url="https://gnunet.org/gnurl"
+license=('MIT')
+depends=()
+makedepends=()
+source=(https://gnunet.org/sites/default/files/gnurl-$pkgver.tar.bz2)
+md5sums=('c9b0faf03b9286aace01fefb62069088')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure \
+        --prefix=/usr \
+        --mandir=/usr/share/man \
+        --disable-ldap \
+        --disable-ldaps \
+        --enable-ipv6 \
+        --enable-manual \
+        --enable-versioned-symbols \
+        --enable-threaded-resolver \
+        --with-gssapi \
+        --without-libidn \
+        --with-random=/dev/urandom \
+        --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+  rm -rf $pkgdir/usr/share/man \
+    $pkgdir/usr/bin/curl \
+    $pkgdir/usr/share/aclocal
+  mkdir -p $pkgdir/usr/include/gnurl
+  mv $pkgdir/usr/include/curl $pkgdir/usr/include/gnurl/curl
+  sed -i 's|includedir=.*|includedir=/usr/include/gnurl|g' $pkgdir/usr/lib/pkgconfig/libgnurl.pc
+}
diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD
index 12929567e..192957150 100644
--- a/community/gnustep-base/PKGBUILD
+++ b/community/gnustep-base/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 98739 2013-10-17 14:01:46Z andyrtr $
+# $Id: PKGBUILD 103913 2014-01-13 17:16:45Z 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=3
+pkgrel=5
 pkgdesc="The GNUstep base package"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnustep.org/"
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index 52f9e77a8..d3bbcd4c0 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 101866 2013-12-02 13:37:29Z arodseth $
+# $Id: PKGBUILD 104859 2014-01-27 16:24:41Z 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.2
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc='Compiler and tools for the Go programming language from Google'
 arch=('x86_64' 'i686')
@@ -24,15 +24,11 @@ install="$pkgname.install"
 backup=('usr/lib/go/bin')
 
 if [ "$CARCH" == 'x86_64' ]; then
-  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz"
-          "$pkgname.sh")
-  sha256sums=('1252ca0aa0a96d53c0592fbc4ea9c9ff5c6b588169c92e08d06da9d89d9d91f2'
-              'b6209904c88bde96efcac846c267e308e4dc39c8a45f2690204c2175de4b9b0a')
+  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz")
+  sha256sums=('1252ca0aa0a96d53c0592fbc4ea9c9ff5c6b588169c92e08d06da9d89d9d91f2')
 else
-  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz"
-          "$pkgname.sh")
-  sha256sums=('3f51aacc7af60c520fe1071f3cb1d9ceee5db0e8fdfb7168a73e12fd7603e651'
-              'b6209904c88bde96efcac846c267e308e4dc39c8a45f2690204c2175de4b9b0a')
+  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz")
+  sha256sums=('3f51aacc7af60c520fe1071f3cb1d9ceee5db0e8fdfb7168a73e12fd7603e651')
 fi
 
 build() {
@@ -41,10 +37,9 @@ build() {
   export GOROOT_FINAL=/usr/lib/go
 
   #
-  # 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.
+  # Arch Linux doesn't support SSE2 for i686 (to support older CPUs)
+  # The SSE2 version is _a lot_ faster for i686.
+  # This line disables it.
   #
   export GO386=387
 
@@ -134,9 +129,6 @@ package() {
   install -Dm644 src/pkg/runtime/cgocall.h \
     "$pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h"
 
-  # For packages that source /etc/profile.d/go.sh
-  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh"
-
   # This is to make go get code.google.com/p/go-tour/gotour and
   # then running the gotour executable work out of the box.
   ln -sf /usr/bin "$pkgdir/usr/lib/go/bin"
diff --git a/community/go/go.install b/community/go/go.install
index e0610f3c5..286aaf9dd 100644
--- a/community/go/go.install
+++ b/community/go/go.install
@@ -1,10 +1,13 @@
 post_install() {
   # Friendly message for new users
-  echo "Example use of the \"go\" tool:"
-  echo '    mkdir ~/mygoproject'
-  echo '    export GOPATH=~/mygoproject'
-  echo '    export PATH=\$PATH:\$GOPATH/bin'
-  echo '    go get github.com/codegangsta/martini'
+  echo
+  echo 'Example use of the "go" tool:'
+  echo
+  echo '    mkdir ~/go'
+  echo '    export GOPATH=~/go'
+  echo '    export PATH=$PATH:~/go/bin'
+  echo '    go get code.google.com/p/go-tour/gotour'
+  echo
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/go/go.sh b/community/go/go.sh
deleted file mode 100644
index 8393dc8d2..000000000
--- a/community/go/go.sh
+++ /dev/null
@@ -1 +0,0 @@
-export GOROOT=/usr/lib/go
diff --git a/community/gogglesmm/PKGBUILD b/community/gogglesmm/PKGBUILD
index bb3df682f..3f0bc2b55 100644
--- a/community/gogglesmm/PKGBUILD
+++ b/community/gogglesmm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81309 2012-12-17 10:05:29Z spupykin $
+# $Id: PKGBUILD 103914 2014-01-13 17:16:46Z andyrtr $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sander Jansen <sander@knology.net>
 
 pkgname=gogglesmm
 pkgver=0.12.7
-pkgrel=1
+pkgrel=3
 pkgdesc="Music Manager and Player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/gogglesmm/"
diff --git a/community/gq/PKGBUILD b/community/gq/PKGBUILD
index 595f70f28..9f0f7a8d0 100644
--- a/community/gq/PKGBUILD
+++ b/community/gq/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65588 2012-02-21 09:13:40Z spupykin $
+# $Id: PKGBUILD 103915 2014-01-13 17:16:47Z andyrtr $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Gergely Tamas <dice@mfa.kfki.hu>
 
 pkgname=gq
 pkgver=1.3.4
-pkgrel=2.1
+pkgrel=3
 pkgdesc="interactive graphical LDAP browser"
 url="http://sourceforge.net/projects/gqclient"
 license=("GPL")
@@ -13,14 +13,22 @@ makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils')
 arch=('i686' 'x86_64' 'mips64el')
 install=gq.install
 source=(http://downloads.sourceforge.net/sourceforge/gqclient/$pkgname-$pkgver.tar.gz
-        glib-includes.patch)
+	glib-headers-fix.patch)
 md5sums=('d7b1e183a3ecbd77aceea02d27f36b3e'
-         'fa7d0f5f40953324dba108993d004807')
+         '4a98232c5a908c86216c7d9e235d4c0b')
+
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+  patch -p1 <$srcdir/glib-headers-fix.patch
+}
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -p1 -i "$srcdir/glib-includes.patch"
   LDFLAGS=-lcrypto ./configure --prefix=/usr --disable-debugging --disable-update-mimedb
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/gq/glib-headers-fix.patch b/community/gq/glib-headers-fix.patch
new file mode 100644
index 000000000..19e0846d7
--- /dev/null
+++ b/community/gq/glib-headers-fix.patch
@@ -0,0 +1,124 @@
+diff -wbBur gq-1.3.4/src/glib-helpers.h gq-1.3.4.my/src/glib-helpers.h
+--- gq-1.3.4/src/glib-helpers.h	2008-01-09 19:35:12.000000000 +0300
++++ gq-1.3.4.my/src/glib-helpers.h	2013-12-25 18:53:46.695364792 +0400
+@@ -24,7 +24,7 @@
+ #ifndef GLIB_HELPERS_H
+ #define GLIB_HELPERS_H
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+diff -wbBur gq-1.3.4/src/gq-hash.h gq-1.3.4.my/src/gq-hash.h
+--- gq-1.3.4/src/gq-hash.h	2008-01-09 19:35:12.000000000 +0300
++++ gq-1.3.4.my/src/gq-hash.h	2013-12-25 18:54:12.485364495 +0400
+@@ -24,7 +24,7 @@
+ #ifndef GQ_ENCRYPTION_H
+ #define GQ_ENCRYPTION_H
+ 
+-#include <glib/garray.h>
++#include <glib.h>
+ #include "gq-utilities.h"
+ 
+ G_BEGIN_DECLS
+diff -wbBur gq-1.3.4/src/gq-ldap.h gq-1.3.4.my/src/gq-ldap.h
+--- gq-1.3.4/src/gq-ldap.h	2008-02-14 00:15:05.000000000 +0300
++++ gq-1.3.4.my/src/gq-ldap.h	2013-12-25 16:28:25.672131705 +0400
+@@ -24,7 +24,7 @@
+ #ifndef GQ_LDAP_H
+ #define GQ_LDAP_H
+ 
+-
++#define LDAP_DEPRECATED 1
+ 
+ #include <ldap.h>
+ 
+diff -wbBur gq-1.3.4/src/gq-main-loop.h gq-1.3.4.my/src/gq-main-loop.h
+--- gq-1.3.4/src/gq-main-loop.h	2008-01-09 19:35:12.000000000 +0300
++++ gq-1.3.4.my/src/gq-main-loop.h	2013-12-25 18:54:29.135364303 +0400
+@@ -24,7 +24,7 @@
+ #ifndef GQ_MAIN_LOOP_H
+ #define GQ_MAIN_LOOP_H
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+diff -wbBur gq-1.3.4/src/gq-marshallers.c gq-1.3.4.my/src/gq-marshallers.c
+--- gq-1.3.4/src/gq-marshallers.c	2008-01-09 20:44:57.000000000 +0300
++++ gq-1.3.4.my/src/gq-marshallers.c	2013-12-25 16:28:26.202131699 +0400
+@@ -5,7 +5,7 @@
+ 
+ #ifdef G_ENABLE_DEBUG
+ #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
+-#define g_marshal_value_peek_char(v)     g_value_get_char (v)
++#define g_marshal_value_peek_char(v)     g_value_get_schar (v)
+ #define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
+ #define g_marshal_value_peek_int(v)      g_value_get_int (v)
+ #define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
+@@ -22,6 +22,7 @@
+ #define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
+ #define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
+ #define g_marshal_value_peek_object(v)   g_value_get_object (v)
++#define g_marshal_value_peek_variant(v)  g_value_get_variant (v)
+ #else /* !G_ENABLE_DEBUG */
+ /* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
+  *          Do not access GValues directly in your code. Instead, use the
+@@ -45,16 +46,17 @@
+ #define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
+ #define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
+ #define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
++#define g_marshal_value_peek_variant(v)  (v)->data[0].v_pointer
+ #endif /* !G_ENABLE_DEBUG */
+ 
+ 
+ /* VOID:OBJECT,INT (gq-marshallers.list:1) */
+ void
+ gq_marshal_VOID__OBJECT_INT (GClosure     *closure,
+-                             GValue       *return_value,
++                             GValue       *return_value G_GNUC_UNUSED,
+                              guint         n_param_values,
+                              const GValue *param_values,
+-                             gpointer      invocation_hint,
++                             gpointer      invocation_hint G_GNUC_UNUSED,
+                              gpointer      marshal_data)
+ {
+   typedef void (*GMarshalFunc_VOID__OBJECT_INT) (gpointer     data1,
+diff -wbBur gq-1.3.4/src/gq-stack.h gq-1.3.4.my/src/gq-stack.h
+--- gq-1.3.4/src/gq-stack.h	2008-01-09 19:35:12.000000000 +0300
++++ gq-1.3.4.my/src/gq-stack.h	2013-12-25 18:54:46.318697439 +0400
+@@ -24,7 +24,7 @@
+ #ifndef GQ_STACK_H
+ #define GQ_STACK_H
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+diff -wbBur gq-1.3.4/src/gq-tab.h gq-1.3.4.my/src/gq-tab.h
+--- gq-1.3.4/src/gq-tab.h	2008-01-09 19:35:12.000000000 +0300
++++ gq-1.3.4.my/src/gq-tab.h	2013-12-25 18:55:10.392030496 +0400
+@@ -24,7 +24,7 @@
+ #ifndef GQ_TAB_H
+ #define GQ_TAB_H
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+diff -wbBur gq-1.3.4/src/syntax.h gq-1.3.4.my/src/syntax.h
+--- gq-1.3.4/src/syntax.h	2008-01-09 19:35:13.000000000 +0300
++++ gq-1.3.4.my/src/syntax.h	2013-12-25 18:53:19.428698438 +0400
+@@ -27,7 +27,7 @@
+ #ifndef GQ_SYNTAX_H_INCLUDED
+ #define GQ_SYNTAX_H_INCLUDED
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/community/gsmartcontrol/PKGBUILD b/community/gsmartcontrol/PKGBUILD
index 9b557fac7..895dfbe84 100644
--- a/community/gsmartcontrol/PKGBUILD
+++ b/community/gsmartcontrol/PKGBUILD
@@ -2,49 +2,50 @@
 
 pkgname=gsmartcontrol
 pkgver=0.8.7
-pkgrel=3
+pkgrel=4
 pkgdesc="A graphical user interface for the smartctl hard disk drive health inspection tool."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gsmartcontrol.berlios.de/home/index.php/en/Home"
 license=('GPL3')
-depends=('smartmontools' 'gtkmm' 'xorg-xmessage' 'hicolor-icon-theme' 'polkit')
-optdepends=('polkit-gnome: to run gsmartcontrol directly from menu')
+depends=('smartmontools' 'gtkmm' 'xorg-xmessage' 'hicolor-icon-theme')
+optdepends=('polkit: to run gsmartcontrol directly from menu')
 install=${pkgname}.install
 source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2
-        org.archlinux.pkexec.gsmartcontrol.policy)
+        org.archlinux.pkexec.gsmartcontrol.policy
+        gsmartcontrol_polkit)
 md5sums=('6d104c2ffc1e693cd1a8052a6d7e3b30'
-         'e403f8e06e6b8a3d1a99da5e584b2257')
+         '503989a7e6a9a287d81e91243d03f162'
+         '33bdda04d8db1525f2507485f3f2a663')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+        # Modify desktop file
+        sed -i "s|^Exec=.*|Exec="@prefix@/bin/gsmartcontrol_polkit"|" \
+                data/gsmartcontrol.desktop.in
+}
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --prefix=/usr
 	make 
 }
 
 check() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+	cd "${srcdir}/${pkgname}-${pkgver}"
         make check
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	make DESTDIR=${pkgdir} install
 
-        # We need rename the original binary
-        mv "${pkgdir}/usr/bin/gsmartcontrol" "${pkgdir}/usr/bin/gsmartcontrol.elf"
-
         # Install launcher script
-        echo '#!/bin/sh' > ${pkgdir}/usr/bin/gsmartcontrol
-        echo 'pkexec --disable-internal-agent "/usr/bin/gsmartcontrol.elf" "$@"' \
-                >> ${pkgdir}/usr/bin/gsmartcontrol
-        chmod 755 ${pkgdir}/usr/bin/gsmartcontrol
-
-        # Modify desktop file
-        sed -i -e "s|^Exec=.*|Exec=/usr/bin/gsmartcontrol|" \
-                "${pkgdir}/usr/share/applications/gsmartcontrol.desktop"
+        install -m755 ${srcdir}/gsmartcontrol_polkit \
+                "${pkgdir}/usr/bin/gsmartcontrol_polkit"
 
         # Install policy file
-        install -Dm766 $srcdir/org.archlinux.pkexec.gsmartcontrol.policy \
-                $pkgdir/usr/share/polkit-1/actions/org.archlinux.pkexec.gsmartcontrol.policy
+        install -Dm644 ${srcdir}/org.archlinux.pkexec.gsmartcontrol.policy \
+                "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gsmartcontrol.policy"
 }
diff --git a/community/gsmartcontrol/gsmartcontrol.desktop b/community/gsmartcontrol/gsmartcontrol.desktop
deleted file mode 100644
index e65a26ef6..000000000
--- a/community/gsmartcontrol/gsmartcontrol.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=GSmartControl
-GenericName=Hard Disk Health Inspection
-Comment=Monitor and control SMART data on hard disks
-Icon=gsmartcontrol
-Exec=pkexec /usr/bin/gsmartcontrol
-Type=Application
-Categories=GTK;GNOME;System;Filesystem;
diff --git a/community/gsmartcontrol/gsmartcontrol.install b/community/gsmartcontrol/gsmartcontrol.install
index f636406f2..b711352cb 100644
--- a/community/gsmartcontrol/gsmartcontrol.install
+++ b/community/gsmartcontrol/gsmartcontrol.install
@@ -1,14 +1,11 @@
 post_install() {
   which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-  echo 'If you use a lightweight windowmanager, remember to run'
-  echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable'
-  echo 'graphical authentication, which may be needed for pkexec to work.'
 }
 
 post_upgrade() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+  post_install $1
 }
 
 post_remove() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+  post_install $1
 }
diff --git a/community/gsmartcontrol/gsmartcontrol_polkit b/community/gsmartcontrol/gsmartcontrol_polkit
new file mode 100644
index 000000000..fa7ec8557
--- /dev/null
+++ b/community/gsmartcontrol/gsmartcontrol_polkit
@@ -0,0 +1,6 @@
+#!/bin/bash
+if [ $(which pkexec) ]; then
+	pkexec --disable-internal-agent "/usr/bin/gsmartcontrol" "$@"
+else
+	/usr/bin/gsmartcontrol "$@"
+fi
diff --git a/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy b/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy
index b71db7904..471cd0e86 100644
--- a/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy
+++ b/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy
@@ -12,7 +12,7 @@
       <allow_inactive>auth_admin</allow_inactive>
       <allow_active>auth_admin</allow_active>
     </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gsmartcontrol.elf</annotate>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gsmartcontrol</annotate>
     <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
   </action>
 
diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD
index a3e1f8e85..8e8018c24 100644
--- a/community/gsoap/PKGBUILD
+++ b/community/gsoap/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 101476 2013-11-26 09:44:41Z spupykin $
+# $Id: PKGBUILD 104560 2014-01-22 19:43:31Z 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=3
+pkgver=2.8.17
+pkgrel=1
 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')
@@ -15,7 +15,7 @@ makedepends=('autoconf' 'automake')
 options=('staticlibs')
 source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip
 	LICENSE)
-md5sums=('274d16bea12b111681bcac2283c4c24a'
+md5sums=('381affd6e3ba59effb35725166143014'
          '27aaa3f5166db94d44044c11a7b2c37b')
 
 build() {
diff --git a/community/gtkimageview/PKGBUILD b/community/gtkimageview/PKGBUILD
index fb5ceaf50..5ccaf30a9 100644
--- a/community/gtkimageview/PKGBUILD
+++ b/community/gtkimageview/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 102159 2013-12-06 11:35:48Z giovanni $
+# $Id: PKGBUILD 103868 2014-01-12 20:31:29Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan Blazek <appolito@gmail.com>
 # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
 
 pkgname=gtkimageview
 pkgver=1.6.4
-pkgrel=3.2
+pkgrel=4
 pkgdesc="Simple image viewer widget for GTK2"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://trac.bjourne.webfactional.com/"
+url="https://github.com/GNOME/gtkimageview"
 license=('LGPL2.1')
 depends=('gtk2')
-makedepends=('pkgconfig')
-source=("http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/${pkgname}-${pkgver}.tar.gz?format=raw")
+makedepends=('pkg-config')
+source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('501367b3f50e69a12208dc9c6ad00b18')
 
 build() {
@@ -20,6 +20,7 @@ build() {
 
   ./configure --prefix=/usr \
               --disable-static
+
   make
 }
 
@@ -27,5 +28,6 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
+
   rm -rf "${pkgdir}/usr/share"
 }
diff --git a/community/gtypist/PKGBUILD b/community/gtypist/PKGBUILD
index 025697fc8..167beb14b 100644
--- a/community/gtypist/PKGBUILD
+++ b/community/gtypist/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 92635 2013-06-10 09:42:13Z spupykin $
+# $Id: PKGBUILD 105230 2014-02-03 09:21:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Ben Mazer <blm@groknil.org>
 # Contributor: Mike Douglas <code_monkey@gooeylinux.org>
 
 pkgname=gtypist
-pkgver=2.9.3
+pkgver=2.9.4
 pkgrel=1
 pkgdesc="universal typing tutor"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,15 +15,19 @@ makedepends=('emacs')
 install=gtypist.install
 source=(ftp://ftp.gnu.org/gnu/gtypist/$pkgname-$pkgver.tar.gz
 	ncurses.patch)
-md5sums=('e26c29be0adf345604a802be81712bee'
-         'e37a2e8fe90c6c0c684c1a12d016ee03')
+md5sums=('1b6acd602996b86f8967ab7693b06ec8'
+         'a836141e70941b7e0d3477bc8ecdecdf')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
   patch -p1 <$srcdir/ncurses.patch
   aclocal
   automake --add-missing
   autoreconf
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
diff --git a/community/gtypist/ncurses.patch b/community/gtypist/ncurses.patch
index 9fa484ffd..a1c144562 100644
--- a/community/gtypist/ncurses.patch
+++ b/community/gtypist/ncurses.patch
@@ -1,7 +1,7 @@
-diff -wbBur gtypist-2.9.3/configure.ac gtypist-2.9.3.q/configure.ac
---- gtypist-2.9.3/configure.ac	2013-06-05 22:50:00.000000000 +0400
-+++ gtypist-2.9.3.q/configure.ac	2013-06-10 13:32:54.284038071 +0400
-@@ -44,14 +44,14 @@
+diff -wbBur gtypist-2.9.4/configure.ac gtypist-2.9.4.my/configure.ac
+--- gtypist-2.9.4/configure.ac	2014-02-02 15:38:40.000000000 +0400
++++ gtypist-2.9.4.my/configure.ac	2014-02-03 13:08:53.085983684 +0400
+@@ -44,20 +44,20 @@
  AC_FUNC_STRTOD
  AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify dcgettext getcwd getwd mempcpy memset munmap nl_langinfo setlocale stpcpy strcasecmp strchr strcspn strdup strstr strtoul])
  
@@ -18,12 +18,19 @@ diff -wbBur gtypist-2.9.3/configure.ac gtypist-2.9.3.q/configure.ac
  else
 -   echo -e "Error:  both library and header files for the ncursesw library\n"\
 +   echo -e "Error:  both library and header files for the ncurses library\n"\
-    	"are required to build this package.  See INSTALL file for"\
- 	"further information. On Debian/Ubuntu you need to install libncursesw5-dev."
+        "are required to build this package.  See INSTALL file for"\
+        "further information. On Debian/Ubuntu you need to install libncursesw5-dev."
     exit 1;
-diff -wbBur gtypist-2.9.3/src/cursmenu.c gtypist-2.9.3.q/src/cursmenu.c
---- gtypist-2.9.3/src/cursmenu.c	2013-06-05 22:50:00.000000000 +0400
-+++ gtypist-2.9.3.q/src/cursmenu.c	2013-06-10 13:33:16.610704480 +0400
+ fi
+ AC_SEARCH_LIBS(cbreak, tinfo, [],
+-  [AC_MSG_ERROR([Can't find cbreak() in -lncursesw or -ltinfo])])
++  [AC_MSG_ERROR([Can't find cbreak() in -lncurses or -ltinfo])])
+ 
+ 
+ # iconv
+diff -wbBur gtypist-2.9.4/src/cursmenu.c gtypist-2.9.4.my/src/cursmenu.c
+--- gtypist-2.9.4/src/cursmenu.c	2013-08-18 18:36:14.000000000 +0400
++++ gtypist-2.9.4.my/src/cursmenu.c	2014-02-03 13:09:04.669316878 +0400
 @@ -24,7 +24,7 @@
  #ifdef HAVE_PDCURSES
  #include <curses.h>
@@ -33,9 +40,9 @@ diff -wbBur gtypist-2.9.3/src/cursmenu.c gtypist-2.9.3.q/src/cursmenu.c
  #endif
  
  #include "error.h"
-diff -wbBur gtypist-2.9.3/src/error.c gtypist-2.9.3.q/src/error.c
---- gtypist-2.9.3/src/error.c	2013-06-05 22:50:00.000000000 +0400
-+++ gtypist-2.9.3.q/src/error.c	2013-06-10 13:33:26.124037704 +0400
+diff -wbBur gtypist-2.9.4/src/error.c gtypist-2.9.4.my/src/error.c
+--- gtypist-2.9.4/src/error.c	2013-08-18 18:36:14.000000000 +0400
++++ gtypist-2.9.4.my/src/error.c	2014-02-03 13:09:04.669316878 +0400
 @@ -25,7 +25,7 @@
  #ifdef HAVE_PDCURSES
  #include <curses.h>
@@ -45,9 +52,9 @@ diff -wbBur gtypist-2.9.3/src/error.c gtypist-2.9.3.q/src/error.c
  #endif
  
  #include <stdlib.h>
-diff -wbBur gtypist-2.9.3/src/gtypist.c gtypist-2.9.3.q/src/gtypist.c
---- gtypist-2.9.3/src/gtypist.c	2013-06-05 22:50:00.000000000 +0400
-+++ gtypist-2.9.3.q/src/gtypist.c	2013-06-10 13:33:18.844037788 +0400
+diff -wbBur gtypist-2.9.4/src/gtypist.c gtypist-2.9.4.my/src/gtypist.c
+--- gtypist-2.9.4/src/gtypist.c	2013-08-18 18:36:14.000000000 +0400
++++ gtypist-2.9.4.my/src/gtypist.c	2014-02-03 13:09:04.669316878 +0400
 @@ -31,7 +31,7 @@
  #ifdef HAVE_PDCURSES
  #include <curses.h>
@@ -57,9 +64,9 @@ diff -wbBur gtypist-2.9.3/src/gtypist.c gtypist-2.9.3.q/src/gtypist.c
  #endif
  
  #include <time.h>
-diff -wbBur gtypist-2.9.3/src/script.c gtypist-2.9.3.q/src/script.c
---- gtypist-2.9.3/src/script.c	2013-06-05 22:50:00.000000000 +0400
-+++ gtypist-2.9.3.q/src/script.c	2013-06-10 13:33:21.067371095 +0400
+diff -wbBur gtypist-2.9.4/src/script.c gtypist-2.9.4.my/src/script.c
+--- gtypist-2.9.4/src/script.c	2013-08-18 18:36:14.000000000 +0400
++++ gtypist-2.9.4.my/src/script.c	2014-02-03 13:09:04.669316878 +0400
 @@ -24,7 +24,7 @@
  #ifdef HAVE_PDCURSES
  #include <curses.h>
@@ -69,9 +76,9 @@ diff -wbBur gtypist-2.9.3/src/script.c gtypist-2.9.3.q/src/script.c
  #endif
  
  #include "error.h"
-diff -wbBur gtypist-2.9.3/src/utf8.c gtypist-2.9.3.q/src/utf8.c
---- gtypist-2.9.3/src/utf8.c	2013-06-05 22:50:00.000000000 +0400
-+++ gtypist-2.9.3.q/src/utf8.c	2013-06-10 13:33:23.604037733 +0400
+diff -wbBur gtypist-2.9.4/src/utf8.c gtypist-2.9.4.my/src/utf8.c
+--- gtypist-2.9.4/src/utf8.c	2013-08-18 18:36:14.000000000 +0400
++++ gtypist-2.9.4.my/src/utf8.c	2014-02-03 13:09:04.669316878 +0400
 @@ -23,7 +23,7 @@
  #ifdef HAVE_PDCURSES
  #include <curses.h>
diff --git a/community/guayadeque/PKGBUILD b/community/guayadeque/PKGBUILD
index 7d0863cec..7ef2cdb4d 100755
--- a/community/guayadeque/PKGBUILD
+++ b/community/guayadeque/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 86605 2013-03-20 15:17:37Z alucryd $
+# $Id: PKGBUILD 103795 2014-01-11 20:08:28Z eric $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Sial <sial@cpan.org>
 # Contributor: Martin Herndl <martin.herndl@gmail.com>
 
 pkgname=guayadeque
 pkgver=0.3.5
-pkgrel=5
+pkgrel=6
 pkgdesc="Lightweight music player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://guayadeque.org/"
 license=('GPL3')
-depends=('curl' 'dbus' 'desktop-file-utils' 'flac' 'libgpod' 'taglib' 'wxgtk')
+depends=('curl' 'desktop-file-utils' 'flac' 'libgpod' 'taglib' 'wxgtk2.8')
 makedepends=('cmake')
 optdepends=('gstreamer0.10-good-plugins: Support for additional file formats'
             'gvfs: Support for external devices')
@@ -18,17 +18,25 @@ install=$pkgname.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
 sha256sums=('8281286a715731b567097238e1c0aaf962e052fbc7e2761b10f36407eb6ec4d5')
 
+prepare() {
+  cd ${pkgname}-${pkgver}/src
+
+  xgettext -d guayadeque -o guayadeque.pot -C --keyword=_ *.cpp
+  mv guayadeque.pot ../po
+}
+
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
+
+  rm -rf build
+  mkdir build && cd build
 
-# Build
-  ./build
+  cmake .. -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8'
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}/build
 
-# Install
   make DESTDIR="${pkgdir}" install
 }
 
diff --git a/community/gwenhywfar/PKGBUILD b/community/gwenhywfar/PKGBUILD
index 999632594..953ef85a2 100644
--- a/community/gwenhywfar/PKGBUILD
+++ b/community/gwenhywfar/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99807 2013-10-30 23:50:53Z allan $
+# $Id: PKGBUILD 103916 2014-01-13 17:16:48Z andyrtr $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 
 pkgname=gwenhywfar
 pkgver=4.3.3
 _dnrel=67
-pkgrel=2
+pkgrel=4
 pkgdesc="OS abstraction functions for various projects"
 arch=(i686 x86_64 'mips64el')
 url="http://www.aquamaniac.de"
diff --git a/community/haskell-dataenc/PKGBUILD b/community/haskell-dataenc/PKGBUILD
index 0232eb2c1..c1bd00b18 100644
--- a/community/haskell-dataenc/PKGBUILD
+++ b/community/haskell-dataenc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89297 2013-04-28 16:52:18Z td123 $
+# $Id: PKGBUILD 103336 2014-01-03 11:09:18Z bpiotrowski $
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.5
@@ -12,9 +12,10 @@ url="http://hackage.haskell.org/package/dataenc"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 depends=('ghc=7.6.3-1' sh)
+install=${pkgname}.install
+options=('staticlibs')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz
         '0001-update-build-deps-for-ghc-7.6.1.patch')
-install=${pkgname}.install
 md5sums=('4da812ca7a1640a5fdcc676009ab160c'
          '662056adcb79efe8898298c271b49600')
 
diff --git a/community/haskell-haskeline/PKGBUILD b/community/haskell-haskeline/PKGBUILD
index 7cd9ccb27..e23e3426b 100644
--- a/community/haskell-haskeline/PKGBUILD
+++ b/community/haskell-haskeline/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89304 2013-04-28 16:52:25Z td123 $
+# $Id: PKGBUILD 103338 2014-01-03 11:10:00Z bpiotrowski $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.6
@@ -12,8 +12,9 @@ url="http://hackage.haskell.org/package/haskeline"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 depends=('ghc=7.6.3-1' 'sh' 'haskell-utf8-string=0.3.7-5' 'haskell-mtl=2.1.2-3' 'haskell-terminfo=0.3.2.5-3')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
+options=('staticlibs')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 md5sums=('3a78043dc80b5510202e71e77c0a9923')
 
 build() {
diff --git a/community/haskell-terminfo/PKGBUILD b/community/haskell-terminfo/PKGBUILD
index e35f7da1a..bbd5e49f5 100644
--- a/community/haskell-terminfo/PKGBUILD
+++ b/community/haskell-terminfo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89323 2013-04-28 16:52:45Z td123 $
+# $Id: PKGBUILD 103340 2014-01-03 11:10:44Z bpiotrowski $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
@@ -11,6 +11,7 @@ url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 depends=('ghc=7.6.3-1' 'sh')
+options=('staticlibs')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
 md5sums=('7ef09acfac9f6fc499ed3bb804ae2ab3')
diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD
index cd4ef71eb..a1ccfe497 100644
--- a/community/hedgewars/PKGBUILD
+++ b/community/hedgewars/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 103142 2013-12-27 12:15:28Z spupykin $
+# $Id: PKGBUILD 104154 2014-01-16 11:39:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hedgewars
-pkgver=0.9.20
+pkgver=0.9.20.5
 pkgrel=1
 pkgdesc="turn based strategy, artillery, action and comedy game, featuring the
  antics of pink hedgehogs with attitude as they battle from the depths of hell
@@ -23,11 +23,11 @@ makedepends=('fpc' 'cmake'
 	     'haskell-random')
 source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
 	hedgewars.png)
-md5sums=('7ee1b23e51053d34feb84464184f60fa'
+md5sums=('c61eb01466e86da656e1e74ad70a3217'
          'eeb14d50df39063549ac5eca9dbc65d1')
 
 build() {
-  cd $pkgname-src-$pkgver
+  cd $pkgname-src-*
   cmake \
 	-DCMAKE_BUILD_TYPE="Release" \
 	-DCMAKE_INSTALL_PREFIX=/usr \
@@ -37,7 +37,7 @@ build() {
 }
 
 package() {
-  cd $pkgname-src-$pkgver
+  cd $pkgname-src-*
 
   make DESTDIR=$pkgdir install
 
diff --git a/community/higan-gtk/PKGBUILD b/community/higan-gtk/PKGBUILD
index 53dc19714..fdad4d440 100755
--- a/community/higan-gtk/PKGBUILD
+++ b/community/higan-gtk/PKGBUILD
@@ -1,83 +1,58 @@
-# $Id: PKGBUILD 96210 2013-08-21 19:09:14Z alucryd $
+# $Id: PKGBUILD 104429 2014-01-20 19:23:37Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 
 pkgname=higan-gtk
-pkgver=093
-pkgrel=2
-pkgdesc="Nintendo multi-system emulator - GTK version"
+pkgver=094
+pkgrel=1
+pkgdesc='Nintendo multi-system emulator'
 arch=('i686' 'x86_64')
-url="http://code.google.com/p/higan/"
+url='http://byuu.org/'
 license=('GPL3')
 depends=('libao' 'libpulse' 'libxv' 'openal' 'sdl' 'xdialog')
-makedepends=('gendesk' 'mesa')
+makedepends=('mesa')
 optdepends=('beat: Delta patcher')
 conflicts=('higan-qt')
-source=("http://byuu.org/higan/release/higan_v${pkgver}-source.tar.xz"
-        "http://higan.googlecode.com/files/purify_v03-source.tar.xz"
+source=("http://byuu.org/files/${pkgname%-*}_v${pkgver}-source.tar.xz"
         'higan')
-sha256sums=('6ad526ab7ac16a5b814f84235fbcd48946310af8645c42980b0063e3270ec538'
-            '2020f0b5a744f08c24085a15a6c2ec1d7c4424bba6727f244e513b95c4247e38'
+sha256sums=('5e149df9d50c1066eb97c0d66665428d75304da782bba5a87078b87fc311151b'
             'c799232a0f67c4b7f40fc6ad05325a6c04e86d78e40f361d02f168a16d11d048')
 
-_profiles="accuracy balanced performance"
+_profiles='accuracy balanced performance'
 
 prepare() {
-  gendesk -n --pkgname "higan" --pkgdesc "${pkgdesc}" --name='higan' --exec='higan %u'
-  gendesk -n --pkgname "purify" --pkgdesc "ROM Purifier - GTK version" --name='purify' --exec='purify'
-
   cd higan_v${pkgver}-source
 
-  sed -i "s/flags   += -I. -O3 -fomit-frame-pointer/flags   += -I. -fomit-frame-pointer -std=gnu++11/
-          s/flags += -march=native/flags += $CXXFLAGS/g" Makefile
+  sed "s/-march=native/-march=${CARCH/_/-} -mtune=generic/g" -i Makefile
 }
 
 build() {
-  cd "${srcdir}"/higan_v${pkgver}-source
+  cd higan_v${pkgver}-source
 
-# libananke
-  make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I.. -fomit-frame-pointer -std=gnu++11" -C ananke
+  make phoenix=gtk -C ananke
 
-# higan
   for _profile in ${_profiles}; do
-    make compiler=g++ platform=x target=ethos phoenix=gtk profile=${_profile}
+    make phoenix=gtk profile=${_profile}
     mv out/higan{,-${_profile}}
     make clean
   done
-
-# purify
-  cd "${srcdir}"/purify_v03-source/purify
-  make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I. -fomit-frame-pointer -std=gnu++11" link='-s -lX11 -ldl -Wl,-export-dynamic'
 }
 
 package() {
-  cd "${srcdir}"/higan_v${pkgver}-source
+  cd higan_v${pkgver}-source
 
-# Common files
   install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{applications,pixmaps,higan/Video\ Shaders}}
   install -m 755 {..,"${pkgdir}"/usr/bin}/higan
-  install -m 644 {..,"${pkgdir}"/usr/share/applications}/higan.desktop
-  install -m 644 data/higan512.png "${pkgdir}"/usr/share/pixmaps/higan.png
+  install -m 644 data/higan.desktop "${pkgdir}"/usr/share/applications/
+  install -m 644 data/higan.png "${pkgdir}"/usr/share/pixmaps/
   cp -dr --no-preserve=ownership profile/* data/cheats.bml "${pkgdir}"/usr/share/higan/
   cp -dr --no-preserve=ownership shaders/*.shader "${pkgdir}"/usr/share/higan/Video\ Shaders/
 
-# libananke
   install -m 644 ananke/libananke.so "${pkgdir}"/usr/lib/libananke.so.1
   ln -s libananke.so.1 "${pkgdir}"/usr/lib/libananke.so
 
-# higan
   for _profile in ${_profiles}; do
     install -m 755 {out,"${pkgdir}"/usr/bin}/higan-${_profile}
   done
-
-# purify
-  cd "${srcdir}"/purify_v03-source/purify
-  install -m 755 {,"${pkgdir}"/usr/bin/}purify
-  install -m 644 {../..,"${pkgdir}"/usr/share/applications}/purify.desktop
-  ln -s higan.png "${pkgdir}"/usr/share/pixmaps/purify.png
-
-# Fix permissions
-  find "${pkgdir}"/usr/share/higan/ -type d -exec chmod 755 {} +
-  find "${pkgdir}"/usr/share/higan/ -type f -exec chmod 644 {} +
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/community/higan-qt/PKGBUILD b/community/higan-qt/PKGBUILD
index 212caebf4..db655bca5 100755
--- a/community/higan-qt/PKGBUILD
+++ b/community/higan-qt/PKGBUILD
@@ -1,88 +1,60 @@
-# $Id: PKGBUILD 96212 2013-08-21 19:22:00Z alucryd $
+# $Id: PKGBUILD 104431 2014-01-20 19:37:01Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 
 pkgname=higan-qt
-pkgver=093
-pkgrel=2
-pkgdesc="Nintendo multi-system emulator - Qt version"
+pkgver=094
+pkgrel=1
+pkgdesc='Nintendo multi-system emulator'
 arch=('i686' 'x86_64')
-url="http://code.google.com/p/higan/"
+url='http://byuu.org/'
 license=('GPL3')
 depends=('libao' 'libpulse' 'openal' 'qt4' 'sdl' 'xdialog')
-makedepends=('gendesk' 'mesa')
+makedepends=('mesa')
 optdepends=('beat: Delta patcher')
 conflicts=('higan-gtk')
-source=("http://byuu.org/higan/release/higan_v${pkgver}-source.tar.xz"
-        "http://higan.googlecode.com/files/purify_v03-source.tar.xz"
+source=("http://byuu.org/files/${pkgname%-*}_v${pkgver}-source.tar.xz"
         'higan')
-sha256sums=('6ad526ab7ac16a5b814f84235fbcd48946310af8645c42980b0063e3270ec538'
-            '2020f0b5a744f08c24085a15a6c2ec1d7c4424bba6727f244e513b95c4247e38'
+sha256sums=('5e149df9d50c1066eb97c0d66665428d75304da782bba5a87078b87fc311151b'
             'c799232a0f67c4b7f40fc6ad05325a6c04e86d78e40f361d02f168a16d11d048')
 
-_profiles="accuracy balanced performance"
+_profiles='accuracy balanced performance'
 
 prepare() {
-  gendesk -n --pkgname "higan" --pkgdesc "${pkgdesc}" --name='higan' --exec='higan %u'
-  gendesk -n --pkgname "purify" --pkgdesc "ROM Purifier - GTK version" --name='purify' --exec='purify'
+  cd higan_v${pkgver}-source
 
-  cd "${srcdir}"/higan_v${pkgver}-source
+  sed "s/-march=native/-march=${CARCH/_/-} -mtune=generic/g" -i Makefile
 
   moc-qt4 -i -Iphoenix/qt/ -o phoenix/qt/platform.moc phoenix/qt/platform.moc.hpp
-  sed -i "s/flags   += -I. -O3 -fomit-frame-pointer/flags   += -I. -fomit-frame-pointer -std=gnu++11/
-          s/flags += -march=native/flags += $CXXFLAGS/g" Makefile
-
-  cd "${srcdir}"/purify_v03-source
-
-  moc-qt4 -i -Ipurify/phoenix/qt/ -o purify/phoenix/qt/platform.moc purify/phoenix/qt/platform.moc.hpp
 }
 
 build() {
-  cd "${srcdir}"/higan_v${pkgver}-source
+  cd higan_v${pkgver}-source
 
-# libananke
-  make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I.. -fomit-frame-pointer -std=gnu++11" -C ananke
+  make phoenix=qt -C ananke
 
-# higan
   for _profile in ${_profiles}; do
-    make compiler=g++ platform=x target=ethos phoenix=gtk profile=${_profile}
+    make phoenix=qt profile=${_profile}
     mv out/higan{,-${_profile}}
     make clean
   done
-
-# purify
-  cd "${srcdir}"/purify_v03-source/purify
-  make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I. -fomit-frame-pointer -std=gnu++11" link='-s -lX11 -ldl -Wl,-export-dynamic'
 }
 
 package() {
-  cd "${srcdir}"/higan_v${pkgver}-source
+  cd higan_v${pkgver}-source
 
-# Common files
   install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{applications,pixmaps,higan/Video\ Shaders}}
   install -m 755 {..,"${pkgdir}"/usr/bin}/higan
-  install -m 644 {..,"${pkgdir}"/usr/share/applications}/higan.desktop
-  install -m 644 data/higan512.png "${pkgdir}"/usr/share/pixmaps/higan.png
+  install -m 644 data/higan.desktop "${pkgdir}"/usr/share/applications/
+  install -m 644 data/higan.png "${pkgdir}"/usr/share/pixmaps/
   cp -dr --no-preserve=ownership profile/* data/cheats.bml "${pkgdir}"/usr/share/higan/
   cp -dr --no-preserve=ownership shaders/*.shader "${pkgdir}"/usr/share/higan/Video\ Shaders/
 
-# libananke
   install -m 644 ananke/libananke.so "${pkgdir}"/usr/lib/libananke.so.1
   ln -s libananke.so.1 "${pkgdir}"/usr/lib/libananke.so
 
-# higan
   for _profile in ${_profiles}; do
     install -m 755 {out,"${pkgdir}"/usr/bin}/higan-${_profile}
   done
-
-# purify
-  cd "${srcdir}"/purify_v03-source/purify
-  install -m 755 {,"${pkgdir}"/usr/bin/}purify
-  install -m 644 {../..,"${pkgdir}"/usr/share/applications}/purify.desktop
-  ln -s higan.png "${pkgdir}"/usr/share/pixmaps/purify.png
-
-# Fix permissions
-  find "${pkgdir}"/usr/share/higan/ -type d -exec chmod 755 {} +
-  find "${pkgdir}"/usr/share/higan/ -type f -exec chmod 644 {} +
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD
index 7f1101e51..2ef68e82a 100644
--- a/community/highlight/PKGBUILD
+++ b/community/highlight/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 100546 2013-11-05 19:47:43Z bluewind $
+# $Id: PKGBUILD 104278 2014-01-16 20:21:07Z bluewind $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: Jan Fader <jan.fader@web.de>
 pkgbase=highlight
 pkgname=(highlight highlight-gui)
-pkgver=3.16.1
+pkgver=3.17
 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=('688bb537db149dc720b9ef1ffc796ced'
+md5sums=('52babb37da6a69867dc295e31d8a721e'
          'SKIP')
 
 build() {
diff --git a/community/homebank/PKGBUILD b/community/homebank/PKGBUILD
index baf1ff193..de28490b3 100644
--- a/community/homebank/PKGBUILD
+++ b/community/homebank/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100085 2013-11-01 13:55:56Z eric $
+# $Id: PKGBUILD 105296 2014-02-04 18:24:40Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=homebank
-pkgver=4.5.4
-pkgrel=2
+pkgver=4.5.5
+pkgrel=1
 pkgdesc="Free, easy, personal accounting for everyone"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://homebank.free.fr/"
@@ -14,17 +14,17 @@ makedepends=('intltool')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://homebank.free.fr/public/$pkgname-$pkgver.tar.gz)
-sha256sums=('b3dd7df29d1de38b04c3bce3ade1f6266c1dc91aefa1106e37852edeab39b083')
+sha256sums=('6f3a26075c4da67cf3521a407e90685be9aac2ef3e41614cfece2c8d4f226416')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
 
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
 
   make DESTDIR="${pkgdir}" install
 }
diff --git a/community/homebank/homebank.changelog b/community/homebank/homebank.changelog
index f2e6255c2..8eddc34ad 100644
--- a/community/homebank/homebank.changelog
+++ b/community/homebank/homebank.changelog
@@ -1,3 +1,6 @@
+2014-02-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* homebank 4.5.5-1
+
 2013-10-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* homebank 4.5.4-1
 
diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD
index a85b6d751..01bc9eab5 100644
--- a/community/hostapd/PKGBUILD
+++ b/community/hostapd/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 90673 2013-05-13 14:26:11Z spupykin $
+# $Id: PKGBUILD 105700 2014-02-14 09:18:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hostapd
-pkgver=2.0
-pkgrel=6
+pkgver=2.1
+pkgrel=2
 pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://w1.fi/hostapd/"
 license=('custom')
 depends=('openssl' 'libnl')
 backup=('etc/hostapd/hostapd.conf'
-        'etc/conf.d/hostapd'
         'etc/hostapd/hlr_auc_gw.milenage_db'
         'etc/hostapd/hostapd.accept'
         'etc/hostapd/hostapd.deny'
@@ -24,8 +23,8 @@ install=hostapd.install
 source=(http://w1.fi/releases/$pkgname-$pkgver.tar.gz
 	config
 	hostapd.service)
-md5sums=('ba22e639bc57aa4035d2ea8ffa9bbbee'
-         '5d7ee10b04e33f22c37be56a4c33dddb'
+md5sums=('bb9c50e87c5af6f89f387e63911effac'
+         'eab3ae853869f832965f59898bb04a52'
          'a0a16879eed5e4e41ae6b225a4809955')
 
 build() {
diff --git a/community/hostapd/config b/community/hostapd/config
index a11ebd587..55c6ed257 100644
--- a/community/hostapd/config
+++ b/community/hostapd/config
@@ -90,3 +90,5 @@ CONFIG_DRIVER_NL80211=y
 CONFIG_IEEE80211N=y
 
 CONFIG_LIBNL32=y
+
+CONFIG_ACS=y
diff --git a/community/hostapd/hostapd.install b/community/hostapd/hostapd.install
index d838c6a47..072cde845 100644
--- a/community/hostapd/hostapd.install
+++ b/community/hostapd/hostapd.install
@@ -1,7 +1,3 @@
 post_install() {
   echo "> More info: https://wiki.archlinux.org/index.php/Software_Access_Point"
 }
-
-post_upgrade() {
-  post_install
-}
diff --git a/community/hwinfo/PKGBUILD b/community/hwinfo/PKGBUILD
index 07c280b4b..ab29b5369 100644
--- a/community/hwinfo/PKGBUILD
+++ b/community/hwinfo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90497 2013-05-12 23:11:39Z arodseth $
+# $Id: PKGBUILD 103280 2014-01-02 12:43:36Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Gergely Imreh <imrehgATgmailDOTcom>
@@ -8,23 +8,22 @@
 # Contributor: ninja_pt
 
 pkgname=hwinfo
-pkgver=20.1
-_subver=3.10
-pkgrel=2
+pkgver=21.0
+_subver=1.2
+pkgrel=1
 pkgdesc='Hardware detection tool from openSUSE'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://download.opensuse.org/source/factory/repo/oss/suse/src/'
 license=('GPL2')
 depends=('perl' 'libx86emu')
 makedepends=('sysfsutils' 'rpmextract' 'flex')
+options=('!emptydirs')
 source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-$pkgver-$_subver.src.rpm"
         'custom_ioctl.patch')
-sha256sums=('b0e2e51b4dd754071fb40843deaaafb0755388de5335b1d2c4c081d0f6393841'
+sha256sums=('4126875621a935a450cf616b69a1f922047f241cedc3ac02ece54cd78b23a9fb'
             '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d')
 
 prepare() {
-  cd "$srcdir"
-
   rpmextract.sh "$pkgname-$pkgver-$_subver.src.rpm"
   tar jxf $pkgname-$pkgver.tar.bz2
   cd "$pkgname-$pkgver"
@@ -32,17 +31,14 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make -j1 CFLAGS+="-fPIC -I$srcdir/$pkgname-$pkgver/src/hd" LIBDIR=/usr/lib
+  make -C "$pkgname-$pkgver" -j1 \
+    CFLAGS+="-fPIC -I$srcdir/$pkgname-$pkgver/src/hd" \
+    LIBDIR=/usr/lib
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make LIBDIR=/usr/lib DESTDIR="$pkgdir" install
+  make -C "$pkgname-$pkgver" LIBDIR=/usr/lib DESTDIR="$pkgdir" install
   mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin"
-  rmdir "$pkgdir/sbin"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD
index 221086e01..61e1fb220 100644
--- a/community/i3-wm/PKGBUILD
+++ b/community/i3-wm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102909 2013-12-23 21:00:35Z ttoepper $
+# $Id: PKGBUILD 104713 2014-01-24 20:05:37Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3-wm
 _pkgsourcename=i3
-pkgver=4.7
+pkgver=4.7.2
 pkgrel=1
 pkgdesc='An improved dynamic tiling window manager'
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,7 +20,7 @@ optdepends=('dmenu: As menu.'
 options=('docs' '!strip')
 source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2"
         "http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2.asc")
-md5sums=('34dade2bc69e241ab3e3ffaa81122266'
+md5sums=('64141f7c23f97cd1e52c52918476c1c8'
          'SKIP')
 
 build() {
diff --git a/community/i3status/PKGBUILD b/community/i3status/PKGBUILD
index a2ba5074f..33030d657 100644
--- a/community/i3status/PKGBUILD
+++ b/community/i3status/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 85172 2013-02-27 14:41:02Z ttoepper $
+# $Id: PKGBUILD 105366 2014-02-06 05:24:12Z bisson $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3status
-pkgver=2.7
-pkgrel=1
-pkgdesc="Generates status bar to use with dzen2 or xmobar"
+pkgver=2.8
+pkgrel=2
+pkgdesc='Generates status bar to use with i3bar, dzen2 or xmobar'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://i3.zekjur.net/i3status/"
+url='http://i3.zekjur.net/i3status/'
 license=('BSD')
 groups=('i3')
 depends=('wireless_tools' 'confuse' 'alsa-lib' 'yajl')
@@ -14,8 +14,10 @@ makedepends=('asciidoc')
 backup=('etc/i3status.conf')
 install=i3status.install
 options=('docs')
-source=("http://i3.zekjur.net/i3status/$pkgname-$pkgver.tar.bz2")
-md5sums=('f0a39e84aebb65496af3dcec9d8cfeb8')
+source=("http://i3.zekjur.net/i3status/$pkgname-$pkgver.tar.bz2"
+        "http://i3.zekjur.net/i3status/$pkgname-$pkgver.tar.bz2.asc")
+md5sums=('68d944e9c1f48183356c9ea15b5b4e3b'
+         'SKIP')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/iasl/PKGBUILD b/community/iasl/PKGBUILD
index b1341ae81..5c74912c1 100644
--- a/community/iasl/PKGBUILD
+++ b/community/iasl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96438 2013-08-28 21:10:55Z lcarlier $
+# $Id: PKGBUILD 104510 2014-01-22 06:49:46Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alessio 'mOlOk' Bolognino <themolok@gmail.com>
 
 pkgname=iasl
-pkgver=20130823
+pkgver=20140114
 pkgrel=1
 pkgdesc="Intel ACPI Source Language compiler"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ options=('!makeflags')
 #install=iasl.install
 source=(http://acpica.org/sites/acpica/files/acpica-unix-${pkgver}.tar.gz
 	LICENSE)
-md5sums=('7846a62551352d7dae6f93f8255e9d99'
+md5sums=('77d5aaa723b98314dae80cac1b33514d'
          '8615526144f69ea4e870d9bc37df9b29')
 
 build() {
@@ -24,14 +24,14 @@ build() {
 
   #sed -i -e 's/_CYGWIN/_LINUX/g' -e 's/-Werror//g' Makefile.config
 
-  if [[ $CARCH == i686 ]]; then
-    make BITS=32
-  elif [[ $CARCH == x86_64 ]]; then
-    make BITS=64
-  else
-    sed -i 's|$(BITSFLAG)||g' Makefile.config
-    make
-  fi
+  make clean
+  make
+
+#  if [[ $CARCH == i686 ]]; then
+#    make BITS=32
+#  else
+#    make BITS=64
+#  fi
 }
 
 package() {
@@ -41,5 +41,3 @@ package() {
 
   install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-md5sums=('cc7528ecd185ff779c6b58bfede091b2'
-         '8615526144f69ea4e870d9bc37df9b29')
diff --git a/community/ibus-chewing/PKGBUILD b/community/ibus-chewing/PKGBUILD
index 56f79bc4e..ba855670e 100644
--- a/community/ibus-chewing/PKGBUILD
+++ b/community/ibus-chewing/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102761 2013-12-19 11:22:34Z fyan $
+# $Id: PKGBUILD 104344 2014-01-18 10:47:03Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
@@ -6,7 +6,7 @@
 # Contributor: Hiroshi Yui <hiroshiyui@gmail.com>
 
 pkgname=ibus-chewing
-pkgver=1.4.4
+pkgver=1.4.7
 pkgrel=1
 pkgdesc='Chinese Chewing Engine for IBus Framework'
 arch=('i686' 'x86_64' 'mips64el')
@@ -23,6 +23,7 @@ build() {
     -DSYSCONF_INSTALL_DIR=/usr/share \
     -DLIBEXEC_DIR=/usr/lib/ibus
   make
+  make translations
 }
 
 package() {
@@ -34,4 +35,4 @@ package() {
   rm -r "$pkgdir/etc"
 }
 
-sha512sums=('47581bca46d1a8f0f10f13887d5db37cf1ca3531e1a05fea516ea10fec59d4b0c2f629b5a291b1aed77e642efa3d456670c8f7fcaff460b187e3b7fc8220f2d6')
+sha512sums=('70e9c4950ac846c2f0087200d3b42f845ef8f911962d3f6bf37a3a0054606fa0fc061daa5dac390d022dbd29801fbcae596d2c5126270eb6e9843a9e0af4486e')
diff --git a/community/iftop/PKGBUILD b/community/iftop/PKGBUILD
index 4cd95e129..5eb35b0d8 100644
--- a/community/iftop/PKGBUILD
+++ b/community/iftop/PKGBUILD
@@ -1,30 +1,31 @@
-# $Id: PKGBUILD 96466 2013-08-30 08:54:27Z fyan $
-# Maintainer: Daenyth <Daenyth+Arch at gmail dot com>
+# $Id: PKGBUILD 104526 2014-01-22 10:17:20Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Daenyth <Daenyth+Arch at gmail dot com>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Alexander Mieland (dma147) <dma147@linux-stats.org>
 # Contributor: slubman <slubman@slubman.net>
 
 pkgname=iftop
-pkgver=1.0pre2
+pkgver=1.0pre4
 pkgrel=1
 pkgdesc="Display bandwidth usage on an interface"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ex-parrot.com/~pdw/iftop/"
 license=('GPL')
 depends=('libpcap' 'ncurses')
-#options=('!makeflags')
 source=("http://www.ex-parrot.com/~pdw/$pkgname/download/$pkgname-$pkgver.tar.gz")
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man --build=$CHOST
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   make DESTDIR="$pkgdir" install
 }
-sha512sums=('708172baa00a94671b494f33e7290af9ed4e0f764fabb500187855ee39840e379590274802e9ef360c128e881cfe0cefe7a12a9bfdcf9cfa7ffb49746b02300a')
+
+sha512sums=('abd74e8025bb82fef9ebab4997b1d018201a523d47c0128128ca37797490046538d74758dc4471735c22b890e5bd238ad6b2a30776d465138ede367cdd263d22')
diff --git a/community/instead/PKGBUILD b/community/instead/PKGBUILD
index b04c1fb55..268ae3c53 100644
--- a/community/instead/PKGBUILD
+++ b/community/instead/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94126 2013-07-14 18:31:12Z spupykin $
+# $Id: PKGBUILD 105061 2014-01-30 20:23:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Peter Kosyh <p.kosyhgmail.com>
 
 pkgname=instead
-pkgver=1.9.1
-pkgrel=2
+pkgver=2.0.2
+pkgrel=1
 pkgdesc="a quest interpreter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/instead/"
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'lua')
 optdepends=('instead-launcher: install and update INSTEAD games from net')
 source=(http://downloads.sourceforge.net/project/instead/instead/${pkgver}/instead_${pkgver}.tar.gz)
-md5sums=('fe925715e48ce06ddce9eeeec380b881')
+md5sums=('040d8378df4695aed771d6699e1cd7d8')
 
 build() {
   cd "${srcdir}/instead-${pkgver}"
@@ -24,5 +24,5 @@ package() {
   cd "${srcdir}/instead-${pkgver}"
   make DESTDIR="${pkgdir}" PREFIX=/usr install
 
-  cp -a doc/*.{html,txt,pdf} doc/examples $pkgdir/usr/share/doc/instead/
+  cp -a doc/*.{html,pdf} doc/instead.txt doc/examples $pkgdir/usr/share/doc/instead/
 }
diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index f808fc005..a0b3660fb 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 102772 2013-12-19 14:18:19Z stativ $
+# $Id: PKGBUILD 105255 2014-02-03 11:44:27Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=intellij-idea-libs
-pkgver=13.0.1
-_pkgver=133.331
+pkgver=13.0.2
+_pkgver=133.696
 pkgrel=1
 pkgdesc="Architecture dependent libraries needed by the Intellij Idea IDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('Apache')
 depends=('glibc')
 options=(!strip)
 source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz)
-md5sums=('14ca0ad374cfd96ec4b8d3d3bfec9e76')
+md5sums=('ee07c8647c525a1b4ef1fb25550f7598')
 
 package() {
   [ $CARCH == "x86_64" ] && SUFFIX=64
diff --git a/community/ipmitool/PKGBUILD b/community/ipmitool/PKGBUILD
new file mode 100644
index 000000000..1b48c5230
--- /dev/null
+++ b/community/ipmitool/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Florian Pritz <bluewind@xinu.at>
+# Contributor: Florian Dejonckheere <florian@floriandejonckheere.be>
+# Contributor: gori
+
+pkgname=ipmitool
+pkgver=1.8.13
+pkgrel=2
+pkgdesc="Command-line interface to IPMI-enabled devices"
+arch=('i686' 'x86_64')
+url="http://ipmitool.sourceforge.net"
+depends=('openssl')
+license=('BSD')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('64f36baea740f701c5f287805da968a2')
+
+build(){
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	./configure --prefix=/usr --sbindir=/usr/bin --with-kerneldir
+	make
+}
+
+package(){
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install
+
+	# Install license
+	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/libre/ipsec-tools-libre/PKGBUILD b/community/ipsec-tools/PKGBUILD
index eb7a846bb..08a4c6115 100644
--- a/libre/ipsec-tools-libre/PKGBUILD
+++ b/community/ipsec-tools/PKGBUILD
@@ -1,23 +1,18 @@
-# $Id: PKGBUILD 100177 2013-11-01 20:59:04Z spupykin $
+# $Id: PKGBUILD 100178 2013-11-01 20:59:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Allan Henriksen <allan.henriksen@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
-_pkgname=ipsec-tools
-pkgname=ipsec-tools-libre
+pkgname=ipsec-tools
 pkgver=0.8.1
 pkgrel=5
-pkgdesc="KAME IPSec tools ported to Linux (built for the linux-libre-headers package)"
-arch=('i686' 'x86_64' 'mips64el')
+pkgdesc="KAME IPSec tools ported to Linux"
+arch=('i686' 'x86_64')
 url="http://ipsec-tools.sourceforge.net/"
 depends=('readline' 'openssl' 'krb5')
-makedepends=('linux-libre-headers')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
+makedepends=('linux-headers')
 license=('GPL')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$_pkgname-$pkgver.tar.bz2
+source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2
 	racoon.service
 	ipsec.service
 	ipsec-tools-linux-3.7-compat.patch)
@@ -27,7 +22,7 @@ md5sums=('d38b39f291ba2962387c3232e7335dd8'
          'ae1dd20c83dcfce3dedb46ee73e83613')
 
 build() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
   patch -p1 <$srcdir/ipsec-tools-linux-3.7-compat.patch
   sed -i 's#-Werror##' configure.ac
@@ -36,12 +31,12 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \
 	--enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \
 	--enable-adminport --enable-gssapi \
-	--with-kernel-headers=/lib/modules/`pacman -Q linux-libre-headers | cut -f2 -d\ `-LIBRE/build/include
+	--with-kernel-headers=/lib/modules/`pacman -Q linux-headers | cut -f2 -d\ `-ARCH/build/include
   make
 }
 
 package() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
   install -Dm0644 $srcdir/racoon.service $pkgdir/usr/lib/systemd/system/racoon.service
   install -Dm0644 $srcdir/ipsec.service $pkgdir/usr/lib/systemd/system/ipsec.service
diff --git a/libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch b/community/ipsec-tools/ipsec-tools-linux-3.7-compat.patch
index 46b11ee51..46b11ee51 100644
--- a/libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch
+++ b/community/ipsec-tools/ipsec-tools-linux-3.7-compat.patch
diff --git a/libre/ipsec-tools-libre/ipsec.service b/community/ipsec-tools/ipsec.service
index 483a5b58d..483a5b58d 100644
--- a/libre/ipsec-tools-libre/ipsec.service
+++ b/community/ipsec-tools/ipsec.service
diff --git a/libre/ipsec-tools-libre/racoon.service b/community/ipsec-tools/racoon.service
index 95324bd5d..95324bd5d 100644
--- a/libre/ipsec-tools-libre/racoon.service
+++ b/community/ipsec-tools/racoon.service
diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD
index aa5475044..2abcb9856 100644
--- a/community/ipset/PKGBUILD
+++ b/community/ipset/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99568 2013-10-29 21:15:35Z seblu $
+# $Id: PKGBUILD 105161 2014-02-02 00:47:06Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgname=ipset
 pkgver=6.20.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Administration tool for IP sets'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://ipset.netfilter.org'
@@ -13,7 +13,7 @@ backup=("etc/$pkgname.conf")
 source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
         "$pkgname.service")
 md5sums=('8af741492752fbf24d3a28a9d1473d40'
-         '6be6a2b34c1f38fc8ad60828403e2077')
+         '4b195827996c6012a801e21f869c385d')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/ipset/ipset.service b/community/ipset/ipset.service
index 39183c7d7..c3e7460a0 100644
--- a/community/ipset/ipset.service
+++ b/community/ipset/ipset.service
@@ -6,6 +6,7 @@ Before=iptables.service
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/usr/bin/ipset -f /etc/ipset.conf restore
+ExecReload=/usr/bin/ipset -f /etc/ipset.conf restore
 ExecStop=/usr/bin/ipset destroy
 
 [Install]
diff --git a/community/jalv/PKGBUILD b/community/jalv/PKGBUILD
index 3efe760d3..0318a58d5 100644
--- a/community/jalv/PKGBUILD
+++ b/community/jalv/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 95410 2013-08-11 23:09:01Z speps $
+# $Id: PKGBUILD 104788 2014-01-26 03:57:57Z speps $
 # Maintainer: speps <speps at aur dot archlinux dot org>
 
 pkgname=jalv
-pkgver=1.4.2
+pkgver=1.4.4
 pkgrel=1
 pkgdesc="A simple but fully featured LV2 host for Jack"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ optdepends=('qt4: Qt 4.x frontend'
             'gtk3: Gtk+ 3.x frontend'
             'gtkmm: Gtk++ 2.x frontend')
 source=(http://download.drobilla.net/$pkgname-$pkgver.tar.bz2{,.sig})
-md5sums=('a649bbe71ecb54563764f4acbdcc84f6'
+md5sums=('56aea296a43b2906cc930c1727b3835c'
          'SKIP')
 
 build() {
diff --git a/community/jemalloc/PKGBUILD b/community/jemalloc/PKGBUILD
index 8531768e4..9aab7741c 100644
--- a/community/jemalloc/PKGBUILD
+++ b/community/jemalloc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99648 2013-10-30 17:30:37Z mtorromeo $
+# $Id: PKGBUILD 104634 2014-01-23 14:58:20Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Kovivchak Evgen <oneonfire@gmail.com>
 
 pkgname=jemalloc
-pkgver=3.4.1
-pkgrel=2
+pkgver=3.5.0
+pkgrel=1
 pkgdesc="General-purpose scalable concurrent malloc implementation"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
@@ -18,7 +18,7 @@ source=(http://www.canonware.com/download/jemalloc/$pkgname-$pkgver.tar.bz2)
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr
+	CFLAGS="$CFLAGS -std=gnu11" ./configure --prefix=/usr
 	make
 }
 
@@ -30,4 +30,4 @@ package() {
 	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha256sums=('7341953fe9f21342b005b6c7e798631678ae713293a64d5fa61dea7449fc10fb')
+sha256sums=('5b13dbef27c46e9efbe19b5eef574e298409ed9dbbde85ec805e29d04c05e473')
diff --git a/community/julius/PKGBUILD b/community/julius/PKGBUILD
new file mode 100644
index 000000000..8e14904d7
--- /dev/null
+++ b/community/julius/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id: PKGBUILD 103609 2014-01-08 10:39:22Z arcanis $
+# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
+# Contributor: Matt Harrison <matt at mistbyte dot com>
+# Contributor: Muhammad Qadri <Muhammad dot A dot Qadri at gmail dot com>
+
+pkgname=julius
+pkgver=4.3
+pkgrel=1
+pkgdesc="A high-performance, two-pass large vocabulary continuous speech recognition decoder software"
+arch=("i686" "x86_64")
+url="http://julius.sourceforge.jp/"
+license=("custom")
+depends=("libpulse")
+optdepends=("voxforge-am-julius: acoustic models")
+source=("http://iij.dl.sourceforge.jp/${pkgname}/60153/${pkgname}-${pkgver}.tar.gz")
+md5sums=("48b36e9104b55c409a60947f7ba05bb3")
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  
+  # replace /lib/cpp with /usr/bin/cpp since Arch Linux doesn't have /lib/cpp anymore
+  sed -i "s|/lib/cpp|/usr/bin/cpp|g" "julius/configure"
+  sed -i "s|/lib/cpp|/usr/bin/cpp|g" "jcontrol/configure"
+  sed -i "s|/lib/cpp|/usr/bin/cpp|g" "libjulius/configure"
+  sed -i "s|/lib/cpp|/usr/bin/cpp|g" "gramtools/configure"
+  sed -i "s|/lib/cpp|/usr/bin/cpp|g" "libsent/configure"
+  sed -i "s|/lib/cpp|/usr/bin/cpp|g" "configure"
+  
+  # Add -02 to CPPFLAGS to prevent issue with -D_FORTIFY_SOURCE=2
+  CPPFLAGS="$CPPFLAGS -O2"
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}/"
+  ./configure \
+    --prefix="/usr/" \
+    --mandir='${prefix}/share/man' \
+    --enable-words-int \
+    --enable-msd \
+    --enable-gmm-vad \
+    --enable-decoder-vad \
+    --enable-power-reject \
+    --enable-wpair
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/"
+  
+  make prefix="${pkgdir}/usr" install
+  install -D "LICENSE.txt" "${pkgdir}/usr/share/licenses/julius/LICENSE"
+  # remove empty lib directory
+  rm -r "${pkgdir}/usr/lib"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/jwm/PKGBUILD b/community/jwm/PKGBUILD
index 972707a20..4763b652a 100644
--- a/community/jwm/PKGBUILD
+++ b/community/jwm/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 90050 2013-05-06 19:37:59Z foutrelis $
+# $Id: PKGBUILD 105157 2014-02-02 00:03:54Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=jwm
-pkgver=2.1.0
-pkgrel=3
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="A lightweight window manager for the X11 Window System"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://joewing.net/programs/jwm/"
 license=('GPL2')
 depends=('libx11' 'libxft' 'libjpeg>=7' 'libxpm' 'libxinerama' 'libpng')
 backup=('etc/system.jwmrc')
-source=(http://joewing.net/programs/jwm/releases/jwm-$pkgver.tar.bz2)
-md5sums=('e8fab21b2410eb82032b7c3472af642c')
+source=(http://joewing.net/programs/jwm/releases/jwm-$pkgver.tar.xz)
+md5sums=('4950ed5d44d1f00e7b7386fea4657b54')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/kbibtex/PKGBUILD b/community/kbibtex/PKGBUILD
index 9bac69f64..c92ab49f8 100644
--- a/community/kbibtex/PKGBUILD
+++ b/community/kbibtex/PKGBUILD
@@ -1,26 +1,27 @@
-# $Id: PKGBUILD 87529 2013-04-02 15:44:34Z schiv $
+# $Id: PKGBUILD 103296 2014-01-02 21:08:34Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Antonio Rojas <nqn1976 @ gmail.com>
 # Contributor: cmorlok <christianmorlok@web.de>
 
 pkgname=kbibtex
-pkgver=0.4.1
-_branch=0.4
-pkgrel=2
+pkgver=0.5
+_branch=0.5
+pkgrel=1
 pkgdesc="A BibTeX editor for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://home.gna.org/kbibtex/'
 license=('GPL')
-depends=('kdebase-runtime' 'kdegraphics-okular')
+depends=('kdebase-runtime')
+optdepends=('kdegraphics-okular: Document preview')
 makedepends=('cmake' 'automoc4')
 install=$pkgname.install
-source=("http://download.gna.org/$pkgname/$_branch/$pkgname-$pkgver.tar.bz2")
-md5sums=('657eda1da48198a3c336ff268ce46d6f')
+source=("http://download.gna.org/$pkgname/$_branch/$pkgname-$pkgver.tar.xz")
+md5sums=('bbd2affd1edfb8f02a077c2c7cfc2038')
 
 build() {
   cd "$pkgname-$pkgver"
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
   make
 }
 
diff --git a/community/kbibtex/kbibtex.install b/community/kbibtex/kbibtex.install
index 139cb5694..3f22aadfb 100644
--- a/community/kbibtex/kbibtex.install
+++ b/community/kbibtex/kbibtex.install
@@ -1,15 +1,15 @@
 post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
   update-mime-database usr/share/mime &> /dev/null
   update-desktop-database -q
 }
 
 post_upgrade() {
-	post_install
+  post_install
 }
 
 post_remove() {
-	post_install
+  post_install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD
index 8096339be..b8d37909f 100644
--- a/community/keepalived/PKGBUILD
+++ b/community/keepalived/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 100797 2013-11-11 03:42:38Z seblu $
+# $Id: PKGBUILD 105469 2014-02-08 19:27:45Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 
 pkgname=keepalived
-pkgver=1.2.9
+pkgver=1.2.12
 pkgrel=1
 pkgdesc='Failover and monitoring daemon for LVS clusters'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ backup=('etc/keepalived/keepalived.conf')
 depends=('openssl' 'popt' 'libnl1')
 source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz"
         'keepalived.service')
-md5sums=('adfad98a2cc34230867d794ebc633492'
+md5sums=('60f2564acc1e1faa0237b53cf4392d1f'
          '0a5171f4298528315e8a8004b55befb7')
 
 build() {
diff --git a/community/keepassx/PKGBUILD b/community/keepassx/PKGBUILD
index 36ac427e8..3383462e8 100644
--- a/community/keepassx/PKGBUILD
+++ b/community/keepassx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 101314 2013-11-22 17:06:59Z spupykin $
+# $Id: PKGBUILD 104304 2014-01-17 11:43:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Greg Bouzakis <gregbouzakis@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -6,7 +6,7 @@
 
 pkgname=keepassx
 pkgver=0.4.3
-pkgrel=5
+pkgrel=6
 pkgdesc='Password manager'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.keepassx.org'
@@ -17,15 +17,19 @@ install=keepassx.install
 source=(http://downloads.sourceforge.net/keepassx/$pkgname-$pkgver.tar.gz)
 md5sums=('1df67bb22b2e08df49f09e61d156f508')
 
-build() {
-  cd $srcdir/$pkgname-$pkgver
+prepare() {
+  cd $pkgname-$pkgver
   sed -i '1,1i#include <unistd.h>' src/lib/random.cpp
+  find -name '*.png' -exec optipng -quiet -force -fix {} \;
+}
+
+build() {
+  cd $pkgname-$pkgver
   qmake-qt4
   make
-  find -name '*.png' -exec optipng -quiet -force -fix {} \;
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make INSTALL_ROOT=$pkgdir install
+  cd $pkgname-$pkgver
+  make INSTALL_ROOT="$pkgdir" install
 }
diff --git a/community/kicad/PKGBUILD b/community/kicad/PKGBUILD
index 6818b5de5..2d1b3ea43 100644
--- a/community/kicad/PKGBUILD
+++ b/community/kicad/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92569 2013-06-08 18:17:35Z kkeen $
+# $Id: PKGBUILD 103943 2014-01-13 20:00:42Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Marq Schneider <queueRAM@gmail.com>
 
@@ -6,25 +6,34 @@ pkgname=kicad
 pkgver=20130518
 _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}
 _pkgbzr=4017
-pkgrel=1
+pkgrel=3
 pkgdesc="Electronic schematic and printed circuit board (PCB) design tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://iut-tice.ujf-grenoble.fr/kicad/"
 license=('GPL')
-depends=('glu' 'wxgtk' 'hicolor-icon-theme' 'desktop-file-utils')
+depends=('glu' 'wxgtk2.8' 'hicolor-icon-theme' 'desktop-file-utils' 'libsm')
 makedepends=('cmake' 'zlib' 'mesa')
 optdepends=('kicad-docs-bzr: for documentation' 
             'kicad-library-bzr: for footprints')
 install=kicad.install
 source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}-sources-stable_${_pkgver}_BZR${_pkgbzr}.zip
-        kicad-boost-polygon-declare-gtlsort-earlier.patch)
+        kicad-boost-polygon-declare-gtlsort-earlier.patch
+        wxgtk3.0.patch)
 md5sums=('9e6aab0f2ad01a17c8ec96cd9162dc79'
-         'a2c39704238946e74a5ed0c38326345f')
+         'a2c39704238946e74a5ed0c38326345f'
+         'ec3e7581c814ca2b76becc7b30a8529f')
+
+#source=(https://launchpad.net/ubuntu/trusty/+source/kicad/0.${pkgver}+bzr${_pkgbzr}-2/+files/kicad_0.${pkgver}+bzr${_pkgbzr}.orig.tar.gz)
+# patches from https://launchpad.net/ubuntu/trusty/+source/kicad/0.20130727+bzr4024-2/+files/kicad_0.20130727+bzr4024-2.debian.tar.gz ?
 
 build() {
   cd "$srcdir/stable_${_pkgver}_BZR${_pkgbzr}"
 
+  # kicad-boost-polygon-declare-gtlsort-earlier.patch
+  #sed -i '20i #include "detail/polygon_sort_adaptor.hpp"' include/boost/polygon/polygon.hpp
   patch -p0 < "$srcdir/kicad-boost-polygon-declare-gtlsort-earlier.patch"
+  #patch -p1 < "$srcdir/wxgtk3.0.patch"
+  #sed -i 's/wxStandardPaths/&::Get/' common/edaappl.cpp
 
   # harmless build blocking error
   # see https://lists.launchpad.net/kicad-developers/msg07841.html
@@ -37,9 +46,13 @@ build() {
   # build and install kicad
   mkdir -p build/Release
   cd build/Release
+  # STABLE_VERSION gets removed, eventually
+  # gets ported to wxgtk3, eventually
   cmake ../.. -DKICAD_STABLE_VERSION=ON    \
               -DCMAKE_BUILD_TYPE=Release   \
-              -DCMAKE_INSTALL_PREFIX=/usr
+              -DCMAKE_INSTALL_PREFIX=/usr \
+              -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' \
+              -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8'
   make
 }
 
@@ -52,3 +65,4 @@ package() {
   #cp -r -n "$srcdir/$pkgname-icons/resources/linux/mime/icons" "$pkgdir/usr/share/"
 }
 
+
diff --git a/community/kicad/wxgtk3.0.patch b/community/kicad/wxgtk3.0.patch
new file mode 100644
index 000000000..532fd5da9
--- /dev/null
+++ b/community/kicad/wxgtk3.0.patch
@@ -0,0 +1,12 @@
+diff -rupN a/common/edaappl.cpp b/common/edaappl.cpp
+--- a/common/edaappl.cpp	2013-03-09 21:07:56.000000000 +0000
++++ b/common/edaappl.cpp	2014-01-07 07:49:38.984938912 +0000
+@@ -451,7 +451,7 @@ bool EDA_APP::SetBinDir()
+ 
+     // Linux and Unix
+ #elif defined(__UNIX__)
+-    m_BinDir = wxStandardPaths().GetExecutablePath();
++    m_BinDir = wxStandardPaths::Get().GetExecutablePath();
+ #else
+     m_BinDir = argv[0];
+ #endif // __UNIX__
diff --git a/community/kiwi/PKGBUILD b/community/kiwi/PKGBUILD
index feb6e9870..c051870d9 100644
--- a/community/kiwi/PKGBUILD
+++ b/community/kiwi/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 85550 2013-03-03 03:09:38Z cinelli $
+# $Id: PKGBUILD 105127 2014-02-01 09:34:22Z lfleischer $
 # Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=kiwi
 pkgver=1.9.29
-pkgrel=2
+pkgrel=3
 pkgdesc="A set of classes and wrappers for PyGTK"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.async.com.br/projects/kiwi"
diff --git a/community/klavaro/PKGBUILD b/community/klavaro/PKGBUILD
index 9448a2af0..17ff9bd8e 100644
--- a/community/klavaro/PKGBUILD
+++ b/community/klavaro/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 98040 2013-10-04 13:46:45Z stativ $
+# $Id: PKGBUILD 105247 2014-02-03 11:23:55Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=klavaro
-pkgver=2.00
+pkgver=3.00
 pkgrel=1
 pkgdesc="Free touch typing tutor program"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://klavaro.sourceforge.net/"
 license=('GPL2')
-depends=('curl' 'gtkdatabox' 'hicolor-icon-theme')
+depends=('curl' 'gtk3' 'hicolor-icon-theme')
 makedepends=('intltool')
 optdepends=('espeakup: voice output')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('f7c804fbad7f9a053dfcfbea6d91dce6')
+md5sums=('254559632d4ae26aa22b80be9f01cb47')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
@@ -24,6 +24,10 @@ package() {
   cd "$srcdir"/$pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
+  # remove the gtkdatabox shared library
+  # klavaro links to it statically due to some incompatibility wioth GTK3
+  rm -r "$pkgdir/usr/lib"
+
   sed -i 's|/usr/share/icons/hicolor/24x24/apps/klavaro.png|klavaro|' \
     "$pkgdir"/usr/share/applications/$pkgname.desktop
 }
diff --git a/community/kmess/PKGBUILD b/community/kmess/PKGBUILD
index 293e964d8..05ccc5c1a 100644
--- a/community/kmess/PKGBUILD
+++ b/community/kmess/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97032 2013-09-11 02:13:11Z bgyorgy $
-# Maintainer:
+# $Id: PKGBUILD 103917 2014-01-13 17:16:49Z andyrtr $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com>
 
 pkgname=kmess
 pkgver=2.0.6.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A MSN Messenger client for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://kmess.sourceforge.net/'
diff --git a/community/knemo/PKGBUILD b/community/knemo/PKGBUILD
index 4cd33a88f..7838449ca 100644
--- a/community/knemo/PKGBUILD
+++ b/community/knemo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85916 2013-03-08 23:40:41Z foutrelis $
+# $Id: PKGBUILD 105367 2014-02-06 05:24:13Z bisson $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=knemo
 pkgver=0.7.6
-pkgrel=3
+pkgrel=4
 pkgdesc="The KDE Network Monitor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde-apps.org/content/show.php?content=12956"
@@ -15,25 +15,26 @@ depends=('kdebase-workspace' 'wireless_tools' 'iw' 'libnl' 'gtk-update-icon-cach
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 options=('libtool')
-source=("http://www.kde-apps.org/CONTENT/content-files/12956-${pkgname}-${pkgver}.tar.bz2")
+source=(https://launchpad.net/ubuntu/+archive/primary/+files/knemo_$pkgver.orig.tar.bz2)
 md5sums=('42b35d4d48698a2f514adeb2ca872408')
 
-build() {
-  cd ${srcdir}
-
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
+
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr    
+    -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/build
-
-  make DESTDIR=${pkgdir} install
+  cd build
+  make DESTDIR="${pkgdir}" install
 
   # remove knemo autostart
   # rm -rf ${pkgdir}/usr/share/autostart
diff --git a/community/kphotoalbum/PKGBUILD b/community/kphotoalbum/PKGBUILD
index 11375c709..1c12378c8 100644
--- a/community/kphotoalbum/PKGBUILD
+++ b/community/kphotoalbum/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103167 2013-12-28 11:16:04Z lcarlier $
+# $Id: PKGBUILD 104796 2014-01-26 12:17:34Z andyrtr $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com>
@@ -7,7 +7,7 @@
 
 pkgname=kphotoalbum
 pkgver=4.4
-pkgrel=3
+pkgrel=4
 pkgdesc="KDE Photo Album, picture collection manager"
 url="http://www.kphotoalbum.org/"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/krename/PKGBUILD b/community/krename/PKGBUILD
index e7fdfe295..2ef6e1696 100644
--- a/community/krename/PKGBUILD
+++ b/community/krename/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 74836 2012-08-06 23:09:01Z andrea $
+# $Id: PKGBUILD 104797 2014-01-26 12:17:35Z andyrtr $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=krename
 pkgver=4.0.9
-pkgrel=2
-pkgdesc="A very powerfull batch file renamer for KDE"
+pkgrel=3
+pkgdesc="A very powerful batch file renamer for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.krename.net"
 license=('GPL')
@@ -16,16 +16,15 @@ source=(http://downloads.sourceforge.net/project/krename/KDE4%20krename-stable/$
 sha1sums=('03886a385a16de4c9bc285d25b9816ea97768c9e')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-I/usr/include/freetype2"
   make
 }
 
 package() {
-  cd "${srcdir}/build"
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/community/kvpnc/PKGBUILD b/community/kvpnc/PKGBUILD
index 8f65fc769..18a9a0e63 100644
--- a/community/kvpnc/PKGBUILD
+++ b/community/kvpnc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91108 2013-05-19 18:46:49Z dreisner $
+# $Id: PKGBUILD 103918 2014-01-13 17:16:50Z andyrtr $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Danial Olsen <do@meyl.fo>
 
 pkgname=kvpnc
 pkgver=0.9.6a
-pkgrel=4
+pkgrel=5
 pkgdesc="A KDE Desktop Environment frontend for various vpn clients"
 arch=(i686 x86_64 'mips64el')
 url="http://home.gna.org/kvpnc/"
diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD
index 8333b1a01..e69b7ecff 100644
--- a/community/leptonica/PKGBUILD
+++ b/community/leptonica/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100182 2013-11-01 21:05:03Z spupykin $
+# $Id: PKGBUILD 105237 2014-02-03 10:02:21Z heftig $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Christoph Drexler <chrdr at gmx dot at>
 
 pkgname=leptonica
 pkgver=1.69
-pkgrel=9
+pkgrel=10
 pkgdesc="Software that is broadly useful for image processing and image analysis applications"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.leptonica.com/"
diff --git a/community/libaacs/PKGBUILD b/community/libaacs/PKGBUILD
new file mode 100644
index 000000000..9c3e01eef
--- /dev/null
+++ b/community/libaacs/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 104040 2014-01-14 17:14:01Z flexiondotorg $
+# Maintainer:  Martin Wimpress <code@flexion.org>
+# Contributor: Gustavo Alvarez <sl1pkn07@gmail.com>
+# Contributor: Dirk Berg <berg1981@googlemail.com>
+
+pkgname=libaacs
+pkgver=0.7.0
+pkgrel=2
+pkgdesc="Advanced Access Content System"
+arch=('i686' 'x86_64')
+license=('LGPL')
+url="http://www.videolan.org/developers/libaacs.html"
+depends=('libgcrypt')
+source=("ftp://ftp.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+provides=('libaacs')
+conflicts=('libaacs-git')
+md5sums=('8da0da893d1f266b31bf8a8fc7c84a84')
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./bootstrap
+    ./configure --prefix=/usr
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+    install -Dm644 KEYDB.cfg "${pkgdir}/usr/share/doc/${pkgname}"/KEYDB.cfg
+    install -Dm644 README.txt "${pkgdir}/usr/share/doc/${pkgname}"/README.txt
+}
diff --git a/community/libc++/PKGBUILD b/community/libc++/PKGBUILD
index 6a4f8c0df..fc27155d1 100644
--- a/community/libc++/PKGBUILD
+++ b/community/libc++/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Daniel Micay <danielmicay@gmail.com>
 # Contributor: MThinkCpp <mtc.maintainer[at]outlook.com>
 pkgname=libc++
-pkgver=3.3
-pkgrel=3
+pkgver=3.4
+pkgrel=1
 pkgdesc='A new implementation of the C++ standard library, targeting C++11.'
 url='http://libcxx.llvm.org'
 license=('custom:University of Illinois/NCSA Open Source License')
@@ -11,19 +11,19 @@ arch=('i686' 'x86_64')
 depends=('glibc' 'libc++abi' 'gcc-libs')
 makedepends=('clang' 'subversion' 'cmake')
 source=("http://www.llvm.org/releases/${pkgver}/libcxx-${pkgver}.src.tar.gz")
-md5sums=('59006e659ffb33f5222a7b79d4cd071e')
+md5sums=('85c3c4e2233893b037256bf9f7077857')
 install=${pkgname}.install
 
 build() {
-  mkdir -p libcxx-${pkgver}.src/build
-  cd libcxx-${pkgver}.src/build
+  mkdir -p libcxx-${pkgver}/build
+  cd libcxx-${pkgver}/build
   CC=clang CXX=clang++ cmake -G "Unix Makefiles" -DLIBCXX_CXX_ABI=libcxxabi \
     -DLIBCXX_LIBCXXABI_INCLUDE_PATHS=/usr/include \
-    -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr "$srcdir/libcxx-${pkgver}.src"
+    -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr "$srcdir/libcxx-${pkgver}"
   make
 }
 package() {
-  install -Dm644 libcxx-${pkgver}.src/LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/license.txt"
-  cd libcxx-${pkgver}.src/build
+  install -Dm644 libcxx-${pkgver}/LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/license.txt"
+  cd libcxx-${pkgver}/build
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/libdivecomputer/PKGBUILD b/community/libdivecomputer/PKGBUILD
new file mode 100644
index 000000000..128d186c5
--- /dev/null
+++ b/community/libdivecomputer/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 105692 2014-02-14 05:51:19Z bisson $
+# Contributor: Francois Boulogne <fboulogne at april dot org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=libdivecomputer
+pkgver=0.4.2
+pkgrel=2
+pkgdesc='Library for communication with dive computers'
+url='http://www.libdivecomputer.org/'
+license=('LGPL')
+arch=('i686' 'x86_64')
+source=("http://www.libdivecomputer.org/releases/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('a57176ae6a7bd5e0ad4d19a39e5aebcfba818acc')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure \
+		--prefix=/usr \
+		--program-prefix="${pkgname}-" \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}
diff --git a/community/libesmtp/PKGBUILD b/community/libesmtp/PKGBUILD
index 92112d78b..f6f402dcc 100644
--- a/community/libesmtp/PKGBUILD
+++ b/community/libesmtp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99832 2013-10-31 01:58:40Z allan $
+# $Id: PKGBUILD 103322 2014-01-03 10:52:59Z bpiotrowski $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=libesmtp
 pkgver=1.0.6
-pkgrel=2.1
+pkgrel=3
 pkgdesc='A library to manage posting mail to a preconfigured MTA.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.stafford.uklinux.net/libesmtp/'
diff --git a/community/libev/PKGBUILD b/community/libev/PKGBUILD
index f293b35a9..286ae1f22 100644
--- a/community/libev/PKGBUILD
+++ b/community/libev/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99834 2013-10-31 01:59:20Z allan $
+# $Id: PKGBUILD 103324 2014-01-03 10:53:10Z bpiotrowski $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Thomas Haider <t.haider@vcnc.org>
 
 pkgname=libev
 pkgver=4.15
-pkgrel=1
+pkgrel=2
 pkgdesc="A full-featured and high-performance event loop"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://software.schmorp.de/pkg/libev.html"
diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD
index c77f0539e..92e1d1d25 100644
--- a/community/libextractor/PKGBUILD
+++ b/community/libextractor/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99836 2013-10-31 02:00:00Z allan $
+# $Id: PKGBUILD 104798 2014-01-26 12:17:36Z andyrtr $
 # Maintainer: Sergej Pupykin <pupykin.s@gmail.com>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=libextractor
 pkgver=1.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A library used to extract meta-data from files of arbitrary type"
 arch=("i686" "x86_64" 'mips64el')
 license=('GPL')
diff --git a/community/libfaketime/PKGBUILD b/community/libfaketime/PKGBUILD
index a43fbb58b..c5e306d70 100644
--- a/community/libfaketime/PKGBUILD
+++ b/community/libfaketime/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 103175 2013-12-28 18:39:16Z lfleischer $
+# $Id: PKGBUILD 105112 2014-01-31 20:29:28Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Dan Serban
 # Contributor: Ross Melin <rdmelin@gmail.com>
 
 pkgname=libfaketime
 pkgver=0.9.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Report fake dates and times to programs without having to change the system-wide time.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.code-wizards.com/projects/libfaketime/'
@@ -15,7 +15,7 @@ md5sums=('89b5c71e6c6a93b1c6feba374ac37719')
 
 build() {
   cd "${pkgname}-${pkgver}"
-  make
+  make PREFIX=/usr
 }
 
 package() {
diff --git a/community/libfdk-aac/PKGBUILD b/community/libfdk-aac/PKGBUILD
new file mode 100644
index 000000000..0a6cf737b
--- /dev/null
+++ b/community/libfdk-aac/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 105354 2014-02-05 21:49:32Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: PelPix <kylebloss@pelpix.info>
+# Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com>
+
+pkgname=libfdk-aac
+pkgver=0.1.3
+pkgrel=2
+pkgdesc='Fraunhofer FDK AAC codec library'
+arch=('i686' 'x86_64')
+url='http://sourceforge.net/projects/opencore-amr/'
+license=('custom')
+depends=('glibc')
+source=("http://downloads.sourceforge.net/opencore-amr/${pkgname#lib}-${pkgver}.tar.gz")
+sha256sums=('a9cb872802cfb7a2aff7a549c114c547d1e518dd60c2f85942229cc20c0d0c8d')
+
+build() {
+  cd ${pkgname#lib}-${pkgver}
+
+  ./configure --prefix='/usr' --disable-static
+  make
+}
+
+package () {
+  cd ${pkgname#lib}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+
+  install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -m 644 NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/extra/libftdi/PKGBUILD b/community/libftdi/PKGBUILD
index 164883361..047615a8e 100644
--- a/extra/libftdi/PKGBUILD
+++ b/community/libftdi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 200729 2013-12-03 16:51:00Z eric $
-# Maintainer:
+# $Id: PKGBUILD 105529 2014-02-09 17:42:22Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
 
 pkgname=libftdi
-pkgver=1.0
+pkgver=1.1
 pkgrel=2
 pkgdesc="A library to talk to FTDI chips"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,26 +11,24 @@ license=('GPL2' 'LGPL2.1')
 depends=('libusbx')
 makedepends=('boost' 'cmake')
 source=(http://www.intra2net.com/en/developer/libftdi/download/${pkgname}1-$pkgver.tar.bz2{,.sig})
-sha1sums=('5be76cfd7cd36c5291054638f7caf4137303386f'
+sha1sums=('f05ade5614aa31e64f91a30ce3782f7ca3704d18'
           'SKIP')
 
 prepare() {
-  cd ${pkgname}1-$pkgver
+  cd "${pkgname}1-$pkgver"
   sed -i 's|LIB_SUFFIX 64|LIB_SUFFIX ""|' CMakeLists.txt
 }
 
 build() {
-  cd ${pkgname}1-$pkgver
+  cd "${pkgname}1-$pkgver"
   mkdir build
   cd build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_BUILD_TYPE=Release
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_BUILD_RPATH=ON \
+    -DCMAKE_BUILD_TYPE=Release -DEXAMPLES=OFF -DFTDI_EEPROM=OFF
   make
 }
 
 package() {
-  cd ${pkgname}1-$pkgver/build
+  cd "${pkgname}1-$pkgver/build"
   make DESTDIR="$pkgdir" install
-  find examples -type f -perm -755 -exec install {} "$pkgdir/usr/bin" \;
-  # Remove eepreom (conflict with i2c-tools FS#37925)
-  rm "$pkgdir/usr/bin/eeprom"
 }
diff --git a/community/libgeotiff/PKGBUILD b/community/libgeotiff/PKGBUILD
index a391e2128..0f8da267c 100644
--- a/community/libgeotiff/PKGBUILD
+++ b/community/libgeotiff/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99840 2013-10-31 02:01:25Z allan $
+# $Id: PKGBUILD 103326 2014-01-03 10:53:25Z bpiotrowski $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
@@ -6,7 +6,7 @@
 
 pkgname=libgeotiff
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A TIFF based interchange format for georeferenced raster imagery"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.remotesensing.org/geotiff"
diff --git a/community/libgexiv2/PKGBUILD b/community/libgexiv2/PKGBUILD
index 9adbc5efb..760c679f0 100644
--- a/community/libgexiv2/PKGBUILD
+++ b/community/libgexiv2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100330 2013-11-02 11:06:06Z arodseth $
+# $Id: PKGBUILD 104799 2014-01-26 12:17:37Z andyrtr $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libgexiv2
 pkgver=0.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc='GObject-based wrapper around the Exiv2 library'
 arch=('x86_64' 'i686' 'mips64el')
 # http://yorba.org/download/gexiv2/
diff --git a/community/libgit2-glib/PKGBUILD b/community/libgit2-glib/PKGBUILD
index bb1484a33..9cc31aa13 100644
--- a/community/libgit2-glib/PKGBUILD
+++ b/community/libgit2-glib/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 99843 2013-10-31 02:02:27Z allan $
+# $Id: PKGBUILD 104880 2014-01-28 00:44:20Z eric $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libgit2-glib
-pkgver=0.0.6
+pkgver=0.0.10
 pkgrel=1
 pkgdesc="GLib wrapper for libgit2"
-url="http://live.gnome.org/Libgit2-glib"
+url="http://wiki.gnome.org/Projects/Libgit2-glib"
 license=(LGPL2.1)
 arch=(i686 x86_64)
-depends=(glib2 libgit2 gobject-introspection)
+depends=(glib2 libgit2)
+makedepends=(gobject-introspection)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bda84b5ab6fbe2922a4cf386b4e6d4401863dec7bea1879e86939d005cd521f6')
+sha256sums=('3d9dc3c2ca7fab21aa005100b102e085f4d864e507c424d46de451e9d40bfeff')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
diff --git a/community/libgit2/PKGBUILD b/community/libgit2/PKGBUILD
index 37fe82c0e..4c7c48313 100644
--- a/community/libgit2/PKGBUILD
+++ b/community/libgit2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 93245 2013-06-29 19:05:07Z thestinger $
+# $Id: PKGBUILD 104861 2014-01-27 17:22:44Z thestinger $
 # Maintainer: Daniel Micay <danielmicay@gmail.com>
 # Contributor: Hilton Medeiros <medeiros.hilton@gmail.com>
 # Contributor: Dave Reisner <d@falconindy.com>
 
 pkgname=libgit2
-pkgver=0.19.0
+pkgver=0.20.0
 pkgrel=1
 pkgdesc="A linkable library for Git"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ url="http://libgit2.github.com/"
 depends=(zlib openssl libssh2)
 makedepends=(cmake python)
 license=('GPL2')
-source=("src-$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/tarball/v$pkgver")
-md5sums=('df1c1e058b2d0f46b1b73dc78d551ea1')
+source=("https://github.com/libgit2/libgit2/archive/v${pkgver}.tar.gz")
+md5sums=('e35f613a37e11354f34249f2faa68237')
 
 build() {
   cd $pkgname-*
diff --git a/community/libinfinity/PKGBUILD b/community/libinfinity/PKGBUILD
index 81c623de6..c5aa21815 100644
--- a/community/libinfinity/PKGBUILD
+++ b/community/libinfinity/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 100198 2013-11-01 21:12:34Z spupykin $
+# $Id: PKGBUILD 105374 2014-02-06 09:23:52Z 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=2
+pkgver=0.5.5
+pkgrel=1
 pkgdesc="An implementation of the Infininote protocol written in GObject-based C"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gobby.0x539.de"
@@ -15,7 +15,7 @@ makedepends=('gtk-doc' 'pkgconfig')
 optdepends=('avahi: zeroconf support'
             'gtk2: gtk support')
 source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('1e83ec8b3ed3159d0c883c056b153429')
+md5sums=('93a0cd2b73c9298aa77ee37503d2bc5f')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/liblinebreak/PKGBUILD b/community/liblinebreak/PKGBUILD
deleted file mode 100644
index 7c558a7f5..000000000
--- a/community/liblinebreak/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $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=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")
-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/liblogging/PKGBUILD b/community/liblogging/PKGBUILD
new file mode 100644
index 000000000..9c2c94f39
--- /dev/null
+++ b/community/liblogging/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 105659 2014-02-13 09:26:42Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Denis Wernert <deniswernert@gmail.com>
+
+pkgname=liblogging
+pkgver=1.0.1
+pkgrel=1
+pkgdesc="easy to use, portable, open source library for system logging"
+url="http://www.liblogging.org/"
+arch=('i686' 'x86_64')
+license=('GPL')
+makedepends=('git')
+options=('strip' 'zipman' '!libtool')
+source=("http://download.rsyslog.com/$pkgname/$pkgname-$pkgver.tar.gz")
+#source=("git://git.adiscon.com/git/liblogging.git")
+md5sums=('1db6bef59157a5676f8fad49be6e5d9d')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+#  libtoolize --force --copy
+#  aclocal
+#  autoheader
+#  automake --add-missing --copy
+#  autoconf
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make install DESTDIR=${pkgdir}
+}
diff --git a/community/libmatekbd/PKGBUILD b/community/libmatekbd/PKGBUILD
new file mode 100644
index 000000000..e351ce4b3
--- /dev/null
+++ b/community/libmatekbd/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 104170 2014-01-16 15:09:15Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
+# Contributor: Xpander <xpander0@gmail.com>
+
+pkgname=libmatekbd
+pkgver=1.6.2
+pkgrel=1
+pkgdesc="MATE keyboard library"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('dconf' 'gtk2' 'iso-codes' 'libxklavier')
+makedepends=('mate-common' 'perl-xml-parser')
+options=('!emptydirs')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('224eba31dbf6d44f69ae3b75712a0bb90717df68')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --disable-static
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/geoclue2/geoclue.install b/community/libmatekbd/libmatekbd.install
index c25dff2d3..3a06d45b9 100644
--- a/extra/geoclue2/geoclue.install
+++ b/community/libmatekbd/libmatekbd.install
@@ -1,5 +1,5 @@
 post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
 }
 
 post_upgrade() {
diff --git a/community/libmatekeyring/PKGBUILD b/community/libmatekeyring/PKGBUILD
new file mode 100644
index 000000000..54fb88865
--- /dev/null
+++ b/community/libmatekeyring/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 104159 2014-01-16 13:02:33Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
+# Contributor: Xpander <xpander0@gmail.com>
+
+pkgname=libmatekeyring
+pkgver=1.6.1
+pkgrel=3
+pkgdesc="MATE keyring client library"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL')
+depends=('dbus' 'glib2' 'libgcrypt')
+makedepends=('docbook-xml' 'mate-common' 'perl-xml-parser')
+options=('!emptydirs')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('ad6a5d029506348094e0147a9be9cc4555ed87a4')
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/mate-keyring \
+        --disable-static
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/libmateweather/PKGBUILD b/community/libmateweather/PKGBUILD
new file mode 100644
index 000000000..82d54aebe
--- /dev/null
+++ b/community/libmateweather/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 104174 2014-01-16 15:20:18Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
+# Contributor: Xpander <xpander0@gmail.com>
+
+pkgname=libmateweather
+pkgver=1.6.2
+pkgrel=5
+pkgdesc="Provides access to weather information from the net"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('dconf' 'gtk2' 'libsoup' 'pygtk' 'python2-gobject2')
+makedepends=('mate-common' 'perl-xml-parser')
+options=('!emptydirs')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('56f30e35345864954a37228ad8103350f4bc3651')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    PYTHON=/usr/bin/python2 ./configure \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --disable-static \
+        --enable-python \
+        --enable-locations-compression
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/libmateweather/libmateweather.install b/community/libmateweather/libmateweather.install
new file mode 100644
index 000000000..d6813b0f7
--- /dev/null
+++ b/community/libmateweather/libmateweather.install
@@ -0,0 +1,12 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/mate
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/libmatewnck/PKGBUILD b/community/libmatewnck/PKGBUILD
new file mode 100644
index 000000000..2c967fb94
--- /dev/null
+++ b/community/libmatewnck/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 104295 2014-01-17 10:05:11Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=libmatewnck
+pkgver=1.6.1
+pkgrel=6
+pkgdesc="Window Navigator Construction Kit for MATE."
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('gtk2' 'libxres' 'startup-notification')
+makedepends=('gobject-introspection' 'mate-common' 'perl-xml-parser')
+options=('!emptydirs')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('10e2def928dd74529c49a624803187098ea2b0f6')
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --disable-static \
+        --enable-gtk-doc \
+        --enable-startup-notification \
+        --enable-introspection
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD
index b8cf31a36..4e5579e26 100644
--- a/community/libmicrohttpd/PKGBUILD
+++ b/community/libmicrohttpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102393 2013-12-10 10:04:03Z spupykin $
+# $Id: PKGBUILD 104514 2014-01-22 06:55:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Norberto Lopes <shelika@mail.telepac.pt>
 # Contributor: Kao Dome <kaodome@gmail.com>
@@ -6,7 +6,7 @@
 # Contributor: Mathias Rohnstock <linksoft@gmx.de>
 
 pkgname=libmicrohttpd
-pkgver=0.9.32
+pkgver=0.9.33
 pkgrel=1
 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')
@@ -15,7 +15,7 @@ license=('LGPL')
 depends=('gnutls' 'libgcrypt')
 install=libmicrohttpd.install
 source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz)
-md5sums=('29dcc1c201c36044be2c3f816c64a5bb')
+md5sums=('013b10f9de1cda5448b29c81305354a3')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/libmilter/PKGBUILD b/community/libmilter/PKGBUILD
index dd73bbe83..e08478350 100644
--- a/community/libmilter/PKGBUILD
+++ b/community/libmilter/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 88321 2013-04-16 13:29:18Z spupykin $
+# $Id: PKGBUILD 105609 2014-02-11 17:57:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: mutantmonkey <mutantmonkey@gmail.com>
 
 pkgname=libmilter
-pkgver=8.14.6
+pkgver=8.14.8
 pkgrel=1
 pkgdesc="libmilter"
 arch=(i686 x86_64 mips64el)
 url="http://www.postfix.org/MILTER_README.html"
+options=('staticlibs')
 license=('custom:Sendmail open source license')
 source="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${pkgver}.tar.gz"
-md5sums=('9eeed3d1baecbf4e17d829d2ec005553')
+md5sums=('73bfc621c75dbdd3d719e54685d92577')
 options=(staticlibs)
 
 build(){
diff --git a/community/libnfs/PKGBUILD b/community/libnfs/PKGBUILD
index e4bc6184b..f83af59e4 100644
--- a/community/libnfs/PKGBUILD
+++ b/community/libnfs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 101449 2013-11-25 20:44:51Z idevolder $
+# $Id: PKGBUILD 105190 2014-02-02 16:31:36Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 
 pkgname=libnfs
-pkgver=1.8.0
+pkgver=1.9.2
 pkgrel=1
 pkgdesc="client library for accessing NFS shares"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,7 +10,6 @@ url="https://github.com/sahlberg/libnfs"
 license=('GPL')
 depends=('glibc')
 source=("https://github.com/sahlberg/$pkgname/archive/$pkgname-$pkgver.tar.gz")
-sha256sums=('e4d766efba85e79b04c18038070506d0a9df5b7e0f08aa54ab402892cd1542cc')
 
 build() {
   cd "$pkgname-$pkgname-$pkgver"
@@ -24,3 +23,4 @@ package() {
   cd "$pkgname-$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
+sha256sums=('77d9d543eb1ae3e36497e5a3d4f37c8dd3d66def8d11817d4ed84368bbbb225b')
diff --git a/community/liboobs/PKGBUILD b/community/liboobs/PKGBUILD
new file mode 100644
index 000000000..8ca3cea23
--- /dev/null
+++ b/community/liboobs/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 104269 2014-01-16 18:45:11Z flexiondotorg $
+# Maintainer: Martin Wimpress <code@flexion.org>
+
+pkgname=liboobs
+pkgver=3.0.0
+pkgrel=3
+pkgdesc="GObject based interface to system-tools-backends - shared library"
+arch=('i686' 'x86_64')
+url="http://developer.gnome.org/liboobs/"
+license=('GPL2')
+depends=('system-tools-backends')
+source=("ftp://ftp.gnome.org/pub/GNOME/sources/liboobs/3.0/${pkgname}-${pkgver}.tar.bz2")
+sha256sums=('1e7a327df7dcfa30e0cd3e0d2ffcd9a2c91c7870291dd30434b5da907945c00a')
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --disable-static
+    make
+}
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/libpaper/PKGBUILD b/community/libpaper/PKGBUILD
deleted file mode 100644
index 82c85b7a9..000000000
--- a/community/libpaper/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $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=6
-pkgdesc='Library for handling paper characteristics'
-arch=('x86_64' 'i686' 'mips64el')
-url='http://packages.debian.org/unstable/source/libpaper'
-license=('GPL')
-depends=('sh')
-source=("http://ftp.de.debian.org/debian/pool/main/libp/$pkgname/${pkgname}_$pkgver+nmu2.tar.gz")
-sha256sums=('c5bdd6d9dff179699160675dbb61651d9b3158f6da27558fdaba00e7c427ba96')
-
-build() {
-  cd "$pkgname-$pkgver+nmu2"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --sbindir=/usr/bin
-  make
-}
-
-package() {
-  make -C "$pkgname-$pkgver+nmu2" DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/libuhd/PKGBUILD b/community/libuhd/PKGBUILD
index e33eaf34f..d51796f9e 100644
--- a/community/libuhd/PKGBUILD
+++ b/community/libuhd/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 102256 2013-12-07 10:36:40Z bpiotrowski $
+# $Id: PKGBUILD 105585 2014-02-10 16:15:17Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Dominik Heidler <dheidler@gmail.com>
 
 pkgname=libuhd
-pkgver=3.5.4
-_verstring=003_005_004
-pkgrel=4
+pkgver=3.6.2
+_verstring=003_006_002
+pkgrel=1
 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')
+optdepends=('python2: usrp utils')
 makedepends=('cmake' 'boost' 'python2-cheetah')
 
-source=("libuhd-$pkgver.tar.gz::https://codeload.github.com/EttusResearch/uhd/tar.gz/release_$_verstring")
-md5sums=('e90c95483a52b75cacc85f4fb0ef63ed')
+source=("libuhd-$pkgver.tar.gz::https://github.com/EttusResearch/uhd/archive/release_${_verstring}.tar.gz")
+md5sums=('50a25b95dc08dd3946988c5da98814a9')
 
 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|"
+  find -name "*.py" -or -name '*.py.in' | xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
+  
   mkdir -p build
   cd build
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr/ \
@@ -29,6 +31,7 @@ build() {
            -DENABLE_TESTS=OFF \
            -DENABLE_E100=ON
   # e100 is disabled by default for now, check that on future releases
+
   make
 }
 
@@ -40,5 +43,5 @@ check() {
 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"
+  install -Dm644 "../utils/uhd-usrp.rules" "$pkgdir/usr/lib/udev/rules.d/10-uhd-usrp.rules"
 } 
diff --git a/community/libvdpau-va-gl/PKGBUILD b/community/libvdpau-va-gl/PKGBUILD
index b5f7deb53..6134346c9 100644
--- a/community/libvdpau-va-gl/PKGBUILD
+++ b/community/libvdpau-va-gl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 101594 2013-11-28 16:02:19Z bpiotrowski $
+# $Id: PKGBUILD 105035 2014-01-30 12:39:32Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Behem0th <grantipak@gmail.com>
 
 pkgname=libvdpau-va-gl
-pkgver=0.2.1
+pkgver=0.3.2
 pkgrel=1
 pkgdesc='VDPAU driver with OpenGL/VAAPI backend'
 arch=('i686' 'x86_64')
@@ -11,8 +11,8 @@ url='https://github.com/i-rinat/libvdpau-va-gl'
 license=('LGPL3')
 depends=('libvdpau' 'libva' 'libgl' 'ffmpeg' 'glu')
 makedepends=('cmake')
-source=('https://github.com/i-rinat/${pkgname}/archive/v'${pkgver}'.zip')
-md5sums=('bb14c2ec9763c025b1abde96df845512')
+source=(https://github.com/i-rinat/$pkgname/archive/v$pkgver.tar.gz)
+md5sums=('3fea8e94a67cd54c2f1d3ce1907c910a')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/libvirt-python/PKGBUILD b/community/libvirt-python/PKGBUILD
index 3e592fdfd..27eba642e 100644
--- a/community/libvirt-python/PKGBUILD
+++ b/community/libvirt-python/PKGBUILD
@@ -3,31 +3,25 @@
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt-python
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.2.1
+pkgrel=1
 pkgdesc="libvirt python binding"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
 license=('LGPL')
 depends=('python2' 'libvirt')
+makedepends=('git')
 options=('emptydirs')
 install="libvirt-python.install"
-source=("ftp://libvirt.org/libvirt/python/$pkgname-$pkgver.tar.gz"
-	"python-fix.patch::http://libvirt.org/git/?p=libvirt-python.git;a=patch;h=9d9e2513c09e7ba7474c94455e5f82b3d00e6396")
-md5sums=('38158e5740be65f17eef9f99ffa5dadf'
-         'ba2e5b0d5906a25a6e8a857156d55b61')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 <$srcdir/python-fix.patch
-}
+source=("$pkgname::git://libvirt.org/libvirt-python.git#tag=v1.2.1")
+md5sums=('SKIP')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
   python2 setup.py build
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
   python2 setup.py install --root=$pkgdir
 }
diff --git a/community/libvirt/0001-Also-store-user-group-ID-values-in-virIdentity.patch b/community/libvirt/0001-Also-store-user-group-ID-values-in-virIdentity.patch
deleted file mode 100644
index 70a613820..000000000
--- a/community/libvirt/0001-Also-store-user-group-ID-values-in-virIdentity.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From 02432e3afa32e9866fbf1317069b422ef552d1d4 Mon Sep 17 00:00:00 2001

-From: "Daniel P. Berrange" <berrange@redhat.com>

-Date: Thu, 22 Aug 2013 16:00:01 +0100

-Subject: [PATCH 1/3] Also store user & group ID values in virIdentity

-

-Future improvements to the polkit code will require access to

-the numeric user ID, not merely user name.

-

-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

----

- src/rpc/virnetserverclient.c | 18 ++++++++++++++++++

- src/util/viridentity.c       | 23 +++++++++++++++++++----

- src/util/viridentity.h       |  2 ++

- 3 files changed, 39 insertions(+), 4 deletions(-)

-

-diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c

-index 83d5cf1..f30dd08 100644

---- a/src/rpc/virnetserverclient.c

-+++ b/src/rpc/virnetserverclient.c

-@@ -652,7 +652,9 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)

-     char *processid = NULL;

-     char *processtime = NULL;

-     char *username = NULL;

-+    char *userid = NULL;

-     char *groupname = NULL;

-+    char *groupid = NULL;

- #if WITH_SASL

-     char *saslname = NULL;

- #endif

-@@ -672,8 +674,12 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)

- 

-         if (!(username = virGetUserName(uid)))

-             goto cleanup;

-+        if (virAsprintf(&userid, "%d", uid) < 0)

-+            goto cleanup;

-         if (!(groupname = virGetGroupName(gid)))

-             goto cleanup;

-+        if (virAsprintf(&userid, "%d", gid) < 0)

-+            goto cleanup;

-         if (virAsprintf(&processid, "%llu",

-                         (unsigned long long)pid) < 0)

-             goto cleanup;

-@@ -710,11 +716,21 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)

-                            VIR_IDENTITY_ATTR_UNIX_USER_NAME,

-                            username) < 0)

-         goto error;

-+    if (userid &&

-+        virIdentitySetAttr(ret,

-+                           VIR_IDENTITY_ATTR_UNIX_USER_ID,

-+                           userid) < 0)

-+        goto error;

-     if (groupname &&

-         virIdentitySetAttr(ret,

-                            VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,

-                            groupname) < 0)

-         goto error;

-+    if (groupid &&

-+        virIdentitySetAttr(ret,

-+                           VIR_IDENTITY_ATTR_UNIX_GROUP_ID,

-+                           groupid) < 0)

-+        goto error;

-     if (processid &&

-         virIdentitySetAttr(ret,

-                            VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,

-@@ -745,7 +761,9 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)

- 

- cleanup:

-     VIR_FREE(username);

-+    VIR_FREE(userid);

-     VIR_FREE(groupname);

-+    VIR_FREE(groupid);

-     VIR_FREE(processid);

-     VIR_FREE(processtime);

-     VIR_FREE(seccontext);

-diff --git a/src/util/viridentity.c b/src/util/viridentity.c

-index 781f660..03c375b 100644

---- a/src/util/viridentity.c

-+++ b/src/util/viridentity.c

-@@ -133,7 +133,9 @@ int virIdentitySetCurrent(virIdentityPtr ident)

- virIdentityPtr virIdentityGetSystem(void)

- {

-     char *username = NULL;

-+    char *userid = NULL;

-     char *groupname = NULL;

-+    char *groupid = NULL;

-     char *seccontext = NULL;

-     virIdentityPtr ret = NULL;

- #if WITH_SELINUX

-@@ -147,8 +149,13 @@ virIdentityPtr virIdentityGetSystem(void)

- 

-     if (!(username = virGetUserName(getuid())))

-         goto cleanup;

-+    if (virAsprintf(&userid, "%d", (int)getuid()) < 0)

-+        goto cleanup;

-+

-     if (!(groupname = virGetGroupName(getgid())))

-         goto cleanup;

-+    if (virAsprintf(&groupid, "%d", (int)getgid()) < 0)

-+        goto cleanup;

- 

- #if WITH_SELINUX

-     if (getcon(&con) < 0) {

-@@ -166,16 +173,22 @@ virIdentityPtr virIdentityGetSystem(void)

-     if (!(ret = virIdentityNew()))

-         goto cleanup;

- 

--    if (username &&

--        virIdentitySetAttr(ret,

-+    if (virIdentitySetAttr(ret,

-                            VIR_IDENTITY_ATTR_UNIX_USER_NAME,

-                            username) < 0)

-         goto error;

--    if (groupname &&

--        virIdentitySetAttr(ret,

-+    if (virIdentitySetAttr(ret,

-+                           VIR_IDENTITY_ATTR_UNIX_USER_ID,

-+                           userid) < 0)

-+        goto error;

-+    if (virIdentitySetAttr(ret,

-                            VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,

-                            groupname) < 0)

-         goto error;

-+    if (virIdentitySetAttr(ret,

-+                           VIR_IDENTITY_ATTR_UNIX_GROUP_ID,

-+                           groupid) < 0)

-+        goto error;

-     if (seccontext &&

-         virIdentitySetAttr(ret,

-                            VIR_IDENTITY_ATTR_SELINUX_CONTEXT,

-@@ -188,7 +201,9 @@ virIdentityPtr virIdentityGetSystem(void)

- 

- cleanup:

-     VIR_FREE(username);

-+    VIR_FREE(userid);

-     VIR_FREE(groupname);

-+    VIR_FREE(groupid);

-     VIR_FREE(seccontext);

-     VIR_FREE(processid);

-     return ret;

-diff --git a/src/util/viridentity.h b/src/util/viridentity.h

-index 4bae8d6..a240c2d 100644

---- a/src/util/viridentity.h

-+++ b/src/util/viridentity.h

-@@ -29,7 +29,9 @@ typedef virIdentity *virIdentityPtr;

- 

- typedef enum {

-       VIR_IDENTITY_ATTR_UNIX_USER_NAME,

-+      VIR_IDENTITY_ATTR_UNIX_USER_ID,

-       VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,

-+      VIR_IDENTITY_ATTR_UNIX_GROUP_ID,

-       VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,

-       VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME,

-       VIR_IDENTITY_ATTR_SASL_USER_NAME,

--- 

-1.8.3.1

-

diff --git a/community/libvirt/0002-Ensure-system-identity-includes-process-start-time.patch b/community/libvirt/0002-Ensure-system-identity-includes-process-start-time.patch
deleted file mode 100644
index 1fba7d56c..000000000
--- a/community/libvirt/0002-Ensure-system-identity-includes-process-start-time.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From f26b6e44bf0c3efe8167a528141224ccb7623b4a Mon Sep 17 00:00:00 2001

-From: "Daniel P. Berrange" <berrange@redhat.com>

-Date: Wed, 28 Aug 2013 15:22:05 +0100

-Subject: [PATCH 2/3] Ensure system identity includes process start time

-

-The polkit access driver will want to use the process start

-time field. This was already set for network identities, but

-not for the system identity.

-

-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

----

- src/util/viridentity.c | 16 ++++++++++++++++

- 1 file changed, 16 insertions(+)

-

-diff --git a/src/util/viridentity.c b/src/util/viridentity.c

-index 03c375b..f681f85 100644

---- a/src/util/viridentity.c

-+++ b/src/util/viridentity.c

-@@ -35,6 +35,7 @@

- #include "virthread.h"

- #include "virutil.h"

- #include "virstring.h"

-+#include "virprocess.h"

- 

- #define VIR_FROM_THIS VIR_FROM_IDENTITY

- 

-@@ -142,11 +143,20 @@ virIdentityPtr virIdentityGetSystem(void)

-     security_context_t con;

- #endif

-     char *processid = NULL;

-+    unsigned long long timestamp;

-+    char *processtime = NULL;

- 

-     if (virAsprintf(&processid, "%llu",

-                     (unsigned long long)getpid()) < 0)

-         goto cleanup;

- 

-+    if (virProcessGetStartTime(getpid(), &timestamp) < 0)

-+        goto cleanup;

-+

-+    if (timestamp != 0 &&

-+        virAsprintf(&processtime, "%llu", timestamp) < 0)

-+        goto cleanup;

-+

-     if (!(username = virGetUserName(getuid())))

-         goto cleanup;

-     if (virAsprintf(&userid, "%d", (int)getuid()) < 0)

-@@ -198,6 +208,11 @@ virIdentityPtr virIdentityGetSystem(void)

-                            VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,

-                            processid) < 0)

-         goto error;

-+    if (processtime &&

-+        virIdentitySetAttr(ret,

-+                           VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME,

-+                           processtime) < 0)

-+        goto error;

- 

- cleanup:

-     VIR_FREE(username);

-@@ -206,6 +221,7 @@ cleanup:

-     VIR_FREE(groupid);

-     VIR_FREE(seccontext);

-     VIR_FREE(processid);

-+    VIR_FREE(processtime);

-     return ret;

- 

- error:

--- 

-1.8.3.1

-

diff --git a/community/libvirt/0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch b/community/libvirt/0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch
deleted file mode 100644
index 8882f1227..000000000
--- a/community/libvirt/0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 4a061ec8fe94857dd21acf401c66195ec51b1234 Mon Sep 17 00:00:00 2001

-From: "Daniel P. Berrange" <berrange@redhat.com>

-Date: Wed, 28 Aug 2013 15:25:40 +0100

-Subject: [PATCH 3/3] Add support for using 3-arg pkcheck syntax for process

-

-With the existing pkcheck (pid, start time) tuple for identifying

-the process, there is a race condition, where a process can make

-a libvirt RPC call and in another thread exec a setuid application,

-causing it to change to effective UID 0. This in turn causes polkit

-to do its permission check based on the wrong UID.

-

-To address this, libvirt must get the UID the caller had at time

-of connect() (from SO_PEERCRED) and pass a (pid, start time, uid)

-triple to the pkcheck program.

-

-Signed-off-by: Colin Walters <walters@redhat.com>

-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

----

- configure.ac                       |  8 ++++++++

- daemon/remote.c                    | 21 +++++++++++++++++---

- src/access/viraccessdriverpolkit.c | 40 +++++++++++++++++++++++++++++++++-----

- 3 files changed, 61 insertions(+), 8 deletions(-)

-

-diff --git a/configure.ac b/configure.ac

-index 94a2e19..3dfbb4d 100644

---- a/configure.ac

-+++ b/configure.ac

-@@ -1184,6 +1184,14 @@ if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then

-   AC_PATH_PROG([PKCHECK_PATH],[pkcheck], [], [/usr/sbin:$PATH])

-   if test "x$PKCHECK_PATH" != "x" ; then

-     AC_DEFINE_UNQUOTED([PKCHECK_PATH],["$PKCHECK_PATH"],[Location of pkcheck program])

-+    AC_MSG_CHECKING([whether pkcheck supports uid value])

-+    pkcheck_supports_uid=$($PKG_CONFIG --variable pkcheck_supports_uid polkit-gobject-1)

-+    if test "x$pkcheck_supports_uid" = "xtrue"; then

-+      AC_MSG_RESULT([yes])

-+      AC_DEFINE_UNQUOTED([PKCHECK_SUPPORTS_UID], 1, [Pass uid to pkcheck])

-+    else

-+      AC_MSG_RESULT([no])

-+    fi

-     AC_DEFINE_UNQUOTED([WITH_POLKIT], 1,

-         [use PolicyKit for UNIX socket access checks])

-     AC_DEFINE_UNQUOTED([WITH_POLKIT1], 1,

-diff --git a/daemon/remote.c b/daemon/remote.c

-index 03d5557..6132091 100644

---- a/daemon/remote.c

-+++ b/daemon/remote.c

-@@ -2731,10 +2731,12 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED,

-     int status = -1;

-     char *ident = NULL;

-     bool authdismissed = 0;

-+    bool supportsuid = 0;

-     char *pkout = NULL;

-     struct daemonClientPrivate *priv =

-         virNetServerClientGetPrivateData(client);

-     virCommandPtr cmd = NULL;

-+    static bool polkitInsecureWarned = false;

- 

-     virMutexLock(&priv->lock);

-     action = virNetServerClientGetReadonly(client) ?

-@@ -2756,14 +2758,27 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED,

-         goto authfail;

-     }

- 

-+    if (timestamp == 0) {

-+        VIR_WARN("Failing polkit auth due to missing client (pid=%lld) start time",

-+                 (long long)callerPid);

-+        goto authfail;

-+    }

-+

-     VIR_INFO("Checking PID %lld running as %d",

-              (long long) callerPid, callerUid);

- 

-     virCommandAddArg(cmd, "--process");

--    if (timestamp != 0) {

--        virCommandAddArgFormat(cmd, "%lld,%llu", (long long) callerPid, timestamp);

-+# ifdef PKCHECK_SUPPORTS_UID

-+    supportsuid = 1;

-+# endif

-+    if (supportsuid) {

-+        virCommandAddArgFormat(cmd, "%lld,%llu,%lu", (long long) callerPid, timestamp, (unsigned long) callerUid);

-     } else {

--        virCommandAddArgFormat(cmd, "%lld", (long long) callerPid);

-+        if (!polkitInsecureWarned) {

-+            VIR_WARN("No support for caller UID with pkcheck. This deployment is known to be insecure.");

-+            polkitInsecureWarned = true;

-+        }

-+        virCommandAddArgFormat(cmd, "%lld,%llu", (long long) callerPid, timestamp);

-     }

-     virCommandAddArg(cmd, "--allow-user-interaction");

- 

-diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c

-index 4c76e64..d980820 100644

---- a/src/access/viraccessdriverpolkit.c

-+++ b/src/access/viraccessdriverpolkit.c

-@@ -72,8 +72,12 @@ static char *

- virAccessDriverPolkitFormatProcess(const char *actionid)

- {

-     virIdentityPtr identity = virIdentityGetCurrent();

--    const char *process = NULL;

-+    const char *callerPid = NULL;

-+    const char *callerTime = NULL;

-+    const char *callerUid = NULL;

-     char *ret = NULL;

-+    bool supportsuid = 0;

-+    static bool polkitInsecureWarned = false;

- 

-     if (!identity) {

-         virAccessError(VIR_ERR_ACCESS_DENIED,

-@@ -81,17 +85,43 @@ virAccessDriverPolkitFormatProcess(const char *actionid)

-                        actionid);

-         return NULL;

-     }

--    if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, &process) < 0)

-+    if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, &callerPid) < 0)

-+        goto cleanup;

-+    if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME, &callerTime) < 0)

-+        goto cleanup;

-+    if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_USER_ID, &callerUid) < 0)

-         goto cleanup;

- 

--    if (!process) {

-+    if (!callerPid) {

-         virAccessError(VIR_ERR_INTERNAL_ERROR, "%s",

-                        _("No UNIX process ID available"));

-         goto cleanup;

-     }

--

--    if (VIR_STRDUP(ret, process) < 0)

-+    if (!callerTime) {

-+        virAccessError(VIR_ERR_INTERNAL_ERROR, "%s",

-+                       _("No UNIX process start time available"));

-+        goto cleanup;

-+    }

-+    if (!callerUid) {

-+        virAccessError(VIR_ERR_INTERNAL_ERROR, "%s",

-+                       _("No UNIX caller UID available"));

-         goto cleanup;

-+    }

-+

-+#ifdef PKCHECK_SUPPORTS_UID

-+    supportsuid = 1;

-+#endif

-+    if (supportsuid) {

-+        if (virAsprintf(&ret, "%s,%s,%s", callerPid, callerTime, callerUid) < 0)

-+            goto cleanup;

-+    } else {

-+        if (!polkitInsecureWarned) {

-+            VIR_WARN("No support for caller UID with pkcheck. This deployment is known to be insecure.");

-+            polkitInsecureWarned = true;

-+        }

-+        if (virAsprintf(&ret, "%s,%s", callerPid, callerTime) < 0)

-+            goto cleanup;

-+    }

- 

- cleanup:

-     virObjectUnref(identity);

--- 

-1.8.3.1

-

diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 2d81f175d..eb275f3f0 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 101981 2013-12-03 09:49:12Z spupykin $
+# $Id: PKGBUILD 105708 2014-02-14 09:37:10Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
-pkgver=1.2.0
-pkgrel=1
+pkgver=1.2.1
+pkgrel=4
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libvirt.org/"
@@ -13,30 +13,65 @@ depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2'
 	 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap'
 	 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs'
 	 'iproute2' 'libnl' 'libx11' 'audit' 'numactl')
-makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq')
+makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq' 'lxc')
 optdepends=('bridge-utils: for briged networking (default)'
 	    'dnsmasq: for NAT/DHCP for guests'
 	    'openbsd-netcat: for remote management over ssh'
 	    'qemu'
 	    'radvd'
-	    'ebtables')
+	    'ebtables'
+	    'pm-utils: host power management')
 [ "$CARCH" != "mips64el" ] && optdepends+=('dmidecode')
 options=('emptydirs')
-backup=('etc/conf.d/libvirtd'
-	'etc/conf.d/libvirt-guests'
-	'etc/libvirt/libvirtd.conf'
+backup=('etc/conf.d/libvirt-guests'
+	'etc/conf.d/libvirtd'
 	'etc/libvirt/libvirt.conf'
+	'etc/libvirt/libvirtd.conf'
+	'etc/libvirt/lxc.conf'
+	'etc/libvirt/nwfilter/allow-arp.xml'
+	'etc/libvirt/nwfilter/allow-dhcp-server.xml'
+	'etc/libvirt/nwfilter/allow-dhcp.xml'
+	'etc/libvirt/nwfilter/allow-incoming-ipv4.xml'
+	'etc/libvirt/nwfilter/allow-ipv4.xml'
+	'etc/libvirt/nwfilter/clean-traffic.xml'
+	'etc/libvirt/nwfilter/no-arp-ip-spoofing.xml'
+	'etc/libvirt/nwfilter/no-arp-mac-spoofing.xml'
+	'etc/libvirt/nwfilter/no-arp-spoofing.xml'
+	'etc/libvirt/nwfilter/no-ip-multicast.xml'
+	'etc/libvirt/nwfilter/no-ip-spoofing.xml'
+	'etc/libvirt/nwfilter/no-mac-broadcast.xml'
+	'etc/libvirt/nwfilter/no-mac-spoofing.xml'
+	'etc/libvirt/nwfilter/no-other-l2-traffic.xml'
+	'etc/libvirt/nwfilter/no-other-rarp-traffic.xml'
+	'etc/libvirt/nwfilter/qemu-announce-self-rarp.xml'
+	'etc/libvirt/nwfilter/qemu-announce-self.xml'
+	'etc/libvirt/qemu-lockd.conf'
 	'etc/libvirt/qemu.conf'
+	'etc/libvirt/qemu/networks/autostart/default.xml'
+	'etc/libvirt/qemu/networks/default.xml'
+	'etc/libvirt/virt-login-shell.conf'
+	'etc/libvirt/virtlockd.conf'
+	'etc/logrotate.d/libvirtd'
+	'etc/logrotate.d/libvirtd.lxc'
+	'etc/logrotate.d/libvirtd.qemu'
+	'etc/logrotate.d/libvirtd.uml'
 	'etc/sasl2/libvirt.conf')
 install="libvirt.install"
 source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	libvirtd.conf.d
 	libvirtd-guests.conf.d
-	libvirt.tmpfiles.d)
-md5sums=('f74f78059def4e68d69b975ad6e6c3e2'
+	libvirt.tmpfiles.d
+	"FS#38546.patch::http://libvirt.org/git/?p=libvirt.git;a=commitdiff_plain;h=7f0fd427413fe04963b1bcb158cf70e980ad1842")
+md5sums=('cce374220f67895afb6331bd2ddedbfd'
          '3ed0e24f5b5e25bf553f5427d64915e6'
          '0a96ed876ffb1fcb9dff5a9b3a609c1e'
-         '020971887442ebbf1b6949e031c8dd3f')
+         '020971887442ebbf1b6949e031c8dd3f'
+         'f579805e75956d32992c6934346ee740')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 <"$srcdir/FS#38546.patch"
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -54,7 +89,7 @@ build() {
 	--with-storage-lvm --without-xen --with-udev --without-hal --disable-static \
 	--with-init-script=systemd --with-audit \
 	--with-qemu-user=nobody --with-qemu-group=nobody \
-	--without-netcf --with-interface
+	--without-netcf --with-interface --with-lxc
   make
 
   sed -i 's|/etc/sysconfig/|/etc/conf.d/|' daemon/libvirtd.service tools/libvirt-guests.service
diff --git a/community/libvirt/libvirt.install b/community/libvirt/libvirt.install
index efb652a88..b75d85ec8 100644
--- a/community/libvirt/libvirt.install
+++ b/community/libvirt/libvirt.install
@@ -13,7 +13,3 @@ post_upgrade() {
   echo ">>> libvirt runs qemu from nobody:nobody by default"
   echo ">>> change it in /etc/libvirt/qemu.conf"
 }
-
-post_remove() {
-   rm -f /usr/lib/python[0-9].[0-9]/site-packages/libvirt.pyc
-}
diff --git a/community/libx86emu/PKGBUILD b/community/libx86emu/PKGBUILD
index c9973fa49..e9cd2338b 100644
--- a/community/libx86emu/PKGBUILD
+++ b/community/libx86emu/PKGBUILD
@@ -1,36 +1,31 @@
-# $Id: PKGBUILD 67396 2012-03-11 10:52:58Z lcarlier $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# $Id: PKGBUILD 104103 2014-01-15 17:01:05Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Gergely Imreh <imrehgATgmailDOTcom>
 
 pkgname=libx86emu
 pkgver=1.1
-_pkgver=$pkgver-15.3
-pkgrel=29
+_pkgver=$pkgver-21.4
+pkgrel=30
 pkgdesc='x86 emulation library'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.opensuse.org/'
+url='http://download.opensuse.org/source/factory/repo/oss/suse/src/'
 license=('BSD')
 depends=('glibc')
 makedepends=('rpmextract')
 source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-$_pkgver.src.rpm")
-md5sums=('ba6a0fc46307dd79078579140aab2f02')
+sha256sums=('d94a9b2e00e995856bf71a1db8d97ba2a622d3f447248f53cd4e175d491c6a1b')
 
 build() {
-  cd "${srcdir}"
-
   rpmextract.sh "${pkgname}-${_pkgver}.src.rpm"
-  tar -xjf $pkgname-$pkgver.tar.bz2
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make LIBDIR=/usr/lib
+  tar jxvf "$pkgname-$pkgver.tar.bz2"
+  make -C "$pkgname-$pkgver" LIBDIR=/usr/lib
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make LIBDIR=/usr/lib DESTDIR=$pkgdir install
-
-  install -Dm644 LICENSE \
-  ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+  make -C "$pkgname-$pkgver" LIBDIR=/usr/lib DESTDIR="$pkgdir" install
+  install -Dm644 "$pkgname-$pkgver/LICENSE" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/libxdg-basedir/PKGBUILD b/community/libxdg-basedir/PKGBUILD
index 1a089307a..3d8d94c98 100644
--- a/community/libxdg-basedir/PKGBUILD
+++ b/community/libxdg-basedir/PKGBUILD
@@ -3,26 +3,26 @@
 
 pkgname=libxdg-basedir
 pkgver=1.2.0
-pkgrel=1.1
+pkgrel=2
 pkgdesc="An implementation of the XDG Base Directory specifications."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://n.ethz.ch/student/nevillm/download/libxdg-basedir"
 license=('MIT')
 depends=('glibc')
-source=(http://n.ethz.ch/student/nevillm/download/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	'LICENSE')
-sha1sums=('b924afe4e29c52358ad67476887e9ca0dcf90f7c'
+source=(https://github.com/devnev/$pkgname/archive/$pkgname-$pkgver.tar.gz
+        'LICENSE')
+sha1sums=('e671b01b17c8cf785d95dd3aefa93e7cf31e56a5'
           'c76efede60d0632d4241d718919d8b4ec62056b3')
 
 build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+   cd "${srcdir}/$pkgname-$pkgname-$pkgver"
 
-   ./configure --prefix=/usr
+   ./autogen.sh --prefix=/usr
    make
 }
 
 package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+   cd "${srcdir}/$pkgname-$pkgname-$pkgver"
    make DESTDIR=${pkgdir} install
 
    # Install MIT license
diff --git a/community/libxnvctrl/10_libxnvctrl_so_0.diff b/community/libxnvctrl/10_libxnvctrl_so_0.diff
new file mode 100644
index 000000000..02673675a
--- /dev/null
+++ b/community/libxnvctrl/10_libxnvctrl_so_0.diff
@@ -0,0 +1,55 @@
+Author: Andreas Beckmann <debian@abeckmann.de>
+Description: build a shared library for libXNVCtrl
+Bug-Debian: http://bugs.debian.org/666909
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -79,6 +79,9 @@
+ 
+ XNVCTRL_DIR             ?= libXNVCtrl
+ XNVCTRL_ARCHIVE         ?= $(XNVCTRL_DIR)/libXNVCtrl.a
++XNVCTRL_SHARED          ?= $(XNVCTRL_DIR)/libXNVCtrl.so.0
++#XNVCTRL_LIB            ?= $(XNVCTRL_ARCHIVE)
++XNVCTRL_LIB             ?= $(XNVCTRL_SHARED)
+ XCONFIG_PARSER_DIR      ?= XF86Config-parser
+ COMMON_UTILS_DIR        ?= common-utils
+ COMMON_UNIX_DIR         ?= common-unix
+@@ -179,9 +182,12 @@
+ 	$(MKDIR) $(BINDIR)
+ 	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
+ 
+-$(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_ARCHIVE)
++$(XNVCTRL_ARCHIVE) $(XNVCTRL_SHARED):
++	$(MAKE) -C $(XNVCTRL_DIR)
++
++$(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_LIB)
+ 	$(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) -o $@ $(OBJS) \
+-	    $(XNVCTRL_ARCHIVE) $(LIBS)
++	    $(XNVCTRL_LIB) $(LIBS)
+ 	$(call quiet_cmd,STRIP_CMD) $@
+ 
+ # define the rule to build each object file
+--- a/src/libXNVCtrl/Makefile
++++ b/src/libXNVCtrl/Makefile
+@@ -22,12 +22,21 @@
+ RANLIB ?= ranlib
+ CFLAGS += -fPIC
+ 
++all: libXNVCtrl.a libXNVCtrl.so
++
+ libXNVCtrl.a : libXNVCtrl.a(NVCtrl.o)
+ 	$(RANLIB) $@
+ 
++libXNVCtrl.so: NVCtrl.o
++	$(RM) $@ $@.*
++	$(CC) -shared -Wl,-soname=$@.0 -o $@.0.0.0 $(LDFLAGS) $^ -lXext -lX11
++	ln -s $@.0.0.0 $@.0
++	ln -s $@.0 $@
++
+ NVCtrl.o : NVCtrl.h nv_control.h NVCtrlLib.h
+ .INTERMEDIATE: NVCtrl.o
+ 
+ clean ::
+ 	rm -f libXNVCtrl.a *.o
++	rm -f libXNVCtrl.so libXNVCtrl.so.*
+ .PHONY: clean
diff --git a/community/libxnvctrl/PKGBUILD b/community/libxnvctrl/PKGBUILD
new file mode 100644
index 000000000..e5f3cf25b
--- /dev/null
+++ b/community/libxnvctrl/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 104297 2014-01-17 10:20:00Z flexiondotorg $
+# Maintainer:  Martin Wimpress <code@flexion.org>
+# Contributor: Alessio Sergi <asergi at archlinux dot us>
+
+pkgname=libxnvctrl
+pkgver=331.38
+pkgrel=2
+pkgdesc="NVIDIA X Ctrl library"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+license=('GPL2')
+depends=('libxext')
+source=("http://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${pkgver}.tar.bz2"
+        "10_libxnvctrl_so_0.diff")
+sha1sums=('ad3fd407dcf8678c770d6202651eb08162fd5e5d'
+          '84146494a08d4b691e2cff84d1551210eee584dd')
+
+prepare() {
+    cd "nvidia-settings-$pkgver"
+    patch -Np1 -i "${srcdir}/10_libxnvctrl_so_0.diff"
+}
+
+build() {
+    cd "nvidia-settings-$pkgver/src/libXNVCtrl"
+    make clean
+    make
+}
+
+package() {
+    cd "nvidia-settings-$pkgver/src/libXNVCtrl"
+    # install libXNVCtrl and headers
+    install -d -m 755 "$pkgdir"/usr/{include/NVCtrl,lib}
+    install -m 644 nv_control.h NVCtrl{,Lib}.h "$pkgdir"/usr/include/NVCtrl/
+    install -m 644 libXNVCtrl.so.0.0.0 "$pkgdir"/usr/lib/
+    cd "$pkgdir"/usr/lib/
+    ln -s libXNVCtrl.so.0.0.0 libXNVCtrl.so.0
+    ln -s libXNVCtrl.so.0 libXNVCtrl.so
+}
diff --git a/community/libyaml/PKGBUILD b/community/libyaml/PKGBUILD
index b8802167e..39e2f5acc 100644
--- a/community/libyaml/PKGBUILD
+++ b/community/libyaml/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 100114 2013-11-01 17:16:45Z spupykin $
+# $Id: PKGBUILD 105278 2014-02-04 12:27:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Michal Bozon <michal.bozon__at__gmail.com>
 
 pkgname=libyaml
-pkgver=0.1.4
-pkgrel=3
+pkgver=0.1.5
+pkgrel=1
 pkgdesc="YAML 1.1 library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pyyaml.org/wiki/LibYAML"
 license=('MIT')
 source=(http://pyyaml.org/download/libyaml/yaml-$pkgver.tar.gz)
-md5sums=('36c852831d02cf90508c29852361d01b')
+md5sums=('24f6093c1e840ca5df2eb09291a1dbf1')
 
 build() {
   cd "$srcdir/yaml-$pkgver"
diff --git a/community/lightdm-gtk2-greeter/PKGBUILD b/community/lightdm-gtk2-greeter/PKGBUILD
index d3e64d514..6da2c7bf9 100755
--- a/community/lightdm-gtk2-greeter/PKGBUILD
+++ b/community/lightdm-gtk2-greeter/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 98452 2013-10-10 20:04:45Z alucryd $
+# $Id: PKGBUILD 105741 2014-02-14 18:30:58Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Padfoot <padfoot@exemail.com.au>
 
 pkgname=lightdm-gtk2-greeter
-pkgver=1.6.1
+pkgver=1.8.1
 pkgrel=1
 epoch=1
-pkgdesc="GTK+ greeter for LightDM"
+pkgdesc='GTK+ greeter for LightDM'
 arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/lightdm-gtk-greeter"
+url='https://launchpad.net/lightdm-gtk-greeter'
 license=('GPL3' 'LGPL3')
 depends=('gtk2' 'lightdm')
 makedepends=('exo' 'gnome-doc-utils' 'gobject-introspection' 'intltool')
 provides=("${pkgname/2/}")
 conflicts=("${pkgname/2/3}")
 backup=('etc/lightdm/lightdm-gtk-greeter.conf')
-source=("https://launchpad.net/${pkgname/2/}/1.6/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz")
-sha256sums=('1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9')
+install="${pkgname/2/}.install"
+source=("https://launchpad.net/${pkgname/2/}/${pkgver%.?}/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz")
+sha256sums=('dac5ce9ac54a6b3c1ef9f9cc056f13f01352c2a897c5bed11e52505132610bab')
 
 build() {
   cd ${pkgname/2/}-${pkgver}
diff --git a/libre/hexchat-libre/hexchat.install b/community/lightdm-gtk2-greeter/lightdm-gtk-greeter.install
index 214da2ef9..b72f4439b 100644
--- a/libre/hexchat-libre/hexchat.install
+++ b/community/lightdm-gtk2-greeter/lightdm-gtk-greeter.install
@@ -1,9 +1,8 @@
 post_install() {
   gtk-update-icon-cache -ftq usr/share/icons/hicolor
-  update-desktop-database -q
 }
 
-post_upgrade() {
+post_update() {
   post_install
 }
 
diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD
index e85df609b..7c406fdf3 100755
--- a/community/lightdm-gtk3-greeter/PKGBUILD
+++ b/community/lightdm-gtk3-greeter/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 98450 2013-10-10 19:59:15Z alucryd $
+# $Id: PKGBUILD 105739 2014-02-14 18:25:52Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Padfoot <padfoot@exemail.com.au>
 
 pkgname=lightdm-gtk3-greeter
-pkgver=1.6.1
+pkgver=1.8.1
 pkgrel=1
 epoch=1
-pkgdesc="GTK+ greeter for LightDM"
+pkgdesc='GTK+ greeter for LightDM'
 arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/lightdm-gtk-greeter"
+url='https://launchpad.net/lightdm-gtk-greeter'
 license=('GPL3' 'LGPL3')
 depends=('gtk3' 'lightdm')
 makedepends=('exo' 'gnome-doc-utils' 'gobject-introspection' 'intltool')
 provides=("${pkgname/3/}")
 conflicts=("${pkgname/3/2}")
 backup=('etc/lightdm/lightdm-gtk-greeter.conf')
-source=("https://launchpad.net/${pkgname/3/}/1.6/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz")
-sha256sums=('1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9')
+install="${pkgname/3/}.install"
+source=("https://launchpad.net/${pkgname/3/}/${pkgver%.?}/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz")
+sha256sums=('dac5ce9ac54a6b3c1ef9f9cc056f13f01352c2a897c5bed11e52505132610bab')
 
 build() {
   cd ${pkgname/3/}-${pkgver}
diff --git a/libre/clementine-libre/clementine.install b/community/lightdm-gtk3-greeter/lightdm-gtk-greeter.install
index 927a10258..b72f4439b 100644
--- a/libre/clementine-libre/clementine.install
+++ b/community/lightdm-gtk3-greeter/lightdm-gtk-greeter.install
@@ -1,13 +1,11 @@
 post_install() {
   gtk-update-icon-cache -ftq usr/share/icons/hicolor
-  update-desktop-database -q
 }
 
-post_upgrade() {
+post_update() {
   post_install
 }
 
-
 post_remove() {
   post_install
 }
diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD
index 899aad3e2..de8099c1b 100755
--- a/community/lightdm/PKGBUILD
+++ b/community/lightdm/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 101357 2013-11-23 12:07:27Z alucryd $
+# $Id: PKGBUILD 104558 2014-01-22 19:29:43Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Morfeo <morfeo89@hotmail.it>
 
 pkgbase=lightdm
 pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
-pkgver=1.8.5
-pkgrel=2
+pkgver=1.8.6
+pkgrel=1
 epoch=1
-pkgdesc="A lightweight display manager"
+pkgdesc='A lightweight display manager'
 arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/lightdm"
+url='https://launchpad.net/lightdm'
 license=('GPL3' 'LGPL3')
 makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'polkit' 'qt4' 'qt5-base')
 source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz"
@@ -20,7 +20,7 @@ source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/${pkgbas
         'lightdm.rules'
         'lightdm-default-config.patch'
         'Xsession')
-sha256sums=('c1a55800628c7a683a529e32646eae4be32295a09af049c9b15387acff0232a2'
+sha256sums=('111760e65d9f29e4bfe41a8affc9d8aa4163d92832a0d2be03ccae4618603b9e'
             '0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a'
             'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f'
             'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
@@ -88,7 +88,7 @@ install="${pkgbase}.install"
 }
 
 package_liblightdm-qt4() {
-pkgdesc=('LightDM Qt client library')
+pkgdesc='LightDM Qt client library'
 depends=('lightdm' 'qt4')
 options+=('!emptydirs')
 
@@ -103,7 +103,7 @@ options+=('!emptydirs')
 }
 
 package_liblightdm-qt5() {
-pkgdesc=('LightDM Qt client library')
+pkgdesc='LightDM Qt client library'
 depends=('lightdm' 'qt5-base')
 options+=('!emptydirs')
 
diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD
index 13d35b6a8..65b84c033 100644
--- a/community/lilypond/PKGBUILD
+++ b/community/lilypond/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 103224 2013-12-30 15:18:05Z bgyorgy $
+# $Id: PKGBUILD 103308 2014-01-02 22:45:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
 
 pkgname=lilypond
-pkgver=2.16.2
-pkgrel=5
+pkgver=2.18.0
+pkgrel=1
 pkgdesc="An automated music engraving system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://lilypond.org"
@@ -16,12 +16,8 @@ makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils'
 	     'gsfonts' 'texi2html')
 options=('emptydirs')
 #install=lilypond.install
-source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz
-        lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch
-        lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch)
-md5sums=('6db27f17d47e4f66a3b0716c65db3041'
-         '121ac86f1004338ae20ad55a5690c0ad'
-         'fa5073506f0e4dd96fb1858e3a75e08e')
+source=(http://download.linuxaudio.org/lilypond/sources/v2.18/$pkgname-$pkgver.tar.gz)
+md5sums=('5696fec935c616fb437693bed477cc27')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -38,8 +34,8 @@ prepare() {
   rm -rf lily/out/ python/out/
 
   # Fix build
-  patch -Np1 -i "$srcdir/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch"
-  patch -Np1 -i "$srcdir/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch"
+#  patch -Np1 -i "$srcdir/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch"
+#  patch -Np1 -i "$srcdir/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch"
 }
 
 build() {
diff --git a/community/linux-tools/01-fix-perf-python.patch b/community/linux-tools/01-fix-perf-python.patch
new file mode 100644
index 000000000..d46bd773c
--- /dev/null
+++ b/community/linux-tools/01-fix-perf-python.patch
@@ -0,0 +1,12 @@
+--- a/tools/perf/config/feature-checks/Makefile  2014-01-21 01:58:25.444339009 +0100
++++ b/tools/perf/config/feature-checks/Makefile  2014-01-21 01:46:58.081780576 +0100
+@@ -103,9 +103,6 @@
+ test-libperl:
+        $(BUILD) $(FLAGS_PERL_EMBED)
+ 
+-override PYTHON := python
+-override PYTHON_CONFIG := python-config
+-
+ escape-for-shell-sq =  $(subst ','\'',$(1))
+ shell-sq = '$(escape-for-shell-sq)'
+ 
diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD
index 9a061562f..bce68a7bd 100644
--- a/community/linux-tools/PKGBUILD
+++ b/community/linux-tools/PKGBUILD
@@ -1,15 +1,20 @@
-# $Id: PKGBUILD 102150 2013-12-05 21:53:38Z seblu $
+# $Id: PKGBUILD 104448 2014-01-21 01:11:29Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgbase=linux-tools
-pkgname=('linux-tools-meta'
-         'libtraceevent'
-         'perf'
-         'cpupower'
-         'x86_energy_perf_policy'
-         'usbip')
-pkgver=3.12
-pkgrel=2
+pkgname=(
+  'acpidump'
+  'cgroup_event_listener'
+  'cpupower'
+  'libtraceevent'
+  'linux-tools-meta'
+  'perf'
+  'tmon'
+  'usbip'
+  'x86_energy_perf_policy'
+)
+pkgver=3.13
+pkgrel=1
 license=('GPL2')
 arch=('i686' 'x86_64')
 url='http://www.kernel.org'
@@ -18,63 +23,67 @@ options=('!strip')
 # kernel source deps
 makedepends=('asciidoc' 'xmlto')
 # perf deps
-makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind')
+makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'numactl')
 # cpupower deps
 makedepends+=('pciutils')
 # usbip deps
 makedepends+=('glib2' 'sysfsutils')
+# tmon deps
+makedepends+=('ncurses')
 groups=("$pkgbase")
 source=("http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$pkgver.tar.xz"
-        "http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.3.xz"
+        #"http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.3.xz"
         'cpupower.default'
         'cpupower.systemd'
         'cpupower.service'
-        'usbipd.service')
+        'usbipd.service'
+        '01-fix-perf-python.patch')
 # http://www.kernel.org/pub/linux/kernel/v3.x/sha256sums.asc
-sha256sums=('2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02'
-            '22f2f3249e9014693a487c9734dc4142d89ed8bd9e3b2a74128208f5ea7e47d6'
+sha256sums=('4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2'
             '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
             'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
             'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
-            '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f')
+            '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f'
+            'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a')
 
-#prepare() {
-#  # apply stable patching set
-#  cd linux-$pkgver
-#  patch -N -p1 -i "$srcdir/patch-$pkgver.5"
-#}
+prepare() {
+  cd linux-$pkgver
+  #patch -N -p1 -i "$srcdir/patch-$pkgver.5"
+  patch -N -p1 -i "$srcdir/01-fix-perf-python.patch"
+}
 
 build() {
-  msg2 'Build libtraceevent'
+  msg2 'libtraceevent'
   pushd linux-$pkgver/tools/lib/traceevent
   make
   popd
 
-  msg2 'Build perf'
+  msg2 'perf'
   pushd linux-$pkgver/tools/perf
   make \
     WERROR=0 \
     DESTDIR="$pkgdir/usr" \
     perfexecdir='lib/perf' \
     PYTHON=python2 \
+    PYTHON_CONFIG=python2-config \
     NO_GTK2=1 \
     PERF_VERSION=$pkgver-$pkgrel \
     all man
   popd
 
-  msg2 'Build cpupower'
+  msg2 'cpupower'
   pushd linux-$pkgver/tools/power/cpupower
   # we cannot use --as-needed
-  LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
+  #LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
   make VERSION=$pkgver-$pkgrel
   popd
 
-  msg2 'Build x86_energy_perf_policy'
+  msg2 'x86_energy_perf_policy'
   pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
   make
   popd
 
-  msg2 'Build usbip'
+  msg2 'usbip'
   pushd linux-$pkgver/drivers/staging/usbip/userspace
   # fix missing man page
   sed -i 's/usbip_bind_driver.8//' Makefile.am
@@ -82,12 +91,37 @@ build() {
   ./configure --prefix=/usr --sbindir=/usr/bin
   make
   popd
+
+  msg2 'tmon'
+  pushd linux-$pkgver/tools/thermal/tmon
+  make
+  popd
+
+  msg2 'acpidump'
+  pushd linux-$pkgver/tools/power/acpi
+  make
+  popd
+
+  msg2 'cgroup_event_listener'
+  pushd linux-$pkgver/tools/cgroup
+  make
+  popd
 }
 
 package_linux-tools-meta() {
   pkgdesc='Linux kernel tools meta package'
   groups=()
-  depends=('libtraceevent' 'perf' 'cpupower' 'x86_energy_perf_policy' 'usbip')
+  depends=(
+    'acpidump'
+    'cgroup_event_listener'
+    'cpupower'
+    'libtraceevent'
+    'linux-tools-meta'
+    'perf'
+    'tmon'
+    'usbip'
+    'x86_energy_perf_policy'
+  )
 }
 
 package_libtraceevent() {
@@ -101,7 +135,8 @@ package_libtraceevent() {
 
 package_perf() {
   pkgdesc='Linux kernel performance auditing tool'
-  depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils')
+  depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils'
+           'numactl')
 
   cd linux-$pkgver/tools/perf
   make \
@@ -109,6 +144,7 @@ package_perf() {
     DESTDIR="$pkgdir/usr" \
     perfexecdir='lib/perf' \
     PYTHON=python2 \
+    PYTHON_CONFIG=python2-config \
     NO_GTK2=1 \
     PERF_VERSION=$pkgver-$pkgrel \
     install install-man
@@ -163,4 +199,30 @@ package_usbip() {
   install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
 }
 
+package_tmon() {
+  pkgdesc='Monitoring and Testing Tool for Linux kernel thermal subsystem'
+  depends=('glibc' 'ncurses')
+
+  cd linux-$pkgver/tools/thermal/tmon
+  make install INSTALL_ROOT="$pkgdir"
+}
+
+package_acpidump() {
+  pkgdesc='Dump system ACPI tables to an ASCII file'
+  depends=('glibc')
+  conflicts=('iasl')
+
+  cd linux-$pkgver/tools/power/acpi
+  install -Dm755 acpidump "$pkgdir/usr/bin/acpidump"
+  install -Dm644 acpidump.8 "$pkgdir/usr/share/man/man8/acpidump.8"
+}
+
+package_cgroup_event_listener() {
+  pkgdesc='Simple listener of cgroup events'
+  depends=('glibc')
+
+  cd linux-$pkgver/tools/cgroup
+  install -Dm755 cgroup_event_listener "$pkgdir/usr/bin/cgroup_event_listener"
+}
+
 # vim:set ts=2 sw=2 et:
diff --git a/community/lomoco/PKGBUILD b/community/lomoco/PKGBUILD
index 25cc6a165..fea043e12 100644
--- a/community/lomoco/PKGBUILD
+++ b/community/lomoco/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99898 2013-10-31 02:21:19Z allan $
+# $Id: PKGBUILD 104089 2014-01-15 13:38:02Z spupykin $
 # Maintainer: Jeff Mickey <j@codemac.net>
 # Contributor: Shadowhand <woody.gilk@gmail.com>
 
 pkgname=lomoco
 pkgver=1.0
-pkgrel=8
+pkgrel=9
 url="http://www.lomoco.org/"
 pkgdesc="Logitech USB mouse configuration program"
 license=('GPL')
@@ -14,19 +14,30 @@ arch=('i686' 'x86_64' 'mips64el')
 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"
+	"lomoco_mxair.patch::https://bugs.archlinux.org/task/36657?getfile=10920"
 	lomoco_mouse.conf
 	lomoco.sh)
 md5sums=('f5197d0a3ee81229c3eecc1e03f7b08d'
          '87aeccb99413faf9e49453215c3d0b8a'
+         'd0390dfcadae6e54a4af3e6227d24201'
          '182b10a7e4a1828a93c1d55ef7f81b97'
          'bc92f661641265b33b27895ef24028fd')
 
-build() {
+prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
   patch -p1 <$srcdir/lomoco_mx518.patch
+  patch -p0 <$srcdir/lomoco_mxair.patch
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./autogen.sh --prefix=/usr --mandir=/usr/share/man
   make
   make udev-rules
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 
   # Fix and install udev rules and helpers
diff --git a/community/luafilesystem/PKGBUILD b/community/luafilesystem/PKGBUILD
index 07bad5022..bba8b6e1e 100644
--- a/community/luafilesystem/PKGBUILD
+++ b/community/luafilesystem/PKGBUILD
@@ -1,12 +1,13 @@
-# $Id: PKGBUILD 81391 2012-12-19 13:27:48Z seblu $
-# Maintainer: Chris Brannon <cmbrannon79@gmail.com>
+# $Id: PKGBUILD 104485 2014-01-21 17:41:26Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Anders Bergh <anders1@gmail.com>
 
 pkgbase=luafilesystem
 pkgname=(lua-filesystem lua51-filesystem)
 pkgver=1.6.2
-pkgrel=2
+pkgrel=3
 pkgdesc='File System Library for the Lua Programming Language'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.keplerproject.org/luafilesystem/'
@@ -18,12 +19,13 @@ md5sums=('4e7ec93678c760c4e42cea7d28aafa13'
          'beb2b58c4b5c2782304a5b0267a5651b')
 
 build() {
-  msg2 "Building $pkgbase with lua 5.1"
+  msg2 "Building $pkgbase with Lua 5.1"
   cp -a $pkgbase-$pkgver $pkgbase-$pkgver-51
   cd $pkgbase-$pkgver-51
   make LUA_INC=/usr/include/lua5.1
-  msg2 "Building $pkgbase with lua 5.2"
-  cd "$srcdir/$pkgbase-$pkgver"
+
+  msg2 "Building $pkgbase with Lua 5.2"
+  cd "$srcdir"/$pkgbase-$pkgver
   make
 }
 
@@ -31,8 +33,8 @@ package_lua-filesystem() {
   depends=('lua')
 
   cd $pkgbase-$pkgver
-  make PREFIX=$pkgdir/usr LUA_LIBDIR='$(PREFIX)/lib/lua/5.2' install
-  install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  make PREFIX="$pkgdir"/usr LUA_LIBDIR='$(PREFIX)/lib/lua/5.2' install
+  install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 package_lua51-filesystem() {
@@ -41,6 +43,6 @@ package_lua51-filesystem() {
   replaces=('luafilesystem')
 
   cd $pkgbase-$pkgver-51
-  make PREFIX=$pkgdir/usr LUA_LIBDIR='$(PREFIX)/lib/lua/5.1' install
-  install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  make PREFIX="$pkgdir"/usr LUA_LIBDIR='$(PREFIX)/lib/lua/5.1' install
+  install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD
index 36e8b0902..0f8b6248e 100644
--- a/community/luakit/PKGBUILD
+++ b/community/luakit/PKGBUILD
@@ -1,35 +1,39 @@
-# $Id: PKGBUILD 81116 2012-12-12 00:49:28Z eric $
-# Maintainer:  Bartłomiej Piotrowski
+# $Id: PKGBUILD 105053 2014-01-30 18:41:11Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com>
 
 pkgname=luakit
 pkgver=2012.09.13.r1
 _pkgver=2012.09.13-r1
-pkgrel=5
-pkgdesc='Fast, small, webkit based browser framework extensible by Lua'
+pkgrel=7
+pkgdesc='Fast, small, Webkit based browser framework extensible by Lua'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://mason-larobina.github.com/luakit/'
 license=('GPL3')
-depends=('libwebkit' 'lua51-filesystem' 'libunique' 'desktop-file-utils' 'luajit')
-makedepends=('git' 'help2man')
+depends=('webkitgtk2' 'lua51-filesystem' 'libunique' 'desktop-file-utils' 'luajit')
+makedepends=('help2man')
+backup=(etc/xdg/luakit/binds.lua etc/xdg/luakit/globals.lua
+        etc/xdg/luakit/modes.lua etc/xdg/luakit/rc.lua etc/xdg/luakit/theme.lua
+        etc/xdg/luakit/webview.lua etc/xdg/luakit/window.lua)
 options=(!makeflags)
-install='luakit.install'
+install=luakit.install
 source=($pkgname-$pkgver.tar.gz::https://github.com/mason-larobina/luakit/tarball/$_pkgver)
 md5sums=('77b02e6d19ba021409f1778fddd94a42')
 
-build() {
+prepare() {
   cd mason-larobina-luakit-*
-
-  # use luajit to run script needed at build
   sed -i '1s,lua,luajit,' build-utils/gentokens.lua
+}
 
+build() {
+  cd mason-larobina-luakit-*
   make USE_LUAJIT=1 PREFIX=/usr all
 }
 
 package() {
   cd mason-larobina-luakit-*
-  make PREFIX=/usr DESTDIR=$pkgdir install 
+  make PREFIX=/usr DESTDIR="$pkgdir" install
 
-  chmod -x $pkgdir/usr/share/pixmaps/luakit.png # FS#32938
+  chmod -x "$pkgdir"/usr/share/pixmaps/luakit.png # FS#32938
 }
diff --git a/community/luasec/PKGBUILD b/community/luasec/PKGBUILD
index bb3f199a5..28dc95608 100644
--- a/community/luasec/PKGBUILD
+++ b/community/luasec/PKGBUILD
@@ -1,32 +1,33 @@
-# $Id: PKGBUILD 98944 2013-10-21 14:45:17Z spupykin $
+# $Id: PKGBUILD 105499 2014-02-09 10:04:32Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Dwayne Bent <dbb.1@liqd.org>
+# Contributor: Dwayne Bent <dbb.1@liqd.org>
 # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
 
 pkgbase=luasec
 pkgname=(lua-sec lua51-sec)
-pkgver=20131021git
+pkgver=0.5
 pkgrel=1
+epoch=1
 pkgdesc='Lua bindings for OpenSSL library to provide TLS/SSL communication.'
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/brunoos/luasec/wiki'
 license=('MIT')
-makedepends=('openssl' 'lua' 'lua-socket' 'lua51' 'lua51-socket' 'git')
-source=("luasec::git://github.com/brunoos/luasec.git")
-md5sums=('SKIP')
+makedepends=('openssl' 'lua' 'lua-socket' 'lua51' 'lua51-socket')
+options=('!buildflags')
+source=("https://github.com/brunoos/luasec/archive/luasec-$pkgver.tar.gz")
+md5sums=('0518f4524f399f33424c6f450e1d06db')
 
-build() {
-  cp -a luasec luasec-51
-
-  unset CFLAGS
-  unset LDFLAGS
+prepare() {
+  cp -a luasec-luasec-$pkgver luasec-luasec-$pkgver-51
+}
 
+build() {
   msg2 'Building with lua 5.2'
-  cd luasec
+  cd luasec-luasec-$pkgver
   make linux
 
   msg2 'Building with lua 5.1'
-  cd ../luasec-51
+  cd ../luasec-luasec-$pkgver-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' \
@@ -40,7 +41,7 @@ package_lua-sec() {
   depends=('openssl' 'lua' 'lua-socket')
 
   install -dm755 "$pkgdir/usr/lib/lua/5.2"
-  cd luasec
+  cd luasec-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"
 }
@@ -51,9 +52,9 @@ package_lua51-sec() {
   replaces=('luasec')
 
   install -dm755 "$pkgdir/usr/lib/lua/5.1"
-  cd luasec-51
+  cd luasec-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"
 }
 
-# vim:set ts=4 sw=4 et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/lucene++/PKGBUILD b/community/lucene++/PKGBUILD
new file mode 100644
index 000000000..d5a9410d2
--- /dev/null
+++ b/community/lucene++/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 105669 2014-02-13 11:02:33Z spupykin $
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Rafael Ferreira <josephgbr@archlinux.info>
+
+pkgname=lucene++
+pkgver=3.0.5
+pkgrel=2
+pkgdesc='C++ port of the popular Java Lucene library'
+arch=(i686 x86_64)
+url='https://github.com/luceneplusplus/LucenePlusPlus'
+license=('GPL' 'Apache')
+depends=('boost-libs')
+makedepends=('boost' 'cmake')
+source=(https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_$pkgver.tar.gz)
+md5sums=('da785510716a759d7d37a2ee52cb8140')
+
+prepare() {
+  mkdir build
+  sed -i \
+    -e 's#SET(LUCENE++_VERSION_REVISION.*#SET(LUCENE++_VERSION_REVISION "5")#' \
+    -e 's#SET(LUCENE++_VERSION_PATCH.*#SET(LUCENE++_VERSION_PATCH "0")#' \
+    $srcdir/LucenePlusPlus-rel_$pkgver/CMakeLists.txt
+}
+
+build() {
+  cd build
+
+  cmake ../LucenePlusPlus-rel_$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_DESTINATION=/usr/lib \
+    -DBoost_LIBRARY_DIR=/usr/lib \
+    -DENABLE_CUSTOM_ALLOCATOR='FALSE'
+
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD
index b60dffd51..ba47bbb0e 100644
--- a/community/luminancehdr/PKGBUILD
+++ b/community/luminancehdr/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 92941 2013-06-19 21:09:46Z bpiotrowski $
+# $Id: PKGBUILD 105320 2014-02-04 22:24:07Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: Dmitry N. Shilov <stormblast@land.ru>
 
 pkgname=luminancehdr
-pkgver=2.3.1
-pkgrel=3
+pkgver=2.4.0
+pkgrel=1
 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qtpfsgui.sourceforge.net/'
 license=('GPL')
-depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qtwebkit')
-makedepends=('cmake' 'boost' 'gtest')
+depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qt5-webkit' 'ccfits')
+makedepends=('cmake' 'boost' 'gtest' 'qt5-tools')
 optdepends=('hugin: align image stack functionality')
 install=$pkgname.install
 changelog=$pkgname.changelog
 options=('!emptydirs')
 source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/${pkgver}/luminance-hdr-${pkgver}.tar.bz2)
-sha256sums=('7a2a81cd0f2da6b6780bdd47e5f902c9dfaeb8107d763ea63007b6fcdcb4d23b')
+sha256sums=('14014eadab099944f051dd99447f6f47d455ffb0e4e0272d93a8e71fd96ad401')
 
 build() {
-  cd "${srcdir}"
+  cd "${srcdir}"/luminance-hdr-${pkgver}
 
   # x86-specific options.
   sed -i '/ADD_DEFINITIONS(-ffast-math -msse2 -msse)/d' cmake/CompilerSettings.cmake
@@ -29,7 +29,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"
+  cd "${srcdir}"/luminance-hdr-${pkgver}
 
   make DESTDIR="${pkgdir}" install
 }
diff --git a/community/luminancehdr/luminancehdr.changelog b/community/luminancehdr/luminancehdr.changelog
index ab6898db8..cf004a39d 100644
--- a/community/luminancehdr/luminancehdr.changelog
+++ b/community/luminancehdr/luminancehdr.changelog
@@ -1,3 +1,9 @@
+2014-02-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* luminancehdr 2.4.0-1
+
+2014-01-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* luminancehdr 2.3.1-4 libraw rebuild
+
 2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* luminancehdr 2.3.1-3 libraw rebuild
 
diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD
index 28cddd8cf..0589e5989 100644
--- a/community/lxappearance/PKGBUILD
+++ b/community/lxappearance/PKGBUILD
@@ -1,11 +1,11 @@
-#$Id: PKGBUILD 101232 2013-11-20 09:52:30Z bpiotrowski $
-# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com>
+#$Id: PKGBUILD 103634 2014-01-08 14:31:20Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>  
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=lxappearance
-pkgver=0.5.3
-pkgrel=2
+pkgver=0.5.5
+pkgrel=1
 pkgdesc='Feature-rich GTK+ theme switcher of the LXDE Desktop'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -13,8 +13,8 @@ url='http://lxde.org/'
 groups=('lxde')
 depends=('gtk2' 'dbus-glib')
 makedepends=('intltool')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9dfdc9bd45519d51b9df2ad6650c36f5')
+source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.xz)
+md5sums=('a67113681d9d0a6d936289909aed5782')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD
index f0583f4d6..16ac7d949 100644
--- a/community/lxc/PKGBUILD
+++ b/community/lxc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103083 2013-12-26 10:01:37Z spupykin $
+# $Id: PKGBUILD 105711 2014-02-14 09:37:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 # Contributor: Daniel Micay <danielmicay@gmail.com>
@@ -8,7 +8,7 @@
 pkgname=lxc
 pkgver=0.9.0
 epoch=1
-pkgrel=5
+pkgrel=6
 pkgdesc="Linux Containers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linuxcontainers.org"
@@ -22,10 +22,11 @@ source=("http://linuxcontainers.org/downloads/$pkgname-${pkgver}.tar.gz"
 	"lxc@.service")
 md5sums=('8552a4479090616f4bc04d8473765fc9'
          'df94c9fb8a753011c86ee664e9f521ff'
-         '8003139e60ea66c05460660f31780706')
+         '32db4ef06b27f36e15ff4b67c049dfeb')
 
 prepare() {
   cd "$srcdir/$pkgname-${pkgver/_/-}"
+  sed -i 's|sbin/init none bind|sbin/init none ro,bind|' templates/lxc-sshd.in
   sed -i \
     -e "s/for name in docbook2x-man db2x_docbook2man; do/for name in docbook2x-man db2x_docbook2man docbook2man; do/" \
     -e "s|AM_INIT_AUTOMAKE.*|AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability subdir-objects])|" \
diff --git a/community/lxc/lxc@.service b/community/lxc/lxc@.service
index 7bc87b5dd..4c0c34e3e 100644
--- a/community/lxc/lxc@.service
+++ b/community/lxc/lxc@.service
@@ -1,11 +1,11 @@
 [Unit]
-Description=%I LXC
+Description=%i LXC
 After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/lxc-start -d -n %I
-ExecStop=/usr/bin/lxc-stop -n %I
+ExecStart=/usr/bin/lxc-start -d -n %i
+ExecStop=/usr/bin/lxc-stop -n %i
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD
index 36bdde8c8..7383a4eaf 100644
--- a/community/lxpanel/PKGBUILD
+++ b/community/lxpanel/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 98054 2013-10-04 17:26:39Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 105368 2014-02-06 05:24:14Z bisson $
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=lxpanel
 pkgver=0.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight X11 desktop panel for LXDE'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -22,7 +22,7 @@ build() {
   CFLAGS+=' -lgmodule-2.0' ./configure \
     --sysconfdir=/etc \
     --prefix=/usr \
-    --enable-man 
+    --enable-man
   make
 }
 
diff --git a/community/lxtask/PKGBUILD b/community/lxtask/PKGBUILD
index 526fbfd53..0c2b318ce 100644
--- a/community/lxtask/PKGBUILD
+++ b/community/lxtask/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 56901 2011-10-16 07:43:53Z bpiotrowski $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# $Id: PKGBUILD 104479 2014-01-21 17:24:15Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
+
 pkgname=lxtask
 pkgver=0.1.4
-pkgrel=3.2
-pkgdesc="Task manager of the LXDE Desktop"
+pkgrel=4
+pkgdesc='Task manager of the LXDE Desktop'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-url="http://lxde.org/"
+url='http://lxde.org/'
 groups=('lxde')
 depends=('gtk2')
 makedepends=('pkgconfig' 'intltool')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
+source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz)
 md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac
-	autoreconf
-	./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/lz4/PKGBUILD b/community/lz4/PKGBUILD
index 0fc508a3f..afdbcf888 100644
--- a/community/lz4/PKGBUILD
+++ b/community/lz4/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 103238 2013-12-30 22:18:53Z seblu $
+# $Id: PKGBUILD 105324 2014-02-04 23:27:29Z 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=110
+pkgver=113
 pkgrel=1
 pkgdesc='Very fast lossless compression algorithm'
 arch=('i686' 'x86_64')
diff --git a/community/madman/PKGBUILD b/community/madman/PKGBUILD
index c5b08cbfc..1eb7e5b86 100644
--- a/community/madman/PKGBUILD
+++ b/community/madman/PKGBUILD
@@ -1,37 +1,33 @@
-# $Id: PKGBUILD 87994 2013-04-09 21:36:20Z eric $
+# $Id: PKGBUILD 104837 2014-01-27 10:33:49Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
 # Contributor: Hugo Ideler <hugoideler@dse.nl>
 # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu>
 
 pkgname=madman
-pkgver=0.94beta1.20060611
-pkgrel=3
+pkgver=0.94beta1.20080906
+pkgrel=1
 pkgdesc="I-tunes like music player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://madman.sourceforge.net/"
 license=('GPL')
 depends=('qt3' 'xmms' 'gtk' 'taglib')
-makedepends=('python2' 'scons')
-source=(ftp://ftp.archlinux.org/other/community/madman/madman_$pkgver.orig.tar.gz
-	ftp://ftp.archlinux.org/other/community/madman/madman_$pkgver-2.diff.gz
+makedepends=('python2' 'scons' 'git')
+source=(git+http://git.tiker.net/trees/madman.git
 	ftp://ftp.archlinux.org/other/community/madman/madman.desktop
 	ftp://ftp.archlinux.org/other/community/madman/madman_logo.png
 	ftp://ftp.archlinux.org/other/community/madman/madman_logo_mini.png
 	ftp://ftp.archlinux.org/other/community/madman/madman_logo_large.png
 	fake-g++.sh)
-md5sums=('36e7a4619ebe83ed939c7ae09c16d535'
-         '26de942ae2465fb805748d3bea9a8a17'
+md5sums=('SKIP'
          '591354b69235d5a4b5a09591d04db266'
          'd4546f77857a6ccdabb2036eb6a0da07'
          '2d54bb8eceed283edc88a3e4553d2483'
          '3c2da1b1800fb372e225ae38fa1398e8'
          '685a6fb13c861b82950dd6a77fd02120')
 
-build() {
-  cd $srcdir/$pkgname-$pkgver.orig
-
-  patch -p1 -i $srcdir/madman_0.94beta1.20060611-2.diff
+prepare() {
+  cd $srcdir/$pkgname
   mkdir -p ,build/release/designer
   touch ,build/release/designer/tsonglistview.h \
 	,build/release/designer/tsetlistview.h \
@@ -39,16 +35,19 @@ build() {
 	,build/release/designer/tacceleratorlineedit.h \
 	,build/release/designer/tsonglistview.h \
 	,build/release/designer/tsetlistview.h
-  sed -i '26,1i#include <memory>' utility/base.h
   sed -i 's|python|python2|' designer/make_imagedata httpd/make_webdata doc/update_format_tag
+}
+
+build() {
+  cd $srcdir/$pkgname
+  echo -e '\n\n' | ./configure
   install -m755 $srcdir/fake-g++.sh ./g++
   export PATH=.:$PATH
-
   scons qt_directory=/usr/lib/qt3 add_c_include_dirs=/usr/include/qt3
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver.orig
+  cd $srcdir/$pkgname
 
   scons qt_directory=/usr/lib/qt3 add_c_include_dirs=/usr/include/qt3 \
     install_to=$pkgdir/usr prefix=/usr install
diff --git a/community/mailutils/PKGBUILD b/community/mailutils/PKGBUILD
index cf6cb2416..4521cf19c 100644
--- a/community/mailutils/PKGBUILD
+++ b/community/mailutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100116 2013-11-01 17:17:05Z spupykin $
+# $Id: PKGBUILD 103921 2014-01-13 17:16:54Z andyrtr $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=mailutils
 pkgver=2.2
-pkgrel=9
+pkgrel=10
 pkgdesc="MUA command line tool (mailx)"
 arch=(i686 x86_64 'mips64el')
 url="http://www.gnu.org/software/mailutils/"
diff --git a/community/marisa/ChangeLog b/community/marisa/ChangeLog
deleted file mode 100644
index b7f4b062d..000000000
--- a/community/marisa/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-2013-05-28  ponsfoot  <cabezon dot hashimoto at gmail dot com>
-
-	* marisa 0.2.4-2
-	- Separate bindings to another packages
-
-2013-05-27  ponsfoot  <cabezon dot hashimoto at gmail dot com>
-
-	* marisa 0.2.4-1
-	- Initial release on AUR
-
diff --git a/community/marisa/PKGBUILD b/community/marisa/PKGBUILD
index fcd7fec2a..6bfc6f8bf 100644
--- a/community/marisa/PKGBUILD
+++ b/community/marisa/PKGBUILD
@@ -1,15 +1,15 @@
+# $Id: PKGBUILD 104883 2014-01-28 03:34:13Z td123 $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
 pkgbase=marisa
 pkgname=('marisa' 'perl-marisa' 'python2-marisa' 'ruby-marisa')
 pkgver=0.2.4
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="https://code.google.com/p/marisa-trie/"
 license=('BSD' 'LGPL')
 makedepends=('python2' 'ruby' 'perl')
-changelog=ChangeLog
 source=(https://marisa-trie.googlecode.com/files/$pkgbase-$pkgver.tar.gz)
 sha1sums=('fb0ed7d993e84dff32ec456a79bd36a00022629d')
 
@@ -95,8 +95,8 @@ package_ruby-marisa() {
   depends=('ruby' 'marisa')
 
   cd "${pkgbase}-${pkgver}/bindings/ruby"
-    _hdrdir=`pkg-config --variable=rubyhdrdir ruby-2.0`
-    _arch=`pkg-config --variable=arch ruby-2.0`
+    _hdrdir=`pkg-config --variable=rubyhdrdir ruby-2.1`
+    _arch=`pkg-config --variable=arch ruby-2.1`
   make DESTDIR="$pkgdir" install \
     hdrdir="$_hdrdir" \
     arch_hdrdir="${_hdrdir}/${_arch}" \
diff --git a/community/mate-applet-lockkeys/PKGBUILD b/community/mate-applet-lockkeys/PKGBUILD
new file mode 100644
index 000000000..190ad0bb5
--- /dev/null
+++ b/community/mate-applet-lockkeys/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 104265 2014-01-16 18:34:55Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=mate-applet-lockkeys
+pkgver=0.2.3
+pkgrel=1
+pkgdesc="A MATE panel applet that shows which of the CapsLock, NumLock and ScrollLock keys are on and which are off."
+url="http://www.zavedil.com/mate-lock-keys-applet/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk2' 'mate-panel')
+makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+source=("http://www.zavedil.com/wp-content/uploads/2013/12/${pkgname}-${pkgver}.tar.gz")
+md5sums=('84515b805609daf1998590ee5f1fcb6a')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgname}
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+    rm -f "${pkgdir}/usr/share/glib-2.0/schemas/gschemas.compiled"
+}
diff --git a/extra/modemmanager/modemmanager.install b/community/mate-applet-lockkeys/mate-applet-lockkeys.install
index d0e87bc18..7af080f58 100644
--- a/extra/modemmanager/modemmanager.install
+++ b/community/mate-applet-lockkeys/mate-applet-lockkeys.install
@@ -1,7 +1,6 @@
 post_install() {
-  if type -P gtk-update-icon-cache &>/dev/null; then
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
     gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  fi
 }
 
 post_upgrade() {
diff --git a/community/mate-applet-softupd/PKGBUILD b/community/mate-applet-softupd/PKGBUILD
new file mode 100644
index 000000000..962ac9b1f
--- /dev/null
+++ b/community/mate-applet-softupd/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 104262 2014-01-16 18:29:31Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=mate-applet-softupd
+pkgver=0.2.10
+pkgrel=2
+pkgdesc="A MATE panel applet to notify when software updates become available."
+url="http://www.zavedil.com/mate-software-updates-applet/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gnome-packagekit' 'gtk2' 'libnotify' 'mate-panel')
+makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+source=("http://www.zavedil.com/wp-content/uploads/2013/10/${pkgname}-${pkgver}.tar.gz")
+md5sums=('f15f61c05a6701d8f987179f61c7bc0f')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgname}
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+    rm -f "${pkgdir}/usr/share/glib-2.0/schemas/gschemas.compiled"
+}
diff --git a/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install b/community/mate-applet-softupd/mate-applet-softupd.install
index 525ecff63..71d138f2d 100644
--- a/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install
+++ b/community/mate-applet-softupd/mate-applet-softupd.install
@@ -1,4 +1,4 @@
-post_install () {
+post_install() {
     gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
diff --git a/community/mate-applet-streamer/PKGBUILD b/community/mate-applet-streamer/PKGBUILD
new file mode 100644
index 000000000..a50677f44
--- /dev/null
+++ b/community/mate-applet-streamer/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 104264 2014-01-16 18:30:19Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=mate-applet-streamer
+pkgver=0.0.5
+pkgrel=1
+pkgdesc="A MATE panel applet to let you play your favourite online radio station with a single click."
+url="http://www.zavedil.com/online-radio-applet/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gst-plugins-base' 'gtk2' 'libnotify' 'mate-panel' 'sqlite')
+makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+source=("http://www.zavedil.com/wp-content/uploads/2013/12/${pkgname}-${pkgver}.tar.gz")
+md5sums=('c974612d6ef8138c472511dbc6587013')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgname}
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+    rm -f "${pkgdir}/usr/share/glib-2.0/schemas/gschemas.compiled"
+}
diff --git a/community/mate-applet-streamer/mate-applet-streamer.install b/community/mate-applet-streamer/mate-applet-streamer.install
new file mode 100644
index 000000000..71d138f2d
--- /dev/null
+++ b/community/mate-applet-streamer/mate-applet-streamer.install
@@ -0,0 +1,11 @@
+post_install() {
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/mate-applets/PKGBUILD b/community/mate-applets/PKGBUILD
new file mode 100644
index 000000000..67c628807
--- /dev/null
+++ b/community/mate-applets/PKGBUILD
@@ -0,0 +1,55 @@
+# $Id: PKGBUILD 104220 2014-01-16 17:30:37Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
+# Contributor: Xpander <xpander0@gmail.com>
+
+pkgname=mate-applets
+pkgver=1.6.2
+pkgrel=1
+pkgdesc="Applets for MATE panel"
+arch=('i686' 'x86_64')
+url="http://mate-desktop.org"
+license=('GPL')
+depends=('mate-character-map' 'mate-panel' 'python2-dbus' 'python2-gobject'
+         'upower')
+makedepends=('docbook2x' 'docbook-xsl' 'mate-common' 'mate-doc-utils'
+             'networkmanager' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz"
+        "https://github.com/mate-desktop/mate-applets/commit/98dfd949e9209eefc0722fb232761f01b4fe2d7e.diff"
+        "https://github.com/mate-desktop/mate-applets/commit/6fca38a74cc9e6b4ce107496f2e0e7d203c43d2b.diff")
+sha1sums=('2978918a0b995b3f3dd98ad7ca159b0d7bcd245a'
+          'c4d7f2d7952b53d8ac616ced55a4cf3da25c0fc4'
+          '36c4507e54b21fbcff49732077912dbc5283807a')
+install=${pkgname}.install
+
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    #upower: fix upower version
+    patch -Np1 -i "${srcdir}/98dfd949e9209eefc0722fb232761f01b4fe2d7e.diff"
+    #battstat: use g_signal notify for upower-1.0
+    patch -Np1 -i "${srcdir}/6fca38a74cc9e6b4ce107496f2e0e7d203c43d2b.diff"
+    # Use python2
+    sed -i 's/env python/env python2/' invest-applet/invest/{chart.py,invest-applet.py,mate-invest-chart}
+    sed -i 's/env python/env python2/' timer-applet/src/timer-applet
+}
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    PYTHON=/usr/bin/python2 ./configure \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --libexecdir=/usr/lib/${pkgname} \
+        --enable-polkit \
+        --enable-networkmanager \
+        --enable-ipv6 \
+        --disable-static \
+        --disable-scrollkeeper
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-applets/mate-applets.install b/community/mate-applets/mate-applets.install
new file mode 100644
index 000000000..fd1a71ca6
--- /dev/null
+++ b/community/mate-applets/mate-applets.install
@@ -0,0 +1,13 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    gtk-update-icon-cache -q -t -f /usr/share/icons/mate
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/mate-calc/PKGBUILD b/community/mate-calc/PKGBUILD
new file mode 100644
index 000000000..d48ea6d52
--- /dev/null
+++ b/community/mate-calc/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 104914 2014-01-28 10:51:00Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=mate-calc
+pkgver=1.6.1
+pkgrel=1
+pkgdesc="Calculator for the Mate desktop environment"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('LGPL' 'GPL')
+depends=('dconf' 'gtk2')
+makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('dca1568748e42d4a019d7cf8effe1be80b20b82b')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/gstreamer0.10-bad-libre/gstreamer0.10-bad-plugins.install b/community/mate-calc/mate-calc.install
index 3a36b0ccb..3a06d45b9 100644
--- a/libre/gstreamer0.10-bad-libre/gstreamer0.10-bad-plugins.install
+++ b/community/mate-calc/mate-calc.install
@@ -1,5 +1,5 @@
 post_install() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
 }
 
 post_upgrade() {
diff --git a/community/mate-character-map/PKGBUILD b/community/mate-character-map/PKGBUILD
new file mode 100644
index 000000000..f7e511a3d
--- /dev/null
+++ b/community/mate-character-map/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 104218 2014-01-16 17:20:32Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
+
+pkgname=mate-character-map
+pkgver=1.6.0
+pkgrel=5
+pkgdesc="MATE Unicode Charmap"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dconf' 'gtk2' 'pygtk' 'python2')
+makedepends=('gobject-introspection' 'mate-common' 'mate-doc-utils' 'perl-xml-parser')
+options=('!emptydirs' )
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('e378e26ebe493d3f849771d10930504b8980448e')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    PYTHON=/usr/bin/python2 ./autogen.sh \
+        --prefix=/usr \
+        --enable-charmap \
+        --enable-python-bindings \
+        --enable-introspection \
+        --disable-static \
+        --disable-scrollkeeper
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-character-map/mate-character-map.install b/community/mate-character-map/mate-character-map.install
new file mode 100644
index 000000000..9f6e9c08b
--- /dev/null
+++ b/community/mate-character-map/mate-character-map.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/mate-color-manager/PKGBUILD b/community/mate-color-manager/PKGBUILD
new file mode 100644
index 000000000..048949ce1
--- /dev/null
+++ b/community/mate-color-manager/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 105579 2014-02-10 13:50:05Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=mate-color-manager
+pkgver=1.6.1
+pkgrel=3
+pkgdesc="Color management application for MATE."
+url="https://github.com/NiceandGently/${pkgname}"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus' 'desktop-file-utils' 'exiv2' 'gtk2' 'lcms2' 'libcanberra' 'libcups' 'libexif' 'libnotify' 'libtiff'
+         'libunique' 'mate-desktop' 'sane' 'vte')
+makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+options=('!emptydirs')
+source=("https://github.com/NiceandGently/${pkgname}/archive/v${pkgver}.tar.gz"
+        "https://github.com/NiceandGently/mate-color-manager/commit/cb80f549af83a703243eae4afad841d564743afb.diff")
+sha1sums=('6a8d18a3a7e3fb22e03cd319556575b9482c6f04'
+          '283c767591956206f5c7229ee1eff86faea253c0')
+install=${pkgname}.install
+
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    # Get udevrulesdir from pkg-config 
+    patch -Np1 -i  "${srcdir}/cb80f549af83a703243eae4afad841d564743afb.diff"
+    NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --sbindir=/usr/bin \
+        --libexecdir=/usr/lib/${pkgname} \
+        --disable-static \
+        --disable-scrollkeeper
+
+    #Work around a problem where the .sgml fail to parse.
+    sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/kdenetwork-kopete-libre/kdenetwork-kopete.install b/community/mate-color-manager/mate-color-manager.install
index 5495fb1b5..4e09ba484 100644
--- a/libre/kdenetwork-kopete-libre/kdenetwork-kopete.install
+++ b/community/mate-color-manager/mate-color-manager.install
@@ -1,5 +1,6 @@
 post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/mate
     update-desktop-database -q
 }
 
diff --git a/community/mate-control-center/PKGBUILD b/community/mate-control-center/PKGBUILD
new file mode 100644
index 000000000..94620fbaa
--- /dev/null
+++ b/community/mate-control-center/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 104207 2014-01-16 16:54:02Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
+# Contributor: Xpander <xpander0@gmail.com>
+# Contributor: hekel <hekel@archlinux.info>
+
+pkgname=mate-control-center
+pkgver=1.6.2
+pkgrel=1
+pkgdesc="The Control Center for MATE"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus-glib' 'dconf' 'desktop-file-utils' 'gsettings-desktop-schemas'
+         'gtk2' 'mate-desktop' 'mate-file-manager' 'mate-icon-theme' 'mate-menus'
+         'mate-settings-daemon' 'mate-window-manager' 'libgtop' 'libmatekbd'
+         'libunique' 'librsvg' 'libxss' 'libxt' 'startup-notification')
+makedepends=('docbook2x' 'mate-common' 'mate-doc-utils' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('d3aa9434dde63bd176e995cbb8408fd673f6eed5')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --sbindir=/usr/bin \
+        --localstatedir=/var \
+        --disable-static \
+        --disable-scrollkeeper \
+        --disable-update-mimedb
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+    rm -f "${pkgdir}/usr/share/applications/mimeinfo.cache"
+}
diff --git a/community/mate-control-center/mate-control-center.install b/community/mate-control-center/mate-control-center.install
new file mode 100644
index 000000000..d5a70db20
--- /dev/null
+++ b/community/mate-control-center/mate-control-center.install
@@ -0,0 +1,14 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    update-mime-database /usr/share/mime/ > /dev/null
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/mate-desktop/PKGBUILD b/community/mate-desktop/PKGBUILD
new file mode 100644
index 000000000..caeed6036
--- /dev/null
+++ b/community/mate-desktop/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 104842 2014-01-27 11:23:45Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=mate-desktop
+pkgver=1.6.2
+pkgrel=2
+pkgdesc="Library with common API for various MATE modules"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=(GPL LGPL)
+depends=('dconf' 'gtk2' 'hicolor-icon-theme' 'libunique' 'python2'
+         'startup-notification' 'ttf-dejavu')
+makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+optdepends=('lightdm-gtk2-greeter: A lightweight display manager')
+options=('!emptydirs')
+groups=('mate')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('413ef92f1aedf0ffbbf232ce6907211f0f4722a2')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    PYTHON=/usr/bin/python2 ./configure \
+        --prefix=/usr \
+        --disable-static \
+        --disable-scrollkeeper \
+        --disable-schemas-compile \
+        --enable-gtk-doc \
+        --with-omf-dir=/usr/share/omf/${pkgname}
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-desktop/mate-desktop.install b/community/mate-desktop/mate-desktop.install
new file mode 100644
index 000000000..3a06d45b9
--- /dev/null
+++ b/community/mate-desktop/mate-desktop.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/mate-dialogs/PKGBUILD b/community/mate-dialogs/PKGBUILD
new file mode 100644
index 000000000..8feff3f1d
--- /dev/null
+++ b/community/mate-dialogs/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 104188 2014-01-16 16:13:01Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
+# Contributor: Xpander <xpander0@gmail.com>
+
+pkgname=mate-dialogs
+pkgver=1.6.2
+pkgrel=3
+pkgdesc="Display graphical dialog boxes from shell scripts"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('gtk2' 'libnotify')
+makedepends=('docbook-xml' 'mate-common' 'mate-doc-utils' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('64601ae71671911dbc83d1fab2a837da0b218cf9')
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --disable-scrollkeeper
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-disk-utility/PKGBUILD b/community/mate-disk-utility/PKGBUILD
new file mode 100644
index 000000000..e1dedca5f
--- /dev/null
+++ b/community/mate-disk-utility/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 105605 2014-02-11 17:24:56Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=mate-disk-utility
+pkgver=1.6.2
+pkgrel=2
+pkgdesc="Disk management application for MATE."
+url="https://github.com/NiceandGently/mate-disk-utility"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('avahi' 'dbus' 'gtk2' 'libatasmart' 'libgnome-keyring' 'libnotify'
+         'libunique' 'mate-file-manager' 'udisks')
+makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+options=('!emptydirs')
+source=("https://github.com/NiceandGently/${pkgname}/archive/v${pkgver}.tar.gz")
+md5sums=('ff3b520a06c367124558cdd252f1956d')
+install=${pkgname}.install
+
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --libexecdir=/usr/lib/${pkgname} \
+        --enable-gnome-keyring \
+        --disable-static \
+        --disable-scrollkeeper
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/icedove-libre/icedove.install b/community/mate-disk-utility/mate-disk-utility.install
index 4d4a283db..94794eb8d 100644
--- a/libre/icedove-libre/icedove.install
+++ b/community/mate-disk-utility/mate-disk-utility.install
@@ -1,6 +1,6 @@
 post_install() {
+    gtk-update-icon-cache -q -t -f /usr/share/icons/mate
     update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff --git a/community/mate-file-manager-gksu/PKGBUILD b/community/mate-file-manager-gksu/PKGBUILD
new file mode 100644
index 000000000..c9e407950
--- /dev/null
+++ b/community/mate-file-manager-gksu/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 104226 2014-01-16 17:40:52Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
+# Contributor: Xpander <xpander0@gmail.com>
+
+pkgname=mate-file-manager-gksu
+pkgver=1.6.0
+pkgrel=7
+pkgdesc="A Caja extension for executing files with elevated privileges."
+url="http://mate-desktop.org/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gksu' 'gtk2' 'mate-file-manager')
+makedepends=('mate-common' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('fd6e6268e5e00706fbe5d20090aff94d2ce57302')
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./autogen.sh \
+        --prefix=/usr
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-file-manager-image-converter/PKGBUILD b/community/mate-file-manager-image-converter/PKGBUILD
new file mode 100644
index 000000000..85b106344
--- /dev/null
+++ b/community/mate-file-manager-image-converter/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 104228 2014-01-16 17:41:51Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
+# Contributor: Xpander <xpander0@gmail.com>
+
+pkgname=mate-file-manager-image-converter
+pkgver=1.6.0
+pkgrel=6
+pkgdesc="A Caja extension for simple image conversions."
+url="http://mate-desktop.org/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk2' 'imagemagick' 'mate-file-manager')
+makedepends=('mate-common' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('ab3b248e93f4c7322296d5856a8439d0a2515f53')
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./autogen.sh \
+        --prefix=/usr
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-file-manager-open-terminal/PKGBUILD b/community/mate-file-manager-open-terminal/PKGBUILD
new file mode 100644
index 000000000..e40d19b16
--- /dev/null
+++ b/community/mate-file-manager-open-terminal/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 104828 2014-01-27 09:49:50Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=mate-file-manager-open-terminal
+pkgver=1.6.1
+pkgrel=1
+pkgdesc="A Caja extension for opening terminals in arbitrary local paths."
+url="http://mate-desktop.org/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk2' 'mate-desktop' 'mate-file-manager')
+makedepends=('mate-common' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('958a213572e99cf734aeae75c604a9193abe07de')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-file-manager-open-terminal/mate-file-manager-open-terminal.install b/community/mate-file-manager-open-terminal/mate-file-manager-open-terminal.install
new file mode 100644
index 000000000..3a06d45b9
--- /dev/null
+++ b/community/mate-file-manager-open-terminal/mate-file-manager-open-terminal.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/mate-file-manager-sendto/PKGBUILD b/community/mate-file-manager-sendto/PKGBUILD
new file mode 100644
index 000000000..e986477b5
--- /dev/null
+++ b/community/mate-file-manager-sendto/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 104232 2014-01-16 17:43:59Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
+# Contributor: Xpander <xpander0@gmail.com>
+
+pkgname=mate-file-manager-sendto
+pkgver=1.6.0
+pkgrel=4
+pkgdesc="A Caja extension for sending files."
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus-glib' 'gupnp' 'gtk2' 'mate-file-manager')
+makedepends=('mate-common' 'perl-xml-parser')
+optdepends=('pidgin: Support for sending to instant messaging networks.'
+            'gajim: Support for sending to Jabber.'
+            'mate-bluetooth: Support for sending to bluetooth.')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('cf81a12d6d5d90f431d96fd67eed893f472b36f0')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./autogen.sh \
+        --prefix=/usr \
+        --with-plugins=gajim,pidgin,removable-devices,upnp,emailclient
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-file-manager-sendto/mate-file-manager-sendto.install b/community/mate-file-manager-sendto/mate-file-manager-sendto.install
new file mode 100644
index 000000000..3a06d45b9
--- /dev/null
+++ b/community/mate-file-manager-sendto/mate-file-manager-sendto.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/mate-file-manager-share/PKGBUILD b/community/mate-file-manager-share/PKGBUILD
new file mode 100644
index 000000000..96e1668a7
--- /dev/null
+++ b/community/mate-file-manager-share/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 104234 2014-01-16 17:45:59Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
+
+pkgname=mate-file-manager-share
+pkgver=1.6.0
+pkgrel=7
+pkgdesc="A Caja extension to quickly share a folder."
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('mate-file-manager' 'samba')
+makedepends=('mate-common' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('28e8ec54330e41aa44866107c23f48b47ea198e4')
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    PYTHON=/usr/bin/python2 ./autogen.sh \
+        --prefix=/usr
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-file-manager/PKGBUILD b/community/mate-file-manager/PKGBUILD
new file mode 100644
index 000000000..0203916d6
--- /dev/null
+++ b/community/mate-file-manager/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 104181 2014-01-16 15:54:41Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
+# Contributor: Xpander <xpander0@gmail.com>
+
+pkgname=mate-file-manager
+pkgver=1.6.3
+pkgrel=1
+pkgdesc="The MATE shell and file manager"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus' 'desktop-file-utils' 'exempi' 'gtk2' 'gvfs' 'libexif'
+         'libunique' 'libxt' 'mate-desktop' 'mate-icon-theme' 'startup-notification')
+makedepends=('gobject-introspection' 'mate-common' 'pangox-compat')
+optdepends=('gstreamer0.10-good-plugins: automatic media playback when mouseover')
+options=('!emptydirs')
+groups=('mate')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('ea52cfef3d728e4d5e135bff88452c02de05e960')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/caja \
+        --enable-unique \
+        --enable-introspection \
+        --disable-static \
+        --disable-update-mimedb
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-file-manager/mate-file-manager.install b/community/mate-file-manager/mate-file-manager.install
new file mode 100644
index 000000000..d5a70db20
--- /dev/null
+++ b/community/mate-file-manager/mate-file-manager.install
@@ -0,0 +1,14 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    update-mime-database /usr/share/mime/ > /dev/null
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/mate-image-viewer/PKGBUILD b/community/mate-image-viewer/PKGBUILD
new file mode 100644
index 000000000..6d17b27cb
--- /dev/null
+++ b/community/mate-image-viewer/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 104205 2014-01-16 16:49:55Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
+# Contributor: Xpander <xpander0@gmail.com>
+
+pkgname=mate-image-viewer
+pkgver=1.6.2
+pkgrel=1
+pkgdesc="An image viewing and cataloging program for MATE"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus-glib' 'desktop-file-utils' 'gtk2' 'exempi' 'lcms' 'libexif'
+         'libjpeg-turbo' 'mate-desktop' 'mate-icon-theme' 'pygtk' 'python2'
+         'python2-gobject2' 'startup-notification' 'zlib')
+makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz"
+        "https://github.com/mate-desktop/eom/commit/e62ed087493c8a529d4eeab46c7d68a2047ac81a.diff")
+sha1sums=('37e638790329350bb772a40549741f89ed43952c'
+          'a2f0810a48d81023e9bae29d80b682ae0fe9faac')
+install=${pkgname}.install
+
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    #Use GETTEXT_PACKAGE instead of PACKAGE
+    patch -Np1 -i "${srcdir}/e62ed087493c8a529d4eeab46c7d68a2047ac81a.diff"
+}
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    PYTHON=/usr/bin/python2 ./configure \
+        --prefix=/usr \
+        --localstatedir=/var \
+        --disable-scrollkeeper
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/file-roller-libre/file-roller.install b/community/mate-image-viewer/mate-image-viewer.install
index 8b17fa3d4..bf6781f93 100644
--- a/libre/file-roller-libre/file-roller.install
+++ b/community/mate-image-viewer/mate-image-viewer.install
@@ -1,7 +1,7 @@
 post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
     gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/community/mate-keyring/PKGBUILD b/community/mate-keyring/PKGBUILD
new file mode 100644
index 000000000..7b67fa117
--- /dev/null
+++ b/community/mate-keyring/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 104168 2014-01-16 15:04:52Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
+# Contributor: Xpander <xpander0@gmail.com>
+
+pkgname=mate-keyring
+pkgver=1.6.1
+pkgrel=3
+pkgdesc="MATE Password Management daemon"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL')
+depends=('dbus' 'dconf' 'gtk2' 'libtasn1' 'pam')
+makedepends=('docbook-xml' 'mate-common' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('7b2e0201d4f4eb0f728dbf1626d5aa05b2d05675')
+install=${pkgname}.install
+
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    # Prevent gck conflict with gnome gcr lib
+    sed -e 's/DOC_MODULE=gck/DOC_MODULE=mate-gck/' -i docs/reference/gck/Makefile.am
+    autoreconf -fi
+    intltoolize -c -f
+}
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgname} \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --with-pam-dir=/usr/lib/security \
+        --with-root-certs=/etc/ssl/certs \
+        --disable-static
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-keyring/mate-keyring.install b/community/mate-keyring/mate-keyring.install
new file mode 100644
index 000000000..3a06d45b9
--- /dev/null
+++ b/community/mate-keyring/mate-keyring.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/mate-media/PKGBUILD b/community/mate-media/PKGBUILD
new file mode 100644
index 000000000..33c3510e2
--- /dev/null
+++ b/community/mate-media/PKGBUILD
@@ -0,0 +1,75 @@
+# $Id: PKGBUILD 104197 2014-01-16 16:38:43Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgbase=mate-media
+pkgname=("${pkgbase}-pulseaudio" "${pkgbase}-gstreamer")
+pkgver=1.6.1
+pkgrel=1
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gstreamer0.10-base-plugins' 'gtk2' 'libcanberra-pulse' 'libunique'
+         'mate-desktop' 'mate-window-manager' 'pulseaudio')
+makedepends=('mate-common' 'mate-doc-utils' 'mate-panel'
+             'mate-settings-daemon-gstreamer' 'perl-xml-parser')
+options=('!emptydirs')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('39acbf670a384325b5f68487e62bb1bdddb7d68f')
+
+build() {
+    cd "${srcdir}"
+    cp -a ${pkgbase}-${pkgver}{,-gstreamer}
+    
+    # build for pulseaudio
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+    ./autogen.sh \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --libexecdir=/usr/lib/${pkgbase} \
+        --localstatedir=/var \
+        --enable-pulseaudio \
+        --disable-gstmix \
+        --disable-gst-mixer-applet \
+        --disable-static \
+        --disable-scrollkeeper
+    make
+    
+    # build for gstreamer
+    cd "${srcdir}/${pkgbase}-${pkgver}-gstreamer"
+    ./autogen.sh \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --libexecdir=/usr/lib/${pkgbase} \
+        --localstatedir=/var \
+        --enable-gstmix \
+        --enable-gst-mixer-applet \
+        --enable-deprecated \
+        --disable-pulseaudio \
+        --disable-static \
+        --disable-scrollkeeper
+    make
+}
+
+package_mate-media-pulseaudio() {
+    groups=('mate-extra')
+    pkgdesc="MATE Media Tools (pulseaudio)"
+    depends=('libcanberra-pulse' 'libunique' 'mate-desktop' 'mate-window-manager'
+             'pulseaudio')
+    conflicts=("${pkgbase}-gstreamer" 'mate-settings-daemon-gstreamer')
+    provides=("${pkgbase}")
+    replaces=("${pkgbase}")
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
+
+package_mate-media-gstreamer() {
+    pkgdesc="MATE Media Tools (GStreamer)"
+    depends=('gstreamer0.10-base-plugins' 'gtk2' 'libcanberra' 'mate-desktop'
+             'mate-window-manager')
+    optdepends=('mate-panel: Volume control for the panel')
+    conflicts=("${pkgbase}-pulseaudio" 'mate-settings-daemon-pulseaudio')
+    provides=("${pkgbase}")    
+    install=${pkgbase}-gstreamer.install
+    cd "${srcdir}/${pkgbase}-${pkgver}-gstreamer"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-media/mate-media-gstreamer.install b/community/mate-media/mate-media-gstreamer.install
new file mode 100644
index 000000000..d6813b0f7
--- /dev/null
+++ b/community/mate-media/mate-media-gstreamer.install
@@ -0,0 +1,12 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/mate
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/mate-menus/PKGBUILD b/community/mate-menus/PKGBUILD
new file mode 100644
index 000000000..d236e328e
--- /dev/null
+++ b/community/mate-menus/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 104193 2014-01-16 16:26:41Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
+# Contributor: Xpander <xpander0@gmail.com>
+
+pkgname=mate-menus
+pkgver=1.6.0
+pkgrel=3
+pkgdesc="MATE menu specifications"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('glib2' 'python2')
+makedepends=('gobject-introspection'  'mate-common' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('798e1e96e8dea48d93f1db90b6fbe69d0a3f3ea5')
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    PYTHON=/usr/bin/python2 ./autogen.sh \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --enable-python \
+        --disable-static
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-mplayer/PKGBUILD b/community/mate-mplayer/PKGBUILD
new file mode 100644
index 000000000..119b0ab70
--- /dev/null
+++ b/community/mate-mplayer/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 104685 2014-01-24 16:26:27Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=mate-mplayer
+pkgver=1.0.8
+pkgrel=3
+pkgdesc="Mplayer GUI for MATE"
+url="https://github.com/NiceandGently/mate-mplayer"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('curl' 'dbus-glib' 'gmtk' 'gtk2' 'libgpod' 'libnotify' 'libmusicbrainz3'
+         'mate-file-manager')
+optdepends=('mplayer: required to actually play any media')
+makedepends=('mate-common' 'perl-xml-parser')
+options=('!emptydirs')
+source=("https://github.com/NiceandGently/${pkgname}/archive/v${pkgver}.tar.gz")
+md5sums=('05a5571f9ffc8493a0814065b78faa11')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/epiphany-libre/epiphany.install b/community/mate-mplayer/mate-mplayer.install
index 8b17fa3d4..bf6781f93 100644
--- a/libre/epiphany-libre/epiphany.install
+++ b/community/mate-mplayer/mate-mplayer.install
@@ -1,7 +1,7 @@
 post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
     gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/community/mate-netbook/PKGBUILD b/community/mate-netbook/PKGBUILD
new file mode 100644
index 000000000..eaba0ab36
--- /dev/null
+++ b/community/mate-netbook/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 104240 2014-01-16 17:53:25Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Xpander <xpander0@gmail.com>
+
+pkgname=mate-netbook
+pkgver=1.6.1
+pkgrel=1
+pkgdesc="A simple window management tool."
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk2' 'libfakekey' 'libmatewnck' 'libunique' 'mate-panel')
+makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+options=('!emptydirs')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('8aa6f4802bbe5ef7aef9d601a4172d1304d6bb86')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexec=/usr/lib/${pkgname} \
+        --sysconfdir=/etc \
+        --disable-static
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-netbook/mate-netbook.install b/community/mate-netbook/mate-netbook.install
new file mode 100644
index 000000000..3a06d45b9
--- /dev/null
+++ b/community/mate-netbook/mate-netbook.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/mate-netspeed/PKGBUILD b/community/mate-netspeed/PKGBUILD
new file mode 100644
index 000000000..883a6a108
--- /dev/null
+++ b/community/mate-netspeed/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 105369 2014-02-06 05:24:15Z bisson $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=mate-netspeed
+pkgver=1.6.1
+pkgrel=2
+pkgdesc="A MATE applet that shows how much traffic occurs on a specified network device."
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk2' 'libgtop' 'mate-panel' 'wireless_tools')
+makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('4b9c8b7f7ff59ef8ad989821fe360f5f459c66ed')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgname} \
+        --disable-static \
+        --disable-scrollkeeper
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-netspeed/mate-netspeed.install b/community/mate-netspeed/mate-netspeed.install
new file mode 100644
index 000000000..7af080f58
--- /dev/null
+++ b/community/mate-netspeed/mate-netspeed.install
@@ -0,0 +1,12 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/mate-nettool/PKGBUILD b/community/mate-nettool/PKGBUILD
new file mode 100644
index 000000000..da3b56e32
--- /dev/null
+++ b/community/mate-nettool/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 105607 2014-02-11 17:55:05Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=mate-nettool
+pkgver=1.8.1
+pkgrel=7
+pkgdesc="MATE interface for various networking tools."
+url="https://github.com/NiceandGently/mate-nettool"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('coreutils' 'gtk3' 'libgtop' 'net-tools')
+makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('dnsutils: Required for DNS queries'
+            'iputils: Required for ping, traceroute and finger'
+            'nmap: Required for network discovery and security audits'
+            'whois: Required for WHOIS queries'
+            'yelp: for reading help documents')
+options=('!emptydirs')
+source=("https://github.com/NiceandGently/${pkgname}/archive/v${pkgver}.tar.gz")
+md5sums=('c05c525fee4d70c03ebad7e9bb9b7e4c')
+install=${pkgname}.install
+
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --disable-static \
+        --disable-schemas-compile
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-nettool/mate-nettool.install b/community/mate-nettool/mate-nettool.install
new file mode 100644
index 000000000..bf6781f93
--- /dev/null
+++ b/community/mate-nettool/mate-nettool.install
@@ -0,0 +1,13 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/mate-notification-daemon/PKGBUILD b/community/mate-notification-daemon/PKGBUILD
new file mode 100644
index 000000000..0201510a6
--- /dev/null
+++ b/community/mate-notification-daemon/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 104203 2014-01-16 16:45:28Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com>
+# Contributor: Xpander <xpander0@gmail.com>
+
+pkgname=mate-notification-daemon
+pkgver=1.6.1
+pkgrel=3
+pkgdesc="Notification daemon for MATE"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL')
+depends=('dconf' 'dbus-glib' 'gtk2' 'libcanberra' 'libmatewnck' 'libnotify')
+makedepends=('mate-common' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate')
+provides=('notification-daemon')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('b911efdc4e37dc0b521165168fee03889f776c12')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgname} \
+        --disable-static
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-notification-daemon/mate-notification-daemon.install b/community/mate-notification-daemon/mate-notification-daemon.install
new file mode 100644
index 000000000..7af080f58
--- /dev/null
+++ b/community/mate-notification-daemon/mate-notification-daemon.install
@@ -0,0 +1,12 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/mate-panel/PKGBUILD b/community/mate-panel/PKGBUILD
new file mode 100644
index 000000000..9fa14e4a8
--- /dev/null
+++ b/community/mate-panel/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=mate-panel
+pkgver=1.6.2
+pkgrel=1
+pkgdesc="The MATE Panel"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus-glib' 'dconf' 'gtk2' 'libmatewnck' 'libcanberra' 'libice'
+         'libmateweather' 'librsvg' 'libsm'
+         'libsoup' 'libxau' 'mate-desktop' 'mate-file-manager'
+         'mate-menus' 'mate-session-manager' 'mate-window-manager')
+makedepends=('gobject-introspection' 'mate-common' 'mate-doc-utils'
+             'networkmanager' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('a02d8a678b9235f231002feb4ecef7171939161e')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgname} \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --enable-introspection \
+        --disable-static \
+        --disable-scrollkeeper
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-panel/mate-panel.install b/community/mate-panel/mate-panel.install
new file mode 100644
index 000000000..7af080f58
--- /dev/null
+++ b/community/mate-panel/mate-panel.install
@@ -0,0 +1,12 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/mate-polkit/PKGBUILD b/community/mate-polkit/PKGBUILD
new file mode 100644
index 000000000..67d8f1963
--- /dev/null
+++ b/community/mate-polkit/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 104183 2014-01-16 15:57:10Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com>
+# Contributor: Xpander <xpander0@gmail.com>
+
+pkgname=mate-polkit
+pkgver=1.6.1
+pkgrel=1
+pkgdesc="PolicyKit integration for the MATE desktop"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('gtk2' 'polkit')
+makedepends=('gobject-introspection' 'mate-common' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('43afbbb0a9e4c1295bdd0f788ad7effd776dccf2')
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/polkit-mate \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --enable-introspection \
+        --disable-static
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-power-manager/PKGBUILD b/community/mate-power-manager/PKGBUILD
new file mode 100644
index 000000000..74d83b619
--- /dev/null
+++ b/community/mate-power-manager/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 104214 2014-01-16 17:11:58Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com>
+# Contributor: Xpander <xpander0@gmail.com>
+# Contributor: hekel <hekel@archlinux.info>
+
+pkgname=mate-power-manager
+pkgver=1.6.3
+pkgrel=3
+pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system for Mate Desktop"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus-glib' 'dconf' 'libcanberra' 'libmatekeyring' 'libnotify'
+         'libunique' 'upower')
+makedepends=('docbook2x' 'docbook-xml' 'mate-common' 'mate-doc-utils'
+             'mate-panel' 'perl-xml-parser' 'xmlto')
+optdepends=('mate-panel: Set brightness and inhibit power management from the panel')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('a949e34494cb70bcb2fa349dcc35847f022be187')
+install=${pkgname}.install
+
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    #Work around a problem where the .sgml fail to parse.
+    sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in
+}
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgname} \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --sbindir=/usr/bin \
+        --enable-applets \
+        --enable-unique \
+        --disable-scrollkeeper
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-power-manager/mate-power-manager.install b/community/mate-power-manager/mate-power-manager.install
new file mode 100644
index 000000000..7af080f58
--- /dev/null
+++ b/community/mate-power-manager/mate-power-manager.install
@@ -0,0 +1,12 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/mate-screensaver/PKGBUILD b/community/mate-screensaver/PKGBUILD
new file mode 100644
index 000000000..3ff0d4b0b
--- /dev/null
+++ b/community/mate-screensaver/PKGBUILD
@@ -0,0 +1,40 @@
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=mate-screensaver
+pkgver=1.6.2
+pkgrel=3
+pkgdesc='Screensaver for MATE'
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus-glib' 'libmatekbd' 'libnotify' 'libxss' 'mate-desktop'
+         'mate-menus' 'mate-session-manager')
+makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser' 'xmlto')
+optdepends=('mate-power-manager: Add power management support.'
+            'mate-screensaver-hacks: Additional screensavers.'
+            'rss-glx: Really slick screensavers.')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('f8101af15e909ca40c1546bda637712e00458a67')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgname} \
+        --sysconfdir=/etc \
+        --with-xscreensaverdir=/usr/share/xscreensaver/config \
+        --with-xscreensaverhackdir=/usr/lib/xscreensaver \
+        --with-mit-ext \
+        --with-libnotify \
+        --enable-locking \
+        --disable-static
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-screensaver/mate-screensaver.install b/community/mate-screensaver/mate-screensaver.install
new file mode 100644
index 000000000..3a06d45b9
--- /dev/null
+++ b/community/mate-screensaver/mate-screensaver.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/mate-sensors-applet/PKGBUILD b/community/mate-sensors-applet/PKGBUILD
new file mode 100644
index 000000000..c78432fa8
--- /dev/null
+++ b/community/mate-sensors-applet/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 104246 2014-01-16 18:03:24Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com>
+# Contributor: Xpander <xpander0@gmail.com>
+
+pkgname=mate-sensors-applet
+pkgver=1.6.1
+pkgrel=1
+pkgdesc="A MATE Panel applet to display readings from hardware sensors, including CPU temperature, fan speeds and voltage readings."
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus' 'gtk2' 'libatasmart' 'libnotify' 'libxnvctrl' 'lm_sensors' 'mate-panel' )
+makedepends=('docbook-xml' 'mate-common' 'mate-doc-utils' 'perl-xml-parser' 'rarian')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('3b57d8e4b47ff2b25bbcee465c0ef7c37bcff1f7')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgname} \
+        --disable-static \
+        --disable-scrollkeeper
+  make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-sensors-applet/mate-sensors-applet.install b/community/mate-sensors-applet/mate-sensors-applet.install
new file mode 100644
index 000000000..7af080f58
--- /dev/null
+++ b/community/mate-sensors-applet/mate-sensors-applet.install
@@ -0,0 +1,12 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/mate-session-manager/PKGBUILD b/community/mate-session-manager/PKGBUILD
new file mode 100644
index 000000000..e493b23eb
--- /dev/null
+++ b/community/mate-session-manager/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 105093 2014-01-31 12:59:35Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=mate-session-manager
+pkgver=1.6.1
+pkgrel=10
+pkgdesc="The MATE Session Handler"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL')
+depends=('dbus-glib' 'gtk2' 'libsm' 'libxtst' 'mate-desktop' 'mate-polkit'
+         'mate-settings-daemon' 'xdg-user-dirs')
+makedepends=('mate-common' 'perl-xml-parser' 'xmlto')
+optdepends=('xdg-user-dirs-gtk: Add autostart that prompts to rename user directories when switching locales')
+options=('!emptydirs')
+groups=('mate')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz"
+        f0b5b1ab78879d64f80117415aacf029359afea5.diff
+        e934e91226e9a93956121c9c84ecf3664fcd68be.diff)
+sha1sums=('46188f6c02cc5978688af9d5db4be09f1b9199a5'
+          '20fb99c29731d05191cd0029d0573db784b06ccf'
+          '4312495bcd12ca5a20f7d5442b7517902605534c')
+install=${pkgname}.install
+
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    # fix systemd-login1 support for hibernate/suspend
+    # https://github.com/mate-desktop/mate-session-manager/commit/f0b5b1ab78879d64f80117415aacf029359afea5
+    patch -Np1 -i "${srcdir}/f0b5b1ab78879d64f80117415aacf029359afea5.diff"
+
+    # Make upower optional
+    # https://github.com/mate-desktop/mate-session-manager/commit/e934e91226e9a93956121c9c84ecf3664fcd68be
+    patch -Np1 -i "${srcdir}/e934e91226e9a93956121c9c84ecf3664fcd68be.diff"
+
+    # Recreate the build system because configure.ac was patched.
+    autoreconf -fi
+}
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgname} \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --disable-upower
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-session-manager/e934e91226e9a93956121c9c84ecf3664fcd68be.diff b/community/mate-session-manager/e934e91226e9a93956121c9c84ecf3664fcd68be.diff
new file mode 100644
index 000000000..bd42a4722
--- /dev/null
+++ b/community/mate-session-manager/e934e91226e9a93956121c9c84ecf3664fcd68be.diff
@@ -0,0 +1,293 @@
+diff --git a/configure.ac b/configure.ac
+index 37bb191..a9e20ef 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -70,7 +70,6 @@ PKG_CHECK_MODULES(MATE_SESSION,
+         gio-2.0 >= $GIO_REQUIRED
+         gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+         dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+-        upower-glib >= $UPOWER_REQUIRED
+ )
+ 
+ PKG_CHECK_MODULES(SESSION_PROPERTIES,
+@@ -128,6 +127,24 @@ AM_CONDITIONAL(HAVE_SYSTEMD, test "x$use_systemd" = "xyes")
+ AC_SUBST(HAVE_SYSTEMD)
+ 
+ dnl ====================================================================
++dnl UPOWER
++dnl ====================================================================
++
++AC_ARG_ENABLE(upower,
++              AS_HELP_STRING([--enable-upower],
++              [Use upower to suspend/hibernate]),
++              enable_upower=$enableval,
++              enable_upower=yes)
++if test "x$enable_upower" = "xyes"; then
++    PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED, has_upower=yes, has_upower=no)
++    AC_DEFINE(HAVE_UPOWER, 1, [upower support])
++    AC_SUBST(UPOWER_CFLAGS)
++    AC_SUBST(UPOWER_LIBS)
++fi
++AM_CONDITIONAL(HAVE_UPOWER, test "x$enable_upower" = "xyes")
++AC_SUBST(HAVE_UPOWER)
++
++dnl ====================================================================
+ dnl X development libraries check
+ dnl ====================================================================
+ 
+@@ -385,6 +402,7 @@ echo "
+         GTK+ version:             ${with_gtk}
+         Default WM:               ${with_default_wm}
+         Systemd support:          ${use_systemd}
++        Upower support:           ${enable_upower}
+         IPv6 support:             ${have_full_ipv6}
+         Backtrace support:        ${have_backtrace}
+         XRender support:          ${have_xrender}
+diff --git a/mate-session/Makefile.am b/mate-session/Makefile.am
+index f37a0e2..53f0fc7 100644
+--- a/mate-session/Makefile.am
++++ b/mate-session/Makefile.am
+@@ -7,6 +7,7 @@ noinst_PROGRAMS = 		\
+ AM_CPPFLAGS =					\
+ 	$(MATE_SESSION_CFLAGS)		\
+ 	$(SYSTEMD_CFLAGS)			\
++	$(UPOWER_CFLAGS)			\
+ 	$(DISABLE_DEPRECATED_CFLAGS)
+ 
+ AM_CFLAGS = $(WARN_CFLAGS)
+@@ -76,6 +77,7 @@ mate_session_LDADD =				\
+ 	$(XEXT_LIBS)				\
+ 	$(MATE_SESSION_LIBS)			\
+ 	$(SYSTEMD_LIBS)				\
++	$(UPOWER_LIBS)				\
+ 	$(EXECINFO_LIBS)
+ 
+ libgsmutil_la_SOURCES =				\
+diff --git a/mate-session/gsm-logout-dialog.c b/mate-session/gsm-logout-dialog.c
+index 1a79875..323f123 100644
+--- a/mate-session/gsm-logout-dialog.c
++++ b/mate-session/gsm-logout-dialog.c
+@@ -27,7 +27,9 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ 
++#ifdef HAVE_UPOWER
+ #include <upower.h>
++#endif
+ 
+ #include "gsm-logout-dialog.h"
+ #ifdef HAVE_SYSTEMD
+@@ -52,8 +54,9 @@
+ struct _GsmLogoutDialogPrivate
+ {
+         GsmDialogLogoutType  type;
+-
++#ifdef HAVE_UPOWER
+         UpClient            *up_client;
++#endif
+ #ifdef HAVE_SYSTEMD
+         GsmSystemd          *systemd;
+ #endif
+@@ -147,9 +150,9 @@ enum {
+         gtk_window_set_skip_taskbar_hint (GTK_WINDOW (logout_dialog), TRUE);
+         gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
+         gtk_window_stick (GTK_WINDOW (logout_dialog));
+-
++#ifdef HAVE_UPOWER
+         logout_dialog->priv->up_client = up_client_new ();
+-
++#endif
+ #ifdef HAVE_SYSTEMD
+         if (LOGIND_RUNNING())
+             logout_dialog->priv->systemd = gsm_get_systemd ();
+@@ -176,12 +179,12 @@ enum {
+                 g_source_remove (logout_dialog->priv->timeout_id);
+                 logout_dialog->priv->timeout_id = 0;
+         }
+-
++#ifdef HAVE_UPOWER
+         if (logout_dialog->priv->up_client) {
+                 g_object_unref (logout_dialog->priv->up_client);
+                 logout_dialog->priv->up_client = NULL;
+         }
+-
++#endif
+ #ifdef HAVE_SYSTEMD
+         if (logout_dialog->priv->systemd) {
+                 g_object_unref (logout_dialog->priv->systemd);
+@@ -201,13 +204,17 @@ enum {
+ gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog)
+ {
+         gboolean ret;
++        ret = FALSE;
+ #ifdef HAVE_SYSTEMD
+         if (LOGIND_RUNNING())
+             ret = gsm_systemd_can_suspend (logout_dialog->priv->systemd);
++#endif
++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
+         else
+ #endif
++#ifdef HAVE_UPOWER
+         ret = up_client_get_can_suspend (logout_dialog->priv->up_client);
+-
++#endif
+         return ret;
+ }
+ 
+@@ -215,13 +222,17 @@ enum {
+ gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog)
+ {
+         gboolean ret;
++        ret = FALSE;
+ #ifdef HAVE_SYSTEMD
+         if (LOGIND_RUNNING())
+             ret = gsm_systemd_can_hibernate (logout_dialog->priv->systemd);
++#endif
++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
+         else
+ #endif
++#ifdef HAVE_UPOWER
+         ret = up_client_get_can_hibernate (logout_dialog->priv->up_client);
+-
++#endif
+         return ret;
+ }
+ 
+diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
+index 79d0829..17a20b8 100644
+--- a/mate-session/gsm-manager.c
++++ b/mate-session/gsm-manager.c
+@@ -38,7 +38,9 @@
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
++#ifdef HAVE_UPOWER
+ #include <upower.h>
++#endif
+ 
+ #include <gtk/gtk.h> /* for logout dialog */
+ #include <gio/gio.h> /* for gsettings */
+@@ -144,9 +146,10 @@ struct GsmManagerPrivate
+ 
+         DBusGProxy             *bus_proxy;
+         DBusGConnection        *connection;
+-
++#ifdef HAVE_UPOWER
+         /* Interface with other parts of the system */
+         UpClient               *up_client;
++#endif
+ };
+ 
+ enum {
+@@ -1097,10 +1100,11 @@ enum {
+ static void
+ manager_attempt_hibernate (GsmManager *manager)
+ {
++#ifdef HAVE_UPOWER
+         gboolean  can_hibernate;
+         GError   *error;
+         gboolean  ret;
+-
++#endif
+ #ifdef HAVE_SYSTEMD
+         if (LOGIND_RUNNING()) {
+ 
+@@ -1113,8 +1117,11 @@ enum {
+ 
+                 gsm_systemd_attempt_hibernate (systemd);
+         }
++#endif
++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
+         else {
+ #endif
++#ifdef HAVE_UPOWER
+         can_hibernate = up_client_get_can_hibernate (manager->priv->up_client);
+         if (can_hibernate) {
+ 
+@@ -1129,7 +1136,8 @@ enum {
+                         g_error_free (error);
+                 }
+         }
+-#ifdef HAVE_SYSTEMD
++#endif
++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
+         }
+ #endif
+ }
+@@ -1137,10 +1145,11 @@ enum {
+ static void
+ manager_attempt_suspend (GsmManager *manager)
+ {
++#ifdef HAVE_UPOWER
+         gboolean  can_suspend;
+         GError   *error;
+         gboolean  ret;
+-
++#endif
+ #ifdef HAVE_SYSTEMD
+         if (LOGIND_RUNNING()) {
+ 
+@@ -1153,8 +1162,11 @@ enum {
+ 
+                 gsm_systemd_attempt_suspend (systemd);
+         }
++#endif
++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
+         else {
+ #endif
++#ifdef HAVE_UPOWER
+         can_suspend = up_client_get_can_suspend (manager->priv->up_client);
+         if (can_suspend) {
+ 
+@@ -1169,7 +1181,8 @@ enum {
+                         g_error_free (error);
+                 }
+         }
+-#ifdef HAVE_SYSTEMD
++#endif
++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
+         }
+ #endif
+ }
+@@ -2341,12 +2354,12 @@ enum {
+                 g_object_unref (manager->priv->settings_screensaver);
+                 manager->priv->settings_screensaver = NULL;
+         }
+-
++#ifdef HAVE_UPOWER
+         if (manager->priv->up_client != NULL) {
+                 g_object_unref (manager->priv->up_client);
+                 manager->priv->up_client = NULL;
+         }
+-
++#endif
+         G_OBJECT_CLASS (gsm_manager_parent_class)->dispose (object);
+ }
+ 
+@@ -2553,9 +2566,9 @@ enum {
+                           "status-changed",
+                           G_CALLBACK (on_presence_status_changed),
+                           manager);
+-
++#ifdef HAVE_UPOWER
+         manager->priv->up_client = up_client_new ();
+-
++#endif
+         g_signal_connect (manager->priv->settings_session,
+                           "changed",
+                           G_CALLBACK (on_gsettings_key_changed),
+@@ -3224,12 +3237,12 @@ enum {
+ #endif
+         gboolean can_suspend;
+         gboolean can_hibernate;
+-
++#ifdef HAVE_UPOWER
+         g_object_get (manager->priv->up_client,
+                       "can-suspend", &can_suspend,
+                       "can-hibernate", &can_hibernate,
+                       NULL);
+-
++#endif
+         g_debug ("GsmManager: CanShutdown called");
+ 
+         g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
diff --git a/community/mate-session-manager/f0b5b1ab78879d64f80117415aacf029359afea5.diff b/community/mate-session-manager/f0b5b1ab78879d64f80117415aacf029359afea5.diff
new file mode 100644
index 000000000..ffbe19a5d
--- /dev/null
+++ b/community/mate-session-manager/f0b5b1ab78879d64f80117415aacf029359afea5.diff
@@ -0,0 +1,271 @@
+diff --git a/mate-session/gsm-logout-dialog.c b/mate-session/gsm-logout-dialog.c
+index 2d2947c..1a79875 100644
+--- a/mate-session/gsm-logout-dialog.c
++++ b/mate-session/gsm-logout-dialog.c
+@@ -200,13 +200,29 @@ enum {
+ static gboolean
+ gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog)
+ {
+-        return up_client_get_can_suspend (logout_dialog->priv->up_client);
++        gboolean ret;
++#ifdef HAVE_SYSTEMD
++        if (LOGIND_RUNNING())
++            ret = gsm_systemd_can_suspend (logout_dialog->priv->systemd);
++        else
++#endif
++        ret = up_client_get_can_suspend (logout_dialog->priv->up_client);
++
++        return ret;
+ }
+ 
+ static gboolean
+ gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog)
+ {
+-        return up_client_get_can_hibernate (logout_dialog->priv->up_client);
++        gboolean ret;
++#ifdef HAVE_SYSTEMD
++        if (LOGIND_RUNNING())
++            ret = gsm_systemd_can_hibernate (logout_dialog->priv->systemd);
++        else
++#endif
++        ret = up_client_get_can_hibernate (logout_dialog->priv->up_client);
++
++        return ret;
+ }
+ 
+ static gboolean
+diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
+index 8143d1f..b4986ac 100644
+--- a/mate-session/gsm-manager.c
++++ b/mate-session/gsm-manager.c
+@@ -1109,6 +1109,20 @@ enum {
+         GError   *error;
+         gboolean  ret;
+ 
++#ifdef HAVE_SYSTEMD
++        if (LOGIND_RUNNING()) {
++
++                GsmSystemd *systemd;
++
++                systemd = gsm_get_systemd ();
++
++                /* lock the screen before we suspend */
++                manager_perhaps_lock (manager);
++
++                gsm_systemd_attempt_hibernate (systemd);
++        }
++        else {
++#endif
+         can_hibernate = up_client_get_can_hibernate (manager->priv->up_client);
+         if (can_hibernate) {
+ 
+@@ -1123,6 +1137,9 @@ enum {
+                         g_error_free (error);
+                 }
+         }
++#ifdef HAVE_SYSTEMD
++        }
++#endif
+ }
+ 
+ static void
+@@ -1132,6 +1149,20 @@ enum {
+         GError   *error;
+         gboolean  ret;
+ 
++#ifdef HAVE_SYSTEMD
++        if (LOGIND_RUNNING()) {
++
++                GsmSystemd *systemd;
++
++                systemd = gsm_get_systemd ();
++
++                /* lock the screen before we suspend */
++                manager_perhaps_lock (manager);
++
++                gsm_systemd_attempt_suspend (systemd);
++        }
++        else {
++#endif
+         can_suspend = up_client_get_can_suspend (manager->priv->up_client);
+         if (can_suspend) {
+ 
+@@ -1146,6 +1177,9 @@ enum {
+                         g_error_free (error);
+                 }
+         }
++#ifdef HAVE_SYSTEMD
++        }
++#endif
+ }
+ 
+ static void
+diff --git a/mate-session/gsm-systemd.c b/mate-session/gsm-systemd.c
+index 377f026..dbe8ea0 100644
+--- a/mate-session/gsm-systemd.c
++++ b/mate-session/gsm-systemd.c
+@@ -725,6 +725,141 @@ static void     gsm_systemd_on_name_owner_changed (DBusGProxy       *bus_proxy,
+     return can_stop;
+ }
+ 
++gboolean
++gsm_systemd_can_hibernate (GsmSystemd *manager)
++{
++  gboolean res;
++  gchar   *value;
++  gboolean can_hibernate;
++  GError  *error;
++  
++  error = NULL;
++  
++  if (!gsm_systemd_ensure_sd_connection (manager, &error)) {
++    g_warning ("Could not connect to Systemd: %s",
++	       error->message);
++    g_error_free (error);
++    return FALSE;
++  }
++  
++  res = dbus_g_proxy_call_with_timeout (manager->priv->sd_proxy,
++					"CanHibernate",
++					INT_MAX,
++					&error,
++					G_TYPE_INVALID,
++					G_TYPE_STRING, &value,
++					G_TYPE_INVALID);
++  if (res == FALSE) {
++    g_warning ("Could not make DBUS call: %s",
++	       error->message);
++    g_error_free (error);
++    return FALSE;
++  }
++  
++  can_hibernate = g_strcmp0 (value, "yes") == 0 ||
++  g_strcmp0 (value, "challenge") == 0;
++  g_free (value);
++  return can_hibernate;
++}
++
++gboolean
++gsm_systemd_can_suspend (GsmSystemd *manager)
++{
++  gboolean res;
++  gchar   *value;
++  gboolean can_suspend;
++  GError  *error;
++  
++  error = NULL;
++  
++  if (!gsm_systemd_ensure_sd_connection (manager, &error)) {
++    g_warning ("Could not connect to Systemd: %s",
++	       error->message);
++    g_error_free (error);
++    return FALSE;
++  }
++  
++  res = dbus_g_proxy_call_with_timeout (manager->priv->sd_proxy,
++					"CanSuspend",
++					INT_MAX,
++					&error,
++					G_TYPE_INVALID,
++					G_TYPE_STRING, &value,
++					G_TYPE_INVALID);
++  if (res == FALSE) {
++    g_warning ("Could not make DBUS call: %s",
++	       error->message);
++    g_error_free (error);
++    return FALSE;
++  }
++  
++  can_suspend = g_strcmp0 (value, "yes") == 0 ||
++  g_strcmp0 (value, "challenge") == 0;
++  g_free (value);
++  return can_suspend;
++}
++
++void
++gsm_systemd_attempt_hibernate (GsmSystemd *manager)
++{
++  gboolean res;
++  GError  *error;
++  
++  error = NULL;
++  
++  if (!gsm_systemd_ensure_sd_connection (manager, &error)) {
++    g_warning ("Could not connect to Systemd: %s",
++	       error->message);
++    g_error_free (error);
++    return FALSE;
++  }
++  
++  res = dbus_g_proxy_call_with_timeout (manager->priv->sd_proxy,
++					"Hibernate",
++					INT_MAX,
++					&error,
++                                        G_TYPE_BOOLEAN, TRUE, /* interactive */
++					G_TYPE_INVALID,
++					G_TYPE_INVALID);
++  if (res == FALSE) {
++    g_warning ("Could not make DBUS call: %s",
++	       error->message);
++    g_error_free (error);
++    return FALSE;
++  }
++  
++}
++
++void
++gsm_systemd_attempt_suspend (GsmSystemd *manager)
++{
++  gboolean res;
++  GError  *error;
++  
++  error = NULL;
++  
++  if (!gsm_systemd_ensure_sd_connection (manager, &error)) {
++    g_warning ("Could not connect to Systemd: %s",
++	       error->message);
++    g_error_free (error);
++    return FALSE;
++  }
++  
++  res = dbus_g_proxy_call_with_timeout (manager->priv->sd_proxy,
++					"Suspend",
++					INT_MAX,
++					&error,
++                                        G_TYPE_BOOLEAN, TRUE, /* interactive */
++                                        G_TYPE_INVALID,
++					G_TYPE_INVALID);
++  if (res == FALSE) {
++    g_warning ("Could not make DBUS call: %s",
++	       error->message);
++    g_error_free (error);
++    return FALSE;
++  }
++}
++
+ gchar *
+ gsm_systemd_get_current_session_type (GsmSystemd *manager)
+ {
+diff --git a/mate-session/gsm-systemd.h b/mate-session/gsm-systemd.h
+index 8e886ba..e0e21c4 100644
+--- a/mate-session/gsm-systemd.h
++++ b/mate-session/gsm-systemd.h
+@@ -89,10 +89,18 @@ enum _GsmSystemdError {
+ 
+ gboolean         gsm_systemd_can_restart     (GsmSystemd *manager);
+ 
++gboolean         gsm_systemd_can_hibernate     (GsmSystemd *manager);
++
++gboolean         gsm_systemd_can_suspend     (GsmSystemd *manager);
++
+ void             gsm_systemd_attempt_stop    (GsmSystemd *manager);
+ 
+ void             gsm_systemd_attempt_restart (GsmSystemd *manager);
+ 
++void             gsm_systemd_attempt_hibernate (GsmSystemd *manager);
++
++void             gsm_systemd_attempt_suspend (GsmSystemd *manager);
++
+ void             gsm_systemd_set_session_idle (GsmSystemd *manager,
+                                                   gboolean       is_idle);
+ 
diff --git a/community/mate-session-manager/mate-session-manager.install b/community/mate-session-manager/mate-session-manager.install
new file mode 100644
index 000000000..b30edffe9
--- /dev/null
+++ b/community/mate-session-manager/mate-session-manager.install
@@ -0,0 +1,12 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor    
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/mate-settings-daemon/PKGBUILD b/community/mate-settings-daemon/PKGBUILD
new file mode 100644
index 000000000..307271771
--- /dev/null
+++ b/community/mate-settings-daemon/PKGBUILD
@@ -0,0 +1,70 @@
+# $Id: PKGBUILD 105085 2014-01-31 11:55:11Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgbase=mate-settings-daemon
+pkgname=("${pkgbase}-pulseaudio" "${pkgbase}-gstreamer")
+pkgver=1.6.2
+pkgrel=6
+pkgdesc="The MATE Settings daemon"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus-glib' 'dconf' 'fontconfig' 'gstreamer0.10-base' 'gtk2'
+         'libcanberra-pulse' 'libmatekbd' 'libnotify' 'libxt' 'mate-desktop'
+         'nss' 'polkit' 'pulseaudio-alsa')
+makedepends=('mate-common' 'perl-xml-parser')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('76c50bddcffd6b0415b058c828784bcd11c034ee')
+install=${pkgbase}.install
+
+build() {
+    cd "${srcdir}"
+    cp -a ${pkgbase}-${pkgver}{,-gstreamer}
+    
+    # build for pulseaudio 
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgbase} \
+        --sysconfdir=/etc \
+        --enable-polkit \
+        --enable-pulse \
+        --disable-gstreamer \
+        --disable-static
+    make
+    
+    # build for gstreamer
+    cd "${srcdir}/${pkgbase}-${pkgver}-gstreamer"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgbase} \
+        --sysconfdir=/etc \
+        --enable-polkit \
+        --enable-gstreamer \
+        --disable-pulse \
+        --disable-static
+    make
+}
+
+package_mate-settings-daemon-pulseaudio() {
+    groups=('mate')
+    pkgdesc="The MATE Settings daemon (pulseaudio)"
+    depends=('dbus-glib' 'dconf' 'fontconfig' 'gtk2' 'libcanberra-pulse'
+            'libmatekbd' 'libnotify' 'libxt' 'mate-desktop' 'nss' 'polkit'
+            'pulseaudio-alsa')
+    conflicts=("${pkgbase}-gstreamer" 'mate-media-gstreamer')
+    provides=("${pkgbase}")
+    replaces=("${pkgbase}")
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
+
+package_mate-settings-daemon-gstreamer() {
+    pkgdesc="The MATE Settings daemon (GStreamer)"
+    depends=('dbus-glib' 'dconf' 'fontconfig' 'gstreamer0.10-base' 'gtk2'
+             'libmatekbd' 'libnotify' 'libxt' 'mate-desktop' 'nss' 'polkit')
+    conflicts=("${pkgbase}-pulseaudio" 'mate-media-pulseaudio')
+    provides=("${pkgbase}")             
+    cd "${srcdir}/${pkgbase}-${pkgver}-gstreamer"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-settings-daemon/mate-settings-daemon.install b/community/mate-settings-daemon/mate-settings-daemon.install
new file mode 100644
index 000000000..d6813b0f7
--- /dev/null
+++ b/community/mate-settings-daemon/mate-settings-daemon.install
@@ -0,0 +1,12 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/mate
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/mate-system-monitor/PKGBUILD b/community/mate-system-monitor/PKGBUILD
new file mode 100644
index 000000000..9741948c9
--- /dev/null
+++ b/community/mate-system-monitor/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 104271 2014-01-16 18:56:12Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com>
+
+pkgname=mate-system-monitor
+pkgver=1.6.1
+pkgrel=6
+pkgdesc="A system monitor for MATE"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dconf' 'dbus-glib' 'glibmm' 'gtk2' 'gtkmm' 'libgtop' 'libmatewnck' 'librsvg'
+         'mate-icon-theme')
+makedepends=('docbook2x' 'mate-common' 'mate-doc-utils' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('84b6e8f3557bdadada026aeb349f6e9e90b59c6a')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgname} \
+        --localstatedir=/var \
+        --disable-static \
+        --disable-scrollkeeper
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-system-monitor/mate-system-monitor.install b/community/mate-system-monitor/mate-system-monitor.install
new file mode 100644
index 000000000..3a06d45b9
--- /dev/null
+++ b/community/mate-system-monitor/mate-system-monitor.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/mate-system-tools/PKGBUILD b/community/mate-system-tools/PKGBUILD
new file mode 100644
index 000000000..c3301560e
--- /dev/null
+++ b/community/mate-system-tools/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 105370 2014-02-06 05:24:16Z bisson $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=mate-system-tools
+pkgver=1.6.0
+pkgrel=9
+pkgdesc="Suite of tools for MATE to simplify configuring workstations."
+url="http://mate-desktop.org/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dconf' 'gtk2' 'liboobs' 'mate-polkit' 'system-tools-backends'
+         'wireless_tools')
+makedepends=('mate-common' 'mate-doc-utils' 'mate-file-manager' 'perl-xml-parser')
+optdepends=('ntp: Automatic time synchronisation.'
+            'mate-file-manager: provides Caja Shares extension')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('89d53c22171f6181ad4fb89387d4fa3300bb27b2')
+install=${pkgname}.install
+
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    # Modify the groups for Arch
+    #  - https://wiki.archlinux.org/index.php/Users_and_Groups
+    #  - https://wiki.archlinux.org/index.php/Systemd#Supplementary_information
+    #  - https://bbs.archlinux.org/viewtopic.php?pid=1183332
+    # Desktop user
+    sed -i 's/cdrom,floppy,dialout,tape,dip,adm,plugdev,fax,audio,scanner,fuse,video/adm,log,sys,users,uucp/' src/users/user-profiles.conf.in
+    # Administrator
+    sed -i 's/cdrom,floppy,dialout,tape,dip,adm,plugdev,fax,audio,scanner,fuse,admin,sambashare,lpadmin,video/adm,disk,locate,log,sys,users,uucp,wheel/' src/users/user-profiles.conf.in
+}
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./autogen.sh \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --disable-scrollkeeper \
+        LIBS="-lm" # Required for MATE 1.6 but can be removed in MATE 1.7/1.8
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-system-tools/mate-system-tools.install b/community/mate-system-tools/mate-system-tools.install
new file mode 100644
index 000000000..d6813b0f7
--- /dev/null
+++ b/community/mate-system-tools/mate-system-tools.install
@@ -0,0 +1,12 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/mate
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/mate-terminal/PKGBUILD b/community/mate-terminal/PKGBUILD
new file mode 100644
index 000000000..8787ef79a
--- /dev/null
+++ b/community/mate-terminal/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 104248 2014-01-16 18:05:57Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com>
+
+pkgname=mate-terminal
+pkgver=1.6.2
+pkgrel=1
+pkgdesc="The MATE Terminal Emulator"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus' 'dconf' 'gtk2' 'libsm' 'mate-desktop' 'vte')
+makedepends=('docbook2x' 'mate-common' 'mate-doc-utils' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('951c006c5ee31da0d0da1ebad4d1e6648fe0e41b')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --disable-static \
+        --disable-scrollkeeper
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-terminal/mate-terminal.install b/community/mate-terminal/mate-terminal.install
new file mode 100644
index 000000000..3a06d45b9
--- /dev/null
+++ b/community/mate-terminal/mate-terminal.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/mate-text-editor/PKGBUILD b/community/mate-text-editor/PKGBUILD
new file mode 100644
index 000000000..2c384761e
--- /dev/null
+++ b/community/mate-text-editor/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 104251 2014-01-16 18:10:47Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com>
+
+pkgname=mate-text-editor
+pkgver=1.6.2
+pkgrel=1
+pkgdesc="A powerful text editor for MATE"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('desktop-file-utils' 'enchant' 'gtk2' 'gtksourceview2' 'iso-codes'
+         'libsm' 'mate-desktop' 'mate-file-manager' 'python2' 'python2-gobject2'
+         'pygtksourceview2')
+makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('64e34ae5724608fcc5adff195515b74e1e3e5bd6')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    PYTHON=/usr/bin/python2 ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib \
+        --enable-python \
+        --disable-scrollkeeper
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/ogmrip-libre/ogmrip.install b/community/mate-text-editor/mate-text-editor.install
index 660593cf5..ed73415a4 100644
--- a/libre/ogmrip-libre/ogmrip.install
+++ b/community/mate-text-editor/mate-text-editor.install
@@ -1,4 +1,5 @@
 post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
     update-desktop-database -q
 }
 
diff --git a/community/mate-text-editor/pluma_gettext_fix.diff b/community/mate-text-editor/pluma_gettext_fix.diff
new file mode 100644
index 000000000..b6829835a
--- /dev/null
+++ b/community/mate-text-editor/pluma_gettext_fix.diff
@@ -0,0 +1,18 @@
+diff --git a/configure.ac b/configure.ac
+index be832f7..485c574 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -155,10 +155,11 @@ dnl Gettext stuff.
+ dnl ================================================================
+ 
+ IT_PROG_INTLTOOL([0.40.0])
+-AC_SUBST([GETTEXT_PACKAGE], [pluma])
++GETTEXT_PACKAGE=pluma
++AC_SUBST([GETTEXT_PACKAGE])
+ AM_GNU_GETTEXT_VERSION([0.17])
+ AM_GLIB_GNU_GETTEXT
+-AC_DEFINE([GETTEXT_PACKAGE],[PACKAGE_TARNAME], [Define to the gettext package name.])
++AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext package name])
+ 
+ dnl ================================================================
+ dnl Use gvfs metadata or the old xml file store.
diff --git a/community/mate-user-share/PKGBUILD b/community/mate-user-share/PKGBUILD
new file mode 100644
index 000000000..ccf81858d
--- /dev/null
+++ b/community/mate-user-share/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 105613 2014-02-11 18:11:20Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=mate-user-share
+pkgver=1.6.1
+pkgrel=7
+pkgdesc="User level public file sharing via WebDAV."
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('apache' 'dbus-glib' 'dconf' 'libunique' 'mod_dnssd')
+makedepends=('libcanberra' 'libnotify' 'mate-common' 'mate-doc-utils'
+             'mate-file-manager' 'perl-xml-parser')
+options=('!emptydirs')
+install=${pkgname}.install
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz"
+        "https://github.com/mate-desktop/mate-user-share/commit/7a0305478295e9e7c284372677a4cbc382444482.diff")
+sha1sums=('83f161dee79ea0ae4345c54a5b1339f673f68e8f'
+          'ffa10ae69f5edf08d605418182f3c5bc975eb3cf')
+
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    # do not use download dir for incoming bluetooth downloads if mate-bluetooth isn't installed
+    patch -Np1 -i "${srcdir}/7a0305478295e9e7c284372677a4cbc382444482.diff"
+}
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    PYTHON=/usr/bin/python2 ./configure \
+        --prefix=/usr \
+        --libexec=/usr/lib/${pkgname} \
+        --sysconfdir=/etc \
+        --disable-static \
+        --disable-scrollkeeper \
+        --disable-bluetooth
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make  DESTDIR="${pkgdir}" install
+    rm -f "${pkgdir}/usr/share/mate-user-share/dav_user_2.0.conf"
+}
diff --git a/community/mate-user-share/mate-user-share.install b/community/mate-user-share/mate-user-share.install
new file mode 100644
index 000000000..7af080f58
--- /dev/null
+++ b/community/mate-user-share/mate-user-share.install
@@ -0,0 +1,12 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/mate-utils/422504e251442ca9921c4218151cffb6548280e6.diff b/community/mate-utils/422504e251442ca9921c4218151cffb6548280e6.diff
new file mode 100644
index 000000000..fd71dbb57
--- /dev/null
+++ b/community/mate-utils/422504e251442ca9921c4218151cffb6548280e6.diff
@@ -0,0 +1,62 @@
+diff --git a/mate-screenshot/mate-screenshot.c b/mate-screenshot/mate-screenshot.c
+index 63ec5d9..6510f7f 100644
+--- a/mate-screenshot/mate-screenshot.c
++++ b/mate-screenshot/mate-screenshot.c
+@@ -809,13 +809,14 @@ enum
+ finish_prepare_screenshot (char *initial_uri, GdkWindow *window, GdkRectangle *rectangle)
+ {  
+   ScreenshotDialog *dialog;
++  gboolean include_mask = (!take_window_shot && !take_area_shot);
+ 
+   /* always disable window border for full-desktop or selected-area screenshots */
+   if (!take_window_shot)
+-    screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, FALSE);
++    screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, FALSE, include_mask);
+   else
+     {
+-      screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, include_border);
++      screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, include_border, include_mask);
+ 
+       switch (border_effect[0])
+         {
+diff --git a/mate-screenshot/screenshot-utils.c b/mate-screenshot/screenshot-utils.c
+index b41ae4b..faed676 100644
+--- a/mate-screenshot/screenshot-utils.c
++++ b/mate-screenshot/screenshot-utils.c
+@@ -670,7 +670,8 @@
+ screenshot_get_pixbuf (GdkWindow    *window,
+                        GdkRectangle *rectangle,
+                        gboolean      include_pointer,
+-                       gboolean      include_border)
++                       gboolean      include_border,
++                       gboolean      include_mask)
+ {
+   GdkWindow *root;
+   GdkPixbuf *screenshot;
+@@ -738,7 +739,11 @@
+                                              x_orig, y_orig, 0, 0,
+                                              width, height);
+ 
+-  mask_monitors (screenshot, root);
++  /*
++   * Masking currently only works properly with full-screen shots
++   */
++  if (include_mask)
++      mask_monitors (screenshot, root);
+ 
+ #ifdef HAVE_X11_EXTENSIONS_SHAPE_H
+   if (include_border)
+diff --git a/mate-screenshot/screenshot-utils.h b/mate-screenshot/screenshot-utils.h
+index 0af2ba3..5404bde 100644
+--- a/mate-screenshot/screenshot-utils.h
++++ b/mate-screenshot/screenshot-utils.h
+@@ -36,7 +36,8 @@ gboolean   screenshot_select_area         (int *px,
+ GdkPixbuf *screenshot_get_pixbuf          (GdkWindow *win,
+                                            GdkRectangle *rectangle,
+                                            gboolean include_pointer,
+-                                           gboolean include_border);
++                                           gboolean include_border,
++                                           gboolean include_mask);
+ 
+ void       screenshot_show_error_dialog   (GtkWindow   *parent,
+                                            const gchar *message,
diff --git a/community/mate-utils/PKGBUILD b/community/mate-utils/PKGBUILD
new file mode 100644
index 000000000..66b8ddd6c
--- /dev/null
+++ b/community/mate-utils/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 104256 2014-01-16 18:15:52Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
+
+pkgname=mate-utils
+pkgver=1.6.1
+pkgrel=1
+pkgdesc="Common MATE utilities for viewing disk usage, logs and fonts, taking screenshots, managing dictionaries and searching files"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk2' 'libcanberra' 'libgtop' 'libsm' 'mate-desktop' 'zlib')
+makedepends=('mate-common' 'mate-doc-utils' 'mate-panel' 'perl-xml-parser'
+             'rarian')
+optdepends=('mate-panel: Look up words in dictionaries from the panel')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('c765c53cd4b279155d30ed057a78a584e5b2addc')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgname} \
+        --sysconfdir=/etc \
+        --disable-static \
+        --disable-scrollkeeper
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-utils/mate-utils.install b/community/mate-utils/mate-utils.install
new file mode 100644
index 000000000..d6813b0f7
--- /dev/null
+++ b/community/mate-utils/mate-utils.install
@@ -0,0 +1,12 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/mate
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/mate-utils/patch.diff b/community/mate-utils/patch.diff
new file mode 100644
index 000000000..6971c219e
--- /dev/null
+++ b/community/mate-utils/patch.diff
@@ -0,0 +1,34 @@
+From a59fda7d006b856ac5982750f2ffdefd24191be0 Mon Sep 17 00:00:00 2001
+From: Stefano Karapetsas <stefano@karapetsas.com>
+Date: Thu, 11 Jul 2013 11:14:38 +0000
+Subject: mate-screenshot: Fix save path selection
+
+Closes #32
+https://github.com/mate-desktop/mate-utils/issues/32
+
+Fix from https://bugzilla.gnome.org/show_bug.cgi?id=579232
+---
+diff --git a/mate-screenshot/screenshot-dialog.c b/mate-screenshot/screenshot-dialog.c
+index bcac343..b5b2be5 100644
+--- a/mate-screenshot/screenshot-dialog.c
++++ b/mate-screenshot/screenshot-dialog.c
+@@ -338,7 +338,7 @@ screenshot_dialog_get_uri (ScreenshotDialog *dialog)
+   gchar *uri, *file, *tmp;
+   GError *error;
+ 
+-  folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog->save_widget));
++  folder = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog->save_widget));
+   file_name = gtk_entry_get_text (GTK_ENTRY (dialog->filename_entry));
+ 
+   error = NULL;
+@@ -366,7 +366,7 @@ screenshot_dialog_get_uri (ScreenshotDialog *dialog)
+ char *
+ screenshot_dialog_get_folder (ScreenshotDialog *dialog)
+ {
+-  return gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog->save_widget));
++  return gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog->save_widget));
+ }
+ 
+ GdkPixbuf *
+--
+cgit 
diff --git a/community/mate-window-manager/PKGBUILD b/community/mate-window-manager/PKGBUILD
new file mode 100644
index 000000000..fa498c203
--- /dev/null
+++ b/community/mate-window-manager/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 104189 2014-01-16 16:18:35Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com>
+
+pkgname=mate-window-manager
+pkgver=1.6.2
+pkgrel=4
+pkgdesc="A window manager for MATE"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk2' 'libcanberra' 'libgtop' 'libice' 'libsm' 'libxt' 'mate-desktop'
+         'mate-dialogs' 'startup-notification')
+makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+options=('!emptydirs')
+groups=('mate')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('dce0fd1953d75b4aad88d4818228eac677fb1d7b')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --enable-startup-notification \
+        --disable-static \
+        --disable-scrollkeeper
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-window-manager/mate-window-manager.install b/community/mate-window-manager/mate-window-manager.install
new file mode 100644
index 000000000..3a06d45b9
--- /dev/null
+++ b/community/mate-window-manager/mate-window-manager.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/mayavi/PKGBUILD b/community/mayavi/PKGBUILD
index df6dee64e..81832fa16 100644
--- a/community/mayavi/PKGBUILD
+++ b/community/mayavi/PKGBUILD
@@ -1,25 +1,28 @@
-# $Id: PKGBUILD 96082 2013-08-20 06:32:22Z lcarlier $
+# $Id: PKGBUILD 105092 2014-01-31 12:47:02Z aginiewicz $
 # Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
 
 pkgname=mayavi
-pkgver=4.3.0
-pkgrel=2
+pkgver=4.3.1
+pkgrel=1
 pkgdesc="A 3-dimensional visualizer of scientific data"
 arch=('i686' 'x86_64')
 url="https://github.com/enthought/mayavi"
 license=('BSD')
-depends=('ipython2' 'vtk' 'python2-envisage' 'wxpython')
+depends=('ipython2' 'vtk' 'python2-envisage' 'wxpython2.8')
 makedepends=('python2-setuptools' 'python2-sphinx' 'xorg-server-xvfb' 'twisted')
 replaces=('python2-mayavi')
 provides=('python2-mayavi')
 options=(!emptydirs)
 
 source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/mayavi/archive/${pkgver}.tar.gz")
-md5sums=('7708d85a77c427c8dfbeb914630d31be')
+md5sums=('93677c77f0a835537bd210c493740b03')
 
 build() {
   cd "$srcdir"/mayavi-$pkgver
 
+  # force selection of wxpython 2.8
+  sed -e "s/wxversion.ensureMinimal('2.8')/wxversion.select('2.8')/g" -i $(find . -name '*.py')
+
   # Use python2-sphinx provided sphinx-build2
   sed -i -e 's/sphinx-build/sphinx-build2/' docs/Makefile*
 
diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD
index 583cda1f5..5dd6cffc7 100644
--- a/community/mediainfo-gui/PKGBUILD
+++ b/community/mediainfo-gui/PKGBUILD
@@ -1,34 +1,33 @@
-# $Id: PKGBUILD 101328 2013-11-22 17:36:49Z spupykin $
+# $Id: PKGBUILD 103859 2014-01-12 19:04:40Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: hydro <hydro@freenet.de>
 
 pkgname=mediainfo-gui
 pkgver=0.7.65
-pkgrel=1
+pkgrel=6
 pkgdesc="GUI for mediainfo"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mediainfo.sourceforge.net"
 license=('GPL')
-depends=('libmediainfo' 'wxgtk')
-makedepends=('libtool' 'automake' 'autoconf')
+depends=('libmediainfo' 'wxgtk' 'libsm' 'desktop-file-utils')
 install=mediainfo-gui.install
 source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2)
 md5sums=('19d7992a7d0cba0f5f731f993e8c537c')
 
 build() {
-  cd $srcdir/MediaInfo/Project/GNU/GUI
+  cd MediaInfo/Project/GNU/GUI
   sh ./autogen
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/MediaInfo/Project/GNU/GUI
-  make DESTDIR=$pkgdir install
-  install -D -m 644 $srcdir/MediaInfo/Source/Resource/Image/MediaInfo.png \
-                    $pkgdir/usr/share/icons/hicolor/128x128/apps/mediainfo.png
-  install -D -m 644 $srcdir/MediaInfo/Source/Resource/Image/MediaInfo.png \
-                    $pkgdir/usr/share/pixmaps/mediainfo-gui.png
-  install -D -m 644 $srcdir/MediaInfo/Project/GNU/GUI/mediainfo-gui.desktop \
-                    $pkgdir/usr/share/applications/mediainfo-gui.desktop
+  cd MediaInfo/Project/GNU/GUI
+  make DESTDIR="$pkgdir" install
+  install -D -m 644 "$srcdir/MediaInfo/Source/Resource/Image/MediaInfo.png" \
+                    "$pkgdir/usr/share/icons/hicolor/128x128/apps/mediainfo.png"
+  install -D -m 644 "$srcdir/MediaInfo/Source/Resource/Image/MediaInfo.png" \
+                    "$pkgdir/usr/share/pixmaps/mediainfo-gui.png"
+  install -D -m 644 "$srcdir/MediaInfo/Project/GNU/GUI/mediainfo-gui.desktop" \
+                    "$pkgdir/usr/share/applications/mediainfo-gui.desktop"
 }
diff --git a/community/mediainfo-gui/mediainfo-gui.install b/community/mediainfo-gui/mediainfo-gui.install
index 28d8f7815..678df2aef 100644
--- a/community/mediainfo-gui/mediainfo-gui.install
+++ b/community/mediainfo-gui/mediainfo-gui.install
@@ -1,5 +1,6 @@
 post_install() {
   which gtk-update-icon-cache >/dev/null && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/community/medit/PKGBUILD b/community/medit/PKGBUILD
index 58bcc33f5..89a9d4dd9 100644
--- a/community/medit/PKGBUILD
+++ b/community/medit/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 75884 2012-09-04 15:31:23Z spupykin $
+# $Id: PKGBUILD 104071 2014-01-15 09:49:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=medit
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK text editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mooedit.sourceforge.net"
 options=('!emptydirs')
 license=('GPL')
-depends=('pygtk' 'libxml2' 'pcre' 'libsm' 'python2' 'gtk2' 'gcc-libs')
+depends=('pygtk' 'libxml2' 'pcre' 'libsm' 'python2' 'gtk2' 'gcc-libs' 'gamin')
 optdepends=('ctags' 'vte: terminal emulator')
 makedepends=(pkgconfig perlxml intltool gcc-objc)
 install=medit.install
@@ -20,7 +20,7 @@ md5sums=('9ea0d396a3bf3ee6ce220365bffb7358')
 build() {
   cd $srcdir/medit-$pkgver
   export PYTHON=/usr/bin/python2
-  [ -f Makefile ] || ./configure --prefix=/usr
+  [ -f Makefile ] || ./configure --prefix=/usr --with-fam
   make
 }
 
diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD
index b00f681b3..e7284e3c4 100644
--- a/community/mednafen/PKGBUILD
+++ b/community/mednafen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97157 2013-09-14 14:43:41Z jsteel $
+# $Id: PKGBUILD 104369 2014-01-19 16:29:32Z bpiotrowski $
 # Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
 # Contributor: megadriver <megadriver at gmx dot com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -7,9 +7,9 @@
 # Contributor: Hans-Kristian Arntzen <maister@archlinux.us>
 
 pkgname=mednafen
-pkgver=0.9.32
+pkgver=0.9.32.1
 _pkgver=$pkgver-wip
-pkgrel=1
+pkgrel=2
 pkgdesc="A command-line multi-system gaming emulator"
 url="http://mednafen.sourceforge.net"
 license=('GPL')
@@ -19,7 +19,7 @@ makedepends=('mesa' 'glu')
 replaces=('mednafen-wip')
 install="$pkgname.install"
 source=(http://downloads.sourceforge.net/mednafen/$pkgname-$_pkgver.tar.bz2)
-md5sums=('ffdf4f4bb4498df38e6aaaf316be40f5')
+md5sums=('ee9edeece554755e762a6d140fad21e9')
 
 build() {
   cd "$srcdir"/$pkgname
diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD
index eabe06044..851acdae4 100644
--- a/community/megaglest/PKGBUILD
+++ b/community/megaglest/PKGBUILD
@@ -1,38 +1,38 @@
-# $Id: PKGBUILD 101155 2013-11-18 15:23:29Z svenstaro $
+# $Id: PKGBUILD 105859 2014-02-16 14:27:59Z bpiotrowski $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
 
 pkgname=megaglest
-pkgver=3.9.0
-_pkgver=3.9.0
-pkgrel=1
-pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world."
+pkgver=3.9.2
+pkgrel=2
+pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/megaglest/"
 license=('GPL3')
 depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua51' 'icu' 'ftgl' 'glew'
-'libircclient' 'miniupnpc' 'wxgtk' 'glu')
-makedepends=('ftjam' 'cmake' 'mesa')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${_pkgver}.tar.xz")
-md5sums=('b599e8a71376640bc0d191d6c92c9073')
+'libircclient' 'miniupnpc' 'wxgtk2.8' 'glu')
+makedepends=('ftjam' 'cmake' 'mesa' 'git')
+source=("git+https://github.com/MegaGlest/megaglest-source.git#tag=${pkgver}")
+md5sums=('SKIP')
 
 build() {
-  cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/
+  cd megaglest-source
 
   [[ -d build ]] && rm -r build
   mkdir build && cd build
 
   cmake .. \
-    -DWANT_SVN_STAMP=OFF \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_BUILD_TYPE=Release \
+    -DWANT_GIT_STAMP=0 \
+    -DwxWidgets_CONFIG_EXECUTABLE="/usr/bin/wx-config-2.8" \
+    -DwxWidgets_wxrc_EXECUTABLE="/usr/bin/wxrc-2.8"
   make
 }
 
 package() {
-  cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/
+  cd megaglest-source/build
 
-  cd build
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/community/minetest/PKGBUILD b/community/minetest/PKGBUILD
index f54209b0f..f5a6bea71 100644
--- a/community/minetest/PKGBUILD
+++ b/community/minetest/PKGBUILD
@@ -1,21 +1,30 @@
-# $Id: PKGBUILD 101392 2013-11-24 18:49:30Z lcarlier $
+# $Id: PKGBUILD 104382 2014-01-19 17:35:53Z bgyorgy $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Konsta Kokkinen <kray@tsundere.fi>
 
 pkgname=minetest
-pkgver=0.4.8
-pkgrel=1
+pkgver=0.4.9
+pkgrel=2
 pkgdesc='An Infiniminer/Minecraft inspired game'
 arch=('i686' 'x86_64')
 url='http://minetest.net/'
 license=('GPL')
-depends=('sqlite' 'libxxf86vm' 'openal' 'libvorbis' 'curl' 'irrlicht' 'hicolor-icon-theme')
+depends=('sqlite' 'openal' 'libvorbis' 'curl' 'irrlicht' 'hicolor-icon-theme')
 makedepends=('cmake')
 install=minetest.install
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}/tarball/${pkgver}
-	${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver})
-md5sums=('90dd6a3c2c587a3e55df59ba4458cd65'
-         'df88f4a28ad10e9ab8c445bd28a504e2')
+	${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver}
+        optional-opengles.patch)
+md5sums=('2a2629befa86ef72924bcc0e489730c7'
+         '097666443a71988cf2d41ebd9be31ec9'
+         '116de5a70e13dbd0e2419fc7fb59ee3b')
+
+prepare() {
+  cd "$srcdir"/minetest-minetest-*
+
+  # Fix rendering with NVIDIA driver (FS#37918)
+  patch -Np1 -i "$srcdir"/optional-opengles.patch
+}
 
 build() {
   cd "$srcdir"/minetest-minetest-*
diff --git a/community/minetest/optional-opengles.patch b/community/minetest/optional-opengles.patch
new file mode 100644
index 000000000..2481b42c5
--- /dev/null
+++ b/community/minetest/optional-opengles.patch
@@ -0,0 +1,30 @@
+From 160e2b7b7d1edc7630db0eb0ebbd796a66aab89a Mon Sep 17 00:00:00 2001
+From: Sfan5 <sfan5@live.de>
+Date: Fri, 3 Jan 2014 10:17:01 +0100
+Subject: [PATCH] Add option to link to OpenGL ES, fixes #1051
+
+---
+ src/CMakeLists.txt | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 90f5867..6418b3b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -170,7 +170,12 @@ endif()
+ 
+ find_package(Sqlite3 REQUIRED)
+ find_package(Json REQUIRED)
+-find_package(OpenGLES2)
++
++option(ENABLE_GLES "Enable OpenGL ES support" 0)
++mark_as_advanced(ENABLE_GLES)
++if(ENABLE_GLES)
++	find_package(OpenGLES2)
++endif(ENABLE_GLES)
+ 
+ if(USE_FREETYPE)
+ 	find_package(Freetype REQUIRED)
+-- 
+1.8.5.1
+
diff --git a/community/mingw-w64-binutils/PKGBUILD b/community/mingw-w64-binutils/PKGBUILD
index 469ced17d..28ba518b0 100644
--- a/community/mingw-w64-binutils/PKGBUILD
+++ b/community/mingw-w64-binutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 101172 2013-11-18 17:41:58Z spupykin $
+# $Id: PKGBUILD 104091 2014-01-15 13:38:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com
 
@@ -6,7 +6,7 @@ _targets="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-binutils
 pkgver=2.23.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Cross binutils for the MinGW-w64 cross-compiler"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/binutils"
@@ -15,8 +15,10 @@ groups=('mingw-w64-toolchain' 'mingw-w64')
 depends=('zlib')
 options=('!libtool' '!emptydirs')
 source=("http://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz"
-        "binutils-2.23.2-texinfo-5.0.patch.txt")
+	"windres.patch::https://bugs.archlinux.org/task/38111?getfile=11313"
+	"binutils-2.23.2-texinfo-5.0.patch.txt")
 md5sums=('cda9dcc08c86ff2fd3f27e4adb250f6f'
+         '2b653bdfd2ddda9ff36b4695b2d9bc8c'
          '34e439ce23213a91e2af872dfbb5094c')
 
 prepare() {
@@ -24,6 +26,7 @@ prepare() {
   # http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935
   # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542
   patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch.txt
+  patch -p1 -i ${srcdir}/windres.patch
 
   #do not install libiberty
   sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
diff --git a/community/mingw-w64-gcc/PKGBUILD b/community/mingw-w64-gcc/PKGBUILD
index 999fc9584..c89263432 100644
--- a/community/mingw-w64-gcc/PKGBUILD
+++ b/community/mingw-w64-gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 101210 2013-11-19 19:03:58Z spupykin $
+# $Id: PKGBUILD 105245 2014-02-03 11:09:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com
 
@@ -6,7 +6,7 @@ _targets="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-gcc
 pkgver=4.8.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Cross GCC for the MinGW-w64 cross-compiler"
 arch=('i686' 'x86_64')
 url="http://gcc.gnu.org"
@@ -46,7 +46,7 @@ build() {
   for _target in ${_targets}; do
     mkdir -p ${srcdir}/gcc-build-${_target} && cd ${srcdir}/gcc-build-${_target}
 
-    ${srcdir}/gcc-${pkgver}/configure --prefix=/usr \
+    ${srcdir}/gcc-${pkgver}/configure --prefix=/usr --libexecdir=/usr/lib \
         --target=${_target} \
         --enable-languages=c,lto,c++,objc,obj-c++,fortran,ada \
         --enable-shared --enable-static \
@@ -65,8 +65,11 @@ package() {
     make DESTDIR=${pkgdir} install
     ${_target}-strip ${pkgdir}/usr/${_target}/lib/*.dll
     strip ${pkgdir}/usr/bin/${_target}-*
-    strip ${pkgdir}/usr/libexec/gcc/${_target}/${pkgver}/{cc1*,collect2,gnat1,f951,lto*}
+    strip ${pkgdir}/usr/lib/gcc/${_target}/${pkgver}/{cc1*,collect2,gnat1,f951,lto*}
     ln -s ${_target}-gcc $pkgdir/usr/bin/${_target}-cc
+    # mv dlls
+    mkdir -p $pkgdir/usr/${_target}/bin/
+    mv $pkgdir/usr/${_target}/lib/*.dll $pkgdir/usr/${_target}/bin/
   done
   strip ${pkgdir}/usr/bin/*
   # remove unnecessary files
diff --git a/community/minicom/PKGBUILD b/community/minicom/PKGBUILD
index 2b8e06a05..ff398e1ab 100644
--- a/community/minicom/PKGBUILD
+++ b/community/minicom/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 102303 2013-12-07 19:40:29Z giovanni $
+# $Id: PKGBUILD 103744 2014-01-11 10:02:16Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Denis Tikhomirov <dvtikhomirov@gmail.com>
 
 pkgname=minicom
-pkgver=2.6.2
-pkgrel=2
+pkgver=2.7
+pkgrel=1
 pkgdesc="A serial communication program"
 arch=('i686'  'x86_64' 'mips64el')
 url="http://alioth.debian.org/projects/minicom/"
@@ -14,8 +14,8 @@ license=('GPL')
 depends=('bash')
 optdepends=('lrzsz: for xmodem, ymodem and zmodem file transfer protocols')
 backup=('etc/minirc.dfl')
-source=("https://alioth.debian.org/frs/download.php/file/3869/${pkgname}-${pkgver}.tar.gz")
-md5sums=('203c56c4b447f45e2301b0cc4e83da3c')
+source=("https://alioth.debian.org/frs/download.php/file/3977/${pkgname}-${pkgver}.tar.gz")
+md5sums=('7044ca3e291268c33294f171d426dc2d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/minitube/PKGBUILD b/community/minitube/PKGBUILD
index ce08d5b60..1abb5e533 100644
--- a/community/minitube/PKGBUILD
+++ b/community/minitube/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 97545 2013-09-23 20:44:05Z speps $
+# $Id: PKGBUILD 103290 2014-01-02 16:08:02Z speps $
 # Maintainer : speps <speps at aur dot archlinux dot org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=minitube
-pkgver=2.1.3
+pkgver=2.1.5
 pkgrel=1
 pkgdesc="A native YouTube client in Qt. Watch YouTube videos without Flash Player"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,8 +11,16 @@ url='http://flavio.tordini.org/minitube'
 license=('GPL3')
 depends=('phonon')
 install="$pkgname.install"
-source=("http://flavio.tordini.org/files/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('b43df4358de2e170d7e22370b39bd1ec')
+source=("http://flavio.tordini.org/files/$pkgname/$pkgname-$pkgver.tar.gz"
+        "$pkgname-missing-locale.patch")
+md5sums=('e52933f3ae5200f83aa39ac71ac13bfb'
+         '70cdaa1d3df700cf90243be5a0d55443')
+
+prepare() {
+  cd $pkgname
+  # remove missing translations
+  patch -p1 -i ../${source[1]}
+}
 
 build() {
   cd $pkgname
diff --git a/community/minitube/minitube-missing-locale.patch b/community/minitube/minitube-missing-locale.patch
new file mode 100644
index 000000000..5288120e4
--- /dev/null
+++ b/community/minitube/minitube-missing-locale.patch
@@ -0,0 +1,12 @@
+diff -aur minitube/locale/locale.pri minitube.patched/locale/locale.pri
+--- minitube/locale/locale.pri	2013-12-19 00:37:27.000000000 +0100
++++ minitube.patched/locale/locale.pri	2013-12-25 00:03:56.783943888 +0100
+@@ -4,7 +4,7 @@
+ DEPENDPATH += $$PWD
+ 
+ # ls -1 *.ts | tr '\n' ' '
+-TRANSLATIONS += ar.ts ast.ts be.ts bg_BG.ts ca.ts ca_ES.ts cs_CZ.ts da.ts de_DE.ts el.ts en.ts es.ts es_AR.ts es_ES.ts es_MX.ts fi.ts fi_FI.ts fr.ts gl.ts he_IL.ts hr.ts hu.ts ia.ts it.ts ja_JP.ts ky.ts ms_MY.ts nb.ts nl.ts pl.ts pl_PL.ts pt.ts pt_BR.ts ro.ts ru.ts sk.ts sl.ts sq.ts sv_SE.ts tr.ts uk.ts uk_UA.ts vi.ts zh_CN.ts zh_TW.ts 
++TRANSLATIONS += ar.ts ast.ts bg_BG.ts ca.ts cs_CZ.ts da.ts de_DE.ts el.ts en.ts es.ts es_AR.ts es_ES.ts fi.ts fi_FI.ts fr.ts gl.ts he_IL.ts hu.ts ia.ts it.ts ja_JP.ts ky.ts ms_MY.ts nb.ts nl.ts pl.ts pl_PL.ts pt_BR.ts ro.ts ru.ts sk.ts sl.ts sq.ts sv_SE.ts tr.ts uk.ts uk_UA.ts zh_CN.ts zh_TW.ts 
+ isEmpty(QMAKE_LRELEASE) {
+     win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
+     else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
diff --git a/community/miniupnpc/PKGBUILD b/community/miniupnpc/PKGBUILD
index 17f29a89f..3210b2b51 100644
--- a/community/miniupnpc/PKGBUILD
+++ b/community/miniupnpc/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 99404 2013-10-28 11:22:46Z tredaelli $
+# $Id: PKGBUILD 105735 2014-02-14 15:45:18Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Florian Loitsch <archlinux@florian.loitsch.com>
 pkgname=miniupnpc
-pkgver=1.8
-pkgrel=2
+pkgver=1.9
+pkgrel=1
 pkgdesc="A small UPnP client library/tool to access Internet Gateway Devices"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://miniupnp.free.fr"
 license=('BSD')
 depends=('sh')
 source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz")
-md5sums=('065bf20a20ebe605c675b7a5aaef340a')
+sha256sums=('2923e453e880bb949e3d4da9f83dd3cb6f08946d35de0b864d0339cf70934464')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/miniupnpd/PKGBUILD b/community/miniupnpd/PKGBUILD
index d1c7bd977..2cdd0c529 100644
--- a/community/miniupnpd/PKGBUILD
+++ b/community/miniupnpd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 99009 2013-10-22 08:59:17Z tredaelli $
+# $Id: PKGBUILD 104540 2014-01-22 15:25:26Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: fauno <fauno@parabola.nu>
 pkgname=miniupnpd
-pkgver=1.8.20130730
+pkgver=1.8.20131216
 pkgrel=1
 pkgdesc="Lightweight UPnP IGD daemon"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('libnfnetlink' 'iptables' 'net-tools' 'util-linux')
 makedepends=('lsb-release')
 source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz"
         miniupnpd.systemd)
-sha256sums=('919ab6ec719959fff9bdae3f1d83f6a39c43fa4a6d3f2c48077f43729d3d7d43'
+sha256sums=('f016e21d84ecce7887cef4ec74354afe465412022c013473f3ac3e33ca51a8a7'
             '2707d028f28fbb28c3a9d13605c9c738e9628f828e22288a8a1492ac93f9ad7c')
 
 build() {
diff --git a/community/mixxx/PKGBUILD b/community/mixxx/PKGBUILD
index 397cb6834..60051646e 100644
--- a/community/mixxx/PKGBUILD
+++ b/community/mixxx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92429 2013-06-05 10:08:34Z lfleischer $
+# $Id: PKGBUILD 103651 2014-01-08 19:58:08Z bgyorgy $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com>
 # Contributor: Ryan Coyner <rcoyner@gmail.com>
@@ -6,20 +6,20 @@
 
 pkgname=mixxx
 pkgver=1.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Free, open source software for digital DJ'ing."
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.mixxx.org'
 license=('GPL')
 depends=('fftw' 'libid3tag' 'libmad' 'libogg' 'libshout' 'libsndfile' 'portaudio' 'portmidi'
-         'taglib' 'qtwebkit' 'vamp-plugin-sdk' 'libusbx' 'protobuf')
+         'taglib' 'qtwebkit' 'vamp-plugin-sdk' 'libusbx' 'protobuf' 'faad2' 'libmp4v2')
 makedepends=('mesa' 'scons' 'libshout' 'glu')
 source=("http://downloads.mixxx.org/${pkgname}-${pkgver}/${pkgname}-${pkgver}-src.tar.gz")
 md5sums=('89ee8ba60824919d8dd1194287bda259')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  scons qtdir=/usr/lib/qt4 prefix=/usr
+  scons qtdir=/usr/lib/qt4 prefix=/usr faad=1
 }
 
 package() {
diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD
index bc0926a8a..1be8c6ef8 100644
--- a/community/mksh/PKGBUILD
+++ b/community/mksh/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 95881 2013-08-18 08:58:15Z ttoepper $
+# $Id: PKGBUILD 103962 2014-01-14 07:07:04Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Daniel Hommel <dhommel@gmail.com>
 
 pkgname=mksh
-_pkgver=R48b
-pkgver=48.1
+_pkgver=R49
+pkgver=49
 pkgrel=1
 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh'
 url='https://www.mirbsd.org/mksh.htm'
@@ -14,8 +14,8 @@ depends=('gcc-libs')
 install=mksh.install
 source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$_pkgver.tgz"
         'https://www.mirbsd.org/TaC-mksh.txt')
-md5sums=('ab9baa6b5a4de9d0e6a3ce9957c18da0'
-         '0601617f19e1c0423cbdb8599e16eec3')
+md5sums=('e8c205cac72c3dc8540bbc3897421422'
+         'fd6f7b5eb01280b0110af736d6188f34')
 
 check() {
   cd "$srcdir/$pkgname"
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index 66ca7bc61..ef0b90c05 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102260 2013-12-07 10:36:45Z bpiotrowski $
+# $Id: PKGBUILD 104064 2014-01-15 03:02:11Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -6,8 +6,8 @@
 # Contributor: Alec Thomas
 
 pkgname=mongodb
-pkgver=2.4.8
-pkgrel=2
+pkgver=2.4.9
+pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.mongodb.org'
@@ -65,8 +65,8 @@ package() {
     --sharedclient \
     --full \
     --prefix="$pkgdir/usr"
-    # --use-system-v8
     # --use-sasl-client
+    # --use-system-v8
 
   install -Dm644 "$srcdir/mongodb.conf" "$pkgdir/etc/mongodb.conf"
   install -Dm644 "$srcdir/mongodb.service" "$pkgdir/usr/lib/systemd/system/mongodb.service"
@@ -74,7 +74,7 @@ package() {
   install -dm755 "$pkgdir/var/log/mongodb"
 }
 
-sha512sums=('33202f101d00c796253c5fd333242ce2c5399352bf325e0af1df92d9c291d7a768bbed56f7b7fccfaa3cea2385cec941bd05cb27a635ca034485bd39ef4129a1'
+sha512sums=('f9991b30eebdc13e04b553ea9c133f73cb7c0d034ae94e6293a28f3c40e8c93d3e63257e20ff801dfd586a22c95ca52551da8517d0e25534dda62f3ed650aa23'
             '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c'
             '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9'
             'e709f76fa71a10d6b72d2eeae65d715e0a0a7e6cb93704114f22db8662d7102de77bd1e6706049351beb159aaa04548cfe4b14fe6ee498a166c5ad54c8275f84')
diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD
index 2baa5ab47..511c9e03a 100644
--- a/community/motion/PKGBUILD
+++ b/community/motion/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94894 2013-08-01 06:55:12Z bpiotrowski $
+# $Id: PKGBUILD 103886 2014-01-13 10:05:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=motion
 pkgver=3.2.12
-pkgrel=10
+pkgrel=11
 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -11,6 +11,7 @@ url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
 depends=('libjpeg' 'v4l-utils' 'ffmpeg-compat')
 backup=('etc/motion/motion.conf')
 options=('!makeflags')
+install=motion.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
 	motion.service
 	motion.tmpfiles
diff --git a/community/motion/motion.install b/community/motion/motion.install
new file mode 100644
index 000000000..f36054033
--- /dev/null
+++ b/community/motion/motion.install
@@ -0,0 +1,7 @@
+post_install() {
+  systemd-tmpfiles --create motion.conf
+}
+
+post_upgrade() {
+  systemd-tmpfiles --create motion.conf
+}
diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD
index ba55e1e7a..0756bc09a 100644
--- a/community/mpv/PKGBUILD
+++ b/community/mpv/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 103194 2013-12-29 19:04:18Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 105849 2014-02-16 12:44:18Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Eivind Uggedal <eivind@uggedal.com>
 
 pkgname=mpv
-pkgver=0.3.0
+pkgver=0.3.5
 pkgrel=1
 pkgdesc='Video player based on MPlayer/mplayer2'
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ makedepends=('mesa' 'python-docutils' 'waf')
 options=('!emptydirs' '!buildflags')
 install=mpv.install
 source=(https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz)
-md5sums=('47c9ea5fc8cf0c15cc6a15631bfbc770')
+md5sums=('b3fdd3e70d6e53a14c3b1881343d2aca')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/mumble/PKGBUILD b/community/mumble/PKGBUILD
index 3d1a80521..91a551b6c 100644
--- a/community/mumble/PKGBUILD
+++ b/community/mumble/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99917 2013-10-31 02:27:44Z allan $
+# $Id: PKGBUILD 105350 2014-02-05 20:04:46Z bluewind $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lauri Niskanen <ape@ape3000.com>
 # Contributor: Sebastian.Salich@gmx.de
@@ -8,18 +8,18 @@
 # to the depends and delete "no-g15" in the configure line below
 
 pkgname=mumble
-pkgver=1.2.4
-pkgrel=2
+pkgver=1.2.5
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="A voice chat application similar to TeamSpeak"
 license=('BSD')
 depends=('qt4' 'speex' 'lsb-release' 'libxi' 'avahi' 'libsndfile' 'protobuf' 'libpulse' 'opus')
-makedepends=('boost' 'mesa' 'avahi')
+makedepends=('boost' 'mesa')
 #optdepends=('portaudio: for portaudio back-end' 'g15daemon: G15 Keyboard support')
 install=mumble.install
 url="http://mumble.sourceforge.net/"
 source=("http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz")
-md5sums=('49bc6abea78f9c54298934c2c28a7c7c')
+md5sums=('084ca44252bd5356b68af555f81ba6f6')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -53,5 +53,6 @@ package() {
   install -m755 -d $pkgdir/usr/share/man/man1
   install -m644 -D ./man/mum* $pkgdir/usr/share/man/man1/
   install -m644 -D ./icons/mumble.svg $pkgdir/usr/share/icons/hicolor/scalable/apps/mumble.svg
+  install -m644 -D ./LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
 # vim: sw=2:ts=2 et:
diff --git a/community/mumble/mumble11x.desktop b/community/mumble/mumble11x.desktop
deleted file mode 100644
index 5dba0d0c6..000000000
--- a/community/mumble/mumble11x.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Mumble (1.1.X compatible)
-GenericName=Voice Chat
-Comment=Voice chat program (compatible with Mumble 1.1.X)
-Exec=mumble11x
-Icon=mumble
-Terminal=false
-Type=Application
-StartupNotify=false
-Categories=Network;Chat;Qt;
-Version=1.2.1
diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD
index 709e2c14b..6788ab8ab 100644
--- a/community/mupdf/PKGBUILD
+++ b/community/mupdf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99335 2013-10-27 10:47:47Z bpiotrowski $
+# $Id: PKGBUILD 105051 2014-01-30 18:29:49Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
@@ -7,23 +7,34 @@
 
 pkgname=mupdf
 pkgver=1.3
-pkgrel=7
+pkgrel=8
 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')
+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'
-            '41a3b6df736f971e91c066e73afac286eec8fa37af244a55df52e8b173646f42')
+        mupdf-1.3-system-libcurl.patch
+        mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch)
+md5sums=('fe53c2a56ebd7759f5f965bc4ff66359'
+         '6d11387e9bb9897f6f1ecc3956f8e2d4'
+         'f4d785b28f711e12d4a078ce9b3ed8f5')
 
 prepare() {
   cd $pkgname-$pkgver-source
   rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec}
-  patch -Np1 -i ../mupdf-1.3-system-libcurl.patch
+  patch -p1 -i ../mupdf-1.3-system-libcurl.patch
+  patch -p1 -i ../mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch
+
+  cd platform/debian
+  sed -i -e 's/mupdf.xpm/mupdf/' \
+    -e 's/application\/x-pdf/application\/x-pdf/' \
+    -e 's/mupdf-select-file/mupdf/' \
+    -e 's/^$/NoDisplay=true/' \
+    mupdf.desktop
 }
 
 build() {
@@ -42,11 +53,6 @@ package() {
   rm "$pkgdir"/usr/bin/mupdf-x11
 
   cd platform/debian
-  sed -i -e 's/mupdf.xpm/mupdf/' \
-         -e 's/application\/x-pdf/application\/x-pdf/' \
-         -e 's/mupdf-select-file/mupdf/' \
-         -e 's/^$/NoDisplay=true/' \
-            mupdf.desktop
   install -Dm644 mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
   install -Dm644 mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
 
diff --git a/community/mupdf/mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch b/community/mupdf/mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch
new file mode 100644
index 000000000..bfe86f320
--- /dev/null
+++ b/community/mupdf/mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch
@@ -0,0 +1,135 @@
+From 60dabde18d7fe12b19da8b509bdfee9cc886aafc Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Simon=20B=C3=BCnzli?= <zeniko@gmail.com>
+Date: Thu, 16 Jan 2014 22:04:51 +0100
+Subject: [PATCH] Bug 694957: fix stack buffer overflow in xps_parse_color
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+xps_parse_color happily reads more than FZ_MAX_COLORS values out of a
+ContextColor array which overflows the passed in samples array.
+Limiting the number of allowed samples to FZ_MAX_COLORS and make sure
+to use that constant for all callers fixes the problem.
+
+Thanks to Jean-Jamil Khalifé for reporting and investigating the issue
+and providing a sample exploit file.
+---
+ source/xps/xps-common.c   |   22 ++++++++++++++--------
+ source/xps/xps-glyphs.c   |    2 +-
+ source/xps/xps-gradient.c |    2 +-
+ source/xps/xps-path.c     |    2 +-
+ 4 files changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/source/xps/xps-common.c b/source/xps/xps-common.c
+index b780f42..32a30ba 100644
+--- a/source/xps/xps-common.c
++++ b/source/xps/xps-common.c
+@@ -89,7 +89,7 @@ xps_begin_opacity(xps_document *doc, const fz_matrix *ctm, const fz_rect *area,
+ 		if (scb_color_att)
+ 		{
+ 			fz_colorspace *colorspace;
+-			float samples[32];
++			float samples[FZ_MAX_COLORS];
+ 			xps_parse_color(doc, base_uri, scb_color_att, &colorspace, samples);
+ 			opacity = opacity * samples[0];
+ 		}
+@@ -208,12 +208,13 @@ void
+ xps_parse_color(xps_document *doc, char *base_uri, char *string,
+ 		fz_colorspace **csp, float *samples)
+ {
++	fz_context *ctx = doc->ctx;
+ 	char *p;
+ 	int i, n;
+ 	char buf[1024];
+ 	char *profile;
+ 
+-	*csp = fz_device_rgb(doc->ctx);
++	*csp = fz_device_rgb(ctx);
+ 
+ 	samples[0] = 1;
+ 	samples[1] = 0;
+@@ -259,7 +260,7 @@ xps_parse_color(xps_document *doc, char *base_uri, char *string,
+ 		profile = strchr(buf, ' ');
+ 		if (!profile)
+ 		{
+-			fz_warn(doc->ctx, "cannot find icc profile uri in '%s'", string);
++			fz_warn(ctx, "cannot find icc profile uri in '%s'", string);
+ 			return;
+ 		}
+ 
+@@ -267,12 +268,17 @@ xps_parse_color(xps_document *doc, char *base_uri, char *string,
+ 		p = strchr(profile, ' ');
+ 		if (!p)
+ 		{
+-			fz_warn(doc->ctx, "cannot find component values in '%s'", profile);
++			fz_warn(ctx, "cannot find component values in '%s'", profile);
+ 			return;
+ 		}
+ 
+ 		*p++ = 0;
+ 		n = count_commas(p) + 1;
++		if (n > FZ_MAX_COLORS)
++		{
++			fz_warn(ctx, "ignoring %d color components (max %d allowed)", n - FZ_MAX_COLORS, FZ_MAX_COLORS);
++			n = FZ_MAX_COLORS;
++		}
+ 		i = 0;
+ 		while (i < n)
+ 		{
+@@ -292,10 +298,10 @@ xps_parse_color(xps_document *doc, char *base_uri, char *string,
+ 		/* TODO: load ICC profile */
+ 		switch (n)
+ 		{
+-		case 2: *csp = fz_device_gray(doc->ctx); break;
+-		case 4: *csp = fz_device_rgb(doc->ctx); break;
+-		case 5: *csp = fz_device_cmyk(doc->ctx); break;
+-		default: *csp = fz_device_gray(doc->ctx); break;
++		case 2: *csp = fz_device_gray(ctx); break;
++		case 4: *csp = fz_device_rgb(ctx); break;
++		case 5: *csp = fz_device_cmyk(ctx); break;
++		default: *csp = fz_device_gray(ctx); break;
+ 		}
+ 	}
+ }
+diff --git a/source/xps/xps-glyphs.c b/source/xps/xps-glyphs.c
+index b26e18d..e621257 100644
+--- a/source/xps/xps-glyphs.c
++++ b/source/xps/xps-glyphs.c
+@@ -590,7 +590,7 @@ xps_parse_glyphs(xps_document *doc, const fz_matrix *ctm,
+ 
+ 	if (fill_att)
+ 	{
+-		float samples[32];
++		float samples[FZ_MAX_COLORS];
+ 		fz_colorspace *colorspace;
+ 
+ 		xps_parse_color(doc, base_uri, fill_att, &colorspace, samples);
+diff --git a/source/xps/xps-gradient.c b/source/xps/xps-gradient.c
+index 7d03f89..76188e9 100644
+--- a/source/xps/xps-gradient.c
++++ b/source/xps/xps-gradient.c
+@@ -39,7 +39,7 @@ xps_parse_gradient_stops(xps_document *doc, char *base_uri, fz_xml *node,
+ 	struct stop *stops, int maxcount)
+ {
+ 	fz_colorspace *colorspace;
+-	float sample[8];
++	float sample[FZ_MAX_COLORS];
+ 	float rgb[3];
+ 	int before, after;
+ 	int count;
+diff --git a/source/xps/xps-path.c b/source/xps/xps-path.c
+index b97ee17..ea84a81 100644
+--- a/source/xps/xps-path.c
++++ b/source/xps/xps-path.c
+@@ -826,7 +826,7 @@ xps_parse_path(xps_document *doc, const fz_matrix *ctm, char *base_uri, xps_reso
+ 
+ 	fz_stroke_state *stroke = NULL;
+ 	fz_matrix transform;
+-	float samples[32];
++	float samples[FZ_MAX_COLORS];
+ 	fz_colorspace *colorspace;
+ 	fz_path *path = NULL;
+ 	fz_path *stroke_path = NULL;
+-- 
+1.7.9.5
+
diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD
index c6a901b1c..c138c9e0c 100644
--- a/community/murmur/PKGBUILD
+++ b/community/murmur/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 92168 2013-06-02 06:18:50Z svenstaro $
+# $Id: PKGBUILD 105352 2014-02-05 20:05:30Z bluewind $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com>
 # Contributor: Malte Rabenseifner <malte@zearan.de> 
 
 pkgname=murmur
-pkgver=1.2.4
+pkgver=1.2.5
 pkgrel=1
 pkgdesc="The voice chat application server for Mumble"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ install="murmur.install"
 source=("http://downloads.sourceforge.net/mumble/mumble-$pkgver.tar.gz"
         "murmur.dbus.conf"
         "murmur.service")
-md5sums=('49bc6abea78f9c54298934c2c28a7c7c'
+md5sums=('084ca44252bd5356b68af555f81ba6f6'
          'eddea4cdbd0bde4b960a67e16b5d5478'
          'd27a9adcd7561859e7b033046729bc0e')
 
@@ -44,6 +44,7 @@ package() {
   install -Dm644 README ${pkgdir}/usr/share/doc/murmur/README
   install -Dm644 man/murmurd.1 ${pkgdir}/usr/share/man/man1/murmurd.1
   install -Dm644 ${srcdir}/murmur.service ${pkgdir}/usr/lib/systemd/system/murmur.service
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
 
 # vim: sw=2:ts=2 et:
diff --git a/community/murmur/murmur.install b/community/murmur/murmur.install
index fecd2c2ca..13eec8094 100644
--- a/community/murmur/murmur.install
+++ b/community/murmur/murmur.install
@@ -5,7 +5,7 @@ post_install() {
     chown -R murmur:murmur /var/lib/murmur
 
     echo "You might have to reload dbus before launching murmur:"
-    echo "    systemctl reload bus"
+    echo "    systemctl reload dbus"
     echo "Don't forget to set the superuser password:"
     echo "    murmurd -ini /etc/murmur.ini -supw <your-password>"
 }
diff --git a/community/mxml/PKGBUILD b/community/mxml/PKGBUILD
index e77fc55e0..bafb7bfe0 100644
--- a/community/mxml/PKGBUILD
+++ b/community/mxml/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 100340 2013-11-02 11:47:21Z spupykin $
+# $Id: PKGBUILD 104562 2014-01-22 19:43:48Z 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=2
+pkgver=2.8
+pkgrel=1
 pkgdesc="A small XML parsing library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.minixml.org/"
 license=('LGPL')
 source=("http://www.msweet.org/files/project3/$pkgname-$pkgver.tar.gz")
-md5sums=('76f2ae49bf0f5745d5cb5d9507774dc9')
+md5sums=('d85ee6d30de053581242c4a86e79a5d2')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD
index c138d9f78..c53db1f37 100644
--- a/community/myodbc/PKGBUILD
+++ b/community/myodbc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 100622 2013-11-06 14:11:22Z spupykin $
+# $Id: PKGBUILD 105021 2014-01-30 10:11:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=myodbc
 pkgver=5.2.6
-pkgrel=1
+pkgrel=2
 pkgdesc="ODBC driver/connector for mariadb"
 arch=(i686 x86_64 mips64el)
 url="http://dev.mysql.com/downloads/connector/odbc/"
@@ -20,7 +20,7 @@ build() {
   export LDFLAGS="-lpthread -ldl"
   cmake -G "Unix Makefiles" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMYSQLCLIENT_LIB_NAME=libmysqlclient_r.so \
+    -DMYSQLCLIENT_LIB_NAME=libmysqlclient_r.a \
     -DWITH_UNIXODBC=1 .
   make
 }
diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD
index 211d5ae20..0756f17cd 100644
--- a/community/mythplugins/PKGBUILD
+++ b/community/mythplugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102726 2013-12-17 20:17:14Z bgyorgy $
+# $Id: PKGBUILD 104372 2014-01-19 16:29:36Z bpiotrowski $
 # 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=4
+pkgrel=5
 epoch=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mythtv.org"
diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD
index 6e98f7a9d..b93f3ccb4 100644
--- a/community/nbd/PKGBUILD
+++ b/community/nbd/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 101824 2013-12-02 01:03:13Z svenstaro $
+# $Id: PKGBUILD 104524 2014-01-22 10:03:16Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Christian Hesse <mail@eworm.de>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
 
 pkgname=nbd
-pkgver=3.5
+pkgver=3.7
 pkgrel=1
 pkgdesc="tools for network block devices, allowing you to use remote block devices over TCP/IP"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://nbd.sourceforge.net"
 license=('GPL')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz
 	config nbd.service)
 backup=('etc/nbd-server/config')
 depends=('glib2')
 install=nbd.install
-md5sums=('d89133bf9b681c17ed9d09a21b19f1ee'
+md5sums=('09a17fd19596b6908bff8b7db74141fc'
          '2d05d426b8c2708d5f8a0d028fcbae05'
          '5d1acc143018117174f79eff15afa038')
 
@@ -36,5 +36,5 @@ package() {
   install -D -m644 "${srcdir}"/config "${pkgdir}"/etc/nbd-server/config
   install -D -m644 "${srcdir}"/nbd.service "${pkgdir}"/usr/lib/systemd/system/nbd.service
 
-  install -D -m644 README "${pkgdir}"/usr/share/doc/nbd/README
+  install -D -m644 doc/README "${pkgdir}"/usr/share/doc/nbd/README
 }
diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD
index c5e9f43be..f3088ab79 100644
--- a/community/nemiver/PKGBUILD
+++ b/community/nemiver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99921 2013-10-31 02:29:03Z allan $
+# $Id: PKGBUILD 103761 2014-01-11 12:23:34Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: jordz <jordz@archlinux.us>
 
 pkgname=nemiver
-pkgver=0.9.4
-pkgrel=5
+pkgver=0.9.5
+pkgrel=1
 pkgdesc='C/C++ debugger for GNOME'
 arch=('x86_64' 'i686' 'mips64el')
 license=('GPL')
@@ -14,7 +14,7 @@ depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'gsettings-desk
 makedepends=('boost' 'intltool' 'itstool')
 source=("http://ftp.acc.umu.se/pub/GNOME/sources/nemiver/0.9/$pkgname-$pkgver.tar.xz")
 options=('!emptydirs')
-sha256sums=('12cc5b6092ba720f2524f59928bee4d736e5e5ffeeffb6fd06f99695f17d683f')
+sha256sums=('33590e3964092cabb629a6ba8415786b054702063a944eca5fe4156048baf8d9')
 
 build() {	
   cd "$pkgname-$pkgver"
diff --git a/community/netcf/PKGBUILD b/community/netcf/PKGBUILD
index 1d2140e30..45c436094 100644
--- a/community/netcf/PKGBUILD
+++ b/community/netcf/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99926 2013-10-31 02:30:50Z allan $
+# $Id: PKGBUILD 103922 2014-01-13 17:16:55Z andyrtr $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Aurélien Wailly <aurelien.wailly@gmail.com>
 
 pkgname=netcf
 pkgver=0.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A library for configuring network interfaces"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
diff --git a/community/newsbeuter/PKGBUILD b/community/newsbeuter/PKGBUILD
index 95bd03b15..3d8bbbed6 100644
--- a/community/newsbeuter/PKGBUILD
+++ b/community/newsbeuter/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99927 2013-10-31 02:31:10Z allan $
+# $Id: PKGBUILD 104865 2014-01-27 18:21:58Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Sven Pfleiderer <pfleidi@roothausen.de>
 
 pkgname=newsbeuter
-pkgver=2.7
+pkgver=2.8
 pkgrel=1
 pkgdesc="A RSS feed reader for the text console with special Podcast support"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ optdepends=('ruby')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://www.newsbeuter.org/downloads/$pkgname-$pkgver.tar.gz)
-sha256sums=('e6720da7ac3f5ea83bc39cd17bd61ccf458b7167f5a17170ae32c7b6e8ff903a')
+sha256sums=('c872a068ec7792680b11126230dff240dee72acdab8f153016ba5ef83c8a7804')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/newsbeuter/newsbeuter.changelog b/community/newsbeuter/newsbeuter.changelog
index 6d5db9fd3..357a7fe19 100644
--- a/community/newsbeuter/newsbeuter.changelog
+++ b/community/newsbeuter/newsbeuter.changelog
@@ -1,3 +1,6 @@
+2014-01-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* newsbeuter 2.8-1
+
 2013-09-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* newsbeuter 2.7-1
 
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index 9f0fdc398..ac0c3aa6b 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 102927 2013-12-24 08:43:25Z bpiotrowski $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 105603 2014-02-11 17:09:36Z bpiotrowski $
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Maintainer: Sébastien Luttringer
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
 
 pkgname=nginx
-pkgver=1.4.4
-pkgrel=2
+pkgver=1.4.5
+pkgrel=1
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://nginx.org'
@@ -22,75 +22,78 @@ backup=('etc/nginx/fastcgi.conf'
         'etc/nginx/uwsgi_params'
         'etc/nginx/win-utf'
         'etc/logrotate.d/nginx')
-install=install
-source=("http://nginx.org/download/nginx-$pkgver.tar.gz"
-        'service'
-        'logrotate')
-sha256sums=('7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9'
-            '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b'
-            '272907d3213d69dac3bd6024d6d150caa23cb67d4f121e4171f34ba5581f9e98')
+install=nginx.install
+source=($url/download/nginx-$pkgver.tar.gz
+        service
+        logrotate)
+md5sums=('1a635e9543570f0c881b8ec9db0c6898'
+         'ce9a06bcaf66ec4a3c4eb59b636e0dfd'
+         '3441ce77cdd1aab6f0ab7e212698a8a7')
 
 build() {
-    cd $pkgname-$pkgver
-    ./configure \
-        --prefix=/etc/nginx \
-        --conf-path=/etc/nginx/nginx.conf \
-        --sbin-path=/usr/bin/nginx \
-        --pid-path=/run/nginx.pid \
-        --lock-path=/run/lock/nginx.lock \
-        --user=http \
-        --group=http \
-        --http-log-path=/var/log/nginx/access.log \
-        --error-log-path=stderr \
-        --http-client-body-temp-path=/var/lib/nginx/client-body \
-        --http-proxy-temp-path=/var/lib/nginx/proxy \
-        --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
-        --http-scgi-temp-path=/var/lib/nginx/scgi \
-        --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
-        --with-imap \
-        --with-imap_ssl_module \
-        --with-ipv6 \
-        --with-pcre-jit \
-        --with-file-aio \
-        --with-http_dav_module \
-        --with-http_gunzip_module \
-        --with-http_gzip_static_module \
-        --with-http_realip_module \
-        --with-http_spdy_module \
-        --with-http_ssl_module \
-        --with-http_stub_status_module \
-        --with-http_addition_module \
-        --with-http_degradation_module \
-        --with-http_flv_module \
-        --with-http_mp4_module \
-        --with-http_secure_link_module \
-        --with-http_sub_module
-    make
+  cd $pkgname-$pkgver
+  ./configure \
+    --prefix=/etc/nginx \
+    --conf-path=/etc/nginx/nginx.conf \
+    --sbin-path=/usr/bin/nginx \
+    --pid-path=/run/nginx.pid \
+    --lock-path=/run/lock/nginx.lock \
+    --user=http \
+    --group=http \
+    --http-log-path=/var/log/nginx/access.log \
+    --error-log-path=stderr \
+    --http-client-body-temp-path=/var/lib/nginx/client-body \
+    --http-proxy-temp-path=/var/lib/nginx/proxy \
+    --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
+    --http-scgi-temp-path=/var/lib/nginx/scgi \
+    --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
+    --with-imap \
+    --with-imap_ssl_module \
+    --with-ipv6 \
+    --with-pcre-jit \
+    --with-file-aio \
+    --with-http_dav_module \
+    --with-http_gunzip_module \
+    --with-http_gzip_static_module \
+    --with-http_realip_module \
+    --with-http_spdy_module \
+    --with-http_ssl_module \
+    --with-http_stub_status_module \
+    --with-http_addition_module \
+    --with-http_degradation_module \
+    --with-http_flv_module \
+    --with-http_mp4_module \
+    --with-http_secure_link_module \
+    --with-http_sub_module
+
+  make
 }
 
 package() {
-    cd $pkgname-$pkgver
-    make DESTDIR="$pkgdir" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  sed -e 's|\<user\s\+\w\+;|user html;|g' \
+    -e '44s|html|/usr/share/nginx/html|' \
+    -e '54s|html|/usr/share/nginx/html|' \
+    -i "$pkgdir"/etc/nginx/nginx.conf
+
+  rm "$pkgdir"/etc/nginx/*.default
 
-    sed -e 's|\<user\s\+\w\+;|user html;|g' \
-        -e '44s|html|/usr/share/nginx/html|' \
-        -e '54s|html|/usr/share/nginx/html|' \
-        -i "$pkgdir"/etc/nginx/nginx.conf
-    rm "$pkgdir"/etc/nginx/*.default
+  install -d "$pkgdir"/var/lib/nginx
+  install -dm700 "$pkgdir"/var/lib/nginx/proxy
 
-    install -d "$pkgdir"/var/lib/nginx
-    install -dm700 "$pkgdir"/var/lib/nginx/proxy
+  chmod 750 "$pkgdir"/var/log/nginx
+  chown http:log "$pkgdir"/var/log/nginx
 
-    chmod 750 "$pkgdir"/var/log/nginx
-    chown http:log "$pkgdir"/var/log/nginx
+  install -d "$pkgdir"/usr/share/nginx
+  mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx
 
-    install -d "$pkgdir"/usr/share/nginx
-    mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx
+  install -Dm644 ../logrotate "$pkgdir"/etc/logrotate.d/nginx
+  install -Dm644 ../service "$pkgdir"/usr/lib/systemd/system/nginx.service
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 
-    install -Dm644 "$srcdir"/logrotate "$pkgdir"/etc/logrotate.d/nginx
-    install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service
-    install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-    rmdir "$pkgdir/run"
+  rmdir "$pkgdir/run"
 }
 
-# vim:set ts=4 sw=4 et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/nginx/install b/community/nginx/nginx.install
index 7c4adf14b..7c4adf14b 100644
--- a/community/nginx/install
+++ b/community/nginx/nginx.install
diff --git a/community/ngspice/PKGBUILD b/community/ngspice/PKGBUILD
index eb18ee629..83426b31f 100644
--- a/community/ngspice/PKGBUILD
+++ b/community/ngspice/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 88376 2013-04-16 21:34:14Z kkeen $
+# $Id: PKGBUILD 103872 2014-01-12 23:58:12Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: Jason Taylor <jftaylor21@gmail.com>
 # Contributor: Luis Henrique <lmello.009@gmail.com>
 
 pkgname=ngspice
-pkgver=25
-pkgrel=2
+pkgver=26
+pkgrel=1
 pkgdesc='Mixed-level/Mixed-signal circuit simulator based on Spice3f5, Ciber1b1, and Xspice.'
 url='http://ngspice.sourceforge.net'
 license=('BSD')
@@ -14,8 +14,8 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('libxaw' 'libedit' 'gcc-libs')
 source=("http://downloads.sourceforge.net/project/$pkgname/ng-spice-rework/$pkgver/$pkgname-$pkgver.tar.gz"
         "http://downloads.sourceforge.net/project/$pkgname/ng-spice-rework/$pkgver/$pkgname-doc-$pkgver.tar.gz")
-sha1sums=('745c3c32385b7d5c808836e393fe7699f8568860'
-          'db7a1de7553b4e0d454e6c99b4371677eaf130aa')
+sha1sums=('7c043c604b61f76ad1941defeeac6331efc48ad2'
+          'bc163a47a2b4987c4617c47b132a30ffdc674350')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index b03915e39..308c12d92 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102828 2013-12-21 15:00:24Z bpiotrowski $
+# $Id: PKGBUILD 104706 2014-01-24 17:24:23Z 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.24
+pkgver=0.10.25
 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=('610cd733186842cb7f554336d6851a61b2d3d956050d62e49fa359a47640377a')
+sha256sums=('46eef3b9d5475a2081dc2b2f7cf1f4c3a56824d1fc9b04e7ed1d7a88e8f6b36f')
 
 prepare() {
   cd node-v$pkgver
diff --git a/community/noise/PKGBUILD b/community/noise/PKGBUILD
index e34eb3062..02dc4a26e 100644
--- a/community/noise/PKGBUILD
+++ b/community/noise/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99111 2013-10-24 13:13:25Z alucryd $
+# $Id: PKGBUILD 103644 2014-01-08 17:47:17Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd at gmail dot com>
 
 pkgname=noise
 pkgver=0.2.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple, fast, and good looking music player"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/noise"
diff --git a/community/nomacs/PKGBUILD b/community/nomacs/PKGBUILD
index ce73fca29..a409ba992 100644
--- a/community/nomacs/PKGBUILD
+++ b/community/nomacs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102808 2013-12-20 19:30:50Z speps $
+# $Id: PKGBUILD 104801 2014-01-26 12:17:39Z andyrtr $
 # Maintainer: speps <speps at aur dot archlinux dot org>
 
 pkgname=nomacs
 pkgver=1.6.2
-pkgrel=1
+pkgrel=3
 pkgdesc="A Qt image viewer"
 arch=(i686 x86_64)
 url="http://www.nomacs.org/"
diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD
index 934655ccc..341454437 100644
--- a/community/notion/PKGBUILD
+++ b/community/notion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 102889 2013-12-23 13:28:04Z spupykin $
+# $Id: PKGBUILD 105675 2014-02-13 14:16:41Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com
 # Contributor: aunoor
 
 pkgname=notion
-pkgver=20131223
+pkgver=20140213
 pkgrel=1
 pkgdesc="Tabbed tiling, window manager. Fork of Ion3"
 url="http://sourceforge.net/projects/notion/"
@@ -17,73 +17,43 @@ makedepends=('git' 'pkgconfig' 'libxinerama' 'libxrandr'
 provides=('libtu' 'libextl')
 changelog=ChangleLog
 source=("notion::git://notion.git.sourceforge.net/gitroot/notion/notion"
-	"$pkgname-libtu::git://notion.git.sourceforge.net/gitroot/notion/libtu"
-	"$pkgname-libextl::git://notion.git.sourceforge.net/gitroot/notion/libextl"
-	"$pkgname-notion-doc::git://notion.git.sourceforge.net/gitroot/notion/notion-doc"
-	"$pkgname-mod_xinerama::git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama"
-	"$pkgname-mod_xkbevents::git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents"
-	"$pkgname-mod_xrandr::git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr"
-	"$pkgname-mod_notionflux::git://notion.git.sourceforge.net/gitroot/notion/mod_notionflux"
-	"$pkgname-contrib::git://notion.git.sourceforge.net/gitroot/notion/contrib")
+	"notion-doc::git://notion.git.sourceforge.net/gitroot/notion/notion-doc")
 md5sums=('SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
          'SKIP')
 
 prepare() {
   cd ${srcdir}
-  sed -i 's|lua5.2|lua|g' notion/system-autodetect.mk
-  sed -i 's|luac5.2|luac|g' notion{,-libextl}/system-autodetect.mk
-
-  for i in libextl libtu mod_xinerama mod_xkbevents mod_xrandr mod_notionflux notion-doc; do
-    mkdir -p ${srcdir}/notion/$i
-    cp -r ${srcdir}/$pkgname-$i/* ${srcdir}/notion/$i/
-  done
-
-  cd ${srcdir}/notion
-  sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \
-	-e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \
-	-e 's/^\(LUA_DIR=\).*$/\1\/usr/' \
-	-e 's/^\(X11_PREFIX=\).*/\1\/usr/' \
-	-e 's|/usr/local|/usr|g' \
-	-i system-autodetect.mk
+  cat >notion/build/lua-detect.mk <<EOF
+LUA_VERSION := 5.2
+LUA_LIBS     := $(pkg-config --libs lua)
+LUA_INCLUDES := $(pkg-config --cflags lua)
+LUA          := $(which lua)
+LUAC         := $(which luac)
+EOF
 }
 
 build() {
   cd ${srcdir}/notion
-
-  # build notion
-  make INCLUDES=-I${srcdir}/notion PREFIX=/usr ETCDIR=/etc/notion
-
-  # build doc and modules
-  for i in mod_xinerama mod_xkbevents mod_xrandr; do
-    (cd $i && make -j1 TOPDIR=.. all)
-  done
-
-  (cd notion-doc && make -j1 TOPDIR=.. all)
+  make INCLUDES=-I${srcdir}/notion LUA_VERSION=5.2 PREFIX=/usr ETCDIR=/etc/notion
+  cd ${srcdir}/notion-doc
+  make -j1 all
 }
 
 package() {
   cd ${srcdir}/notion
+  make DESTDIR=$pkgdir LUA_VERSION=5.2 PREFIX=/usr ETCDIR=/etc/notion install
 
-  # notion
-  make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install
+  # doc
+  cd ${srcdir}/notion-doc
+  make PREFIX=$pkgdir/usr ETCDIR=/etc/notion install
 
   # modules
-  for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do
-    (cd $i && make  PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion TOPDIR=.. install)
-  done
   cp ${srcdir}/notion/mod_xinerama/*.lua $pkgdir/etc/notion/
   cp ${srcdir}/notion/mod_xkbevents/*.lua $pkgdir/etc/notion/
 
   # contrib
   mkdir -p $pkgdir/usr/share/notion/contrib
-  cp -a ${srcdir}/$pkgname-contrib/* $pkgdir/usr/share/notion/contrib
+  cp -a ${srcdir}/$pkgname/contrib/* $pkgdir/usr/share/notion/contrib
 
   # license
   install -Dm0644 LICENSE ${pkgdir}/usr/share/licenses/notion/LICENSE
diff --git a/community/notmuch/PKGBUILD b/community/notmuch/PKGBUILD
index 4ca5f46c1..d5550afcc 100644
--- a/community/notmuch/PKGBUILD
+++ b/community/notmuch/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95030 2013-08-03 23:12:06Z dwallace $
+# $Id: PKGBUILD 104884 2014-01-28 03:34:14Z td123 $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: fauno <fauno at kiwwwi.com.ar>
 # Contributor: Olivier Ramonat <olivier at ramonat dot fr>
@@ -6,7 +6,7 @@
 
 pkgbase=notmuch
 pkgname=('notmuch' 'notmuch-vim' 'notmuch-mutt' 'notmuch-runtime')
-pkgver=0.16
+pkgver=0.17
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://notmuchmail.org/"
@@ -14,7 +14,7 @@ license=('GPL3')
 makedepends=('python2' 'python' 'emacs' 'gnupg' 'ruby' 'pkgconfig' 'xapian-core' 'gmime' 'talloc')
 options=(!distcc !makeflags)
 source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('9de9f8a91eb2323d8503872a059c7f11')
+md5sums=('65a6a6f1fe912803b60d5870132e2006')
 
 prepare(){
     #cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-runtime-$pkgver"
diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD
index cf9d0322e..bd1542c70 100644
--- a/community/nsd/PKGBUILD
+++ b/community/nsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 100223 2013-11-02 00:00:56Z bisson $
+# $Id: PKGBUILD 104857 2014-01-27 16:23:54Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=nsd
-pkgver=4.0.0
-pkgrel=2
+pkgver=4.0.1
+pkgrel=1
 pkgdesc='Authoritative only, high performance and simple DNS server'
 url='http://www.nlnetlabs.nl/nsd/'
 license=('BSD')
@@ -15,9 +15,9 @@ makedepends=('flex')
 source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'tmpfiles.d'
         'service')
-sha1sums=('b3ebd669be8e830f62062d12be55242ca41da369'
+sha1sums=('788cc290ade7fc6a61fe4391837d3abddbda4df0'
           '7ad2b8da961a893095eede8963cf8026b13186a1'
-          '491bf9c6e63644f7d6c81d3b16138f0d87706aa0')
+          '3dbe300d834a32c9a339a6c76c58f5c240239e9b')
 
 install=install
 
diff --git a/community/nsd/install b/community/nsd/install
index 6e56e9ba1..5f693dba0 100644
--- a/community/nsd/install
+++ b/community/nsd/install
@@ -1,12 +1,13 @@
+post_upgrade() {
+	usr/bin/systemd-tmpfiles --create nsd.conf || true
+}
+
 post_install() {
 	getent group nsd &>/dev/null || groupadd -r nsd >/dev/null
 	getent passwd nsd &>/dev/null || useradd -r -g nsd -d /dev/null -s /bin/false -c nsd nsd >/dev/null
 	chown nsd:nsd /var/db/nsd
 	chmod 700 /var/db/nsd
-}
-
-post_upgrade() {
-	usr/bin/systemd-tmpfiles --create nsd.conf || true
+	post_upgrade
 }
 
 post_remove() {
diff --git a/community/nsd/service b/community/nsd/service
index b6125a686..9f0231227 100644
--- a/community/nsd/service
+++ b/community/nsd/service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 PIDFile=/run/nsd/nsd.pid
-ExecStart=/usr/bin/nsd -c /etc/nsd/nsd.conf
+ExecStart=/usr/bin/nsd -d -c /etc/nsd/nsd.conf
 ExecReload=/bin/kill -HUP $MAINPID
 ExecStop=/bin/kill -TERM $MAINPID
 
diff --git a/community/nullmailer/PKGBUILD b/community/nullmailer/PKGBUILD
new file mode 100644
index 000000000..7fa8a5a9b
--- /dev/null
+++ b/community/nullmailer/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 104004 2014-01-14 15:23:43Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Roberto Alsina <ralsina at kde.org>
+# Contributor: Kurt J. Bosch <kjb-temp-2009 at alpenjodel.de>
+
+pkgname=nullmailer
+pkgver=1.13
+pkgrel=3
+pkgdesc="Simple relay-only mail transport agent."
+arch=('i686' 'x86_64')
+url="http://www.untroubled.org/nullmailer/"
+license=("GPL")
+provides=('smtp-forwarder')
+conflicts=('smtp-forwarder' 'smtp-server')
+depends=('gnutls')
+install=nullmailer.install
+source=("http://www.untroubled.org/nullmailer/archive/${pkgname}-${pkgver}.tar.gz"
+        nullmailer.service)
+md5sums=('aaeb8746fbc082917b26d0827ccc9270'
+         '300f17c52422d4156583f207f2405930')
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgname} \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --sbindir=/usr/bin \
+        --enable-tls
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+    install -D -m 0644 ../nullmailer.service "${pkgdir}/usr/lib/systemd/system/nullmailer.service"
+    # Remove pipe and create on install to work around makepkg hang on grep -R
+    rm -f "${pkgdir}/var/nullmailer/trigger"
+}
diff --git a/community/nullmailer/nullmailer.install b/community/nullmailer/nullmailer.install
new file mode 100644
index 000000000..823df6e27
--- /dev/null
+++ b/community/nullmailer/nullmailer.install
@@ -0,0 +1,44 @@
+# arg 1: the new package version
+post_install() {
+    if ! getent passwd nullmail > /dev/null; then
+        echo "==> Creating nullmail user"
+        usr/bin/useradd --comment "nullmailer MTA" --shell /bin/sh --home /var/nullmailer --system --user-group nullmail
+    fi
+
+    echo "==> Creating trigger fifo"
+    rm -f var/nullmailer/trigger && mkfifo -m 600 var/nullmailer/trigger
+
+    echo "==> Fixing permissions"
+    chown nullmail var/nullmailer/*
+    chown nullmail usr/bin/nullmailer-queue
+    chmod u+s      usr/bin/nullmailer-queue
+    chown nullmail usr/bin/mailq
+    chmod u+s      usr/bin/mailq
+    if ! [ -s etc/nullmailer/me ]; then
+        echo "==> Configuring"
+        hostnamectl --static > etc/nullmailer/me
+    fi
+    if ! [ -s etc/nullmailer/remotes ]; then
+        echo "smarthost.example.org smtp --port=25 --auth-login --user=user --pass=pass" > etc/nullmailer/remotes
+        chgrp nullmail etc/nullmailer/remotes
+        chmod 640 etc/nullmailer/remotes
+    fi
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+    post_install $1
+}
+
+# arg 1:  the old package version
+pre_remove() {
+    systemctl stop nullmailer
+    # Leave the 'queue' directory intact
+    rm -rf var/service/nullmailer/{tmp,trigger}
+    echo "==> Removing nullmailer user and group"
+    userdel nullmail
+    if getent group nullmail > /dev/null; then
+        groupdel nullmail
+    fi
+}
diff --git a/community/nullmailer/nullmailer.service b/community/nullmailer/nullmailer.service
new file mode 100644
index 000000000..8adbec076
--- /dev/null
+++ b/community/nullmailer/nullmailer.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Nullmailer relay-only MTA
+After=local-fs.target
+ConditionPathExists=/var/nullmailer/queue
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+WorkingDirectory=/var/nullmailer
+ExecStart=/usr/bin/nullmailer-send
+User=nullmail
+Restart=always
diff --git a/community/nzbget/PKGBUILD b/community/nzbget/PKGBUILD
index e7c998433..70279e09b 100644
--- a/community/nzbget/PKGBUILD
+++ b/community/nzbget/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 96729 2013-09-03 15:26:43Z alucryd $
+# $Id: PKGBUILD 104048 2014-01-14 21:30:48Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=nzbget
-pkgver=11.0
-pkgrel=3
+pkgver=12.0
+pkgrel=1
 pkgdesc="Download from Usenet using .nzb files"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://nzbget.sourceforge.net/"
 license=('GPL')
 depends=('gnutls' 'libpar2' 'libsigc++' 'libxml2' 'python')
-changelog="${pkgname}.changelog"
-source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('27abacf6c604969dc987b7e50689caef22a65dbb1690b020b0c6d147ae123b3d')
+changelog=${pkgname}.changelog
+source=(http://sourceforge.net/projects/${pkgname}/files/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('023c4e3b9c7e920d9ea72b60135b438ce13543454f79984c06fd15365b9a882e')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/nzbget/nzbget.changelog b/community/nzbget/nzbget.changelog
index 8670f51a9..4f48ebf99 100644
--- a/community/nzbget/nzbget.changelog
+++ b/community/nzbget/nzbget.changelog
@@ -1,3 +1,6 @@
+2014-01-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+  * nzbget 12.0-1
+
 2013-09-03 Maxime Gauduin <alucryd@gmail.com>
   * Fixed FS#36250 - package built without system CXXFLAGS
 
diff --git a/community/oath-toolkit/PKGBUILD b/community/oath-toolkit/PKGBUILD
index d3d8ced44..72cc41e1f 100644
--- a/community/oath-toolkit/PKGBUILD
+++ b/community/oath-toolkit/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 98970 2013-10-21 20:20:39Z seblu $
+# $Id: PKGBUILD 105649 2014-02-13 00:27:31Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Christian Hesse <mail@eworm.de>
 # Contributor: L42y <423300@gmail.com>
 
 pkgname=oath-toolkit
-pkgver=2.4.0
-pkgrel=2
+pkgver=2.4.1
+pkgrel=1
 pkgdesc='OATH one-time password toolkit'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.nongnu.org/oath-toolkit/'
 license=('GPL3')
 depends=('glibc' 'pam' 'xmlsec')
-source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
-md5sums=('456774fbc37d5267e4e8920694b7ad48'
+source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('951bafd1d86e6013903c10be3b6623bb'
          'SKIP')
 
 build() {
diff --git a/community/obexftp/PKGBUILD b/community/obexftp/PKGBUILD
index c70a26780..9d4a4e4ee 100644
--- a/community/obexftp/PKGBUILD
+++ b/community/obexftp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 102177 2013-12-06 12:11:56Z giovanni $
+# $Id: PKGBUILD 104885 2014-01-28 03:34:16Z td123 $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 pkgname=obexftp
 pkgver=0.24
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for transfer files to/from any OBEX enabled device"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
diff --git a/community/ode/PKGBUILD b/community/ode/PKGBUILD
index cd6b103a7..e390045cb 100644
--- a/community/ode/PKGBUILD
+++ b/community/ode/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 102181 2013-12-06 12:14:44Z giovanni $
+# $Id: PKGBUILD 105840 2014-02-16 09:40:14Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Adam Griffiths <adam_griffithsAATTdart.net.au>
 
 pkgname=ode
-pkgver=0.12
-pkgrel=5
+pkgver=0.13
+pkgrel=1
 pkgdesc="An open source, high performance library for simulating rigid body dynamics"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ode.org"
 license=('LGPL' 'BSD')
 depends=('gcc-libs' 'bash')
 source=("http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('48fdd41fae1a7e7831feeded09826599')
+md5sums=('04b32c9645c147e18caff7a597a19f84')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/opencolorio/PKGBUILD b/community/opencolorio/PKGBUILD
deleted file mode 100644
index 517499f23..000000000
--- a/community/opencolorio/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Dumitru Ursu <dima@ceata.org>
-
-pkgname=opencolorio
-pkgver=1.0.9
-pkgrel=1
-pkgdesc="A color management framework for visual effects and animation"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://opencolorio.org"
-license=('BSD')
-depends=('python' 'lcms2' 'tinyxml')
-makedepends=('cmake')
-source=(http://github.com/imageworks/OpenColorIO/tarball/v$pkgver)
-sha1sums=('a015cb51b9b0ea0cdb3989fc23e1c18ad69511e0')
-
-build() 
-{
-  mv imageworks-OpenColorIO-* $pkgname-$pkgver
-  cd $pkgname-$pkgver
-
-  [ "$CARCH" = "mips64el" ] && extra=-DOCIO_USE_SSE=OFF
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_EXTERNAL_LCMS=ON -DUSE_EXTERNAL_TINYXML=ON -DPYTHON=/usr/bin/python2 $extra .
-  make 
-}
-
-package() 
-{
-  cd "$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/opencsg/PKGBUILD b/community/opencsg/PKGBUILD
new file mode 100644
index 000000000..134300f78
--- /dev/null
+++ b/community/opencsg/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 105548 2014-02-10 04:53:52Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Maintainer: Xyne <ca dot archlinux at xyne, backwards>
+# Contributor: nikor
+
+pkgname=opencsg
+pkgver=1.3.2
+pkgrel=2
+pkgdesc="Library for image-based CSG rendering using OpenGL."
+arch=('i686' 'x86_64')
+license=('GPL2')
+depends=('glew' 'glut' 'mesa')
+url="http://www.opencsg.org"
+source=(http://www.opencsg.org/OpenCSG-${pkgver}.tar.gz)
+sha1sums=('e2b4abf169ae3e319eb5f6d9ae6136fa96710a05')
+
+build() {
+  cd -- "${srcdir}/OpenCSG-${pkgver}"
+  sed -i 's|-rpath,../lib|-rpath,/usr/lib|' src/Makefile
+  make
+}
+
+package() {
+  cd -- "${srcdir}/OpenCSG-${pkgver}"
+  install -D lib/libopencsg.so.${pkgver} "$pkgdir/usr/lib/libopencsg.so.${pkgver}"
+  install -D include/opencsg.h "$pkgdir/usr/include/opencsg.h"
+  cd "$pkgdir/usr/lib/"
+  ln -s libopencsg.so.${pkgver} libopencsg.so.1.3
+  ln -s libopencsg.so.${pkgver} libopencsg.so.1
+  ln -s libopencsg.so.${pkgver} libopencsg.so
+}
+
diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD
index a959593dc..1843931af 100644
--- a/community/opendkim/PKGBUILD
+++ b/community/opendkim/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 102395 2013-12-10 10:40:58Z spupykin $
+# $Id: PKGBUILD 105611 2014-02-11 17:57:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Thomas Jost <schnouki@schnouki.net>
 
 pkgname=opendkim
 pkgver=2.9.0
-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 mips64el)
 url="http://www.opendkim.org/"
 license=('BSD' 'custom:Sendmail')
-depends=("db" "openssl" "libstrl")
+depends=("db" "openssl" "libbsd")
 makedepends=("libmilter")
 options=(!emptydirs)
 backup=(etc/conf.d/opendkim)
diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD
deleted file mode 100644
index 8f47b1d4d..000000000
--- a/community/openimageio/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 102264 2013-12-07 10:36:49Z bpiotrowski $
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-
-pkgname=openimageio
-pkgver=1.2.3
-pkgrel=1
-pkgdesc="A library for reading and writing images, including classes, utilities, and applications"
-arch=(i686 x86_64)
-url="http://www.openimageio.org/"
-license=('custom')
-depends=('openexr' 'boost-libs' 'jasper' 'glew' 'libtiff' 'opencolorio' 'intel-tbb')
-makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa')
-optdepends=('qt4: iv image viewer'
-            'python2: bindings support')
-source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver)
-md5sums=('20066ae0e9026717242f64f107f7ee8e')
-
-build() {
-  cd "$srcdir"/$_pkgname*
-
-  cd src
-
-  [[ -d build ]] && rm -r build
-  mkdir build && cd build
-
-  cmake \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages \
-      -DUSE_EXTERNAL_TBB=ON \
-      -DOIIO_BUILD_TESTS=OFF \
-      ..
-  make
-}
-
-package() {
-  cd "$srcdir"/$_pkgname*/src/build
-
-  make DESTDIR="$pkgdir" install
-
-  # license
-  cd ../..
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/community/openimageio/fix32bit-fail.patch b/community/openimageio/fix32bit-fail.patch
deleted file mode 100644
index 5d9bbbe36..000000000
--- a/community/openimageio/fix32bit-fail.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- orig/src/libutil/SHA1.cpp	2012-11-17 01:02:42.000000000 +0200
-+++ fixed/src/libutil/SHA1.cpp	2012-12-14 14:37:37.552042793 +0200
-@@ -8,9 +8,9 @@
- 
- // If compiling with MFC, you might want to add #include "StdAfx.h"
- 
-+#include "SHA1.h"
- #include "hash.h"
- #include "dassert.h"
--#include "SHA1.h"
- 
- #ifdef SHA1_UTILITY_FUNCTIONS
- #define SHA1_MAX_FILE_BUFFER 8000
diff --git a/community/openmw/PKGBUILD b/community/openmw/PKGBUILD
new file mode 100644
index 000000000..ebac4c7ea
--- /dev/null
+++ b/community/openmw/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Sandy Carter <bwrsandman@gmail.com>
+
+pkgname=openmw
+pkgver=0.28.0
+pkgrel=1
+pkgdesc="An open-source engine reimplementation for the role-playing game Morrowind"
+arch=('i686' 'x86_64')
+url="http://www.openmw.org"
+license=('GPL3' 'MIT' 'custom')
+depends=('openal' 'ogre' 'mygui' 'bullet' 'qt4' 'ffmpeg' 'sdl2' 'unshield')
+makedepends=('cmake' 'boost')
+source=("https://github.com/zinnschlag/openmw/archive/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('2686b0a588571b9196e691b0ac484c59d8c49bce')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD
index cd0412116..ea76814a7 100644
--- a/community/openntpd/PKGBUILD
+++ b/community/openntpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91455 2013-05-22 23:28:35Z seblu $
+# $Id: PKGBUILD 103685 2014-01-09 16:10:15Z bgyorgy $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Mark Rosenstand <mark@borkware.net>
 # Contributor: Giorgio Lando <patroclo7@gmail.com> (adjtimex patch)
@@ -6,7 +6,7 @@
 
 pkgname=openntpd
 pkgver=3.9p1
-pkgrel=22
+pkgrel=24
 pkgdesc='Free, easy to use implementation of the Network Time Protocol.'
 url='http://www.openntpd.org/'
 arch=('x86_64' 'i686' 'mips64el')
@@ -47,8 +47,9 @@ package() {
   make DESTDIR="$pkgdir" install
   install -Dm644 "$srcdir/$pkgname-$pkgver/LICENCE" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENCE"
-  sed -i 's/\*/0.0.0.0/' $pkgdir/etc/ntpd.conf
+  sed -i 's/\*/0.0.0.0/' "$pkgdir/etc/ntpd.conf"
 
+  install -d -o 87 -g 87 "$pkgdir/var/lib/ntp"
   install -Dm644 "$srcdir/openntpd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/openntpd.conf"
   install -Dm644 "$srcdir/openntpd.service" "$pkgdir/usr/lib/systemd/system/openntpd.service"
 
diff --git a/extra/openobex/PKGBUILD b/community/openobex/PKGBUILD
index 9d2c6fd98..99225edcf 100644
--- a/extra/openobex/PKGBUILD
+++ b/community/openobex/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 199321 2013-11-10 20:21:49Z eric $
+# $Id: PKGBUILD 103373 2014-01-04 10:26:43Z andrea $
 # Maintainer:
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
diff --git a/community/openscad/CHANGELOG b/community/openscad/CHANGELOG
new file mode 100644
index 000000000..86c5f542e
--- /dev/null
+++ b/community/openscad/CHANGELOG
@@ -0,0 +1,27 @@
+2014-02-10 Kyle Keen <keenerd@gmail.com>
+
+	* 2013.06-3
+	- Moved package to [community]
+	- Explicit boost depends
+	- Use official resources
+
+2014-02-07 Chirantan Ekbote <chirantan.ekbote@gmail.com>
+
+	* 2013.06-2
+	- Update makedepends since eigen3 has now become eigen in [extra]
+
+2013-06-19 Chirantan Ekbote <chirantan.ekbote@gmail.com>
+
+	* 2013.06-1 :
+	- Updated to version 2013.06
+
+2013-03-01 Chirantan Ekbote <chirantan.ekbote@gmail.com>
+
+	* 2013.01-2 :
+	Dependency qt replaced with qt4
+
+2013-01-23 Chirantan Ekbote <chirantan.ekbote@gmail.com>
+
+	* 2013.01-1 :
+	New upstream release.
+	Dependency eigen2 repaced by eigen3
diff --git a/community/openscad/PKGBUILD b/community/openscad/PKGBUILD
new file mode 100644
index 000000000..0577125f1
--- /dev/null
+++ b/community/openscad/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 105552 2014-02-10 05:19:10Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: Chirantan Ekbote <chirantan.ekbote at gmail.com>
+# Contributor: Eric Anderson <ejona86 at gmail.com>
+# Contributor: Pierre DOUCET <pierre at equinoxefr.org>
+pkgname=openscad
+pkgver=2013.06
+pkgrel=3
+pkgdesc="The programmers' solid 3D CAD modeller"
+url="http://openscad.org/"
+arch=('i686' 'x86_64')
+license=('GPL2')
+changelog=CHANGELOG
+depends=('qt4' 'cgal' 'opencsg' 'boost-libs')
+makedepends=('eigen' 'boost' 'imagemagick')
+source=("https://openscad.googlecode.com/files/$pkgname-$pkgver.src.tar.gz")
+md5sums=('b7b5faecdffc41e28cdf0c1162299de7')
+
+build() {
+    cd "$srcdir/$pkgname-$pkgver"
+    qmake-qt4 PREFIX="/usr"
+    make
+    convert "icons/$pkgname.png" -resize 128x128\> "icons/$pkgname-128.png"
+}
+
+package() {
+    cd "$srcdir/$pkgname-$pkgver"
+    make INSTALL_ROOT="$pkgdir" install
+    install -Dm644 "icons/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+    install -Dm644 "icons/$pkgname-128.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+}
diff --git a/community/openshadinglanguage/PKGBUILD b/community/openshadinglanguage/PKGBUILD
deleted file mode 100644
index f663d9ac9..000000000
--- a/community/openshadinglanguage/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 102265 2013-12-07 10:36:50Z bpiotrowski $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-pkgname=openshadinglanguage
-pkgver=1.4.0
-pkgrel=2
-pkgdesc="Advanced shading language for production GI renderers"
-arch=(i686 x86_64)
-url="https://github.com/imageworks/OpenShadingLanguage"
-license=('custom')
-depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' 'libtiff' 'llvm')
-makedepends=('boost' 'cmake' 'clang')
-source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz)
-md5sums=('dcc7b6dfbc68d7af0d5cfa2940ff205b')
-
-build() {
-  cd OpenShadingLanguage-Release-$pkgver
-
-  cd src
-
-  [[ -d build ]] && rm -r build
-  mkdir build && cd build
-
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLLVM_STATIC=0 \
-    ../..
-  make
-}
-
-package() {
-  cd OpenShadingLanguage-Release-$pkgver/src/build
-
-  make DESTDIR="$pkgdir/" install
-
-  mkdir -p "$pkgdir"/usr/share/OSL/
-  mkdir -p "$pkgdir"/usr/share/licenses/$pkgname
-  mv "$pkgdir"/usr/LICENSE "$pkgdir"/usr/share/licenses/$pkgname # TODO: Tell upstream about this shit
-  mv "$pkgdir"/usr/{CHANGES,README.md,INSTALL} "$pkgdir"/usr/share/OSL/
-  mv "$pkgdir"/usr/doc "$pkgdir"/usr/share/OSL/doc
-  mv "$pkgdir"/usr/shaders "$pkgdir"/usr/share/OSL/shaders
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/openshadinglanguage/llvm32.patch b/community/openshadinglanguage/llvm32.patch
deleted file mode 100644
index 5eb63bcf3..000000000
--- a/community/openshadinglanguage/llvm32.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-commit c391ceb1936459b70147d6f8ac389ded26a7e028
-Author: Sven-Hendrik Haase <sh@lutzhaase.com>
-Date:   Fri Dec 28 09:00:33 2012 +0100
-
-    Fix for LLVM 3.2
-
-diff --git a/src/liboslexec/llvm_headers.h b/src/liboslexec/llvm_headers.h
-index 41a7a11..5ff4384 100644
---- a/src/liboslexec/llvm_headers.h
-+++ b/src/liboslexec/llvm_headers.h
-@@ -45,10 +45,18 @@ namespace llvm = LLVM_NAMESPACE;
- #include <llvm/LLVMContext.h>
- #include <llvm/Module.h>
- #include <llvm/PassManager.h>
-+#if OSL_LLVM_VERSION >= 32
-+#include <llvm/IRBuilder.h>
-+#else
- #include <llvm/Support/IRBuilder.h>
-+#endif
- #include <llvm/Support/ManagedStatic.h>
- #include <llvm/Support/MemoryBuffer.h>
- #include <llvm/Support/raw_ostream.h>
-+#if OSL_LLVM_VERSION >= 32
-+#include <llvm/DataLayout.h>
-+#else
- #include <llvm/Target/TargetData.h>
-+#endif
- 
- #endif /* OSL_LLVM_HEADERS_H */
-diff --git a/src/liboslexec/llvm_instance.cpp b/src/liboslexec/llvm_instance.cpp
-index 8709c8b..3e42557 100644
---- a/src/liboslexec/llvm_instance.cpp
-+++ b/src/liboslexec/llvm_instance.cpp
-@@ -1273,13 +1273,21 @@ RuntimeOptimizer::llvm_setup_optimization_passes ()
-     //
-     m_llvm_func_passes = new llvm::FunctionPassManager(llvm_module());
-     llvm::FunctionPassManager &fpm (*m_llvm_func_passes);
-+#if OSL_LLVM_VERSION >= 32
-+    fpm.add (new llvm::DataLayout(llvm_module()));
-+#else
-     fpm.add (new llvm::TargetData(llvm_module()));
-+#endif
- 
-     // Specify module-wide (interprocedural optimization) passes
-     //
-     m_llvm_passes = new llvm::PassManager;
-     llvm::PassManager &passes (*m_llvm_passes);
-+#if OSL_LLVM_VERSION >= 32
-+    passes.add (new llvm::DataLayout(llvm_module()));
-+#else
-     passes.add (new llvm::TargetData(llvm_module()));
-+#endif
- 
-     if (shadingsys().llvm_optimize() >= 1 && shadingsys().llvm_optimize() <= 3) {
-         // For LLVM 3.0 and higher, llvm_optimize 1-3 means to use the
-diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
-index 135da2e..4e0eefe 100644
---- a/src/liboslexec/llvm_util.cpp
-+++ b/src/liboslexec/llvm_util.cpp
-@@ -42,7 +42,11 @@ namespace pvt {
- llvm::Type *
- RuntimeOptimizer::llvm_type_union(const std::vector<llvm::Type *> &types)
- {
-+#if OSL_LLVM_VERSION >= 32
-+    llvm::DataLayout target(llvm_module());
-+#else
-     llvm::TargetData target(llvm_module());
-+#endif
-     size_t max_size = 0;
-     size_t max_align = 1;
-     for (size_t i = 0; i < types.size(); ++i) {
diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD
index 1fc2bfdd9..c96dee0ec 100644
--- a/community/opensips/PKGBUILD
+++ b/community/opensips/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 91536 2013-05-23 11:21:11Z spupykin $
+# $Id: PKGBUILD 103707 2014-01-10 10:51:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=opensips
-pkgver=1.9.1
+pkgver=1.10.0
 pkgrel=2
 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..."
 url="http://www.opensips.org"
@@ -25,7 +25,7 @@ install=opensips.install
 options=('!emptydirs' 'zipman' '!makeflags' 'docs')
 source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar.gz
 	opensips.service)
-md5sums=('0b7b93f4df29a96daedf12e490e7ec86'
+md5sums=('5cbccda321940c51baed798f2f6c5b1a'
          '35cdcb3692f6925236fd5fe7e9484c58')
 
 prepare() {
@@ -46,7 +46,7 @@ build() {
 
   make \
 	include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \
-	TLS=1 LIBDIR=lib
+	TLS=1 LIBDIR=lib PREFIX=/usr
 }
 
 package() {
@@ -54,7 +54,7 @@ package() {
 
   make \
 	include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \
-	TLS=1 DESTDIR=$pkgdir/usr LIBDIR=lib install
+	TLS=1 BASEDIR=$pkgdir PREFIX=/usr LIBDIR=lib install
 
   # Conforms to the arch packaging standards (http://wiki.archlinux.org/index.php/Arch_Packaging_Standards)
   mkdir -p $pkgdir/etc/
diff --git a/community/openssh-askpass/PKGBUILD b/community/openssh-askpass/PKGBUILD
index 26bda4541..aaa29cdaf 100644
--- a/community/openssh-askpass/PKGBUILD
+++ b/community/openssh-askpass/PKGBUILD
@@ -3,17 +3,17 @@
 # Contributor: Massimiliano Torromeo <Massimiliano.Torromeo AT gmail DOT com>
 
 pkgname=openssh-askpass
-pkgver=2.0.0
-pkgrel=2
+pkgver=2.0.1
+pkgrel=1
 pkgdesc='A plasma-like passphrase dialog for ssh'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.phenix.bnl.gov/WWW/publish/hpereira/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=1'
+url='http://hugo.pereira.free.fr/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=0'
 license=('GPL')
 depends=('openssh' 'qt4')
 makedepends=('cmake')
 provides=('x11-ssh-askpass')
 conflicts=('x11-ssh-askpass')
-source=("http://www.phenix.bnl.gov/WWW/publish/hpereira/software/tgz/$pkgname-$pkgver.tar.gz"
+source=("http://hugo.pereira.free.fr/software/tgz/$pkgname-$pkgver.tar.gz"
         "$pkgname.sh")
          
 build() {
@@ -32,5 +32,5 @@ package() {
   install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh"
 }
 
-md5sums=('99b31e5bc2c12f91cc88869661ad92be'
+md5sums=('c196971941ff3773d9f977b52015b214'
          'baec3f0499b851aca6705968fa9e0df7')
diff --git a/community/opusfile/PKGBUILD b/community/opusfile/PKGBUILD
index c3765b3c8..8b8459283 100644
--- a/community/opusfile/PKGBUILD
+++ b/community/opusfile/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 102291 2013-12-07 11:02:30Z bpiotrowski $
+# $Id: PKGBUILD 105124 2014-02-01 00:48:22Z eric $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com>
 
 pkgname=opusfile
-pkgver=0.4
+pkgver=0.5
 pkgrel=1
 pkgdesc='Library for opening, seeking, and decoding .opus files'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.opus-codec.org/'
-license=('custom')
+license=('BSD')
 depends=('libogg' 'openssl' 'opus')
 source=(http://downloads.xiph.org/releases/opus/${pkgname}-${pkgver}.tar.gz)
-md5sums=('80f3d4106106905255ff84def1b5d9ae')
+md5sums=('6c96ae240ada27fafff423f96a8814cb')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/pacparser/PKGBUILD b/community/pacparser/PKGBUILD
new file mode 100644
index 000000000..f7c000918
--- /dev/null
+++ b/community/pacparser/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 103445 2014-01-06 02:45:23Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Max Meyer <dev@fedux.org>
+
+pkgbase=pacparser
+pkgname=('pacparser' 'python2-pacparser')
+pkgver=1.3.1
+pkgrel=1
+arch=(i686 x86_64)
+url="http://pacparser.googlecode.com"
+license=('LGPL')
+makedepends=('python2')
+options=('!makeflags')
+source=("http://pacparser.googlecode.com/files/${pkgbase}-${pkgver}.tar.gz")
+
+build() {
+  cd $pkgbase-$pkgver
+  PYTHON=python2 make all pymod -C src
+}
+
+package_pacparser() {
+  pkgdesc="Library to parse proxy auto-config (PAC) files"
+
+  cd $pkgbase-$pkgver
+  make -C src DESTDIR="$pkgdir/" install
+}
+
+package_python2-pacparser() {
+  depends=('python2')
+  pkgdesc="Python 2.x pacparser module"
+
+  cd $pkgbase-$pkgver
+  PYTHON=python2 make -C src DESTDIR="$pkgdir/" install-pymod
+}
+
+# vim:set ts=2 sw=2 et:
+sha512sums=('20295667d92eb5385429c085c14ca8dc1ba216487ff474304433f99119216934be2dd1647452173418de31f5345679dd7159eafd331e40a2b87564f878d31349')
diff --git a/community/par2cmdline/PKGBUILD b/community/par2cmdline/PKGBUILD
index 4b7f6eda4..148faba04 100644
--- a/community/par2cmdline/PKGBUILD
+++ b/community/par2cmdline/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 102557 2013-12-14 14:03:38Z idevolder $
+# $Id: PKGBUILD 103377 2014-01-04 19:33:08Z idevolder $
 # Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com >
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org
 
 pkgname=par2cmdline
-pkgver=0.6.3
+pkgver=0.6.4
 pkgrel=1
 pkgdesc='A PAR 2.0 compatible file verification and repair tool'
 url='https://github.com/BlackIkeEagle/par2cmdline'
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/BlackIkeEagle/$pkgname/archive/v$pkgver.tar.gz")
-sha256sums=('903bff9d1720523683cb04db76d37169ebab3a5157f0ae1d5f9065f371929288')
+sha256sums=('431da50fdd794881bad7e1b0dee234e8102d7065f53abd7ce1e86be758810116')
 
 build() {
 	cd "$pkgname-$pkgver"
diff --git a/community/partclone/PKGBUILD b/community/partclone/PKGBUILD
index 59fab2a04..8ce5e34a2 100644
--- a/community/partclone/PKGBUILD
+++ b/community/partclone/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 90410 2013-05-12 09:03:51Z jsteel $
-# Maintainer: Jonathan Steel <mail at jsteel dot org>
+# $Id: PKGBUILD 104331 2014-01-17 20:10:14Z jsteel $
+# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
 # Contrinutor: Dan Serban
 # Contributor: Franz Burgmann
 # Contributor: Todd Partridge (Gen2ly)
 # Contributor: Ivan Sichmann Freitas
 
 pkgname=partclone
-pkgver=0.2.58
-pkgrel=2
+pkgver=0.2.69
+pkgrel=1
 pkgdesc="Utilities to save and restore used blocks on a partition"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://partclone.org"
 license=('GPL')
 depends=('progsreiserfs' 'ntfs-3g')
 source=(https://downloads.sourceforge.net/project/$pkgname/stable/$pkgver/${pkgname}_$pkgver.orig.tar.gz)
-md5sums=('8d8edeab8a0ce430d2e00efcc25f4ce7')
+md5sums=('2cc3b4e49819da32adcf63ef9246dca0')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
@@ -29,5 +29,5 @@ build() {
 package() {
   cd "$srcdir"/$pkgname-$pkgver
 
-  make DESTDIR="$pkgdir"/ install
+  make PREFIX=/usr DESTDIR="$pkgdir"/ install
 }
diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD
index 4db7991a5..2412f2a16 100644
--- a/community/passenger/PKGBUILD
+++ b/community/passenger/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 100819 2013-11-11 12:06:03Z spupykin $
+# $Id: PKGBUILD 105017 2014-01-30 08:53:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=passenger
-pkgver=4.0.21
-pkgrel=2
+pkgver=4.0.37
+pkgrel=1
 pkgdesc="mod_rails passenger"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.modrails.com"
@@ -14,7 +14,7 @@ makedepends=('apache')
 install=passenger.install
 options=('!emptydirs' 'staticlibs')
 source=($pkgname-$pkgver.tar.gz::https://github.com/FooBarWidget/passenger/archive/release-$pkgver.tar.gz)
-md5sums=('200ba8636baa06c9a44d30c7bbb50ac3')
+md5sums=('7040af5314fe19a420f38732c6bd4f5b')
 
 prepare() {
   cd $srcdir/passenger-release-$pkgver
diff --git a/community/pcsc-tools/PKGBUILD b/community/pcsc-tools/PKGBUILD
index 6c6f3ad94..1289ae086 100644
--- a/community/pcsc-tools/PKGBUILD
+++ b/community/pcsc-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81203 2012-12-13 02:21:32Z giovanni $
+# $Id: PKGBUILD 105196 2014-02-02 17:02:19Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Lorenzo Nizzi Grifi Gargiolli <lorenzo.nizzi.grifi@gmail.com>
 # Contributor: marc0s <marc0s@fsfe.org>
 
 pkgname=pcsc-tools
-pkgver=1.4.21
+pkgver=1.4.22
 pkgrel=1
 pkgdesc="PC/SC Architecture smartcard tools"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('pcsclite' 'pcsc-perl' 'gtk2-perl' 'glib-perl')
 makedepends=('pkg-config')
 source=("http://ludovic.rousseau.free.fr/softwares/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('c5ec17124aab4e933d537d6253046423')
+md5sums=('b519862fa75b61da72b7d09f20bbbc9f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD
index 56894c53a..016fa2ac6 100644
--- a/community/pcsclite/PKGBUILD
+++ b/community/pcsclite/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99948 2013-10-31 02:38:13Z allan $
+# $Id: PKGBUILD 105842 2014-02-16 09:46:31Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=pcsclite
-pkgver=1.8.10
+pkgver=1.8.11
 pkgrel=1
 pkgdesc="PC/SC Architecture smartcard middleware library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('BSD')
 depends=('python2' 'systemd')
 makedepends=('pkg-config')
 options=('!docs')
-source=("https://alioth.debian.org/frs/download.php/file/3963/pcsc-lite-${pkgver}.tar.bz2")
-md5sums=('7268cc5ef8fc01b785c7cea87adb1ade')
+source=("https://alioth.debian.org/frs/download.php/file/3991/pcsc-lite-${pkgver}.tar.bz2")
+md5sums=('73502ca4ba6526727f9f49c63d805408')
 
 build() {
   cd "${srcdir}/pcsc-lite-${pkgver}"
diff --git a/community/pcsxr/PKGBUILD b/community/pcsxr/PKGBUILD
index 164608a55..f0843d556 100644
--- a/community/pcsxr/PKGBUILD
+++ b/community/pcsxr/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99949 2013-10-31 02:38:33Z allan $
+# $Id: PKGBUILD 104373 2014-01-19 16:29:37Z bpiotrowski $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: quantax -- contact via Arch Linux forum or AUR
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=pcsxr
 pkgver=1.9.93
-pkgrel=2
+pkgrel=3
 pkgdesc='A Sony PlayStation (PSX) emulator based on the PCSX-df project'
 arch=('i686' 'x86_64')
 url='http://pcsxr.codeplex.com/'
diff --git a/community/pcurses/PKGBUILD b/community/pcurses/PKGBUILD
new file mode 100644
index 000000000..1cc5e1827
--- /dev/null
+++ b/community/pcurses/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: schuay <jakob.gruber@gmail.com>
+
+pkgname=pcurses
+pkgver=3
+pkgrel=2
+pkgdesc='A curses package management tool using libalpm'
+arch=('x86_64' 'i686')
+url="https://github.com/schuay/$pkgname"
+license=('GPL')
+depends=('ncurses' 'pacman>=4.1.2')
+makedepends=('boost' 'cmake' 'git')
+source=("git://github.com/schuay/pcurses.git#tag=pcurses-$pkgver")
+md5sums=('SKIP')
+
+build() {
+  rm -rf "$srcdir/$pkgname-build"
+  mkdir "$srcdir/$pkgname-build"
+  cd "$srcdir/$pkgname-build"
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr "$srcdir/$pkgname"
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-build"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/pdf2svg/PKGBUILD b/community/pdf2svg/PKGBUILD
index 535913d6a..fa9279dd0 100644
--- a/community/pdf2svg/PKGBUILD
+++ b/community/pdf2svg/PKGBUILD
@@ -1,26 +1,29 @@
-# $Id: PKGBUILD 67717 2012-03-14 08:30:56Z giovanni $
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
+# $Id: PKGBUILD 104053 2014-01-14 22:18:17Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: corvolino <corvolino@archlinux.com.br>
 # Contributor: Joel Schaerer
 
 pkgname=pdf2svg
-pkgver=0.2.1
-pkgrel=7.1
+pkgver=0.2.2
+pkgrel=1
 pkgdesc="A pdf to svg converter"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.cityinthesky.co.uk/pdf2svg.html"
+url="http://www.cityinthesky.co.uk/opensource/pdf2svg/"
 license=('GPL')
 depends=('poppler-glib' 'gtk2' 'glib2')
-source=("http://www.cityinthesky.co.uk/_media/opensource/$pkgname-$pkgver.tar.gz")
-md5sums=('59b3b9768166f73b77215e95d91f0a9d')
+source=(http://www.cityinthesky.co.uk/wp-content/uploads/2013/10/$pkgname-$pkgver.tar.gz)
+md5sums=('800488ff6d773b309561dfa9be5dc712')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+
   ./configure --prefix=/usr
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
+
   make DESTDIR="$pkgdir/" install
 }
diff --git a/community/pdfgrep/PKGBUILD b/community/pdfgrep/PKGBUILD
new file mode 100644
index 000000000..063b5a20c
--- /dev/null
+++ b/community/pdfgrep/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: schuay <jakob.gruber@gmail.com>
+# Contributor: Gabriel B. Casella <gbc921@gmail.com>
+# Contributor: josephgbr <rafael.f.f1@gmail.com>
+
+pkgname=pdfgrep
+pkgver=1.3.0
+pkgrel=2
+pkgdesc="A tool to search text in PDF files"
+arch=('i686' 'x86_64')
+url="http://pdfgrep.sourceforge.net/"
+license=('GPL')
+depends=('poppler')
+conflicts=('pdfgrep-git')
+source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('07d2819dd11b0f92278df11a95221833')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/perl-class-methodmaker/PKGBUILD b/community/perl-class-methodmaker/PKGBUILD
index 0bcf76cb3..a9170e3bc 100644
--- a/community/perl-class-methodmaker/PKGBUILD
+++ b/community/perl-class-methodmaker/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 91657 2013-05-26 09:24:47Z bluewind $
+# $Id: PKGBUILD 105815 2014-02-15 20:44:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-class-methodmaker
-pkgver=2.18
-pkgrel=7
+pkgver=2.20
+pkgrel=1
 pkgdesc="Create generic class methods"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Class-MethodMaker"
 license=('GPL' 'PerlArtistic')
 depends=('perl>=5.10.0')
 options=('!emptydirs')
-source=("http://search.cpan.org/CPAN/authors/id/S/SC/SCHWIGON/Class-MethodMaker-${pkgver}.tar.gz")
-md5sums=('99435d78e0a1754b102fe39597c6c3df')
+source=("http://search.cpan.org/CPAN/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-${pkgver}.tar.gz")
+md5sums=('6ff22acb19ebfccaa9de07c7d4358129')
 
 build() {
   cd  $srcdir/Class-MethodMaker-$pkgver
diff --git a/community/perl-clone/PKGBUILD b/community/perl-clone/PKGBUILD
index 31ddf15e9..b368c94d9 100644
--- a/community/perl-clone/PKGBUILD
+++ b/community/perl-clone/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Alex Dioso <adioso->gmail*com>
 
 pkgname=perl-clone
-pkgver=0.35
+pkgver=0.36
 pkgrel=1
 pkgdesc='Recursive copy of nested objects.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic')
 depends=('perl>=5.10.0')
 options=('!emptydirs')
 source=("http://search.cpan.org/CPAN/authors/id/G/GA/GARU/Clone-$pkgver.tar.gz")
-md5sums=('22175ef74a6e5f5604cb74d1e4af456e')
+md5sums=('bb7aeeb66b183f600e5a4ccb941cbc1b')
 
 build() {
   cd  Clone-${pkgver}
diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD
index 9f6a4e829..3820d3735 100644
--- a/community/perl-datetime/PKGBUILD
+++ b/community/perl-datetime/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91663 2013-05-26 09:24:55Z bluewind $
+# $Id: PKGBUILD 105763 2014-02-15 20:31:20Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-datetime
-pkgver=1.03
-pkgrel=2
+pkgver=1.07
+pkgrel=1
 pkgdesc="A complete, easy to use date and time object"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/DateTime"
@@ -15,7 +15,7 @@ LC_NUMERIC=C
 provides=("perl-datetime=`printf %.4f $pkgver`")
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz)
-md5sums=('ea0fc830410b9ce3baeef3525bc0acdd')
+md5sums=('2b1745e4f7c0777c02545033588f6394')
 
 build() {
   cd  $srcdir/DateTime-$pkgver
diff --git a/community/perl-dbd-pg/PKGBUILD b/community/perl-dbd-pg/PKGBUILD
index 5bdb15d52..54c85f245 100644
--- a/community/perl-dbd-pg/PKGBUILD
+++ b/community/perl-dbd-pg/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91665 2013-05-26 09:25:00Z bluewind $
+# $Id: PKGBUILD 105418 2014-02-07 09:53:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-dbd-pg
-pkgver=2.19.3
-pkgrel=2
+pkgver=3.0.0
+pkgrel=1
 pkgdesc="Postgres Driver for DBI"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/DBD-Pg"
@@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic')
 depends=('perl-dbi>=1.52' 'postgresql-libs')
 options=('!emptydirs')
 source=("http://www.cpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-${pkgver}.tar.gz")
-md5sums=('026ea19f89aee12051bce23d797e824b')
+md5sums=('58c2613bcb241279aca4c111ba16db48')
 
 build() {
   cd  DBD-Pg-${pkgver}
diff --git a/community/perl-gd/PKGBUILD b/community/perl-gd/PKGBUILD
index e5f0134ec..6be053a96 100644
--- a/community/perl-gd/PKGBUILD
+++ b/community/perl-gd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 93776 2013-07-10 07:27:16Z bpiotrowski $
+# $Id: PKGBUILD 105781 2014-02-15 20:33:01Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+aur@gmail.com>
 
 pkgname=perl-gd
-pkgver=2.50
-pkgrel=2
+pkgver=2.51
+pkgrel=1
 pkgdesc="Interface to Gd Graphics Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/GD"
@@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic')
 depends=('gd')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/L/LD/LDS/GD-$pkgver.tar.gz)
-md5sums=('b2f1e47dfc1c4e4fdda3277f165d36e5')
+md5sums=('49ab25536d4708ab10b7f4879d2fbbc8')
 
 build() {
   cd  $srcdir/GD-$pkgver
diff --git a/community/perl-string-crc32/PKGBUILD b/community/perl-string-crc32/PKGBUILD
index 45af750c0..4c3e9349e 100644
--- a/community/perl-string-crc32/PKGBUILD
+++ b/community/perl-string-crc32/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 91694 2013-05-26 09:26:00Z bluewind $
+# $Id: PKGBUILD 105797 2014-02-15 20:34:32Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 
 pkgname=perl-string-crc32
-pkgver=1.4
-pkgrel=9
+pkgver=1.5
+pkgrel=1
 pkgdesc="Perl/CPAN Module String::CRC32 : ZMODEMlike CRC32 generation"
 arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/String-CRC32"
 license=("GPL" "PerlArtistic")
 options=('!emptydirs')
 source=("http://www.cpan.org/authors/id/S/SO/SOENKE/String-CRC32-${pkgver}.tar.gz")
-md5sums=('9b241bc4a482a3aa59fbb1429bc30546')
+md5sums=('3a9516454722823bd7965d1128d53869')
 
 build() {
   cd String-CRC32-${pkgver}
diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD
index e1f6f5035..513c5857f 100644
--- a/community/perl-xml-libxml/PKGBUILD
+++ b/community/perl-xml-libxml/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100412 2013-11-03 17:59:19Z jsteel $
+# $Id: PKGBUILD 105751 2014-02-15 09:51:59Z 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.0107
+pkgver=2.0110
 pkgrel=1
 pkgdesc="Interface to the libxml library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ replaces=('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=('4caedd8fb64167e1caf0443f18ec47a2')
+md5sums=('5cc869a22613e20d9d0abc58aae11bcd')
 
 build() {
   cd "$srcdir"/XML-LibXML-$pkgver
diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD
index e21cfc56a..8c0b47f60 100644
--- a/community/perl-xml-libxslt/PKGBUILD
+++ b/community/perl-xml-libxslt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100900 2013-11-12 23:39:12Z eric $
+# $Id: PKGBUILD 105747 2014-02-15 01:58:04Z eric $
 # Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
 # Contributor: Justin "juster" Davis <jrcd83@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-xml-libxslt
-pkgver=1.82
+pkgver=1.87
 pkgrel=1
 pkgdesc="Interface to the gnome libxslt library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('perl-xml-libxml' 'libxslt')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-$pkgver.tar.gz)
-md5sums=('91b5432b2c68fcf88b25cfd825b23b14')
+md5sums=('6a9303ffada82422781a36c54d3f4a8f')
 
 build() {
   cd XML-LibXSLT-$pkgver
diff --git a/community/pgadmin3/ChangeLog b/community/pgadmin3/ChangeLog
deleted file mode 100644
index 76de01d7d..000000000
--- a/community/pgadmin3/ChangeLog
+++ /dev/null
@@ -1,28 +0,0 @@
-2008-08-21  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.8.5
-
-2008-06-24  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
-
-	* Updated for i686   - 1.8.4
-
-2008-02-21  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
-
-	* Updated for i686   - 1.8.2
-
-2008-01-05  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
-
-	* Updated for x86_64 - 1.8.1
-	* Updated for i686   - 1.8.1
-
-2007-10-28  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
-
-	* Updated version
-
-2007-10-11  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
-
-	* Updated version
-
-2007-06-28  tardo  <tardo@nagi-fanboi.net>
-	
-	* Built for x86_64
diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD
index 9c4ee420d..73a521e71 100644
--- a/community/pgadmin3/PKGBUILD
+++ b/community/pgadmin3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99091 2013-10-24 10:41:34Z spupykin $
+# $Id: PKGBUILD 103960 2014-01-14 05:57:45Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Benjamin Andresen <benny@klapmuetz.org>
@@ -6,12 +6,12 @@
 
 pkgname=pgadmin3
 pkgver=1.18.1
-pkgrel=3
+pkgrel=8
 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')
+depends=('wxgtk2.8' 'postgresql-libs' 'libxslt')
 makedepends=('libpqxx' 'krb5' 'postgresql' 'imagemagick')
 install=pgadmin3.install
 source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz)
@@ -22,17 +22,18 @@ build() {
   convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgadmin3.png
 
   cd "pgadmin3-${pkgver}"
-  [ -f Makefile ] || ./configure --prefix=/usr
+  sed -i 's/wx-config/wx-config-2.8/' configure
+  [ -f Makefile ] ||  ./configure --prefix=/usr --with-wx-version=2.8
   make
 }
 
 package() {
-  cd $srcdir/pgadmin3-${pkgver}
+  cd "$srcdir"/pgadmin3-${pkgver}
 
-  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/pgAdmin3.ico
+  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/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/phantomjs/PKGBUILD b/community/phantomjs/PKGBUILD
index 9bbf6f5cc..05628853f 100644
--- a/community/phantomjs/PKGBUILD
+++ b/community/phantomjs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97046 2013-09-11 13:42:10Z fyan $
+# $Id: PKGBUILD 104973 2014-01-29 04:07:48Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: grimsock <lord.grimsock at gmail dot com>
 # Contributor: Dieter Plaetinck <dieter@plaetinck.be>
@@ -6,23 +6,19 @@
 # Contributor: Henry Tang <henryykt@gmail.com>
 
 pkgname=phantomjs
-pkgver=1.9.2
+pkgver=1.9.7
 pkgrel=1
 pkgdesc="Headless WebKit with JavaScript API"
 url="http://www.phantomjs.org/"
 license=('BSD' 'LGPL' 'MIT')
 arch=('i686' 'x86_64')
-depends=('gstreamer0.10-base' 'fontconfig' 'freetype2')
-makedepends=('unzip')
-source=("http://phantomjs.googlecode.com/files/${pkgname}-${pkgver}-source.zip")
-noextract=("${pkgname}-${pkgver}-source.zip")
+depends=('gstreamer0.10-base' 'fontconfig' 'freetype2' 'gcc-libs')
+makedepends=('git')
+source=("git+https://github.com/ariya/${pkgname}.git#tag=$pkgver")
 
 build() {
-  # workaround for https://code.google.com/p/libarchive/issues/detail?id=271
-  # cd $srcdir/$pkgname-$pkgver
-  unzip ${pkgname}-${pkgver}-source.zip
+  cd $pkgname
 
-  cd $pkgname-$pkgver
   # workaround for http://code.google.com/p/phantomjs/issues/detail?id=635
   sed -i 's/QMAKE_LFLAGS+=-fuse-ld=gold/#QMAKE_LFLAGS+=-fuse-ld=gold/' src/qt/src/3rdparty/webkit/Source/common.pri
 
@@ -30,13 +26,13 @@ build() {
 }
 
 package() {
-  install -Dm755 "$srcdir/$pkgname-$pkgver/bin/phantomjs" "$pkgdir/usr/bin/phantomjs"
+  install -Dm755 "$srcdir/$pkgname/bin/phantomjs" "$pkgdir/usr/bin/phantomjs"
 
   mkdir -p "$pkgdir/usr/share/$pkgname"
-  cp -r "$srcdir/$pkgname-$pkgver/examples" "$pkgdir/usr/share/$pkgname"/
+  cp -r "$srcdir/$pkgname/examples" "$pkgdir/usr/share/$pkgname"/
 
-  install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE.BSD" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.BSD"
-  install -Dm644 "$srcdir/$pkgname-$pkgver/third-party.txt" "$pkgdir/usr/share/licenses/$pkgname/third-party.txt"
+  install -Dm644 "$srcdir/$pkgname/LICENSE.BSD" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.BSD"
+  install -Dm644 "$srcdir/$pkgname/third-party.txt" "$pkgdir/usr/share/licenses/$pkgname/third-party.txt"
 }
 
-sha512sums=('ada4010a1ba43950f25bcf42bc41f158c8dc91320edff18efece68c69cd16d1246512fbd66e2dcbe9d0ecd71d8587252570072e2499ec9dfce0ac871c0ce2720')
+sha512sums=('SKIP')
diff --git a/community/pianobar/PKGBUILD b/community/pianobar/PKGBUILD
index ca792101e..dcdfc8f05 100644
--- a/community/pianobar/PKGBUILD
+++ b/community/pianobar/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 98105 2013-10-06 00:35:49Z dwallace $
+# $Id: PKGBUILD 103923 2014-01-13 17:16:56Z andyrtr $
 # Maintainer: Daniel Wallace < danielwallace at gtmanfred dot com>
 # Contributor: Mitch Bigelow <ipha00@gmail.com>
 # Contributor: Patrick Palka <patrick@parcs.ath.cx>
 
 pkgname=pianobar
 pkgver=2013.09.15
-pkgrel=1
+pkgrel=2
 pkgdesc="console-based frontend for Pandora"
 url="http://6xq.net/0017"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD
index 079791b09..2d8d73663 100644
--- a/community/pidgin-lwqq/PKGBUILD
+++ b/community/pidgin-lwqq/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102564 2013-12-15 04:07:26Z fyan $
+# $Id: PKGBUILD 105694 2014-02-14 06:29:13Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=pidgin-lwqq
-pkgver=0.2c.20131206
-_commit=41f92cb7d8b4cfb26e51eded734e8110f845cff3
+pkgver=0.2c.20140214
+_commit=de349f7a2d6b1728f4f03e374dd3bc000f4b1248
 pkgrel=1
 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol"
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,21 +20,22 @@ source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit"
         "git://github.com/xiehuc/lwqq.git")
 
 prepare() {
-  cd "$srcdir/$pkgname"
+  cd $pkgname
   git submodule init
   git config submodule."liblwqq".url "$srcdir/lwqq"
   git submodule update
 }
 
 build() {
-  cd "${srcdir}/$pkgname"
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .
+  cd $pkgname
+  
+  #Disable SSL as per upstream suggests
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DSSL=Off .
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname"
+  cd $pkgname
   make DESTDIR="${pkgdir}" install
 }
 
diff --git a/community/pidgin-otr/PKGBUILD b/community/pidgin-otr/PKGBUILD
index 38cfbd399..bc1cd9ced 100644
--- a/community/pidgin-otr/PKGBUILD
+++ b/community/pidgin-otr/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79622 2012-11-09 00:24:37Z ebelanger $
+# $Id: PKGBUILD 103924 2014-01-13 17:16:58Z andyrtr $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=pidgin-otr
 pkgver=4.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Off-the-Record Messaging plugin for Pidgin.'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/community/pidgin-talkfilters/PKGBUILD b/community/pidgin-talkfilters/PKGBUILD
new file mode 100644
index 000000000..f094aa050
--- /dev/null
+++ b/community/pidgin-talkfilters/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Connor Behan <connor.behan@gmail.com>
+
+pkgname=pidgin-talkfilters
+pkgver=2.7.0
+pkgrel=2
+pkgdesc="Implements GNU talkfilters in pidgin chats"
+arch=('i686' 'x86_64')
+url="https://bitbucket.org/rekkanoryo/purple-plugin-pack"
+license=('GPL')
+depends=('libpurple' 'talkfilters')
+makedepends=('intltool' 'gettext' 'python2' 'pidgin')
+source=(https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/purple-plugin-pack-$pkgver.tar.bz2)
+sha256sums=('2bbcf5e778a33968ba7f2864d2a6cb526a8984be3e4151642a583eee8eafb03c')
+
+build() {
+  cd "$srcdir"/purple-plugin-pack-$pkgver
+
+  PYTHON=/usr/bin/python2 \
+    ./configure --prefix=/usr --with-plugins=talkfilters
+}
+
+package() {
+  cd "$srcdir"/purple-plugin-pack-$pkgver
+
+  make
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/pidgin-toobars/PKGBUILD b/community/pidgin-toobars/PKGBUILD
index 4187952c2..1ed3d8c8e 100644
--- a/community/pidgin-toobars/PKGBUILD
+++ b/community/pidgin-toobars/PKGBUILD
@@ -1,25 +1,26 @@
-# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
+# $Id: PKGBUILD 104483 2014-01-21 17:38:13Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: JokerBoy <jokerboy at punctweb dot ro>
 
 pkgname=pidgin-toobars
 pkgver=1.14
-pkgrel=1
-pkgdesc="Pidgin plugin that adds a toolbar and status bar to the buddy list"
+pkgrel=2
+pkgdesc='Pidgin plugin that adds a toolbar and status bar to the buddy list'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://vayurik.ru/wordpress/en/toobars/"
+url='http://vayurik.ru/wordpress/en/toobars/'
 license=('GPL')
 depends=('pidgin')
 makedepends=('intltool')
-source=("http://vayurik.ru/wordpress/wp-content/uploads/toobars/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+source=(http://vayurik.ru/wordpress/wp-content/uploads/toobars/$pkgver/$pkgname-$pkgver.tar.gz)
 md5sums=('0b9255902c10ec1b171329474bd69e82')
 
 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/community/pingus/PKGBUILD b/community/pingus/PKGBUILD
index a049f5d0d..4046afb3a 100644
--- a/community/pingus/PKGBUILD
+++ b/community/pingus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102268 2013-12-07 10:36:53Z bpiotrowski $
+# $Id: PKGBUILD 104769 2014-01-25 18:55:45Z lcarlier $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 
 pkgname=pingus
 pkgver=0.7.6
-pkgrel=10
+pkgrel=11
 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pingus.seul.org"
@@ -23,6 +23,8 @@ build() {
   # fedora patch to fix error due to new standards
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51282
   patch -Np0 -i ${srcdir}/pingus-0.7.6-gcc470-udl.patch
+  # manpage must be in man6, not man1
+  sed -i "s#/man1/#/man6/#g" Makefile
 
   scons prefix=/usr
 }
diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD
index 6d3b73dce..8fe0e0c7e 100644
--- a/community/pinot/PKGBUILD
+++ b/community/pinot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102269 2013-12-07 10:36:55Z bpiotrowski $
+# $Id: PKGBUILD 104802 2014-01-26 12:17:40Z andyrtr $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=pinot
 pkgver=1.06
-pkgrel=2
+pkgrel=3
 pkgdesc='Personal search and metasearch tool'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/pinot-search/'
diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD
index 138f002ad..48e94274c 100644
--- a/community/plan9port/PKGBUILD
+++ b/community/plan9port/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102625 2013-12-16 21:54:40Z arodseth $
+# $Id: PKGBUILD 104876 2014-01-27 23:51:46Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: phrakture <aaronmgriffin--gmail--com>
 # Contributor: Fazlul Shahriar
@@ -6,7 +6,7 @@
 
 pkgname=plan9port
 pkgver=20131024
-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/'
@@ -45,10 +45,10 @@ package() {
     LICENSE
 
   # Fix hardcoded paths
-  #for f in `grep -H -r "$pkgdir$d/$pkgname" | cut -d: -f1`; do
-  #  echo -n "\t$f"
-  #  [ -e "$f" ] && sed -i "s:$pkgdir$d/$pkgname:$d/$pkgname:" "$f" || true
-  #done
+  for f in `grep -H -r "$pkgdir$d/$pkgname" | cut -d: -f1`; do
+    echo -n "\t$f"
+    [ -e "$f" ] && sed -i "s:$pkgdir$d/$pkgname:$d/$pkgname:" "$f" || true
+  done
 
   # Fix python scripts
   find "$pkgdir" -name '*.py' -print0 |xargs -0 \
diff --git a/community/planner/05ba23be296085313abd8d7d5075d962084f5d38.patch b/community/planner/05ba23be296085313abd8d7d5075d962084f5d38.patch
new file mode 100644
index 000000000..591b2f20d
--- /dev/null
+++ b/community/planner/05ba23be296085313abd8d7d5075d962084f5d38.patch
@@ -0,0 +1,26 @@
+From 05ba23be296085313abd8d7d5075d962084f5d38 Mon Sep 17 00:00:00 2001
+From: Alexandre Franke <alexandre.franke@gmail.com>
+Date: Wed, 14 Mar 2012 10:52:25 +0000
+Subject: Better use of fields in the .desktop file
+
+https://bugzilla.gnome.org/show_bug.cgi?id=672033
+---
+diff --git a/data/planner.desktop.in.in b/data/planner.desktop.in.in
+index af61d34..30eb921 100644
+--- a/data/planner.desktop.in.in
++++ b/data/planner.desktop.in.in
+@@ -1,6 +1,10 @@
+ [Desktop Entry]
+-_Name=Project Management
+-_Comment=Planner Project Management
++Version=1.0
++_Name=Planner
++_GenericName=Project Management
++_X-GNOME-FullName=Planner Project Management
++_Comment=Handle the tasks, resources, and cost of your projects
++_Keywords=Gantt;Chart;Critical path;Relationship;Dependency;WBS;
+ Exec=planner %F
+ Icon=gnome-planner.png
+ Terminal=false
+--
+cgit v0.9.2
diff --git a/community/planner/0cc65e2f420af45f78d190ac2af64810a148bb31.patch b/community/planner/0cc65e2f420af45f78d190ac2af64810a148bb31.patch
new file mode 100644
index 000000000..de5a64c37
--- /dev/null
+++ b/community/planner/0cc65e2f420af45f78d190ac2af64810a148bb31.patch
@@ -0,0 +1,41 @@
+From 0cc65e2f420af45f78d190ac2af64810a148bb31 Mon Sep 17 00:00:00 2001
+From: Luis Menina <liberforce@freeside.fr>
+Date: Mon, 11 Mar 2013 00:00:44 +0000
+Subject: Don't crash on an empty print preview, just provide an empty preview.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=581282
+---
+diff --git a/src/planner-print-job.c b/src/planner-print-job.c
+index 6334037..96267a0 100644
+--- a/src/planner-print-job.c
++++ b/src/planner-print-job.c
+@@ -237,17 +237,7 @@ print_job_draw_page (GtkPrintOperation *operation,
+ 
+ 	l = priv->views;
+ 
+-	/* Abort if there is nothing to print.
+-	 *
+-	 * A better solution would be to set the number of pages to print to 0
+-	 * in print_job_begin_print, but 0 is not a valid value for
+-	 * gtk_print_operation_set_n_pages.
+-	 */
+-	if(!l) {
+-		return;
+-	}
+-
+-	while (!page_found) {
++	while (! page_found && l != NULL) {
+ 		v = PLANNER_VIEW (l->data);
+ 
+ 		pages_in_view = planner_view_print_get_n_pages (v);
+@@ -258,8 +248,6 @@ print_job_draw_page (GtkPrintOperation *operation,
+ 		} else {
+ 			page_nr -= pages_in_view;
+ 			l = l->next;
+-
+-			g_assert (l != NULL);
+ 		}
+ 	}
+ }
+--
+cgit v0.9.2
diff --git a/community/planner/PKGBUILD b/community/planner/PKGBUILD
new file mode 100644
index 000000000..5aef75dd1
--- /dev/null
+++ b/community/planner/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 104580 2014-01-23 07:08:15Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: herb  <herb@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=planner
+pkgver=0.14.6
+pkgrel=3
+pkgdesc='Project management application for GNOME'
+arch=('i686' 'x86_64')
+license=('GPL')
+url='https://wiki.gnome.org/Apps/Planner'
+depends=('libgnomecanvas' 'libxslt' 'gconf' 'desktop-file-utils')
+makedepends=('intltool' 'gtk-doc' 'pygtk')
+options=('!emptydirs')
+install=planner.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/planner/${pkgver%.*}/planner-$pkgver.tar.xz
+        f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch
+        05ba23be296085313abd8d7d5075d962084f5d38.patch
+        0cc65e2f420af45f78d190ac2af64810a148bb31.patch
+        cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch
+        fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch)
+sha256sums=('130d29e6d6b8c1994017deba2acca05a4bf83ba1e169635ec8c5c7878abe0696'
+            'bc4455b318bb26f44fe50a8e07292b7654c795ff2a1629a788ea749f6c8bac81'
+            '88a34bb93bca4ae5865f6c70d7d73f3a0009e5137ba2346a8446c6e206e51b20'
+            '0cde21948f01baaa31a9a5f8af76444c7151ad39a0bc45d8e04de8b07837f0ad'
+            '1644550a9be35253fe0a353fc004bd8576de3b85a6b21b92cbb0a87c03f37894'
+            '4275689c2d4493ddcda3a40309a6bbdcdf6323bed80ca2e011138cdcd88da852')
+
+prepare() {
+  cd $pkgname-$pkgver
+  # Upstream fixes
+  patch -Np1 -i ../f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch
+  patch -Np1 -i ../05ba23be296085313abd8d7d5075d962084f5d38.patch
+  patch -Np1 -i ../0cc65e2f420af45f78d190ac2af64810a148bb31.patch
+
+  # Remove deprecated libgnomeui dependency
+  patch -Np1 -i ../cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch
+  patch -Np1 -i ../fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-update-mimedb --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/planner/cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch b/community/planner/cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch
new file mode 100644
index 000000000..722c59ec3
--- /dev/null
+++ b/community/planner/cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch
@@ -0,0 +1,147 @@
+From cd2b658e83d47e8f49d1bbaf54be6433a21d3758 Mon Sep 17 00:00:00 2001
+From: Luis Menina <liberforce@freeside.fr>
+Date: Mon, 04 Mar 2013 17:10:26 +0000
+Subject: Remove deprecated GnomeEntry.
+
+It is replaced by GtkEntry. This means we lose the history
+functionality, but that could be reimplemented using GtkComboBoxText
+with an entry.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=589045
+---
+diff --git a/data/glade/sql.glade b/data/glade/sql.glade
+index 2b12b85..f673ae0 100644
+--- a/data/glade/sql.glade
++++ b/data/glade/sql.glade
+@@ -165,24 +165,16 @@
+ 	  </child>
+ 
+ 	  <child>
+-	    <widget class="GnomeEntry" id="server_entry">
++	    <widget class="GtkEntry" id="server_entry">
+ 	      <property name="visible">True</property>
+-	      <property name="history_id">database_server</property>
+-	      <property name="max_saved">10</property>
+-
+-	      <child internal-child="entry">
+-		<widget class="GtkEntry" id="combo-entry1">
+-		  <property name="visible">True</property>
+-		  <property name="can_focus">True</property>
+-		  <property name="editable">True</property>
+-		  <property name="visibility">True</property>
+-		  <property name="max_length">0</property>
+-		  <property name="text" translatable="yes"></property>
+-		  <property name="has_frame">True</property>
+-		  <property name="invisible_char" translatable="yes">*</property>
+-		  <property name="activates_default">True</property>
+-		</widget>
+-	      </child>
++	      <property name="can_focus">True</property>
++	      <property name="editable">True</property>
++	      <property name="visibility">True</property>
++	      <property name="max_length">0</property>
++	      <property name="text" translatable="yes"></property>
++	      <property name="has_frame">True</property>
++	      <property name="invisible_char" translatable="yes">*</property>
++	      <property name="activates_default">True</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="left_attach">1</property>
+@@ -194,24 +186,16 @@
+ 	  </child>
+ 
+ 	  <child>
+-	    <widget class="GnomeEntry" id="user_entry">
++	    <widget class="GtkEntry" id="user_entry">
+ 	      <property name="visible">True</property>
+-	      <property name="history_id">database_user</property>
+-	      <property name="max_saved">10</property>
+-
+-	      <child internal-child="entry">
+-		<widget class="GtkEntry" id="combo-entry2">
+-		  <property name="visible">True</property>
+-		  <property name="can_focus">True</property>
+-		  <property name="editable">True</property>
+-		  <property name="visibility">True</property>
+-		  <property name="max_length">0</property>
+-		  <property name="text" translatable="yes"></property>
+-		  <property name="has_frame">True</property>
+-		  <property name="invisible_char" translatable="yes">*</property>
+-		  <property name="activates_default">True</property>
+-		</widget>
+-	      </child>
++	      <property name="can_focus">True</property>
++	      <property name="editable">True</property>
++	      <property name="visibility">True</property>
++	      <property name="max_length">0</property>
++	      <property name="text" translatable="yes"></property>
++	      <property name="has_frame">True</property>
++	      <property name="invisible_char" translatable="yes">*</property>
++	      <property name="activates_default">True</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="left_attach">1</property>
+@@ -248,24 +232,16 @@
+ 	  </child>
+ 
+ 	  <child>
+-	    <widget class="GnomeEntry" id="db_entry">
++	    <widget class="GtkEntry" id="db_entry">
+ 	      <property name="visible">True</property>
+-	      <property name="history_id">database_name</property>
+-	      <property name="max_saved">10</property>
+-
+-	      <child internal-child="entry">
+-		<widget class="GtkEntry" id="combo-entry3">
+-		  <property name="visible">True</property>
+-		  <property name="can_focus">True</property>
+-		  <property name="editable">True</property>
+-		  <property name="visibility">True</property>
+-		  <property name="max_length">0</property>
+-		  <property name="text" translatable="yes"></property>
+-		  <property name="has_frame">True</property>
+-		  <property name="invisible_char" translatable="yes">*</property>
+-		  <property name="activates_default">True</property>
+-		</widget>
+-	      </child>
++	      <property name="can_focus">True</property>
++	      <property name="editable">True</property>
++	      <property name="visibility">True</property>
++	      <property name="max_length">0</property>
++	      <property name="text" translatable="yes"></property>
++	      <property name="has_frame">True</property>
++	      <property name="invisible_char" translatable="yes">*</property>
++	      <property name="activates_default">True</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="left_attach">1</property>
+diff --git a/src/planner-sql-plugin.c b/src/planner-sql-plugin.c
+index 14a088c..ea2f46a 100644
+--- a/src/planner-sql-plugin.c
++++ b/src/planner-sql-plugin.c
+@@ -27,7 +27,6 @@
+ #include <stdlib.h>
+ #include <glib.h>
+ #include <glib/gi18n.h>
+-#include <libgnomeui/gnome-entry.h>
+ #include <glade/glade.h>
+ #include <gtk/gtk.h>
+ #include <libgda/libgda.h>
+@@ -950,12 +949,9 @@ sql_plugin_retrieve_db_values (PlannerPlugin  *plugin,
+ 
+ 	gtk_window_set_title (GTK_WINDOW (dialog), title);
+ 
+-	server_entry = gnome_entry_gtk_entry (
+-		GNOME_ENTRY (glade_xml_get_widget (gui, "server_entry")));
+-	db_entry = gnome_entry_gtk_entry (
+-		GNOME_ENTRY (glade_xml_get_widget (gui, "db_entry")));
+-	user_entry = gnome_entry_gtk_entry (
+-		GNOME_ENTRY (glade_xml_get_widget (gui, "user_entry")));
++	server_entry   = glade_xml_get_widget (gui, "server_entry");
++	db_entry       = glade_xml_get_widget (gui, "db_entry");
++	user_entry     = glade_xml_get_widget (gui, "user_entry");
+ 	password_entry = glade_xml_get_widget (gui, "password_entry");
+ 
+ 	str = planner_conf_get_string (CONF_SERVER, NULL);
+--
+cgit v0.9.2
diff --git a/community/planner/f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch b/community/planner/f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch
new file mode 100644
index 000000000..1ee60f528
--- /dev/null
+++ b/community/planner/f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch
@@ -0,0 +1,114 @@
+From f9840c342e4b5767ee35f0d326b7f7eaf56850ed Mon Sep 17 00:00:00 2001
+From: Alexandre Franke <alexandre.franke@gmail.com>
+Date: Mon, 05 Mar 2012 17:22:56 +0000
+Subject: Fix for broken "open file on startup" behaviour
+
+Switch to gtk_init_with_args from GnomeProgam broke opening of files from command line and when double clicking on file in file browser.
+
+Based on patches 193670 and 193835 by Maxim Zakharov.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=656373
+---
+diff --git a/src/planner-main.c b/src/planner-main.c
+index cdeb8ea..c0aabd2 100644
+--- a/src/planner-main.c
++++ b/src/planner-main.c
+@@ -37,7 +37,7 @@ static gchar **args_remaining = NULL;
+ 
+ static GOptionEntry options[] = {
+ 		{ "geometry", 'g', 0, G_OPTION_ARG_STRING, &geometry, N_("Create the initial window with the given geometry."), N_("GEOMETRY")},
+-		{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &args_remaining, NULL, N_("FILES") },
++		{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &args_remaining, NULL, N_("FILES|URIs") },
+ 		{ NULL }
+ 	};
+ 
+@@ -92,26 +92,27 @@ main (int argc, char **argv)
+ 
+ 	gtk_widget_show_all (main_window);
+ 
+-	if (argc > 1) {
+-		i = 1;
+-		while (argv[i]) {
+-			if (g_str_has_prefix (argv[i], "file:")) {
++	if (args_remaining != NULL) {
++		for (i = 0; args_remaining[i]; i++) {
++			gchar *scheme = g_uri_parse_scheme(args_remaining[i]);
++			if (scheme != NULL) {
+ 				planner_window_open_in_existing_or_new (
+-					PLANNER_WINDOW (main_window), argv[i], FALSE);
++					PLANNER_WINDOW (main_window), args_remaining[i], FALSE);
++				g_free(scheme);
+ 			} else {
+ 				gchar *uri;
+ 
+-				if (!g_path_is_absolute (argv[i])) {
++				if (!g_path_is_absolute (args_remaining[i])) {
+ 					/* Relative path. */
+ 					gchar *cwd, *tmp;
+ 
+ 					cwd = g_get_current_dir ();
+-					tmp = g_build_filename (cwd, argv[i], NULL);
++					tmp = g_build_filename (cwd, args_remaining[i], NULL);
+ 					uri = g_filename_to_uri (tmp, NULL, NULL);
+ 					g_free (tmp);
+ 					g_free (cwd);
+ 				} else {
+-					uri = g_filename_to_uri (argv[i], NULL, NULL);
++					uri = g_filename_to_uri (args_remaining[i], NULL, NULL);
+ 				}
+ 
+ 				if (uri) {
+@@ -120,8 +121,6 @@ main (int argc, char **argv)
+ 					g_free (uri);
+ 				}
+ 			}
+-
+-			i++;
+ 		}
+ 	}
+ 
+diff --git a/src/planner-window.c b/src/planner-window.c
+index 73f1766..b0536c3 100644
+--- a/src/planner-window.c
++++ b/src/planner-window.c
+@@ -1726,36 +1726,24 @@ planner_window_open_in_existing_or_new (PlannerWindow *window,
+ {
+ 	PlannerWindowPriv *priv;
+ 	GtkWidget         *new_window;
+-	gchar             *filename;
+ 	gboolean           ret;
+ 
+ 	priv = window->priv;
+-
+-	filename = g_filename_from_uri (uri, NULL, NULL);
+-	if (!filename) {
+-		return FALSE;
+-	}
+-
+ 	if (mrp_project_is_empty (priv->project)) {
+-		ret = planner_window_open (window, filename, internal);
+-		g_free (filename);
++		ret = planner_window_open (window, uri, internal);
+ 		return ret;
+ 	} else {
+ 		new_window = planner_application_new_window (priv->application);
+-		if (planner_window_open (PLANNER_WINDOW (new_window), filename, internal)) {
+-			g_free (filename);
++		if (planner_window_open (PLANNER_WINDOW (new_window), uri, internal)) {
+ 			gtk_widget_show_all (new_window);
+ 			return TRUE;
+ 		} else {
+-			g_free (filename);
+ 			g_signal_emit (new_window, signals[CLOSED], 0, NULL);
+ 			gtk_widget_destroy (new_window);
+ 			return FALSE;
+ 		}
+ 	}
+ 
+-	g_free (filename);
+-
+ 	return FALSE;
+ }
+ 
+--
+cgit v0.9.2
diff --git a/community/planner/fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch b/community/planner/fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch
new file mode 100644
index 000000000..7c1b1d5ef
--- /dev/null
+++ b/community/planner/fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch
@@ -0,0 +1,41 @@
+From fd8da8994f7006b9fcefc90d2fe5c2b484c7871e Mon Sep 17 00:00:00 2001
+From: Luis Menina <liberforce@freeside.fr>
+Date: Mon, 04 Mar 2013 13:42:22 +0000
+Subject: Remove deprecated libgnomeui.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=589045
+---
+diff --git a/README b/README
+index e6d5c31..b2489ef 100644
+--- a/README
++++ b/README
+@@ -59,7 +59,6 @@ Dependencies:
+ GLIB 2.6.0
+ GTK 2.14.0
+ LIBGNOMECANVAS 2.10.0
+-LIBGNOMEUI 2.10.0
+ LIBGLADE 2.3.0
+ GNOME_VFS 2.10.0
+ GCONF 2.10.0
+diff --git a/configure.in b/configure.in
+index 9f3d112..06568fd 100644
+--- a/configure.in
++++ b/configure.in
+@@ -67,7 +67,6 @@ dnl it too, or it will never make it into the spec file!
+ GLIB_REQUIRED=2.6.0
+ GTK_REQUIRED=2.14.0
+ LIBGNOMECANVAS_REQUIRED=2.10.0
+-LIBGNOMEUI_REQUIRED=2.10.0
+ LIBGLADE_REQUIRED=2.3.0
+ GNOME_VFS_REQUIRED=2.10.0
+ GCONF_REQUIRED=2.10.0
+@@ -116,7 +115,6 @@ PKG_CHECK_MODULES(PLANNER,
+ 	gobject-2.0 gmodule-2.0
+ 	gtk+-2.0 >= $GTK_REQUIRED
+ 	libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED
+-	libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
+ 	libglade-2.0 >= $LIBGLADE_REQUIRED
+ 	gconf-2.0 >= $GCONF_REQUIRED
+ ])
+--
+cgit v0.9.2
diff --git a/pcr/qtoctave/qtoctave.install b/community/planner/planner.install
index 28fdb48fb..9d325dbb1 100644
--- a/pcr/qtoctave/qtoctave.install
+++ b/community/planner/planner.install
@@ -1,14 +1,26 @@
+pkgname=planner
+
 post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-mime-database usr/share/mime
+}
+
+pre_upgrade() {
+  pre_remove $1
 }
 
 post_upgrade() {
   post_install $1
 }
 
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
 post_remove() {
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-mime-database usr/share/mime
 }
-
diff --git a/community/plib/PKGBUILD b/community/plib/PKGBUILD
index 294df226d..b612a359a 100644
--- a/community/plib/PKGBUILD
+++ b/community/plib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70925 2012-05-19 18:43:17Z spupykin $
+# $Id: PKGBUILD 103334 2014-01-03 11:08:04Z bpiotrowski $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
@@ -11,6 +11,7 @@ url="http://plib.sourceforge.net/"
 license=('custom:LGPL')
 makedepends=('mesa' 'libxi' 'libxmu')
 source=(http://plib.sourceforge.net/dist/$pkgname-$pkgver.tar.gz)
+options=('staticlibs')
 md5sums=('47a6fbf63668c1eed631024038b2ea90')
 sha1sums=('c2cf7e3e1e58f7b63dae4bb21e4fa82c3e4d4cfc')
 
diff --git a/community/poedit/PKGBUILD b/community/poedit/PKGBUILD
index 3c3858870..a9c7f4b2a 100644
--- a/community/poedit/PKGBUILD
+++ b/community/poedit/PKGBUILD
@@ -1,31 +1,38 @@
-# $Id: PKGBUILD 96184 2013-08-21 12:27:48Z spupykin $
+# $Id: PKGBUILD 105671 2014-02-13 11:03:29Z spupykin $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=poedit
-pkgver=1.5.7
-pkgrel=4
+pkgver=1.6.4
+pkgrel=1
 pkgdesc="Cross-platform gettext catalogs (.po files) editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.poedit.net/"
-license=('custom')
-depends=('wxgtk2.9' 'gtkspell' 'db' 'hicolor-icon-theme' 'gettext')
-makedepends=('pkgconfig' 'boost')
+license=('MIT')
+depends=('wxgtk' 'desktop-file-utils' 'lucene++' 'gtkspell')
+makedepends=('boost' 'libsm')
 install=poedit.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('f5b53ec66a606f088b0aa388595ea5f9')
+#source=(http://www.poedit.net/dl/poedit-$pkgver.tar.gz)
+source=(https://github.com/vslavik/poedit/releases/download/v$pkgver-oss/poedit-$pkgver.tar.gz
+	build-fix.patch)
+md5sums=('203e27826c1baa4de403ce6d1cc60444'
+         '724aed37a6760c8ac9405f9ee4b70c05')
+
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    patch -p1 <$srcdir/build-fix.patch
+}
 
 build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    export WX_CONFIG_PATH=/usr/bin/wx-config-2.9
-    ./configure --prefix=/usr
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure --prefix=/usr --libexecdir=/usr/lib/poedit
     make
 }
 
 package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make DESTDIR=${pkgdir} install
-    install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+    install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/community/poedit/build-fix.patch b/community/poedit/build-fix.patch
new file mode 100644
index 000000000..fb582bf2b
--- /dev/null
+++ b/community/poedit/build-fix.patch
@@ -0,0 +1,235 @@
+diff -wbBur poedit-1.6.4/src/edapp.cpp poedit-1.6.4.my/src/edapp.cpp
+--- poedit-1.6.4/src/edapp.cpp	2014-02-07 22:03:55.000000000 +0400
++++ poedit-1.6.4.my/src/edapp.cpp	2014-02-13 14:49:30.231324614 +0400
+@@ -67,7 +67,6 @@
+ 
+ #include "edapp.h"
+ #include "edframe.h"
+-#include "aboutbox.h"
+ #include "manager.h"
+ #include "prefsdlg.h"
+ #include "parser.h"
+@@ -666,7 +665,7 @@
+     about.SetCopyright(L"Copyright \u00a9 1999-2014 Václav Slavík");
+     about.SetWebSite("http://www.poedit.net");
+ 
+-    PoeditAboutBox(about);
++//    PoeditAboutBox(about);
+ }
+ 
+ 
+@@ -792,7 +791,7 @@
+ void PoeditApp::EmailSupport(const wxString& subject, const wxString& body)
+ {
+     wxString body2(body);
+-    wxString appname(HasLicense() ? "Poedit Pro" : "Poedit");
++    wxString appname("Poedit");
+ 
+ #ifdef __WXOSX__
+     NSString *s = [[NSProcessInfo processInfo] operatingSystemVersionString];
+@@ -927,31 +926,8 @@
+ 
+ void PoeditApp::OnLicense(wxCommandEvent&)
+ {
+-    ShowLicenseInformation();
+ }
+ 
+ void PoeditApp::ImportLicenseKey(const wxString& url)
+ {
+-    PoeditLicense lic = PoeditLicense::FromURL(url);
+-
+-    if (lic.IsValid())
+-    {
+-        lic.Store(); // save valid license
+-        ShowLicenseInformation(nullptr, &lic); // ...and thank the user
+-    }
+-    else if (!lic.Key().empty())
+-    {
+-        // if we at least parsed the data, even if invalid, show it and let the
+-        // user correct them
+-        ShowLicenseInformation(nullptr, &lic);
+-    }
+-    else
+-    {
+-        wxMessageDialog dlg(nullptr, _("Invalid license data."), _("Poedit"), wxOK | wxICON_ERROR);
+-        dlg.SetExtendedMessage(wxString::Format(_("The link doesn't contain valid Poedit license. Try entering it manually or contact support at help@poedit.net.\n\n(%s)"), url));
+-        dlg.ShowModal();
+-    }
+-
+-    if (wxTopLevelWindows.empty())
+-        OpenNewFile();
+ }
+diff -wbBur poedit-1.6.4/src/edapp.h poedit-1.6.4.my/src/edapp.h
+--- poedit-1.6.4/src/edapp.h	2014-02-07 22:03:55.000000000 +0400
++++ poedit-1.6.4.my/src/edapp.h	2014-02-13 14:49:08.831324860 +0400
+@@ -27,8 +27,6 @@
+ #ifndef _EDAPP_H_
+ #define _EDAPP_H_
+ 
+-#include "licensing.h"
+-
+ #include <wx/app.h>
+ #include <wx/string.h>
+ #include <wx/intl.h>
+diff -wbBur poedit-1.6.4/src/edframe.cpp poedit-1.6.4.my/src/edframe.cpp
+--- poedit-1.6.4/src/edframe.cpp	2014-02-07 22:03:55.000000000 +0400
++++ poedit-1.6.4.my/src/edframe.cpp	2014-02-13 14:49:20.301324729 +0400
+@@ -85,9 +85,7 @@
+ #include "errorbar.h"
+ #include "utility.h"
+ #include "languagectrl.h"
+-#include "statistics.h"
+ #include "welcomescreen.h"
+-#include "wordpress.h"
+ #include "errors.h"
+ 
+ #include <wx/listimpl.cpp>
+@@ -1374,8 +1372,6 @@
+ 
+ void PoeditFrame::OnNewForWordpress(wxCommandEvent&)
+ {
+-    CHECK_LICENSE(Wordpress);
+-
+     DoIfCanDiscardCurrentDoc([=]{
+         NewForWordpress();
+     });
+@@ -1466,73 +1462,6 @@
+ void PoeditFrame::NewForWordpress()
+ {
+     // TODO: share code with NewFromPOT()
+-
+-    wxDirDialog dirdlg(this,
+-                    _("Select the folder with the WordPress theme or plugin"),
+-                    "",
+-                    wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST);
+-    if (dirdlg.ShowModal() != wxID_OK)
+-        return;
+-
+-    try
+-    {
+-        std::unique_ptr<ProgressInfo> progress(new ProgressInfo(this, _("WordPress")));
+-        progress->UpdateMessage(_("Analyzing WordPress code..."));
+-
+-        auto wpInfo = WordpressInfo::Analyze(dirdlg.GetPath());
+-        auto catalog = wpInfo.CreateCatalog();
+-
+-        delete m_catalog;
+-        m_catalog = catalog.release();
+-
+-        m_fileName = wpInfo.GetPOFilePath("LANG");
+-        m_catalog->SetFileName(m_fileName);
+-        m_fileExistsOnDisk = false;
+-        m_modified = true;
+-
+-        EnsureContentView(Content::PO);
+-        m_list->CatalogChanged(m_catalog);
+-
+-        UpdateTitle();
+-        UpdateMenu();
+-        UpdateStatusBar();
+-        InitSpellchecker();
+-
+-        progress.reset();
+-
+-        UpdateCatalog();
+-
+-        // Choose the language:
+-        wxWindowPtr<LanguageDialog> dlg(new LanguageDialog(this));
+-
+-        dlg->ShowWindowModalThenDo([=](int retcode){
+-            if (retcode == wxID_OK)
+-            {
+-                Language lang = dlg->GetLang();
+-                m_catalog->Header().Lang = lang;
+-                m_catalog->Header().SetHeaderNotEmpty("Plural-Forms", lang.DefaultPluralFormsExpr());
+-
+-                m_fileName = wpInfo.GetPOFilePath(lang.Code());
+-                m_catalog->SetFileName(m_fileName);
+-                m_fileExistsOnDisk = false;
+-                m_modified = true;
+-
+-                UpdateTitle();
+-                UpdateMenu();
+-                UpdateStatusBar();
+-                RecreatePluralTextCtrls();
+-                InitSpellchecker();
+-                if (m_list)
+-                    m_list->CatalogChanged(m_catalog); // refresh language column
+-            }
+-        });
+-    }
+-    catch (const WordpressException& e)
+-    {
+-        WordpressErrorDialog dlg(this, e);
+-        dlg.ShowModal();
+-        return;
+-    }
+ }
+ 
+ 
+@@ -1728,10 +1657,6 @@
+ 
+ void PoeditFrame::OnStatistics(wxCommandEvent&)
+ {
+-    CHECK_LICENSE(Statistics);
+-
+-    wxWindowPtr<wxDialog> dlg(new StatisticsWindow(this, *m_catalog));
+-    dlg->ShowWindowModalThenDo([dlg](int){});
+ }
+ 
+ 
+diff -wbBur poedit-1.6.4/src/tm/tm_migrate.cpp poedit-1.6.4.my/src/tm/tm_migrate.cpp
+--- poedit-1.6.4/src/tm/tm_migrate.cpp	2014-02-01 22:10:12.000000000 +0400
++++ poedit-1.6.4.my/src/tm/tm_migrate.cpp	2014-02-13 14:15:57.734681082 +0400
+@@ -92,7 +92,7 @@
+     return path.GetFullPath();
+   #endif
+ #else
+-    return wxStandardPaths::Get().GetInstallPrefix() + "/libexec/poedit-dump-legacy-tm";
++    return wxStandardPaths::Get().GetInstallPrefix() + "/lib/poedit/poedit-dump-legacy-tm";
+ #endif
+ }
+ 
+diff -wbBur poedit-1.6.4/src/welcomescreen.cpp poedit-1.6.4.my/src/welcomescreen.cpp
+--- poedit-1.6.4/src/welcomescreen.cpp	2014-02-07 22:03:55.000000000 +0400
++++ poedit-1.6.4.my/src/welcomescreen.cpp	2014-02-13 14:48:36.421325233 +0400
+@@ -118,11 +118,10 @@
+ #endif
+ 
+ 
+-class UpgradeSizer : public wxBoxSizer, public LicenseObserver
++class UpgradeSizer : public wxBoxSizer
+ {
+ public:
+     UpgradeSizer(int orient) : wxBoxSizer(orient) {}
+-    virtual void OnLicenseEntered() { ShowItems(false); }
+ };
+ 
+ } // anonymous namespace
+@@ -203,26 +202,6 @@
+ 
+     sizer->AddSpacer(20);
+ 
+-    if (!HasLicense())
+-    {
+-        auto upgradeSizer = new UpgradeSizer(wxHORIZONTAL);
+-        sizer->Add(upgradeSizer, wxSizerFlags().Align(wxALIGN_RIGHT).Border());
+-        auto upgradeBtn = new wxBitmapButton(this, wxID_ANY, wxArtProvider::GetBitmap("UpgradeBanner"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxDefaultValidator, "Upgrade to Pro");
+-        upgradeBtn->SetBitmapCurrent(wxArtProvider::GetBitmap("UpgradeBannerHighlight"));
+-        upgradeBtn->SetToolTip(_("Upgrade to the Pro version of Poedit with more features."));
+-        upgradeSizer->Add(upgradeBtn);
+-        auto upgradeInfoBtn = new wxBitmapButton(this, wxID_ANY, wxArtProvider::GetBitmap("UpgradeBannerInfo"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxDefaultValidator, "Upgrade to Pro Info");
+-        upgradeInfoBtn->SetBitmapCurrent(wxArtProvider::GetBitmap("UpgradeBannerInfoHighlight"));
+-        upgradeSizer->Add(upgradeInfoBtn);
+-
+-        upgradeBtn->Bind(wxEVT_BUTTON, [=](wxCommandEvent&){
+-            PurchaseUpgrade(UpgradeSource::WelcomeScreen_Upgrade, /*certain=*/false, parent);
+-        });
+-        upgradeInfoBtn->Bind(wxEVT_BUTTON, [=](wxCommandEvent&){
+-            AskUserToUpgradeIfAppliable(UpgradeSource::WelcomeScreen_Info, parent);
+-        });
+-    }
+-
+     sizer->Add(new ActionButton(
+                        this, wxID_OPEN,
+                        _("Edit a translation"),
diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD
index 8c243711e..d6fe96e8e 100644
--- a/community/pokerth/PKGBUILD
+++ b/community/pokerth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102271 2013-12-07 10:36:58Z bpiotrowski $
+# $Id: PKGBUILD 104126 2014-01-16 06:37:17Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
@@ -7,22 +7,22 @@
 
 pkgname=pokerth
 _realname=PokerTH
-pkgver=1.0.1
-pkgrel=3
+pkgver=1.1.1
+pkgrel=1
 pkgdesc="Poker game written in C++/Qt4"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pokerth.net/"
 license=('GPL' 'custom')
 depends=('curl' 'boost-libs' 'gsasl' 'gnutls' 'protobuf'
-         'qt4' 'sdl_mixer' 'libircclient' 'tinyxml')
+         'qt5-base' 'sdl_mixer' 'libircclient' 'tinyxml')
 makedepends=('boost')
 source=("http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2")
-md5sums=('c6dcf0ed68ab50af91371348ffad5d00')
+md5sums=('a7f76f95782099f966e5f2b6809f502a')
 
 build() {
   cd "$srcdir/$_realname-$pkgver-src"
   
-  qmake-qt4 "$pkgname.pro"
+  qmake-qt5 "$pkgname.pro"
   make
 }
 
diff --git a/community/pokerth/gcrypt16.patch b/community/pokerth/gcrypt16.patch
new file mode 100644
index 000000000..818feda09
--- /dev/null
+++ b/community/pokerth/gcrypt16.patch
@@ -0,0 +1,57 @@
+From aa22d39d7753acc56813171e654fa9fa1f0ca759 Mon Sep 17 00:00:00 2001
+From: lotodore <pokerth@lotharmay.de>
+Date: Thu, 19 Dec 2013 12:28:35 +0100
+Subject: [PATCH] Fix for libgcrypt 1.6.0 compile error #247 (supported only on
+ Linux because libgcrypt does not yet support native Windows threads).
+
+---
+ src/net/common/socket_startup.cpp | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/src/net/common/socket_startup.cpp b/src/net/common/socket_startup.cpp
+index 12e8604..59ffc4f 100644
+--- a/src/net/common/socket_startup.cpp
++++ b/src/net/common/socket_startup.cpp
+@@ -37,6 +37,10 @@
+ 
+ #ifndef HAVE_OPENSSL
+ 
++// With libgcrypt 1.6.0, it is no longer supported to provide thread callbacks.
++// Use the default thread implementation instead, and cross fingers that it works with boost thread...
++#if GCRYPT_VERSION_NUMBER < 0x010600
++
+ extern "C" {
+ 
+ 	int gcry_bthread_init()
+@@ -64,12 +68,15 @@
+ 		return 0;
+ 	}
+ 
+-	struct gcry_thread_cbs gcry_threads_boost = {
++	static struct gcry_thread_cbs gcry_threads_boost = {
+ 		GCRY_THREAD_OPTION_USER, gcry_bthread_init, gcry_bmutex_init,
+ 		gcry_bmutex_destroy, gcry_bmutex_lock, gcry_bmutex_unlock,
+ 		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
+ 	};
+ }
++
++#endif // GCRYPT_VERSION_NUMBER < 0x010600
++
+ #endif // not HAVE_OPENSSL
+ 
+ bool
+@@ -78,8 +85,10 @@
+ #ifdef HAVE_OPENSSL
+ 	return SSL_library_init() == 1;
+ #else
+-	gcry_check_version(NULL);
++#if GCRYPT_VERSION_NUMBER < 0x010600
+ 	gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_boost);
++#endif
++	gcry_check_version(NULL);
+ 	gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0);
+ 	gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
+ 	return true;
+-- 
+1.8.5.1
+
diff --git a/community/ponymix/PKGBUILD b/community/ponymix/PKGBUILD
new file mode 100644
index 000000000..49f988710
--- /dev/null
+++ b/community/ponymix/PKGBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Dave Reisner <d@falconindy.com>
+# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
+
+pkgname=ponymix
+pkgver=2
+pkgrel=2
+pkgdesc="CLI PulseAudio Volume Control"
+arch=('i686' 'x86_64')
+url="http://github.com/falconindy/ponymix"
+license=('MIT')
+depends=('pulseaudio' 'libnotify')
+source=("http://code.falconindy.com/archive/ponymix/$pkgname-$pkgver.tar.xz"{,.sig})
+md5sums=('9874c22dbba2805c870ae663331ca4ca'
+         'SKIP')
+
+build() {
+  make -C "$srcdir/$pkgname-$pkgver"
+}
+
+package() {
+  make -C "$srcdir/$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}
+
+# vim: ft=sh syn=sh et
diff --git a/community/portaudio/PKGBUILD b/community/portaudio/PKGBUILD
index 82291a2e5..057403fcf 100644
--- a/community/portaudio/PKGBUILD
+++ b/community/portaudio/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 99961 2013-10-31 02:42:36Z allan $
+# $Id: PKGBUILD 105110 2014-01-31 20:24:11Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 # Contributor: Bob Finch <w9ya@qrparci.net>
 
 pkgname=portaudio
-pkgver=19_20111121
-pkgrel=3
+pkgver=19_20140130
+pkgrel=1
 pkgdesc='A free, cross-platform, open source, audio I/O library.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.portaudio.com/'
@@ -16,13 +16,13 @@ conflicts=('portaudio_cpp')
 provides=('portaudio_cpp')
 replaces=('portaudio_cpp')
 source=("http://www.portaudio.com/archives/pa_stable_v$pkgver.tgz")
-md5sums=('25c85c1cc5e9e657486cbc299c6c035a')
+md5sums=('7f220406902af9dca009668e198cbd23')
 
 build() {
   cd "$srcdir/$pkgname"
 
   ./configure --prefix=/usr --enable-cxx
-  make -j1
+  make
 }
 
 package() {
diff --git a/community/pdns-recursor/PKGBUILD b/community/powerdns-recursor/PKGBUILD
index 876f44eef..34f6d8b28 100644
--- a/community/pdns-recursor/PKGBUILD
+++ b/community/powerdns-recursor/PKGBUILD
@@ -1,33 +1,34 @@
-# $Id: PKGBUILD 100036 2013-10-31 11:20:57Z arodseth $
+# $Id: PKGBUILD 100035 2013-10-31 11:20:48Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Jan Steffens <heftig@archlinux.org>
 
-pkgname=pdns-recursor
+pkgname=powerdns-recursor
 pkgver=3.5.3
-pkgrel=1
-pkgdesc='PowerDNS recursor'
+pkgrel=2
+pkgdesc='Resolving DNS server'
 url='https://www.powerdns.com/'
 license=('GPL')
 arch=('x86_64' 'i686' 'mips64el')
 depends=('gcc-libs' 'lua51')
 makedepends=('boost')
+replaces=('pdns-recursor')
+provides=('pdns-recursor')
+conflicts=('pdns-recursor')
 backup=('etc/powerdns/recursor.conf')
-source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.bz2"
+source=("http://downloads.powerdns.com/releases/pdns-recursor-$pkgver.tar.bz2"
         'pdns-recursor.service')
 sha256sums=('192c0b47a1cfcdccaa88d70fd33766a4c381f4223f966416f15e169df5d58eaa'
-            '51688d9576736fdf210048098fa96c8710bfbd6a63eb4d69d20bac57b299b5f9')
+            'd4f545e85dffa86bf23c89ff0f352c74ec3524dfc53871f129656299222e4fba')
 
 build() {
-  cd "$pkgname-$pkgver"
-
-  make -j1 LUA=1 \
+  make -C "pdns-recursor-$pkgver" -j1 LUA=1 \
     LUA_CPPFLAGS_CONFIG="$(pkg-config --cflags lua5.1)" \
     LUA_LIBS_CONFIG="$(pkg-config --libs lua5.1)"
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd "pdns-recursor-$pkgver"
 
   make SBINDIR="/usr/bin" DESTDIR="$pkgdir" install
   mv "$pkgdir/etc/powerdns/recursor.conf-dist" \
diff --git a/community/pdns-recursor/pdns-recursor.service b/community/powerdns-recursor/pdns-recursor.service
index e8d23ccd0..0859889a6 100644
--- a/community/pdns-recursor/pdns-recursor.service
+++ b/community/powerdns-recursor/pdns-recursor.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=PowerDNS recursing nameserver
+Description=PowerDNS resolving DNS server
 After=network.target
 
 [Service]
diff --git a/community/pdns/PKGBUILD b/community/powerdns/PKGBUILD
index 6045d1a2b..842decd4c 100644
--- a/community/pdns/PKGBUILD
+++ b/community/powerdns/PKGBUILD
@@ -1,35 +1,37 @@
-# $Id: PKGBUILD 102266 2013-12-07 10:36:51Z bpiotrowski $
+# $Id: PKGBUILD 101429 2013-11-25 14:11:30Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kevin Mihelich <kevin@archlinuxarm.org>
 
-pkgname=pdns
-pkgver=3.3
-pkgrel=3
-pkgdesc='Modern, advanced and high performance authoritative-only nameserver'
+pkgname=powerdns
+pkgver=3.3.1
+pkgrel=1
+pkgdesc='Authoritative DNS server'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.powerdns.com/'
 license=('GPL')
-depends=('boost-libs' 'gcc-libs' 'postgresql-libs' 'libmariadbclient' 'sqlite' 'libldap' 'lua51')
+depends=('boost-libs' 'gcc-libs' 'postgresql-libs' 'libmariadbclient' 'sqlite' 'libldap' 'lua')
 makedepends=('boost')
-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')
+provides=('pdns' 'pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
+replaces=('pdns' 'pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
+conflicts=('pdns' 'pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
 options=('!makeflags')
 backup=('etc/powerdns/pdns.conf')
-source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.gz"
+source=("http://downloads.powerdns.com/releases/pdns-$pkgver.tar.gz"
         'pdns.service'
         'pdns.conf')
-sha256sums=('93417bb418ccd1eaf85fc98aa9f687ed175de388fa2624a1978b7cd40dc2b0b6'
+sha256sums=('feb566994725e049391e9b862c9437ca545f1bb970143d2387e474a6ff645bf3'
             'b2358a5951ac944feee15ac03d42ffe9c2a72fa6f57746f77ef8997d54a82040'
             'a1afcccb0d2fb6a6f7a5960de95f8d38ce1ac75ac5e3dcecf09e49f0de10166e')
 
 prepare() {
-  touch "$pkgname-$pkgver/AUTHORS" "$pkgname-$pkgver/NEWS"
+  cd "pdns-$pkgver"
+
+  touch AUTHORS NEWS
 }
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd "pdns-$pkgver"
 
   ./configure \
     --prefix=/usr \
@@ -46,7 +48,7 @@ build() {
 }
 
 package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+  make -C "pdns-$pkgver" DESTDIR="$pkgdir" install
   install -m644 "$srcdir/pdns.conf" "$pkgdir/etc/powerdns/"
   install -Dm644 "$srcdir/pdns.service" \
     "$pkgdir/usr/lib/systemd/system/pdns.service"
diff --git a/community/pdns/pdns.conf b/community/powerdns/pdns.conf
index e71d7155c..e71d7155c 100644
--- a/community/pdns/pdns.conf
+++ b/community/powerdns/pdns.conf
diff --git a/community/pdns/pdns.service b/community/powerdns/pdns.service
index b544ba73e..b544ba73e 100644
--- a/community/pdns/pdns.service
+++ b/community/powerdns/pdns.service
diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD
index c95f667e1..1e8f49b76 100644
--- a/community/pragha/PKGBUILD
+++ b/community/pragha/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 101337 2013-11-22 22:20:43Z ttoepper $
+# $Id: PKGBUILD 104374 2014-01-19 16:29:38Z bpiotrowski $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: J0k3r <moebius282 e4a t gmail D0_T com>
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=pragha
 pkgver=1.1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pragha.wikispaces.com/"
diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD
index c2557b7d1..ecc0580c6 100644
--- a/community/processing/PKGBUILD
+++ b/community/processing/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 99410 2013-10-28 11:54:28Z arodseth $
+# $Id: PKGBUILD 104598 2014-01-23 11:45:02Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=processing
-pkgver=2.1
+pkgver=2.1.1
 pkgrel=1
 arch=('x86_64' 'i686')
 pkgdesc='Programming environment for creating images, animations and interactions'
@@ -10,18 +10,18 @@ url='http://www.processing.org/'
 license=('GPL' 'LGPL')
 depends=('libgl' 'libxxf86vm')
 makedepends=('gendesk')
-options=('!strip') # 'staticlibs')
+options=('!strip')
 
 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=('68a5fd3befeb951c57f3cfcf55e755fc2b8fbd22ad23deae01bd10d8460ce84a'
-              '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
+  sha256sums=('e1799b9ec86633f4fd2c45905d6ac7897f14b1de4ea4913d7ad5b3b8956917d7'
+            '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=('ccb026d685ddb7f28c3292c27ccffa6033a459d0d2dcaa703781736a26dde62f'
-             '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
+  sha256sums=('9b4db11ea9b7b16a4c2c36987a1fadb4971e36023a7fa3259d7763e068b17284'
+            '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
 fi
 
 prepare() {
diff --git a/community/prosody/ChangeLog b/community/prosody/ChangeLog
deleted file mode 100644
index 45f3a05fd..000000000
--- a/community/prosody/ChangeLog
+++ /dev/null
@@ -1,398 +0,0 @@
-2009-11-23  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.6.0-1 for changeset 6c5b7e66bee4
-	[d573d1d7a403] [tip]
-
-	* .hgtags:
-	Removed tag v0.6.0-1
-	[6c5b7e66bee4] [v0.6.0-1]
-
-	* PKGBUILD:
-	Use correct package name and version
-	[1e65e6a877d3]
-
-	* .hgtags:
-	Added tag v0.6.0-1 for changeset ad52fee15148
-	[8196689dd4c4]
-
-	* PKGBUILD, prosody.cfg.lua:
-	Included mod_compression in example configuration file
-	[ad52fee15148]
-
-	* ChangeLog:
-	Updated ChangeLog
-	[34b6046aca14]
-
-	* PKGBUILD:
-	Updated checksums
-	[3b4c28f28321]
-
-	* PKGBUILD, prosody.cfg.lua:
-	New upstream version
-	[9d201755b63d]
-
-2009-10-22  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.6.0rc1-1 for changeset c0a99ab935a8
-	[a0e2015435b6]
-
-	* ChangeLog, PKGBUILD:
-	New upstream version
-	[c0a99ab935a8] [v0.6.0rc1-1]
-
-	* PKGBUILD:
-	Removed conflicts
-	[0f0560190a81]
-
-	* PKGBUILD:
-	Removed makedepends for gcc, the base-devel group is assumed to
-	exist
-	[4160ed469fa4]
-
-	* PKGBUILD:
-	Fix typo in PKGBUILD
-	[85d988c7e4a5]
-
-2009-09-28  Dwayne Bent  <dbb.0@liqd.org>
-
-	* ChangeLog, PKGBUILD:
-	New upstream version
-	[3e4ffcdc887a]
-
-2009-07-29  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.5.1-1 for changeset 1be51884e580
-	[74f32914279c]
-
-	* ChangeLog, PKGBUILD:
-	New upstream version
-	[1be51884e580] [v0.5.1-1]
-
-2009-07-20  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Corrected tag name
-	[d9662df69ab4]
-
-	* .hgtags:
-	Added tag v0.5.0 for changeset d228983b5873
-	[a350368643eb]
-
-	* PKGBUILD:
-	New upstream version
-	[d228983b5873] [v0.5.0-1]
-
-	* ChangeLog:
-	Updated ChangeLog
-	[111cf16bfc8b]
-
-2009-07-14  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.5.0rc2-1 for changeset 701e6c5ed639
-	[828bb0fc4e5e]
-
-	* PKGBUILD:
-	New upstream version
-	[701e6c5ed639] [v0.5.0rc2-1]
-
-	* ChangeLog:
-	Updated ChangeLog
-	[7616eaf8b835]
-
-	* prosody.cfg.lua:
-	Enabled PEP in default configuration
-	[c8a7c4d15e38]
-
-2009-07-11  Dwayne Bent  <dbb.0@liqd.org>
-
-	* prosody.cfg.lua:
-	Cleaned up and added new modules to default configuration file
-	[07fdc8fd8ff9]
-
-	* PKGBUILD:
-	Added luasec back as hard dependency
-	[9506bff48c77]
-
-	* .hgtags:
-	Added tag v0.5.0rc1-2 for changeset a252809a03a3
-	[803ace20879a]
-
-	* ChangeLog, PKGBUILD:
-	New release version
-	[a252809a03a3] [v0.5.0rc1-2]
-
-	* PKGBUILD:
-	Added make before make install
-
-	This should fix Prosody not correctly reporting version.
-	[881eca5b8e0e]
-
-	* .hgtags:
-	Added tag v0.5.0rc1-1 for changeset f1d918d4779e
-	[1fc8dbc498d5]
-
-	* ChangeLog:
-	New upstream version
-	[f1d918d4779e] [v0.5.0rc1-1]
-
-	* PKGBUILD, prosody.rcd:
-	Redid indent alignment and silenced successful output of prosodyctl
-	[de9bdd756bd8]
-
-	* PKGBUILD, prosody-datadir.diff:
-	Converted to prosody-devel package
-	[92e5e98529dd]
-
-2009-06-30  Dwayne Bent  <dbb.0@liqd.org>
-
-	* PKGBUILD, prosody.cfg.lua:
-	Moved luasec from depends to optdepends
-
-	Since luasec is not strictly required for Prosody to operate it is
-	now an optional dependency.
-	[7079ec87eef5]
-
-2009-06-27  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.4.2-4 for changeset 0345a59e8495
-	[1e488e1c03eb]
-
-	* PKGBUILD:
-	New release version
-	[0345a59e8495] [v0.4.2-4]
-
-	* prosody.install:
-	Added note about ChangeLog to install script
-	[c683ef309b6a]
-
-	* PKGBUILD, prosody.rcd:
-	Use prosodyctl to start/stop daemon
-	[eaf4c26bb29f]
-
-	* PKGBUILD, prosody.rcd:
-	Refactored start, stop, reload in rc.d script
-
-	Start, stop, reload will not display a friendly error message if
-	Prosody is not running when you attempt to stop or reload, or if
-	Prosody is already running when you attempt to start. Reload also
-	now utilizes the get_pid function.
-	[9873d5256a42]
-
-	* PKGBUILD, prosody.logrotated:
-	Use explicit log filenames in logrotate script
-
-	This fixes an issue where if you do not have olddir enabled, rotated
-	logs will be rotated again.
-	[38ea11efacb9]
-
-2009-06-22  Dwayne Bent  <dbb.0@liqd.org>
-
-	* PKGBUILD, prosody.rcd:
-	Added status command to rc.d usage
-	[1b31e88d992d]
-
-	* PKGBUILD, prosody.rcd:
-	Added reload command
-	[62e3cbdff1d5]
-
-	* prosody.install:
-	Updated leftover olddir path
-	[e91b3fc2a9ee]
-
-	* PKGBUILD, prosody.rcd:
-	Use explicit source command
-	[b790c098d519]
-
-	* prosody.install:
-	Removed tab characters
-	[870316274137]
-
-2009-06-20  Dwayne Bent  <dbb.0@liqd.org>
-
-	* PKGBUILD:
-	Updated md5 sums
-	[74ce2ab8a96b]
-
-	* prosody.logrotated:
-	Changed default olddir path
-	[cef8226473c2]
-
-	* prosody.rcd:
-	Removed sleep delay in restart
-	[a94167e59091]
-
-2009-06-10  Dwayne Bent  <dbb.0@liqd.org>
-
-	* prosody.cfg.lua:
-	Removed per-host certificate entry in example configuration
-
-	Until Issue #30
-	[http://code.google.com/p/lxmppd/issues/detail?id=30] is fixed per-
-	host certificates have no effect.
-	[d00e35979450]
-
-2009-06-05  Dwayne Bent  <dbb.0@liqd.org>
-
-	* ChangeLog:
-	Added ChangeLog
-	[7298c4da135a]
-
-2009-06-03  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.4.2-3 for changeset 028183ffeba8
-	[7dbfd040e908]
-
-	* PKGBUILD:
-	New release version
-	[028183ffeba8] [v0.4.2-3]
-
-	* PKGBUILD:
-	Removed superfluous make command
-	[3d96c98bac26]
-
-	* PKGBUILD:
-	More consistent use of quote marks
-	[f6bd5b595b2d]
-
-	* PKGBUILD, prosody.logrotated:
-	Correct PID file location in logrotate script
-	[cec60904c739]
-
-2009-05-30  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.4.2-2 for changeset 37268dd0d4fd
-	[a8a197635bb6]
-
-	* PKGBUILD:
-	New release version
-	[37268dd0d4fd] [v0.4.2-2]
-
-	* PKGBUILD:
-	Use install instead of mkdir in PKGBUILD
-	[8e48108bbe9a]
-
-	* PKGBUILD, prosody-datadir.diff:
-	Apply patch to fix world-readable data directory
-	[2c706dda941c]
-
-2009-05-23  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.4.2-1 for changeset 1d29ea2dc519
-	[e2d2962de3f7]
-
-	* PKGBUILD:
-	New upstream release
-	[1d29ea2dc519] [v0.4.2-1]
-
-	* prosody.cfg.lua:
-	Aesthetic changes to the configuration file
-	[d5d848a58965]
-
-2009-05-22  Dwayne Bent  <dbb.0@liqd.org>
-
-	* prosody.cfg.lua:
-	Removed extraneous semicolon in configuration file
-	[9a002c74edc2]
-
-	* PKGBUILD:
-	Cleaned up PKGBUILD license
-	[82cb66a84de8]
-
-2009-05-21  Dwayne Bent  <dbb.0@liqd.org>
-
-	* prosody.install:
-	Changed formatting of leftover path messages.
-	[ac6069de93c9]
-
-	* prosody.install:
-	Moved prosody user removal to post_remove.
-	[2c60e27d0c13]
-
-	* PKGBUILD, prosody.cfg.lua:
-	Added comment about pidfile in prosody configuration file.
-	[8b9fa4da48ca]
-
-	* .hgtags:
-	Added tag v0.4.1-5 for changeset 69962178bcae
-	[01812099521b]
-
-	* PKGBUILD:
-	New release version.
-	[69962178bcae] [v0.4.1-5]
-
-	* PKGBUILD, prosody.cfg.lua, prosody.install, prosody.rcd:
-	Refactored rc.d daemon script.
-
-	Prosody now writes its own PID file to /var/run/prosody/prosody.pid.
-	rc.d script now uses '/bin/kill -0' to check for running process
-	instead of awkward combination of 'ps' and 'awk'.
-	[4f0e937c5148]
-
-	* prosody.install:
-	Added post_install message with link to Arch Wiki documentation.
-	[88d99267ad19]
-
-2009-05-19  Dwayne Bent  <dbb.0@liqd.org>
-
-	* PKGBUILD:
-	Add logrotate script to backup array.
-	[d4f5445707f7]
-
-2009-05-11  Dwayne Bent  <dbb.0@liqd.org>
-
-	* prosody.install:
-	Fixed install script attempting to add prosody group when it already
-	exists.
-	[7d7807aa5d30]
-
-	* .hgtags:
-	Added tag v0.4.1-4 for changeset 442f62077f30
-	[389c885a35c5]
-
-	* PKGBUILD:
-	New release version.
-	[442f62077f30] [v0.4.1-4]
-
-	* PKGBUILD:
-	Generated correct checksums for source files.
-	[162859c9e287]
-
-	* .hgtags:
-	Added tag v0.4.1-3 for changeset b629392e4716
-	[f3d11fbd0b45]
-
-	* PKGBUILD:
-	New release version.
-	[b629392e4716] [v0.4.1-3]
-
-	* prosody.logrotated:
-	Fixed wrong PID file path in logrotate script.
-	[0871a4a12392]
-
-2009-05-07  Dwayne Bent  <dbb.0@liqd.org>
-
-	* prosody.cfg.lua, prosody.rcd:
-	Removed trailing whitespace.
-	[7c86c073650e]
-
-	* prosody.cfg.lua:
-	Added logging timestamps to default configuration.
-	[46f9111d47ce]
-
-	* .hgtags:
-	Added tag v0.4.1-2 for changeset 24b9dee19e65
-	[5240b39d76d7]
-
-	* PKGBUILD, prosody.cfg.lua, prosody.install, prosody.logrotated,
-	prosody.rcd:
-	Initial commit.
-	[24b9dee19e65] [v0.4.1-2]
-
diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD
index 2ab0743cc..359b55a6b 100644
--- a/community/prosody/PKGBUILD
+++ b/community/prosody/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 97026 2013-09-10 15:54:28Z spupykin $
+# $Id: PKGBUILD 105722 2014-02-14 11:30:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Dwayne Bent <dbb@dbb.io>
 # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
 # Contributor: Timothée Ravier <tim@siosm.fr>
 
 pkgname=prosody
-pkgver=0.9.1
-pkgrel=1
+pkgver=0.9.3
+pkgrel=2
 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://prosody.im/"
@@ -22,13 +22,7 @@ source=("http://prosody.im/downloads/source/${pkgname}-${pkgver}.tar.gz"{,.asc}
         'fix-config.patch'
         'prosody.tmpfile.d'
         'prosody.service')
-sha256sums=('f0e5e5fa27aa3ffec326b6c212adf2d86fb438133739d45e1232082ff0fbe06f'
-            'SKIP'
-            '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f'
-            '1b461d860b584c09ba4c16300a245f2580f1d0b74d774ae7567b7aac0f249587'
-            '3f5cc5db2cfe74c4edf91f60e692e04c3504025e893d0880114d52728a2c4bc4'
-            '16fbfb54bf21bb73ce9d9acacb60d47f237c35e842c5a00f1153f72f0d2f7f6b')
-sha256sums=('6cdea6fd6027bec621f7995709ca825a29aa5e066b321bfbb7785925c9f32cd5'
+sha256sums=('22d2427fae4858d15b4f695348fb7781e4c65c04a24171837985024e76799ea0'
             'SKIP'
             '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f'
             'db37b1b6bcd648f264164c5db5e754fc077671c74df6079c101384e146f4d6da'
@@ -38,8 +32,6 @@ sha256sums=('6cdea6fd6027bec621f7995709ca825a29aa5e066b321bfbb7785925c9f32cd5'
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -p1 < ../fix-config.patch
-  find . -type f -exec \
-    sed -i '1s,^#! \?/usr/bin/\(env \|\)lua$,#!/usr/bin/lua5.1,' {} \;
 }
 
 build() {
@@ -47,7 +39,8 @@ build() {
   ./configure --ostype=linux --prefix=/usr --sysconfdir=/etc/prosody \
     --datadir=/var/lib/prosody --with-lua-include=/usr/include/lua5.1 \
     --cflags="${CFLAGS} -fPIC -Wall -Wextra -D_GNU_SOURCE" \
-    --ldflags="${LDFLAGS} -shared"
+    --ldflags="${LDFLAGS} -shared" --no-example-certs \
+    --runwith=lua5.1
   make
 }
 
@@ -56,7 +49,7 @@ package() {
   make DESTDIR="${pkgdir}" install
   make DESTDIR="${pkgdir}" install -C tools/migration
 
-  install -Dm 0644 $srcdir/prosody.logrotated "${pkgdir}"/etc/logrotate.d/prosody
+#  install -Dm 0644 $srcdir/prosody.logrotated "${pkgdir}"/etc/logrotate.d/prosody
   install -Dm 0644 $srcdir/prosody.tmpfile.d "${pkgdir}"/usr/lib/tmpfiles.d/prosody.conf
   install -Dm 0644 $srcdir/prosody.service "${pkgdir}"/usr/lib/systemd/system/prosody.service
 
@@ -65,7 +58,6 @@ package() {
   done
 
   install -Dm 0644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
-  install -dm 755 "${pkgdir}"/var/log/prosody
   rm "${pkgdir}"/etc/prosody/certs/*
 }
 
diff --git a/community/prosody/prosody.install b/community/prosody/prosody.install
index a77801d7b..dbd78bb62 100644
--- a/community/prosody/prosody.install
+++ b/community/prosody/prosody.install
@@ -7,7 +7,7 @@ post_install() {
     fi
 
     chown prosody:prosody var/lib/prosody
-    chown prosody:prosody var/log/prosody
+    [ -d var/log/prosody ] && chown prosody:prosody var/log/prosody
 
     echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody"
 
diff --git a/community/pv/PKGBUILD b/community/pv/PKGBUILD
index 00761c7a0..2ef614ef3 100644
--- a/community/pv/PKGBUILD
+++ b/community/pv/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 98158 2013-10-06 19:15:22Z jlichtblau $
+# $Id: PKGBUILD 105108 2014-01-31 20:17:47Z lfleischer $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 
 pkgname=pv
-pkgver=1.4.12
+pkgver=1.5.1
 pkgrel=1
 pkgdesc='A terminal-based tool for monitoring the progress of data through a pipeline.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url='http://www.ivarch.com/programs/pv.shtml'
 license=('custom:Artistic 2.0')
 depends=('glibc')
 source=("http://www.ivarch.com/programs/sources/$pkgname-$pkgver.tar.bz2")
-md5sums=('605adc0f369496bca92b0656cf86b25e')
+md5sums=('fb7ecf2f5a8d5562d618efd5d85cdf82')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/pymol/PKGBUILD b/community/pymol/PKGBUILD
index 352ea5f1c..65a78d1a7 100644
--- a/community/pymol/PKGBUILD
+++ b/community/pymol/PKGBUILD
@@ -1,21 +1,38 @@
-# Maintainer: Evgeniy Alekseev <arcanis dot arch at gmail dot com>
+# $Id: PKGBUILD 105733 2014-02-14 15:40:11Z arcanis $
+# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
 # Contributor: graysky
 # Contributor: Tomasz Żok <tomasz dot zok at gmail dot com>
 
 pkgname=pymol
-pkgver=1.6.0.0
+pkgver=1.7.0.0
 pkgrel=2
-pkgdesc="A USER-SPONSORED molecular visualization system on an OPEN-SOURCE foundation"
+pkgdesc="Molecular visualization system on an Open Source foundation"
 arch=('i686' 'x86_64')
 url="http://pymol.org/"
 license=('custom')
-depends=('glut' 'glew' 'mesa' 'python-pmw' 'tcl' 'tcsh' 'tk')
-source=("http://downloads.sourceforge.net/project/pymol/pymol/1.6/pymol-v${pkgver}.tar.bz2")
-md5sums=('6f5db5beea7497f5a414c8e0cf1ae53d')
+depends=('glew' 'glut' 'mesa' 'python2-numpy' 'python2-pmw' 'tcsh')
+makedepends=('desktop-file-utils' 'gendesk')
+source=("http://downloads.sourceforge.net/project/pymol/pymol/1.7/pymol-v${pkgver}.tar.bz2"
+        "${pkgname}-38899.patch")
+install="${pkgname}.install"
+md5sums=('36fc735f6104e59802f109d0d25b6676'
+         '1f8152c4604ba2939b24e25a022937ca')
 
 prepare() {
+  # create desktop file
+  gendesk -f --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --name="PyMOL" --categories="Science;Chemistry"
+  
   # suppress non-zero exit code that breaks makepkg
-  sed -i '/sys.exit/ s,2,0,' "${srcdir}/${pkgname}/setup.py"
+  sed -i '/sys.exit/ s,2,0,' "${srcdir}/pymol/setup.py"
+  # change python to python2
+  sed -i "s|python|python2|g" "${srcdir}/pymol/test/cyg"
+  sed -i "s|python|python2|g" "${srcdir}/pymol/test/run"
+  sed -i "s|python|python2|g" "${srcdir}/pymol/test/show"
+  sed -i "s|python|python2|g" "${srcdir}/pymol/modules/pmg_tk/startup/apbs_tools.py"
+  
+  # fix FS#38899
+  patch -p0 -i "${pkgname}-38899.patch"
+  mv "${srcdir}/${pkgname}/modules/web" "${srcdir}/${pkgname}/modules/pymolweb"
 }
 
 build() {
@@ -25,18 +42,12 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}"
-  python2 setup.py install --prefix="usr/" --root="${pkgdir}"
-  
-  sed -i "s|${pkgdir}||g" pymol
-  install -D -m755 "pymol" "${pkgdir}/usr/bin/pymol"
-  
-  # change python to python2
-  sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pymol/pymol_path/test/run"
-  sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pymol/pymol_path/test/cyg"
-  sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pmg_tk/startup/apbs_tools.py"
-  sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pymol/pymol_path/test/show"
-  
-  install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  python2 setup.py install --prefix=/usr --root="${pkgdir}"
+  sed -i "s|"${pkgdir}"||g" pymol
+  install -Dm755 "pymol" "${pkgdir}/usr/bin/pymol"
+  install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 "${srcdir}/pymol.desktop" "${pkgdir}/usr/share/applications/pymol.desktop"
+  install -Dm644 "${srcdir}/pymol.png" "${pkgdir}/usr/share/pixmaps/pymol.png"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/pymol/pymol-38899.patch b/community/pymol/pymol-38899.patch
new file mode 100644
index 000000000..8e4baf416
--- /dev/null
+++ b/community/pymol/pymol-38899.patch
@@ -0,0 +1,251 @@
+diff -ruN pymol.orig/modules/pymol/importing.py pymol/modules/pymol/importing.py
+--- pymol.orig/modules/pymol/importing.py	2014-01-15 00:02:55.000000000 +0400
++++ pymol/modules/pymol/importing.py	2014-02-14 10:19:11.275591741 +0400
+@@ -473,7 +473,7 @@
+     def _processPWG(fname,_self=cmd):
+         r = DEFAULT_ERROR
+         try:
+-            from web.pymolhttpd import PymolHttpd
++            from pymolweb.pymolhttpd import PymolHttpd
+             browser_flag = 0
+             launch_flag = 0
+             report_url = None
+diff -ruN pymol.orig/modules/web/examples/content/SOP.html pymol/modules/web/examples/content/SOP.html
+--- pymol.orig/modules/web/examples/content/SOP.html	2014-01-15 00:02:58.000000000 +0400
++++ pymol/modules/web/examples/content/SOP.html	2014-02-14 10:19:11.275591741 +0400
+@@ -49,7 +49,7 @@
+ The first seven
+ <a href="../index.html#sample01" target="_blank"> sample applications</a>
+  are implemented like this, residing in folders at
+-<code>$PYMOL_PATH/modules/web/examples/sample[0-7]</code> There
++<code>$PYMOL_PATH/modules/pymolweb/examples/sample[0-7]</code> There
+ may be future PyMOL web applications delivered with new versions of
+ PyMOL.  Of course, you are free to write your own PyMOL web
+ applications and store them on each user's machine, or perhaps on a
+diff -ruN pymol.orig/modules/web/examples/content/pwg.html pymol/modules/web/examples/content/pwg.html
+--- pymol.orig/modules/web/examples/content/pwg.html	2014-01-15 00:02:58.000000000 +0400
++++ pymol/modules/web/examples/content/pwg.html	2014-02-14 10:19:11.275591741 +0400
+@@ -58,13 +58,13 @@
+ 
+ <p>In contrast, the PWG file which launches the Sample 01 application is:</p>
+ <pre>
+-root $PYMOL_PATH/modules/web/examples/sample01/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample01/htdocs
+ browser
+ </pre>
+ 
+ <p>which tells PyMOL to (1) launch its internal web server on a
+ dynamically assigned port with a root content directory of
+-$PYMOL_PATH/modules/web/examples/sample01/htdocs and (2) open
++$PYMOL_PATH/modules/pymolweb/examples/sample01/htdocs and (2) open
+ up a local browser window pointing at that server instance.  The
+ assumption in this scenario is that this newly-opened web page will be
+ responsible for sending requests to the PyMOL server (and thus, will
+diff -ruN pymol.orig/modules/web/examples/content/running.html pymol/modules/web/examples/content/running.html
+--- pymol.orig/modules/web/examples/content/running.html	2014-01-15 00:02:58.000000000 +0400
++++ pymol/modules/web/examples/content/running.html	2014-02-14 10:19:11.278925074 +0400
+@@ -36,7 +36,7 @@
+ 
+ <p>The main index file with sample application links is located at</p>
+ 
+-<pre>./modules/web/examples/index.html</pre>
++<pre>./modules/pymolweb/examples/index.html</pre>
+ 
+ <p>If you are reading this file from within a browser, then you may
+ <a href="../index.html">return to it now</a> in order to try the sample
+@@ -55,7 +55,7 @@
+ 
+ <pre># from within the PyMOL folder
+ 
+-cd ./modules/web/examples
++cd ./modules/pymolweb/examples
+ 
+ # then
+ 
+diff -ruN pymol.orig/modules/web/examples/content/server.html pymol/modules/web/examples/content/server.html
+--- pymol.orig/modules/web/examples/content/server.html	2014-01-15 00:02:58.000000000 +0400
++++ pymol/modules/web/examples/content/server.html	2014-02-14 10:19:11.278925074 +0400
+@@ -18,7 +18,7 @@
+ browser window).</p>
+ 
+ <p>The source code is located at
+-<code>$PYMOL_PATH/modules/web/pymolhttpd.py</code>,
++<code>$PYMOL_PATH/modules/pymolweb/pymolhttpd.py</code>,
+ and this file serves as a python module that can be imported by any
+ python script running inside of PyMOL. </p>
+ 
+@@ -33,7 +33,7 @@
+ <p>Alternatively, pymolhttpd.py can be used as the start-up script
+ when you launch PyMOL.</p>
+ 
+-<pre>pymol $PYMOL_PATH/modules/web/pymolhttpd.py</pre>
++<pre>pymol $PYMOL_PATH/modules/pymolweb/pymolhttpd.py</pre>
+ 
+ <p>This will cause PyMOL to start serving requests on the default port
+ (8080, assuming of course that the port is not already claimed by
+@@ -44,7 +44,7 @@
+ <p>
+ The PyMOL web server module can be imported into and launched using code like this.
+ <pre>
+-from web import pymolhttpd
++from pymolweb import pymolhttpd
+ httpd = pymolhttpd.PymolHttpd("htdocs", 8080)
+ httpd.start()
+ </pre>
+diff -ruN pymol.orig/modules/web/examples/index.html pymol/modules/web/examples/index.html
+--- pymol.orig/modules/web/examples/index.html	2014-01-15 00:02:58.000000000 +0400
++++ pymol/modules/web/examples/index.html	2014-02-14 10:19:11.288925075 +0400
+@@ -156,7 +156,7 @@
+ services interface!</p>
+ 
+ <p>The code for the applications above is located inside a series of folders located at:
+-<pre>$PYMOL_PATH/modules/web/examples/sample*</pre></p>
++<pre>$PYMOL_PATH/modules/pymolweb/examples/sample*</pre></p>
+ 
+ </body>
+ </html>
+diff -ruN pymol.orig/modules/web/examples/sample01/htdocs/api.html pymol/modules/web/examples/sample01/htdocs/api.html
+--- pymol.orig/modules/web/examples/sample01/htdocs/api.html	2014-01-15 00:02:56.000000000 +0400
++++ pymol/modules/web/examples/sample01/htdocs/api.html	2014-02-14 10:19:11.288925075 +0400
+@@ -9,9 +9,9 @@
+ </ul><hr><p>Please click the link(s) below before testing methods in this section (in order).</p><pre><a target="result" href="/apply/pymol.cmd.reinitialize">/apply/pymol.cmd.reinitialize</a></pre>
+ 
+ <ul><li><p><font face="Courier" size="2"><b>load</b></font> 
+-<i>filename, object, state, format, finish, discrete, quiet, multiplex, zoom, partial</i><pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb</a></pre>
++<i>filename, object, state, format, finish, discrete, quiet, multiplex, zoom, partial</i><pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb</a></pre>
+ 
+-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/map.ccp4">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/map.ccp4</a></pre>
++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/map.ccp4">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/map.ccp4</a></pre>
+ 
+ </p></li>
+ <li><p><font face="Courier" size="2"><b>enable</b></font> 
+@@ -38,7 +38,7 @@
+ </p></li>
+ </ul><hr><p>Please click the link(s) below before testing methods in this section (in order).</p><pre><a target="result" href="/apply/pymol.cmd.reinitialize">/apply/pymol.cmd.reinitialize</a></pre>
+ 
+-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb</a></pre>
++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb</a></pre>
+ 
+ <ul><li><p><font face="Courier" size="2"><b>color</b></font> 
+ <i>color, selection, quiet, flags</i><pre><a target="result" href="/apply/pymol.cmd.color?color=yellow&selection=elem c">/apply/pymol.cmd.color?color=yellow&selection=elem c</a></pre>
+@@ -118,9 +118,9 @@
+ </p></li>
+ </ul><hr><p>Please click the link(s) below before testing methods in this section (in order).</p><pre><a target="result" href="/apply/pymol.cmd.reinitialize">/apply/pymol.cmd.reinitialize</a></pre>
+ 
+-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb</a></pre>
++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb</a></pre>
+ 
+-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/map.ccp4">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/map.ccp4</a></pre>
++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/map.ccp4">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/map.ccp4</a></pre>
+ 
+ <ul><li><p><font face="Courier" size="2"><b>isomesh</b></font> 
+ <i>name, map, level, selection, buffer, state, carve, source_state, quiet</i><pre><a target="result" href="/apply/pymol.cmd.isomesh?name=mesh&map=map&level=1.0">/apply/pymol.cmd.isomesh?name=mesh&map=map&level=1.0</a></pre>
+@@ -142,7 +142,7 @@
+ </p></li>
+ </ul><hr><p>Please click the link(s) below before testing methods in this section (in order).</p><pre><a target="result" href="/apply/pymol.cmd.reinitialize">/apply/pymol.cmd.reinitialize</a></pre>
+ 
+-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb</a></pre>
++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb</a></pre>
+ 
+ <ul><li><p><font face="Courier" size="2"><b>show</b></font> 
+ <i>representation, selection</i><pre><a target="result" href="/apply/pymol.cmd.show?representation=sticks">/apply/pymol.cmd.show?representation=sticks</a></pre>
+@@ -174,7 +174,7 @@
+ </p></li>
+ </ul><hr><p>Please click the link(s) below before testing methods in this section (in order).</p><pre><a target="result" href="/apply/pymol.cmd.reinitialize">/apply/pymol.cmd.reinitialize</a></pre>
+ 
+-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb</a></pre>
++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb</a></pre>
+ 
+ <ul><li><p><font face="Courier" size="2"><b>show_as</b></font> 
+ <i>representation, selection</i><pre><a target="result" href="/apply/pymol.cmd.show_as?representation=spheres">/apply/pymol.cmd.show_as?representation=spheres</a></pre>
+@@ -224,7 +224,7 @@
+ </p></li>
+ </ul><hr><p>Please click the link(s) below before testing methods in this section (in order).</p><pre><a target="result" href="/apply/pymol.cmd.reinitialize">/apply/pymol.cmd.reinitialize</a></pre>
+ 
+-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb</a></pre>
++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb</a></pre>
+ 
+ <ul><li><p><font face="Courier" size="2"><b>super</b></font> 
+ <i>mobile, target, cutoff, cycles, gap, extend, max_gap, object, matrix, mobile_state, target_state, quiet, max_skip, transform, reset, seq, radius, scale, base, coord, expect, window, ante</i><pre><a target="result" href="/apply/pymol.cmd.create?name=helix1&selection=polymer and 5-17/">/apply/pymol.cmd.create?name=helix1&selection=polymer and 5-17/</a></pre>
+diff -ruN pymol.orig/modules/web/examples/sample01/start.pwg pymol/modules/web/examples/sample01/start.pwg
+--- pymol.orig/modules/web/examples/sample01/start.pwg	2014-01-15 00:02:56.000000000 +0400
++++ pymol/modules/web/examples/sample01/start.pwg	2014-02-14 10:19:11.288925075 +0400
+@@ -1,2 +1,2 @@
+-root $PYMOL_PATH/modules/web/examples/sample01/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample01/htdocs
+ browser
+diff -ruN pymol.orig/modules/web/examples/sample02/start.pwg pymol/modules/web/examples/sample02/start.pwg
+--- pymol.orig/modules/web/examples/sample02/start.pwg	2014-01-15 00:02:56.000000000 +0400
++++ pymol/modules/web/examples/sample02/start.pwg	2014-02-14 10:19:11.292258408 +0400
+@@ -1,2 +1,2 @@
+-root $PYMOL_PATH/modules/web/examples/sample02/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample02/htdocs
+ browser
+diff -ruN pymol.orig/modules/web/examples/sample03/start.pwg pymol/modules/web/examples/sample03/start.pwg
+--- pymol.orig/modules/web/examples/sample03/start.pwg	2014-01-15 00:02:56.000000000 +0400
++++ pymol/modules/web/examples/sample03/start.pwg	2014-02-14 10:19:11.292258408 +0400
+@@ -1,2 +1,2 @@
+-root $PYMOL_PATH/modules/web/examples/sample03/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample03/htdocs
+ browser
+diff -ruN pymol.orig/modules/web/examples/sample04/htdocs/pdbshow.js pymol/modules/web/examples/sample04/htdocs/pdbshow.js
+--- pymol.orig/modules/web/examples/sample04/htdocs/pdbshow.js	2014-01-15 00:02:56.000000000 +0400
++++ pymol/modules/web/examples/sample04/htdocs/pdbshow.js	2014-02-14 10:19:11.292258408 +0400
+@@ -12,7 +12,7 @@
+ function get_protein(a) {
+   // load protein, unless already loaded
+   if (load_state[a] == undefined) {
+-    load = "load?filename=$PYMOL_PATH/modules/web/examples/data/" + a + ".pdb.gz" + zoom;
++    load = "load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/" + a + ".pdb.gz" + zoom;
+     cmd(load);
+     zoom = "&zoom=0"; // subsequent loads shold not zoom
+     cmd("orient?selection=bymol organic and elem n&animate=2");
+diff -ruN pymol.orig/modules/web/examples/sample04/start.pwg pymol/modules/web/examples/sample04/start.pwg
+--- pymol.orig/modules/web/examples/sample04/start.pwg	2014-01-15 00:02:56.000000000 +0400
++++ pymol/modules/web/examples/sample04/start.pwg	2014-02-14 10:19:11.292258408 +0400
+@@ -1,2 +1,2 @@
+-root $PYMOL_PATH/modules/web/examples/sample04/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample04/htdocs
+ browser
+diff -ruN pymol.orig/modules/web/examples/sample05/htdocs/index.html pymol/modules/web/examples/sample05/htdocs/index.html
+--- pymol.orig/modules/web/examples/sample05/htdocs/index.html	2014-01-15 00:02:57.000000000 +0400
++++ pymol/modules/web/examples/sample05/htdocs/index.html	2014-02-14 10:19:11.292258408 +0400
+@@ -108,7 +108,7 @@
+ 
+ function loadPDB(code)
+ {
+-   return cmd('load?filename=$PYMOL_PATH/modules/web/examples/data/'+code+'.pdb');
++   return cmd('load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/'+code+'.pdb');
+ }
+ 
+ </script>
+diff -ruN pymol.orig/modules/web/examples/sample05/start.pwg pymol/modules/web/examples/sample05/start.pwg
+--- pymol.orig/modules/web/examples/sample05/start.pwg	2014-01-15 00:02:57.000000000 +0400
++++ pymol/modules/web/examples/sample05/start.pwg	2014-02-14 10:19:11.292258408 +0400
+@@ -1,2 +1,2 @@
+-root $PYMOL_PATH/modules/web/examples/sample05/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample05/htdocs
+ browser
+diff -ruN pymol.orig/modules/web/examples/sample06/start.pwg pymol/modules/web/examples/sample06/start.pwg
+--- pymol.orig/modules/web/examples/sample06/start.pwg	2014-01-15 00:02:57.000000000 +0400
++++ pymol/modules/web/examples/sample06/start.pwg	2014-02-14 10:19:11.292258408 +0400
+@@ -1,3 +1,3 @@
+-root $PYMOL_PATH/modules/web/examples/sample06/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample06/htdocs
+ browser
+ logging 0
+diff -ruN pymol.orig/modules/web/examples/sample07/start.pwg pymol/modules/web/examples/sample07/start.pwg
+--- pymol.orig/modules/web/examples/sample07/start.pwg	2014-01-15 00:02:57.000000000 +0400
++++ pymol/modules/web/examples/sample07/start.pwg	2014-02-14 10:19:11.295591741 +0400
+@@ -1,2 +1,2 @@
+-root $PYMOL_PATH/modules/web/examples/sample07/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample07/htdocs
+ browser
+diff -ruN pymol.orig/modules/web/examples/sample08/start.pwg pymol/modules/web/examples/sample08/start.pwg
+--- pymol.orig/modules/web/examples/sample08/start.pwg	2014-01-15 00:02:57.000000000 +0400
++++ pymol/modules/web/examples/sample08/start.pwg	2014-02-14 10:19:11.295591741 +0400
+@@ -1,3 +1,3 @@
+-root $PYMOL_PATH/modules/web/examples/sample08/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample08/htdocs
+ browser
+ logging 0
\ No newline at end of file
diff --git a/libre/avidemux-libre/avidemux.install b/community/pymol/pymol.install
index e111ef946..e111ef946 100644
--- a/libre/avidemux-libre/avidemux.install
+++ b/community/pymol/pymol.install
diff --git a/community/python-biopython/PKGBUILD b/community/python-biopython/PKGBUILD
new file mode 100644
index 000000000..75d169a4e
--- /dev/null
+++ b/community/python-biopython/PKGBUILD
@@ -0,0 +1,27 @@
+# $id$
+# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
+# Contributor: Stunts <f.pinamartins at gmail dot com>
+# Contributor: damir <damir at archlinux dot org>
+
+pkgname=python-biopython
+_upstream_pkgname=biopython
+pkgver=1.63
+pkgrel=2
+pkgdesc="Freely available Python tools for computational molecular biology"
+arch=('i686' 'x86_64')
+url="http://www.biopython.org"
+license=('custom')
+depends=('python-numpy')
+source=(http://www.biopython.org/DIST/${_upstream_pkgname}-${pkgver}.tar.gz)
+md5sums=('09c58433150849b131d2d9bbfdf342d3')
+
+build() {
+  cd "${srcdir}/${_upstream_pkgname}-${pkgver}/"
+  python setup.py build
+}
+
+package() {
+  cd "${srcdir}/${_upstream_pkgname}-${pkgver}/"
+  python setup.py install --root="${pkgdir}"
+  install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/community/python-cx_freeze/PKGBUILD b/community/python-cx_freeze/PKGBUILD
index 74986cdc6..a7ec30bf1 100644
--- a/community/python-cx_freeze/PKGBUILD
+++ b/community/python-cx_freeze/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84904 2013-02-25 23:57:50Z arodseth $
+# $Id: PKGBUILD 103463 2014-01-06 11:40:32Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgbase=python-cx_freeze
 pkgname=('python-cx_freeze' 'python2-cx_freeze')
-pkgver=4.3.1
+pkgver=4.3.2
 pkgrel=1
 pkgdesc='Set of utilities for freezing Python scripts into executables'
 arch=('x86_64' 'i686' 'mips64el')
@@ -15,13 +15,13 @@ url='http://cx-freeze.sourceforge.net/'
 license=('PSF')
 makedepends=('python' 'python2')
 source=("http://prdownloads.sourceforge.net/cx-freeze/cx_Freeze-$pkgver.tar.gz")
-sha256sums=('11f8818ab4e1754c81c1226ce3430f29e6ba231a22a153ce3794a5cc464fa11b')
+sha256sums=('d634aae1e1d20b660d24245450b8a5ea3ad9c443cd735d8fbe17c1d93b8b23df')
 
 package_python-cx_freeze() {
   depends=('python')
   conflicts=('cx_freeze' 'python2-cx_freeze')
 
-  cd "$srcdir/cx_Freeze-$pkgver"
+  cd "cx_Freeze-$pkgver"
   python setup.py install --root "$pkgdir" --optimize 1
 }
 
@@ -30,8 +30,9 @@ package_python2-cx_freeze() {
   conflicts=('cx_freeze' 'python-cx_freeze')
   replaces=('cx_freeze')
 
-  cd "$srcdir/cx_Freeze-$pkgver"
+  cd "cx_Freeze-$pkgver"
   python2 setup.py install --root "$pkgdir" --optimize 1
+
   # Python 2 shebang fix
   find "$pkgdir" -name qotd.py -exec sed -i '0,/on/s//on2/' {} \;
 }
diff --git a/community/python-greenlet/PKGBUILD b/community/python-greenlet/PKGBUILD
new file mode 100644
index 000000000..5d123cf72
--- /dev/null
+++ b/community/python-greenlet/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 104937 2014-01-28 14:10:19Z fyan $
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Ralf Schmitt <ralf@systemexit.de>
+
+pkgbase=python-greenlet
+pkgname=(python-greenlet python2-greenlet)
+pkgver=0.4.2
+pkgrel=2
+pkgdesc="Lightweight in-process concurrent programming"
+license=("MIT")
+url="http://pypi.python.org/pypi/greenlet"
+makedepends=('python' 'python2')
+source=("http://pypi.python.org/packages/source/g/greenlet/greenlet-${pkgver}.zip")
+arch=('i686' 'x86_64')
+
+prepare() {
+    cp -r greenlet-$pkgver greenlet-$pkgver-py2
+}
+
+build() {
+	cd greenlet-$pkgver
+	python setup.py build
+
+    cd ../greenlet-$pkgver-py2
+    python2 setup.py build
+}
+
+package_python-greenlet() {
+    depends=('python')
+
+    cd greenlet-$pkgver
+    python setup.py install -O1 --root="$pkgdir"
+    install -Dm0644 LICENSE.PSF "$pkgdir/usr/share/licenses/$pkgname/LICENSE.PSF"
+}
+
+package_python2-greenlet() {
+    depends=('python2')
+
+	cd greenlet-$pkgver-py2
+	python2 setup.py install -O1 --root="$pkgdir"
+	install -Dm0644 LICENSE.PSF "$pkgdir/usr/share/licenses/$pkgname/LICENSE.PSF"
+}
+
+sha512sums=('9596b740921e4a80bcb43adb725a7a4ea428dadc10ba55f8840837ba685b010c273a4a2bd62c5ba4bfdf27ce87c914a83714d762bacafb8e0a3cd7e2a9675992')
diff --git a/community/python-levenshtein/PKGBUILD b/community/python-levenshtein/PKGBUILD
new file mode 100644
index 000000000..f38df5c3f
--- /dev/null
+++ b/community/python-levenshtein/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 104954 2014-01-28 15:04:34Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Thomas S Hatch <thatch45@gmail.com>
+# Contributor: shamrok <szamrok@gmail.com>
+# Contributor: scj <scj archlinux us>
+
+pkgbase=python-levenshtein
+pkgname=(python-levenshtein python2-levenshtein)
+pkgver=0.11.1
+pkgrel=2
+pkgdesc="Python extension for computing string edit distances and similarities"
+url="http://pypi.python.org/pypi/python-Levenshtein/"
+license=("GPL")
+arch=('i686' 'x86_64')
+makedepends=('python-setuptools' 'python2-setuptools')
+source=("http://pypi.python.org/packages/source/p/python-Levenshtein/python-Levenshtein-$pkgver.tar.gz")
+
+prepare() {
+  cp -r python-Levenshtein-$pkgver python2-Levenshtein-$pkgver
+
+  cd python-Levenshtein-$pkgver
+  sed -i "s|[)].read|, encoding='utf8').read|" setup.py
+}
+
+package_python-levenshtein() {
+  depends=('python')
+
+  cd python-Levenshtein-$pkgver
+  python setup.py build install -O1 --prefix=/usr --root="$pkgdir"
+}
+
+package_python2-levenshtein() {
+  depends=('python2')
+
+  cd python2-Levenshtein-$pkgver
+  python2 setup.py build install -O1 --prefix=/usr --root="$pkgdir"
+}
+
+sha512sums=('335f29253ec7bba8d54881dfe093ac194626cdaad0cc6ed08327917d6187cdfe1fbb3d003744f991587f8dc800aa1d361e3aa0b276b31ecfe7a43d83ea0d660b')
diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD
index 594f8c62b..9a3ebeb83 100644
--- a/community/python-matplotlib/PKGBUILD
+++ b/community/python-matplotlib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98442 2013-10-10 15:29:19Z fyan $
+# $Id: PKGBUILD 104353 2014-01-19 04:17:18Z bgyorgy $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
@@ -7,7 +7,7 @@
 pkgbase=python-matplotlib
 pkgname=('python2-matplotlib' 'python-matplotlib')
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A python plotting library, making publication quality plots"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://matplotlib.org'
@@ -20,18 +20,23 @@ optdepends=('pygtk: for use with the GTK or GTKAgg backend'
             'tk: used by the TkAgg backend'
             'ghostscript: usetex dependencies'
             'texlive-bin: usetex dependencies')
-source=("http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-${pkgver}/matplotlib-${pkgver}.tar.gz")
+source=("http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-${pkgver}/matplotlib-${pkgver}.tar.gz"
+        "ffmpeg-2.0.patch")
+sha512sums=('04877aa15b6d52a6f813e8377098d13c432f66ae2522c544575440180944c9b73a2164ae63edd3a0eff807883bf7b39cd55f28454ccee8c76146567ff4a6fd40'
+            'f76cde48aee9819f080bc34717c9cb6270f6dfac0490e7b19673ee665392be1837621aa858435f48595fa7d095e8efaee6737c87f9d42419499f5b8b8b001129')
 
 prepare() {
    cp -a matplotlib-${pkgver} matplotlib-${pkgver}-py3
 
    cd matplotlib-${pkgver}
+   patch -Np1 -i ../ffmpeg-2.0.patch
    for file in $(find . -name '*.py' -print); do
       sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \
              -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" ${file}
    done
 
    cd ../matplotlib-${pkgver}-py3
+   patch -Np1 -i ../ffmpeg-2.0.patch
    for file in $(find . -name '*.py' -print); do
       sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python3|" \
              -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python3|" ${file}
@@ -65,4 +70,3 @@ package_python-matplotlib() {
    install -dm755 "${pkgdir}"/usr/share/licenses/python-matplotlib
    install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python-matplotlib
 }
-sha512sums=('04877aa15b6d52a6f813e8377098d13c432f66ae2522c544575440180944c9b73a2164ae63edd3a0eff807883bf7b39cd55f28454ccee8c76146567ff4a6fd40')
diff --git a/community/python-matplotlib/ffmpeg-2.0.patch b/community/python-matplotlib/ffmpeg-2.0.patch
new file mode 100644
index 000000000..e9c12e911
--- /dev/null
+++ b/community/python-matplotlib/ffmpeg-2.0.patch
@@ -0,0 +1,98 @@
+From 1935f1273aef443895a4da4e5f2c4aa86103a414 Mon Sep 17 00:00:00 2001
+From: Vlad Seghete <vlad.seghete@gmail.com>
+Date: Mon, 25 Nov 2013 13:35:57 -0600
+Subject: [PATCH 1/3] fixes issue #2482 and adds note about incompatibility
+ between bbox options and animation backends
+
+---
+ lib/matplotlib/animation.py | 8 ++++----
+ matplotlibrc.template       | 4 ++++
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
+index 295d60d..9078c5d 100644
+--- a/lib/matplotlib/animation.py
++++ b/lib/matplotlib/animation.py
+@@ -399,9 +399,9 @@ class FFMpegFileWriter(FileMovieWriter, FFMpegBase):
+     def _args(self):
+         # Returns the command line parameters for subprocess to use
+         # ffmpeg to create a movie using a collection of temp images
+-        return [self.bin_path(), '-vframes', str(self._frame_counter),
+-                '-r', str(self.fps), '-i',
+-                self._base_temp_name()] + self.output_args
++        return [self.bin_path(), '-i', self._base_temp_name()-vframes,
++                '-vframes', str(self._frame_counter),
++                '-r', str(self.fps), ] + self.output_args
+ 
+ 
+ # Base class of avconv information.  AVConv has identical arguments to
+diff --git a/matplotlibrc.template b/matplotlibrc.template
+index 473d624..e4d3593 100644
+--- a/matplotlibrc.template
++++ b/matplotlibrc.template
+@@ -380,6 +380,10 @@ backend      : %(backend)s
+ #savefig.edgecolor   : white    # figure edgecolor when saving
+ #savefig.format      : png      # png, ps, pdf, svg
+ #savefig.bbox        : standard # 'tight' or 'standard'.
++                                # 'tight' is incompatible with pipe-based animation
++                                # backends but will workd with temporary file based ones:
++                                # e.g. setting animation.writer to ffmpeg will not work,
++                                # use ffmpeg_file instead
+ #savefig.pad_inches  : 0.1      # Padding to be used when bbox is set to 'tight'
+ #savefig.jpeg_quality: 95       # when a jpeg is saved, the default quality parameter.
+ #savefig.directory   : ~        # default directory in savefig dialog box,
+-- 
+1.8.5.1
+
+
+From f38fcb392d1d247b933f00e65022892007fb8325 Mon Sep 17 00:00:00 2001
+From: Vlad Seghete <vlad.seghete@gmail.com>
+Date: Mon, 25 Nov 2013 13:52:53 -0600
+Subject: [PATCH 2/3] fixed a typo
+
+---
+ lib/matplotlib/animation.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
+index 9078c5d..07c6d27 100644
+--- a/lib/matplotlib/animation.py
++++ b/lib/matplotlib/animation.py
+@@ -399,7 +399,7 @@ class FFMpegFileWriter(FileMovieWriter, FFMpegBase):
+     def _args(self):
+         # Returns the command line parameters for subprocess to use
+         # ffmpeg to create a movie using a collection of temp images
+-        return [self.bin_path(), '-i', self._base_temp_name()-vframes,
++        return [self.bin_path(), '-i', self._base_temp_name(),
+                 '-vframes', str(self._frame_counter),
+                 '-r', str(self.fps), ] + self.output_args
+ 
+-- 
+1.8.5.1
+
+
+From 5c8f3d605ff045ddfbc3ca950aef85366617af5a Mon Sep 17 00:00:00 2001
+From: Vlad Seghete <vlad.seghete@gmail.com>
+Date: Mon, 25 Nov 2013 14:17:54 -0600
+Subject: [PATCH 3/3] fixed another typo
+
+---
+ lib/matplotlib/animation.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
+index 07c6d27..9854ca2 100644
+--- a/lib/matplotlib/animation.py
++++ b/lib/matplotlib/animation.py
+@@ -401,7 +401,7 @@ def _args(self):
+         # ffmpeg to create a movie using a collection of temp images
+         return [self.bin_path(), '-i', self._base_temp_name(),
+                 '-vframes', str(self._frame_counter),
+-                '-r', str(self.fps), ] + self.output_args
++                '-r', str(self.fps)] + self.output_args
+ 
+ 
+ # Base class of avconv information.  AVConv has identical arguments to
+-- 
+1.8.5.1
+
diff --git a/community/python-msgpack/PKGBUILD b/community/python-msgpack/PKGBUILD
new file mode 100644
index 000000000..486ea8c28
--- /dev/null
+++ b/community/python-msgpack/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 105444 2014-02-08 02:18:28Z seblu $
+# Maintainer: Sébastien "Seblu" Luttringer
+
+pkgbase=python-msgpack
+pkgname=('python-msgpack' 'python2-msgpack')
+pkgver=0.4.0
+pkgrel=2
+arch=('i686' 'x86_64')
+url='https://github.com/msgpack/msgpack-python'
+license=('Apache')
+makedepends=('cython' 'cython2' 'python-distribute' 'python2-distribute')
+checkdepends=('python-pytest' 'python2-pytest' 'python-six' 'python2-six')
+source=("http://pypi.python.org/packages/source/m/msgpack-python/msgpack-python-$pkgver.tar.gz")
+md5sums=('8b9ce43619fd1428bf7baddf57e38d1a')
+
+build() {
+  cd msgpack-python-$pkgver
+  python setup.py build --build-lib=build/python
+  python2 setup.py build --build-lib=build/python2
+  find build/python2 -type f -exec \
+    sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
+}
+
+check() {
+  cd msgpack-python-$pkgver
+  msg2 'python'
+  PYTHONPATH=$PWD/build/python py.test test
+  msg2 'python2'
+  PYTHONPATH=$PWD/build/python2 py.test2 test
+}
+
+package_python-msgpack() {
+  pkgdesc='MessagePack serializer implementation for Python'
+  depends=('python')
+
+  cd msgpack-python-$pkgver
+  python setup.py build --build-lib=build/python \
+                  install --root="$pkgdir" --optimize=1
+}
+
+package_python2-msgpack() {
+  pkgdesc='MessagePack serializer implementation for Python2'
+  depends=('python2')
+
+  cd msgpack-python-$pkgver
+  python2 setup.py build --build-lib=build/python2 \
+                   install --root="$pkgdir" --optimize=1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/python-numexpr/PKGBUILD b/community/python-numexpr/PKGBUILD
index d381c2e8a..8c4c74de0 100644
--- a/community/python-numexpr/PKGBUILD
+++ b/community/python-numexpr/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 96812 2013-09-05 18:53:58Z aginiewicz $
+# $Id: PKGBUILD 104927 2014-01-28 11:43:36Z aginiewicz $
 # Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
 # Contributor: Sebastien Binet <binet@lblbox>
 
 pkgbase=python-numexpr
 pkgname=('python2-numexpr' 'python-numexpr')
-pkgver=2.2
+pkgver=2.3
 pkgrel=1
-pkgdesc="A JIT compiler for Python expressions"
-url="http://code.google.com/p/numexpr/"
+pkgdesc="Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas"
+url="https://github.com/pydata/numexpr"
 arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 makedepends=('python2-setuptools' 'python-setuptools' 'python-numpy' 'python2-numpy')
-source=(http://numexpr.googlecode.com/files/numexpr-$pkgver.tar.gz)
-md5sums=('1d83b13e69fff897a5bc588b7119506c')
+source=(https://github.com/pydata/numexpr/archive/$pkgver.tar.gz)
+md5sums=('fc9b5765c8ceda4a4c2e974e565b98cf')
 
 build() {
   cd "$srcdir"
diff --git a/community/python-pillow/PKGBUILD b/community/python-pillow/PKGBUILD
index 436125772..756956683 100644
--- a/community/python-pillow/PKGBUILD
+++ b/community/python-pillow/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 102812 2013-12-21 01:57:46Z kkeen $
+# $Id: PKGBUILD 105239 2014-02-03 10:02:23Z heftig $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: minder
 
 pkgbase=python-pillow
 pkgname=(python-pillow python2-pillow)
-pkgver=2.2.2
-pkgrel=1
+pkgver=2.3.0
+pkgrel=3
 _appname=Pillow
 _py2basever=2.7
 _py3basever=3.3m
@@ -15,7 +15,7 @@ url="http://python-imaging.github.io/"
 license=('BSD')
 makedepends=('python-setuptools' 'python2-setuptools' 'lcms' 'libwebp' 'tk' 'sane')
 source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip")
-md5sums=('6a76a16f6db45744ff2e9327bf0608b4')
+md5sums=('56b6614499aacb7d6b5983c4914daea7')
 
 build() {
   cd "$srcdir"
diff --git a/community/python-psycopg2/PKGBUILD b/community/python-psycopg2/PKGBUILD
index bd9db9a8b..f215da072 100644
--- a/community/python-psycopg2/PKGBUILD
+++ b/community/python-psycopg2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 93151 2013-06-26 09:20:17Z spupykin $
+# $Id: PKGBUILD 103604 2014-01-08 10:35:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgbase=python-psycopg2
 pkgname=('python-psycopg2' 'python2-psycopg2')
-pkgver=2.5.1
+pkgver=2.5.2
 pkgrel=1
 pkgdesc="A PostgreSQL database adapter for the Python programming language."
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ url="http://initd.org/psycopg/"
 license=('LGPL3')
 makedepends=('python2' 'python' 'postgresql-libs>=8.4.1')
 source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-5/psycopg2-$pkgver.tar.gz)
-md5sums=('1b433f83d50d1bc61e09026e906d84c7')
+md5sums=('53d81793fbab8fee6e732a0425d50047')
 
 build() {
   cd "$srcdir/psycopg2-$pkgver"
diff --git a/community/python-pybluez/PKGBUILD b/community/python-pybluez/PKGBUILD
new file mode 100644
index 000000000..1dc7b5535
--- /dev/null
+++ b/community/python-pybluez/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 66132 2012-02-23 01:40:38Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: cs-cam - me.at.camdaniel.com
+
+pkgbase=python-pybluez
+pkgname=(python-pybluez python2-pybluez)
+pkgver=0.20
+pkgrel=1
+pkgdesc="Python wrapper for the BlueZ Bluetooth stack"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/pybluez/"
+license=('GPL')
+makedepends=('python' 'python2' 'bluez-libs')
+source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.zip)
+md5sums=('1e7fad332d50f089bbce69070c877ef6')
+
+package_python-pybluez() {
+  depends=('python' 'bluez-libs')
+
+  cd $srcdir/PyBluez-$pkgver
+  python setup.py install --root=$pkgdir
+#  ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python3.3/site-packages/_bluetooth.so
+}
+
+package_python2-pybluez() {
+  depends=('python2' 'bluez-libs')
+
+  cd $srcdir/PyBluez-$pkgver
+  python2 setup.py install --root=$pkgdir
+#  ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.7/site-packages/_bluetooth.so
+}
diff --git a/community/python-pybox2d/PKGBUILD b/community/python-pybox2d/PKGBUILD
index 874445d6f..193f1b1e1 100644
--- a/community/python-pybox2d/PKGBUILD
+++ b/community/python-pybox2d/PKGBUILD
@@ -1,25 +1,35 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-pkgname=python-pybox2d
+# $Id: PKGBUILD 104878 2014-01-28 00:06:26Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
+
+pkgbase=python-pybox2d
+pkgname=('python2-pybox2d')
 pkgver=370
 pkgrel=1
-pkgdesc="Python wrapper for Box2D"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/pybox2d"
+url='http://code.google.com/p/pybox2d'
 license=('GPL')
-depends=('python' 'swig')
-makedepends=('subversion')
-source=("svn+http://pybox2d.googlecode.com/svn/trunk/")
+makedepends=('subversion' 'python2' 'swig')
+source=("$pkgbase::svn+http://pybox2d.googlecode.com/svn/trunk/")
 md5sums=('SKIP')
 
 build() {
-  cd ${srcdir}/trunk
+  cd "$pkgbase"
   
-  python setup.py build
+  python2 setup.py build
 }
 
-package() {
-  cd ${srcdir}/trunk
+package_python2-pybox2d() {
+  depends=('python2')
+  pkgdesc='Python wrapper for Box2D'
+
+  cd "$pkgbase"
 
-  python setup.py install --root=${pkgdir} 
+  python2 setup.py install --root="$pkgdir" --optimize=1
+
+  # Fixes the warning about a missing dependency on python
+  sed -i 's:python:python2:g' \
+    "$pkgdir/usr/lib/python2.7/site-packages/Box2D/__init__.py"
 }
+
 # vim: sw=2 ts=2 et:
diff --git a/community/python-pygit2/PKGBUILD b/community/python-pygit2/PKGBUILD
index 748012d7b..35f81c8cc 100644
--- a/community/python-pygit2/PKGBUILD
+++ b/community/python-pygit2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 98636 2013-10-15 23:04:31Z thestinger $
+# $Id: PKGBUILD 104863 2014-01-27 17:34:04Z thestinger $
 # Maintainer: Daniel Micay <danielmicay@gmail.com>
 
 pkgbase=python-pygit2
 pkgname=(python-pygit2 python2-pygit2)
-pkgver=0.19.1
+pkgver=0.20.0
 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=('98a98d8052a4066ab48b74ebd05c90e1')
+md5sums=('3b8cba0ad69bcb2e1aa73d325dcdf53b')
 
 package_python-pygit2() {
   cd "$srcdir/pygit2-$pkgver"
diff --git a/community/python-pyopencl/PKGBUILD b/community/python-pyopencl/PKGBUILD
index 07f720db3..fbe922ea5 100644
--- a/community/python-pyopencl/PKGBUILD
+++ b/community/python-pyopencl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 102275 2013-12-07 10:37:03Z bpiotrowski $
+# $Id: PKGBUILD 105755 2014-02-15 13:12:50Z jelle $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgbase=python-pyopencl
 pkgname=('python2-pyopencl' 'python-pyopencl' 'pyopencl-headers')
 pkgver=2013.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A complete, object-oriented language binding of OpenCL to Python"
 arch=('i686' 'x86_64')
 url="http://mathema.tician.de/software/pyopencl"
@@ -39,7 +39,7 @@ check(){
 }
 
 package_python-pyopencl() {
-   depends=('libcl' 'opencl-headers' 'mesa' 'boost-libs' 'python' 'python-numpy' 'python-mako' 'python-pytools' 'pyopencl-headers')
+   depends=('libcl' 'opencl-headers' 'mesa' 'boost-libs' 'python' 'python-numpy' 'python-mako' 'python-pytools' 'pyopencl-headers' 'python-setuptools')
 
    cd "${srcdir}/pyopencl-${pkgver}"
    python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
@@ -50,7 +50,7 @@ package_python-pyopencl() {
 }
 
 package_python2-pyopencl() {
-   depends=('libcl' 'opencl-headers' 'mesa' 'boost-libs' 'python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'pyopencl-headers')
+   depends=('libcl' 'opencl-headers' 'mesa' 'boost-libs' 'python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'pyopencl-headers' 'python2-setuptools')
 
    cd "${srcdir}/pyopencl-${pkgver}-python2"
    python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/community/python-pytables/PKGBUILD b/community/python-pytables/PKGBUILD
index 9831e3438..fc5876a12 100644
--- a/community/python-pytables/PKGBUILD
+++ b/community/python-pytables/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 98817 2013-10-19 13:44:44Z bpiotrowski $
+# $Id: PKGBUILD 105425 2014-02-07 11:53:10Z aginiewicz $
 # 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=4
+pkgver=3.1.0
+pkgrel=1
 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"
 license=("BSD")
 makedepends=('lzo2' 'hdf5' 'python2-numexpr' 'cython2' 'python-numexpr' 'cython')
 source=("http://pypi.python.org/packages/source/t/tables/tables-$pkgver.tar.gz")
-md5sums=('9c8a18d51be5e94a2ae50ea31d26f8c2')
+md5sums=('22e048ef20883269c4a2a3f2026c38ee')
 
 build() {
   cd "$srcdir"
diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD
index 9dc109822..260ef4096 100644
--- a/community/python-scipy/PKGBUILD
+++ b/community/python-scipy/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 
 pkgname=('python-scipy' 'python2-scipy')
-pkgver=0.13.2
+pkgver=0.13.3
 pkgrel=1
 pkgdesc="SciPy is open-source software for mathematics, science, and engineering."
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,6 +15,7 @@ license=('BSD')
 makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy' 'python-setuptools' 'python2-setuptools')
 checkdepends=('python-nose' 'python2-nose')
 source=("https://pypi.python.org/packages/source/s/scipy/scipy-${pkgver}.tar.gz")
+md5sums=('0547c1f8e8afad4009cc9b5ef17a2d4d')
 
 build() {
   # Changing the arithmetic parameter (Thanks to Fabrizio Castellano)
@@ -80,4 +81,3 @@ package_python2-scipy() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('fcd110802b0bf3505ba567cf831566e1')
diff --git a/community/python-simplejson/PKGBUILD b/community/python-simplejson/PKGBUILD
index 5ac12532a..ce91e686d 100644
--- a/community/python-simplejson/PKGBUILD
+++ b/community/python-simplejson/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95625 2013-08-15 08:14:50Z arodseth $
+# $Id: PKGBUILD 105342 2014-02-05 15:26:52Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -6,20 +6,20 @@
 
 pkgbase=python-simplejson
 pkgname=("$pkgbase" 'python2-simplejson')
-pkgver=3.3.0
+pkgver=3.3.2
 pkgrel=1
 pkgdesc='Simple, fast, extensible JSON encoder/decoder for Python'
 license=('MIT')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://undefined.org/python/#simplejson'
-makedepends=('python' 'python2-distribute')
+makedepends=('python-setuptools' 'python2-setuptools')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver}")
-sha256sums=('ed7e700a9b689f81e54738d796ce456eca12481412f198d44d42f69d8d6f9a82')
+sha256sums=('ecff7508cb34547de611c5b367ad1ff74290f638f29853be5801823e1565592c')
 
 package_python-simplejson() {
   depends=('python')
 
-  cd "$srcdir/simplejson-simplejson-"*
+  cd "simplejson-simplejson-"*
   python setup.py install --root="$pkgdir"
   install -Dm644 "$srcdir/simplejson-simplejson"-*/LICENSE.txt \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -28,7 +28,7 @@ package_python-simplejson() {
 package_python2-simplejson() {
   depends=('python2')
 
-  cd "$srcdir/simplejson-simplejson-"*
+  cd "simplejson-simplejson-"*
   python2 setup.py install --root="$pkgdir"
   install -Dm644 "$srcdir/simplejson-simplejson"-*/LICENSE.txt \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/community/python-simplejson/python-simplejson.changelog b/community/python-simplejson/python-simplejson.changelog
deleted file mode 100644
index c1e227d24..000000000
--- a/community/python-simplejson/python-simplejson.changelog
+++ /dev/null
@@ -1,20 +0,0 @@
-2012-07-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.6.1-1
-
-2012-05-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.5.2-1
-
-2012-03-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.3.3-1
-
-2011-10-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.2.1-1
-
-2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.1.3-1
-
-2010-05-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 2.1.1
-
-2010-03-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 2.1.0
diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD
index 1bb3b9f72..32e2c6fa7 100644
--- a/community/python-sqlalchemy/PKGBUILD
+++ b/community/python-sqlalchemy/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 102482 2013-12-12 10:34:55Z jelle $ 
+# $Id: PKGBUILD 105348 2014-02-05 18:51:35Z angvp $ 
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgbase=python-sqlalchemy
 pkgname=('python-sqlalchemy' 'python2-sqlalchemy')
-pkgver=0.8.4
+pkgver=0.9.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el') # python2 package contain .so
 url="http://www.sqlalchemy.org/"
 license=('custom: MIT')
 makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools' 'python-nose' 'python2-nose')
 source=("https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-$pkgver.tar.gz")
-md5sums=('fd517e1bb4031cac1e3fa00108111b38')
+md5sums=('c36a958e46a8514583be82523785269d')
 
 build() {
   cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver
@@ -31,6 +31,7 @@ check() {
 package_python-sqlalchemy() {
   pkgdesc='Python SQL toolkit and Object Relational Mapper'
   depends=('python')
+  optdepends=('python-psycopg2: connect to PostgreSQL database')
 
   cd SQLAlchemy-${pkgver}
   python setup.py install --root="${pkgdir}"
@@ -41,6 +42,7 @@ package_python-sqlalchemy() {
 package_python2-sqlalchemy() {
   pkgdesc='Python 2 SQL toolkit and Object Relational Mapper'
   depends=('python2')
+  optdepends=('python2-psycopg2: connect to PostgreSQL database')
 
   cd SQLAlchemy2-$pkgver
   python2 setup.py install --root="$pkgdir"
diff --git a/community/python-tornado/PKGBUILD b/community/python-tornado/PKGBUILD
new file mode 100644
index 000000000..42c463e58
--- /dev/null
+++ b/community/python-tornado/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 104290 2014-01-17 07:31:27Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+
+pkgname=('python-tornado' 'python2-tornado')
+pkgver=3.2.0
+pkgrel=1
+pkgdesc='open source version of the scalable, non-blocking web server and tools'
+arch=('i686' 'x86_64')
+url='http://www.tornadoweb.org/'
+license=('Apache')
+makedepends=('python-setuptools' 'python2-setuptools' 'python2-backports.ssl_match_hostname')
+source=("https://github.com/facebook/tornado/archive/v${pkgver}.tar.gz")
+
+build() {
+  cd "$srcdir"
+  cp -r tornado-${pkgver} python2-tornado-${pkgver}
+
+  cd tornado-${pkgver}
+
+  python setup.py build
+
+  cd ../python2-tornado-${pkgver}
+
+  # python -> python2 rename
+  find -name '*py' -exec sed -e 's_#!/usr/bin/env python_&2_' -i {} \;
+
+  python2 setup.py build
+}
+
+package_python-tornado() {
+  depends=('python')
+
+  cd "$srcdir/tornado-${pkgver}"
+
+  python setup.py install --root="${pkgdir}" --optimize=1
+}
+
+package_python2-tornado() {
+  depends=('python2' 'python2-backports.ssl_match_hostname')
+
+  cd "$srcdir/python2-tornado-${pkgver}"
+
+  python2 setup.py install --root="${pkgdir}" --optimize=1
+}
+
+sha512sums=('1703178be34060a6c36e9e0aa742b87ad905dfb0f565e43a1158edfe5c7800fe35aff9168b60aabd3b831b339af6ef95aaa144a9fb167c5d93f548eb59fc2557')
diff --git a/community/python2-biopython/PKGBUILD b/community/python2-biopython/PKGBUILD
new file mode 100644
index 000000000..c22385574
--- /dev/null
+++ b/community/python2-biopython/PKGBUILD
@@ -0,0 +1,48 @@
+# $id$
+# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
+# Contributor: Stunts <f.pinamartins at gmail dot com>
+# Contributor: damir <damir at archlinux dot org>
+
+pkgname=python2-biopython
+_upstream_pkgname=biopython
+pkgver=1.63
+pkgrel=2
+pkgdesc="Freely available Python tools for computational molecular biology"
+arch=('i686' 'x86_64')
+url="http://www.biopython.org"
+license=('custom')
+depends=('python2-numpy')
+optdepends=('python2-reportlab: for pdf graphics code'
+            'mysql-python: for BioSQL module')
+source=(http://www.biopython.org/DIST/${_upstream_pkgname}-${pkgver}.tar.gz)
+md5sums=('09c58433150849b131d2d9bbfdf342d3')
+
+prepare() {
+  cd "${srcdir}/${_upstream_pkgname}-${pkgver}/"
+  # change python to python2
+  sed -i "s|python|python2|g" "Bio/bgzf.py"
+  sed -i "s|python|python2|g" "Bio/DocSQL.py"
+  sed -i "s|python|python2|g" "Bio/kNN.py"
+  sed -i "s|python|python2|g" "Bio/LogisticRegression.py"
+  sed -i "s|python|python2|g" "Bio/PDB/parse_pdb_header.py"
+  sed -i "s|python|python2|g" "Bio/PDB/PDBList.py"
+  sed -i "s|python|python2|g" "Bio/Restriction/__init__.py"
+  sed -i "s|python|python2|g" "Bio/Restriction/PrintFormat.py"
+  sed -i "s|python|python2|g" "Bio/Restriction/Restriction.py"
+  sed -i "s|python|python2|g" "Bio/SeqUtils/__init__.py"
+  sed -i "s|python|python2|g" "Bio/UniProt/GOA.py"
+  sed -i "s|python|python2|g" "Bio/Wise/__init__.py"
+  sed -i "s|python|python2|g" "Bio/Wise/dnal.py"
+  sed -i "s|python|python2|g" "Bio/Wise/psw.py"
+}
+
+build() {
+  cd "${srcdir}/${_upstream_pkgname}-${pkgver}/"
+  python2 setup.py build
+}
+
+package() {
+  cd "${srcdir}/${_upstream_pkgname}-${pkgver}/"
+  python2 setup.py install --root="${pkgdir}"
+  install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/community/python2-caja/PKGBUILD b/community/python2-caja/PKGBUILD
new file mode 100644
index 000000000..85ad37a62
--- /dev/null
+++ b/community/python2-caja/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 104310 2014-01-17 11:54:21Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Xpander <xpander0@gmail.com>
+
+pkgname=python2-caja
+_pkgname=python-caja
+pkgver=1.6.1
+pkgrel=1
+pkgdesc="Python binding for Caja, to allow Caja property page and menu item extensions to be written in Python."
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('mate-file-manager' 'python2' 'python2-gobject')
+makedepends=('mate-common')
+options=('!emptydirs')
+replaces=('python-caja')
+provides=('python-caja')
+source=("http://pub.mate-desktop.org/releases/1.6/${_pkgname}-${pkgver}.tar.xz")
+sha1sums=('44c39d62c977b06e9a8f37cfdbd81c2f6eb10ff5')
+
+prepare() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+    sed -i 's/python-config/python2-config/' configure
+}
+
+build() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+    PYTHON=/usr/bin/python2 ./configure \
+        --prefix=/usr \
+        --disable-static
+    make
+}
+
+package() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/python2-exiv2/PKGBUILD b/community/python2-exiv2/PKGBUILD
new file mode 100644
index 000000000..77e5caeb2
--- /dev/null
+++ b/community/python2-exiv2/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 104803 2014-01-26 12:17:41Z andyrtr $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Archie <xMickael@ifrance.com>
+# Contributor: Byron Clark <byron@theclarkfamily.name>
+
+_pkgname=pyexiv2
+pkgname=python2-exiv2
+pkgver=0.3.2
+pkgrel=3
+pkgdesc="pyexiv2 is a Python binding to exiv2, the C++ library for manipulation of EXIF, IPTC and XMP image metadata."
+url="http://tilloy.net/dev/pyexiv2"
+arch=('i686' 'x86_64')
+depends=('python2' 'boost-libs' 'exiv2')
+makedepends=('scons' 'boost')
+replaces=('pyexiv2')
+conflicts=('pyexiv2')
+provides=('pyexiv2')
+license=('GPL')
+source=("http://launchpad.net/${_pkgname}/0.3.x/${pkgver}/+download/${_pkgname}-${pkgver}.tar.bz2")
+md5sums=('9c0377ca4cf7d5ceeee994af0b5536ae')
+
+build() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+    scons
+}
+
+package() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+    scons DESTDIR="${pkgdir}" install
+}
diff --git a/community/python2-gnutls/PKGBUILD b/community/python2-gnutls/PKGBUILD
index adce49d24..fdc763e87 100644
--- a/community/python2-gnutls/PKGBUILD
+++ b/community/python2-gnutls/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=python2-gnutls
 pkgver=1.2.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Python wrapper for the GNUTLS library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cheeseshop.python.org/pypi/python-gnutls"
@@ -15,7 +15,7 @@ source=(http://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-${p
 	libraryinit.patch
         libraryfunctions.patch)
 md5sums=('a398a75b1f366857cf2628cf4d62dd34'
-         '28227b8626e8a7df81cf3b7dae88bd80'
+         '2ac537f816225bc324a9e0529774df48'
          '9907d3a446fdc3b33a70e57925d67298')
 
 build() {
diff --git a/community/python2-gnutls/libraryinit.patch b/community/python2-gnutls/libraryinit.patch
index 5f987b513..5a82bbcf8 100644
--- a/community/python2-gnutls/libraryinit.patch
+++ b/community/python2-gnutls/libraryinit.patch
@@ -5,7 +5,7 @@
          gcry_control = libgcrypt.gcry_control
      else:
 -        gcry_control = libgnutls.gcry_control
-+        libgcrypt = load_library(name='gcrypt', version=11)
++        libgcrypt = load_library(name='gcrypt', version=20)
 +        gcry_control = libgcrypt.gcry_control
  
      gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr))
diff --git a/community/python2-greenlet/PKGBUILD b/community/python2-greenlet/PKGBUILD
deleted file mode 100644
index ea9605f52..000000000
--- a/community/python2-greenlet/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 70305 2012-05-04 08:21:08Z mtorromeo $
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-# Maintainer: Felix Yan <felixonmars@gmail.com>
-# Contributor: Ralf Schmitt <ralf@systemexit.de>
-
-pkgname=python2-greenlet
-pkgver=0.4.1
-pkgrel=1
-pkgdesc="python coroutine library"
-license=("MIT")
-url="http://pypi.python.org/pypi/greenlet"
-depends=('python2')
-source=(http://pypi.python.org/packages/source/g/greenlet/greenlet-$pkgver.zip)
-arch=('i686' 'x86_64')
-
-build() {
-	cd "$srcdir/greenlet-$pkgver"
-	python2 setup.py build
-}
-
-package() {
-	cd "$srcdir/greenlet-$pkgver"
-	python2 setup.py install --root="$pkgdir"
-	install -Dm0644 LICENSE.PSF "$pkgdir/usr/share/licenses/$pkgname/LICENSE.PSF"
-}
-
-sha512sums=('bb33db07b8b86ba8ccec920748cfc207d27eed0b76218cf06c3b1706a1e9350be62a99a92e05c8e683a7c3ab1e232dbb46259380c7e5f2c6b140a3a96a36f8bf')
diff --git a/community/python2-imaging/PKGBUILD b/community/python2-imaging/PKGBUILD
deleted file mode 100644
index 965f3f130..000000000
--- a/community/python2-imaging/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 83335 2013-01-29 19:26:55Z kkeen $
-# Maintainer: Kyle Keen <keenerd@gmail.com>
-# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: simo <simo@archlinux.org>
-
-pkgname=python2-imaging
-pkgver=1.1.7
-pkgrel=8
-pkgdesc="PIL. Provides image processing capabilities for python"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.pythonware.com/products/pil/index.htm"
-license=('custom:"pil"')
-depends=('python2' 'libjpeg' 'freetype2' 'lcms') 
-makedepends=('tk' 'sane')
-optdepends=('tk: for the ImageTK module'
-            'sane: for the ImageSane module')
-provides=("pil=${pkgver}" "python-imaging=${pkgver}")
-conflicts=('pil' 'python-imaging')
-replaces=('pil' 'python-imaging')
-source=(http://effbot.org/downloads/Imaging-${pkgver}.tar.gz)
-md5sums=('fc14a54e1ce02a0225be8854bfba478e')
-
-build() {
-  cd "${srcdir}/Imaging-${pkgver}"
-
-  # FS#33452
-  export CFLAGS="$CFLAGS -fno-strict-aliasing"
-
-  python2 setup.py build_ext
-  cd Sane
-  python2 setup.py build_ext
-}
-
-package() {
-  cd "${srcdir}/Imaging-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  
-  pushd Sane
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  popd
-  
-  install -dm755 "${pkgdir}/usr/include/python2.7/"
-  install -m644 -t "${pkgdir}/usr/include/python2.7/" libImaging/*.h 
-
-  # do not have files ending in .py in /usr/bin
-  for f in pildriver pilprint pilconvert pilfile pilfont; do
-    mv "${pkgdir}"/usr/bin/${f}{.py,}
-  done
-
-  # Install license
-  install -Dm644 "${srcdir}/Imaging-${pkgver}/README" \
-                 "${pkgdir}/usr/share/licenses/${pkgname}/README"
-}
diff --git a/community/python2-ldap/PKGBUILD b/community/python2-ldap/PKGBUILD
index 5d64c807b..e2801f4a7 100644
--- a/community/python2-ldap/PKGBUILD
+++ b/community/python2-ldap/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 93180 2013-06-27 12:10:25Z spupykin $
+# $Id: PKGBUILD 105333 2014-02-05 12:43:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Morgan LEFIEUX <comete_AT_archlinuxfr.org>
 
 pkgname=python2-ldap
-pkgver=2.4.13
+pkgver=2.4.14
 pkgrel=1
 pkgdesc="Provides an object-oriented API to access LDAP directory servers from Python programs"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('python2' 'libldap>=2.4.26')
 makedepends=('chrpath')
 replaces=('python-ldap')
 source=(http://pypi.python.org/packages/source/p/python-ldap/python-ldap-$pkgver.tar.gz)
-md5sums=('74b7b50267761540451eade44b2049ee')
+md5sums=('15eb167403b3706fe2e40db751117c28')
 
 build() {
   cd $srcdir/python-ldap-$pkgver
diff --git a/community/python2-m2crypto/LICENSE b/community/python2-m2crypto/LICENSE
new file mode 100644
index 000000000..d2f636fdd
--- /dev/null
+++ b/community/python2-m2crypto/LICENSE
@@ -0,0 +1,26 @@
+Copyright (c) 1999-2004 Ng Pheng Siong. All rights reserved.
+
+Portions copyright (c) 2004-2006 Open Source Applications Foundation. 
+All rights reserved.
+
+Portions copyright (c) 2005-2006 Vrije Universiteit Amsterdam. 
+All rights reserved.
+
+Copyright (c) 2008-2010 Heikki Toivonen. All rights reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation.
+
+THE AUTHOR PROVIDES THIS SOFTWARE ``AS IS'' AND ANY EXPRESSED OR 
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/community/python2-m2crypto/PKGBUILD b/community/python2-m2crypto/PKGBUILD
index 3a744e587..183e4ebfb 100644
--- a/community/python2-m2crypto/PKGBUILD
+++ b/community/python2-m2crypto/PKGBUILD
@@ -4,16 +4,18 @@
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=python2-m2crypto
-pkgver=0.21.1
-pkgrel=2
+pkgver=0.22.3
+pkgrel=1
 pkgdesc="A crypto and SSL toolkit for Python"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto"
 license=('BSD')
 depends=('python2' 'openssl')
-makedepends=('swig')
-source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz")
-md5sums=('f93d8462ff7646397a9f77a2fe602d17')
+makedepends=('swig' 'python2-setuptools')
+source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz"
+	"LICENSE")
+md5sums=('573f21aaac7d5c9549798e72ffcefedd'
+         'b0e1f0b7d0ce8a62c18b1287b991800e')
 
 build() {
   cd "${srcdir}/M2Crypto-${pkgver}"
@@ -23,5 +25,5 @@ build() {
 package() {
   cd "${srcdir}/M2Crypto-${pkgver}"
   python2 setup.py install --root="${pkgdir}/" --optimize=1
-  install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 $srcdir/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/community/python-pmw/LICENSE.txt b/community/python2-pmw/LICENSE.txt
index de9a58260..de9a58260 100644
--- a/community/python-pmw/LICENSE.txt
+++ b/community/python2-pmw/LICENSE.txt
diff --git a/community/python-pmw/PKGBUILD b/community/python2-pmw/PKGBUILD
index dd43ef0b5..739d1cfd3 100644
--- a/community/python-pmw/PKGBUILD
+++ b/community/python2-pmw/PKGBUILD
@@ -1,11 +1,12 @@
-# Maintainer: Evgeniy Alekseev <arcanis dot arch at gmail dot com>
-# Contributor: kfgz <kfgz at interia pl>
+# $Id: PKGBUILD 105149 2014-02-01 19:59:28Z arcanis $
+# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
+# Contributor: kfgz <kfgz at interia dot pl>
 # Contributor: Michael Krauss <hippodriver at gmx dot net>
 # Contributor: dsa
 
-pkgname=python-pmw
+pkgname=python2-pmw
 pkgver=1.3.3b
-pkgrel=2
+pkgrel=1
 pkgdesc="A toolkit for high-level compound widgets in Python using the Tkinter module"
 arch=('i686' 'x86_64')
 url="http://pmw.sourceforge.net/doc/index.html"
@@ -16,16 +17,21 @@ source=(${pkgname}-${pkgver}.tar.gz::http://sourceforge.net/projects/pmw/files/P
 md5sums=('d8b998b921584db32a5eeeddc6bc606c'
          '28b047a148c1780eddcf4bed6b150123')
 
-package() {
+prepare() {
+  # change python to python2
+  sed -i "s|python|python2|g" "${srcdir}/Pmw/Pmw/Pmw_1_3_3/tests/ManualTests.py"
+  sed -i "s|python|python2|g" "${srcdir}/Pmw/Pmw/Pmw_1_3_3/demos/All.py"
+  sed -i "s|python|python2|g" "${srcdir}/Pmw/Pmw/Pmw_1_3_3/tests/All.py"
+  sed -i "s|python|python2|g" "${srcdir}/Pmw/Pmw/Pmw_1_3_3/bin/bundlepmw.py"
+}
+
+build() {
   cd "Pmw"
   python2 setup.py build
+}
+
+package() {
+  cd "Pmw"
   python2 setup.py install --prefix=/usr --root="${pkgdir}"
-  
-  # change python to python2
-  sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/Pmw/Pmw_1_3_3/tests/ManualTests.py"
-  sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/Pmw/Pmw_1_3_3/demos/All.py"
-  sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/Pmw/Pmw_1_3_3/tests/All.py"
-  sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/Pmw/Pmw_1_3_3/bin/bundlepmw.py"
-  
   install -D -m644 "${srcdir}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/community/python2-pybluez/PKGBUILD b/community/python2-pybluez/PKGBUILD
deleted file mode 100644
index f211ede1f..000000000
--- a/community/python2-pybluez/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 66132 2012-02-23 01:40:38Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: cs-cam - me.at.camdaniel.com
-
-pkgname=python2-pybluez
-pkgver=0.18
-pkgrel=6
-pkgdesc="Python wrapper for the BlueZ Bluetooth stack"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/pybluez/"
-license=('GPL')
-provides=('pybluez')
-conflicts=('pybluez')
-replaces=('pybluez')
-depends=('python2' 'bluez-libs')
-source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.tar.gz)
-md5sums=('be8c8ce615c3189fda1aaf3d568314b2')
-
-package() {
-  cd $srcdir/PyBluez-$pkgver
-  python2 setup.py install --root=$pkgdir
-  ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.7/site-packages/_bluetooth.so
-}
diff --git a/community/python2-pycdio/PKGBUILD b/community/python2-pycdio/PKGBUILD
index 418557d2e..821cbb5cb 100644
--- a/community/python2-pycdio/PKGBUILD
+++ b/community/python2-pycdio/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 101971 2013-12-03 03:22:58Z fyan $
+# $Id: PKGBUILD 104375 2014-01-19 16:29:39Z bpiotrowski $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Alessandro Pezzoni <donbex at nerdshack dot com>
 
 pkgname=python2-pycdio
 pkgver=0.20
-pkgrel=1
+pkgrel=2
 pkgdesc="Python OO interface to libcdio (CD Input and Control library)"
 arch=("i686" "x86_64" "mips64el")
 url="http://pypi.python.org/pypi/pycdio/"
diff --git a/community/python2-systemd/PKGBUILD b/community/python2-systemd/PKGBUILD
new file mode 100644
index 000000000..e956cec53
--- /dev/null
+++ b/community/python2-systemd/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 105641 2014-02-12 17:41:55Z dwallace $
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com
+pkgname=python2-systemd
+_pkgname=systemd
+pkgver=208
+pkgrel=1
+pkgdesc="Python2 bindings for systemd"
+arch=('x86_64' 'i686')
+url="http://www.freedesktop.org/wiki/Software/systemd/"
+license=('GPL')
+depends=('python2' "systemd=$pkgver")
+makedepends=('intltool' 'gperf')
+source=("http://www.freedesktop.org/software/$_pkgname/$_pkgname-$pkgver.tar.xz")
+md5sums=('df64550d92afbffb4f67a434193ee165')
+
+
+build() {
+	cd "$_pkgname-$pkgver"
+    ./configure \
+        --libexecdir=/usr/lib \
+        --disable-manpages \
+        --with-sysvinit-path=/etc/rc.d/init.d \
+        --with-rc-local-script-path-start=/etc/rc.d/rc.local \
+        PYTHON=python2
+	make
+}
+
+package(){
+	cd "$_pkgname-$pkgver"
+    make DESTDIR=$srcdir/root install
+    install -dm755 $pkgdir/usr/lib/python2.7
+    cp -dpr --no-preserve=ownership $srcdir/root/usr/lib/python2.7 $pkgdir/usr/lib/python2.7
+}
diff --git a/community/python2-traits/PKGBUILD b/community/python2-traits/PKGBUILD
index 5ca8ea7fc..9cf16a528 100644
--- a/community/python2-traits/PKGBUILD
+++ b/community/python2-traits/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 96105 2013-08-20 06:32:41Z lcarlier $
+# $Id: PKGBUILD 105025 2014-01-30 10:34:22Z aginiewicz $
 # Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
 
 pkgname=python2-traits
-pkgver=4.3.0
-pkgrel=2
+pkgver=4.4.0
+pkgrel=1
 pkgdesc="Explicitly typed attributes for Python"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/enthought/traits"
@@ -13,7 +13,7 @@ makedepends=('python2-setuptools')
 options=(!emptydirs)
 
 source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/traits/archive/${pkgver}.tar.gz")
-md5sums=('f78c15c44e0f965cc2ab799806a80388')
+md5sums=('f284e67ae3437e9427e23f7f8a4975d6')
 
 build() {
   cd "$srcdir"/traits-$pkgver
diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD
index 8dbe5a252..9c924cdcb 100644
--- a/community/qcad/PKGBUILD
+++ b/community/qcad/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 102798 2013-12-20 11:28:08Z spupykin $
+# $Id: PKGBUILD 105852 2014-02-16 14:13:56Z 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.4.5.0
+pkgver=3.4.6.0
 pkgrel=1
 pkgdesc="A 2D CAD package based upon Qt"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ makedepends=('glu')
 options=('libtool')
 source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
         QCad.desktop)
-md5sums=('d7e5a77d05bdc7f6d5762029ec03fc2d'
+md5sums=('b446738ba71ee0a0ba1431b95d07a2fd'
          '84f189dd152e7614a1265659dac6222d')
 
 prepare() {
@@ -59,7 +59,7 @@ package() {
   install -Dm644 $srcdir/QCad.desktop ${pkgdir}/usr/share/applications/QCad.desktop
 
   install -dm0755 $pkgdir/usr/bin
-  echo -e '#!/bin/sh\ncd /usr/share/qcad\nLD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"/usr/share/qcad" exec /usr/share/qcad/qcad-bin "$@"' >$pkgdir/usr/bin/qcad
+  echo -e '#!/bin/sh\nLD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"/usr/share/qcad" exec /usr/share/qcad/qcad-bin "$@"' >$pkgdir/usr/bin/qcad
 
   chmod 0755 $pkgdir/usr/bin/qcad
 }
diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD
index 5e6546abf..66f70dc5b 100644
--- a/community/qmmp/PKGBUILD
+++ b/community/qmmp/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 103152 2013-12-27 20:10:05Z jlichtblau $
+#$Id: PKGBUILD 105826 2014-02-15 21:58:32Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=qmmp
-pkgver=0.7.4
+pkgver=0.7.5
 pkgrel=1
 pkgdesc="Qt4 based audio-player"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,7 +24,7 @@ optdepends=('flac: native FLAC support'
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('ba10d0595b99495587643584c9c8400e6eb987bd2e4bbb30c1060c507f44b4f2')
+sha256sums=('6066aea939813667dae7cf32ff1d6eb9913894977d132c2cd729fea22d24cf67')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog
index ca8e921c9..0cbc2673d 100644
--- a/community/qmmp/qmmp.changelog
+++ b/community/qmmp/qmmp.changelog
@@ -1,3 +1,6 @@
+2014-02-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qmmp 0.7.5-1
+
 2013-12-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* qmmp 0.7.4-1
 
diff --git a/community/qtcurve/PKGBUILD b/community/qtcurve/PKGBUILD
index d85ed86d5..f64a14d42 100644
--- a/community/qtcurve/PKGBUILD
+++ b/community/qtcurve/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98877 2013-10-21 00:42:02Z speps $
+# $Id: PKGBUILD 105059 2014-01-30 19:46:54Z speps $
 # Maintainer : speps <speps at aur dot archlinux dot org>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,16 +6,16 @@
 
 pkgbase=qtcurve
 pkgname=('qtcurve-utils' 'qtcurve-gtk2' 'qtcurve-qt4' 'qtcurve-qt5' 'qtcurve-kde4')
-pkgver=1.8.17
+pkgver=1.8.18
 pkgrel=1
 pkgdesc='A configurable set of widget styles for KDE and Gtk'
 arch=('i686' 'x86_64')
 url='https://github.com/QtCurve/qtcurve'
-license=('GPL')
+license=('LGPL')
 groups=('qtcurve')
 makedepends=('cmake' 'automoc4' 'gtk2' 'qt4' 'qt5-svg' 'qt5-x11extras' 'kdebase-workspace')
 source=("$pkgbase-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
-md5sums=('c4f2e9bc296398b42bfc132b88a3b989')
+md5sums=('422d1876d944bb278855f320eda19368')
 
 build() {
   cd $pkgbase-$pkgver
@@ -37,7 +37,7 @@ build() {
 
 package_qtcurve-utils() {
   depends=('libx11')
-  cd $pkgbase-$pkgver/build/qtcurve-utils
+  cd $pkgbase-$pkgver/build/lib/utils
   make DESTDIR="$pkgdir" install
 }
 
@@ -45,6 +45,8 @@ package_qtcurve-gtk2() {
   depends=('qtcurve-utils' 'gtk2')
   cd $pkgbase-$pkgver/build/gtk2
   make DESTDIR="$pkgdir" install
+  cd ../lib/cairo
+  make DESTDIR="$pkgdir" install
 }
 
 package_qtcurve-qt4() {
diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD
index c64c433ee..4e78d67ec 100644
--- a/community/qtractor/PKGBUILD
+++ b/community/qtractor/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 98346 2013-10-08 20:19:08Z schiv $
+# $Id: PKGBUILD 105622 2014-02-12 07:14:10Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Philipp Überbacher <hollunder at gmx dot at>
 
 pkgname=qtractor
-pkgver=0.5.11
-pkgrel=1
+pkgver=0.5.12
+pkgrel=2
 pkgdesc="Audio/MIDI multitrack sequencer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://qtractor.sourceforge.net/"
 license=('GPL')
-depends=('qt4' 'suil' 'lilv' 'libmad' 'liblo'
+depends=('qt4' 'suil' 'lilv' 'libmad' 'liblo>=0.28'
          'rubberband' 'shared-mime-info')
 makedepends=('ladspa' 'dssi')
 [ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support')
 install=qtractor.install
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('97a07f55ea61747859b1fd6c284a0806')
+md5sums=('f26691f70c4cd4b89bc4369a579f291f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/qtspim/PKGBUILD b/community/qtspim/PKGBUILD
index 1dc5e82a1..9b1d4bb4b 100644
--- a/community/qtspim/PKGBUILD
+++ b/community/qtspim/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 85407 2013-03-01 10:39:40Z andrea $
+# $Id: PKGBUILD 105104 2014-01-31 20:09:26Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgname=qtspim
-pkgver=9.1.7
-pkgrel=2
+pkgver=9.1.13
+pkgrel=1
 pkgdesc="New user interface for spim, a MIPS simulator."
 arch=('i686' 'x86_64')
 url="http://spimsimulator.sourceforge.net/"
@@ -14,7 +14,7 @@ makedepends=('subversion')
 
 __svntrunk="https://spimsimulator.svn.sourceforge.net/svnroot/spimsimulator"
 __svnmod=('QtSpim' 'CPU' 'Documentation' 'Setup')
-__svnrev=598
+__svnrev=637
 
 build() {
   cd "$srcdir"
@@ -38,7 +38,8 @@ build() {
   done
   cd "$srcdir/build/QtSpim"
 
-  qmake
+  qmake-qt4
+  sed -i 's/qcollectiongenerator/qcollectiongenerator-qt4/' Makefile
   make
 }
 
diff --git a/community/qucs/PKGBUILD b/community/qucs/PKGBUILD
index 1ff7d7cb1..d43c09d04 100644
--- a/community/qucs/PKGBUILD
+++ b/community/qucs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94064 2013-07-13 14:17:21Z spupykin $
+# $Id: PKGBUILD 105286 2014-02-04 16:31:06Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Víctor Martínez Romanos <vmromanos@gmail.com>
 
 pkgname=qucs
 pkgver=0.0.17
-pkgrel=1
+pkgrel=2
 pkgdesc="An integrated circuit simulator with a graphical user interface"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://qucs.sourceforge.net"
@@ -17,6 +17,11 @@ optdepends=('freehdl: to permit digital circuit simulation'
 source=("http://downloads.sourceforge.net/project/qucs/qucs/$pkgver/qucs-$pkgver.tar.gz")
 md5sums=('4b93ffcc2ef3dbbd6fa53a5743721532')
 
+prepare() {
+  cd $srcdir/$pkgname-${pkgver/s/.}
+  sed -i 's|Icon=.*|Icon=/usr/share/qucs/bitmaps/big.qucs.xpm|' debian/qucs.desktop
+}
+
 build() {
   cd $srcdir/$pkgname-${pkgver/s/.}
   ./configure --prefix=/usr
@@ -26,4 +31,6 @@ build() {
 package() {
   cd $srcdir/$pkgname-${pkgver/s/.}
   make DESTDIR=$pkgdir install
+
+  install -Dm0644 debian/qucs.desktop $pkgdir/usr/share/applications/qucs.desktop
 }
diff --git a/community/quesoglc/PKGBUILD b/community/quesoglc/PKGBUILD
index 44d7f817c..bd149df59 100644
--- a/community/quesoglc/PKGBUILD
+++ b/community/quesoglc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99975 2013-10-31 02:47:18Z allan $
+# $Id: PKGBUILD 103332 2014-01-03 11:06:25Z bpiotrowski $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Markus Pargmann
 
 pkgname=quesoglc
 pkgver=0.7.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A free implementation of the OpenGL Character Renderer (GLC)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://quesoglc.sourceforge.net/"
diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD
index e0fe27250..7a9e95b0e 100644
--- a/community/radvd/PKGBUILD
+++ b/community/radvd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 101735 2013-11-30 16:21:06Z seblu $
+# $Id: PKGBUILD 103783 2014-01-11 19:10:38Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
 
 pkgname=radvd
-pkgver=1.9.7
+pkgver=1.9.8
 pkgrel=1
 pkgdesc='IPv6 Router Advertisement Daemon'
 url='http://www.litech.org/radvd/'
@@ -12,9 +12,10 @@ license=('custom')
 depends=('glibc' 'libdaemon')
 arch=('i686' 'x86_64' 'mips64el')
 backup=('etc/radvd.conf')
-source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz"
+source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.xz"{,.asc}
         "$pkgname.service")
-sha1sums=('92f7eadfee951f787e861f41c344689416f3f504'
+sha1sums=('69db8ee2e74e2312db482882bb68726f7bbd3477'
+          'SKIP'
           '2fdba3b0ed28c67dc1c04bfd1439fa4dece88bbc')
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/rapidsvn/PKGBUILD b/community/rapidsvn/PKGBUILD
index 767d945d5..055f617a0 100644
--- a/community/rapidsvn/PKGBUILD
+++ b/community/rapidsvn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 100277 2013-11-02 08:47:54Z spupykin $
+# $Id: PKGBUILD 103801 2014-01-11 20:08:34Z eric $
 # 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,12 @@
 
 pkgname=rapidsvn
 pkgver=0.12.1
-pkgrel=2
+pkgrel=6
 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')
-depends=('subversion' 'wxgtk')
+depends=('subversion' 'wxgtk2.8')
 makedepends=('python2' 'automake' 'libtool')
 source=(http://www.rapidsvn.org/download/release/$pkgver/rapidsvn-$pkgver.tar.gz
 	$pkgname.desktop)
@@ -24,7 +24,10 @@ build() {
   ./autogen.sh
 
   sed -i 's#src/tests/svncpp/Makefile##' configure
-  [ "$NOEXTRACT" == 1 ] || ./configure --prefix=/usr --with-apu-config="`which apu-1-config`" --with-apr-config="`which apr-1-config`"
+  [ "$NOEXTRACT" == 1 ] || ./configure --prefix=/usr \
+    --with-apu-config="`which apu-1-config`" \
+    --with-apr-config="`which apr-1-config`" \
+    --with-wx-config="`which wx-config-2.8`"
 
   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/*.py
   sed -i 's|python|python2|' src/locale/Makefile
diff --git a/community/ratpoison/PKGBUILD b/community/ratpoison/PKGBUILD
index dbfaaeac6..ad4de8c21 100644
--- a/community/ratpoison/PKGBUILD
+++ b/community/ratpoison/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88374 2013-04-16 20:26:08Z kkeen $
+# $Id: PKGBUILD 105159 2014-02-02 00:22:45Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: juergen <juergen@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=ratpoison
 pkgver=1.4.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple keystroke-driven window manager"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -21,6 +21,9 @@ md5sums=('5fbaab737cf7fcc8e5eb2d619aaa0eab'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # FS#38726, v1.4.6-2 
+  sed -i 's|PRINT_ERROR (("XGetWMName|PRINT_DEBUG (("XGetWMName|' src/manage.c
+
   ./configure --prefix=/usr
   make CFLAGS="$CFLAGS -DHAVE_GETLINE"
 }
diff --git a/community/rawstudio/PKGBUILD b/community/rawstudio/PKGBUILD
index ea5f6ba0f..b256019d4 100644
--- a/community/rawstudio/PKGBUILD
+++ b/community/rawstudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 100450 2013-11-04 12:12:48Z spupykin $
+# $Id: PKGBUILD 104804 2014-01-26 12:17:42Z andyrtr $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=rawstudio
 pkgver=2.0
-pkgrel=10
+pkgrel=11
 pkgdesc="An open source raw-image converter written in GTK+"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD
index 54e0a876c..2c39d7c01 100644
--- a/community/rawtherapee/PKGBUILD
+++ b/community/rawtherapee/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 92590 2013-06-09 15:08:48Z stativ $
+# $Id: PKGBUILD 103786 2014-01-11 19:56:49Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com>
 # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com>
 # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz>
 # Contributor: Archie <mymaud@gmail.com>
 
 pkgname=rawtherapee
-pkgver=4.0.11
+pkgver=4.0.12
 pkgrel=1
 epoch=1
 pkgdesc="RAW photo editor"
@@ -13,10 +13,13 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rawtherapee.com/"
 license=('GPL3')
 depends=('fftw' 'gtkmm' 'libcanberra' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('cmake')
+makedepends=('cmake' 'mercurial')
+#makedepends=('cmake')
 install=rawtherapee.install
-source=("http://rawtherapee.googlecode.com/files/rawtherapee-$pkgver.tar.xz")
-md5sums=('d30a54e6446326d8299c06ec76c281d8')
+source=("rawtherapee-$pkgver::hg+https://code.google.com/p/rawtherapee/#tag=$pkgver")
+md5sums=('SKIP')
+#source=("http://rawtherapee.googlecode.com/files/rawtherapee-$pkgver.tar.xz")
+#md5sums=('d30a54e6446326d8299c06ec76c281d8')
 
 build() {
   mkdir "$srcdir/$pkgname-build"
diff --git a/community/rbutil/PKGBUILD b/community/rbutil/PKGBUILD
index 7ed26bf3e..c6bf0ea4a 100755
--- a/community/rbutil/PKGBUILD
+++ b/community/rbutil/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 96229 2013-08-22 00:02:57Z alucryd $
+# $Id: PKGBUILD 103630 2014-01-08 13:34:03Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: said <atvordhosbn@gmail.com>
 # Contributor: clinx <clinx.hacker@googlemail.com>
 
 pkgname=rbutil
-pkgver=1.3.1
-pkgrel=4
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="Rockbox Utility"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rockbox.org/twiki/bin/view/Main/RockboxUtility"
 license=("GPL")
-depends=('qt4' 'libusbx')
-makedepends=('gendesk')
+depends=('qt5-base' 'libusbx')
+makedepends=('gendesk' 'qt5-tools')
 optdepends=('speex: voice files support')
 source=("http://download.rockbox.org/${pkgname}/source/RockboxUtility-v${pkgver}-src.tar.bz2")
-sha256sums=('6c04b5c7eaad1762577908dedb9e40f5b0cee675150ae5ba844ea2c9bea294ca')
+sha256sums=('bc28a58ac1f62055a39b072e7b41a162f407a8b83172c84790568235d4637e4c')
 
 prepare() {
   gendesk -n --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --name="Rockbox Utility" --exec="RockboxUtility" --categories="Application;Utility;" --comment="Rockbox automated installer"
@@ -23,8 +23,8 @@ prepare() {
 build() {
   cd RockboxUtility-v${pkgver}/${pkgname}/rbutilqt
 
-  lrelease-qt4 rbutilqt.pro
-  qmake-qt4
+  lrelease-qt5 rbutilqt.pro
+  qmake-qt5
   make
 }
 
diff --git a/community/rbutil/rbutil.desktop b/community/rbutil/rbutil.desktop
deleted file mode 100755
index 920b6a452..000000000
--- a/community/rbutil/rbutil.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Rockbox Utility
-GenericName=Rockbox Utility
-Comment=Configure Rockbox
-Encoding=UTF-8
-Exec=rbutil
-Icon=rbutil.png
-Categories=Application;Qt;AudioVideo;Audio;
-StartupNotify=false
-Terminal=false
-Type=Application
diff --git a/community/rdesktop/PKGBUILD b/community/rdesktop/PKGBUILD
index 9ed9c79c0..f666847d5 100644
--- a/community/rdesktop/PKGBUILD
+++ b/community/rdesktop/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 101267 2013-11-21 12:16:40Z bpiotrowski $
+# $Id: PKGBUILD 104044 2014-01-14 19:45:06Z jelle $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Dan McGee <dan@archlinux.org>
 
 pkgname=rdesktop
 pkgver=1.8.1
-pkgrel=1
+pkgrel=3
 pkgdesc="An open source client for Windows Remote Desktop Services"
 arch=('i686' 'x86_64')
 url="http://www.rdesktop.org/"
 license=('GPL3')
-depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite')
+depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite' 'libgssglue')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         rdesktop-send_physical_buttons.diff)
 sha1sums=('57bb41f98ddf9eeef875c613d790fee37971d0f8'
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 20cfff99b..67c403c8a 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 102497 2013-12-12 12:51:43Z spupykin $
+# $Id: PKGBUILD 105686 2014-02-13 16:52:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
-pkgver=2.8.3
+pkgver=2.8.6
 pkgrel=1
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ source=("http://download.redis.io/releases/redis-$pkgver.tar.gz"
 	"redis.service"
 	"redis.logrotate"
 	"redis.tmpfiles.d")
-md5sums=('6327e6786130b556b048beef0edbdfa7'
+md5sums=('f0dbfcdea98ed237e7990d1eaff82241'
          '5320aa6d0f31aadc1d6202ca40425aea'
          '9e2d75b7a9dc421122d673fe520ef17f'
          'dd9ab8022b4d963b2e5899170dfff490')
diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD
index dcd7122a6..962c1c5b8 100644
--- a/community/rekonq/PKGBUILD
+++ b/community/rekonq/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 101077 2013-11-16 03:53:07Z andrea $
+# $Id: PKGBUILD 104681 2014-01-24 15:11:26Z andrea $
 # Maintainer: Peter Lewis <plewis@aur.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net>
 
 pkgname=rekonq
-pkgver=2.4.0
+pkgver=2.4.2
 pkgrel=1
 pkgdesc='A WebKit based web browser for KDE'
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ optdepends=('kdebase-konqueror: search engines support'
             'qca-ossl: to use the sync handler')
 install=${pkgname}.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('660f40fe612b6706623977d8cdb94b49aaacdb53aac2689d95f02d782ce2715b')
+sha256sums=('e9805b32f592ca5809bd1632c624c57fc0109ce98b73a8b8e3ebd04e9c875126')
 
 prepare() {
   mkdir build
diff --git a/community/remind/PKGBUILD b/community/remind/PKGBUILD
index 54ee3ba5d..67eac4915 100644
--- a/community/remind/PKGBUILD
+++ b/community/remind/PKGBUILD
@@ -5,12 +5,14 @@
 
 pkgname=remind
 pkgver=3.01.13
-pkgrel=1
+pkgrel=2
 pkgdesc='A sophisticated calendar and alarm program.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.roaringpenguin.com/penguin/open_source_remind.php'
 license=('GPL')
-depends=('tk' 'tcllib')
+optdepends=('tk: for tkremind'
+            'tcllib: for tkremind'
+            'tcl: for cm2rem.tcl')
 source=("http://www.roaringpenguin.com/files/download/${pkgname}-0${pkgver}.tar.gz"{,.sig})
 options=('!emptydirs')
 md5sums=('9b746d257eccd5961d61c649cf48305c'
diff --git a/community/remmina/PKGBUILD b/community/remmina/PKGBUILD
index adc4084a8..17b881c1a 100644
--- a/community/remmina/PKGBUILD
+++ b/community/remmina/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 72637 2012-06-18 09:24:39Z spupykin $
+# $Id: PKGBUILD 103926 2014-01-13 17:17:00Z andyrtr $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=remmina
 pkgver=1.0.0
-pkgrel=9.1
+pkgrel=11
 pkgdesc="remote desktop client written in GTK+"
 arch=(i686 x86_64 mips64el)
 url="http://remmina.sourceforge.net/"
@@ -14,7 +14,8 @@ makedepends=('intltool' 'pkgconfig' 'cmake' 'libgnome-keyring'
 optdepends=('libxkbfile'
 	    'freerdp'
 	    'telepathy-glib'
-	    'gnome-keyring')
+	    'gnome-keyring'
+	    'nxproxy')
 replaces=('remmina-plugins')
 provides=('remmina-plugins')
 install=remmina.install
@@ -30,16 +31,16 @@ source=("https://github.com/downloads/FreeRDP/Remmina/Remmina-$pkgver.tar.gz"
 	'https://github.com/FreeRDP/Remmina/commit/b2277827.patch'
 	'https://github.com/FreeRDP/Remmina/commit/cb0b209b.patch')
 md5sums=('701c540acaab961bc3adf130a2ddb8b1'
-         '23927a584c23d0da7a893c1f39d53857'
-         '40f5ce2f30c8ce8ae8a4ebcee52874ab'
-         'c842ba295c2327ab4d0819fc4a5bc03f'
-         '9312b5bf953a63e6203f0d0be6cb8134'
-         '65bfcc39ae51343b90928ea329cc4900'
-         '42b971116f887657fc210da70c3afba5'
-         '04b5bc1190b53211747e097897d1d19c'
-         'ce0b538ff850556b2ad8fc4e4736039e'
-         '3bc1a4e50cdd864c0e2d7c91a1e02e32'
-         'b9023ea4f36c31c3d4e98cfc472c1a09')
+         '658218f0e63f512425893ec204e18f29'
+         'dd1aad8524f470c634c4534122c1d101'
+         '2cfe2dbb399cbc1b0d89606824b4280d'
+         '26d06a319589bdc906422eb902ebfd17'
+         'b813f7b1281d808d45da99699e17c4b7'
+         '3bb434fd6c6b8ee90d98fcd7be2e307d'
+         '083a34a0339f763e52f33b6dbfb0a550'
+         '0fdb897dbccf2f986fc49a15f6d22bd7'
+         'e891041fb3b14eb6465cc3d783e9b600'
+         '59ec2f4ed9382c743db212e86ebfbdfe')
 
 build() {
   cd ${srcdir}/FreeRDP-Remmina-*/
diff --git a/community/ripperx/PKGBUILD b/community/ripperx/PKGBUILD
index cd0fb0261..896d1f8ac 100644
--- a/community/ripperx/PKGBUILD
+++ b/community/ripperx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83323 2013-01-29 14:04:00Z spupykin $
+# $Id: PKGBUILD 105241 2014-02-03 10:20:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: dorphell <dorphell@archlinux.org>
 
 pkgname=ripperx
 pkgver=2.7.3
-pkgrel=4
+pkgrel=5
 pkgdesc="GTK program to rip and encode mp3 files"
 arch=(i686 x86_64 'mips64el')
 url="http://ripperx.sourceforge.net/"
@@ -13,11 +13,20 @@ license=('GPL')
 source=(http://downloads.sourceforge.net/ripperx/ripperX-$pkgver.tar.gz)
 md5sums=('f07c55edf08a1cd57537f1b9379b4e4d')
 
-build() {
+prepare() {
   cd $srcdir/ripperX-$pkgver
-  LDFLAGS=-lm ./configure --prefix=/usr
   sed -i 's|Icon=.*|Icon=ripperX.xpm|g' ripperX.desktop
   echo "Categories=GTK;GNOME;AudioVideo;DiscBurning;" >>ripperX.desktop
+  patch ripperX.pc.in <<EOF
+diff -r ripperX-2.7.3/ripperX.pc.in ripperX-2.7.3.y/ripperX.pc.in
+3a4
+> includedir=@includedir@
+EOF
+}
+
+build() {
+  cd $srcdir/ripperX-$pkgver
+  LDFLAGS=-lm ./configure --prefix=/usr
   make
 }
 
diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD
index aded6c0b6..11614da4a 100644
--- a/community/roxterm/PKGBUILD
+++ b/community/roxterm/PKGBUILD
@@ -1,20 +1,23 @@
-# $Id: PKGBUILD 92214 2013-06-02 21:00:23Z ttoepper $
+# $Id: PKGBUILD 104490 2014-01-21 20:41:40Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=roxterm
-pkgver=2.7.2
+pkgver=2.8.1
 pkgrel=1
 pkgdesc='Tabbed, VTE-based terminal emulator'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://roxterm.sourceforge.net/'
 license=('GPL3')
-depends=('dbus-glib' 'vte3' 'hicolor-icon-theme')
+depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'libsm')
 makedepends=('docbook-xsl' 'xmlto' 'po4a' 'python2' 'python2-lockfile' 'imagemagick' 'librsvg')
 install=roxterm.install
-source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2")
-md5sums=('8ef80f9a5e0aea659b1f9cd6de9869b4')
-sha1sums=('fa32ceeb19a097d5fb8a54c24cb7a6f1b957e74d')
+source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2"
+        "http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2.sign")
+md5sums=('cf5aa488cc382ec0df8b3a856707d245'
+         'SKIP')
+sha1sums=('45535957cec6936d259dc8ae693f2ab4b148bde6'
+          'SKIP')
 
 
 build() {
diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD
index 4ae5984c1..d5a9fb56c 100644
--- a/community/rss-glx/PKGBUILD
+++ b/community/rss-glx/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99981 2013-10-31 02:49:18Z allan $
+# $Id: PKGBUILD 104502 2014-01-22 01:50:15Z eric $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it>
 # Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au>
 
 pkgname=rss-glx
 pkgver=0.9.1
-pkgrel=16
+pkgrel=17
 pkgdesc="The Really Slick Screensavers port to GLX"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://rss-glx.sourceforge.net/"
@@ -20,7 +20,7 @@ md5sums=('a772bd143cd8d141edf4d9eff9860ab3'
          '4211215c9a4918b0dff30a7000647dd9')
 
 build() {
-  cd ${srcdir}/${pkgname}_${pkgver}
+  cd ${pkgname}_${pkgver}
 
   [ "$CARCH" = "x86_64" ] && (sed -i -e 's|@LIBS@|@LIBS@ -fopenmp|g' src/Makefile.in)
 
@@ -34,16 +34,16 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}_${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd ${pkgname}_${pkgver}
+  make DESTDIR="${pkgdir}" install
 
   # FS#18300
-  install -d ${pkgdir}/usr/lib/xscreensaver/
-  list=$(ls ${pkgdir}/usr/bin --ignore rss-glx_install.pl)
+  install -d "${pkgdir}/usr/lib/xscreensaver/"
+  list=$(ls "${pkgdir}/usr/bin" --ignore rss-glx_install.pl)
   for i in $list; do
     ln -s "/usr/bin/$i" "$pkgdir/usr/lib/xscreensaver/"
   done
 
-  install -d ${pkgdir}/usr/share/applications/screensavers
-  install -m644 ${srcdir}/${pkgname}-desktops/*.desktop ${pkgdir}/usr/share/applications/screensavers
+  install -d "${pkgdir}/usr/share/applications/screensavers"
+  install -m644 "${srcdir}"/${pkgname}-desktops/*.desktop "${pkgdir}/usr/share/applications/screensavers"
 }
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index 50df0b3f8..cea367ff1 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 102435 2013-12-11 10:18:07Z spupykin $
+# $Id: PKGBUILD 105661 2014-02-13 09:27:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=rsyslog
-pkgver=7.4.7
+pkgver=7.6.0
 pkgrel=1
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
-depends=('zlib' 'libestr' 'libee' 'json-c' 'systemd')
+depends=('zlib' 'libestr' 'libee' 'json-c' 'systemd' 'liblogging')
 makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls'
 	     'python-docutils')
 optdepends=('postgresql-libs: PostgreSQL Database Support'
@@ -16,13 +16,12 @@ optdepends=('postgresql-libs: PostgreSQL Database Support'
 	    'net-snmp'
 	    'gnutls')
 backup=('etc/rsyslog.conf'
-	'etc/logrotate.d/rsyslog'
-	'etc/conf.d/rsyslog')
+	'etc/logrotate.d/rsyslog')
 options=('strip' 'zipman')
 source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
 	'rsyslog.logrotate'
 	'rsyslog.conf')
-md5sums=('c96850bd9d07780ea7398ac86df385ae'
+md5sums=('26a12cb6d6693839aea07d29f8654bc9'
          '0d990373f5c70ddee989296007b4df5b'
          'd61dd424e660eb16401121eed20d98bc')
 
diff --git a/community/rtl-sdr/PKGBUILD b/community/rtl-sdr/PKGBUILD
index 76f5a20ec..3bad0ade0 100644
--- a/community/rtl-sdr/PKGBUILD
+++ b/community/rtl-sdr/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 100562 2013-11-05 21:31:17Z kkeen $
+# $Id: PKGBUILD 105412 2014-02-07 01:40:43Z 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=20131105
-_commit=c5b8a2130007
+pkgver=20140207
+_commit=df9596b2d1
 pkgrel=1
 pkgdesc="Driver for Realtek RTL2832U, allowing general purpose software defined radio (SDR)."
 arch=('i686' 'x86_64')
@@ -31,9 +31,10 @@ pkgver() {
 
 build() {
   cd "$srcdir/$_gitname"
-  mkdir build
+  mkdir -p build
   cd build
   cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+        -DDETACH_KERNEL_DRIVER=ON \
         -DINSTALL_UDEV_RULES=ON -Wno-dev ../
   make
 }
diff --git a/community/rubinius/PKGBUILD b/community/rubinius/PKGBUILD
index 1d4d24942..bf7ead370 100644
--- a/community/rubinius/PKGBUILD
+++ b/community/rubinius/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 103201 2013-12-29 21:58:18Z heftig $
+# $Id: PKGBUILD 105511 2014-02-09 13:50:07Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=rubinius
 pkgname=(rubinius rubinius-ruby)
-pkgver=2.2.3
+pkgver=2.2.5
 pkgrel=1
 pkgdesc="Ruby runtime written in Ruby, designed for concurrency"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ makedepends=(llvm rubinius-ruby)
 options=(!emptydirs)
 source=(http://releases.rubini.us/${pkgbase}-${pkgver}.tar.bz2
         gemrc dirs.patch)
-sha256sums=('b3426aa6996420f1d9d8a7926a94160b84d8bdf725793c64462b27b74f2f2acf'
+sha256sums=('42cfae89d481dfa5e0ccb53a67720f109fc6c2e1b6ca68a8ae9676be6d0457de'
             '4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614'
             '93f3918dc2a5679e281e724f9b3cb712ffa784c1e52e6fa7ce75f74ce6655a66')
 
@@ -61,7 +61,7 @@ package_rubinius() {
   DESTDIR="$pkgdir" rake install
 
   mkdir -p "$pkgdir/usr/share/ri"
-  ln -s 2.0.0 "$pkgdir/usr/share/ri/2.1"
+  ln -s 2.1.0 "$pkgdir/usr/share/ri/2.1"
 
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/rubinius/LICENSE"
 
@@ -75,7 +75,7 @@ package_rubinius() {
 
 package_rubinius-ruby() {
   pkgdesc="Ruby compat for Rubinius"
-  depends=(rubinius)
+  depends=("rubinius=$pkgver-$pkgrel")
   provides=(ruby)
   conflicts=(ruby)
   backup=(etc/gemrc)
diff --git a/community/rubinius/dirs.patch b/community/rubinius/dirs.patch
new file mode 100644
index 000000000..8fe9c3b4e
--- /dev/null
+++ b/community/rubinius/dirs.patch
@@ -0,0 +1,16 @@
+diff --git i/library/rbconfig.rb w/library/rbconfig.rb
+index 611ad6a..533ef00 100644
+--- i/library/rbconfig.rb
++++ w/library/rbconfig.rb
+@@ -19,9 +19,9 @@ module RbConfig
+   CONFIG["libexecdir"]         = "$(exec_prefix)/libexec"
+   CONFIG["datarootdir"]        = "$(prefix)/share"
+   CONFIG["datadir"]            = "$(datarootdir)"
+-  CONFIG["sysconfdir"]         = "$(prefix)/etc"
++  CONFIG["sysconfdir"]         = "/etc"
+   CONFIG["sharedstatedir"]     = "$(prefix)/com"
+-  CONFIG["localstatedir"]      = "$(prefix)/var"
++  CONFIG["localstatedir"]      = "/var"
+   CONFIG["includedir"]         = "$(prefix)/include"
+   CONFIG["oldincludedir"]      = "/usr/include"
+   CONFIG["docdir"]             = "$(datarootdir)/doc/$(PACKAGE)"
diff --git a/community/ruby-cairo/PKGBUILD b/community/ruby-cairo/PKGBUILD
index 0b0ef4e3e..56ae7e010 100644
--- a/community/ruby-cairo/PKGBUILD
+++ b/community/ruby-cairo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 102505 2013-12-12 14:34:05Z arodseth $
+# $Id: PKGBUILD 104887 2014-01-28 03:34:18Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Jeremy <reebydobalina@yahoo.ca>
 
 pkgname=ruby-cairo
-pkgver=1.12.6
+pkgver=1.12.8
 pkgrel=1
 pkgdesc='Ruby bindings for cairo'
 arch=('x86_64' 'i686' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('ruby' 'cairo')
 makedepends=('ruby-pkgconfig')
 source=("http://cairographics.org/releases/rcairo-$pkgver.tar.gz")
-sha256sums=('e7ff8d49a730662b3f999187fde45ac0b8651996fe7f9a952496be8b6e45800e')
+sha256sums=('8a6a73c9c67eb0a5b6502483c8c39ffb6acbcadd2574123a6597271c2c25736d')
 
 build() {
   cd "$srcdir/rcairo-$pkgver"
@@ -27,7 +27,7 @@ package() {
 
   make DESTDIR="$pkgdir" install
   install -Dm644 ext/cairo/cairo.so \
-    "$pkgdir/usr/lib/ruby/vendor_ruby/2.0.0/$CARCH-linux/cairo.so"
+    "$pkgdir/usr/lib/ruby/vendor_ruby/2.1.0/$CARCH-linux/cairo.so"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD
index 0ab0c44d3..854f049ac 100644
--- a/community/ruby-gtk2/PKGBUILD
+++ b/community/ruby-gtk2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92390 2013-06-04 13:59:53Z arodseth $
+# $Id: PKGBUILD 104888 2014-01-28 03:34:19Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
@@ -8,17 +8,17 @@
 pkgbase=ruby-gtk2
 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2'
          'ruby-pango')
-pkgver=2.0.2
-pkgrel=1
+pkgver=2.1.0
+pkgrel=2
 arch=('x86_64' 'i686' 'mips64el')
 url='http://ruby-gnome2.sourceforge.jp/'
 license=('LGPL')
 makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2' 'glib2')
 source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz")
-sha256sums=('3a009bde5f4c684214d7860cce5763db4d862cfdeafaa84578117dc723b7e1e5')
+sha256sums=('939251c1f82b41c3cf657552396cf4e1198365316904957cfb7167d1298db204')
 
 prepare() {
-  cd "$srcdir/ruby-gtk2-$pkgver"
+  cd "ruby-gtk2-$pkgver"
 
   LANG="en_US.UTF-8" \
     ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --vendor
@@ -34,8 +34,7 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir/ruby-gtk2-$pkgver"
-  make
+  make -C "ruby-gtk2-$pkgver"
 }
 
 package_ruby-atk() {
@@ -43,7 +42,7 @@ package_ruby-atk() {
   depends=("ruby-glib2=$pkgver" 'atk')
 
   cd "$srcdir/ruby-gtk2-$pkgver/atk"
-  make includedir="/usr/include" DESTDIR="$pkgdir" install
+  make includedir="/usr/include" DESTDIR="$pkgdir" install -j1
 }
 
 package_ruby-gdkpixbuf2() {
@@ -51,7 +50,7 @@ package_ruby-gdkpixbuf2() {
   depends=("ruby-glib2=$pkgver" 'gdk-pixbuf2')
 
   cd "$srcdir/ruby-gtk2-$pkgver/gdk_pixbuf2"
-  make includedir="/usr/include" DESTDIR="$pkgdir" install
+  make includedir="/usr/include" DESTDIR="$pkgdir" install -j1
 }
 
 package_ruby-gio2() {
@@ -59,7 +58,7 @@ package_ruby-gio2() {
   depends=("ruby-glib2=$pkgver")
 
   cd "$srcdir/ruby-gtk2-$pkgver/gio2"
-  make includedir="/usr/include" DESTDIR="$pkgdir/" install
+  make includedir="/usr/include" DESTDIR="$pkgdir/" install -j1
 }
 
 package_ruby-glib2() {
@@ -67,7 +66,7 @@ package_ruby-glib2() {
   depends=('glib2' 'ruby')
 
   cd "$srcdir/ruby-gtk2-$pkgver/glib2"
-  make includedir="/usr/include" DESTDIR="$pkgdir/" install
+  make includedir="/usr/include" DESTDIR="$pkgdir/" install -j1
 }
 
 package_ruby-gtk2() {
@@ -76,7 +75,7 @@ package_ruby-gtk2() {
            "ruby-gdkpixbuf2=$pkgver")
 
   cd "$srcdir/ruby-gtk2-$pkgver/gtk2"
-  make includedir="/usr/include" DESTDIR="$pkgdir/" install
+  make includedir="/usr/include" DESTDIR="$pkgdir/" install -j1
 }
 
 package_ruby-pango() {
@@ -84,7 +83,7 @@ package_ruby-pango() {
   depends=("ruby-glib2=$pkgver" 'ruby-cairo' 'pango')
 
   cd "$srcdir/ruby-gtk2-$pkgver/pango"
-  make includedir="/usr/include" DESTDIR="$pkgdir/" install
+  make includedir="/usr/include" DESTDIR="$pkgdir/" install -j1
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/ruby-gtk3/PKGBUILD b/community/ruby-gtk3/PKGBUILD
index 22205ea02..a09544879 100644
--- a/community/ruby-gtk3/PKGBUILD
+++ b/community/ruby-gtk3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92836 2013-06-16 15:30:03Z arodseth $
+# $Id: PKGBUILD 104889 2014-01-28 03:34:19Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Eric Bélanger
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
@@ -6,8 +6,8 @@
 # Contributor: kritoke <kritoke@nospam.gmail.com>
 
 pkgbase=ruby-gtk3
-pkgver=2.0.2
-pkgrel=1
+pkgver=2.1.0
+pkgrel=2
 pkgname=('ruby-gtk3' 'ruby-gdk3')
 depends=("ruby-atk=$pkgver" "ruby-gdkpixbuf2=$pkgver" "ruby-glib2=$pkgver" "ruby-pango=$pkgver")
 arch=('x86_64' 'i686' 'mips64el')
@@ -15,7 +15,7 @@ url='http://ruby-gnome2.sourceforge.jp/'
 license=('LGPL')
 makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk3')
 source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk3-$pkgver.tar.gz")
-sha256sums=('cc55542b207899af2bc0489c004c394b2332656cbf25ef3ff0daceff39535047')
+sha256sums=('436844cc9ab3bf5e5a3027e3276fc69ff9cae5cff88bc60179c416050d5e753d')
 
 prepare() {
 	cd "$srcdir/ruby-gtk3-$pkgver"
diff --git a/community/ruby-iconv/PKGBUILD b/community/ruby-iconv/PKGBUILD
index 8a6e207f9..87d751791 100755
--- a/community/ruby-iconv/PKGBUILD
+++ b/community/ruby-iconv/PKGBUILD
@@ -1,41 +1,27 @@
-# $Id: PKGBUILD 100391 2013-11-03 11:24:29Z alucryd $
+# $Id: PKGBUILD 104890 2014-01-28 03:34:20Z td123 $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 
 pkgname=ruby-iconv
-pkgver=1.0.3
-pkgrel=6
-pkgdesc="Wrapper library for iconv"
+pkgver=1.0.4
+pkgrel=2
+pkgdesc='Wrapper library for iconv'
 arch=('i686' 'x86_64' 'mips64el')
-url="https://github.com/nurse/iconv"
+url='https://github.com/nurse/iconv'
 license=('BSD')
 depends=('ruby')
+options=('!emptydirs')
 source=("http://rubygems.org/downloads/${pkgname#*-}-${pkgver}.gem")
 noextract=("${pkgname#*-}-${pkgver}.gem")
-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
-}
+sha256sums=('5bd4e387a2e8070baf3ebf8d91f545200db25c08686f82cde66f118d9f914f9b')
 
 package() {
-  cd gems/${pkgname#*-}-${pkgver}
-
-  local _rubyver="$(ruby --version | sed 's/.* \(.*\..*\..*\)p.*/\1/')"
-
-  install -dm 755 "${pkgdir}"/usr/lib/ruby/{gems/${_rubyver},vendor_ruby}
-  mv lib "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver}
-
-# Native extension
-  install -dm 755 "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver}/$CARCH-linux
-  mv "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver}/{iconv,$CARCH-linux}/iconv.so
+  local _gemdir="$(ruby -e'puts Gem.default_dir')"
 
-# Gem compatibility
-  mv ../../specifications "${pkgdir}"/usr/lib/ruby/gems/${_rubyver}/
+  gem install --ignore-dependencies --no-user-install -N -i "${pkgdir}"/${_gemdir} ${pkgname#*-}-${pkgver}.gem
+  find "${pkgdir}" -type f -name *.gem -delete
 
-# License
   install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname}
-  install -m 644 {,"${pkgdir}"/usr/share/licenses/${pkgname}/}BSDL
+  ln -s ${_gemdir}/gems/${pkgname#*-}-${pkgver}/BSDL "${pkgdir}"/usr/share/licenses/${pkgname}/
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/community/ruby-ncurses/PKGBUILD b/community/ruby-ncurses/PKGBUILD
index ba37a6dc5..25ee81890 100644
--- a/community/ruby-ncurses/PKGBUILD
+++ b/community/ruby-ncurses/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92582 2013-06-09 08:55:46Z arodseth $
+# $Id: PKGBUILD 104893 2014-01-28 03:34:24Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Jeff Mickey <j@codemac.net>
@@ -6,7 +6,7 @@
 
 pkgname=ruby-ncurses
 pkgver=1.3.1
-pkgrel=5
+pkgrel=6
 pkgdesc='Module for interactive text console applications (ncurses)'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://ncurses-ruby.berlios.de/'
diff --git a/community/rust/PKGBUILD b/community/rust/PKGBUILD
index b6831ab5d..fb1832001 100644
--- a/community/rust/PKGBUILD
+++ b/community/rust/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 97658 2013-09-27 01:45:47Z thestinger $
+# $Id: PKGBUILD 103695 2014-01-10 03:08:10Z thestinger $
 # Maintainer: Daniel Micay <danielmicay@gmail.com>
 pkgname=rust
-pkgver=0.8
-pkgrel=1
+pkgver=0.9
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc='A safe, concurrent, practical language'
 url='http://www.rust-lang.org/'
@@ -11,9 +11,10 @@ depends=(gcc shared-mime-info)
 makedepends=(libffi perl python2 curl chrpath)
 source=("http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz"
         "http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz.asc")
-sha256sums=('42f791ab1537357fe0f63d67ffe6bcb64ecf16b2bd3f1484ab589823f5914182'
+sha256sums=('c0911c3545b797a1ca16f3d76bf5ed234754b828efd1e22c182c7300ac7dd5d1'
             'SKIP')
 install=rust.install
+options=(staticlibs)
 
 build() {
   cd rust-$pkgver
@@ -57,8 +58,8 @@ package() {
   cd "$pkgdir/usr"
 
   # https://github.com/mozilla/rust/issues/5219
-  chrpath -d bin/* lib/*.so lib/rustc/*/lib/*.so
+  chrpath -d bin/* lib/*.so lib/rustlib/*/lib/*.so
 
   cd lib
-  ln -sf rustc/$CARCH-unknown-linux-gnu/lib/* .
+  ln -sf rustlib/$CARCH-unknown-linux-gnu/lib/* .
 }
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index 1a6718f5c..1ec59806e 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102937 2013-12-24 15:23:39Z arcanis $
+# $Id: PKGBUILD 105532 2014-02-09 18:40:24Z arcanis $
 # Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
 # Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Antonio Rojas <nqn1976 at gmail dot com>
@@ -8,39 +8,36 @@
 # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=6.0
-pkgrel=2
-pkgdesc="SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab"
+pkgver=6.1.1
+pkgrel=1
+pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=('i686' 'x86_64')
 url="http://www.sagemath.org"
 license=('GPL')
 #depends=('desktop-file-utils' 'java-environment=7' 'libjpeg-turbo' 'libtiff' 'libxmu' 'sqlite' 'xz')
 depends=('freetype2>=2.3.5')
-makedepends=('gcc-fortran' 'gendesk' 'desktop-file-utils')
+makedepends=('desktop-file-utils' 'gcc-fortran' 'gendesk')
 optdepends=('imagemagick: some plotting functionality benefits from it'
             'texlive-core: some plotting functionality benefits from it, also to use SageTeX'
             'openssh: to use the notebook in secure mode'
             'ffmpeg: to show animations'
             'cairo: R plots')
 source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
-        "fix-pil.patch"
         "sage.service")
 install="${pkgname}.install"
-md5sums=('da1bacf90fc291e736aaa71431e8874e'
-         'de54cb818d74c070a524fc3fd5208b2c'
+md5sums=('800c59f7cfa32c012f358ae240cdb2e6'
          '985da1c1d1dcdc3ea9aa73035cb7996b')
 
 prepare() {
   # create *.desktop file
-  gendesk -n \
+  gendesk -f -n \
           --pkgname="sage-notebook" \
-          --pkgdesc="sage notebook" \
-          --name="sage" \
+          --pkgdesc="Sage notebook" \
+          --name="Sage" \
           --exec="/opt/sage/sage -notebook" \
           --terminal=true \
           --categories="Science;Math" \
-          --custom="StartupNotify=true
-X-DCOP-ServiceType=
+          --custom="X-DCOP-ServiceType=
 X-KDE-SubstituteUID=false
 X-KDE-Username="
   
@@ -51,22 +48,6 @@ X-KDE-Username="
   mkdir "${srcdir}/build"
   
   # according to FS#34769
-  # NOTE: there is an error in pil build (freetype/fterrors.h not found)
-  cd "${srcdir}/sage-${pkgver}/upstream/"
-  tar xjfv pil-1.1.6.tar.bz2
-  rm -r pil-1.1.6.tar.bz2
-  patch -p0 -i "${srcdir}/fix-pil.patch"
-  tar cjvf pil-1.1.6.tar.bz2 pil-1.1.6
-  rm -rf pil-1.1.6
-  # fix checksums
-  SUMS=$(md5sum pil-1.1.6.tar.bz2 | awk '{print $1}')
-  sed "s/md5=[0-9a-f]\{32\}/md5=${SUMS}/" -i "${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini"
-  SUMS=$(sha1sum pil-1.1.6.tar.bz2 | awk '{print $1}')
-  sed "s/sha1=[0-9a-f]\{40\}/sha1=${SUMS}/" -i "${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini"
-  SUMS=$(cksum pil-1.1.6.tar.bz2 | awk '{print $1}')
-  sed "s/cksum=[0-9a-f]\{10\}/cksum=${SUMS}/" -i "${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini"
-  # disable freetype build
-  rm -rf freetype-*
   sed -i -e 's/FREETYPE/#FREETYPE/' "${srcdir}/sage-${pkgver}/build/install"
 }
 
@@ -100,7 +81,6 @@ build() {
   # only build sage, no documents
   #make build
   make
-  ./sage --bdist "${pkgver}"
 }
 
 << COMMENT
@@ -115,27 +95,23 @@ check() {
 COMMENT
 
 package() {
-  cd "sage-${pkgver}"
+  cd "${srcdir}/sage-${pkgver}/"
+  # remove build logs
+  rm -f *.log
+  rm -rf "${srcdir}/sage-${pkgver}/"{logs,upstream}
+  # do NOT remove build directory!
   
   # cp because make install is experimental and will corrupt the install
-  install -d "${pkgdir}/opt/sage"
-  cp -dpr --no-preserve=ownership dist/sage-"${pkgver}-$CARCH-Linux/"* "${pkgdir}/opt/sage/"
+  install -dm755 "${pkgdir}/opt/sage"
+  cp -r * "${pkgdir}/opt/sage/"
   
   # move SageTeX files to more appropriate directory
-  install -d "${pkgdir}/usr/share"
+  install -dm755 "${pkgdir}/usr/share"
   mv "${pkgdir}/opt/sage/local/share/texmf" "${pkgdir}/usr/share"
   
-  # remove build logs
-  rm -f "${pkgdir}/opt/sage/*.log"
-  rm -rf "${pkgdir}/opt/sage/spkg/logs"
-  
-  # remove source packages, since they are rarely needed, they are 300mb in size (compressed)
-  rm -f "${pkgdir}/opt/sage/spkg/base/*spkg"
-  rm -f "${pkgdir}/opt/sage/spkg/standard/*spkg"
-  
   # according to FS#37090
   # install scripts
-  install -d "${pkgdir}/usr/bin"
+  install -dm755 "${pkgdir}/usr/bin"
   ./sage -c "install_scripts('${pkgdir}/usr/bin', ignore_existing=True)"
   # rename scripts to avoid conflicts
   for ITEM in $(ls "${pkgdir}/usr/bin"); do
@@ -147,9 +123,9 @@ package() {
   install -Dm644 "${srcdir}/sage.service" "${pkgdir}/usr/lib/systemd/user/sage.service"
   # install *.desktop and icon files
   install -Dm644 "${srcdir}/sage-notebook.desktop" \
-                 "${pkgdir}/usr/share/applications/SAGE-notebook.desktop"
-  install -Dm644 "${pkgdir}/opt/sage/local/lib/python2.7/site-packages/sagenb-0.10.7.2-py2.7.egg/sagenb/data/sage/images/icon128x128.png" \
-                 "${pkgdir}/usr/share/pixmaps/SAGE-notebook.png"
+                 "${pkgdir}/usr/share/applications/sage-notebook.desktop"
+  install -Dm644 "${pkgdir}/opt/sage/local/lib/python2.7/site-packages/sagenb-0.10.8.2-py2.7.egg/sagenb/data/sage/images/icon48x48.png" \
+                 "${pkgdir}/usr/share/pixmaps/sage-notebook.png"
 }
 
 # vim :set ts=2 sw=2 et:
diff --git a/community/sage-mathematics/fix-pil.patch b/community/sage-mathematics/fix-pil.patch
deleted file mode 100644
index a17f26833..000000000
--- a/community/sage-mathematics/fix-pil.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN pil-1.1.6.orig/_imagingft.c pil-1.1.6/_imagingft.c
---- pil-1.1.6.orig/_imagingft.c	2013-12-23 17:45:39.991183855 +0400
-+++ pil-1.1.6/_imagingft.c	2013-12-23 17:49:06.297861197 +0400
-@@ -65,7 +65,7 @@
-     const char* message;
- } ft_errors[] =
- 
--#include <freetype/fterrors.h>
-+#include <freetype2/fterrors.h>
- 
- /* -------------------------------------------------------------------- */
- /* font objects */
diff --git a/community/sakura/PKGBUILD b/community/sakura/PKGBUILD
index 7e5fa2714..c38d4ba84 100644
--- a/community/sakura/PKGBUILD
+++ b/community/sakura/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102425 2013-12-10 20:26:05Z ronald $
+# $Id: PKGBUILD 105082 2014-01-31 10:43:46Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Dmitry N. Shilov <stormblast@land.ru>
 
 pkgname=sakura
-pkgver=3.1.2
+pkgver=3.1.3
 pkgrel=1
 pkgdesc="A terminal emulator based on GTK and VTE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,35 +11,30 @@ url="https://launchpad.net/sakura"
 license=('GPL')
 depends=('vte3' 'libxft' 'desktop-file-utils')
 makedepends=('cmake')
-source=("https://launchpad.net/sakura/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2"
-	"deprecated_symbols.patch")
+source=("https://launchpad.net/sakura/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2")
 install=sakura.install
-sha1sums=('c4d5356c228af112dda20b3db3eaf32868e91ab1'
-          '1c31086360f5ce9d6ca0e4303b6b8cf62266f4d1')
+sha1sums=('44556f30eb63c95eb46d253a0e69c81ec7e0112b')
 
 prepare() {
-  cd $srcdir/${pkgname}-${pkgver}
+  cd "$srcdir/${pkgname}-${pkgver}"
 
   # Set default font size a bit smaller
   sed -i 's|#define DEFAULT_FONT "Bitstream Vera Sans Mono 14"|#define DEFAULT_FONT "Bitstream Vera Sans Mono 10"|g' src/sakura.c
-
-  # deprecated gtk symbols are used but disabled... enabling
-  patch -Np1 -i ${srcdir}/deprecated_symbols.patch
 }
 
 build() {
-  cd $srcdir/${pkgname}-${pkgver}
+  cd "$srcdir/${pkgname}-${pkgver}"
 
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE . 
   make 
 }
 
 package() {
-  cd $srcdir/${pkgname}-${pkgver}
+  cd "$srcdir/${pkgname}-${pkgver}"
 
-  make DESTDIR=${pkgdir} install 
+  make DESTDIR="${pkgdir}" install 
   # extract the keybindings from the installed documentation, rest is only relevant during build time
   awk '/^Keybindings/{f="'${pkgdir}'/usr/share/doc/'${pkgname}'/KEYBINDINGS"} f{print > f} /^END/' \
-        ${pkgdir}/usr/share/doc/${pkgname}/INSTALL
-  rm ${pkgdir}/usr/share/doc/${pkgname}/INSTALL
+        "${pkgdir}"/usr/share/doc/${pkgname}/INSTALL
+  rm "${pkgdir}/usr/share/doc/${pkgname}/INSTALL"
 }
diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD
index 94f4e2238..f5f7bd4f9 100644
--- a/community/scite/PKGBUILD
+++ b/community/scite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103181 2013-12-28 19:39:48Z arodseth $
+# $Id: PKGBUILD 105192 2014-02-02 16:50:19Z 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.7
+pkgver=3.3.9
 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=('ad094de779572a5c1bb0f2c590acc05a8706fc2f8c8e9ba7d4d98182bb37f174')
+sha256sums=('cd7bdfdf8cd870893375519405510417145ec0a9790ed7209f21d552d36c0775')
 
 prepare() {
   if [ $?CXXBASEFLAGS == 1 ]; then 
diff --git a/community/scorched3d/PKGBUILD b/community/scorched3d/PKGBUILD
index 0770354ba..d46fd2201 100644
--- a/community/scorched3d/PKGBUILD
+++ b/community/scorched3d/PKGBUILD
@@ -5,12 +5,12 @@
 pkgname=scorched3d
 pkgver=43.3.d
 _pkgver=43.3d
-pkgrel=5
+pkgrel=6
 pkgdesc="3D artillery combat game"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.scorched3d.co.uk/"
 license=('GPL')
-depends=('sdl_net' 'wxgtk' 'freealut>=1.0.0-3' 'libvorbis' 'glu' 'fftw' 'libjpeg>=8' 'xdg-utils')
+depends=('sdl_net' 'wxgtk2.8' 'freealut>=1.0.0-3' 'libvorbis' 'glu' 'fftw' 'libjpeg>=8' 'xdg-utils')
 makedepends=('gendesk' 'mesa')
 install=scorched3d.install
 source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${_pkgver}-src.tar.gz"
@@ -20,12 +20,16 @@ source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${_pkgver}-src.t
         'scorched3d-libpng1.5.patch'
         'libpng14.patch')
 md5sums=('9c3043282a9e7451468ff325bef3b04c'
-         '0f7e570f586c227873e909ebbc17c84d'
+         'cc3217f5b3baa6950a4619aac72d8a75'
          '053769f77a38c252eef1d967b18e93e6'
          'dfde556559d95bca07c4a390c60790b4'
          'ec6958191751b5a2c44aa15abfc75269'
          'c8c03855fd3693122fd39427fa3638c1')
 
+prepare() {
+  gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name "Scorched3d"
+}
+
 build() {
   cd "$srcdir/scorched"
 
@@ -35,13 +39,14 @@ build() {
 #  patch -Np0 -i ${srcdir}/libpng14.patch
 
   WANT_WXGTK=gtk2
-  sh autogen.sh \
+  ./configure \
     --prefix=/usr \
     --datadir=/usr/share/scorched3d \
     --disable-openaltest \
-    --with-wx-config=wx-config
+    --with-wx-config=wx-config-2.8
 
   sed -i '1 i #include <unistd.h>' src/client/client/SecureID.cpp
+  sed -i 's|freetype/||g' src/launcher/wxdialogs/TrueTypeFont.h src/client/GLEXT/GLFont2dFreeType.h
   #sed -i 's/-lz/-lz -lalut/g' src/scorched/Makefile || return 1
   #sed -i 's|/usr/local/lib/libwx_gtk-2.4.a||' src/scorched/Makefile || return 1
 
@@ -49,10 +54,8 @@ build() {
 }
 
 package() {
-  cd "$srcdir"
-  gendesk
-
   cd scorched
+
   make DESTDIR=${pkgdir} install
   cd ..
 
diff --git a/community/scratch/PKGBUILD b/community/scratch/PKGBUILD
index 508442874..4ea7e23ad 100644
--- a/community/scratch/PKGBUILD
+++ b/community/scratch/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 77468 2012-10-10 18:12:07Z jsteel $
-# Maintainer: Jonathan Steel <mail at jsteel dot org>
+# $Id: PKGBUILD 105503 2014-02-09 11:46:59Z jsteel $
+# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
 # Contributor: Muhammed Uluyol <muhammedu@gmail.com>
 
 pkgname=scratch
 pkgver=1.4.0.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Create and share your own interactive stories, games, music and art"
 arch=('i686' 'x86_64')
 url="http://scratch.mit.edu"
 license=('GPL2')
 install=$pkgname.install
-depends=('squeak-vm' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils' 'pango'
-	 'gtk-update-icon-cache')
+depends=('squeak-vm' 'shared-mime-info' 'desktop-file-utils' 'pango'
+         'gtk-update-icon-cache')
 source=(http://download.scratch.mit.edu/$pkgname-$pkgver.src.tar.gz)
 md5sums=('f948e9e6de3ec9c7c7b4cc2a1975eb5a')
 
-build() {
+prepare() {
   cd "$srcdir"/$pkgname-$pkgver.src
 
   sed -i 's/-vm-sound-pulse/-vm-sound-ALSA/' src/$pkgname
+}
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver.src
 
   make build
 }
@@ -35,6 +39,10 @@ package() {
   install -dm755 "$pkgdir"/usr/share/{$pkgname,icons/hicolor}
 
   cp -rp Help locale Media Projects README "$pkgdir"/usr/share/$pkgname/
-  cp -rp src/icons/* "$pkgdir"/usr/share/icons/hicolor/
   cp -rp Plugins "$pkgdir"/usr/lib/$pkgname/
+
+  for res in 32 48 128; do
+    install -D -m644 src/icons/${res}x${res}/$pkgname.png \
+      "$pkgdir"/usr/share/icons/hicolor/${res}x${res}/apps/$pkgname.png
+  done
 }
diff --git a/community/scratch/scratch.install b/community/scratch/scratch.install
index 7fe49829c..8db29369c 100644
--- a/community/scratch/scratch.install
+++ b/community/scratch/scratch.install
@@ -4,6 +4,10 @@ post_install() {
     gtk-update-icon-cache -qf /usr/share/icons/hicolor
 }
 
+post_upgrade() {
+    post_install
+}
+
 post_remove() {
     post_install
 }
diff --git a/community/scummvm-tools/PKGBUILD b/community/scummvm-tools/PKGBUILD
index 736b5a9a5..845d12c7b 100644
--- a/community/scummvm-tools/PKGBUILD
+++ b/community/scummvm-tools/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 90088 2013-05-06 19:39:30Z foutrelis $
+# $Id: PKGBUILD 103803 2014-01-11 20:08:37Z eric $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jérémie Dimino <jeremie@dimino.org>
 # Contributor: Sebastian Hase <sebastian_hase@gmx.de>
 # Contributor: Joe Davison <joe@thosedamnpeanuts.com>
 pkgname=scummvm-tools
-pkgver=1.4.0
-pkgrel=3
+pkgver=1.6.0
+pkgrel=1
 pkgdesc="A set of tools that enable you to convert, compress and decode game datafiles for ScummVM"
 url="http://www.scummvm.org/"
 license=('GPL')
-depends=('libpng' 'wxgtk' 'flac' 'libvorbis')
+depends=('libpng' 'wxgtk2.8' 'flac' 'libvorbis')
 arch=('i686' 'x86_64' 'mips64el')
-source=(http://downloads.sourceforge.net/sourceforge/scummvm/${pkgname}-${pkgver}.tar.gz)
-md5sums=('43cbf9f5c4939876cf4149dd59e68044')
+source=(http://downloads.sourceforge.net/sourceforge/scummvm/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('9a5c74a49707c513e8853004e3a699e4')
 
 build() {
   cd ${pkgname}-${pkgver}
 
+  sed -i 's/wxgtk2-2.8-config/wx-config-2.8/' configure
   ./configure --prefix=/usr
   make
 }
diff --git a/community/scummvm/PKGBUILD b/community/scummvm/PKGBUILD
index b3974172f..203051775 100644
--- a/community/scummvm/PKGBUILD
+++ b/community/scummvm/PKGBUILD
@@ -4,12 +4,14 @@
 
 pkgname=scummvm
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.scummvm.org/"
-depends=('libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad')
+depends=('libpng' 'libtheora' 'libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad' 'freetype2'
+         'libgl' 'glu')
+makedepends=('mesa')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('473c151ff44e3db7b603ecacd800a0d2')
 
diff --git a/community/sfk/PKGBUILD b/community/sfk/PKGBUILD
index e19df670f..c75baf697 100644
--- a/community/sfk/PKGBUILD
+++ b/community/sfk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102870 2013-12-23 01:46:34Z seblu $
+# $Id: PKGBUILD 105651 2014-02-13 00:44:20Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Baumi <baumi@gmx.com>
 
 pkgname=sfk
-pkgver=1.6.9
+pkgver=1.7.0
 pkgrel=1
 pkgdesc='Swiss File Knife - A Command Line Tools Collection'
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url='http://stahlforce.com/dev/?tool=sfk'
 license=('custom: BSD')
 depends=('gcc-libs')
 source=("http://downloads.sourceforge.net/swissfileknife/${pkgname}${pkgver//./}.zip")
-md5sums=('3a006bd1f73587ef347838231a5adbb3')
+md5sums=('325842e02ca7db504deace76b6375861')
 
 build() {
   cd ${pkgname}${pkgver//./}
diff --git a/community/shapelib/PKGBUILD b/community/shapelib/PKGBUILD
index 20a79b127..7a714c5fa 100644
--- a/community/shapelib/PKGBUILD
+++ b/community/shapelib/PKGBUILD
@@ -1,34 +1,32 @@
-# $Id: PKGBUILD 103038 2013-12-25 17:41:52Z jlichtblau $
+# $Id: PKGBUILD 105403 2014-02-06 19:27:08Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: Bob Finch <w9ya@arrl.net>
 
 pkgname=shapelib
 pkgver=1.3.0
-pkgrel=4
+pkgrel=5
 pkgdesc='simple C API for reading and writing ESRI Shapefiles'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://shapelib.maptools.org/'
 license=('LGPL' 'MIT')
+options=('staticlibs')
 source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.gz
         LICENSE)
 sha256sums=('23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f'
             '67e45b04045e27a9d6f64f92b295831b8739b32668ce497d3fa02999e349a789')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   
   sed -i -e s:'-fPIC':"${CFLAGS} -fPIC": Makefile
   make lib
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
-  # The Makefile won't install it correctly, this is easier.
-  install -D -m644 libshp.a "$pkgdir/usr/lib/libshp.a"
-  install -D -m644 shapefil.h "$pkgdir/usr/include/libshp/shapefil.h"
-  install -dm755 "$pkgdir"/usr/{lib,include}
+  install -dm755 "${pkgdir}"/usr/{lib,include}
 
   # Fix the broken makefile
   sed -i -e s:/usr/local:${pkgdir}/usr: Makefile
@@ -36,7 +34,7 @@ package() {
   make lib_install
   
   # Fix world readable bit not set
-  chmod 644 $pkgdir/usr/include/shapefil.h
+  chmod 644 "${pkgdir}"/usr/include/shapefil.h
 
-  install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -D -m644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index fe560a485..2fa364c1d 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 101260 2013-11-21 10:27:21Z spupykin $
+# $Id: PKGBUILD 104606 2014-01-23 13:18:27Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 
 pkgname=shotwell
 pkgver=0.15.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://yorba.org/shotwell/"
diff --git a/pcr/skanlite/PKGBUILD b/community/skanlite/PKGBUILD
index b0fa953e5..b8654f92c 100644
--- a/pcr/skanlite/PKGBUILD
+++ b/community/skanlite/PKGBUILD
@@ -1,30 +1,34 @@
-# Maintainer: birdflesh <antkoul at gmail dot com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: birdflesh <antkoul at gmail dot com>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=skanlite
-pkgver=1.0
-pkgrel=1.1
+pkgver=1.1
+pkgrel=2
 pkgdesc="Image Scanning Application for KDE"
 arch=('i686' 'x86_64')
 url='http://www.kde.org/applications/graphics/skanlite'
 license=('GPL')
 depends=('kdebase-runtime' 'libksane')
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.bz2")
-md5sums=('e22b2719f134d2483591082026961bf5')
+source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz")
+md5sums=('21cd642d4177fff759bf4694af39b9fe')
 
-build() {
-  cd "$srcdir"
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../$pkgname-$pkgver \
+    -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
 package() {
-  cd "$srcdir/build"
+  cd build
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/sleuthkit/PKGBUILD b/community/sleuthkit/PKGBUILD
index 1a04353e4..4b058df5b 100644
--- a/community/sleuthkit/PKGBUILD
+++ b/community/sleuthkit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 103041 2013-12-25 17:46:25Z jlichtblau $
+# $Id: PKGBUILD 105400 2014-02-06 18:08:16Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=sleuthkit
-pkgver=4.1.2
-pkgrel=2
+pkgver=4.1.3
+pkgrel=1
 pkgdesc='File system and media management forensic analysis tools'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.sleuthkit.org/sleuthkit'
@@ -12,7 +12,7 @@ license=('GPL2' 'CPL' 'custom:"IBM Public Licence"')
 depends=('perl')
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('58253b35c016083558fb581308f4a3baf884229de89eb84ddbfb977ed56600d3')
+sha256sums=('67f9d2a31a8884d58698d6122fc1a1bfa9bf238582bde2b49228ec9b899f0327')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/sleuthkit/sleuthkit.changelog b/community/sleuthkit/sleuthkit.changelog
index 86fb29e8b..9a3c7c791 100644
--- a/community/sleuthkit/sleuthkit.changelog
+++ b/community/sleuthkit/sleuthkit.changelog
@@ -1,3 +1,6 @@
+2014-02-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* sleuthkit 4.1.3-1
+
 2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* sleuthkit 4.1.2-2 static library removed
 
diff --git a/community/smbnetfs/PKGBUILD b/community/smbnetfs/PKGBUILD
index 8acee1114..4fa7a5201 100644
--- a/community/smbnetfs/PKGBUILD
+++ b/community/smbnetfs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90723 2013-05-13 14:38:02Z spupykin $
+# $Id: PKGBUILD 103894 2014-01-13 12:10:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=smbnetfs
-pkgver=0.5.3a
-pkgrel=6
+pkgver=0.5.3b
+pkgrel=1
 pkgdesc="small C program that mounts Microsoft network neighborhood in single directory."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://smbnetfs.sourceforge.net/"
@@ -19,7 +19,7 @@ options=(docs)
 source=(http://downloads.sourceforge.net/smbnetfs/$pkgname-$pkgver.tar.bz2
 	conf-smbnetfs
 	smbnetfs.service)
-md5sums=('66d1477ca981f5a07b4b21c6bdbdc442'
+md5sums=('fa9f7be673eb48d032bbd044f6da4016'
          'e150c4cd894cc6ade11b94c95cf17ec4'
          '0fdd0dbaa5f16b1ecd00ec1ddcdfc223')
 
diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD
index dae8aa4d5..f5a4bc09b 100644
--- a/community/spacefm/PKGBUILD
+++ b/community/spacefm/PKGBUILD
@@ -1,37 +1,37 @@
-# $Id: PKGBUILD 102305 2013-12-07 21:26:57Z bpiotrowski $
+# $Id: PKGBUILD 105055 2014-01-30 18:44:14Z 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.9.2
+pkgver=0.9.3
 pkgrel=1
 pkgdesc='Multi-panel tabbed file manager'
 arch=('i686' 'x86_64')
 url='http://ignorantguru.github.com/spacefm/'
 license=('GPL3')
 install=$pkgname.install
-depends=('gtk3' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' 'udev')
+depends=('gtk3' 'shared-mime-info' 'desktop-file-utils' 'startup-notification'
+         'udev' 'bash')
 makedepends=('intltool' 'gettext')
 optdepends=('lsof: device processes'
-			'eject: eject media'
             'wget: plugin download'
             'gksu: perform as root functionality'
             'udevil: mount as non-root user and mount networks'
             'udisks: mount as non-root user'
             'udisks2: mount as non-root user')
 source=(https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz)
-md5sums=('f7d04110b4dd9c3c434bffe8b04bbb69')
+md5sums=('6bbf41bc97a46a797500dbf0ae359971')
 
 build() {
-	cd $pkgname-$pkgver
-	./configure --prefix=/usr \
-				--disable-pixmaps \
-				--with-gtk3
-	make
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr \
+    --disable-pixmaps \
+    --with-gtk3
+  make
 }
 
 package() {
-	cd $pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/spice-gtk3/PKGBUILD b/community/spice-gtk3/PKGBUILD
index 019c6cc2e..466e014a1 100644
--- a/community/spice-gtk3/PKGBUILD
+++ b/community/spice-gtk3/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 102790 2013-12-20 03:19:02Z bgyorgy $
+# $Id: PKGBUILD 105626 2014-02-12 09:17:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefano Facchini <stefano.facchini@gmail.com>
 # Contributor: Jonathan Lestrelin <zanko@daemontux.org>
 # Contributor: Lucio Zara <pennega@gmail.com>
 
 pkgname=spice-gtk3
-pkgver=0.22
+pkgver=0.23
 pkgrel=1
 pkgdesc="Gtk client and libraries for SPICE remote desktop servers (gtk3 version)"
 arch=('i686' 'x86_64')
@@ -15,6 +15,7 @@ depends=('celt0.5.1' 'dbus-glib' 'gtk3' 'libcacard' 'libpulse' 'usbredir')
 makedepends=('gobject-introspection' 'intltool' 'python2-pyparsing' 'spice-protocol' 'usbutils' 'vala')
 source=("http://www.spice-space.org/download/gtk/spice-gtk-$pkgver.tar.bz2")
 sha256sums=('05e9e5d915a99005a812846f733bba177ef3b1a9de9356690047250fb1b1fa3a')
+sha256sums=('bfdfa6cb12c40327b63167fe7191ce94e7f2a272473c87df31790c25d60cc81d')
 
 prepare() {
   cd "$srcdir/spice-gtk-$pkgver"
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index 5cb460ab8..e776d4e27 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 102279 2013-12-07 10:37:11Z bpiotrowski $
+# $Id: PKGBUILD 103730 2014-01-11 01:37:55Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=spring
-pkgver=0.95.0
-_pkgver=95.0
-pkgrel=2
+pkgver=0.96.0
+_pkgver=96.0
+pkgrel=1
 pkgdesc='A free 3D real-time-strategy (RTS) game engine'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://springrts.com/"
@@ -18,7 +18,7 @@ optdepends=('python2: python-based bots'
             'java-runtime: java-based bots')
 install=spring.install
 source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma)
-md5sums=('2030100b4c51a1906408aad417a39b1b')
+md5sums=('2aeaaed4cf316ea22761efc0ef849a73')
 
 build() {
   bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma
diff --git a/community/spring/boost-1.50.patch b/community/spring/boost-1.50.patch
deleted file mode 100644
index f8a8b5695..000000000
--- a/community/spring/boost-1.50.patch
+++ /dev/null
@@ -1,2539 +0,0 @@
-diff -ru spring_89.0/rts/Game/Camera/CameraController.cpp /home/svenstaro/src/spring/rts/Game/Camera/CameraController.cpp
---- spring_89.0/rts/Game/Camera/CameraController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/CameraController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -59,7 +59,7 @@
- bool CCameraController::GetUseDistToGroundForIcons() {
- 
- 	const float3& dir     = GetDir().UnsafeNormalize();
--	const float dot       = std::min(1.0f, std::max(0.0f, fabs(dir.dot(UpVector))));
-+	const float dot       = std::min(1.0f, std::max(0.0f, math::fabs(dir.dot(UpVector))));
- 
- 	if (dot < switchVal) {
- 		// flat angle (typical for first person camera)
-diff -ru spring_89.0/rts/Game/Camera/FPSController.cpp /home/svenstaro/src/spring/rts/Game/Camera/FPSController.cpp
---- spring_89.0/rts/Game/Camera/FPSController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/FPSController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -80,9 +80,9 @@
- 		oldHeight = pos.y - gndHeight;
- 	}
- 
--	dir.x = (float)(cos(camera->rot.x) * sin(camera->rot.y));
--	dir.z = (float)(cos(camera->rot.x) * cos(camera->rot.y));
--	dir.y = (float)(sin(camera->rot.x));
-+	dir.x = (float)(math::cos(camera->rot.x) * math::sin(camera->rot.y));
-+	dir.z = (float)(math::cos(camera->rot.x) * math::cos(camera->rot.y));
-+	dir.y = (float)(math::sin(camera->rot.x));
- 	dir.ANormalize();
- }
- 
-diff -ru spring_89.0/rts/Game/Camera/FreeController.cpp /home/svenstaro/src/spring/rts/Game/Camera/FreeController.cpp
---- spring_89.0/rts/Game/Camera/FreeController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/FreeController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -51,9 +51,9 @@
- 	dir = float3(0.0f, -2.0f, -1.0f);
- 	dir.ANormalize();
- 	if (camera) {
--		const float hDist = sqrt((dir.x * dir.x) + (dir.z * dir.z));
--		camera->rot.y = atan2(dir.x, dir.z);
--		camera->rot.x = atan2(dir.y, hDist);
-+		const float hDist = math::sqrt((dir.x * dir.x) + (dir.z * dir.z));
-+		camera->rot.y = math::atan2(dir.x, dir.z);
-+		camera->rot.x = math::atan2(dir.y, hDist);
- 	}
- 	pos -= (dir * 1000.0f);
- 
-@@ -84,14 +84,14 @@
- 
- 	// lock the view direction to the target
- 	const float3 diff(trackPos - pos);
--	const float rads = atan2(diff.x, diff.z);
-+	const float rads = math::atan2(diff.x, diff.z);
- 	camera->rot.y = rads;
- 
- 	const float len2D = diff.Length2D();
--	if (fabs(len2D) <= 0.001f) {
-+	if (math::fabs(len2D) <= 0.001f) {
- 		camera->rot.x = 0.0f;
- 	} else {
--		camera->rot.x = atan2((trackPos.y - pos.y), len2D);
-+		camera->rot.x = math::atan2((trackPos.y - pos.y), len2D);
- 	}
- 
- 	camera->UpdateForward();
-@@ -130,11 +130,11 @@
- 		if (pos.y < (gndHeight + gndOffset + 1.0f)) {
- 			float3 hDir;
- 			hDir.y = 0.0f;
--			hDir.x = (float)sin(camera->rot.y);
--			hDir.z = (float)cos(camera->rot.y);
-+			hDir.x = (float)math::sin(camera->rot.y);
-+			hDir.z = (float)math::cos(camera->rot.y);
- 			const float3 gndNormal = ground->GetSmoothNormal(pos.x, pos.z, false);
- 			const float dot = gndNormal.dot(hDir);
--			const float gndRotX = (float)acos(dot) - (PI * 0.5f);
-+			const float gndRotX = (float)math::acos(dot) - (PI * 0.5f);
- 			const float rotXdiff = (gndRotX - camera->rot.x);
- 			autoTiltVel = (autoTilt * rotXdiff);
- 		}
-@@ -214,8 +214,8 @@
- 		// convert the angular velocity into its positional change
- 		const float3 diff2 = (pos - trackPos);
- 		const float deltaRad = (avel.y * ft);
--		const float cos_val = cos(deltaRad);
--		const float sin_val = sin(deltaRad);
-+		const float cos_val = math::cos(deltaRad);
-+		const float sin_val = math::sin(deltaRad);
- 		pos.x = trackPos.x + ((cos_val * diff2.x) + (sin_val * diff2.z));
- 		pos.z = trackPos.z + ((cos_val * diff2.z) - (sin_val * diff2.x));
- 	}
-@@ -246,7 +246,7 @@
- 		if (pos.y < minHeight) {
- 			pos.y = minHeight;
- 			if (gndLock) {
--				vel.y = min(fabs(scrollSpeed), ((minHeight - prevPos.y) / ft));
-+				vel.y = min(math::fabs(scrollSpeed), ((minHeight - prevPos.y) / ft));
- 			} else {
- 				vel.y = 0.0f;
- 			}
-@@ -263,7 +263,7 @@
- 		camera->rot.x = -xRotLimit;
- 		avel.x = 0.0f;
- 	}
--	camera->rot.y = fmod(camera->rot.y, PI * 2.0f);
-+	camera->rot.y = math::fmod(camera->rot.y, PI * 2.0f);
- 
- 	// setup for the next loop
- 	prevVel  = vel;
-@@ -277,9 +277,9 @@
- float3 CFreeController::GetDir() const
- {
- 	float3 dir;
--	dir.x = (float)(sin(camera->rot.y) * cos(camera->rot.x));
--	dir.z = (float)(cos(camera->rot.y) * cos(camera->rot.x));
--	dir.y = (float)(sin(camera->rot.x));
-+	dir.x = (float)(math::sin(camera->rot.y) * math::cos(camera->rot.x));
-+	dir.z = (float)(math::cos(camera->rot.y) * math::cos(camera->rot.x));
-+	dir.y = (float)(math::sin(camera->rot.x));
- 	dir.ANormalize();
- 	return dir;
- }
-@@ -373,7 +373,7 @@
- 	if ((yDiff * dir.y) >= 0.0f) {
- 		pos = float3(newPos.x, h, newPos.z);
- 	} else {
--		pos = target - (dir * fabs(yDiff / dir.y));
-+		pos = target - (dir * math::fabs(yDiff / dir.y));
- 	} // FIXME
- /*
- 	const float oldPosY = pos.y;
-diff -ru spring_89.0/rts/Game/Camera/OrbitController.cpp /home/svenstaro/src/spring/rts/Game/Camera/OrbitController.cpp
---- spring_89.0/rts/Game/Camera/OrbitController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/OrbitController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -51,8 +51,8 @@
- 	const float3 w = (v / v.Length()); // do not normalize v in-place
- 
- 	const float d = v.Length();
--	const float e = RAD2DEG(acos(v.Length2D() / d));
--	const float r = RAD2DEG(acos(w.x));
-+	const float e = RAD2DEG(math::acos(v.Length2D() / d));
-+	const float r = RAD2DEG(math::acos(w.x));
- 
- 	distance  = cDistance = d;
- 	elevation = cElevation = e;
-@@ -251,12 +251,12 @@
- 	float tx = cx;
- 
- 	tx = cx;
--	cx = cx * cos(beta) + cy * sin(beta);
--	cy = tx * sin(beta) + cy * cos(beta);
-+	cx = cx * math::cos(beta) + cy * math::sin(beta);
-+	cy = tx * math::sin(beta) + cy * math::cos(beta);
- 
- 	tx = cx;
--	cx = cx * cos(gamma) - cz * sin(gamma);
--	cz = tx * sin(gamma) + cz * cos(gamma);
-+	cx = cx * math::cos(gamma) - cz * math::sin(gamma);
-+	cz = tx * math::sin(gamma) + cz * math::cos(gamma);
- 
- 	return float3(cx, cy, cz);
- }
-diff -ru spring_89.0/rts/Game/Camera/OverheadController.cpp /home/svenstaro/src/spring/rts/Game/Camera/OverheadController.cpp
---- spring_89.0/rts/Game/Camera/OverheadController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/OverheadController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -52,7 +52,7 @@
- 		move.x = -move.x;
- 		move.y = -move.y;
- 	}
--	move *= sqrt(move.z) * 200;
-+	move *= math::sqrt(move.z) * 200;
- 
- 	pos.x += move.x * pixelSize * 2.0f * scrollSpeed;
- 	pos.z -= move.y * pixelSize * 2.0f * scrollSpeed;
-diff -ru spring_89.0/rts/Game/Camera/RotOverheadController.cpp /home/svenstaro/src/spring/rts/Game/Camera/RotOverheadController.cpp
---- spring_89.0/rts/Game/Camera/RotOverheadController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/RotOverheadController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -29,7 +29,7 @@
- 
- void CRotOverheadController::KeyMove(float3 move)
- {
--	move *= sqrt(move.z) * 400;
-+	move *= math::sqrt(move.z) * 400;
- 
- 	float3 flatForward = camera->forward;
- 	if(camera->forward.y < -0.9f)
-@@ -68,9 +68,9 @@
- 
- void CRotOverheadController::UpdateVectors()
- {
--	dir.x=(float)(sin(camera->rot.y) * cos(camera->rot.x));
--	dir.y=(float)(sin(camera->rot.x));
--	dir.z=(float)(cos(camera->rot.y) * cos(camera->rot.x));
-+	dir.x=(float)(math::sin(camera->rot.y) * math::cos(camera->rot.x));
-+	dir.y=(float)(math::sin(camera->rot.x));
-+	dir.z=(float)(math::cos(camera->rot.y) * math::cos(camera->rot.x));
- 	dir.ANormalize();
- 
- 	pos.x = Clamp(pos.x, 0.01f, gs->mapx * SQUARE_SIZE - 0.01f);
-diff -ru spring_89.0/rts/Game/Camera/SmoothController.cpp /home/svenstaro/src/spring/rts/Game/Camera/SmoothController.cpp
---- spring_89.0/rts/Game/Camera/SmoothController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/SmoothController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -55,7 +55,7 @@
- 		move.y = -move.y;
- 	}
- 
--	move *= sqrt(move.z) * 200.0f;
-+	move *= math::sqrt(move.z) * 200.0f;
- 
- 	const float3 thisMove(move.x * pixelSize * 2.0f * scrollSpeed, 0.0f, -move.y * pixelSize * 2.0f * scrollSpeed);
- 
-@@ -103,7 +103,7 @@
- 		move.x = -move.x;
- 		move.y = -move.y;
- 	}
--	move *= sqrt(move.z) * 200.0f;
-+	move *= math::sqrt(move.z) * 200.0f;
- 
- 	const float3 thisMove(move.x * pixelSize * 2.0f * scrollSpeed, 0.0f, -move.y * pixelSize * 2.0f * scrollSpeed);
- 
-diff -ru spring_89.0/rts/Game/Camera/TWController.cpp /home/svenstaro/src/spring/rts/Game/Camera/TWController.cpp
---- spring_89.0/rts/Game/Camera/TWController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/TWController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -35,7 +35,7 @@
- 	flatForward.y=0;
- 	flatForward.ANormalize();
- 
--	move *= sqrt(move.z) * 200;
-+	move *= math::sqrt(move.z) * 200;
- 	pos  += (camera->right * move.x + flatForward * move.y) * scrollSpeed;
- 	UpdateVectors();
- }
-@@ -79,9 +79,9 @@
- 
- 	camera->rot.x = Clamp(camera->rot.x, -PI * 0.4f, -0.1f);
- 
--	dir.x = sin(camera->rot.y) * cos(camera->rot.x);
--	dir.y = sin(camera->rot.x);
--	dir.z = cos(camera->rot.y) * cos(camera->rot.x);
-+	dir.x = math::sin(camera->rot.y) * math::cos(camera->rot.x);
-+	dir.y = math::sin(camera->rot.x);
-+	dir.z = math::cos(camera->rot.y) * math::cos(camera->rot.x);
- 	dir.ANormalize();
- }
- 
-diff -ru spring_89.0/rts/Game/Camera.cpp /home/svenstaro/src/spring/rts/Game/Camera.cpp
---- spring_89.0/rts/Game/Camera.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -89,7 +89,7 @@
- 	up.UnsafeANormalize();
- 
- 	const float aspect = globalRendering->aspectRatio;
--	const float viewx = tan(aspect * halfFov);
-+	const float viewx = math::tan(aspect * halfFov);
- 	const float viewy = tanHalfFov;
- 
- 	if (globalRendering->viewSizeY <= 0) {
-@@ -218,9 +218,9 @@
- 
- void CCamera::UpdateForward()
- {
--	forward.z = cos(rot.y) * cos(rot.x);
--	forward.x = sin(rot.y) * cos(rot.x);
--	forward.y = sin(rot.x);
-+	forward.z = math::cos(rot.y) * math::cos(rot.x);
-+	forward.x = math::sin(rot.y) * math::cos(rot.x);
-+	forward.y = math::sin(rot.x);
- 	forward.Normalize();
- }
- 
-@@ -229,7 +229,7 @@
- {
- 	fov = myfov;
- 	halfFov = (fov * 0.5f) * (PI / 180.f);
--	tanHalfFov = tan(halfFov);
-+	tanHalfFov = math::tan(halfFov);
- }
- 
- 
-@@ -330,7 +330,7 @@
- 	float3 pInt;
- 
- 	// prevent DIV0 when calculating line.dir
--	if (fabs(xdir.z) < 0.001f)
-+	if (math::fabs(xdir.z) < 0.001f)
- 		xdir.z = 0.001f;
- 
- 	if (ydir.y != 0.0f) {
-diff -ru spring_89.0/rts/Game/CameraHandler.cpp /home/svenstaro/src/spring/rts/Game/CameraHandler.cpp
---- spring_89.0/rts/Game/CameraHandler.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/CameraHandler.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -139,7 +139,7 @@
- 		cameraTimeLeft = std::max(0.0f, (cameraTimeLeft - globalRendering->lastFrameTime));
- 		const float nextTime = cameraTimeLeft;
- 		const float exp = cameraTimeExponent;
--		const float ratio = 1.0f - (float)pow((nextTime / currTime), exp);
-+		const float ratio = 1.0f - (float)math::pow((nextTime / currTime), exp);
- 
- 		const float  deltaFOV = wantedCamFOV - camera->GetFov();
- 		const float3 deltaPos = wantedCamPos - camera->pos;
-diff -ru spring_89.0/rts/Game/GameServer.cpp /home/svenstaro/src/spring/rts/Game/GameServer.cpp
---- spring_89.0/rts/Game/GameServer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/GameServer.cpp	2012-07-13 06:34:42.936060485 +0200
-@@ -253,7 +253,7 @@
- 	// Something in CGameServer::CGameServer borks the FPU control word
- 	// maybe the threading, or something in CNet::InitServer() ??
- 	// Set single precision floating point math.
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- }
- 
-diff -ru spring_89.0/rts/Game/SelectedUnitsAI.cpp /home/svenstaro/src/spring/rts/Game/SelectedUnitsAI.cpp
---- spring_89.0/rts/Game/SelectedUnitsAI.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/SelectedUnitsAI.cpp	2012-07-13 06:34:43.086060494 +0200
-@@ -179,7 +179,7 @@
- 		const float3 sideDir = frontdir.cross(UpVector);
- 
- 		// calculate so that the units form in an aproximate square
--		float length = 100.0f + (sqrt((float)nbrOfSelectedUnits) * 32.0f);
-+		float length = 100.0f + (math::sqrt((float)nbrOfSelectedUnits) * 32.0f);
- 
- 		// push back some extra params so it confer with a front move
- 		c.params.push_back(pos.x + (sideDir.x * length));
-diff -ru spring_89.0/rts/Game/TraceRay.cpp /home/svenstaro/src/spring/rts/Game/TraceRay.cpp
---- spring_89.0/rts/Game/TraceRay.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/TraceRay.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -75,7 +75,7 @@
- 	if (closeFlatLength > length)
- 		closeFlatLength = length;
- 
--	if (fabs(linear - quadratic * closeFlatLength) < 0.15f) {
-+	if (math::fabs(linear - quadratic * closeFlatLength) < 0.15f) {
- 		// relatively flat region -> use approximation
- 		dif.y -= (linear + quadratic * closeFlatLength) * closeFlatLength;
- 
-diff -ru spring_89.0/rts/Game/UI/EndGameBox.cpp /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.cpp
---- spring_89.0/rts/Game/UI/EndGameBox.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -29,11 +29,11 @@
- 
- 	if (num == 0) {
- 		sprintf(c, "0");
--	} else if (fabs(num) < 10 * mul) {
-+	} else if (math::fabs(num) < 10 * mul) {
- 		sprintf(c, "%.1f",  num);
--	} else if (fabs(num) < 10000 * mul) {
-+	} else if (math::fabs(num) < 10000 * mul) {
- 		sprintf(c, "%.0f",  num);
--	} else if (fabs(num) < 10000000 * mul) {
-+	} else if (math::fabs(num) < 10000000 * mul) {
- 		sprintf(c, "%.0fk", num / 1000);
- 	} else {
- 		sprintf(c, "%.0fM", num / 1000000);
-@@ -165,7 +165,7 @@
- 	if (dispMode > 0 ) {
- 		if ((mx > (box.x1 + 0.01f)) && (mx < (box.x1 + 0.12f)) &&
- 		    (my < (box.y1 + 0.57f)) && (my > (box.y1 + 0.571f - stats.size()*0.02f))) {
--			int sel = (int) floor(-(my - box.y1 - 0.57f) * 50);
-+			int sel = (int) math::floor(-(my - box.y1 - 0.57f) * 50);
- 
- 			if (button == 1) {
- 				stat1 = sel;
-@@ -341,7 +341,7 @@
- 
- 		if ((mx > box.x1 + 0.01f) && (mx < box.x1 + 0.12f) &&
- 		    (my < box.y1 + 0.57f) && (my > box.y1 + 0.571f - (stats.size() * 0.02f))) {
--			const int sel = (int) floor(50 * -(my - box.y1 - 0.57f));
-+			const int sel = (int) math::floor(50 * -(my - box.y1 - 0.57f));
- 
- 			glColor4f(0.7f, 0.2f, 0.2f, guiAlpha);
- 			glDisable(GL_TEXTURE_2D);
-diff -ru spring_89.0/rts/Game/UI/EndGameBox.h /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.h
---- spring_89.0/rts/Game/UI/EndGameBox.h	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.h	2012-07-13 06:34:43.066060493 +0200
-@@ -60,8 +60,8 @@
- 			if (team >= 0 && static_cast<size_t>(team) >= values.size()) {
- 				values.resize(team + 1);
- 			}
--			if (values[team].size() > 0 && fabs(value-values[team].back()) > maxdif) {
--				maxdif = fabs(value-values[team].back());
-+			if (values[team].size() > 0 && math::fabs(value-values[team].back()) > maxdif) {
-+				maxdif = math::fabs(value-values[team].back());
- 			}
- 
- 			values[team].push_back(value);
-diff -ru spring_89.0/rts/Game/UI/MouseCursor.cpp /home/svenstaro/src/spring/rts/Game/UI/MouseCursor.cpp
---- spring_89.0/rts/Game/UI/MouseCursor.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/MouseCursor.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -355,7 +355,7 @@
- 		return;
- 	}
- 
--	animTime = fmod(animTime + globalRendering->lastFrameTime, animPeriod);
-+	animTime = math::fmod(animTime + globalRendering->lastFrameTime, animPeriod);
- 
- 	if (animTime < frames[currentFrame].startTime) {
- 		currentFrame = 0;
-diff -ru spring_89.0/rts/Game/UI/ResourceBar.cpp /home/svenstaro/src/spring/rts/Game/UI/ResourceBar.cpp
---- spring_89.0/rts/Game/UI/ResourceBar.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/ResourceBar.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -48,11 +48,11 @@
- 
- 	if (num == 0)
- 		sprintf(c, "0");
--	if (       fabs(num) < (10       * mul)) {
-+	if (       math::fabs(num) < (10       * mul)) {
- 		sprintf(c, "%.1f",  num);
--	} else if (fabs(num) < (10000    * mul)) {
-+	} else if (math::fabs(num) < (10000    * mul)) {
- 		sprintf(c, "%.0f",  num);
--	} else if (fabs(num) < (10000000 * mul)) {
-+	} else if (math::fabs(num) < (10000000 * mul)) {
- 		sprintf(c, "%.0fk", num / 1000);
- 	} else {
- 		sprintf(c, "%.0fM", num / 1000000);
-@@ -180,11 +180,11 @@
- 
- 	smallFont->SetTextColor(1.0f, 0.3f, 0.3f, 1.0f); // Expenses
- 	smallFont->glFormat(metalx  + 0.044f, box.y1, labelsFontSize, FONT_DESCENDER | fontOptions, "-%s(-%s)",
--			FloatToSmallString(fabs(myTeam->prevMetalPull)).c_str(),
--			FloatToSmallString(fabs(myTeam->metalSent)).c_str());
-+			FloatToSmallString(math::fabs(myTeam->prevMetalPull)).c_str(),
-+			FloatToSmallString(math::fabs(myTeam->metalSent)).c_str());
- 	smallFont->glFormat(energyx + 0.044f, box.y1, labelsFontSize, FONT_DESCENDER | fontOptions, "-%s(-%s)",
--			FloatToSmallString(fabs(myTeam->prevEnergyPull)).c_str(),
--			FloatToSmallString(fabs(myTeam->energySent)).c_str());
-+			FloatToSmallString(math::fabs(myTeam->prevEnergyPull)).c_str(),
-+			FloatToSmallString(math::fabs(myTeam->energySent)).c_str());
- 
- 	smallFont->SetTextColor(0.4f, 1.0f, 0.4f, 0.95f); // Income
- 	smallFont->glFormat(metalx  + 0.044f, box.y2 - 2*globalRendering->pixelY, labelsFontSize, FONT_ASCENDER | fontOptions, "+%s",
-diff -ru spring_89.0/rts/Game/UI/SelectionKeyHandler.cpp /home/svenstaro/src/spring/rts/Game/UI/SelectionKeyHandler.cpp
---- spring_89.0/rts/Game/UI/SelectionKeyHandler.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/SelectionKeyHandler.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -367,9 +367,9 @@
- 				camera->rot.x=-1;
- 
- 			float3 wantedCamDir;
--			wantedCamDir.x=(float)(sin(camera->rot.y)*cos(camera->rot.x));
--			wantedCamDir.y=(float)(sin(camera->rot.x));
--			wantedCamDir.z=(float)(cos(camera->rot.y)*cos(camera->rot.x));
-+			wantedCamDir.x=(float)(math::sin(camera->rot.y)*math::cos(camera->rot.x));
-+			wantedCamDir.y=(float)(math::sin(camera->rot.x));
-+			wantedCamDir.z=(float)(math::cos(camera->rot.y)*math::cos(camera->rot.x));
- 			wantedCamDir.ANormalize();
- 
- 			camHandler->GetCurrentController().SetPos(sel->pos - wantedCamDir*800);
-diff -ru spring_89.0/rts/Game/UI/UnitTracker.cpp /home/svenstaro/src/spring/rts/Game/UI/UnitTracker.cpp
---- spring_89.0/rts/Game/UI/UnitTracker.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/UnitTracker.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -297,8 +297,8 @@
-   			modPlanePos.y = minHeight;
- 		}
- 
--		trackPos += (modPlanePos - trackPos) * (1 - pow(0.95f, deltaTime));
--		trackDir += (u->frontdir - trackDir) * (1 - pow(0.90f, deltaTime));
-+		trackPos += (modPlanePos - trackPos) * (1 - math::pow(0.95f, deltaTime));
-+		trackDir += (u->frontdir - trackDir) * (1 - math::pow(0.90f, deltaTime));
- 		trackDir.ANormalize();
- 
- 		camera->pos = trackPos;
-diff -ru spring_89.0/rts/lib/gml/gmlsrv.h /home/svenstaro/src/spring/rts/lib/gml/gmlsrv.h
---- spring_89.0/rts/lib/gml/gmlsrv.h	2012-07-10 00:10:09.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/lib/gml/gmlsrv.h	2012-07-13 06:34:43.209393834 +0200
-@@ -361,7 +361,7 @@
- 		if (gmlShareLists) {
- 			ogc[thr]->WorkerThreadPost();
- 		}
--		streflop_init<streflop::Simple>();
-+		streflop::streflop_init<streflop::Simple>();
- 		while(dorun) {
- 			gmlClientSub();
- 		}
-@@ -452,7 +452,7 @@
- 		Threading::SetThreadName("sim");
- 		Watchdog::RegisterThread(WDT_SIM, true);
- 		set_threadnum(GML_SIM_THREAD_NUM);
--		streflop_init<streflop::Simple>();
-+		streflop::streflop_init<streflop::Simple>();
- 		while(dorun) {
- 			gmlClientAuxSub();
- 		}
-diff -ru spring_89.0/rts/lib/headlessStubs/sdlstub_cppbit.cpp /home/svenstaro/src/spring/rts/lib/headlessStubs/sdlstub_cppbit.cpp
---- spring_89.0/rts/lib/headlessStubs/sdlstub_cppbit.cpp	2012-07-10 00:10:09.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/lib/headlessStubs/sdlstub_cppbit.cpp	2012-07-13 06:35:00.626061514 +0200
-@@ -12,10 +12,16 @@
- extern "C" {
- #endif
- 
-+#if (BOOST_VERSION >= 105000) //boost 1.50 renamed TIME_UTC to TIME_UTC_
-+	#define SPRING_UTCTIME boost::TIME_UTC_
-+#else
-+	#define SPRING_UTCTIME boost::TIME_UTC
-+#endif
-+
- int stub_sdl_getSystemMilliSeconds() {
- 
- 	boost::xtime t;
--	boost::xtime_get(&t, boost::TIME_UTC);
-+	boost::xtime_get(&t, SPRING_UTCTIME);
- 	const int milliSeconds = t.sec * 1000 + (t.nsec / 1000000);   
- 	return milliSeconds;
- }
-@@ -23,7 +29,7 @@
- void stub_sdl_sleepMilliSeconds(int milliSeconds) {
- 
- 	boost::xtime t;
--	boost::xtime_get(&t, boost::TIME_UTC);
-+	boost::xtime_get(&t, SPRING_UTCTIME);
- 	t.nsec += 1000000 * milliSeconds;
- 	boost::thread::sleep(t);
- }
-diff -ru spring_89.0/rts/lib/streflop/streflopC.cpp /home/svenstaro/src/spring/rts/lib/streflop/streflopC.cpp
---- spring_89.0/rts/lib/streflop/streflopC.cpp	2012-07-10 00:10:10.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/lib/streflop/streflopC.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -9,16 +9,16 @@
- #endif
- 
- void streflop_init_Simple() {
--	streflop_init<Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- }
- 
- void streflop_init_Double() {
--	streflop_init<Double>();
-+	streflop::streflop_init<streflop::Double>();
- }
- 
- #if defined(Extended)
- void streflop_init_Extended() {
--	streflop_init<Extended>();
-+	streflop::streflop_init<streflop::Extended>();
- }
- #endif // defined(Extended)
- 
-diff -ru spring_89.0/rts/lib/streflop/streflop_cond.h /home/svenstaro/src/spring/rts/lib/streflop/streflop_cond.h
---- spring_89.0/rts/lib/streflop/streflop_cond.h	2012-07-10 00:10:10.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/lib/streflop/streflop_cond.h	2012-07-13 06:34:42.906060483 +0200
-@@ -11,8 +11,6 @@
- 
- #if defined(STREFLOP_X87) || defined(STREFLOP_SSE) || defined(STREFLOP_SOFT)
- #include "streflop.h"
--using namespace streflop;
--
- namespace math {
- 	using namespace streflop;
- }
-@@ -20,6 +18,7 @@
- #include <cmath>
- namespace math {
- 	using std::fabs;
-+	// We are using fastmath::sqrt_sse instead!
- 	// using std::sqrt;
- 	using std::sin;
- 	using std::cos;
-diff -ru spring_89.0/rts/Map/BasicMapDamage.cpp /home/svenstaro/src/spring/rts/Map/BasicMapDamage.cpp
---- spring_89.0/rts/Map/BasicMapDamage.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/BasicMapDamage.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -33,7 +33,7 @@
- 
- 	for (int a = 0; a <= CRATER_TABLE_SIZE; ++a) {
- 		const float r = a / float(CRATER_TABLE_SIZE);
--		const float d = cos((r - 0.1f) * (PI + 0.3f)) * (1 - r) * (0.5f + 0.5f * cos(std::max(0.0f, r * 3 - 2) * PI));
-+		const float d = math::cos((r - 0.1f) * (PI + 0.3f)) * (1 - r) * (0.5f + 0.5f * math::cos(std::max(0.0f, r * 3 - 2) * PI));
- 		craterTable[a] = d;
- 	}
- 
-@@ -83,7 +83,7 @@
- 	const float* curHeightMap = readmap->GetCornerHeightMapSynced();
- 	const float* orgHeightMap = readmap->GetOriginalHeightMapSynced();
- 	const unsigned char* typeMap = readmap->GetTypeMapSynced();
--	const float baseStrength = -pow(strength, 0.6f) * 3 / mapHardness;
-+	const float baseStrength = -math::pow(strength, 0.6f) * 3 / mapHardness;
- 	const float invRadius = 1.0f / radius;
- 
- 	for (int y = e->y1; y <= e->y2; ++y) {
-@@ -111,7 +111,7 @@
- 				orgHeightMap[y * gs->mapxp1 + x];
- 
- 			if (prevDif * dif > 0.0f) {
--				dif /= fabs(prevDif) * 0.1f + 1;
-+				dif /= math::fabs(prevDif) * 0.1f + 1;
- 			}
- 
- 			e->squares.push_back(dif);
-@@ -148,7 +148,7 @@
- 						orgHeightMap[z * gs->mapxp1 + x];
- 
- 				if (prevDif * dif > 0.0f) {
--					dif /= fabs(prevDif) * 0.1f + 1;
-+					dif /= math::fabs(prevDif) * 0.1f + 1;
- 				}
- 
- 				totalDif += dif;
-diff -ru spring_89.0/rts/Map/Ground.cpp /home/svenstaro/src/spring/rts/Map/Ground.cpp
---- spring_89.0/rts/Map/Ground.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/Ground.cpp	2012-07-13 06:34:43.086060494 +0200
-@@ -433,8 +433,8 @@
- 
- float3 CGround::GetSmoothNormal(float x, float y, bool synced) const
- {
--	int sx = (int) floor(x / SQUARE_SIZE);
--	int sy = (int) floor(y / SQUARE_SIZE);
-+	int sx = (int) math::floor(x / SQUARE_SIZE);
-+	int sy = (int) math::floor(y / SQUARE_SIZE);
- 
- 	if (sy < 1)
- 		sy = 1;
-diff -ru spring_89.0/rts/Map/SM3/Plane.cpp /home/svenstaro/src/spring/rts/Map/SM3/Plane.cpp
---- spring_89.0/rts/Map/SM3/Plane.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SM3/Plane.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -15,7 +15,7 @@
- 	a = ry1*rz2 - ry2*rz1;
- 	b = rz1*rx2 - rz2*rx1;
- 	c = rx1*ry2 - rx2*ry1;
--	float len = (float)sqrt(a*a + b*b + c*c);
-+	float len = (float)math::sqrt(a*a + b*b + c*c);
- 	a /= len;
- 	b /= len;
- 	c /= len;
-@@ -37,10 +37,10 @@
- bool Plane::EpsilonCompare(const Plane& pln, float epsilon)
- {
- 	Plane t;
--	t.a = fabs(a - pln.a);
--	t.b = fabs(b - pln.b);
--	t.c = fabs(c - pln.c);
--	t.d = fabs(d - pln.d);
-+	t.a = math::fabs(a - pln.a);
-+	t.b = math::fabs(b - pln.b);
-+	t.c = math::fabs(c - pln.c);
-+	t.d = math::fabs(d - pln.d);
- 	if (t.a > epsilon || t.b > epsilon || t.c > epsilon || t.d > epsilon) {
- 		return false;
- 	}
-diff -ru spring_89.0/rts/Map/SM3/terrain/Lightcalc.cpp /home/svenstaro/src/spring/rts/Map/SM3/terrain/Lightcalc.cpp
---- spring_89.0/rts/Map/SM3/terrain/Lightcalc.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SM3/terrain/Lightcalc.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -197,7 +197,7 @@
- 					continue;
- 			}
- 
--			float len = sqrt(dx*dx + dy*dy);
-+			float len = math::sqrt(dx*dx + dy*dy);
- 			const float step = 5.0f;
- 			float invLength2d = step / len;
- 			dx *= invLength2d;
-diff -ru spring_89.0/rts/Map/SM3/terrain/Textures.cpp /home/svenstaro/src/spring/rts/Map/SM3/terrain/Textures.cpp
---- spring_89.0/rts/Map/SM3/terrain/Textures.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SM3/terrain/Textures.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -248,7 +248,7 @@
- 				}
- 
- 				// flatness=dotproduct of surface normal with up vector
--				float slope = 1.0f - fabs(norm_y);
-+				float slope = 1.0f - math::fabs(norm_y);
- 
- 				if (slope < gi->minSlope - gi->minSlopeFuzzy) {
- 					bm->at(x,y) = 0.0f;
-@@ -307,7 +307,7 @@
- 				Vector3 n;
- 
- 				if (sx*sx + sy*sy < 32*32) {
--					const int sz = (int)sqrt(static_cast<float>(32 * 32 - sx*sx - sy*sy));
-+					const int sz = (int)math::sqrt(static_cast<float>(32 * 32 - sx*sx - sy*sy));
- 					n = Vector3(sx, sy, sz);
- 					n.ANormalize();
- 				}
-diff -ru spring_89.0/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp /home/svenstaro/src/spring/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp
---- spring_89.0/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -99,7 +99,7 @@
- 	const int minz =  bty * smfReadMap->bigTexSize;
- 	const int maxz = minz + smfReadMap->bigTexSize;
- 	const float miny = readmap->currMinHeight;
--	const float maxy = fabs(cam->pos.y);
-+	const float maxy = math::fabs(cam->pos.y);
- 
- 	const float3 mins(                   0, miny, minz);
- 	const float3 maxs(smfReadMap->mapSizeX, maxy, maxz);
-diff -ru spring_89.0/rts/Map/SMF/ROAM/Patch.cpp /home/svenstaro/src/spring/rts/Map/SMF/ROAM/Patch.cpp
---- spring_89.0/rts/Map/SMF/ROAM/Patch.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SMF/ROAM/Patch.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -405,7 +405,7 @@
- 
- 	// Variance of this triangle is the actual height at it's hypotenuse midpoint minus the interpolated height.
- 	// Use values passed on the stack instead of re-accessing the Height Field.
--	float myVariance = fabs(centerZ - ((leftZ + rightZ) / 2));
-+	float myVariance = math::fabs(centerZ - ((leftZ + rightZ) / 2));
- 	
- 	if (leftZ*rightZ<0 || leftZ*centerZ<0 || rightZ*centerZ<0)
- 		myVariance = std::max(myVariance * 1.5f, 20.0f); //shore lines get more variance for higher accuracy
-diff -ru spring_89.0/rts/Map/SMF/SMFRenderState.cpp /home/svenstaro/src/spring/rts/Map/SMF/SMFRenderState.cpp
---- spring_89.0/rts/Map/SMF/SMFRenderState.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SMF/SMFRenderState.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -385,7 +385,7 @@
- 	smfShaderCurrARB->SetUniformTarget(GL_VERTEX_PROGRAM_ARB);
- 	smfShaderCurrARB->SetUniform4f(10, 1.0f / (gs->pwr2mapx * SQUARE_SIZE), 1.0f / (gs->pwr2mapy * SQUARE_SIZE), 0, 1);
- 	smfShaderCurrARB->SetUniform4f(12, 1.0f / smfMap->bigTexSize, 1.0f / smfMap->bigTexSize, 0, 1);
--	smfShaderCurrARB->SetUniform4f(13, -floor(camera->pos.x * 0.02f), -floor(camera->pos.z * 0.02f), 0, 0);
-+	smfShaderCurrARB->SetUniform4f(13, -math::floor(camera->pos.x * 0.02f), -math::floor(camera->pos.z * 0.02f), 0, 0);
- 	smfShaderCurrARB->SetUniform4f(14, 0.02f, 0.02f, 0, 1);
- 	smfShaderCurrARB->SetUniformTarget(GL_FRAGMENT_PROGRAM_ARB);
- 	smfShaderCurrARB->SetUniform4f(10, ambientColor.x, ambientColor.y, ambientColor.z, 1);
-diff -ru spring_89.0/rts/Rendering/Env/AdvSky.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvSky.cpp
---- spring_89.0/rts/Rendering/Env/AdvSky.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvSky.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -65,8 +65,8 @@
- 	memset(thicknessTransform, 0, 1024);
- 	memset(covers, 0, 4 * 32 * sizeof(float));
- 
--	domeheight = cos(PI / 16) * 1.01f;
--	domeWidth = sin(2 * PI / 32) * 400 * 1.7f;
-+	domeheight = math::cos(PI / 16) * 1.01f;
-+	domeWidth = math::sin(2 * PI / 32) * 400 * 1.7f;
- 
- 	UpdateSkyDir();
- 	InitSun();
-@@ -383,7 +383,7 @@
- 	case 0: {
- 		for(int a=0; a<CLOUD_DETAIL; a++) {
- 			float fade = gs->frameNum / (70.0f * (2<<(CLOUD_DETAIL-1-a)));
--			fade -= floor(fade/2)*2;
-+			fade -= math::floor(fade/2)*2;
- 			if(fade>1) {
- 				fade = 2 - fade;
- 				if(!cloudDown[a]) {
-@@ -417,11 +417,11 @@
- 		int qcda=(4<<CLOUD_DETAIL)>>a;
- 		int *pkernel=kernel;
- 		for(int y=0; y<cs4a; ++y, pkernel+=CLOUD_SIZE/4) {
--			float ydist=fabs(1.0f+y-cs8a)/cs8a;
-+			float ydist=math::fabs(1.0f+y-cs8a)/cs8a;
- 			ydist=ydist*ydist*(3-2*ydist);
- 			int *pkrn=pkernel;
- 			for(int x=0; x<cs4a; ++x) {
--				float xdist=fabs(1.0f+x-cs8a)/cs8a;
-+				float xdist=math::fabs(1.0f+x-cs8a)/cs8a;
- 				xdist=xdist*xdist*(3-2*xdist);
- 
- 				float contrib=(1-xdist)*(1-ydist);
-@@ -533,7 +533,7 @@
- 	unsigned char *tt=thicknessTransform;
- 	for(int a=0;a<1024;++a){
- 		float f=(1023.0f-(a+cloudDensity*1024-512))/1023.0f;
--		float alpha=pow(f*2,3);
-+		float alpha=math::pow(f*2,3);
- 		if(alpha>1)
- 			alpha=1;
- 		*at=(int) (alpha*255);
-@@ -560,11 +560,11 @@
- 
- 	float ymod=(sunTexCoordY-0.5f)*domeWidth*0.025f*256;
- 	float fy=ymod+modCamera.z*CLOUD_SIZE*0.000025f;
--	int baseY=int(floor(fy))&CLOUD_MASK;
--	fy-=floor(fy);
-+	int baseY=int(math::floor(fy))&CLOUD_MASK;
-+	fy-=math::floor(fy);
- 	float fx=gs->frameNum*0.00005f*CLOUD_SIZE+modCamera.x*CLOUD_SIZE*0.000025f;
--	int baseX=int(floor(fx))&CLOUD_MASK;
--	fx-=floor(fx);
-+	int baseX=int(math::floor(fx))&CLOUD_MASK;
-+	fx-=math::floor(fx);
- 
- 	float *cvs=(float *)covers[0], *cvs1=(float *)covers[1], *cvs2=(float *)covers[2], *cvs3=(float *)covers[3];
- 	if(baseX!=oldCoverBaseX || baseY!=oldCoverBaseY){
-@@ -622,8 +622,8 @@
- 	glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE);
- 	glBegin(GL_TRIANGLE_STRIP);
- 	for(int x=0;x<257;++x){
--		float dx = sin(x*2*PI/256.0f);
--		float dy = cos(x*2*PI/256.0f);
-+		float dx = math::sin(x*2*PI/256.0f);
-+		float dy = math::cos(x*2*PI/256.0f);
- 
- 		glTexCoord2f(x/256.0f,0.125f);
- 		glVertexf3(modSunDir*5+ldir*dx*0.0014f+udir*dy*0.0014f);
-@@ -646,7 +646,7 @@
- 			mem[(y*128+x)*4+0]=255;
- 			mem[(y*128+x)*4+1]=255;
- 			mem[(y*128+x)*4+2]=255;
--			float dist=sqrt((float)(y-64)*(y-64)+(x-64)*(x-64));
-+			float dist=math::sqrt((float)(y-64)*(y-64)+(x-64)*(x-64));
- 			if(dist>60)
- 				mem[(y*128+x)*4+3]=0;
- 			else
-@@ -749,7 +749,7 @@
- 
- 	for(int a=0;a<5;++a){
- 		float fade = gs->frameNum / float(30<<a);
--		fade -= floor(fade/2)*2;
-+		fade -= math::floor(fade/2)*2;
- 		int size = std::min(32,256>>a);
- 
- 		if(fade>1){
-@@ -770,7 +770,7 @@
- 
- 		}
- 		float tSize = std::max(1,8>>a);
--		float c = pow(2.0f,a)*6/255.0f;
-+		float c = math::pow(2.0f,a)*6/255.0f;
- 		CVertexArray* va = GetVertexArray();
- 		va->Initialize();
- 		va->CheckInitSize(4*VA_SIZE_T);
-@@ -867,10 +867,10 @@
- 
- 	const float hdist = math::sqrt(dir.x * dir.x + dir.z * dir.z);
- 	const float ang = GetRadFromXY(dir.x, dir.z) + skyAngle;
--	const float fy = asin(hdist / 400);
-+	const float fy = math::asin(hdist / 400);
- 
--	dir.x = hdist * cos(ang);
--	dir.z = hdist * sin(ang);
-+	dir.x = hdist * math::cos(ang);
-+	dir.z = hdist * math::sin(ang);
- 	dir.y = (fastmath::cos(fy) - domeheight) * 400;
- 
- 	dir.ANormalize();
-@@ -903,7 +903,7 @@
- 	const float3& dir = GetDirFromTexCoord(x / 256.0f, (255.0f - y) / 256.0f);
- 
- 	const float sunInt = skyLight->GetLightIntensity();
--	const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 50;
-+	const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 50;
- 	const float sunMod = sunInt * (0.3f / math::sqrt(sunDist) + 3.0f / (1 + sunDist));
- 
- 	const float green = std::min(1.0f, (0.55f + sunMod));
-@@ -918,7 +918,7 @@
- void CAdvSky::UpdateTexPart(int x, int y, unsigned char (*texp)[4]) {
- 	const float3& dir = GetDirFromTexCoord(x / 512.0f, (511.0f - y) / 512.0f);
- 
--	const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 70;
-+	const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 70;
- 	const float sunMod = skyLight->GetLightIntensity() * 12.0f / (12 + sunDist);
- 
- 	const float red   = std::min(skyColor.x + sunMod * sunColor.x, 1.0f);
-diff -ru spring_89.0/rts/Rendering/Env/AdvTreeDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeDrawer.cpp
---- spring_89.0/rts/Rendering/Env/AdvTreeDrawer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeDrawer.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -229,7 +229,7 @@
- 			std::list<FallingTree>::iterator prev = fti++;
- 			fallingTrees.erase(prev);
- 		} else {
--			fti->speed += (sin(fti->fallPos) * 0.04f);
-+			fti->speed += (math::sin(fti->fallPos) * 0.04f);
- 			++fti;
- 		}
- 	}
-@@ -616,7 +616,7 @@
- 			if (camera->InView(pos + float3(0.0f, MAX_TREE_HEIGHT / 2, 0.0f), MAX_TREE_HEIGHT / 2.0f)) {
- 				const float ang = fti->fallPos * PI;
- 
--				const float3 yvec(fti->dir.x * sin(ang), cos(ang), fti->dir.z * sin(ang));
-+				const float3 yvec(fti->dir.x * math::sin(ang), math::cos(ang), fti->dir.z * math::sin(ang));
- 				const float3 zvec((yvec.cross(float3(-1.0f, 0.0f, 0.0f))).ANormalize());
- 				const float3 xvec(yvec.cross(zvec));
- 
-@@ -957,7 +957,7 @@
- 			if (camera->InView(pos + float3(0, MAX_TREE_HEIGHT / 2, 0), MAX_TREE_HEIGHT / 2)) {
- 				const float ang = fti->fallPos * PI;
- 
--				const float3 yvec(fti->dir.x * sin(ang), cos(ang), fti->dir.z * sin(ang));
-+				const float3 yvec(fti->dir.x * math::sin(ang), math::cos(ang), fti->dir.z * math::sin(ang));
- 				const float3 zvec((yvec.cross(float3(1.0f, 0.0f, 0.0f))).ANormalize());
- 				const float3 xvec(zvec.cross(yvec));
- 
-diff -ru spring_89.0/rts/Rendering/Env/AdvTreeGenerator.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeGenerator.cpp
---- spring_89.0/rts/Rendering/Env/AdvTreeGenerator.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeGenerator.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -159,9 +159,9 @@
- 	int numIter=(int)max(3.0f,size*10);
- 	for(int a=0;a<=numIter;a++){
- 		float angle=a/(float)numIter*2*PI;
--		float col=0.4f+(((orto1*sin(angle)+orto2*cos(angle)).dot(flatSun)))*0.3f;
--		barkva->AddVertexTN(start+orto1*sin(angle)*size+orto2*cos(angle)*size,angle/PI*0.125f*0.5f,0,float3(0,0,col));
--		barkva->AddVertexTN(end+orto1*sin(angle)*size*0.2f+orto2*cos(angle)*size*0.2f,angle/PI*0.125f*0.5f,3,float3(0,0,col));
-+		float col=0.4f+(((orto1*math::sin(angle)+orto2*math::cos(angle)).dot(flatSun)))*0.3f;
-+		barkva->AddVertexTN(start+orto1*math::sin(angle)*size+orto2*math::cos(angle)*size,angle/PI*0.125f*0.5f,0,float3(0,0,col));
-+		barkva->AddVertexTN(end+orto1*math::sin(angle)*size*0.2f+orto2*math::cos(angle)*size*0.2f,angle/PI*0.125f*0.5f,3,float3(0,0,col));
- 	}
- 	barkva->EndStrip();
- }
-@@ -176,18 +176,18 @@
- 
- 	for (int a = 0; a < numBranch; ++a) {
- 		const float angle = baseAngle + (a * 3.88f) + fRand(0.5f);
--		float3 dir = orto1 * sin(angle) + orto2 * cos(angle);
-+		float3 dir = orto1 * math::sin(angle) + orto2 * math::cos(angle);
- 			dir.y = 0.3f + fRand(0.4f);
- 			dir.ANormalize();
- 		const float3 start(0, (a + 5) * height / (numBranch + 5), 0);
--		const float length = (height * (0.4f + fRand(0.1f))) * sqrt(float(numBranch - a) / numBranch);
-+		const float length = (height * (0.4f + fRand(0.1f))) * math::sqrt(float(numBranch - a) / numBranch);
- 
- 		TrunkIterator(start, dir, length, length * 0.05f, 1);
- 	}
- 
- 	for (int a = 0; a < 3; ++a) {
- 		const float angle = (a * 3.88f) + fRand(0.5f);
--		float3 dir = orto1*sin(angle)+orto2*cos(angle);
-+		float3 dir = orto1*math::sin(angle)+orto2*math::cos(angle);
- 			dir.y = 0.8f;
- 			dir.ANormalize();
- 		const float3 start(0, height - 0.3f, 0);
-@@ -225,7 +225,7 @@
- 		const float newLength = length * (float(numTrunks - a) / (numTrunks + 1));
- 
- 		float3 newbase = start + dir * length * (float(a + 1) / (numTrunks + 1));
--		float3 newDir = dir + orto1 * cos(angle) * dirDif + orto2 * sin(angle) * dirDif;
-+		float3 newDir = dir + orto1 * math::cos(angle) * dirDif + orto2 * math::sin(angle) * dirDif;
- 		newDir.ANormalize();
- 
- 		TrunkIterator(newbase, newDir, newLength, newLength * 0.05f, depth - 1);
-@@ -245,8 +245,8 @@
- 
- 		float3 pos = start + dir * length * (0.7f + fRand(0.3f));
- 		pos +=
--			(orto1 * sin(angle) + orto2 * cos(angle)) *
--			(sqrt((float) a + 1) * 0.6f + fRand(0.4f)) *
-+			(orto1 * math::sin(angle) + orto2 * math::cos(angle)) *
-+			(math::sqrt((float) a + 1) * 0.6f + fRand(0.4f)) *
- 			0.1f * MAX_TREE_HEIGHT;
- 
- 		if (pos.y < 0.2f * MAX_TREE_HEIGHT)
-@@ -538,12 +538,12 @@
- 	float baseAngle=fRand(2*PI);
- 	for(int a=0;a<numBranch;++a){
- 		float sh = 0.2f + fRand(0.2f);
--		float h  = height * pow(sh + float(a)/numBranch * (1-sh), (float)0.7f);
-+		float h  = height * math::pow(sh + float(a)/numBranch * (1-sh), (float)0.7f);
- 		float angle = baseAngle + (a * 0.618f + fRand(0.1f)) * 2 * PI;
--		float3 dir(orto1 * sin(angle) + orto2 * cos(angle));
-+		float3 dir(orto1 * math::sin(angle) + orto2 * math::cos(angle));
- 		dir.y = (a - numBranch) * 0.01f - (0.2f + fRand(0.2f));
- 		dir.ANormalize();
--		float size = sqrt((float)numBranch - a + 5) * 0.08f * MAX_TREE_HEIGHT;
-+		float size = math::sqrt((float)numBranch - a + 5) * 0.08f * MAX_TREE_HEIGHT;
- 		DrawPineBranch(float3(0,h,0),dir,size);
- 	}
- 	//create the top
-@@ -569,16 +569,16 @@
- 	for(int a=0;a<numIter;a++){
- 		float angle=a/(float)numIter*2*PI;
- 		float angle2=(a+1)/(float)numIter*2*PI;
--		float col=0.45f+(((orto1*sin(angle)+orto2*cos(angle)).dot(flatSun)))*0.3f;
--		float col2=0.45f+(((orto1*sin(angle2)+orto2*cos(angle2)).dot(flatSun)))*0.3f;
-+		float col=0.45f+(((orto1*math::sin(angle)+orto2*math::cos(angle)).dot(flatSun)))*0.3f;
-+		float col2=0.45f+(((orto1*math::sin(angle2)+orto2*math::cos(angle2)).dot(flatSun)))*0.3f;
- 
--		va->AddVertexTN(start+orto1*sin(angle)*size+orto2*cos(angle)*size,           angle/PI*0.125f*0.5f+0.5f,  0, float3(0,0,col));
--		va->AddVertexTN(end+orto1*sin(angle)*size*0.1f+orto2*cos(angle)*size*0.1f,   angle/PI*0.125f*0.5f+0.5f,  3, float3(0,0,col));
--		va->AddVertexTN(start+orto1*sin(angle2)*size+orto2*cos(angle2)*size,         angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2));
--
--		va->AddVertexTN(start+orto1*sin(angle2)*size+orto2*cos(angle2)*size,         angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2));
--		va->AddVertexTN(end+orto1*sin(angle)*size*0.1f+orto2*cos(angle)*size*0.1f,   angle/PI*0.125f*0.5f+0.5f,  3, float3(0,0,col));
--		va->AddVertexTN(end+orto1*sin(angle2)*size*0.1f+orto2*cos(angle2)*size*0.1f, angle2/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col2));
-+		va->AddVertexTN(start+orto1*math::sin(angle)*size+orto2*math::cos(angle)*size,           angle/PI*0.125f*0.5f+0.5f,  0, float3(0,0,col));
-+		va->AddVertexTN(end+orto1*math::sin(angle)*size*0.1f+orto2*math::cos(angle)*size*0.1f,   angle/PI*0.125f*0.5f+0.5f,  3, float3(0,0,col));
-+		va->AddVertexTN(start+orto1*math::sin(angle2)*size+orto2*math::cos(angle2)*size,         angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2));
-+
-+		va->AddVertexTN(start+orto1*math::sin(angle2)*size+orto2*math::cos(angle2)*size,         angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2));
-+		va->AddVertexTN(end+orto1*math::sin(angle)*size*0.1f+orto2*math::cos(angle)*size*0.1f,   angle/PI*0.125f*0.5f+0.5f,  3, float3(0,0,col));
-+		va->AddVertexTN(end+orto1*math::sin(angle2)*size*0.1f+orto2*math::cos(angle2)*size*0.1f, angle2/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col2));
- 	}
- }
- 
-diff -ru spring_89.0/rts/Rendering/Env/AdvWater.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvWater.cpp
---- spring_89.0/rts/Rendering/Env/AdvWater.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvWater.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -48,7 +48,7 @@
- 	for (int y = 0; y < 64; ++y) {
- 		for (int x = 0; x < 64; ++x) {
- 			scrap[(y*64 + x)*4 + 0] = 128;
--			scrap[(y*64 + x)*4 + 1] = (unsigned char)(sin(y*PI*2.0f/64.0f)*128 + 128);
-+			scrap[(y*64 + x)*4 + 1] = (unsigned char)(math::sin(y*PI*2.0f/64.0f)*128 + 128);
- 			scrap[(y*64 + x)*4 + 2] = 0;
- 			scrap[(y*64 + x)*4 + 3] = 255;
- 		}
-@@ -62,8 +62,8 @@
- 		for (int x = 0; x < 64; ++x) {
- 			const float ang = 26.5f*PI/180.0f;
- 			const float pos = y*2+x;
--			scrap[(y*64 + x)*4 + 0] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*sin(ang)) + 128;
--			scrap[(y*64 + x)*4 + 1] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*cos(ang)) + 128;
-+			scrap[(y*64 + x)*4 + 0] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::sin(ang)) + 128;
-+			scrap[(y*64 + x)*4 + 1] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::cos(ang)) + 128;
- 		}
- 	}
- 	glBindTexture(GL_TEXTURE_2D, rawBumpTexture[1]);
-@@ -75,8 +75,8 @@
- 		for (int x = 0; x < 64; ++x) {
- 			const float ang = -19*PI/180.0f;
- 			const float pos = 3*y - x;
--			scrap[(y*64 + x)*4 + 0] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*sin(ang)) + 128;
--			scrap[(y*64 + x)*4 + 1] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*cos(ang)) + 128;
-+			scrap[(y*64 + x)*4 + 0] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::sin(ang)) + 128;
-+			scrap[(y*64 + x)*4 + 1] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::cos(ang)) + 128;
- 		}
- 	}
- 	glBindTexture(GL_TEXTURE_2D, rawBumpTexture[2]);
-@@ -192,14 +192,14 @@
- 				dir = xbase + dv;
- 				dir.ANormalize();
- 				zpos = camera->pos + dir*(camera->pos.y / -dir.y);
--				zpos.y = sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f;
-+				zpos.y = math::sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f;
- 				col[3] = (unsigned char)((0.8f + 0.7f*dir.y)*255);
- 				va->AddVertexQTC(zpos, x*(1.0f/numDivs), screenY - yInc, col);
- 
- 				dir = xbase;
- 				dir.ANormalize();
- 				zpos = camera->pos + dir*(camera->pos.y / -dir.y);
--				zpos.y = sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f;
-+				zpos.y = math::sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f;
- 				col[3] = (unsigned char)((0.8f + 0.7f*dir.y)*255);
- 				va->AddVertexQTC(zpos, x*(1.0f/numDivs), screenY, col);
- 
-diff -ru spring_89.0/rts/Rendering/Env/BasicSky.cpp /home/svenstaro/src/spring/rts/Rendering/Env/BasicSky.cpp
---- spring_89.0/rts/Rendering/Env/BasicSky.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/BasicSky.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -67,8 +67,8 @@
- 	rawClouds=newmat2<int>(CLOUD_SIZE,CLOUD_SIZE);
- 	blendMatrix=newmat3<int>(CLOUD_DETAIL,32,32);
- 
--	domeheight=cos(PI/16)*1.01f;
--	domeWidth=sin(PI/16)*400*1.7f;
-+	domeheight=math::cos(PI/16)*1.01f;
-+	domeWidth=math::sin(PI/16)*400*1.7f;
- 
- 	UpdateSkyDir();
- 	InitSun();
-@@ -369,7 +369,7 @@
- 	case 0: {
- 		for(int a=0; a<CLOUD_DETAIL; a++) {
- 			float fade = gs->frameNum / (70.0f * (2<<(CLOUD_DETAIL-1-a)));
--			fade -= floor(fade/2)*2;
-+			fade -= math::floor(fade/2)*2;
- 			if(fade>1) {
- 				fade = 2 - fade;
- 				if(!cloudDown[a]) {
-@@ -403,11 +403,11 @@
- 		int qcda=(4<<CLOUD_DETAIL)>>a;
- 		int *pkernel=kernel;
- 		for(int y=0; y<cs4a; ++y, pkernel+=CLOUD_SIZE/4) {
--			float ydist=fabs(1.0f+y-cs8a)/cs8a;
-+			float ydist=math::fabs(1.0f+y-cs8a)/cs8a;
- 			ydist=ydist*ydist*(3-2*ydist);
- 			int *pkrn=pkernel;
- 			for(int x=0; x<cs4a; ++x) {
--				float xdist=fabs(1.0f+x-cs8a)/cs8a;
-+				float xdist=math::fabs(1.0f+x-cs8a)/cs8a;
- 				xdist=xdist*xdist*(3-2*xdist);
- 
- 				float contrib=(1-xdist)*(1-ydist);
-@@ -506,7 +506,7 @@
- 	unsigned char *tt=thicknessTransform;
- 	for(int a=0;a<1024;++a){
- 		float f=(1023.0f-(a+cloudDensity*1024-512))/1023.0f;
--		float alpha=pow(f*2,3);
-+		float alpha=math::pow(f*2,3);
- 		if(alpha>1)
- 			alpha=1;
- 		*at=(unsigned char)(alpha*255);
-@@ -533,11 +533,11 @@
- 
- 	float ymod=(sunTexCoordY-0.5f)*domeWidth*0.025f*256;
- 	float fy=ymod+modCamera.z*CLOUD_SIZE*0.000025f;
--	int baseY=int(floor(fy))&CLOUD_MASK;
--	fy-=floor(fy);
-+	int baseY=int(math::floor(fy))&CLOUD_MASK;
-+	fy-=math::floor(fy);
- 	float fx=gs->frameNum*0.00005f*CLOUD_SIZE+modCamera.x*CLOUD_SIZE*0.000025f;
--	int baseX=int(floor(fx))&CLOUD_MASK;
--	fx-=floor(fx);
-+	int baseX=int(math::floor(fx))&CLOUD_MASK;
-+	fx-=math::floor(fx);
- 
- 	float *cvs=(float *)covers[0], *cvs1=(float *)covers[1], *cvs2=(float *)covers[2], *cvs3=(float *)covers[3];
- 	if(baseX!=oldCoverBaseX || baseY!=oldCoverBaseY){
-@@ -589,8 +589,8 @@
- 		glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE);
- 		glBegin(GL_TRIANGLE_STRIP);
- 		for(int x=0;x<257;++x){
--			float dx=sin(x*2*PI/256.0f);
--			float dy=cos(x*2*PI/256.0f);
-+			float dx=math::sin(x*2*PI/256.0f);
-+			float dy=math::cos(x*2*PI/256.0f);
- 
- 			glTexCoord2f(x/256.0f,0.25f);
- 			glVertexf3(modSunDir*5+ldir*dx*0.0014f+udir*dy*0.0014f);
-@@ -613,7 +613,7 @@
- 			mem[(y*128+x)*4+0]=255;
- 			mem[(y*128+x)*4+1]=255;
- 			mem[(y*128+x)*4+2]=255;
--			float dist=sqrt((float)(y-64)*(y-64)+(x-64)*(x-64));
-+			float dist=math::sqrt((float)(y-64)*(y-64)+(x-64)*(x-64));
- 			if(dist>60)
- 				mem[(y*128+x)*4+3]=0;
- 			else
-@@ -764,10 +764,10 @@
- 
- 	const float hdist = math::sqrt(dir.x * dir.x + dir.z * dir.z);
- 	const float ang = GetRadFromXY(dir.x, dir.z) + skyAngle;
--	const float fy = asin(hdist / 400);
-+	const float fy = math::asin(hdist / 400);
- 
--	dir.x = hdist * cos(ang);
--	dir.z = hdist * sin(ang);
-+	dir.x = hdist * math::cos(ang);
-+	dir.z = hdist * math::sin(ang);
- 	dir.y = (fastmath::cos(fy) - domeheight) * 400;
- 
- 	dir.ANormalize();
-@@ -800,7 +800,7 @@
- 	const float3& dir = GetDirFromTexCoord(x / 256.0f, (255.0f - y) / 256.0f);
- 
- 	const float sunInt = skyLight->GetLightIntensity();
--	const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 50;
-+	const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 50;
- 	const float sunMod = sunInt * (0.3f / math::sqrt(sunDist) + 2.0f / sunDist);
- 
- 	const float green = std::min(1.0f, (0.55f + sunMod));
-@@ -814,7 +814,7 @@
- void CBasicSky::UpdateTexPart(int x, int y, unsigned char (*texp)[4]) {
- 	const float3& dir = GetDirFromTexCoord(x / 512.0f, (511.0f - y) / 512.0f);
- 
--	const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 70;
-+	const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 70;
- 	const float sunMod = skyLight->GetLightIntensity() * 12.0f / (12 + sunDist);
- 
- 	const float red   = std::min(skyColor.x + sunMod * sunColor.x, 1.0f);
-diff -ru spring_89.0/rts/Rendering/Env/CubeMapHandler.cpp /home/svenstaro/src/spring/rts/Rendering/Env/CubeMapHandler.cpp
---- spring_89.0/rts/Rendering/Env/CubeMapHandler.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/CubeMapHandler.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -269,7 +269,7 @@
- 	for (int x = 0; x < size; ++x) {
- 		const float3 dir = (cdir + (xdif * (x + 0.5f)) / size + (ydif * (y + 0.5f)) / size).Normalize();
- 		const float dot  = std::max(0.0f, dir.dot(sky->GetLight()->GetLightDir()));
--		const float spec = std::min(1.0f, pow(dot, mapInfo->light.specularExponent) + pow(dot, 3.0f) * 0.25f);
-+		const float spec = std::min(1.0f, math::pow(dot, mapInfo->light.specularExponent) + math::pow(dot, 3.0f) * 0.25f);
- 
- 		buf[x * 4 + 0] = (mapInfo->light.unitSpecularColor.x * spec * 255);
- 		buf[x * 4 + 1] = (mapInfo->light.unitSpecularColor.y * spec * 255);
-diff -ru spring_89.0/rts/Rendering/Env/DynWater.cpp /home/svenstaro/src/spring/rts/Rendering/Env/DynWater.cpp
---- spring_89.0/rts/Rendering/Env/DynWater.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/DynWater.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -88,9 +88,9 @@
- 
- 	for (int y = 0; y < 64; ++y) {
- 		for (int x = 0; x < 64; ++x) {
--			temp[(y*64 + x)*4 + 0] = sin(x*PI*2.0f/64.0f) + ((x < 32) ? -1 : 1)*0.3f;
-+			temp[(y*64 + x)*4 + 0] = math::sin(x*PI*2.0f/64.0f) + ((x < 32) ? -1 : 1)*0.3f;
- 			temp[(y*64 + x)*4 + 1] = temp[(y*64 + x)*4 + 0];
--			temp[(y*64 + x)*4 + 2] = cos(x*PI*2.0f/64.0f) + ((x < 32) ? (16 - x) : (x - 48))/16.0f*0.3f;
-+			temp[(y*64 + x)*4 + 2] = math::cos(x*PI*2.0f/64.0f) + ((x < 32) ? (16 - x) : (x - 48))/16.0f*0.3f;
- 			temp[(y*64 + x)*4 + 3] = 0;
- 		}
- 	}
-@@ -197,7 +197,7 @@
- 		const float dy = y - 31.5f;
- 		for (int x = 0; x < 64; ++x) {
- 			const float dx = x-31.5f;
--			const float dist = sqrt(dx*dx + dy*dy);
-+			const float dist = math::sqrt(dx*dx + dy*dy);
- 			temp[(y*64 + x)*4 + 0] = std::max(0.0f, 1 - dist/30.f) * std::max(0.0f, 1 - dist/30.f);
- 			temp[(y*64 + x)*4 + 1] = std::max(0.0f, 1 - dist/30.f);
- 			temp[(y*64 + x)*4 + 2] = std::max(0.0f, 1 - dist/30.f) * std::max(0.0f, 1 - dist/30.f);
-@@ -425,8 +425,8 @@
- 
- 	oldCamPosBig = camPosBig;
- 
--	camPosBig.x = floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE-WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16);
--	camPosBig.z = floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE-WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16);
-+	camPosBig.x = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE-WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16);
-+	camPosBig.z = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE-WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16);
- 
- 	glDisable(GL_DEPTH_TEST);
- 	glDepthMask(0);
-@@ -835,8 +835,8 @@
- 	va = GetVertexArray();
- 	va->Initialize();
- 
--	camPosBig2.x = floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE - WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16);
--	camPosBig2.z = floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE - WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16);
-+	camPosBig2.x = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE - WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16);
-+	camPosBig2.z = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE - WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16);
- 
- 	// FIXME:
- 	//     1. DynWater::UpdateCamRestraints was never called ==> <this->left> and <this->right> were always empty
-@@ -1132,8 +1132,8 @@
- 				// hovercraft
- 				const float3& pos = unit->pos;
- 
--				if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) ||
--					(fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
-+				if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) ||
-+					(math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
- 				{
- 					continue;
- 				}
-@@ -1144,7 +1144,7 @@
- 				if ((pos.y > -4.0f) && (pos.y < 4.0f)) {
- 					const float3 frontAdd = unit->frontdir * unit->radius * 0.75f;
- 					const float3 sideAdd = unit->rightdir * unit->radius * 0.75f;
--					const float depth = sqrt(sqrt(unit->mass)) * 0.4f;
-+					const float depth = math::sqrt(math::sqrt(unit->mass)) * 0.4f;
- 					const float3 n(depth, 0.05f * depth, depth);
- 
- 					va2->AddVertexQTN(pos + frontAdd + sideAdd, 0, 0, n);
-@@ -1156,8 +1156,8 @@
- 				// surface ship
- 				const float3& pos = unit->pos;
- 
--				if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) ||
--					(fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
-+				if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) ||
-+					(math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
- 				{
- 					continue;
- 				}
-@@ -1171,7 +1171,7 @@
- 
- 				const float3 frontAdd = unit->frontdir * unit->radius * 0.75f;
- 				const float3 sideAdd = unit->rightdir * unit->radius * 0.18f;
--				const float depth = sqrt(sqrt(unit->mass));
-+				const float depth = math::sqrt(math::sqrt(unit->mass));
- 				const float3 n(depth, 0.04f * unit->speed.Length2D() * depth, depth);
- 
- 				va->AddVertexQTN(pos + frontAdd + sideAdd, 0, 0, n);
-@@ -1249,8 +1249,8 @@
- 	for (std::vector<Explosion>::iterator ei = explosions.begin(); ei != explosions.end(); ++ei) {
- 		Explosion& explo = *ei;
- 		float3 pos = explo.pos;
--		if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50))
--				|| (fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
-+		if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50))
-+				|| (math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
- 		{
- 			continue;
- 		}
-diff -ru spring_89.0/rts/Rendering/Env/GrassDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/Env/GrassDrawer.cpp
---- spring_89.0/rts/Rendering/Env/GrassDrawer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/GrassDrawer.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -75,11 +75,11 @@
- 	}
- 
- 	// TODO: get rid of the magic constants
--	maxGrassDist = 800 + sqrt((float) detail) * 240;
-+	maxGrassDist = 800 + math::sqrt((float) detail) * 240;
- 	maxDetailedDist = 146 + detail * 24;
- 	detailedBlocks = int((maxDetailedDist - 24) / bMSsq) + 1;
- 	numTurfs = 3 + int(detail * 0.5f);
--	strawPerTurf = 50 + int(sqrt((float) detail) * 10);
-+	strawPerTurf = 50 + int(math::sqrt((float) detail) * 10);
- 
- 	blocksX = gs->mapx / grassSquareSize  /grassBlockSize;
- 	blocksY = gs->mapy / grassSquareSize / grassBlockSize;
-@@ -641,7 +641,7 @@
- 		const float3 billboardDirX = (billboardDirZ.cross(UpVector)).ANormalize();
- 		const float3 billboardDirY = billboardDirX.cross(billboardDirZ);
- 
--		const float ang = acos(billboardDirZ.y);
-+		const float ang = math::acos(billboardDirZ.y);
- 		const int texPart = std::min(15, int(std::max(0, int((ang + PI / 16 - PI / 2) / PI * 30))));
- 
- 		if (globalRendering->haveGLSL) {
-@@ -673,7 +673,7 @@
- 			const float3 billboardDirX = (billboardDirZ.cross(UpVector)).ANormalize();
- 			const float3 billboardDirY = billboardDirX.cross(billboardDirZ);
- 
--			const float ang = acos(billboardDirZ.y);
-+			const float ang = math::acos(billboardDirZ.y);
- 			const int texPart = std::min(15, int(std::max(0, int((ang + PI / 16 - PI / 2) / PI * 30))));
- 
- 			if (globalRendering->haveGLSL) {
-@@ -820,7 +820,7 @@
- 		float3 forwardVect = sideVect.cross(UpVector);
- 		sideVect *= mapInfo->grass.bladeWidth;
- 
--		const float3 cornerPos = (UpVector * cos(maxAng) + forwardVect * sin(maxAng)) * length;
-+		const float3 cornerPos = (UpVector * math::cos(maxAng) + forwardVect * math::sin(maxAng)) * length;
- 		float3 basePos(30.0f, 0.0f, 30.0f);
- 
- 		while (basePos.SqLength2D() > (turfSize * turfSize / 4)) {
-@@ -837,10 +837,10 @@
- 
- 			const float3 edgePosL =
- 				-sideVect * (1 - h) +
--				(UpVector * cos(ang) + forwardVect * sin(ang)) * length * h;
-+				(UpVector * math::cos(ang) + forwardVect * math::sin(ang)) * length * h;
- 			const float3 edgePosR =
- 				sideVect * (1.0f - h) +
--				(UpVector * cos(ang) + forwardVect * sin(ang)) * length * h;
-+				(UpVector * math::cos(ang) + forwardVect * math::sin(ang)) * length * h;
- 
- 			if (b == 0) {
- 				va->AddVertexT(basePos + (edgePosR - float3(0.0f, 0.1f, 0.0f)), xtexBase + xtexOffset, h);
-diff -ru spring_89.0/rts/Rendering/Env/SkyLight.cpp /home/svenstaro/src/spring/rts/Rendering/Env/SkyLight.cpp
---- spring_89.0/rts/Rendering/Env/SkyLight.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/SkyLight.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -72,7 +72,7 @@
- bool DynamicSkyLight::SetLightDir(const float4& newLightDir) {
- 	if (newLightDir != lightDir) {
- 		static float4 lastUpdate = ZeroVector;
--		static const float minCosAngle = cos(1.5f * (PI/180.f));
-+		static const float minCosAngle = math::cos(1.5f * (PI/180.f));
- 
- 		if (lastUpdate.dot(newLightDir) < minCosAngle) {
- 			lastUpdate   = newLightDir;
-@@ -92,7 +92,7 @@
- 	const float angularVelocity = 2.0f * PI / sunOrbitTime;
- 
- 	const float sunAng  = startAngle - initialSunAngle - angularVelocity * gameSeconds;
--	const float4 sunPos = sunRotation.Mul(float3(sunOrbitRad * cos(sunAng), sunOrbitHeight, sunOrbitRad * sin(sunAng)));
-+	const float4 sunPos = sunRotation.Mul(float3(sunOrbitRad * math::cos(sunAng), sunOrbitHeight, sunOrbitRad * math::sin(sunAng)));
- 
- 	return sunPos;
- }
-@@ -108,18 +108,18 @@
- 	if (newLightDir.w == FLT_MAX) {
- 		// old: newLightDir is position where sun reaches highest altitude
- 		const float sunLen = newLightDir.Length2D();
--		const float sunAzimuth = (sunLen <= 0.001f) ? PI / 2.0f : atan(newLightDir.y / sunLen);
--		const float sunHeight = tan(sunAzimuth - 0.001f);
-+		const float sunAzimuth = (sunLen <= 0.001f) ? PI / 2.0f : math::atan(newLightDir.y / sunLen);
-+		const float sunHeight = math::tan(sunAzimuth - 0.001f);
- 
--		float3 v1(cos(initialSunAngle), sunHeight, sin(initialSunAngle));
-+		float3 v1(math::cos(initialSunAngle), sunHeight, math::sin(initialSunAngle));
- 		v1.ANormalize();
- 
- 		if (v1.y <= orbitMinSunHeight) {
- 			newLightDir = UpVector;
- 			sunOrbitHeight = v1.y;
--			sunOrbitRad = sqrt(1.0f - sunOrbitHeight * sunOrbitHeight);
-+			sunOrbitRad = math::sqrt(1.0f - sunOrbitHeight * sunOrbitHeight);
- 		} else {
--			float3 v2(cos(initialSunAngle + PI), orbitMinSunHeight, sin(initialSunAngle + PI));
-+			float3 v2(math::cos(initialSunAngle + PI), orbitMinSunHeight, math::sin(initialSunAngle + PI));
- 			v2.ANormalize();
- 			float3 v3 = v2 - v1;
- 			sunOrbitRad = v3.Length() / 2.0f;
-@@ -137,7 +137,7 @@
- 	} else {
- 		// new: newLightDir is center position of orbit, and newLightDir.w is orbit height
- 		sunOrbitHeight = std::max(-1.0f, std::min(newLightDir.w, 1.0f));
--		sunOrbitRad = sqrt(1.0f - sunOrbitHeight * sunOrbitHeight);
-+		sunOrbitRad = math::sqrt(1.0f - sunOrbitHeight * sunOrbitHeight);
- 	}
- 
- 	sunRotation.LoadIdentity();
-diff -ru spring_89.0/rts/Rendering/GL/glExtra.cpp /home/svenstaro/src/spring/rts/Rendering/GL/glExtra.cpp
---- spring_89.0/rts/Rendering/GL/glExtra.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/GL/glExtra.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -83,7 +83,7 @@
- 		float adjustment = rad/2;
- 		float ydiff = 0;
- 		int j;
--		for(j = 0; j < 50 && fabs(adjRadius - rad) + ydiff > .01*rad; j++){
-+		for(j = 0; j < 50 && math::fabs(adjRadius - rad) + ydiff > .01*rad; j++){
- 			if(adjRadius > rad) {
- 				rad += adjustment;
- 			} else {
-@@ -93,7 +93,7 @@
- 			pos.x = center.x + (sinR * rad);
- 			pos.z = center.z + (cosR * rad);
- 			float newY = ground->GetHeightAboveWater(pos.x, pos.z, false);
--			ydiff = fabs(pos.y - newY);
-+			ydiff = math::fabs(pos.y - newY);
- 			pos.y = newY;
- 			heightDiff = (pos.y - center.y);
- 			adjRadius = weapon ? weapon->GetRange2D(heightDiff*weapon->heightMod) : rad;
-diff -ru spring_89.0/rts/Rendering/GroundDecalHandler.cpp /home/svenstaro/src/spring/rts/Rendering/GroundDecalHandler.cpp
---- spring_89.0/rts/Rendering/GroundDecalHandler.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/GroundDecalHandler.cpp	2012-07-13 06:34:43.082727161 +0200
-@@ -963,7 +963,7 @@
- 		radius = damage * 0.25f;
- 
- 	if (damage > 400)
--		damage = 400 + sqrt(damage - 399);
-+		damage = 400 + math::sqrt(damage - 399);
- 
- 	pos.ClampInBounds();
- 
-diff -ru spring_89.0/rts/Rendering/InMapDrawView.cpp /home/svenstaro/src/spring/rts/Rendering/InMapDrawView.cpp
---- spring_89.0/rts/Rendering/InMapDrawView.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/InMapDrawView.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -38,7 +38,7 @@
- 	for (int y = 0; y < 64; y++) {
- 		// circular thingy
- 		for (int x = 0; x < 64; x++) {
--			float dist = sqrt((float)(x - 32) * (x - 32) + (y - 32) * (y - 32));
-+			float dist = math::sqrt((float)(x - 32) * (x - 32) + (y - 32) * (y - 32));
- 			if (dist > 31.0f) {
- 				// do nothing - leave transparent
- 			} else if (dist > 30.0f) {
-diff -ru spring_89.0/rts/Rendering/LineDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/LineDrawer.cpp
---- spring_89.0/rts/Rendering/LineDrawer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/LineDrawer.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -29,7 +29,7 @@
- void CLineDrawer::UpdateLineStipple()
- {
- 	stippleTimer += (globalRendering->lastFrameTime * cmdColors.StippleSpeed());
--	stippleTimer = fmod(stippleTimer, (16.0f / 20.0f));
-+	stippleTimer = math::fmod(stippleTimer, (16.0f / 20.0f));
- }
- 
- 
-diff -ru spring_89.0/rts/Rendering/Models/S3OParser.cpp /home/svenstaro/src/spring/rts/Rendering/Models/S3OParser.cpp
---- spring_89.0/rts/Rendering/Models/S3OParser.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Models/S3OParser.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -319,7 +319,7 @@
- 		float3& t = tTangents[vrtIdx];
- 		int h = 1;
- 
--		if (isnan(n.x) || isnan(n.y) || isnan(n.z)) {
-+		if (math::isnan(n.x) || math::isnan(n.y) || math::isnan(n.z)) {
- 			n = float3(0.0f, 0.0f, 1.0f);
- 		}
- 		if (s == ZeroVector) { s = float3(1.0f, 0.0f, 0.0f); }
-diff -ru spring_89.0/rts/Sim/Misc/LosMap.cpp /home/svenstaro/src/spring/rts/Sim/Misc/LosMap.cpp
---- spring_89.0/rts/Sim/Misc/LosMap.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Misc/LosMap.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -182,7 +182,7 @@
- 
- 		y = (int)i;
- 		x = 1;
--		y = (int) (sqrt((float)r2 - 1) + 0.5f);
-+		y = (int) (math::sqrt((float)r2 - 1) + 0.5f);
- 		while (x < y) {
- 			if(!PaintTable[x+y*Radius]) {
- 				DrawLine(PaintTable, x, y, Radius);
-@@ -198,7 +198,7 @@
- 			}
- 
- 			x += 1;
--			y = (int) (sqrt((float)r2 - x*x) + 0.5f);
-+			y = (int) (math::sqrt((float)r2 - x*x) + 0.5f);
- 		}
- 		if (x == y) {
- 			if(!PaintTable[x+y*Radius]) {
-diff -ru spring_89.0/rts/Sim/Misc/QuadField.cpp /home/svenstaro/src/spring/rts/Sim/Misc/QuadField.cpp
---- spring_89.0/rts/Sim/Misc/QuadField.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Misc/QuadField.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -329,12 +329,12 @@
- 	float zp = start.z;
- 	const float invQuadSize = 1.0f / QUAD_SIZE;
- 
--	if ((floor(start.x * invQuadSize) == floor(to.x * invQuadSize)) &&
--		(floor(start.z * invQuadSize) == floor(to.z * invQuadSize)))
-+	if ((math::floor(start.x * invQuadSize) == math::floor(to.x * invQuadSize)) &&
-+		(math::floor(start.z * invQuadSize) == math::floor(to.z * invQuadSize)))
- 	{
- 		*endQuad = ((int(start.x * invQuadSize)) + (int(start.z * invQuadSize)) * numQuadsX);
- 		++endQuad;
--	} else if (floor(start.x * invQuadSize) == floor(to.x * invQuadSize)) {
-+	} else if (math::floor(start.x * invQuadSize) == math::floor(to.x * invQuadSize)) {
- 		const int first = (int)(start.x * invQuadSize) + ((int)(start.z * invQuadSize) * numQuadsX);
- 		const int last  = (int)(to.x    * invQuadSize) + ((int)(to.z    * invQuadSize) * numQuadsX);
- 
-@@ -347,7 +347,7 @@
- 				*endQuad = a; ++endQuad;
- 			}
- 		}
--	} else if (floor(start.z * invQuadSize) == floor(to.z * invQuadSize)) {
-+	} else if (math::floor(start.z * invQuadSize) == math::floor(to.z * invQuadSize)) {
- 		const int first = (int)(start.x * invQuadSize) + ((int)(start.z * invQuadSize) * numQuadsX);
- 		const int last  = (int)(to.x    * invQuadSize) + ((int)(to.z    * invQuadSize) * numQuadsX);
- 
-@@ -369,14 +369,14 @@
- 			++endQuad;
- 
- 			if (dx > 0) {
--				xn = (floor(xp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - xp) / dx;
-+				xn = (math::floor(xp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - xp) / dx;
- 			} else {
--				xn = (floor(xp * invQuadSize) * QUAD_SIZE - xp) / dx;
-+				xn = (math::floor(xp * invQuadSize) * QUAD_SIZE - xp) / dx;
- 			}
- 			if (dz > 0) {
--				zn = (floor(zp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - zp) / dz;
-+				zn = (math::floor(zp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - zp) / dz;
- 			} else {
--				zn = (floor(zp * invQuadSize) * QUAD_SIZE - zp) / dz;
-+				zn = (math::floor(zp * invQuadSize) * QUAD_SIZE - zp) / dz;
- 			}
- 
- 			if (xn < zn) {
-@@ -388,8 +388,8 @@
- 			}
- 
- 			keepgoing =
--				(fabs(xp - start.x) < fabs(to.x - start.x)) &&
--				(fabs(zp - start.z) < fabs(to.z - start.z));
-+				(math::fabs(xp - start.x) < math::fabs(to.x - start.x)) &&
-+				(math::fabs(zp - start.z) < math::fabs(to.z - start.z));
- 		}
- 	}
- 
-diff -ru spring_89.0/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp
---- spring_89.0/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp	2012-07-13 06:34:43.256060504 +0200
-@@ -386,7 +386,7 @@
- 
- 	const float dif = wSpeed - currentSpeed;
- 
--	if (fabs(dif) < 0.05f) {
-+	if (math::fabs(dif) < 0.05f) {
- 		deltaSpeed = dif * 0.125f;
- 		nextDeltaSpeedUpdate = gs->frameNum + 8;
- 	} else if (dif > 0.0f) {
-@@ -529,7 +529,7 @@
- 			skidRotSpeed = 0.0f;
- 			owner->physicalState = oldPhysState;
- 			owner->moveType->useHeading = true;
--			float rp = floor(skidRotPos2 + skidRotSpeed2 + 0.5f);
-+			float rp = math::floor(skidRotPos2 + skidRotSpeed2 + 0.5f);
- 			skidRotSpeed2 = (rp - skidRotPos2) * 0.5f;
- 			ChangeHeading(owner->heading);
- 		} else {
-@@ -545,10 +545,10 @@
- 			}
- 
- 			float remTime=speedf/speedReduction-1;
--			float rp=floor(skidRotPos2+skidRotSpeed2*remTime+0.5f);
-+			float rp=math::floor(skidRotPos2+skidRotSpeed2*remTime+0.5f);
- 			skidRotSpeed2=(remTime+1 == 0 ) ? 0 : (rp-skidRotPos2)/(remTime+1);
- 
--			if(floor(skidRotPos2)!=floor(skidRotPos2+skidRotSpeed2)){
-+			if(math::floor(skidRotPos2)!=math::floor(skidRotPos2+skidRotSpeed2)){
- 				skidRotPos2=0;
- 				skidRotSpeed2=0;
- 			}
-@@ -571,7 +571,7 @@
- 				speed*=0.95f;
- 			}
- 			else {
--				speed += (normal*(fabs(speed.dot(normal)) + .1))*1.9f;
-+				speed += (normal*(math::fabs(speed.dot(normal)) + .1))*1.9f;
- 				speed*=.8;
- 			}
- 		}
-@@ -625,7 +625,7 @@
- 		float totRad = owner->radius + u->radius;
- 
- 		if (sqDist < totRad * totRad && sqDist != 0) {
--			float dist = sqrt(sqDist);
-+			float dist = math::sqrt(sqDist);
- 			float3 dif = midPos - u->midPos;
- 			dif /= std::max(dist, 1.f);
- 
-@@ -682,7 +682,7 @@
- 		float sqDist=(midPos-u->midPos).SqLength();
- 		float totRad=owner->radius+u->radius;
- 		if(sqDist<totRad*totRad && sqDist!=0){
--			float dist=sqrt(sqDist);
-+			float dist=math::sqrt(sqDist);
- 			float3 dif=midPos-u->midPos;
- 			dif/=std::max(dist, 1.f);
- 			float impactSpeed = -owner->speed.dot(dif);
-@@ -721,8 +721,8 @@
- 
- 	skidRotPos2 += skidRotSpeed2;
- 
--	float cosp = cos(skidRotPos2 * PI * 2.0f);
--	float sinp = sin(skidRotPos2 * PI * 2.0f);
-+	float cosp = math::cos(skidRotPos2 * PI * 2.0f);
-+	float sinp = math::sin(skidRotPos2 * PI * 2.0f);
- 
- 	float3 f1 = skidRotVector * skidRotVector.dot(owner->frontdir);
- 	float3 f2 = owner->frontdir - f1;
-@@ -812,7 +812,7 @@
- 						float objectDistToAvoidDirCenter = objectToUnit.dot(rightOfAvoid);
- 
- 						if (objectToUnit.dot(avoidanceDir) < radiusSum &&
--							fabs(objectDistToAvoidDirCenter) < radiusSum &&
-+							math::fabs(objectDistToAvoidDirCenter) < radiusSum &&
- 							(o->moveDef || Distance2D(owner, o) >= 0)) {
- 
- 							if (objectDistToAvoidDirCenter > 0.0f) {
-@@ -824,7 +824,7 @@
- 								rightOfAvoid = avoidanceDir.cross(float3(0.0f, 1.0f, 0.0f));
- 							} else {
- 								avoidLeft +=
--									(radiusSum - fabs(objectDistToAvoidDirCenter)) *
-+									(radiusSum - math::fabs(objectDistToAvoidDirCenter)) *
- 									AVOIDANCE_STRENGTH * fastmath::isqrt2(distanceToObjectSq);
- 								avoidanceDir -= (rightOfAvoid * avoidLeft);
- 								avoidanceDir.Normalize();
-@@ -952,7 +952,7 @@
- 	if (!decRate) {
- 		return 0.0f;
- 	}
--	return fabs(speed*speed / decRate);
-+	return math::fabs(speed*speed / decRate);
- }
- 
- float3 CClassicGroundMoveType::Here()
-@@ -1043,7 +1043,7 @@
- 			const float zmove = (owner->mapPos.y + owner->zsize / 2) * SQUARE_SIZE;
- 			const float xmove = (owner->mapPos.x + owner->xsize / 2) * SQUARE_SIZE;
- 
--			if (fabs(owner->frontdir.x) > fabs(owner->frontdir.z)) {
-+			if (math::fabs(owner->frontdir.x) > math::fabs(owner->frontdir.z)) {
- 				if (newmp.y < owner->mapPos.y) {
- 					haveCollided |= CheckColV(newmp.y, newmp.x, newmp.x + owner->xsize - 1,  zmove - 3.99f, owner->mapPos.y);
- 					newmp = owner->GetMapPos();
-@@ -1261,20 +1261,20 @@
- 			float xp = start.x;
- 			float zp = start.z;
- 
--			if (floor(start.x) == floor(to.x)) {
-+			if (math::floor(start.x) == math::floor(to.x)) {
- 				if (dz > 0.0f) {
--					for (int a = 1; a < floor(to.z); ++a)
-+					for (int a = 1; a < math::floor(to.z); ++a)
- 						lineTable[yt][xt].push_back(int2(0, a));
- 				} else {
--					for (int a = -1; a > floor(to.z); --a)
-+					for (int a = -1; a > math::floor(to.z); --a)
- 						lineTable[yt][xt].push_back(int2(0, a));
- 				}
--			} else if (floor(start.z) == floor(to.z)) {
-+			} else if (math::floor(start.z) == math::floor(to.z)) {
- 				if (dx > 0.0f) {
--					for (int a = 1; a < floor(to.x); ++a)
-+					for (int a = 1; a < math::floor(to.x); ++a)
- 						lineTable[yt][xt].push_back(int2(a, 0));
- 				} else {
--					for (int a = -1; a > floor(to.x); --a)
-+					for (int a = -1; a > math::floor(to.x); --a)
- 						lineTable[yt][xt].push_back(int2(a, 0));
- 				}
- 			} else {
-@@ -1283,14 +1283,14 @@
- 
- 				while (keepgoing) {
- 					if (dx > 0.0f) {
--						xn = (floor(xp) + 1.0f - xp) / dx;
-+						xn = (math::floor(xp) + 1.0f - xp) / dx;
- 					} else {
--						xn = (floor(xp)        - xp) / dx;
-+						xn = (math::floor(xp)        - xp) / dx;
- 					}
- 					if (dz > 0.0f) {
--						zn = (floor(zp) + 1.0f - zp) / dz;
-+						zn = (math::floor(zp) + 1.0f - zp) / dz;
- 					} else {
--						zn = (floor(zp)        - zp) / dz;
-+						zn = (math::floor(zp)        - zp) / dz;
- 					}
- 
- 					if (xn < zn) {
-@@ -1302,10 +1302,10 @@
- 					}
- 
- 					keepgoing =
--						fabs(xp - start.x) < fabs(to.x - start.x) &&
--						fabs(zp - start.z) < fabs(to.z - start.z);
-+						math::fabs(xp - start.x) < math::fabs(to.x - start.x) &&
-+						math::fabs(zp - start.z) < math::fabs(to.z - start.z);
- 
--					lineTable[yt][xt].push_back( int2(int(floor(xp)), int(floor(zp))) );
-+					lineTable[yt][xt].push_back( int2(int(math::floor(xp)), int(math::floor(zp))) );
- 				}
- 
- 				lineTable[yt][xt].pop_back();
-@@ -1335,7 +1335,7 @@
- 		const MoveDef& md = *(owner->unitDef->moveDef);
- 		const float cmod = movemath->GetPosSpeedMod(md, moveSquareX * 2, moveSquareY * 2);
- 
--		if (fabs(owner->frontdir.x) < fabs(owner->frontdir.z)) {
-+		if (math::fabs(owner->frontdir.x) < math::fabs(owner->frontdir.z)) {
- 			if (newMoveSquareX > moveSquareX) {
- 				const float nmod = movemath->GetPosSpeedMod(md, newMoveSquareX * 2, newMoveSquareY * 2);
- 				if (cmod > 0.01f && nmod <= 0.01f) {
-diff -ru spring_89.0/rts/Sim/MoveTypes/GroundMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/GroundMoveType.cpp
---- spring_89.0/rts/Sim/MoveTypes/GroundMoveType.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/GroundMoveType.cpp	2012-07-13 06:34:43.249393836 +0200
-@@ -1808,20 +1808,20 @@
- 			float xp = start.x;
- 			float zp = start.z;
- 
--			if (floor(start.x) == floor(to.x)) {
-+			if (math::floor(start.x) == math::floor(to.x)) {
- 				if (dz > 0.0f) {
--					for (int a = 1; a <= floor(to.z); ++a)
-+					for (int a = 1; a <= math::floor(to.z); ++a)
- 						lineTable[yt][xt].push_back(int2(0, a));
- 				} else {
--					for (int a = -1; a >= floor(to.z); --a)
-+					for (int a = -1; a >= math::floor(to.z); --a)
- 						lineTable[yt][xt].push_back(int2(0, a));
- 				}
--			} else if (floor(start.z) == floor(to.z)) {
-+			} else if (math::floor(start.z) == math::floor(to.z)) {
- 				if (dx > 0.0f) {
--					for (int a = 1; a <= floor(to.x); ++a)
-+					for (int a = 1; a <= math::floor(to.x); ++a)
- 						lineTable[yt][xt].push_back(int2(a, 0));
- 				} else {
--					for (int a = -1; a >= floor(to.x); --a)
-+					for (int a = -1; a >= math::floor(to.x); --a)
- 						lineTable[yt][xt].push_back(int2(a, 0));
- 				}
- 			} else {
-@@ -1830,14 +1830,14 @@
- 
- 				while (keepgoing) {
- 					if (dx > 0.0f) {
--						xn = (floor(xp) + 1.0f - xp) / dx;
-+						xn = (math::floor(xp) + 1.0f - xp) / dx;
- 					} else {
--						xn = (floor(xp)        - xp) / dx;
-+						xn = (math::floor(xp)        - xp) / dx;
- 					}
- 					if (dz > 0.0f) {
--						zn = (floor(zp) + 1.0f - zp) / dz;
-+						zn = (math::floor(zp) + 1.0f - zp) / dz;
- 					} else {
--						zn = (floor(zp)        - zp) / dz;
-+						zn = (math::floor(zp)        - zp) / dz;
- 					}
- 
- 					if (xn < zn) {
-@@ -1851,7 +1851,7 @@
- 					keepgoing =
- 						math::fabs(xp - start.x) <= math::fabs(to.x - start.x) &&
- 						math::fabs(zp - start.z) <= math::fabs(to.z - start.z);
--					int2 pt(int(floor(xp)), int(floor(zp)));
-+					int2 pt(int(math::floor(xp)), int(math::floor(zp)));
- 
- 					static const int MIN_IDX = -int(LINETABLE_SIZE / 2);
- 					static const int MAX_IDX = -MIN_IDX;
-diff -ru spring_89.0/rts/Sim/MoveTypes/HoverAirMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/HoverAirMoveType.cpp
---- spring_89.0/rts/Sim/MoveTypes/HoverAirMoveType.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/HoverAirMoveType.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -325,7 +325,7 @@
- {
- 	#define NOZERO(x) std::max(x, 0.0001f)
- 
--	const float driftSpeed = fabs(owner->unitDef->dlHoverFactor);
-+	const float driftSpeed = math::fabs(owner->unitDef->dlHoverFactor);
- 	float3 deltaVec = goalPos - owner->pos;
- 	float3 deltaDir = float3(deltaVec.x, 0.0f, deltaVec.z);
- 	float l = NOZERO(deltaDir.Length2D());
-@@ -342,7 +342,7 @@
- 	deltaDir -= owner->speed;
- 	l = deltaDir.SqLength2D();
- 	if (l > (maxSpeed * maxSpeed)) {
--		deltaDir *= maxSpeed / NOZERO(sqrt(l));
-+		deltaDir *= maxSpeed / NOZERO(math::sqrt(l));
- 	}
- 	wantedSpeed = owner->speed + deltaDir;
- 
-diff -ru spring_89.0/rts/Sim/MoveTypes/StrafeAirMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/StrafeAirMoveType.cpp
---- spring_89.0/rts/Sim/MoveTypes/StrafeAirMoveType.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/StrafeAirMoveType.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -412,7 +412,7 @@
- 				}
- 			}
- 
--			if (fabs(owner->rightdir.y) < maxAileron * 3.0f * speedf || owner->updir.y < 0.0f) {
-+			if (math::fabs(owner->rightdir.y) < maxAileron * 3.0f * speedf || owner->updir.y < 0.0f) {
- 				elevator = 1;
- 			}
- 			UpdateAirPhysics(0, aileron, elevator, 1, owner->frontdir);
-@@ -528,13 +528,13 @@
- 	if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && frontdir.y > -0.2f && speedf > 2.0f && gs->randFloat() > 0.996f)
- 		maneuver = 1;
- 
--	if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && fabs(frontdir.y) < 0.2f && gs->randFloat() > 0.996f && gHeightAW + 400 < pos.y) {
-+	if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && math::fabs(frontdir.y) < 0.2f && gs->randFloat() > 0.996f && gHeightAW + 400 < pos.y) {
- 		maneuver = 2;
- 		maneuverSubState = 0;
- 	}
- 
- 	// roll
--	if (speedf > 0.45f && pos.y + owner->speed.y * 60 * fabs(frontdir.y) + std::min(0.0f, float(updir.y)) * 150 > gHeightAW + 60 + fabs(rightdir.y) * 150) {
-+	if (speedf > 0.45f && pos.y + owner->speed.y * 60 * math::fabs(frontdir.y) + std::min(0.0f, float(updir.y)) * 150 > gHeightAW + 60 + math::fabs(rightdir.y) * 150) {
- 		const float goalBankDif = goalDotRight + rightdir.y * 0.2f;
- 		if (goalBankDif > maxAileron * speedf * 4.0f) {
- 			aileron = 1;
-@@ -706,7 +706,7 @@
- 		} else if (goalBankDif < -maxAileron * speedf * 4 && rightdir.y < maxBank) {
- 			aileron = -1;
- 		} else {
--			if (fabs(rightdir.y) < maxBank) {
-+			if (math::fabs(rightdir.y) < maxBank) {
- 				aileron = goalBankDif / (maxAileron * speedf * 4);
- 			} else {
- 				if (rightdir.y < 0.0f && goalBankDif < 0.0f) {
-@@ -762,7 +762,7 @@
- 			} else if (hdif > (maxElevator * speedf * speedf * 20) && frontdir.y < maxPitch) {
- 				elevator = 1;
- 			} else {
--				if (fabs(frontdir.y) < maxPitch)
-+				if (math::fabs(frontdir.y) < maxPitch)
- 					elevator = hdif / (maxElevator * speedf * speedf * 20);
- 			}
- 		}
-diff -ru spring_89.0/rts/Sim/Path/Default/PathEstimator.cpp /home/svenstaro/src/spring/rts/Sim/Path/Default/PathEstimator.cpp
---- spring_89.0/rts/Sim/Path/Default/PathEstimator.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Path/Default/PathEstimator.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -201,7 +201,7 @@
- 
- void CPathEstimator::CalcOffsetsAndPathCosts(int thread) {
- 	//! reset FPU state for synced computations
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 
- 	// NOTE: EstimatePathCosts() [B] is temporally dependent on CalculateBlockOffsets() [A],
- 	// A must be completely finished before B_i can be safely called. This means we cannot
-diff -ru spring_89.0/rts/Sim/Path/QTPFS/PathManager.cpp /home/svenstaro/src/spring/rts/Sim/Path/QTPFS/PathManager.cpp
---- spring_89.0/rts/Sim/Path/QTPFS/PathManager.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Path/QTPFS/PathManager.cpp	2012-07-13 06:34:43.016060490 +0200
-@@ -251,7 +251,7 @@
- 
- 
- void QTPFS::PathManager::InitNodeLayersThreaded(const SRectangle& rect) {
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 
- 	char loadMsg[512] = {'\0'};
- 	const char* fmtString = "[PathManager::%s] using %u threads for %u node-layers (cached? %s)";
-@@ -310,7 +310,7 @@
- 	}
- 	#endif
- 
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- }
- 
- void QTPFS::PathManager::InitNodeLayersThread(
-@@ -360,7 +360,7 @@
- 
- 
- void QTPFS::PathManager::UpdateNodeLayersThreaded(const SRectangle& rect) {
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 
- 	#ifdef QTPFS_OPENMP_ENABLED
- 	{
-@@ -375,7 +375,7 @@
- 	}
- 	#endif
- 
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- }
- 
- void QTPFS::PathManager::UpdateNodeLayersThread(
-@@ -569,7 +569,7 @@
- 	SCOPED_TIMER("PathManager::Update");
- 
- 	#ifdef QTPFS_ENABLE_THREADED_UPDATE
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 
- 	// allow ThreadUpdate to run one iteration
- 	condThreadUpdate->notify_one();
-@@ -579,7 +579,7 @@
- 	// wait for the ThreadUpdate iteration to finish
- 	condThreadUpdated->wait(lock);
- 
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 	#else
- 	ThreadUpdate();
- 	#endif
-diff -ru spring_89.0/rts/Sim/Projectiles/ExplosionGenerator.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/ExplosionGenerator.cpp
---- spring_89.0/rts/Sim/Projectiles/ExplosionGenerator.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/ExplosionGenerator.cpp	2012-07-13 06:34:43.082727161 +0200
-@@ -262,7 +262,7 @@
- 	damage *= gfxMod;
- 	damage = std::max(damage, 0.0f);
- 
--	const float sqrtDmg = sqrt(damage);
-+	const float sqrtDmg = math::sqrt(damage);
- 	const float camLength = camVect.Length();
- 	float moveLength = radius * 0.03f;
- 
-@@ -283,7 +283,7 @@
- 		if (airExplosion || waterExplosion) { smokeDamage *= 0.6f; }
- 
- 		if (smokeDamage > 0.01f) {
--			smokeDamageSQRT = sqrt(smokeDamage);
-+			smokeDamageSQRT = math::sqrt(smokeDamage);
- 			smokeDamageISQRT = 1.0f / (smokeDamageSQRT * 0.35f);
- 		}
- 
-@@ -507,17 +507,17 @@
- 			}
- 			case OP_SAWTOOTH: {
- 				// this translates to modulo except it works with floats
--				val -= (*(float*) code) * floor(val / (*(float*) code));
-+				val -= (*(float*) code) * math::floor(val / (*(float*) code));
- 				code += 4;
- 				break;
- 			}
- 			case OP_DISCRETE: {
--				val = (*(float*) code) * floor(val / (*(float*) code));
-+				val = (*(float*) code) * math::floor(val / (*(float*) code));
- 				code += 4;
- 				break;
- 			}
- 			case OP_SINE: {
--				val = (*(float*) code) * sin(val);
-+				val = (*(float*) code) * math::sin(val);
- 				code += 4;
- 				break;
- 			}
-@@ -538,12 +538,12 @@
- 				break;
- 			}
- 			case OP_POW: {
--				val = pow(val, (*(float*) code));
-+				val = math::pow(val, (*(float*) code));
- 				code += 4;
- 				break;
- 			}
- 			case OP_POWBUFF: {
--				val = pow(val, buffer[(*(int*) code)]);
-+				val = math::pow(val, buffer[(*(int*) code)]);
- 				code += 4;
- 				break;
- 			}
-diff -ru spring_89.0/rts/Sim/Projectiles/PieceProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/PieceProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/PieceProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/PieceProjectile.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -111,7 +111,7 @@
- 	oldSmokeDir.Normalize();
- 	const float3 camDir = (pos - camera->pos).Normalize();
- 
--	if (camera->pos.distance(pos) + (1 - fabs(camDir.dot(oldSmokeDir))) * 3000 < 200) {
-+	if (camera->pos.distance(pos) + (1 - math::fabs(camDir.dot(oldSmokeDir))) * 3000 < 200) {
- 		drawTrail = false;
- 	}
- 
-@@ -334,7 +334,7 @@
- 
- 			if (!drawTrail) {
- 				float3 camDir = (pos - camera->pos).Normalize();
--				if (camera->pos.distance(pos) + (1 - fabs(camDir.dot(dir))) * 3000 > 300) {
-+				if (camera->pos.distance(pos) + (1 - math::fabs(camDir.dot(dir))) * 3000 > 300) {
- 					drawTrail = true;
- 				}
- 			}
-@@ -373,7 +373,7 @@
- 				const float3 dif2 = (oldSmokePos - camera->pos).Normalize();
- 				const float3 dir2 = (dif2.cross(oldSmokeDir)).Normalize();
- 
--				float a1 = ((1 - 0.0f / (Smoke_Time)) * 255) * (0.7f + fabs(dif.dot(dir)));
-+				float a1 = ((1 - 0.0f / (Smoke_Time)) * 255) * (0.7f + math::fabs(dif.dot(dir)));
- 				float alpha = std::min(255.0f, std::max(0.f, a1));
- 				col[0] = (unsigned char) (color * alpha);
- 				col[1] = (unsigned char) (color * alpha);
-@@ -381,7 +381,7 @@
- 				col[3] = (unsigned char) (alpha);
- 
- 				unsigned char col2[4];
--				float a2 = ((1 - float(age2) / (Smoke_Time)) * 255) * (0.7f + fabs(dif2.dot(oldSmokeDir)));
-+				float a2 = ((1 - float(age2) / (Smoke_Time)) * 255) * (0.7f + math::fabs(dif2.dot(oldSmokeDir)));
- 
- 				if (age < 8)
- 					a2 = 0;
-diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp
---- spring_89.0/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -188,7 +188,7 @@
- 		particles[i].size = particleSize + gu->usRandFloat()*particleSizeSpread;
- 		particles[i].pos = pos;
- 
--		particles[i].speed = ((up * emitMul.y) * cos(ay) - ((right * emitMul.x) * cos(az) - (forward * emitMul.z) * sin(az)) * sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread));
-+		particles[i].speed = ((up * emitMul.y) * math::cos(ay) - ((right * emitMul.x) * math::cos(az) - (forward * emitMul.z) * math::sin(az)) * math::sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread));
- 	}
- 
- 	drawRadius = (particleSpeed + particleSpeedSpread) * (particleLife * particleLifeSpread);
-@@ -232,7 +232,7 @@
- 		const float az = gu->usRandFloat() * 2 * PI;
- 		const float ay = (emitRot + emitRotSpread*gu->usRandFloat()) * (PI / 180.0);
- 
--		float3 pspeed = ((up * emitMul.y) * cos(ay) - ((right * emitMul.x) * cos(az) - (forward * emitMul.z) * sin(az)) * sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread));
-+		float3 pspeed = ((up * emitMul.y) * math::cos(ay) - ((right * emitMul.x) * math::cos(az) - (forward * emitMul.z) * math::sin(az)) * math::sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread));
- 
- 		CGenericParticleProjectile* particle = new CGenericParticleProjectile(pos + explosionPos, pspeed, owner);
- 
-diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -124,7 +124,7 @@
- 		if (lastSegment) {
- 			a1 = 0;
- 		}
--		a1 *= 0.7f + fabs(dif1.dot(dir1));
-+		a1 *= 0.7f + math::fabs(dif1.dot(dir1));
- 		float alpha = std::min(255.f, std::max(0.f, a1));
- 		col[0] = (unsigned char) (color * alpha);
- 		col[1] = (unsigned char) (color * alpha);
-@@ -136,7 +136,7 @@
- 		if (firstSegment) {
- 			a2 = 0;
- 		}
--		a2 *= 0.7f + fabs(dif2.dot(dir2));
-+		a2 *= 0.7f + math::fabs(dif2.dot(dir2));
- 		alpha = std::min(255.f, std::max(0.0f, a2));
- 		col2[0] = (unsigned char) (color * alpha);
- 		col2[1] = (unsigned char) (color * alpha);
-@@ -153,7 +153,7 @@
- 
- 			unsigned char col3[4];
- 			float a2 = (1 - (float)(age + 4) / lifeTime) * 255;
--			a2 *= 0.7f + fabs(dif3.dot(middir));
-+			a2 *= 0.7f + math::fabs(dif3.dot(middir));
- 			alpha = std::min(255.0f, std::max(0.0f, a2));
- 			col3[0] = (unsigned char) (color * alpha);
- 			col3[1] = (unsigned char) (color * alpha);
-diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -49,7 +49,7 @@
- 		const float yp = (y + ypart) / 16.0f*PI - PI/2;
- 		for (int x = 0; x < 5; ++x) {
- 			float xp = (x + xpart) / 32.0f*2*PI;
--			vectors[y*5 + x] = float3(sin(xp)*cos(yp), sin(yp), cos(xp)*cos(yp));
-+			vectors[y*5 + x] = float3(math::sin(xp)*math::cos(yp), math::sin(yp), math::cos(xp)*math::cos(yp));
- 		}
- 	}
- 	pos = centerPos+vectors[12] * sphereSize;
-@@ -86,7 +86,7 @@
- 			float alpha =
- 				baseAlpha *
- 				(1.0f - min(1.0f, float(age + globalRendering->timeOffset) / (float) ttl)) *
--				(1.0f - fabs(y + ybase - 8.0f) / 8.0f * 1.0f);
-+				(1.0f - math::fabs(y + ybase - 8.0f) / 8.0f * 1.0f);
- 
- 			col[0] = (unsigned char) (color.x * 255.0f * alpha);
- 			col[1] = (unsigned char) (color.y * 255.0f * alpha);
-@@ -94,7 +94,7 @@
- 			col[3] = ((unsigned char) (40 * alpha)) + 1;
- 			va->AddVertexQTC(centerPos + vectors[y*5 + x]     * interSize, texx, texy, col);
- 			va->AddVertexQTC(centerPos + vectors[y*5 + x + 1] * interSize, texx, texy, col);
--			alpha = baseAlpha * (1.0f - min(1.0f, (float)(age + globalRendering->timeOffset) / (float) ttl)) * (1 - fabs(y + 1 + ybase - 8.0f) / 8.0f*1.0f);
-+			alpha = baseAlpha * (1.0f - min(1.0f, (float)(age + globalRendering->timeOffset) / (float) ttl)) * (1 - math::fabs(y + 1 + ybase - 8.0f) / 8.0f*1.0f);
- 
- 			col[0] = (unsigned char) (color.x * 255.0f * alpha);
- 			col[1] = (unsigned char) (color.y * 255.0f * alpha);
-diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -79,7 +79,7 @@
- 	float interSize = size + sizeExpansion * globalRendering->timeOffset;
- 	float interRot = rotation + rotSpeed * globalRendering->timeOffset;
- 
--	const float3 dir1 = float3(cos(interRot), 0, sin(interRot)) * interSize;
-+	const float3 dir1 = float3(math::cos(interRot), 0, math::sin(interRot)) * interSize;
- 	const float3 dir2 = dir1.cross(UpVector);
- 
- 	#define wt projectileDrawer->waketex
-diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -96,7 +96,7 @@
- 	drawRadius = radius + maxSpeed * 8;
- 
- 	float3 camDir = (pos - camera->pos).ANormalize();
--	if ((camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000) < 200) {
-+	if ((camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000) < 200) {
- 		drawTrail = false;
- 	}
- 
-@@ -229,8 +229,8 @@
- 					// is too close or height difference too large)
- 					const float horDiff = (targPos - pos).Length2D() + 0.01f;
- 					const float verDiff = (targPos.y - pos.y) + 0.01f;
--					const float dirDiff = fabs(targetDir.y - dir.y);
--					const float ratio = fabs(verDiff / horDiff);
-+					const float dirDiff = math::fabs(targetDir.y - dir.y);
-+					const float ratio = math::fabs(verDiff / horDiff);
- 
- 					dir.y -= (dirDiff * ratio);
- 				} else {
-@@ -295,7 +295,7 @@
- 		if (!drawTrail) {
- 			const float3 camDir = (pos - camera->pos).ANormalize();
- 
--			if ((camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000) > 300) {
-+			if ((camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000) > 300) {
- 				drawTrail = true;
- 			}
- 		}
-@@ -343,7 +343,7 @@
- 			dir2.ANormalize();
- 
- 			float a1 = (1.0f / (SMOKE_TIME)) * 255;
--			a1 *= 0.7f + fabs(dif.dot(dir));
-+			a1 *= 0.7f + math::fabs(dif.dot(dir));
- 			const float alpha1 = std::min(255.0f, std::max(0.0f, a1));
- 			col[0] = (unsigned char) (color * alpha1);
- 			col[1] = (unsigned char) (color * alpha1);
-@@ -357,7 +357,7 @@
- 				a2 = 0;
- 			}
- 
--			a2 *= 0.7f + fabs(dif2.dot(oldDir));
-+			a2 *= 0.7f + math::fabs(dif2.dot(oldDir));
- 			const float alpha2 = std::min(255.0f, std::max(0.0f, a2));
- 			col2[0] = (unsigned char) (color * alpha2);
- 			col2[1] = (unsigned char) (color * alpha2);
-diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -90,13 +90,13 @@
- 		}
- 	}
- 
--	maxGoodDif = cos(tracking * 0.6f);
-+	maxGoodDif = math::cos(tracking * 0.6f);
- 	curSpeed = speed.Length();
- 	dir = speed / curSpeed;
- 	oldSmokeDir = dir;
- 
- 	const float3 camDir = (pos - camera->pos).ANormalize();
--	const float camDist = (camera->pos.distance(pos) * 0.2f) + ((1.0f - fabs(camDir.dot(dir))) * 3000);
-+	const float camDist = (camera->pos.distance(pos) * 0.2f) + ((1.0f - math::fabs(camDir.dot(dir))) * 3000);
- 
- 	drawTrail = (camDist >= 200.0f);
- 	drawRadius = maxSpeed * 8.0f;
-@@ -304,7 +304,7 @@
- 
- 		if (!drawTrail) {
- 			const float3 camDir = (pos - camera->pos).ANormalize();
--			const float camDist = (camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000);
-+			const float camDist = (camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000);
- 
- 			drawTrail = (camDist > 300.0f);
- 		}
-@@ -335,11 +335,11 @@
- 
- 			const float a1 =
- 				((1.0f - (0.0f / SMOKE_TIME)) * 255) *
--				(0.7f + fabs(dif1.dot(dir)));
-+				(0.7f + math::fabs(dif1.dot(dir)));
- 			const float a2 =
- 				(age < 8)? 0.0f:
- 				((1.0f - (age2 / SMOKE_TIME)) * 255) *
--				(0.7f + fabs(dif2.dot(oldSmokeDir)));
-+				(0.7f + math::fabs(dif2.dot(oldSmokeDir)));
- 			const int alpha1 = std::min(255, (int) std::max(0.0f, a1));
- 			const int alpha2 = std::min(255, (int) std::max(0.0f, a2));
- 
-diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp	2012-07-13 06:34:43.249393836 +0200
-@@ -252,8 +252,8 @@
- 				const float dot = speed.dot(normal);
- 
- 				pos -= speed;
--				speed -= (speed + normal * fabs(dot)) * (1 - weaponDef->bounceSlip);
--				speed += (normal * (fabs(dot))) * (1 + weaponDef->bounceRebound);
-+				speed -= (speed + normal * math::fabs(dot)) * (1 - weaponDef->bounceSlip);
-+				speed += (normal * (math::fabs(dot))) * (1 + weaponDef->bounceRebound);
- 				pos += speed;
- 
- 				if (weaponDef->bounceExplosionGenerator) {
-diff -ru spring_89.0/rts/Sim/Units/CommandAI/MobileCAI.cpp /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/MobileCAI.cpp
---- spring_89.0/rts/Sim/Units/CommandAI/MobileCAI.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/MobileCAI.cpp	2012-07-13 06:34:43.079393827 +0200
-@@ -770,7 +770,7 @@
- 			b2 = w->TryTargetRotate(orderTarget, c.GetID() == CMD_MANUALFIRE);
- 			b3 = Square(w->range - (w->relWeaponPos).Length()) > (orderTarget->pos.SqDistance(owner->pos));
- 			b4 = w->TryTargetHeading(GetHeadingFromVector(-diff.x, -diff.z), orderTarget->pos, orderTarget != NULL, orderTarget);
--			edgeFactor = fabs(w->targetBorder);
-+			edgeFactor = math::fabs(w->targetBorder);
- 		}
- 
- 		const float diffLength2D = diff.Length2D();
-diff -ru spring_89.0/rts/Sim/Units/CommandAI/TransportCAI.cpp /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/TransportCAI.cpp
---- spring_89.0/rts/Sim/Units/CommandAI/TransportCAI.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/TransportCAI.cpp	2012-07-13 06:34:43.079393827 +0200
-@@ -349,7 +349,7 @@
- 			if (rx <= spread)
- 				continue;
- 
--			rx = sqrt(rx);
-+			rx = math::sqrt(rx);
- 	
- 			const float minx = std::max(                               spread,  center.x - rx);
- 			const float maxx = std::min(float(gs->mapx * SQUARE_SIZE - spread), center.x + rx);
-@@ -676,7 +676,7 @@
- 				am->ForceHeading(unloadHeading);
- 				am->maxDrift = 1;
- 				if ((owner->pos.SqDistance(pos) < 64) &&
--						(owner->updir.dot(UpVector) > 0.99f) && fabs(owner->heading - unloadHeading) < AIRTRANSPORT_DOCKING_ANGLE) {
-+						(owner->updir.dot(UpVector) > 0.99f) && math::fabs(owner->heading - unloadHeading) < AIRTRANSPORT_DOCKING_ANGLE) {
- 					if (!SpotIsClearIgnoreSelf(pos, unit)) {
- 						// chosen spot is no longer clear to land, choose a new one
- 						// if a new spot cannot be found, don't unload at all
-diff -ru spring_89.0/rts/Sim/Units/UnitDef.cpp /home/svenstaro/src/spring/rts/Sim/Units/UnitDef.cpp
---- spring_89.0/rts/Sim/Units/UnitDef.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Units/UnitDef.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -399,9 +399,9 @@
- 	selfDCountdown = udTable.GetInt("selfDestructCountdown", 5);
- 
- 	speed  = udTable.GetFloat("maxVelocity", 0.0f) * GAME_SPEED;
--	speed  = fabs(speed);
-+	speed  = math::fabs(speed);
- 	rSpeed = udTable.GetFloat("maxReverseVelocity", 0.0f) * GAME_SPEED;
--	rSpeed = fabs(rSpeed);
-+	rSpeed = math::fabs(rSpeed);
- 
- 	fireState = udTable.GetInt("fireState", canFireControl? FIRESTATE_NONE: FIRESTATE_FIREATWILL);
- 	fireState = std::min(fireState, int(FIRESTATE_FIREATWILL));
-@@ -462,8 +462,8 @@
- 	useSmoothMesh  = udTable.GetBool("useSmoothMesh", true);
- 
- 
--	maxAcc = fabs(udTable.GetFloat("acceleration", 0.5f)); // no negative values
--	maxDec = fabs(udTable.GetFloat("brakeRate", 3.0f * maxAcc)) * (canfly? 0.1f: 1.0f); // no negative values
-+	maxAcc = math::fabs(udTable.GetFloat("acceleration", 0.5f)); // no negative values
-+	maxDec = math::fabs(udTable.GetFloat("brakeRate", 3.0f * maxAcc)) * (canfly? 0.1f: 1.0f); // no negative values
- 
- 	turnRate    = udTable.GetFloat("turnRate", 0.0f);
- 	turnInPlace = udTable.GetBool("turnInPlace", true);
-@@ -709,7 +709,7 @@
- 	seismicSignature = udTable.GetFloat("seismicSignature", -1.0f);
- 	if (seismicSignature == -1.0f) {
- 		if (!canFloat && !canHover && !canfly) {
--			seismicSignature = sqrt(mass / 100.0f);
-+			seismicSignature = math::sqrt(mass / 100.0f);
- 		} else {
- 			seismicSignature = 0.0f;
- 		}
-diff -ru spring_89.0/rts/Sim/Units/UnitHandler.cpp /home/svenstaro/src/spring/rts/Sim/Units/UnitHandler.cpp
---- spring_89.0/rts/Sim/Units/UnitHandler.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Units/UnitHandler.cpp	2012-07-13 06:34:43.076060493 +0200
-@@ -419,8 +419,8 @@
- 		// look for a nearby geothermal feature if we need one
- 		for (std::vector<CFeature*>::const_iterator fi = features.begin(); fi != features.end(); ++fi) {
- 			if ((*fi)->def->geoThermal
--				&& fabs((*fi)->pos.x - pos.x) < (xsize * 4 - 4)
--				&& fabs((*fi)->pos.z - pos.z) < (zsize * 4 - 4)) {
-+				&& math::fabs((*fi)->pos.x - pos.x) < (xsize * 4 - 4)
-+				&& math::fabs((*fi)->pos.z - pos.z) < (zsize * 4 - 4)) {
- 				canBuild = BUILDSQUARE_OPEN;
- 				break;
- 			}
-@@ -589,7 +589,7 @@
- 				BuildInfo bi(cmd);
- 				tempF1 = pos + dir * ((bi.pos.y - pos.y) / dir.y) - bi.pos;
- 
--				if (bi.def && (bi.GetXSize() / 2) * SQUARE_SIZE > fabs(tempF1.x) && (bi.GetZSize() / 2) * SQUARE_SIZE > fabs(tempF1.z)) {
-+				if (bi.def && (bi.GetXSize() / 2) * SQUARE_SIZE > math::fabs(tempF1.x) && (bi.GetZSize() / 2) * SQUARE_SIZE > math::fabs(tempF1.z)) {
- 					return cmd;
- 				}
- 			}
-diff -ru spring_89.0/rts/Sim/Weapons/BombDropper.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/BombDropper.cpp
---- spring_89.0/rts/Sim/Weapons/BombDropper.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Weapons/BombDropper.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -62,7 +62,7 @@
- 			const float s = -owner->speed.y;
- 			const float sq = (s - 2*d) / -((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity));
- 			if (sq > 0) {
--				predict = s / ((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity)) + sqrt(sq);
-+				predict = s / ((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity)) + math::sqrt(sq);
- 			} else {
- 				predict = 0;
- 			}
-diff -ru spring_89.0/rts/Sim/Weapons/Cannon.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/Cannon.cpp
---- spring_89.0/rts/Sim/Weapons/Cannon.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Weapons/Cannon.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -169,7 +169,7 @@
- 
- 	int ttl = 0;
- 	float sqSpeed2D = dir.SqLength2D() * projectileSpeed * projectileSpeed;
--	int predict = (int)ceil((sqSpeed2D == 0) ? (-2 * projectileSpeed * dir.y / gravity)
-+	int predict = (int)math::ceil((sqSpeed2D == 0) ? (-2 * projectileSpeed * dir.y / gravity)
- 			: math::sqrt(diff.SqLength2D() / sqSpeed2D));
- 	if(weaponDef->flighttime > 0) {
- 		ttl = weaponDef->flighttime;
-@@ -216,9 +216,9 @@
- 	// try to cache results, sacrifice some (not much too much even for a pewee) accuracy
- 	// it saves a dozen or two expensive calculations per second when 5 guardians
- 	// are shooting at several slow- and fast-moving targets
--	if (fabs(diff.x - lastDiff.x) < (SQUARE_SIZE / 4.0f) &&
--		fabs(diff.y - lastDiff.y) < (SQUARE_SIZE / 4.0f) &&
--		fabs(diff.z - lastDiff.z) < (SQUARE_SIZE / 4.0f)) {
-+	if (math::fabs(diff.x - lastDiff.x) < (SQUARE_SIZE / 4.0f) &&
-+		math::fabs(diff.y - lastDiff.y) < (SQUARE_SIZE / 4.0f) &&
-+		math::fabs(diff.z - lastDiff.z) < (SQUARE_SIZE / 4.0f)) {
- 		return lastDir;
- 	}
- 
-@@ -237,7 +237,7 @@
- 		// FIXME: temporary safeguards against FP overflow
- 		// (introduced by extreme off-map unit positions; the term
- 		// DFsq * Dsq * ... * dy should never even approach 1e38)
--		if (Dsq < 1e12f && fabs(dy) < 1e6f) {
-+		if (Dsq < 1e12f && math::fabs(dy) < 1e6f) {
- 			const float root1 = v*v*v*v + 2.0f*v*v*g*dy - g*g*DFsq;
- 
- 			if (root1 >= 0.0f) {
-diff -ru spring_89.0/rts/Sim/Weapons/WeaponDefHandler.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/WeaponDefHandler.cpp
---- spring_89.0/rts/Sim/Weapons/WeaponDefHandler.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Weapons/WeaponDefHandler.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -126,9 +126,9 @@
- 
- 	// should really be tan but TA seem to cap it somehow
- 	// should also be 7fff or ffff theoretically but neither seems good
--	wd.accuracy       = sin((accuracy)       * PI / 0xafff);
--	wd.sprayAngle     = sin((sprayAngle)     * PI / 0xafff);
--	wd.movingAccuracy = sin((movingAccuracy) * PI / 0xafff);
-+	wd.accuracy       = math::sin((accuracy)       * PI / 0xafff);
-+	wd.sprayAngle     = math::sin((sprayAngle)     * PI / 0xafff);
-+	wd.movingAccuracy = math::sin((movingAccuracy) * PI / 0xafff);
- 
- 	wd.targetMoveError = wdTable.GetFloat("targetMoveError", 0.0f);
- 	wd.leadLimit = wdTable.GetFloat("leadLimit", -1.0f);
-@@ -375,7 +375,7 @@
- 
- 
- 	const float gd = max(30.0f, wd.damages[0] / 20.0f);
--	const float defExpSpeed = (8.0f + (gd * 2.5f)) / (9.0f + (sqrt(gd) * 0.7f)) * 0.5f;
-+	const float defExpSpeed = (8.0f + (gd * 2.5f)) / (9.0f + (math::sqrt(gd) * 0.7f)) * 0.5f;
- 	wd.explosionSpeed = wdTable.GetFloat("explosionSpeed", defExpSpeed);
- 
- 	// Dynamic Damage
-@@ -461,7 +461,7 @@
- 			wd.hitSound.setVolume(0, 5.0f);
- 			wd.hitSound.setVolume(1, 5.0f);
- 		} else {
--			float fireSoundVolume = sqrt(wd.damages[0] * 0.5f);
-+			float fireSoundVolume = math::sqrt(wd.damages[0] * 0.5f);
- 
- 			if (wd.type == "LaserCannon") {
- 				fireSoundVolume *= 0.5f;
-@@ -472,7 +472,7 @@
- 			if ((fireSoundVolume > 100.0f) &&
- 			    ((wd.type == "MissileLauncher") ||
- 			     (wd.type == "StarburstLauncher"))) {
--				fireSoundVolume = 10.0f * sqrt(hitSoundVolume);
-+				fireSoundVolume = 10.0f * math::sqrt(hitSoundVolume);
- 			}
- 
- 			if (wd.damageAreaOfEffect > 8.0f) {
-@@ -564,7 +564,7 @@
- 
- 	if (inverted == true) {
- 		for(int i = 0; i < damageArrayHandler->GetNumTypes(); ++i) {
--			dynDamages[i] = damages[i] - (1 - pow(1 / range * travDist, exp)) * damages[i];
-+			dynDamages[i] = damages[i] - (1 - math::pow(1 / range * travDist, exp)) * damages[i];
- 
- 			if (damageMin > 0)
- 				dynDamages[i] = max(damages[i] * ddmod, dynDamages[i]);
-@@ -577,7 +577,7 @@
- 	}
- 	else {
- 		for(int i = 0; i < damageArrayHandler->GetNumTypes(); ++i) {
--			dynDamages[i] = (1 - pow(1 / range * travDist, exp)) * damages[i];
-+			dynDamages[i] = (1 - math::pow(1 / range * travDist, exp)) * damages[i];
- 
- 			if (damageMin > 0)
- 				dynDamages[i] = max(damages[i] * ddmod, dynDamages[i]);
-diff -ru spring_89.0/rts/System/Matrix44f.cpp /home/svenstaro/src/spring/rts/System/Matrix44f.cpp
---- spring_89.0/rts/System/Matrix44f.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/Matrix44f.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -72,8 +72,8 @@
- 
- 	*this=Mul(rm);
- */
--	const float sr = sin(rad);
--	const float cr = cos(rad);
-+	const float sr = math::sin(rad);
-+	const float cr = math::cos(rad);
- 
- 	float a=m[4];
- 	m[4] = cr*a - sr*m[8];
-@@ -107,8 +107,8 @@
- 
- 	*this = Mul(rm);
- */
--	const float sr = sin(rad);
--	const float cr = cos(rad);
-+	const float sr = math::sin(rad);
-+	const float cr = math::cos(rad);
- 
- 	float a=m[0];
- 	m[0] =  cr*a + sr*m[8];
-@@ -142,8 +142,8 @@
- 
- 	*this = Mul(rm);
- */
--	const float sr = sin(rad);
--	const float cr = cos(rad);
-+	const float sr = math::sin(rad);
-+	const float cr = math::cos(rad);
- 
- 	float a=m[0];
- 	m[0] = cr*a - sr*m[4];
-@@ -165,8 +165,8 @@
- 
- void CMatrix44f::Rotate(float rad, const float3& axis)
- {
--	const float sr = sin(rad);
--	const float cr = cos(rad);
-+	const float sr = math::sin(rad);
-+	const float cr = math::cos(rad);
- 
- 	for(int a=0;a<3;++a){
- 		float3 v(m[a*4],m[a*4+1],m[a*4+2]);
-diff -ru spring_89.0/rts/System/myMath.cpp /home/svenstaro/src/spring/rts/System/myMath.cpp
---- spring_89.0/rts/System/myMath.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/myMath.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -44,7 +44,7 @@
- 	}
- 
- 	// Set single precision floating point math.
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #if defined(__SUPPORT_SNAN__) && !defined(USE_GML)
- 	streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW));
- #endif
-@@ -58,7 +58,7 @@
- 	#pragma omp parallel
- 	{
- 		//good_fpu_control_registers("OMP-Init");
--		streflop_init<streflop::Simple>();
-+		streflop::streflop_init<streflop::Simple>();
- 	#if defined(__SUPPORT_SNAN__) && !defined(USE_GML)
- 		streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW));
- 	#endif
-@@ -77,8 +77,8 @@
- 	for (int a = 0; a < NUM_HEADINGS; ++a) {
- 		float ang = (a - (NUM_HEADINGS / 2)) * 2 * PI / NUM_HEADINGS;
- 		float2 v;
--			v.x = sin(ang);
--			v.y = cos(ang);
-+			v.x = math::sin(ang);
-+			v.y = math::cos(ang);
- 		headingToVectorTable[a] = v;
- 	}
- 
-@@ -107,9 +107,9 @@
- 	float3 ret;
- 	float h = heading * TAANG2RAD;
- 	float p = pitch * TAANG2RAD;
--	ret.x = sin(h) * cos(p);
--	ret.y = sin(p);
--	ret.z = cos(h) * cos(p);
-+	ret.x = math::sin(h) * math::cos(p);
-+	ret.y = math::sin(p);
-+	ret.z = math::cos(h) * math::cos(p);
- 	return ret;
- }
- 
-@@ -138,7 +138,7 @@
- 	float3 dir(l2-l1);
- 	float3 pdir(p-l1);
- 	float length = dir.Length();
--	if (fabs(length) < 1e-4f)
-+	if (math::fabs(length) < 1e-4f)
- 		return l1;
- 	float c = dir.dot(pdir) / length;
- 	if (c < 0) c = 0;
-diff -ru spring_89.0/rts/System/Net/Socket.cpp /home/svenstaro/src/spring/rts/System/Net/Socket.cpp
---- spring_89.0/rts/System/Net/Socket.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/Net/Socket.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -73,7 +73,7 @@
- 	//! (date of note: 08/05/10)
- 	//! something in from_string() is invalidating the FPU flags
- 	//! tested on win2k and linux (not happening there)
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- 
- 	return addr;
-@@ -94,7 +94,7 @@
- #ifdef STREFLOP_H
- 	//! (date of note: 08/22/10)
- 	//! something in resolve() is invalidating the FPU flags
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- 
- 	return resolveIt;
-diff -ru spring_89.0/rts/System/OffscreenGLContext.cpp /home/svenstaro/src/spring/rts/System/OffscreenGLContext.cpp
---- spring_89.0/rts/System/OffscreenGLContext.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/OffscreenGLContext.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -259,7 +259,7 @@
- #ifdef STREFLOP_H
- 	// init streflop to make it available for synced computations, too
- 	// redundant? threads copy the FPU state of their parent.
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- 
- 	try {
-diff -ru spring_89.0/rts/System/Sound/SoundSource.h /home/svenstaro/src/spring/rts/System/Sound/SoundSource.h
---- spring_89.0/rts/System/Sound/SoundSource.h	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/Sound/SoundSource.h	2012-07-13 06:34:42.836060480 +0200
-@@ -7,7 +7,6 @@
- 
- #include <al.h>
- #include <boost/noncopyable.hpp>
--#include <boost/thread/recursive_mutex.hpp>
- 
- class IAudioChannel;
- class float3;
-diff -ru spring_89.0/rts/System/SpringApp.cpp /home/svenstaro/src/spring/rts/System/SpringApp.cpp
---- spring_89.0/rts/System/SpringApp.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/SpringApp.cpp	2012-07-13 06:34:42.982727155 +0200
-@@ -385,7 +385,7 @@
- #ifdef STREFLOP_H
- 	//! Something in SDL_SetVideoMode (OpenGL drivers?) messes with the FPU control word.
- 	//! Set single precision floating point math.
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- 
- 	//! setup GL smoothing
-@@ -1009,7 +1009,7 @@
- 			SDL_Event event;
- 
- 			while (SDL_PollEvent(&event)) {
--				streflop_init<streflop::Simple>(); // SDL_PollEvent may modify FPU flags
-+				streflop::streflop_init<streflop::Simple>(); // SDL_PollEvent may modify FPU flags
- 				input.PushEvent(event);
- 			}
- 		}
-diff -ru spring_89.0/rts/System/Sync/FPUCheck.cpp /home/svenstaro/src/spring/rts/System/Sync/FPUCheck.cpp
---- spring_89.0/rts/System/Sync/FPUCheck.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/Sync/FPUCheck.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -85,7 +85,7 @@
- 		LOG_L(L_WARNING, "[%s] Sync warning: (env.x87_mode) FPUCW 0x%04X instead of 0x%04X or 0x%04X (\"%s\")", __FUNCTION__, fenv.x87_mode, x87_a, x87_b, text);
- 
- 		// Set single precision floating point math.
--		streflop_init<streflop::Simple>();
-+		streflop::streflop_init<streflop::Simple>();
- 	#if defined(__SUPPORT_SNAN__) && !defined(USE_GML)
- 		streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW));
- 	#endif
diff --git a/community/spring/gcc48.patch b/community/spring/gcc48.patch
deleted file mode 100644
index ea69a42c4..000000000
--- a/community/spring/gcc48.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/rts/System/Sound/EFX.cpp b/rts/System/Sound/EFX.cpp
-index 08fe9f4..3b197f0 100644
---- a/rts/System/Sound/EFX.cpp
-+++ b/rts/System/Sound/EFX.cpp
-@@ -83,7 +83,7 @@ CEFX::CEFX(ALCdevice* device)
- 		ALuint alFx;
- 		alGenEffects(1, &alFx);
- 		if (alGetError() == AL_NO_ERROR) {
--			for(size_t i = 0; i < sizeof(effects); i++) {
-+			for(size_t i = 0; i < sizeof(effects)/sizeof(effects[0]); i++) {
- 				const ALuint fx = effects[i];
- 				alEffecti(alFx, AL_EFFECT_TYPE, fx);
- 				effectsSupported[fx] = (alGetError() == AL_NO_ERROR);
-@@ -103,7 +103,7 @@ CEFX::CEFX(ALCdevice* device)
- 		ALuint alFilter;
- 		alGenFilters(1, &alFilter);
- 		if (alGetError() == AL_NO_ERROR) {
--			for(size_t i = 0; i < sizeof(filters); i++) {
-+			for(size_t i = 0; i < sizeof(filters)/sizeof(filters[0]); i++) {
- 				const ALuint filter = filters[i];
- 				alFilteri(alFilter, AL_FILTER_TYPE, filter);
- 				filtersSupported[filter] = (alGetError() == AL_NO_ERROR);
diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD
index e10ab5811..63b6091ed 100644
--- a/community/springlobby/PKGBUILD
+++ b/community/springlobby/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 102280 2013-12-07 10:37:12Z bpiotrowski $
+# $Id: PKGBUILD 104963 2014-01-28 18:12:41Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: DuGi <dugi@irc.pl>
 
 pkgname=springlobby
 pkgver=0.180
-pkgrel=1
+pkgrel=3
 pkgdesc="A free cross-platform lobby client for the Spring RTS project."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://springlobby.info/"
 license=('GPL2')
-depends=('hicolor-icon-theme' 'wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs' 'alure')
+depends=('hicolor-icon-theme' 'wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs'
+         'alure' 'libsm')
 optdepends=('sdl' 'sdl_sound' 'sdl_mixer') 
 makedepends=('boost' 'asio' 'cmake')
 install=springlobby.install
diff --git a/community/sqlite2/PKGBUILD b/community/sqlite2/PKGBUILD
index 95e66e8b8..e6ee41f75 100644
--- a/community/sqlite2/PKGBUILD
+++ b/community/sqlite2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99991 2013-10-31 02:52:44Z allan $
+# $Id: PKGBUILD 103328 2014-01-03 10:53:51Z bpiotrowski $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd <jvinet@zeroflux.org>
 
 pkgname=sqlite2
 pkgver=2.8.17
-pkgrel=5
+pkgrel=6
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.sqlite.org/"
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
index e06b654cc..2e76912a3 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 102758 2013-12-19 10:29:53Z spupykin $
+# $Id: PKGBUILD 105249 2014-02-03 11:29:24Z 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.4.1
-pkgrel=2
+pkgver=3.4.3
+pkgrel=1
 pkgdesc='Full-featured Web proxy cache server'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.squid-cache.org'
@@ -21,7 +21,7 @@ source=("http://www.squid-cache.org/Versions/v3/3.4/$pkgname-$pkgver.tar.bz2"
         'squid.pam'
         'squid.cron'
         'squid.service')
-md5sums=('859cf167499d8a5430070dbde78c8eea'
+md5sums=('4c4c53d2260afd6e7e2dd7c445c92920'
          '270977cdd9b47ef44c0c427ab9034777'
          'a71425c4951f2e5b640d19e6a5048531'
          'ceeb57c69ebb165676219222f109a24e')
diff --git a/community/srm/PKGBUILD b/community/srm/PKGBUILD
index a610fc767..1c08c8c9b 100644
--- a/community/srm/PKGBUILD
+++ b/community/srm/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 102189 2013-12-06 12:44:16Z giovanni $
+# $Id: PKGBUILD 104066 2014-01-15 08:27:26Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=srm
-pkgver=1.2.11
-pkgrel=2
+pkgver=1.2.12
+pkgrel=1
 pkgdesc="A secure replacement for rm(1) that overwrites data before unlinking"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://srm.sourceforge.net/"
 license=('custom')
 depends=('glibc')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('ee8269be18de6bbd3f74252d6e3039fe')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('395c42753e9d98d6f815ac28a42ba87a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/sshfs/PKGBUILD b/community/sshfs/PKGBUILD
index 05b1a8546..7ef1a502b 100644
--- a/community/sshfs/PKGBUILD
+++ b/community/sshfs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102191 2013-12-06 12:45:33Z giovanni $
+# $Id: PKGBUILD 104110 2014-01-15 23:34:26Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=sshfs
-pkgver=2.4
-pkgrel=1.1
+pkgver=2.5
+pkgrel=1
 pkgdesc="FUSE client based on the SSH File Transfer Protocol"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fuse.sourceforge.net/sshfs.html"
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('fuse' 'glib2' 'openssh')
 makedepends=('pkg-config')
 source=("http://downloads.sourceforge.net/sourceforge/fuse/${pkgname}-fuse-${pkgver}.tar.gz")
-md5sums=('3c7c3647c52ce84d09486f1da3a3ce24')
+md5sums=('17494910db8383a366b1301e5f5148a9')
 
 build() {
   cd "${srcdir}/${pkgname}-fuse-${pkgver}"
diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD
index d93e934d5..d2a1be7d4 100644
--- a/community/sslh/PKGBUILD
+++ b/community/sslh/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94597 2013-07-27 17:54:41Z seblu $
+# $Id: PKGBUILD 105863 2014-02-16 17:09:52Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com>
 # Contributor: Jason Rodriguez <jason-aur@catloaf.net>
 
 pkgname=sslh
-pkgver=1.15
+pkgver=1.16
 pkgrel=1
 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,21 +13,21 @@ license=('GPL2')
 depends=('libconfig')
 backup=('etc/sslh.conf')
 install=$pkgname.install
-source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz"
+source=("http://www.rutschle.net/tech/$pkgname-v$pkgver.tar.gz"
        'sslh-select.service'
        'sslh-fork.service')
-md5sums=('cdb3e4499ff00438495f46ef7204ec58'
+md5sums=('1e85b84eb82a96b81de9b1e637a3e795'
          '67e8c9511508673254afa3e1ca61ff89'
          'a4402244a4d819beb3c6dc7ff031084e')
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname-v$pkgver
   make VERSION=\"v$pkgver\"
 }
 
 package() {
   # manually install to have both ssl-fork and ssl-select
-  cd $pkgname-$pkgver
+  cd $pkgname-v$pkgver
   install -Dm 0755 sslh-fork "$pkgdir/usr/bin/sslh-fork"
   install -Dm 0755 sslh-select "$pkgdir/usr/bin/sslh-select"
   ln -s sslh-fork "$pkgdir/usr/bin/sslh"
diff --git a/community/stella/PKGBUILD b/community/stella/PKGBUILD
index ea68ee2ce..2e0be090d 100644
--- a/community/stella/PKGBUILD
+++ b/community/stella/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
 
 pkgname=stella
-pkgver=3.9.2
+pkgver=3.9.3
 pkgrel=1
 pkgdesc="A multi-platform Atari 2600 VCS emulator"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('sdl' 'hicolor-icon-theme' 'gtk-update-icon-cache')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver-src.tar.gz)
-md5sums=('49d2accab82601ad0ad04536e8400266')
+md5sums=('007d45faa46341763da31f87d55df2d8')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD
index 3b994e1a6..55c65cd38 100644
--- a/community/stunnel/PKGBUILD
+++ b/community/stunnel/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99994 2013-10-31 02:53:44Z allan $
+# $Id: PKGBUILD 103727 2014-01-10 21:25:08Z bgyorgy $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,7 +6,7 @@
 
 pkgname=stunnel
 pkgver=4.56
-pkgrel=3
+pkgrel=4
 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.stunnel.org"
@@ -42,17 +42,10 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 
-  for i in ca.pl importCA.sh; do
-    install -Dm755 "tools/$i" "$pkgdir/usr/share/stunnel/$i"
-  done
-
-  install -Dm644 tools/stunnel.cnf "$pkgdir/etc/stunnel/stunnel.cnf"
+  install -Dm644 tools/stunnel.cnf "$pkgdir/etc/stunnel/stunnel-openssl.cnf-sample"
+  install -Dm644 tools/stunnel.service "$pkgdir/usr/lib/systemd/system/stunnel.service"
   install -Dm644 "$srcdir/stunnel.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/stunnel.conf"
 
-  # move systemd service into place
-  install -dm755 "$pkgdir/usr/lib/systemd/system"
-  mv "tools/stunnel.service" "$pkgdir/usr/lib/systemd/system/"
-
   sed -e "s:/usr/var/lib/stunnel/:/var/run/stunnel:g" \
       -e "s:/usr/etc/stunnel/:/etc/stunnel/:g" \
       -e "s:no\(body\|group\):stunnel:g" \
diff --git a/community/subsurface/PKGBUILD b/community/subsurface/PKGBUILD
new file mode 100644
index 000000000..f0d7087db
--- /dev/null
+++ b/community/subsurface/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 105595 2014-02-11 07:54:24Z bisson $
+# Contributor: Francois Boulogne <fboulogne at april dot org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=subsurface
+_pkgname=Subsurface
+pkgver=4.0.2
+pkgrel=1
+pkgdesc='Divelog program'
+url='http://subsurface.hohndel.org/'
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('qt4' 'kdeedu-marble' 'libzip' 'libxml2' 'libxslt' 'sqlite' 'libdivecomputer' 'libusbx')
+source=("http://subsurface.hohndel.org/downloads/${_pkgname}-${pkgver}.tgz")
+sha1sums=('14370c2e91f82a6df32d44e2a0a4b20908c74465')
+
+build() {
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	qmake-qt4 -config release
+	make
+}
+
+package() {
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	make INSTALL_ROOT="${pkgdir}" install
+} 
diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD
deleted file mode 100644
index cc9e5f317..000000000
--- a/community/subtle/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 86887 2013-03-23 23:10:50Z td123 $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: unexist <unexist@dorfelite.net>
-# Contributor: Abakus <java5@arcor.de>
-# Contributor: TDY <tdy@gmx.com>
-# Contributor: Xilon <xilonmu@gmail.com>
-
-pkgname=subtle
-pkgver=0.11.3224
-pkgrel=2
-pkgdesc='Grid-based manual tiling window manager'
-arch=('x86_64' 'i686' 'mips64el')
-url='http://subtle.subforge.org/'
-license=('GPL')
-depends=('ruby' 'libxft' 'libxpm' 'libxrandr' 'libxft' 'libxpm' 'libxinerama'
-         'libxtst')
-makedepends=('pkg-config' 'libxinerama' 'libxrandr' 'libxft' 'libxpm')
-backup=('etc/xdg/subtle/subtle.rb')
-install=subtle.install
-source=("http://subforge.org/attachments/download/81/$pkgname-$pkgver-xi.tbz2")
-sha256sums=('a22ee94a70c1105a018e1c0a754597b4e3a87d1b915301a0b22888920fa0f8a2')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver-xi"
-
-  # Disable the check for Ruby 1.9
-  sed -i 's/ 1 != / 7 == /' Rakefile
-  sed -i 's/ 9 != / 7 == /' Rakefile
-  # Use vendor_ruby instead of site_ruby
-  sed -e \
-    's/RbConfig::CONFIG\["sitelibdir"\]/RbConfig::CONFIG\["vendorlibdir"\]/' \
-    -i Rakefile
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver-xi"
-
-  rake destdir=$pkgdir install  --trace
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/subtle/subtle.install b/community/subtle/subtle.install
deleted file mode 100644
index cdb0d9469..000000000
--- a/community/subtle/subtle.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_upgrade() {
-  echo "In order to use sur you can install ruby-curb and ruby-minitar."
-  echo "If you have subtle on your system remember to upgrade with:"
-  echo "  sur upgrade"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/synce-core/PKGBUILD b/community/synce-core/PKGBUILD
index 4ed45b1af..55dd9c6eb 100644
--- a/community/synce-core/PKGBUILD
+++ b/community/synce-core/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 100285 2013-11-02 08:49:32Z spupykin $
+# $Id: PKGBUILD 103618 2014-01-08 11:37:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan Was <janek.jan@gmail.com>
 
 pkgname=synce-core
 pkgver=0.17
-pkgrel=2
+pkgrel=3
 pkgdesc="provide a means of communication with a Windows CE device - libraries"
 arch=('i686' 'x86_64')
 url="http://synce.sourceforge.net/"
 license=('GPL')
 depends=('dbus-glib' 'udev' 'python2')
-makedepends=('dhclient')
+makedepends=('dhclient' 'pyrex')
 provides=('synce-libsynce' 'synce-librapi')
 replaces=('synce-libsynce' 'synce-librapi')
 conflicts=('synce-libsynce' 'synce-librapi')
diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD
index fdf5e0de9..0ccabda99 100644
--- a/community/synfig/PKGBUILD
+++ b/community/synfig/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 102282 2013-12-07 10:37:16Z bpiotrowski $
+# $Id: PKGBUILD 104503 2014-01-22 01:50:16Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
 pkgname=synfig
 pkgver=0.64.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Professional vector animation program (CLI renderer only)"
 arch=(i686 x86_64 'mips64el')
 url="http://synfig.org"
@@ -25,15 +25,15 @@ md5sums=('548a5d51a48b2be0c3fcaebe917a5d88'
          'c6684c876c093f5e53d2c46592994e9b')
 
 prepare() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 -i $srcdir/build-fix.patch
-  patch -Np1 -i $srcdir/ffmpeg-0.8.patch
-#  patch -Np1 -i $srcdir/ffmpeg-loop.patch
+  cd $pkgname-$pkgver
+  patch -p1 -i "$srcdir/build-fix.patch"
+  patch -Np1 -i "$srcdir/ffmpeg-0.8.patch"
+#  patch -Np1 -i "$srcdir/ffmpeg-loop.patch"
   sed -i '1,1i#include <string.h>' src/modules/mod_png/trgt_png.cpp
 }
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
   LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat"
   CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS"
@@ -44,6 +44,6 @@ build() {
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD
index e45ac8dda..f7e4d9d8b 100644
--- a/community/sysstat/PKGBUILD
+++ b/community/sysstat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 100454 2013-11-04 12:13:37Z spupykin $
+# $Id: PKGBUILD 104646 2014-01-24 07:28:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Martin Devera <devik@cdi.cz>
 
 pkgname=sysstat
-pkgver=10.2.0
+pkgver=10.2.1
 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=('7a6e3df08590385113a27a76ce64a6ff'
+md5sums=('039dcd235dfcfb3d4acc0a05730f9512'
          '12ba479c606620193e8b7c6e982d5088'
          '7ffa6bf990609d85367070f71b40a34b')
 
diff --git a/community/system-tools-backends/PKGBUILD b/community/system-tools-backends/PKGBUILD
new file mode 100644
index 000000000..49dffb894
--- /dev/null
+++ b/community/system-tools-backends/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 104267 2014-01-16 18:40:20Z flexiondotorg $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Hugo Doria <hugo@archlinux.org>
+# Contributor: Martin Wimpress <code@flexion.org>
+
+pkgname=system-tools-backends
+pkgver=2.10.2
+pkgrel=4
+pkgdesc='Backends for Gnome/MATE System Tools.'
+arch=('i686' 'x86_64')
+url='http://system-tools-backends.freedesktop.org/'
+license=('GPL')
+depends=('dbus-glib' 'perl' 'perl-net-dbus'  'polkit')
+makedepends=('intltool' 'perl-xml-parser')
+source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.10/${pkgname}-${pkgver}.tar.bz2")
+sha256sums=('1dbe5177df46a9c7250735e05e77129fe7ec04840771accfa87690111ca2c670')
+
+build() {
+    cd "${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --with-dbus-sys=/etc/dbus-1/system.d \
+        --localstatedir=/var \
+        --mandir=/usr/share \
+        --sbindir=/usr/bin \
+        --disable-static
+    make
+}
+
+package() {
+    cd "${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+    #clean up man
+    rm -rf "${pkgdir}/usr/share/system-tools-backends-2.0/modules/share/"
+}
diff --git a/community/tabbed/PKGBUILD b/community/tabbed/PKGBUILD
index 59dc75b5b..9c22c0851 100644
--- a/community/tabbed/PKGBUILD
+++ b/community/tabbed/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 92069 2013-05-31 08:05:10Z lfleischer $
+# $Id: PKGBUILD 105102 2014-01-31 19:44:06Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: totoloco <totoloco at gmx>
 
 pkgname=tabbed
-pkgver=0.5
+pkgver=0.6
 pkgrel=1
 pkgdesc='Simple generic tabbed fronted to xembed aware applications.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ depends=('libx11')
 install='tabbed.install'
 source=("http://dl.suckless.org/tools/${pkgname}-${pkgver}.tar.gz"
         'config.h')
-md5sums=('cd9cfd696db745637486ec3b9bbe4b75'
-         'cea7b04d4f67d917c68673cd0e63ae32')
+md5sums=('7898992feb9358e0196119750b77b42c'
+         '910b1cbcf62051064c58029987e05db8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/tabbed/config.h b/community/tabbed/config.h
index ca4b8d6b4..ceda9f704 100644
--- a/community/tabbed/config.h
+++ b/community/tabbed/config.h
@@ -2,10 +2,10 @@
 
 /* appearance */
 static const char font[]        = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*";
-static const char normbgcolor[] = "#222222";
-static const char normfgcolor[] = "#cccccc";
-static const char selbgcolor[]  = "#555555";
-static const char selfgcolor[]  = "#ffffff";
+static const char* normbgcolor  = "#222222";
+static const char* normfgcolor  = "#cccccc";
+static const char* selbgcolor   = "#555555";
+static const char* selfgcolor   = "#ffffff";
 static const char before[]      = "<";
 static const char after[]       = ">";
 static const int  tabwidth      = 200;
@@ -19,11 +19,20 @@ static const Bool foreground    = True;
 static int  newposition   = 0;
 static Bool npisrelative  = False;
 
+#define SETPROP(p) { \
+	.v = (char *[]){ "/bin/sh", "-c", \
+		"prop=\"`xwininfo -children -id $1 | grep '^     0x' | sed -e's@^ *\\(0x[0-9a-f]*\\) \"\\([^\"]*\\)\".*@\\1 \\2@' | xargs -0 printf %b | dmenu -l 10`\" &&" \
+		"xprop -id $1 -f $0 8s -set $0 \"$prop\"", \
+		p, winid, NULL \
+	} \
+}
+
 #define MODKEY ControlMask
 static Key keys[] = { \
 	/* modifier                     key        function        argument */
 	{ MODKEY|ShiftMask,             XK_Return, focusonce,      { 0 } },
 	{ MODKEY|ShiftMask,             XK_Return, spawn,          { 0 } },
+	{ MODKEY,                       XK_t,      spawn,          SETPROP("_TABBED_SELECT_TAB") },
 
 	{ MODKEY|ShiftMask,             XK_l,      rotate,         { .i = +1 } },
 	{ MODKEY|ShiftMask,             XK_h,      rotate,         { .i = -1 } },
diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD
index ab6b31024..6ae449aee 100644
--- a/community/task/PKGBUILD
+++ b/community/task/PKGBUILD
@@ -5,17 +5,17 @@
 # Contributor: coolkehon <coolkehon@gmail.com>
 
 pkgname=task
-pkgver=2.2.0
-pkgrel=1
+pkgver=2.3.0
+pkgrel=2
 pkgdesc="A command-line todo list manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://taskwarrior.org/projects/show/taskwarrior/"
 license=('MIT')
-depends=('util-linux')
+depends=('util-linux' 'gnutls')
 makedepends=('cmake')
 optdepends=('bash-completion: for bash completion' 'python: for python export addon' 'ruby: for ruby export addon' 'perl: for perl export addon' 'perl-json: for perl export addon')
 source=(http://www.taskwarrior.org/download/$pkgname-$pkgver.tar.gz)
-sha256sums=('39e25dd285e6bc8474337a5868cb2ec55675978fa1f08c802e6da58b4181ee14')
+sha256sums=('2b9a289109e691e305b84631622299853134cf195d4c9af962759b640176ac73')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/tcplay/PKGBUILD b/community/tcplay/PKGBUILD
index 2e11106e0..81b53d2dc 100644
--- a/community/tcplay/PKGBUILD
+++ b/community/tcplay/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 102520 2013-12-12 22:28:07Z tredaelli $
+# $Id: PKGBUILD 103928 2014-01-13 17:17:02Z andyrtr $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Thomas Weißschuh <thomas t-8ch de>
 # Contributor: James Reed <supplantr at archlinux dot info>
 
 pkgname=tcplay
 pkgver=1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Free and simple TrueCrypt implementation based on dm-crypt."
 arch=('i686' 'x86_64')
 url="https://github.com/bwalex/tc-play"
diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD
index 80bead240..632d88604 100644
--- a/community/tea/PKGBUILD
+++ b/community/tea/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102931 2013-12-24 09:48:38Z spupykin $
+# $Id: PKGBUILD 105222 2014-02-03 09:08:05Z 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=37.0.1
+pkgver=37.1.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=('587a3c245e414ecb718369a170f1c991'
+md5sums=('aa63bea9c741ba0201fbeb0da0eb9599'
          '377ace3363124f4c086de0babb820761')
 
 build() {
diff --git a/community/teeworlds/PKGBUILD b/community/teeworlds/PKGBUILD
index b965c6975..81a7d376c 100644
--- a/community/teeworlds/PKGBUILD
+++ b/community/teeworlds/PKGBUILD
@@ -6,43 +6,42 @@
 
 pkgname=teeworlds
 pkgver=0.6.2
-pkgrel=1
-pkgdesc="A multiplayer 2D shooter"
+pkgrel=2
+pkgdesc='Multiplayer 2D shooter'
 arch=('i686' 'x86_64' 'mips64el')
-url="https://www.teeworlds.com"
+url='https://www.teeworlds.com'
 license=('custom')
 depends=('alsa-lib' 'glu' 'sdl' 'freetype2')
-makedepends=('python' 'bam' 'mesa')
-replaces=('teewars')
-source=(https://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz
-        teeworlds.desktop
-		teeworlds.png)
-md5sums=('649f6c05a7b117096b238c07062edc39'
-         '3944aaf7a8c19a83510b2b39c4cddf5f'
-         '44f39e398409232a0e0a431ed46d8cc8')
+makedepends=('python' 'bam' 'mesa' 'imagemagick' 'gendesk')
+source=("https://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz")
+md5sums=('649f6c05a7b117096b238c07062edc39')
+
+prepare() {
+  convert "$pkgname-$pkgver-source/other/icons/Teeworlds.ico" "$srcdir/$pkgname.png"
+  gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" \
+    --name 'Teeworlds' --categories 'Game;ArcadeGame'
+}
 
 build() {
-	# Build teeworlds
-	cd ${srcdir}/${pkgname}-*-source
+  cd "$pkgname-$pkgver-source"
 
-	bam server_release client_release
+  bam server_release client_release
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-*-source
-
-	# Install data files
-	mkdir -p ${pkgdir}/usr/share/${pkgname}/data
-	cp -r data/* ${pkgdir}/usr/share/${pkgname}/data
-
-	install -Dm755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
-	install -Dm755 ${pkgname}_srv ${pkgdir}/usr/bin/${pkgname}_srv
-
-	install -Dm644 ${srcdir}/${pkgname}.desktop \
-		${pkgdir}/usr/share/applications/${pkgname}.desktop
-	install -Dm644 ${srcdir}/${pkgname}.png \
-		${pkgdir}/usr/share/pixmaps/${pkgname}.png
-
-	install -Dm644 license.txt \
-		${pkgdir}/usr/share/licenses/${pkgname}/license.txt
+  cd "$pkgname-$pkgver-source"
+
+  # Install data files
+  mkdir -p ${pkgdir}/usr/share/${pkgname}/data
+  cp -r data/* ${pkgdir}/usr/share/${pkgname}/data
+  
+  install -Dm755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
+  install -Dm755 ${pkgname}_srv ${pkgdir}/usr/bin/${pkgname}_srv
+  
+  install -Dm644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
+  install -Dm644 ${srcdir}/${pkgname}-0.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png
+  
+  install -Dm644 license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/teeworlds/teeworlds.desktop b/community/teeworlds/teeworlds.desktop
deleted file mode 100644
index ddfb8994d..000000000
--- a/community/teeworlds/teeworlds.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Icon=teeworlds
-Exec=teeworlds
-Terminal=false
-StartupNotify=false
-
-Name=TeeWorlds
-GenericName=Arcade Game
-Comment=is a multiplayer 2D FPS shooter
-Comment[pl_PL]=wieloosobowa strzelanka FTP w 2D
-
-Categories=Game;ArcadeGame;
diff --git a/community/teeworlds/teeworlds.png b/community/teeworlds/teeworlds.png
deleted file mode 100644
index 890baaff3..000000000
--- a/community/teeworlds/teeworlds.png
+++ /dev/null
diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD
index befe6843c..21bec9994 100644
--- a/community/the_silver_searcher/PKGBUILD
+++ b/community/the_silver_searcher/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100581 2013-11-06 10:52:39Z arodseth $
+# $Id: PKGBUILD 105344 2014-02-05 15:34:54Z 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.18.1
+pkgver=0.19.2
 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=('1f5cdacf955d5707cdb60f3f46aab3aae7fe96f105f00ab2d6a5a52d0aad5dc5')
+sha256sums=('e2de31b8b4745b4614d3a6fa4cd61130474b0e861e80b3784daee7ce0eeca300')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -27,9 +27,7 @@ build() {
 }
 
 package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/tigervnc/PKGBUILD b/community/tigervnc/PKGBUILD
index 843288f8c..5f84ee833 100644
--- a/community/tigervnc/PKGBUILD
+++ b/community/tigervnc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 100001 2013-10-31 02:56:06Z allan $
+# $Id: PKGBUILD 104076 2014-01-15 09:51:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com>
 
 pkgname=tigervnc
 pkgver=1.3.0
-pkgrel=3
-_xorgver=1.14.2
+pkgrel=4
+_xorgver=1.15.0
 pkgdesc="suite of VNC servers and clients. VNC 4 branch of TightVNC."
 arch=('i686' 'x86_64')
 url="http://www.tigervnc.org"
@@ -23,13 +23,15 @@ source=(http://downloads.sourceforge.net/project/tigervnc/tigervnc/$pkgver/tiger
 	vncserver.service
 	vncviewer.desktop
 	gethomedir.patch
-	getmaster.patch)
+	getmaster.patch
+	xorg115.patch)
 md5sums=('a5158228e64d14496821a39bf3851f1b'
-         '5d36a6483e8e301875131e8302c67727'
+         'c2ace3697b32414094cf8c597c39d7d9'
          '0903d5a0dfa38e0b04964505b644585c'
          '71cac0fb9701b0a041430f0fddfe00c8'
          '22f1523a0eca56ad79cfabd0db6e2cf6'
-         'e056a2502dfe0cb3b02e08cab689482f')
+         'e056a2502dfe0cb3b02e08cab689482f'
+         'd7765cb11be43b557ee77dfa486fdb68')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -37,6 +39,7 @@ prepare() {
 
   patch -Np1 -i ${srcdir}/gethomedir.patch
   patch -Np1 -i ${srcdir}/getmaster.patch
+  patch -Np1 -i ${srcdir}/xorg115.patch
 }
 
 build() {
@@ -49,6 +52,7 @@ build() {
   patch -Np1 -i ../xserver114.patch
   autoreconf -fiv
   ./configure --prefix=/usr \
+	--disable-wayland --disable-present --disable-dri3 \
 	--disable-static --disable-xinerama --without-dtrace \
 	--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
 	--disable-xwin --disable-xephyr --disable-kdrive --with-pic \
diff --git a/community/tigervnc/xorg115.patch b/community/tigervnc/xorg115.patch
new file mode 100644
index 000000000..d070a705c
--- /dev/null
+++ b/community/tigervnc/xorg115.patch
@@ -0,0 +1,15 @@
+diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h.jx tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h
+--- tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h.jx	2013-07-01 08:41:24.000000000 -0400
++++ tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h	2013-11-07 11:39:49.749992669 -0500
+@@ -44,8 +44,10 @@
+ #define XORG 113
+ #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (14 * 100000) + (99 * 1000))
+ #define XORG 114
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (15 * 100000) + (99 * 1000))
++#define XORG 115
+ #else
+-#error "X.Org newer than 1.14 is not supported"
++#error "X.Org newer than 1.15 is not supported"
+ #endif
+ 
+ #endif
diff --git a/libre/tomoyo-tools-libre/PKGBUILD b/community/tomoyo-tools/PKGBUILD
index ad0306918..f321ae4fc 100644
--- a/libre/tomoyo-tools-libre/PKGBUILD
+++ b/community/tomoyo-tools/PKGBUILD
@@ -1,30 +1,25 @@
-# $Id: PKGBUILD 96508 2013-08-30 20:31:24Z foutrelis $
+# $Id: PKGBUILD 96550 2013-08-31 16:05:13Z foutrelis $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
-_pkgname=tomoyo-tools
-pkgname=tomoyo-tools-libre
+pkgname=tomoyo-tools
 _basever=2.5.0
 _timestamp=20130406
 _file=53357
 pkgver=${_basever}.${_timestamp}
 pkgrel=2
-pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2 (built for the linux-libre kernel package)'
-arch=('i686' 'x86_64' 'mips64el')
+pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2'
+arch=('i686' 'x86_64')
 url='http://tomoyo.sourceforge.jp'
 #url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818'
 license=('GPL')
-depends=('ncurses' 'linux-libre>=3.2')
-replaces=${_pkgname}
-conflicts=${_pkgname}
-provides=${_pkgname}=${pkgver}
+depends=('ncurses' 'linux>=3.2')
 install=tomoyo-tools.install
-source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${_pkgname}-${_basever}-${_timestamp}.tar.gz")
+source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz")
 md5sums=('8888f83fcb87823d714ff551e8680d0d')
 
 prepare() {
-  cd "${srcdir}/${_pkgname}"
+  cd "${srcdir}/${pkgname}"
   sed -i \
     -e 's|usr/sbin|usr/bin|g' \
     -e 's|sbin|usr/bin|g' \
@@ -32,11 +27,11 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}"
+  cd "${srcdir}/${pkgname}"
   make USRSBINDIR=/usr/bin SBINDIR=/usr/bin
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}"
+  cd "${srcdir}/${pkgname}"
   make USRSBINDIR=/usr/bin SBINDIR=/usr/bin INSTALLDIR="${pkgdir}" install
 }
diff --git a/libre/tomoyo-tools-libre/tomoyo-tools.install b/community/tomoyo-tools/tomoyo-tools.install
index c23df1212..c23df1212 100644
--- a/libre/tomoyo-tools-libre/tomoyo-tools.install
+++ b/community/tomoyo-tools/tomoyo-tools.install
diff --git a/community/udpxy/PKGBUILD b/community/udpxy/PKGBUILD
new file mode 100644
index 000000000..bec1cca99
--- /dev/null
+++ b/community/udpxy/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 104084 2014-01-15 11:36:44Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Konstantin Shabanov <kes.eclipse@gmail.com>
+# Contributor: Evka
+# Maintainer: Jose Riha <jose 1711 gmail com>
+
+pkgname=udpxy
+pkgver=1.0.23.0
+_pkgver=1.0.23-0
+pkgrel=2
+pkgdesc="small-footprint UNIX/Linux daemon to relay multicast UDP traffic to client's TCP (HTTP) connection."
+arch=(i686 x86_64)
+url="http://udpxy.sf.net"
+license=('GPL3')
+source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/Chipmunk-1.0/$pkgname.${_pkgver}-prod.tar.gz
+	$pkgname.service
+	pidfile.patch)
+md5sums=('3dd99ba264078e873cbe1d98369ed423'
+         '19d76e6fbd876b5a7cdaa3e69cecdb0e'
+         '7a268f58ee964895377c95d16c9c633a')
+
+prepare() {
+  cd "$srcdir/$pkgname-${_pkgver}"
+  patch -Np1 -i "${srcdir}/pidfile.patch"
+  sed -i '/ln -s $(INSTALLROOT)\/bin\/$(EXEC) $(INSTALLROOT)\/bin\/$(UDPXREC/s%$(INSTALLROOT)%/usr%' Makefile
+}
+
+build() {
+  cd "$srcdir/$pkgname-${_pkgver}"
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-${_pkgver}"
+  make INSTALLROOT="$pkgdir/usr" install
+  install -D -m644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
+}
diff --git a/community/udpxy/pidfile.patch b/community/udpxy/pidfile.patch
new file mode 100644
index 000000000..0adb24951
--- /dev/null
+++ b/community/udpxy/pidfile.patch
@@ -0,0 +1,48 @@
+diff --git a/udpxy.c b/udpxy.c
+index 43f213a..8f0e30d 100644
+--- a/udpxy.c
++++ b/udpxy.c
+@@ -1423,7 +1423,7 @@ udpxy_main( int argc, char* const argv[] )
+                 }
+             }
+ 
+-            rc = set_pidfile( g_udpxy_app, port, pidfile, sizeof(pidfile) );
++            rc = set_pidfile( g_udpxy_app, pidfile, sizeof(pidfile) );
+             if( 0 != rc ) {
+                 mperror( g_flog, errno, "set_pidfile" );
+                 rc = ERR_INTERNAL; break;
+diff --git a/util.c b/util.c
+index 0ad34bb..6b7daf8 100644
+--- a/util.c
++++ b/util.c
+@@ -302,7 +302,7 @@ make_pidfile( const char* fpath, pid_t pid, FILE* log )
+  * (fail if destination directory is not writable)
+  */
+ int
+-set_pidfile( const char* appname, int port, char* buf, size_t len )
++set_pidfile( const char* appname, char* buf, size_t len )
+ {
+     int n = -1;
+ 
+@@ -311,7 +311,7 @@ set_pidfile( const char* appname, int port, char* buf, size_t len )
+     if( -1 == access(PIDFILE_DIR, W_OK ) )
+         return -1;
+ 
+-    n = snprintf( buf, len, "%s/%s%d.pid", PIDFILE_DIR, appname, port );
++    n = snprintf( buf, len, "%s/%s.pid", PIDFILE_DIR, appname );
+     if( n < 0 ) return EXIT_FAILURE;
+ 
+     buf[ len - 1 ] = '\0';
+diff --git a/util.h b/util.h
+index f274c7b..64a10d1 100644
+--- a/util.h
++++ b/util.h
+@@ -66,7 +66,7 @@ make_pidfile( const char* fpath, pid_t pid, FILE* log );
+  * (fail of destination directory is not writable)
+  */
+ int
+-set_pidfile( const char* appname, int port, char* buf, size_t len );
++set_pidfile( const char* appname, char* buf, size_t len );
+ 
+ /* write buffer to designated socket/file
+  * return number of bytes read/written or one of the error
diff --git a/community/udpxy/udpxy.service b/community/udpxy/udpxy.service
new file mode 100644
index 000000000..9ab244043
--- /dev/null
+++ b/community/udpxy/udpxy.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=UDP multicast to TCP (HTTP) relay proxy
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/udpxy.pid
+ExecStart=/usr/bin/udpxy -T -S -p 4022 -B 256kb
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/uget/PKGBUILD b/community/uget/PKGBUILD
index 85af0b30f..32fb678a3 100644
--- a/community/uget/PKGBUILD
+++ b/community/uget/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 95829 2013-08-17 12:17:24Z bgyorgy $
+# $Id: PKGBUILD 103501 2014-01-06 21:19:08Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=uget
-pkgver=1.10.3
-pkgrel=2
+pkgver=1.10.4
+pkgrel=1
 pkgdesc="GTK+ download manager featuring download classification and HTML import"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://urlget.sourceforge.net/"
+url="http://ugetdm.com/"
 license=('LGPL')
 depends=('libnotify' 'gtk3' 'gstreamer' 'curl' 'hicolor-icon-theme' 'xdg-utils')
 makedepends=('intltool')
 optdepends=('aria2: alternative backend')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/urlget/$pkgname-$pkgver.tar.gz)
-md5sums=('d71c927cfcfc3ef9f62cc9cb3ca7bab7')
+md5sums=('58139de0bd043cfeae0f22c239f4bbc5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-appindicator
   make
@@ -25,6 +24,5 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-
   make DESTDIR="$pkgdir/" install
 }
diff --git a/community/umurmur/PKGBUILD b/community/umurmur/PKGBUILD
index 6af6b8cb3..c191297ef 100644
--- a/community/umurmur/PKGBUILD
+++ b/community/umurmur/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 101363 2013-11-23 15:13:00Z bpiotrowski $
+# $Id: PKGBUILD 103638 2014-01-08 15:18:58Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Robert Knauer <robert@privatdemail.net>
 # Contributor: xav <xav at ethertricks dot net>
 
 pkgname=umurmur
-pkgver=0.2.13
+pkgver=0.2.14
 pkgrel=1
 pkgdesc='Minimalistic Mumble server'
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ install=$pkgname.install
 backup=('etc/umurmur/umurmur.conf')
 source=(http://umurmur.googlecode.com/files/umurmur-$pkgver.tar.gz
         umurmur.service)
-md5sums=('04d0ea7a90b7858c16df26317b318bf4'
+md5sums=('e22121b4b91f4c9de43f858f6defa0b0'
          'd9d556e4ffa77e193fb40ce508804720')
 
 build() {
diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD
index 1390a5344..10b2cbf8c 100644
--- a/community/unrealircd/PKGBUILD
+++ b/community/unrealircd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 101548 2013-11-27 16:02:52Z spupykin $
+# $Id: PKGBUILD 104840 2014-01-27 10:46:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zerial <fernando@zerial.org>
 
 pkgname=unrealircd
 pkgver=3.2.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source IRC Server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://unrealircd.com"
@@ -16,10 +16,12 @@ backup=('etc/unrealircd/unrealircd.conf')
 install=unrealircd.install
 source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz
 	unrealircd.service
+	unrealircd.tmpfiles.d
 	arch-fixes.patch)
 md5sums=('21c460dc04d221b401a1701ca96e9e58'
-         '93276a1cd426e4a811c072c35fc31e94'
-         '77807313c4578f2c30286b9f9e3fb21c')
+         '677d8de0bae770488a2c1730f9475a51'
+         '3ec519ea7dbe99696eb6c51dfc0d382a'
+         '5f4bf9f99f6c78bc9e6ee4ec66b021fa')
 
 prepare() {
   cd $srcdir/Unreal$pkgver
@@ -68,5 +70,7 @@ package() {
   find $pkgdir/usr -type f -exec chmod ugo+r {} \;
   find $pkgdir/usr -type d -exec chmod ugo+rx {} \;
 
-  install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
+  rm -f $pkgdir/etc/unrealircd/unreal
+  install -Dm0644 $srcdir/unrealircd.service $pkgdir/usr/lib/systemd/system/unrealircd.service
+  install -Dm0644 $srcdir/unrealircd.tmpfiles.d $pkgdir/usr/lib/tmpfiles.d/unrealircd.conf
 }
diff --git a/community/unrealircd/arch-fixes.patch b/community/unrealircd/arch-fixes.patch
index a1741968d..2f89647bc 100644
--- a/community/unrealircd/arch-fixes.patch
+++ b/community/unrealircd/arch-fixes.patch
@@ -1,6 +1,6 @@
-diff -wbBur Unreal3.2.org/doc/example.conf Unreal3.2/doc/example.conf
---- Unreal3.2.org/doc/example.conf	2009-04-13 15:03:55.000000000 +0400
-+++ Unreal3.2/doc/example.conf	2011-08-29 13:39:25.000000000 +0400
+diff -wbBur Unreal3.2.10.2.org/doc/example.conf Unreal3.2.10.2/doc/example.conf
+--- Unreal3.2.10.2.org/doc/example.conf	2013-11-24 23:24:26.000000000 +0400
++++ Unreal3.2.10.2/doc/example.conf	2014-01-27 14:38:16.669081776 +0400
 @@ -33,8 +33,8 @@
   */
  
@@ -12,10 +12,22 @@ diff -wbBur Unreal3.2.org/doc/example.conf Unreal3.2/doc/example.conf
  
  /* FOR Windows, uncomment the following 2 lines: */
  //loadmodule "modules/commands.dll";
-diff -wbBur Unreal3.2.org/src/ircd.c Unreal3.2/src/ircd.c
---- Unreal3.2.org/src/ircd.c	2009-03-01 21:37:58.000000000 +0300
-+++ Unreal3.2/src/ircd.c	2011-08-29 13:39:25.000000000 +0400
-@@ -844,7 +844,7 @@
+diff -wbBur Unreal3.2.10.2.org/include/config.h Unreal3.2.10.2/include/config.h
+--- Unreal3.2.10.2.org/include/config.h	2013-11-24 23:24:26.000000000 +0400
++++ Unreal3.2.10.2/include/config.h	2014-01-27 14:38:53.349081379 +0400
+@@ -248,7 +248,7 @@
+ #define RPATH   	"ircd.rules"	/* server rules file */
+ #define OPATH   	"oper.motd"	/* Operators MOTD file */
+ #define	LPATH		"debug.log"	/* Where the debug file lives, if DEBUGMODE */
+-#define	PPATH		"ircd.pid"	/* file for server pid */
++#define	PPATH		"/run/unrealircd/ircd.pid"	/* file for server pid */
+ #define VPATH		"ircd.svsmotd"	/* Services MOTD append. */
+ #define BPATH		"bot.motd"	/* Bot MOTD */
+ #define IRCDTUNE 	"ircd.tune"	/* tuning .. */
+diff -wbBur Unreal3.2.10.2.org/src/ircd.c Unreal3.2.10.2/src/ircd.c
+--- Unreal3.2.10.2.org/src/ircd.c	2013-11-24 23:24:26.000000000 +0400
++++ Unreal3.2.10.2/src/ircd.c	2014-01-27 14:38:16.669081776 +0400
+@@ -840,7 +840,7 @@
  const char *compiledfor, *runtime;
  int error = 0;
  
@@ -24,7 +36,7 @@ diff -wbBur Unreal3.2.org/src/ircd.c Unreal3.2/src/ircd.c
  	compiledfor = OPENSSL_VERSION_TEXT;
  	runtime = SSLeay_version(SSLEAY_VERSION);
  	if (strcasecmp(compiledfor, runtime))
-@@ -854,7 +854,7 @@
+@@ -850,7 +850,7 @@
  		error=1;
  	}
  #endif
@@ -33,7 +45,7 @@ diff -wbBur Unreal3.2.org/src/ircd.c Unreal3.2/src/ircd.c
  	runtime = zlibVersion();
  	compiledfor = ZLIB_VERSION;
  	if (*compiledfor != *runtime)
-@@ -864,7 +864,7 @@
+@@ -860,7 +860,7 @@
  		error = 1;
  	}
  #endif
@@ -42,48 +54,3 @@ diff -wbBur Unreal3.2.org/src/ircd.c Unreal3.2/src/ircd.c
  	/* Perhaps someone should tell them to do this a bit more easy ;)
  	 * problem is runtime output is like: 'libcurl/7.11.1 zlib/1.2.1 c-ares/1.2.0'
  	 * while header output is like: '7.11.1'.
-diff -wbBur Unreal3.2.org/unreal.in Unreal3.2/unreal.in
---- Unreal3.2.org/unreal.in	2009-03-01 21:37:55.000000000 +0300
-+++ Unreal3.2/unreal.in	2011-08-29 13:39:37.000000000 +0400
-@@ -7,7 +7,7 @@
- 	if [ -r $PID_FILE ] ; then
- 		mv -f $PID_FILE $PID_BACKUP
- 	fi
--	@BINDIR@
-+	@BINDIR@/ircd
- 	sleep 1
- 	if [ ! -r $PID_FILE ] ; then
- 		echo "Possible error encountered (IRCd seemingly not started)"	
-@@ -31,11 +31,11 @@
- 	echo "Restarting UnrealIRCd"
- 	kill -2 `cat $PID_FILE`
- elif [ "$1" = "mkpasswd" ] ; then
--	@BINDIR@ -P $2 $3
-+	@BINDIR@/ircd -P $2 $3
- elif [ "$1" = "version" ] ; then
--	@BINDIR@ -v
-+	@BINDIR@/ircd -v
- elif [ "$1" = "gencloak" ] ; then
--	@BINDIR@ -k
-+	@BINDIR@/ircd -k
- elif [ "$1" = "backtrace" ] ; then
- 	cd @IRCDDIR@
- 
-@@ -90,7 +90,7 @@
- 	fi
- 
- 	# Some ugly prepare work -- ignore errors
--	(echo quit|gdb @BINDIR@ $corefile 2>&1)|\
-+	(echo quit|gdb @BINDIR@/ircd $corefile 2>&1)|\
- 	grep -i 'no such file'|\
- 	awk -F ':' '{ print $1 }'|sort|uniq|\
- 	awk -F '.' "{ system(\"ln -s ../$modpath/\" \$2 \".so \" \$0) }"
-@@ -110,7 +110,7 @@
- quit
- __EOF__
- 
--	gdb -batch -x gdb.commands @BINDIR@ $corefile
-+	gdb -batch -x gdb.commands @BINDIR@/ircd $corefile
- 	rm -f gdb.commands
- 	echo "GCC: `gcc -v 2>&1|tail -n 1`"
- 	echo "UNAME: `uname -a`"
diff --git a/community/unrealircd/unrealircd.install b/community/unrealircd/unrealircd.install
index 274d8b13f..0eca0c2a8 100644
--- a/community/unrealircd/unrealircd.install
+++ b/community/unrealircd/unrealircd.install
@@ -1,7 +1,9 @@
 post_install() {
-  echo "Create ircd user and chown /etc/unrealircd and /var/log/unrealircd recursively"
+  getent passwd ircd >/dev/null || useradd -r ircd
+  chown -R ircd etc/unrealircd var/log/unrealircd
+  systemd-tmpfiles --create unrealircd.conf
   echo "SSL is enabled by default, so you need to create pem files"
-  echo "Also unrealircd.conf needs adjustments"
+  echo "unrealircd.conf needs adjustments"
   echo "See also: https://wiki.archlinux.org/index.php/UnrealIRCd"
 }
 
@@ -10,5 +12,5 @@ post_upgrade() {
 }
 
 post_remove() {
-  echo "Don't forget to remove ircd user"
+  userdel ircd
 }
diff --git a/community/unrealircd/unrealircd.service b/community/unrealircd/unrealircd.service
index a81419f2a..7550ebe15 100644
--- a/community/unrealircd/unrealircd.service
+++ b/community/unrealircd/unrealircd.service
@@ -5,7 +5,7 @@ After=network.target remote-fs.target nss-lookup.target
 [Service]
 Type=forking
 User=ircd
-PIDFile=/var/run/unrealircd.pid
+PIDFile=/run/unrealircd/ircd.pid
 ExecStart=/usr/bin/unrealircd
 
 [Install]
diff --git a/community/unrealircd/unrealircd.tmpfiles.d b/community/unrealircd/unrealircd.tmpfiles.d
new file mode 100644
index 000000000..137431233
--- /dev/null
+++ b/community/unrealircd/unrealircd.tmpfiles.d
@@ -0,0 +1 @@
+d /run/unrealircd 0755 ircd root -
diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD
index 0a3607bcb..846bcfa8a 100644
--- a/community/usb_modeswitch/PKGBUILD
+++ b/community/usb_modeswitch/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 98181 2013-10-07 10:07:44Z spupykin $
+# $Id: PKGBUILD 105224 2014-02-03 09:08:22Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=usb_modeswitch
-pkgver=2.0.1
+pkgver=2.1.0
 pkgrel=1
-_pkgdata=20130807
+_pkgdata=20140129
 pkgdesc="Activating switchable USB devices on Linux."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.draisberghof.de/usb_modeswitch/"
@@ -15,9 +15,9 @@ backup=("etc/$pkgname.conf")
 source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2"
 	"http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2"
 	"usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt")
-md5sums=('e48d4419d0574d342bb183f7465556d0'
-         '91feff51deba6e48e78506b8f4db2274'
-         'dd14f254f6c3642ce16fd7c2f43ee112')
+md5sums=('9eaf1749996f5f797323d474d1d390c5'
+         'e1e7a4c679f8029a8da146477d102c60'
+         '1ec5054e071d6af9ab5b862197222455')
 
 prepare() {
   cd $srcdir/usb-modeswitch-$pkgver/
diff --git a/community/uwsgi/PKGBUILD b/community/uwsgi/PKGBUILD
index cce6fe1a9..39cf1d837 100644
--- a/community/uwsgi/PKGBUILD
+++ b/community/uwsgi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102953 2013-12-24 23:07:41Z dwallace $
+# $Id: PKGBUILD 105643 2014-02-12 17:51:46Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>  
@@ -14,7 +14,6 @@ pkgname=(uwsgi
         uwsgi-plugin-python
         uwsgi-plugin-nagios
         uwsgi-plugin-router
-        uwsgi-plugin-admin
         uwsgi-plugin-php
         uwsgi-plugin-lua51
         uwsgi-plugin-carbon
@@ -23,7 +22,8 @@ pkgname=(uwsgi
         uwsgi-plugin-zergpool
         )
         #uwsgi-plugin-erlang
-pkgver=1.9.21.1
+        #uwsgi-plugin-admin
+pkgver=2.0.1
 pkgrel=1
 arch=(i686 x86_64)
 url="http://projects.unbit.it/$pkgbase"
@@ -41,8 +41,8 @@ source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz
         uwsgi_ruby20_compatibility.patch
         uwsgi_trick_chroot.patch)
 
-md5sums=('82df3eeacc0d4e661459bc50d50e757b'
-         '2f21e871e81698c88c7ec2dbb4e3833e'
+md5sums=('e7234f16ddfb4fe5d0b5d5fa76dc17e1'
+         'a0749da07b545efcbb0276f52be22652'
          'b05ba1d796e1ea608a40635bc4f3ec67'
          '740a7718bd341b03d916a13ddbbbe694'
          'db70315bbc8cb886a278ba59d5fd8d57'
@@ -155,13 +155,13 @@ package_uwsgi-plugin-router(){
     install -Dm755 router_basicauth_plugin.so $pkgdir/usr/lib/uwsgi/basicauth_plugin.so
 }
 
-package_uwsgi-plugin-admin(){
-    depends=( uwsgi-plugin-common)
-    pkgdesc="Plugin for Admin support"
-    install -dm755 $pkgdir/usr/bin
-    install -Dm755 $pkgbase-$pkgver/admin_plugin.so $pkgdir/usr/lib/uwsgi/admin_plugin.so
-    ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
-}
+#package_uwsgi-plugin-admin(){
+#    depends=( uwsgi-plugin-common)
+#    pkgdesc="Plugin for Admin support"
+#    install -dm755 $pkgdir/usr/bin
+#    install -Dm755 $pkgbase-$pkgver/admin_plugin.so $pkgdir/usr/lib/uwsgi/admin_plugin.so
+#    ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
+#}
 
 package_uwsgi-plugin-lua51(){
     depends=(lua51 uwsgi-plugin-common)
diff --git a/community/uwsgi/archlinux.ini b/community/uwsgi/archlinux.ini
index f2550757f..4e689849f 100644
--- a/community/uwsgi/archlinux.ini
+++ b/community/uwsgi/archlinux.ini
@@ -14,4 +14,4 @@ yaml_implementation = auto
 malloc_implementation = libc
 embedded_plugins = echo, ping, http, corerouter
 plugin_dir = /usr/lib/uwsgi
-plugins = echo, ping, http, rack, psgi, corerouter, rbthreads, fiber, python, nagios,  admin, lua, cache, cgi, rpc, ugreen, carbon, rrdtool, pam, systemd_logger, php, fastrouter, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter
+plugins = echo, ping, http, rack, psgi, corerouter, rbthreads, fiber, python, nagios,  lua, cache, cgi, rpc, ugreen, carbon, rrdtool, pam, systemd_logger, php, fastrouter, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter
diff --git a/community/vbam/PKGBUILD b/community/vbam/PKGBUILD
index 3ea2ab4e0..6a182124d 100755
--- a/community/vbam/PKGBUILD
+++ b/community/vbam/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 98482 2013-10-11 16:52:10Z alucryd $
+# $Id: PKGBUILD 103805 2014-01-11 20:08:39Z eric $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase=vbam
 pkgname=('vbam-cli' 'vbam-gtk' 'vbam-wx')
 pkgver=1.8.0.1202
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://vba-m.com"
 license=('GPL2')
-makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'gtkglextmm' 'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr' 'mesa' 'openal' 'wxgtk' 'zip')
+makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'gtkglextmm' 'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr' 'mesa' 'openal' 'wxgtk2.8' 'zip')
 [[ $CARCH == i686 ]] && makedepends+=('nasm')
 source=("http://downloads.sourceforge.net/project/vbam/vbam-src/vbam-r${pkgver##*.}-src.tar.bz2"
         'http://downloads.sourceforge.net/sfml/SFML-1.6-sdk-linux-64.tar.gz'
@@ -25,6 +25,7 @@ sha256sums=('148d866c08d7a810be5c845247d212f1d1d07395f2ccdecef10ad81a76072877'
 prepare() {
   patch -Np0 -i soil.patch
   patch -Np0 -i sfml.patch
+  sed 's/wxrc/wxrc-2.8/g' -i {po/update_pot.sh,src/wx/CMakeLists.txt}
 }
 
 build() {
@@ -47,6 +48,7 @@ build() {
   mkdir build && cd build
 
   local _cmakeargs="-DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_CXX_FLAGS=-I${srcdir}/staging/usr/include -DENABLE_GTK='ON' -DENABLE_WX='ON' \
+                    -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8'
                     -DSFML_INCLUDE_DIR='../staging/usr/include/SFML' \
                     -DSFML_AUDIO_INCLUDE_DIR='../staging/usr/include/SFML/Audio' \
                     -DSFML_AUDIO_LIBRARY='../staging/usr/lib/libsfml-audio-s.a' \
@@ -91,7 +93,7 @@ install='vbam-gtk.install'
 
 package_vbam-wx() {
 pkgdesc="Nintendo GameBoy Advance emulator - wx version"
-depends=('wxgtk')
+depends=('wxgtk2.8')
 conflicts=('vbam-gtk')
 options=('!emptydirs')
 install='vbam-wx.install'
diff --git a/community/viewnior/PKGBUILD b/community/viewnior/PKGBUILD
index b0695e908..98e30b3db 100644
--- a/community/viewnior/PKGBUILD
+++ b/community/viewnior/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 66682 2012-02-27 10:02:48Z spupykin $
+# $Id: PKGBUILD 105587 2014-02-10 17:25:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 # Maintainer: M Rawash <mrawash@gmail.com>
 
 pkgname=viewnior
-pkgver=1.3
-pkgrel=1
+pkgver=1.4
+pkgrel=2
 pkgdesc="A simple, fast and elegant image viewer program"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xsisqox.github.com/Viewnior/"
 license=('GPL3')
-depends=('gtk2>=2.12')
+depends=('gtk2>=2.12' 'exiv2')
 makedepends=('make' 'intltool>=0.35' 'pkgconfig>=0.9' 'perl>=5.8.1')
 install=viewnior.install
-source=(http://cloud.github.com/downloads/xsisqox/Viewnior/$pkgname-$pkgver.tar.gz)
-md5sums=('273c379933ae3e74ad414fde00198695')
+source=(https://www.dropbox.com/s/zytq0suabesv933/viewnior-$pkgver.tar.gz)
+md5sums=('13d7cb3381522161b32de9b70dd989b8')
 
 build() {
   cd $pkgname-$pkgver
   LDFLAGS=-lm ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/viewnior/viewnior.install b/community/viewnior/viewnior.install
index 5f0358791..c52bea067 100644
--- a/community/viewnior/viewnior.install
+++ b/community/viewnior/viewnior.install
@@ -1,7 +1,7 @@
 post_install() {
 	[ -x `which update-mime-database` ] &&  update-mime-database usr/share/mime
 	[ -x `which gtk-update-icon-cache` ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	/bin/true
+	true
 }
 
 post_upgrade() {
diff --git a/community/viking/PKGBUILD b/community/viking/PKGBUILD
index 64196d9eb..1877deec9 100644
--- a/community/viking/PKGBUILD
+++ b/community/viking/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 97743 2013-09-28 08:12:47Z jlichtblau $
+# $Id: PKGBUILD 105307 2014-02-04 19:39:51Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Nick Østergaard <oe.nick@gmail.com>
 # Contributor: Jonny Gerold <jonny@fsk141.com>
 
 pkgname=viking
-pkgver=1.4.2
+pkgver=1.5
 pkgrel=1
 pkgdesc="GTK+2 application to manage GPS data"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,22 +12,22 @@ url="http://viking.sourceforge.net/"
 license=('GPL2')
 depends=('curl' 'gpsd' 'gtk2' 'hicolor-icon-theme' 'libexif' 'gpsbabel')
 makedepends=('intltool' 'gnome-doc-utils')
-optdepends=(geo: for geocaches)
+optdepends=('geo: for geocaches')
 options=('!emptydirs') 
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('58e85c9792d0df62c3c9b583869bc40d6218ca01c117c05599d45e6d6b254bf1')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha256sums=('2f00549e236dedec811c6b018f5ae76a1f4a1b68b1e33ef1eb2de14533579dc4')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
 
   ./configure --prefix=/usr --enable-expedia --enable-geocaches
   make
 }
 
 package(){
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/viking/viking.changelog b/community/viking/viking.changelog
index 78255a931..e0c5ff12a 100644
--- a/community/viking/viking.changelog
+++ b/community/viking/viking.changelog
@@ -1,3 +1,6 @@
+2014-02-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* viking 1.5-1
+
 2013-09-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* viking 1.4.2-1
 
diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD
index d4f458448..f8d432691 100644
--- a/community/virtualbox-modules-lts/PKGBUILD
+++ b/community/virtualbox-modules-lts/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 102983 2013-12-25 11:05:37Z bpiotrowski $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 105457 2014-02-08 12:33:27Z bpiotrowski $
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # 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.3.6
-pkgrel=2
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index ec8bd87b6..e5a316067 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 103140 2013-12-27 12:02:56Z foutrelis $
+# $Id: PKGBUILD 104437 2014-01-20 20:07:03Z tpowa $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
 pkgver=4.3.6
-pkgrel=2
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/community/virtualgl/PKGBUILD b/community/virtualgl/PKGBUILD
index 0f6721646..7ec063ca8 100644
--- a/community/virtualgl/PKGBUILD
+++ b/community/virtualgl/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Andres Jimenez
 
 pkgname=virtualgl
-pkgver=2.3.2
-pkgrel=4
+pkgver=2.3.3
+pkgrel=1
 pkgdesc="Redirects 3D commands from an OpenGL application onto a server-side 3D graphics card"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://virtualgl.org"
@@ -12,7 +12,7 @@ license=('LGPL')
 depends=('libxv' 'glu' 'libjpeg-turbo')
 makedepends=('cmake' 'mesa')
 source=("http://downloads.sourceforge.net/project/virtualgl/VirtualGL/$pkgver/VirtualGL-$pkgver.tar.gz")
-sha1sums=('f042862c21ceaba57c6e1f0ec72adb4f838725e9')
+sha1sums=('7128fc546f0bc65a74296e19d474e52d41acbf47')
  
 build() {
   cd "$srcdir/VirtualGL-$pkgver"
diff --git a/community/virtviewer/PKGBUILD b/community/virtviewer/PKGBUILD
index 7035a24a1..9251089ef 100644
--- a/community/virtviewer/PKGBUILD
+++ b/community/virtviewer/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 95330 2013-08-09 16:10:52Z spupykin $
+# $Id: PKGBUILD 105236 2014-02-03 09:59:08Z heftig $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=virtviewer
-pkgver=0.5.7
-pkgrel=1
+pkgver=0.6.0
+pkgrel=2
 pkgdesc="A lightweight interface for interacting with the graphical display of virtualized guest OS."
-depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt' 'spice-gtk3')
+depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt' 'spice-gtk3' 'desktop-file-utils')
 makedepends=('intltool')
 url="http://virt-manager.et.redhat.com"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
+install=virtviewer.install
 source=("http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-$pkgver.tar.gz")
-md5sums=('c0d6d2de66e61df6c2ad339625c58a2a')
+md5sums=('a3d7dd877105117e36185378ee1849ee')
 
 build() {
   cd $srcdir/virt-viewer-$pkgver
-  ./configure --prefix=/usr --with-gtk=3.0
+  ./configure --prefix=/usr --with-gtk=3.0 --disable-update-mimedb
   make
 }
 
diff --git a/nonprism/banshee-nonprism/banshee.install b/community/virtviewer/virtviewer.install
index 079ac953d..4d07c984a 100644
--- a/nonprism/banshee-nonprism/banshee.install
+++ b/community/virtviewer/virtviewer.install
@@ -1,15 +1,13 @@
-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
+  update-mime-database /usr/share/mime > /dev/null
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  post_install $1
+  post_install
 }
diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD
index 5db9de80b..3a1a84a16 100644
--- a/community/vtk/PKGBUILD
+++ b/community/vtk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98818 2013-10-19 13:44:45Z bpiotrowski $
+# $Id: PKGBUILD 105095 2014-01-31 14:18:52Z aginiewicz $
 # Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
@@ -12,13 +12,13 @@
 
 pkgname=vtk
 pkgver=5.10.1
-pkgrel=10
+pkgrel=11
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.'
 arch=('i686' 'x86_64')
 url='http://www.vtk.org/'
 license=('BSD')
 depends=('libjpeg-turbo' 'boost' 'ffmpeg' 'qt4' 'lesstif' 'mariadb' 'hdf5' 'libgl')
-makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa-libgl' 'python2' 'tk')
+makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa-libgl' 'python2' 'tk' 'wget')
 optdepends=('python2: python bindings'
             'java-runtime: java bindings'
             'tk: tcl bindings'
@@ -26,14 +26,16 @@ optdepends=('python2: python bindings'
             'graphviz: drawing tools')
 source=("http://www.vtk.org/files/release/${pkgver:0:4}/vtk-${pkgver}.tar.gz"
         "http://www.vtk.org/files/release/${pkgver:0:4}/vtkdata-${pkgver}.tar.gz"
-        ffmpeg-0.8.diff ffmpeg-0.11.diff ffmpeg-2.0.diff tcl-8.6.diff python-destdir.diff)
+        ffmpeg-0.8.diff ffmpeg-0.11.diff ffmpeg-2.0.diff
+        tcl-8.6.diff python-destdir.diff freetype.diff)
 md5sums=('264b0052e65bd6571a84727113508789'
          'b6355063264cd56bcd1396c92f6ca59a'
          'e992321c9d1def6034d0fa6607b40c5a'
          '81922ea61989e5591135f233a0400694'
          '4ff5668957336709dcd096fbac102558'
          'a804a9f034e24ef1a8b28542c15ce1a1'
-         'f7aba715bcc10de93a6ecf1cd6b0c560')
+         'f7aba715bcc10de93a6ecf1cd6b0c560'
+         '1e45b3664b395c70017ff46d3370c84d')
 
 build() {
   cd "${srcdir}"/VTK$pkgver
@@ -44,6 +46,7 @@ build() {
   patch -Np1 -i "${srcdir}/ffmpeg-2.0.diff"
   patch -Np1 -i "${srcdir}/tcl-8.6.diff"
   patch -Np1 -i "${srcdir}/python-destdir.diff"
+  patch -Np1 -i "${srcdir}/freetype.diff"
 
   cd "${srcdir}"
 
diff --git a/community/vtk/freetype.diff b/community/vtk/freetype.diff
new file mode 100644
index 000000000..03753ee3f
--- /dev/null
+++ b/community/vtk/freetype.diff
@@ -0,0 +1,16 @@
+--- VTK5.10.1/CMake/FindFREETYPE.cmake.orig	2014-01-30 12:40:11.252760741 +0100
++++ VTK5.10.1/CMake/FindFREETYPE.cmake	2014-01-30 12:40:43.235853875 +0100
+@@ -10,9 +10,11 @@
+ # also defined, but not for general use are
+ # FREETYPE_LIBRARY, where to find the FREETYPE library.
+ 
+-FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h)
++FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
++  /usr/include/freetype2
++)
+ 
+-FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
++FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER config/ftheader.h
+   /usr/include/freetype2
+   /usr/local/include/freetype2
+   PATH_SUFFIXES freetype2  
diff --git a/community/vym/PKGBUILD b/community/vym/PKGBUILD
index 9106ca202..7e9d8b387 100644
--- a/community/vym/PKGBUILD
+++ b/community/vym/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 85424 2013-03-01 10:42:25Z andrea $
+# $Id: PKGBUILD 105317 2014-02-04 21:41:39Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> 
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: S�ren Holm <sgh@sgh.dk> 
+# Contributor: Søren Holm <sgh@sgh.dk> 
 
 pkgname=vym
 pkgver=2.2.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A mindmapping tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.insilmaril.de/vym/"
@@ -22,7 +22,7 @@ sha256sums=('fa6d088327feae80c4c6760454fba64fe253a7de6e7e46f45a4c7f7db9b998f4'
 build() {
   cd "${srcdir}"/$pkgname-$pkgver
 
-  qmake PREFIX=/usr
+  qmake-qt4 PREFIX=/usr
   make
 }
 
@@ -33,9 +33,10 @@ package() {
   make INSTALL_ROOT="${pkgdir}" install
 
 # correct doc location
-  install -d "${pkgdir}"/usr/share/doc/$pkgname
+  install -d "${pkgdir}"/usr/share/{doc/$pkgname,man/man1}
   install -m644 doc/* "${pkgdir}"/usr/share/doc/$pkgname
   rm -rf "${pkgdir}"/usr/share/doc/packages
+  mv "${pkgdir}"/usr/share/doc/vym/vym.1.gz "${pkgdir}"/usr/share/man/man1/
 
 # .desktop and icon file
   install -D -m644 "${srcdir}"/$pkgname.desktop \
diff --git a/community/vym/vym.changelog b/community/vym/vym.changelog
index 6344bbecd..ebbcbda5d 100644
--- a/community/vym/vym.changelog
+++ b/community/vym/vym.changelog
@@ -1,3 +1,6 @@
+2014-02-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* vym 2.2.4-3 FS#38753 fixed, qt4 rebuild finalized
+
 2012-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* vym 2.2.4-1
 
diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD
index eae9d26ce..53e252866 100644
--- a/community/weston/PKGBUILD
+++ b/community/weston/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 103053 2013-12-25 21:25:19Z andyrtr $
+# $Id: PKGBUILD 104875 2014-01-27 23:38:12Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Joel Teichroeb <joel@teichroeb.net>
 
 pkgname=weston
-pkgver=1.3.1
+pkgver=1.4.0
 pkgrel=2
 pkgdesc='Reference implementation of a Wayland compositor'
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,14 +11,14 @@ url='http://wayland.freedesktop.org'
 license=('MIT')
 depends=('libxkbcommon' 'libunwind' 'poppler-glib' 'mtdev' 'libxcursor' 'glu' 'pango' 'colord')
 source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz")
-sha1sums=('56acdfde4d1a3871d6e54f0cdbcf2736e73e979a')
+sha1sums=('49b0b6d5e2366a7bad5158b29998213e5ca7f254')
 
 build() {
 	cd $pkgname-$pkgver
 	./configure \
 		--prefix=/usr \
 		--libexecdir=/usr/lib/weston \
-		--enable-demo-clients
+		--enable-demo-clients-install
 	make
 }
 
diff --git a/community/winff/PKGBUILD b/community/winff/PKGBUILD
index efbf80827..df3f45a64 100644
--- a/community/winff/PKGBUILD
+++ b/community/winff/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96460 2013-08-29 16:47:40Z arodseth $
+# $Id: PKGBUILD 105386 2014-02-06 11:25:14Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: yugrotavele <yugrotavele at archlinux dot us>
 # Contributor: Paolo Stivanin <admin AT polslinux DOT it>
 
 pkgname=winff
-pkgver=1.5.2
+pkgver=1.5.3
 pkgrel=1
 pkgdesc='GUI for ffmpeg'
 url='http://code.google.com/p/winff/'
@@ -13,9 +13,8 @@ arch=('x86_64' 'i686')
 depends=('ffmpeg' 'gtk2' 'xterm' 'hicolor-icon-theme')
 makedepends=('lazarus' 'lazarus-gtk2' 'gendesk' 'tar')
 install='winff.install'
-source=("https://$pkgname.googlecode.com/files/WinFF-$pkgver-source.tar.gz")
-noextract=("WinFF-$pkgver-source.tar.gz")
-sha256sums=('9ee1c68173263dad8d07df2bd62e830d73e6546a0fa86b35de9be8b4c363434c')
+source=("$pkgname-$pkgver.tar.gz::https://docs.google.com/uc?authuser=0&id=0B8HoAIi30ZDkMHlvVkVtNHJnLVE&export=download")
+sha256sums=('ce82ef4359ef45d4c4a18977e49e403474cae4e3a948e90a66cc41068b3d5106')
 
 prepare() {
   gendesk -n \
@@ -23,12 +22,6 @@ prepare() {
     --pkgdesc "$pkgdesc" \
     --genericname 'Video converter' \
     --categories 'AudioVideo;AudioVideoEditing;GTK'
-
-  # The file provided by upstream is an "exploding tarball" where the files
-  # are not extracted in a directory. Also everything is set as executable. m)
-  mkdir -p "$pkgname"
-  cd "$pkgname"
-  tar zxf "../WinFF-$pkgver-source.tar.gz"
 }
 
 build() {
diff --git a/community/wireshark/PKGBUILD b/community/wireshark/PKGBUILD
index 2cda54a4b..70b2c2544 100644
--- a/community/wireshark/PKGBUILD
+++ b/community/wireshark/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 102796 2013-12-20 11:11:34Z tredaelli $
+# $Id: PKGBUILD 103931 2014-01-13 17:17:08Z andyrtr $
 # 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.5
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
diff --git a/community/wxcam/PKGBUILD b/community/wxcam/PKGBUILD
index 974971d91..ea750b50c 100644
--- a/community/wxcam/PKGBUILD
+++ b/community/wxcam/PKGBUILD
@@ -1,7 +1,8 @@
+# $Id: PKGBUILD 103835 2014-01-12 02:47:26Z eric $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=wxcam
 pkgver=1.1
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
 pkgdesc="Webcam application for linux"
@@ -9,24 +10,24 @@ pkgdesc="Webcam application for linux"
 # http://cimg.sourceforge.net/
 _CImg_ver=1.4.9
 url="http://wxcam.sourceforge.net"
-makedepends=('intltool>=0.35.0')
+makedepends=('intltool>=0.35.0' 'libsm')
 depends=('libglade' 'mjpegtools' 'perlxml' 'wxgtk' 'xvidcore' 'v4l-utils' 'alsa-lib')
 source=(http://downloads.sourceforge.net/wxcam/${pkgname}-${pkgver}.tar.bz2
 	    http://downloads.sourceforge.net/cimg/CImg-${_CImg_ver}.zip)
 md5sums=('c9ea8991b6375c1709a7ce4e61fcc263'
          'a07cba03f6d66a9970e0b3fcc230bddc')
 
-build() {
-    cp $srcdir/CImg-${_CImg_ver}/CImg.h $srcdir/$pkgname-$pkgver
+prepare() {
+    cp "$srcdir"/CImg-${_CImg_ver}/CImg.h "$srcdir"/$pkgname-$pkgver
+}
 
-    cd $srcdir/$pkgname-$pkgver
+build() {
+    cd "$srcdir"/$pkgname-$pkgver
     ./configure --prefix=/usr
     make
 }
 
 package() {
-    cd $srcdir/$pkgname-$pkgver
-    make DESTDIR=$pkgdir install
-
-    mv $pkgdir/usr/doc $pkgdir/usr/share/
+    cd "$srcdir"/$pkgname-$pkgver
+    make DESTDIR="$pkgdir" wxcamdocdir=/usr/share/doc/wxcam install
 }
diff --git a/community/wxgtk2.9/PKGBUILD b/community/wxgtk2.9/PKGBUILD
deleted file mode 100644
index 9497c57bf..000000000
--- a/community/wxgtk2.9/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 96072 2013-08-19 20:07:32Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=wxgtk2.9
-pkgver=2.9.5
-pkgrel=1
-pkgdesc="GTK+ implementation of wxWidgets API for GUI"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://wxwidgets.org"
-license=('custom:wxWindows')
-depends=('gtk2' 'gstreamer0.10-base')
-makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2')
-optdepends=('webkitgtk2: for webview support')
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2
-        wxGTK-2.9.5-collision.patch)
-sha1sums=('0bab57ecd6d065a3672ec5fbb09d287456727ea4'
-          '22f21e91d847779f17cace8cfde553ab1ffac279')
-
-prepare() {
-  cd wxWidgets-${pkgver}
-  patch -p1 -i ../wxGTK-2.9.5-collision.patch
-}
-
-build() {
-  cd wxWidgets-${pkgver}
-  ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
-    --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \
-    --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
-    --disable-precomp-headers
-  make
-  make -C locale allmo
-}
-
-package() {
-  cd wxWidgets-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community/wxgtk2.9/wxGTK-2.9.5-collision.patch b/community/wxgtk2.9/wxGTK-2.9.5-collision.patch
deleted file mode 100644
index 4d7090581..000000000
--- a/community/wxgtk2.9/wxGTK-2.9.5-collision.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Prevent file collisions between multiple installed SLOTs.
-
-  - Don't install wxwin.m4.  It is installed with app-admin/eselect-wxwidgets.
-  - Version the bakefile preset filenames.  Unversioned symlinks to these files
-    are handled by eselect.
-  - Version wx-config and wxrc.  The unversioned forms are wrapper scripts
-    installed with eselect-wxwidgets.
-  - Version wxstd.mo and modify AddStdCatalog to use it.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -14076,10 +14076,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
- 
- install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
--	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
--	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
--	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
-+	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
-+	for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
-+	$(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
- 	$(DYLIB_RPATH_INSTALL)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
- 	for f in setup.h $(RCDEFS_H); do \
-@@ -14964,15 +14964,16 @@ install-wxconfig:
- 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
- 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
--	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) ../`basename $(libdir)`/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
--
-+	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
-+	&& $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
- locale_install: 
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
- 	for l in $(LOCALE_LINGUAS) ; do \
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
- 	if test -f $(srcdir)/locale/$$l.mo ; then \
--	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
-+	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo \
-+	$(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
- 	fi ; \
- 	done
- 
---- a/build/bakefiles/wx.bkl
-+++ b/build/bakefiles/wx.bkl
-@@ -138,7 +138,7 @@
-         <using module="gettext"/>
-         <gettext-catalogs id="locale">
-             <srcdir>$(SRCDIR)/locale</srcdir>
--            <catalog-name>wxstd</catalog-name>
-+            <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
-             <linguas>
-                 ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
-                 zh zh_CN zh_TW
---- a/src/common/translation.cpp
-+++ b/src/common/translation.cpp
-@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
- 
- bool wxTranslations::AddStdCatalog()
- {
--    if ( !AddCatalog(wxS("wxstd")) )
-+    if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) )
-         return false;
- 
-     // there may be a catalog with toolkit specific overrides, it is not
---- a/utils/wxrc/Makefile.in
-+++ b/utils/wxrc/Makefile.in
-@@ -124,7 +124,6 @@ distclean: clean
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
- @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
- @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
--@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
- 
- @COND_USE_XRC_1@uninstall_wxrc: 
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
---- a/Makefile.in	2013-07-17 18:32:11.705720544 -0400
-+++ b/Makefile.in	2013-07-17 18:39:24.134286555 -0400
-@@ -16124,7 +16124,7 @@
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
- 	if test -f $(srcdir)/locale/msw/$$l.mo ; then \
--	$(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \
-+	$(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \
- 	fi ; \
- 	done
- 
diff --git a/community/xbindkeys/PKGBUILD b/community/xbindkeys/PKGBUILD
index 2d71c8a37..b71dd164d 100644
--- a/community/xbindkeys/PKGBUILD
+++ b/community/xbindkeys/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 92556 2013-06-08 11:18:52Z bpiotrowski $
+# $Id: PKGBUILD 103379 2014-01-04 20:12:41Z bluewind $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 
 pkgname=xbindkeys
-pkgver=1.8.5
-pkgrel=4
+pkgver=1.8.6
+pkgrel=1
 pkgdesc="Launch shell commands with your keyboard or your mouse under X"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/xbindkeys/xbindkeys.html"
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('libx11' 'guile')
 optdepends=('tk: xbindkeys_show')
 source=(http://www.nongnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('4b66a05594dbc6888c0a6439351aa66d')
+md5sums=('c6ea9db56e075dae0697497e2ed390cc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD
index 943912d3b..a2c71d3ea 100644
--- a/community/xboard/PKGBUILD
+++ b/community/xboard/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 97844 2013-09-30 10:04:25Z spupykin $
+# $Id: PKGBUILD 104711 2014-01-24 18:40:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jason Chu <jason@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=xboard
-pkgver=4.7.2
-pkgrel=3
+pkgver=4.7.3
+pkgrel=1
 pkgdesc="Graphical user interfaces for chess"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/xboard/"
 license=('GPL3')
-depends=('gnuchess' 'texinfo' 'xdg-utils'
-	 'xorg-fonts-75dpi' 'xorg-fonts-100dpi'
-	 'gtk2' 'cairo' 'librsvg')
-optdepends=('perl')
+depends=('texinfo' 'xdg-utils' 'gtk2' 'cairo' 'librsvg')
+optdepends=('gnuchess: chess engine'
+	    'perl')
 install=${pkgname}.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('83ec086cbf5c4bc362a188654a9332fc')
+md5sums=('5ad06ca818c29f499ba227ea3d19df14')
 
 build() {
   cd "${pkgname}-${pkgver}"
diff --git a/community/xchm/PKGBUILD b/community/xchm/PKGBUILD
index f2fd50ac3..2e443ca4e 100644
--- a/community/xchm/PKGBUILD
+++ b/community/xchm/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 102193 2013-12-06 12:52:51Z giovanni $
+# $Id: PKGBUILD 103807 2014-01-11 20:08:41Z eric $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=xchm
 pkgver=1.23
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform GUI front-end to chmlib"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xchm.sourceforge.net/"
 license=('GPL')
-depends=('chmlib' 'wxgtk' 'desktop-file-utils')
+depends=('chmlib' 'wxgtk2.8' 'desktop-file-utils')
 install=xchm.install
 source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz"
         'xchm.desktop'
@@ -21,7 +21,8 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-  ./configure --prefix=/usr \
+  #export WX_CONFIG_PATH=/usr/bin/wx-config-2.8
+  ./configure --prefix=/usr --with-wx-config=wx-config-2.8 \
               --build=$CHOST \
               --host=$CHOST
   make
diff --git a/community/xdelta3/PKGBUILD b/community/xdelta3/PKGBUILD
index bd8d6cd9f..d629379ea 100644
--- a/community/xdelta3/PKGBUILD
+++ b/community/xdelta3/PKGBUILD
@@ -1,31 +1,44 @@
-# $Id: PKGBUILD 90967 2013-05-16 19:50:32Z bpiotrowski $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 105087 2014-01-31 12:10:31Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com>
 # Contributor: Henning Garus <henning.garus@gmail.com>
 
 pkgname=xdelta3
-pkgver=3.0.7
+pkgver=3.0.8
 pkgrel=1
-pkgdesc="Diff utility which works with binary files"
+pkgdesc='Diff utility which works with binary files'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://xdelta.org/"
+url='http://xdelta.org/'
 license=('GPL')
 depends=('xz')
-source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('ef6631e4f9219a80bcb9e3020962b6ec')
+source=("http://${pkgname/3}.googlecode.com/files/$pkgname-$pkgver.tar.xz"
+        'regtest_size_t.patch')
+# SHA1 sum from https://code.google.com/p/xdelta/downloads/detail?name=xdelta3-3.0.8.tar.xz&can=2&q=        
+sha1sums=('62c7a029e96c0904bb47a5e2f3de08473a185539'
+          'c2816b5d4bfb405d3adb771fa09b367a88971240')
 
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
+prepare() {
+  cd "$pkgname-$pkgver"
+  
+  patch -Np1 -i ../regtest_size_t.patch
 }
 
 check() {
-  cd $pkgname-$pkgver
-  ./xdelta3 test
+  cd "$pkgname-$pkgver"
+
+  ./$pkgname test
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+  
+  ./configure --prefix=/usr
+  make
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/xdelta3/regtest_size_t.patch b/community/xdelta3/regtest_size_t.patch
new file mode 100644
index 000000000..e048135bd
--- /dev/null
+++ b/community/xdelta3/regtest_size_t.patch
@@ -0,0 +1,11 @@
+--- a/testing/regtest.cc
++++ b/testing/regtest.cc
+@@ -12,7 +12,7 @@ public:
+     Options() : encode_srcwin_maxsz(1<<20),
+		block_size(Constants::BLOCK_SIZE),
+		size_known(false) { }
+-    size_t encode_srcwin_maxsz;
++    uint64_t encode_srcwin_maxsz;
+     size_t block_size;
+     bool size_known;
+   };
diff --git a/community/xjadeo/PKGBUILD b/community/xjadeo/PKGBUILD
index 1269ee7ea..3665fc78e 100644
--- a/community/xjadeo/PKGBUILD
+++ b/community/xjadeo/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 101054 2013-11-15 17:47:59Z speps $
+# $Id: PKGBUILD 105623 2014-02-12 07:14:19Z schiv $
 # Maintainer : speps <speps at aur dot archlinux dot org>
 
 pkgname=xjadeo
 pkgver=0.7.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple video player that is synchronized to jack transport."
 arch=('i686' 'x86_64')
 url="http://xjadeo.sourceforge.net"
 license=('GPL')
-depends=('ffmpeg' 'ffmpeg-compat' 'imlib2' 'jack' 'liblo' 'libxpm' 'libxv' 'portmidi')
+depends=('ffmpeg' 'ffmpeg-compat' 'imlib2' 'jack' 'liblo>=0.28' 'libxpm' 'libxv' 'portmidi')
 makedepends=('qt4')
 optdepends=('qt4: for the GUI (qjadeo)')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD
index 258f5d9de..2c6b9618b 100644
--- a/community/xl2tpd/PKGBUILD
+++ b/community/xl2tpd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91508 2013-05-23 10:16:34Z spupykin $
+# $Id: PKGBUILD 104644 2014-01-24 07:01:07Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Hengfu <rhfcaesar@gmail.com>
 
 pkgname=xl2tpd
-pkgver=1.3.1
-pkgrel=3
+pkgver=1.3.6
+pkgrel=1
 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xelerance.com/services/software/xl2tpd/"
@@ -19,7 +19,7 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$p
 	xl2tpd.service
 	xl2tpd.tmpfiles
 	ipparam.patch)
-md5sums=('38c2461d3562f98b08454ca403706886'
+md5sums=('2f526cc0c36cf6d8a74f1fb2e08c18ec'
          '5f0ae07026e61a3dd15a76fd4144a6d5'
          '16ed0886115d4dcc21072cfb847250bb'
          'ed57eb67335cdf246251285dad502cc7'
@@ -30,7 +30,7 @@ md5sums=('38c2461d3562f98b08454ca403706886'
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  patch -p1 <$srcdir/ipparam.patch
+#  patch -p1 <$srcdir/ipparam.patch
 
   make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr SBINDIR=/usr/bin
 }
diff --git a/community/xmind/PKGBUILD b/community/xmind/PKGBUILD
index be506239e..26b9502c2 100644
--- a/community/xmind/PKGBUILD
+++ b/community/xmind/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id$
+# $Id: PKGBUILD 105001 2014-01-29 18:13:52Z fyan $
 # 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.4.0
-_pkgdate=201311050558
+pkgver=3.4.1
+_pkgdate=201401221918
 pkgrel=1
 pkgdesc="Brainstorming and Mind Mapping Software"
 arch=('i686' 'x86_64')
@@ -17,11 +17,10 @@ depends=('desktop-file-utils' 'fontconfig' 'libxrender' 'java-runtime' 'shared-m
 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=('7e5d4a8218397cdefa5a6c4ecaed7cbd')
-[ "${CARCH}" = "x86_64" ] && md5sums=('6dcaeb46ab9b88c1904f594b9b1eebc8')
+[ "${CARCH}" = "i686" ] && sha512sums=('780fb661d51d68326d4478810d806eab4312b6f21538d4f2dde786f63bd2b9527ec73c25414b83e5aecf496ef78da932697cab2ef099005966a9b13d0f0c5413')
+[ "${CARCH}" = "x86_64" ] && sha512sums=('bfa6f4f3b07091c667fb05fcb4a9f22594f474c6dc34d1439f60bb3769c3c62d583366c2ebd61779c152461553537a2422627f8ad7006be5400f59d4553583f6')
 
 build() {
-  cd "${srcdir}"
   ar x "${pkgname}-linux-${pkgver}.${_pkgdate}_${_arch}.deb"
   bsdtar -xf data.tar.gz
 }
diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD
index 1fcca5cd7..1a5740fcb 100644
--- a/community/xmms2/PKGBUILD
+++ b/community/xmms2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 97846 2013-09-30 10:05:03Z spupykin $
+# $Id: PKGBUILD 104903 2014-01-28 03:34:35Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=xmms2
 pkgver=0.8DrO_o
-pkgrel=20
+pkgrel=23
 pkgdesc="complete rewrite of the popular music player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmms2.org/"
diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD
index a6abea19e..20e14ca5a 100644
--- a/community/xmobar/PKGBUILD
+++ b/community/xmobar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99437 2013-10-28 20:54:44Z jelle $
+# $Id: PKGBUILD 105371 2014-02-06 05:24:17Z bisson $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=xmobar
 pkgver=0.19
-pkgrel=1
+pkgrel=2
 pkgdesc="A Minimalistic Text Based Status Bar"
 url="http://hackage.haskell.org/package/xmobar"
 license=('custom:BSD3')
diff --git a/community/xnee/PKGBUILD b/community/xnee/PKGBUILD
index 44f82123d..fb5c09419 100644
--- a/community/xnee/PKGBUILD
+++ b/community/xnee/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 100021 2013-10-31 03:03:11Z allan $
+# $Id: PKGBUILD 105302 2014-02-04 19:29:39Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 
 pkgname=xnee
-pkgver=3.16
+pkgver=3.17
 pkgrel=1
 pkgdesc="A program to record, distribute, and replay X (X11) protocol data"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,19 +15,21 @@ optdepends=('xosd: feedback support')
 options=('!emptydirs')
 source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
         gnee.desktop)
-sha256sums=('07393d84d7abfab607b5ba078a0c32411815b7c883317356f6b92f7bbf3176fe'
+sha256sums=('c76d1c8b9deff2e52721e474cb69cf092c0d72212c916c6dacc94e33618c8638'
             'de42d419a46083e39a9b6d60c045c1cd68deb793cc5166a86df81dff608387c1')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
 
   ./configure --prefix=/usr --enable-gui --enable-lib --disable-static --disable-static-programs
   make
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
 
-  make DESTDIR=${pkgdir} install
-  install -Dm644 ${srcdir}/gnee.desktop ${pkgdir}/usr/share/applications/gnee.desktop
+  make DESTDIR="${pkgdir}" install
+
+#.desktop file
+  install -Dm644 "${srcdir}"/gnee.desktop "${pkgdir}"/usr/share/applications/gnee.desktop
 }
diff --git a/community/xnee/xnee.changelog b/community/xnee/xnee.changelog
index d72b4493b..aa157b6be 100644
--- a/community/xnee/xnee.changelog
+++ b/community/xnee/xnee.changelog
@@ -1,3 +1,6 @@
+2014-02-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* xnee 3.17-1
+
 2013-07-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* xnee 3.16-1
 
diff --git a/community/xtrabackup/PKGBUILD b/community/xtrabackup/PKGBUILD
new file mode 100644
index 000000000..d90eeb4a8
--- /dev/null
+++ b/community/xtrabackup/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+
+pkgname=xtrabackup
+pkgver=2.1.7
+pkgrel=3
+pkgdesc='Non-blocking backup tool for MySQL'
+arch=('i686' 'x86_64')
+url='http://www.percona.com/software/percona-xtrabackup/'
+license=('GPL')
+depends=('libaio' 'libgcrypt' 'openssl')
+makedepends=('cmake' 'python-sphinx' 'zlib')
+source=(http://percona.com/redir/downloads/XtraBackup/XtraBackup-$pkgver/source/percona-xtrabackup-$pkgver.tar.gz
+        build.patch)
+
+build() {
+  cd percona-xtrabackup-$pkgver
+
+  utils/build.sh xtradb55
+  cp src/xtrabackup_55 src/xbstream src/xbcrypt .
+  utils/build.sh xtradb56
+  cp src/xtrabackup_56 .
+
+  cd doc
+  make man
+}
+
+package() {
+  cd percona-xtrabackup-$pkgver
+
+  for file in innobackupex xtrabackup_55 xtrabackup_56 xbcrypt xbstream; do
+    install -Dm0755 $file "$pkgdir"/usr/bin/$file
+  done
+
+  cd doc/build/man
+  for file in *.1; do
+    install -Dm0644 $file "$pkgdir"/usr/share/man/man1/$file
+  done
+}
+
+sha256sums=('b0a89dd805fe25d1fd00c3f84b43d59e88173a19e2075d444a116118e2623587'
+            'e6f329c061c921be6e44e16fd64d79bcca8c61ea1ce4a1d2f923408d30318b25')
diff --git a/community/xtrabackup/build.patch b/community/xtrabackup/build.patch
new file mode 100644
index 000000000..fc2ef2866
--- /dev/null
+++ b/community/xtrabackup/build.patch
@@ -0,0 +1,11 @@
+--- utils/build.sh.orig 2014-01-24 10:37:41.206535420 +0100
++++ utils/build.sh      2014-01-24 10:44:00.841407894 +0100
+@@ -167,6 +167,9 @@
+     tar xzf $top_dir/$1
+     cd $dirname
+     patch -p1 < $top_dir/patches/$2
++    sed 's|srv_buf_size|srv_sort_buf_size|g' -i \
++        sql/sql_planner.cc \
++        storage/innobase/row/row0log.cc
+     cd -
+ }
diff --git a/community/xulrunner/PKGBUILD b/community/xulrunner/PKGBUILD
index fe3c629d2..8fe4e064a 100644
--- a/community/xulrunner/PKGBUILD
+++ b/community/xulrunner/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 103127 2013-12-26 20:12:06Z bpiotrowski $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 105483 2014-02-09 04:20:46Z cbehan $
+# Maintainer: Connor Behan <connor.behan@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xulrunner
-pkgver=23.0.1
+pkgver=27.0
 pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13')
+depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'libvpx' 'python2')
+makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'gstreamer0.10-base')
 url="http://wiki.mozilla.org/XUL:Xul_Runner"
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2
         mozconfig
         mozilla-pkgconfig.patch
         shared-libs.patch)
-options=('!emptydirs')
+options=('!emptydirs' '!makeflags' 'staticlibs')
 replaces=('xulrunner-oss')
-sha256sums=('50d70813cee1c966a6037957206626bb62dc047b011d2e4fab11c559008f9336'
-            '3fba82b327f8825ebe93ceaeaea4968d57cf7d700f40bf4457b06d263bcc2e8f'
+sha256sums=('4f6125c053e12c4ac3317b075e289b10ce470dd90ed6fc43c4572bf1acc64981'
+            '8455f7bc00e8ad6e69bba43171083c778420a8b1c566347ed5381ae9cf98191a'
             '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269'
             'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1')
 
@@ -44,16 +45,17 @@ build() {
   cd "$srcdir/mozilla-release"
 
   export PATH="$srcdir/python2-path:$PATH"
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver"
+  export LDFLAGS="$LDFALGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver"
   export PYTHON="/usr/bin/python2"
 
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  make -j1 -f client.mk build
 }
 
 package() {
   cd "$srcdir/mozilla-release"
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
+  # Use system-provided dictionaries
   rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation}
   ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries"
   ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation"
@@ -63,6 +65,8 @@ package() {
   echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf
 
   chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
+  chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpcshell"
+  ln -s /usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpcshell "${pkgdir}/usr/lib/xulrunner-$pkgver/xpcshell"
   sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \
     "$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin/{xpt,header,typelib,xpidl}.py
 }
diff --git a/community/xulrunner/freetype-headers.patch b/community/xulrunner/freetype-headers.patch
new file mode 100644
index 000000000..20a5b19ca
--- /dev/null
+++ b/community/xulrunner/freetype-headers.patch
@@ -0,0 +1,66 @@
+diff -Nur mozilla-release.orig/config/system-headers mozilla-release/config/system-headers
+--- mozilla-release.orig/config/system-headers
++++ mozilla-release/config/system-headers
+@@ -408,16 +408,29 @@ freetype/ftoutln.h
+ freetype/ttnameid.h
+ freetype/tttables.h
+ freetype/t1tables.h
+ freetype/ftlcdfil.h
+ freetype/ftsizes.h
+ freetype/ftadvanc.h
+ freetype/ftbitmap.h
+ freetype/ftxf86.h
++freetype.h
++ftcache.h
++ftglyph.h
++ftsynth.h
++ftoutln.h
++ttnameid.h
++tttables.h
++t1tables.h
++ftlcdfil.h
++ftsizes.h
++ftadvanc.h
++ftbitmap.h
++ftxf86.h
+ fribidi/fribidi.h
+ FSp_fopen.h
+ fstream
+ fstream.h
+ ft2build.h
+ fts.h
+ gconf/gconf-client.h
+ Gdiplus.h
+diff -Nur mozilla-release.orig/js/src/config/system-headers mozilla-release/js/src/config/system-headers
+--- mozilla-release.orig/js/src/config/system-headers
++++ mozilla-release/js/src/config/system-headers
+@@ -408,16 +408,29 @@ freetype/ftoutln.h
+ freetype/ttnameid.h
+ freetype/tttables.h
+ freetype/t1tables.h
+ freetype/ftlcdfil.h
+ freetype/ftsizes.h
+ freetype/ftadvanc.h
+ freetype/ftbitmap.h
+ freetype/ftxf86.h
++freetype.h
++ftcache.h
++ftglyph.h
++ftsynth.h
++ftoutln.h
++ttnameid.h
++tttables.h
++t1tables.h
++ftlcdfil.h
++ftsizes.h
++ftadvanc.h
++ftbitmap.h
++ftxf86.h
+ fribidi/fribidi.h
+ FSp_fopen.h
+ fstream
+ fstream.h
+ ft2build.h
+ fts.h
+ gconf/gconf-client.h
+ Gdiplus.h
diff --git a/community/xulrunner/mozconfig b/community/xulrunner/mozconfig
index 6679dac21..d2078e936 100644
--- a/community/xulrunner/mozconfig
+++ b/community/xulrunner/mozconfig
@@ -15,15 +15,17 @@ 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
 
 # Features
 ac_add_options --enable-startup-notification
-#ac_add_options --enable-gstreamer
-
+ac_add_options --enable-gstreamer
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-tests
 ac_add_options --disable-installer
+
+# https://bugzilla.mozilla.org/show_bug.cgi?id=955876
+ac_add_options --enable-release
diff --git a/community/xwax/PKGBUILD b/community/xwax/PKGBUILD
index 7de1ebc5c..5bae4061f 100644
--- a/community/xwax/PKGBUILD
+++ b/community/xwax/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 92791 2013-06-15 08:44:39Z lfleischer $
+# $Id: PKGBUILD 105538 2014-02-09 21:37:01Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: sputnick <gilles DOT quenot AT gmail DOT com>
 
 pkgname=xwax
-pkgver=1.4
+pkgver=1.5
 pkgrel=1
 pkgdesc='Open-source vinyl emulation software for Linux.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('cdparanoia: for CD import'
             'mpg123: for MP3 import'
             'ffmpeg: for video fallback import')
 source=("http://www.xwax.co.uk/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('01afde1f1222fca38eab736e0b3df116')
+md5sums=('7c2f30c3a9a71c4dba107e3eb9b40430')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD
index 3af26cb5e..34cf9ec12 100644
--- a/community/yaz/PKGBUILD
+++ b/community/yaz/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 100025 2013-10-31 03:04:33Z allan $
+# $Id: PKGBUILD 105395 2014-02-06 17:52:44Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,7 +7,7 @@
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
 
 pkgname=yaz
-pkgver=5.0.1
+pkgver=5.0.12
 pkgrel=1
 pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ license=('BSD')
 depends=('openssl' 'libxslt' 'icu')
 changelog=$pkgname.changelog
 source=(http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('4792096db2175b8e3553dec5f3762efab9b1b9d0f84acceec0690ddcf7954a11')
+sha256sums=('bf84f42cd442564bb911e869033c876c7ff561e203ae35504b8ca64f8575a8eb')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
@@ -34,3 +34,4 @@ package() {
 
   install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 }
+sha256sums=('4501bbeee665e34ad480508e83fbe8b65d2b5fd0a8194077f1b4235b616a846e')
diff --git a/community/yaz/yaz.changelog b/community/yaz/yaz.changelog
index 7198259b5..2ee2a0a8a 100644
--- a/community/yaz/yaz.changelog
+++ b/community/yaz/yaz.changelog
@@ -1,3 +1,9 @@
+2014-02-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* yaz 5.0.12-1
+
+2013-10-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* yaz 5.0.9-1
+
 2013-10-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* yaz 5.0.1-1
 
diff --git a/community/zbar/PKGBUILD b/community/zbar/PKGBUILD
index a18821a4b..a90744275 100644
--- a/community/zbar/PKGBUILD
+++ b/community/zbar/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 104504 2014-01-22 01:50:17Z eric $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Marti Raudsepp <marti@juffo.org>
 # Contributor: Radu Andries <admiral0@tuxfamily.org>
@@ -6,7 +6,7 @@
 
 pkgname=zbar
 pkgver=0.10
-pkgrel=4
+pkgrel=5
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('i686' 'x86_64')
 url="http://zbar.sourceforge.net/"
@@ -29,6 +29,7 @@ build() {
   msg 'Running make...'
   make
 }
+
 package() {
   cd zbar-$pkgver
   make DESTDIR="$pkgdir" install
diff --git a/community/zynaddsubfx/PKGBUILD b/community/zynaddsubfx/PKGBUILD
index 1e3602001..f36efad23 100644
--- a/community/zynaddsubfx/PKGBUILD
+++ b/community/zynaddsubfx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72810 2012-06-22 13:58:49Z spupykin $
+# $Id: PKGBUILD 103709 2014-01-10 12:47:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=zynaddsubfx
 pkgver=2.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Opensource software synthesizer capable of making a countless number of instruments."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://zynaddsubfx.sourceforge.net"
@@ -15,31 +15,26 @@ depends=('fltk' 'libgl' 'fftw' 'lash' 'mxml')
 makedepends=('cmake' 'pkgconfig' 'mesa' 'setconf' 'gendesk')
 options=('!emptydirs')
 source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/ZynAddSubFX-$pkgver.tar.bz2"
-	"http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch"
-	"http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch"
-	"$pkgname.svg"
-	"zynaddsubfx-2.4.3-no_sse_generic.patch")
+	"$pkgname.svg")
 md5sums=('2e8994cc54e5f1a64b77dfac3baf0d9a'
-         'eb95d339ff5deac8c6b54965f04a8c60'
-         '49464a33ab9c4250520eda0df7705663'
-         '6f7e9c3ce3947088a10c99c46a65431f'
-	 'd997b35b47eff56a2d056df61b737ddc')
+         '6f7e9c3ce3947088a10c99c46a65431f')
 
 build() {
   cd "$srcdir"
-  gendesk
+  gendesk $startdir/PKGBUILD
   setconf "$pkgname.desktop" Icon "$pkgname.svg"
 
   cd "ZynAddSubFX-$pkgver"
 
-  # patches
-#  patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk.patch"
-#  patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk13.patch"
-  patch -Np1 -i ${srcdir}/zynaddsubfx-2.4.3-no_sse_generic.patch
   sed -i '1,1i#include <unistd.h>' src/Nio/NulEngine.cpp
 
   [ -d build ] || mkdir build && cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DOutputModule=jack -DGuiModule=fltk ..
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DDefaultOutput=jack \
+    -DDefaultInput=jack \
+    -DGuiModule=fltk \
+    ..
   make
 
   # build external programs
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index 8009c93f1..edd433c64 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,18 +1,20 @@
-# $Id: PKGBUILD 201559 2013-12-15 06:41:35Z allan $
+# $Id: PKGBUILD 205615 2014-02-10 03:07:50Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=binutils
 pkgver=2.24
-pkgrel=1
+pkgrel=2
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/binutils/"
 license=('GPL')
 groups=('base-devel')
-depends=('glibc>=2.18' 'zlib')
+depends=('glibc>=2.19' 'zlib')
 checkdepends=('dejagnu' 'bc')
+conflicts=('binutils-multilib')
+replaces=('binutils-multilib')
 options=('staticlibs' '!distcc' '!ccache')
 install=binutils.install
 source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig})
@@ -36,7 +38,7 @@ build() {
     --with-bugurl=https://bugs.archlinux.org/ \
     --enable-threads --enable-shared \
     --enable-ld=default --enable-gold --enable-plugins \
-    --disable-werror --disable-multilib
+    --disable-werror
 
   # check the host environment and makes sure all the necessary tools are available
   make configure-host
diff --git a/core/crda/PKGBUILD b/core/crda/PKGBUILD
index 2a6568539..97541e8dd 100644
--- a/core/crda/PKGBUILD
+++ b/core/crda/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 186207 2013-05-22 04:47:50Z foutrelis $
+# $Id: PKGBUILD 203561 2014-01-13 17:11:37Z andyrtr $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=crda
 pkgver=1.1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Central Regulatory Domain Agent for wireless networks"
 arch=(i686 x86_64 'mips64el')
 url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
 license=('custom')
-depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd-tools' 'iw')
+depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd' 'iw')
 makedepends=('python2-m2crypto')
 install=crda.install
 source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index 985ca277c..3ca0ff89d 100644
--- a/core/cryptsetup/PKGBUILD
+++ b/core/cryptsetup/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202619 2013-12-22 13:44:39Z thomas $
+# $Id: PKGBUILD 203562 2014-01-13 17:11:38Z andyrtr $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=cryptsetup
 pkgver=1.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD
index 9cb6bee57..a12afcd78 100644
--- a/core/curl/PKGBUILD
+++ b/core/curl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202635 2013-12-23 02:04:37Z dreisner $
+# $Id: PKGBUILD 204940 2014-02-01 03:04:49Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
@@ -6,18 +6,18 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=curl
-pkgver=7.34.0
+pkgver=7.35.0
 pkgrel=1
 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')
+depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib')
 provides=('libcurl.so')
 options=('strip' 'debug')
 source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
         curlbuild.h)
-md5sums=('d5b7edccbd1793e3549842e01331da20'
+md5sums=('f5ae45ed6e86debb721b68392b5ce13c'
          'SKIP'
          '751bd433ede935c8fae727377625a8ae')
 
@@ -33,6 +33,7 @@ build() {
       --enable-manual \
       --enable-versioned-symbols \
       --enable-threaded-resolver \
+      --with-gssapi \
       --without-libidn \
       --with-random=/dev/urandom \
       --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD
index 1c2b0f966..3ce1871f0 100644
--- a/core/dbus/PKGBUILD
+++ b/core/dbus/PKGBUILD
@@ -1,32 +1,24 @@
-# $Id: PKGBUILD 200253 2013-11-23 20:09:30Z tomegun $
+# $Id: PKGBUILD 204675 2014-01-24 19:00:33Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
-pkgname=dbus
-pkgver=1.6.18
+pkgbase=dbus
+pkgname=('dbus' 'libdbus')
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64 mips64el)
 license=('GPL' 'custom')
-depends=('expat' 'coreutils' 'filesystem')
-makedepends=('libx11' 'systemd')
-optdepends=('libx11: dbus-launch support')
-provides=('dbus-core')
-conflicts=('dbus-core')
-replaces=('dbus-core')
+makedepends=('libx11' 'systemd' 'xmlto' 'docbook-xsl')
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz
-        30-dbus systemd-user-session.patch memleak.patch)
-md5sums=('b02e9c95027a416987b81f9893831061'
-         '3314d727fa57fc443fce25b5cbeebbcc'
-         'd8a1bd529b3ddca671ee1a695a143db9'
-         'cf86d68e39d975cec1e9f0342eb9b142')
+        30-dbus)
+md5sums=('059fbe84e39fc99c67a14f15b1f39dff'
+         '3314d727fa57fc443fce25b5cbeebbcc')
 
 prepare() {
   cd dbus-$pkgver
-  patch -Np1 -i ../systemd-user-session.patch
-  patch -Np1 -i ../memleak.patch
 }
 
 build() {
@@ -44,7 +36,13 @@ build() {
   make
 }
 
-package(){
+package_dbus(){
+  depends=('libdbus' 'expat')
+  optdepends=('libx11: dbus-launch support')
+  provides=('dbus-core')
+  conflicts=('dbus-core')
+  replaces=('dbus-core')
+
   cd dbus-$pkgver
   make DESTDIR="$pkgdir" install
 
@@ -53,4 +51,21 @@ package(){
   install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus"
 
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
+
+  # split out libdbus-1
+  rm -rf "$srcdir/_libdbus"
+  install -dm755 "$srcdir"/_libdbus/usr/lib/dbus-1.0
+  mv "$pkgdir"/usr/include "$srcdir"/_libdbus/usr/
+  mv "$pkgdir"/usr/lib/pkgconfig "$srcdir"/_libdbus/usr/lib/
+  mv "$pkgdir"/usr/lib/libdbus* "$srcdir"/_libdbus/usr/lib/
+  mv "$pkgdir"/usr/lib/dbus-1.0/include "$srcdir"/_libdbus/usr/lib/dbus-1.0/
+  install -Dm644 COPYING "$srcdir"/_libdbus/usr/share/licenses/libdbus/COPYING
+}
+
+package_libdbus(){
+  pkgdesc="DBus library"
+  depends=('glibc')
+
+
+  mv "$srcdir"/_libdbus/* "$pkgdir"
 }
diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index 3dc822836..412bbfaf9 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 199762 2013-11-15 21:24:38Z ronald $
+# $Id: PKGBUILD 205513 2014-02-06 15:35:30Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Tom Killian <tom.archlinux.org>
 # Contributor: Judd Vinet <jvinet.zeroflux.org>
 
 pkgname=dhcpcd
-pkgver=6.1.0
+pkgver=6.2.1
 pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/projects/dhcpcd/"
@@ -18,12 +18,12 @@ options=('emptydirs')  # We Need the Empty /var/lib/dhcpcd Directory
 source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2"
         'dhcpcd_.service'
         'dhcpcd.service')
-sha1sums=('dcd6970db0440398aaf3ae4b58cc262a67b2e472'
+sha1sums=('02319be210f10e73a3add726ae3fd96f69743cff'
           '6f1633edde14d29b5cdc09c4f029a450ef2ebc96'
-          '7f3e62908037b888df2f6b87af1c7611f462dd08')
+          '52c1bad9ab43e9a253c1eb175e7eefb13497b8f9')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   # configure variables
   ./configure \
@@ -37,18 +37,18 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
   # Install License
-  install -d $pkgdir/usr/share/licenses/$pkgname
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
   sed 26q "$srcdir/$pkgname-$pkgver/control.h" \
       >>"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   # Set Options in /etc/dhcpcd.conf
-  echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall
+  echo noipv4ll >> "${pkgdir}/etc/dhcpcd.conf" # Disable ip4vall
 
   # install systemd files
-  install -Dm644 ${srcdir}/dhcpcd_.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service
-  install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543
+  install -Dm644 "${srcdir}/dhcpcd_.service" "${pkgdir}/usr/lib/systemd/system/dhcpcd@.service"
+  install -Dm644 "${srcdir}/dhcpcd.service" "${pkgdir}/usr/lib/systemd/system/dhcpcd.service" # FS#31543
 }
diff --git a/core/dhcpcd/dhcpcd.service b/core/dhcpcd/dhcpcd.service
index 489023d3e..e7dc2890a 100644
--- a/core/dhcpcd/dhcpcd.service
+++ b/core/dhcpcd/dhcpcd.service
@@ -6,8 +6,8 @@ Before=network.target
 [Service]
 Type=forking
 PIDFile=/run/dhcpcd.pid
-ExecStart=/bin/dhcpcd -q -b
-ExecStop=/bin/dhcpcd -x
+ExecStart=/usr/bin/dhcpcd -q -b
+ExecStop=/usr/bin/dhcpcd -x
 
 [Install]
 WantedBy=multi-user.target
diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD
index 01252795c..afd113d74 100644
--- a/core/dialog/PKGBUILD
+++ b/core/dialog/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197224 2013-10-24 09:07:05Z foutrelis $
+# $Id: PKGBUILD 204572 2014-01-23 02:27:38Z 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_20130928
+pkgver=1.2_20140112
 pkgrel=1
 epoch=1
 pkgdesc="A tool to display dialog boxes from shell scripts"
@@ -15,7 +15,7 @@ license=('LGPL2.1')
 depends=('ncurses')
 options=('staticlibs')
 source=(ftp://invisible-island.net/$pkgname/$pkgname-${pkgver/_/-}.tgz)
-sha256sums=('6fcf8daa50335e4d08da9f4f5ea5e1025efe84c3a719a56e871eb83ed0fd2b4c')
+sha256sums=('8d30043872c57d4d3b3b05e4390ece356843f2a71303c91a2f8a536b369e0077')
 
 build() {
   cd "$srcdir/$pkgname-${pkgver/_/-}"
diff --git a/core/dirmngr/PKGBUILD b/core/dirmngr/PKGBUILD
index 30240c121..5159752ed 100644
--- a/core/dirmngr/PKGBUILD
+++ b/core/dirmngr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 184781 2013-05-08 13:18:15Z tpowa $
+# $Id: PKGBUILD 203563 2014-01-13 17:11:39Z andyrtr $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=dirmngr
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A daemon to handle CRL and certificate requests"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/core/dosfstools/PKGBUILD b/core/dosfstools/PKGBUILD
index 4714cb9a7..5f0137718 100644
--- a/core/dosfstools/PKGBUILD
+++ b/core/dosfstools/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 200725 2013-12-03 16:03:02Z tpowa $
+# $Id: PKGBUILD 204794 2014-01-27 09:03:20Z tpowa $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 pkgname=dosfstools
-pkgver=3.0.24
+pkgver=3.0.25
 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=('41931f36ebee6e79e9dafe85cc916f2b'
+md5sums=('6d000d9f68b7766dfe12c88c4aaaa293'
          'SKIP')
 
 build() {
diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD
index 2def1a4df..23b8784a2 100644
--- a/core/e2fsprogs/PKGBUILD
+++ b/core/e2fsprogs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197436 2013-10-26 01:07:56Z allan $
+# $Id: PKGBUILD 204953 2014-02-01 17:23:07Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=e2fsprogs
-pkgver=1.42.8
-pkgrel=2
+pkgver=1.42.9
+pkgrel=1
 pkgdesc="Ext2/3/4 filesystem utilities"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'MIT')
@@ -17,7 +17,7 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk
 backup=('etc/mke2fs.conf')
 options=('staticlibs')
 install=${pkgname}.install
-sha1sums=('79cdb2374a9c0e68f01739598679db06d546b897'
+sha1sums=('fb8e3662302bcab1682d567d6ee0ff051faa1bbd'
           'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb')
 
 build() {
@@ -44,7 +44,7 @@ package() {
   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
+  rm "${pkgdir}"/usr/lib/lib{com_err,e2p,ext2fs,ss}.a
 
   # install MIT license
   install -Dm644 "${srcdir}/MIT-LICENSE" \
diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD
index 2c1380caa..32337b30f 100644
--- a/core/file/PKGBUILD
+++ b/core/file/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 201433 2013-12-11 15:08:39Z allan $
+# $Id: PKGBUILD 205932 2014-02-14 08:16:42Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=file
-pkgver=5.16
+pkgver=5.17
 pkgrel=1
 pkgdesc="File type identification utility"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ groups=('base' 'base-devel')
 url="http://www.darwinsys.com/file/"
 depends=('glibc' 'zlib')
 source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('359c0cf41c3d438d17b4d293f3b950dc')
+md5sums=('e19c47e069ced7b01ccb4db402cc01d3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/flex/PKGBUILD b/core/flex/PKGBUILD
index 801252b58..51dccdc63 100644
--- a/core/flex/PKGBUILD
+++ b/core/flex/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196829 2013-10-20 11:50:22Z allan $
+# $Id: PKGBUILD 205933 2014-02-14 08:16:43Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=flex
-pkgver=2.5.37
+pkgver=2.5.38
 pkgrel=1
 pkgdesc="A tool for generating text-scanning programs"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,12 +11,9 @@ 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)
-md5sums=('c75940e1fc25108f2a7b3ef42abdae06'
-         'f725259ec23a9e87ee29e2ef82eda9a5')
+source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2)
+md5sums=('b230c88e65996ff74994d08a2a2e0f27')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -27,7 +24,7 @@ build() {
 check() {
   cd $srcdir/$pkgname-$pkgver
   
-  # these tests used features removed in bison-2.6
+  # these tests are incompatible with latest bison
   sed -i -e '/test-bison-yylloc/d' -e '/test-bison-yylval/d' tests/Makefile.in
 
   make check
@@ -37,7 +34,7 @@ package() {
   cd $srcdir/$pkgname-$pkgver
 
   make DESTDIR=$pkgdir install
-  install -Dm755 $srcdir/lex.sh $pkgdir/usr/bin/lex
+  ln -s flex ${pkgdir}/usr/bin/lex
 
   install -Dm644 COPYING \
   	$pkgdir/usr/share/licenses/$pkgname/license.txt
diff --git a/core/flex/lex.sh b/core/flex/lex.sh
deleted file mode 100644
index 13e7de692..000000000
--- a/core/flex/lex.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/flex -l "$@"
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 608f101fd..5b576678b 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202694 2013-12-25 03:04:31Z allan $
+# $Id: PKGBUILD 205614 2014-02-10 03:07:49Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -11,13 +11,13 @@ else
 fi
 pkgver=4.8.2
 _pkgver=4.8
-pkgrel=7
-_snapshot=4.8-20131219
+pkgrel=8
+_snapshot=4.8-20140206
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://gcc.gnu.org"
-makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'doxygen')
+makedepends=('binutils>=2.24' 'libmpc' 'cloog' 'doxygen')
 [[ "$CARCH" != "mips64el" ]] && makedepends+=('gcc-ada')
 checkdepends=('dejagnu' 'inetutils')
 options=('!emptydirs')
@@ -25,7 +25,7 @@ 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
         gcc-4.8-lambda-ICE.patch)
-md5sums=('666ef08f87649f941bc5512e13a88fdc'
+md5sums=('9d35549404a2326540fb88301ebd1977'
          '40cb437805e2f7a006aa0d0c3098ab0f'
          '6eb6e080dbf7bc6825f53a0aaa6c4ef9')
 
@@ -131,7 +131,7 @@ package_gcc-libs()
 {
   pkgdesc="Runtime libraries shipped by GCC"
   groups=('base')
-  depends=('glibc>=2.17')
+  depends=('glibc>=2.19')
   options=('!emptydirs')
   install=gcc-libs.install
 
@@ -181,7 +181,7 @@ package_gcc-libs()
 package_gcc()
 {
   pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog')
+  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.24' 'libmpc' 'cloog')
   groups=('base-devel')
   options=('staticlibs')
   install=gcc.install
@@ -319,11 +319,11 @@ package_gcc-ada()
 
   ln -s gcc ${pkgdir}/usr/bin/gnatgcc
 
-  # insist on dynamic linking
+  # insist on dynamic linking, but keep static libraries because gnatmake complains
   mv ${pkgdir}/${_libdir}/adalib/libgna{rl,t}-${_pkgver}.so ${pkgdir}/usr/lib
   ln -s libgnarl-${_pkgver}.so ${pkgdir}/usr/lib/libgnarl.so
   ln -s libgnat-${_pkgver}.so ${pkgdir}/usr/lib/libgnat.so
-  rm -f ${pkgdir}/${_libdir}/adalib/libgna{rl,t}.*
+  rm ${pkgdir}/${_libdir}/adalib/libgna{rl,t}.so
 
   # Install Runtime Library Exception
   install -d ${pkgdir}/usr/share/licenses/gcc-ada/
diff --git a/core/gcc/gcc_mips64el_lib.patch b/core/gcc/gcc_mips64el_lib.patch
deleted file mode 100644
index c938d9b30..000000000
--- a/core/gcc/gcc_mips64el_lib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru gcc-4.7-20120324.orig/gcc/config/mips/linux64.h gcc-4.7-20120324/gcc/config/mips/linux64.h
---- gcc-4.7-20120324.orig/gcc/config/mips/linux64.h	2012-04-06 11:32:50.545152897 +0200
-+++ gcc-4.7-20120324/gcc/config/mips/linux64.h	2012-04-06 12:06:58.501290352 +0200
-@@ -23,9 +23,9 @@
- #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip"
- #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
--#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1"
- #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
- #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
- #define GNU_USER_DYNAMIC_LINKERN32 \
-diff -ru gcc-4.7-20120324.orig/gcc/config/mips/t-linux64 gcc-4.7-20120324/gcc/config/mips/t-linux64
---- gcc-4.7-20120324.orig/gcc/config/mips/t-linux64	2012-04-06 11:32:50.379989000 +0200
-+++ gcc-4.7-20120324/gcc/config/mips/t-linux64	2012-04-06 12:05:55.461021317 +0200
-@@ -18,4 +18,4 @@
- 
- MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
- MULTILIB_DIRNAMES = n32 32 64
--MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
-+MULTILIB_OSDIRNAMES = ../lib ../lib32 ../lib64
diff --git a/core/gdbm/PKGBUILD b/core/gdbm/PKGBUILD
index 97e801b2d..59b0722a4 100644
--- a/core/gdbm/PKGBUILD
+++ b/core/gdbm/PKGBUILD
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD 197797 2013-10-30 10:37:51Z allan $
+# $Id: PKGBUILD 203669 2014-01-13 20:48:15Z eric $
+# Maintainer: 
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=gdbm
-pkgver=1.10
-pkgrel=3
+pkgver=1.11
+pkgrel=1
 pkgdesc="GNU database library"
 url="http://www.gnu.org/software/gdbm/gdbm.html"
-license=('GPL')
+license=('GPL3')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc' 'sh')
-source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz
+source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz{,.sig}
         gdbm-1.10-zeroheaders.patch)
 options=('!makeflags')
 install=gdbm.install
-md5sums=('88770493c2559dc80b561293e39d3570'
+md5sums=('72c832680cf0999caedbe5b265c8c1bd'
+         'SKIP'
          'ac255b10452005237836cd2d3a470733')
 
 prepare() {
@@ -32,13 +34,8 @@ prepare() {
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man \
-              --infodir=/usr/share/info \
-              --enable-libgdbm-compat
-
-  make prefix=/usr
+  ./configure --prefix=/usr --enable-libgdbm-compat
+  make
 }
 
 check() {
@@ -48,12 +45,8 @@ check() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make prefix="${pkgdir}"/usr \
-       manprefix="${pkgdir}"/usr/share/man \
-       man3dir="${pkgdir}"/usr/share/man/man3 \
-       infodir="${pkgdir}"/usr/share/info \
-       install
-  
+  make DESTDIR="${pkgdir}" install
+
   # create symlinks for compatibility
   install -dm755 "${pkgdir}"/usr/include/gdbm
   ln -sf ../gdbm.h "${pkgdir}"/usr/include/gdbm/gdbm.h
diff --git a/core/gettext/PKGBUILD b/core/gettext/PKGBUILD
index 27a87056a..ad2995152 100644
--- a/core/gettext/PKGBUILD
+++ b/core/gettext/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197811 2013-10-30 11:03:28Z allan $
+# $Id: PKGBUILD 203560 2014-01-13 16:35:40Z tpowa $
 # Maintainer:
 
 pkgname=gettext
-pkgver=0.18.3.1
-pkgrel=2
+pkgver=0.18.3.2
+pkgrel=1
 pkgdesc="GNU internationalization library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gettext/"
@@ -14,7 +14,7 @@ optdepends=('cvs: for autopoint tool')
 options=(!docs)
 install=gettext.install
 source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('3fc808f7d25487fc72b5759df7419e02'
+md5sums=('241aba309d07aa428252c74b40a818ef'
          'SKIP')
 
 build() {
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 990d71597..302b4d6bc 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 201557 2013-12-15 06:41:32Z allan $
+# $Id: PKGBUILD 205934 2014-02-14 08:16:44Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -7,79 +7,35 @@
 # NOTE: adjust version in install script when locale files are updated
 
 pkgname=glibc
-pkgver=2.18
-pkgrel=11
+pkgver=2.19
+pkgrel=2
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libc"
 license=('GPL' 'LGPL')
 groups=('base')
-depends=('linux-api-headers>=3.7' 'tzdata' 'filesystem>=2013.01')
-makedepends=('gcc>=4.7')
+depends=('linux-api-headers>=3.13' 'tzdata' 'filesystem>=2013.01')
+makedepends=('gcc>=4.8')
 backup=(etc/gai.conf
         etc/locale.gen
         etc/nscd.conf)
 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-getaddrinfo-CVE-2013-4458.patch
-        glibc-2.18-getaddrinfo-assertion.patch
-        glibc-2.18-scanf-parse-0e-0.patch
-        glibc-2.18-strstr-hackfix.patch
-        nscd.service
-        nscd.tmpfiles
+        glibc-2.18-xattr-compat-hack.patch
         locale.gen.txt
         locale-gen)
-md5sums=('88fbbceafee809e82efd52efa1e3c58f'
+md5sums=('e26b8cc666b162f999404b03970f14e4'
          'SKIP'
-         'e1883c2d1b01ff73650db5f5bb5a5a52'
-         '154da6bf5a5248f42a7bf5bf08e01a47'
-         'b79561ab9dce900e9bbeaf0d49927c2b'
-         'c7264b99d0f7e51922a4d3126182c40a'
-         '9749ba386b08a8fe53e7ecede9bf2dfb'
-         '71329fccb8eb583fb0d67b55f1e8df68'
-         'd4d86add33f22125777e0ecff06bc9bb'
-         '01d19fe9b2aea489cf5651530e0369f2'
-         '4441f6dfe7d75ced1fa75e54dd21d36e'
-         'd5fab2cd3abea65aa5ae696ea4a47d6b'
-         'da662ca76e7c8d7efbc7986ab7acea2d'
+         '7ca96c68a37f2a4ab91792bfa0160a24'
          '07ac979b6ab5eeb778d55f041529d623'
-         'b5fd017036fb91199ee76f670da8c15b')
+         '476e9113489f93b348b21e144b6a8fcf')
 
 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
-
-  # upstream commits 1159a193, 55e17aad and b73ed247
-  patch -p1 -i $srcdir/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
-
-  # upstream commits 1326ba1a, 141f3a77 and 303e567a
-  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
-
-  # upstream commit a4966c61
-  patch -p1 -i $srcdir/glibc-2.18-scanf-parse-0e-0.patch
-
-  # hack fix for strstr issues on x86
-  patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch
+  
+  # hack fix for {linux,sys}/xattr.h incompatibility
+  patch -p1 -i $srcdir/glibc-2.18-xattr-compat-hack.patch
 
   mkdir ${srcdir}/glibc-build
 }
@@ -159,8 +115,8 @@ package() {
   install -dm755 ${pkgdir}/usr/lib/{locale,systemd/system,tmpfiles.d}
 
   install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
-  install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system
-  install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
+  install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.service ${pkgdir}/usr/lib/systemd/system
+  install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
 
   install -m644 ${srcdir}/${pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf
 
@@ -172,8 +128,9 @@ package() {
     ${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
+  # libc, libdl, libm and libpthread are required for toolchain testsuites
+  # in addition libcrypt appears widely required
+  rm $pkgdir/usr/lib/lib{anl,BrokenLocale,nsl,resolv,rt,util}.a
 
   # Do not strip the following files for improved debugging support
   # ("improved" as in not breaking gdb and valgrind...):
diff --git a/core/glibc/glibc-2.18-getaddrinfo-CVE-2013-4458.patch b/core/glibc/glibc-2.18-getaddrinfo-CVE-2013-4458.patch
deleted file mode 100644
index a7bc67c6f..000000000
--- a/core/glibc/glibc-2.18-getaddrinfo-CVE-2013-4458.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644
index 2f1f7c694..000000000
--- a/core/glibc/glibc-2.18-getaddrinfo-assertion.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index 374933464..000000000
--- a/core/glibc/glibc-2.18-make-4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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-2.18-malloc-corrupt-CVE-2013-4332.patch b/core/glibc/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
deleted file mode 100644
index 093db86c9..000000000
--- a/core/glibc/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/malloc/malloc.c b/malloc/malloc.c
-index dd295f5..7f43ba3 100644
---- a/malloc/malloc.c
-+++ b/malloc/malloc.c
-@@ -3082,6 +3082,13 @@ __libc_pvalloc(size_t bytes)
-   size_t page_mask = GLRO(dl_pagesize) - 1;
-   size_t rounded_bytes = (bytes + page_mask) & ~(page_mask);
- 
-+  /* Check for overflow.  */
-+  if (bytes > SIZE_MAX - 2*pagesz - MINSIZE)
-+    {
-+      __set_errno (ENOMEM);
-+      return 0;
-+    }
-+
-   void *(*hook) (size_t, size_t, const void *) =
-     force_reg (__memalign_hook);
-   if (__builtin_expect (hook != NULL, 0))
-diff --git a/malloc/malloc.c b/malloc/malloc.c
-index 7f43ba3..3148c5f 100644
---- a/malloc/malloc.c
-+++ b/malloc/malloc.c
-@@ -3046,6 +3046,13 @@ __libc_valloc(size_t bytes)
- 
-   size_t pagesz = GLRO(dl_pagesize);
- 
-+  /* Check for overflow.  */
-+  if (bytes > SIZE_MAX - pagesz - MINSIZE)
-+    {
-+      __set_errno (ENOMEM);
-+      return 0;
-+    }
-+
-   void *(*hook) (size_t, size_t, const void *) =
-     force_reg (__memalign_hook);
-   if (__builtin_expect (hook != NULL, 0))
-diff --git a/malloc/malloc.c b/malloc/malloc.c
-index 3148c5f..f7718a9 100644
---- a/malloc/malloc.c
-+++ b/malloc/malloc.c
-@@ -3015,6 +3015,13 @@ __libc_memalign(size_t alignment, size_t bytes)
-   /* Otherwise, ensure that it is at least a minimum chunk size */
-   if (alignment <  MINSIZE) alignment = MINSIZE;
- 
-+  /* Check for overflow.  */
-+  if (bytes > SIZE_MAX - alignment - MINSIZE)
-+    {
-+      __set_errno (ENOMEM);
-+      return 0;
-+    }
-+
-   arena_get(ar_ptr, bytes + alignment + MINSIZE);
-   if(!ar_ptr)
-     return 0;
diff --git a/core/glibc/glibc-2.18-ptr-mangle-CVE-2013-4788.patch b/core/glibc/glibc-2.18-ptr-mangle-CVE-2013-4788.patch
deleted file mode 100644
index 09a439440..000000000
--- a/core/glibc/glibc-2.18-ptr-mangle-CVE-2013-4788.patch
+++ /dev/null
@@ -1,485 +0,0 @@
-diff --git a/csu/libc-start.c b/csu/libc-start.c
-index e5da3ef..c898d06 100644
---- a/csu/libc-start.c
-+++ b/csu/libc-start.c
-@@ -37,6 +37,12 @@ extern void __pthread_initialize_minimal (void);
-    in thread local area.  */
- uintptr_t __stack_chk_guard attribute_relro;
- # endif
-+# ifndef  THREAD_SET_POINTER_GUARD
-+/* Only exported for architectures that don't store the pointer guard
-+   value in thread local area.  */
-+uintptr_t __pointer_chk_guard_local
-+	attribute_relro attribute_hidden __attribute__ ((nocommon));
-+# endif
- #endif
- 
- #ifdef HAVE_PTR_NTHREADS
-@@ -195,6 +201,16 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
- # else
-   __stack_chk_guard = stack_chk_guard;
- # endif
-+
-+  /* Set up the pointer guard value.  */
-+  uintptr_t pointer_chk_guard = _dl_setup_pointer_guard (_dl_random,
-+							 stack_chk_guard);
-+# ifdef THREAD_SET_POINTER_GUARD
-+  THREAD_SET_POINTER_GUARD (pointer_chk_guard);
-+# else
-+  __pointer_chk_guard_local = pointer_chk_guard;
-+# endif
-+
- #endif
- 
-   /* Register the destructor of the dynamic linker if there is any.  */
-diff --git a/elf/Makefile b/elf/Makefile
-index aaa9534..cb8da93 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -121,7 +121,8 @@ endif
- tests = tst-tls1 tst-tls2 tst-tls9 tst-leaks1 \
- 	tst-array1 tst-array2 tst-array3 tst-array4 tst-array5
- tests-static = tst-tls1-static tst-tls2-static tst-stackguard1-static \
--	       tst-leaks1-static tst-array1-static tst-array5-static
-+	       tst-leaks1-static tst-array1-static tst-array5-static \
-+	       tst-ptrguard1-static
- ifeq (yes,$(build-shared))
- tests-static += tst-tls9-static
- tst-tls9-static-ENV = \
-@@ -145,7 +146,8 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
- 	 tst-audit1 tst-audit2 tst-audit8 \
- 	 tst-stackguard1 tst-addr1 tst-thrlock \
- 	 tst-unique1 tst-unique2 tst-unique3 tst-unique4 \
--	 tst-initorder tst-initorder2 tst-relsort1 tst-null-argv
-+	 tst-initorder tst-initorder2 tst-relsort1 tst-null-argv \
-+	 tst-ptrguard1
- #	 reldep9
- test-srcs = tst-pathopt
- selinux-enabled := $(shell cat /selinux/enforce 2> /dev/null)
-@@ -1016,6 +1018,9 @@ LDFLAGS-order2mod2.so = $(no-as-needed)
- tst-stackguard1-ARGS = --command "$(host-test-program-cmd) --child"
- tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child"
- 
-+tst-ptrguard1-ARGS = --command "$(host-test-program-cmd) --child"
-+tst-ptrguard1-static-ARGS = --command "$(objpfx)tst-ptrguard1-static --child"
-+
- $(objpfx)tst-leaks1: $(libdl)
- $(objpfx)tst-leaks1-mem: $(objpfx)tst-leaks1.out
- 	$(common-objpfx)malloc/mtrace $(objpfx)tst-leaks1.mtrace > $@
-diff --git a/elf/tst-ptrguard1-static.c b/elf/tst-ptrguard1-static.c
-new file mode 100644
-index 0000000..7aff3b7
---- /dev/null
-+++ b/elf/tst-ptrguard1-static.c
-@@ -0,0 +1 @@
-+#include "tst-ptrguard1.c"
-diff --git a/elf/tst-ptrguard1.c b/elf/tst-ptrguard1.c
-new file mode 100644
-index 0000000..c344a04
---- /dev/null
-+++ b/elf/tst-ptrguard1.c
-@@ -0,0 +1,202 @@
-+/* Copyright (C) 2013 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#include <errno.h>
-+#include <stdbool.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/wait.h>
-+#include <stackguard-macros.h>
-+#include <tls.h>
-+#include <unistd.h>
-+
-+#ifndef POINTER_CHK_GUARD
-+extern uintptr_t __pointer_chk_guard;
-+# define POINTER_CHK_GUARD __pointer_chk_guard
-+#endif
-+
-+static const char *command;
-+static bool child;
-+static uintptr_t ptr_chk_guard_copy;
-+static bool ptr_chk_guard_copy_set;
-+static int fds[2];
-+
-+static void __attribute__ ((constructor))
-+con (void)
-+{
-+  ptr_chk_guard_copy = POINTER_CHK_GUARD;
-+  ptr_chk_guard_copy_set = true;
-+}
-+
-+static int
-+uintptr_t_cmp (const void *a, const void *b)
-+{
-+  if (*(uintptr_t *) a < *(uintptr_t *) b)
-+    return 1;
-+  if (*(uintptr_t *) a > *(uintptr_t *) b)
-+    return -1;
-+  return 0;
-+}
-+
-+static int
-+do_test (void)
-+{
-+  if (!ptr_chk_guard_copy_set)
-+    {
-+      puts ("constructor has not been run");
-+      return 1;
-+    }
-+
-+  if (ptr_chk_guard_copy != POINTER_CHK_GUARD)
-+    {
-+      puts ("POINTER_CHK_GUARD changed between constructor and do_test");
-+      return 1;
-+    }
-+
-+  if (child)
-+    {
-+      write (2, &ptr_chk_guard_copy, sizeof (ptr_chk_guard_copy));
-+      return 0;
-+    }
-+
-+  if (command == NULL)
-+    {
-+      puts ("missing --command or --child argument");
-+      return 1;
-+    }
-+
-+#define N 16
-+  uintptr_t child_ptr_chk_guards[N + 1];
-+  child_ptr_chk_guards[N] = ptr_chk_guard_copy;
-+  int i;
-+  for (i = 0; i < N; ++i)
-+    {
-+      if (pipe (fds) < 0)
-+	{
-+	  printf ("couldn't create pipe: %m\n");
-+	  return 1;
-+	}
-+
-+      pid_t pid = fork ();
-+      if (pid < 0)
-+	{
-+	  printf ("fork failed: %m\n");
-+	  return 1;
-+	}
-+
-+      if (!pid)
-+	{
-+	  if (ptr_chk_guard_copy != POINTER_CHK_GUARD)
-+	    {
-+	      puts ("POINTER_CHK_GUARD changed after fork");
-+	      exit (1);
-+	    }
-+
-+	  close (fds[0]);
-+	  close (2);
-+	  dup2 (fds[1], 2);
-+	  close (fds[1]);
-+
-+	  system (command);
-+	  exit (0);
-+	}
-+
-+      close (fds[1]);
-+
-+      if (TEMP_FAILURE_RETRY (read (fds[0], &child_ptr_chk_guards[i],
-+				    sizeof (uintptr_t))) != sizeof (uintptr_t))
-+	{
-+	  puts ("could not read ptr_chk_guard value from child");
-+	  return 1;
-+	}
-+
-+      close (fds[0]);
-+
-+      pid_t termpid;
-+      int status;
-+      termpid = TEMP_FAILURE_RETRY (waitpid (pid, &status, 0));
-+      if (termpid == -1)
-+	{
-+	  printf ("waitpid failed: %m\n");
-+	  return 1;
-+	}
-+      else if (termpid != pid)
-+	{
-+	  printf ("waitpid returned %ld != %ld\n",
-+		  (long int) termpid, (long int) pid);
-+	  return 1;
-+	}
-+      else if (!WIFEXITED (status) || WEXITSTATUS (status))
-+	{
-+	  puts ("child hasn't exited with exit status 0");
-+	  return 1;
-+	}
-+    }
-+
-+  qsort (child_ptr_chk_guards, N + 1, sizeof (uintptr_t), uintptr_t_cmp);
-+
-+  /* The default pointer guard is the same as the default stack guard.
-+     They are only set to default if dl_random is NULL.  */
-+  uintptr_t default_guard = 0;
-+  unsigned char *p = (unsigned char *) &default_guard;
-+  p[sizeof (uintptr_t) - 1] = 255;
-+  p[sizeof (uintptr_t) - 2] = '\n';
-+  p[0] = 0;
-+
-+  /* Test if the pointer guard canaries are either randomized,
-+     or equal to the default pointer guard value.
-+     Even with randomized pointer guards it might happen
-+     that the random number generator generates the same
-+     values, but if that happens in more than half from
-+     the 16 runs, something is very wrong.  */
-+  int ndifferences = 0;
-+  int ndefaults = 0;
-+  for (i = 0; i < N; ++i)
-+    {
-+      if (child_ptr_chk_guards[i] != child_ptr_chk_guards[i+1])
-+	ndifferences++;
-+      else if (child_ptr_chk_guards[i] == default_guard)
-+	ndefaults++;
-+    }
-+
-+  printf ("differences %d defaults %d\n", ndifferences, ndefaults);
-+
-+  if (ndifferences < N / 2 && ndefaults < N / 2)
-+    {
-+      puts ("pointer guard values are not randomized enough");
-+      puts ("nor equal to the default value");
-+      return 1;
-+    }
-+
-+  return 0;
-+}
-+
-+#define OPT_COMMAND	10000
-+#define OPT_CHILD	10001
-+#define CMDLINE_OPTIONS	\
-+  { "command", required_argument, NULL, OPT_COMMAND },  \
-+  { "child", no_argument, NULL, OPT_CHILD },
-+#define CMDLINE_PROCESS	\
-+  case OPT_COMMAND:	\
-+    command = optarg;	\
-+    break;		\
-+  case OPT_CHILD:	\
-+    child = true;	\
-+    break;
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
-diff --git a/ports/sysdeps/ia64/stackguard-macros.h b/ports/sysdeps/ia64/stackguard-macros.h
-index dc683c2..3907293 100644
---- a/ports/sysdeps/ia64/stackguard-macros.h
-+++ b/ports/sysdeps/ia64/stackguard-macros.h
-@@ -2,3 +2,6 @@
- 
- #define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("adds %0 = -8, r13;; ld8 %0 = [%0]" : "=r" (x)); x; })
-+
-+#define POINTER_CHK_GUARD \
-+  ({ uintptr_t x; asm ("adds %0 = -16, r13;; ld8 %0 = [%0]" : "=r" (x)); x; })
-diff --git a/ports/sysdeps/tile/stackguard-macros.h b/ports/sysdeps/tile/stackguard-macros.h
-index 589ea2b..f2e041b 100644
---- a/ports/sysdeps/tile/stackguard-macros.h
-+++ b/ports/sysdeps/tile/stackguard-macros.h
-@@ -4,11 +4,17 @@
- # if __WORDSIZE == 64
- #  define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("addi %0, tp, -16; ld %0, %0" : "=r" (x)); x; })
-+#  define POINTER_CHK_GUARD \
-+  ({ uintptr_t x; asm ("addi %0, tp, -24; ld %0, %0" : "=r" (x)); x; })
- # else
- #  define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("addi %0, tp, -8; ld4s %0, %0" : "=r" (x)); x; })
-+#  define POINTER_CHK_GUARD \
-+  ({ uintptr_t x; asm ("addi %0, tp, -12; ld4s %0, %0" : "=r" (x)); x; })
- # endif
- #else
- # define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("addi %0, tp, -8; lw %0, %0" : "=r" (x)); x; })
-+# define POINTER_CHK_GUARD \
-+  ({ uintptr_t x; asm ("addi %0, tp, -12; lw %0, %0" : "=r" (x)); x; })
- #endif
-diff --git a/sysdeps/generic/stackguard-macros.h b/sysdeps/generic/stackguard-macros.h
-index ababf65..4fa3d96 100644
---- a/sysdeps/generic/stackguard-macros.h
-+++ b/sysdeps/generic/stackguard-macros.h
-@@ -2,3 +2,6 @@
- 
- extern uintptr_t __stack_chk_guard;
- #define STACK_CHK_GUARD __stack_chk_guard
-+
-+extern uintptr_t __pointer_chk_guard_local;
-+#define POINTER_CHK_GUARD __pointer_chk_guard_local
-diff --git a/sysdeps/i386/stackguard-macros.h b/sysdeps/i386/stackguard-macros.h
-index 8c31e19..0397629 100644
---- a/sysdeps/i386/stackguard-macros.h
-+++ b/sysdeps/i386/stackguard-macros.h
-@@ -2,3 +2,11 @@
- 
- #define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("movl %%gs:0x14, %0" : "=r" (x)); x; })
-+
-+#define POINTER_CHK_GUARD \
-+  ({							\
-+     uintptr_t x;					\
-+     asm ("movl %%gs:%c1, %0" : "=r" (x)		\
-+	  : "i" (offsetof (tcbhead_t, pointer_guard)));	\
-+     x;							\
-+   })
-diff --git a/sysdeps/powerpc/powerpc32/stackguard-macros.h b/sysdeps/powerpc/powerpc32/stackguard-macros.h
-index 839f6a4..b3d0af8 100644
---- a/sysdeps/powerpc/powerpc32/stackguard-macros.h
-+++ b/sysdeps/powerpc/powerpc32/stackguard-macros.h
-@@ -2,3 +2,13 @@
- 
- #define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("lwz %0,-28680(2)" : "=r" (x)); x; })
-+
-+#define POINTER_CHK_GUARD \
-+  ({												\
-+     uintptr_t x;										\
-+     asm ("lwz %0,%1(2)"									\
-+	  : "=r" (x)										\
-+	  : "i" (offsetof (tcbhead_t, pointer_guard) - TLS_TCB_OFFSET - sizeof (tcbhead_t))	\
-+         );											\
-+     x;												\
-+   })
-diff --git a/sysdeps/powerpc/powerpc64/stackguard-macros.h b/sysdeps/powerpc/powerpc64/stackguard-macros.h
-index 9da879c..4620f96 100644
---- a/sysdeps/powerpc/powerpc64/stackguard-macros.h
-+++ b/sysdeps/powerpc/powerpc64/stackguard-macros.h
-@@ -2,3 +2,13 @@
- 
- #define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("ld %0,-28688(13)" : "=r" (x)); x; })
-+
-+#define POINTER_CHK_GUARD \
-+  ({												\
-+     uintptr_t x;										\
-+     asm ("ld %0,%1(2)"										\
-+	  : "=r" (x)										\
-+	  : "i" (offsetof (tcbhead_t, pointer_guard) - TLS_TCB_OFFSET - sizeof (tcbhead_t))	\
-+         );											\
-+     x;												\
-+   })
-diff --git a/sysdeps/s390/s390-32/stackguard-macros.h b/sysdeps/s390/s390-32/stackguard-macros.h
-index b74c579..449e8d4 100644
---- a/sysdeps/s390/s390-32/stackguard-macros.h
-+++ b/sysdeps/s390/s390-32/stackguard-macros.h
-@@ -2,3 +2,14 @@
- 
- #define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("ear %0,%%a0; l %0,0x14(%0)" : "=a" (x)); x; })
-+
-+/* On s390/s390x there is no unique pointer guard, instead we use the
-+   same value as the stack guard.  */
-+#define POINTER_CHK_GUARD \
-+  ({							\
-+     uintptr_t x;					\
-+     asm ("ear %0,%%a0; l %0,%1(%0)"			\
-+	  : "=a" (x)					\
-+	  : "i" (offsetof (tcbhead_t, stack_guard)));	\
-+     x;							\
-+   })
-diff --git a/sysdeps/s390/s390-64/stackguard-macros.h b/sysdeps/s390/s390-64/stackguard-macros.h
-index 0cebb5f..c8270fb 100644
---- a/sysdeps/s390/s390-64/stackguard-macros.h
-+++ b/sysdeps/s390/s390-64/stackguard-macros.h
-@@ -2,3 +2,17 @@
- 
- #define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("ear %0,%%a0; sllg %0,%0,32; ear %0,%%a1; lg %0,0x28(%0)" : "=a" (x)); x; })
-+
-+/* On s390/s390x there is no unique pointer guard, instead we use the
-+   same value as the stack guard.  */
-+#define POINTER_CHK_GUARD \
-+  ({							\
-+     uintptr_t x;					\
-+     asm ("ear %0,%%a0;"				\
-+	  "sllg %0,%0,32;"				\
-+	  "ear %0,%%a1;"				\
-+	  "lg %0,%1(%0)"				\
-+	 : "=a" (x)					\
-+	 : "i" (offsetof (tcbhead_t, stack_guard)));	\
-+     x;							\
-+   })
-diff --git a/sysdeps/sparc/sparc32/stackguard-macros.h b/sysdeps/sparc/sparc32/stackguard-macros.h
-index c0b02b0..1eef0f1 100644
---- a/sysdeps/sparc/sparc32/stackguard-macros.h
-+++ b/sysdeps/sparc/sparc32/stackguard-macros.h
-@@ -2,3 +2,6 @@
- 
- #define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("ld [%%g7+0x14], %0" : "=r" (x)); x; })
-+
-+#define POINTER_CHK_GUARD \
-+  ({ uintptr_t x; asm ("ld [%%g7+0x18], %0" : "=r" (x)); x; })
-diff --git a/sysdeps/sparc/sparc64/stackguard-macros.h b/sysdeps/sparc/sparc64/stackguard-macros.h
-index 80f0635..cc0c12c 100644
---- a/sysdeps/sparc/sparc64/stackguard-macros.h
-+++ b/sysdeps/sparc/sparc64/stackguard-macros.h
-@@ -2,3 +2,6 @@
- 
- #define STACK_CHK_GUARD \
-   ({ uintptr_t x; asm ("ldx [%%g7+0x28], %0" : "=r" (x)); x; })
-+
-+#define POINTER_CHK_GUARD \
-+  ({ uintptr_t x; asm ("ldx [%%g7+0x30], %0" : "=r" (x)); x; })
-diff --git a/sysdeps/x86_64/stackguard-macros.h b/sysdeps/x86_64/stackguard-macros.h
-index d7fedb3..1948800 100644
---- a/sysdeps/x86_64/stackguard-macros.h
-+++ b/sysdeps/x86_64/stackguard-macros.h
-@@ -4,3 +4,8 @@
-   ({ uintptr_t x;						\
-      asm ("mov %%fs:%c1, %0" : "=r" (x)				\
- 	  : "i" (offsetof (tcbhead_t, stack_guard))); x; })
-+
-+#define POINTER_CHK_GUARD \
-+  ({ uintptr_t x;						\
-+     asm ("mov %%fs:%c1, %0" : "=r" (x)				\
-+	  : "i" (offsetof (tcbhead_t, pointer_guard))); x; })
-diff --git a/elf/Makefile b/elf/Makefile
-index cb8da93..27d249b 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -1019,6 +1019,9 @@ tst-stackguard1-ARGS = --command "$(host-test-program-cmd) --child"
- tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child"
- 
- tst-ptrguard1-ARGS = --command "$(host-test-program-cmd) --child"
-+# When built statically, the pointer guard interface uses
-+# __pointer_chk_guard_local.
-+CFLAGS-tst-ptrguard1-static.c = -DPTRGUARD_LOCAL
- tst-ptrguard1-static-ARGS = --command "$(objpfx)tst-ptrguard1-static --child"
- 
- $(objpfx)tst-leaks1: $(libdl)
-diff --git a/sysdeps/generic/stackguard-macros.h b/sysdeps/generic/stackguard-macros.h
-index 4fa3d96..b4a6b23 100644
---- a/sysdeps/generic/stackguard-macros.h
-+++ b/sysdeps/generic/stackguard-macros.h
-@@ -3,5 +3,10 @@
- extern uintptr_t __stack_chk_guard;
- #define STACK_CHK_GUARD __stack_chk_guard
- 
-+#ifdef PTRGUARD_LOCAL
- extern uintptr_t __pointer_chk_guard_local;
--#define POINTER_CHK_GUARD __pointer_chk_guard_local
-+# define POINTER_CHK_GUARD __pointer_chk_guard_local
-+#else
-+extern uintptr_t __pointer_chk_guard;
-+# define POINTER_CHK_GUARD __pointer_chk_guard
-+#endif
diff --git a/core/glibc/glibc-2.18-readdir_r-CVE-2013-4237.patch b/core/glibc/glibc-2.18-readdir_r-CVE-2013-4237.patch
deleted file mode 100644
index 7277ca229..000000000
--- a/core/glibc/glibc-2.18-readdir_r-CVE-2013-4237.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-diff --git a/manual/conf.texi b/manual/conf.texi
-index 7eb8b36..c720063 100644
---- a/manual/conf.texi
-+++ b/manual/conf.texi
-@@ -1149,6 +1149,9 @@ typed ahead as input.  @xref{I/O Queues}.
- @deftypevr Macro int NAME_MAX
- The uniform system limit (if any) for the length of a file name component, not
- including the terminating null character.
-+
-+@strong{Portability Note:} On some systems, @theglibc{} defines
-+@code{NAME_MAX}, but does not actually enforce this limit.
- @end deftypevr
- 
- @comment limits.h
-@@ -1157,6 +1160,9 @@ including the terminating null character.
- The uniform system limit (if any) for the length of an entire file name (that
- is, the argument given to system calls such as @code{open}), including the
- terminating null character.
-+
-+@strong{Portability Note:} @Theglibc{} does not enforce this limit
-+even if @code{PATH_MAX} is defined.
- @end deftypevr
- 
- @cindex limits, pipe buffer size
-@@ -1476,6 +1482,9 @@ Inquire about the value of @code{POSIX_REC_MIN_XFER_SIZE}.
- Inquire about the value of @code{POSIX_REC_XFER_ALIGN}.
- @end table
- 
-+@strong{Portability Note:} On some systems, @theglibc{} does not
-+enforce @code{_PC_NAME_MAX} or @code{_PC_PATH_MAX} limits.
-+
- @node Utility Limits
- @section Utility Program Capacity Limits
- 
-diff --git a/manual/filesys.texi b/manual/filesys.texi
-index 1df9cf2..814c210 100644
---- a/manual/filesys.texi
-+++ b/manual/filesys.texi
-@@ -444,9 +444,9 @@ symbols are declared in the header file @file{dirent.h}.
- @comment POSIX.1
- @deftypefun {struct dirent *} readdir (DIR *@var{dirstream})
- This function reads the next entry from the directory.  It normally
--returns a pointer to a structure containing information about the file.
--This structure is statically allocated and can be rewritten by a
--subsequent call.
-+returns a pointer to a structure containing information about the
-+file.  This structure is associated with the @var{dirstream} handle
-+and can be rewritten by a subsequent call.
- 
- @strong{Portability Note:} On some systems @code{readdir} may not
- return entries for @file{.} and @file{..}, even though these are always
-@@ -461,19 +461,61 @@ conditions are defined for this function:
- The @var{dirstream} argument is not valid.
- @end table
- 
--@code{readdir} is not thread safe.  Multiple threads using
--@code{readdir} on the same @var{dirstream} may overwrite the return
--value.  Use @code{readdir_r} when this is critical.
-+To distinguish between an end-of-directory condition or an error, you
-+must set @code{errno} to zero before calling @code{readdir}.  To avoid
-+entering an infinite loop, you should stop reading from the directory
-+after the first error.
-+
-+In POSIX.1-2008, @code{readdir} is not thread-safe.  In @theglibc{}
-+implementation, it is safe to call @code{readdir} concurrently on
-+different @var{dirstream}s, but multiple threads accessing the same
-+@var{dirstream} result in undefined behavior.  @code{readdir_r} is a
-+fully thread-safe alternative, but suffers from poor portability (see
-+below).  It is recommended that you use @code{readdir}, with external
-+locking if multiple threads access the same @var{dirstream}.
- @end deftypefun
- 
- @comment dirent.h
- @comment GNU
- @deftypefun int readdir_r (DIR *@var{dirstream}, struct dirent *@var{entry}, struct dirent **@var{result})
--This function is the reentrant version of @code{readdir}.  Like
--@code{readdir} it returns the next entry from the directory.  But to
--prevent conflicts between simultaneously running threads the result is
--not stored in statically allocated memory.  Instead the argument
--@var{entry} points to a place to store the result.
-+This function is a version of @code{readdir} which performs internal
-+locking.  Like @code{readdir} it returns the next entry from the
-+directory.  To prevent conflicts between simultaneously running
-+threads the result is stored inside the @var{entry} object.
-+
-+@strong{Portability Note:} It is recommended to use @code{readdir}
-+instead of @code{readdir_r} for the following reasons:
-+
-+@itemize @bullet
-+@item
-+On systems which do not define @code{NAME_MAX}, it may not be possible
-+to use @code{readdir_r} safely because the caller does not specify the
-+length of the buffer for the directory entry.
-+
-+@item
-+On some systems, @code{readdir_r} cannot read directory entries with
-+very long names.  If such a name is encountered, @theglibc{}
-+implementation of @code{readdir_r} returns with an error code of
-+@code{ENAMETOOLONG} after the final directory entry has been read.  On
-+other systems, @code{readdir_r} may return successfully, but the
-+@code{d_name} member may not be NUL-terminated or may be truncated.
-+
-+@item
-+POSIX-1.2008 does not guarantee that @code{readdir} is thread-safe,
-+even when access to the same @var{dirstream} is serialized.  But in
-+current implementations (including @theglibc{}), it is safe to call
-+@code{readdir} concurrently on different @var{dirstream}s, so there is
-+no need to use @code{readdir_r} in most multi-threaded programs.  In
-+the rare case that multiple threads need to read from the same
-+@var{dirstream}, it is still better to use @code{readdir} and external
-+synchronization.
-+
-+@item
-+It is expected that future versions of POSIX will obsolete
-+@code{readdir_r} and mandate the level of thread safety for
-+@code{readdir} which is provided by @theglibc{} and other
-+implementations today.
-+@end itemize
- 
- Normally @code{readdir_r} returns zero and sets @code{*@var{result}}
- to @var{entry}.  If there are no more entries in the directory or an
-@@ -481,15 +523,6 @@ error is detected, @code{readdir_r} sets @code{*@var{result}} to a
- null pointer and returns a nonzero error code, also stored in
- @code{errno}, as described for @code{readdir}.
- 
--@strong{Portability Note:} On some systems @code{readdir_r} may not
--return a NUL terminated string for the file name, even when there is no
--@code{d_reclen} field in @code{struct dirent} and the file
--name is the maximum allowed size.  Modern systems all have the
--@code{d_reclen} field, and on old systems multi-threading is not
--critical.  In any case there is no such problem with the @code{readdir}
--function, so that even on systems without the @code{d_reclen} member one
--could use multiple threads by using external locking.
--
- It is also important to look at the definition of the @code{struct
- dirent} type.  Simply passing a pointer to an object of this type for
- the second parameter of @code{readdir_r} might not be enough.  Some
-diff --git a/sysdeps/posix/dirstream.h b/sysdeps/posix/dirstream.h
-index a7a074d..8e8570d 100644
---- a/sysdeps/posix/dirstream.h
-+++ b/sysdeps/posix/dirstream.h
-@@ -39,6 +39,8 @@ struct __dirstream
- 
-     off_t filepos;		/* Position of next entry to read.  */
- 
-+    int errcode;		/* Delayed error code.  */
-+
-     /* Directory block.  */
-     char data[0] __attribute__ ((aligned (__alignof__ (void*))));
-   };
-diff --git a/sysdeps/posix/opendir.c b/sysdeps/posix/opendir.c
-index ddfc3a7..fc05b0f 100644
---- a/sysdeps/posix/opendir.c
-+++ b/sysdeps/posix/opendir.c
-@@ -231,6 +231,7 @@ __alloc_dir (int fd, bool close_fd, int flags, const struct stat64 *statp)
-   dirp->size = 0;
-   dirp->offset = 0;
-   dirp->filepos = 0;
-+  dirp->errcode = 0;
- 
-   return dirp;
- }
-diff --git a/sysdeps/posix/readdir_r.c b/sysdeps/posix/readdir_r.c
-index b5a8e2e..8ed5c3f 100644
---- a/sysdeps/posix/readdir_r.c
-+++ b/sysdeps/posix/readdir_r.c
-@@ -40,6 +40,7 @@ __READDIR_R (DIR *dirp, DIRENT_TYPE *entry, DIRENT_TYPE **result)
-   DIRENT_TYPE *dp;
-   size_t reclen;
-   const int saved_errno = errno;
-+  int ret;
- 
-   __libc_lock_lock (dirp->lock);
- 
-@@ -70,10 +71,10 @@ __READDIR_R (DIR *dirp, DIRENT_TYPE *entry, DIRENT_TYPE **result)
- 		  bytes = 0;
- 		  __set_errno (saved_errno);
- 		}
-+	      if (bytes < 0)
-+		dirp->errcode = errno;
- 
- 	      dp = NULL;
--	      /* Reclen != 0 signals that an error occurred.  */
--	      reclen = bytes != 0;
- 	      break;
- 	    }
- 	  dirp->size = (size_t) bytes;
-@@ -106,29 +107,46 @@ __READDIR_R (DIR *dirp, DIRENT_TYPE *entry, DIRENT_TYPE **result)
-       dirp->filepos += reclen;
- #endif
- 
--      /* Skip deleted files.  */
-+#ifdef NAME_MAX
-+      if (reclen > offsetof (DIRENT_TYPE, d_name) + NAME_MAX + 1)
-+	{
-+	  /* The record is very long.  It could still fit into the
-+	     caller-supplied buffer if we can skip padding at the
-+	     end.  */
-+	  size_t namelen = _D_EXACT_NAMLEN (dp);
-+	  if (namelen <= NAME_MAX)
-+	    reclen = offsetof (DIRENT_TYPE, d_name) + namelen + 1;
-+	  else
-+	    {
-+	      /* The name is too long.  Ignore this file.  */
-+	      dirp->errcode = ENAMETOOLONG;
-+	      dp->d_ino = 0;
-+	      continue;
-+	    }
-+	}
-+#endif
-+
-+      /* Skip deleted and ignored files.  */
-     }
-   while (dp->d_ino == 0);
- 
-   if (dp != NULL)
-     {
--#ifdef GETDENTS_64BIT_ALIGNED
--      /* The d_reclen value might include padding which is not part of
--	 the DIRENT_TYPE data structure.  */
--      reclen = MIN (reclen,
--		    offsetof (DIRENT_TYPE, d_name) + sizeof (dp->d_name));
--#endif
-       *result = memcpy (entry, dp, reclen);
--#ifdef GETDENTS_64BIT_ALIGNED
-+#ifdef _DIRENT_HAVE_D_RECLEN
-       entry->d_reclen = reclen;
- #endif
-+      ret = 0;
-     }
-   else
--    *result = NULL;
-+    {
-+      *result = NULL;
-+      ret = dirp->errcode;
-+    }
- 
-   __libc_lock_unlock (dirp->lock);
- 
--  return dp != NULL ? 0 : reclen ? errno : 0;
-+  return ret;
- }
- 
- #ifdef __READDIR_R_ALIAS
-diff --git a/sysdeps/posix/rewinddir.c b/sysdeps/posix/rewinddir.c
-index 2935a8e..d4991ad 100644
---- a/sysdeps/posix/rewinddir.c
-+++ b/sysdeps/posix/rewinddir.c
-@@ -33,6 +33,7 @@ rewinddir (dirp)
-   dirp->filepos = 0;
-   dirp->offset = 0;
-   dirp->size = 0;
-+  dirp->errcode = 0;
- #ifndef NOT_IN_libc
-   __libc_lock_unlock (dirp->lock);
- #endif
-diff --git a/sysdeps/unix/sysv/linux/i386/readdir64_r.c b/sysdeps/unix/sysv/linux/i386/readdir64_r.c
-index 8ebbcfd..a7d114e 100644
---- a/sysdeps/unix/sysv/linux/i386/readdir64_r.c
-+++ b/sysdeps/unix/sysv/linux/i386/readdir64_r.c
-@@ -18,7 +18,6 @@
- #define __READDIR_R __readdir64_r
- #define __GETDENTS __getdents64
- #define DIRENT_TYPE struct dirent64
--#define GETDENTS_64BIT_ALIGNED 1
- 
- #include <sysdeps/posix/readdir_r.c>
- 
-diff --git a/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c b/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c
-index 5ed8e95..290f2c8 100644
---- a/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c
-+++ b/sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c
-@@ -1,5 +1,4 @@
- #define readdir64_r __no_readdir64_r_decl
--#define GETDENTS_64BIT_ALIGNED 1
- #include <sysdeps/posix/readdir_r.c>
- #undef readdir64_r
- weak_alias (__readdir_r, readdir64_r)
--- 
-1.8.3.4
-
diff --git a/core/glibc/glibc-2.18-scanf-parse-0e-0.patch b/core/glibc/glibc-2.18-scanf-parse-0e-0.patch
deleted file mode 100644
index 651e56590..000000000
--- a/core/glibc/glibc-2.18-scanf-parse-0e-0.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/stdio-common/tst-sscanf.c b/stdio-common/tst-sscanf.c
-index 1edb227..3c34f58 100644
---- a/stdio-common/tst-sscanf.c
-+++ b/stdio-common/tst-sscanf.c
-@@ -109,6 +109,19 @@ struct test double_tests[] =
-   { L("-inf"), L("%g"), 1 }
- };
- 
-+struct test2
-+{
-+  const CHAR *str;
-+  const CHAR *fmt;
-+  int retval;
-+  char residual;
-+} double_tests2[] =
-+{
-+  { L("0e+0"), L("%g%c"), 1, 0 },
-+  { L("0xe+0"), L("%g%c"), 2, '+' },
-+  { L("0x.e+0"), L("%g%c"), 2, '+' },
-+};
-+
- int
- main (void)
- {
-@@ -196,5 +209,26 @@ main (void)
- 	}
-     }
- 
-+  for (i = 0; i < sizeof (double_tests2) / sizeof (double_tests2[0]); ++i)
-+    {
-+      double dummy;
-+      int ret;
-+      char c = 0;
-+
-+      if ((ret = SSCANF (double_tests2[i].str, double_tests2[i].fmt,
-+			 &dummy, &c)) != double_tests2[i].retval)
-+	{
-+	  printf ("double_tests2[%d] returned %d != %d\n",
-+		  i, ret, double_tests2[i].retval);
-+	  result = 1;
-+	}
-+      else if (ret == 2 && c != double_tests2[i].residual)
-+	{
-+	  printf ("double_tests2[%d] stopped at '%c' != '%c'\n",
-+		  i, c, double_tests2[i].residual);
-+	  result = 1;
-+	}
-+    }
-+
-   return result;
- }
-diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
-index 78dc2fc..e6fa8f3 100644
---- a/stdio-common/vfscanf.c
-+++ b/stdio-common/vfscanf.c
-@@ -1966,6 +1966,8 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
- 		  if (width > 0)
- 		    --width;
- 		}
-+	      else
-+		got_digit = 1;
- 	    }
- 
- 	  while (1)
--- 
-1.8.4.2
-
diff --git a/core/glibc/glibc-2.18-strcoll-CVE-2012-4412+4424.patch b/core/glibc/glibc-2.18-strcoll-CVE-2012-4412+4424.patch
deleted file mode 100644
index 5558c1fe9..000000000
--- a/core/glibc/glibc-2.18-strcoll-CVE-2012-4412+4424.patch
+++ /dev/null
@@ -1,1004 +0,0 @@
-diff --git a/string/strcoll_l.c b/string/strcoll_l.c
-index ecda08f..bb34a72 100644
---- a/string/strcoll_l.c
-+++ b/string/strcoll_l.c
-@@ -41,11 +41,434 @@
- 
- #include "../locale/localeinfo.h"
- 
-+/* Track status while looking for sequences in a string.  */
-+typedef struct
-+{
-+  int len;			/* Length of the current sequence.  */
-+  size_t val;			/* Position of the sequence relative to the
-+				   previous non-ignored sequence.  */
-+  size_t idxnow;		/* Current index in sequences.  */
-+  size_t idxmax;		/* Maximum index in sequences.  */
-+  size_t idxcnt;		/* Current count of indices.  */
-+  size_t backw;			/* Current Backward sequence index.  */
-+  size_t backw_stop;		/* Index where the backward sequences stop.  */
-+  const USTRING_TYPE *us;	/* The string.  */
-+  int32_t *idxarr;		/* Array to cache weight indices.  */
-+  unsigned char *rulearr;	/* Array to cache rules.  */
-+  unsigned char rule;		/* Saved rule for the first sequence.  */
-+  int32_t idx;			/* Index to weight of the current sequence.  */
-+  int32_t save_idx;		/* Save looked up index of a forward
-+				   sequence after the last backward
-+				   sequence.  */
-+  const USTRING_TYPE *back_us;	/* Beginning of the backward sequence.  */
-+} coll_seq;
-+
-+/* Get next sequence.  The weight indices are cached, so we don't need to
-+   traverse the string.  */
-+static void
-+get_next_seq_cached (coll_seq *seq, int nrules, int pass,
-+		     const unsigned char *rulesets,
-+		     const USTRING_TYPE *weights)
-+{
-+  size_t val = seq->val = 0;
-+  int len = seq->len;
-+  size_t backw_stop = seq->backw_stop;
-+  size_t backw = seq->backw;
-+  size_t idxcnt = seq->idxcnt;
-+  size_t idxmax = seq->idxmax;
-+  size_t idxnow = seq->idxnow;
-+  unsigned char *rulearr = seq->rulearr;
-+  int32_t *idxarr = seq->idxarr;
-+
-+  while (len == 0)
-+    {
-+      ++val;
-+      if (backw_stop != ~0ul)
-+	{
-+	  /* There is something pushed.  */
-+	  if (backw == backw_stop)
-+	    {
-+	      /* The last pushed character was handled.  Continue
-+		 with forward characters.  */
-+	      if (idxcnt < idxmax)
-+		{
-+		  idxnow = idxcnt;
-+		  backw_stop = ~0ul;
-+		}
-+	      else
-+		{
-+		  /* Nothing any more.  The backward sequence
-+		     ended with the last sequence in the string.  */
-+		  idxnow = ~0ul;
-+		  break;
-+		}
-+	    }
-+	  else
-+	    idxnow = --backw;
-+	}
-+      else
-+	{
-+	  backw_stop = idxcnt;
-+
-+	  while (idxcnt < idxmax)
-+	    {
-+	      if ((rulesets[rulearr[idxcnt] * nrules + pass]
-+		   & sort_backward) == 0)
-+		/* No more backward characters to push.  */
-+		break;
-+	      ++idxcnt;
-+	    }
-+
-+	  if (backw_stop == idxcnt)
-+	    {
-+	      /* No sequence at all or just one.  */
-+	      if (idxcnt == idxmax)
-+		/* Note that LEN is still zero.  */
-+		break;
-+
-+	      backw_stop = ~0ul;
-+	      idxnow = idxcnt++;
-+	    }
-+	  else
-+	    /* We pushed backward sequences.  */
-+	    idxnow = backw = idxcnt - 1;
-+	}
-+      len = weights[idxarr[idxnow]++];
-+    }
-+
-+  /* Update the structure.  */
-+  seq->val = val;
-+  seq->len = len;
-+  seq->backw_stop = backw_stop;
-+  seq->backw = backw;
-+  seq->idxcnt = idxcnt;
-+  seq->idxnow = idxnow;
-+}
-+
-+/* Get next sequence.  Traverse the string as required.  */
-+static void
-+get_next_seq (coll_seq *seq, int nrules, const unsigned char *rulesets,
-+	      const USTRING_TYPE *weights, const int32_t *table,
-+	      const USTRING_TYPE *extra, const int32_t *indirect)
-+{
-+#include WEIGHT_H
-+  size_t val = seq->val = 0;
-+  int len = seq->len;
-+  size_t backw_stop = seq->backw_stop;
-+  size_t backw = seq->backw;
-+  size_t idxcnt = seq->idxcnt;
-+  size_t idxmax = seq->idxmax;
-+  size_t idxnow = seq->idxnow;
-+  unsigned char *rulearr = seq->rulearr;
-+  int32_t *idxarr = seq->idxarr;
-+  const USTRING_TYPE *us = seq->us;
-+
-+  while (len == 0)
-+    {
-+      ++val;
-+      if (backw_stop != ~0ul)
-+	{
-+	  /* There is something pushed.  */
-+	  if (backw == backw_stop)
-+	    {
-+	      /* The last pushed character was handled.  Continue
-+		 with forward characters.  */
-+	      if (idxcnt < idxmax)
-+		{
-+		  idxnow = idxcnt;
-+		  backw_stop = ~0ul;
-+		}
-+	      else
-+		/* Nothing any more.  The backward sequence ended with
-+		   the last sequence in the string.  Note that LEN
-+		   is still zero.  */
-+		break;
-+	    }
-+	  else
-+	    idxnow = --backw;
-+	}
-+      else
-+	{
-+	  backw_stop = idxmax;
-+
-+	  while (*us != L('\0'))
-+	    {
-+	      int32_t tmp = findidx (&us, -1);
-+	      rulearr[idxmax] = tmp >> 24;
-+	      idxarr[idxmax] = tmp & 0xffffff;
-+	      idxcnt = idxmax++;
-+
-+	      if ((rulesets[rulearr[idxcnt] * nrules]
-+		   & sort_backward) == 0)
-+		/* No more backward characters to push.  */
-+		break;
-+	      ++idxcnt;
-+	    }
-+
-+	  if (backw_stop >= idxcnt)
-+	    {
-+	      /* No sequence at all or just one.  */
-+	      if (idxcnt == idxmax || backw_stop > idxcnt)
-+		/* Note that LEN is still zero.  */
-+		break;
-+
-+	      backw_stop = ~0ul;
-+	      idxnow = idxcnt;
-+	    }
-+	  else
-+	    /* We pushed backward sequences.  */
-+	    idxnow = backw = idxcnt - 1;
-+	}
-+      len = weights[idxarr[idxnow]++];
-+    }
-+
-+  /* Update the structure.  */
-+  seq->val = val;
-+  seq->len = len;
-+  seq->backw_stop = backw_stop;
-+  seq->backw = backw;
-+  seq->idxcnt = idxcnt;
-+  seq->idxmax = idxmax;
-+  seq->idxnow = idxnow;
-+  seq->us = us;
-+}
-+
-+/* Get next sequence.  Traverse the string as required.  This function does not
-+   set or use any index or rule cache.  */
-+static void
-+get_next_seq_nocache (coll_seq *seq, int nrules, const unsigned char *rulesets,
-+		      const USTRING_TYPE *weights, const int32_t *table,
-+		      const USTRING_TYPE *extra, const int32_t *indirect,
-+		      int pass)
-+{
-+#include WEIGHT_H
-+  size_t val = seq->val = 0;
-+  int len = seq->len;
-+  size_t backw_stop = seq->backw_stop;
-+  size_t backw = seq->backw;
-+  size_t idxcnt = seq->idxcnt;
-+  size_t idxmax = seq->idxmax;
-+  int32_t idx = seq->idx;
-+  const USTRING_TYPE *us = seq->us;
-+
-+  while (len == 0)
-+    {
-+      ++val;
-+      if (backw_stop != ~0ul)
-+	{
-+	  /* There is something pushed.  */
-+	  if (backw == backw_stop)
-+	    {
-+	      /* The last pushed character was handled.  Continue
-+		 with forward characters.  */
-+	      if (idxcnt < idxmax)
-+		{
-+		  idx = seq->save_idx;
-+		  backw_stop = ~0ul;
-+		}
-+	      else
-+		{
-+		  /* Nothing anymore.  The backward sequence ended with
-+		     the last sequence in the string.  Note that len is
-+		     still zero.  */
-+		  idx = 0;
-+		  break;
-+	        }
-+	    }
-+	  else
-+	    {
-+	      /* XXX Traverse BACKW sequences from the beginning of
-+		 BACKW_STOP to get the next sequence.  Is ther a quicker way
-+	         to do this?  */
-+	      size_t i = backw_stop;
-+	      us = seq->back_us;
-+	      while (i < backw)
-+		{
-+		  int32_t tmp = findidx (&us, -1);
-+		  idx = tmp & 0xffffff;
-+		  i++;
-+		}
-+	      --backw;
-+	      us = seq->us;
-+	    }
-+	}
-+      else
-+	{
-+	  backw_stop = idxmax;
-+	  int32_t prev_idx = idx;
-+
-+	  while (*us != L('\0'))
-+	    {
-+	      int32_t tmp = findidx (&us, -1);
-+	      unsigned char rule = tmp >> 24;
-+	      prev_idx = idx;
-+	      idx = tmp & 0xffffff;
-+	      idxcnt = idxmax++;
-+
-+	      /* Save the rule for the first sequence.  */
-+	      if (__glibc_unlikely (idxcnt == 0))
-+	        seq->rule = rule;
-+
-+	      if ((rulesets[rule * nrules + pass]
-+		   & sort_backward) == 0)
-+		/* No more backward characters to push.  */
-+		break;
-+	      ++idxcnt;
-+	    }
-+
-+	  if (backw_stop >= idxcnt)
-+	    {
-+	      /* No sequence at all or just one.  */
-+	      if (idxcnt == idxmax || backw_stop > idxcnt)
-+		/* Note that len is still zero.  */
-+		break;
-+
-+	      backw_stop = ~0ul;
-+	    }
-+	  else
-+	    {
-+	      /* We pushed backward sequences.  If the stream ended with the
-+		 backward sequence, then we process the last sequence we
-+		 found.  Otherwise we process the sequence before the last
-+		 one since the last one was a forward sequence.  */
-+	      seq->back_us = seq->us;
-+	      seq->us = us;
-+	      backw = idxcnt;
-+	      if (idxmax > idxcnt)
-+		{
-+		  backw--;
-+		  seq->save_idx = idx;
-+		  idx = prev_idx;
-+		}
-+	      if (backw > backw_stop)
-+		backw--;
-+	    }
-+	}
-+
-+      len = weights[idx++];
-+      /* Skip over indices of previous levels.  */
-+      for (int i = 0; i < pass; i++)
-+	{
-+	  idx += len;
-+	  len = weights[idx];
-+	  idx++;
-+	}
-+    }
-+
-+  /* Update the structure.  */
-+  seq->val = val;
-+  seq->len = len;
-+  seq->backw_stop = backw_stop;
-+  seq->backw = backw;
-+  seq->idxcnt = idxcnt;
-+  seq->idxmax = idxmax;
-+  seq->us = us;
-+  seq->idx = idx;
-+}
-+
-+/* Compare two sequences.  This version does not use the index and rules
-+   cache.  */
-+static int
-+do_compare_nocache (coll_seq *seq1, coll_seq *seq2, int position,
-+		    const USTRING_TYPE *weights)
-+{
-+  int seq1len = seq1->len;
-+  int seq2len = seq2->len;
-+  size_t val1 = seq1->val;
-+  size_t val2 = seq2->val;
-+  int idx1 = seq1->idx;
-+  int idx2 = seq2->idx;
-+  int result = 0;
-+
-+  /* Test for position if necessary.  */
-+  if (position && val1 != val2)
-+    {
-+      result = val1 > val2 ? 1 : -1;
-+      goto out;
-+    }
-+
-+  /* Compare the two sequences.  */
-+  do
-+    {
-+      if (weights[idx1] != weights[idx2])
-+	{
-+	  /* The sequences differ.  */
-+	  result = weights[idx1] - weights[idx2];
-+	  goto out;
-+	}
-+
-+      /* Increment the offsets.  */
-+      ++idx1;
-+      ++idx2;
-+
-+      --seq1len;
-+      --seq2len;
-+    }
-+  while (seq1len > 0 && seq2len > 0);
-+
-+  if (position && seq1len != seq2len)
-+    result = seq1len - seq2len;
-+
-+out:
-+  seq1->len = seq1len;
-+  seq2->len = seq2len;
-+  seq1->idx = idx1;
-+  seq2->idx = idx2;
-+  return result;
-+}
-+
-+/* Compare two sequences using the index cache.  */
-+static int
-+do_compare (coll_seq *seq1, coll_seq *seq2, int position,
-+	    const USTRING_TYPE *weights)
-+{
-+  int seq1len = seq1->len;
-+  int seq2len = seq2->len;
-+  size_t val1 = seq1->val;
-+  size_t val2 = seq2->val;
-+  int32_t *idx1arr = seq1->idxarr;
-+  int32_t *idx2arr = seq2->idxarr;
-+  int idx1now = seq1->idxnow;
-+  int idx2now = seq2->idxnow;
-+  int result = 0;
-+
-+  /* Test for position if necessary.  */
-+  if (position && val1 != val2)
-+    {
-+      result = val1 > val2 ? 1 : -1;
-+      goto out;
-+    }
-+
-+  /* Compare the two sequences.  */
-+  do
-+    {
-+      if (weights[idx1arr[idx1now]] != weights[idx2arr[idx2now]])
-+	{
-+	  /* The sequences differ.  */
-+	  result = weights[idx1arr[idx1now]] - weights[idx2arr[idx2now]];
-+	  goto out;
-+	}
-+
-+      /* Increment the offsets.  */
-+      ++idx1arr[idx1now];
-+      ++idx2arr[idx2now];
-+
-+      --seq1len;
-+      --seq2len;
-+    }
-+  while (seq1len > 0 && seq2len > 0);
-+
-+  if (position && seq1len != seq2len)
-+    result = seq1len - seq2len;
-+
-+out:
-+  seq1->len = seq1len;
-+  seq2->len = seq2len;
-+  return result;
-+}
-+
- int
--STRCOLL (s1, s2, l)
--     const STRING_TYPE *s1;
--     const STRING_TYPE *s2;
--     __locale_t l;
-+STRCOLL (const STRING_TYPE *s1, const STRING_TYPE *s2, __locale_t l)
- {
-   struct __locale_data *current = l->__locales[LC_COLLATE];
-   uint_fast32_t nrules = current->values[_NL_ITEM_INDEX (_NL_COLLATE_NRULES)].word;
-@@ -56,34 +479,6 @@ STRCOLL (s1, s2, l)
-   const USTRING_TYPE *weights;
-   const USTRING_TYPE *extra;
-   const int32_t *indirect;
--  uint_fast32_t pass;
--  int result = 0;
--  const USTRING_TYPE *us1;
--  const USTRING_TYPE *us2;
--  size_t s1len;
--  size_t s2len;
--  int32_t *idx1arr;
--  int32_t *idx2arr;
--  unsigned char *rule1arr;
--  unsigned char *rule2arr;
--  size_t idx1max;
--  size_t idx2max;
--  size_t idx1cnt;
--  size_t idx2cnt;
--  size_t idx1now;
--  size_t idx2now;
--  size_t backw1_stop;
--  size_t backw2_stop;
--  size_t backw1;
--  size_t backw2;
--  int val1;
--  int val2;
--  int position;
--  int seq1len;
--  int seq2len;
--  int use_malloc;
--
--#include WEIGHT_H
- 
-   if (nrules == 0)
-     return STRCMP (s1, s2);
-@@ -98,7 +493,6 @@ STRCOLL (s1, s2, l)
-     current->values[_NL_ITEM_INDEX (CONCAT(_NL_COLLATE_EXTRA,SUFFIX))].string;
-   indirect = (const int32_t *)
-     current->values[_NL_ITEM_INDEX (CONCAT(_NL_COLLATE_INDIRECT,SUFFIX))].string;
--  use_malloc = 0;
- 
-   assert (((uintptr_t) table) % __alignof__ (table[0]) == 0);
-   assert (((uintptr_t) weights) % __alignof__ (weights[0]) == 0);
-@@ -106,18 +500,13 @@ STRCOLL (s1, s2, l)
-   assert (((uintptr_t) indirect) % __alignof__ (indirect[0]) == 0);
- 
-   /* We need this a few times.  */
--  s1len = STRLEN (s1);
--  s2len = STRLEN (s2);
-+  size_t s1len = STRLEN (s1);
-+  size_t s2len = STRLEN (s2);
- 
-   /* Catch empty strings.  */
--  if (__builtin_expect (s1len == 0, 0) || __builtin_expect (s2len == 0, 0))
-+  if (__glibc_unlikely (s1len == 0) || __glibc_unlikely (s2len == 0))
-     return (s1len != 0) - (s2len != 0);
- 
--  /* We need the elements of the strings as unsigned values since they
--     are used as indeces.  */
--  us1 = (const USTRING_TYPE *) s1;
--  us2 = (const USTRING_TYPE *) s2;
--
-   /* Perform the first pass over the string and while doing this find
-      and store the weights for each character.  Since we want this to
-      be as fast as possible we are using `alloca' to store the temporary
-@@ -127,411 +516,124 @@ STRCOLL (s1, s2, l)
- 
-      Please note that the localedef programs makes sure that `position'
-      is not used at the first level.  */
--  if (! __libc_use_alloca ((s1len + s2len) * (sizeof (int32_t) + 1)))
--    {
--      idx1arr = (int32_t *) malloc ((s1len + s2len) * (sizeof (int32_t) + 1));
--      idx2arr = &idx1arr[s1len];
--      rule1arr = (unsigned char *) &idx2arr[s2len];
--      rule2arr = &rule1arr[s1len];
--
--      if (idx1arr == NULL)
--	/* No memory.  Well, go with the stack then.
--
--	   XXX Once this implementation is stable we will handle this
--	   differently.  Instead of precomputing the indeces we will
--	   do this in time.  This means, though, that this happens for
--	   every pass again.  */
--	goto try_stack;
--      use_malloc = 1;
--    }
--  else
--    {
--    try_stack:
--      idx1arr = (int32_t *) alloca (s1len * sizeof (int32_t));
--      idx2arr = (int32_t *) alloca (s2len * sizeof (int32_t));
--      rule1arr = (unsigned char *) alloca (s1len);
--      rule2arr = (unsigned char *) alloca (s2len);
--    }
- 
--  idx1cnt = 0;
--  idx2cnt = 0;
--  idx1max = 0;
--  idx2max = 0;
--  idx1now = 0;
--  idx2now = 0;
--  backw1_stop = ~0ul;
--  backw2_stop = ~0ul;
--  backw1 = ~0ul;
--  backw2 = ~0ul;
--  seq1len = 0;
--  seq2len = 0;
--  position = rulesets[0] & sort_position;
--  while (1)
--    {
--      val1 = 0;
--      val2 = 0;
--
--      /* Get the next non-IGNOREd element for string `s1'.  */
--      if (seq1len == 0)
--	do
--	  {
--	    ++val1;
--
--	    if (backw1_stop != ~0ul)
--	      {
--		/* The is something pushed.  */
--		if (backw1 == backw1_stop)
--		  {
--		    /* The last pushed character was handled.  Continue
--		       with forward characters.  */
--		    if (idx1cnt < idx1max)
--		      {
--			idx1now = idx1cnt;
--			backw1_stop = ~0ul;
--		      }
--		    else
--		      /* Nothing anymore.  The backward sequence ended with
--			 the last sequence in the string.  Note that seq1len
--			 is still zero.  */
--		      break;
--		  }
--		else
--		  idx1now = --backw1;
--	      }
--	    else
--	      {
--		backw1_stop = idx1max;
--
--		while (*us1 != L('\0'))
--		  {
--		    int32_t tmp = findidx (&us1, -1);
--		    rule1arr[idx1max] = tmp >> 24;
--		    idx1arr[idx1max] = tmp & 0xffffff;
--		    idx1cnt = idx1max++;
--
--		    if ((rulesets[rule1arr[idx1cnt] * nrules]
--			 & sort_backward) == 0)
--		      /* No more backward characters to push.  */
--		      break;
--		    ++idx1cnt;
--		  }
--
--		if (backw1_stop >= idx1cnt)
--		  {
--		    /* No sequence at all or just one.  */
--		    if (idx1cnt == idx1max || backw1_stop > idx1cnt)
--		      /* Note that seq1len is still zero.  */
--		      break;
--
--		    backw1_stop = ~0ul;
--		    idx1now = idx1cnt;
--		  }
--		else
--		  /* We pushed backward sequences.  */
--		  idx1now = backw1 = idx1cnt - 1;
--	      }
--	  }
--	while ((seq1len = weights[idx1arr[idx1now]++]) == 0);
--
--      /* And the same for string `s2'.  */
--      if (seq2len == 0)
--	do
--	  {
--	    ++val2;
--
--	    if (backw2_stop != ~0ul)
--	      {
--		/* The is something pushed.  */
--		if (backw2 == backw2_stop)
--		  {
--		    /* The last pushed character was handled.  Continue
--		       with forward characters.  */
--		    if (idx2cnt < idx2max)
--		      {
--			idx2now = idx2cnt;
--			backw2_stop = ~0ul;
--		      }
--		    else
--		      /* Nothing anymore.  The backward sequence ended with
--			 the last sequence in the string.  Note that seq2len
--			 is still zero.  */
--		      break;
--		  }
--		else
--		  idx2now = --backw2;
--	      }
--	    else
--	      {
--		backw2_stop = idx2max;
--
--		while (*us2 != L('\0'))
--		  {
--		    int32_t tmp = findidx (&us2, -1);
--		    rule2arr[idx2max] = tmp >> 24;
--		    idx2arr[idx2max] = tmp & 0xffffff;
--		    idx2cnt = idx2max++;
--
--		    if ((rulesets[rule2arr[idx2cnt] * nrules]
--			 & sort_backward) == 0)
--		      /* No more backward characters to push.  */
--		      break;
--		    ++idx2cnt;
--		  }
--
--		if (backw2_stop >= idx2cnt)
--		  {
--		    /* No sequence at all or just one.  */
--		    if (idx2cnt == idx2max || backw2_stop > idx2cnt)
--		      /* Note that seq1len is still zero.  */
--		      break;
--
--		    backw2_stop = ~0ul;
--		    idx2now = idx2cnt;
--		  }
--		else
--		  /* We pushed backward sequences.  */
--		  idx2now = backw2 = idx2cnt - 1;
--	      }
--	  }
--	while ((seq2len = weights[idx2arr[idx2now]++]) == 0);
--
--      /* See whether any or both strings are empty.  */
--      if (seq1len == 0 || seq2len == 0)
--	{
--	  if (seq1len == seq2len)
--	    /* Both ended.  So far so good, both strings are equal at the
--	       first level.  */
--	    break;
--
--	  /* This means one string is shorter than the other.  Find out
--	     which one and return an appropriate value.  */
--	  result = seq1len == 0 ? -1 : 1;
--	  goto free_and_return;
--	}
-+  coll_seq seq1, seq2;
-+  bool use_malloc = false;
-+  int result = 0;
- 
--      /* Test for position if necessary.  */
--      if (position && val1 != val2)
--	{
--	  result = val1 - val2;
--	  goto free_and_return;
--	}
-+  memset (&seq1, 0, sizeof (seq1));
-+  seq2 = seq1;
- 
--      /* Compare the two sequences.  */
--      do
--	{
--	  if (weights[idx1arr[idx1now]] != weights[idx2arr[idx2now]])
--	    {
--	      /* The sequences differ.  */
--	      result = weights[idx1arr[idx1now]] - weights[idx2arr[idx2now]];
--	      goto free_and_return;
--	    }
-+  size_t size_max = SIZE_MAX / (sizeof (int32_t) + 1);
- 
--	  /* Increment the offsets.  */
--	  ++idx1arr[idx1now];
--	  ++idx2arr[idx2now];
-+  /* If the strings are long enough to cause overflow in the size request, then
-+     skip the allocation and proceed with the non-cached routines.  */
-+  if (MIN (s1len, s2len) > size_max
-+      || MAX (s1len, s2len) > size_max - MIN (s1len, s2len))
-+    goto begin_collate;
- 
--	  --seq1len;
--	  --seq2len;
--	}
--      while (seq1len > 0 && seq2len > 0);
-+  if (! __libc_use_alloca ((s1len + s2len) * (sizeof (int32_t) + 1)))
-+    {
-+      seq1.idxarr = (int32_t *) malloc ((s1len + s2len) * (sizeof (int32_t) + 1));
- 
--      if (position && seq1len != seq2len)
-+      /* If we failed to allocate memory, we leave everything as NULL so that
-+	 we use the nocache version of traversal and comparison functions.  */
-+      if (seq1.idxarr != NULL)
- 	{
--	  result = seq1len - seq2len;
--	  goto free_and_return;
-+	  seq2.idxarr = &seq1.idxarr[s1len];
-+	  seq1.rulearr = (unsigned char *) &seq2.idxarr[s2len];
-+	  seq2.rulearr = &seq1.rulearr[s1len];
-+	  use_malloc = true;
- 	}
-     }
-+  else
-+    {
-+      seq1.idxarr = (int32_t *) alloca (s1len * sizeof (int32_t));
-+      seq2.idxarr = (int32_t *) alloca (s2len * sizeof (int32_t));
-+      seq1.rulearr = (unsigned char *) alloca (s1len);
-+      seq2.rulearr = (unsigned char *) alloca (s2len);
-+    }
- 
--  /* Now the remaining passes over the weights.  We now use the
--     indeces we found before.  */
--  for (pass = 1; pass < nrules; ++pass)
-+  int rule;
-+
-+ begin_collate:
-+  rule = 0;
-+  /* Cache values in the first pass and if needed, use them in subsequent
-+     passes.  */
-+  for (int pass = 0; pass < nrules; ++pass)
-     {
-+      seq1.idxcnt = 0;
-+      seq1.idx = 0;
-+      seq2.idx = 0;
-+      seq1.backw_stop = ~0ul;
-+      seq1.backw = ~0ul;
-+      seq2.idxcnt = 0;
-+      seq2.backw_stop = ~0ul;
-+      seq2.backw = ~0ul;
-+
-+      /* We need the elements of the strings as unsigned values since they
-+	 are used as indices.  */
-+      seq1.us = (const USTRING_TYPE *) s1;
-+      seq2.us = (const USTRING_TYPE *) s2;
-+
-       /* We assume that if a rule has defined `position' in one section
- 	 this is true for all of them.  */
--      idx1cnt = 0;
--      idx2cnt = 0;
--      backw1_stop = ~0ul;
--      backw2_stop = ~0ul;
--      backw1 = ~0ul;
--      backw2 = ~0ul;
--      position = rulesets[rule1arr[0] * nrules + pass] & sort_position;
-+      int position = rulesets[rule * nrules + pass] & sort_position;
- 
-       while (1)
- 	{
--	  val1 = 0;
--	  val2 = 0;
--
--	  /* Get the next non-IGNOREd element for string `s1'.  */
--	  if (seq1len == 0)
--	    do
--	      {
--		++val1;
--
--		if (backw1_stop != ~0ul)
--		  {
--		    /* The is something pushed.  */
--		    if (backw1 == backw1_stop)
--		      {
--			/* The last pushed character was handled.  Continue
--			   with forward characters.  */
--			if (idx1cnt < idx1max)
--			  {
--			    idx1now = idx1cnt;
--			    backw1_stop = ~0ul;
--			  }
--			else
--			  {
--			    /* Nothing anymore.  The backward sequence
--			       ended with the last sequence in the string.  */
--			    idx1now = ~0ul;
--			    break;
--			  }
--		      }
--		    else
--		      idx1now = --backw1;
--		  }
--		else
--		  {
--		    backw1_stop = idx1cnt;
--
--		    while (idx1cnt < idx1max)
--		      {
--			if ((rulesets[rule1arr[idx1cnt] * nrules + pass]
--			     & sort_backward) == 0)
--			  /* No more backward characters to push.  */
--			  break;
--			++idx1cnt;
--		      }
--
--		    if (backw1_stop == idx1cnt)
--		      {
--			/* No sequence at all or just one.  */
--			if (idx1cnt == idx1max)
--			  /* Note that seq1len is still zero.  */
--			  break;
--
--			backw1_stop = ~0ul;
--			idx1now = idx1cnt++;
--		      }
--		    else
--		      /* We pushed backward sequences.  */
--		      idx1now = backw1 = idx1cnt - 1;
--		  }
--	      }
--	    while ((seq1len = weights[idx1arr[idx1now]++]) == 0);
--
--	  /* And the same for string `s2'.  */
--	  if (seq2len == 0)
--	    do
--	      {
--		++val2;
--
--		if (backw2_stop != ~0ul)
--		  {
--		    /* The is something pushed.  */
--		    if (backw2 == backw2_stop)
--		      {
--			/* The last pushed character was handled.  Continue
--			   with forward characters.  */
--			if (idx2cnt < idx2max)
--			  {
--			    idx2now = idx2cnt;
--			    backw2_stop = ~0ul;
--			  }
--			else
--			  {
--			    /* Nothing anymore.  The backward sequence
--			       ended with the last sequence in the string.  */
--			    idx2now = ~0ul;
--			    break;
--			  }
--		      }
--		    else
--		      idx2now = --backw2;
--		  }
--		else
--		  {
--		    backw2_stop = idx2cnt;
--
--		    while (idx2cnt < idx2max)
--		      {
--			if ((rulesets[rule2arr[idx2cnt] * nrules + pass]
--			     & sort_backward) == 0)
--			  /* No more backward characters to push.  */
--			  break;
--			++idx2cnt;
--		      }
--
--		    if (backw2_stop == idx2cnt)
--		      {
--			/* No sequence at all or just one.  */
--			if (idx2cnt == idx2max)
--			  /* Note that seq2len is still zero.  */
--			  break;
--
--			backw2_stop = ~0ul;
--			idx2now = idx2cnt++;
--		      }
--		    else
--		      /* We pushed backward sequences.  */
--		      idx2now = backw2 = idx2cnt - 1;
--		  }
--	      }
--	    while ((seq2len = weights[idx2arr[idx2now]++]) == 0);
-+	  if (__glibc_unlikely (seq1.idxarr == NULL))
-+	    {
-+	      get_next_seq_nocache (&seq1, nrules, rulesets, weights, table,
-+				    extra, indirect, pass);
-+	      get_next_seq_nocache (&seq2, nrules, rulesets, weights, table,
-+				    extra, indirect, pass);
-+	    }
-+	  else if (pass == 0)
-+	    {
-+	      get_next_seq (&seq1, nrules, rulesets, weights, table, extra,
-+			    indirect);
-+	      get_next_seq (&seq2, nrules, rulesets, weights, table, extra,
-+			    indirect);
-+	    }
-+	  else
-+	    {
-+	      get_next_seq_cached (&seq1, nrules, pass, rulesets, weights);
-+	      get_next_seq_cached (&seq2, nrules, pass, rulesets, weights);
-+	    }
- 
- 	  /* See whether any or both strings are empty.  */
--	  if (seq1len == 0 || seq2len == 0)
-+	  if (seq1.len == 0 || seq2.len == 0)
- 	    {
--	      if (seq1len == seq2len)
-+	      if (seq1.len == seq2.len)
- 		/* Both ended.  So far so good, both strings are equal
- 		   at this level.  */
- 		break;
- 
- 	      /* This means one string is shorter than the other.  Find out
- 		 which one and return an appropriate value.  */
--	      result = seq1len == 0 ? -1 : 1;
-+	      result = seq1.len == 0 ? -1 : 1;
- 	      goto free_and_return;
- 	    }
- 
--	  /* Test for position if necessary.  */
--	  if (position && val1 != val2)
--	    {
--	      result = val1 - val2;
--	      goto free_and_return;
--	    }
--
--	  /* Compare the two sequences.  */
--	  do
--	    {
--	      if (weights[idx1arr[idx1now]] != weights[idx2arr[idx2now]])
--		{
--		  /* The sequences differ.  */
--		  result = (weights[idx1arr[idx1now]]
--			    - weights[idx2arr[idx2now]]);
--		  goto free_and_return;
--		}
--
--	      /* Increment the offsets.  */
--	      ++idx1arr[idx1now];
--	      ++idx2arr[idx2now];
--
--	      --seq1len;
--	      --seq2len;
--	    }
--	  while (seq1len > 0 && seq2len > 0);
--
--	  if (position && seq1len != seq2len)
--	    {
--	      result = seq1len - seq2len;
--	      goto free_and_return;
--	    }
-+	  if (__glibc_unlikely (seq1.idxarr == NULL))
-+	    result = do_compare_nocache (&seq1, &seq2, position, weights);
-+	  else
-+	    result = do_compare (&seq1, &seq2, position, weights);
-+	  if (result != 0)
-+	    goto free_and_return;
- 	}
-+
-+      if (__glibc_likely (seq1.rulearr != NULL))
-+	rule = seq1.rulearr[0];
-+      else
-+	rule = seq1.rule;
-     }
- 
-   /* Free the memory if needed.  */
-  free_and_return:
-   if (use_malloc)
--    free (idx1arr);
-+    free (seq1.idxarr);
- 
-   return result;
- }
diff --git a/core/glibc/glibc-2.18-strstr-hackfix.patch b/core/glibc/glibc-2.18-strstr-hackfix.patch
deleted file mode 100644
index 6149f88bc..000000000
--- a/core/glibc/glibc-2.18-strstr-hackfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sysdeps/x86_64/multiarch/strstr.c b/sysdeps/x86_64/multiarch/strstr.c
-index cd63b68..03d8b9a 100644
---- a/sysdeps/x86_64/multiarch/strstr.c
-+++ b/sysdeps/x86_64/multiarch/strstr.c
-@@ -86,7 +86,7 @@
- /* Simple replacement of movdqu to address 4KB boundary cross issue.
-    If EOS occurs within less than 16B before 4KB boundary, we don't
-    cross to next page.  */
--static __m128i
-+static inline __m128i
- __m128i_strloadu (const unsigned char * p, __m128i zero)
- {
-   if (__builtin_expect ((int) ((size_t) p & 0xfff) > 0xff0, 0))
diff --git a/core/glibc/glibc-2.18-xattr-compat-hack.patch b/core/glibc/glibc-2.18-xattr-compat-hack.patch
new file mode 100644
index 000000000..7486922d7
--- /dev/null
+++ b/core/glibc/glibc-2.18-xattr-compat-hack.patch
@@ -0,0 +1,19 @@
+diff -Naur glibc-2.18-orig/misc/sys/xattr.h glibc-2.18/misc/sys/xattr.h
+--- glibc-2.18-orig/misc/sys/xattr.h	2013-08-11 08:52:55.000000000 +1000
++++ glibc-2.18/misc/sys/xattr.h	2014-01-07 15:45:50.533969040 +1000
+@@ -26,13 +26,8 @@
+ 
+ /* The following constants should be used for the fifth parameter of
+    `*setxattr'.  */
+-enum
+-{
+-  XATTR_CREATE = 1,	/* set value, fail if attr already exists.  */
+-#define XATTR_CREATE	XATTR_CREATE
+-  XATTR_REPLACE = 2	/* set value, fail if attr does not exist.  */
+-#define XATTR_REPLACE	XATTR_REPLACE
+-};
++#define XATTR_CREATE	1
++#define XATTR_REPLACE	2
+ 
+ /* Set the attribute NAME of the file pointed to by PATH to VALUE (which
+    is SIZE bytes long).  Return 0 on success, -1 for errors.  */
diff --git a/core/glibc/glibc.install b/core/glibc/glibc.install
index 6b405486e..31ce3dae2 100644
--- a/core/glibc/glibc.install
+++ b/core/glibc/glibc.install
@@ -4,7 +4,7 @@ filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11})
 post_upgrade() {
   ldconfig -r .
   
-  if [[ $(vercmp 2.18 $2) = 1 ]]; then
+  if [[ $(vercmp 2.19-2 $2) = 1 ]]; then
     locale-gen
   fi
   
diff --git a/core/glibc/locale-gen b/core/glibc/locale-gen
index 51191f810..5aff344c4 100755
--- a/core/glibc/locale-gen
+++ b/core/glibc/locale-gen
@@ -4,53 +4,39 @@ set -e
 
 LOCALEGEN=/etc/locale.gen
 LOCALES=/usr/share/i18n/locales
-unset POSIXLY_CORRECT
+if [ -n "$POSIXLY_CORRECT" ]; then
+  unset POSIXLY_CORRECT
+fi
 
-[ -s "$LOCALEGEN" ] || exit 0
+
+[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0;
 
 # Remove all old locale dir and locale-archive before generating new
 # locale data.
-rm -rf /usr/lib/locale/*
+rm -rf /usr/lib/locale/* || true
 
 umask 022
 
-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"
+is_entry_ok() {
+  if [ -n "$locale" -a -n "$charset" ] ; then
+    true
+  else
+    echo "error: Bad entry '$locale $charset'"
+    false
+  fi
 }
 
-maxjobs=$(grep -c processor /proc/cpuinfo 2>/dev/null || echo 1)
 echo "Generating locales..."
 while read locale charset; do \
-	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
+	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'; \
 done < $LOCALEGEN
-wait
-
 echo "Generation complete."
diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD
index 412da5996..084e34af6 100644
--- a/core/gnupg/PKGBUILD
+++ b/core/gnupg/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195927 2013-10-05 17:40:59Z bisson $
+# $Id: PKGBUILD 203564 2014-01-13 17:11:40Z andyrtr $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.0.22
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD
index caabdfaa2..902c0d0fa 100644
--- a/core/grep/PKGBUILD
+++ b/core/grep/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197799 2013-10-30 10:37:55Z allan $
+# $Id: PKGBUILD 203054 2014-01-03 00:30:46Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=grep
-pkgver=2.15
+pkgver=2.16
 pkgrel=1
 pkgdesc="A string search utility"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('glibc' 'pcre' 'sh')
 makedepends=('texinfo')
 install=${pkgname}.install
 source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-md5sums=('8cab8ca52bcae735af40278423c7c942'
+md5sums=('502350a6c8f7c2b12ee58829e760b44d'
          'SKIP')
 
 build() {
diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD
index 602334876..58f2a2f56 100644
--- a/core/inetutils/PKGBUILD
+++ b/core/inetutils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 201551 2013-12-14 23:02:04Z eric $
+# $Id: PKGBUILD 204528 2014-01-22 01:54:27Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=inetutils
-pkgver=1.9.1.341
-pkgrel=2
+pkgver=1.9.2
+pkgrel=1
 pkgdesc="A collection of common network programs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/inetutils/"
@@ -16,11 +16,11 @@ backup=('etc/xinetd.d/telnet' 'etc/xinetd.d/talk'
 	'etc/pam.d/rlogin' 'etc/pam.d/rsh')
 options=('!emptydirs')
 install=inetutils.install
-source=(ftp://ftp.archlinux.org/other/packages/inetutils/${pkgname}-${pkgver}.tar.xz{,.sig}
+source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.xz{,.sig}
         ftpd.service rlogin.pam rlogin@.service rlogin.socket rlogin.xinetd
         rsh.pam rsh@.service rsh.socket rsh.xinetd talk.service talk.socket talk.xinetd
         telnet@.service telnet.socket telnet.xinetd)
-sha1sums=('eaccc1568c9cc624f6cda3a265fb92ec72c7304d'
+sha1sums=('f9fc5c3ba7046d95fdfd0f1c6adf508220082893'
           'SKIP'
           'aa4730d662398b6c33df2b6fc116ab6b5c3cd120'
           '387b371cbaa3611b95d30f806c0dd08b621a584a'
diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD
index 35f426749..845d5aade 100644
--- a/core/iproute2/PKGBUILD
+++ b/core/iproute2/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 199763 2013-11-15 21:24:40Z ronald $
+# $Id: PKGBUILD 203666 2014-01-13 18:57:04Z foutrelis $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=iproute2
-pkgver=3.11.0
+pkgver=3.12.0
 pkgrel=1
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
-depends=('glibc' 'db' 'iptables')
+depends=('glibc' 'iptables')
 makedepends=('linux-atm')
 optdepends=('linux-atm: ATM support')
 groups=('base')
@@ -22,7 +22,7 @@ backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_pro
 source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
         iproute2-fhs.patch
 	unwanted-link-help.patch)
-sha1sums=('efb5ca0688e28967ec146ac37cc728c4f53c9d8f'
+sha1sums=('9397376e5d4dcbb1182745cd58625895fcdb868d'
           '35b8cf2dc94b73eccad427235c07596146cd6f6c'
           '3b1335f4025f657f388fbf4e5a740871e3129c2a')
 
diff --git a/core/iptables/0503-extension_cppflags.patch b/core/iptables/0503-extension_cppflags.patch
deleted file mode 100644
index 0eb645731..000000000
--- a/core/iptables/0503-extension_cppflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/extensions/GNUmakefile.in
-===================================================================
---- a/extensions/GNUmakefile.in	2012-03-27 12:14:05.000000000 -0400
-+++ b/extensions/GNUmakefile.in	2012-03-27 16:03:48.378790221 -0400
-@@ -21,7 +21,7 @@
- kinclude_CPPFLAGS  = @kinclude_CPPFLAGS@
- 
- AM_CFLAGS       = ${regular_CFLAGS}
--AM_CPPFLAGS     = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS}
-+AM_CPPFLAGS     = ${CPPFLAGS} ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS}
- AM_DEPFLAGS     = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
- AM_LDFLAGS      = @noundef_LDFLAGS@
- 
diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD
index 17675f234..c61d2d72d 100644
--- a/core/iptables/PKGBUILD
+++ b/core/iptables/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 199764 2013-11-15 21:24:41Z ronald $
+# $Id: PKGBUILD 203667 2014-01-13 18:57:06Z foutrelis $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=iptables
-pkgver=1.4.20
+pkgver=1.4.21
 pkgrel=1
 pkgdesc='Linux kernel packet control tool'
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,11 +20,10 @@ source=(http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.ta
         empty-nat.rules
         empty-raw.rules
         empty-security.rules
-        0503-extension_cppflags.patch
         iptables.service
         ip6tables.service
         iptables-flush)
-sha1sums=('7219b32657e9f794ff1b5a2476363c59f9c2175c'
+sha1sums=('85d4160537546a23a7e42bc26dd7ee62a0ede4c8'
           'SKIP'
           '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
           'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec'
@@ -33,18 +32,19 @@ sha1sums=('7219b32657e9f794ff1b5a2476363c59f9c2175c'
           '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6'
           '7db53bb882f62f6c677cc8559cff83d8bae2ef73'
           'ebbd1424a1564fd45f455a81c61ce348f0a14c2e'
-          '44626980a52e49f345a0b1e1ca03060f3a35763c'
           '9306cba67dbeaa004af084a816f66920a6a10faf'
           '38fa2ffe7965e63b494d333f69193029c1258c28'
           'e7abda09c61142121b6695928d3b71ccd8fdf73a')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   # use system one
   rm include/linux/types.h
+}
 
-  patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
  ./configure --prefix=/usr \
      --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD
index 14e023272..3b3d1e11e 100644
--- a/core/isl/PKGBUILD
+++ b/core/isl/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 201470 2013-12-12 15:38:37Z allan $
+# $Id: PKGBUILD 204392 2014-01-19 00:33:31Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=isl
-pkgver=0.12.1
-pkgrel=2
+pkgver=0.12.2
+pkgrel=1
 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')
 source=(http://isl.gforge.inria.fr/$pkgname-$pkgver.tar.bz2)
-md5sums=('27d381085ff1b5733c3e8a9b6ad24a4d')
+md5sums=('e039bfcfb6c2ab039b8ee69bf883e824')
+
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -25,10 +26,10 @@ check() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  make -j1 DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir/" install
 
   install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/
-  mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.2.1-gdb.py
+  mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.2.2-gdb.py
   
   install -Dm644 LICENSE $pkgdir/usr/share/licenses/isl/LICENSE
 }
diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD
index 66ccfb288..9eff5e362 100644
--- a/core/iw/PKGBUILD
+++ b/core/iw/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195909 2013-10-05 07:30:47Z thomas $
+# $Id: PKGBUILD 204472 2014-01-20 18:47:27Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=iw
-pkgver=3.11
+pkgver=3.13
 pkgrel=1
 pkgdesc="nl80211 based CLI configuration utility for wireless devices"
 arch=("i686" "x86_64" 'mips64el')
@@ -11,7 +11,7 @@ license=("GPL")
 depends=("libnl")
 makedepends=("linux-api-headers")
 source=(https://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('e90327323821a8219abac56298919076c4bac6636464ca91356f02cfe40530ff')
+sha256sums=('70c1c0f5145542b4d04dd52ad637920718515245e3dd3b4dc4c8e3b57b110dc6')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD
index 2cc64e971..e6aa9ed2b 100644
--- a/core/kmod/PKGBUILD
+++ b/core/kmod/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197816 2013-10-30 11:04:03Z allan $
+# $Id: PKGBUILD 203021 2014-01-01 17:44:12Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=kmod
-pkgver=15
+pkgver=16
 pkgrel=1
 pkgdesc="Linux kernel module handling"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,12 +10,13 @@ url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
 license=('GPL2')
 depends=('glibc' 'zlib')
 makedepends=('gtk-doc')
+options=('strip' 'debug')
 provides=('module-init-tools=3.16' 'libkmod.so')
 conflicts=('module-init-tools')
 replaces=('module-init-tools')
 source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
         "depmod-search.conf")
-md5sums=('d03372179ed2cfa0c52b6672cf438901'
+md5sums=('3006a0287211212501cdfe1211b29f09'
          'dd62cbf62bd8f212f51ef8c43bec9a77')
 
 build() {
diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
index a18e8d724..25a0ff30a 100644
--- a/core/krb5/PKGBUILD
+++ b/core/krb5/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 199942 2013-11-20 02:11:51Z eric $
+# $Id: PKGBUILD 204797 2014-01-27 13:46:43Z eric $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=krb5
-pkgver=1.11.4
+pkgver=1.12.1
 pkgrel=1
 pkgdesc="The Kerberos network authentication system"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/${pkgver%.*}/${pkgname}-${pk
         krb5-kpropd.service
         krb5-kpropd@.service
         krb5-kpropd.socket)
-sha1sums=('a432489410efa3ff27ac0ae54f55edeede3ed63f'
+sha1sums=('d59e8dc0fc9e1890e109cd033756539984e3d3fe'
           '09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa'
           '59bbc7e686cbb4bcefddf0f134d928d7bd5e7722'
           '2ef2476a8673b3b702e829d8f451c839c2273b02'
@@ -28,10 +28,15 @@ sha1sums=('a432489410efa3ff27ac0ae54f55edeede3ed63f'
           'f3677d30dbbd7106c581379c2c6ebb1bf7738912')
 
 prepare() {
-   tar -xf ${pkgname}-${pkgver}.tar.gz
-   cd ${pkgname}-${pkgver}/src
-   # cf https://bugs.gentoo.org/show_bug.cgi?id=448778
-   patch -Np2 -i "${srcdir}"/krb5-config_LDFLAGS.patch
+  tar -xf ${pkgname}-${pkgver}.tar.gz
+  # the signature and source are bundled together, so signature check needs to be done here
+  local statusfile=$(mktemp)
+  (( SKIPPGPCHECK )) || gpg --quiet --batch --status-file "$statusfile" --verify krb5-${pkgver}.tar.gz.asc krb5-${pkgver}.tar.gz 2> /dev/null
+  rm "$statusfile"
+
+  cd ${pkgname}-${pkgver}/src
+  # cf https://bugs.gentoo.org/show_bug.cgi?id=448778
+  (cd build-tools;  patch -Np2 -i "${srcdir}"/krb5-config_LDFLAGS.patch; cd ..)
 
    # FS#25384
    sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4
diff --git a/core/ldns/PKGBUILD b/core/ldns/PKGBUILD
index 98ac36415..62b22876f 100644
--- a/core/ldns/PKGBUILD
+++ b/core/ldns/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197817 2013-10-30 11:04:09Z allan $
+# $Id: PKGBUILD 205001 2014-02-02 20:56:10Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: mathieui <mathieui@mathieui.net>
 # Contributor: jiribb <jiribb@gmail.com>
 
 pkgname=ldns
-pkgver=1.6.16
-pkgrel=1.1
+pkgver=1.6.17
+pkgrel=1
 pkgdesc='Fast DNS library supporting recent RFCs'
 url='http://www.nlnetlabs.nl/projects/ldns/'
 license=('custom:BSD')
@@ -14,7 +14,7 @@ depends=('openssl' 'dnssec-anchors')
 optdepends=('libpcap: ldns-dpa tool')
 makedepends=('libpcap')
 source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('5b4fc6c5c3078cd061905c47178478cb1015c62a')
+sha1sums=('4218897b3c002aadfc7280b3f40cda829e05c9a4')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,7 +23,6 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--enable-static=no \
 		--disable-rpath \
 		--with-drill \
 		--with-examples \
diff --git a/core/libcap/PKGBUILD b/core/libcap/PKGBUILD
index 24d2ade35..9c3a0fa0d 100644
--- a/core/libcap/PKGBUILD
+++ b/core/libcap/PKGBUILD
@@ -1,19 +1,18 @@
-#$Id: PKGBUILD 185557 2013-05-15 05:24:44Z allan $
+#$Id: PKGBUILD 203339 2014-01-08 11:40:25Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libcap
-pkgver=2.22
-pkgrel=5
+pkgver=2.24
+pkgrel=1
 pkgdesc="POSIX 1003.1e capabilities"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sites.google.com/site/fullycapable/"
 license=('GPL2')
 depends=('glibc' 'attr')
 options=('!staticlibs')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
-md5sums=('b4896816b626bea445f0b3849bdd4077'
-         '9d0983e25e5a251d098507f9561d2b27')
+source=(https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-${pkgver}.tar.xz)
+md5sums=('d43ab9f680435a7fff35b4ace8d45b80')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD
index 5028378bf..4a0072ae3 100644
--- a/core/libgcrypt/PKGBUILD
+++ b/core/libgcrypt/PKGBUILD
@@ -1,8 +1,12 @@
-# $Id: PKGBUILD 197821 2013-10-30 11:04:40Z allan $
+# $Id: PKGBUILD 204931 2014-01-31 15:34:43Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
+# after a .so bump first rebuild dirmngr
+# with sudo testing-x86_64-build -- -I libgcrypt-1.6.0-1-x86_64.pkg.tar.xz
+# then cp /usr/lib/libgcrypt.so.11 /var/lib/archbuild/staging-x86_64/root/usr/lib/ and do staging-x86_64-build
+
 pkgname=libgcrypt
-pkgver=1.5.3
+pkgver=1.6.1
 pkgrel=1
 pkgdesc="General purpose cryptographic library based on the code from GnuPG"
 arch=(i686 x86_64 'mips64el')
@@ -11,13 +15,15 @@ license=('LGPL')
 depends=('libgpg-error>=1.10-2')
 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
-)
-sha1sums=('2c6553cc17f2a1616d512d6870fe95edf6b0e26e')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('f03d9b63ac3b17a6972fc11150d136925b702f02')
+
+#prepare() {
+#  cd ${pkgname}-${pkgver}
+#}
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
 	--disable-static \
 	--disable-padlock-support
@@ -25,11 +31,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/core/libmpc/PKGBUILD b/core/libmpc/PKGBUILD
index 535e95513..ac7cbf8e0 100644
--- a/core/libmpc/PKGBUILD
+++ b/core/libmpc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197164 2013-10-23 13:05:01Z allan $
+# $Id: PKGBUILD 204788 2014-01-27 08:27:19Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=libmpc
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=2
 pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,8 +11,8 @@ license=('LGPL')
 depends=('mpfr')
 install=libmpc.install
 source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz{,.sig})
-md5sums=('b32a2e1a3daa392372fbd586d1ed3679'
-         'c064863fbbb5831ba4f75f1181333862')
+md5sums=('68fadff3358fb3e7976c7a398a0af4c3'
+         'SKIP')
 
 build() {
   cd "${srcdir}/mpc-${pkgver}"
diff --git a/core/libpcap/PKGBUILD b/core/libpcap/PKGBUILD
index 0e2a133fc..dfc6b9248 100644
--- a/core/libpcap/PKGBUILD
+++ b/core/libpcap/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 200644 2013-11-30 17:42:00Z thomas $
+# $Id: PKGBUILD 204851 2014-01-29 11:26:56Z andyrtr $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=libpcap
-pkgver=1.5.1
+pkgver=1.5.3
 pkgrel=1
 pkgdesc="A system-independent interface for user-level packet capture"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tcpdump.org/"
 license=('BSD')
 depends=('glibc' 'libnl' 'sh' 'libusbx')
-makedepends=('flex')
+makedepends=('flex' 'bluez-libs')
 source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig})
-sha256sums=('259db4fe1e9f0b6b9c43a057ec5916dec7d0a821b00d6d6c4dff7db2445fa7e4'
+sha256sums=('9ae92159c1060f15e6a90f2c4ad227268b6aaa382c316fa49a31c496b9979e93'
             'SKIP')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-ipv6 --with-libnl
+  ./configure --prefix=/usr \
+    --enable-ipv6 \
+    --enable-bluetooth \
+    --with-libnl
   make
 }
 
diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD
index 3632f77fc..ae2f71f57 100644
--- a/core/libsasl/PKGBUILD
+++ b/core/libsasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197827 2013-10-30 11:05:21Z allan $
+# $Id: PKGBUILD 205603 2014-02-09 10:29:30Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 # This package spans multiple repositories. 
@@ -8,13 +8,13 @@
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.26
-pkgrel=6
+pkgrel=7
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
 options=('!makeflags')
-makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite2')
+makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite')
 source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
         cyrus-sasl-2.1.22-qa.patch
         cyrus-sasl-2.1.26-size_t.patch
@@ -26,7 +26,8 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
         saslauthd.service
         saslauthd.conf.d
         tmpfiles.conf
-        CVE-2013-4122.patch)
+        CVE-2013-4122.patch
+        cyrus-sasl-sql.patch)
 md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '79b8a5e8689989e2afd4b7bda595a7b1'
          'f45aa8c42b32e0569ab3d14a83485b37'
@@ -38,7 +39,8 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '3499dcd610ad1ad58e0faffde2aa7a23'
          '49219af5641150edec288a3fdb65e7c1'
          '45bb0192d2f188066240b9a66ee6365f'
-         'c5f0ec88c584a75c14d7f402eaeed7ef')
+         'c5f0ec88c584a75c14d7f402eaeed7ef'
+         '82c0f66fdc5c1145eb48ea9116c27931')
 
 prepare() {
   cd cyrus-sasl-$pkgver
@@ -50,6 +52,7 @@ prepare() {
   patch -Np1 -i ../0026_drop_krb5support_dependency.patch
   patch -Np1 -i ../0030-dont_use_la_files_for_opening_plugins.patch
   patch -Np1 -i ../CVE-2013-4122.patch
+  patch -Np0 -i ../cyrus-sasl-sql.patch
 
   sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
 }
@@ -102,11 +105,15 @@ build() {
       --enable-ntlm \
       --disable-passdss \
       --enable-sql \
+      --with-mysql \
+      --with-pgsql=/usr/lib \
+      --with-sqlite3=/usr/lib \
       --enable-ldapdb \
       --disable-macos-framework \
       --with-pam \
       --with-saslauthd=/var/run/saslauthd \
       --with-ldap \
+      --with-dblib=gdbm \
       --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
       --sysconfdir=/etc \
       --with-devrandom=/dev/urandom
@@ -176,7 +183,7 @@ package_cyrus-sasl-ldap() {
 
 package_cyrus-sasl-sql() {
   pkgdesc="SQL auxprop module for Cyrus SASL"
-  depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2')
+  depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite')
   replaces=('cyrus-sasl-plugins')
 
   cd cyrus-sasl-$pkgver/plugins
diff --git a/core/libsasl/cyrus-sasl-sql.patch b/core/libsasl/cyrus-sasl-sql.patch
new file mode 100644
index 000000000..2dcdad822
--- /dev/null
+++ b/core/libsasl/cyrus-sasl-sql.patch
@@ -0,0 +1,39 @@
+--- configure.in	2012-10-12 16:05:48.000000000 +0200
++++ configure.in	2013-05-11 18:48:59.021848013 +0200
+@@ -861,9 +860,9 @@
+     notfound) AC_WARN([SQLite Library not found]); true;;
+     *)
+      if test -d ${with_sqlite}/lib; then
+-         LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib"
++         LIB_SQLITE="-L${with_sqlite}/lib"
+      else
+-         LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
++         LIB_SQLITE="-L${with_sqlite}"
+      fi
+ 
+      LIB_SQLITE_DIR=$LIB_SQLITE
+@@ -913,9 +912,9 @@
+     notfound) AC_WARN([SQLite3 Library not found]); true;;
+     *)
+      if test -d ${with_sqlite3}/lib; then
+-         LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib"
++         LIB_SQLITE3="-L${with_sqlite3}/lib"
+      else
+-         LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
++         LIB_SQLITE3="-L${with_sqlite3}"
+      fi
+ 
+      LIB_SQLITE3_DIR=$LIB_SQLITE3
+--- configure.in
++++ configure.in
+@@ -674,7 +674,9 @@
+      LIB_PGSQL_DIR=$LIB_PGSQL
+      LIB_PGSQL="$LIB_PGSQL -lpq"
+ 
+-     if test -d ${with_pgsql}/include/pgsql; then
++     if test -d ${with_pgsql}/include/postgresql/pgsql; then
++         CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/postgresql/pgsql"
++     elif test -d ${with_pgsql}/include/pgsql; then
+          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/pgsql"
+      elif test -d ${with_pgsql}/pgsql/include; then
+          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/pgsql/include"
diff --git a/core/libusbx/PKGBUILD b/core/libusb/PKGBUILD
index 78f874dd4..b5ec8c9a4 100644
--- a/core/libusbx/PKGBUILD
+++ b/core/libusb/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 197829 2013-10-30 11:05:34Z allan $
+# $Id: PKGBUILD 206056 2014-02-16 12:47:08Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=libusbx
-pkgver=1.0.17
+pkgname=libusb
+pkgver=1.0.18
 pkgrel=1
 depends=('glibc' 'systemd')
 pkgdesc="Library that provides generic access to USB device"
@@ -9,9 +9,10 @@ arch=(i686 x86_64 mips64el)
 url="http://libusbx.org"
 license=('LGPL')
 source=(http://downloads.sourceforge.net/${pkgname}/releases/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-replaces=('libusb1' 'libusb')
-provides=("libusb=$pkgver")
-conflicts=("libusb")
+replaces=('libusb1' 'libusbx')
+provides=("libusbx=$pkgver")
+conflicts=("libusbx")
+md5sums=('4a6d049923efc6496f1d383054dac1a6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,4 +29,3 @@ package () {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('99467ca2cb81c19c4a172de9f30e7576')
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index 5c7031372..c8f4987d0 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 199802 2013-11-16 17:53:26Z thomas $
+# $Id: PKGBUILD 204497 2014-01-21 09:38:00Z thomas $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.104
+pkgver=2.02.105
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceware.org/lvm2/"
@@ -22,7 +22,7 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
         lvm-monitoring.service
         lvmetad.service
         lvmetad.socket)
-sha1sums=('4c296453e10deafe02004fde40075cdb3792eeb2'
+sha1sums=('796163e766480cdc427cd443dc1336ae8e8e3bd7'
           'SKIP'
           '76e83966d1bc84f9a1e30bcaff84b8b8fefbca0f'
           'ff0fdf0a3005a41acd4b36865056109effc3474b'
diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD
index 85387f10a..aeb5a7523 100644
--- a/core/man-db/PKGBUILD
+++ b/core/man-db/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197832 2013-10-30 11:05:56Z allan $
+# $Id: PKGBUILD 204740 2014-01-26 11:28:37Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
 
 pkgname=man-db
-pkgver=2.6.5
+pkgver=2.6.6
 pkgrel=1
 pkgdesc="A utility for reading man pages"
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,7 +20,7 @@ replaces=('man')
 install=${pkgname}.install
 source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig}
         convert-mans man-db.cron.daily)
-md5sums=('36f59d9314b45a266ba350584b4d7cc1'
+md5sums=('5d65d66191080c144437a6c854e17868'
          'SKIP'
          '2b7662a7d5b33fe91f9f3e034361a2f6'
          '934fd047fecb915038bf4bf844ea609c')
@@ -40,7 +40,7 @@ build() {
 
 check() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make -k check
+  make check
 }
 
 package() {
diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD
index 8f1f2c7ab..5ab139634 100644
--- a/core/nfs-utils/PKGBUILD
+++ b/core/nfs-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 200306 2013-11-25 08:16:32Z tpowa $
+# $Id: PKGBUILD 203559 2014-01-13 16:35:26Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
@@ -7,7 +7,7 @@
 
 pkgname=nfs-utils
 pkgver=1.2.9
-pkgrel=1
+pkgrel=5
 pkgdesc="Support programs for Network File Systems"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://nfs.sourceforge.net'
@@ -20,7 +20,6 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn
 	nfs-server.conf
 	exports
 	idmapd.conf
-        nfs
 	nfs-utils-1.1.4-mtab-sym.patch
 	nfs-utils-1.1.4-no-exec.patch
 	rpc-gssd.service
@@ -31,32 +30,34 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn
 	nfsd.service
 	var-lib-nfs-rpc_pipefs.mount
 	proc-fs-nfsd.mount
+	nfs-client.target
+	nfs-server.target
 	blkmapd.service
 	nfs-utils.conf
         id_resolver.conf
         start-statd.patch)
 install=nfs-utils.install
 optdepends=('sqlite: for nfsdcltrack usage')
-
 md5sums=('18869d16db3f49c053f8c68eba3fe2e0'
          'f73f197a16b02c3e248488ec35c4cf43'
          '9cef69bc686cc5dcac23fbb51450747d'
-         'ff585faf410a62c4333a027c50b56bae'
+         'e6ad3c7a59c7e4c24965a0e7da35026c'
          'eb4f4027fab6fc1201f1ca04f5954c76'
-         'f5e7bba09a46c5c5d7007cac6eff9df5'
          '7674106eaaa4c149bccd4f05fe3604e9'
          '4f4827dfc93008dfadd0a530ad0872b2'
-         '6aeb4a80b2a5162f5951438474ea22f3'
-         'ff95ad9275ef774e0a2ea8adfe55ee66'
-         '2e991f0e440b4809e22b6c7689544fc0'
-         '42d0088add3beab0284be1379391382b'
-         '60d82e2d2d19d21ceb72665e54bf913e'
-         '3bcc9901478f4f9ea0a03b67171c13e3'
-         '1cd65909fa0983047f3f06a3ab352401'
-         '8f1b5282795895c9b8ce8430d20cdda6'
-         '8f03e708b230619ffc2a799a48bffb53'
+         'b9329c9d4a6b4a72ab2a04aac9229171'
+         '656ac433c4443eba6b47744a53a3c7d9'
+         '295ec0c9c049e146992561650fec9d52'
+         '6ff4f297df4e90440b8bdbc6b1a78480'
+         '20d5b8120d1049b27dd44dc4c57f667d'
+         '01a1dd533382630ccecc9b882c47aa2f'
+         'f48da2fb07b1d5f016d63c16b0979ebb'
+         '972eb80ff8c94c647b977a8a3cdd985f'
+         'a13e9f388cd939d68fa6ada205eb4e25'
+         '1ee3eea917131f04bb08f2f858be7724'
+         'f513ab0eae74918df08f329b0c6a9b6f'
          '8ac484023d786766d287ccbe878ae4ba'
-         'bed57f7c3911af695ec7b469248c104a'
+         'a43aabf0b8d02406b1babc3a206d952a'
          'f8bb29c2ca1ce178e6371091a3e1090d')
 
 prepare() {
@@ -83,29 +84,22 @@ build() {
 
 package() {
   cd $srcdir/${pkgname}-${pkgver}
-  # fix make install
-  make DESTDIR=$pkgdir install
 
-  # support python2 (FS#25120)
+  make DESTDIR="$pkgdir" install
   sed -i '1s/python$/python2/' "$pkgdir"/usr/bin/{nfsiostat,mountstats}
+  install -D -m 644 utils/mount/nfsmount.conf "$pkgdir"/etc/nfsmount.conf
 
-  # Configuration
-  install -D -m 644 ../exports "$pkgdir/"etc/exports
-  install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf
-  install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf
-  install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf
-  install -D -m 644 ../nfs "$pkgdir/"etc/conf.d/nfs
-  install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf
-  # keyutils id_resolver #35463
-  install -D -m 644 ../id_resolver.conf "$pkgdir/"etc/request-key.d/id_resolver.conf
-  # systemd files
-  for i in ${srcdir}/*.{service,mount}; do
-    install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}"
+  cd ..
+  install -D -m 644 nfs-common.conf  "$pkgdir"/etc/conf.d/nfs-common.conf
+  install -D -m 644 nfs-server.conf  "$pkgdir"/etc/conf.d/nfs-server.conf
+  install -D -m 644 exports          "$pkgdir"/etc/exports
+  install -D -m 644 idmapd.conf      "$pkgdir"/etc/idmapd.conf
+  install -D -m 644 id_resolver.conf "$pkgdir"/etc/request-key.d/id_resolver.conf
+  install -D -m 644 nfs-utils.conf   "$pkgdir"/usr/lib/modules-load.d/nfs-utils.conf
+  for i in *.service *.mount *.target; do
+    install -D -m 644 $i "$pkgdir"/usr/lib/systemd/system/$i
   done
-  install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf
-  # directories
-  mkdir "$pkgdir/"etc/exports.d
-  mkdir -m 555 "$pkgdir/"var/lib/nfs/rpc_pipefs
-  mkdir "$pkgdir/"var/lib/nfs/v4recovery
+  mkdir "$pkgdir"/etc/exports.d
+  mkdir -m 555 "$pkgdir"/var/lib/nfs/rpc_pipefs
+  mkdir "$pkgdir"/var/lib/nfs/v4recovery
 }
-
diff --git a/core/nfs-utils/blkmapd.service b/core/nfs-utils/blkmapd.service
index fa7ce394b..04711d09c 100644
--- a/core/nfs-utils/blkmapd.service
+++ b/core/nfs-utils/blkmapd.service
@@ -1,5 +1,6 @@
 [Unit]
-Description=pNFS block layout mapping daemon
+Description=pNFS Block Layout Client Mapping Daemon
+Documentation=man:blkmapd(8)
 After=var-lib-nfs-rpc_pipefs.mount nfsd.service
 Requires=var-lib-nfs-rpc_pipefs.mount
 
diff --git a/core/nfs-utils/exports b/core/nfs-utils/exports
index 8f4aac598..59dfa2e7c 100644
--- a/core/nfs-utils/exports
+++ b/core/nfs-utils/exports
@@ -1,15 +1,12 @@
-# /etc/exports
-#
-# List of directories exported to NFS clients.  See exports(5).
-# Use exportfs -arv to reread.
+# /etc/exports - exports(5) - directories exported to NFS clients
 #
 # Example for NFSv2 and NFSv3:
-#  /srv/home       hostname1(rw,sync) hostname2(ro,sync)
-#
+#  /srv/home        hostname1(rw,sync) hostname2(ro,sync)
 # Example for NFSv4:
-#  /srv/nfs4	   hostname1(rw,sync,fsid=0)
+#  /srv/nfs4	    hostname1(rw,sync,fsid=0)
 #  /srv/nfs4/home   hostname1(rw,sync,nohide)
 # Using Kerberos and integrity checking:
-#  /srv/nfs4        gss/krb5i(rw,sync,fsid=0,crossmnt)
-#  /srv/nfs4/home   gss/krb5i(rw,sync,nohide)
+#  /srv/nfs4        *(rw,sync,sec=krb5i,fsid=0)
+#  /srv/nfs4/home   *(rw,sync,sec=krb5i,nohide)
 #
+# Use `exportfs -arv` to reload.
diff --git a/core/nfs-utils/id_resolver.conf b/core/nfs-utils/id_resolver.conf
index 9c0fee337..92f78281f 100644
--- a/core/nfs-utils/id_resolver.conf
+++ b/core/nfs-utils/id_resolver.conf
@@ -1 +1,2 @@
-create id_resolver * * /usr/bin/nfsidmap %k %d
\ No newline at end of file
+create id_resolver * * /usr/bin/nfsidmap %k %d
+
diff --git a/core/nfs-utils/nfs b/core/nfs-utils/nfs
deleted file mode 100644
index 2d33cf3d4..000000000
--- a/core/nfs-utils/nfs
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Optinal options passed to rquotad
-RPCRQUOTADOPTS=""
-#
-# Optional arguments passed to in-kernel lockd
-#LOCKDARG=
-# TCP port rpc.lockd should listen on.
-#LOCKD_TCPPORT=32803
-# UDP port rpc.lockd should listen on.
-#LOCKD_UDPPORT=32769
-#
-# Optional arguments passed to rpc.nfsd. See rpc.nfsd(8)
-RPCNFSDARGS=""
-# Number of nfs server processes to be started.
-# The default is 8. 
-RPCNFSDCOUNT=8
-# Set V4 grace period in seconds
-#NFSD_V4_GRACE=90
-#
-# Optional arguments passed to rpc.mountd. See rpc.mountd(8)
-RPCMOUNTDOPTS=""
-#
-# Optional arguments passed to rpc.statd. See rpc.statd(8)
-STATDARG=""
-#
-# Optional arguments passed to rpc.idmapd. See rpc.idmapd(8)
-RPCIDMAPDARGS=""
-#
-# Optional arguments passed to rpc.gssd. See rpc.gssd(8)
-RPCGSSDARGS=""
-#
-# Optional arguments passed to rpc.svcgssd. See rpc.svcgssd(8)
-RPCSVCGSSDARGS=""
-#
-# To enable RDMA support on the server by setting this to
-# the port the server should listen on
-#RDMA_PORT=20049 
-#
-# Optional arguments passed to blkmapd. See blkmapd(8)
-BLKMAPDARGS=""
diff --git a/core/nfs-utils/nfs-client.target b/core/nfs-utils/nfs-client.target
new file mode 100644
index 000000000..1bec662ab
--- /dev/null
+++ b/core/nfs-utils/nfs-client.target
@@ -0,0 +1,8 @@
+[Unit]
+Description=NFS Client Daemons
+Before=remote-fs-pre.target
+Wants=rpc-statd.service
+Wants=rpc-gssd.service
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/nfs-utils/nfs-server.target b/core/nfs-utils/nfs-server.target
new file mode 100644
index 000000000..52f0f04a4
--- /dev/null
+++ b/core/nfs-utils/nfs-server.target
@@ -0,0 +1,10 @@
+[Unit]
+Description=NFS File Server Daemons
+Wants=rpc-mountd.service
+Wants=rpc-idmapd.service
+Wants=rpc-rquotad.service
+Wants=rpc-statd.service
+Wants=rpc-svcgssd.service
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/nfs-utils/nfsd.service b/core/nfs-utils/nfsd.service
index d63e49016..83db80657 100644
--- a/core/nfs-utils/nfsd.service
+++ b/core/nfs-utils/nfsd.service
@@ -1,13 +1,17 @@
 [Unit]
-Description=NFS server
+Description=NFS Server Daemon
+Documentation=man:rpc.nfsd(8)
 After=rpcbind.service
 Requires=rpcbind.service
+Before=nfs-server.target
+PartOf=nfs-server.target
 
 [Service]
 Type=oneshot
 EnvironmentFile=/etc/conf.d/nfs-server.conf
 ExecStart=/usr/bin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
 ExecStartPost=/usr/bin/exportfs -a
+ExecReload=/usr/bin/exportfs -a -r
 ExecStop=/usr/bin/rpc.nfsd 0
 ExecStopPost=/usr/bin/exportfs -a -u
 RemainAfterExit=yes
diff --git a/core/nfs-utils/proc-fs-nfsd.mount b/core/nfs-utils/proc-fs-nfsd.mount
index e5ee6fbf6..26b58b968 100644
--- a/core/nfs-utils/proc-fs-nfsd.mount
+++ b/core/nfs-utils/proc-fs-nfsd.mount
@@ -1,5 +1,5 @@
 [Unit]
-Description=RPC Pipe File System 
+Description=NFS Configuration File System
 DefaultDependencies=no
 
 [Mount]
diff --git a/core/nfs-utils/rpc-gssd.service b/core/nfs-utils/rpc-gssd.service
index 182d9b72c..8674fb2e5 100644
--- a/core/nfs-utils/rpc-gssd.service
+++ b/core/nfs-utils/rpc-gssd.service
@@ -1,8 +1,10 @@
 [Unit]
-Description=RPC GSS-API client-side daemon
+Description=RPC GSS-API Client Daemon
+Documentation=man:rpc.gssd(8)
 After=rpcbind.service var-lib-nfs-rpc_pipefs.mount
 Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount
-Before=remote-fs-pre.target
+Before=nfs-client.target remote-fs-pre.target
+PartOf=nfs-client.target
 
 [Service]
 Type=forking
diff --git a/core/nfs-utils/rpc-idmapd.service b/core/nfs-utils/rpc-idmapd.service
index 1167daf36..609cde6ed 100644
--- a/core/nfs-utils/rpc-idmapd.service
+++ b/core/nfs-utils/rpc-idmapd.service
@@ -1,8 +1,10 @@
 [Unit]
-Description=NFSv4 ID-name mapping daemon
+Description=NFS v4 ID-Name Mapping Daemon
+Documentation=man:rpc.idmapd(8) man:idmapd.conf(5)
 After=var-lib-nfs-rpc_pipefs.mount nfsd.service
 Requires=var-lib-nfs-rpc_pipefs.mount
-Before=remote-fs-pre.target
+Before=nfs-server.target
+PartOf=nfs-server.target
 
 [Service]
 Type=forking
diff --git a/core/nfs-utils/rpc-mountd.service b/core/nfs-utils/rpc-mountd.service
index 7528884c2..2969ee6b0 100644
--- a/core/nfs-utils/rpc-mountd.service
+++ b/core/nfs-utils/rpc-mountd.service
@@ -1,7 +1,10 @@
 [Unit]
-Description=NFS Mount Daemon
+Description=NFS Mount Server Daemon
+Documentation=man:rpc.mountd(8)
 After=rpcbind.service nfsd.service
 Requires=rpcbind.service nfsd.service
+Before=nfs-server.target
+PartOf=nfs-server.target
 
 [Service]
 Type=forking
diff --git a/core/nfs-utils/rpc-statd.service b/core/nfs-utils/rpc-statd.service
index c2fd63b3d..c5a1c359a 100644
--- a/core/nfs-utils/rpc-statd.service
+++ b/core/nfs-utils/rpc-statd.service
@@ -1,8 +1,11 @@
 [Unit]
-Description=NFSv2/3 Network Status Monitor Daemon
+Description=NFS v2/3 Network Status Monitor Daemon
+Documentation=man:rpc.statd(8)
 After=rpcbind.service
 Requires=rpcbind.service
-Before=remote-fs-pre.target
+Before=nfs-server.target
+PartOf=nfs-server.target
+Wants=remote-fs-pre.target
 
 [Service]
 Type=forking
diff --git a/core/nfs-utils/rpc-svcgssd.service b/core/nfs-utils/rpc-svcgssd.service
index 876bad38c..f52f26aec 100644
--- a/core/nfs-utils/rpc-svcgssd.service
+++ b/core/nfs-utils/rpc-svcgssd.service
@@ -1,7 +1,10 @@
 [Unit]
-Description=RPC GSS-API server-side daemon
+Description=RPC GSS-API Server Daemon
+Documentation=man:rpc.svcgssd(8)
 After=rpcbind.service
 Requires=rpcbind.service
+Before=nfs-server.target
+PartOf=nfs-server.target
 
 [Service]
 Type=forking
diff --git a/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount b/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount
index 4bd440f24..c41665822 100644
--- a/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount
+++ b/core/nfs-utils/var-lib-nfs-rpc_pipefs.mount
@@ -1,5 +1,5 @@
 [Unit]
-Description=RPC pipe filesystem
+Description=RPC Pipe File System
 
 [Mount]
 What=rpc_pipefs
diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD
index 7829ccb7a..122d2c5ce 100644
--- a/core/nilfs-utils/PKGBUILD
+++ b/core/nilfs-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197802 2013-10-30 10:38:00Z allan $
+# $Id: PKGBUILD 206066 2014-02-16 17:07:26Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=nilfs-utils
-pkgver=2.1.5
-pkgrel=3
+pkgver=2.1.6
+pkgrel=1
 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nilfs.org/"
@@ -12,11 +12,11 @@ license=('GPL2' 'LGPL2.1')
 backup=('etc/nilfs_cleanerd.conf')
 depends=('util-linux')
 source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2)
-md5sums=('f072cc53c288492061b3199d63e32177')
+md5sums=('3d8166ba2346b61ac8dd83a64e92ae0f')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --sbindir=/usr/bin --enable-libmount
+  ./configure --sbindir=/usr/bin --with-libmount
   make
 }
 
diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD
index d3e96081f..e87362833 100644
--- a/core/openldap/PKGBUILD
+++ b/core/openldap/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 200710 2013-12-02 22:13:10Z eric $
+# $Id: PKGBUILD 205013 2014-02-02 21:19:24Z eric $
 # Maintainer:
 
 pkgbase=openldap
 pkgname=('libldap' 'openldap')
-pkgver=2.4.38
+pkgver=2.4.39
 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=('b15132075661761dca822270cdbeddc3c49a6193'
+sha1sums=('2b8e8401214867c361f7212e7058f95118b5bd6c'
           '2441815efbfa01ad7a1d39068e5503b53d1d04b0'
           '59241a813d7508294e4ef1cec3bfe1f5495e109d'
           'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef')
diff --git a/core/openldap/openldap.install b/core/openldap/openldap.install
index cf3cb9f25..a34ca1a10 100644
--- a/core/openldap/openldap.install
+++ b/core/openldap/openldap.install
@@ -1,4 +1,5 @@
 post_install(){
+  systemd-tmpfiles --create slapd.conf
   groupadd -g 439 ldap &>/dev/null
   useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
   chown -R ldap:ldap var/lib/openldap &>/dev/null
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index 7749fca8a..f3ca270fd 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 199078 2013-11-08 16:53:32Z bisson $
+# $Id: PKGBUILD 205496 2014-02-06 05:24:35Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
-pkgver=6.4p1
-pkgrel=1
+pkgver=6.5p1
+pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -14,14 +14,16 @@ makedepends=('linux-headers')
 depends=('krb5' 'openssl' 'libedit' 'ldns')
 optdepends=('xorg-xauth: X11 forwarding'
             'x11-ssh-askpass: input passphrase in X')
-source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
+source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
+        'lowercase.patch'
         'sshdgenkeys.service'
         'sshd@.service'
         'sshd.service'
         'sshd.socket'
         'sshd.pam')
-sha1sums=('cf5fe0eb118d7e4f9296fbc5d6884965885fc55d'
-          '6df5be396f8c593bb511a249a1453294d18a01a6'
+sha1sums=('3363a72b4fee91b29cf2024ff633c17f6cd2f86d' 'SKIP'
+          '3163a71cbaeac39d0783ad4c501fd0630d6c0c22'
+          'cc1ceec606c98c7407e7ac21ade23aed81e31405'
           '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
           'ec49c6beba923e201505f5669cea48cad29014db'
           'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
@@ -31,6 +33,11 @@ backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
 
 install=install
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../lowercase.patch
+}
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
@@ -56,9 +63,10 @@ build() {
 check() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	make tests ||
-	grep $USER /etc/passwd | grep -q /bin/false
-	# connect.sh fails when run with stupid login shell
+	make tests || true
+	# hard to suitably test connectivity:
+	# - fails with /bin/false as login shell
+	# - fails with firewall activated, etc.
 }
 
 package() {
diff --git a/core/openssh/lowercase.patch b/core/openssh/lowercase.patch
new file mode 100644
index 000000000..50b9e6e7d
--- /dev/null
+++ b/core/openssh/lowercase.patch
@@ -0,0 +1,32 @@
+From d56b44d2dfa093883a5c4e91be3f72d99946b170 Mon Sep 17 00:00:00 2001
+From: Damien Miller <djm@mindrot.org>
+Date: Tue, 04 Feb 2014 00:26:04 +0000
+Subject:    - djm@cvs.openbsd.org 2014/02/04 00:24:29
+
+     [ssh.c]
+     delay lowercasing of hostname until right before hostname
+     canonicalisation to unbreak case-sensitive matching of ssh_config;
+     reported by Ike Devolder; ok markus@
+---
+diff --git a/ssh.c b/ssh.c
+index ec95733..add760c 100644
+--- a/ssh.c
++++ b/ssh.c
+@@ -780,7 +780,6 @@ main(int ac, char **av)
+ 	if (!host)
+ 		usage();
+ 
+-	lowercase(host);
+ 	host_arg = xstrdup(host);
+ 
+ 	OpenSSL_add_all_algorithms();
+@@ -914,6 +913,7 @@ main(int ac, char **av)
+ 	}
+ 
+ 	/* If canonicalization requested then try to apply it */
++	lowercase(host);
+ 	if (options.canonicalize_hostname != SSH_CANONICALISE_NO)
+ 		addrs = resolve_canonicalize(&host, options.port);
+ 	/*
+--
+cgit v0.9.2
diff --git a/core/openssh/sshdgenkeys.service b/core/openssh/sshdgenkeys.service
index 8c27d7110..1d01b7acf 100644
--- a/core/openssh/sshdgenkeys.service
+++ b/core/openssh/sshdgenkeys.service
@@ -2,12 +2,14 @@
 Description=SSH Key Generation
 ConditionPathExists=|!/etc/ssh/ssh_host_key
 ConditionPathExists=|!/etc/ssh/ssh_host_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub
 ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key
 ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key
+ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key
+ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key
+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key.pub
 
 [Service]
 ExecStart=/usr/bin/ssh-keygen -A
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index b5a2f6e9c..5a16e550f 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 199034 2013-11-07 14:18:31Z pierre $
+# $Id: PKGBUILD 203278 2014-01-07 10:02:52Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=openssl
-_ver=1.0.1e
+_ver=1.0.1f
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=5
+pkgrel=1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
 arch=('i686' 'x86_64' 'mips64el')
 url='https://www.openssl.org'
@@ -19,16 +19,12 @@ 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'
-        'openssl-1.0.1e-fix_pod_syntax-1.patch'
-        'openssl-1.0.1-Check-DTLS_BAD_VER-for-version-number.patch'
-        'openssl-1.0.1-e_aes_cbc_hmac_sha1.c-fix-rare-bad-record-mac-on-AES.patch')
-md5sums=('66bf6f10f060d561929de96f9dfe5b8c'
+        'openssl-1.0.1f-perl-5.18.patch')
+md5sums=('f26b09c028a0541cab33da697d522b25'
          'SKIP'
          'dc78d3d06baffc16217519242ce92478'
          '3bf51be3a1bbd262be46dc619f92aa90'
-         '88d3bef4bbdc640b0412315d8d347bdf'
-         'ae7848bb152b8834ceff30c8c480d422'
-         'c5cc62a47cef72f4e5ad119a88e97ae4')
+         'ea2a61c8bd43788d81d98f1ac36c98ac')
 
 prepare() {
 	cd $srcdir/$pkgname-$_ver
@@ -38,13 +34,7 @@ prepare() {
 	# 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
-	# OpenSSL 1.0.0k, 1.0.1.d, 1.0.1e fail handshake with DTLS1_BAD_VER
-	# http://rt.openssl.org/Ticket/Display.html?id=2984
-	patch -p1 -i $srcdir/openssl-1.0.1-Check-DTLS_BAD_VER-for-version-number.patch
-	# Communication problems with 1.0.1e
-	# http://rt.openssl.org/Ticket/Display.html?id=3002
-	patch -p1 -i $srcdir/openssl-1.0.1-e_aes_cbc_hmac_sha1.c-fix-rare-bad-record-mac-on-AES.patch
+	patch -p1 -i $srcdir/openssl-1.0.1f-perl-5.18.patch
 }
 
 build() {
diff --git a/core/openssl/openssl-1.0.1-Check-DTLS_BAD_VER-for-version-number.patch b/core/openssl/openssl-1.0.1-Check-DTLS_BAD_VER-for-version-number.patch
deleted file mode 100644
index 5a88220c3..000000000
--- a/core/openssl/openssl-1.0.1-Check-DTLS_BAD_VER-for-version-number.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9fe4603b8245425a4c46986ed000fca054231253 Mon Sep 17 00:00:00 2001
-From: David Woodhouse <dwmw2@infradead.org>
-Date: Tue, 12 Feb 2013 14:55:32 +0000
-Subject: Check DTLS_BAD_VER for version number.
-
-The version check for DTLS1_VERSION was redundant as
-DTLS1_VERSION > TLS1_1_VERSION, however we do need to
-check for DTLS1_BAD_VER for compatibility.
-
-PR:2984
-(cherry picked from commit d980abb22e22661e98e5cee33d760ab0c7584ecc)
----
- ssl/s3_cbc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c
-index 02edf3f..443a31e 100644
---- a/ssl/s3_cbc.c
-+++ b/ssl/s3_cbc.c
-@@ -148,7 +148,7 @@ int tls1_cbc_remove_padding(const SSL* s,
- 	unsigned padding_length, good, to_check, i;
- 	const unsigned overhead = 1 /* padding length byte */ + mac_size;
- 	/* Check if version requires explicit IV */
--	if (s->version >= TLS1_1_VERSION || s->version == DTLS1_VERSION)
-+	if (s->version >= TLS1_1_VERSION || s->version == DTLS1_BAD_VER)
- 		{
- 		/* These lengths are all public so we can test them in
- 		 * non-constant time.
--- 
-1.8.4.2
-
diff --git a/core/openssl/openssl-1.0.1-e_aes_cbc_hmac_sha1.c-fix-rare-bad-record-mac-on-AES.patch b/core/openssl/openssl-1.0.1-e_aes_cbc_hmac_sha1.c-fix-rare-bad-record-mac-on-AES.patch
deleted file mode 100644
index f1a251227..000000000
--- a/core/openssl/openssl-1.0.1-e_aes_cbc_hmac_sha1.c-fix-rare-bad-record-mac-on-AES.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9ab3ce124616cb12bd39c6aa1e1bde0f46969b29 Mon Sep 17 00:00:00 2001
-From: Andy Polyakov <appro@openssl.org>
-Date: Mon, 18 Mar 2013 19:29:41 +0100
-Subject: e_aes_cbc_hmac_sha1.c: fix rare bad record mac on AES-NI plaforms.
-
-PR: 3002
-(cherry picked from commit 5c60046553716fcf160718f59160493194f212dc)
----
- crypto/evp/e_aes_cbc_hmac_sha1.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
-index 483e04b..fb2c884 100644
---- a/crypto/evp/e_aes_cbc_hmac_sha1.c
-+++ b/crypto/evp/e_aes_cbc_hmac_sha1.c
-@@ -328,10 +328,11 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
- 
- 				if (res!=SHA_CBLOCK) continue;
- 
--				mask = 0-((inp_len+8-j)>>(sizeof(j)*8-1));
-+				/* j is not incremented yet */
-+				mask = 0-((inp_len+7-j)>>(sizeof(j)*8-1));
- 				data->u[SHA_LBLOCK-1] |= bitlen&mask;
- 				sha1_block_data_order(&key->md,data,1);
--				mask &= 0-((j-inp_len-73)>>(sizeof(j)*8-1));
-+				mask &= 0-((j-inp_len-72)>>(sizeof(j)*8-1));
- 				pmac->u[0] |= key->md.h0 & mask;
- 				pmac->u[1] |= key->md.h1 & mask;
- 				pmac->u[2] |= key->md.h2 & mask;
--- 
-1.8.4.2
-
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
deleted file mode 100644
index ba25afec3..000000000
--- a/core/openssl/openssl-1.0.1e-fix_pod_syntax-1.patch
+++ /dev/null
@@ -1,393 +0,0 @@
-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/openssl/openssl-1.0.1f-perl-5.18.patch b/core/openssl/openssl-1.0.1f-perl-5.18.patch
new file mode 100644
index 000000000..c66209637
--- /dev/null
+++ b/core/openssl/openssl-1.0.1f-perl-5.18.patch
@@ -0,0 +1,356 @@
+Forward-ported from openssl-1.0.1e-perl-5.18.patch
+Fixes install with perl-5.18.
+
+https://bugs.gentoo.org/show_bug.cgi?id=497286
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+
+--- openssl-1.0.1f/doc/apps/cms.pod
++++ openssl-1.0.1f/doc/apps/cms.pod
+@@ -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.
+--- openssl-1.0.1f/doc/apps/smime.pod
++++ openssl-1.0.1f/doc/apps/smime.pod
+@@ -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.
+--- openssl-1.0.1f/doc/ssl/SSL_accept.pod
++++ openssl-1.0.1f/doc/ssl/SSL_accept.pod
+@@ -44,13 +44,13 @@
+ 
+ =over 4
+ 
+-=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
+ return value B<ret> to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+--- openssl-1.0.1f/doc/ssl/SSL_clear.pod
++++ openssl-1.0.1f/doc/ssl/SSL_clear.pod
+@@ -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.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_COMP_add_compression_method.pod
++++ openssl-1.0.1f/doc/ssl/SSL_COMP_add_compression_method.pod
+@@ -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.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_connect.pod
++++ openssl-1.0.1f/doc/ssl/SSL_connect.pod
+@@ -41,13 +41,13 @@
+ 
+ =over 4
+ 
+-=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
+ return value B<ret> to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+--- openssl-1.0.1f/doc/ssl/SSL_CTX_add_session.pod
++++ openssl-1.0.1f/doc/ssl/SSL_CTX_add_session.pod
+@@ -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.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_CTX_load_verify_locations.pod
++++ openssl-1.0.1f/doc/ssl/SSL_CTX_load_verify_locations.pod
+@@ -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.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_CTX_set_client_CA_list.pod
++++ openssl-1.0.1f/doc/ssl/SSL_CTX_set_client_CA_list.pod
+@@ -66,13 +66,13 @@
+ 
+ =over 4
+ 
+-=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
+ to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_CTX_set_session_id_context.pod
++++ openssl-1.0.1f/doc/ssl/SSL_CTX_set_session_id_context.pod
+@@ -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.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_CTX_set_ssl_version.pod
++++ openssl-1.0.1f/doc/ssl/SSL_CTX_set_ssl_version.pod
+@@ -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.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
++++ openssl-1.0.1f/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+@@ -96,7 +96,7 @@
+ 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.
+--- openssl-1.0.1f/doc/ssl/SSL_do_handshake.pod
++++ openssl-1.0.1f/doc/ssl/SSL_do_handshake.pod
+@@ -45,13 +45,13 @@
+ 
+ =over 4
+ 
+-=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
+ return value B<ret> to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+--- openssl-1.0.1f/doc/ssl/SSL_read.pod
++++ openssl-1.0.1f/doc/ssl/SSL_read.pod
+@@ -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
+--- openssl-1.0.1f/doc/ssl/SSL_session_reused.pod
++++ openssl-1.0.1f/doc/ssl/SSL_session_reused.pod
+@@ -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.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_set_fd.pod
++++ openssl-1.0.1f/doc/ssl/SSL_set_fd.pod
+@@ -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.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_set_session.pod
++++ openssl-1.0.1f/doc/ssl/SSL_set_session.pod
+@@ -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.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_shutdown.pod
++++ openssl-1.0.1f/doc/ssl/SSL_shutdown.pod
+@@ -92,14 +92,14 @@
+ 
+ =over 4
+ 
+-=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.
+ The output of L<SSL_get_error(3)|SSL_get_error(3)> may be misleading, as an
+ erroneous SSL_ERROR_SYSCALL may be flagged even though no error occurred.
+ 
+-=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.
+--- openssl-1.0.1f/doc/ssl/SSL_write.pod
++++ openssl-1.0.1f/doc/ssl/SSL_write.pod
+@@ -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/pam/PKGBUILD b/core/pam/PKGBUILD
index bcb75977e..af3ca9f0c 100644
--- a/core/pam/PKGBUILD
+++ b/core/pam/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 197836 2013-10-30 11:06:23Z allan $
+# $Id: PKGBUILD 205604 2014-02-09 10:29:31Z andyrtr $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=pam
 pkgver=1.1.8
-pkgrel=2
+pkgrel=3
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-url="http://www.kernel.org/pub/linux/libs/pam/"
-depends=('glibc' 'db' 'cracklib' 'libtirpc' 'pambase')
+url="http://linux-pam.org"
+depends=('glibc' 'cracklib' 'libtirpc' 'pambase')
 makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
 backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/default/passwd etc/environment)
 source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
@@ -23,7 +23,7 @@ md5sums=('35b6091af95981b1b2cd60d813b5e4ee'
 
 build() {
   cd $srcdir/Linux-PAM-$pkgver
-  ./configure --libdir=/usr/lib --sbindir=/usr/bin
+  ./configure --libdir=/usr/lib --sbindir=/usr/bin --disable-db
   make
 
   cd $srcdir/pam_unix2-2.9.1
diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD
index cb47cdaf7..de9313aeb 100644
--- a/core/pciutils/PKGBUILD
+++ b/core/pciutils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197782 2013-10-30 07:26:12Z tpowa $
+# $Id: PKGBUILD 204793 2014-01-27 09:03:19Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pciutils
-pkgver=3.2.0
-pkgrel=4
+pkgver=3.2.1
+pkgrel=1
 pkgdesc="PCI bus configuration space access library and tools"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
@@ -11,7 +11,7 @@ url="http://mj.ucw.cz/sw/pciutils/"
 depends=('glibc' 'hwids' 'kmod')
 source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
        ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3fccb0b28879adb57d8156115f8003c8')
+md5sums=('fdc92c4665bb169022ffe730b3c08313')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/pcre/PKGBUILD b/core/pcre/PKGBUILD
index 8b86dc848..199aec60b 100644
--- a/core/pcre/PKGBUILD
+++ b/core/pcre/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 202198 2013-12-19 09:22:02Z allan $
+# $Id: PKGBUILD 204393 2014-01-19 00:33:32Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=pcre
 pkgver=8.34
-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')
+depends=('readline' 'zlib' 'bzip2')
 source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig})
 md5sums=('5439e321351bddd5533551bbce128d07'
          'SKIP')
@@ -18,8 +18,13 @@ md5sums=('5439e321351bddd5533551bbce128d07'
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   ./configure --prefix=/usr \
-    --enable-pcre16 --enable-pcre32 --enable-jit \
-    --enable-utf --enable-unicode-properties
+    --enable-unicode-properties \
+    --enable-pcre16 \
+    --enable-pcre32 \
+    --enable-jit \
+    --enable-pcregrep-libz \
+    --enable-pcregrep-libbz2 \
+    --enable-pcretest-libreadline
   make
 }
 
diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD
index 91c24e45e..7623417fb 100644
--- a/core/perl/PKGBUILD
+++ b/core/perl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193454 2013-08-20 18:08:57Z bluewind $
+# $Id: PKGBUILD 204014 2014-01-14 08:12:09Z bluewind $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: kevin <kevin.archlinux.org>
@@ -6,21 +6,20 @@
 # Contributor: francois <francois.archlinux.org>
 
 pkgname=perl
-pkgver=5.18.1
-pkgrel=1
+pkgver=5.18.2
+pkgrel=2
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'PerlArtistic')
 url="http://www.perl.org"
 groups=('base')
-depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh')
+depends=('gdbm' 'db' 'glibc')
 source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2
         perlbin.sh
         perlbin.csh
         provides.pl)
-install=perl.install
 options=('makeflags' '!purge')
-md5sums=('4ec1a3f3824674552e749ae420c5e68c'
+md5sums=('d549b16ee4e9210988da39193a9389c1'
          '5ed2542fdb9a60682f215bd33701e61a'
          '1f0cbbee783e8a6d32f01be5118e0d5e'
          '999c3eea6464860704abbb055a0f0896')
diff --git a/core/perl/perl.install b/core/perl/perl.install
deleted file mode 100644
index a355c5bbe..000000000
--- a/core/perl/perl.install
+++ /dev/null
@@ -1,10 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  for ver in 5.8.{0,1,2,3,4,5,6,7,8}; do
-    [ -h usr/lib/perl5/$ver ] && rm usr/lib/perl5/$ver
-    [ -h usr/lib/perl5/site_perl/$ver ] && rm usr/lib/perl5/site_perl/$ver
-    [ -h usr/bin/perl$ver ] && rm usr/bin/perl$ver
-  done
-  return 0
-}
-
diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD
index 83e61d1e2..6c1b0f86b 100644
--- a/core/procps-ng/PKGBUILD
+++ b/core/procps-ng/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 201333 2013-12-09 03:38:18Z bisson $
+# $Id: PKGBUILD 204689 2014-01-25 04:07:27Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 
 pkgname=procps-ng
 pkgver=3.3.9
-pkgrel=1
+pkgrel=2
 pkgdesc='Utilities for monitoring your system and its processes'
 url='http://sourceforge.net/projects/procps-ng/'
 license=('GPL' 'LGPL')
@@ -21,6 +21,11 @@ replaces=('procps' 'sysvinit-tools')
 
 install=install
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed 's:<ncursesw/:<:g' -i watch.c
+}
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure \
@@ -30,6 +35,7 @@ build() {
 		--libdir=/usr/lib \
 		--bindir=/usr/bin \
 		--sbindir=/usr/bin \
+		--enable-watch8bit \
 
 	make
 }
diff --git a/core/pth/PKGBUILD b/core/pth/PKGBUILD
index 9a2b8a3a2..4cb127aa3 100644
--- a/core/pth/PKGBUILD
+++ b/core/pth/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id: PKGBUILD 197839 2013-10-30 11:06:47Z allan $
-# Maintainer: damir <damir@archlinux.org>
+# $Id: PKGBUILD 203545 2014-01-13 14:20:07Z dan $
 
 pkgname=pth
 pkgver=2.0.7
-pkgrel=4.2
+pkgrel=5
 pkgdesc="The GNU Portable Threads."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/pth/"
diff --git a/core/s-nail/PKGBUILD b/core/s-nail/PKGBUILD
index 222e1b37d..a51680193 100644
--- a/core/s-nail/PKGBUILD
+++ b/core/s-nail/PKGBUILD
@@ -1,20 +1,26 @@
-# $Id: PKGBUILD 202657 2013-12-23 17:15:07Z bisson $
+# $Id: PKGBUILD 205863 2014-02-12 06:21:09Z 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.5
-pkgrel=1
+pkgver=14.5.2
+pkgrel=4
 pkgdesc='Mail processing system with a command syntax reminiscent of ed'
-url='http://sourceforge.net/projects/s-nail/'
+url='http://sdaoden.users.sourceforge.net/code.html#s-nail'
 license=('custom:BSD')
 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=('0c7341f7404f7113a3c4ed915adfed720379e8e7')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver//./_}.tar.xz"
+        'mimeheader.patch'
+        'maildir.patch'
+        'sort.patch')
+sha1sums=('26ad43f5f41b429d5f13a3ce73a3dff75325950c'
+          'e72ed84f584ebc50eb9d04779b8b754afa446bf4'
+          '9ba91a0c697c121d9de4ff67766ec90f4ee354b5'
+          '909da731e590d1d2877ed38bed667440a02d1259')
 
 groups=('base')
 backup=('etc/mail.rc')
@@ -22,6 +28,13 @@ replaces=('mailx' 'mailx-heirloom' 'heirloom-mailx')
 provides=('mailx' 'mailx-heirloom' 'heirloom-mailx')
 conflicts=('mailx' 'mailx-heirloom' 'heirloom-mailx')
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../mimeheader.patch
+	patch -p1 -i ../maildir.patch
+	patch -p1 -i ../sort.patch
+}
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make \
diff --git a/core/s-nail/maildir.patch b/core/s-nail/maildir.patch
new file mode 100644
index 000000000..d9b16c348
--- /dev/null
+++ b/core/s-nail/maildir.patch
@@ -0,0 +1,253 @@
+s-nail-14_5_2-maildir.patch, 2014-02-10:
+
+Apply:
+  $ cd s-nail-14.5.2
+  $ patch -bu < s-nail-14_5_2-maildir.patch
+
+Description:
+  To overcome a general design problem of the Berkeley Mail codebase
+  i once added realpath(3) calls to be able to resolve the path of
+  a mailbox file: like that changing a directory wouldn't cause the
+  program to "hang" because the (relatively) opened mailbox became
+  inaccessible.  (Again: the real solution will take many years.)
+
+  My first KISS solution to one aspect of the general problem was
+  [3adf33ee] (schdir(): realpath() local files before leaving CWD..,
+  2013-01-08), and it should possibly have worked with maildir boxes,
+  because we'd only did anything once the user actively used the `chdir'
+  command (and who does), but Christos Zoulas from NetBSD actually forced
+  me to do more (after i've reported the general Berkeley bug), and that
+  led to the current code, which always calls realpath(3).
+  Anyway, i wasn't in the position to reflect the impact of doing so at
+  that time.  And the entire codebase needs to be reworked anyway. (:(
+
+  Anyway -- this patch is an adjusted combination of the [1c2563b]
+  (lex.c:_update_mailname(): continue if realname() fails.., 2014-02-10)
+  and [13f325f] (Avoid "cannot canonicalize" maildir warning.., 2014-02-10)
+  changesets that have been pushed to [master], and make maildir mailboxes
+  usable again.
+
+Notes:
+  The patch is so large because it was cherry-picked from [crawl] onto
+  [master] and (thus) includes the very large [nyd] topic branch style-and-
+  much-more changes.  Sorry for that.
+
+ lex.c     |  11 +++--
+ maildir.c | 152 +++++++++++++++++++++++++++++++++-----------------------------
+ 2 files changed, 87 insertions(+), 76 deletions(-)
+
+diff --git a/lex.c b/lex.c
+index 922faf8..3b3b3cc 100644
+--- a/lex.c
++++ b/lex.c
+@@ -164,7 +164,7 @@ _update_mailname(char const *name)
+ {
+    char tbuf[MAXPATHLEN], *mailp, *dispp;
+    size_t i, j;
+-   bool_t rv;
++   bool_t rv = TRU1;
+ 
+    /* Don't realpath(3) if it's only an update request */
+    if (name != NULL) {
+@@ -174,9 +174,10 @@ _update_mailname(char const *name)
+          if (realpath(name, mailname) == NULL) {
+             fprintf(stderr, tr(151, "Can't canonicalize `%s'\n"), name);
+             rv = FAL0;
+-            goto jleave;
++            goto jdocopy;
+          }
+       } else
++jdocopy:
+ #endif
+          n_strlcpy(mailname, name, sizeof(mailname));
+    }
+@@ -197,9 +198,10 @@ _update_mailname(char const *name)
+ 
+    /* We want to see the name of the folder .. on the screen */
+    i = strlen(mailp);
+-   if ((rv = (i < sizeof(displayname) - 1)))
++   if (i < sizeof(displayname) - 1)
+       memcpy(dispp, mailp, i + 1);
+    else {
++      rv = FAL0;
+       /* Avoid disrupting multibyte sequences (if possible) */
+ #ifndef HAVE_C90AMEND1
+       j = sizeof(displayname) / 3 - 1;
+@@ -212,9 +214,6 @@ _update_mailname(char const *name)
+       snprintf(dispp, sizeof(displayname), "%.*s...%s",
+          (int)j, mailp, mailp + i);
+    }
+-#ifdef HAVE_REALPATH
+-jleave:
+-#endif
+    return rv;
+ }
+ 
+diff --git a/maildir.c b/maildir.c
+index 32180bd..3d45f77 100644
+--- a/maildir.c
++++ b/maildir.c
+@@ -1,5 +1,5 @@
+ /*@ S-nail - a mail user agent derived from Berkeley Mail.
+- *@ Maildir folder support.
++ *@ Maildir folder support. FIXME rewrite - why do we chdir(2)??
+  *
+  * Copyright (c) 2000-2004 Gunnar Ritter, Freiburg i. Br., Germany.
+  * Copyright (c) 2012 - 2014 Steffen "Daode" Nurpmeso <sdaoden@users.sf.net>.
+@@ -101,75 +101,87 @@ jleave:	;
+ FL int
+ maildir_setfile(char const * volatile name, int nmail, int isedit)
+ {
+-	sighandler_type	volatile saveint;
+-	struct cw	cw;
+-	int	i = -1, omsgCount;
+-
+-	(void)&saveint;
+-	(void)&i;
+-	omsgCount = msgCount;
+-	if (cwget(&cw) == STOP) {
+-		fprintf(stderr, "Fatal: Cannot open current directory\n");
+-		return -1;
+-	}
+-	if (!nmail)
+-		quit();
+-	saveint = safe_signal(SIGINT, SIG_IGN);
+-	if (chdir(name) < 0) {
+-		fprintf(stderr, "Cannot change directory to \"%s\".\n", name);
+-		cwrelse(&cw);
+-		return -1;
+-	}
+-	if (!nmail) {
+-		edit = (isedit != 0);
+-		if (mb.mb_itf) {
+-			fclose(mb.mb_itf);
+-			mb.mb_itf = NULL;
+-		}
+-		if (mb.mb_otf) {
+-			fclose(mb.mb_otf);
+-			mb.mb_otf = NULL;
+-		}
+-		initbox(name);
+-		mb.mb_type = MB_MAILDIR;
+-	}
+-	_maildir_table = NULL;
+-	if (sigsetjmp(_maildir_jmp, 1) == 0) {
+-		if (nmail)
+-			mktable();
+-		if (saveint != SIG_IGN)
+-			safe_signal(SIGINT, maildircatch);
+-		i = maildir_setfile1(name, nmail, omsgCount);
+-	}
+-	if (nmail && _maildir_table != NULL)
+-		free(_maildir_table);
+-	safe_signal(SIGINT, saveint);
+-	if (i < 0) {
+-		mb.mb_type = MB_VOID;
+-		*mailname = '\0';
+-		msgCount = 0;
+-	}
+-	if (cwret(&cw) == STOP) {
+-		fputs("Fatal: Cannot change back to current directory.\n",
+-				stderr);
+-		abort();
+-	}
+-	cwrelse(&cw);
+-	setmsize(msgCount);
+-	if (nmail && mb.mb_sorted && msgCount > omsgCount) {
+-		mb.mb_threaded = 0;
+-		sort((void *)-1);
+-	}
+-	if (!nmail)
+-		sawcom = FAL0;
+-	if (!nmail && !edit && msgCount == 0) {
+-		if (mb.mb_type == MB_MAILDIR && !ok_blook(emptystart))
+-			fprintf(stderr, "No mail at %s\n", name);
+-		return 1;
+-	}
+-	if (nmail && msgCount > omsgCount)
+-		newmailinfo(omsgCount);
+-	return 0;
++   sighandler_type volatile saveint;
++   struct cw cw;
++   int i = -1, omsgCount;
++
++   /* TODO ince we have a VOID box... */
++   omsgCount = msgCount;
++   if (cwget(&cw) == STOP) {
++      fprintf(stderr, "Cannot open current directory");
++      goto jleave;
++   }
++
++   if (!nmail)
++      quit();
++
++   saveint = safe_signal(SIGINT, SIG_IGN);
++
++   if (!nmail) {
++      edit = (isedit != 0);
++      if (mb.mb_itf) {
++         fclose(mb.mb_itf);
++         mb.mb_itf = NULL;
++      }
++      if (mb.mb_otf) {
++         fclose(mb.mb_otf);
++         mb.mb_otf = NULL;
++      }
++      initbox(name);
++      mb.mb_type = MB_MAILDIR;
++   }
++
++   if (chdir(name) < 0) {
++      fprintf(stderr, "Cannot change directory to \"%s\".\n", name);/*TODO tr*/
++      mb.mb_type = MB_VOID;
++      *mailname = '\0';
++      msgCount = 0;
++      cwrelse(&cw);
++      safe_signal(SIGINT, saveint);
++      goto jleave;
++   }
++
++   _maildir_table = NULL;
++   if (sigsetjmp(_maildir_jmp, 1) == 0) {
++      if (nmail)
++         mktable();
++      if (saveint != SIG_IGN)
++         safe_signal(SIGINT, &maildircatch);
++      i = maildir_setfile1(name, nmail, omsgCount);
++   }
++   if (nmail && _maildir_table != NULL)
++      free(_maildir_table);
++
++   safe_signal(SIGINT, saveint);
++
++   if (i < 0) {
++      mb.mb_type = MB_VOID;
++      *mailname = '\0';
++      msgCount = 0;
++   }
++
++   if (cwret(&cw) == STOP)
++      panic("Cannot change back to current directory.");/* TODO tr */
++   cwrelse(&cw);
++
++   setmsize(msgCount);
++   if (nmail && mb.mb_sorted && msgCount > omsgCount) {
++      mb.mb_threaded = 0;
++      sort((void*)-1);
++   }
++   if (!nmail)
++      sawcom = FAL0;
++   if (!nmail && !edit && msgCount == 0) {
++      if (mb.mb_type == MB_MAILDIR /* XXX ?? */ && !ok_blook(emptystart))
++         fprintf(stderr, tr(258, "No mail at %s\n"), name);
++      i = 1;
++      goto jleave;
++   }
++   if (nmail && msgCount > omsgCount)
++      newmailinfo(omsgCount);
++   i = 0;
++jleave:
++   return i;
+ }
+ 
+ static int
diff --git a/core/s-nail/mimeheader.patch b/core/s-nail/mimeheader.patch
new file mode 100644
index 000000000..2f7163b36
--- /dev/null
+++ b/core/s-nail/mimeheader.patch
@@ -0,0 +1,147 @@
+s-nail-14_5_2-mimeheader.patch, 2014-02-05:
+
+Apply:
+  $ cd s-nail-14.5.2
+  $ patch -bu < s-nail-14_5_2-mimeheader.patch
+
+Description:
+    mime_fromhdr(): fix my rewrite again..
+    
+    My hasty rewrite [0f9ad93] (mime_fromhdr(): partial rewrite using
+    n_iconv_str(), 2013-03-12), just about ninety (90) minutes before
+    the release of S-nail v14.1 already caused the bugfix [b608c6b]
+    (mime_fromhdr(): never return NULL output.., 2013-03-14), which
+    was the sole reason for the release of S-nail v14.2.
+    
+    Well, about a year later, after tens of thousands of mails,
+    including multibyte ones, i wrote myself a message that has shown
+    that the rewrite was still buggy -- the header
+    
+      Subject: ehm, .getElementById("blink") needs <span
+       =?US-ASCII?Q?id=3D"blink">,?= not =?US-ASCII?Q?class=3D"id"?=
+    
+    cannot be viewed correctly, the ", not" will be lost.
+    The reason is now understood and this changeset should fix
+    mime_fromhdr() so that it'll do what it is assumed to do in the
+    current codebase, unless i'm terribly mistaken.
+    
+    Because i bickered some time in private, i WANT to add that the
+    real problem is that the codebase is weird INSOFAR as that i still
+    don't really understand the WAY it works, because THAT IS SICK.
+    I.e., in my brain i assume this function effectively is
+    rfc_2047_decode(), meant to decode encoded words as specified in
+    RFC 2047, but that's simply not true, and FOR QUITE SOME TIME,
+    because of the embedded newlines that may be in the data and need
+    to passed through for at least the case that we send data to the
+    display.  I slowly get around that schizophrenic codebase while
+    also converting it to a straight one, but that will take years.
+    Until then we need to strip whitespace in between multiple
+    adjacent encoded words, while passing through newlines and
+    whitespace that follows newlines, regardless of whatever.
+    I hope this will do it until we are sane.
+---
+ mime.c | 63 +++++++++++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 39 insertions(+), 24 deletions(-)
+
+diff --git a/mime.c b/mime.c
+index ccb0061..6ee55cc 100644
+--- a/mime.c
++++ b/mime.c
+@@ -863,20 +863,26 @@ jclear:
+ 	goto jleave;
+ }
+ 
+-/*
+- * Convert header fields from RFC 1522 format
+- * TODO mime_fromhdr(): NO error handling, fat; REWRITE **ASAP**
+- */
+ FL void
+ mime_fromhdr(struct str const *in, struct str *out, enum tdflags flags)
+ {
+-	/* TODO mime_fromhdr(): is called with strings that contain newlines;
+-	 * TODO this is the usual newline problem all around the codebase;
+-	 * TODO i.e., if we strip it, then the display misses it ;} */
++   /* TODO mime_fromhdr(): is called with strings that contain newlines;
++    * TODO this is the usual newline problem all around the codebase;
++    * TODO i.e., if we strip it, then the display misses it ;>
++    * TODO this is why it is so messy and why S-nail v14.2 plus additional
++    * TODO patch for v14.5.2 (and maybe even v14.5.3 subminor) occurred, and
++    * TODO why our display reflects what is contained in the message: the 1:1
++    * TODO relationship of message content and display!
++    * TODO instead a header line should be decoded to what it is (a single
++    * TODO line that is) and it should be objective to the backend wether
++    * TODO it'll be folded to fit onto the display or not, e.g., for search
++    * TODO purposes etc.  then the only condition we have to honour in here
++    * TODO is that whitespace in between multiple adjacent MIME encoded words
++    * TODO á la RFC 2047 is discarded; i.e.: this function should deal with
++    * TODO RFC 2047 and be renamed: mime_fromhdr() -> mime_rfc2047_decode() */
+ 	struct str cin, cout;
+ 	char *p, *op, *upper, *cs, *cbeg;
+-	int convert;
+-	size_t lastoutl = (size_t)-1;
++   ui32_t convert, lastenc, lastoutl;
+ #ifdef HAVE_ICONV
+ 	char const *tcs;
+ 	iconv_t fhicd = (iconv_t)-1;
+@@ -894,6 +900,7 @@ mime_fromhdr(struct str const *in, struct str *out, enum tdflags flags)
+ #endif
+ 	p = in->s;
+ 	upper = p + in->l;
++   lastenc = lastoutl = 0;
+ 
+ 	while (p < upper) {
+ 		op = p;
+@@ -949,8 +956,7 @@ mime_fromhdr(struct str const *in, struct str *out, enum tdflags flags)
+ 					--cout.l;
+ 			} else
+ 				(void)qp_decode(&cout, &cin, NULL);
+-			if (lastoutl != (size_t)-1)
+-				out->l = lastoutl;
++			out->l = lastenc;
+ #ifdef HAVE_ICONV
+ 			if ((flags & TD_ICONV) && fhicd != (iconv_t)-1) {
+ 				cin.s = NULL, cin.l = 0; /* XXX string pool ! */
+@@ -966,21 +972,30 @@ mime_fromhdr(struct str const *in, struct str *out, enum tdflags flags)
+ #ifdef HAVE_ICONV
+ 			}
+ #endif
+-			lastoutl = out->l;
++			lastenc = lastoutl = out->l;
+ 			free(cout.s);
+-		} else {
+-jnotmime:
+-			p = op;
+-			convert = 1;
+-			while ((op = p + convert) < upper &&
+-					(op[0] != '=' || op[1] != '?'))
+-				++convert;
+-			out = n_str_add_buf(out, p, convert);
+-			p += convert;
+-			if (! blankchar(p[-1]))
+-				lastoutl = (size_t)-1;
+-		}
++		} else
++jnotmime: {
++         bool_t onlyws;
++
++         p = op;
++         onlyws = (lastenc > 0);
++         for (;;) {
++            if (++op == upper)
++               break;
++            if (op[0] == '=' && (PTRCMP(op + 1, ==, upper) || op[1] == '?'))
++               break;
++            if (onlyws && !blankchar(*op))
++               onlyws = FAL0;
++         }
++
++         out = n_str_add_buf(out, p, PTR2SIZE(op - p));
++         p = op;
++         if (!onlyws || lastoutl != lastenc)
++            lastenc = out->l;
++         lastoutl = out->l;
+ 	}
++  }
+ 	out->s[out->l] = '\0';
+ 
+ 	if (flags & TD_ISPR) {
diff --git a/core/s-nail/sort.patch b/core/s-nail/sort.patch
new file mode 100644
index 000000000..fdb8d526d
--- /dev/null
+++ b/core/s-nail/sort.patch
@@ -0,0 +1,75 @@
+s-nail-14_5_2-sort.patch, 2014-01-30:
+
+Apply:
+  $ cd s-nail-14.5.2
+  $ patch -bu < s-nail-14_5_2-sort.patch
+
+Description:
+Reverses (sort(),thread(): use srelax()!, 2014-01-18, [a9b67e9]), which
+was a hasty commit of an untested diff that i've added few minutes
+beforehand.
+It was of course wrong.
+The problem (no memory relaxation during entire sort operation) requires
+a different approach (either only relax when we don't need to hold
+dope storage (as for SORT_TO/SORT_FROM/SORT_SUBJECT/+) or use heap
+memory for those allocations, then).
+
+s-nail-14_5_2-sort-alt.patch is an alternative working thesis that uses
+heap allocations, thus continues to relax the dope storage.
+This version has been pushed to [master].
+
+diff --git a/thread.c b/thread.c
+index 3ac5966..9ec1ac9 100644
+--- a/thread.c
++++ b/thread.c
+@@ -361,8 +361,6 @@ makethreads(struct message *m, long cnt, int nmail)
+ 		return;
+ 	mprime = nextprime(cnt);
+ 	mt = scalloc(mprime, sizeof *mt);
+-
+-	srelax_hold();
+ 	for (i = 0; i < cnt; i++) {
+ 		if ((m[i].m_flag&MHIDDEN) == 0) {
+ 			mlook(NULL, mt, &m[i], mprime);
+@@ -376,7 +374,6 @@ makethreads(struct message *m, long cnt, int nmail)
+ 		m[i].m_level = 0;
+ 		if (!nmail && !(inhook&2))
+ 			m[i].m_collapsed = 0;
+-		srelax();
+ 	}
+ 	/*
+ 	 * Most folders contain the eldest messages first. Traversing
+@@ -387,12 +384,8 @@ makethreads(struct message *m, long cnt, int nmail)
+ 	 * are replies to the one message, and are sorted such that
+ 	 * youngest messages occur first.
+ 	 */
+-	for (i = cnt-1; i >= 0; i--) {
++	for (i = cnt-1; i >= 0; i--)
+ 		lookup(&m[i], mt, mprime);
+-		srelax();
+-	}
+-	srelax_rele();
+-
+ 	threadroot = interlink(m, cnt, nmail);
+ 	finalize(threadroot);
+ 	free(mt);
+@@ -572,8 +565,6 @@ sort(void *vp)
+ 	default:
+ 		break;
+ 	}
+-
+-	srelax_hold();
+ 	for (n = 0, i = 0; i < msgCount; i++) {
+ 		mp = &message[i];
+ 		if ((mp->m_flag&MHIDDEN) == 0) {
+@@ -637,10 +628,7 @@ sort(void *vp)
+ 		mp->m_child = mp->m_younger = mp->m_elder = mp->m_parent = NULL;
+ 		mp->m_level = 0;
+ 		mp->m_collapsed = 0;
+-		srelax();
+ 	}
+-	srelax_rele();
+-
+ 	if (n > 0) {
+ 		qsort(ms, n, sizeof *ms, func);
+ 		threadroot = &message[ms[0].ms_n];
diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD
index 84511dd8a..8b986a145 100644
--- a/core/sudo/PKGBUILD
+++ b/core/sudo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197841 2013-10-30 11:07:01Z allan $
+# $Id: PKGBUILD 205612 2014-02-09 15:37:47Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sudo
-_sudover=1.8.8
+_sudover=1.8.9p5
 pkgver=${_sudover/p/.p}
 pkgrel=1
 pkgdesc="Give certain users the ability to run some commands as root"
@@ -12,13 +12,13 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.sudo.ws/sudo/"
 license=('custom')
 groups=('base-devel')
-depends=('glibc' 'pam')
+depends=('glibc' 'pam' 'libldap')
 backup=('etc/sudoers' 'etc/pam.d/sudo')
 source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
         sudo.pam)
-sha256sums=('9f911c1e9297fb8006deb52fa81197a8d06b9d54e70672f723c467ecae992fc9'
+sha256sums=('bc9d5c96de5f8b4d2b014f87a37870aef60d2891c869202454069150a21a5c21'
             'SKIP'
-            'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae')
+            'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2')
 
 build() {
   cd "$srcdir/$pkgname-$_sudover"
@@ -29,6 +29,8 @@ build() {
     --libexecdir=/usr/lib \
     --with-logfac=auth \
     --with-pam \
+    --with-ldap \
+    --with-ldap-conf-file=/etc/openldap/ldap.conf \
     --with-env-editor \
     --with-passprompt="[sudo] password for %p: " \
     --with-all-insults
diff --git a/core/sudo/sudo.pam b/core/sudo/sudo.pam
index 4e586cd22..ab053c543 100644
--- a/core/sudo/sudo.pam
+++ b/core/sudo/sudo.pam
@@ -1,3 +1,4 @@
 #%PAM-1.0
-auth		required	pam_unix.so
-auth		required	pam_nologin.so
+auth		include		system-auth
+account		include		system-auth
+session		include		system-auth
diff --git a/core/systemd/0001-Make-hibernation-test-work-for-swap-files.patch b/core/systemd/0001-Make-hibernation-test-work-for-swap-files.patch
new file mode 100644
index 000000000..e780e01b6
--- /dev/null
+++ b/core/systemd/0001-Make-hibernation-test-work-for-swap-files.patch
@@ -0,0 +1,28 @@
+From 0c6f1f4ea4980ff719979d36f10bd6ea3e464c02 Mon Sep 17 00:00:00 2001
+From: Jan Janssen <medhefgo@web.de>
+Date: Thu, 31 Oct 2013 17:22:03 +0100
+Subject: [PATCH] Make hibernation test work for swap files
+
+Suspend to disk works for swap files too (even if it is located
+on an ecrypted file system):
+https://www.kernel.org/doc/Documentation/power/swsusp-and-swap-files.txt
+---
+ src/shared/sleep-config.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
+index d068bfc..2bb0493 100644
+--- a/src/shared/sleep-config.c
++++ b/src/shared/sleep-config.c
+@@ -206,7 +206,7 @@ static int hibernation_partition_size(size_t *size, size_t *used) {
+                 if (!d)
+                         return -ENOMEM;
+ 
+-                if (!streq(type, "partition")) {
++                if (!streq(type, "partition") && !streq(type, "file")) {
+                         log_debug("Partition %s has type %s, ignoring.", d, type);
+                         continue;
+                 }
+-- 
+1.8.5.2
+
diff --git a/core/systemd/0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch b/core/systemd/0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch
new file mode 100644
index 000000000..2594d5066
--- /dev/null
+++ b/core/systemd/0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch
@@ -0,0 +1,26 @@
+From f576cd2092bc40f9998415cdc3caf10035d4743a Mon Sep 17 00:00:00 2001
+From: Pavel Holica <conscript89@gmail.com>
+Date: Wed, 6 Nov 2013 23:24:16 +0100
+Subject: [PATCH] acpi-fpdt: break on zero or negative length read
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1027478
+---
+ src/shared/acpi-fpdt.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
+index 75648b4..7bae47f 100644
+--- a/src/shared/acpi-fpdt.c
++++ b/src/shared/acpi-fpdt.c
+@@ -109,6 +109,8 @@ int acpi_get_boot_usec(usec_t *loader_start, usec_t *loader_exit) {
+         for (rec = (struct acpi_fpdt_header *)(buf + sizeof(struct acpi_table_header));
+              (char *)rec < buf + l;
+              rec = (struct acpi_fpdt_header *)((char *)rec + rec->length)) {
++                if (rec->length <= 0)
++                        break;
+                 if (rec->type != ACPI_FPDT_TYPE_BOOT)
+                         continue;
+                 if (rec->length != sizeof(struct acpi_fpdt_header))
+-- 
+1.8.5.2
+
diff --git a/core/systemd/0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch b/core/systemd/0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch
new file mode 100644
index 000000000..dd8c9ff74
--- /dev/null
+++ b/core/systemd/0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch
@@ -0,0 +1,45 @@
+From 66a5dbdf282435403f947c2caadd04bb0cdec752 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Sat, 8 Feb 2014 12:54:58 -0500
+Subject: [PATCH] cryptsetup-generator: auto add deps for device as password
+
+If the password is a device file, we can add Requires/After dependencies
+on the device rather than requiring the user to do so.
+---
+ src/cryptsetup/cryptsetup-generator.c | 20 +++++++++++++++-----
+ 1 file changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
+index 9c98f0b..46ad9b8 100644
+--- a/src/cryptsetup/cryptsetup-generator.c
++++ b/src/cryptsetup/cryptsetup-generator.c
+@@ -130,11 +130,21 @@ static int create_disk(
+                     streq(password, "/dev/random") ||
+                     streq(password, "/dev/hw_random"))
+                         fputs("After=systemd-random-seed.service\n", f);
+-                else if (!streq(password, "-") &&
+-                         !streq(password, "none"))
+-                        fprintf(f,
+-                                "RequiresMountsFor=%s\n",
+-                                password);
++
++                else if (!streq(password, "-") && !streq(password, "none")) {
++                        _cleanup_free_ char *uu = fstab_node_to_udev_node(password);
++                        if (uu == NULL)
++                                return log_oom();
++
++                        if (is_device_path(uu)) {
++                                _cleanup_free_ char *dd = unit_name_from_path(uu, ".device");
++                                if (dd == NULL)
++                                        return log_oom();
++
++                                fprintf(f, "After=%1$s\nRequires=%1$s\n", dd);
++                        } else
++                                fprintf(f, "RequiresMountsFor=%s\n", password);
++                }
+         }
+ 
+         if (is_device_path(u))
+-- 
+1.8.5.4
+
diff --git a/core/systemd/0001-do-not-accept-garbage-from-acpi-firmware-performance.patch b/core/systemd/0001-do-not-accept-garbage-from-acpi-firmware-performance.patch
new file mode 100644
index 000000000..d0533c84c
--- /dev/null
+++ b/core/systemd/0001-do-not-accept-garbage-from-acpi-firmware-performance.patch
@@ -0,0 +1,33 @@
+From 6c7980093c4e39d07bf06484f96f489e236c7c29 Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay@vrfy.org>
+Date: Thu, 10 Oct 2013 01:38:11 +0200
+Subject: [PATCH] do not accept "garbage" from acpi firmware performance data
+ (FPDT)
+
+00000000  46 42 50 54 38 00 00 00  02 00 30 02 00 00 00 00  |FBPT8.....0.....|
+00000010  23 45 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |#E..............|
+00000020  f5 6a 51 00 00 00 00 00  00 00 00 00 00 00 00 00  |.jQ.............|
+00000030  00 00 00 00 00 00 00 00  70 74 61 6c 58 00 00 00  |........ptalX...|
+---
+ src/shared/acpi-fpdt.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
+index af58c7c..75648b4 100644
+--- a/src/shared/acpi-fpdt.c
++++ b/src/shared/acpi-fpdt.c
+@@ -146,6 +146,11 @@ int acpi_get_boot_usec(usec_t *loader_start, usec_t *loader_exit) {
+         if (brec.type != ACPI_FPDT_BOOT_REC)
+                 return -EINVAL;
+ 
++        if (brec.startup_start == 0 || brec.exit_services_exit < brec.startup_start)
++                return -EINVAL;
++        if (brec.exit_services_exit > NSEC_PER_HOUR)
++                return -EINVAL;
++
+         if (loader_start)
+                 *loader_start = brec.startup_start / 1000;
+         if (loader_exit)
+-- 
+1.8.5.4
+
diff --git a/core/systemd/0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch b/core/systemd/0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch
new file mode 100644
index 000000000..e0f3d4ce3
--- /dev/null
+++ b/core/systemd/0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch
@@ -0,0 +1,33 @@
+From 92e94a2b145eb3bee7035907cd8482285bb680ef Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Sun, 22 Dec 2013 09:17:14 +0100
+Subject: [PATCH] fstab-generator: Do not try to fsck non-devices
+
+This fixes a regression introduced in 64e70e4 where the mount fails
+when fstab is misconfigured with fs_passno > 0 on a virtual file
+system like nfs, and the type is specified as "auto".
+
+This is a backport of e2f123b97, but it since not all fsck-related patches
+have been backported to this version, the implementation is a bit different.
+---
+ src/fstab-generator/fstab-generator.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
+index c0c2992..cf8b371 100644
+--- a/src/fstab-generator/fstab-generator.c
++++ b/src/fstab-generator/fstab-generator.c
+@@ -210,7 +210,9 @@ static int add_mount(
+                         post);
+ 
+         if (passno > 0) {
+-                if (streq(where, "/")) {
++                if(!is_device_path(what)) {
++                        log_warning("Checking was requested for \"%s\", but it is not a device.", what);
++                } else if (streq(where, "/")) {
+                         lnk = strjoin(arg_dest, "/", SPECIAL_LOCAL_FS_TARGET, ".wants/", "systemd-fsck-root.service", NULL);
+                         if (!lnk)
+                                 return log_oom();
+-- 
+1.8.5.2
+
diff --git a/core/systemd/0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch b/core/systemd/0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch
new file mode 100644
index 000000000..6e7f37bfe
--- /dev/null
+++ b/core/systemd/0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch
@@ -0,0 +1,41 @@
+From 77009452cfd25208509b14ea985e81fdf9f7d40e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Thu, 3 Oct 2013 22:15:08 -0400
+Subject: [PATCH] systemd: order remote mounts from mountinfo before
+ remote-fs.target
+
+Usually the network is stopped before filesystems are umounted.
+Ordering network filesystems before remote-fs.target means that their
+unmounting will be performed earlier, and can terminate sucessfully.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=70002
+---
+ src/core/mount.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/mount.c b/src/core/mount.c
+index 3d46557..93bfa99 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -1440,6 +1440,9 @@ static int mount_add_one(
+ 
+         u = manager_get_unit(m, e);
+         if (!u) {
++                const char* const target =
++                        fstype_is_network(fstype) ? SPECIAL_REMOTE_FS_TARGET : SPECIAL_LOCAL_FS_TARGET;
++
+                 delete = true;
+ 
+                 u = unit_new(m, sizeof(Mount));
+@@ -1466,7 +1469,7 @@ static int mount_add_one(
+                         goto fail;
+                 }
+ 
+-                r = unit_add_dependency_by_name(u, UNIT_BEFORE, SPECIAL_LOCAL_FS_TARGET, NULL, true);
++                r = unit_add_dependency_by_name(u, UNIT_BEFORE, target, NULL, true);
+                 if (r < 0)
+                         goto fail;
+ 
+-- 
+1.8.5.2
+
diff --git a/core/systemd/0001-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch b/core/systemd/0001-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch
new file mode 100644
index 000000000..58158f04a
--- /dev/null
+++ b/core/systemd/0001-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch
@@ -0,0 +1,26 @@
+From 7074fecf6747c9a6ad872cc87701481e8bece8b0 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Wed, 2 Oct 2013 15:35:16 -0400
+Subject: [PATCH] tmpfiles.d: include setgid perms for /run/log/journal
+
+4608af4333d0f7f5 set permissions for journal storage on persistent disk
+but not the volatile storage.
+
+ref: https://bugs.archlinux.org/task/37170
+---
+ tmpfiles.d/systemd.conf | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
+index b630440..a05c657 100644
+--- a/tmpfiles.d/systemd.conf
++++ b/tmpfiles.d/systemd.conf
+@@ -26,3 +26,5 @@ F /run/nologin 0644 - - - "System is booting up. See pam_nologin(8)"
+ 
+ m /var/log/journal 2755 root systemd-journal - -
+ m /var/log/journal/%m 2755 root systemd-journal - -
++m /run/log/journal 2755 root systemd-journal - -
++m /run/log/journal/%m 2755 root systemd-journal - -
+-- 
+1.8.5.4
+
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 23023060a..57d98d7c5 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -4,10 +4,10 @@
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
 pkgver=208
-pkgrel=3
+pkgrel=11
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/systemd"
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
+makedepends=('acl' 'cryptsetup' 'libdbus' 'docbook-xsl' 'gobject-introspection' 'gperf'
              'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt'  'libmicrohttpd' 'libxslt'
              'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz')
 options=('strip' 'debug')
@@ -15,6 +15,8 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev'
+        '0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch'
+        '0001-Make-hibernation-test-work-for-swap-files.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'
@@ -25,11 +27,18 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         '0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch'
         '0005-mount-service-drop-FsckPassNo-support.patch'
         '0006-efi-boot-generator-hookup-to-fsck.patch'
-        '0007-fsck-root-only-run-when-requested-in-fstab.patch')
+        '0007-fsck-root-only-run-when-requested-in-fstab.patch'
+        '0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch'
+        '0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch'
+        '0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch'
+        '0001-do-not-accept-garbage-from-acpi-firmware-performance.patch'
+        '0001-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch')
 md5sums=('df64550d92afbffb4f67a434193ee165'
          '29245f7a240bfba66e2b1783b63b6b40'
          '8b68b0218a3897d4d37a6ccf47914774'
          'bde43090d4ac0ef048e3eaee8202a407'
+         '8f1182afa1156f0076a912b23e761e02'
+         'a5c6564d5435ee99814effd2aa9baf93'
          '1b191c4e7a209d322675fd199e3abc66'
          'a693bef63548163ffc165f4c4801ebf7'
          'ccafe716d87df9c42af0d1960b5a4105'
@@ -40,10 +49,16 @@ md5sums=('df64550d92afbffb4f67a434193ee165'
          '2096f33bd36dfa0a7f0431d0a429787a'
          'd2481a6ea199b581e243a950125b0ca6'
          'c2aee634a3a6c50778968f0d5c756f40'
-         'ef8b8212d504bb73c10bf4e85f0703b2')
+         'ef8b8212d504bb73c10bf4e85f0703b2'
+         '4ba2317bf4d7708fca406f49482b1bf3'
+         '078f10d6fc315b329844cd20fa742eee'
+         'f3e4e5b840cace769556e802466574da'
+         '707d64bad7461c04d4cfce21bfddf712'
+         '13232b7f28100e40990dde1c9e411596')
 
 prepare() {
   cd "$pkgname-$pkgver"
+
   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
@@ -59,6 +74,17 @@ prepare() {
   patch -Np1 < "$srcdir"/0005-mount-service-drop-FsckPassNo-support.patch
   patch -Np1 < "$srcdir"/0006-efi-boot-generator-hookup-to-fsck.patch
   patch -Np1 < "$srcdir"/0007-fsck-root-only-run-when-requested-in-fstab.patch
+  # Fix FS#38210 (result of the previous backport)
+  patch -Np1 < "$srcdir"/0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch
+  # Fix FS#38123
+  patch -Np1 < "$srcdir"/0001-Make-hibernation-test-work-for-swap-files.patch
+  # Fix FS#35671
+  patch -Np1 <"$srcdir"/0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch
+  # Fix FS#38403
+  patch -Np1 <"$srcdir"/0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch
+  patch -Np1 <"$srcdir"/0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch
+  patch -Np1 <"$srcdir"/0001-d""o-not-accept-garbage-from-acpi-firmware-performance.patch
+  patch -Np1 <"$srcdir"/0001-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch
 
   autoreconf
 }
@@ -119,8 +145,6 @@ package_systemd() {
 
   make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 
-  printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
   # fix .so links in manpage stubs
   find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
       -exec sed -ri '1s|^\.so (.*)\.([0-9]+)|.so man\2/\1.\2|' {} +
diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install
index 1e79585d7..38a28f2c9 100644
--- a/core/systemd/systemd.install
+++ b/core/systemd/systemd.install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 sd_booted() {
-  [ -e sys/fs/cgroup/systemd ]
+  [[ -d /run/systemd/systemd/ ]]
 }
 
 add_privs() {
@@ -11,6 +11,12 @@ add_privs() {
   fi
 }
 
+add_journal_acls() {
+  # ignore errors, since the filesystem might not support ACLs
+  setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal/ 2>/dev/null
+  :
+}
+
 post_common() {
   systemd-machine-id-setup
 
@@ -54,6 +60,8 @@ _208_changes() {
 post_install() {
   post_common
 
+  add_journal_acls
+
   # enable getty@tty1 by default, but don't track the file
   systemctl enable getty@tty1.service
 
@@ -115,6 +123,10 @@ post_upgrade() {
   if [ "$(vercmp 208-1 "$2")" -eq 1 ]; then
     _208_changes
   fi
+
+  if [ "$(vercmp 208-8 "$2")" -eq 1 ]; then
+    add_journal_acls
+  fi
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/core/util-linux/0001-lsblk-fix-D-segfault.patch b/core/util-linux/0001-lsblk-fix-D-segfault.patch
deleted file mode 100644
index 8e4d7c6d2..000000000
--- a/core/util-linux/0001-lsblk-fix-D-segfault.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 71d842c01992b3678de4da4773ed54f08c0ab4f6 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Mon, 18 Nov 2013 11:27:35 +0100
-Subject: [PATCH] lsblk: fix -D segfault
-
-References: https://bugzilla.redhat.com/show_bug.cgi?id=1031262
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- misc-utils/lsblk.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
-index 9f7f1b6..9b53be3 100644
---- a/misc-utils/lsblk.c
-+++ b/misc-utils/lsblk.c
-@@ -903,7 +903,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line
- 		if (cxt->discard && p)
- 			tt_line_set_data(ln, col, p);
- 		else
--			tt_line_set_data(ln, col, "0");
-+			tt_line_set_data(ln, col, xstrdup("0"));
- 		break;
- 	case COL_DGRAN:
- 		if (lsblk->bytes)
-@@ -936,7 +936,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line
- 		if (cxt->discard && p)
- 			tt_line_set_data(ln, col, p);
- 		else
--			tt_line_set_data(ln, col, "0");
-+			tt_line_set_data(ln, col, xstrdup("0"));
- 		break;
- 	case COL_WSAME:
- 		if (lsblk->bytes)
-@@ -948,7 +948,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line
- 					   "queue/write_same_max_bytes", &x) == 0)
- 				p = size_to_human_string(SIZE_SUFFIX_1LETTER, x);
- 		}
--		tt_line_set_data(ln, col, p ? p : "0");
-+		tt_line_set_data(ln, col, p ? p : xstrdup("0"));
- 		break;
- 	};
- }
--- 
-1.8.4.2
-
diff --git a/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch b/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch
deleted file mode 100644
index 34040b9eb..000000000
--- a/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c8e5e6e7323642f7e6f12ee5f5231b0ec44c40ab Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Thu, 21 Nov 2013 12:25:27 -0500
-Subject: [PATCH] pylibmount: correctly import from pylibmount.so
-
-Without this, python is unable to find the module:
-
-$ python -c 'import libmount'
-Traceback (most recent call last):
-  File "<string>", line 1, in <module>
-  File "/usr/lib/python3.3/site-packages/libmount/__init__.py", line 1, in <module>
-    from pylibmount import *
-ImportError: No module named 'pylibmount'
-
-Signed-off-by: Dave Reisner <dreisner@archlinux.org>
----
- libmount/python/libmount/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libmount/python/libmount/__init__.py b/libmount/python/libmount/__init__.py
-index 243c639..09104e2 100644
---- a/libmount/python/libmount/__init__.py
-+++ b/libmount/python/libmount/__init__.py
-@@ -1,2 +1,2 @@
--from pylibmount import *
-+from .pylibmount import *
- 
--- 
-1.8.4.2
-
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index aecd7341f..8578fd9f4 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 201467 2013-12-12 15:33:24Z dreisner $
+# $Id: PKGBUILD 204875 2014-01-30 03:12:08Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=util-linux
-pkgver=2.24
-pkgrel=2
+pkgver=2.24.1
+pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,8 +19,6 @@ provides=("util-linux-ng=$pkgver" 'eject')
 license=('GPL2')
 options=('strip' 'debug')
 source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.24/$pkgname-$pkgver.tar.xz"
-        0001-lsblk-fix-D-segfault.patch
-        0001-pylibmount-correctly-import-from-pylibmount.so.patch
         uuidd.tmpfiles
         pam-login
         pam-common
@@ -31,21 +29,12 @@ backup=(etc/pam.d/chfn
         etc/pam.d/su
         etc/pam.d/su-l)
 install=util-linux.install
-md5sums=('4fac6443427f575fc5f3531a4ad2ca01'
-         '1899fe3b853a5835c76cca0501b6b518'
-         'a18a1e89ffdfa3bc96ae976646a723ec'
+md5sums=('88d46ae23ca599ac5af9cf96b531590f'
          'a39554bfd65cccfd8254bb46922f4a67'
          '4368b3f98abd8a32662e094c54e7f9b1'
          'a31374fef2cba0ca34dfc7078e2969e4'
          'fa85e5cce5d723275b14365ba71a8aad')
 
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np1 <"$srcdir"/0001-lsblk-fix-D-segfault.patch
-  patch -Np1 <"$srcdir"/0001-pylibmount-correctly-import-from-pylibmount.so.patch
-}
-
 build() {
   cd "$pkgname-$pkgver"
 
diff --git a/core/wireless_tools/PKGBUILD b/core/wireless_tools/PKGBUILD
index 8a6b6cb41..8373ceafd 100644
--- a/core/wireless_tools/PKGBUILD
+++ b/core/wireless_tools/PKGBUILD
@@ -1,32 +1,31 @@
-# $Id: PKGBUILD 186266 2013-05-23 06:41:05Z bisson $
+# $Id: PKGBUILD 205493 2014-02-06 05:23:57Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jason Chu <jchu@xentac.net>
 
 pkgname=wireless_tools
-pkgver=29
-pkgrel=8
+pkgver=30.pre9
+_pkgver=${pkgver%.pre*}
+pkgrel=1
 pkgdesc='Tools allowing to manipulate the Wireless Extensions'
 url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz"
-        'dense.patch')
-sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710'
-          '5c297c7dff1ec1d2a3d918c20622ab3c6daf5b72')
+source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz")
+sha1sums=('41db5ced9ed3d8d3cc104ce43c19af1d72f07eec')
 
 prepare() {
-	cd "${srcdir}/${pkgname}.${pkgver}"
-	patch -p1 -i ../dense.patch # FS#15363
+	cd "${srcdir}/${pkgname}.${_pkgver}"
+	sed '/BUILD_STATIC =/d' -i Makefile
 }
 
 build() {
-	cd "${srcdir}/${pkgname}.${pkgver}"
+	cd "${srcdir}/${pkgname}.${_pkgver}"
 	make CFLAGS="${CFLAGS} -I." LDFLAGS="${LDFLAGS}"
 }
 
 package() {
-	cd "${srcdir}/${pkgname}.${pkgver}"
+	cd "${srcdir}/${pkgname}.${_pkgver}"
 	make \
 		INSTALL_DIR="${pkgdir}/usr/bin" \
 		INSTALL_LIB="${pkgdir}/usr/lib" \
diff --git a/core/wireless_tools/dense.patch b/core/wireless_tools/dense.patch
deleted file mode 100644
index 85182cd82..000000000
--- a/core/wireless_tools/dense.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-The length field of wext data (iw_point.data) is 16 bits. The largest
-value is thus 65535. During the attempts to increase buffer size the
-buffer starts at 4096 and is doubled after each failure to fill. From the
-time this length reaches 65536 it is effectively zero. We thus loose all
-potential space from 32768 to 65535.
-
-This problem is clear when scanning in a RF dense environment.
-
-Without this patch:
-~$ iwlist wlan0 scan
-print_scanning_info: Allocation failed
-
-With this patch:
-~$ iwlist wlan0 scan | grep Cell | wc -l
-86
-
-Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
-
----
-A similar patch was recently created to fix wpa_supplicant.
-
-I could not find a source code repo for this code and created this patch
-against version 30-pre7 downloaded from 
-http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
-
-diff -uprN wireless_tools_org/wireless_tools.30/iwlist.c wireless_tools.30/iwlist.c
---- wireless_tools_org/wireless_tools.30/iwlist.c	2008-01-16 17:45:41.000000000 -0800
-+++ wireless_tools.30/iwlist.c	2009-02-12 14:16:48.000000000 -0800
-@@ -800,7 +800,7 @@ print_scanning_info(int		skfd,
- 	  if(iw_get_ext(skfd, ifname, SIOCGIWSCAN, &wrq) < 0)
- 	    {
- 	      /* Check if buffer was too small (WE-17 only) */
--	      if((errno == E2BIG) && (range.we_version_compiled > 16))
-+	      if((errno == E2BIG) && (range.we_version_compiled > 16) && (buflen < 65535))
- 		{
- 		  /* Some driver may return very large scan results, either
- 		   * because there are many cells, or because they have many
-@@ -816,6 +816,10 @@ print_scanning_info(int		skfd,
- 		  else
- 		    buflen *= 2;
- 
-+		  /* wrq.u.data.length is 16 bits so max size is 65535 */
-+		  if(buflen > 65535)
-+		    buflen = 65535;
-+
- 		  /* Try again */
- 		  goto realloc;
- 		}
-
diff --git a/cross/README b/cross/README
deleted file mode 100644
index a77b1eb5c..000000000
--- a/cross/README
+++ /dev/null
@@ -1,21 +0,0 @@
-# Build order
-
-* $target-binutils
-* cross-$target-gcc-core
-* $target-linux-api-headers
-* cross-$target-glibc-headers
-* cross-$target-gcc-core-shared
-* $target-glibc
-* $target-gcc
-* $target-glibc with BOOTSTRAPING=false
-
-cross-* packages are used to bootstrap the full toolchain for the first time,
-you'll only need binutils, linux-api-headers, glibc and gcc once you're done.
-
-
-# Create a new toolchain
-
-Copy the base PKGBUILDS from mips64el-unknown-linux-gnu and change this part of
-the names to your target. At the header of each PKGBUILD there're several
-variables to configure the target system. Take note some require other manual
-changes, like final gcc.
diff --git a/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD b/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
deleted file mode 100644
index eb0ddb881..000000000
--- a/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $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
deleted file mode 100644
index 7b864eeb6..000000000
--- a/cross/xtensa-unknown-elf-binutils/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 182407 2013-04-10 07:34:20Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-_pkgname=binutils
-_target="xtensa-unknown-elf"
-
-pkgname=${_target}-${_pkgname}
-pkgver=2.23.2
-pkgrel=2.5
-pkgdesc="A set of programs to assemble and manipulate binary and object files for the Xtensa architecture"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gnu.org/software/binutils/"
-license=('GPL')
-groups=("${_target}-base-devel")
-depends=('glibc>=2.17' 'zlib')
-options=('!libtool' '!distcc' '!ccache')
-install=${_target}-binutils.install
-source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
-        https://raw.github.com/qca/open-ath9k-htc-firmware/1.3.2/local/patches/binutils.patch
-        binutils-2.23.2-texinfo-5.0.patch)
-md5sums=('4f8fa651e35ef262edc01d60fb45702e'
-         'dfde4428f08d91f309cdcfe92bf28d08'
-         '7077126d96e9a755a0eaddb5505efe68'
-         '34e439ce23213a91e2af872dfbb5094c')
-
-prepare() {
-  cd ${srcdir}/binutils-${pkgver}
-
-  # http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935
-  # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542
-  patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch
-
-  # open-ath9k-htc-firmware patch
-  patch -p1 -i ${srcdir}/binutils.patch
-
-  # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
-  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
-
-  mkdir ${srcdir}/binutils-build
-}
-
-build() {
-  cd ${srcdir}/binutils-build
-
-  ${srcdir}/binutils-${pkgver}/configure --prefix=/usr \
-    --target=${_target} \
-    --disable-nls \
-    --with-lib-path=/usr/lib:/usr/local/lib \
-    --with-bugurl=https://labs.parabola.nu/ \
-    --enable-shared \
-    --disable-werror --disable-multilib
-
-  # check the host environment and makes sure all the necessary tools are available
-  make configure-host
-
-  make tooldir=/usr
-}
-
-package() {
-  cd ${srcdir}/binutils-build
-  make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
-
-  # Remove unwanted files
-  rm ${pkgdir}/usr/share/man/man1/${_target}-{dlltool,nlmconv,windres,windmc}*
-
-  # Remove unnecessary files and folders
-  rm $pkgdir/usr/bin/{a{r,s},nm,obj{copy,dump},ranlib,strip}
-  rm $pkgdir/usr/lib/libiberty.a
-  rm $pkgdir/usr/$CHOST/${_target}/include/* && rmdir $pkgdir/usr/$CHOST/${_target}/include
-  rm $pkgdir/usr/share/info/* && rmdir $pkgdir/usr/share/info
-}
diff --git a/cross/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch b/cross/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch
deleted file mode 100644
index 38dc19fb0..000000000
--- a/cross/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-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/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
-index 56a0510..fb1802b 100644
---- a/binutils/doc/binutils.texi
-+++ b/binutils/doc/binutils.texi
-@@ -148,18 +148,18 @@ in the section entitled ``GNU Free Documentation License''.
- * objcopy::			Copy and translate object files
- * objdump::                     Display information from object files
- * ranlib::                      Generate index to archive contents
--* readelf::                     Display the contents of ELF format files
- * size::                        List section sizes and total size
- * strings::                     List printable strings from files
- * strip::                       Discard symbols
--* elfedit::                     Update the ELF header of ELF files
- * c++filt::			Filter to demangle encoded C++ symbols
- * cxxfilt: c++filt.             MS-DOS name for c++filt
- * addr2line::			Convert addresses to file and line
- * nlmconv::                     Converts object code into an NLM
--* windres::			Manipulate Windows resources
- * windmc::			Generator for Windows message resources
-+* windres::			Manipulate Windows resources
- * dlltool::			Create files needed to build and use DLLs
-+* readelf::                     Display the contents of ELF format files
-+* elfedit::                     Update the ELF header of ELF files
- * Common Options::              Command-line options for all utilities
- * Selecting the Target System:: How these utilities determine the target
- * Reporting Bugs::              Reporting Bugs
-@@ -2907,7 +2907,7 @@ the Info entries for @file{binutils}.
- @c man end
- @end ignore
- 
--@node c++filt, addr2line, elfedit, Top
-+@node c++filt, addr2line, strip, Top
- @chapter c++filt
- 
- @kindex c++filt
-@@ -4384,7 +4384,7 @@ equivalent. At least one of the @option{--output-mach},
- 
- @table @env
- 
--@itemx --input-mach=@var{machine}
-+@item --input-mach=@var{machine}
- Set the matching input ELF machine type to @var{machine}.  If
- @option{--input-mach} isn't specified, it will match any ELF
- machine types.
-@@ -4392,21 +4392,21 @@ machine types.
- The supported ELF machine types are, @var{L1OM}, @var{K1OM} and
- @var{x86-64}.
- 
--@itemx --output-mach=@var{machine}
-+@item --output-mach=@var{machine}
- Change the ELF machine type in the ELF header to @var{machine}.  The
- supported ELF machine types are the same as @option{--input-mach}.
- 
--@itemx --input-type=@var{type}
-+@item --input-type=@var{type}
- Set the matching input ELF file type to @var{type}.  If
- @option{--input-type} isn't specified, it will match any ELF file types.
- 
- The supported ELF file types are, @var{rel}, @var{exec} and @var{dyn}.
- 
--@itemx --output-type=@var{type}
-+@item --output-type=@var{type}
- Change the ELF file type in the ELF header to @var{type}.  The
- supported ELF types are the same as @option{--input-type}.
- 
--@itemx --input-osabi=@var{osabi}
-+@item --input-osabi=@var{osabi}
- Set the matching input ELF file OSABI to @var{osabi}.  If
- @option{--input-osabi} isn't specified, it will match any ELF OSABIs.
- 
-@@ -4416,7 +4416,7 @@ The supported ELF OSABIs are, @var{none}, @var{HPUX}, @var{NetBSD},
- @var{FreeBSD}, @var{TRU64}, @var{Modesto}, @var{OpenBSD}, @var{OpenVMS},
- @var{NSK}, @var{AROS} and @var{FenixOS}.
- 
--@itemx --output-osabi=@var{osabi}
-+@item --output-osabi=@var{osabi}
- Change the ELF OSABI in the ELF header to @var{osabi}.  The
- supported ELF OSABI are the same as @option{--input-osabi}.
- 
-diff --git a/ld/ld.texinfo b/ld/ld.texinfo
-index c7ae2a5..4777ad5 100644
---- a/ld/ld.texinfo
-+++ b/ld/ld.texinfo
-@@ -142,12 +144,12 @@ in the section entitled ``GNU Free Documentation License''.
- @ifset ARM
- * ARM::				ld and the ARM family
- @end ifset
--@ifset HPPA
--* HPPA ELF32::                  ld and HPPA 32-bit ELF
--@end ifset
- @ifset M68HC11
- * M68HC11/68HC12::              ld and the Motorola 68HC11 and 68HC12 families
- @end ifset
-+@ifset HPPA
-+* HPPA ELF32::                  ld and HPPA 32-bit ELF
-+@end ifset
- @ifset M68K
- * M68K::                        ld and Motorola 68K family
- @end ifset
-@@ -6012,6 +6014,9 @@ functionality are not listed.
- @ifset I960
- * i960::                        @command{ld} and the Intel 960 family
- @end ifset
-+@ifset M68HC11
-+* M68HC11/68HC12::		@code{ld} and the Motorola 68HC11 and 68HC12 families
-+@end ifset
- @ifset ARM
- * ARM::				@command{ld} and the ARM family
- @end ifset
-@@ -6027,9 +6032,6 @@ functionality are not listed.
- @ifset MSP430
- * MSP430::			@command{ld} and MSP430
- @end ifset
--@ifset M68HC11
--* M68HC11/68HC12::		@code{ld} and the Motorola 68HC11 and 68HC12 families
--@end ifset
- @ifset POWERPC
- * PowerPC ELF32::		@command{ld} and PowerPC 32-bit ELF Support
- @end ifset
-@@ -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
--- 
-1.7.1
-
diff --git a/cross/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install b/cross/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install
deleted file mode 100644
index 9de0533ee..000000000
--- a/cross/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-filelist=(as.info bfd.info binutils.info gprof.info ld.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
diff --git a/cross/xtensa-unknown-elf-gcc/PKGBUILD b/cross/xtensa-unknown-elf-gcc/PKGBUILD
deleted file mode 100644
index 50d125e8a..000000000
--- a/cross/xtensa-unknown-elf-gcc/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 186915 2013-05-31 23:25:14Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
-
-_pkgname=gcc
-_target="xtensa-unknown-elf"
-_sysroot="/usr/$CHOST/${_target}"
-
-pkgname=${_target}-${_pkgname}
-pkgver=4.8.1
-pkgrel=1.3
-pkgdesc="The GNU Compiler Collection for the Xtensa architecture"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=("${_target}-binutils>=2.23" 'libmpc' 'cloog' 'gcc-ada' 'doxygen')
-checkdepends=('dejagnu' 'inetutils')
-options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-        https://raw.github.com/qca/open-ath9k-htc-firmware/1.3.2/local/patches/gcc.patch)
-
-md5sums=('3b2386c114cd74185aa3754b58a79304'
-         '81372ee980289a9f6df01dad31c64a63')
-
-_basedir=gcc-${pkgver}
-
-prepare() {
-  cd ${srcdir}/${_basedir}
-
-  # open-ath9k-htc-firmware patch
-  patch -p1 -i ${srcdir}/gcc.patch
-
-  # Do not run fixincludes
-  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
-  # Parabola installs x86_64 libraries /lib
-  [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
-
-  echo ${pkgver} > gcc/BASE-VER
-
-  # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
-  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
-
-  mkdir ${srcdir}/gcc-build
-}
-
-build() {
-  cd ${srcdir}/gcc-build
-
-  ${srcdir}/${_basedir}/configure --prefix=/usr \
-    --target=${_target} \
-    --disable-multilib \
-    --disable-nls \
-    --disable-shared \
-    --disable-threads \
-    --enable-languages=c \
-    --disable-libquadmath \
-    --disable-libssp \
-    --with-newlib \
-    --disable-werror \
-    --libdir=/usr/lib --libexecdir=/usr/lib
-#      --mandir=/usr/share/man --infodir=/usr/share/info \
-#      --with-bugurl=https://labs.parabola.nu/ \
-#      --disable-shared --enable-threads=posix \
-#      --with-system-zlib --enable-__cxa_atexit \
-#      --disable-libunwind-exceptions --enable-clocale=gnu \
-#      --disable-libstdcxx-pch \
-#      --enable-gnu-unique-object --enable-linker-build-id \
-#      --enable-cloog-backend=isl --disable-cloog-version-check \
-#      --enable-lto --enable-gold --enable-ld=default \
-#      --enable-plugin --with-plugin-ld=ld.gold \
-#      --with-linker-hash-style=gnu --disable-install-libiberty \
-#      --enable-checking=release \
-  make all-gcc
-}
-
-package() {
-  pkgdesc="The GNU Compiler Collection for the Xtensa architecture"
-  depends=("${_target}-binutils>=2.23" 'libmpc' 'cloog')
-  groups=("${_target}-devel")
-  install=${_target}-gcc.install
-
-  cd ${srcdir}/gcc-build
-  
-  make -j1 DESTDIR=${pkgdir} install-gcc
-
-  # many packages expect this symlinks
-  ln -s ${_target}-gcc ${pkgdir}/usr/bin/${_target}-cc
-
-  # Remove unnecessary files and folders
-  rm $pkgdir/usr/share/info/* && rmdir $pkgdir/usr/share/info
-  rm $pkgdir/usr/share/man/man7/* && rmdir $pkgdir/usr/share/man/man7
-}
diff --git a/cross/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install b/cross/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/cross/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD b/cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
deleted file mode 100644
index 2e75e0d9a..000000000
--- a/cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $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=xtensa
-_target=xtensa-unknown-elf
-_sysroot="/usr/${_target}"
-
-pkgname=${_target}-linux-libre-api-headers
-_basekernel=3.8
-_sublevel=4
-pkgver=${_basekernel}.${_sublevel}
-pkgrel=1.3
-pkgdesc="Kernel headers sanitized for use in userspace for the Xtensa architecture"
-arch=('i686' 'x86_64' 'mips64el')
-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")
-md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
-         'be610dd93dbe033cfe04018b27557c3e')
-
-build() {
-  cd ${srcdir}/linux-${_basekernel}
-
-  if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
-  fi
-
-  make mrproper
-  make headers_check
-}
-
-package() {
-  cd ${srcdir}/linux-${_basekernel}
-  make ARCH=${ARCH} INSTALL_HDR_PATH=${pkgdir} headers_install
-
-  # use headers from libdrm
-  rm -r ${pkgdir}/include/drm
-
-  # clean-up unnecessary files generated during install
-  find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete
-}
diff --git a/elementary/elementary-gtk-theme/PKGBUILD b/elementary/elementary-gtk-theme/PKGBUILD
deleted file mode 100644
index 64f4a4511..000000000
--- a/elementary/elementary-gtk-theme/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: paterbrown <paterbrown at silberhelme dot de>
-# Contributor: Daniel Milde <info@milde.cz>
-
-pkgname=elementary-gtk-theme
-_pkgname=egtk
-pkgver=2.1
-pkgrel=5
-pkgdesc="The official elementary GTK theme designed to be smooth, attractive, fast, and usable."
-arch=('any')
-url="https://launchpad.net/egtk"
-license=('GPL2')
-depends=('gtk-engine-murrine')
-optdepends=('elementary-icons: the elementary icon theme'
-	'nautilus-elementary-bzr: the fork of Nautilus for simplicity')
-source=(http://launchpad.net/egtk/2.0/${pkgver}/+download/${_pkgname}.zip)
-md5sums=('f685d659c72271944ca2e76d638ca2ed')
-install=elementary-gtk-theme.install
-
-build () {
-	mkdir -p ${pkgdir}/usr/share/themes
-	cp -r ${srcdir}/${_pkgname} ${pkgdir}/usr/share/themes/elementary
-	
-	# remove unnecessary files
-	rm -rf ${pkgdir}/usr/share/themes/elementary/debian
-	rm -rf ${pkgdir}/usr/share/themes/elementary/.bzr
-}
-	
diff --git a/elementary/elementary-gtk-theme/elementary-gtk-theme.install b/elementary/elementary-gtk-theme/elementary-gtk-theme.install
deleted file mode 100644
index 66264ead4..000000000
--- a/elementary/elementary-gtk-theme/elementary-gtk-theme.install
+++ /dev/null
@@ -1,10 +0,0 @@
-pkgname=elementary-gtk-theme
-
-post_install() {
-	echo -e "\033[1;34mIf you prefer the light panel then follow this instruction:\033[0m"
-	echo -e "change '\033[1;32minclude "Apps/panel-dark.rc"\033[0m' to '\033[1;32minclude "Apps/panel.rc"\033[0m' in '/usr/share/themes/elementary/gtk-2.0/gtkrc'"
-}
-
-post_upgrade() {
-	post_install $1
-}
diff --git a/elementary/elementary-icons/PKGBUILD b/elementary/elementary-icons/PKGBUILD
deleted file mode 100644
index b56c16d8b..000000000
--- a/elementary/elementary-icons/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: paterbrown <paterbrown at silberhelme dot de>
-# Contributor: Josip <josipponjavic at gmail dot com>
-
-pkgname=elementary-icons
-_pkgname=elementary-icon-theme
-pkgver=2.7.1
-pkgrel=1
-pkgdesc="The elementary icons is an icon theme designed to be smooth, sexy, clear, and efficient."
-arch=('any')
-url="https://launchpad.net/elementaryicons"
-license=('GPL3')
-depends=('librsvg')
-source=(http://launchpad.net/elementaryicons/2.0/${pkgver}/+download/${_pkgname}-${pkgver}.tar.gz)
-md5sums=('fc4580641089a09cbcf7df38ebddd807')
-
-build() {
-	cd ${srcdir}/${_pkgname}/elementary/panel/22
-	for i in audio*-panel.svg; do ln -s "$i" "${i%-panel.svg}.svg"; done
-	cd ${srcdir}/${_pkgname}/elementary-mono-dark/panel/22
-	for i in audio*-panel.svg; do ln -s "$i" "${i%-panel.svg}.svg"; done
-	mkdir -p ${pkgdir}/usr/share/icons
-	cp -r ${srcdir}/${_pkgname}/elementary ${pkgdir}/usr/share/icons
-	cp -r ${srcdir}/${_pkgname}/elementary-mono-dark ${pkgdir}/usr/share/icons
-}
diff --git a/elementary/gtk-engine-equinox/PKGBUILD b/elementary/gtk-engine-equinox/PKGBUILD
deleted file mode 100644
index db7b71343..000000000
--- a/elementary/gtk-engine-equinox/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer : SpepS <dreamspepser at yahoo dot it>
-# Contributor: Frikilinux <frikilinux at frikilinux.com.ar>
-
-pkgname=gtk-engine-equinox
-pkgver=1.50
-pkgrel=3
-pkgdesc="A heavily modified version of the beautiful Aurora engine"
-url="http://gnome-look.org/content/show.php/Equinox+GTK+Engine?content=121881"
-license=('GPL')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('gtk2')
-makedepends=('libtool')
-options=('!libtool')
-source=("http://gnome-look.org/CONTENT/content-files/121881-equinox-$pkgver.tar.gz")
-sha256sums=('0cf8b8cc841e0da7d4a08ab5a70d3bb330fd76bdcb03165a47aaddcd47e02227')
-
-build() {
-  cd "$srcdir/equinox-$pkgver"
-
-  # toolbar fix
-  sed -i "s/=\( EQUINOX_IS_TOOLBAR\)/= widget \&\&\1/" \
-    src/equinox_style.c
-
-  # glib2 fix
-  sed -i "/gtimer/d" src/animation.c
-        
-  ./configure --prefix=/usr \
-              --enable-animation
-  make
-}
-package() {
-  cd "$srcdir/equinox-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/elementary/postler/PKGBUILD b/elementary/postler/PKGBUILD
deleted file mode 100644
index 38a5d9a0d..000000000
--- a/elementary/postler/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Kosava <kosava@archlinux.us>
-
-pkgname=postler
-pkgver=0.1.1
-pkgrel=2
-pkgdesc="Postler is simple desktop mail client built in vala"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/postler"
-license=('GPL')
-depends=('libwebkit' 'libunique' 'libcanberra' 'libnotify')
-makedepends=('vala-010' 'intltool' 'librsvg' 'gettext' 'python2' 'msmtp')
-optdepends=('dexter: provides contact completion'
-            'lynx: enables HTML to text conversion'
-            'libindicate: raise flags on dbus for other components of the desktop')
-install="postler.install"
-source=(http://git.xfce.org/apps/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 $pkgname.install)
-md5sums=('02e502c9f4a4b92e4ace32d9e268f06d'
-         '7541710086c2b4f45da7268c137ed708')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  export VALAC="/opt/vala-0.10/bin/valac" 
-  msg "Patching the buildscript to use python2..."
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|g" waf
-   ./waf configure --prefix=/usr --disable-libindicate
-   ./waf build
-   ./waf --destdir=$pkgdir install
-}
diff --git a/elementary/postler/postler.install b/elementary/postler/postler.install
deleted file mode 100644
index 709ad81f2..000000000
--- a/elementary/postler/postler.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/elementary/vala-010/PKGBUILD b/elementary/vala-010/PKGBUILD
deleted file mode 100644
index aad2232fe..000000000
--- a/elementary/vala-010/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Alessio Sergi <asergi at archlinux dot us>
-
-pkgname=vala-010
-_pkgname=vala
-pkgver=0.10.4
-pkgrel=1
-pkgdesc="Compiler for the GObject type system (0.10 branch)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://live.gnome.org/Vala"
-license=('LGPL2.1')
-depends=('glib2')
-makedepends=('libxslt')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgname}/0.10/${_pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4d23bd8b904ec59537ed5bcf44064104ccc41d639a3386cbc62d91f6bf0301c4')
-
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  ./configure --prefix=/opt/vala-0.10 \
-              --enable-vapigen
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  # make it nice
-  install -d -m755 ${pkgdir}/usr/bin
-  ln -s /opt/vala-0.10/bin/{vala-0.10,valac-0.10,vala-gen-introspect-0.10,vapicheck-0.10,vapigen-0.10} ${pkgdir}/usr/bin/
-}
-
diff --git a/extra/a2ps/PKGBUILD b/extra/a2ps/PKGBUILD
index 8cbe130fb..94117b127 100644
--- a/extra/a2ps/PKGBUILD
+++ b/extra/a2ps/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 197210 2013-10-24 03:42:33Z eric $
+# $Id: PKGBUILD 205465 2014-02-05 16:42:48Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=a2ps
 pkgver=4.14
-pkgrel=5
+pkgrel=6
 pkgdesc="An Any to PostScript filter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/a2ps/"
 license=('GPL3')
-depends=('ghostscript' 'psutils' 'imagemagick')
+depends=('psutils' 'imagemagick')
 makedepends=('gperf')
 backup=('etc/a2ps/a2ps.cfg' 'etc/a2ps/a2ps-site.cfg')
 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 
-	a2ps-4.13-manpage-chmod.patch a2ps-4.14-check-mempcpy.patch 
-	a2ps-4.14-fix-stpcpy-proto.patch a2ps-texinfo5.patch)
+        a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch
+	a2ps-4.13-manpage-chmod.patch a2ps-4.14-check-mempcpy.patch
+	a2ps-4.14-fix-stpcpy-proto.patch a2ps-texinfo5.patch
+	a2ps-4.13-security.patch)
 sha1sums=('365abbbe4b7128bf70dad16d06e23c5701874852'
           'SKIP'
           '8783952d3410d8d59ed953e1db45e2ef1a0b8f65'
@@ -23,7 +24,8 @@ sha1sums=('365abbbe4b7128bf70dad16d06e23c5701874852'
           '2bb3d0a2ef2f3ff9262723e35c742a80ab0235ce'
           '6aed29c1399e79f3914b408059610f9e7c0fc38e'
           '58fa90134f1027e3f05aeb08212cbcc10f420738'
-          '81269db9dd29685b0ece2539070ced3f7a8472df')
+          '81269db9dd29685b0ece2539070ced3f7a8472df'
+          '93a4db17edfaa99e3498c7d952c560dab49dbe42')
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -37,13 +39,14 @@ prepare() {
   patch -p1 -i "${srcdir}/a2ps-4.14-check-mempcpy.patch"
   patch -p0 -i "${srcdir}/a2ps-4.14-fix-stpcpy-proto.patch"
   patch -p1 -i "${srcdir}/a2ps-texinfo5.patch"
+  patch -p1 -i "${srcdir}/a2ps-4.13-security.patch"
 }
 
 build() {
   cd ${pkgname}-${pkgver}
   libtoolize --force --copy
   autoreconf --force --install -I m4 
-  ./configure --prefix=/usr --sysconfdir=/etc/a2ps \
+  LIBS+="-lm" ./configure --prefix=/usr --sysconfdir=/etc/a2ps \
     --includedir=/usr/include --enable-shared --enable-nls
   make
 }
diff --git a/extra/a2ps/a2ps-4.13-security.patch b/extra/a2ps/a2ps-4.13-security.patch
new file mode 100644
index 000000000..cff622535
--- /dev/null
+++ b/extra/a2ps/a2ps-4.13-security.patch
@@ -0,0 +1,65 @@
+--- a2ps-4.13/lib/routines.c.security	Sat Oct 16 05:46:37 1999
++++ a2ps-4.13/lib/routines.c	Mon Feb 12 17:45:15 2001
+@@ -242,3 +242,50 @@
+   /* Don't complain if you can't unlink.  Who cares of a tmp file? */
+   unlink (filename);
+ }
++
++/*
++ * Securely generate a temp file, and make sure it gets
++ * deleted upon exit.
++ */
++static char **	tempfiles;
++static unsigned	ntempfiles;
++
++static void
++cleanup_tempfiles()
++{
++	while (ntempfiles--)
++		unlink(tempfiles[ntempfiles]);
++}
++
++char *
++safe_tempnam(const char *pfx)
++{
++	char	*dirname, *filename;
++	int	fd;
++
++	if (!(dirname = getenv("TMPDIR")))
++		dirname = "/tmp";
++
++	tempfiles = (char **) realloc(tempfiles,
++			(ntempfiles+1) * sizeof(char *));
++	if (tempfiles == NULL)
++		return NULL;
++
++	filename = malloc(strlen(dirname) + strlen(pfx) + sizeof("/XXXXXX"));
++	if (!filename)
++		return NULL;
++
++	sprintf(filename, "%s/%sXXXXXX", dirname, pfx);
++
++	if ((fd = mkstemp(filename)) < 0) {
++		free(filename);
++		return NULL;
++	}
++	close(fd);
++
++	if (ntempfiles == 0)
++		atexit(cleanup_tempfiles);
++	tempfiles[ntempfiles++] = filename;
++
++	return filename;
++}
+--- a2ps-4.13/lib/routines.h.security	Mon Oct 18 21:24:41 1999
++++ a2ps-4.13/lib/routines.h	Mon Feb 12 17:39:30 2001
+@@ -255,7 +255,8 @@
+ /* If _STR_ is not defined, give it a tempname in _TMPDIR_ */
+ #define tempname_ensure(Str)				\
+ do {							\
+-  (Str) = (Str) ? (Str) : tempnam (NULL, "a2_");	\
++  (Str) = (Str) ? (Str) : safe_tempnam("a2_");	\
+ } while (0)
++char * safe_tempnam(const char *);
+ 
+ #endif
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index 86fc0ad57..cbda2744e 100644
--- a/extra/amarok/PKGBUILD
+++ b/extra/amarok/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 193110 2013-08-16 13:35:31Z andrea $
+# $Id: PKGBUILD 203567 2014-01-13 17:11:57Z andyrtr $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=amarok
 pkgver=2.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64" 'mips64el')
 url="http://amarok.kde.org/"
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index b2a1e16d8..766aa68f5 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202683 2013-12-24 15:27:05Z giovanni $
+# $Id: PKGBUILD 205560 2014-02-07 16:24:49Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
@@ -6,18 +6,18 @@
 # Contributor: Anatol Pomozov <anatol.pomozov@gmail.com>
 
 pkgname=amule
-pkgver=10827
-pkgrel=1
+pkgver=10834
+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++' 'libsm')
+depends=('wxgtk' 'wxgtk2.8' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
 install=amule.install
 source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2"
         'amuled.systemd'
         'amuleweb.systemd')
-md5sums=('ca6564f1f4de16d70532308e234bde56'
+md5sums=('80e6375acbdc287b15cc92131bf9e027'
          '59772c41860e238f1c822feb8ca8d47f'
          '05975c5d94bfc41fddb894d98b1115d5')
 
@@ -38,7 +38,8 @@ build() {
               --enable-optimize \
               --enable-ccache \
               --enable-geoip \
-              --enable-upnp
+              --enable-upnp \
+              --with-wxversion=2.8
 
   make
 }
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index f1b0d972f..28d02990c 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 199757 2013-11-15 18:34:29Z heftig $
+# $Id: PKGBUILD 203276 2014-01-07 09:24:12Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgbase=anjuta
 pkgname=('libanjuta' 'anjuta')
 pkgver=3.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
 makedepends=(gdl vte3 autogen devhelp glade libgda subversion neon gnome-icon-theme vala dconf
              gtk-doc yelp-tools gnome-common intltool gobject-introspection itstool gjs
-             python)
+             python2)
 url="http://www.anjuta.org/"
 options=('!emptydirs')
 source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
@@ -21,7 +21,8 @@ build() {
   cd "$pkgbase-$pkgver"
 
   ./autogen.sh --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --enable-glade-catalog --enable-compile-warnings=minimum
+      --localstatedir=/var --enable-glade-catalog --enable-compile-warnings=minimum \
+      PYTHON=/usr/bin/python2
   make
 }
 
diff --git a/extra/antlr2/PKGBUILD b/extra/antlr2/PKGBUILD
deleted file mode 100644
index 77f37b20a..000000000
--- a/extra/antlr2/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 193188 2013-08-18 11:26:04Z guillaume $
-# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: George Giorgidze <giorgidze (at) gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgbase=antlr2
-pkgname=('antlr2' 'python2-antlr2')
-pkgver=2.7.7
-pkgrel=4
-# architecture dependant files in /usr/lib/libantlr.a
-arch=('i686' 'x86_64')
-url="http://www.antlr2.org/"
-license=('custom')
-makedepends=('java-environment' 'python2' 'sh')
-source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz"
-        'runantlr2.sh'
-        'gcc4.4.patch')
-md5sums=('01cc9a2a454dd33dcd8c856ec89af090'
-         'e4aa827cf78f97c4e5fae086831192d6'
-         '8574c93f40e6477e83c29f9b07de49da')
-
-build() {
-  cd "${srcdir}/antlr-${pkgver}"
-
-  patch -Np0 -i ${srcdir}/gcc4.4.patch
-
-  ./configure --prefix=/usr \
-    --disable-examples \
-    --disable-csharp
-  make
-}
-
-package_antlr2() {
-  pkgdesc='Tool for language recognition with C++ or Java actions'
-  depends=('java-runtime' 'sh')
-  replaces=('antlr')
-  conflicts=('antlr')
-  provides=("antlr=${pkgver}")
-
-  cd ${srcdir}/antlr-${pkgver}/lib/cpp
-  make prefix="${pkgdir}/usr" install
-
-  install -Dm644 ${srcdir}/antlr-${pkgver}/antlr/antlr.jar \
-    "${pkgdir}/usr/share/java/antlr2.jar"
-  install -Dm755 ${srcdir}/runantlr2.sh ${pkgdir}/usr/bin/runantlr2
-  install -Dm644 ${srcdir}/antlr-${pkgver}/LICENSE.txt \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python2-antlr2() {
-  pkgdesc='Tool for language recognition with C++ or Java actions - Python runtime support'
-  depends=('antlr2' 'python2')
-  replaces=('python-antlr')
-  conflicts=('python-antlr')
-  provides=("python-antlr=${pkgver}")
-
-  cd ${srcdir}/antlr-${pkgver}/lib/python
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-
-  install -d ${pkgdir}/usr/share/licenses
-  ln -s /usr/share/licenses/antlr2 ${pkgdir}/usr/share/licenses/${pkgname}
-}
diff --git a/extra/antlr2/gcc4.4.patch b/extra/antlr2/gcc4.4.patch
deleted file mode 100644
index de8de9d3f..000000000
--- a/extra/antlr2/gcc4.4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp
---- lib/cpp/antlr/CharScanner.hpp	2006-11-01 22:37:17.000000000 +0100
-+++ lib/cpp/antlr/CharScanner.hpp	2008-03-19 20:09:21.000000000 +0100
-@@ -10,6 +10,7 @@
- 
- #include <antlr/config.hpp>
- 
-+#include <cstring>
- #include <map>
- 
- #ifdef HAS_NOT_CCTYPE_H
---- lib/cpp/antlr/CharScanner.hpp~      2008-11-11 21:24:02.000000000 +0000
-+++ lib/cpp/antlr/CharScanner.hpp       2008-11-11 21:24:33.000000000 +0000
-@@ -10,6 +10,7 @@
-
- #include <antlr/config.hpp>
-
-+#include <cstdio>
- #include <cstring>
- #include <map>
-
diff --git a/extra/antlr2/runantlr2.sh b/extra/antlr2/runantlr2.sh
deleted file mode 100644
index 716f6f887..000000000
--- a/extra/antlr2/runantlr2.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-echo Running 'java antlr.Tool $*' with /usr/share/java/antlr2.jar appended to the CLASSPATH variable
-export CLASSPATH
-CLASSPATH=$CLASSPATH:/usr/share/java/antlr2.jar
-java antlr.Tool $*
diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD
index bfbdc0958..7c45e0c65 100644
--- a/extra/apache/PKGBUILD
+++ b/extra/apache/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197860 2013-10-30 11:18:54Z allan $
+# $Id: PKGBUILD 205426 2014-02-04 16:28:18Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apache
-pkgver=2.2.25
+pkgver=2.2.26
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,13 +14,13 @@ backup=(etc/httpd/conf/httpd.conf
         etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
         etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
         etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
+        etc/conf.d/apache
         etc/logrotate.d/httpd)
 depends=('openssl' 'zlib' 'apr-util' 'pcre' 'systemd')
 optdepends=('lynx: apachectl status')
 install=apache.install
 _itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01
-source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
-        http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2.asc
+source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
         ${_itkurl}/02-rename-prefork-to-itk.patch
         ${_itkurl}/03-add-mpm-to-build-system.patch
         ${_itkurl}/04-correct-output-makefile-location.patch
@@ -37,7 +37,7 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
         httpd.logrotate
         httpd.service
         arch.layout)
-md5sums=('9ebe3070c0bb4311f21a0cd0e34f0045'
+md5sums=('254eda547f8d624604e4bf403241e617'
          'SKIP'
          'f1d9d41360908ceb2374da55ae99197a'
          'cdfa04985a0efa850976aef01c2a0c40'
diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD
index 6b0501024..232631aa1 100644
--- a/extra/apr-util/PKGBUILD
+++ b/extra/apr-util/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 200761 2013-12-04 19:37:05Z jgc $
+# $Id: PKGBUILD 205605 2014-02-09 10:29:36Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apr-util
 pkgver=1.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://apr.apache.org/"
-depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
+depends=('apr' 'gdbm' 'expat' 'libldap' 'unixodbc')
 license=('APACHE')
 source=(http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2{,.asc})
 md5sums=('6f3417691c7a27090f36e7cf4d94b36e'
@@ -17,8 +17,8 @@ md5sums=('6f3417691c7a27090f36e7cf4d94b36e'
 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-ldap \
+    --with-gdbm=/usr
   make
 }
 
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index 6938cf6f4..5959fca9f 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 202775 2013-12-27 23:05:21Z schiv $
+# $Id: PKGBUILD 205866 2014-02-12 07:12:24Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: see .contrib
 
 pkgname=ardour
 _pkgname=Ardour3
-pkgver=3.5.143
-pkgrel=1
+pkgver=3.5.308
+pkgrel=2
 pkgdesc="Professional-grade digital audio workstation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ardour.org/"
 license=('GPL')
-depends=('liblrdf' 'liblo' 'libsmf' 'lilv'
+depends=('liblrdf' 'liblo>=0.28' 'libsmf' 'lilv'
          'aubio' 'libgnomecanvasmm' 'suil')
 makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz')
 optdepends=('xjadeo: video monitoring')
 install=$pkgname.install
 source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2"
         "$pkgname.desktop")
-md5sums=('52c3b8ea3ab014002e84e377f8a15097'
+md5sums=('710e084d5edeb3c216c8fdd57f6ed744'
          '316bd21ece5e2208a104fd09cac521af')
 
 prepare() {
diff --git a/extra/aubio/PKGBUILD b/extra/aubio/PKGBUILD
index 8a8b231de..2cfbbb06d 100644
--- a/extra/aubio/PKGBUILD
+++ b/extra/aubio/PKGBUILD
@@ -1,31 +1,40 @@
-# $Id: PKGBUILD 199836 2013-11-17 08:28:12Z allan $
-# Maintainer: Tobias Kieslich tobias [funnychar] archlinux org
-# Contributor: Peter Baldwin <bald_pete@hotmail.com>
-# Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
+# $Id: PKGBUILD 204700 2014-01-25 13:01:02Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Tobias Kieslich tobias [funnychar] archlinux org
+# Contributor: see .contrib
 
 pkgname=aubio
-pkgver=0.3.2
-pkgrel=6
-pkgdesc="A library for audio labelling"
+pkgver=0.4.0
+pkgrel=1
+pkgdesc="A tool for extracting annotations from audio signals"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://aubio.org/"
 license=('GPL')
-depends=('libsamplerate' 'fftw' 'jack')
-source=("http://aubio.org/pub/${pkgname}-${pkgver}.tar.gz"
-        aubio-linking.patch)
-md5sums=('ffc3e5e4880fec67064f043252263a44'
-         '674259ce137ca28ef24bd62482829cd5')
+depends=('fftw' 'jack' 'ffmpeg')
+makedepends=('python2-numpy')
+optdepends=('python2-numpy: Python 2.x interface')
+source=("http://aubio.org/pub/$pkgname-$pkgver.tar.bz2")
+md5sums=('8de88baab79f7eec8e1c7f321c4026af')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
-  patch -p1 -i $srcdir/aubio-linking.patch
-
-  ./configure --prefix=/usr
-  make
+  python2 waf configure --prefix=/usr --enable-fftw3f
+  python2 waf build $MAKEFLAGS
+  cd python; python2 setup.py build # python interface
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+
+  python2 waf --destdir="$pkgdir" install
+
+  # python interface
+  cd python
+
+  python2 setup.py install --root="$pkgdir" --optimize=1
+
+  # python2 compat
+  sed -i 's:bin/env python:bin/env python2:' \
+      "$pkgdir/usr/lib/python2.7/site-packages/aubio/__init__.py"
 }
diff --git a/extra/aubio/aubio-linking.patch b/extra/aubio/aubio-linking.patch
deleted file mode 100644
index ea68335a4..000000000
--- a/extra/aubio/aubio-linking.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -rupN aubio-0.3.2.old/examples/Makefile.am aubio-0.3.2/examples/Makefile.am
---- aubio-0.3.2.old/examples/Makefile.am	2006-09-12 18:31:40.000000000 -0400
-+++ aubio-0.3.2/examples/Makefile.am	2010-02-10 04:06:51.000000000 -0500
-@@ -23,7 +23,7 @@ aubionotes_SOURCES = aubionotes.c utils.
- aubiotrack_SOURCES = aubiotrack.c utils.c
- aubioquiet_SOURCES = aubioquiet.c utils.c
- 
--aubioonset_LDADD = @JACK_LIBS@
--aubionotes_LDADD = @JACK_LIBS@
--aubiotrack_LDADD = @JACK_LIBS@
--aubioquiet_LDADD = @JACK_LIBS@
-+aubioonset_LDADD = @JACK_LIBS@ -lm
-+aubionotes_LDADD = @JACK_LIBS@ -lm
-+aubiotrack_LDADD = @JACK_LIBS@ -lm
-+aubioquiet_LDADD = @JACK_LIBS@ -lm
-diff -rupN aubio-0.3.2.old/examples/Makefile.in aubio-0.3.2/examples/Makefile.in
---- aubio-0.3.2.old/examples/Makefile.in	2006-10-08 19:22:10.000000000 -0400
-+++ aubio-0.3.2/examples/Makefile.in	2010-02-10 04:07:00.000000000 -0500
-@@ -247,10 +247,10 @@ aubioonset_SOURCES = aubioonset.c utils.
- aubionotes_SOURCES = aubionotes.c utils.c
- aubiotrack_SOURCES = aubiotrack.c utils.c
- aubioquiet_SOURCES = aubioquiet.c utils.c
--aubioonset_LDADD = @JACK_LIBS@
--aubionotes_LDADD = @JACK_LIBS@
--aubiotrack_LDADD = @JACK_LIBS@
--aubioquiet_LDADD = @JACK_LIBS@
-+aubioonset_LDADD = @JACK_LIBS@ -lm
-+aubionotes_LDADD = @JACK_LIBS@ -lm
-+aubiotrack_LDADD = @JACK_LIBS@ -lm
-+aubioquiet_LDADD = @JACK_LIBS@ -lm
- all: all-recursive
- 
- .SUFFIXES:
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 679522107..fa5232d0d 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198671 2013-11-01 21:03:18Z bisson $
+# $Id: PKGBUILD 203195 2014-01-05 05:23:56Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=audacious
-pkgver=3.4.2
+pkgver=3.4.3
 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=('341452d3beceb57451f0675a61fabfd9c59d2dab')
+sha1sums=('1d348f8ef5238de7cd6669189ecca690452e96c4')
 
 provides=('audacious-player')
 replaces=('audacious-player')
diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD
index cdd8aabd6..74ab5c7c7 100644
--- a/extra/audacity/PKGBUILD
+++ b/extra/audacity/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 197206 2013-10-23 23:57:14Z eric $
+# $Id: PKGBUILD 203490 2014-01-11 20:07:06Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=audacity
 pkgver=2.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A program that lets you manipulate digital audio waveforms"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://audacity.sourceforge.net/"
 license=('GPL')
-depends=('libmad' 'libid3tag' 'wxgtk' 'lame' 'hicolor-icon-theme'
+depends=('libmad' 'libid3tag' 'wxgtk2.8' 'lame' 'hicolor-icon-theme'
 	 'desktop-file-utils' 'jack' 'soundtouch' 'ffmpeg-compat')
 makedepends=('cmake')
 options=('!makeflags')
@@ -19,7 +19,7 @@ sha1sums=('f63cafb81f29e7f3813dc9f80fb1dfdbcfe46b33')
 build() {
   cd ${pkgname}-src-${pkgver}
   [ "$CARCH" = "mips64el" ] && sse="--disable-sse"
-  PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \
+  WX_CONFIG=/usr/bin/wx-config-2.8 PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \
     ./configure --prefix=/usr $sse
   make
 }
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index 42c6c31fa..93b28e071 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -1,29 +1,31 @@
-# $Id: PKGBUILD 201255 2013-12-07 10:34:55Z bpiotrowski $
+# $Id: PKGBUILD 205595 2014-02-08 15:48:17Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Nick B <Shirakawasuna at gmail _dot_com>
 
 pkgname=avogadro
-pkgver=1.1.0
-pkgrel=6
+pkgver=1.1.1
+pkgrel=2
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://avogadro.openmolecules.net/wiki/Main_Page"
 license=('GPL2')
-depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
-makedepends=('cmake' 'boost' 'doxygen' 'mesa-libgl')
+depends=('openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
+makedepends=('cmake' 'boost' 'doxygen' 'mesa-libgl' 'eigen2')
 install=avogadro.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'boost153.patch')
-md5sums=('f4fbef5ffc69cc312b2316426c36a78d'
+md5sums=('1223bb18f50dccd2c60538aa90d58c7a'
          'aa2573f78d5dbd85b3cb79e08acde8ab')
 
-build() {
+prepare() {
+  mkdir build
+
   cd ${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}"/boost153.patch
-  cd ../
+}
 
-  mkdir build
+build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/bc/PKGBUILD b/extra/bc/PKGBUILD
index bc214dd20..4172c6c74 100644
--- a/extra/bc/PKGBUILD
+++ b/extra/bc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137896 2011-09-12 10:03:30Z pierre $
+# $Id: PKGBUILD 204773 2014-01-26 21:41:56Z andyrtr $
 # Maintainer: dorphell <dorphell@archlinux.org>
 
 pkgname=bc
-pkgver=1.06
-pkgrel=8.1
+pkgver=1.06.95
+pkgrel=1
 pkgdesc="An arbitrary precision calculator language"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/bc/"
@@ -12,25 +12,32 @@ depends=('readline')
 replaces=('bc-readline')
 conflicts=('bc-readline')
 install=bc.install
-source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'build-fix.patch' 'bc-1.06-info-dir-entry.patch')
-md5sums=('d44b5dddebd8a7a7309aea6c36fda117'
-         'fc7ecbd9e55ef04c6d3a495692626116'
-         'b6fe9869830aca0d34badf810fe0cfb3')
+source=(ftp://alpha.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+        bc-1.06.95-void_uninitialized.patch)
+md5sums=('5126a721b73f97d715bb72c13c889035'
+         'SKIP'
+         'fe85d42dd4151801e9b8c2d2c4d990bf')
 
-build() {
-  export CFLAGS="${CFLAGS/-O?/-O3}"
+prepare() {
+  cd "${pkgname}-${pkgver}"
 
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/build-fix.patch"
-  patch -p1 -i "${srcdir}/bc-1.06-info-dir-entry.patch"
+  # https://bugs.gentoo.org/show_bug.cgi?id=349339
+  patch -Np0 -i ${srcdir}/bc-1.06.95-void_uninitialized.patch
+}
 
+build() {
+  cd "${pkgname}-${pkgver}"
   ./configure --prefix=/usr --mandir=/usr/share/man \
     --infodir=/usr/share/info --with-readline
-  make LEX="flex -I"
+  make
+}
+
+check () {
+  cd "${pkgname}-${pkgver}"
+  echo "quit" | ./bc/bc -l Test/checklib.b # 10 failures
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/bc/bc-1.06-info-dir-entry.patch b/extra/bc/bc-1.06-info-dir-entry.patch
deleted file mode 100644
index 8c1344c82..000000000
--- a/extra/bc/bc-1.06-info-dir-entry.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bc-1.06/doc/bc.info.info-dir-entry	2000-10-03 20:36:31.000000000 +0200
-+++ bc-1.06/doc/bc.info	2003-01-06 14:07:40.000000000 +0100
-@@ -1,5 +1,8 @@
- This is bc.info, produced by makeinfo version 4.0 from bc.texi.
- 
-+START-INFO-DIR-ENTRY
-+* bc: (bc).                   Arbritrary precision calculator language.
-+END-INFO-DIR-ENTRY
- 
- File: bc.info,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
- 
diff --git a/extra/bc/bc-1.06.95-void_uninitialized.patch b/extra/bc/bc-1.06.95-void_uninitialized.patch
new file mode 100644
index 000000000..c60290c4d
--- /dev/null
+++ b/extra/bc/bc-1.06.95-void_uninitialized.patch
@@ -0,0 +1,14 @@
+http://www.pixelbeat.org/programming/oss_bug_flow.html
+https://bugs.gentoo.org/349339
+
+--- bc/storage.c
++++ bc/storage.c
+@@ -99,6 +99,7 @@
+     {
+       f = &functions[indx];
+       f->f_defined = FALSE;
++      f->f_void = FALSE;
+       f->f_body = (char *) bc_malloc (BC_START_SIZE);
+       f->f_body_size = BC_START_SIZE;
+       f->f_code_size = 0;
+
diff --git a/extra/bc/build-fix.patch b/extra/bc/build-fix.patch
deleted file mode 100644
index 98a40820a..000000000
--- a/extra/bc/build-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -wbBur bc-1.06/bc/scan.l bc-1.06.my/bc/scan.l
---- bc-1.06/bc/scan.l   2000-09-13 22:25:47 +0400
-+++ bc-1.06.my/bc/scan.l    2006-12-25 12:39:34 +0300
-@@ -143,7 +143,9 @@
-
- /* Definitions for readline access. */
- extern FILE *rl_instream;
-+#if 0
- _PROTOTYPE(char *readline, (char *));
-+#endif
-
- /* rl_input puts upto MAX characters into BUF with the number put in
-    BUF placed in *RESULT.  If the yy input file is the same as
diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD
index b5489bdad..10608b3fa 100644
--- a/extra/bftpd/PKGBUILD
+++ b/extra/bftpd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 187832 2013-06-06 18:31:08Z thomas $
+# $Id: PKGBUILD 203673 2014-01-13 22:08:35Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=bftpd
-pkgver=4.0
+pkgver=4.2
 pkgrel=1
 pkgdesc="Small, easy-to-configure FTP server"
 arch=(i686 x86_64 'mips64el')
@@ -21,7 +21,7 @@ source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz
         bftpd.service
         bftpd.socket
         bftpd_AT.service)
-md5sums=('34bac87bb196ae823fa2b4731dfa9383'
+md5sums=('6b60fbab807d31d803c7f984e8488743'
          '853680dad0df39d0b4d2fb43d4be430a'
          '96f82c38f3f540b53f3e5144900acf17'
          '23feb84e8ecbae5df320b49e01821d9a'
diff --git a/extra/bluefish/PKGBUILD b/extra/bluefish/PKGBUILD
index 15b134c32..7ca29834f 100644
--- a/extra/bluefish/PKGBUILD
+++ b/extra/bluefish/PKGBUILD
@@ -1,33 +1,36 @@
-# $Id: PKGBUILD 197875 2013-10-30 11:24:20Z allan $
+# $Id: PKGBUILD 204944 2014-02-01 05:29:28Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=bluefish
-pkgver=2.2.4
+pkgver=2.2.5
 pkgrel=1
 pkgdesc="A powerful HTML editor for experienced web designers and programmers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://bluefish.openoffice.nl/"
 license=('GPL3')
-depends=('gtk3' 'enchant' 'python2' 'desktop-file-utils' 'hicolor-icon-theme')
+depends=('gtk3' 'enchant' 'python2' 'desktop-file-utils')
 makedepends=('gucharmap' 'intltool')
 optdepends=('gucharmap: for using the charmap plugin')
 install=bluefish.install
 source=(http://www.bennewitz.com/bluefish/stable/source/bluefish-${pkgver}.tar.bz2{,.sig})
-sha1sums=('b65310617b5fd525a8c57f7681e023f6f4496378'
-          '6ff0474602c520e2a638436c5423957cfe4be4d0')
+sha1sums=('efdd577a20a439e58f14f68e725f00be230d5de1'
+          'SKIP')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
     src/plugin_zencoding/zencoding/{,filters/,actions/}*.py \
     data/{cssmin.py,jsbeautify,jsmin.py,lorem-ipsum-generator}
-    
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --enable-spell-check --disable-update-databases --disable-xml-catalog-update
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index 7822479aa..7e709fd17 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 202773 2013-12-27 22:14:31Z andyrtr $
+# $Id: PKGBUILD 204503 2014-01-21 12:45:19Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgbase=bluez
 pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
-pkgver=5.13
+pkgver=5.14
 pkgrel=1
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,9 +14,10 @@ makedepends=('dbus' 'libical' 'systemd')
 source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.xz
         0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
         bluetooth.modprobe)
-md5sums=('c68f8cb270110256a684403ee43b5f79'
-         'ec97f23123456900446e8ab17361d6c2'
-         '671c15e99d7154c2df987b71c5851b3d')
+# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
+sha256sums=('5a485837c215f3093d3a98cb412dc99e1139f88a66c8809bdf183ad5e676395f'
+            '896a1403d9b7258c4fb0d41f3a6f70fd51eaa1115ab3f4259f3dbbe02b55766b'
+            '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
 
 prepare() {
   cd $pkgname-$pkgver
diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD
index 1c52e2dab..f86a8f6c4 100644
--- a/extra/brltty/PKGBUILD
+++ b/extra/brltty/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 196739 2013-10-17 14:02:42Z andyrtr $
+# $Id: PKGBUILD 203074 2014-01-03 11:03:11Z tomegun $
 # 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=5
+pkgrel=6
 pkgdesc="Braille display driver for Linux/Unix"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mielke.cc/brltty"
diff --git a/extra/cagibi/PKGBUILD b/extra/cagibi/PKGBUILD
deleted file mode 100644
index ec5b4b969..000000000
--- a/extra/cagibi/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 178952 2013-03-01 10:19:46Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=cagibi
-pkgver=0.2.0
-pkgrel=3
-pkgdesc='A cache/proxy daemon for SSDP (the discovery part of UPnP)'
-arch=('i686' 'x86_64' 'mips64el')
-url='https://projects.kde.org/projects/kdesupport/cagibi/'
-license=('LGPL')
-depends=('qt4')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('af66d89337ef80e8a868d3bb9dd92328')
-
-build() {
-  . /etc/profile.d/qt4.sh
-
-  mkdir 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/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index b62b3c852..738778942 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 200653 2013-12-01 09:50:18Z andyrtr $
+# $Id: PKGBUILD 204752 2014-01-26 12:15:56Z andyrtr $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
@@ -18,14 +18,14 @@ pkgname=('calligra-braindump'
          'calligra-stage'
          'calligra-words')
 pkgver=2.7.5
-pkgrel=2
+pkgrel=5
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
              'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio'
-             'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw'
-             'openjpeg' 'kdegraphics-okular' 'pstoedit')
+             'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt' 'libkdcraw'
+             'openjpeg' 'kdegraphics-okular' 'pstoedit' 'libvisio')
 [ "$CARCH" != "mips64el" ] && makedepends+=('vc')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz")
@@ -33,6 +33,9 @@ md5sums=('05d1d0bac970d6dc68ffabc12fca2eb7')
 
 prepare() {
   mkdir build
+  # fix openjpeg detection
+  sed -i "s:/usr/include/openjpeg:/usr/include/openjpeg-1.5:" \
+     ${srcdir}/${pkgbase}-${pkgver}/cmake/modules/FindOpenJPEG.cmake
 }
 
 build() {
@@ -47,7 +50,8 @@ build() {
 package_calligra-filters() {
   pkgdesc="Filters for the Calligra office suite"
   optdepends=('libwpg: Corel WordPerfect Graphics image importer'
-              'libwps: Microsoft Works file word processor format import')
+              'libwps: Microsoft Works file word processor format import'
+              'libvisio: Microsoft Visio import filter')
   conflicts=('koffice-filters')
   replaces=('koffice-filters')
   install=calligra-filters.install
@@ -148,8 +152,8 @@ package_calligra-stage() {
 
 package_calligra-krita() {
   pkgdesc="Edit and paint images"
-  depends=('calligra-plugins' 'kdebase-runtime' 'eigen2'
-           'opencolorio' 'libkdcraw' 'fftw' 'glew' 'opengtl')
+  depends=('calligra-plugins' 'kdebase-runtime' 'opencolorio' 'libkdcraw'
+           'fftw' 'glew')
   conflicts=('koffice-krita' 'calligra-krita-doc')
   replaces=('koffice-krita' 'calligra-krita-doc')
   install=calligra-krita.install
diff --git a/extra/ccrtp/PKGBUILD b/extra/ccrtp/PKGBUILD
index d74c9782c..444367280 100644
--- a/extra/ccrtp/PKGBUILD
+++ b/extra/ccrtp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197587 2013-10-27 03:20:07Z eric $
+# $Id: PKGBUILD 203569 2014-01-13 17:11:59Z andyrtr $
 # Maintainer:
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
@@ -7,16 +7,23 @@
 
 pkgname=ccrtp
 pkgver=2.0.6
-pkgrel=1
+pkgrel=2
 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')
 install=$pkgname.install
-source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+        'libgcrypt160.patch')
 md5sums=('ca0a7a184b242d660d81caf6101a2c0c'
-         'SKIP')
+         'SKIP'
+         '8ca785e2613b4e056685d3dca3fe8670')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/libgcrypt160.patch
+}
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/ccrtp/libgcrypt160.patch b/extra/ccrtp/libgcrypt160.patch
new file mode 100644
index 000000000..f8a21dc51
--- /dev/null
+++ b/extra/ccrtp/libgcrypt160.patch
@@ -0,0 +1,52 @@
+--- ccrtp-2.0.6/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp~	2013-12-24 09:48:10.679538751 +0000
++++ ccrtp-2.0.6/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp	2013-12-24 09:48:29.149404720 +0000
+@@ -22,40 +22,6 @@
+ #include <errno.h>
+ #include <gcrypt.h>
+ 
+-/*
+- * The following macro was copied from gcrypt.h and modified to explicitly
+- * cast the pointer types to keep the compiler happy.
+- */
+-#define GCRY_THREAD_OPTION_PTHREAD_CPP_IMPL                                   \
+-static int gcry_pthread_mutex_init (void **priv)                              \
+-{                                                                             \
+-  int err = 0;                                                                \
+-  pthread_mutex_t *lock = (pthread_mutex_t *)malloc (sizeof (pthread_mutex_t)); \
+-                                                                              \
+-  if (!lock)                                                                  \
+-    err = ENOMEM;                                                             \
+-  if (!err)                                                                   \
+-{                                                                         \
+-      err = pthread_mutex_init (lock, NULL);                                  \
+-      if (err)                                                                \
+-        free (lock);                                                          \
+-      else                                                                    \
+-        *priv = lock;                                                         \
+-}                                                                         \
+-  return err;                                                                 \
+-}                                                                             \
+-static int gcry_pthread_mutex_destroy (void **lock)                           \
+-{ int err = pthread_mutex_destroy ((pthread_mutex_t *)*lock);  free (*lock); return err; }     \
+-static int gcry_pthread_mutex_lock (void **lock)                              \
+-{ return pthread_mutex_lock ((pthread_mutex_t *)*lock); }                     \
+-static int gcry_pthread_mutex_unlock (void **lock)                            \
+-{ return pthread_mutex_unlock ((pthread_mutex_t *)*lock); }                   \
+-                                                                              \
+-static struct gcry_thread_cbs gcry_threads_pthread =                          \
+-{ GCRY_THREAD_OPTION_PTHREAD, NULL,                                           \
+-  gcry_pthread_mutex_init, gcry_pthread_mutex_destroy,                        \
+-  gcry_pthread_mutex_lock, gcry_pthread_mutex_unlock }
+-
+ /** Implement the locking callback functions for libgcrypt.
+  *
+  */
+@@ -65,7 +31,7 @@
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+-GCRY_THREAD_OPTION_PTHREAD_CPP_IMPL;
++GCRY_THREAD_OPTION_PTHREAD_IMPL;
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/extra/chmlib/PKGBUILD b/extra/chmlib/PKGBUILD
index 52c7f82d1..17cb584c5 100644
--- a/extra/chmlib/PKGBUILD
+++ b/extra/chmlib/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197891 2013-10-30 11:30:33Z allan $
+# $Id: PKGBUILD 203057 2014-01-03 08:38:57Z bpiotrowski $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alexander 'dma147' Mieland <dma147@linux-stats.org>
 # Contributor: Simon Morgan <simon@16hz.net>
 
 pkgname=chmlib
 pkgver=0.40
-pkgrel=3.1
+pkgrel=4
 pkgdesc="Library for dealing with Microsoft ITSS/CHM format files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://morte.jedrea.com/~jedwin/projects/chmlib/"
diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index aff1e1a05..0f8f2760a 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -1,36 +1,36 @@
-# $Id: PKGBUILD 197893 2013-10-30 11:31:17Z allan $
+# $Id: PKGBUILD 204255 2014-01-15 16:47:46Z bisson $
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=clamav
-pkgver=0.98
+pkgver=0.98.1
 pkgrel=1
 pkgdesc='Anti-virus toolkit for Unix'
 url='http://www.clamav.net/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('bzip2' 'libltdl')
-backup=('etc/logrotate.d/clamav')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'service'
-        'service.fresh'
+depends=('bzip2' 'libltdl' 'gcc-libs')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.sig}
         'logrotate'
         'tmpfiles.d'
-        'config.patch')
-sha1sums=('1e6a7284721387646c713a8d32fa8b5a897985db'
-          'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb'
-          'cda9a087e5593992150cb456e34c5f6f589aca82'
+        'clamd.conf'
+        'freshclam.conf'
+        'clamd.service'
+        'freshclamd.service')
+sha1sums=('9f04c0e81463c36f7e58d18f16d1b88f3332dcb8' 'SKIP'
           'bb488a56b0f6a0760446cde89c1e3321e2717b78'
           'a224ea9b4d0f4f196827347d54bed51e11c197ea'
-          '00dfadd93d11186793cb1161745f9dd7370beb99')
+          '887f624eb305f2446f55d8339e2972ad0cfe2b79'
+          'b767837d0279ad30b92c314cb762b73e5ad0415e'
+          'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb'
+          'cda9a087e5593992150cb456e34c5f6f589aca82')
 
-install=install
+backup=('etc/clamav/clamd.conf'
+        'etc/clamav/freshclam.conf'
+        'etc/logrotate.d/clamav')
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../config.patch
-}
+install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
@@ -48,8 +48,10 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 
-	install -Dm644 ../service.fresh "${pkgdir}"/usr/lib/systemd/system/freshclamd.service
-	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service
+	install -Dm644 ../clamd.conf "${pkgdir}"/etc/clamav/clamd.conf
+	install -Dm644 ../freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf
+	install -Dm644 ../freshclamd.service "${pkgdir}"/usr/lib/systemd/system/freshclamd.service
+	install -Dm644 ../clamd.service "${pkgdir}"/usr/lib/systemd/system/clamd.service
 	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf
 	install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav
 
diff --git a/extra/clamav/clamd.conf b/extra/clamav/clamd.conf
new file mode 100644
index 000000000..d231ec9f0
--- /dev/null
+++ b/extra/clamav/clamd.conf
@@ -0,0 +1,6 @@
+LogFile /var/log/clamav/clamd.log
+LogTime yes
+PidFile /run/clamav/clamd.pid
+TemporaryDirectory /tmp
+LocalSocket /var/lib/clamav/clamd.sock
+User clamav
diff --git a/extra/clamav/service b/extra/clamav/clamd.service
index 86608c40e..86608c40e 100644
--- a/extra/clamav/service
+++ b/extra/clamav/clamd.service
diff --git a/extra/clamav/config.patch b/extra/clamav/config.patch
deleted file mode 100644
index 0b552b3f9..000000000
--- a/extra/clamav/config.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -arU 0 old/etc/clamd.conf.sample new/etc/clamd.conf.sample
---- old/etc/clamd.conf.sample	2010-12-02 19:31:21.773357389 +0100
-+++ new/etc/clamd.conf.sample	2010-12-02 19:31:45.873357389 +0100
-@@ -14 +14 @@
--#LogFile /tmp/clamd.log
-+LogFile /var/log/clamav/clamd.log
-@@ -34 +34 @@
--#LogTime yes
-+LogTime yes
-@@ -61 +61 @@
--#PidFile /var/run/clamd.pid
-+PidFile /run/clamav/clamd.pid
-@@ -65 +65 @@
--#TemporaryDirectory /var/tmp
-+TemporaryDirectory /tmp
-@@ -80 +80 @@
--#LocalSocket /tmp/clamd.socket
-+LocalSocket /var/lib/clamav/clamd.sock
-@@ -190 +190 @@
--#User clamav
-+User clamav
-diff -arU 0 old/etc/freshclam.conf.sample new/etc/freshclam.conf.sample
---- old/etc/freshclam.conf.sample	2010-12-02 19:31:21.773357389 +0100
-+++ new/etc/freshclam.conf.sample	2010-12-02 19:31:51.190024057 +0100
-@@ -17 +17 @@
--#UpdateLogFile /var/log/freshclam.log
-+UpdateLogFile /var/log/clamav/freshclam.log
-@@ -121 +121 @@
--#NotifyClamd /path/to/clamd.conf
-+NotifyClamd /etc/clamav/clamd.conf
diff --git a/extra/clamav/freshclam.conf b/extra/clamav/freshclam.conf
new file mode 100644
index 000000000..db513fd3e
--- /dev/null
+++ b/extra/clamav/freshclam.conf
@@ -0,0 +1,3 @@
+UpdateLogFile /var/log/clamav/freshclam.log
+DatabaseMirror database.clamav.net
+NotifyClamd /etc/clamav/clamd.conf
diff --git a/extra/clamav/service.fresh b/extra/clamav/freshclamd.service
index a0a72c2e6..a0a72c2e6 100644
--- a/extra/clamav/service.fresh
+++ b/extra/clamav/freshclamd.service
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
index da6b00a57..49bb20157 100644
--- a/extra/claws-mail/PKGBUILD
+++ b/extra/claws-mail/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 201548 2013-12-14 21:56:57Z andyrtr $
+# $Id: PKGBUILD 205523 2014-02-06 16:23:04Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=claws-mail
 pkgver=3.9.3
-pkgrel=1
+pkgrel=2
 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' 'compface'
+depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan' 'compface'
          'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('spamassassin' 'bogofilter' 'valgrind' 
              # dependencies for plugins
diff --git a/extra/clisp/PKGBUILD b/extra/clisp/PKGBUILD
index 4798ee4cb..edecd7e52 100644
--- a/extra/clisp/PKGBUILD
+++ b/extra/clisp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 154935 2012-03-31 09:53:13Z ronald $
+# $Id: PKGBUILD 203061 2014-01-03 09:08:54Z bpiotrowski $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 pkgname=clisp
 pkgver=2.49
-pkgrel=3.1
+pkgrel=4
 pkgdesc="ANSI Common Lisp interpreter, compiler and debugger"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD
index 3a9067696..aedef4955 100644
--- a/extra/clutter-gst/PKGBUILD
+++ b/extra/clutter-gst/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197896 2013-10-30 11:32:22Z allan $
+# $Id: PKGBUILD 203440 2014-01-10 21:09:04Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=clutter-gst
-pkgver=2.0.8
+pkgver=2.0.10
 pkgrel=1
 pkgdesc="GStreamer bindings for clutter"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=(LGPL)
 depends=(clutter gst-plugins-base-libs libxdamage gst-plugins-bad)
 makedepends=(gobject-introspection)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('cee6b0667c74a54fdf43f0ec7c1dc8ff0ffd1c594e0d43529de45048f8080a4d')
+sha256sums=('f00cf492a6d4f1036c70d8a0ebd2f0f47586ea9a9b49b1ffda79c9dc7eadca00')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD
index c00e4ce07..4db8e7a84 100644
--- a/extra/clutter/PKGBUILD
+++ b/extra/clutter/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 199922 2013-11-19 00:45:36Z heftig $
+# $Id: PKGBUILD 204685 2014-01-24 23:21:57Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=clutter
-pkgver=1.16.2
+pkgver=1.16.4
 pkgrel=1
 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('LGPL')
 depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon' 'libevdev')
 makedepends=('gobject-introspection')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0cb7e88c80f43fc7fb869fc6d34c42e98aa1a0ef7aa02e6aeef1b099ad33df42')
+sha256sums=('cf50836ec5503577b73f75f984577610881b3e2ff7a327bb5b6918b431b51b65')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index ff739c5fa..53ed76bef 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 200685 2013-12-02 11:59:05Z svenstaro $
+# $Id: PKGBUILD 204853 2014-01-29 13:51:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
-pkgver=2.8.12.1
-pkgrel=3
+pkgver=2.8.12.2
+pkgrel=1
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cmake.org/"
@@ -15,7 +15,7 @@ optdepends=('qt4: cmake-gui')
 install="${pkgname}.install"
 source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
         "findfreetype.patch")
-md5sums=('9d38cd4e2c94c3cea97d0e2924814acc'
+md5sums=('17c6513483d23590cbce6957ec6d1e66'
          '90321de1d9d46cd8d6609d0509dbd7b0')
 
 build() {
diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD
index 97fc0cb5a..43a20322e 100644
--- a/extra/cogl/PKGBUILD
+++ b/extra/cogl/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 197898 2013-10-30 11:33:08Z allan $
+# $Id: PKGBUILD 204483 2014-01-20 20:35:39Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=cogl
-pkgver=1.16.0
-pkgrel=2
+pkgver=1.16.2
+pkgrel=1
 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
 arch=(mips64el)
 url="http://www.clutter-project.org/"
 license=('GPL2')
-depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango')
-makedepends=('mesa' 'gobject-introspection')
+depends=('mesa' 'libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango' 'libxrandr')
+makedepends=('gobject-introspection')
 options=(!emptydirs)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094')
+sha256sums=('65be91591546ef6fdfec93a71979b2b108eee25edbc20c53190caafc9a92d4e7')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD
index 13d84dd4f..12470c923 100644
--- a/extra/colord/PKGBUILD
+++ b/extra/colord/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 199996 2013-11-20 23:55:49Z heftig $
+# $Id: PKGBUILD 204982 2014-02-02 18:46:09Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=colord
-pkgver=1.0.4
+pkgver=1.0.6
 pkgrel=1
 pkgdesc="System daemon for managing color devices"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/software/colord"
 license=(GPL2)
-depends=(lcms2 libgusb polkit shared-color-profiles sqlite udev dconf dbus)
+depends=(lcms2 libgusb polkit shared-color-profiles sqlite systemd dconf dbus)
 makedepends=(intltool gobject-introspection vala docbook2x sane bash-completion)
 optdepends=('sane: UseSANE support [/etc/colord.conf]')
 install=colord.install
 backup=(etc/colord.conf)
-source=($url/releases/$pkgname-$pkgver.tar.xz
+source=($url/releases/$pkgname-$pkgver.tar.xz{,.asc}
         udev-systemd.patch)
-sha1sums=('85a08925690a33011cb3d032b0d20cd9ca86adb3'
+sha1sums=('b3ad9d1cd90ff0ea4d955b253dc0491d851c2778'
+          'SKIP'
           '3b467b9674f767c804943d191beaf6bd1ba3a606')
 
 prepare() {
diff --git a/extra/compface/PKGBUILD b/extra/compface/PKGBUILD
index 2381162a9..25683c856 100644
--- a/extra/compface/PKGBUILD
+++ b/extra/compface/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197085 2013-10-21 18:34:54Z andyrtr $
+# $Id: PKGBUILD 204047 2014-01-14 16:59:02Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: simo <simo@archlinux.org> 
 # Contributor: Manolis Tzanidakis
 
 pkgname=compface
 pkgver=1.5.2
-pkgrel=4
+pkgrel=6
 pkgdesc="Utils & libs to convert from/to X-Face format."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ftp.xemacs.org/pub/xemacs/aux/"
@@ -26,7 +26,7 @@ prepare() {
 build() {
   cd $pkgname-$pkgver
   CFLAGS="$CFLAGS -fPIC"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --mandir=/usr/share/man
   make
 }
 
diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD
index 5c8a528d5..77a2b3632 100644
--- a/extra/conky/PKGBUILD
+++ b/extra/conky/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 199065 2013-11-08 03:17:34Z bisson $
+# $Id: PKGBUILD 205494 2014-02-06 05:24:01Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: James Rayner <james@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=conky
 pkgver=1.9.0
-pkgrel=2
+pkgrel=4
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
 license=('BSD' 'GPL')
diff --git a/extra/cppunit/PKGBUILD b/extra/cppunit/PKGBUILD
index f2cce9c14..661cb84c1 100644
--- a/extra/cppunit/PKGBUILD
+++ b/extra/cppunit/PKGBUILD
@@ -1,32 +1,31 @@
-# $Id: PKGBUILD 197901 2013-10-30 11:34:14Z allan $
+# $Id: PKGBUILD 204848 2014-01-29 10:11:42Z andyrtr $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
 
 pkgname=cppunit
-pkgver=1.13.1
+pkgver=1.13.2
 pkgrel=1
-_hash=fa9aa839145cdf860bf596532bb8af97
 pkgdesc="A C++ unit testing framework"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/cppunit"
 license=('LGPL')
 depends=('sh' 'gcc-libs')
 options=('!emptydirs')
-source=(http://dev-www.libreoffice.org/src/${_hash}-${pkgname}-${pkgver}.tar.gz)
-md5sums=(${_hash})
+source=(http://dev-www.libreoffice.org/src/${pkgname}-${pkgver}.tar.gz)
+md5sums=('d1c6bdd5a76c66d2c38331e2d287bc01')
 
 build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+   cd ${pkgname}-${pkgver}
    ./configure --prefix=/usr --disable-static
    make
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
+  cd ${pkgname}-${pkgver}
+  make check
 }
 
 package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+   cd ${pkgname}-${pkgver}
    make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/crypto++/PKGBUILD b/extra/crypto++/PKGBUILD
index 7bcececdc..d838dbbc5 100644
--- a/extra/crypto++/PKGBUILD
+++ b/extra/crypto++/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179501 2013-03-05 17:32:57Z giovanni $
+# $Id: PKGBUILD 203063 2014-01-03 09:15:09Z bpiotrowski $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -8,7 +8,7 @@
 pkgname=crypto++
 pkgver=5.6.2
 _srcver=562
-pkgrel=1
+pkgrel=2
 pkgdesc="A free C++ class library of cryptographic schemes"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cryptopp.com/"
@@ -28,8 +28,6 @@ build() {
   # The upstream build system expects this file to be modified
   # to e.g. use system CFLAGS or use features of modern linkers.
   cp "${srcdir}/GNUmakefile.parabola" GNUmakefile
-  make -f GNUmakefile
-
   sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
   export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
   make -f GNUmakefile  
@@ -37,11 +35,8 @@ build() {
 }
 
 package() {
-  cd ${srcdir}
-
   install -d ${pkgdir}/usr/{lib/pkgconfig,include/cryptopp}
   install -m644 *.h ${pkgdir}/usr/include/cryptopp/
-  install -m644 libcryptopp.a "${pkgdir}/usr/lib/libcryptopp.a"
   install -m644 libcryptopp.so "${pkgdir}/usr/lib/libcryptopp.so"
   install -m644 ${srcdir}/libcrypto++.pc "${pkgdir}/usr/lib/pkgconfig/libcrypto++.pc"
   install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/extra/cscope/PKGBUILD b/extra/cscope/PKGBUILD
index 12f4c236b..8fac89cd3 100644
--- a/extra/cscope/PKGBUILD
+++ b/extra/cscope/PKGBUILD
@@ -1,11 +1,11 @@
+# Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Jason Chu <jason@archlinux.org>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=cscope
 pkgver=15.8.a
 _realver=15.8a
-pkgrel=1
+pkgrel=2
 pkgdesc="A developers tool for browsing program code"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cscope.sourceforge.net/"
@@ -33,4 +33,3 @@ package() {
 	install -Dm644 xcscope.el "${pkgdir}"/usr/share/emacs/site-lisp/xcscope.el
 	install -m755 cscope-indexer "${pkgdir}"/usr/bin
 }
-
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 60395b68d..92e111d3f 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 199750 2013-11-15 15:38:18Z andyrtr $
+# $Id: PKGBUILD 204552 2014-01-22 13:21:08Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=1.7.0
-pkgrel=2
+pkgver=1.7.1
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 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')
+makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'openssl'
+             'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus' 
+             'avahi'  'hicolor-icon-theme' 'systemd' 'inetutils' 'libpaper' 'valgrind')
 source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
         http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2
         cups.logrotate cups.pam
@@ -19,7 +20,6 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b
         cups-no-gzip-man.patch
         # FC
         cups-systemd-socket.patch
-        cups-dbus-utf8.patch
         cups-res_init.patch
         cups-avahi-address.patch
         cups-enum-all.patch
@@ -31,14 +31,13 @@ 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=('5ab496a2ce27017fcdb3d7ec4818a75a'
+md5sums=('55277c40fd4b7183dc3671d39c5c42b7'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17'
          '3ba9e3410df1dc3015463d615ef91b3b'
          'cc4101beccb5ed6deb1c92707a575925'
          '90c30380d4c8cd48a908cfdadae1ea24'
-         '555a1c71151ce990e176315b46e3de2f'
-         'a2a88b3a3257c3b5fd3edcc169e6aca4'
+         'be0ce5a9bcf5079af1a260fef395e146'
          '8fe27d4248cacbc02824e7937cab4088'
          'df0c367c0022e3c7d8e01827e8a6c5e7'
          'f30c2a161caaf27854581507cde8cac6'
@@ -69,9 +68,6 @@ prepare() {
 
   # various bugfixes (upstream reports/SVN or Fedora/Debian
 
-  # Ensure attributes are valid UTF-8 in dbus notifier
-  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
   # Applications could not get the PPD file for statically-configured IPP-shared print queues
@@ -112,9 +108,10 @@ build() {
      --enable-pam=yes \
      --enable-raw-printing \
      --enable-dbus --with-dbusdir=/etc/dbus-1 \
-     --enable-ssl=yes --enable-gnutls \
+     --enable-ssl=yes --enable-openssl \
      --enable-threads \
      --enable-avahi\
+     --enable-libpaper \
      --with-php=/usr/bin/php-cgi \
      --with-optim="$CFLAGS"
   make
@@ -122,15 +119,14 @@ build() {
 
 check() {
   cd ${pkgbase}-${pkgver}
-  #httpAddrGetList(workstation64): FAIL
-  #1 TESTS FAILED!
-  #make[1]: *** [testhttp] Error 1
+#./run-stp-tests.sh: line 782:  6307 Aborted                 (core dumped) $VALGRIND ../scheduler/cupsd -c /tmp/cups-$user/cupsd.conf -f > /tmp/cups-$user/log/debug_log 2>&1
+#FAIL: 87 error messages, expected 33.
   make -k check || /bin/true
 }
 
 package_libcups() {
 pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
+depends=('openssl' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
 backup=(etc/cups/client.conf)
 
   cd ${pkgbase}-${pkgver}
@@ -162,7 +158,8 @@ backup=(etc/cups/cupsd.conf
         etc/logrotate.d/cups
         etc/pam.d/cups
         etc/xinetd.d/cups-lpd)
-depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme')
+depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord'
+         'libusb' 'dbus' 'systemd' 'libpaper' 'hicolor-icon-theme')
 optdepends=('xdg-utils: xdg .desktop file support')
 
   cd ${pkgbase}-${pkgver}
diff --git a/extra/cups/cups-dbus-utf8.patch b/extra/cups/cups-dbus-utf8.patch
deleted file mode 100644
index 0bcd4a163..000000000
--- a/extra/cups/cups-dbus-utf8.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff -up cups-1.6.1/notifier/dbus.c.dbus-utf8 cups-1.6.1/notifier/dbus.c
---- cups-1.6.1/notifier/dbus.c.dbus-utf8	2012-01-20 19:00:32.000000000 +0000
-+++ cups-1.6.1/notifier/dbus.c	2012-10-31 11:04:47.686973616 +0000
-@@ -31,6 +31,9 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <assert.h>
-+#include <locale.h>
-+#include <wchar.h>
- 
- #ifdef HAVE_DBUS
- #  include <dbus/dbus.h>
-@@ -157,10 +160,82 @@ enum
-  * Local functions...
-  */
- 
--static int	acquire_lock(int *fd, char *lockfile, size_t locksize);
-+static int		acquire_lock(int *fd, char *lockfile, size_t locksize);
-+static const char	*validate_utf8(const char *str);
- 
- 
- /*
-+ * 'validate_utf8()' - Convert to valid UTF-8
-+ */
-+
-+static const char *
-+validate_utf8 (const char *str)
-+{
-+  static char *buffer = NULL;
-+  static size_t buflen = 0;
-+  char *p;
-+  size_t str_len;
-+  unsigned int i;
-+  mbstate_t instate, outstate;
-+
-+  if (str == NULL)
-+  {
-+    free (buffer);
-+    return (NULL);
-+  }
-+
-+  /* Is it already valid? */
-+  if (mbstowcs (NULL, str, 0) != (size_t) -1)
-+    return str;
-+
-+  /* Make sure our buffer is at least as large as the input string */
-+  str_len = strlen (str);
-+  if (str_len > buflen)
-+  {
-+    if (buffer == NULL)
-+      /* Set encoding type to UTF-8 the first time we need to */
-+      setlocale (LC_CTYPE, "en_US.UTF-8");
-+
-+    buflen = str_len + 1;
-+    buffer = realloc (buffer, buflen);
-+  }
-+
-+  memset (&instate, '\0', sizeof (mbstate_t));
-+  memset (&outstate, '\0', sizeof (mbstate_t));
-+  p = buffer;
-+  i = 0;
-+  while (i < str_len)
-+  {
-+    wchar_t wc;
-+    size_t used, written;
-+    mbstate_t orig_instate = instate;
-+    used = mbrtowc (&wc, str + i, str_len - i, &instate);
-+    switch (used)
-+    {
-+    case (size_t) -2:
-+    case (size_t) -1:
-+      wc = L'?'; /* so replacement is never longer than original char */
-+      instate = orig_instate;
-+      /* fallthru */
-+    case 0:
-+      used = 1;
-+    }
-+
-+    written = wcrtomb (p, wc, &outstate);
-+    if (written != -1)
-+    {
-+      p += written;
-+      assert (p - buffer < buflen);
-+    }
-+
-+    i += used;
-+  }
-+
-+  *p = '\0';
-+  return buffer;
-+}
-+
-+/*
-  * 'main()' - Read events and send DBUS notifications.
-  */
- 
-@@ -366,7 +441,7 @@ main(int  argc,				/* I - Number of comm
-     attr = ippFindAttribute(msg, "notify-text", IPP_TAG_TEXT);
-     if (attr)
-     {
--      const char *val = ippGetString(attr, 0, NULL);
-+      const char *val = validate_utf8 (ippGetString(attr, 0, NULL));
-       if (!dbus_message_iter_append_string(&iter, &val))
-         goto bail;
-     }
diff --git a/extra/cups/cups-systemd-socket.patch b/extra/cups/cups-systemd-socket.patch
index cfbe93354..4c3de1188 100644
--- a/extra/cups/cups-systemd-socket.patch
+++ b/extra/cups/cups-systemd-socket.patch
@@ -117,12 +117,13 @@ diff -up cups-1.7rc1/data/cups.service.in.systemd-socket cups-1.7rc1/data/cups.s
 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 @@
+@@ -0,0 +1,9 @@
 +[Unit]
 +Description=CUPS Printing Service Sockets
 +
 +[Socket]
 +ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
++ListenStream=@DEFAULT_IPP_PORT@
 +
 +[Install]
 +WantedBy=sockets.target
diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index a43d07e81..121c4d3f4 100644
--- a/extra/cyrus-sasl/PKGBUILD
+++ b/extra/cyrus-sasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197903 2013-10-30 11:35:00Z allan $
+# $Id: PKGBUILD 205606 2014-02-09 10:29:38Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 # This package spans multiple repositories. 
@@ -8,13 +8,13 @@ pkgbase=('cyrus-sasl')
 pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 #pkgname=libsasl
 pkgver=2.1.26
-pkgrel=6
+pkgrel=7
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
 options=('!makeflags')
-makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite2')
+makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite')
 source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
         cyrus-sasl-2.1.22-qa.patch
         cyrus-sasl-2.1.26-size_t.patch
@@ -26,7 +26,8 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
         saslauthd.service
         saslauthd.conf.d
         tmpfiles.conf
-        CVE-2013-4122.patch)
+        CVE-2013-4122.patch
+        cyrus-sasl-sql.patch)
 md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '79b8a5e8689989e2afd4b7bda595a7b1'
          'f45aa8c42b32e0569ab3d14a83485b37'
@@ -38,7 +39,8 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '3499dcd610ad1ad58e0faffde2aa7a23'
          '49219af5641150edec288a3fdb65e7c1'
          '45bb0192d2f188066240b9a66ee6365f'
-         'c5f0ec88c584a75c14d7f402eaeed7ef')
+         'c5f0ec88c584a75c14d7f402eaeed7ef'
+         '82c0f66fdc5c1145eb48ea9116c27931')
 
 prepare() {
   cd cyrus-sasl-$pkgver
@@ -50,6 +52,7 @@ prepare() {
   patch -Np1 -i ../0026_drop_krb5support_dependency.patch
   patch -Np1 -i ../0030-dont_use_la_files_for_opening_plugins.patch
   patch -Np1 -i ../CVE-2013-4122.patch
+  patch -Np0 -i ../cyrus-sasl-sql.patch
 
   sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
 }
@@ -102,11 +105,15 @@ build() {
       --enable-ntlm \
       --disable-passdss \
       --enable-sql \
+      --with-mysql \
+      --with-pgsql=/usr/lib \
+      --with-sqlite3=/usr/lib \
       --enable-ldapdb \
       --disable-macos-framework \
       --with-pam \
       --with-saslauthd=/var/run/saslauthd \
       --with-ldap \
+      --with-dblib=gdbm \
       --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
       --sysconfdir=/etc \
       --with-devrandom=/dev/urandom
@@ -176,7 +183,7 @@ package_cyrus-sasl-ldap() {
 
 package_cyrus-sasl-sql() {
   pkgdesc="SQL auxprop module for Cyrus SASL"
-  depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2')
+  depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite')
   replaces=('cyrus-sasl-plugins')
 
   cd cyrus-sasl-$pkgver/plugins
diff --git a/extra/cyrus-sasl/cyrus-sasl-sql.patch b/extra/cyrus-sasl/cyrus-sasl-sql.patch
new file mode 100644
index 000000000..2dcdad822
--- /dev/null
+++ b/extra/cyrus-sasl/cyrus-sasl-sql.patch
@@ -0,0 +1,39 @@
+--- configure.in	2012-10-12 16:05:48.000000000 +0200
++++ configure.in	2013-05-11 18:48:59.021848013 +0200
+@@ -861,9 +860,9 @@
+     notfound) AC_WARN([SQLite Library not found]); true;;
+     *)
+      if test -d ${with_sqlite}/lib; then
+-         LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib"
++         LIB_SQLITE="-L${with_sqlite}/lib"
+      else
+-         LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
++         LIB_SQLITE="-L${with_sqlite}"
+      fi
+ 
+      LIB_SQLITE_DIR=$LIB_SQLITE
+@@ -913,9 +912,9 @@
+     notfound) AC_WARN([SQLite3 Library not found]); true;;
+     *)
+      if test -d ${with_sqlite3}/lib; then
+-         LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib"
++         LIB_SQLITE3="-L${with_sqlite3}/lib"
+      else
+-         LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
++         LIB_SQLITE3="-L${with_sqlite3}"
+      fi
+ 
+      LIB_SQLITE3_DIR=$LIB_SQLITE3
+--- configure.in
++++ configure.in
+@@ -674,7 +674,9 @@
+      LIB_PGSQL_DIR=$LIB_PGSQL
+      LIB_PGSQL="$LIB_PGSQL -lpq"
+ 
+-     if test -d ${with_pgsql}/include/pgsql; then
++     if test -d ${with_pgsql}/include/postgresql/pgsql; then
++         CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/postgresql/pgsql"
++     elif test -d ${with_pgsql}/include/pgsql; then
+          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/pgsql"
+      elif test -d ${with_pgsql}/pgsql/include; then
+          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/pgsql/include"
diff --git a/extra/davfs2/PKGBUILD b/extra/davfs2/PKGBUILD
index dca4adc8d..51394f622 100644
--- a/extra/davfs2/PKGBUILD
+++ b/extra/davfs2/PKGBUILD
@@ -1,16 +1,29 @@
-# $Id: PKGBUILD 187054 2013-06-03 11:16:20Z allan $
+# $Id: PKGBUILD 203671 2014-01-13 22:05:39Z thomas $
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 pkgname=davfs2
 pkgver=1.4.7
-pkgrel=2
+pkgrel=3
 pkgdesc="File system driver that allows you to mount a WebDAV folder"
 arch=(i686 x86_64 'mips64el')
 url="http://savannah.nongnu.org/projects/davfs2"
 license=('GPL')
 depends=('neon')
 backup=(etc/davfs2/davfs2.conf etc/davfs2/secrets)
-source=(http://mirrors.zerg.biz/nongnu/davfs2/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('50c0ee2a12e8d09fc6a852d32bdfebb1f784939433a85f05254bc7ef28cff044')
+source=(http://mirrors.zerg.biz/nongnu/davfs2/${pkgname}-${pkgver}.tar.gz
+        davfs2-1.4.7-system.diff
+        davfs2-1.4.7-fix-neon-version-check.patch)
+sha256sums=('50c0ee2a12e8d09fc6a852d32bdfebb1f784939433a85f05254bc7ef28cff044'
+            '1d7e921da5edf07bddbd2bfbbf5010a690b4d47166a86ab5abaa6de4dc82125e'
+            'd637ccfcac85bf642083525018ca6799754b3728766483a616de27213318c1a1')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}"/davfs2-1.4.7-system.diff
+  # Some autotools files are missing, so autoreconf fails!
+  # Running autoconf may fail here, it does work for now
+  patch -p1 -i "${srcdir}"/davfs2-1.4.7-fix-neon-version-check.patch
+  autoconf  
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -22,6 +35,7 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
-  rm -rf ${pkgdir}/sbin
+  # This directory contains worthless symlinks
+  rm -r ${pkgdir}/sbin
   rm -f ${pkgdir}/usr/share/davfs2/{BUGS,COPYING,FAQ,NEWS,TODO,ChangeLog,GPL,README,THANKS}
 }
diff --git a/extra/davfs2/davfs2-1.4.7-fix-neon-version-check.patch b/extra/davfs2/davfs2-1.4.7-fix-neon-version-check.patch
new file mode 100644
index 000000000..25b5cb6c4
--- /dev/null
+++ b/extra/davfs2/davfs2-1.4.7-fix-neon-version-check.patch
@@ -0,0 +1,12 @@
+diff -Nur davfs2-1.4.7.orig/configure.ac davfs2-1.4.7/configure.ac
+--- davfs2-1.4.7.orig/configure.ac	2012-07-19 13:38:47.000000000 +0200
++++ davfs2-1.4.7/configure.ac	2014-01-13 23:00:15.021471570 +0100
+@@ -36,7 +36,7 @@
+ # Checks for libraries.
+ AM_GNU_GETTEXT_VERSION(0.14.4)
+ AM_GNU_GETTEXT([external])
+-NE_REQUIRE_VERSIONS([0], [25 26 27 28 29])
++NE_REQUIRE_VERSIONS([0], [25 26 27 28 29 30])
+ DAV_CHECK_NEON
+ 
+ # Checks for header files.
diff --git a/extra/davfs2/davfs2-1.4.7-system.diff b/extra/davfs2/davfs2-1.4.7-system.diff
new file mode 100644
index 000000000..d0d62fc59
--- /dev/null
+++ b/extra/davfs2/davfs2-1.4.7-system.diff
@@ -0,0 +1,150 @@
+diff -ur davfs2-1.4.7/ChangeLog davfs2-1.4.7.new/ChangeLog
+--- davfs2-1.4.7/ChangeLog	2012-07-19 13:37:52.000000000 +0200
++++ davfs2-1.4.7.new/ChangeLog	2013-09-15 10:19:12.000000000 +0200
+@@ -1,6 +1,11 @@
+ ChangeLog for davfs2
+ --------------------
+ 
++2013-09-08 Werner Baumann (werner.baumann@onlinehome.de)
++    * kernel_interface.c, mount_davfs.c:
++      Don't create /dev/coda and /dev/fuse.
++      Remove insecure calls of system().
++
+ 2012-07-19 Werner Baumann (werner.baumann@onlinehome.de)
+     * Release version 1.4.7.
+ 
+diff -ur davfs2-1.4.7/src/kernel_interface.c davfs2-1.4.7.new/src/kernel_interface.c
+--- davfs2-1.4.7/src/kernel_interface.c	2012-07-19 12:58:48.000000000 +0200
++++ davfs2-1.4.7.new/src/kernel_interface.c	2013-09-15 10:15:07.000000000 +0200
+@@ -167,29 +167,6 @@
+         ++minor;
+     }
+ 
+-    if (*dev <= 0 && system("/sbin/modprobe coda &>/dev/null") == 0) {
+-        minor = 0;
+-        while (*dev <= 0 && minor < MAX_CODADEVS) {
+-            char *path;
+-            if (asprintf(&path, "%s/%s%i",
+-                         DAV_DEV_DIR, CODA_DEV_NAME, minor) < 0)
+-                abort();
+-            *dev = open(path, O_RDWR | O_NONBLOCK);
+-            if (*dev <= 0) {
+-                if (mknod(path, S_IFCHR, makedev(CODA_MAJOR, minor)) == 0) {
+-                    if (chown(path, 0, 0) == 0
+-                            && chmod(path, S_IRUSR | S_IWUSR) == 0) {
+-                        *dev = open(path, O_RDWR | O_NONBLOCK);
+-                    } else {
+-                        remove(path);
+-                    }
+-                }
+-            }
+-            free(path);
+-            ++minor;
+-        }
+-    }
+-
+     if (*dev <= 0) {
+         error(0, 0, _("no free coda device to mount"));
+         return -1;
+@@ -225,20 +202,6 @@
+             abort();
+ 
+     *dev = open(path, O_RDWR | O_NONBLOCK);
+-    if (*dev <= 0 && system("/sbin/modprobe fuse &>/dev/null") == 0) {
+-        *dev = open(path, O_RDWR | O_NONBLOCK);
+-    }
+-    if (*dev <= 0) {
+-        if (mknod(path, S_IFCHR, makedev(FUSE_MAJOR, FUSE_MINOR)) == 0) {
+-             if (chown(path, 0, 0) == 0
+-                    && chmod(path, S_IRUSR | S_IWUSR) == 0) {
+-                *dev = open(path, O_RDWR | O_NONBLOCK);
+-            } else {
+-                remove(path);
+-            }
+-        }
+-    }
+-
+     free(path);
+     if (*dev <= 0) {
+         error(0, 0, _("can't open fuse device"));
+diff -ur davfs2-1.4.7/src/mount_davfs.c davfs2-1.4.7.new/src/mount_davfs.c
+--- davfs2-1.4.7/src/mount_davfs.c	2012-07-19 13:35:11.000000000 +0200
++++ davfs2-1.4.7.new/src/mount_davfs.c	2013-09-15 10:15:22.000000000 +0200
+@@ -170,6 +170,9 @@
+ static int
+ arg_to_int(const char *arg, int base, const char *opt);
+ 
++static void
++cp_file(const char *src, const char *dest);
++
+ static int
+ debug_opts(const char *s);
+ 
+@@ -530,10 +533,7 @@
+             char *file_name = ne_concat(path, "/", DAV_CONFIG, NULL);
+             if (access(file_name, F_OK) != 0) {
+                 char *template = ne_concat(DAV_DATA_DIR, "/", DAV_CONFIG, NULL);
+-                char *command = ne_concat("cp ", template, " ", file_name,
+-                                          NULL);
+-                if (system(command) != 0);
+-                free(command);
++                cp_file(template, file_name);
+                 free(template);
+             }
+             free(file_name);
+@@ -542,11 +542,7 @@
+             if (access(file_name, F_OK) != 0) {
+                 char *template = ne_concat(DAV_DATA_DIR, "/", DAV_SECRETS,
+                                            NULL);
+-                char *command = ne_concat("cp ", template, " ", file_name,
+-                                          NULL);
+-                if (system(command) == 0)
+-                    chmod(file_name, S_IRUSR | S_IWUSR);
+-                free(command);
++                cp_file(template, file_name);
+                 free(template);
+             }
+             free(file_name);
+@@ -1304,6 +1300,7 @@
+    opt    : name of the option, arg belongs to. Used in the error message.
+    return value: the value of the integer number in arg */
+ static int
++
+ arg_to_int(const char *arg, int base, const char *opt)
+ {
+     char *tail = NULL;
+@@ -1325,6 +1322,34 @@
+ }
+ 
+ 
++/* Creates a copy of src with name dest. */
++static void
++cp_file(const char *src, const char *dest)
++{
++    FILE *in = fopen(src, "r");
++    if (!in)
++        error(EXIT_FAILURE, errno, _("can't open file %s"), src);
++
++    FILE *out = fopen(dest, "w");
++    if (!out)
++        error(EXIT_FAILURE, errno, _("can't open file %s"), dest);
++
++    size_t n = 0;
++    char *line = NULL;
++    int length = getline(&line, &n, in);
++    while (length > 0) {
++        if (fputs(line, out) == EOF) 
++            error(EXIT_FAILURE, errno, _("error writing to file %s"), dest);
++        length = getline(&line, &n, in);
++    }
++
++    if (line)
++        free(line);
++    fclose(out);
++    fclose(in);
++}
++
++
+ /* Converts a debug option string s into numerical value. If s is not a
+    valid debug option, it returns 0. */
+ static int
diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD
index a9cc0efe1..a37f00dbe 100644
--- a/extra/dbus-python/PKGBUILD
+++ b/extra/dbus-python/PKGBUILD
@@ -1,27 +1,31 @@
-# $Id: PKGBUILD 197906 2013-10-30 11:36:04Z allan $
+# $Id: PKGBUILD 204499 2014-01-21 10:11:01Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=dbus-python
 pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common')
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Python bindings for DBUS"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 url="http://www.freedesktop.org/wiki/Software/DBusBindings"
 makedepends=('docutils' 'dbus-glib' 'python' 'python2')
-source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz)
-md5sums=('b09cd2d1a057cc432ce944de3fc06bf7')
+source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz{,.asc})
+md5sums=('b09cd2d1a057cc432ce944de3fc06bf7'
+         'SKIP')
 
-build() {
-  cd "${srcdir}"
+prepare() {
   mkdir build-python2 build-python3
-  cd "${srcdir}/build-python2"
+  cd $pkgbase-$pkgver
+  autoreconf -fi
+}
+
+build() {
+  cd build-python2
   PYTHON=python2 ../${pkgbase}-${pkgver}/configure --prefix=/usr
   make
 
-
-  cd "${srcdir}/build-python3"
+  cd ../build-python3
   ../${pkgbase}-${pkgver}/configure --prefix=/usr
   make
 }
@@ -30,7 +34,7 @@ package_python-dbus-common() {
   pkgdesc="Common dbus-python files shared between python-dbus and python2-dbus"
   conflicts=('dbus-python<1.1.0')
 
-  cd "${srcdir}/build-python3"
+  cd build-python3
   make DESTDIR="${pkgdir}" install-data
   rm -rf "${pkgdir}"/usr/lib/python*
 }
@@ -40,7 +44,7 @@ package_python-dbus() {
   optdepends=('dbus-glib: glib mainloop support')
   pkgdesc="Python 3.3 bindings for DBUS"
 
-  cd "${srcdir}/build-python3"
+  cd build-python3
   make DESTDIR="${pkgdir}" install
 
   rm -rf "${pkgdir}/usr/share"
@@ -56,7 +60,7 @@ package_python2-dbus() {
   conflicts=('dbus-python')
   provides=("dbus-python=$pkgver")
 
-  cd "${srcdir}/build-python2"
+  cd build-python2
   make DESTDIR="${pkgdir}" install
 
   rm -rf "${pkgdir}/usr/share"
diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD
index 5ae6a42c6..cd40f8804 100644
--- a/extra/dhcp/PKGBUILD
+++ b/extra/dhcp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187056 2013-06-03 11:16:27Z allan $
+# $Id: PKGBUILD 203066 2014-01-03 09:19:21Z bpiotrowski $
 # Maintainer: Daniel Isenmann <daniel @archlinux.org>
 
 pkgbase=dhcp
@@ -7,7 +7,7 @@ pkgname=('dhcp' 'dhclient')
 # separate patch levels with a period to maintain proper versioning.
 pkgver=4.2.5.p1
 _pkgver=4.2.5-P1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
diff --git a/extra/di/PKGBUILD b/extra/di/PKGBUILD
index 0b825d9cf..39cd06a00 100644
--- a/extra/di/PKGBUILD
+++ b/extra/di/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 175744 2013-01-21 05:50:00Z eric $
+# $Id: PKGBUILD 206035 2014-02-16 04:07:15Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=di
-pkgver=4.34
+pkgver=4.35
 pkgrel=1
 pkgdesc="A disk information utility, displaying everything (and more) that your df command does"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,17 +10,15 @@ url="http://www.gentoo.com/di/"
 license=('ZLIB')
 depends=('glibc')
 source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('5be548368bb795303f11cff340f3bbc659f892cd')
+sha1sums=('989b03afb0bc40d4dbdcc8e2b6889cf2cf8e2852')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|error|//error|' C/di.h
-  sed -i '11i\#include <string.h>' C/di.h
+  cd ${pkgname}-${pkgver}
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make INSTALL_DIR="${pkgdir}/usr" install
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index d34f40f4a..13a5fbb5d 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202656 2013-12-23 16:27:53Z ronald $
+# $Id: PKGBUILD 204523 2014-01-22 01:48:54Z eric $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,7 +6,7 @@
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
 pkgver=3.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 646025838..0fc89b22d 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202249 2013-12-20 22:01:34Z andyrtr $
+# $Id: PKGBUILD 205903 2014-02-13 16:52:18Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
@@ -8,7 +8,7 @@
 # --->>> remember to rebuild/bump pigeonhole in one step <<<---
 
 pkgname=dovecot
-pkgver=2.2.10
+pkgver=2.2.11
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64' 'mips64el')
@@ -23,17 +23,25 @@ optdepends=('libldap: ldap plugin'
 provides=('imap-server' 'pop3-server')
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig}
-        dovecot.tmpfilesd)
-md5sums=('037e9c9e07d9dbff54dcff09f280fc8c'
+        dovecot.tmpfilesd
+        pop3_Access_sequence_numbers_correctly.diff)
+md5sums=('d53d207727df99e4362a3787223c6fa3'
          'SKIP'
-         '342a28251d40f983c98c0d1f1bf3d07d')
+         '342a28251d40f983c98c0d1f1bf3d07d'
+         'c8096d3966651222accd7f6bc678d08d')
 
-build() {
+prepare() {
   cd $pkgname-$pkgver
-  
+
   # fix path in helper script
   sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh
 
+  # post release segfault fix
+  patch -Np1 -i ${srcdir}/pop3_Access_sequence_numbers_correctly.diff
+}
+
+build() {
+  cd $pkgname-$pkgver
   # configure with openssl, mysql, and postgresql support
   ./configure --prefix=/usr --sysconfdir=/etc \
     --sbindir=/usr/bin \
@@ -61,7 +69,7 @@ build() {
 
 check() {
   cd $pkgname-$pkgver
-  make -k check
+  make
 }
 
 package() {
diff --git a/extra/dovecot/pop3_Access_sequence_numbers_correctly.diff b/extra/dovecot/pop3_Access_sequence_numbers_correctly.diff
new file mode 100644
index 000000000..d415a0eff
--- /dev/null
+++ b/extra/dovecot/pop3_Access_sequence_numbers_correctly.diff
@@ -0,0 +1,36 @@
+
+diff -r 59decc957b39 -r d20059f7d3a1 src/pop3/pop3-commands.c
+--- a/src/pop3/pop3-commands.c	Fri Feb 07 15:03:33 2014 -0500
++++ b/src/pop3/pop3-commands.c	Thu Feb 13 05:33:13 2014 +0200
+@@ -253,7 +253,7 @@
+ 		for (msgnum = 0; msgnum < client->messages_count; msgnum++) {
+ 			bit = 1 << (msgnum % CHAR_BIT);
+ 			if ((client->deleted_bitmask[msgnum / CHAR_BIT] & bit) != 0)
+-				seq_range_array_add(&deleted_msgs, client->msgnum_to_seq_map[msgnum]);
++				seq_range_array_add(&deleted_msgs, msgnum_to_seq(client, msgnum));
+ 		}
+ 	}
+ 	t_array_init(&seen_msgs, 8);
+@@ -261,7 +261,7 @@
+ 		for (msgnum = 0; msgnum < client->messages_count; msgnum++) {
+ 			bit = 1 << (msgnum % CHAR_BIT);
+ 			if ((client->seen_bitmask[msgnum / CHAR_BIT] & bit) != 0)
+-				seq_range_array_add(&seen_msgs, client->msgnum_to_seq_map[msgnum]);
++				seq_range_array_add(&seen_msgs, msgnum_to_seq(client, msgnum));
+ 		}
+ 	}
+ 
+@@ -826,7 +826,7 @@
+ 				      client->messages_count+1);
+ 	for (msgnum = 0; msgnum < client->messages_count; msgnum++) {
+ 		client->message_uidls[msgnum] =
+-			seq_uidls[client->msgnum_to_seq_map[msgnum]];
++			seq_uidls[msgnum_to_seq(client, msgnum)];
+ 	}
+ 	i_free(seq_uidls);
+ }
+
+
+
+
+
diff --git a/extra/dssi/PKGBUILD b/extra/dssi/PKGBUILD
index c67d67d7a..60f6dcd52 100644
--- a/extra/dssi/PKGBUILD
+++ b/extra/dssi/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 197528 2013-10-26 14:48:17Z schiv $
+# $Id: PKGBUILD 205865 2014-02-12 07:12:16Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Pajaro
 
 pkgname=dssi
 pkgver=1.1.1
-pkgrel=5
+pkgrel=7
 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>=1:0.26' 'liblo<1:0.27' 'jack')
+depends=('liblo>=0.28' 'jack')
 makedepends=('ladspa' 'qt4')
 optdepends=('qt4: example plugins')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD
index 13143c008..a07bd4a50 100644
--- a/extra/dvdauthor/PKGBUILD
+++ b/extra/dvdauthor/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192473 2013-08-12 20:25:40Z eric $
+# $Id: PKGBUILD 204520 2014-01-22 01:48:50Z eric $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Travis Willard <travisw@wmpub.ca>
 # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
@@ -6,7 +6,7 @@
 
 pkgname=dvdauthor
 pkgver=0.7.1
-pkgrel=6
+pkgrel=7
 pkgdesc="DVD authoring tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dvdauthor.sourceforge.net/"
diff --git a/extra/e_dbus/PKGBUILD b/extra/e_dbus/PKGBUILD
index e61160868..3c1d615fc 100644
--- a/extra/e_dbus/PKGBUILD
+++ b/extra/e_dbus/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 199736 2013-11-15 12:16:22Z ronald $
+# $Id: PKGBUILD 204350 2014-01-17 13:56:52Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=e_dbus
 pkgver=1.7.9
-pkgrel=1
+pkgrel=2
 pkgdesc="D-Bus integration with Ecore"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD')
-depends=('ecore' 'dbus-core')
+depends=('efl' 'dbus-core')
 options=('!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
 sha1sums=('d1c30cf95cf6eea07c5be54bd8cfbf7eba9fb20b')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+  export CFLAGS="${CFLAGS} -fvisibility=hidden"
 
   ./configure \
     --prefix=/usr \
@@ -42,12 +40,12 @@ build() {
 }
 
 package(){
-  cd $srcdir/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR=$pkgdir install
+  make DESTDIR="${pkgdir}" install
 
   # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/COPYING" \
+        "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
 
diff --git a/extra/easytag/PKGBUILD b/extra/easytag/PKGBUILD
index bef1e4ae1..d329ca076 100644
--- a/extra/easytag/PKGBUILD
+++ b/extra/easytag/PKGBUILD
@@ -1,37 +1,25 @@
-# $Id: PKGBUILD 178421 2013-02-21 20:49:20Z guillaume $
+# $Id: PKGBUILD 203446 2014-01-10 22:37:23Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=easytag
-pkgver=2.1.8
-pkgrel=2
+pkgver=2.1.9
+pkgrel=1
 pkgdesc='Utility for viewing and editing tags for most audio formats'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://easytag.sourceforge.net/'
-makedepends=('intltool')
+makedepends=('intltool' 'itstool')
 depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'speex' 'wavpack' 'taglib'
          'desktop-file-utils' 'hicolor-icon-theme')
 install=${pkgname}.install
-source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz
-        easytag-2.1.8-fix_mixed_declarations_and_code.patch
-        easytag-2.1.8-fix_mime_directory_association.patch)
-sha256sums=('1a2f75c9a70aeb7a404dfaa96e0df0eaaa325df301c58f0f708d0da4c08e65a9'
-            '453d2a102cf482d6d1586b11e531bf267f302aab3ee6b8c43b6bcc61cfa2ede5'
-            '693da67f0c96d51ad363bb9e70a22b402bc7c5058d648981919a115381700cd3')
+source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('f5a6e742a458ef6f48f2d5e98a24182a9c87a213e847fcce75c757ac90273501')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Already fixed upstream
-  # http://git.gnome.org/browse/easytag/commit/src/wavpack_tag.c?id=17a33964c32035f6b9986e13726ae3582a126244
-  patch -p0 -i ${srcdir}/easytag-2.1.8-fix_mixed_declarations_and_code.patch
-
-  # Bad Easytag! Bad! You don't know your place!
-  patch -p0 -i ${srcdir}/easytag-2.1.8-fix_mime_directory_association.patch
-
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/ecl/PKGBUILD b/extra/ecl/PKGBUILD
index 263e734cf..3a5f96811 100644
--- a/extra/ecl/PKGBUILD
+++ b/extra/ecl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192491 2013-08-13 08:44:20Z juergen $
+# $Id: PKGBUILD 203068 2014-01-03 09:30:10Z bpiotrowski $
 # Contributor: John Proctor <jproctor@prium.net>
 # Maintainer: juergen <juergen@archlinux.org>
 
 pkgname=ecl
 pkgver=13.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Embeddable Common Lisp"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/ecls/"
diff --git a/extra/ecore/PKGBUILD b/extra/ecore/PKGBUILD
deleted file mode 100644
index ddca9887f..000000000
--- a/extra/ecore/PKGBUILD
+++ /dev/null
@@ -1,97 +0,0 @@
-# $Id: PKGBUILD 199728 2013-11-15 12:13:56Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
-
-pkgname=ecore
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="OS abstraction layer for e17"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('eina' 'evas' 'glib2' 'libxp' 'curl' 'libxss' 'libxtst'
-  'libxcomposite' 'libxrandr' 'libxinerama' 'libxcursor')
-makedepends=('subversion')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('c4343110508dc9dd1580f3349dbc1d4de2088f3d')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/ecore \
-    --with-internal-maximum-log-level=3 \
-    --disable-static \
-    --disable-ecore-timer-dump \
-    --enable-glib \
-    --enable-ecore-x-composite \
-    --enable-ecore-x-damage \
-    --enable-ecore-x-dpms \
-    --enable-ecore-x-randr \
-    --enable-ecore-x-render \
-    --enable-ecore-x-screensaver \
-    --enable-ecore-x-shape \
-    --enable-ecore-x-gesture \
-    --enable-ecore-x-sync \
-    --enable-ecore-x-xfixes \
-    --enable-ecore-x-xinerama \
-    --enable-ecore-x-xprint \
-    --enable-ecore-x-xtest \
-    --enable-ecore-x-cursor \
-    --enable-ecore-x-input \
-    --enable-ecore-x-dri \
-    --enable-epoll \
-    --enable-posix-threads \
-    --disable-debug-threads \
-    --enable-atfile-source \
-    --enable-ecore-con \
-    --enable-curl \
-    --disable-gnutls \
-    --enable-openssl \
-    --enable-ecore-ipc \
-    --enable-ecore-file \
-    --enable-poll \
-    --enable-inotify \
-    --enable-ecore-imf \
-    --enable-ecore-imf-evas \
-    --enable-ecore-input \
-    --enable-ecore-input-evas \
-    --enable-ecore-imf-xim \
-    --disable-ecore-imf-scim \
-    --disable-ecore-imf-ibus \
-    --enable-ecore-x \
-    --disable-ecore-sdl \
-    --enable-ecore-fb \
-    --disable-ecore-directfb \
-    --enable-ecore-evas \
-    --enable-ecore-evas-software-buffer \
-    --enable-ecore-evas-software-x11 \
-    --enable-ecore-evas-opengl-x11 \
-    --enable-ecore-evas-fb \
-    --disable-ecore-evas-ews \
-    --disable-ecore-wayland \
-    --disable-tests \
-    --disable-coverage \
-    --disable-install-examples \
-    --disable-doc
-
-#    --enable-thread-safety # e17 starts with a non-functioning black window if enabled
-
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-# install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD
deleted file mode 100644
index be1999263..000000000
--- a/extra/edje/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 199732 2013-11-15 12:15:08Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
-
-pkgname=edje
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="A graphical design and layout library based on Evas"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('eina' 'ecore' 'evas' 'eio' 'lua' 'shared-mime-info' 'embryo')
-optdepends=('python2: inkscape2edc')
-install=edje.install
-options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('fe5fa239d75e96c7e02c58abb75776a54817654d')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  # python2 fix
-  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' utils/inkscape2edc
-
-  ./configure \
-    --prefix=/usr \
-    --disable-static \
-    --disable-sndfile \
-    --disable-remix \
-    --disable-vorbisenc \
-    --disable-alsa \
-    --disable-flac \
-    --disable-tests \
-    --disable-coverage \
-    --enable-amalgamation \
-    --disable-doc
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-  # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
diff --git a/extra/edje/changeset_76449.diff b/extra/edje/changeset_76449.diff
deleted file mode 100644
index 1a1406b4e..000000000
--- a/extra/edje/changeset_76449.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: /trunk/edje/src/bin/edje_cc_out.c

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

---- /trunk/edje/src/bin/edje_cc_out.c	(revision 76448)

-+++ /trunk/edje/src/bin/edje_cc_out.c	(revision 76449)

-@@ -1882,25 +1882,30 @@

-              for (i = 0 ; i < pc->programs.fnmatch_count ; i++)

-                {

--                  if (!strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name))

-+                  if (pl->u.ep->name && pc->programs.fnmatch[i]->name &&

-+                      !strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name))

-                     data_queue_anonymous_lookup(pc, pc->programs.fnmatch[i], dest);

-                }

-              for (i = 0 ; i < pc->programs.strcmp_count ; i++)

-                {

--                  if (!strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name))

-+                  if (pl->u.ep->name && pc->programs.strcmp[i]->name &&

-+                      !strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name))

-                     data_queue_anonymous_lookup(pc, pc->programs.strcmp[i], dest);

-                }

-              for (i = 0 ; i < pc->programs.strncmp_count ; i++)

-                {

--                  if (!strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name))

-+                  if (pl->u.ep->name && pc->programs.strncmp[i]->name &&

-+                      !strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name))

-                     data_queue_anonymous_lookup(pc, pc->programs.strncmp[i], dest);

-                }

-              for (i = 0 ; i < pc->programs.strrncmp_count ; i++)

-                {

--                  if (!strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name))

-+                  if (pl->u.ep->name && pc->programs.strrncmp[i]->name &&

-+                      !strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name))

-                     data_queue_anonymous_lookup(pc, pc->programs.strrncmp[i], dest);

-                }

-              for (i = 0 ; i < pc->programs.nocmp_count ; i++)

-                {

--                  if (!strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name))

-+                  if (pl->u.ep->name && pc->programs.nocmp[i]->name &&

-+                      !strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name))

-                     data_queue_anonymous_lookup(pc, pc->programs.nocmp[i], dest);

-                }

-@@ -2450,4 +2455,5 @@

- {

-    Code_Lookup *cl;

-+

-    cl = mem_alloc(SZ(Code_Lookup));

-    cl->ptr = ptr;

diff --git a/extra/eet/PKGBUILD b/extra/eet/PKGBUILD
deleted file mode 100644
index 5ac190ba2..000000000
--- a/extra/eet/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 199725 2013-11-15 12:12:55Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=eet
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="A data storage and compression library"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('libjpeg>=7' 'openssl' 'eina')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('843eb9733f6c01442b9c1379e9a48b69bfd5081f')
-
-build() {
-   cd $srcdir/$pkgname-$pkgver
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure --prefix=/usr --enable-openssl --disable-gnutls \
-	--disable-build-examples \
-	--disable-doc --disable-install-examples \
-	--disable-old-eet-file-format --disable-tests \
-	--disable-static
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install 
-
-  # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
-
diff --git a/extra/eeze/PKGBUILD b/extra/eeze/PKGBUILD
deleted file mode 100644
index 84a4b1c3f..000000000
--- a/extra/eeze/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 199730 2013-11-15 12:14:34Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
-
-pkgname=eeze
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="Manipulate devices using udev and sysfs"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('ecore' 'eina' 'udev')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('6651d9b7723dda9dc00be093097a12a52764d431')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure \
-    --prefix=/usr \
-    --disable-static \
-    --disable-tests \
-    --disable-doc
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
diff --git a/extra/efl/PKGBUILD b/extra/efl/PKGBUILD
new file mode 100644
index 000000000..ad4ba444d
--- /dev/null
+++ b/extra/efl/PKGBUILD
@@ -0,0 +1,63 @@
+# $Id: PKGBUILD 205022 2014-02-03 10:02:52Z heftig $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Enlightenment Developers <enlightenment-devel@enlightenment.org>
+
+pkgbase=efl
+pkgname=('efl' 'efl-docs')
+pkgver=1.8.5
+pkgrel=2
+pkgdesc="Enlightenment Foundation Libraries"
+arch=('i686' 'x86_64')
+url="http://www.enlightenment.org"
+license=('BSD' 'LGPL2.1' 'GPL2' 'custom')
+depends=('bullet' 'libjpeg-turbo' 'gstreamer0.10-base-plugins'
+         'lua' 'curl' 'fribidi' 'libpulse' 'libxcomposite'
+         'libxinerama' 'libxrandr' 'libxss' 'python2'
+         'libxcursor' 'libxp' 'libwebp' 'shared-mime-info')
+makedepends=('doxygen')
+replaces=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo' 
+	'emotion' 'ethumb' 'evas')
+options=('!emptydirs')
+source=(http://download.enlightenment.org/rel/libs/${pkgname}/$pkgname-$pkgver.tar.gz)
+install=efl.install
+sha1sums=('6ab88b263f784f935310b1055d67578ae66e50df')
+
+prepare() {
+  sed -i 's/env python$/&2/' "${srcdir}/${pkgname}-${pkgver}/src/scripts/eina/eina-bench-cmp"
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  export CFLAGS="$CFLAGS -fvisibility=hidden"
+
+  ./configure --prefix=/usr \
+  --disable-static --disable-tslib --enable-fb \
+  --enable-xinput22 --enable-multisense --enable-systemd \
+  --enable-image-loader-webp --enable-harfbuzz 
+
+  make
+  make -j1 doc
+}
+
+package_efl(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -j1 DESTDIR=${pkgdir} install
+
+  # install non-standard license files
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.BSD" \
+	"${pkgdir}/usr/share/licenses/${pkgname}/COPYING.BSD"
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.SMALL" \
+	"${pkgdir}/usr/share/licenses/${pkgname}/COPYING.SMALL"
+}
+
+package_efl-docs() {
+  pkgdesc="Documentation for the Enlightenment Foundation Libraries"
+  depends=()
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  install -d "${pkgdir}/usr/share/doc/${pkgbase}"
+  cp -a doc/html "${pkgdir}/usr/share/doc/${pkgbase}/html"
+  cp -a doc/latex "${pkgdir}/usr/share/doc/${pkgbase}/latex"
+}
+
diff --git a/extra/edje/edje.install b/extra/efl/efl.install
index 8407f4576..8407f4576 100644
--- a/extra/edje/edje.install
+++ b/extra/efl/efl.install
diff --git a/extra/efreet/PKGBUILD b/extra/efreet/PKGBUILD
deleted file mode 100644
index 60e4167fc..000000000
--- a/extra/efreet/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 199735 2013-11-15 12:16:06Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
-
-pkgname=efreet
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="FreeDesktop.Org specifications for e17"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('eina' 'ecore' 'e_dbus')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('7f12f4c943b572b5470ce11aad2d5f4054b22dc7')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure \
-    --prefix=/usr \
-    --disable-static \
-    --disable-tests \
-    --disable-coverage \
-    --disable-doc
-
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
-
-
diff --git a/extra/eina/PKGBUILD b/extra/eina/PKGBUILD
deleted file mode 100644
index 324866a0c..000000000
--- a/extra/eina/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 199724 2013-11-15 12:12:34Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=eina
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="A core data structure and common utility library"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.enlightenment.org"
-license=('LGPL2.1')
-depends=('glibc')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('26f385e888b29876c8fb06f35f0433ab7e3251d5')
-
-build() {
-   cd $srcdir/$pkgname-$pkgver
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure --prefix=/usr --enable-amalgamation \
-	--with-internal-maximum-log-level=3 \
-	--disable-static \
-	--disable-benchmark \
-	--disable-install-examples \
-	--disable-build-examples \
-	--disable-doc \
-	--disable-tests \
-	--enable-default-mempool \
-	--enable-mempool-chained-pool \
-	--enable-mempool-pass-through \
-	--disable-mempool-buddy \
-	--disable-mempool-ememoa-fixed \
-	--disable-mempool-ememoa-unknown \
-	--disable-mempool-fixed-bitmap \
-	--disable-assert \
-	--disable-ememoa 
-
-#	--disable-mempool-one-big ## this option causes a segfault in 1.7.2
-
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
-
diff --git a/extra/eio/PKGBUILD b/extra/eio/PKGBUILD
deleted file mode 100644
index 7b243ee03..000000000
--- a/extra/eio/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 199729 2013-11-15 12:14:20Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
-
-pkgname=eio
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="Async IO library using Ecore"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('ecore')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('6a849c5da4b1213d018ca46dcea1130a135e99e6')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure \
-    --prefix=/usr \
-    --disable-static \
-    --enable-posix-threads \
-    --disable-debug-threads \
-    --enable-inotify \
-    --disable-install-examples \
-    --disable-doc
-  make
-}
-
-package(){
-  cd $pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-  	$pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD
index 520e98ab5..837f084c5 100644
--- a/extra/elementary/PKGBUILD
+++ b/extra/elementary/PKGBUILD
@@ -1,54 +1,50 @@
-# $Id: PKGBUILD 199737 2013-11-15 12:16:38Z ronald $
+# $Id: PKGBUILD 204916 2014-01-31 11:21:42Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
-pkgname=elementary
-pkgver=1.7.9
+pkgbase=elementary
+pkgname=('elementary' 'elementary-docs')
+pkgver=1.8.4
 pkgrel=1
 pkgdesc="Enlightenment's widget set"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD')
-depends=('edje' 'e_dbus' 'efreet' 'ethumb' 'eio')
+depends=('efl' 'evas_generic_loaders')
+makedepends=('doxygen' 'imagemagick')
 options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('4d68e4f77d6b3471a45a4e33ae3af18d0ca42ab1')
+source=(http://download.enlightenment.org/rel/libs/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('ceaae46c7b8e936e2e4cea9e9fe41fdcff6b45d8')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
+  export CFLAGS="$CFLAGS -fvisibility=hidden"
+	
   ./configure \
     --prefix=/usr \
-    --libexecdir=/usr/lib/elementary \
-    --with-internal-maximum-log-level=3 \
-    --disable-static \
-    --enable-quick-launch \
-    --enable-emotion \
-    --enable-ecore-x \
-    --enable-ecore-fb \
-    --disable-ecore-sdl \
-    --disable-ecore-wayland \
-    --enable-edbus \
-    --enable-efreet \
-    --disable-eweather \
-    --disable-emap \
-    --enable-ethumb \
-    --disable-debug \
-    --disable-install-examples \
-    --disable-doc
+    --disable-static
   make
+  make -j1 doc
 }
 
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+package_elementary(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install
 
   # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/COPYING" \
+        "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
 
+package_elementary-docs() {
+  pkgdesc="Documentation for Elementary GUI toolkit"
+  depends=()
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  install -d "${pkgdir}/usr/share/doc/${pkgbase}"
+  cp -a doc/html "${pkgdir}/usr/share/doc/${pkgbase}/html"
+  cp -a doc/latex "${pkgdir}/usr/share/doc/${pkgbase}/latex"
+}
+
+
diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD
index 9dbfe8f1c..d284e571b 100644
--- a/extra/elfutils/PKGBUILD
+++ b/extra/elfutils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198810 2013-11-05 15:59:03Z lcarlier $
+# $Id: PKGBUILD 205875 2014-02-12 08:00:43Z lcarlier $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu>
 
 pkgname=elfutils
-pkgver=0.157
+pkgver=0.158
 pkgrel=1
 pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,11 +13,18 @@ depends=('gcc-libs' 'zlib' 'bzip2' 'xz')
 provides=('libelf')
 replaces=('libelf')
 conflicts=('libelf')
-source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig})
+source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig}
+        fix-run-backtrace-native-core-test.patch)
 options=('staticlibs')
-sha1sums=('5e3767206c7f1b3bcfe33bce99fe09686ef165d2'
+sha1sums=('09adbbf0f3a35bb1bcb77c2eaa40de8d3443af4d'
           'SKIP')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  patch -Np1 -i ../fix-run-backtrace-native-core-test.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
 
@@ -40,3 +47,6 @@ package() {
   
   rm "${pkgdir}"/usr/lib/lib{asm,dw,elf}.a
 }
+sha1sums=('09adbbf0f3a35bb1bcb77c2eaa40de8d3443af4d'
+          'SKIP'
+          '8ecef640f3d1229cdf45ffda016a69848c18e61b')
diff --git a/extra/elfutils/fix-run-backtrace-native-core-test.patch b/extra/elfutils/fix-run-backtrace-native-core-test.patch
new file mode 100644
index 000000000..5088ea579
--- /dev/null
+++ b/extra/elfutils/fix-run-backtrace-native-core-test.patch
@@ -0,0 +1,43 @@
+From e922ec4e3bcd7c164a9ce424accac4394e7d5afd Mon Sep 17 00:00:00 2001
+From: Matthias Klose <doko@ubuntu.com>
+Date: Tue, 07 Jan 2014 09:25:29 +0000
+Subject: tests: backtrace-subr.sh (check_native_core) should check core file name.
+
+Needed when /proc/sys/kernel/core_uses_pid is set to 0. Try to rename
+the core file, and if it does still fail, skip the test.
+
+Signed-off-by: Mark Wielaard <mjw@redhat.com>
+---
+diff --git a/tests/ChangeLog b/tests/ChangeLog
+index 63b7bed..7e9dcf4 100644
+--- a/tests/ChangeLog
++++ b/tests/ChangeLog
+@@ -1,3 +1,9 @@
++2014-01-07  Matthias Klose <doko@ubuntu.com>
++
++	* backtrace-subr.sh (check_native_core): Check to see if core file
++	was created without ".PID" extension, if so mv core to core.PID.
++	Skip test if no core file was created or could be found.
++
+ 2014-01-04  Mark Wielaard  <mjw@redhat.com>
+ 
+ 	* backtrace-data.c (main): Don't assert if raise returns.
+diff --git a/tests/backtrace-subr.sh b/tests/backtrace-subr.sh
+index e7ece91..62b873c 100644
+--- a/tests/backtrace-subr.sh
++++ b/tests/backtrace-subr.sh
+@@ -111,6 +111,11 @@ check_native_core()
+ 
+   # Skip the test if we cannot adjust core ulimit.
+   core="core.`ulimit -c unlimited || exit 77; set +ex; testrun ${abs_builddir}/$child --gencore; true`"
++  # see if /proc/sys/kernel/core_uses_pid is set to 0
++  if [ -f core ]; then
++    mv core "$core"
++  fi
++  if [ ! -f "$core" ]; then exit 77; fi
+ 
+   if [ "x$SAVED_VALGRIND_CMD" != "x" ]; then
+     VALGRIND_CMD="$SAVED_VALGRIND_CMD"
+--
+cgit v0.9.2
+
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index 9092bf044..79a022d5f 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 192474 2013-08-12 20:25:41Z eric $
+# $Id: PKGBUILD 204839 2014-01-28 14:14:20Z juergen $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
 
 pkgname=emacs
 pkgver=24.3
-pkgrel=4
+pkgrel=6
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
-depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
+depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls')
 install=emacs.install
 source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}
         emacs-24.3-giflib5.patch)
diff --git a/extra/embryo/PKGBUILD b/extra/embryo/PKGBUILD
deleted file mode 100644
index 8f3ef843b..000000000
--- a/extra/embryo/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 199731 2013-11-15 12:14:50Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=embryo
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="implementation of a C like scripting language for e17"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('glibc' 'eina')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('1644da0be669213ce9ed29f1b58e9c6f3ab7c05c')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure --prefix=/usr \
-	--disable-static \
-	--disable-doc
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
diff --git a/extra/emotion/PKGBUILD b/extra/emotion/PKGBUILD
deleted file mode 100644
index 9b96fda7a..000000000
--- a/extra/emotion/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 199733 2013-11-15 12:15:33Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
-
-pkgname=emotion
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="Library to easily integrate media playback into EFL applications"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('gstreamer0.10' 'edje' 'eeze')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('c7817d6252ed90d06f9e4ef491f9399fb6213990')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure \
-    --prefix=/usr \
-    --disable-static \
-    --enable-generic \
-    --enable-gstreamer \
-    --disable-generic-vlc \
-    --disable-xine \
-    --disable-install-examples \
-    --disable-doc
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
diff --git a/extra/emotion_generic_players/PKGBUILD b/extra/emotion_generic_players/PKGBUILD
new file mode 100644
index 000000000..c0d7b6e2b
--- /dev/null
+++ b/extra/emotion_generic_players/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 204920 2014-01-31 11:38:05Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Enlightenment Developers <enlightenment-devel@enlightenment.org>
+
+pkgname=emotion_generic_players
+pkgver=1.8.1
+pkgrel=1
+pkgdesc="Enlightenment Foundation Libraries"
+arch=('i686' 'x86_64')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('efl' 'vlc')
+options=('!emptydirs')
+source=(http://download.enlightenment.org/rel/libs/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('4466aca9801cd2bf69dcc7509f5eb8504518e8ab')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  export CFLAGS="$CFLAGS -fvisibility=hidden"
+
+  ./configure \
+    --prefix=/usr
+  make
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install
+
+  # install license files
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/COPYING" \
+  	"${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
+
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index f89648cfd..e5cfc5b26 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 199330 2013-11-11 10:46:23Z jgc $
+# $Id: PKGBUILD 203294 2014-01-07 13:41:30Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=empathy
-pkgver=3.10.2
+pkgver=3.10.3
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ options=('!makeflags')
 groups=(gnome)
 install=empathy.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9d8e082a448f3e9450a31f0ec21f01e34cf1c15b192cfa30842d71537796cfbf')
+sha256sums=('49366acdd3c3ef9a74f63eb09920803c4c9df83056acbf8a7899e7890a9fb196')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD
index faa11c61d..3fda0cbbd 100644
--- a/extra/enblend-enfuse/PKGBUILD
+++ b/extra/enblend-enfuse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 201258 2013-12-07 10:34:58Z bpiotrowski $
+# $Id: PKGBUILD 203180 2014-01-04 22:17:16Z andyrtr $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=enblend-enfuse
 pkgver=4.1.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Intelligent blend tool for overlapping picture"
 arch=("i686" "x86_64" 'mips64el')
 license=('GPL')
diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD
new file mode 100644
index 000000000..f7080625e
--- /dev/null
+++ b/extra/enlightenment/PKGBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Enlightenment Developers <enlightenment-devel@enlightenment.org>>
+
+pkgname=enlightenment
+pkgver=0.18.3
+pkgrel=1
+pkgdesc="Enlightenment window manager"
+arch=('i686' 'x86_64')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('elementary' 'xcb-util-keysyms' 'hicolor-icon-theme' 'pixman' 'mesa'
+         'desktop-file-utils' 'udisks2' 'ttf-font' 'bluez-libs')
+optdepends=('connman: network module'
+            'acpid: power events on laptop lid close')
+provides=("enlightenment17=$pkgver" 'notification-daemon')
+conflicts=("enlightenment17")
+replaces=("enlightenment17")
+backup=('etc/enlightenment/sysactions.conf'
+        'etc/xdg/menus/enlightenment.menu')
+source=(http://download.enlightenment.org/rel/apps/${pkgname}/$pkgname-$pkgver.tar.gz)
+install=enlightenment.install
+sha1sums=('c753ea32e74250b5ad1241f8499d4ac98ae47a78')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  export CFLAGS="$CFLAGS -fvisibility=hidden"
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+	--enable-wayland-clients --enable-wayland-egl
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -j1 DESTDIR="$pkgdir" install
+
+  # install LICENSE
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
diff --git a/pcr/setbfree/setbfree.install b/extra/enlightenment/enlightenment.install
index e111ef946..1182e768f 100644
--- a/pcr/setbfree/setbfree.install
+++ b/extra/enlightenment/enlightenment.install
@@ -1,4 +1,5 @@
 post_install() {
+  update-mime-database usr/share/mime > /dev/null
   update-desktop-database -q
 }
 
diff --git a/extra/enlightenment16/PKGBUILD b/extra/enlightenment16/PKGBUILD
index bfc1c04bd..aa52eb9d8 100644
--- a/extra/enlightenment16/PKGBUILD
+++ b/extra/enlightenment16/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 201529 2013-12-13 21:18:56Z ronald $
+# $Id: PKGBUILD 203364 2014-01-08 20:08:26Z ronald $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=enlightenment16
 _pkgname=enlightenment
 pkgver=1.0.13
 _themever=1.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A fast, flexible, and very extensible Window Manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD' 'custom')
 depends=('libxinerama' 'imlib2' 'perl' 'pango' 'libxcomposite' \
          'libxrandr' 'libpulse')
-replaces=('enlightenment<=1.0.13')
+replaces=('enlightenment>=1.0.13')
 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
deleted file mode 100644
index 34df14257..000000000
--- a/extra/enlightenment17/PKGBUILD
+++ /dev/null
@@ -1,87 +0,0 @@
-# $Id: PKGBUILD 199739 2013-11-15 12:19:48Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
-
-pkgname=enlightenment17
-_pkgname=enlightenment
-pkgver=0.17.5
-pkgrel=1
-pkgdesc="Enlightenment window manager DR17 (aka e17)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('alsa-lib' 'pam' 'shared-mime-info' 'hicolor-icon-theme'
-  'desktop-file-utils' 'e_dbus' 'edje' 'eeze' 'efreet'
-  'eio' 'elementary' 'xcb-util-keysyms' 'udisks' 'systemd' 'ttf-font')
-optdepends=('connman: network module')
-provides=('notification-daemon' 'e')
-backup=('etc/enlightenment/sysactions.conf')
-options=('!emptydirs')
-install=enlightenment17.install
-source=(http://download.enlightenment.org/releases/$_pkgname-$pkgver.tar.gz
-  'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch')
-sha1sums=('8fd40ad2df2eb96a3d6583bcd19d150d594a6e86'
-          'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5'
-          '3f53931ae86de8fe99e386aeb097521aac0decd8'
-          '86f1c5e36dc274c3101362532378be034e89c593')
-	
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  patch -p0 < $srcdir/quickstart.patch
-
-  # default to systemd for sysactions
-  patch -Np0 < $srcdir/sysactions_systemd.patch
-
-}
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/enlightenment  \
-    --enable-strict \
-    --disable-static \
-    --enable-pam \
-    --disable-device-hal \
-    --enable-device-udev \
-    --disable-mount-hal \
-    --enable-mount-udisks \
-    --enable-mount-eeze \
-    --enable-elementary \
-    --enable-emotion \
-    --enable-enotify \
-    --disable-ephysics \
-    --disable-wayland-clients \
-    --disable-conf-wallpaper2 \
-    --disable-illume2 \
-    --disable-physics \
-    --disable-doc
-  make
-}
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-# install license files
-  if [ -e $srcdir/$_pkgname-$pkgver/COPYING ]; then
-    install -Dm644 $srcdir/$_pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-  fi
-
-  if [ -e $srcdir/$_pkgname-$pkgver/COPYING-PLAIN ]; then
-    install -Dm644 $srcdir/$_pkgname-$pkgver/COPYING-PLAIN \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING-PLAIN
-  fi
-
-  # install a default applications.menu file (mostly copy from gnome-menus)
-  install -Dm644 $srcdir/e-applications.menu \
-	$pkgdir/etc/xdg/menus/e-applications.menu
-}
-
diff --git a/extra/enlightenment17/blackscreenfix.patch b/extra/enlightenment17/blackscreenfix.patch
deleted file mode 100644
index 817d6c105..000000000
--- a/extra/enlightenment17/blackscreenfix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From b17a9b9cc9438b6dfac4402ac4107f08e23a4373 Mon Sep 17 00:00:00 2001
-From: Chris Michael <cp.michael@samsung.com>
-Date: Wed, 29 May 2013 11:50:17 +0000
-Subject: Backport: 45b4d9f :: Move xinerama init until After randr has setup the screens.
-
-NB: Old Man, THIS should fix your black screen problem ;)
-
-Signed-off-by: Chris Michael <cp.michael@samsung.com>
-Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
----
-diff --git a/src/bin/e_main.c b/src/bin/e_main.c
-index ee8fd8a..ed58cfd 100644
---- a/src/bin/e_main.c
-+++ b/src/bin/e_main.c
-@@ -462,15 +462,6 @@ main(int argc, char **argv)
-    TS("E_Alert Init Done");
-    _e_main_shutdown_push(e_alert_shutdown);
- 
--   TS("E_Xinerama Init");
--   if (!e_xinerama_init())
--     {
--        e_error_message_show(_("Enlightenment cannot initialize E_Xinerama!\n"));
--        _e_main_shutdown(-1);
--     }
--   TS("E_Xinerama Init Done");
--   _e_main_shutdown_push(e_xinerama_shutdown);
--
-    TS("E_Hints Init");
-    e_hints_init();
-    TS("E_Hints Init Done");
-@@ -521,6 +512,15 @@ main(int argc, char **argv)
-      _e_main_shutdown_push(e_randr_shutdown);
-    TS("E_Randr Init Done");
- 
-+   TS("E_Xinerama Init");
-+   if (!e_xinerama_init())
-+     {
-+        e_error_message_show(_("Enlightenment cannot initialize E_Xinerama!\n"));
-+        _e_main_shutdown(-1);
-+     }
-+   TS("E_Xinerama Init Done");
-+   _e_main_shutdown_push(e_xinerama_shutdown);
-+
-    TS("E_Env Init");
-    if (!e_env_init())
-      {
---
-cgit v0.9.2
diff --git a/extra/enlightenment17/e-applications.menu b/extra/enlightenment17/e-applications.menu
deleted file mode 100644
index 69456c1d5..000000000
--- a/extra/enlightenment17/e-applications.menu
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-
-<Menu>
-
-  <Name>Applications</Name>
-  <Directory>X-E-Menu-Applications.directory</Directory>
-
-  <!-- Scan legacy dirs first, as later items take priority -->
-  <KDELegacyDirs/>
-  <LegacyDir>/etc/X11/applnk</LegacyDir>
-  <LegacyDir>/usr/share/gnome/apps</LegacyDir>
-
-  <!-- Read standard .directory and .desktop file locations -->
-  <DefaultAppDirs/>
-  <DefaultDirectoryDirs/>
-
-  <!-- Read in overrides and child menus from applications-merged/ -->
-  <DefaultMergeDirs/>
-
-  <!-- Accessories submenu -->
-  <Menu>
-    <Name>Accessories</Name>
-    <Directory>Utility.directory</Directory>
-    <Include>
-      <And>
-        <Category>Utility</Category>
-	<!-- Accessibility spec must have either the Utility or Settings
-	     category, and we display an accessibility submenu already for
-	     the ones that do not have Settings, so don't display accessibility
-	     applications here -->
-        <Not><Category>Accessibility</Category></Not>
-        <Not><Category>System</Category></Not>
-      </And>
-    </Include>
-  </Menu> <!-- End Accessories -->
-
-  <!-- Accessibility submenu -->
-  <Menu>
-    <Name>Universal Access</Name>
-    <Directory>Utility-Accessibility.directory</Directory>
-    <Include>
-      <And>
-        <Category>Accessibility</Category>
-        <Not><Category>Settings</Category></Not>
-      </And>
-    </Include>
-  </Menu> <!-- End Accessibility -->
-
-  <!-- Development Tools -->
-  <Menu>
-    <Name>Development</Name>
-    <Directory>Development.directory</Directory>
-    <Include>
-      <And>
-        <Category>Development</Category>
-      </And>
-      <Filename>emacs.desktop</Filename>
-    </Include>
-  </Menu> <!-- End Development Tools -->
-
-  <!-- Education -->
-  <Menu>
-    <Name>Education</Name>
-    <Directory>Education.directory</Directory>
-    <Include>
-      <And>
-        <Category>Education</Category>
-      </And>
-    </Include>
-  </Menu> <!-- End Education -->
-
-  <!-- Games -->
-  <Menu>
-    <Name>Games</Name>
-    <Directory>Game.directory</Directory>
-    <Include>
-      <And>
-        <Category>Game</Category>
-      </And>
-    </Include>
-  </Menu> <!-- End Games -->
-
-  <!-- Graphics -->
-  <Menu>
-    <Name>Graphics</Name>
-    <Directory>Graphics.directory</Directory>
-    <Include>
-      <And>
-        <Category>Graphics</Category>
-      </And>
-    </Include>
-  </Menu> <!-- End Graphics -->
-
-  <!-- Internet -->
-  <Menu>
-    <Name>Internet</Name>
-    <Directory>Network.directory</Directory>
-    <Include>
-      <And>
-        <Category>Network</Category>
-      </And>
-    </Include>
-  </Menu>   <!-- End Internet -->
-
-  <!-- Multimedia -->
-  <Menu>
-    <Name>Multimedia</Name>
-    <Directory>AudioVideo.directory</Directory>
-    <Include>
-      <And>
-        <Category>AudioVideo</Category>
-      </And>
-    </Include>
-  </Menu>   <!-- End Multimedia -->
-
-  <!-- Office -->
-  <Menu>
-    <Name>Office</Name>
-    <Directory>Office.directory</Directory>
-    <Include>
-      <And>
-        <Category>Office</Category>
-      </And>
-    </Include>
-  </Menu> <!-- End Office -->
-
-  <!-- System Tools-->
-  <Menu>
-    <Name>System</Name>
-    <Directory>System-Tools.directory</Directory>
-    <Include>
-      <And>
-        <Category>System</Category>
-        <Not><Category>Settings</Category></Not>
-      </And>
-    </Include>
-  </Menu>   <!-- End System Tools -->
-
-  <!-- Other -->
-  <Menu>
-    <Name>Other</Name>
-    <Directory>X-GNOME-Other.directory</Directory>
-    <OnlyUnallocated/>
-    <Include>
-      <And>
-        <Not><Category>Core</Category></Not>
-        <Not><Category>Settings</Category></Not>
-        <Not><Category>Screensaver</Category></Not>
-      </And>
-    </Include>
-  </Menu> <!-- End Other -->
-
-</Menu> <!-- End Applications -->
diff --git a/extra/enlightenment17/enlightenment17.install b/extra/enlightenment17/enlightenment17.install
deleted file mode 100644
index 0e3216ffe..000000000
--- a/extra/enlightenment17/enlightenment17.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime > /dev/null
-  update-desktop-database -q
-
-cat << EOF
-Enlightenment is configured to use systemd by default for shutdown/sleep purposes. 
-This can be changed in /etc/enlightenment/sysactions.conf.
-EOF
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/extra/enlightenment17/quickstart.patch b/extra/enlightenment17/quickstart.patch
deleted file mode 100644
index 6b7f372dc..000000000
--- a/extra/enlightenment17/quickstart.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/bin/e_main.c
-===================================================================
---- src/bin/e_main.c	(revision 78707)
-+++ src/bin/e_main.c	(working copy)
-@@ -101,7 +101,7 @@
- static Eina_Bool _e_main_cb_startup_fake_end(void *data __UNUSED__);
- 
- /* local variables */
--static Eina_Bool really_know = EINA_FALSE;
-+static Eina_Bool really_know = EINA_TRUE;
- static Eina_Bool locked = EINA_FALSE;
- static Eina_Bool inloop = EINA_FALSE;
- static jmp_buf x_fatal_buff;
diff --git a/extra/enlightenment17/sysactions_systemd.patch b/extra/enlightenment17/sysactions_systemd.patch
deleted file mode 100644
index 5d535dd60..000000000
--- a/extra/enlightenment17/sysactions_systemd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- data/etc/sysactions.conf.in	2012-10-31 17:28:49.000000000 +0100
-+++ data/etc/sysactions.conf.in.bak	2012-11-27 19:27:15.955334382 +0100
-@@ -43,10 +43,10 @@
- # user and group name can use glob matches (* == all for example) like the
- # shell. as can action names allowed or denied. 
- 
--action:   halt      /sbin/shutdown -h now
--action:   reboot    /sbin/shutdown -r now
--action:   suspend   @SUSPEND@
--action:   hibernate @HIBERNATE@
-+action:   halt      /usr/bin/systemctl poweroff
-+action:   reboot    /usr/bin/systemctl reboot
-+action:   suspend   /usr/bin/systemctl suspend
-+action:   hibernate /usr/bin/systemctl hibernate
- action:   /bin/mount /bin/mount
- action:   /bin/umount /bin/umount
- action:   /usr/bin/eject /usr/bin/eject
diff --git a/extra/enscript/PKGBUILD b/extra/enscript/PKGBUILD
new file mode 100644
index 000000000..d24620f96
--- /dev/null
+++ b/extra/enscript/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 189649 2013-07-04 03:34:44Z eric $
+# Maintainer: Paul Mattal <paul@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
+pkgname=enscript
+pkgver=1.6.6
+pkgrel=1
+pkgdesc="Convert ASCII files to PostScript suitable for printing"
+arch=('i686' 'x86_64')
+url="http://git.savannah.gnu.org/cgit/enscript.git"
+license=('GPL3')
+depends=('glibc')
+backup=('etc/enscript/enscript.cfg')
+install=enscript.install
+source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('3acc242b829adacabcaf28533f049afd')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc/enscript
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/pcr/gnuit/gnuit.install b/extra/enscript/enscript.install
index e26e79dae..18ffbe910 100644
--- a/pcr/gnuit/gnuit.install
+++ b/extra/enscript/enscript.install
@@ -1,9 +1,8 @@
 infodir=usr/share/info
-file=gnuit.info
 
 post_install() {
   [[ -x usr/bin/install-info ]] || return 0
-  install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+    install-info "$infodir/enscript.info.gz" "$infodir/dir" 2> /dev/null
 }
 
 post_upgrade() {
@@ -12,5 +11,5 @@ post_upgrade() {
 
 pre_remove() {
   [[ -x usr/bin/install-info ]] || return 0
-  install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+    install-info --delete "$infodir/enscript.info.gz" "$infodir/dir" 2> /dev/null
 }
diff --git a/extra/ethumb/PKGBUILD b/extra/ethumb/PKGBUILD
deleted file mode 100644
index b46ad87d9..000000000
--- a/extra/ethumb/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 199734 2013-11-15 12:15:50Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
-
-pkgname=ethumb
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="Thumbnailing library and D-Bus service using EFL"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('libexif' 'e_dbus'  'emotion')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('7f9a7e536de7a598e921709c3ba0d23850f4494f')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/ethumb \
-    --with-internal-maximum-log-level=3 \
-    --disable-static \
-    --enable-emotion \
-    --disable-epdf \
-    --enable-libexif \
-    --disable-install-examples \
-    --disable-doc
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD
deleted file mode 100644
index 45601d1bd..000000000
--- a/extra/evas/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 199727 2013-11-15 12:13:26Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
-
-pkgname=evas
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="A hardware-accelerated canvas API for X-Windows"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('eet' 'giflib' 'libpng' 'libjpeg' 'libxrender' 'mesa'
-  'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('5804cf35451f4e05185b6ae9103b0390c0dfed5d')
-
-build() {
-  cd $pkgname-$pkgver
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/evas \
-    --enable-strict \
-    --disable-static \
-    --enable-fontconfig \
-    --enable-fribidi \
-    --enable-harfbuzz \
-    --disable-pixman \
-    --enable-buffer=static \
-    --disable-gl-sdl \
-    --enable-fb \
-    --disable-directfb \
-    --disable-wayland-shm \
-    --disable-wayland-egl \
-    --disable-sdl-primitive \
-    --disable-software-xcb \
-    --enable-software-xlib=static \
-    --disable-gl-xcb \
-    --enable-gl-xlib \
-    --disable-image-loader-edb \
-    --enable-image-loader-gif=static \
-    --enable-image-loader-tiff=static \
-    --enable-image-loader-svg=static \
-    --enable-image-loader-eet=static \
-    --enable-image-loader-generic=static \
-    --disable-install-examples \
-    --disable-tests \
-    --disable-coverage \
-    --disable-doc
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # install license files
-  install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" \
-        "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-
diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD
index c1d676fa7..1d5374b4a 100644
--- a/extra/evas_generic_loaders/PKGBUILD
+++ b/extra/evas_generic_loaders/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 200655 2013-12-01 09:50:20Z andyrtr $
+# $Id: PKGBUILD 204578 2014-01-23 13:18:51Z andrea $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=evas_generic_loaders
-pkgver=1.7.9
-pkgrel=2
+pkgver=1.8.1
+pkgrel=3
 pkgdesc="Additional generic loaders for Evas"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
-license=('BSD')
-depends=('librsvg' 'gstreamer0.10-base' 'poppler' 'libraw' 'libspectre' 'eina')
+license=('GPL2')
+depends=('librsvg' 'gstreamer0.10-base' 'poppler' 'libraw' 'libspectre' 'efl')
 options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('598241d2276608fc41a79216e94b4176a4404277')
+source=(http://download.enlightenment.org/rel/libs/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('e196829b26f74a1a0a4d9292ebdf8c98b08a32f1')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+  export CFLAGS="$CFLAGS -fvisibility=hidden"
 
   ./configure \
     --prefix=/usr \
@@ -34,11 +32,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # install license files
-  install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" \
-        "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
 
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index 95c147da5..34a8f8613 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 201347 2013-12-09 08:46:39Z heftig $
+# $Id: PKGBUILD 205805 2014-02-10 12:27:15Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.10.3
+pkgver=3.10.4
 pkgrel=1
 pkgdesc="Centralized access to appointments and contacts"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ 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=('41af5c658255230de47423fad73f19bfab15b9e0df80141b13f66b55bf295bd2')
+sha256sums=('5c2d5e19af19ecfa81f31306411ab6155c3c62cf407d5a5aaa675a8ce940fa2d')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD
index 2acbfadc4..9ecd95ad9 100644
--- a/extra/evolution-ews/PKGBUILD
+++ b/extra/evolution-ews/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 201349 2013-12-09 08:51:59Z heftig $
+# $Id: PKGBUILD 205807 2014-02-10 12:27:43Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=evolution-ews
-pkgver=3.10.3
+pkgver=3.10.4
 pkgrel=1
 pkgdesc="MS Exchange integration through Exchange Web Services"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('evolution-data-server' 'gtkhtml4' 'libmspack')
 makedepends=('intltool' 'evolution')
 options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('485951935014fbf7d092b318cee3131c442b959f3ed2163932bfb11fdc15c6e9')
+sha256sums=('b46d17ad4fce5fab1d4645dfe69ef47ee0e88178c6fa6fb945b861ce64aa821a')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index 7df0c7939..8ab2df0d9 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 201348 2013-12-09 08:51:13Z heftig $
+# $Id: PKGBUILD 205806 2014-02-10 12:27:30Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution
-pkgver=3.10.3
+pkgver=3.10.4
 pkgrel=1
 pkgdesc="Manage your email, contacts and schedule"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ 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=('ad4b37215c361134a14aa1598d5c038327f897b7d9dbc750cab3d58d5c922f4c')
+sha256sums=('ac60557f264f211e6a7bc0ced919041c154e4c7b9c79600516aee7acc1d03e40')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/exiv2/PKGBUILD b/extra/exiv2/PKGBUILD
index 4fea3a69d..60cdf8182 100644
--- a/extra/exiv2/PKGBUILD
+++ b/extra/exiv2/PKGBUILD
@@ -1,24 +1,42 @@
-#$Id: PKGBUILD 197943 2013-10-30 11:49:33Z allan $
+#$Id: PKGBUILD 204753 2014-01-26 12:15:57Z andyrtr $
 # Maintainer: tobias <tobias@arhlinux.org>
 
 pkgname=exiv2
-pkgver=0.23
-pkgrel=2
+pkgver=0.24
+pkgrel=1
 pkgdesc="Exif and Iptc metadata manipulation library and tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://exiv2.org"
-license=('GPL')
+license=('GPL2')
 depends=('gcc-libs' 'zlib' 'expat')
-source=("http://www.exiv2.org/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('5f342bf642477526f41add11d6ee7787cdcd639f')
+makedepends=('cmake') # for doc: 'doxygen' 'graphviz' 'ttf-liberation' 'libxslt')
+source=(http://www.exiv2.org/${pkgname}-${pkgver}.tar.gz)
+        # for doc build maybe add from FC exiv2-0.24-doxygen_config.patch)
+md5sums=('b8a23dc56a98ede85c00718a97a8d6fc')
 
+prepare() {
+  mkdir build
+  # fix man pages install patch
+  sed -i "s:man/man1:share/man/man1:" ${pkgbase}-${pkgver}/src/CMakeLists.txt
+}
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr
+  cd build
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DEXIV2_ENABLE_BUILD_PO:BOOL=ON \
+    -DEXIV2_ENABLE_BUILD_SAMPLES=ON
   make
+#  cd ../${pkgbase}-${pkgver}
+#  make -j1 doc # needs to be fixed
 }
 
+#check() {
+#  cd build
+#  make tests # doesn't work for me not finding tests dir
+#}
+
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/f2fs-tools/PKGBUILD b/extra/f2fs-tools/PKGBUILD
index fb2646183..e837e89e4 100644
--- a/extra/f2fs-tools/PKGBUILD
+++ b/extra/f2fs-tools/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 197945 2013-10-30 11:50:17Z allan $
+# $Id: PKGBUILD 205870 2014-02-12 07:22:16Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Christian Hesse <mail@eworm.de>
 
 pkgname=f2fs-tools
-pkgver=1.2.0
+pkgver=1.3.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.2.0.tar.gz')
+source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.3.0.tar.gz')
 #source=("ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('d27ad7cd56f6001f7e1d508d85eef195')
+md5sums=('fd5f9cbef72a58f3264f27d72a27b8ae')
 
 build() {
 	cd "${pkgname}-${pkgver}"
diff --git a/extra/festival/PKGBUILD b/extra/festival/PKGBUILD
index a663b3353..ad2b34306 100644
--- a/extra/festival/PKGBUILD
+++ b/extra/festival/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 137968 2011-09-13 09:17:12Z eric $
+# $Id: PKGBUILD 205607 2014-02-09 10:29:39Z andyrtr $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Simo Leone <neotuli@gmail.com>
 
 pkgname=festival
 pkgver=2.1
-_suffix=release
-pkgrel=3.1
+pkgrel=4
 pkgdesc="A general multi-lingual speech synthesis system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cstr.ed.ac.uk/projects/festival/"
 license=('BSD' 'GPL' 'custom')
 depends=('perl')
 options=('!makeflags')
-source=("http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}-${_suffix}.tar.gz"
-        "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/speech_tools-${pkgver}-${_suffix}.tar.gz"
-	"http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_CMU.tar.gz"
-	"http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_OALD.tar.gz"
-	"http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_POSLEX.tar.gz"
-	'speechconfig.patch'
-	'festconfig.patch'
-	'festival-shared-build.patch'
-	'speech_tools-2.1-build.patch')
+source=(http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}-release.tar.gz
+        http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/speech_tools-${pkgver}-release.tar.gz
+        http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_CMU.tar.gz
+        http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_OALD.tar.gz
+        http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_POSLEX.tar.gz
+        speechconfig.patch
+        festconfig.patch
+        festival-shared-build.patch
+        festival.gcc47.patch
+        festival-2.1-bettersonamehack.patch)
 md5sums=('c93eb3e389ed171ab9abd46afe8897a8'
          '6920ddc75b042910a3bcfee3ab106938'
          '6a2ee4fed7c3ebedf197a3b8524ccb87'
@@ -29,34 +29,38 @@ md5sums=('c93eb3e389ed171ab9abd46afe8897a8'
          'aa80f9250065b318325f16fdad3a4484'
          'c30ae990baca40c9c2b1d5cd27502139'
          '348cc033430aee7989463198818ae74c'
-         '46132b1cd86a982007312def49ab176a'
-	 '347c9433a3879c0f12e1cd6befbd92ff')
+         '02f589688182527308e3fe8d1a82c056'
+         'ed738fdf981aaddbae6d00c3a0120d62'
+         '85367db2b57bae214d1032e2fc896753')
+
+prepare() {
+  cd $srcdir
+  patch -Np0 -i ${srcdir}/speechconfig.patch
+  patch -Np0 -i ${srcdir}/festconfig.patch
+
+  # fix build with new gcc versions and build shared libs - taken from Mageia
+  patch -Np0 -i ${srcdir}/festival-shared-build.patch
+  patch -Np0 -i ${srcdir}/festival-2.1-bettersonamehack.patch
+  patch -Np0 -i ${srcdir}/festival.gcc47.patch
+  
+  # Avoid make failure on making scripts and docs
+  sed -i "s#examples bin doc#examples#" festival/Makefile
+}
 
 build() {
-  cd "$srcdir"
-  patch -Np0 -i "$srcdir/festival-shared-build.patch"
-  patch -Np0 -i ${srcdir}/speech_tools-2.1-build.patch
-
   # Build Speech Tools first
   cd "$srcdir/speech_tools"
-  sed -i 's/ -fno-shared-data//g' config/compilers/gcc_defaults.mak
-  patch -Np1 -i "$srcdir/speechconfig.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc --build=$CHOST --host=$CHOST
-  make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make OPTIMISE_CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" OPTIMISE_CCFLAGS="${CFLAGS} -fno-strict-aliasing"
 
   # Build Festival itself
   cd "$srcdir/festival"
-  patch -Np1 -i "$srcdir/festconfig.patch"
-
-  # Avoid make failure on making scripts and docs
-  sed -i "s#examples bin doc#examples#" Makefile
-
-  ./configure --prefix=/usr --sysconfdir=/etc --build=$CHOST --host=$CHOST
+  ./configure --prefix=/usr --sysconfdir=/etc
   make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
 }
 
 package() {
- # Install Speech Tools first
+  # Install Speech Tools first
   cd "$srcdir/speech_tools"
   install -dm755 "$pkgdir"/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}}
 
@@ -73,7 +77,6 @@ package() {
   ln -sf libestbase.so.${pkgver}.1 "$pkgdir"/usr/lib/libestbase.so
   ln -sf libestools.so.${pkgver}.1 "$pkgdir"/usr/lib/libestools.so
   ln -sf libeststring.so.1.2 "$pkgdir"/usr/lib/libeststring.so
-  install -m644 -t "$pkgdir"/usr/lib lib/lib*.a
 
   #headers
   for dir in {.,instantiate,ling_class,rxp,sigpr,unix}; do
@@ -99,7 +102,6 @@ package() {
   install -m755 examples/text2wave "$pkgdir"/usr/bin
 
   #libraries
-  install -m644 src/lib/libFestival.a "$pkgdir"/usr/lib/
   install -m755 src/lib/libFestival.so.* "$pkgdir"/usr/lib/
   ln -sf libFestival.so.2.1.0 "$pkgdir"/usr/lib/libFestival.so
 
@@ -109,8 +111,8 @@ package() {
 
   mkdir -p "$pkgdir"/usr/share/festival
   cp -aR lib/* "$pkgdir"/usr/share/festival
-  rm -f $(find "$pkgdir"/usr/share/festival -name Makefile)
-  rm -f $(find "$pkgdir"/usr/bin -name Makefile)
+  rm -fv $(find "$pkgdir"/usr/share/festival -name Makefile)
+  rm -fv $(find "$pkgdir"/usr/bin -name Makefile)
 
   #create voices directory
   install -dm755 "$pkgdir"/usr/share/festival/voices
diff --git a/extra/festival/festival-2.1-bettersonamehack.patch b/extra/festival/festival-2.1-bettersonamehack.patch
new file mode 100644
index 000000000..0830168c6
--- /dev/null
+++ b/extra/festival/festival-2.1-bettersonamehack.patch
@@ -0,0 +1,35 @@
+diff -p -up festival/speech_tools/config/compilers/gcc_defaults.mak.bettersoname festival/speech_tools/config/compilers/gcc_defaults.mak
+--- speech_tools/config/compilers/gcc_defaults.mak.bettersoname	2010-12-06 10:25:35.000000000 +0100
++++ speech_tools/config/compilers/gcc_defaults.mak	2010-12-06 10:27:51.000000000 +0100
+@@ -78,7 +78,7 @@ SHARED_CXXFLAGS  = -fPIC
+ SHARED_LINKFLAGS = 
+ 
+ ifndef GCC_MAKE_SHARED_LIB
+-    MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX
++    MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname,YYY
+ else
+     MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
+ endif
+diff -p -up festival/speech_tools/config/rules/library.mak.bettersoname festival/speech_tools/config/rules/library.mak
+--- speech_tools/config/rules/library.mak.bettersoname	2001-04-04 13:55:32.000000000 +0200
++++ speech_tools/config/rules/library.mak	2010-12-06 10:25:35.000000000 +0100
+@@ -103,14 +103,14 @@ endif
+  ###########################################################################
+ 
+ lib%.so : lib%.a
+-	@echo Make Shared Library $*
++	@echo Make Shared Library $(*F)
+ 	@if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi
+ 	@(cd shared_space ; $(AR) x ../$< ) 
+-	@echo Link Shared Library $*
+-	if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$*)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
+-	$(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$*),$(MAKE_SHARED_LIB)) shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs
++	@echo Link Shared Library $(*F)
++	if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$(*F))" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
++	$(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$(*F)),$(subst YYY,$(@F).$(PROJECT_LIBRARY_VERSION_$(*F)),$(MAKE_SHARED_LIB))) shared_space/*.o $(PROJECT_LIBRARY_USES_$(*F):%=-L. -l%) $$libs
+ 	@$(RM) -f shared_space/*.o $@
+-	@ln -s $@.$(PROJECT_LIBRARY_VERSION_$*) $@
++	@ln -s $(@F).$(PROJECT_LIBRARY_VERSION_$(*F)) $@
+ 
+  ###########################################################################
+  ##                                                                       ##
diff --git a/extra/festival/festival-shared-build.patch b/extra/festival/festival-shared-build.patch
index edfa38b17..ee824d458 100644
--- a/extra/festival/festival-shared-build.patch
+++ b/extra/festival/festival-shared-build.patch
@@ -1,3 +1,18 @@
+--- speech_tools/config/project.mak.orig	2007-03-13 15:27:53.000000000 -0400
++++ speech_tools/config/project.mak	2007-03-13 15:29:12.000000000 -0400
+@@ -99,8 +99,9 @@
+ PROJECT_LIBRARY_DIR_eststring = $(TOP)/lib
+ PROJECT_LIBRARY_DIR_estjava = $(TOP)/lib
+ 
+-PROJECT_LIBRARY_USES_estbase = eststring
+-
++PROJECT_LIBRARY_USES_estbase = eststring m
++PROJECT_LIBRARY_USES_estools = estbase m ncurses
++PROJECT_LIBRARY_USES_eststring = m
+ PROJECT_LIBRARY_USES_estjava = estbase eststring
+ 
+ PROJECT_LIBRARY_VERSION_estools = $(PROJECT_VERSION).1
+
 --- speech_tools/config/rules/defaults.mak.orig	2007-03-16 12:39:12.000000000 -0400
 +++ speech_tools/config/rules/defaults.mak	2007-03-16 12:39:19.000000000 -0400
 @@ -69,15 +69,21 @@
@@ -35,38 +50,3 @@
  # Libraries used from other projects
  
  REQUIRED_LIBRARIES = estools estbase eststring
-diff -p -up festival/speech_tools/config/compilers/gcc_defaults.mak.bettersoname festival/speech_tools/config/compilers/gcc_defaults.mak
---- speech_tools/config/compilers/gcc_defaults.mak.bettersoname	2010-12-06 10:25:35.000000000 +0100
-+++ speech_tools/config/compilers/gcc_defaults.mak	2010-12-06 10:27:51.000000000 +0100
-@@ -78,7 +78,7 @@ SHARED_CXXFLAGS  = -fPIC
- SHARED_LINKFLAGS = 
- 
- ifndef GCC_MAKE_SHARED_LIB
--    MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX
-+    MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX -Wl,-soname,YYY
- else
-     MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
- endif
-diff -p -up festival/speech_tools/config/rules/library.mak.bettersoname festival/speech_tools/config/rules/library.mak
---- speech_tools/config/rules/library.mak.bettersoname	2001-04-04 13:55:32.000000000 +0200
-+++ speech_tools/config/rules/library.mak	2010-12-06 10:25:35.000000000 +0100
-@@ -103,14 +103,14 @@ endif
-  ###########################################################################
- 
- lib%.so : lib%.a
--	@echo Make Shared Library $*
-+	@echo Make Shared Library $(*F)
- 	@if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi
- 	@(cd shared_space ; $(AR) x ../$< ) 
--	@echo Link Shared Library $*
--	if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$*)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
--	$(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$*),$(MAKE_SHARED_LIB)) shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs
-+	@echo Link Shared Library $(*F)
-+	if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$(*F))" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
-+	$(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$(*F)),$(subst YYY,$(@F).$(PROJECT_LIBRARY_VERSION_$(*F)),$(MAKE_SHARED_LIB))) shared_space/*.o $(PROJECT_LIBRARY_USES_$(*F):%=-L. -l%) $$libs
- 	@$(RM) -f shared_space/*.o $@
--	@ln -s $@.$(PROJECT_LIBRARY_VERSION_$*) $@
-+	@ln -s $(@F).$(PROJECT_LIBRARY_VERSION_$(*F)) $@
- 
-  ###########################################################################
-  ##                                                                       ##
diff --git a/extra/festival/festival.gcc47.patch b/extra/festival/festival.gcc47.patch
new file mode 100644
index 000000000..40c8c72b8
--- /dev/null
+++ b/extra/festival/festival.gcc47.patch
@@ -0,0 +1,121 @@
+--- speech_tools/base_class/EST_TSimpleMatrix.cc.gcc	2009-02-18 20:56:24.000000000 +0800
++++ speech_tools/base_class/EST_TSimpleMatrix.cc	2012-10-14 13:06:35.000000000 +0800
+@@ -44,6 +44,7 @@
+ #include "EST_TVector.h"
+ #include <fstream>
+ #include <iostream>
++#include <cstring>
+ #include "EST_cutils.h"
+ 
+ template<class T> 
+@@ -98,7 +99,7 @@
+ 	{
+ 	  int copy_r = Lof(this->num_rows(), new_rows);
+ 
+-	  just_resize(new_rows, new_cols, &old_vals);
++	  this->just_resize(new_rows, new_cols, &old_vals);
+ 
+           for (q=0; q<(copy_r*new_cols*sizeof(T)); q++) /* memcpy */
+               ((char *)this->p_memory)[q] = ((char *)old_vals)[q];
+@@ -127,9 +128,9 @@
+ 	  int copy_r = Lof(this->num_rows(), new_rows);
+ 	  int copy_c = Lof(this->num_columns(), new_cols);
+ 	  
+-	  just_resize(new_rows, new_cols, &old_vals);
++	  this->just_resize(new_rows, new_cols, &old_vals);
+ 
+-	  set_values(old_vals,
++	  this->set_values(old_vals,
+ 		     old_row_step, old_column_step,
+ 		     0, copy_r,
+ 		     0, copy_c);
+--- speech_tools/base_class/EST_TSimpleVector.cc.gcc	2009-02-18 20:52:55.000000000 +0800
++++ speech_tools/base_class/EST_TSimpleVector.cc	2012-10-14 13:09:37.000000000 +0800
+@@ -43,6 +43,7 @@
+ #include "EST_TSimpleVector.h"
+ #include "EST_matrix_support.h"
+ #include <fstream>
++#include <cstring>
+ #include "EST_cutils.h"
+ 
+ template<class T> void EST_TSimpleVector<T>::copy(const EST_TSimpleVector<T> &a)
+@@ -70,7 +71,7 @@
+   int old_offset = this->p_offset;
+   unsigned int q;
+ 
+-  just_resize(newn, &old_vals);
++  this->just_resize(newn, &old_vals);
+ 
+   if (set && old_vals)
+     {
+--- speech_tools/include/EST_TIterator.h.gcc	2004-05-04 08:00:16.000000000 +0800
++++ speech_tools/include/EST_TIterator.h	2012-10-14 12:52:52.000000000 +0800
+@@ -101,7 +101,7 @@
+ 
+   /// Create an iterator ready to run over the given container.
+   EST_TIterator(const Container &over)
+-    { begin(over); }
++    { this->begin(over); }
+ 
+   /// Copy an iterator by assignment
+   Iter &operator = (const Iter &orig)
+@@ -109,7 +109,7 @@
+ 
+   /// Assigning a container to an iterator sets it ready to start.
+   Iter &operator = (const Container &over)
+-    { begin(over); return *this;}
++    { this->begin(over); return *this;}
+ 
+   /// Set the iterator ready to run over this container.
+   void begin(const Container &over)
+@@ -209,7 +209,7 @@
+ 
+   /// Create an iterator ready to run over the given container.
+   EST_TStructIterator(const Container &over)
+-    { begin(over); }
++    { this->begin(over); }
+ 
+   const Entry *operator ->() const
+     {return &this->current();}
+@@ -239,7 +239,7 @@
+ 
+   /// Create an iterator ready to run over the given container.
+   EST_TRwIterator(Container &over)
+-    { begin(over); }
++    { this->begin(over); }
+ 
+   /// Set the iterator ready to run over this container.
+   void begin(Container &over)
+@@ -289,7 +289,7 @@
+ 
+   /// Create an iterator ready to run over the given container.
+   EST_TRwStructIterator(Container &over)
+-    { begin(over); }
++    { this->begin(over); }
+ 
+   Entry *operator ->() const
+     {return &this->current();}
+--- speech_tools/include/EST_TNamedEnum.h.gcc	2004-09-30 20:53:36.000000000 +0800
++++ speech_tools/include/EST_TNamedEnum.h	2012-10-14 12:52:52.000000000 +0800
+@@ -130,7 +130,7 @@
+ 	{this->initialise((const void *)defs); };
+   EST_TNamedEnumI(EST_TValuedEnumDefinition<const char *,const char *,INFO> defs[], ENUM (*conv)(const char *))
+ 	{this->initialise((const void *)defs, conv); };
+-  const char *name(ENUM tok, int n=0) const {return value(tok,n); };
++  const char *name(ENUM tok, int n=0) const {return this->value(tok,n); };
+ 
+ };
+ 
+--- festival/src/modules/Text/text_modes.cc.gcc	2012-10-14 13:08:54.000000000 +0800
++++ festival/src/modules/Text/text_modes.cc	2012-10-14 13:09:09.000000000 +0800
+@@ -59,8 +59,8 @@
+ void tts_file_user_mode(LISP filename, LISP params)
+ {
+ 
+-    volatile EST_String tmpname = make_tmp_filename();
+-    volatile EST_String inname = (EST_String)get_c_string(filename);
++    EST_String tmpname = make_tmp_filename();
++    EST_String inname = (EST_String)get_c_string(filename);
+     volatile EST_String filter;
+     volatile EST_TokenStream ts;
+     volatile LISP func;
diff --git a/extra/ffcall/PKGBUILD b/extra/ffcall/PKGBUILD
index cdb920c8a..a328a6e77 100644
--- a/extra/ffcall/PKGBUILD
+++ b/extra/ffcall/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 197949 2013-10-30 11:51:49Z allan $
+# $Id: PKGBUILD 203079 2014-01-03 18:03:13Z bpiotrowski $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Michael Baehr <usemike@spamblocked.com>
 
 pkgname=ffcall
 pkgver=1.10
-pkgrel=4.1
+pkgrel=6
 pkgdesc="C library for implementing foreign function calls in embedded interpreters"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libffcall/"
 license=('GPL2')
-options=('!makeflags')
+options=('!makeflags' 'staticlibs')
 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 350d24f28..744310a4c 100644
--- a/extra/ffmpeg-compat/PKGBUILD
+++ b/extra/ffmpeg-compat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202972 2013-12-29 17:17:30Z bpiotrowski $
+# $Id: PKGBUILD 204592 2014-01-23 13:42:13Z 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.10
-pkgrel=2
+pkgver=0.10.11
+pkgrel=1
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution'
 arch=('i686' 'x86_64' 'mips64el')
@@ -25,7 +25,7 @@ if [ "$CARCH" != "mips64el" ]; then
 fi
 source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2
         ffmpeg-0.10.10-freetype2.patch)
-sha256sums=('936058d7579bfc431b13d47c3f63ee25a0160d4c73cc0fa04fef97cd2394cb91'
+sha256sums=('99a81aa43325de9c670659c15496ef348b5c4c65306caa1ce0893ae5f4f636d0'
             '05cf516b292c3815ecaaf72f12c0c73891b62b47d83f5d81f09380949e691988')
 
 prepare() {
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index c72b8665a..098929b0c 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 202971 2013-12-29 17:17:29Z bpiotrowski $
+# $Id: PKGBUILD 204259 2014-01-15 20:56:02Z bpiotrowski $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=2.1.1
-pkgrel=3
+pkgver=2.1.3
+pkgrel=1
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution'
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,7 +24,7 @@ if [ "${CARCH}" != "mips64el" ]; then
 fi
 source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2
         ffmpeg-2.1.1-freetype2.patch)
-md5sums=('2719ab2b3311ac3775b9cdeb66c54849'
+md5sums=('711b795bbc7b527c0f4a1828f324fd5a'
          '4b5dd079a40f44f4e0d00cdbc9d52ec3')
 
 prepare() {
diff --git a/extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch b/extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch
deleted file mode 100644
index 2ff9f87cc..000000000
--- a/extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From cea5812fa723c08b89d929eeba73462e05de2973 Mon Sep 17 00:00:00 2001
-From: Alexander Strasser <eclipse7@gmx.net>
-Date: Fri, 6 Dec 2013 17:20:26 +0100
-Subject: [PATCH] configure: Special case libfreetype test
-
-Include the freetype header, in-directly through a macro, like it
-is done in the drawtext filter. Do not break if the header is moved.
-
-Unfortunately the drawtext filter included the file where the include
-macros are defined in a wrong way. This is not needed and breaks the
-build. Remove that #include line too.
-
-Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
----
- configure                 |   22 +++++++++++++++++++++-
- libavfilter/vf_drawtext.c |    1 -
- 2 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 205cfc9..0b00684 100755
---- a/configure
-+++ b/configure
-@@ -1128,6 +1128,26 @@ require_pkg_config(){
-     add_extralibs $(get_safe ${pkg}_libs)
- }
- 
-+require_libfreetype(){
-+    log require_libfreetype "$@"
-+    pkg="freetype2"
-+    check_cmd $pkg_config --exists --print-errors $pkg \
-+      || die "ERROR: $pkg not found"
-+    pkg_cflags=$($pkg_config --cflags $pkg)
-+    pkg_libs=$($pkg_config --libs $pkg)
-+    {
-+        echo "#include <ft2build.h>"
-+        echo "#include FT_FREETYPE_H"
-+        echo "long check_func(void) { return (long) FT_Init_FreeType; }"
-+        echo "int main(void) { return 0; }"
-+    } | check_ld "cc" $pkg_cflags $pkg_libs \
-+      && set_safe ${pkg}_cflags $pkg_cflags \
-+      && set_safe ${pkg}_libs   $pkg_libs \
-+      || die "ERROR: $pkg not found"
-+    add_cflags    $(get_safe ${pkg}_cflags)
-+    add_extralibs $(get_safe ${pkg}_libs)
-+}
-+
- hostcc_o(){
-     eval printf '%s\\n' $HOSTCC_O
- }
-@@ -4322,7 +4342,7 @@ enabled libfaac           && require2 libfaac "stdint.h faac.h" faacEncGetVersio
- enabled libfdk_aac        && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
- flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
- enabled libflite          && require2 libflite "flite/flite.h" flite_init $flite_libs
--enabled libfreetype       && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
-+enabled libfreetype       && require_libfreetype
- enabled libgme            && require  libgme gme/gme.h gme_new_emu -lgme -lstdc++
- enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
-                                    check_lib "${gsm_hdr}" gsm_create -lgsm && break;
-diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
-index dde3b0a..91b8218 100644
---- a/libavfilter/vf_drawtext.c
-+++ b/libavfilter/vf_drawtext.c
-@@ -48,7 +48,6 @@
- #include "video.h"
- 
- #include <ft2build.h>
--#include <freetype/config/ftheader.h>
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
- #if CONFIG_FONTCONFIG
--- 
-1.7.10.4
-
diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD
index d9d7e8f8f..3f6e61206 100644
--- a/extra/fontforge/PKGBUILD
+++ b/extra/fontforge/PKGBUILD
@@ -1,63 +1,54 @@
-# $Id: PKGBUILD 197956 2013-10-30 11:54:42Z allan $
+# $Id: PKGBUILD 203200 2014-01-05 09:58:03Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=fontforge
-pkgver=20120731_b
-pkgrel=6
+_pkgver=2.0.20140101
+pkgver=${_pkgver##*.}
+pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 url='http://fontforge.sourceforge.net/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro'
-         'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme')
-source=("http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-${pkgver//_/-}.tar.bz2"
+         'libltdl' 'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme')
+source=("https://github.com/fontforge/fontforge/archive/${_pkgver}.tar.gz"
         'http://fontforge.org/cidmaps.tgz')
-sha1sums=('b520f532b48e557c177dffa29120225066cc4e84'
+sha1sums=('abce297e53e8b6ff6f08871e53d1eb0be5ab82e7'
           'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
 
-# 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=('!makeflags')
 install=install
 
 prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver//_/-}"
-	sed 's/python /python2 /g' -i Makefile.dynamic.in
-	sed \
-		-e'/^#include <gif_lib.h>/i #include <stddef.h>' \
-		-e 's/\(DGifOpenFileName([^)]*\))/\1,NULL)/g' \
-		-i configure gutils/gimagereadgif.c
+	cd "${srcdir}/${pkgname}-${_pkgver}"
+	sed '/fontforge_package_name/s/^#//' -i configure.ac
+	./autogen.sh
 }
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver//_/-}"
+	cd "${srcdir}/${pkgname}-${_pkgver}"
+	export PYTHON=python2
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
-		--enable-type3 \
-		--enable-devicetables \
-		--enable-double \
-		--with-regular-link \
-		--with-python=python2 \
-		--enable-pyextension \
+		--enable-python-extension \
 
 	make
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver//_/-}"
+	cd "${srcdir}/${pkgname}-${_pkgver}"
 	make DESTDIR="${pkgdir}" install
 
 	install -d "${pkgdir}/usr/share/fontforge"
 	install -m644 ../Adobe-* "${pkgdir}/usr/share/fontforge"
 
 	install -d "${pkgdir}/usr/share/icons"
-	cp -a Packaging/icons "${pkgdir}/usr/share/icons/hicolor"
+	cp -a desktop/icons "${pkgdir}/usr/share/icons/hicolor"
 	rm -fr "${pkgdir}/usr/share/icons/hicolor/src"
 
 	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -Dm644 Packaging/fontforge.desktop "${pkgdir}/usr/share/applications/fontforge.desktop"
+	install -Dm644 desktop/fontforge.desktop "${pkgdir}/usr/share/applications/fontforge.desktop"
 }
diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD
index 6b5586369..5a4520eaa 100644
--- a/extra/freeciv/PKGBUILD
+++ b/extra/freeciv/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 201416 2013-12-10 20:59:46Z eric $
+# $Id: PKGBUILD 205826 2014-02-10 19:19:39Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=freeciv
-pkgver=2.4.1
+pkgver=2.4.2
 pkgrel=1
 pkgdesc="A multiuser clone of the famous Microprose game of Civilization"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('gtk2' 'sdl_mixer' 'lua51' 'sqlite' 'curl' 'libltdl')
 backup=('etc/freeciv/database.lua')
 install=freeciv.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('16fddc97c91e99b31f23fc80746b3454f8f55f78')
+sha1sums=('fe8aad19a3d99ebc641678c948417fa7d0c762e9')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/freetds/PKGBUILD b/extra/freetds/PKGBUILD
index 80c6a9e89..454f9c584 100644
--- a/extra/freetds/PKGBUILD
+++ b/extra/freetds/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 197962 2013-10-30 11:56:55Z allan $
+# $Id: PKGBUILD 204952 2014-02-01 16:16:26Z eric $
 # Maintainer:
-# Contributor: Aaron Malone <aaron@munge.net>
 
 pkgname=freetds
 pkgver=0.91
-pkgrel=3
+pkgrel=4
 pkgdesc='Library for accessing Sybase and MS SQL Server databases'
 url='http://www.freetds.org'
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-depends=('unixodbc')
+depends=('openssl' 'unixodbc')
 backup=('etc/freetds/freetds.conf'
         'etc/freetds/locales.conf'
         'etc/freetds/pool.conf')
@@ -17,12 +16,13 @@ source=("ftp://ftp.freetds.org/pub/freetds/stable/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('e88e96800c89d62307812315b235eb18')
 
 build() {
-	cd ${pkgname}-${pkgver}
-	./configure --prefix=/usr --sysconfdir=/etc/freetds --mandir=/usr/share/man --enable-msdblib --with-tdsver=7.0
-	make
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc/freetds --enable-msdblib \
+    --with-tdsver=7.0 --with-unixodbc=/usr --with-openssl
+  make 
 }
 
 package() {
-	cd ${pkgname}-${pkgver}
-	make DESTDIR="${pkgdir}" install
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/fribidi/PKGBUILD b/extra/fribidi/PKGBUILD
index 09d9671f7..dab0e5bb6 100644
--- a/extra/fribidi/PKGBUILD
+++ b/extra/fribidi/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 197964 2013-10-30 11:57:39Z allan $
+# $Id: PKGBUILD 203466 2014-01-11 09:29:09Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Nezmer <Nezmer@gmail.com>
 
 pkgname=fribidi
-pkgver=0.19.5
+pkgver=0.19.6
 pkgrel=1
 pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://fribidi.org"
-depends=('glibc')
+depends=('glib2')
 source=("http://fribidi.org/download/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('925bafb97afee8a2fc2d0470c072a155')
+md5sums=('ce93d862344991173dabb609bf93ca1d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/fsarchiver/PKGBUILD b/extra/fsarchiver/PKGBUILD
index d4f830fcc..e01f2c01b 100644
--- a/extra/fsarchiver/PKGBUILD
+++ b/extra/fsarchiver/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 185201 2013-05-12 06:37:28Z bpiotrowski $
-# Maintainer:
+# $Id: PKGBUILD 206055 2014-02-16 12:39:31Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=fsarchiver
-pkgver=0.6.17
-pkgrel=2
+pkgver=0.6.18
+pkgrel=1
 pkgdesc='Safe and flexible file-system backup and deployment tool'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.fsarchiver.org/'
 license=('GPL2')
 depends=('bzip2' 'e2fsprogs' 'lzo2' 'xz' 'libgcrypt')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha1sums=('3b1049b674f3be45ecda5a91a584c7ddc3781e6b')
+md5sums=('61bfe46dd1aca508169a96dfcd48a630')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gc/PKGBUILD b/extra/gc/PKGBUILD
index c3b8bc407..ff2c9b5c5 100644
--- a/extra/gc/PKGBUILD
+++ b/extra/gc/PKGBUILD
@@ -1,33 +1,34 @@
-# $Id: PKGBUILD 197970 2013-10-30 11:59:52Z allan $
+# $Id: PKGBUILD 204775 2014-01-27 06:51:27Z jgc $
 # Maintainer: Daniel Isenmann <daniel [at] archlinux.org>
 # Contributor: dorphell <dorphell@gmx.net>
 
 pkgname=gc
-pkgver=7.2.d
-pkgrel=2
+pkgver=7.4.0
+pkgrel=1
 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')
-md5sums=('91340b28c61753a789eb6077675d87d2')
+source=("http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${pkgname}-${pkgver}.tar.gz")
+depends=('gcc-libs' 'libatomic_ops')
+md5sums=('f40d9a47c90d60791eeecb484f8df5ee')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed -i 's#pkgdata#doc#' doc/doc.am
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-7.2"
+  cd ${pkgname}-${pkgver}
+  autoreconf -fi
   ./configure --prefix=/usr --enable-cplusplus --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-7.2"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
-  rm -rf "${pkgdir}/usr/share/gc"
-  install -m755 -d "${pkgdir}/usr/share/doc/gc"
-  install -m644 doc/README{,.{changes,contributors,environment,linux}} \
-    "${pkgdir}/usr/share/doc/gc/"
-
   sed -i -e 's/GC_MALLOC 1L/gc 3/' doc/gc.man
   install -m755 -d "${pkgdir}/usr/share/man/man3"
   install -m644 doc/gc.man "${pkgdir}/usr/share/man/man3/gc.3"
diff --git a/extra/gcr/PKGBUILD b/extra/gcr/PKGBUILD
index bec772cdc..d2b1d3fd3 100644
--- a/extra/gcr/PKGBUILD
+++ b/extra/gcr/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 197973 2013-10-30 12:01:04Z allan $
+# $Id: PKGBUILD 203572 2014-01-13 17:12:02Z andyrtr $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gcr
 pkgver=3.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for bits of crypto UI and parsing"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL2')
 depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt')
-makedepends=('intltool' 'gobject-introspection' 'python')
+makedepends=('intltool' 'gobject-introspection' 'python' 'vala')
 install=gcr.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         10-gcr.conf)
diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD
index 398cb7fb0..1feb93763 100644
--- a/extra/gdb/PKGBUILD
+++ b/extra/gdb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 201560 2013-12-15 06:41:56Z allan $
+# $Id: PKGBUILD 205618 2014-02-10 03:08:15Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdb
-pkgver=7.6.2
+pkgver=7.7
 pkgrel=1
 pkgdesc="The GNU Debugger"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('texinfo')
 backup=('etc/gdb/gdbinit')
 install=gdb.install
 source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('496399e96654fc0f899a5c964bc1f0f8'
+md5sums=('271a18f41858a7e98b28ae4eb91287c9'
          'SKIP')
 
 prepare() {
@@ -44,6 +44,5 @@ package() {
 
   # resolve conflicts with binutils
   rm ${pkgdir}/usr/include/{ansidecl,bfd,bfdlink,dis-asm,symcat}.h
-  rm ${pkgdir}/usr/lib/{libbfd,libiberty,libopcodes}.a
   rm ${pkgdir}/usr/share/info/{bfd,configure,standards}.info
 }
diff --git a/extra/gdb/gdb.install b/extra/gdb/gdb.install
index e260d0225..34b9384bd 100644
--- a/extra/gdb/gdb.install
+++ b/extra/gdb/gdb.install
@@ -1,5 +1,5 @@
 infodir=usr/share/info
-filelist=(annotate.info gdb.info{,-{1,2,3,4,5,6,7}} gdbint.info{,-{1,2}} stabs.info)
+filelist=(annotate.info gdb.info{,-{1,2,3,4,5,6}} stabs.info)
 
 post_install() {
   [[ -x usr/bin/install-info ]] || return 0
diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index 003a3073c..ce8e750e8 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 201638 2013-12-17 11:09:15Z heftig $
+# $Id: PKGBUILD 205063 2014-02-04 00:48:48Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gdk-pixbuf2
-pkgver=2.30.2
+pkgver=2.30.4
 pkgrel=1
 pkgdesc="An image loading library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11' 'jasper')
 makedepends=('gtk-doc' 'gobject-introspection')
 install=gdk-pixbuf2.install
 source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('cababfa075a9a60426809309ec86b82ea28e83f44ef69c898e48c040b6feecbf')
+sha256sums=('a13bbad0d804829b260bc901dc7d284d330c534489fc1666c126fa4555bbb051')
 
 build() {
   cd gdk-pixbuf-$pkgver
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index 418189c15..9c4f332a6 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 202235 2013-12-20 16:53:55Z heftig $
+# $Id: PKGBUILD 204519 2014-01-22 00:27:30Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
-pkgver=3.10.3
+pkgver=3.10.4
 pkgrel=1
 pkgdesc="A text editor for GNOME"
 arch=(i686 x86_64 mips64el)
@@ -16,7 +16,7 @@ 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=('d0efec59622061389fcc06d23b88e2621d4d66b4bafe7d4461c1c7d48a54bc82')
+sha256sums=('40dc10b6e26fd8523087e7321a20a063f4c1e586dffd7ce8ee78eead11359f9e')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/geeqie/PKGBUILD b/extra/geeqie/PKGBUILD
index 68f9e1ccc..9d378d4aa 100644
--- a/extra/geeqie/PKGBUILD
+++ b/extra/geeqie/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 168110 2012-10-06 01:00:22Z eric $
+# $Id: PKGBUILD 204754 2014-01-26 12:15:58Z andyrtr $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgname=geeqie
 pkgver=1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A lightweight image browser and viewer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://geeqie.sourceforge.net/"
diff --git a/extra/geoclue2/PKGBUILD b/extra/geoclue2/PKGBUILD
index 8950df832..1c18126d4 100644
--- a/extra/geoclue2/PKGBUILD
+++ b/extra/geoclue2/PKGBUILD
@@ -1,20 +1,26 @@
-# $Id: PKGBUILD 197983 2013-10-30 12:04:51Z allan $
+# $Id: PKGBUILD 206065 2014-02-16 16:10:59Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=geoclue2
-pkgver=1.99.4
+pkgver=2.0.0
 pkgrel=1
-pkgdesc="Modular geoinformation service built on the D-Bus messaging system."
+pkgdesc="Modular geoinformation service built on the D-Bus messaging system"
 arch=(i686 x86_64)
 url="http://geoclue.freedesktop.org/"
 license=(LGPL)
 depends=(libsoup json-glib)
 makedepends=(intltool geoip)
 optdepends=('geoip: geoip-lookup server binary')
-install=geoclue.install
-source=(http://freedesktop.org/software/geoclue/releases/1.99/geoclue-$pkgver.tar.xz)
-md5sums=('b991f4a409b492996a38627ee18fa76e')
+source=(http://freedesktop.org/software/geoclue/releases/2.0/geoclue-$pkgver.tar.xz
+        https.patch)
+md5sums=('401ff99d530b177c62afacef0a33efd9'
+         '20da579a0f1f6476a9c2ba9adebec32c')
+
+prepare() {
+  cd geoclue-$pkgver
+  patch -Np1 -i ../https.patch
+}
 
 build() {
   cd geoclue-$pkgver
diff --git a/extra/geoclue2/https.patch b/extra/geoclue2/https.patch
new file mode 100644
index 000000000..e4eb4e5c9
--- /dev/null
+++ b/extra/geoclue2/https.patch
@@ -0,0 +1,25 @@
+From 12804f7e2e569f7f3a0879d740a62b3e34ae6e36 Mon Sep 17 00:00:00 2001
+From: Stefan Bernhardsgrütter <s.bernhardsgruetter@gmail.com>
+Date: Thu, 02 Jan 2014 13:01:25 +0000
+Subject: ipclient: Use HTTPS to connect to geoip.fedoraproject.org
+
+The actual resource is behind HTTPS so using HTTP leads to
+redirections and thefore redundant TCP packets.
+---
+(limited to 'src/gclue-ipclient.c')
+
+diff --git a/src/gclue-ipclient.c b/src/gclue-ipclient.c
+index 492aa83..6f681f8 100644
+--- a/src/gclue-ipclient.c
++++ b/src/gclue-ipclient.c
+@@ -31,7 +31,7 @@
+ #include "geoip-server/geoip-server.h"
+ #include "geocode-location.h"
+ 
+-#define GEOIP_SERVER "http://geoip.fedoraproject.org/city"
++#define GEOIP_SERVER "https://geoip.fedoraproject.org/city"
+ 
+ /**
+  * SECTION:gclue-ipclient
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/ghostscript/PKGBUILD b/extra/ghostscript/PKGBUILD
new file mode 100644
index 000000000..7e52904c5
--- /dev/null
+++ b/extra/ghostscript/PKGBUILD
@@ -0,0 +1,76 @@
+# $Id: PKGBUILD 204554 2014-01-22 13:38:01Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+
+### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ###
+
+pkgname=ghostscript
+pkgver=9.10
+pkgrel=3
+pkgdesc="An interpreter for the PostScript language"
+arch=('i686' 'x86_64')
+license=('AGPL' 'custom')
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg'
+         'libtiff>=4.0.0' 'lcms2' 'dbus' 'libpaper')
+makedepends=('gtk3' 'gnutls')
+optdepends=('texlive-core:      needed for dvipdf'
+            'gtk3:              needed for gsx')
+url="http://www.ghostscript.com/"
+source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
+options=('!makeflags')
+md5sums=('7179bb1ed4f6f453147e6f7e1f210ce8')
+
+build() {
+  cd ghostscript-${pkgver}
+
+  # force it to use system-libs
+  # keep heavily patched included openjpeg, leads to segfault with system openjpeg
+  # https://bugs.archlinux.org/task/38226
+  rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype cups/libs # jbig2dec is in community
+
+  ./configure --prefix=/usr \
+	--enable-dynamic \
+	--with-ijs \
+	--with-jbig2dec \
+	--with-omni \
+	--with-x \
+	--with-drivers=ALL\
+	--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
+	--enable-fontconfig \
+	--enable-freetype \
+	--enable-openjpeg \
+	--without-luratech \
+	--without-omni \
+	--with-system-libtiff \
+	--with-libpaper \
+	--disable-compile-inits #--help # needed for linking with system-zlib
+  make
+
+  # Build IJS
+  cd ijs
+  sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac
+  ./autogen.sh
+  ./configure --prefix=/usr --enable-shared --disable-static
+  make
+}
+
+package() {
+  cd ghostscript-${pkgver}
+  make DESTDIR="${pkgdir}" \
+	cups_serverroot="${pkgdir}"/etc/cups \
+	cups_serverbin="${pkgdir}"/usr/lib/cups install soinstall
+
+  # install missing doc files # http://bugs.archlinux.org/task/18023
+  install -m 644 "${srcdir}"/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/ghostscript/$pkgver/doc/
+  
+  install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+  # remove unwanted localized man-pages
+  rm -rf "$pkgdir"/usr/share/man/[^man1]*
+
+  # install IJS
+  cd ijs
+  make DESTDIR="${pkgdir}" install
+  
+  # remove filters that are now maintained in cups-filters as upstream home
+  rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster}
+}
diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD
index cbbcb1ceb..dd3f32de4 100644
--- a/extra/gimp/PKGBUILD
+++ b/extra/gimp/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 198812 2013-11-05 16:40:42Z bpiotrowski $
+# $Id: PKGBUILD 203001 2013-12-31 11:59:50Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=gimp
-pkgver=2.8.8
+pkgver=2.8.10
 pkgrel=1
 pkgdesc="GNU Image Manipulation Program"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gimp.org/"
 license=('GPL' 'LGPL')
 depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \
-         'libexif' 'gegl' 'jasper' 'desktop-file-utils' 'hicolor-icon-theme' 'babl')
+         'libexif' 'gegl' 'jasper' 'desktop-file-utils' 'hicolor-icon-theme' 'babl' 'openexr')
 makedepends=('intltool' 'webkitgtk2' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl' 'ghostscript')
 optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
             'webkitgtk2: for the help browser'
@@ -21,14 +21,23 @@ 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=('ef2547c3514a1096931637bd6250635a'
+        uri-backend-libcurl.patch
+	patch_CVE197.patch
+	patch_CVE1913.patch
+	freetype_location.patch)
+md5sums=('84c964aab7044489af69f7319bb59b47'
          'bb27bc214261d36484093e857f015f38'
-         'e894f4b2ffa92c71448fdd350e9b78c6')
+         'e894f4b2ffa92c71448fdd350e9b78c6'
+         '901643efc82fae57af466d8a0a8991ff'
+         'dcc2acc9f9962a7c83ffb4243c08c469'
+         'ca0f32cb329ddad8079f8e2c0fc75b29')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   #patch -p1 < ../uri-backend-libcurl.patch
+  patch -p1 < ../patch_CVE1913.patch
+  patch -p1 < ../patch_CVE197.patch
+  patch -p1 < ../freetype_location.patch
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
     --enable-mp --enable-gimp-console --enable-gimp-remote \
     --enable-python --with-gif-compression=lzw --with-libcurl \
diff --git a/extra/gimp/freetype_location.patch b/extra/gimp/freetype_location.patch
new file mode 100644
index 000000000..4a732d44c
--- /dev/null
+++ b/extra/gimp/freetype_location.patch
@@ -0,0 +1,25 @@
+From 6c73f28b6d87a2afd11974552a075bffec52347f Mon Sep 17 00:00:00 2001
+From: Michael Natterer <mitch@gimp.org>
+Date: Fri, 29 Nov 2013 20:57:46 +0000
+Subject: Bug 719560 - Build failure with freetype 2.5.1
+
+Apply patch from su-v that fixes the freetype include to
+the madness devised and recommended by freetype.
+---
+diff --git a/app/text/gimpfont.c b/app/text/gimpfont.c
+index 4045ca9..66c6e52 100644
+--- a/app/text/gimpfont.c
++++ b/app/text/gimpfont.c
+@@ -28,7 +28,9 @@
+ 
+ #define PANGO_ENABLE_ENGINE  1   /* Argh */
+ #include <pango/pango-ot.h>
+-#include <freetype/tttables.h>
++
++#include <ft2build.h>
++#include FT_TRUETYPE_TABLES_H
+ 
+ #include "text-types.h"
+ 
+--
+cgit v0.9.2
diff --git a/extra/gimp/patch_CVE1913.patch b/extra/gimp/patch_CVE1913.patch
new file mode 100644
index 000000000..17bebe9e5
--- /dev/null
+++ b/extra/gimp/patch_CVE1913.patch
@@ -0,0 +1,30 @@
+From 32ae0f83e5748299641cceaabe3f80f1b3afd03e Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Thu, 14 Nov 2013 13:29:01 +0000
+Subject: file-xwd: sanity check colormap size (CVE-2013-1913)
+
+---
+diff --git a/plug-ins/common/file-xwd.c b/plug-ins/common/file-xwd.c
+index c8e1a6e..343129a 100644
+--- a/plug-ins/common/file-xwd.c
++++ b/plug-ins/common/file-xwd.c
+@@ -466,6 +466,17 @@ load_image (const gchar  *filename,
+   /* Position to start of XWDColor structures */
+   fseek (ifp, (long)xwdhdr.l_header_size, SEEK_SET);
+ 
++  /* Guard against insanely huge color maps -- gimp_image_set_colormap() only
++   * accepts colormaps with 0..256 colors anyway. */
++  if (xwdhdr.l_colormap_entries > 256)
++    {
++      g_message (_("'%s':\nIllegal number of colormap entries: %ld"),
++                 gimp_filename_to_utf8 (filename),
++                 (long)xwdhdr.l_colormap_entries);
++      fclose (ifp);
++      return -1;
++    }
++
+   if (xwdhdr.l_colormap_entries > 0)
+     {
+       xwdcolmap = g_new (L_XWDCOLOR, xwdhdr.l_colormap_entries);
+--
+cgit v0.9.2
diff --git a/extra/gimp/patch_CVE197.patch b/extra/gimp/patch_CVE197.patch
new file mode 100644
index 000000000..48f9123d9
--- /dev/null
+++ b/extra/gimp/patch_CVE197.patch
@@ -0,0 +1,150 @@
+From 23f685931e5f000dd033a45c60c1e60d7f78caf4 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Tue, 26 Nov 2013 09:49:42 +0000
+Subject: file-xwd: sanity check # of colors and map entries (CVE-2013-1978)
+
+The number of colors in an image shouldn't be higher than the number of
+colormap entries. Additionally, consolidate post error cleanup in
+load_image().
+---
+diff --git a/plug-ins/common/file-xwd.c b/plug-ins/common/file-xwd.c
+index 343129a..4df9ce8 100644
+--- a/plug-ins/common/file-xwd.c
++++ b/plug-ins/common/file-xwd.c
+@@ -429,9 +429,9 @@ static gint32
+ load_image (const gchar  *filename,
+             GError      **error)
+ {
+-  FILE            *ifp;
++  FILE            *ifp = NULL;
+   gint             depth, bpp;
+-  gint32           image_ID;
++  gint32           image_ID = -1;
+   L_XWDFILEHEADER  xwdhdr;
+   L_XWDCOLOR      *xwdcolmap = NULL;
+ 
+@@ -441,7 +441,7 @@ load_image (const gchar  *filename,
+       g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
+                    _("Could not open '%s' for reading: %s"),
+                    gimp_filename_to_utf8 (filename), g_strerror (errno));
+-      return -1;
++      goto out;
+     }
+ 
+   read_xwd_header (ifp, &xwdhdr);
+@@ -450,8 +450,7 @@ load_image (const gchar  *filename,
+       g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                    _("Could not read XWD header from '%s'"),
+                    gimp_filename_to_utf8 (filename));
+-      fclose (ifp);
+-      return -1;
++      goto out;
+     }
+ 
+ #ifdef XWD_COL_WAIT_DEBUG
+@@ -473,12 +472,18 @@ load_image (const gchar  *filename,
+       g_message (_("'%s':\nIllegal number of colormap entries: %ld"),
+                  gimp_filename_to_utf8 (filename),
+                  (long)xwdhdr.l_colormap_entries);
+-      fclose (ifp);
+-      return -1;
++      goto out;
+     }
+ 
+   if (xwdhdr.l_colormap_entries > 0)
+     {
++      if (xwdhdr.l_colormap_entries < xwdhdr.l_ncolors)
++        {
++          g_message (_("'%s':\nNumber of colormap entries < number of colors"),
++                     gimp_filename_to_utf8 (filename));
++          goto out;
++        }
++
+       xwdcolmap = g_new (L_XWDCOLOR, xwdhdr.l_colormap_entries);
+ 
+       read_xwd_cols (ifp, &xwdhdr, xwdcolmap);
+@@ -498,9 +503,7 @@ load_image (const gchar  *filename,
+       if (xwdhdr.l_file_version != 7)
+         {
+           g_message (_("Can't read color entries"));
+-          g_free (xwdcolmap);
+-          fclose (ifp);
+-          return (-1);
++          goto out;
+         }
+     }
+ 
+@@ -508,9 +511,7 @@ load_image (const gchar  *filename,
+     {
+       g_message (_("'%s':\nNo image width specified"),
+                  gimp_filename_to_utf8 (filename));
+-      g_free (xwdcolmap);
+-      fclose (ifp);
+-      return (-1);
++      goto out;
+     }
+ 
+   if (xwdhdr.l_pixmap_width > GIMP_MAX_IMAGE_SIZE
+@@ -518,27 +519,21 @@ load_image (const gchar  *filename,
+     {
+       g_message (_("'%s':\nImage width is larger than GIMP can handle"),
+                  gimp_filename_to_utf8 (filename));
+-      g_free (xwdcolmap);
+-      fclose (ifp);
+-      return (-1);
++      goto out;
+     }
+ 
+   if (xwdhdr.l_pixmap_height <= 0)
+     {
+       g_message (_("'%s':\nNo image height specified"),
+                  gimp_filename_to_utf8 (filename));
+-      g_free (xwdcolmap);
+-      fclose (ifp);
+-      return (-1);
++      goto out;
+     }
+ 
+   if (xwdhdr.l_pixmap_height > GIMP_MAX_IMAGE_SIZE)
+     {
+       g_message (_("'%s':\nImage height is larger than GIMP can handle"),
+                  gimp_filename_to_utf8 (filename));
+-      g_free (xwdcolmap);
+-      fclose (ifp);
+-      return (-1);
++      goto out;
+     }
+ 
+   gimp_progress_init_printf (_("Opening '%s'"),
+@@ -591,11 +586,6 @@ load_image (const gchar  *filename,
+     }
+   gimp_progress_update (1.0);
+ 
+-  fclose (ifp);
+-
+-  if (xwdcolmap)
+-    g_free (xwdcolmap);
+-
+   if (image_ID == -1 && ! (error && *error))
+     g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                  _("XWD-file %s has format %d, depth %d and bits per pixel %d. "
+@@ -603,6 +593,17 @@ load_image (const gchar  *filename,
+                  gimp_filename_to_utf8 (filename),
+                  (gint) xwdhdr.l_pixmap_format, depth, bpp);
+ 
++out:
++  if (ifp)
++    {
++      fclose (ifp);
++    }
++
++  if (xwdcolmap)
++    {
++      g_free (xwdcolmap);
++    }
++
+   return image_ID;
+ }
+ 
+--
+cgit v0.9.2
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index ac4faa705..935849041 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 201683 2013-12-18 01:22:42Z dan $
+# $Id: PKGBUILD 206015 2014-02-15 16:11:08Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.8.5.2
+pkgver=1.9.0
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
 url="http://git-scm.com/"
 license=('GPL2')
 depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre')
-makedepends=('python2' 'emacs-nox' 'libgnome-keyring')
+makedepends=('python2' 'emacs' 'libgnome-keyring' 'xmlto' 'asciidoc')
 optdepends=('tk: gitk and git gui'
             'perl-libwww: git svn'
             'perl-term-readkey: git svn'
@@ -24,7 +24,6 @@ replaces=('git-core')
 provides=('git-core')
 install=git.install
 source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz"
-        "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz"
         git-daemon@.service
         git-daemon.socket)
 
@@ -35,7 +34,8 @@ build() {
     CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
     USE_LIBPCRE=1 \
     NO_CROSS_DIRECTORY_HARDLINKS=1 \
-    all
+    MAN_BOLD_LITERAL=1 \
+    all doc
 
   make -C contrib/emacs prefix=/usr
   make -C contrib/credential/gnome-keyring
@@ -60,6 +60,7 @@ check() {
     CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
     USE_LIBPCRE=1 \
     NO_CROSS_DIRECTORY_HARDLINKS=1 \
+    MAN_BOLD_LITERAL=1 \
     NO_SVN_TESTS=y \
     DEFAULT_TEST_TARGET=prove \
     GIT_PROVE_OPTS="$jobs -Q" \
@@ -74,7 +75,8 @@ package() {
     CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
     USE_LIBPCRE=1 \
     NO_CROSS_DIRECTORY_HARDLINKS=1 \
-    INSTALLDIRS=vendor DESTDIR="$pkgdir" install
+    MAN_BOLD_LITERAL=1 \
+    INSTALLDIRS=vendor DESTDIR="$pkgdir" install install-doc
 
   # bash completion
   mkdir -p "$pkgdir"/usr/share/bash-completion/completions/
@@ -101,14 +103,6 @@ package() {
   sed -i 's|#![ ]*/usr/bin/python$|#!/usr/bin/python2|' \
     "$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py
 
-
-  # how 'bout some manpages?
-  for mansect in man1 man5 man7; do
-    for manpage in "$srcdir"/$mansect/*; do
-      install -D -m644 $manpage "$pkgdir"/usr/share/man/$mansect/$(basename $manpage)
-    done
-  done
-
   # remove perllocal.pod, .packlist, and empty directories.
   rm -rf "$pkgdir"/usr/lib/perl5
 
@@ -117,7 +111,9 @@ package() {
   install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
 }
 
-md5sums=('df8519044f9880f3687d863d99245282'
-         '27851cc39808f1be6d3789fae87c8308'
+md5sums=('55c3b57b9d168facbc681d9f7b9a0803'
+         '042524f942785772d7bd52a1f02fe5ae'
+         'f67869315c2cc112e076f0c73f248002')
+md5sums=('e16c14b27c644b8e0dd72bdb5ff77450'
          '042524f942785772d7bd52a1f02fe5ae'
          'f67869315c2cc112e076f0c73f248002')
diff --git a/extra/glamor-egl/PKGBUILD b/extra/glamor-egl/PKGBUILD
index 1a8f1336a..417fecc3a 100644
--- a/extra/glamor-egl/PKGBUILD
+++ b/extra/glamor-egl/PKGBUILD
@@ -3,24 +3,29 @@
 # Contributor: Eugeni Dodonov <eugeni@dodonov.net>
 
 pkgname=glamor-egl
-pkgver=0.5.1
+pkgver=0.6.0
 pkgrel=1
 pkgdesc='OpenGL based 2D rendering acceleration library'
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('mesa-libgl')
-makedepends=('xorg-server-devel')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'git')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16' 'glamor-git')
+#source=('glamor-egl::git+http://anongit.freedesktop.org/git/xorg/driver/glamor.git#commit=2b4a324b03c3ee34de1c122a6db4e6ce7146a3e0')
+#sha256sums=(SKIP)
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-conflicts=('glamor-git')
-sha256sums=('f42805b68e2bddc90cb5d9d3811e4f2176659c5686f295865839b20b7be7f359')
+sha256sums=('66531b56e6054eb53daa7bd57eb6358a7ead1b84f63419606e69d1092365e5c9')
+
+# revision: git rev-list --count master
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$pkgname-$pkgver"
   
   ./configure --prefix=/usr \
     --disable-static \
     --enable-glx-tls \
+    --enable-xv \
     #--with-xorg-conf-dir=/etc/X11/xorg.conf.d
     #--help
     #--enable-glamor-gles2 \ https://bugs.archlinux.org/task/34284
@@ -29,7 +34,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
 
   make "DESTDIR=${pkgdir}" install
 
diff --git a/extra/glamor-egl/compat-api.h b/extra/glamor-egl/compat-api.h
deleted file mode 100644
index 1608478f8..000000000
--- a/extra/glamor-egl/compat-api.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2012 Red Hat, Inc.
- *
- * 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
- * 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.
- *
- * Author: Dave Airlie <airlied@redhat.com>
- */
-
-/* this file provides API compat between server post 1.13 and pre it,
-   it should be reused inside as many drivers as possible */
-#ifndef COMPAT_API_H
-#define COMPAT_API_H
-
-#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
-#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
-#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
-#endif
-
-#ifndef XF86_HAS_SCRN_CONV
-#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
-#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
-#endif
-
-#ifndef XF86_SCRN_INTERFACE
-
-#define SCRN_ARG_TYPE int
-#define SCRN_INFO_PTR(arg1) ScrnInfoPtr scrn = xf86Screens[(arg1)]
-
-#define SCREEN_ARG_TYPE int
-#define SCREEN_PTR(arg1) ScreenPtr screen = screenInfo.screens[(arg1)]
-
-#define SCREEN_INIT_ARGS_DECL int scrnIndex, ScreenPtr screen, int argc, char **argv
-
-#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer timeout, pointer read_mask
-#define BLOCKHANDLER_ARGS arg, blockData, timeout, read_mask
-
-#define WAKEUPHANDLER_ARGS_DECL int arg, pointer wakeupData, unsigned long result, pointer read_mask
-#define WAKEUPHANDLER_ARGS arg, wakeupData, result, read_mask
-
-#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr screen
-#define CLOSE_SCREEN_ARGS scrnIndex, screen
-
-#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
-#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
-
-#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
-#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
-
-#define FREE_SCREEN_ARGS_DECL int arg, int flags
-#define FREE_SCREEN_ARGS	arg, flags
-
-#define VT_FUNC_ARGS_DECL int arg, int flags
-#define VT_FUNC_ARGS(flags) scrn->scrnIndex, (flags)
-
-#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex)
-
-#else
-#define SCRN_ARG_TYPE ScrnInfoPtr
-#define SCRN_INFO_PTR(arg1) ScrnInfoPtr scrn = (arg1)
-
-#define SCREEN_ARG_TYPE ScreenPtr
-#define SCREEN_PTR(arg1) ScreenPtr screen = (arg1)
-
-#define SCREEN_INIT_ARGS_DECL ScreenPtr screen, int argc, char **argv
-
-#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer timeout, pointer read_mask
-#define BLOCKHANDLER_ARGS arg, timeout, read_mask
-
-#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask
-#define WAKEUPHANDLER_ARGS arg, result, read_mask
-
-#define CLOSE_SCREEN_ARGS_DECL ScreenPtr screen
-#define CLOSE_SCREEN_ARGS screen
-
-#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
-#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
-
-#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
-#define SWITCH_MODE_ARGS(arg, m) arg, m
-
-#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
-#define FREE_SCREEN_ARGS	arg
-
-#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
-#define VT_FUNC_ARGS(flags) scrn
-
-#define XF86_ENABLEDISABLEFB_ARG(x) (x)
-
-#endif
-#endif
diff --git a/extra/glamor-egl/compiler.h b/extra/glamor-egl/compiler.h
deleted file mode 100644
index fa2895976..000000000
--- a/extra/glamor-egl/compiler.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2011 Intel Corporation
- *
- * 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
- * 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.
- *
- * Authors:
- *    Chris Wilson <chris@chris-wilson.co.uk>
- *
- *    Copied from sna 
- *
- */
-
-#ifndef _GLAMOR_COMPILER_H_
-#define _GLAMOR_COMPILER_H_
-
-#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
-#define likely(expr) (__builtin_expect (!!(expr), 1))
-#define unlikely(expr) (__builtin_expect (!!(expr), 0))
-#define noinline __attribute__((noinline))
-#define fastcall __attribute__((regparm(3)))
-#define must_check __attribute__((warn_unused_result))
-#define constant __attribute__((const))
-#else
-#define likely(expr) (expr)
-#define unlikely(expr) (expr)
-#define noinline
-#define fastcall
-#define must_check
-#define constant
-#endif
-
-#ifdef HAVE_VALGRIND
-#define VG(x) x
-#else
-#define VG(x)
-#endif
-
-#define VG_CLEAR(s) VG(memset(&s, 0, sizeof(s)))
-
-#define COMPILE_TIME_ASSERT(E) ((void)sizeof(char[1 - 2*!(E)]))
-
-#endif /* _SNA_COMPILER_H_ */
diff --git a/extra/glamor-egl/git-fixes.patch b/extra/glamor-egl/git-fixes.patch
deleted file mode 100644
index 7a03a225e..000000000
--- a/extra/glamor-egl/git-fixes.patch
+++ /dev/null
@@ -1,428 +0,0 @@
-From beeddaae1da253d1a442228a75f80ef40a0204ac Mon Sep 17 00:00:00 2001
-From: Michel Dänzer <michel.daenzer@amd.com>
-Date: Wed, 31 Oct 2012 15:56:00 +0000
-Subject: Don't use glBlitFramebufferEXT for overlapping copies.
-
-According to the GL_EXT_framebuffer_blit spec, the result of doing so is
-undefined. But we need well-defined results. :)
-
-Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
----
-diff --git a/src/glamor_copyarea.c b/src/glamor_copyarea.c
-index 7d06833..4e6f953 100644
---- a/src/glamor_copyarea.c
-+++ b/src/glamor_copyarea.c
-@@ -318,7 +318,8 @@ __glamor_copy_n_to_n(DrawablePtr src,
- 		dx, dy,
- 		src_pixmap, dst_pixmap);
- #ifndef GLAMOR_GLES2
--	if ((overlaped || glamor_priv->state != RENDER_STATE
-+	if (!overlaped &&
-+	    (glamor_priv->state != RENDER_STATE
- 	     || !src_pixmap_priv->base.gl_tex || !dst_pixmap_priv->base.gl_tex)
- 	    && glamor_copy_n_to_n_fbo_blit(src, dst, gc, box, nbox, dx,
- 					   dy)) {
---
-cgit v0.9.0.2-2-gbebe
-From f1457c1c59efdadbad25f01dce9433643d688844 Mon Sep 17 00:00:00 2001
-From: Zhigang Gong <zhigang.gong@linux.intel.com>
-Date: Tue, 13 Nov 2012 02:08:02 +0000
-Subject: glamor_compositerects: Need to initialize region before fallback.
-
-As we need to call DamageRegionAppend even for fallback path,
-we must initialize the region before do that. Pointed by
-Igor Vagulin.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=56940
-
-Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
----
-diff --git a/src/glamor_compositerects.c b/src/glamor_compositerects.c
-index 5fe1bbf..f1564a2 100644
---- a/src/glamor_compositerects.c
-+++ b/src/glamor_compositerects.c
-@@ -131,16 +131,6 @@ glamor_composite_rectangles(CARD8	 op,
- 		return;
- 	}
- 
--	pixmap = glamor_get_drawable_pixmap(dst->pDrawable);
--	priv = glamor_get_pixmap_private(pixmap);
--
--	if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(priv))
--		goto fallback;
--	if (dst->alphaMap) {
--		DEBUGF("%s: fallback, dst has an alpha-map\n", __FUNCTION__);
--		goto fallback;
--	}
--
- 	if ((color->red|color->green|color->blue|color->alpha) <= 0x00ff) {
- 		switch (op) {
- 		case PictOpOver:
-@@ -204,6 +194,16 @@ glamor_composite_rectangles(CARD8	 op,
- 		return;
- 	}
- 
-+	pixmap = glamor_get_drawable_pixmap(dst->pDrawable);
-+	priv = glamor_get_pixmap_private(pixmap);
-+
-+	if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(priv))
-+		goto fallback;
-+	if (dst->alphaMap) {
-+		DEBUGF("%s: fallback, dst has an alpha-map\n", __FUNCTION__);
-+		goto fallback;
-+	}
-+
- 	need_free_region = TRUE;
- 
- 	DEBUGF("%s: drawable extents (%d, %d),(%d, %d) x %d\n",
---
-cgit v0.9.0.2-2-gbebe
-From 4a0ac3ff00d70b13e8483d50657187c7abdfc110 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Sat, 29 Dec 2012 06:28:17 +0000
-Subject: glamor: fix make distcheck part 1
-
-This just adds the headers, then it falls over on the sdk_HEADERS
-as it overrides proper install paths by the looks of it.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 766aac7..e1ee86d 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -20,10 +20,13 @@ AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS) $(LIBDRM_CFLAGS)
- libglamor_la_LDFLAGS = -avoid-version
- 
- libglamor_la_SOURCES = \
-+	compat-api.h \
- 	glamor.c \
- 	glamor_copyarea.c \
- 	glamor_copywindow.c \
- 	glamor_core.c \
-+	glamor_debug.h \
-+	glamor_gl_dispatch.h \
- 	glamor_fill.c \
- 	glamor_fillspans.c \
- 	glamor_getspans.c \
-@@ -42,6 +45,7 @@ libglamor_la_SOURCES = \
- 	glamor_copyplane.c\
- 	glamor_glyphblt.c\
- 	glamor_polyops.c\
-+	glamor_priv.h\
- 	glamor_pixmap.c\
- 	glamor_largepixmap.c\
- 	glamor_picture.c\
-@@ -49,7 +53,9 @@ libglamor_la_SOURCES = \
- 	glamor_gl_dispatch.c\
- 	glamor_fbo.c\
- 	glamor_compositerects.c\
--	glamor.h
-+	glamor_utils.h\
-+	glamor.h\
-+	glapi.h
- 
- sdk_HEADERS = glamor.h
- 
---
-cgit v0.9.0.2-2-gbebe
-From c6d9cb1eb4962a15f8bbc869e9fef6d1464165af Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Sat, 29 Dec 2012 06:42:10 +0000
-Subject: glamor: add compiler.h
-
-This is also required for distchecking.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e1ee86d..55721f6 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -21,6 +21,7 @@ libglamor_la_LDFLAGS = -avoid-version
- 
- libglamor_la_SOURCES = \
- 	compat-api.h \
-+	compiler.h \
- 	glamor.c \
- 	glamor_copyarea.c \
- 	glamor_copywindow.c \
---
-cgit v0.9.0.2-2-gbebe
-From c0729336ae35dcc7e46bcf840d6e9a056d5cdd26 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Sat, 29 Dec 2012 06:42:30 +0000
-Subject: glamor_utils: fix unlikely define use
-
-using a define across a split line expression is failure, compiling
-with warnings shows this up.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/glamor_utils.h b/src/glamor_utils.h
-index 36beb49..d307838 100644
---- a/src/glamor_utils.h
-+++ b/src/glamor_utils.h
-@@ -80,8 +80,7 @@
- 
- #define pixmap_priv_get_fbo_off(_priv_, _xoff_, _yoff_)		\
-    do {								\
--	if (unlikely(_priv_ && (_priv_)->type				\
--		== GLAMOR_TEXTURE_LARGE)) {			\
-+	if (unlikely(_priv_ && (_priv_)->type == GLAMOR_TEXTURE_LARGE)) {  \
- 		*(_xoff_) = - (_priv_)->large.box.x1;	\
- 		*(_yoff_) = - (_priv_)->large.box.y1;	\
- 	} else {						\
---
-cgit v0.9.0.2-2-gbebe
-From 61879504f86c5cb326cc06a5873283234cfbbcd2 Mon Sep 17 00:00:00 2001
-From: Michel Dänzer <michel.daenzer@amd.com>
-Date: Wed, 13 Mar 2013 16:15:33 +0000
-Subject: glamoregl: Use xf86ScreenToScrn()
-
-Fixes crashes when glamor is used for a GPU screen with xserver 1.13 or
-newer.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57200#c17
-
-Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
-Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/glamor_egl.c b/src/glamor_egl.c
-index a248aa2..cd0bdc0 100644
---- a/src/glamor_egl.c
-+++ b/src/glamor_egl.c
-@@ -116,7 +116,7 @@ glamor_egl_get_screen_private(ScrnInfoPtr scrn)
- _X_EXPORT void
- glamor_egl_make_current(ScreenPtr screen)
- {
--	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
-+	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
- 	struct glamor_egl_screen_private *glamor_egl =
- 	    glamor_egl_get_screen_private(scrn);
- 
-@@ -139,7 +139,7 @@ glamor_egl_make_current(ScreenPtr screen)
- _X_EXPORT void
- glamor_egl_restore_context(ScreenPtr screen)
- {
--	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
-+	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
- 	struct glamor_egl_screen_private *glamor_egl =
- 	    glamor_egl_get_screen_private(scrn);
- 
-@@ -221,7 +221,7 @@ glamor_create_texture_from_image(struct glamor_egl_screen_private
- Bool
- glamor_egl_create_textured_screen(ScreenPtr screen, int handle, int stride)
- {
--	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
-+	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
- 	struct glamor_egl_screen_private *glamor_egl;
- 	PixmapPtr	screen_pixmap;
- 
-@@ -245,7 +245,7 @@ glamor_egl_create_textured_screen_ext(ScreenPtr screen,
- 				      int stride,
- 				      PixmapPtr *back_pixmap)
- {
--	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
-+	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
- 	struct glamor_egl_screen_private *glamor_egl;
- 
- 	glamor_egl = glamor_egl_get_screen_private(scrn);
-@@ -272,7 +272,7 @@ Bool
- glamor_egl_create_textured_pixmap(PixmapPtr pixmap, int handle, int stride)
- {
- 	ScreenPtr screen = pixmap->drawable.pScreen;
--	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
-+	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
- 	struct glamor_egl_screen_private *glamor_egl;
- 	EGLImageKHR image;
- 	GLuint texture;
-@@ -318,7 +318,7 @@ done:
- static void
- _glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
- {
--	ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
-+	ScrnInfoPtr scrn = xf86ScreenToScrn(pixmap->drawable.pScreen);
- 	EGLImageKHR image;
- 	struct glamor_egl_screen_private *glamor_egl =
- 	    glamor_egl_get_screen_private(scrn);
-@@ -338,7 +338,7 @@ _glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
- _X_EXPORT void
- glamor_egl_exchange_buffers(PixmapPtr front, PixmapPtr back)
- {
--	ScrnInfoPtr scrn = xf86Screens[front->drawable.pScreen->myNum];
-+	ScrnInfoPtr scrn = xf86ScreenToScrn(front->drawable.pScreen);
- 	struct glamor_egl_screen_private *glamor_egl =
- 	    glamor_egl_get_screen_private(scrn);
- 	EGLImageKHR old_front_image;
-@@ -371,7 +371,7 @@ glamor_egl_close_screen(CLOSE_SCREEN_ARGS_DECL)
- 	PixmapPtr screen_pixmap;
- 	EGLImageKHR back_image;
- 
--	scrn = xf86Screens[screen->myNum];
-+	scrn = xf86ScreenToScrn(screen);
- 	glamor_egl = glamor_egl_get_screen_private(scrn);
- 	screen_pixmap = screen->GetScreenPixmap(screen);
- 
-@@ -417,7 +417,7 @@ glamor_egl_has_extension(struct glamor_egl_screen_private *glamor_egl,
- void
- glamor_egl_screen_init(ScreenPtr screen)
- {
--	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
-+	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
- 	struct glamor_egl_screen_private *glamor_egl =
- 	    glamor_egl_get_screen_private(scrn);
- 
-@@ -588,7 +588,7 @@ glamor_gl_dispatch_init(ScreenPtr screen,
- 			struct glamor_gl_dispatch *dispatch,
- 			int gl_version)
- {
--	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
-+	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
- 	struct glamor_egl_screen_private *glamor_egl =
- 	    glamor_egl_get_screen_private(scrn);
- 	if (!glamor_gl_dispatch_init_impl
---
-cgit v0.9.0.2-2-gbebe
-From 3cd34ba9f0708ab7d816eeee80139257fafcb4ad Mon Sep 17 00:00:00 2001
-From: Armin K <krejzi@email.com>
-Date: Wed, 13 Mar 2013 17:28:57 +0000
-Subject: Silence Automake 1.13 warnings
-
-warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
-
-Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
----
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 55721f6..2140b81 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -12,7 +12,7 @@ endif
- 
- instdir = $(moduledir)
- 
--INCLUDES = \
-+AM_CPPFLAGS = \
- 	$(XORG_INCS)
- 
- AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS) $(LIBDRM_CFLAGS)
---
-cgit v0.9.0.2-2-gbebe
-From c7241f097ddb4d3bfb832f6b4ee6fafe8b4d2cfe Mon Sep 17 00:00:00 2001
-From: Armin K <krejzi@email.com>
-Date: Wed, 13 Mar 2013 17:28:58 +0000
-Subject: Properly dist necesary headers
-
-Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
----
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 2140b81..0879287 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -31,6 +31,7 @@ libglamor_la_SOURCES = \
- 	glamor_fill.c \
- 	glamor_fillspans.c \
- 	glamor_getspans.c \
-+	glamor_glext.h \
- 	glamor_glyphs.c \
- 	glamor_polyfillrect.c \
- 	glamor_polylines.c \
---
-cgit v0.9.0.2-2-gbebe
-From f2d7f1cf351bdc3a8a00fe564cd6a937db3b4e19 Mon Sep 17 00:00:00 2001
-From: Armin K <krejzi@email.com>
-Date: Wed, 13 Mar 2013 17:49:32 +0000
-Subject: First attempt to make libglamor.so shared versioned library
-
-As recommended by Michel in this thread reply:
-http://lists.freedesktop.org/archives/glamor/2013-March/000305.html
-
-v2: Correct shared library location in glamor.pc.in
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=62259
-
-Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
----
-diff --git a/glamor.pc.in b/glamor.pc.in
-index 74ecd2e..5257468 100644
---- a/glamor.pc.in
-+++ b/glamor.pc.in
-@@ -2,12 +2,11 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--moduledir=@moduledir@
- sdkdir=@sdkdir@
- GLAMOR_GL_CFLAGS=@GLAMOR_GL_CFLAGS@
- 
- Name: glamor
- Description: X.Org glamor common library.
- Version: @PACKAGE_VERSION@
--Cflags: -I${sdkdir} -L${moduledir} -lglamor ${GLAMOR_GL_CFLAGS}
--
-+Cflags: -I${sdkdir} ${GLAMOR_GL_CFLAGS}
-+Libs: -L${libdir} -lglamor
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 0879287..4beb559 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,4 +1,4 @@
--inst_LTLIBRARIES = libglamor.la
-+lib_LTLIBRARIES = libglamor.la
- 
- # Override these since glamor doesn't need them and the needed files aren't
- # built (in hw/xfree86/os-support/solaris) until after glamor is built
-@@ -10,14 +10,12 @@ else
- libglamor_la_LIBADD = $(GL_LIBS)
- endif
- 
--instdir = $(moduledir)
--
- AM_CPPFLAGS = \
- 	$(XORG_INCS)
- 
- AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS) $(LIBDRM_CFLAGS)
- 
--libglamor_la_LDFLAGS = -avoid-version
-+libglamor_la_LDFLAGS = -version-info 0:0:0
- 
- libglamor_la_SOURCES = \
- 	compat-api.h \
-@@ -65,7 +63,8 @@ if EGL
- LIBGLAMOREGL = libglamoregl.la
- module_LTLIBRARIES = $(LIBGLAMOREGL)
- libglamoregl_la_DEPENDENCIES = libglamor.la
--libglamoregl_la_LDFLAGS = -avoid-version -module $(EGL_LIBS) -lglamor $(GLX_SYS_LIBS)
-+libglamoregl_la_LDFLAGS = -avoid-version -module
-+libglamoregl_la_LIBADD = $(EGL_LIBS) $(GLX_SYS_LIBS) libglamor.la
- libglamoregl_la_SOURCES = glamor_eglmodule.c $(top_srcdir)/src/glamor_egl.c
- libglamoregl_la_CFLAGS = $(AM_CFLAGS) $(GLX_DEFINES) -I$(top_srcdir)/src $(LIBDRM_CFLAGS) $(EGL_CFLAGS)
- endif
---
-cgit v0.9.0.2-2-gbebe
-From 81aadb8ae204f58d77a948c8624f1e72659dcdf0 Mon Sep 17 00:00:00 2001
-From: Armin K <krejzi@email.com>
-Date: Wed, 13 Mar 2013 17:49:33 +0000
-Subject: Don't use AC_PROG_LIBTOOL
-
-Autoconf only needs libtool macros which are copied when
-autoreconf is run. There is no need for looking for
-"libtool" program in PATH. This properly disables static
-libraries from being built and installed.
-
-Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
----
-diff --git a/configure.ac b/configure.ac
-index 230543c..5ff6ae1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -37,7 +37,6 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
- AM_MAINTAINER_MODE([enable])
- 
- # Initialize libtool
--AC_PROG_LIBTOOL
- LT_PREREQ([2.2])
- LT_INIT([disable-static])
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/glamor-egl/glamor_debug.h b/extra/glamor-egl/glamor_debug.h
deleted file mode 100644
index f0c969b11..000000000
--- a/extra/glamor-egl/glamor_debug.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright © 2009 Intel Corporation
- * Copyright © 1998 Keith Packard
- *
- * 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
- * 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.
- *
- * Authors:
- *    Zhigang Gong <zhigang.gong@gmail.com>
- *
- */
-
-#ifndef __GLAMOR_DEBUG_H__
-#define __GLAMOR_DEBUG_H__
-
-
-#define GLAMOR_DELAYED_STRING_MAX 64
-
-#define GLAMOR_DEBUG_NONE                     0
-#define GLAMOR_DEBUG_UNIMPL                   0
-#define GLAMOR_DEBUG_FALLBACK                 1
-#define GLAMOR_DEBUG_TEXTURE_DOWNLOAD         2
-#define GLAMOR_DEBUG_TEXTURE_DYNAMIC_UPLOAD   3
-
-extern void
-AbortServer(void)
-    _X_NORETURN;
-
-#define GLAMOR_PANIC(_format_, ...)			\
-  do {							\
-    LogMessageVerb(X_NONE, 0, "Glamor Fatal Error"	\
-		   " at %32s line %d: " _format_ "\n",	\
-		   __FUNCTION__, __LINE__,		\
-		   ##__VA_ARGS__ );			\
-    exit(1);                                            \
-  } while(0)
-
-
-
-
-#define __debug_output_message(_format_, _prefix_, ...) \
-  LogMessageVerb(X_NONE, 0,				\
-		 "%32s:\t" _format_ ,		\
-		 /*_prefix_,*/				\
-		 __FUNCTION__,				\
-		 ##__VA_ARGS__)
-
-#define glamor_debug_output(_level_, _format_,...)	\
-  do {							\
-    if (glamor_debug_level >= _level_)			\
-      __debug_output_message(_format_,			\
-			     "Glamor debug",		\
-			     ##__VA_ARGS__);		\
-  } while(0)
-
-
-#define glamor_fallback(_format_,...)			\
-  do {							\
-    if (glamor_debug_level >= GLAMOR_DEBUG_FALLBACK)	\
-      __debug_output_message(_format_,			\
-			     "Glamor fallback",		\
-			     ##__VA_ARGS__);} while(0)
-
-
-
-#define glamor_delayed_fallback(_screen_, _format_,...)			\
-  do {									\
-    if (glamor_debug_level >= GLAMOR_DEBUG_FALLBACK)  {			\
-      glamor_screen_private *_glamor_priv_;				\
-      _glamor_priv_ = glamor_get_screen_private(_screen_);		\
-      _glamor_priv_->delayed_fallback_pending = 1;			\
-      snprintf(_glamor_priv_->delayed_fallback_string,			\
-	       GLAMOR_DELAYED_STRING_MAX,				\
-	       "glamor delayed fallback: \t%s " _format_ ,		\
-               __FUNCTION__, ##__VA_ARGS__); } } while(0)
-
-
-#define glamor_clear_delayed_fallbacks(_screen_)			\
-  do {									\
-    if (glamor_debug_level >= GLAMOR_DEBUG_FALLBACK) {			\
-      glamor_screen_private *_glamor_priv_;				\
-	_glamor_priv_ = glamor_get_screen_private(_screen_);		\
-      _glamor_priv_->delayed_fallback_pending = 0;  } } while(0)
-
-#define glamor_report_delayed_fallbacks(_screen_)			\
-  do {									\
-    if (glamor_debug_level >= GLAMOR_DEBUG_FALLBACK) {			\
-      glamor_screen_private *_glamor_priv_;				\
-      _glamor_priv_ = glamor_get_screen_private(_screen_);		\
-      LogMessageVerb(X_INFO, 0, "%s",					\
-		     _glamor_priv_->delayed_fallback_string);		\
-      _glamor_priv_->delayed_fallback_pending = 0;  } } while(0)
-
-#define DEBUGF(str, ...)  do {} while(0)
-//#define DEBUGF(str, ...) ErrorF(str, ##__VA_ARGS__)
-#define DEBUGRegionPrint(x) do {} while (0)
-//#define DEBUGRegionPrint RegionPrint
-
-
-#endif
diff --git a/extra/glamor-egl/glamor_gl_dispatch.h b/extra/glamor-egl/glamor_gl_dispatch.h
deleted file mode 100644
index b3fc3a629..000000000
--- a/extra/glamor-egl/glamor_gl_dispatch.h
+++ /dev/null
@@ -1,137 +0,0 @@
-typedef struct glamor_gl_dispatch {
-	/* Transformation functions */
-	void (*glMatrixMode) (GLenum mode);
-	void (*glLoadIdentity) (void);
-	void (*glViewport) (GLint x, GLint y, GLsizei width,
-			    GLsizei height);
-	/* Drawing functions */
-	void (*glRasterPos2i) (GLint x, GLint y);
-
-	/* Vertex Array */
-	void (*glDrawArrays) (GLenum mode, GLint first, GLsizei count);
-
-	/* Elements Array*/
-	void (*glDrawElements) (GLenum mode, GLsizei count, GLenum type, const GLvoid * indices);
-
-	/* Raster functions */
-	void (*glReadPixels) (GLint x, GLint y,
-			      GLsizei width, GLsizei height,
-			      GLenum format, GLenum type, GLvoid * pixels);
-
-	void (*glDrawPixels) (GLsizei width, GLsizei height,
-			      GLenum format, GLenum type,
-			      const GLvoid * pixels);
-	void (*glPixelStorei) (GLenum pname, GLint param);
-	/* Texture Mapping */
-
-	void (*glTexParameteri) (GLenum target, GLenum pname, GLint param);
-	void (*glTexImage2D) (GLenum target, GLint level,
-			      GLint internalFormat,
-			      GLsizei width, GLsizei height,
-			      GLint border, GLenum format, GLenum type,
-			      const GLvoid * pixels);
-	/* 1.1 */
-	void (*glGenTextures) (GLsizei n, GLuint * textures);
-	void (*glDeleteTextures) (GLsizei n, const GLuint * textures);
-	void (*glBindTexture) (GLenum target, GLuint texture);
-	void (*glTexSubImage2D) (GLenum target, GLint level,
-				 GLint xoffset, GLint yoffset,
-				 GLsizei width, GLsizei height,
-				 GLenum format, GLenum type,
-				 const GLvoid * pixels);
-	/* MISC */
-	void (*glFlush) (void);
-	void (*glFinish) (void);
-	void (*glGetIntegerv) (GLenum pname, GLint * params);
-	const GLubyte *(*glGetString) (GLenum name);
-	void (*glScissor) (GLint x, GLint y, GLsizei width,
-			   GLsizei height);
-	void (*glEnable) (GLenum cap);
-	void (*glDisable) (GLenum cap);
-	void (*glBlendFunc) (GLenum sfactor, GLenum dfactor);
-	void (*glLogicOp) (GLenum opcode);
-
-	/* 1.3 */
-	void (*glActiveTexture) (GLenum texture);
-
-	/* GL Extentions */
-	void (*glGenBuffers) (GLsizei n, GLuint * buffers);
-	void (*glBufferData) (GLenum target, GLsizeiptr size,
-			      const GLvoid * data, GLenum usage);
-	GLvoid *(*glMapBuffer) (GLenum target, GLenum access);
-	GLvoid *(*glMapBufferRange) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-	GLboolean (*glUnmapBuffer) (GLenum target);
-	void (*glBindBuffer) (GLenum target, GLuint buffer);
-	void (*glDeleteBuffers) (GLsizei n, const GLuint * buffers);
-
-	void (*glFramebufferTexture2D) (GLenum target, GLenum attachment,
-					GLenum textarget, GLuint texture,
-					GLint level);
-	void (*glBindFramebuffer) (GLenum target, GLuint framebuffer);
-	void (*glDeleteFramebuffers) (GLsizei n,
-				      const GLuint * framebuffers);
-	void (*glGenFramebuffers) (GLsizei n, GLuint * framebuffers);
-	GLenum (*glCheckFramebufferStatus) (GLenum target);
-	void (*glBlitFramebuffer) (GLint srcX0, GLint srcY0, GLint srcX1,
-				   GLint srcY1, GLint dstX0, GLint dstY0,
-				   GLint dstX1, GLint dstY1,
-				   GLbitfield mask, GLenum filter);
-
-	void (*glVertexAttribPointer) (GLuint index, GLint size,
-				       GLenum type, GLboolean normalized,
-				       GLsizei stride,
-				       const GLvoid * pointer);
-	void (*glDisableVertexAttribArray) (GLuint index);
-	void (*glEnableVertexAttribArray) (GLuint index);
-	void (*glBindAttribLocation) (GLuint program, GLuint index,
-				      const GLchar * name);
-
-	void (*glLinkProgram) (GLuint program);
-	void (*glShaderSource) (GLuint shader, GLsizei count,
-				const GLchar * *string,
-				const GLint * length);
-	void (*glUseProgram) (GLuint program);
-	void (*glUniform1i) (GLint location, GLint v0);
-	void (*glUniform1f) (GLint location, GLfloat v0);
-	void (*glUniform4f) (GLint location, GLfloat v0, GLfloat v1,
-			     GLfloat v2, GLfloat v3);
-	void (*glUniform1fv) (GLint location, GLsizei count,
-			      const GLfloat * value);
-	void (*glUniform2fv) (GLint location, GLsizei count,
-			      const GLfloat * value);
-	void (*glUniform4fv) (GLint location, GLsizei count,
-			      const GLfloat * value);
-	void (*glUniformMatrix3fv) (GLint location, GLsizei count,
-		           GLboolean transpose, const GLfloat* value);
-	GLuint (*glCreateProgram) (void);
-	GLuint (*glDeleteProgram) (GLuint);
-	GLuint (*glCreateShader) (GLenum type);
-	void (*glCompileShader) (GLuint shader);
-	void (*glAttachShader) (GLuint program, GLuint shader);
-	void (*glDeleteShader) (GLuint shader);
-	void (*glGetShaderiv) (GLuint shader, GLenum pname,
-			       GLint * params);
-	void (*glGetShaderInfoLog) (GLuint shader, GLsizei bufSize,
-				    GLsizei * length, GLchar * infoLog);
-	void (*glGetProgramiv) (GLuint program, GLenum pname,
-				GLint * params);
-	void (*glGetProgramInfoLog) (GLuint program, GLsizei bufSize,
-				     GLsizei * length, GLchar * infoLog);
-	GLint (*glGetUniformLocation) (GLuint program,
-				       const GLchar * name);
-
-} glamor_gl_dispatch;
-
-
-typedef void *(*get_proc_address_t) (const char *);
-
-_X_EXPORT Bool
-glamor_gl_dispatch_init_impl(struct glamor_gl_dispatch *dispatch,
-			     int gl_version,
-			     get_proc_address_t get_proc_address);
-
-
-_X_EXPORT Bool
-glamor_gl_dispatch_init(ScreenPtr screen,
-			struct glamor_gl_dispatch *dispatch,
-			int gl_version);
diff --git a/extra/glamor-egl/glamor_glext.h b/extra/glamor-egl/glamor_glext.h
deleted file mode 100644
index 1f7206b99..000000000
--- a/extra/glamor-egl/glamor_glext.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright © 2001 Keith Packard
- * Copyright © 2008 Intel Corporation
- *
- * 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
- * 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.
- *
- * Authors:
- *    Zhigang Gong <zhigang.gong@linux.intel.com>
- *
- */
-
-
-#ifdef GLAMOR_GLES2
-
-#define GL_BGRA                                 GL_BGRA_EXT
-#define GL_COLOR_INDEX                          0x1900
-#define GL_BITMAP                               0x1A00
-#define GL_UNSIGNED_INT_8_8_8_8                 0x8035
-#define GL_UNSIGNED_INT_8_8_8_8_REV             0x8367
-#define GL_UNSIGNED_INT_2_10_10_10_REV          0x8368
-#define GL_UNSIGNED_INT_10_10_10_2              0x8036
-#define GL_UNSIGNED_SHORT_5_6_5_REV             0x8364
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV           0x8366
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV           0x8365
-
-#define GL_PIXEL_PACK_BUFFER              0x88EB
-#define GL_PIXEL_UNPACK_BUFFER            0x88EC
-#define GL_CLAMP_TO_BORDER                0x812D
-
-#define GL_READ_WRITE                     0x88BA
-#define GL_READ_ONLY                      0x88B8
-#define GL_WRITE_ONLY                     0x88B9
-#define GL_STREAM_DRAW                    0x88E0
-#define GL_STREAM_READ                    0x88E1
-#define GL_PACK_ROW_LENGTH                      0x0D02
-#define GL_UNPACK_ROW_LENGTH                    0x0CF2
-
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
-
-#define GL_PACK_INVERT_MESA               0x8758
-#define GL_MAP_UNSYNCHRONIZED_BIT         0x0020
-#define GL_MAP_READ_BIT                   0x0001
-#define GL_MAP_WRITE_BIT                  0x0002
-
-#endif
diff --git a/extra/glamor-egl/glamor_priv.h b/extra/glamor-egl/glamor_priv.h
deleted file mode 100644
index 6e80ebdf9..000000000
--- a/extra/glamor-egl/glamor_priv.h
+++ /dev/null
@@ -1,1016 +0,0 @@
-/*
- * Copyright © 2008 Intel Corporation
- *
- * 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
- * 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.
- *
- * Authors:
- *    Eric Anholt <eric@anholt.net>
- *
- */
-#ifndef GLAMOR_PRIV_H
-#define GLAMOR_PRIV_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "compiler.h"
-
-#include <xorg-server.h>
-#ifndef DEBUG
-#define NDEBUG
-#endif
-#include "glamor.h"
-#include "compat-api.h"
-
-#define GL_GLEXT_PROTOTYPES
-
-#ifdef GLAMOR_GLES2
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-
-#define GLAMOR_DEFAULT_PRECISION   "precision mediump float;\n"
-#include "glamor_glext.h"
-#else
-#include <GL/gl.h>
-#include <GL/glext.h>
-#define GLAMOR_DEFAULT_PRECISION
-#endif
-
-#ifdef RENDER
-#include "glyphstr.h"
-#endif
-
-#include "glamor_debug.h"
-
-#include <list.h>
-/* The list.h rename all the function to add xorg_ prefix.
-   We add hack here to avoid the compile error when using
-   old version xserver header file.
-   These will be removed in future. */
-#ifndef xorg_list_entry
-#define xorg_list list
-#define xorg_list_for_each_entry list_for_each_entry
-#define xorg_list_for_each_entry_safe list_for_each_entry_safe
-#define xorg_list_del list_del
-#define xorg_list_add list_add
-#define xorg_list_append list_append
-#define xorg_list_init list_init
-#endif
-
-struct glamor_pixmap_private;
-
-typedef struct glamor_composite_shader {
-	GLuint prog;
-	GLint dest_to_dest_uniform_location;
-	GLint dest_to_source_uniform_location;
-	GLint dest_to_mask_uniform_location;
-	GLint source_uniform_location;
-	GLint mask_uniform_location;
-	GLint source_wh;
-	GLint mask_wh;
-	GLint source_repeat_mode;
-	GLint mask_repeat_mode;
-	union {
-		float source_solid_color[4];
-		struct {
-			struct glamor_pixmap_private *source_priv;
-			PicturePtr source;
-		};
-	};
-
-	union {
-		float mask_solid_color[4];
-		struct {
-			struct glamor_pixmap_private *mask_priv;
-			PicturePtr mask;
-		};
-	};
-} glamor_composite_shader;
-
-enum shader_source {
-	SHADER_SOURCE_SOLID,
-	SHADER_SOURCE_TEXTURE,
-	SHADER_SOURCE_TEXTURE_ALPHA,
-	SHADER_SOURCE_COUNT,
-};
-
-enum shader_mask {
-	SHADER_MASK_NONE,
-	SHADER_MASK_SOLID,
-	SHADER_MASK_TEXTURE,
-	SHADER_MASK_TEXTURE_ALPHA,
-	SHADER_MASK_COUNT,
-};
-
-enum shader_in {
-	SHADER_IN_SOURCE_ONLY,
-	SHADER_IN_NORMAL,
-	SHADER_IN_CA_SOURCE,
-	SHADER_IN_CA_ALPHA,
-	SHADER_IN_COUNT,
-};
-
-struct shader_key {
-	enum shader_source source;
-	enum shader_mask mask;
-	enum shader_in in;
-};
-
-struct blendinfo {
-	Bool dest_alpha;
-	Bool source_alpha;
-	GLenum source_blend;
-	GLenum dest_blend;
-};
-
-typedef struct {
-	INT16 x_src;
-	INT16 y_src;
-	INT16 x_mask;
-	INT16 y_mask;
-	INT16 x_dst;
-	INT16 y_dst;
-	INT16 width;
-	INT16 height;
-} glamor_composite_rect_t;
-
-
-enum glamor_vertex_type {
-	GLAMOR_VERTEX_POS,
-	GLAMOR_VERTEX_SOURCE,
-	GLAMOR_VERTEX_MASK
-};
-
-
-enum gradient_shader {
-	SHADER_GRADIENT_LINEAR,
-	SHADER_GRADIENT_RADIAL,
-	SHADER_GRADIENT_CONICAL,
-	SHADER_GRADIENT_COUNT,
-};
-
-enum gradient_shader_prog {
-	SHADER_GRADIENT_VS_PROG,
-	SHADER_GRADIENT_FS_MAIN_PROG,
-	SHADER_GRADIENT_FS_GETCOLOR_PROG,
-	SHADER_GRADIENT_PROG_COUNT,
-};
-
-struct glamor_screen_private;
-struct glamor_pixmap_private;
-
-enum glamor_gl_flavor {
-	GLAMOR_GL_DESKTOP,	// OPENGL API
-	GLAMOR_GL_ES2		// OPENGL ES2.0 API
-};
-
-#define GLAMOR_CREATE_PIXMAP_CPU  0x100
-#define GLAMOR_CREATE_PIXMAP_FIXUP 0x101
-#define GLAMOR_CREATE_FBO_NO_FBO   0x103
-#define GLAMOR_CREATE_PIXMAP_MAP 0x104
-
-#define GLAMOR_CREATE_TEXTURE_EXACT_SIZE 0x104
-
-#define GLAMOR_NUM_GLYPH_CACHE_FORMATS 2
-
-#define GLAMOR_COMPOSITE_VBO_VERT_CNT (64*1024)
-
-typedef struct {
-	PicturePtr picture;	/* Where the glyphs of the cache are stored */
-	GlyphPtr *glyphs;
-	uint16_t count;
-	uint16_t evict;
-} glamor_glyph_cache_t;
-
-#include "glamor_gl_dispatch.h"
-
-struct glamor_saved_procs { 
-	CloseScreenProcPtr close_screen;
-	CreateGCProcPtr create_gc;
-	CreatePixmapProcPtr create_pixmap;
-	DestroyPixmapProcPtr destroy_pixmap;
-	GetSpansProcPtr get_spans;
-	GetImageProcPtr get_image;
-	CompositeProcPtr composite;
-	CompositeRectsProcPtr composite_rects;
-	TrapezoidsProcPtr trapezoids;
-	GlyphsProcPtr glyphs;
-	ChangeWindowAttributesProcPtr change_window_attributes;
-	CopyWindowProcPtr copy_window;
-	BitmapToRegionProcPtr bitmap_to_region;
-	TrianglesProcPtr triangles;
-	AddTrapsProcPtr addtraps;
-	CreatePictureProcPtr create_picture;
-	DestroyPictureProcPtr destroy_picture;
-	UnrealizeGlyphProcPtr unrealize_glyph;
-};
-
-#ifdef GLAMOR_GLES2
-#define CACHE_FORMAT_COUNT 3
-#else
-#define CACHE_FORMAT_COUNT 2
-#endif
-
-#define CACHE_BUCKET_WCOUNT 4
-#define CACHE_BUCKET_HCOUNT 4
-
-#define GLAMOR_TICK_AFTER(t0, t1) 	\
-	(((int)(t1) - (int)(t0)) < 0)
-
-#define IDLE_STATE 0
-#define RENDER_STATE 1
-#define BLIT_STATE 2
-#define RENDER_IDEL_MAX 32
-
-typedef struct glamor_screen_private {
-	struct glamor_gl_dispatch _dispatch;
-	int yInverted;
-	unsigned int tick;
-	enum glamor_gl_flavor gl_flavor;
-	int has_pack_invert;
-	int has_fbo_blit;
-	int max_fbo_size;
-
-	struct xorg_list fbo_cache[CACHE_FORMAT_COUNT][CACHE_BUCKET_WCOUNT][CACHE_BUCKET_HCOUNT];
-	unsigned long    fbo_cache_watermark;
-
-	/* glamor_solid */
-	GLint solid_prog;
-	GLint solid_color_uniform_location;
-
-	/* vertext/elment_index buffer object for render */
-	GLuint vbo, ebo;
-	int vbo_offset;
-	int vbo_size;
-	char *vb;
-	int vb_stride;
-	Bool has_source_coords, has_mask_coords;
-	int render_nr_verts;
-	glamor_composite_shader composite_shader[SHADER_SOURCE_COUNT]
-						[SHADER_MASK_COUNT]
-						[SHADER_IN_COUNT];
-	glamor_glyph_cache_t glyphCaches[GLAMOR_NUM_GLYPH_CACHE_FORMATS];
-	Bool glyph_cache_initialized;
-
-	/* shaders to restore a texture to another texture.*/
-	GLint finish_access_prog[2];
-	GLint finish_access_revert[2];
-	GLint finish_access_swap_rb[2];
-
-	/* glamor_tile */
-	GLint tile_prog;
-	GLint tile_wh;
-
-	/* glamor gradient, 0 for small nstops, 1 for
-	   large nstops and 2 for dynamic generate. */
-	GLint gradient_prog[SHADER_GRADIENT_COUNT][3];
-	GLint linear_gradient_shaders[SHADER_GRADIENT_PROG_COUNT][3];
-	int linear_max_nstops;
-	GLint radial_gradient_shaders[SHADER_GRADIENT_PROG_COUNT][3];
-	int radial_max_nstops;
-
-	/* glamor trapezoid shader. */
-	GLint trapezoid_prog;
-
-	/* glamor_putimage */
-	GLint put_image_xybitmap_prog;
-	GLint put_image_xybitmap_fg_uniform_location;
-	GLint put_image_xybitmap_bg_uniform_location;
-
-	PixmapPtr *back_pixmap;
-	int screen_fbo;
-	struct glamor_saved_procs saved_procs;
-	char delayed_fallback_string[GLAMOR_DELAYED_STRING_MAX + 1];
-	int delayed_fallback_pending;
-	int flags;
-	int state;
-	unsigned int render_idle_cnt;
-	ScreenPtr screen;
-} glamor_screen_private;
-
-typedef enum glamor_access {
-	GLAMOR_ACCESS_RO,
-	GLAMOR_ACCESS_RW,
-	GLAMOR_ACCESS_WO,
-} glamor_access_t;
-
-#define GLAMOR_FBO_NORMAL     1
-#define GLAMOR_FBO_DOWNLOADED 2
-/* glamor_pixmap_fbo:
- * @list:    to be used to link to the cache pool list.
- * @expire:  when push to cache pool list, set a expire count.
- * 	     will be freed when glamor_priv->tick is equal or
- * 	     larger than this expire count in block handler.
- * @pbo_valid: The pbo has a valid copy of the pixmap's data.
- * @tex:     attached texture.
- * @fb:      attached fbo.
- * @pbo:     attached pbo.
- * @width:   width of this fbo.
- * @height:  height of this fbo.
- * @format:  internal format of this fbo's texture.
- * @type:    internal type of this fbo's texture.
- * @glamor_priv: point to glamor private data.
- */
-typedef struct glamor_pixmap_fbo {
-	struct xorg_list list;
-	unsigned int expire;
-	unsigned char pbo_valid;
-	GLuint tex;
-	GLuint fb;
-	GLuint pbo;
-	int width;
-	int height;
-	GLenum format;
-	GLenum type;
-	glamor_screen_private *glamor_priv;
-} glamor_pixmap_fbo;
-
-/*
- * glamor_pixmap_private - glamor pixmap's private structure.
- * @gl_fbo:
- * 	0 		  	- The pixmap doesn't has a fbo attached to it.
- * 	GLAMOR_FBO_NORMAL 	- The pixmap has a fbo and can be accessed normally.
- * 	GLAMOR_FBO_DOWNLOADED 	- The pixmap has a fbo and already downloaded to
- * 				  CPU, so it can only be treated as a in-memory pixmap
- * 				  if this bit is set.
- * @gl_tex:  The pixmap is in a gl texture originally.
- * @is_picture: The drawable is attached to a picture.
- * @pict_format: the corresponding picture's format.
- * @pixmap: The corresponding pixmap's pointer.
- *
- * For GLAMOR_TEXTURE_LARGE, nbox should larger than 1.
- * And the box and fbo will both have nbox elements.
- * and box[i] store the relatively coords in this pixmap
- * of the fbo[i]. The reason why use boxes not region to
- * represent this structure is we may need to use overlapped
- * boxes for one pixmap for some special reason.
- *
- * pixmap
- * ******************
- * *  fbo0 * fbo1   *
- * *       *        *
- * ******************
- * *  fbo2 * fbo3   *
- * *       *        *
- * ******************
- *
- * Let's assume the texture has size of 1024x1024
- * box[0] = {0,0,1024,1024}
- * box[1] = {1024,0,2048,2048}
- * ...
- *
- * For GLAMOR_TEXTURE_ATLAS nbox should be 1. And box
- * and fbo both has one elements, and the box store
- * the relatively coords in the fbo of this pixmap:
- *
- * fbo
- * ******************
- * *   pixmap       *
- * *   *********    *
- * *   *       *    *
- * *   *********    *
- * *                *
- * ******************
- *
- * Assume the pixmap is at the (100,100) relatively to
- * the fbo's origin.
- * box[0]={100, 100, 1124, 1124};
- *
- * Considering large pixmap is not a normal case, to keep
- * it simple, I designe it as the following way.
- * When deal with a large pixmap, it split the working
- * rectangle into serval boxes, and each box fit into a
- * corresponding fbo. And then the rendering function will
- * loop from the left-top box to the right-bottom box,
- * each time, we will set current box and current fbo
- * to the box and fbo elements. Thus the inner routines
- * can handle it as normal, only the coords calculation need
- * to aware of it's large pixmap.
- *
- * Currently, we haven't implemented the atlas pixmap.
- *
- **/
-
-typedef struct glamor_pixmap_clipped_regions{
-	int block_idx;
-	RegionPtr region;
-} glamor_pixmap_clipped_regions;
-
-#define SET_PIXMAP_FBO_CURRENT(priv, idx) 				\
-  do {									\
-	if (priv->type == GLAMOR_TEXTURE_LARGE) {			\
-		(priv)->large.base.fbo = priv->large.fbo_array[idx]; 	\
-		(priv)->large.box = priv->large.box_array[idx]; 	\
-	}								\
-  } while(0)
-
-typedef struct glamor_pixmap_private_base {
-	glamor_pixmap_type_t type;
-	unsigned char gl_fbo:2;
-	unsigned char is_picture:1;
-	unsigned char gl_tex:1;
-	glamor_pixmap_fbo *fbo;
-	PixmapPtr pixmap;
-	int drm_stride;
-	glamor_screen_private *glamor_priv;
-	PicturePtr picture;
-}glamor_pixmap_private_base_t;
-
-/*
- * @base.fbo: current fbo.
- * @box: current fbo's coords in the whole pixmap.
- * @block_w: block width of this large pixmap.
- * @block_h: block height of this large pixmap.
- * @block_wcnt: block count in one block row.
- * @block_hcnt: block count in one block column.
- * @nbox: total block count.
- * @box_array: contains each block's corresponding box.
- * @fbo_array: contains each block's fbo pointer.
- *
- **/
-typedef struct glamor_pixmap_private_large {
-	union {
-		glamor_pixmap_type_t type;
-		glamor_pixmap_private_base_t base;
-	};
-	BoxRec box;
-	int block_w;
-	int block_h;
-	int block_wcnt;
-	int block_hcnt;
-	int nbox;
-	BoxPtr box_array;
-	glamor_pixmap_fbo **fbo_array;
-}glamor_pixmap_private_large_t;
-
-/*
- * @box: the relative coords in the corresponding fbo.
- */
-typedef struct glamor_pixmap_private_atlas {
-	union {
-		glamor_pixmap_type_t type;
-		glamor_pixmap_private_base_t base;
-	};
-	BoxRec box;
-}glamor_pixmap_private_atlas_t;
-
-typedef struct glamor_pixmap_private {
-	union {
-		glamor_pixmap_type_t type;
-		glamor_pixmap_private_base_t base;
-		glamor_pixmap_private_large_t large;
-		glamor_pixmap_private_atlas_t atlas;
-	};
-}glamor_pixmap_private;
-
-/* 
- * Pixmap dynamic status, used by dynamic upload feature.
- *
- * GLAMOR_NONE:  initial status, don't need to do anything.
- * GLAMOR_UPLOAD_PENDING: marked as need to be uploaded to gl texture.
- * GLAMOR_UPLOAD_DONE: the pixmap has been uploaded successfully.
- * GLAMOR_UPLOAD_FAILED: fail to upload the pixmap.
- *
- * */
-typedef enum glamor_pixmap_status {
-	GLAMOR_NONE,
-	GLAMOR_UPLOAD_PENDING,
-	GLAMOR_UPLOAD_DONE,
-	GLAMOR_UPLOAD_FAILED
-} glamor_pixmap_status_t;
-
-extern DevPrivateKey glamor_screen_private_key;
-extern DevPrivateKey glamor_pixmap_private_key;
-static inline glamor_screen_private *
-glamor_get_screen_private(ScreenPtr screen)
-{
-	return (glamor_screen_private *)
-	    dixLookupPrivate(&screen->devPrivates,
-			     glamor_screen_private_key);
-}
-
-static inline void
-glamor_set_screen_private(ScreenPtr screen, glamor_screen_private *priv)
-{
-	dixSetPrivate(&screen->devPrivates,
-		      glamor_screen_private_key,
-		      priv);
-}
-
-
-
-static inline glamor_pixmap_private *
-glamor_get_pixmap_private(PixmapPtr pixmap)
-{
-	glamor_pixmap_private *priv;
-	priv = dixLookupPrivate(&pixmap->devPrivates,
-				glamor_pixmap_private_key);
-	if (!priv) {
-		glamor_set_pixmap_type(pixmap, GLAMOR_MEMORY);
-		priv = dixLookupPrivate(&pixmap->devPrivates,
-					glamor_pixmap_private_key);
-	}
-	return priv;
-}
-
-void glamor_set_pixmap_private(PixmapPtr pixmap, glamor_pixmap_private *priv);
-
-/**
- * Returns TRUE if the given planemask covers all the significant bits in the
- * pixel values for pDrawable.
- */
-static inline Bool
-glamor_pm_is_solid(DrawablePtr drawable, unsigned long planemask)
-{
-	return (planemask & FbFullMask(drawable->depth)) ==
-	    FbFullMask(drawable->depth);
-}
-
-extern int glamor_debug_level;
-
-/* glamor.c */
-PixmapPtr glamor_get_drawable_pixmap(DrawablePtr drawable);
-
-Bool glamor_destroy_pixmap(PixmapPtr pixmap);
-
-glamor_pixmap_fbo* glamor_pixmap_detach_fbo(glamor_pixmap_private *pixmap_priv);
-void glamor_pixmap_attach_fbo(PixmapPtr pixmap, glamor_pixmap_fbo *fbo);
-glamor_pixmap_fbo * glamor_create_fbo_from_tex(glamor_screen_private *glamor_priv,
-					       int w, int h, GLenum format, GLint tex, int flag);
-glamor_pixmap_fbo * glamor_create_fbo(glamor_screen_private *glamor_priv,
-				      int w, int h, GLenum format, int flag);
-void glamor_destroy_fbo(glamor_pixmap_fbo *fbo);
-void glamor_pixmap_destroy_fbo(glamor_pixmap_private *priv);
-void glamor_purge_fbo(glamor_pixmap_fbo *fbo);
-
-void glamor_init_pixmap_fbo(ScreenPtr screen);
-void glamor_fini_pixmap_fbo(ScreenPtr screen);
-Bool glamor_pixmap_fbo_fixup(ScreenPtr screen, PixmapPtr pixmap);
-void glamor_fbo_expire(glamor_screen_private *glamor_priv);
-
-glamor_pixmap_fbo *
-glamor_create_fbo_array(glamor_screen_private *glamor_priv,
-			int w, int h, GLenum format, int flag,
-			int block_w, int block_h, glamor_pixmap_private *);
-
-/* glamor_copyarea.c */
-RegionPtr
-glamor_copy_area(DrawablePtr src, DrawablePtr dst, GCPtr gc,
-		 int srcx, int srcy, int width, int height, int dstx,
-		 int dsty);
-void glamor_copy_n_to_n(DrawablePtr src, DrawablePtr dst, GCPtr gc,
-			BoxPtr box, int nbox, int dx, int dy, Bool reverse,
-			Bool upsidedown, Pixel bitplane, void *closure);
-
-/* glamor_copywindow.c */
-void glamor_copy_window(WindowPtr win, DDXPointRec old_origin,
-			RegionPtr src_region);
-
-/* glamor_core.c */
-Bool glamor_prepare_access(DrawablePtr drawable, glamor_access_t access);
-void glamor_finish_access(DrawablePtr drawable, glamor_access_t access);
-Bool glamor_prepare_access_window(WindowPtr window);
-void glamor_finish_access_window(WindowPtr window);
-Bool glamor_prepare_access_gc(GCPtr gc);
-void glamor_finish_access_gc(GCPtr gc);
-void glamor_init_finish_access_shaders(ScreenPtr screen);
-void glamor_fini_finish_access_shaders(ScreenPtr screen);
-const Bool glamor_get_drawable_location(const DrawablePtr drawable);
-void glamor_get_drawable_deltas(DrawablePtr drawable, PixmapPtr pixmap,
-				int *x, int *y);
-Bool glamor_stipple(PixmapPtr pixmap, PixmapPtr stipple,
-		    int x, int y, int width, int height,
-		    unsigned char alu, unsigned long planemask,
-		    unsigned long fg_pixel, unsigned long bg_pixel,
-		    int stipple_x, int stipple_y);
-GLint glamor_compile_glsl_prog(glamor_gl_dispatch * dispatch, GLenum type,
-			       const char *source);
-void glamor_link_glsl_prog(glamor_gl_dispatch * dispatch, GLint prog);
-void glamor_get_color_4f_from_pixel(PixmapPtr pixmap,
-				    unsigned long fg_pixel,
-				    GLfloat * color);
-
-int glamor_set_destination_pixmap(PixmapPtr pixmap);
-int glamor_set_destination_pixmap_priv(glamor_pixmap_private *
-				       pixmap_priv);
-void glamor_set_destination_pixmap_fbo(glamor_pixmap_fbo *, int, int, int, int);
-
-/* nc means no check. caller must ensure this pixmap has valid fbo.
- * usually use the GLAMOR_PIXMAP_PRIV_HAS_FBO firstly. 
- * */
-void glamor_set_destination_pixmap_priv_nc(glamor_pixmap_private *
-					   pixmap_priv);
-
-glamor_pixmap_fbo *
-glamor_es2_pixmap_read_prepare(PixmapPtr source, int x, int y, int w, int h, GLenum format,
-			       GLenum type, int no_alpha, int revert, int swap_rb);
-
-Bool glamor_set_alu(struct glamor_gl_dispatch *dispatch,
-		    unsigned char alu);
-Bool glamor_set_planemask(PixmapPtr pixmap, unsigned long planemask);
-Bool glamor_change_window_attributes(WindowPtr pWin, unsigned long mask);
-RegionPtr glamor_bitmap_to_region(PixmapPtr pixmap);
-Bool glamor_gl_has_extension(const char *extension);
-int glamor_gl_get_version(void);
-
-#define GLAMOR_GL_VERSION_ENCODE(major, minor) ( \
-          ((major) * 256)                       \
-        + ((minor) *   1))
-
-
-
-
-/* glamor_fill.c */
-Bool glamor_fill(DrawablePtr drawable,
-		 GCPtr gc, int x, int y, int width, int height, Bool fallback);
-Bool glamor_solid(PixmapPtr pixmap, int x, int y, int width, int height,
-		  unsigned char alu, unsigned long planemask,
-		  unsigned long fg_pixel);
-Bool
-glamor_solid_boxes(PixmapPtr pixmap,
-		   BoxPtr box, int nbox,
-		   unsigned long fg_pixel);
-
-/* glamor_fillspans.c */
-void glamor_fill_spans(DrawablePtr drawable,
-		       GCPtr gc,
-		       int n, DDXPointPtr points, int *widths, int sorted);
-
-void glamor_init_solid_shader(ScreenPtr screen);
-void glamor_fini_solid_shader(ScreenPtr screen);
-
-/* glamor_getspans.c */
-void
-
-glamor_get_spans(DrawablePtr drawable,
-		 int wmax,
-		 DDXPointPtr points,
-		 int *widths, int nspans, char *dst_start);
-
-/* glamor_glyphs.c */
-void glamor_glyphs_fini(ScreenPtr screen);
-void glamor_glyphs(CARD8 op,
-		   PicturePtr pSrc,
-		   PicturePtr pDst,
-		   PictFormatPtr maskFormat,
-		   INT16 xSrc,
-		   INT16 ySrc, int nlist, GlyphListPtr list,
-		   GlyphPtr * glyphs);
-
-/* glamor_setspans.c */
-void glamor_set_spans(DrawablePtr drawable, GCPtr gc, char *src,
-		      DDXPointPtr points, int *widths, int n, int sorted);
-
-/* glamor_polyfillrect.c */
-void
-glamor_poly_fill_rect(DrawablePtr drawable,
-		      GCPtr gc, int nrect, xRectangle * prect);
-
-/* glamor_polylines.c */
-void
-
-glamor_poly_lines(DrawablePtr drawable, GCPtr gc, int mode, int n,
-		  DDXPointPtr points);
-
-/* glamor_putimage.c */
-void
-
-glamor_put_image(DrawablePtr drawable, GCPtr gc, int depth, int x, int y,
-		 int w, int h, int leftPad, int format, char *bits);
-void glamor_init_putimage_shaders(ScreenPtr screen);
-void glamor_fini_putimage_shaders(ScreenPtr screen);
-
-/* glamor_render.c */
-Bool
-glamor_composite_clipped_region(CARD8 op,
-				PicturePtr source,
-				PicturePtr mask,
-				PicturePtr dest,
-				glamor_pixmap_private *soruce_pixmap_priv,
-				glamor_pixmap_private *mask_pixmap_priv,
-				glamor_pixmap_private *dest_pixmap_priv,
-				RegionPtr region,
-				int x_source,
-				int y_source,
-				int x_mask,
-				int y_mask,
-				int x_dest,
-				int y_dest);
-
-void glamor_composite(CARD8 op,
-		      PicturePtr pSrc,
-		      PicturePtr pMask,
-		      PicturePtr pDst,
-		      INT16 xSrc,
-		      INT16 ySrc,
-		      INT16 xMask,
-		      INT16 yMask,
-		      INT16 xDst, INT16 yDst, CARD16 width, CARD16 height);
-
-void glamor_init_composite_shaders(ScreenPtr screen);
-void glamor_fini_composite_shaders(ScreenPtr screen);
-void glamor_composite_glyph_rects(CARD8 op,
-				  PicturePtr src, PicturePtr mask,
-				  PicturePtr dst, int nrect,
-				  glamor_composite_rect_t * rects);
-void glamor_composite_rects (CARD8         op,
-			     PicturePtr    pDst,
-			     xRenderColor  *color,
-			     int           nRect,
-			     xRectangle    *rects);
-void glamor_init_trapezoid_shader(ScreenPtr screen);
-void glamor_fini_trapezoid_shader(ScreenPtr screen);
-PicturePtr glamor_convert_gradient_picture(ScreenPtr screen,
-                                           PicturePtr source,
-                                           int x_source,
-                                           int y_source, int width, int height);
-
-Bool glamor_composite_choose_shader(CARD8 op,
-                                    PicturePtr source,
-                                    PicturePtr mask,
-                                    PicturePtr dest,
-			     	    glamor_pixmap_private *source_pixmap_priv,
-			     	    glamor_pixmap_private *mask_pixmap_priv,
-			     	    glamor_pixmap_private *dest_pixmap_priv,
-                                    struct shader_key *s_key,
-				    glamor_composite_shader **shader, 
-				    struct blendinfo *op_info,
-                                    PictFormatShort *psaved_source_format);
-
-void
-glamor_composite_set_shader_blend(glamor_pixmap_private *dest_priv,
-				  struct shader_key *key,
-				  glamor_composite_shader *shader,
-				  struct blendinfo *op_info);
-
-void glamor_setup_composite_vbo(ScreenPtr screen, int n_verts);
-void glamor_emit_composite_vert(ScreenPtr screen,
-                                const float *src_coords,
-                                const float *mask_coords,
-                                const float *dst_coords, int i);
-
-/* glamor_trapezoid.c */
-void glamor_trapezoids(CARD8 op,
-		       PicturePtr src, PicturePtr dst,
-		       PictFormatPtr mask_format, INT16 x_src, INT16 y_src,
-		       int ntrap, xTrapezoid * traps);
-
-/* glamor_tile.c */
-Bool glamor_tile(PixmapPtr pixmap, PixmapPtr tile,
-		 int x, int y, int width, int height,
-		 unsigned char alu, unsigned long planemask,
-		 int tile_x, int tile_y);
-void glamor_init_tile_shader(ScreenPtr screen);
-void glamor_fini_tile_shader(ScreenPtr screen);
-
-/* glamor_gradient.c */
-void glamor_init_gradient_shader(ScreenPtr screen);
-void glamor_fini_gradient_shader(ScreenPtr screen);
-PicturePtr glamor_generate_linear_gradient_picture(ScreenPtr screen,
-                                                   PicturePtr src_picture,
-                                                   int x_source, int y_source,
-                                                   int width, int height,
-                                                   PictFormatShort format);
-PicturePtr glamor_generate_radial_gradient_picture(ScreenPtr screen,
-                                                   PicturePtr src_picture,
-                                                   int x_source, int y_source,
-                                                   int width, int height,
-                                                   PictFormatShort format);
-
-/* glamor_triangles.c */
-void
-
-glamor_triangles(CARD8 op,
-		 PicturePtr pSrc,
-		 PicturePtr pDst,
-		 PictFormatPtr maskFormat,
-		 INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris);
-
-/* glamor_pixmap.c */
-
-void glamor_pixmap_init(ScreenPtr screen);
-void glamor_pixmap_fini(ScreenPtr screen);
-/** 
- * Download a pixmap's texture to cpu memory. If success,
- * One copy of current pixmap's texture will be put into
- * the pixmap->devPrivate.ptr. Will use pbo to map to 
- * the pointer if possible.
- * The pixmap must be a gl texture pixmap. gl_fbo and
- * gl_tex must be 1. Used by glamor_prepare_access.
- *
- */
-Bool glamor_download_pixmap_to_cpu(PixmapPtr pixmap,
-				   glamor_access_t access);
-
-void *
-glamor_download_sub_pixmap_to_cpu(PixmapPtr pixmap, int x, int y, int w, int h,
-				  int stride, void *bits, int pbo, glamor_access_t access);
-
-
-/**
- * Restore a pixmap's data which is downloaded by 
- * glamor_download_pixmap_to_cpu to its original 
- * gl texture. Used by glamor_finish_access. 
- *
- * The pixmap must be
- * in texture originally. In other word, the gl_fbo
- * must be 1.
- **/
-void glamor_restore_pixmap_to_texture(PixmapPtr pixmap);
-
-/**
- * According to the flag,
- * if the flag is GLAMOR_CREATE_FBO_NO_FBO then just ensure
- * the fbo has a valid texture. Otherwise, it will ensure
- * the fbo has valid texture and attach to a valid fb.
- * If the fbo already has a valid glfbo then do nothing.
- */
-Bool
-glamor_pixmap_ensure_fbo(PixmapPtr pixmap, GLenum format, int flag);
-
-/**
- * Upload a pixmap to gl texture. Used by dynamic pixmap
- * uploading feature. The pixmap must be a software pixmap.
- * This function will change current FBO and current shaders.
- */
-enum glamor_pixmap_status glamor_upload_pixmap_to_texture(PixmapPtr
-							  pixmap);
-
-Bool
-glamor_upload_sub_pixmap_to_texture(PixmapPtr pixmap, int x, int y, int w, int h,
-				    int stride, void *bits, int pbo);
-
-PixmapPtr
-glamor_get_sub_pixmap(PixmapPtr pixmap, int x, int y,
-		      int w, int h, glamor_access_t access);
-void
-glamor_put_sub_pixmap(PixmapPtr sub_pixmap, PixmapPtr pixmap, int x, int y,
-		      int w, int h, glamor_access_t access);
-
-glamor_pixmap_clipped_regions *
-glamor_compute_clipped_regions(glamor_pixmap_private *priv, RegionPtr region,
-			       int *clipped_nbox, int repeat_type,
-			       int reverse, int upsidedown);
-
-glamor_pixmap_clipped_regions *
-glamor_compute_clipped_regions_ext(glamor_pixmap_private *pixmap_priv,
-				   RegionPtr region,
-				   int *n_region,
-				   int inner_block_w, int inner_block_h,
-			           int reverse, int upsidedown);
-
-glamor_pixmap_clipped_regions *
-glamor_compute_transform_clipped_regions(glamor_pixmap_private *priv, struct pixman_transform *transform,
-					 RegionPtr region, int *n_region, int dx, int dy, int repeat_type,
-			                 int reverse, int upsidedown);
-
-Bool
-glamor_composite_largepixmap_region(CARD8 op,
-			  PicturePtr source,
-			  PicturePtr mask,
-			  PicturePtr dest,
-			  glamor_pixmap_private * source_pixmap_priv,
-			  glamor_pixmap_private * mask_pixmap_priv,
-			  glamor_pixmap_private * dest_pixmap_priv,
-			  RegionPtr region, Bool force_clip,
-			  INT16 x_source,
-			  INT16 y_source,
-			  INT16 x_mask,
-			  INT16 y_mask,
-			  INT16 x_dest, INT16 y_dest,
-			  CARD16 width, CARD16 height);
-
-Bool
-glamor_get_transform_block_size(struct pixman_transform *transform,
-			   int block_w, int block_h,
-			   int *transformed_block_w,
-			   int *transformed_block_h);
-
-void
-glamor_get_transform_extent_from_box(struct pixman_box32 *temp_box,
-		struct pixman_transform *transform);
-
-/**
- * Upload a picture to gl texture. Similar to the
- * glamor_upload_pixmap_to_texture. Used in rendering.
- **/
-enum glamor_pixmap_status
- glamor_upload_picture_to_texture(PicturePtr picture);
-
-/**
- * Upload bits to a pixmap's texture. This function will
- * convert the bits to the specified format/type format
- * if the conversion is unavoidable.
- **/
-Bool glamor_upload_bits_to_pixmap_texture(PixmapPtr pixmap, GLenum format, GLenum type,
-					  int no_alpha, int revert, int swap_rb, void *bits);
-
-/**
- * Destroy all the resources allocated on the uploading
- * phase, includs the tex and fbo.
- **/
-void glamor_destroy_upload_pixmap(PixmapPtr pixmap);
-
-int glamor_create_picture(PicturePtr picture);
-
-Bool
-glamor_prepare_access_picture(PicturePtr picture, glamor_access_t access);
-
-void glamor_finish_access_picture(PicturePtr picture, glamor_access_t access);
-
-void glamor_destroy_picture(PicturePtr picture);
-
-/* fixup a fbo to the exact size as the pixmap. */
-Bool
-glamor_fixup_pixmap_priv(ScreenPtr screen, glamor_pixmap_private *pixmap_priv);
-
-void
-glamor_picture_format_fixup(PicturePtr picture,
-			    glamor_pixmap_private * pixmap_priv);
-
-void
-glamor_get_image(DrawablePtr pDrawable, int x, int y, int w, int h,
-		 unsigned int format, unsigned long planeMask, char *d);
-
-void
-glamor_add_traps(PicturePtr pPicture,
-		 INT16 x_off, 
-		 INT16 y_off, int ntrap, xTrap * traps);
-
-RegionPtr
-glamor_copy_plane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
-		  int srcx, int srcy, int w, int h, int dstx, int dsty,
-		  unsigned long bitPlane);
-
-void
-glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
-                    int x, int y, unsigned int nglyph,
-                    CharInfoPtr * ppci, pointer pglyphBase);
-
-void
-glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
-                    int x, int y, unsigned int nglyph,
-                    CharInfoPtr * ppci, pointer pglyphBase);
-
-void
-glamor_push_pixels(GCPtr pGC, PixmapPtr pBitmap,
-		   DrawablePtr pDrawable, int w, int h, int x, int y);
-
-void
-glamor_poly_point(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt,
-		  DDXPointPtr ppt);
-
-void
-glamor_poly_segment(DrawablePtr pDrawable, GCPtr pGC, int nseg,
-		    xSegment *pSeg);
-
-void
-glamor_poly_line(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt,
-		 DDXPointPtr ppt);
-
-void
-glamor_composite_rectangles(CARD8	 op,
-			 PicturePtr	 dst,
-			 xRenderColor	*color,
-			 int		 num_rects,
-			 xRectangle	*rects);
-
-#include"glamor_utils.h"
-
-/* Dynamic pixmap upload to texture if needed. 
- * Sometimes, the target is a gl texture pixmap/picture,
- * but the source or mask is in cpu memory. In that case,
- * upload the source/mask to gl texture and then avoid 
- * fallback the whole process to cpu. Most of the time,
- * this will increase performance obviously. */
-
-#define GLAMOR_PIXMAP_DYNAMIC_UPLOAD
-#define GLAMOR_GRADIENT_SHADER
-#define GLAMOR_TRAPEZOID_SHADER
-#define GLAMOR_TEXTURED_LARGE_PIXMAP 1
-#define WALKAROUND_LARGE_TEXTURE_MAP
-#if 0
-#define MAX_FBO_SIZE 32 /* For test purpose only. */
-#endif
-//#define GLYPHS_NO_EDEGEMAP_OVERLAP_CHECK
-#define GLYPHS_EDEGE_OVERLAP_LOOSE_CHECK
-
-#endif				/* GLAMOR_PRIV_H */
diff --git a/extra/glamor-egl/glamor_utils.h b/extra/glamor-egl/glamor_utils.h
deleted file mode 100644
index 36beb49ed..000000000
--- a/extra/glamor-egl/glamor_utils.h
+++ /dev/null
@@ -1,1836 +0,0 @@
-/*
- * Copyright © 2009 Intel Corporation
- *
- * 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
- * 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.
- *
- * Authors:
- *    Zhigang Gong <zhigang.gong@linux.intel.com>
- *
- */
-
-#ifndef GLAMOR_PRIV_H
-#error This file can only be included by glamor_priv.h
-#endif
-
-#ifndef __GLAMOR_UTILS_H__
-#define __GLAMOR_UTILS_H__
-
-#define v_from_x_coord_x(_xscale_, _x_)          ( 2 * (_x_) * (_xscale_) - 1.0)
-#define v_from_x_coord_y(_yscale_, _y_)          (-2 * (_y_) * (_yscale_) + 1.0)
-#define v_from_x_coord_y_inverted(_yscale_, _y_) (2 * (_y_) * (_yscale_) - 1.0)
-#define t_from_x_coord_x(_xscale_, _x_)          ((_x_) * (_xscale_))
-#define t_from_x_coord_y(_yscale_, _y_)          (1.0 - (_y_) * (_yscale_))
-#define t_from_x_coord_y_inverted(_yscale_, _y_) ((_y_) * (_yscale_))
-
-#define pixmap_priv_get_dest_scale(_pixmap_priv_, _pxscale_, _pyscale_)  \
-  do {                                                                   \
-    int _w_,_h_;                                                         \
-    PIXMAP_PRIV_GET_ACTUAL_SIZE(_pixmap_priv_, _w_, _h_);                \
-    *(_pxscale_) = 1.0 / _w_;                                            \
-    *(_pyscale_) = 1.0 / _h_;                                            \
-   } while(0)
-
-#define pixmap_priv_get_scale(_pixmap_priv_, _pxscale_, _pyscale_)	\
-   do {									\
-    *(_pxscale_) = 1.0 / (_pixmap_priv_)->base.fbo->width;			\
-    *(_pyscale_) = 1.0 / (_pixmap_priv_)->base.fbo->height;			\
-  } while(0)
-
-#define GLAMOR_PIXMAP_FBO_NOT_EAXCT_SIZE(priv)			\
-   (priv->base.fbo->width != priv->base.pixmap->drawable.width 	\
-      || priv->base.fbo->height != priv->base.pixmap->drawable.height)	\
-
-#define PIXMAP_PRIV_GET_ACTUAL_SIZE(priv, w, h)			\
-  do {								\
-	if (unlikely(priv->type == GLAMOR_TEXTURE_LARGE)) {		\
-		w = priv->large.box.x2 - priv->large.box.x1;	\
-		h = priv->large.box.y2 - priv->large.box.y1;	\
-	} else {						\
-		w = priv->base.pixmap->drawable.width;		\
-		h = priv->base.pixmap->drawable.height;		\
-	}							\
-  } while(0)
-
-#define glamor_pixmap_fbo_fix_wh_ratio(wh, priv)  		\
-  do {								\
-	int actual_w, actual_h;					\
-	PIXMAP_PRIV_GET_ACTUAL_SIZE(priv, actual_w, actual_h);	\
-	wh[0] = (float)priv->base.fbo->width / actual_w;	\
-	wh[1] = (float)priv->base.fbo->height / actual_h;	\
-	wh[2] = 1.0 / priv->base.fbo->width;			\
-	wh[3] = 1.0 / priv->base.fbo->height;			\
-  } while(0)
-
-#define pixmap_priv_get_fbo_off(_priv_, _xoff_, _yoff_)		\
-   do {								\
-	if (unlikely(_priv_ && (_priv_)->type				\
-		== GLAMOR_TEXTURE_LARGE)) {			\
-		*(_xoff_) = - (_priv_)->large.box.x1;	\
-		*(_yoff_) = - (_priv_)->large.box.y1;	\
-	} else {						\
-		*(_xoff_) = 0;					\
-		*(_yoff_) = 0;					\
-	}							\
-   } while(0)
-
-#define xFixedToFloat(_val_) ((float)xFixedToInt(_val_)			\
-			      + ((float)xFixedFrac(_val_) / 65536.0))
-
-#define glamor_picture_get_matrixf(_picture_, _matrix_)			\
-  do {									\
-    int _i_;								\
-    if ((_picture_)->transform)						\
-      {									\
-	for(_i_ = 0; _i_ < 3; _i_++)					\
-	  {								\
-	    (_matrix_)[_i_ * 3 + 0] =					\
-	      xFixedToFloat((_picture_)->transform->matrix[_i_][0]);	\
-	    (_matrix_)[_i_ * 3 + 1] =					\
-	      xFixedToFloat((_picture_)->transform->matrix[_i_][1]);	\
-	    (_matrix_)[_i_ * 3 + 2] = \
-	      xFixedToFloat((_picture_)->transform->matrix[_i_][2]);	\
-	  }								\
-      }									\
-  }  while(0)
-
-#define fmod(x, w)		(x - w * floor((float)x/w))
-
-#define fmodulus(x, w, c)	do {c = fmod(x, w);		\
-				    c = c >= 0 ? c : c + w;}	\
-				while(0)
-/* @x: is current coord
- * @x2: is the right/bottom edge
- * @w: is current width or height
- * @odd: is output value, 0 means we are in an even region, 1 means we are in a
- * odd region.
- * @c: is output value, equal to x mod w. */
-#define fodd_repeat_mod(x, x2, w, odd, c)	\
-  do {						\
-	float shift;				\
-	fmodulus((x), w, c); 			\
-	shift = fabs((x) - (c));		\
-	shift = floor(fabs(round(shift)) / w);	\
-	odd = (int)shift & 1;			\
-	if (odd && (((x2 % w) == 0) &&		\
-	    round(fabs(x)) == x2))		\
-		odd = 0;			\
-  } while(0)
-
-/* @txy: output value, is the corrected coords.
- * @xy: input coords to be fixed up.
- * @cd: xy mod wh, is a input value.
- * @wh: current width or height.
- * @bxy1,bxy2: current box edge's x1/x2 or y1/y2
- *
- * case 1:
- *  ----------
- *  |  *     |
- *  |        |
- *  ----------
- *  tx = (c - x1) mod w
- *
- *  case 2:
- *     ---------
- *  *  |       |
- *     |       |
- *     ---------
- *   tx = - (c - (x1 mod w))
- *
- *   case 3:
- *
- *   ----------
- *   |        |  *
- *   |        |
- *   ----------
- *   tx = ((x2 mod x) - c) + (x2 - x1)
- **/
-#define __glamor_repeat_reflect_fixup(txy, xy,		\
-				cd, wh, bxy1, bxy2)	\
-  do {							\
-	cd = wh - cd;					\
-	if ( xy >= bxy1 && xy < bxy2) {			\
-		cd = cd - bxy1;				\
-		fmodulus(cd, wh, txy);			\
-	} else	if (xy < bxy1) {			\
-		float bxy1_mod;				\
-		fmodulus(bxy1, wh, bxy1_mod);		\
-		txy = -(cd - bxy1_mod);			\
-	}						\
-	else if (xy >= bxy2)	{			\
-		float bxy2_mod;				\
-		fmodulus(bxy2, wh, bxy2_mod);		\
-		if (bxy2_mod == 0)			\
-			bxy2_mod = wh;			\
-		txy = (bxy2_mod - cd) + bxy2 - bxy1;	\
-	} else {assert(0); txy = 0;}			\
-  } while(0)
-
-#define _glamor_repeat_reflect_fixup(txy, xy, cd, odd,	\
-				     wh, bxy1, bxy2)	\
-  do {							\
-	if (odd) {					\
-		__glamor_repeat_reflect_fixup(txy, xy, 	\
-			cd, wh, bxy1, bxy2);		\
-	} else						\
-		txy = xy - bxy1;			\
-  } while(0)
-
-#define _glamor_get_reflect_transform_coords(priv, repeat_type,	\
-					    tx1, ty1, 		\
-				            _x1_, _y1_)		\
-  do {								\
-	int odd_x, odd_y;					\
-	float c, d;						\
-	fodd_repeat_mod(_x1_,priv->box.x2,			\
-		    priv->base.pixmap->drawable.width,		\
-		    odd_x, c);					\
-	fodd_repeat_mod(_y1_,	priv->box.y2,			\
-		    priv->base.pixmap->drawable.height,		\
-		    odd_y, d);					\
-	DEBUGF("c %f d %f oddx %d oddy %d \n",			\
-		c, d, odd_x, odd_y);				\
-	DEBUGF("x2 %d x1 %d fbo->width %d \n", priv->box.x2,	\
-		priv->box.x1, priv->base.fbo->width);		\
-	DEBUGF("y2 %d y1 %d fbo->height %d \n", priv->box.y2, 	\
-		priv->box.y1, priv->base.fbo->height);		\
-	_glamor_repeat_reflect_fixup(tx1, _x1_, c, odd_x,	\
-		priv->base.pixmap->drawable.width,		\
-		priv->box.x1, priv->box.x2);			\
-	_glamor_repeat_reflect_fixup(ty1, _y1_, d, odd_y,	\
-		priv->base.pixmap->drawable.height,		\
-		priv->box.y1, priv->box.y2);			\
-   } while(0)
-
-#define _glamor_get_repeat_coords(priv, repeat_type, tx1,	\
-				  ty1, tx2, ty2,		\
-				  _x1_, _y1_, _x2_,		\
-				  _y2_, c, d, odd_x, odd_y)	\
-  do {								\
-	if (repeat_type == RepeatReflect) {			\
-		DEBUGF("x1 y1 %d %d\n",				\
-			_x1_, _y1_ );				\
-		DEBUGF("width %d box.x1 %d \n",			\
-		       (priv)->base.pixmap->drawable.width,	\
-		       priv->box.x1);				\
-		if (odd_x) {					\
-			c = (priv)->base.pixmap->drawable.width	\
-				- c;				\
-			tx1 = c - priv->box.x1;			\
-			tx2 = tx1 - ((_x2_) - (_x1_));		\
-		} else {					\
-			tx1 = c - priv->box.x1;			\
-			tx2 = tx1 + ((_x2_) - (_x1_));		\
-		}						\
-		if (odd_y){					\
-			d = (priv)->base.pixmap->drawable.height\
-			    - d;				\
-			ty1 = d - priv->box.y1;			\
-			ty2 = ty1 - ((_y2_) - (_y1_));		\
-		} else {					\
-			ty1 = d - priv->box.y1;			\
-			ty2 = ty1 + ((_y2_) - (_y1_));		\
-		}						\
-	} else { /* RepeatNormal*/				\
-		tx1 = (c - priv->box.x1);  			\
-		ty1 = (d - priv->box.y1);			\
-		tx2 = tx1 + ((_x2_) - (_x1_));			\
-		ty2 = ty1 + ((_y2_) - (_y1_));			\
-	}							\
-   } while(0)
-
-
-/* _x1_ ... _y2_ may has fractional. */
-#define glamor_get_repeat_transform_coords(priv, repeat_type, tx1,	\
-					   ty1, _x1_, _y1_)		\
-  do {									\
-	DEBUGF("width %d box.x1 %d x2 %d y1 %d y2 %d\n",		\
-		(priv)->base.pixmap->drawable.width,			\
-		priv->box.x1, priv->box.x2, priv->box.y1,		\
-		priv->box.y2);						\
-	DEBUGF("x1 %f y1 %f \n", _x1_, _y1_);				\
-	if (repeat_type != RepeatReflect) {				\
-		tx1 = _x1_ - priv->box.x1;				\
-		ty1 = _y1_ - priv->box.y1;				\
-	} else			\
-		_glamor_get_reflect_transform_coords(priv, repeat_type, \
-				  tx1, ty1, 				\
-				  _x1_, _y1_);				\
-	DEBUGF("tx1 %f ty1 %f \n", tx1, ty1);				\
-   } while(0)
-
-/* _x1_ ... _y2_ must be integer. */
-#define glamor_get_repeat_coords(priv, repeat_type, tx1,		\
-				 ty1, tx2, ty2, _x1_, _y1_, _x2_,	\
-				 _y2_) 					\
-  do {									\
-	int c, d;							\
-	int odd_x = 0, odd_y = 0;					\
-	DEBUGF("width %d box.x1 %d x2 %d y1 %d y2 %d\n",		\
-		(priv)->base.pixmap->drawable.width,			\
-		priv->box.x1, priv->box.x2,				\
-		priv->box.y1, priv->box.y2);				\
-	modulus((_x1_), (priv)->base.pixmap->drawable.width, c); 	\
-	modulus((_y1_), (priv)->base.pixmap->drawable.height, d);	\
-	DEBUGF("c %d d %d \n", c, d);					\
-	if (repeat_type == RepeatReflect) {				\
-		odd_x = abs((_x1_ - c)					\
-			/ (priv->base.pixmap->drawable.width)) & 1;	\
-		odd_y = abs((_y1_ - d)					\
-			/ (priv->base.pixmap->drawable.height)) & 1;	\
-	}								\
-	_glamor_get_repeat_coords(priv, repeat_type, tx1, ty1, tx2, ty2,\
-				  _x1_, _y1_, _x2_, _y2_, c, d,		\
-				  odd_x, odd_y);			\
-   } while(0)
-
-#define glamor_transform_point(matrix, tx, ty, x, y)			\
-  do {									\
-    int _i_;								\
-    float _result_[4];							\
-    for (_i_ = 0; _i_ < 3; _i_++) {					\
-      _result_[_i_] = (matrix)[_i_ * 3] * (x) + (matrix)[_i_ * 3 + 1] * (y)	\
-	+ (matrix)[_i_ * 3 + 2];					\
-    }									\
-    tx = _result_[0] / _result_[2];					\
-    ty = _result_[1] / _result_[2];					\
-  } while(0)
-
-#define _glamor_set_normalize_tpoint(xscale, yscale, _tx_, _ty_,	\
-				     texcoord, yInverted)		\
-  do {									\
-	(texcoord)[0] = t_from_x_coord_x(xscale, _tx_);			\
-	if (likely(yInverted))						\
-		(texcoord)[1] = t_from_x_coord_y_inverted(yscale, _ty_);\
-	else								\
-		(texcoord)[1] = t_from_x_coord_y(yscale, _ty_);		\
-        DEBUGF("normalized point tx %f ty %f \n", (texcoord)[0],	\
-		(texcoord)[1]);						\
-  } while(0)
-
-#define glamor_set_transformed_point(priv, matrix, xscale,		\
-				     yscale, texcoord,			\
-                                     x, y, 				\
-				     yInverted)				\
-  do {									\
-    float tx, ty;							\
-    int fbo_x_off, fbo_y_off;						\
-    pixmap_priv_get_fbo_off(priv, &fbo_x_off, &fbo_y_off);		\
-    glamor_transform_point(matrix, tx, ty, x, y);			\
-    DEBUGF("tx %f ty %f fbooff %d %d \n",				\
-	    tx, ty, fbo_x_off, fbo_y_off);				\
-									\
-    tx += fbo_x_off;							\
-    ty += fbo_y_off;							\
-    (texcoord)[0] = t_from_x_coord_x(xscale, tx);			\
-    if (likely(yInverted))							\
-      (texcoord)[1] = t_from_x_coord_y_inverted(yscale, ty);		\
-    else								\
-      (texcoord)[1] = t_from_x_coord_y(yscale, ty);			\
-    DEBUGF("normalized tx %f ty %f \n", (texcoord)[0], (texcoord)[1]);	\
-  } while(0)
-
-#define glamor_set_transformed_normalize_tri_tcoords(priv,		\
-						     matrix,		\
-						     xscale,		\
-						     yscale,		\
-						     vtx,		\
-						     yInverted,		\
-						     texcoords)		\
-    do {								\
-	glamor_set_transformed_point(priv, matrix, xscale, yscale,	\
-				     texcoords, (vtx)[0], (vtx)[1],	\
-				     yInverted);			\
-	glamor_set_transformed_point(priv, matrix, xscale, yscale,	\
-				     texcoords+2, (vtx)[2], (vtx)[3],	\
-				     yInverted);			\
-	glamor_set_transformed_point(priv, matrix, xscale, yscale,	\
-				     texcoords+4, (vtx)[4], (vtx)[5],	\
-				     yInverted);			\
-    } while (0)
-
-#define glamor_set_transformed_normalize_tcoords_ext( priv,		\
-						  matrix,		\
-						  xscale,		\
-						  yscale,		\
-                                                  tx1, ty1, tx2, ty2,   \
-                                                  yInverted, texcoords,	\
-						  stride)		\
-  do {									\
-    glamor_set_transformed_point(priv, matrix, xscale, yscale,		\
-				 texcoords, tx1, ty1,			\
-				 yInverted);				\
-    glamor_set_transformed_point(priv, matrix, xscale, yscale,		\
-				 texcoords + 1 * stride, tx2, ty1,	\
-				 yInverted);				\
-    glamor_set_transformed_point(priv, matrix, xscale, yscale,		\
-				 texcoords + 2 * stride, tx2, ty2,	\
-				 yInverted);				\
-    glamor_set_transformed_point(priv, matrix, xscale, yscale,		\
-				 texcoords + 3 * stride, tx1, ty2,	\
-				 yInverted);				\
-  } while (0)
-
-#define glamor_set_transformed_normalize_tcoords( priv,			\
-						  matrix,		\
-						  xscale,		\
-						  yscale,		\
-                                                  tx1, ty1, tx2, ty2,   \
-                                                  yInverted, texcoords)	\
-  do {									\
-	glamor_set_transformed_normalize_tcoords_ext( priv,		\
-						  matrix,		\
-						  xscale,		\
-						  yscale,		\
-                                                  tx1, ty1, tx2, ty2,   \
-                                                  yInverted, texcoords,	\
-						  2);			\
-  } while (0)
-
-
-
-#define glamor_set_normalize_tri_tcoords(xscale,		\
-					 yscale,		\
-					 vtx,			\
-					 yInverted,		\
-					 texcoords)		\
-    do {							\
-	_glamor_set_normalize_tpoint(xscale, yscale,		\
-				(vtx)[0], (vtx)[1],		\
-				texcoords,			\
-				yInverted);			\
-	_glamor_set_normalize_tpoint(xscale, yscale,		\
-				(vtx)[2], (vtx)[3],		\
-				texcoords+2,			\
-				yInverted);			\
-	_glamor_set_normalize_tpoint(xscale, yscale,		\
-				(vtx)[4], (vtx)[5],		\
-				texcoords+4,			\
-				yInverted);			\
-    } while (0)
-
-#define glamor_set_repeat_transformed_normalize_tcoords_ext( priv,	\
-							 repeat_type,	\
-							 matrix,	\
-							 xscale,	\
-							 yscale,	\
-							 _x1_, _y1_,	\
-							 _x2_, _y2_,   	\
-							 yInverted,	\
-							 texcoords,	\
-							 stride)	\
-  do {									\
-    if (likely(priv->type != GLAMOR_TEXTURE_LARGE)) {			\
-	glamor_set_transformed_normalize_tcoords_ext(priv, matrix, xscale,	\
-						 yscale, _x1_, _y1_,	\
-						 _x2_, _y2_, yInverted,	\
-						 texcoords, stride);	\
-    } else {								\
-    float tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4;			\
-    float ttx1, tty1, ttx2, tty2, ttx3, tty3, ttx4, tty4;		\
-    DEBUGF("original coords %d %d %d %d\n", _x1_, _y1_, _x2_, _y2_);	\
-    glamor_transform_point(matrix, tx1, ty1, _x1_, _y1_);		\
-    glamor_transform_point(matrix, tx2, ty2, _x2_, _y1_);		\
-    glamor_transform_point(matrix, tx3, ty3, _x2_, _y2_);		\
-    glamor_transform_point(matrix, tx4, ty4, _x1_, _y2_);		\
-    DEBUGF("transformed %f %f %f %f %f %f %f %f\n",			\
-	   tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4);			\
-    glamor_get_repeat_transform_coords((&priv->large), repeat_type, 	\
-				       ttx1, tty1, 			\
-				       tx1, ty1);			\
-    glamor_get_repeat_transform_coords((&priv->large), repeat_type, 	\
-				       ttx2, tty2, 			\
-				       tx2, ty2);			\
-    glamor_get_repeat_transform_coords((&priv->large), repeat_type, 	\
-				       ttx3, tty3, 			\
-				       tx3, ty3);			\
-    glamor_get_repeat_transform_coords((&priv->large), repeat_type, 	\
-				       ttx4, tty4, 			\
-				       tx4, ty4);			\
-    DEBUGF("repeat transformed %f %f %f %f %f %f %f %f\n", ttx1, tty1, 	\
-	    ttx2, tty2,	ttx3, tty3, ttx4, tty4);			\
-    _glamor_set_normalize_tpoint(xscale, yscale, ttx1, tty1,		\
-				 texcoords, yInverted);			\
-    _glamor_set_normalize_tpoint(xscale, yscale, ttx2, tty2,		\
-				 texcoords + 1 * stride, yInverted);	\
-    _glamor_set_normalize_tpoint(xscale, yscale, ttx3, tty3,		\
-				 texcoords + 2 * stride, yInverted);	\
-    _glamor_set_normalize_tpoint(xscale, yscale, ttx4, tty4,		\
-				 texcoords + 3 * stride, yInverted);	\
-   }									\
-  } while (0)
-
-
-#define glamor_set_repeat_transformed_normalize_tcoords( priv,		\
-							 repeat_type,	\
-							 matrix,	\
-							 xscale,	\
-							 yscale,	\
-							 _x1_, _y1_,	\
-							 _x2_, _y2_,   	\
-							 yInverted,	\
-							 texcoords)	\
-  do {									\
-	glamor_set_repeat_transformed_normalize_tcoords_ext( priv,	\
-							 repeat_type,	\
-							 matrix,	\
-							 xscale,	\
-							 yscale,	\
-							 _x1_, _y1_,	\
-							 _x2_, _y2_,   	\
-							 yInverted,	\
-							 texcoords,	\
-							 2);	\
-  } while (0)
-
-#define _glamor_set_normalize_tcoords(xscale, yscale, tx1,		\
-				      ty1, tx2, ty2,			\
-				      yInverted, vertices, stride)	\
-  do {									\
-    /* vertices may be write-only, so we use following			\
-     * temporary variable. */ 						\
-    float _t0_, _t1_, _t2_, _t5_;					\
-    (vertices)[0] = _t0_ = t_from_x_coord_x(xscale, tx1);		\
-    (vertices)[1 * stride] = _t2_ = t_from_x_coord_x(xscale, tx2);	\
-    (vertices)[2 * stride] = _t2_;					\
-    (vertices)[3 * stride] = _t0_;					\
-    if (likely(yInverted)) {							\
-      (vertices)[1] = _t1_ = t_from_x_coord_y_inverted(yscale, ty1);	\
-      (vertices)[2 * stride + 1] = _t5_ = t_from_x_coord_y_inverted(yscale, ty2);\
-    }									\
-    else {								\
-      (vertices)[1] = _t1_ = t_from_x_coord_y(yscale, ty1);		\
-      (vertices)[2 * stride + 1] = _t5_ = t_from_x_coord_y(yscale, ty2);\
-    }									\
-    (vertices)[1 * stride + 1] = _t1_;					\
-    (vertices)[3 * stride + 1] = _t5_;					\
-  } while(0)
-
-#define glamor_set_normalize_tcoords_ext(priv, xscale, yscale,		\
-				     x1, y1, x2, y2,			\
-                                     yInverted, vertices, stride)	\
-  do {									\
-     if (unlikely(priv->type == GLAMOR_TEXTURE_LARGE)) {				\
-	float tx1, tx2, ty1, ty2;					\
-	int fbo_x_off, fbo_y_off;					\
-	pixmap_priv_get_fbo_off(priv, &fbo_x_off, &fbo_y_off);		\
-	tx1 = x1 + fbo_x_off; 						\
-	tx2 = x2 + fbo_x_off;						\
-	ty1 = y1 + fbo_y_off;						\
-	ty2 = y2 + fbo_y_off;						\
-	_glamor_set_normalize_tcoords(xscale, yscale, tx1, ty1,		\
-				   tx2, ty2, yInverted, vertices,	\
-				   stride);				\
-     } else								\
-	_glamor_set_normalize_tcoords(xscale, yscale, x1, y1,		\
-				   x2, y2, yInverted, vertices, stride);\
- } while(0)
-
-
-#define glamor_set_normalize_tcoords(priv, xscale, yscale,		\
-				     x1, y1, x2, y2,			\
-                                     yInverted, vertices)		\
-  do {									\
-	glamor_set_normalize_tcoords_ext(priv, xscale, yscale,		\
-				     x1, y1, x2, y2,			\
-                                     yInverted, vertices, 2);		\
- } while(0)
-
-#define glamor_set_repeat_normalize_tcoords_ext(priv, repeat_type,	\
-					    xscale, yscale,		\
-					    _x1_, _y1_, _x2_, _y2_,	\
-	                                    yInverted, vertices, stride)\
-  do {									\
-     if (unlikely(priv->type == GLAMOR_TEXTURE_LARGE)) {				\
-	float tx1, tx2, ty1, ty2;					\
-	if (repeat_type == RepeatPad) {					\
-		tx1 = _x1_ - priv->large.box.x1;			\
-		ty1 = _y1_ - priv->large.box.y1;			\
-		tx2 = tx1 + ((_x2_) - (_x1_));				\
-		ty2 = ty1 + ((_y2_) - (_y1_));				\
-	} else {							\
-	glamor_get_repeat_coords((&priv->large), repeat_type,		\
-				 tx1, ty1, tx2, ty2,			\
-				 _x1_, _y1_, _x2_, _y2_);		\
-	}								\
-	_glamor_set_normalize_tcoords(xscale, yscale, tx1, ty1,		\
-				   tx2, ty2, yInverted, vertices,	\
-				   stride);				\
-     } else								\
-	_glamor_set_normalize_tcoords(xscale, yscale, _x1_, _y1_,	\
-				   _x2_, _y2_, yInverted, vertices,	\
-				   stride);				\
- } while(0)
-
-
-#define glamor_set_repeat_normalize_tcoords(priv, repeat_type,		\
-					    xscale, yscale,		\
-					    _x1_, _y1_, _x2_, _y2_,	\
-	                                    yInverted, vertices)	\
-  do {									\
-	glamor_set_repeat_normalize_tcoords_ext(priv, repeat_type,	\
-					    xscale, yscale,		\
-					    _x1_, _y1_, _x2_, _y2_,	\
-	                                    yInverted, vertices, 2);	\
- } while(0)
-
-#define glamor_set_normalize_tcoords_tri_stripe(xscale, yscale,		\
-						x1, y1, x2, y2,		\
-						yInverted, vertices)	\
-    do {								\
-	(vertices)[0] = t_from_x_coord_x(xscale, x1);			\
-	(vertices)[2] = t_from_x_coord_x(xscale, x2);			\
-	(vertices)[6] = (vertices)[2];					\
-	(vertices)[4] = (vertices)[0];					\
-	if (likely(yInverted)) {						\
-	    (vertices)[1] = t_from_x_coord_y_inverted(yscale, y1);	\
-	    (vertices)[7] = t_from_x_coord_y_inverted(yscale, y2);	\
-	}								\
-	else {								\
-	    (vertices)[1] = t_from_x_coord_y(yscale, y1);		\
-	    (vertices)[7] = t_from_x_coord_y(yscale, y2);		\
-	}								\
-	(vertices)[3] = (vertices)[1];					\
-	(vertices)[5] = (vertices)[7];					\
-    } while(0)
-
-#define glamor_set_tcoords(width, height, x1, y1, x2, y2,	\
-			   yInverted, vertices)			\
-    do {							\
-	(vertices)[0] = (x1);					\
-	(vertices)[2] = (x2);					\
-	(vertices)[4] = (vertices)[2];				\
-	(vertices)[6] = (vertices)[0];				\
-	if (likely(yInverted)) {					\
-	    (vertices)[1] = (y1);				\
-	    (vertices)[5] = (y2);				\
-	}							\
-	else {							\
-	    (vertices)[1] = height - (y2);			\
-	    (vertices)[5] = height - (y1);			\
-	}							\
-	(vertices)[3] = (vertices)[1];				\
-	(vertices)[7] = (vertices)[5];				\
-    } while(0)
-
-#define glamor_set_tcoords_ext(width, height, x1, y1, x2, y2,	\
-			       yInverted, vertices, stride)	\
-    do {							\
-	(vertices)[0] = (x1);					\
-	(vertices)[1*stride] = (x2);				\
-	(vertices)[2*stride] = (vertices)[1*stride];		\
-	(vertices)[3*stride] = (vertices)[0];			\
-	if (likely(yInverted)) {				\
-	    (vertices)[1] = (y1);				\
-	    (vertices)[2*stride + 1] = (y2);			\
-	}							\
-	else {							\
-	    (vertices)[1] = height - (y2);			\
-	    (vertices)[2*stride + 1] = height - (y1);		\
-	}							\
-	(vertices)[1*stride + 1] = (vertices)[1];		\
-	(vertices)[3*stride + 1] = (vertices)[2*stride + 1];	\
-    } while(0)
-
-#define glamor_set_normalize_one_vcoord(xscale, yscale, x, y,		\
-					yInverted, vertices)		\
-    do {								\
-	(vertices)[0] = v_from_x_coord_x(xscale, x);			\
-	if (likely(yInverted)) {						\
-	    (vertices)[1] = v_from_x_coord_y_inverted(yscale, y);	\
-	} else {							\
-	    (vertices)[1] = v_from_x_coord_y(yscale, y);		\
-	}								\
-    } while(0)
-
-#define glamor_set_normalize_tri_vcoords(xscale, yscale, vtx,		\
-					 yInverted, vertices)		\
-    do {								\
-	glamor_set_normalize_one_vcoord(xscale, yscale,			\
-					(vtx)[0], (vtx)[1],		\
-					yInverted, vertices);		\
-	glamor_set_normalize_one_vcoord(xscale, yscale,			\
-					(vtx)[2], (vtx)[3],		\
-					yInverted, vertices+2);		\
-	glamor_set_normalize_one_vcoord(xscale, yscale,			\
-					(vtx)[4], (vtx)[5],		\
-					yInverted, vertices+4);		\
-    } while(0)
-
-#define glamor_set_tcoords_tri_strip(width, height, x1, y1, x2, y2,	\
-				     yInverted, vertices)		\
-    do {								\
-	(vertices)[0] = (x1);						\
-	(vertices)[2] = (x2);						\
-	(vertices)[6] = (vertices)[2];					\
-	(vertices)[4] = (vertices)[0];					\
-	if (likely(yInverted)) {						\
-	    (vertices)[1] = (y1);					\
-	    (vertices)[7] = (y2);					\
-	}								\
-	else {								\
-	    (vertices)[1] = height - (y2);				\
-	    (vertices)[7] = height - (y1);				\
-	}								\
-	(vertices)[3] = (vertices)[1];					\
-	(vertices)[5] = (vertices)[7];					\
-    } while(0)
-
-#define glamor_set_normalize_vcoords_ext(priv, xscale, yscale,		\
-				     x1, y1, x2, y2,			\
-                                     yInverted, vertices, stride)	\
-  do {									\
-    int fbo_x_off, fbo_y_off;						\
-    /* vertices may be write-only, so we use following			\
-     * temporary variable. */						\
-    float _t0_, _t1_, _t2_, _t5_;					\
-    pixmap_priv_get_fbo_off(priv, &fbo_x_off, &fbo_y_off);		\
-    (vertices)[0] = _t0_ = v_from_x_coord_x(xscale, x1 + fbo_x_off);	\
-    (vertices)[1 * stride] = _t2_ = v_from_x_coord_x(xscale,		\
-					x2 + fbo_x_off);		\
-    (vertices)[2 * stride] = _t2_;					\
-    (vertices)[3 * stride] = _t0_;					\
-    if (likely(yInverted)) {							\
-      (vertices)[1] = _t1_ = v_from_x_coord_y_inverted(yscale,		\
-				y1 + fbo_y_off);			\
-      (vertices)[2 * stride + 1] = _t5_ =				\
-			v_from_x_coord_y_inverted(yscale,		\
-					y2 + fbo_y_off);		\
-    }									\
-    else {								\
-      (vertices)[1] = _t1_ = v_from_x_coord_y(yscale, y1 + fbo_y_off);	\
-      (vertices)[2 * stride + 1] = _t5_ = v_from_x_coord_y(yscale,	\
-					y2 + fbo_y_off);		\
-    }									\
-    (vertices)[1 * stride + 1] = _t1_;					\
-    (vertices)[3 * stride + 1] = _t5_;					\
-  } while(0)
-
-
-#define glamor_set_normalize_vcoords(priv, xscale, yscale,		\
-				     x1, y1, x2, y2,			\
-                                     yInverted, vertices)		\
-  do {									\
-	glamor_set_normalize_vcoords_ext(priv, xscale, yscale,		\
-				     x1, y1, x2, y2,			\
-                                     yInverted, vertices, 2);		\
-  } while(0)
-
-#define glamor_set_const_ext(params, nparam, vertices, nverts, stride)	\
-    do {								\
-	int _i_ = 0, _j_ = 0;						\
-	for(; _i_ < nverts; _i_++) {					\
-	    for(_j_ = 0; _j_ < nparam; _j_++) {				\
-		vertices[stride*_i_ + _j_] = params[_j_];		\
-	    }								\
-	}								\
-    } while(0)
-
-#define glamor_set_normalize_vcoords_tri_strip(xscale, yscale,		\
-					       x1, y1, x2, y2,		\
-					       yInverted, vertices)	\
-    do {								\
-	(vertices)[0] = v_from_x_coord_x(xscale, x1);			\
-	(vertices)[2] = v_from_x_coord_x(xscale, x2);			\
-	(vertices)[6] = (vertices)[2];					\
-	(vertices)[4] = (vertices)[0];					\
-	if (likely(yInverted)) {						\
-	    (vertices)[1] = v_from_x_coord_y_inverted(yscale, y1);	\
-	    (vertices)[7] = v_from_x_coord_y_inverted(yscale, y2);	\
-	}								\
-	else {								\
-	    (vertices)[1] = v_from_x_coord_y(yscale, y1);		\
-	    (vertices)[7] = v_from_x_coord_y(yscale, y2);		\
-	}								\
-	(vertices)[3] = (vertices)[1];					\
-	(vertices)[5] = (vertices)[7];					\
-    } while(0)
-
-#define glamor_set_normalize_pt(xscale, yscale, x, y,		\
-                                yInverted, pt)			\
-    do {							\
-        (pt)[0] = t_from_x_coord_x(xscale, x);			\
-        if (likely(yInverted)) {					\
-            (pt)[1] = t_from_x_coord_y_inverted(yscale, y);	\
-        } else {						\
-            (pt)[1] = t_from_x_coord_y(yscale, y);		\
-        }							\
-    } while(0)
-
-#define glamor_set_circle_centre(width, height, x, y,	\
-				 yInverted, c)		\
-    do {						\
-        (c)[0] = (float)x;				\
-        if (likely(yInverted)) {				\
-            (c)[1] = (float)y;				\
-        } else {					\
-            (c)[1] = (float)height - (float)y;		\
-        }						\
-    } while(0)
-
-inline static void
-glamor_calculate_boxes_bound(BoxPtr bound, BoxPtr boxes, int nbox)
-{
-	int x_min, y_min;
-	int x_max, y_max;
-	int i;
-	x_min = y_min = MAXSHORT;
-	x_max = y_max = MINSHORT;
-	for (i = 0; i < nbox; i++) {
-		if (x_min > boxes[i].x1)
-			x_min = boxes[i].x1;
-		if (y_min > boxes[i].y1)
-			y_min = boxes[i].y1;
-
-		if (x_max < boxes[i].x2)
-			x_max = boxes[i].x2;
-		if (y_max < boxes[i].y2)
-			y_max = boxes[i].y2;
-	}
-	bound->x1 = x_min;
-	bound->y1 = y_min;
-	bound->x2 = x_max;
-	bound->y2 = y_max;
-}
-
-inline static void
-glamor_translate_boxes(BoxPtr boxes, int nbox, int dx, int dy)
-{
-	int i;
-	for (i = 0; i < nbox; i++) {
-		boxes[i].x1 += dx;
-		boxes[i].y1 += dy;
-		boxes[i].x2 += dx;
-		boxes[i].y2 += dy;
-	}
-}
-
-static inline Bool
-region_is_empty(pixman_region16_t *region)
-{
-	return region->data && region->data->numRects == 0;
-}
-
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
-#endif
-
-#define ALIGN(i,m)	(((i) + (m) - 1) & ~((m) - 1))
-#define MIN(a,b)	((a) < (b) ? (a) : (b))
-#define MAX(a,b)	((a) > (b) ? (a) : (b))
-
-#define glamor_check_fbo_size(_glamor_,_w_, _h_)    ((_w_) > 0 && (_h_) > 0 \
-                                                    && (_w_) <= _glamor_->max_fbo_size  \
-                                                    && (_h_) <= _glamor_->max_fbo_size)
-
-/* For 1bpp pixmap, we don't store it as texture. */
-#define glamor_check_pixmap_fbo_depth(_depth_) (			\
-						_depth_ == 8		\
-						|| _depth_ == 15	\
-						|| _depth_ == 16	\
-						|| _depth_ == 24	\
-						|| _depth_ == 30	\
-						|| _depth_ == 32)
-
-#define GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv) (pixmap_priv && pixmap_priv->base.is_picture == 1)
-#define GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv)    (pixmap_priv && pixmap_priv->base.gl_fbo == GLAMOR_FBO_NORMAL)
-#define GLAMOR_PIXMAP_PRIV_HAS_FBO_DOWNLOADED(pixmap_priv)    (pixmap_priv && (pixmap_priv->base.gl_fbo == GLAMOR_FBO_DOWNLOADED))
-
-/**
- * Borrow from uxa.
- */
-static inline CARD32
-format_for_depth(int depth)
-{
-	switch (depth) {
-	case 1:
-		return PICT_a1;
-	case 4:
-		return PICT_a4;
-	case 8:
-		return PICT_a8;
-	case 15:
-		return PICT_x1r5g5b5;
-	case 16:
-		return PICT_r5g6b5;
-	default:
-	case 24:
-		return PICT_x8r8g8b8;
-#if XORG_VERSION_CURRENT >= 10699900
-	case 30:
-		return PICT_x2r10g10b10;
-#endif
-	case 32:
-		return PICT_a8r8g8b8;
-	}
-}
-
-static inline void
-gl_iformat_for_depth(int depth, GLenum * format)
-{
-	switch (depth) {
-#ifndef GLAMOR_GLES2
-	case 1:
-	case 8:
-		*format = GL_ALPHA;
-		break;
-#endif
-	default:
-		*format = GL_RGBA;
-		break;
-       }
-}
-
-static inline CARD32
-format_for_pixmap(PixmapPtr pixmap)
-{
-	glamor_pixmap_private *pixmap_priv;
-	PictFormatShort pict_format;
-
-	pixmap_priv = glamor_get_pixmap_private(pixmap);
-	if (GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv))
-		pict_format = pixmap_priv->base.picture->format;
-	else
-		pict_format = format_for_depth(pixmap->drawable.depth);
-
-	return pict_format;
-}
-
-#define REVERT_NONE       		0
-#define REVERT_NORMAL     		1
-#define REVERT_DOWNLOADING_A1		2
-#define REVERT_UPLOADING_A1		3
-#define REVERT_DOWNLOADING_2_10_10_10 	4
-#define REVERT_UPLOADING_2_10_10_10 	5
-#define REVERT_DOWNLOADING_1_5_5_5  	7
-#define REVERT_UPLOADING_1_5_5_5    	8
-#define REVERT_DOWNLOADING_10_10_10_2 	9
-#define REVERT_UPLOADING_10_10_10_2 	10
-
-#define SWAP_NONE_DOWNLOADING  	0
-#define SWAP_DOWNLOADING  	1
-#define SWAP_UPLOADING	  	2
-#define SWAP_NONE_UPLOADING	3
-
-/*
- * Map picture's format to the correct gl texture format and type.
- * no_alpha is used to indicate whehter we need to wire alpha to 1.
- *
- * Although opengl support A1/GL_BITMAP, we still don't use it
- * here, it seems that mesa has bugs when uploading a A1 bitmap.
- *
- * Return 0 if find a matched texture type. Otherwise return -1.
- **/
-#ifndef GLAMOR_GLES2
-static inline int
-glamor_get_tex_format_type_from_pictformat(PictFormatShort format,
-					   GLenum * tex_format,
-					   GLenum * tex_type,
-					   int *no_alpha,
-					   int *revert,
-					   int *swap_rb,
-					   int is_upload)
-
-{
-	*no_alpha = 0;
-	*revert = REVERT_NONE;
-	*swap_rb = is_upload ? SWAP_NONE_UPLOADING : SWAP_NONE_DOWNLOADING;
-	switch (format) {
-	case PICT_a1:
-		*tex_format = GL_ALPHA;
-		*tex_type = GL_UNSIGNED_BYTE;
-		*revert = is_upload ? REVERT_UPLOADING_A1 : REVERT_DOWNLOADING_A1;
-		break;
-	case PICT_b8g8r8x8:
-		*no_alpha = 1;
-	case PICT_b8g8r8a8:
-		*tex_format = GL_BGRA;
-		*tex_type = GL_UNSIGNED_INT_8_8_8_8;
-		break;
-
-	case PICT_x8r8g8b8:
-		*no_alpha = 1;
-	case PICT_a8r8g8b8:
-		*tex_format = GL_BGRA;
-		*tex_type = GL_UNSIGNED_INT_8_8_8_8_REV;
-		break;
-	case PICT_x8b8g8r8:
-		*no_alpha = 1;
-	case PICT_a8b8g8r8:
-		*tex_format = GL_RGBA;
-		*tex_type = GL_UNSIGNED_INT_8_8_8_8_REV;
-		break;
-	case PICT_x2r10g10b10:
-		*no_alpha = 1;
-	case PICT_a2r10g10b10:
-		*tex_format = GL_BGRA;
-		*tex_type = GL_UNSIGNED_INT_2_10_10_10_REV;
-		break;
-	case PICT_x2b10g10r10:
-		*no_alpha = 1;
-	case PICT_a2b10g10r10:
-		*tex_format = GL_RGBA;
-		*tex_type = GL_UNSIGNED_INT_2_10_10_10_REV;
-		break;
-
-	case PICT_r5g6b5:
-		*tex_format = GL_RGB;
-		*tex_type = GL_UNSIGNED_SHORT_5_6_5;
-		break;
-	case PICT_b5g6r5:
-		*tex_format = GL_RGB;
-		*tex_type = GL_UNSIGNED_SHORT_5_6_5_REV;
-		break;
-	case PICT_x1b5g5r5:
-		*no_alpha = 1;
-	case PICT_a1b5g5r5:
-		*tex_format = GL_RGBA;
-		*tex_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
-		break;
-
-	case PICT_x1r5g5b5:
-		*no_alpha = 1;
-	case PICT_a1r5g5b5:
-		*tex_format = GL_BGRA;
-		*tex_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
-		break;
-	case PICT_a8:
-		*tex_format = GL_ALPHA;
-		*tex_type = GL_UNSIGNED_BYTE;
-		break;
-	case PICT_x4r4g4b4:
-		*no_alpha = 1;
-	case PICT_a4r4g4b4:
-		*tex_format = GL_BGRA;
-		*tex_type = GL_UNSIGNED_SHORT_4_4_4_4_REV;
-		break;
-
-	case PICT_x4b4g4r4:
-		*no_alpha = 1;
-	case PICT_a4b4g4r4:
-		*tex_format = GL_RGBA;
-		*tex_type = GL_UNSIGNED_SHORT_4_4_4_4_REV;
-		break;
-
-	default:
-		LogMessageVerb(X_INFO, 0,
-			       "fail to get matched format for %x \n",
-			       format);
-		return -1;
-	}
-	return 0;
-}
-
-/* Currently, we use RGBA to represent all formats. */
-inline static int cache_format(GLenum format)
-{
-	switch (format) {
-	case GL_ALPHA:
-		return 1;
-	case GL_RGBA:
-		return 0;
-	default:
-		return -1;
-	}
-}
-
-#else
-#define IS_LITTLE_ENDIAN  (IMAGE_BYTE_ORDER == LSBFirst)
-
-static inline int
-glamor_get_tex_format_type_from_pictformat(PictFormatShort format,
-					   GLenum * tex_format,
-					   GLenum * tex_type,
-					   int *no_alpha,
-					   int *revert,
-					   int *swap_rb,
-					   int is_upload)
-{
-	int need_swap_rb = 0;
-
-	*no_alpha = 0;
-	*revert = IS_LITTLE_ENDIAN ? REVERT_NONE : REVERT_NORMAL;
-
-	switch (format) {
-	case PICT_b8g8r8x8:
-		*no_alpha = 1;
-	case PICT_b8g8r8a8:
-		*tex_format = GL_RGBA;
-		*tex_type = GL_UNSIGNED_BYTE;
-		need_swap_rb = 1;
-		*revert = IS_LITTLE_ENDIAN ? REVERT_NORMAL : REVERT_NONE;
-		break;
-
-	case PICT_x8r8g8b8:
-		*no_alpha = 1;
-	case PICT_a8r8g8b8:
-		*tex_format = GL_RGBA;
-		*tex_type = GL_UNSIGNED_BYTE;
-		need_swap_rb = 1;
-		break;
-
-	case PICT_x8b8g8r8:
-		*no_alpha = 1;
-	case PICT_a8b8g8r8:
-		*tex_format = GL_RGBA;
-		*tex_type = GL_UNSIGNED_BYTE;
-		break;
-
-	case PICT_x2r10g10b10:
-		*no_alpha = 1;
-	case PICT_a2r10g10b10:
-		*tex_format = GL_RGBA;
-		/* glReadPixmap doesn't support GL_UNSIGNED_INT_10_10_10_2.
-		 * we have to use GL_UNSIGNED_BYTE and do the conversion in
-		 * shader latter.*/
-		*tex_type = GL_UNSIGNED_BYTE;
-		if (is_upload == 1) {
-			if (!IS_LITTLE_ENDIAN)
-				*revert = REVERT_UPLOADING_10_10_10_2;
-			else
-				*revert = REVERT_UPLOADING_2_10_10_10;
-		}
-		else {
-			if (!IS_LITTLE_ENDIAN) {
-				*revert = REVERT_DOWNLOADING_10_10_10_2;
-			}
-			else {
-				*revert = REVERT_DOWNLOADING_2_10_10_10;
-			}
-		}
-		need_swap_rb = 1;
-
-		break;
-
-	case PICT_x2b10g10r10:
-		*no_alpha = 1;
-	case PICT_a2b10g10r10:
-		*tex_format = GL_RGBA;
-		*tex_type = GL_UNSIGNED_BYTE;
-		if (is_upload == 1) {
-			if (!IS_LITTLE_ENDIAN)
-				*revert = REVERT_UPLOADING_10_10_10_2;
-			else
-				*revert = REVERT_UPLOADING_2_10_10_10;
-		}
-		else {
-			if (!IS_LITTLE_ENDIAN) {
-				*revert = REVERT_DOWNLOADING_10_10_10_2;
-			}
-			else {
-				*revert = REVERT_DOWNLOADING_2_10_10_10;
-			}
-		}
-		break;
-
-	case PICT_r5g6b5:
-		*tex_format = GL_RGB;
-		*tex_type = GL_UNSIGNED_SHORT_5_6_5;
-		*revert = IS_LITTLE_ENDIAN ? REVERT_NONE : REVERT_NORMAL;
-
-		break;
-
-	case PICT_b5g6r5:
-		*tex_format = GL_RGB;
-		*tex_type = GL_UNSIGNED_SHORT_5_6_5;
-		need_swap_rb = IS_LITTLE_ENDIAN ? 1 : 0;;
-		break;
-
-	case PICT_x1b5g5r5:
-		*no_alpha = 1;
-	case PICT_a1b5g5r5:
-		*tex_format = GL_RGBA;
-		*tex_type = GL_UNSIGNED_SHORT_5_5_5_1;
-		if (IS_LITTLE_ENDIAN) {
-			*revert = is_upload ? REVERT_UPLOADING_1_5_5_5 : REVERT_DOWNLOADING_1_5_5_5;
-		} else
-			*revert = REVERT_NONE;
-		break;
-
-	case PICT_x1r5g5b5:
-		*no_alpha = 1;
-	case PICT_a1r5g5b5:
-		*tex_format = GL_RGBA;
-		*tex_type = GL_UNSIGNED_SHORT_5_5_5_1;
-		if (IS_LITTLE_ENDIAN) {
-			*revert = is_upload ? REVERT_UPLOADING_1_5_5_5 : REVERT_DOWNLOADING_1_5_5_5;
-		} else
-			*revert = REVERT_NONE;
-		need_swap_rb = 1;
-		break;
-
-	case PICT_a1:
-		*tex_format = GL_ALPHA;
-		*tex_type = GL_UNSIGNED_BYTE;
-		*revert = is_upload ? REVERT_UPLOADING_A1 : REVERT_DOWNLOADING_A1;
-		break;
-
-	case PICT_a8:
-		*tex_format = GL_ALPHA;
-		*tex_type = GL_UNSIGNED_BYTE;
-		*revert = REVERT_NONE;
-		break;
-
-	case PICT_x4r4g4b4:
-		*no_alpha = 1;
-	case PICT_a4r4g4b4:
-		*tex_format = GL_RGBA;
-		*tex_type = GL_UNSIGNED_SHORT_4_4_4_4;
-		*revert = IS_LITTLE_ENDIAN ? REVERT_NORMAL : REVERT_NONE;
-		need_swap_rb = 1;
-		break;
-
-	case PICT_x4b4g4r4:
-		*no_alpha = 1;
-	case PICT_a4b4g4r4:
-		*tex_format = GL_RGBA;
-		*tex_type = GL_UNSIGNED_SHORT_4_4_4_4;
-		*revert = IS_LITTLE_ENDIAN ? REVERT_NORMAL : REVERT_NONE;
-		break;
-
-	default:
-		LogMessageVerb(X_INFO, 0,
-			       "fail to get matched format for %x \n",
-			       format);
-		return -1;
-	}
-
-	if (need_swap_rb)
-		*swap_rb = is_upload ? SWAP_UPLOADING : SWAP_DOWNLOADING;
-	else
-		*swap_rb = is_upload ? SWAP_NONE_UPLOADING : SWAP_NONE_DOWNLOADING;
-	return 0;
-}
-
-inline static int cache_format(GLenum format)
-{
-	switch (format) {
-	case GL_ALPHA:
-		return 2;
-	case GL_RGB:
-		return 1;
-	case GL_RGBA:
-		return 0;
-	default:
-		return -1;
-	}
-}
-
-#endif
-
-
-static inline int
-glamor_get_tex_format_type_from_pixmap(PixmapPtr pixmap,
-				       GLenum * format,
-				       GLenum * type,
-				       int *no_alpha,
-				       int *revert,
-				       int *swap_rb,
-				       int is_upload)
-{
-	glamor_pixmap_private *pixmap_priv;
-	PictFormatShort pict_format;
-
-	pixmap_priv = glamor_get_pixmap_private(pixmap);
-	if (GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv))
-		pict_format = pixmap_priv->base.picture->format;
-	else
-		pict_format = format_for_depth(pixmap->drawable.depth);
-
-	return glamor_get_tex_format_type_from_pictformat(pict_format,
-							  format, type,
-							  no_alpha,
-							  revert,
-							  swap_rb,
-							  is_upload);
-}
-
-
-/* borrowed from uxa */
-static inline Bool
-glamor_get_rgba_from_pixel(CARD32 pixel,
-			   float *red,
-			   float *green,
-			   float *blue, float *alpha, CARD32 format)
-{
-	int rbits, bbits, gbits, abits;
-	int rshift, bshift, gshift, ashift;
-
-	rbits = PICT_FORMAT_R(format);
-	gbits = PICT_FORMAT_G(format);
-	bbits = PICT_FORMAT_B(format);
-	abits = PICT_FORMAT_A(format);
-
-	if (PICT_FORMAT_TYPE(format) == PICT_TYPE_A) {
-		rshift = gshift = bshift = ashift = 0;
-	} else if (PICT_FORMAT_TYPE(format) == PICT_TYPE_ARGB) {
-		bshift = 0;
-		gshift = bbits;
-		rshift = gshift + gbits;
-		ashift = rshift + rbits;
-	} else if (PICT_FORMAT_TYPE(format) == PICT_TYPE_ABGR) {
-		rshift = 0;
-		gshift = rbits;
-		bshift = gshift + gbits;
-		ashift = bshift + bbits;
-#if XORG_VERSION_CURRENT >= 10699900
-	} else if (PICT_FORMAT_TYPE(format) == PICT_TYPE_BGRA) {
-		ashift = 0;
-		rshift = abits;
-		if (abits == 0)
-			rshift = PICT_FORMAT_BPP(format) - (rbits + gbits +
-							    bbits);
-		gshift = rshift + rbits;
-		bshift = gshift + gbits;
-#endif
-	} else {
-		return FALSE;
-	}
-#define COLOR_INT_TO_FLOAT(_fc_, _p_, _s_, _bits_)	\
-  *_fc_ = (((_p_) >> (_s_)) & (( 1 << (_bits_)) - 1))	\
-    / (float)((1<<(_bits_)) - 1)
-
-	if (rbits)
-		COLOR_INT_TO_FLOAT(red, pixel, rshift, rbits);
-	else
-		*red = 0;
-
-	if (gbits)
-		COLOR_INT_TO_FLOAT(green, pixel, gshift, gbits);
-	else
-		*green = 0;
-
-	if (bbits)
-		COLOR_INT_TO_FLOAT(blue, pixel, bshift, bbits);
-	else
-		*blue = 0;
-
-	if (abits)
-		COLOR_INT_TO_FLOAT(alpha, pixel, ashift, abits);
-	else
-		*alpha = 1;
-
-	return TRUE;
-}
-
-inline static Bool glamor_pict_format_is_compatible(PictFormatShort pict_format, int depth)
-{
-	GLenum iformat;
-
-	gl_iformat_for_depth(depth, &iformat);
-	switch (iformat) {
-		case GL_RGBA:
-			return (pict_format == PICT_a8r8g8b8 || pict_format == PICT_x8r8g8b8);
-		case GL_ALPHA:
-			return (pict_format == PICT_a8);
-		default:
-			return FALSE;
-	}
-}
-
-/* return TRUE if we can access this pixmap at DDX driver. */
-inline static Bool glamor_ddx_fallback_check_pixmap(DrawablePtr drawable)
-{
-	PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
-	glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
-	return (!pixmap_priv
-		|| (pixmap_priv->type == GLAMOR_TEXTURE_DRM
-		    || pixmap_priv->type == GLAMOR_MEMORY
-		    || pixmap_priv->type == GLAMOR_DRM_ONLY));
-}
-
-inline static Bool glamor_ddx_fallback_check_gc(GCPtr gc)
-{
-	PixmapPtr pixmap;
-	if (!gc)
-		return TRUE;
-        switch (gc->fillStyle) {
-        case FillStippled:
-        case FillOpaqueStippled:
-                pixmap = gc->stipple;
-                break;
-        case FillTiled:
-                pixmap = gc->tile.pixmap;
-                break;
-	default:
-		pixmap = NULL;
-        }
-	return (!pixmap || glamor_ddx_fallback_check_pixmap(&pixmap->drawable));
-}
-inline static Bool glamor_is_large_pixmap(PixmapPtr pixmap)
-{
-	glamor_pixmap_private *priv;
-
-	priv = glamor_get_pixmap_private(pixmap);
-	return (priv->type == GLAMOR_TEXTURE_LARGE);
-}
-
-inline static Bool glamor_is_large_picture(PicturePtr picture)
-{
-	PixmapPtr pixmap;
-
-	if (picture->pDrawable) {
-		pixmap = glamor_get_drawable_pixmap(picture->pDrawable);
-		return glamor_is_large_pixmap(pixmap);
-	}
-	return FALSE;
-}
-
-inline static Bool glamor_tex_format_is_readable(GLenum format)
-{
-	return ((format == GL_RGBA || format == GL_RGB || format == GL_ALPHA));
-
-}
-
-static inline void _glamor_dump_pixmap_bits(PixmapPtr pixmap, int x, int y, int w, int h)
-{
-	int i,j;
-	unsigned char * p = pixmap->devPrivate.ptr;
-	int stride = pixmap->devKind;
-
-	p = p + y * stride + x;
-
-	for (i = 0; i < h; i++)
-	{
-		ErrorF("line %3d: ", i);
-		for(j = 0; j < w; j++)
-			ErrorF("%2d ", (p[j/8] & (1 << (j%8)))>>(j%8));
-		p += stride;
-		ErrorF("\n");
-	}
-}
-
-static inline void _glamor_dump_pixmap_byte(PixmapPtr pixmap, int x, int y, int w, int h)
-{
-	int i,j;
-	unsigned char * p = pixmap->devPrivate.ptr;
-	int stride = pixmap->devKind;
-
-	p = p + y * stride + x;
-
-	for (i = 0; i < h; i++)
-	{
-		ErrorF("line %3d: ", i);
-		for(j = 0; j < w; j++)
-			ErrorF("%2x ", p[j]);
-		p += stride;
-		ErrorF("\n");
-	}
-}
-
-static inline void _glamor_dump_pixmap_sword(PixmapPtr pixmap, int x, int y, int w, int h)
-{
-	int i,j;
-	unsigned short * p = pixmap->devPrivate.ptr;
-	int stride = pixmap->devKind / 2;
-
-	p = p + y * stride + x;
-
-	for (i = 0; i < h; i++)
-	{
-		ErrorF("line %3d: ", i);
-		for(j = 0; j < w; j++)
-			ErrorF("%2x ", p[j]);
-		p += stride;
-		ErrorF("\n");
-	}
-}
-
-static inline void _glamor_dump_pixmap_word(PixmapPtr pixmap, int x, int y, int w, int h)
-{
-	int i,j;
-	unsigned int * p = pixmap->devPrivate.ptr;
-	int stride = pixmap->devKind / 4;
-
-	p = p + y * stride + x;
-
-	for (i = 0; i < h; i++)
-	{
-		ErrorF("line %3d: ", i);
-		for(j = 0; j < w; j++)
-			ErrorF("%2x ", p[j]);
-		p += stride;
-		ErrorF("\n");
-	}
-}
-
-static inline void glamor_dump_pixmap(PixmapPtr pixmap, int x, int y, int w, int h)
-{
-	w = ((x + w) > pixmap->drawable.width) ? (pixmap->drawable.width - x) : w;
-	h = ((y + h) > pixmap->drawable.height) ? (pixmap->drawable.height - y) : h;
-
-	glamor_prepare_access(&pixmap->drawable, GLAMOR_ACCESS_RO);
-	switch (pixmap->drawable.depth) {
-	case 8:
-		_glamor_dump_pixmap_byte(pixmap, x, y, w, h);
-		break;
-	case 15:
-	case 16:
-		_glamor_dump_pixmap_sword(pixmap, x, y, w, h);
-		break;
-
-	case 24:
-	case 32:
-		_glamor_dump_pixmap_word(pixmap, x, y, w, h);
-		break;
-	case 1:
-		_glamor_dump_pixmap_bits(pixmap, x, y, w, h);
-		break;
-	default:
-		ErrorF("dump depth %d, not implemented.\n", pixmap->drawable.depth);
-	}
-	glamor_finish_access(&pixmap->drawable, GLAMOR_ACCESS_RO);
-}
-
-static inline void _glamor_compare_pixmaps(PixmapPtr pixmap1, PixmapPtr pixmap2,
-                                           int x, int y, int w, int h,
-                                           PictFormatShort short_format,
-                                           int all, int diffs)
-{
-	int i, j;
-	unsigned char * p1 = pixmap1->devPrivate.ptr;
-	unsigned char * p2 = pixmap2->devPrivate.ptr;
-	int line_need_printed = 0;
-	int test_code = 0xAABBCCDD;
-	int little_endian = 0;
-	unsigned char *p_test;
-	int bpp = pixmap1->drawable.depth == 8 ? 1 : 4;
-	int stride = pixmap1->devKind;
-
-	assert(pixmap1->devKind == pixmap2->devKind);
-
-	ErrorF("stride:%d, width:%d, height:%d\n", stride, w, h);
-
-	p1 = p1 + y * stride + x;
-	p2 = p2 + y * stride + x;
-
-	if (all) {
-		for (i = 0; i < h; i++) {
-			ErrorF("line %3d: ", i);
-
-			for (j = 0; j < stride; j++) {
-				if (j % bpp == 0)
-					ErrorF("[%d]%2x:%2x ", j / bpp, p1[j], p2[j]);
-				else
-					ErrorF("%2x:%2x ", p1[j], p2[j]);
-			}
-
-			p1 += stride;
-			p2 += stride;
-			ErrorF("\n");
-		}
-	} else {
-		if (short_format == PICT_a8r8g8b8) {
-			p_test = (unsigned char *) & test_code;
-			little_endian = (*p_test == 0xDD);
-			bpp = 4;
-
-			for (i = 0; i < h; i++) {
-				line_need_printed = 0;
-
-				for (j = 0; j < stride; j++) {
-					if (p1[j] != p2[j] && (p1[j] - p2[j] > diffs || p2[j] - p1[j] > diffs)) {
-						if (line_need_printed) {
-							if (little_endian) {
-								switch (j % 4) {
-									case 2:
-										ErrorF("[%d]RED:%2x:%2x ", j / bpp, p1[j], p2[j]);
-										break;
-									case 1:
-										ErrorF("[%d]GREEN:%2x:%2x ", j / bpp, p1[j], p2[j]);
-										break;
-									case 0:
-										ErrorF("[%d]BLUE:%2x:%2x ", j / bpp, p1[j], p2[j]);
-										break;
-									case 3:
-										ErrorF("[%d]Alpha:%2x:%2x ", j / bpp, p1[j], p2[j]);
-										break;
-								}
-							} else {
-								switch (j % 4) {
-									case 1:
-										ErrorF("[%d]RED:%2x:%2x ", j / bpp, p1[j], p2[j]);
-										break;
-									case 2:
-										ErrorF("[%d]GREEN:%2x:%2x ", j / bpp, p1[j], p2[j]);
-										break;
-									case 3:
-										ErrorF("[%d]BLUE:%2x:%2x ", j / bpp, p1[j], p2[j]);
-										break;
-									case 0:
-										ErrorF("[%d]Alpha:%2x:%2x ", j / bpp, p1[j], p2[j]);
-										break;
-								}
-							}
-						} else {
-							line_need_printed = 1;
-							j = -1;
-							ErrorF("line %3d: ", i);
-							continue;
-						}
-					}
-				}
-
-				p1 += stride;
-				p2 += stride;
-				ErrorF("\n");
-			}
-		} //more format can be added here.
-		else { // the default format, just print.
-			for (i = 0; i < h; i++) {
-				line_need_printed = 0;
-
-				for (j = 0; j < stride; j++) {
-					if (p1[j] != p2[j]) {
-						if (line_need_printed) {
-							ErrorF("[%d]%2x:%2x ", j / bpp, p1[j], p2[j]);
-						} else {
-							line_need_printed = 1;
-							j = -1;
-							ErrorF("line %3d: ", i);
-							continue;
-						}
-					}
-				}
-
-				p1 += stride;
-				p2 += stride;
-				ErrorF("\n");
-			}
-		}
-	}
-}
-
-static inline void glamor_compare_pixmaps(PixmapPtr pixmap1, PixmapPtr pixmap2,
-                                          int x, int y, int w, int h, int all, int diffs)
-{
-	assert(pixmap1->drawable.depth == pixmap2->drawable.depth);
-
-	glamor_prepare_access(&pixmap1->drawable, GLAMOR_ACCESS_RO);
-	glamor_prepare_access(&pixmap2->drawable, GLAMOR_ACCESS_RO);
-
-	_glamor_compare_pixmaps(pixmap1, pixmap2, x, y, w, h, -1, all, diffs);
-
-	glamor_finish_access(&pixmap1->drawable, GLAMOR_ACCESS_RO);
-	glamor_finish_access(&pixmap2->drawable, GLAMOR_ACCESS_RO);
-}
-
-/* This function is used to compare two pictures.
-   If the picture has no drawable, we use fb functions to generate it. */
-static inline void glamor_compare_pictures( ScreenPtr screen,
-                                            PicturePtr fst_picture,
-                                            PicturePtr snd_picture,
-                                            int x_source, int y_source,
-                                            int width, int height,
-                                            int all, int diffs)
-{
-	PixmapPtr fst_pixmap;
-	PixmapPtr snd_pixmap;
-	int fst_generated, snd_generated;
-	int error;
-	int fst_type = -1;
-	int snd_type = -1; // -1 represent has drawable.
-
-	if (fst_picture->format != snd_picture->format) {
-		ErrorF("Different picture format can not compare!\n");
-		return;
-	}
-
-	if (!fst_picture->pDrawable) {
-		fst_type = fst_picture->pSourcePict->type;
-	}
-
-	if (!snd_picture->pDrawable) {
-		snd_type = snd_picture->pSourcePict->type;
-	}
-
-	if ((fst_type != -1) && (snd_type != -1) && (fst_type != snd_type)) {
-		ErrorF("Different picture type will never be same!\n");
-		return;
-	}
-
-	fst_generated = snd_generated = 0;
-
-	if (!fst_picture->pDrawable) {
-		PicturePtr pixman_pic;
-		PixmapPtr pixmap = NULL;
-		PictFormatShort format;
-
-		format = fst_picture->format;
-
-		pixmap = glamor_create_pixmap(screen,
-		                              width, height,
-		                              PIXMAN_FORMAT_DEPTH(format),
-		                              GLAMOR_CREATE_PIXMAP_CPU);
-
-		pixman_pic = CreatePicture(0,
-		                           &pixmap->drawable,
-		                           PictureMatchFormat(screen,
-		                               PIXMAN_FORMAT_DEPTH(format), format),
-		                           0, 0, serverClient, &error);
-
-		fbComposite(PictOpSrc, fst_picture, NULL, pixman_pic,
-		            x_source, y_source,
-		            0, 0,
-		            0, 0,
-		            width, height);
-
-		glamor_destroy_pixmap(pixmap);
-
-		fst_picture = pixman_pic;
-		fst_generated = 1;
-	}
-
-	if (!snd_picture->pDrawable) {
-		PicturePtr pixman_pic;
-		PixmapPtr pixmap = NULL;
-		PictFormatShort format;
-
-		format = snd_picture->format;
-
-		pixmap = glamor_create_pixmap(screen,
-		                              width, height,
-		                              PIXMAN_FORMAT_DEPTH(format),
-		                              GLAMOR_CREATE_PIXMAP_CPU);
-
-		pixman_pic = CreatePicture(0,
-		                           &pixmap->drawable,
-		                           PictureMatchFormat(screen,
-		                               PIXMAN_FORMAT_DEPTH(format), format),
-		                           0, 0, serverClient, &error);
-
-		fbComposite(PictOpSrc, snd_picture, NULL, pixman_pic,
-		            x_source, y_source,
-		            0, 0,
-		            0, 0,
-		            width, height);
-
-		glamor_destroy_pixmap(pixmap);
-
-		snd_picture = pixman_pic;
-		snd_generated = 1;
-	}
-
-	fst_pixmap = glamor_get_drawable_pixmap(fst_picture->pDrawable);
-	snd_pixmap = glamor_get_drawable_pixmap(snd_picture->pDrawable);
-
-	if (fst_pixmap->drawable.depth != snd_pixmap->drawable.depth) {
-		if (fst_generated)
-			glamor_destroy_picture(fst_picture);
-		if (snd_generated)
-			glamor_destroy_picture(snd_picture);
-
-		ErrorF("Different pixmap depth can not compare!\n");
-		return;
-	}
-
-	glamor_prepare_access(&fst_pixmap->drawable, GLAMOR_ACCESS_RO);
-	glamor_prepare_access(&snd_pixmap->drawable, GLAMOR_ACCESS_RO);
-
-	if ((fst_type == SourcePictTypeLinear) ||
-	     (fst_type == SourcePictTypeRadial) ||
-	     (fst_type == SourcePictTypeConical) ||
-	     (snd_type == SourcePictTypeLinear) ||
-	     (snd_type == SourcePictTypeRadial) ||
-	     (snd_type == SourcePictTypeConical)) {
-		x_source = y_source = 0;
-	}
-
-	_glamor_compare_pixmaps(fst_pixmap, snd_pixmap,
-	                        x_source, y_source,
-	                        width, height,
-	                        fst_picture->format, all, diffs);
-
-	glamor_finish_access(&fst_pixmap->drawable, GLAMOR_ACCESS_RO);
-	glamor_finish_access(&snd_pixmap->drawable, GLAMOR_ACCESS_RO);
-
-	if (fst_generated)
-		glamor_destroy_picture(fst_picture);
-	if (snd_generated)
-		glamor_destroy_picture(snd_picture);
-
-	return;
-}
-
-#ifdef __i386__
-static inline unsigned long __fls(unsigned long x)
-{
-        asm("bsr %1,%0"
-            : "=r" (x)
-            : "rm" (x));
-        return x;
-}
-#else
-static inline unsigned long __fls(unsigned long x)
-{
-   int n;
-
-   if (x == 0) return(0);
-   n = 0;
-   if (x <= 0x0000FFFF) {n = n +16; x = x <<16;}
-   if (x <= 0x00FFFFFF) {n = n + 8; x = x << 8;}
-   if (x <= 0x0FFFFFFF) {n = n + 4; x = x << 4;}
-   if (x <= 0x3FFFFFFF) {n = n + 2; x = x << 2;}
-   if (x <= 0x7FFFFFFF) {n = n + 1;}
-   return 31 - n;
-}
-#endif
-
-static inline void glamor_make_current(ScreenPtr screen)
-{
-	glamor_egl_make_current(screen);
-}
-
-static inline void glamor_restore_current(ScreenPtr screen)
-{
-	glamor_egl_restore_context(screen);
-}
-
-#ifdef GLX_USE_SHARED_DISPATCH
-static inline glamor_gl_dispatch *
-glamor_get_dispatch(glamor_screen_private *glamor_priv)
-{
-	if (glamor_priv->flags & GLAMOR_USE_EGL_SCREEN)
-		glamor_make_current(glamor_priv->screen);
-
-	return &glamor_priv->_dispatch;
-}
-
-static inline void
-glamor_put_dispatch(glamor_screen_private *glamor_priv)
-{
-	if (glamor_priv->flags & GLAMOR_USE_EGL_SCREEN)
-		glamor_restore_current(glamor_priv->screen);
-}
-#else
-#warning "Indirect GLX may be broken, need to implement context switch."
-static inline glamor_gl_dispatch *
-glamor_get_dispatch(glamor_screen_private *glamor_priv)
-{
-	return &glamor_priv->_dispatch;
-}
-
-static inline void
-glamor_put_dispatch(glamor_screen_private *glamor_priv)
-{
-}
-
-#endif
-
-#endif
diff --git a/extra/glamor-egl/glapi.h b/extra/glamor-egl/glapi.h
deleted file mode 100644
index d510dac1d..000000000
--- a/extra/glamor-egl/glapi.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2008  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.
- */
-
-
-/**
- * \mainpage Mesa GL API Module
- *
- * \section GLAPIIntroduction Introduction
- *
- * The Mesa GL API module is responsible for dispatching all the
- * gl*() functions.  All GL functions are dispatched by jumping through
- * the current dispatch table (basically a struct full of function
- * pointers.)
- *
- * A per-thread current dispatch table and per-thread current context
- * pointer are managed by this module too.
- *
- * This module is intended to be non-Mesa-specific so it can be used
- * with the X/DRI libGL also.
- */
-
-#ifndef _GLAPI_H
-#define _GLAPI_H
-
-#define GL_GLEXT_PROTOTYPES
-
-#if GLAMOR_GLES2
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#else
-#include <GL/gl.h>
-#include "GL/glext.h"
-#endif
-
-/* Is this needed?  It is incomplete anyway. */
-#ifdef USE_MGL_NAMESPACE
-#define _glapi_set_dispatch _mglapi_set_dispatch
-#define _glapi_get_dispatch _mglapi_get_dispatch
-#define _glapi_set_context _mglapi_set_context
-#define _glapi_get_context _mglapi_get_context
-#define _glapi_Dispatch _mglapi_Dispatch
-#define _glapi_Context _mglapi_Context
-#endif
-
-typedef void (*_glapi_proc)(void);
-struct _glapi_table;
-
-
-#if defined (GLX_USE_TLS)
-
-extern __thread struct _glapi_table * _glapi_tls_Dispatch
-    __attribute__((tls_model("initial-exec")));
-
-extern __thread void * _glapi_tls_Context
-    __attribute__((tls_model("initial-exec")));
-
-extern const struct _glapi_table *_glapi_Dispatch;
-extern const void *_glapi_Context;
-
-# define GET_DISPATCH() _glapi_tls_Dispatch
-# define GET_CURRENT_CONTEXT(C)  C = (typeof(C)) _glapi_tls_Context
-# define SET_CURRENT_CONTEXT(C)  _glapi_tls_Context = (void*)C
-
-#else
-
-extern struct _glapi_table *_glapi_Dispatch;
-extern void *_glapi_Context;
-
-# ifdef THREADS
-
-#  define GET_DISPATCH() \
-     (likely(_glapi_Dispatch) ? _glapi_Dispatch : _glapi_get_dispatch())
-
-#  define GET_CURRENT_CONTEXT(C)  C = (typeof(C)) \
-     (likely(_glapi_Context) ? _glapi_Context : _glapi_get_context())
-
-
-# define SET_CURRENT_CONTEXT(C) do { if (likely(_glapi_Context))   \
-					_glapi_Context = (void*)C; \
-				     else \
-					_glapi_set_context(C); } while(0)
-
-# else
-
-#  define GET_DISPATCH() _glapi_Dispatch
-#  define GET_CURRENT_CONTEXT(C)  C = (typeof(C)) _glapi_Context
-# define SET_CURRENT_CONTEXT(C)  _glapi_Context = (void*)C
-
-# endif
-
-#endif /* defined (GLX_USE_TLS) */
-
-
-extern void
-_glapi_set_context(void *context);
-
-extern void *
-_glapi_get_context(void);
-
-#endif
diff --git a/extra/gmetadom/PKGBUILD b/extra/gmetadom/PKGBUILD
index 7d3b84a59..0d0da48a2 100644
--- a/extra/gmetadom/PKGBUILD
+++ b/extra/gmetadom/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197998 2013-10-30 12:10:28Z allan $
+# $Id: PKGBUILD 203072 2014-01-03 09:38:06Z bpiotrowski $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gmetadom
 pkgver=0.2.6
-pkgrel=3.1
+pkgrel=4
 pkgdesc="C++ bindings for GDome2 DOM implementation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gmetadom.sourceforge.net/"
diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD
index f4f6f4277..4cc8ade12 100644
--- a/extra/gnome-chess/PKGBUILD
+++ b/extra/gnome-chess/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 201495 2013-12-12 22:17:22Z heftig $
+# $Id: PKGBUILD 204484 2014-01-20 20:37:38Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-chess
-pkgver=3.10.2
-pkgrel=2
+pkgver=3.10.3
+pkgrel=1
 pkgdesc="Play the classic two-player boardgame of chess"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -18,7 +18,7 @@ install=gnome-chess.install
 url="https://live.gnome.org/Chess"
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3aae8d501fce8ffd30bee6740e61bfbd7c48336f4ca254912f2646c8486324b1')
+sha256sums=('239a373dc318eeb33ecbbe175880d95239aa8500f7b67d554e084ed6ace69324')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD
index 70683fcfd..9c69f4129 100644
--- a/extra/gnome-color-manager/PKGBUILD
+++ b/extra/gnome-color-manager/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198003 2013-10-30 12:12:21Z allan $
+# $Id: PKGBUILD 204755 2014-01-26 12:16:01Z andyrtr $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-color-manager
 pkgver=3.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Color profile manager for the GNOME desktop"
 arch=(i686 x86_64 'mips64el')
 url="http://projects.gnome.org/gnome-color-manager/"
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index d53db98b3..46becefb4 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 199445 2013-11-12 20:25:31Z heftig $
+# $Id: PKGBUILD 206049 2014-02-16 11:33:25Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-control-center
 pkgver=3.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The Control Center for GNOME"
 license=(GPL)
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,17 +17,21 @@ optdepends=('system-config-printer: Printer settings'
             'gnome-user-share: Bluetooth and WebDAV file sharing'
             'rygel: media sharing'
             'vino: screen sharing'
-            'openssh: remote login')
+            'openssh: remote login'
+            'ntp: network time sync')
 groups=(gnome)
 url="http://www.gnome.org"
 install=gnome-control-center.install
 options=('!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f67a9e88cda62c25e1aa1fbbb36d4fa632e8da11e98ac030e0e40437f12483a9')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        git-fixes.patch)
+sha256sums=('f67a9e88cda62c25e1aa1fbbb36d4fa632e8da11e98ac030e0e40437f12483a9'
+            'f9e39b474858559bd81db9969eddbed2916c7973110b95b970c68f501be20eed')
 
 prepare() {
   cd $pkgname-$pkgver
-  #autoreconf -fi
+  patch -Np1 -i ../git-fixes.patch
+  autoreconf -fi
 }
 
 build() {
diff --git a/extra/gnome-control-center/git-fixes.patch b/extra/gnome-control-center/git-fixes.patch
new file mode 100644
index 000000000..77e0ffda9
--- /dev/null
+++ b/extra/gnome-control-center/git-fixes.patch
@@ -0,0 +1,38641 @@
+diff --git a/panels/background/background.ui b/panels/background/background.ui
+index 2b72502..5eaef45 100644
+--- a/panels/background/background.ui
++++ b/panels/background/background.ui
+@@ -197,7 +197,7 @@
+                           <object class="GtkLabel" id="label2">
+                             <property name="visible">True</property>
+                             <property name="can_focus">False</property>
+-                            <property name="label" translatable="yes">Lock Screen</property>
++                            <property name="label" translatable="yes" comments="To translators: This is the noon, not the verb">Lock Screen</property>
+                           </object>
+                           <packing>
+                             <property name="expand">False</property>
+diff --git a/panels/background/cc-background-chooser-dialog.c b/panels/background/cc-background-chooser-dialog.c
+index 61d19d4..f99267b 100644
+--- a/panels/background/cc-background-chooser-dialog.c
++++ b/panels/background/cc-background-chooser-dialog.c
+@@ -406,6 +406,7 @@ cc_background_chooser_dialog_init (CcBackgroundChooserDialog *chooser)
+ 
+   priv->icon_view = gtk_icon_view_new ();
+   gtk_widget_set_hexpand (priv->icon_view, TRUE);
++  gtk_icon_view_set_columns (GTK_ICON_VIEW (priv->icon_view), 3);
+   gtk_container_add (GTK_CONTAINER (priv->sw_content), priv->icon_view);
+   g_signal_connect (priv->icon_view, "selection-changed", G_CALLBACK (on_selection_changed), chooser);
+   g_signal_connect (priv->icon_view, "item-activated", G_CALLBACK (on_item_activated), chooser);
+diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c
+index 590973d..90b40c8 100644
+--- a/panels/color/cc-color-panel.c
++++ b/panels/color/cc-color-panel.c
+@@ -2104,7 +2104,6 @@ cc_color_panel_dispose (GObject *object)
+   g_clear_object (&priv->list_box_size);
+   g_clear_pointer (&priv->sensors, g_ptr_array_unref);
+   g_clear_pointer (&priv->list_box_filter, g_free);
+-  g_clear_pointer (&priv->assistant_calib, gtk_widget_destroy);
+   g_clear_pointer (&priv->dialog_assign, gtk_widget_destroy);
+ 
+   G_OBJECT_CLASS (cc_color_panel_parent_class)->dispose (object);
+diff --git a/panels/color/color.ui b/panels/color/color.ui
+index 06d146a..1f90a9c 100644
+--- a/panels/color/color.ui
++++ b/panels/color/color.ui
+@@ -228,6 +228,7 @@
+     </child>
+     <child>
+       <object class="GtkBox" id="box_calib_temp">
++        <property name="visible">True</property>
+         <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
+         <property name="spacing">9</property>
+diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c
+index f170d51..87da9d4 100644
+--- a/panels/display/cc-display-panel.c
++++ b/panels/display/cc-display-panel.c
+@@ -78,6 +78,7 @@ struct _CcDisplayPanelPrivate
+   GtkWidget *arrange_button;
+   GtkWidget *res_combo;
+   GtkWidget *rotate_left_button;
++  GtkWidget *upside_down_button;
+   GtkWidget *rotate_right_button;
+   GtkWidget *apply_button;
+   GtkWidget *dialog;
+@@ -1779,18 +1780,44 @@ rotate_left_clicked (GtkButton      *button,
+ {
+   CcDisplayPanelPrivate *priv = panel->priv;
+   GnomeRRRotation rotation;
++  gboolean active;
+ 
+-  rotation = gnome_rr_output_info_get_rotation (priv->current_output);
++  active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+ 
+-  if (rotation & GNOME_RR_ROTATION_0)
++  if (active)
+     {
++      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->rotate_right_button), FALSE);
++      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->upside_down_button), FALSE);
+       rotation = GNOME_RR_ROTATION_90;
+-      gtk_widget_set_sensitive (priv->rotate_left_button, FALSE);
+     }
+   else
+     {
+       rotation = GNOME_RR_ROTATION_0;
+-      gtk_widget_set_sensitive (priv->rotate_right_button, TRUE);
++    }
++
++  gnome_rr_output_info_set_rotation (priv->current_output, rotation);
++  update_apply_button (panel);
++}
++
++static void
++upside_down_clicked (GtkButton      *button,
++                     CcDisplayPanel *panel)
++{
++  CcDisplayPanelPrivate *priv = panel->priv;
++  GnomeRRRotation rotation;
++  gboolean active;
++
++  active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
++
++  if (active)
++    {
++      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->rotate_left_button), FALSE);
++      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->rotate_right_button), FALSE);
++      rotation = GNOME_RR_ROTATION_180;
++    }
++  else
++    {
++      rotation = GNOME_RR_ROTATION_0;
+     }
+ 
+   gnome_rr_output_info_set_rotation (priv->current_output, rotation);
+@@ -1803,18 +1830,19 @@ rotate_right_clicked (GtkButton      *button,
+ {
+   CcDisplayPanelPrivate *priv = panel->priv;
+   GnomeRRRotation rotation;
++  gboolean active;
+ 
+-  rotation = gnome_rr_output_info_get_rotation (priv->current_output);
++  active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+ 
+-  if (rotation & GNOME_RR_ROTATION_0)
++  if (active)
+     {
++      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->rotate_left_button), FALSE);
++      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->upside_down_button), FALSE);
+       rotation = GNOME_RR_ROTATION_270;
+-      gtk_widget_set_sensitive (priv->rotate_right_button, FALSE);
+     }
+   else
+     {
+       rotation = GNOME_RR_ROTATION_0;
+-      gtk_widget_set_sensitive (priv->rotate_left_button, TRUE);
+     }
+ 
+   gnome_rr_output_info_set_rotation (priv->current_output, rotation);
+@@ -1961,9 +1989,9 @@ show_setup_dialog (CcDisplayPanel *panel)
+   gtk_grid_attach (GTK_GRID (priv->config_grid), rotate_box, 0, 1, 2, 1);
+   gtk_widget_set_halign (rotate_box, GTK_ALIGN_CENTER);
+ 
+-  priv->rotate_left_button = gtk_button_new ();
++  priv->rotate_left_button = gtk_toggle_button_new ();
+   if (rotation == GNOME_RR_ROTATION_90)
+-    gtk_widget_set_sensitive (priv->rotate_left_button, FALSE);
++    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->rotate_left_button), TRUE);
+   g_signal_connect (priv->rotate_left_button, "clicked",
+                     G_CALLBACK (rotate_left_clicked), panel);
+   g_signal_connect_swapped (priv->rotate_left_button, "clicked",
+@@ -1974,9 +2002,22 @@ show_setup_dialog (CcDisplayPanel *panel)
+   gtk_widget_set_halign (priv->rotate_left_button, GTK_ALIGN_END);
+   gtk_container_add (GTK_CONTAINER (rotate_box), priv->rotate_left_button);
+ 
+-  priv->rotate_right_button = gtk_button_new ();
++  priv->upside_down_button = gtk_toggle_button_new ();
++  if (rotation == GNOME_RR_ROTATION_180)
++    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->upside_down_button), TRUE);
++  g_signal_connect (priv->upside_down_button, "clicked",
++                    G_CALLBACK (upside_down_clicked), panel);
++  g_signal_connect_swapped (priv->upside_down_button, "clicked",
++                            G_CALLBACK (gtk_widget_queue_draw), preview);
++  gtk_container_add (GTK_CONTAINER (priv->upside_down_button),
++                     gtk_image_new_from_icon_name ("object-flip-vertical-symbolic",
++                                                   GTK_ICON_SIZE_BUTTON));
++  gtk_widget_set_halign (priv->upside_down_button, GTK_ALIGN_FILL);
++  gtk_container_add (GTK_CONTAINER (rotate_box), priv->upside_down_button);
++
++  priv->rotate_right_button = gtk_toggle_button_new ();
+   if (rotation == GNOME_RR_ROTATION_270)
+-    gtk_widget_set_sensitive (priv->rotate_right_button, FALSE);
++    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->rotate_right_button), TRUE);
+   g_signal_connect (priv->rotate_right_button, "clicked",
+                     G_CALLBACK (rotate_right_clicked), panel);
+   g_signal_connect_swapped (priv->rotate_right_button, "clicked",
+@@ -1988,19 +2029,22 @@ show_setup_dialog (CcDisplayPanel *panel)
+   gtk_container_add (GTK_CONTAINER (rotate_box), priv->rotate_right_button);
+ 
+   /* size */
+-  label = gtk_label_new (_("Size"));
+-  gtk_style_context_add_class (gtk_widget_get_style_context (label),
+-                               GTK_STYLE_CLASS_DIM_LABEL);
+-  gtk_grid_attach (GTK_GRID (priv->config_grid), label, 0, 2, 1, 1);
+-  gtk_widget_set_halign (label, GTK_ALIGN_END);
+-
+-
+   gnome_rr_output_get_physical_size (output, &width_mm, &height_mm);
+   str = make_display_size_string (width_mm, height_mm);
+-  label = gtk_label_new (str);
+-  gtk_grid_attach (GTK_GRID (priv->config_grid), label, 1, 2, 1, 1);
+-  gtk_widget_set_halign (label, GTK_ALIGN_START);
+-  g_free (str);
++
++  if (str != NULL)
++    {
++      label = gtk_label_new (_("Size"));
++      gtk_style_context_add_class (gtk_widget_get_style_context (label),
++                                   GTK_STYLE_CLASS_DIM_LABEL);
++      gtk_grid_attach (GTK_GRID (priv->config_grid), label, 0, 2, 1, 1);
++      gtk_widget_set_halign (label, GTK_ALIGN_END);
++
++      label = gtk_label_new (str);
++      gtk_grid_attach (GTK_GRID (priv->config_grid), label, 1, 2, 1, 1);
++      gtk_widget_set_halign (label, GTK_ALIGN_START);
++      g_free (str);
++    }
+ 
+   /* aspect ratio */
+   label = gtk_label_new (_("Aspect Ratio"));
+diff --git a/panels/info/Makefile.am b/panels/info/Makefile.am
+index 9333bb7..96d06d5 100644
+--- a/panels/info/Makefile.am
++++ b/panels/info/Makefile.am
+@@ -5,6 +5,7 @@ INCLUDES = 						\
+ 	$(INFO_PANEL_CFLAGS)				\
+ 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
+ 	-DDATADIR="\"$(datadir)\""			\
++	-DBINDIR="\"$(bindir)\""			\
+ 	$(NULL)
+ 
+ noinst_LTLIBRARIES = libinfo.la
+diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
+index 247f41c..ba5c8de 100644
+--- a/panels/info/cc-info-panel.c
++++ b/panels/info/cc-info-panel.c
+@@ -98,10 +98,11 @@ struct _CcInfoPanelPrivate
+   char          *gnome_date;
+   UpdatesState   updates_state;
+ 
++  GCancellable  *cancellable;
++
+   /* Free space */
+   GList         *primary_mounts;
+   guint64        total_bytes;
+-  GCancellable  *cancellable;
+ 
+   /* Media */
+   GSettings     *media_settings;
+@@ -472,7 +473,11 @@ cc_info_panel_finalize (GObject *object)
+ {
+   CcInfoPanelPrivate *priv = CC_INFO_PANEL (object)->priv;
+ 
+-  g_clear_pointer (&priv->cancellable, g_cancellable_cancel);
++  if (priv->cancellable)
++    {
++      g_cancellable_cancel (priv->cancellable);
++      g_clear_object (&priv->cancellable);
++    }
+   g_free (priv->gnome_version);
+   g_free (priv->gnome_date);
+   g_free (priv->gnome_distributor);
+@@ -1731,18 +1736,37 @@ on_pk_signal (GDBusProxy *proxy,
+     }
+ }
+ 
++static gboolean
++does_gnome_software_exist (void)
++{
++  return g_file_test (BINDIR "/gnome-software", G_FILE_TEST_EXISTS);
++}
++
+ static void
+ on_updates_button_clicked (GtkWidget   *widget,
+                            CcInfoPanel *self)
+ {
+-  GError *error;
+-  error = NULL;
+-  g_spawn_command_line_async ("gpk-update-viewer", &error);
+-  if (error != NULL)
++  GError *error = NULL;
++  gboolean ret;
++  gchar **argv;
++
++  argv = g_new0 (gchar *, 3);
++  if (does_gnome_software_exist ())
++    {
++      argv[0] = g_build_filename (BINDIR, "gnome-software", NULL);
++      argv[1] = g_strdup_printf ("--mode=updates");
++    }
++  else
++    {
++      argv[0] = g_build_filename (BINDIR, "gpk-update-viewer", NULL);
++    }
++  ret = g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, &error);
++  if (!ret)
+     {
+-      g_warning ("unable to launch Software Updates: %s", error->message);
++      g_warning ("Failed to spawn %s: %s", argv[0], error->message);
+       g_error_free (error);
+     }
++  g_strfreev (argv);
+ }
+ 
+ static gboolean
+@@ -1768,18 +1792,24 @@ got_pk_proxy_cb (GObject *source_object,
+ {
+   GError *error = NULL;
+   guint32 major, minor, micro;
++  GDBusProxy *proxy;
+ 
+-  self->priv->pk_proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
++  proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
+ 
+-  if (self->priv->pk_proxy == NULL)
++  if (proxy == NULL)
+     {
+-      g_warning ("Unable to get PackageKit proxy object: %s", error->message);
++      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
++        {
++          g_warning ("Unable to get PackageKit proxy object: %s", error->message);
++          self->priv->updates_state = PK_NOT_AVAILABLE;
++          refresh_update_button (self);
++        }
+       g_error_free (error);
+-      self->priv->updates_state = PK_NOT_AVAILABLE;
+-      refresh_update_button (self);
+       return;
+     }
+ 
++  self->priv->pk_proxy = proxy;
++
+   if (!get_pk_version_property(self->priv->pk_proxy, "VersionMajor", &major) ||
+       !get_pk_version_property(self->priv->pk_proxy, "VersionMinor", &minor) ||
+       !get_pk_version_property(self->priv->pk_proxy, "VersionMicro", &micro))
+@@ -1820,7 +1850,7 @@ info_panel_setup_updates (CcInfoPanel *self)
+                             "org.freedesktop.PackageKit",
+                             "/org/freedesktop/PackageKit",
+                             "org.freedesktop.PackageKit",
+-                            NULL,
++                            self->priv->cancellable,
+                             (GAsyncReadyCallback) got_pk_proxy_cb,
+                             self);
+ }
+diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
+index d9d09b3..73be08f 100644
+--- a/panels/power/cc-power-panel.c
++++ b/panels/power/cc-power-panel.c
+@@ -320,6 +320,11 @@ set_primary (CcPowerPanel *panel, UpDevice *device)
+   else
+     time = time_full;
+ 
++  /* Sometimes the reported state is fully charged but battery is at 99%,
++     refusing to reach 100%. In these cases, just assume 100%. */
++  if (state == UP_DEVICE_STATE_FULLY_CHARGED && (100.0 - percentage <= 1.0))
++    percentage = 100.0;
++
+   details = get_details_string (percentage, state, time);
+ 
+   row = gtk_list_box_row_new ();
+diff --git a/panels/printers/pp-jobs-dialog.c b/panels/printers/pp-jobs-dialog.c
+index b9f291c..079d8e4 100644
+--- a/panels/printers/pp-jobs-dialog.c
++++ b/panels/printers/pp-jobs-dialog.c
+@@ -119,8 +119,8 @@ update_jobs_list_cb (cups_job_t *jobs,
+       gchar     *state = NULL;
+ 
+       ts = localtime (&(dialog->jobs[i].creation_time));
+-      time = g_date_time_new_local (ts->tm_year,
+-                                    ts->tm_mon,
++      time = g_date_time_new_local (ts->tm_year + 1900,
++                                    ts->tm_mon + 1,
+                                     ts->tm_mday,
+                                     ts->tm_hour,
+                                     ts->tm_min,
+diff --git a/panels/sharing/cc-sharing-panel.c b/panels/sharing/cc-sharing-panel.c
+index 586085d..9e444b0 100644
+--- a/panels/sharing/cc-sharing-panel.c
++++ b/panels/sharing/cc-sharing-panel.c
+@@ -100,7 +100,7 @@ cc_sharing_panel_master_switch_notify (GtkSwitch      *gtkswitch,
+       gtk_switch_set_active (GTK_SWITCH (WID ("share-public-folder-on-network-switch")),
+                              FALSE);
+       gtk_switch_set_active (GTK_SWITCH (WID ("share-media-switch")), FALSE);
+-      gtk_switch_set_active (GTK_SWITCH (WID ("share-public-folder-switch")),
++      gtk_switch_set_active (GTK_SWITCH (WID ("save-received-files-to-downloads-switch")),
+                              FALSE);
+     }
+ 
+@@ -348,7 +348,7 @@ bluetooth_set_accept_files (const GValue       *value,
+   if (g_value_get_boolean (value))
+     return g_variant_new_string ("bonded");
+   else
+-    return g_variant_new_string ("always");
++    return g_variant_new_string ("ask");
+ }
+ 
+ #ifdef HAVE_BLUETOOTH
+@@ -384,6 +384,10 @@ cc_sharing_panel_setup_bluetooth_sharing_dialog (CcSharingPanel *self)
+   g_signal_connect_swapped (priv->bluetooth_killswitch, "state-changed",
+                             G_CALLBACK (bluetooth_state_changed), self);
+ 
++  cc_sharing_panel_bind_switch_to_label (self,
++                                         WID ("save-received-files-to-downloads-switch"),
++                                         WID ("bluetooth-sharing-status-label"));
++
+   cc_sharing_panel_bind_switch_to_widgets (WID ("save-received-files-to-downloads-switch"),
+                                            WID ("receive-files-grid"),
+                                            NULL);
+@@ -413,7 +417,7 @@ cc_sharing_panel_add_folder (GtkWidget      *button,
+   gchar *folder;
+   GtkTreeIter iter;
+   gboolean valid;
+-  gboolean matching;
++  gboolean matching = FALSE;
+ 
+   dialog = gtk_file_chooser_dialog_new (_("Choose a Folder"),
+                                         GTK_WINDOW (gtk_widget_get_toplevel (button)),
+@@ -429,6 +433,10 @@ cc_sharing_panel_add_folder (GtkWidget      *button,
+                                                    "shared-folders-liststore");
+ 
+   folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
++  if (!folder || g_str_equal (folder, ""))
++    goto bail;
++
++  g_debug ("Trying to add %s", folder);
+ 
+   for (valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter);
+        valid;
+@@ -437,18 +445,21 @@ cc_sharing_panel_add_folder (GtkWidget      *button,
+       gchar *string;
+ 
+       gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, 0, &string, -1);
+-      matching = (g_strcmp0 (string, folder) != 0);
++      matching = (g_strcmp0 (string, folder) == 0);
+       g_free (string);
+ 
+       if (matching)
+-        break;
++        {
++          g_debug ("Found a duplicate for %s", folder);
++          break;
++        }
+     }
+ 
+-  if (!matching && folder && !g_str_equal (folder, ""))
++  if (!matching)
+     gtk_list_store_insert_with_values (store, NULL, -1, 0, folder, -1);
+ 
++bail:
+   g_free (folder);
+-
+   gtk_widget_destroy (dialog);
+ }
+ 
+diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
+index 516d96d..b481b25 100644
+--- a/panels/user-accounts/um-user-panel.c
++++ b/panels/user-accounts/um-user-panel.c
+@@ -478,7 +478,7 @@ delete_user (GtkButton *button, CcUserPanelPrivate *d)
+                 g_signal_connect (dialog, "response",
+                                   G_CALLBACK (gtk_widget_destroy), NULL);
+         }
+-        else if (act_user_is_logged_in (user)) {
++        else if (act_user_is_logged_in_anywhere (user)) {
+                 dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (d->main_box)),
+                                                  0,
+                                                  GTK_MESSAGE_INFO,
+diff --git a/panels/wacom/calibrator/calibrator-gui.c b/panels/wacom/calibrator/calibrator-gui.c
+index 898fd38..b073887 100644
+--- a/panels/wacom/calibrator/calibrator-gui.c
++++ b/panels/wacom/calibrator/calibrator-gui.c
+@@ -59,6 +59,8 @@ struct CalibArea
+   ClutterActor      *helper_text_body;
+   ClutterActor      *error_text;
+   ClutterTransition *clock_timeline;
++  ClutterTransition *error_msg_timeline;
++  ClutterTransition *helper_msg_timeline;
+   GdkPixbuf         *icon_success;
+ 
+   FinishCallback callback;
+@@ -143,6 +145,9 @@ on_allocation_changed (ClutterActor          *actor,
+                        ClutterAllocationFlags flags,
+                        CalibArea             *area)
+ {
++  if (!gtk_widget_is_visible (area->window))
++    return;
++
+   resize_display (area);
+ }
+ 
+@@ -153,6 +158,11 @@ on_delete_event (GtkWidget *widget,
+ {
+   clutter_timeline_stop (CLUTTER_TIMELINE (area->clock_timeline));
+ 
++  if (area->error_msg_timeline)
++    clutter_timeline_stop (CLUTTER_TIMELINE (area->error_msg_timeline));
++  if (area->helper_msg_timeline)
++    clutter_timeline_stop (CLUTTER_TIMELINE (area->helper_msg_timeline));
++
+   gtk_widget_hide (area->window);
+ 
+   (*area->callback) (area, area->user_data);
+@@ -267,6 +277,9 @@ show_error_message (CalibArea *area)
+   clutter_actor_show (area->error_text);
+   transition = get_error_message_transition (area);
+   clutter_timeline_start (CLUTTER_TIMELINE (transition));
++
++  g_clear_object (&area->error_msg_timeline);
++  area->error_msg_timeline = transition;
+ }
+ 
+ static void
+@@ -288,6 +301,9 @@ hide_error_message (CalibArea *area)
+                     G_CALLBACK (on_error_message_transparent),
+                     area);
+   clutter_timeline_start (CLUTTER_TIMELINE (transition));
++
++  g_clear_object (&area->error_msg_timeline);
++  area->error_msg_timeline = transition;
+ }
+ 
+ static gboolean
+@@ -410,6 +426,9 @@ show_helper_text_body (CalibArea *area)
+   clutter_transition_set_from (transition, G_TYPE_FLOAT, -height);
+   clutter_transition_set_to (transition, G_TYPE_FLOAT, 0.0);
+   clutter_timeline_start (CLUTTER_TIMELINE (transition));
++
++  g_clear_object (&area->helper_msg_timeline);
++  area->helper_msg_timeline = transition;
+ }
+ 
+ static void
+@@ -445,6 +464,9 @@ show_helper_text_title (CalibArea *area)
+                     area);
+ 
+   clutter_timeline_start (CLUTTER_TIMELINE (transition));
++
++  g_clear_object (&area->helper_msg_timeline);
++  area->helper_msg_timeline = transition;
+ }
+ 
+ static void
+@@ -457,6 +479,10 @@ on_fullscreen (GtkWindow           *window,
+   if ((event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) == 0)
+     return;
+ 
++  /* Protect against window state multiple changes*/
++  if (CLUTTER_ACTOR_IS_VISIBLE (area->action_layer))
++    return;
++
+   clutter_actor_show (area->action_layer);
+   clutter_actor_show (area->clock);
+ 
+@@ -499,6 +525,8 @@ set_up_stage (CalibArea *calib_area, ClutterActor *stage)
+ 
+   clutter_stage_set_use_alpha (CLUTTER_STAGE (stage), TRUE);
+ 
++  clutter_actor_hide (calib_area->target);
++
+   /* bind the action layer's geometry to the stage's */
+   clutter_actor_add_constraint (calib_area->action_layer,
+                                 clutter_bind_constraint_new (stage,
+@@ -776,7 +804,9 @@ calib_area_free (CalibArea *area)
+   g_return_if_fail (area != NULL);
+ 
+   g_clear_object (&area->icon_success);
+-
++  g_clear_object (&area->clock_timeline);
++  g_clear_object (&area->error_msg_timeline);
++  g_clear_object (&area->helper_msg_timeline);
+   gtk_widget_destroy (area->window);
+   g_free (area);
+ }
+diff --git a/panels/wacom/calibrator/calibrator.c b/panels/wacom/calibrator/calibrator.c
+index a9acb49..d94fedb 100644
+--- a/panels/wacom/calibrator/calibrator.c
++++ b/panels/wacom/calibrator/calibrator.c
+@@ -149,11 +149,11 @@ finish (struct Calib *c,
+     /* Compute min/max coordinates. */
+     /* These are scaled using the values of old_axis */
+     scale_x = (c->old_axis.x_max - c->old_axis.x_min)/(float)c->geometry.width;
+-    axis.x_min = ((((c->clicked_x[UL] + c->clicked_x[LL]) / 2) - c->geometry.x) * scale_x) + c->old_axis.x_min;
+-    axis.x_max = ((((c->clicked_x[UR] + c->clicked_x[LR]) / 2) - c->geometry.x) * scale_x) + c->old_axis.x_min;
++    axis.x_min = ((((c->clicked_x[UL] + c->clicked_x[LL]) / 2)) * scale_x) + c->old_axis.x_min;
++    axis.x_max = ((((c->clicked_x[UR] + c->clicked_x[LR]) / 2)) * scale_x) + c->old_axis.x_min;
+     scale_y = (c->old_axis.y_max - c->old_axis.y_min)/(float)c->geometry.height;
+-    axis.y_min = ((((c->clicked_y[UL] + c->clicked_y[UR]) / 2) - c->geometry.y) * scale_y) + c->old_axis.y_min;
+-    axis.y_max = ((((c->clicked_y[LL] + c->clicked_y[LR]) / 2) - c->geometry.y) * scale_y) + c->old_axis.y_min;
++    axis.y_min = ((((c->clicked_y[UL] + c->clicked_y[UR]) / 2)) * scale_y) + c->old_axis.y_min;
++    axis.y_max = ((((c->clicked_y[LL] + c->clicked_y[LR]) / 2)) * scale_y) + c->old_axis.y_min;
+ 
+     /* Add/subtract the offset that comes from not having the points in the
+      * corners (using the same coordinate system they are currently in)
+diff --git a/panels/wacom/calibrator/cc-target-actor.c b/panels/wacom/calibrator/cc-target-actor.c
+index a0961c6..8bf64cc 100644
+--- a/panels/wacom/calibrator/cc-target-actor.c
++++ b/panels/wacom/calibrator/cc-target-actor.c
+@@ -106,6 +106,10 @@ draw_target (ClutterCairoTexture *texture,
+              gint                 height,
+              gpointer             data)
+ {
++  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
++  cairo_paint (cr);
++
++  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+   cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
+ 
+   cairo_set_line_width(cr, 1);
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index 737acc7..de298c0 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -77,6 +77,7 @@ panels/network/net-device-bond.c
+ panels/network/net-device-bridge.c
+ panels/network/net-device-ethernet.c
+ panels/network/net-device-mobile.c
++panels/network/net-device-team.c
+ panels/network/net-device-wifi.c
+ panels/network/net-proxy.c
+ panels/network/net-virtual-device.c
+diff --git a/po/as.po b/po/as.po
+index d441396..3a1c6c3 100644
+--- a/po/as.po
++++ b/po/as.po
+@@ -5,14 +5,14 @@
+ # Amitakhya Phukan <amitakhya@svn.gnome.org>, 2008.
+ # Amitakhya Phukan <aphukan@redhat.com>, 2008.
+ # Amitakhya Phukan <aphukan@fedoraproject.org>, 2009.
+-# Nilamdyuti Goswami <ngoswami@redhat.com>, 2012, 2013.
++# Nilamdyuti Goswami <ngoswami@redhat.com>, 2012, 2013, 2014.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: as\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "control-center&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-09-20 21:45+0000\n"
+-"PO-Revision-Date: 2013-09-23 12:52+0530\n"
++"POT-Creation-Date: 2014-01-20 22:41+0000\n"
++"PO-Revision-Date: 2014-01-22 19:45+0630\n"
+ "Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
+ "Language-Team: Assamese <kde-i18n-doc@kde.org>\n"
+ "Language: as_IN\n"
+@@ -67,7 +67,7 @@ msgid "Span"
+ msgstr "বিস্তাৰ"
+ 
+ #. translators: This is the title of the wallpaper chooser dialog.
+-#: ../panels/background/cc-background-chooser-dialog.c:293
++#: ../panels/background/cc-background-chooser-dialog.c:292
+ msgid "Select Background"
+ msgstr "পটভূমি বাছক"
+ 
+@@ -88,32 +88,32 @@ msgid "Flickr"
+ msgstr "Flickr"
+ 
+ #. translators: No pictures were found
+-#: ../panels/background/cc-background-chooser-dialog.c:393
++#: ../panels/background/cc-background-chooser-dialog.c:385
+ msgid "No Pictures Found"
+ msgstr "কোনো ছবি পোৱা নগল"
+ 
+ #. translators: %s here is the name of the Pictures directory, the string should be translated in
+ #. * the context "You can add images to your Pictures folder and they will show up here"
+-#: ../panels/background/cc-background-chooser-dialog.c:408
++#: ../panels/background/cc-background-chooser-dialog.c:400
+ #, c-format
+ msgid "You can add images to your %s folder and they will show up here"
+ msgstr "আপুনি আপোনাৰ %s ফোল্ডাৰলৈ ছবি যোগ কৰিব পাৰিব আৰু সিহত ইয়াত দেখা যাব"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:436
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:631
+-#: ../panels/color/cc-color-panel.c:220 ../panels/color/cc-color-panel.c:967
+-#: ../panels/display/cc-display-panel.c:1495
+-#: ../panels/display/cc-display-panel.c:1910
++#: ../panels/background/cc-background-chooser-dialog.c:429
++#: ../panels/bluetooth/cc-bluetooth-panel.c:640
++#: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
++#: ../panels/display/cc-display-panel.c:1510
++#: ../panels/display/cc-display-panel.c:1952
+ #: ../panels/network/connection-editor/vpn-helpers.c:245
+ #: ../panels/network/connection-editor/vpn-helpers.c:374
+-#: ../panels/network/net-device-wifi.c:1201
+-#: ../panels/network/net-device-wifi.c:1407
++#: ../panels/network/net-device-wifi.c:1194
++#: ../panels/network/net-device-wifi.c:1402
+ #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
+ #: ../panels/printers/cc-printers-panel.c:1946
+ #: ../panels/printers/new-printer-dialog.ui.h:2
+-#: ../panels/privacy/cc-privacy-panel.c:467
++#: ../panels/privacy/cc-privacy-panel.c:470
+ #: ../panels/search/cc-search-locations-dialog.c:682
+-#: ../panels/sharing/cc-sharing-panel.c:421
++#: ../panels/sharing/cc-sharing-panel.c:425
+ #: ../panels/user-accounts/um-fingerprint-dialog.c:269
+ #: ../panels/user-accounts/um-photo-dialog.c:96
+ #: ../panels/user-accounts/um-photo-dialog.c:221
+@@ -121,9 +121,8 @@ msgstr "আপুনি আপোনাৰ %s ফোল্ডাৰলৈ ছব
+ msgid "_Cancel"
+ msgstr "বাতিল কৰক (_C)"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:437
++#: ../panels/background/cc-background-chooser-dialog.c:430
+ #: ../panels/printers/ppd-selection-dialog.ui.h:3
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:9
+ #: ../panels/user-accounts/um-photo-dialog.c:98
+ msgid "Select"
+ msgstr "বাছক"
+@@ -143,7 +142,7 @@ msgstr "%d × %d"
+ msgid "No Desktop Background"
+ msgstr "কোনো ডেস্কটপ পটভূমি নাই"
+ 
+-#: ../panels/background/cc-background-panel.c:492
++#: ../panels/background/cc-background-panel.c:493
+ msgid "Current background"
+ msgstr "বৰ্তমান পটভূমী"
+ 
+@@ -160,7 +159,7 @@ msgstr "ৱালপেপাৰ;পৰ্দা;ডেস্কটপ;"
+ msgid "Set Up New Device"
+ msgstr "নতুন ডিভাইচ সংস্থাপন কৰক"
+ 
+-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
++#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
+ msgid "Remove Device"
+ msgstr "ডিভাইচ আতৰাওক"
+ 
+@@ -214,50 +213,50 @@ msgstr "কিবৰ্ড সংহতিসমূহ"
+ msgid "Send Files…"
+ msgstr "ফাইলসমূহ পঠাওক…"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
+ msgid "Yes"
+ msgstr "হয়"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
+ msgid "No"
+ msgstr "নহয়"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:470
++#: ../panels/bluetooth/cc-bluetooth-panel.c:479
+ msgid "Bluetooth is disabled"
+ msgstr "ব্লুটুথ অসামৰ্থবান"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:475
++#: ../panels/bluetooth/cc-bluetooth-panel.c:484
+ msgid "Bluetooth is disabled by hardware switch"
+ msgstr "ব্লু-টুথ হাৰ্ডৱেৰ চুইচ দ্বাৰা অসামৰ্থবান"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:479
++#: ../panels/bluetooth/cc-bluetooth-panel.c:488
+ msgid "No Bluetooth adapters found"
+ msgstr "কোনো ব্লু-টুথ এডাপ্টাৰ পোৱা নগল"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:578
++#: ../panels/bluetooth/cc-bluetooth-panel.c:587
+ msgid "Visibility"
+ msgstr "দৃশ্যমানতা"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:582
++#: ../panels/bluetooth/cc-bluetooth-panel.c:591
+ #, c-format
+ msgid "Visibility of “%s”"
+ msgstr "“%s” ৰ দৃশ্যমানতা"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:626
++#: ../panels/bluetooth/cc-bluetooth-panel.c:635
+ #, c-format
+ msgid "Remove '%s' from the list of devices?"
+ msgstr "'%s' ক ডিভাইচসমূহৰ তালিকাৰ পৰা আতৰাব নে?"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:628
++#: ../panels/bluetooth/cc-bluetooth-panel.c:637
+ msgid ""
+ "If you remove the device, you will have to set it up again before next use."
+ msgstr ""
+ "যদি আপুনি ডিভাইচ আতৰায়, আপুনি ইয়াক পৰৱৰ্তী ব্যৱহাৰৰ আগত আকৌ সংস্থাপন কৰিব "
+ "লাগিব।"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:632
++#: ../panels/bluetooth/cc-bluetooth-panel.c:641
+ #: ../panels/online-accounts/cc-online-accounts-panel.c:844
+ msgid "_Remove"
+ msgstr "আতৰাওক (_R)"
+@@ -271,14 +270,14 @@ msgid "Turn Bluetooth on and off and connect your devices"
+ msgstr "ব্লুটুথ অন বা অফ কৰক আৰু আপোনাৰ ডিভাইচসমূহ সংযোগ কৰক"
+ 
+ #. TRANSLATORS: The user has to attach the sensor to the screen
+-#: ../panels/color/cc-color-calibrate.c:360
++#: ../panels/color/cc-color-calibrate.c:361
+ msgid "Place your calibration device over the square and press 'Start'"
+ msgstr "আপোনাৰ মানাংকন ডিভাইচক বৰ্গৰ ওপৰত ৰাখি 'আৰম্ভ কৰক' টিপক"
+ 
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:366
++#: ../panels/color/cc-color-calibrate.c:367
+ msgid ""
+ "Move your calibration device to the calibrate position and press 'Continue'"
+ msgstr "আপোনাৰ মানাংকন ডিভাইচক মানাংকন অৱস্থানত ৰাখি 'অব্যাহত ৰাখক' টিপক"
+@@ -286,7 +285,7 @@ msgstr "আপোনাৰ মানাংকন ডিভাইচক মান
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:372
++#: ../panels/color/cc-color-calibrate.c:373
+ msgid ""
+ "Move your calibration device to the surface position and press 'Continue'"
+ msgstr "আপোনাৰ মানাংকন ডিভাইচক পৃষ্ঠ অৱস্থানত ৰাখি 'অব্যাহত ৰাখক' টিপক"
+@@ -294,54 +293,54 @@ msgstr "আপোনাৰ মানাংকন ডিভাইচক পৃষ
+ #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
+ #. * is built into the palmrest and we need to fullscreen the
+ #. * sample widget and shut the lid.
+-#: ../panels/color/cc-color-calibrate.c:378
++#: ../panels/color/cc-color-calibrate.c:379
+ msgid "Shut the laptop lid"
+ msgstr "লেপটপ লিড বন্ধ কৰক"
+ 
+ #. TRANSLATORS: We suck, the calibation failed and we have no
+ #. * good idea why or any suggestions
+-#: ../panels/color/cc-color-calibrate.c:409
++#: ../panels/color/cc-color-calibrate.c:410
+ msgid "An internal error occurred that could not be recovered."
+ msgstr "এটা অভ্যন্তৰীক ত্ৰুটি দেখা দিছে যাক উদ্ধাৰ কৰিব নোৱাৰি।"
+ 
+ #. TRANSLATORS: Some required-at-runtime tools were not
+ #. * installed, which should only affect insane distros
+-#: ../panels/color/cc-color-calibrate.c:414
++#: ../panels/color/cc-color-calibrate.c:415
+ msgid "Tools required for calibration are not installed."
+ msgstr "মানাংকনৰ বাবে প্ৰয়োজনীয় সঁজুলিসমূহ ইনস্টল্ড নাই।"
+ 
+ #. TRANSLATORS: The profile failed for some reason
+-#: ../panels/color/cc-color-calibrate.c:420
++#: ../panels/color/cc-color-calibrate.c:421
+ msgid "The profile could not be generated."
+ msgstr "আলেখ্য সৃজন কৰিব পৰা নগল।"
+ 
+ #. TRANSLATORS: The user specified a whitepoint that was
+ #. * unobtainable with the hardware they've got -- see
+ #. * https://en.wikipedia.org/wiki/White_point for details
+-#: ../panels/color/cc-color-calibrate.c:426
++#: ../panels/color/cc-color-calibrate.c:427
+ msgid "The target whitepoint was not obtainable."
+ msgstr "লক্ষ্য বগাবিন্দু অপ্ৰাপ্য আছিল।"
+ 
+ #. TRANSLATORS: the display calibration process is finished
+-#: ../panels/color/cc-color-calibrate.c:466
++#: ../panels/color/cc-color-calibrate.c:467
+ msgid "Complete!"
+ msgstr "সম্পূৰ্ণ!"
+ 
+ #. TRANSLATORS: the display calibration failed, and we also show
+ #. * the translated (or untranslated) error string after this
+-#: ../panels/color/cc-color-calibrate.c:474
++#: ../panels/color/cc-color-calibrate.c:475
+ msgid "Calibration failed!"
+ msgstr "মানাংকন ব্যৰ্থ হল!"
+ 
+ #. TRANSLATORS: The user can now remove the sensor from the screen
+-#: ../panels/color/cc-color-calibrate.c:481
++#: ../panels/color/cc-color-calibrate.c:482
+ msgid "You can remove the calibration device."
+ msgstr "আপুনি মানাংকন ডিভাইচ আতৰাব পাৰে।"
+ 
+ #. TRANSLATORS: The user has to be careful not to knock the
+ #. * display off the screen (although we do cope if this is
+ #. * detected early enough)
+-#: ../panels/color/cc-color-calibrate.c:552
++#: ../panels/color/cc-color-calibrate.c:553
+ msgid "Do not disturb the calibration device while in progress"
+ msgstr "প্ৰগতিশীল অৱস্থাত মানাংকন ডিভাইচক অসুবিধা নিদিব"
+ 
+@@ -403,48 +402,48 @@ msgstr "মানাংকিত নহয়"
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile has been auto-generated for this hardware
+-#: ../panels/color/cc-color-panel.c:135
++#: ../panels/color/cc-color-panel.c:137
+ msgid "Default: "
+ msgstr "অবিকল্পিত: "
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile his a standard space like AdobeRGB
+-#: ../panels/color/cc-color-panel.c:143
++#: ../panels/color/cc-color-panel.c:145
+ msgid "Colorspace: "
+ msgstr "ৰঙস্থান: "
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile is a test profile
+-#: ../panels/color/cc-color-panel.c:150
++#: ../panels/color/cc-color-panel.c:152
+ msgid "Test profile: "
+ msgstr "আলেখ্য পৰিক্ষা কৰক: "
+ 
+ #. TRANSLATORS: an ICC profile is a file containing colorspace data
+-#: ../panels/color/cc-color-panel.c:218
++#: ../panels/color/cc-color-panel.c:219
+ msgid "Select ICC Profile File"
+ msgstr "ICC আলেখ্য ফাইল বাছক"
+ 
+-#: ../panels/color/cc-color-panel.c:221
++#: ../panels/color/cc-color-panel.c:222
+ msgid "_Import"
+ msgstr "ইমপোৰ্ট কৰক (_I)"
+ 
+ #. TRANSLATORS: filter name on the file->open dialog
+-#: ../panels/color/cc-color-panel.c:232
++#: ../panels/color/cc-color-panel.c:233
+ msgid "Supported ICC profiles"
+ msgstr "সমৰ্থিত ICC আলেখ্যসমূহ"
+ 
+ #. TRANSLATORS: filter name on the file->open dialog
+-#: ../panels/color/cc-color-panel.c:239
++#: ../panels/color/cc-color-panel.c:240
+ #: ../panels/network/wireless-security/eap-method-fast.c:410
+ msgid "All files"
+ msgstr "সৰ্বধৰণৰ ফাইল"
+ 
+-#: ../panels/color/cc-color-panel.c:586
++#: ../panels/color/cc-color-panel.c:579
+ msgid "Screen"
+ msgstr "পৰ্দা"
+ 
+ #. TRANSLATORS: this is when the upload of the profile failed
+-#: ../panels/color/cc-color-panel.c:912
++#: ../panels/color/cc-color-panel.c:903
+ #, c-format
+ msgid "Failed to upload file: %s"
+ msgstr "ফাইল আপল'ড কৰিবলে ব্যৰ্থ: %s"
+@@ -452,40 +451,40 @@ msgstr "ফাইল আপল'ড কৰিবলে ব্যৰ্থ: %s"
+ #. TRANSLATORS: these are instructions on how to recover
+ #. * the ICC profile on the native operating system and are
+ #. * only shown when the user uses a LiveCD to calibrate
+-#: ../panels/color/cc-color-panel.c:926
++#: ../panels/color/cc-color-panel.c:917
+ msgid "The profile has been uploaded to:"
+ msgstr "আলেখ্যক চিহ্নিত স্থানলৈ আপল'ড কৰা হৈছে:"
+ 
+-#: ../panels/color/cc-color-panel.c:928
++#: ../panels/color/cc-color-panel.c:919
+ msgid "Write down this URL."
+ msgstr "এই URL লিখি ৰাখক।"
+ 
+-#: ../panels/color/cc-color-panel.c:929
++#: ../panels/color/cc-color-panel.c:920
+ msgid "Restart this computer and boot your normal operating system."
+ msgstr ""
+ "এই কমপিউটাৰ পুনৰাম্ভ কৰক আৰু আপোনাৰ স্বাভাৱিক অপাৰেটিং চিস্টেম বুট কৰক।"
+ 
+-#: ../panels/color/cc-color-panel.c:930
++#: ../panels/color/cc-color-panel.c:921
+ msgid "Type the URL into your browser to download and install the profile."
+ msgstr "আলেখ্যক ডাউনল'ড কৰি ইনস্টল কৰিবলে URL ক আপোনাৰ ব্ৰাউছাৰত টাইপ কৰক।"
+ 
+ #. TRANSLATORS: this is the dialog to save the ICC profile
+-#: ../panels/color/cc-color-panel.c:964
++#: ../panels/color/cc-color-panel.c:955
+ msgid "Save Profile"
+ msgstr "আলেখ্য সংৰক্ষণ কৰক"
+ 
+-#: ../panels/color/cc-color-panel.c:968
++#: ../panels/color/cc-color-panel.c:959
+ #: ../panels/network/connection-editor/vpn-helpers.c:375
+ msgid "_Save"
+ msgstr "সংৰক্ষণ (_S)"
+ 
+ #. TRANSLATORS: this is when the button is sensitive
+-#: ../panels/color/cc-color-panel.c:1328
++#: ../panels/color/cc-color-panel.c:1315
+ msgid "Create a color profile for the selected device"
+ msgstr "নিৰ্বাচিত ডিভাইচৰ বাবে এটা ৰঙ আলেখ্য সৃষ্টি কৰক"
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1343 ../panels/color/cc-color-panel.c:1367
++#: ../panels/color/cc-color-panel.c:1330 ../panels/color/cc-color-panel.c:1354
+ msgid ""
+ "The measuring instrument is not detected. Please check it is turned on and "
+ "correctly connected."
+@@ -494,12 +493,12 @@ msgstr ""
+ "সঠিকভাৱে সংযুক্ত।"
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1377
++#: ../panels/color/cc-color-panel.c:1364
+ msgid "The measuring instrument does not support printer profiling."
+ msgstr "মাপ লোৱা ডিভাইচয় প্ৰিন্টাৰ আলেখ্যকৰণ সমৰ্থন নকৰে।"
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1388
++#: ../panels/color/cc-color-panel.c:1375
+ msgid "The device type is not currently supported."
+ msgstr "ডিভাইচ ধৰণ বৰ্তমানে সমৰ্থিত নহয়।"
+ 
+@@ -586,7 +585,6 @@ msgstr "মানাংকন প্ৰদৰ্শন কৰক"
+ #: ../panels/color/color-calibrate.ui.h:2
+ #: ../panels/printers/authentication-dialog.ui.h:2
+ #: ../panels/printers/ppd-selection-dialog.ui.h:2
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:8
+ #: ../panels/user-accounts/um-account-dialog.c:1470
+ msgid "Cancel"
+ msgstr "বাতিল কৰক"
+@@ -607,10 +605,10 @@ msgid "Done"
+ msgstr "কৰা হল"
+ 
+ #. Timeout parameters
+-#. 5000 = 5 sec
++#. 15000 = 15 sec
+ #. 750 = 0.75 sec
+ #. Text printed on screen
+-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
++#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:83
+ msgid "Screen Calibration"
+ msgstr "পৰ্দা মানাংকন"
+ 
+@@ -758,169 +756,148 @@ msgstr ""
+ "a>"
+ 
+ #: ../panels/color/color.ui.h:30
+-msgid "Device type:"
+-msgstr "ডিভাইচৰ ধৰণ:"
+-
+-#: ../panels/color/color.ui.h:31
+-msgid "Manufacturer:"
+-msgstr "উৎপাদক:"
+-
+-#: ../panels/color/color.ui.h:32
+-msgid "Model:"
+-msgstr "আৰ্হি:"
+-
+-#: ../panels/color/color.ui.h:33
+-msgid ""
+-"Image files can be dragged on this window to auto-complete the above fields."
+-msgstr ""
+-"উপৰোক্ত ক্ষেত্ৰসমূহ স্বচালিতভাৱে-সম্পূৰ্ণ কৰিবলে ছবি ফাইলসমূহক এই উইন্ডোত "
+-"টানি আনিব "
+-"পাৰি।"
+-
+-#: ../panels/color/color.ui.h:34
+-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+-msgid "Color"
+-msgstr "ৰঙ"
+-
+-#: ../panels/color/color.ui.h:35
+ msgid "Each device needs an up to date color profile to be color managed."
+ msgstr ""
+ "প্ৰতিটো ডিভাইচ ব্যৱস্থাপনা কৰিবলে এটা বৰ্তমান তাৰিখলে উন্নত এটা ৰঙ আলেখ্যৰ "
+ "প্ৰয়োজন।"
+ 
+-#: ../panels/color/color.ui.h:36
++#: ../panels/color/color.ui.h:31
+ msgid "Learn more"
+ msgstr "অধিক জানক"
+ 
+-#: ../panels/color/color.ui.h:37
++#: ../panels/color/color.ui.h:32
+ msgid "Learn more about color management"
+ msgstr "ৰঙ ব্যৱস্থাপনাৰ বিষয়ে অধিক জানক"
+ 
+-#: ../panels/color/color.ui.h:38
++#: ../panels/color/color.ui.h:33
+ msgid "Set for all users"
+ msgstr "সকলো ব্যৱহাৰকাৰীৰ বাবে সংহত"
+ 
+-#: ../panels/color/color.ui.h:39
++#: ../panels/color/color.ui.h:34
+ msgid "Set this profile for all users on this computer"
+ msgstr "এই কমপিউটাৰৰ সকলো ব্যৱহাৰকাৰীৰ বাবে এই আলেখ্য সংহতি কৰক"
+ 
+-#: ../panels/color/color.ui.h:40
++#: ../panels/color/color.ui.h:35
+ msgid "Enable"
+ msgstr "সামৰ্থবান কৰক"
+ 
+-#: ../panels/color/color.ui.h:41
++#: ../panels/color/color.ui.h:36
+ msgid "Add profile"
+ msgstr "আলেখ্য যোগ কৰক"
+ 
+-#: ../panels/color/color.ui.h:42
++#: ../panels/color/color.ui.h:37
+ #: ../panels/wacom/gnome-wacom-properties.ui.h:10
+ msgid "Calibrate…"
+ msgstr "মানাংকন কৰক…"
+ 
+-#: ../panels/color/color.ui.h:43
++#: ../panels/color/color.ui.h:38
+ msgid "Calibrate the device"
+ msgstr "ডিভাইচ মানাংকন কৰক"
+ 
+-#: ../panels/color/color.ui.h:44
++#: ../panels/color/color.ui.h:39
+ msgid "Remove profile"
+ msgstr "আলেখ্য আতৰাওক"
+ 
+-#: ../panels/color/color.ui.h:45
++#: ../panels/color/color.ui.h:40
+ msgid "View details"
+ msgstr "বিৱৰণসমূহ দৰ্শন কৰক"
+ 
+-#: ../panels/color/color.ui.h:46
++#: ../panels/color/color.ui.h:41
+ msgid "Unable to detect any devices that can be color managed"
+ msgstr "ৰঙ ব্যৱস্থাপনা কৰিব পৰা কোনো ডিভাইচ চিনাক্ত কৰিবলে অক্ষম"
+ 
+-#: ../panels/color/color.ui.h:47
++#: ../panels/color/color.ui.h:42
+ msgid "LCD"
+ msgstr "LCD"
+ 
+-#: ../panels/color/color.ui.h:48
++#: ../panels/color/color.ui.h:43
+ msgid "LED"
+ msgstr "LED"
+ 
+-#: ../panels/color/color.ui.h:49
++#: ../panels/color/color.ui.h:44
+ msgid "CRT"
+ msgstr "CRT"
+ 
+-#: ../panels/color/color.ui.h:50
++#: ../panels/color/color.ui.h:45
+ msgid "Projector"
+ msgstr "প্ৰক্ষেপক"
+ 
+-#: ../panels/color/color.ui.h:51
++#: ../panels/color/color.ui.h:46
+ msgid "Plasma"
+ msgstr "প্লাজমা"
+ 
+-#: ../panels/color/color.ui.h:52
++#: ../panels/color/color.ui.h:47
+ msgid "LCD (CCFL backlight)"
+ msgstr "LCD (CCFL বেকলাইট)"
+ 
+-#: ../panels/color/color.ui.h:53
++#: ../panels/color/color.ui.h:48
+ msgid "LCD (RGB LED backlight)"
+ msgstr "LCD (RGB LED বেকলাইট)"
+ 
+-#: ../panels/color/color.ui.h:54
++#: ../panels/color/color.ui.h:49
+ msgid "LCD (white LED backlight)"
+ msgstr "LCD (বগা LED বেকলাইট)"
+ 
+-#: ../panels/color/color.ui.h:55
++#: ../panels/color/color.ui.h:50
+ msgid "Wide gamut LCD (CCFL backlight)"
+ msgstr "বিস্তাৰিত gamut LCD (CCFL বেকলাইট)"
+ 
+-#: ../panels/color/color.ui.h:56
++#: ../panels/color/color.ui.h:51
+ msgid "Wide gamut LCD (RGB LED backlight)"
+ msgstr "বিস্তাৰিত gamut LCD (RGB LED বেকলাইট)"
+ 
+-#: ../panels/color/color.ui.h:57
++#: ../panels/color/color.ui.h:52
+ msgctxt "Calibration quality"
+ msgid "High"
+ msgstr "উচ্চ"
+ 
+-#: ../panels/color/color.ui.h:58
++#: ../panels/color/color.ui.h:53
+ msgid "40 minutes"
+ msgstr "৪০ মিনিট"
+ 
+-#: ../panels/color/color.ui.h:59
++#: ../panels/color/color.ui.h:54
+ msgctxt "Calibration quality"
+ msgid "Medium"
+ msgstr "মধ্যম"
+ 
+-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:4
++#: ../panels/color/color.ui.h:55 ../panels/power/power.ui.h:4
+ #: ../panels/privacy/privacy.ui.h:7
+ msgid "30 minutes"
+ msgstr "৩০ মিনিট"
+ 
+-#: ../panels/color/color.ui.h:61
++#: ../panels/color/color.ui.h:56
+ msgctxt "Calibration quality"
+ msgid "Low"
+ msgstr "নিম্ন"
+ 
+-#: ../panels/color/color.ui.h:62 ../panels/power/power.ui.h:3
++#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:3
+ msgid "15 minutes"
+ msgstr "১৫ মিনিট"
+ 
+-#: ../panels/color/color.ui.h:63
++#: ../panels/color/color.ui.h:58
+ msgid "Native to display"
+ msgstr "প্ৰদৰ্শন কৰিবলে স্থানীয়"
+ 
+-#: ../panels/color/color.ui.h:64
++#: ../panels/color/color.ui.h:59
+ msgid "D50 (Printing and publishing)"
+ msgstr "D50 (প্ৰিন্টিং আৰু প্ৰকাশন)"
+ 
+-#: ../panels/color/color.ui.h:65
++#: ../panels/color/color.ui.h:60
+ msgid "D55"
+ msgstr "D55"
+ 
+-#: ../panels/color/color.ui.h:66
++#: ../panels/color/color.ui.h:61
+ msgid "D65 (Photography and graphics)"
+ msgstr "D65 (ফ'টোগ্ৰাফি আৰু গ্ৰাফিক্স)"
+ 
+-#: ../panels/color/color.ui.h:67
++#: ../panels/color/color.ui.h:62
+ msgid "D75"
+ msgstr "D75"
+ 
++#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
++msgid "Color"
++msgstr "ৰঙ"
++
+ #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+ msgid ""
+ "Calibrate the color of your devices, such as displays, cameras or printers"
+@@ -973,33 +950,33 @@ msgid "Language"
+ msgstr "ভাষা"
+ 
+ #: ../panels/common/language-chooser.ui.h:2
+-#: ../panels/mouse/cc-mouse-panel.c:120 ../panels/region/format-chooser.ui.h:2
++#: ../panels/mouse/cc-mouse-panel.c:111 ../panels/region/format-chooser.ui.h:2
+ msgid "_Done"
+ msgstr "কৰা হল (_D)"
+ 
+ #. Translators: This is the full date and time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:352
++#: ../panels/datetime/cc-datetime-panel.c:363
+ msgid "%e %B %Y, %l:%M %p"
+ msgstr "%e %B %Y, %l:%M %p"
+ 
+ #. Translators: This is the full date and time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:357
++#: ../panels/datetime/cc-datetime-panel.c:368
+ msgid "%e %B %Y, %R"
+ msgstr "%e %B %Y, %R"
+ 
+ #. Translators: UTC here means the Coordinated Universal Time.
+ #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
+-#: ../panels/datetime/cc-datetime-panel.c:573
++#: ../panels/datetime/cc-datetime-panel.c:584
+ msgid "UTC%:::z"
+ msgstr "UTC%:::z"
+ 
+ #. Translators: This is the time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:578
++#: ../panels/datetime/cc-datetime-panel.c:589
+ msgid "%l:%M %p"
+ msgstr "%l:%M %p"
+ 
+ #. Translators: This is the time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:583
++#: ../panels/datetime/cc-datetime-panel.c:594
+ msgid "%R"
+ msgstr "%R"
+ 
+@@ -1138,144 +1115,109 @@ msgstr "চিস্টেম সময় আৰু তাৰিখ সংহত
+ msgid "To change time or date settings, you need to authenticate."
+ msgstr "সময় আৰু তাৰিখ সংহতিসমূহ পৰিবৰ্তন কৰিবলে, আপুনি প্ৰমাণীত হব লাগিব।"
+ 
+-#: ../panels/display/cc-display-panel.c:473
++#: ../panels/display/cc-display-panel.c:486
+ msgid "Lid Closed"
+ msgstr "লিড বন্ধ"
+ 
+ #. translators: "Mirrored" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:476
++#: ../panels/display/cc-display-panel.c:489
+ msgid "Mirrored"
+ msgstr "মিৰৰড্"
+ 
+-#: ../panels/display/cc-display-panel.c:478
+-#: ../panels/display/cc-display-panel.c:2043
+-#: ../panels/display/display-capplet.ui.h:1
++#: ../panels/display/cc-display-panel.c:491
++#: ../panels/display/cc-display-panel.c:2101
+ msgid "Primary"
+ msgstr "প্ৰাথমিক"
+ 
+-#: ../panels/display/cc-display-panel.c:480
++#: ../panels/display/cc-display-panel.c:493
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1727 ../panels/power/cc-power-panel.c:1738
+-#: ../panels/privacy/cc-privacy-panel.c:77
+-#: ../panels/privacy/cc-privacy-panel.c:117
+-#: ../panels/universal-access/cc-ua-panel.c:253
+-#: ../panels/universal-access/cc-ua-panel.c:610
+-#: ../panels/universal-access/cc-ua-panel.c:736
++#: ../panels/power/cc-power-panel.c:1738 ../panels/power/cc-power-panel.c:1749
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ #: ../panels/universal-access/uap.ui.h:6
+ msgid "Off"
+ msgstr "অফ"
+ 
+-#: ../panels/display/cc-display-panel.c:483
++#: ../panels/display/cc-display-panel.c:496
+ msgid "Secondary"
+ msgstr "দ্বিতীয়"
+ 
+-#: ../panels/display/cc-display-panel.c:1491
++#: ../panels/display/cc-display-panel.c:1506
+ msgid "Arrange Combined Displays"
+ msgstr "সংযুক্ত প্ৰদৰ্শনসমূহ সঁজাওক"
+ 
+-#: ../panels/display/cc-display-panel.c:1497
+-#: ../panels/display/cc-display-panel.c:1913
++#: ../panels/display/cc-display-panel.c:1512
++#: ../panels/display/cc-display-panel.c:1955
+ #: ../panels/network/connection-editor/connection-editor.ui.h:1
+ msgid "_Apply"
+ msgstr "প্ৰয়োগ কৰক (_A)"
+ 
+-#: ../panels/display/cc-display-panel.c:1518
++#: ../panels/display/cc-display-panel.c:1533
+ msgid "Drag displays to rearrange them"
+ msgstr "প্ৰদৰ্শনসমূহক পুনৰ সংঘঠিত কৰিবলৈ সিহতক সঁজাওক"
+ 
+-#. size
+-#: ../panels/display/cc-display-panel.c:1977
++#: ../panels/display/cc-display-panel.c:2037
+ msgid "Size"
+ msgstr "আকাৰ"
+ 
+ #. aspect ratio
+-#: ../panels/display/cc-display-panel.c:1992
+-#: ../panels/display/display-capplet.ui.h:12
++#: ../panels/display/cc-display-panel.c:2050
+ msgid "Aspect Ratio"
+ msgstr "অনুপাত হাৰ"
+ 
+-#: ../panels/display/cc-display-panel.c:2013
+-#: ../panels/display/display-capplet.ui.h:13
++#: ../panels/display/cc-display-panel.c:2071
+ #: ../panels/printers/pp-options-dialog.c:86
+ msgid "Resolution"
+ msgstr "বিভেদন"
+ 
+-#: ../panels/display/cc-display-panel.c:2044
+-#: ../panels/display/display-capplet.ui.h:2
++#: ../panels/display/cc-display-panel.c:2102
+ msgid "Show the top bar and Activities Overview on this display"
+ msgstr "এই প্ৰদৰ্শনত ওপৰ বাৰ আৰু কাৰ্য্যসমূহ অভাৰভিউ দেখুৱাওক"
+ 
+-#: ../panels/display/cc-display-panel.c:2050
++#: ../panels/display/cc-display-panel.c:2108
+ msgid "Secondary Display"
+ msgstr "দ্বিতীয় প্ৰদৰ্শন"
+ 
+-#: ../panels/display/cc-display-panel.c:2051
++#: ../panels/display/cc-display-panel.c:2109
+ msgid "Join this display with another to create an extra workspace"
+ msgstr "এটা অতিৰিক্ত কৰ্মস্থান সৃষ্টি কৰিবলৈ এই প্ৰদৰ্শনক অন্যৰ সৈতে লগ লগাওক"
+ 
+-#: ../panels/display/cc-display-panel.c:2058
+-#: ../panels/display/display-capplet.ui.h:3
++#: ../panels/display/cc-display-panel.c:2116
+ msgid "Presentation"
+ msgstr "পৰিৱেশন"
+ 
+-#: ../panels/display/cc-display-panel.c:2059
+-#: ../panels/display/display-capplet.ui.h:4
++#: ../panels/display/cc-display-panel.c:2117
+ msgid "Show slideshows and media only"
+ msgstr "কেৱল স্লাইডশ্ব আৰু মাধ্যম দেখুৱাওক"
+ 
+ #. translators: "Mirror" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:2064
+-#: ../panels/display/display-capplet.ui.h:5
++#: ../panels/display/cc-display-panel.c:2122
+ msgid "Mirror"
+ msgstr "মিৰৰ"
+ 
+-#: ../panels/display/cc-display-panel.c:2065
++#: ../panels/display/cc-display-panel.c:2123
+ msgid "Show your existing view on both displays"
+ msgstr "দুয়োটা প্ৰদৰ্শনত আপোনাৰ স্থায়ী দৰ্শন দেখুৱাওক"
+ 
+-#: ../panels/display/cc-display-panel.c:2071
+-#: ../panels/display/display-capplet.ui.h:9
++#: ../panels/display/cc-display-panel.c:2129
+ msgid "Turn Off"
+ msgstr "বন্ধ কৰক"
+ 
+-#: ../panels/display/cc-display-panel.c:2072
+-#| msgid "Don't use the display"
++#: ../panels/display/cc-display-panel.c:2130
+ msgid "Don't use this display"
+ msgstr "এই প্ৰদৰ্শন ব্যৱহাৰ নকৰিব"
+ 
+-#: ../panels/display/cc-display-panel.c:2289
++#: ../panels/display/cc-display-panel.c:2345
+ msgid "Could not get screen information"
+ msgstr "পৰ্দা পৰিবৰ্তন প্ৰাপ্ত কৰিবলৈ ব্যৰ্থ"
+ 
+-#: ../panels/display/cc-display-panel.c:2320
++#: ../panels/display/cc-display-panel.c:2376
+ msgid "_Arrange Combined Displays"
+ msgstr "সংযুক্ত প্ৰদৰ্শনসমূহ সঁজাওক (_A)"
+ 
+-#: ../panels/display/display-capplet.ui.h:6
+-msgid "Show your primary display on this screen also"
+-msgstr "আপোনাৰ প্ৰাথমিক প্ৰদৰ্শনক এই পৰ্দাত দেখুৱাওক"
+-
+-#: ../panels/display/display-capplet.ui.h:7
+-msgid "Combine"
+-msgstr "সংমিশ্ৰণ কৰক"
+-
+-#: ../panels/display/display-capplet.ui.h:8
+-msgid "Join with the primary display to create an extra space"
+-msgstr "এটা অতিৰিক্ত স্থান সৃষ্টি কৰিবলৈ প্ৰাথমিক প্ৰদৰ্শনৰ সৈতে সংযুক্ত কৰক"
+-
+-#: ../panels/display/display-capplet.ui.h:10
+-msgid "Don't use the display"
+-msgstr "প্ৰদৰ্শন ব্যৱহাৰ নকৰিব"
+-
+-#: ../panels/display/display-capplet.ui.h:11
+-#: ../panels/printers/printers.ui.h:12
+-msgid "Model"
+-msgstr "আৰ্হি"
+-
+-#: ../panels/display/display-capplet.ui.h:14
+-msgid "Refresh Rate"
+-msgstr "সতেজ কৰাৰ হাৰ"
+-
+ #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
+ msgid "Displays"
+ msgstr "প্ৰদৰ্শনসমূহ"
+@@ -1290,53 +1232,53 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
+ msgstr "পেনেল;প্ৰজেক্টৰ;xrandr;পৰ্দা;বিভেদন;সতেজ কৰক;"
+ 
+ #. TRANSLATORS: AP type
+-#: ../panels/info/cc-info-panel.c:450 ../panels/network/panel-common.c:127
++#: ../panels/info/cc-info-panel.c:452 ../panels/network/panel-common.c:127
+ msgid "Unknown"
+ msgstr "অজ্ঞাত"
+ 
+-#: ../panels/info/cc-info-panel.c:532
++#: ../panels/info/cc-info-panel.c:539
+ #, c-format
+ msgid "%s %d-bit"
+ msgstr "%s %d-bit"
+ 
+-#: ../panels/info/cc-info-panel.c:534
++#: ../panels/info/cc-info-panel.c:541
+ #, c-format
+ msgid "%d-bit"
+ msgstr "%d-bit"
+ 
+-#: ../panels/info/cc-info-panel.c:1214
++#: ../panels/info/cc-info-panel.c:1221
+ msgid "Ask what to do"
+ msgstr "কি কৰা হব সোধক"
+ 
+-#: ../panels/info/cc-info-panel.c:1218
++#: ../panels/info/cc-info-panel.c:1225
+ msgid "Do nothing"
+ msgstr "একো নকৰিব"
+ 
+-#: ../panels/info/cc-info-panel.c:1222
++#: ../panels/info/cc-info-panel.c:1229
+ msgid "Open folder"
+ msgstr "ফোল্ডাৰ খোলক"
+ 
+-#: ../panels/info/cc-info-panel.c:1313
++#: ../panels/info/cc-info-panel.c:1320
+ msgid "Other Media"
+ msgstr "অন্য মাধ্যম"
+ 
+-#: ../panels/info/cc-info-panel.c:1344
++#: ../panels/info/cc-info-panel.c:1351
+ msgid "Select an application for audio CDs"
+ msgstr "অডিঅ' CDসমূহৰ বাবে এটা এপ্লিকেচন বাছক"
+ 
+-#: ../panels/info/cc-info-panel.c:1345
++#: ../panels/info/cc-info-panel.c:1352
+ msgid "Select an application for video DVDs"
+ msgstr "ভিডিঅ' DVDসমূহৰ বাবে এটা এপ্লিকেচন বাছক"
+ 
+-#: ../panels/info/cc-info-panel.c:1346
++#: ../panels/info/cc-info-panel.c:1353
+ msgid "Select an application to run when a music player is connected"
+ msgstr "যেতিয়া এটা সংগীত প্লেয়াৰ সংযুক্ত থাকে চলাবলে এটা এপ্লিকেচন বাছক"
+ 
+-#: ../panels/info/cc-info-panel.c:1347
++#: ../panels/info/cc-info-panel.c:1354
+ msgid "Select an application to run when a camera is connected"
+ msgstr "যেতিয়া এটা কেমেৰা সংযুক্ত তেতিয়া চলিবলে এটা এপ্লিকেচন বাছক"
+ 
+-#: ../panels/info/cc-info-panel.c:1348
++#: ../panels/info/cc-info-panel.c:1355
+ msgid "Select an application for software CDs"
+ msgstr "চফ্টৱেৰ CDসমূহৰ বাবে এটা এপ্লিকেচন বাছক"
+ 
+@@ -1345,89 +1287,89 @@ msgstr "চফ্টৱেৰ CDসমূহৰ বাবে এটা এপ্
+ #. * If the shared-mime-info translation works for your language,
+ #. * simply leave these untranslated.
+ #.
+-#: ../panels/info/cc-info-panel.c:1360
++#: ../panels/info/cc-info-panel.c:1367
+ msgid "audio DVD"
+ msgstr "অডিঅ' DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1361
++#: ../panels/info/cc-info-panel.c:1368
+ msgid "blank Blu-ray disc"
+ msgstr "ৰিক্ত Blu-ray ডিস্ক"
+ 
+-#: ../panels/info/cc-info-panel.c:1362
++#: ../panels/info/cc-info-panel.c:1369
+ msgid "blank CD disc"
+ msgstr "ৰিক্ত CD ডিস্ক"
+ 
+-#: ../panels/info/cc-info-panel.c:1363
++#: ../panels/info/cc-info-panel.c:1370
+ msgid "blank DVD disc"
+ msgstr "ৰিক্ত DVD ডিস্ক"
+ 
+-#: ../panels/info/cc-info-panel.c:1364
++#: ../panels/info/cc-info-panel.c:1371
+ msgid "blank HD DVD disc"
+ msgstr "ৰিক্ত HD DVD ডিস্ক"
+ 
+-#: ../panels/info/cc-info-panel.c:1365
++#: ../panels/info/cc-info-panel.c:1372
+ msgid "Blu-ray video disc"
+ msgstr "Blu-ray ভিডিঅ' ডিস্ক"
+ 
+-#: ../panels/info/cc-info-panel.c:1366
++#: ../panels/info/cc-info-panel.c:1373
+ msgid "e-book reader"
+ msgstr "e-book ৰিডাৰ"
+ 
+-#: ../panels/info/cc-info-panel.c:1367
++#: ../panels/info/cc-info-panel.c:1374
+ msgid "HD DVD video disc"
+ msgstr "HD DVD ভিডিঅ' ডিস্ক"
+ 
+-#: ../panels/info/cc-info-panel.c:1368
++#: ../panels/info/cc-info-panel.c:1375
+ msgid "Picture CD"
+ msgstr "ছবি CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1369
++#: ../panels/info/cc-info-panel.c:1376
+ msgid "Super Video CD"
+ msgstr "চুপাৰ ভিডিঅ' CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1370
++#: ../panels/info/cc-info-panel.c:1377
+ msgid "Video CD"
+ msgstr "ভিডিঅ' CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1371
++#: ../panels/info/cc-info-panel.c:1378
+ msgid "Windows software"
+ msgstr "Windows চফ্টৱেৰ"
+ 
+-#: ../panels/info/cc-info-panel.c:1372
++#: ../panels/info/cc-info-panel.c:1379
+ msgid "Software"
+ msgstr "চফ্টৱেৰ"
+ 
+-#: ../panels/info/cc-info-panel.c:1495
++#: ../panels/info/cc-info-panel.c:1502
+ #: ../panels/keyboard/keyboard-shortcuts.c:1696
+ msgid "Section"
+ msgstr "অংশ"
+ 
+-#: ../panels/info/cc-info-panel.c:1504 ../panels/info/info.ui.h:13
++#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:13
+ msgid "Overview"
+ msgstr "অভাৰভিউ"
+ 
+-#: ../panels/info/cc-info-panel.c:1510 ../panels/info/info.ui.h:20
++#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:20
+ msgid "Default Applications"
+ msgstr "অবিকল্পিত এপ্লিকেচনসমূহ"
+ 
+-#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:28
++#: ../panels/info/cc-info-panel.c:1522 ../panels/info/info.ui.h:28
+ msgid "Removable Media"
+ msgstr "আতৰাব পৰা মাধ্যম"
+ 
+-#: ../panels/info/cc-info-panel.c:1540
++#: ../panels/info/cc-info-panel.c:1547
+ #, c-format
+ msgid "Version %s"
+ msgstr "সংস্কৰণ %s"
+ 
+-#: ../panels/info/cc-info-panel.c:1590
++#: ../panels/info/cc-info-panel.c:1597
+ msgid "Install Updates"
+ msgstr "আপডেইটসমূহ ইনস্টল কৰক"
+ 
+-#: ../panels/info/cc-info-panel.c:1594
++#: ../panels/info/cc-info-panel.c:1601
+ msgid "System Up-To-Date"
+ msgstr "চিস্টেম বৰ্তমান-তাৰিখলে-উন্নত"
+ 
+-#: ../panels/info/cc-info-panel.c:1598
++#: ../panels/info/cc-info-panel.c:1605
+ msgid "Checking for Updates"
+ msgstr "আপডেইটসমূহৰ বাবে নীৰিক্ষণ কৰা হৈ আছে"
+ 
+@@ -1593,7 +1535,7 @@ msgid "Eject"
+ msgstr "উলাওক"
+ 
+ #: ../panels/keyboard/01-input-sources.xml.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+ #: ../panels/universal-access/uap.ui.h:11
+ msgid "Typing"
+ msgstr "টাইপিং"
+@@ -1752,7 +1694,6 @@ msgid "Modifiers-only switch to next source"
+ msgstr "পৰিবৰ্তক-কেৱল পৰৱৰ্তী উৎসলে যাওক"
+ 
+ #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Keyboard"
+ msgstr "কিবৰ্ড"
+ 
+@@ -1779,76 +1720,76 @@ msgstr "নাম :(_N)"
+ msgid "C_ommand:"
+ msgstr "কমান্ড:(_o)"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Repeat Keys"
+ msgstr "পুনৰাবৃত্তিৰ-কি"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+ msgid "Key presses _repeat when key is held down"
+ msgstr "কি টিপি ৰাখিলে অনবৰত লিখা হ'ব (_r)"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+ msgid "_Delay:"
+ msgstr "বিলম্ব (_D):"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+ msgid "_Speed:"
+ msgstr "গতি (_S):"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
+ msgctxt "keyboard, delay"
+ msgid "Short"
+ msgstr "সৰু"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+ msgctxt "keyboard, speed"
+ msgid "Slow"
+ msgstr "লেহেম"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+ msgid "Repeat keys speed"
+ msgstr "কি পুনৰাবৃত্তিৰ হাৰ"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+ msgctxt "keyboard, delay"
+ msgid "Long"
+ msgstr "দীঘল"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+ msgctxt "keyboard, speed"
+ msgid "Fast"
+ msgstr "দ্ৰুত"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+ msgid "Cursor Blinking"
+ msgstr "কাৰ্চাৰৰ পিৰিকিয়া"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+ msgid "Cursor _blinks in text fields"
+ msgstr "আখৰৰ ক্ষেত্ৰত কাৰ্চাৰ পিৰিকিয়া (_b)"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+ msgid "S_peed:"
+ msgstr "গতি (_p):"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+ msgid "Cursor blink speed"
+ msgstr "কাৰ্চাৰৰ পিৰিকিয়া গতি"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+ #: ../panels/region/region.ui.h:5
+ msgid "Input Sources"
+ msgstr "ইনপুট উৎসসমূহ"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+ msgid "Add Shortcut"
+ msgstr "চৰ্টকাট যোগ কৰক"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
+ msgid "Remove Shortcut"
+ msgstr "চৰ্টকাট আতৰাওক"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
+ msgid ""
+ "To edit a shortcut, click the row and hold down the new keys or press "
+ "Backspace to clear."
+@@ -1857,7 +1798,7 @@ msgstr ""
+ "পৰিষ্কাৰ "
+ "কৰিবলে Backspace টিপক।"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+ msgid "Shortcuts"
+ msgstr "চৰ্টকাটসমূহ"
+ 
+@@ -1901,11 +1842,11 @@ msgstr "\"%s\" ত চৰ্টকাট স্থাপন কৰা হ'লে
+ msgid "_Reassign"
+ msgstr "পুনৰ ধাৰ্য্য (_R)"
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:100
++#: ../panels/mouse/cc-mouse-panel.c:95
+ msgid "Test Your _Settings"
+ msgstr "আপোনাৰ সংহতিসমূহ পৰিক্ষা কৰক (_S)"
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:117
++#: ../panels/mouse/cc-mouse-panel.c:108
+ msgid "Test Your Settings"
+ msgstr "আপোনাৰ সংহতিসমূহ পৰিক্ষা কৰক"
+ 
+@@ -1925,91 +1866,87 @@ msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
+ msgstr "ট্ৰেকপেড;পোইন্টাৰ;ক্লিক;টেপ;দুবাৰ;বুটাম;ট্ৰেকবল;স্ক্ৰল;"
+ 
+ #: ../panels/mouse/gnome-mouse-properties.ui.h:1
+-msgid "Mouse Preferences"
+-msgstr "মাউছ সম্পৰ্কিত পছন্দ"
+-
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgid "General"
+ msgstr "সাধাৰণ"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
++#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgctxt "double click, speed"
+ msgid "Slow"
+ msgstr "লেহেম"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
++#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+ msgid "Double-click timeout"
+ msgstr "দুবাৰ-ক্লিক সময়অন্ত"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
++#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+ msgctxt "double click, speed"
+ msgid "Fast"
+ msgstr "দ্ৰুত"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
++#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+ msgid "_Double-click"
+ msgstr "দুবাৰ-ক্লিক (_D)"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
++#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+ msgid "Primary _button"
+ msgstr "প্ৰাথমিক বুটাম (_b)"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
++#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+ msgctxt "mouse, left button as primary"
+ msgid "_Left"
+ msgstr "বাওঁ (_L)"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
++#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+ msgctxt "mouse, right button as primary"
+ msgid "_Right"
+ msgstr "সোঁ (_R)"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
++#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+ msgid "Mouse"
+ msgstr "মাউছ"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
++#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+ msgid "_Pointer speed"
+ msgstr "পোইন্টাৰৰ গতি (_P)"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
++#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+ msgctxt "mouse pointer, speed"
+ msgid "Slow"
+ msgstr "লেহেম"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
++#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+ msgctxt "mouse pointer, speed"
+ msgid "Fast"
+ msgstr "দ্ৰুত"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
++#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+ msgid "Touchpad"
+ msgstr "টাচ-প্যাড"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
++#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+ msgctxt "touchpad pointer, speed"
+ msgid "Slow"
+ msgstr "লেহেম"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
++#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+ msgctxt "touchpad pointer, speed"
+ msgid "Fast"
+ msgstr "দ্ৰুত"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
++#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+ msgid "Disable while _typing"
+ msgstr "টাইপ কৰাৰ সময়ত অসামৰ্থবান কৰক (_t)"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
++#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+ msgid "Tap to _click"
+ msgstr "ক্লিক কৰিবলে টেপ কৰক (_c)"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
++#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+ msgid "Two _finger scroll"
+ msgstr "দুটা আঙুলি বিশিষ্ট স্ক্রোলিং (_f)"
+ 
+ #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible.
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:21
++#: ../panels/mouse/gnome-mouse-properties.ui.h:20
+ msgid "_Natural scrolling"
+ msgstr "স্বাভাৱিক স্ক্রোলিং (_N)"
+ 
+@@ -2052,7 +1989,7 @@ msgstr "এবাৰ ক্লিক, দ্বিতীয় বুটাম"
+ msgid "Air_plane Mode"
+ msgstr "বিমান অৱস্থা (_p)"
+ 
+-#: ../panels/network/cc-network-panel.c:928
++#: ../panels/network/cc-network-panel.c:930
+ msgid "Network proxy"
+ msgstr "নেটৱাৰ্ক প্ৰক্সি"
+ 
+@@ -2060,14 +1997,14 @@ msgstr "নেটৱাৰ্ক প্ৰক্সি"
+ #. * window for vpn connections, it is also used to display
+ #. * vpn connections in the device list.
+ #.
+-#: ../panels/network/cc-network-panel.c:1107 ../panels/network/net-vpn.c:285
+-#: ../panels/network/net-vpn.c:438
++#: ../panels/network/cc-network-panel.c:1109 ../panels/network/net-vpn.c:278
++#: ../panels/network/net-vpn.c:431
+ #, c-format
+ msgid "%s VPN"
+ msgstr "%s VPN"
+ 
+ #. TRANSLATORS: the user is running a NM that is not API compatible
+-#: ../panels/network/cc-network-panel.c:1242
++#: ../panels/network/cc-network-panel.c:1244
+ msgid "The system network services are not compatible with this version."
+ msgstr "চিস্টেম নেটৱাৰ্ক সেৱাসমূহ এই সংস্কৰণৰ সৈতে সংগত নহয়।"
+ 
+@@ -2101,34 +2038,34 @@ msgstr "স্বচালিত"
+ 
+ #. TRANSLATORS: this WEP WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:52
+-#: ../panels/network/net-device-wifi.c:221
+-#: ../panels/network/net-device-wifi.c:382
++#: ../panels/network/net-device-wifi.c:216
++#: ../panels/network/net-device-wifi.c:377
+ msgid "WEP"
+ msgstr "WEP"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:56
+-#: ../panels/network/net-device-wifi.c:225
+-#: ../panels/network/net-device-wifi.c:387
++#: ../panels/network/net-device-wifi.c:220
++#: ../panels/network/net-device-wifi.c:382
+ #: ../panels/network/network-wifi.ui.h:17
+ msgid "WPA"
+ msgstr "WPA"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:60
+-#: ../panels/network/net-device-wifi.c:229
++#: ../panels/network/net-device-wifi.c:224
+ msgid "WPA2"
+ msgstr "WPA2"
+ 
+ #. TRANSLATORS: this Enterprise WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:65
+-#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:229
+ msgid "Enterprise"
+ msgstr "এন্টাৰপ্ৰাইজ"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:70
+-#: ../panels/network/net-device-wifi.c:239
+-#: ../panels/network/net-device-wifi.c:372
++#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:367
+ msgctxt "Wifi security"
+ msgid "None"
+ msgstr "কোনো নহয়"
+@@ -2149,8 +2086,8 @@ msgid "Yesterday"
+ msgstr "যোৱাকালি"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:106
+-#: ../panels/network/net-device-ethernet.c:125
+-#: ../panels/network/net-device-wifi.c:476
++#: ../panels/network/net-device-ethernet.c:122
++#: ../panels/network/net-device-wifi.c:471
+ #, c-format
+ msgid "%i day ago"
+ msgid_plural "%i days ago"
+@@ -2160,37 +2097,37 @@ msgstr[1] "%i দিন আগত"
+ #. Translators: network device speed
+ #: ../panels/network/connection-editor/ce-page-details.c:155
+ #: ../panels/network/net-device-ethernet.c:53
+-#: ../panels/network/net-device-wifi.c:534
++#: ../panels/network/net-device-wifi.c:528
+ #, c-format
+ msgid "%d Mb/s"
+ msgstr "%d Mb/s"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:181
+-#: ../panels/network/net-device-wifi.c:563
++#: ../panels/network/net-device-wifi.c:557
+ msgctxt "Signal strength"
+ msgid "None"
+ msgstr "কোনো নহয়"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:183
+-#: ../panels/network/net-device-wifi.c:565
++#: ../panels/network/net-device-wifi.c:559
+ msgctxt "Signal strength"
+ msgid "Weak"
+ msgstr "দুৰ্বল"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:185
+-#: ../panels/network/net-device-wifi.c:567
++#: ../panels/network/net-device-wifi.c:561
+ msgctxt "Signal strength"
+ msgid "Ok"
+ msgstr "ঠিক আছে"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:187
+-#: ../panels/network/net-device-wifi.c:569
++#: ../panels/network/net-device-wifi.c:563
+ msgctxt "Signal strength"
+ msgid "Good"
+ msgstr "ভাল"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:189
+-#: ../panels/network/net-device-wifi.c:571
++#: ../panels/network/net-device-wifi.c:565
+ msgctxt "Signal strength"
+ msgid "Excellent"
+ msgstr "উত্তম"
+@@ -2336,15 +2273,15 @@ msgid "Link speed"
+ msgstr "সংযোগৰ গতী"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:4
+-#: ../panels/network/net-device-ethernet.c:158
++#: ../panels/network/net-device-ethernet.c:155
+ #: ../panels/network/network-simple.ui.h:3
+ #: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
+ msgid "IPv4 Address"
+ msgstr "IPv4 ঠিকনা"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:5
+-#: ../panels/network/net-device-ethernet.c:159
+-#: ../panels/network/net-device-ethernet.c:163
++#: ../panels/network/net-device-ethernet.c:156
++#: ../panels/network/net-device-ethernet.c:160
+ #: ../panels/network/network-mobile.ui.h:4
+ #: ../panels/network/network-simple.ui.h:4
+ #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
+@@ -2352,14 +2289,14 @@ msgid "IPv6 Address"
+ msgstr "IPv6 ঠিকনা"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:6
+-#: ../panels/network/net-device-ethernet.c:166
++#: ../panels/network/net-device-ethernet.c:163
+ #: ../panels/network/network-simple.ui.h:2
+ #: ../panels/network/network-wifi.ui.h:7
+ msgid "Hardware Address"
+ msgstr "হাৰ্ডৱেৰ ঠিকনা"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:7
+-#: ../panels/network/net-device-ethernet.c:170
++#: ../panels/network/net-device-ethernet.c:167
+ #: ../panels/network/network-mobile.ui.h:5
+ #: ../panels/network/network-simple.ui.h:5
+ #: ../panels/network/network-wifi.ui.h:8
+@@ -2369,7 +2306,7 @@ msgstr "অবিকল্পিত পথ"
+ #: ../panels/network/connection-editor/details-page.ui.h:8
+ #: ../panels/network/connection-editor/ip4-page.ui.h:3
+ #: ../panels/network/connection-editor/ip6-page.ui.h:3
+-#: ../panels/network/net-device-ethernet.c:172
++#: ../panels/network/net-device-ethernet.c:169
+ #: ../panels/network/network-mobile.ui.h:6
+ #: ../panels/network/network-simple.ui.h:6
+ #: ../panels/network/network-wifi.ui.h:9
+@@ -2515,7 +2452,7 @@ msgid "_Add"
+ msgstr "যোগ কৰক (_A)"
+ 
+ #: ../panels/network/connection-editor/net-connection-editor.c:595
+-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
++#: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
+ msgid "VPN"
+ msgstr "VPN"
+ 
+@@ -2523,23 +2460,23 @@ msgstr "VPN"
+ msgid "Bond"
+ msgstr "বান্ধনী"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:597
++#: ../panels/network/connection-editor/net-connection-editor.c:598
+ msgid "Bridge"
+ msgstr "ব্ৰিজ"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:598
++#: ../panels/network/connection-editor/net-connection-editor.c:599
+ msgid "VLAN"
+ msgstr "VLAN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:749
++#: ../panels/network/connection-editor/net-connection-editor.c:750
+ msgid "Could not load VPN plugins"
+ msgstr "VPN প্লাগিনসমূহ ল'ড কৰিব পৰা নগল"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:818
++#: ../panels/network/connection-editor/net-connection-editor.c:819
+ msgid "Import from file…"
+ msgstr "ফাইলৰ পৰা ইমপোৰ্ট কৰক…"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:889
++#: ../panels/network/connection-editor/net-connection-editor.c:890
+ msgid "Add Network Connection"
+ msgstr "নেটৱাৰ্ক সংযোগ যোগ কৰক"
+ 
+@@ -2549,7 +2486,7 @@ msgid "_Reset"
+ msgstr "পুনৰ সংহতি কৰক (_R)"
+ 
+ #: ../panels/network/connection-editor/reset-page.ui.h:2
+-#: ../panels/network/net-device-wifi.c:1408
++#: ../panels/network/net-device-wifi.c:1403
+ #: ../panels/network/network-wifi.ui.h:40
+ msgid "_Forget"
+ msgstr "পাহৰি যাওক (_F)"
+@@ -2599,7 +2536,7 @@ msgstr "ইমপোৰ্ট কৰিবলে ফাইল বাছক"
+ 
+ #: ../panels/network/connection-editor/vpn-helpers.c:246
+ #: ../panels/printers/cc-printers-panel.c:1947
+-#: ../panels/sharing/cc-sharing-panel.c:422
++#: ../panels/sharing/cc-sharing-panel.c:426
+ #: ../panels/user-accounts/um-photo-dialog.c:222
+ msgid "_Open"
+ msgstr "খোলক (_O)"
+@@ -2688,29 +2625,29 @@ msgstr "বণ্ড স্লেইভসমূহ"
+ msgid "Bridge slaves"
+ msgstr "ব্ৰিজ স্লেইভসমূহ"
+ 
+-#: ../panels/network/net-device-ethernet.c:111
+-#: ../panels/network/net-device-wifi.c:462
++#: ../panels/network/net-device-ethernet.c:108
++#: ../panels/network/net-device-wifi.c:457
+ msgid "never"
+ msgstr "কেতিয়াও নহয়"
+ 
+-#: ../panels/network/net-device-ethernet.c:121
+-#: ../panels/network/net-device-wifi.c:472
++#: ../panels/network/net-device-ethernet.c:118
++#: ../panels/network/net-device-wifi.c:467
+ msgid "today"
+ msgstr "আজি"
+ 
+-#: ../panels/network/net-device-ethernet.c:123
+-#: ../panels/network/net-device-wifi.c:474
++#: ../panels/network/net-device-ethernet.c:120
++#: ../panels/network/net-device-wifi.c:469
+ msgid "yesterday"
+ msgstr "যোৱাকালী"
+ 
+-#: ../panels/network/net-device-ethernet.c:161
++#: ../panels/network/net-device-ethernet.c:158
+ #: ../panels/network/network-mobile.ui.h:3
+ #: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
+ #: ../panels/printers/printers.ui.h:13
+ msgid "IP Address"
+ msgstr "IP ঠিকনা"
+ 
+-#: ../panels/network/net-device-ethernet.c:177
++#: ../panels/network/net-device-ethernet.c:174
+ #: ../panels/network/network-wifi.ui.h:10
+ msgid "Last used"
+ msgstr "সৰ্বশেষ ব্যৱহৃত"
+@@ -2720,14 +2657,14 @@ msgstr "সৰ্বশেষ ব্যৱহৃত"
+ #. * profile. It is also used to display ethernet in the
+ #. * device list.
+ #.
+-#: ../panels/network/net-device-ethernet.c:287
++#: ../panels/network/net-device-ethernet.c:284
+ #: ../panels/network/network-ethernet.ui.h:1
+ #: ../panels/network/network-simple.ui.h:1
+ msgid "Wired"
+ msgstr "তাঁৰযুক্ত"
+ 
+-#: ../panels/network/net-device-ethernet.c:355
+-#: ../panels/network/net-device-wifi.c:1549
++#: ../panels/network/net-device-ethernet.c:352
++#: ../panels/network/net-device-wifi.c:1558
+ #: ../panels/network/network-ethernet.ui.h:3
+ #: ../panels/network/network-mobile.ui.h:8
+ #: ../panels/network/network-simple.ui.h:8
+@@ -2735,16 +2672,21 @@ msgstr "তাঁৰযুক্ত"
+ msgid "Options…"
+ msgstr "বিকল্পসমূহ…"
+ 
+-#: ../panels/network/net-device-ethernet.c:492
++#: ../panels/network/net-device-ethernet.c:489
+ #, c-format
+ msgid "Profile %d"
+ msgstr "আলেখ্য %d"
+ 
+-#: ../panels/network/net-device-mobile.c:239
++#: ../panels/network/net-device-mobile.c:232
+ msgid "Add new connection"
+ msgstr "নতুন সংযোগ যোগ কৰক"
+ 
+-#: ../panels/network/net-device-wifi.c:1117
++#: ../panels/network/net-device-team.c:77
++#| msgid "Bridge slaves"
++msgid "Team slaves"
++msgstr "দলৰ স্লেইভবোৰ"
++
++#: ../panels/network/net-device-wifi.c:1110
+ msgid ""
+ "If you have a connection to the Internet other than wireless, you can set up "
+ "a wireless hotspot to share the connection with others."
+@@ -2753,12 +2695,12 @@ msgstr ""
+ "সৈতে "
+ "অংশীদাৰী কৰিবলে এটা বেতাঁৰ হটস্পট সংস্থাপন কৰিব পাৰে।"
+ 
+-#: ../panels/network/net-device-wifi.c:1121
++#: ../panels/network/net-device-wifi.c:1114
+ #, c-format
+ msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+ msgstr "বেতাঁৰ হটস্পট আৰম্ভ কৰিলে আপুনি <b>%s</b> ৰ পৰা বিচ্ছিন্নিত হব।"
+ 
+-#: ../panels/network/net-device-wifi.c:1125
++#: ../panels/network/net-device-wifi.c:1118
+ msgid ""
+ "It is not possible to access the Internet through your wireless while the "
+ "hotspot is active."
+@@ -2766,23 +2708,23 @@ msgstr ""
+ "হটস্পট সক্ৰিয় থকা অৱস্থাত আপোনাৰ বেতাঁৰৰ সহায়ত ইন্টাৰনেট অভিগম কৰাটো সম্ভব "
+ "নহয়।"
+ 
+-#: ../panels/network/net-device-wifi.c:1199
++#: ../panels/network/net-device-wifi.c:1192
+ msgid "Stop hotspot and disconnect any users?"
+ msgstr "হটস্পট বন্ধ কৰি কোনো ব্যৱহাৰকাৰী বিচ্ছিন্ন কৰিব নে?"
+ 
+-#: ../panels/network/net-device-wifi.c:1202
++#: ../panels/network/net-device-wifi.c:1195
+ msgid "_Stop Hotspot"
+ msgstr "হটস্পট বন্ধ কৰক (_S)"
+ 
+-#: ../panels/network/net-device-wifi.c:1274
++#: ../panels/network/net-device-wifi.c:1267
+ msgid "System policy prohibits use as a Hotspot"
+ msgstr "চিস্টেমৰ নীতিয়ে হটস্পট হিচাপে ব্যৱহাৰ নিষিদ্ধ কৰে"
+ 
+-#: ../panels/network/net-device-wifi.c:1277
++#: ../panels/network/net-device-wifi.c:1270
+ msgid "Wireless device does not support Hotspot mode"
+ msgstr "বেতাঁৰ ডিভাইচে হটস্পট অৱস্থা সমৰ্থন নকৰে"
+ 
+-#: ../panels/network/net-device-wifi.c:1404
++#: ../panels/network/net-device-wifi.c:1399
+ msgid ""
+ "Network details for the selected networks, including passwords and any "
+ "custom configuration will be lost."
+@@ -2790,19 +2732,19 @@ msgstr ""
+ "নিৰ্বাচিত নেটৱাৰ্কসমূহৰ বাবে নেটৱাৰ্ক বিৱৰণসমূহ, লগতে পাছৱাৰ্ডসমূহ আৰু কোনো "
+ "স্বনিৰ্বাচিত সংৰূপ হেৰাই যাব।"
+ 
+-#: ../panels/network/net-device-wifi.c:1714
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
++#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+ msgid "History"
+ msgstr "ইতিহাস"
+ 
+-#: ../panels/network/net-device-wifi.c:1718 ../panels/power/power.ui.h:21
++#: ../panels/network/net-device-wifi.c:1730 ../panels/power/power.ui.h:21
+ #: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596
+-#: ../panels/wacom/cc-wacom-page.c:525
++#: ../panels/wacom/cc-wacom-page.c:534
+ msgid "_Close"
+ msgstr "বন্ধ কৰক (_C)"
+ 
+ #. translators: This is the label for the "Forget wireless network" functionality
+-#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/network/net-device-wifi.c:1738
+ msgctxt "Wi-Fi Network"
+ msgid "_Forget"
+ msgstr "পাহৰি যাওক (_F)"
+@@ -2821,7 +2763,7 @@ msgstr "যেতিয়া এটা সংৰূপ URL প্ৰদান ক
+ msgid "This is not recommended for untrusted public networks."
+ msgstr "ই ভৰষাহিন ৰাজহুৱা নেটৱাৰ্কসমূহৰ বাবে উপদেশিত নহয়।"
+ 
+-#: ../panels/network/net-proxy.c:417
++#: ../panels/network/net-proxy.c:410
+ msgid "Proxy"
+ msgstr "প্ৰক্সি"
+ 
+@@ -2837,17 +2779,17 @@ msgstr "IMEI"
+ msgid "Provider"
+ msgstr "প্ৰদানকাৰী"
+ 
+-#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
++#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:2
+ msgctxt "proxy method"
+ msgid "None"
+ msgstr "কোনো নহয়"
+ 
+-#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
++#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:3
+ msgctxt "proxy method"
+ msgid "Manual"
+ msgstr "হস্তচালিত"
+ 
+-#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
++#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:4
+ msgctxt "proxy method"
+ msgid "Automatic"
+ msgstr "স্বচালিত"
+@@ -2900,19 +2842,7 @@ msgstr "চক্স প্ৰক্সি পোৰ্ট"
+ msgid "Turn device off"
+ msgstr "ডিভাইচ বন্ধ কৰক"
+ 
+-#: ../panels/network/network.ui.h:1
+-msgid "Select the interface to use for the new service"
+-msgstr "নতুন সেৱাৰ বাবে ব্যৱহাৰ কৰিবলে আন্তঃপৃষ্ঠ বাছক"
+-
+-#: ../panels/network/network.ui.h:2
+-msgid "C_reate…"
+-msgstr "সৃষ্টি কৰক (_r)…"
+-
+-#: ../panels/network/network.ui.h:3
+-msgid "_Interface"
+-msgstr "আন্তঃপৃষ্ঠ (_I)"
+-
+-#: ../panels/network/network.ui.h:8
++#: ../panels/network/network.ui.h:5
+ msgid "Add Device"
+ msgstr "ডিভাইচ যোগ কৰক"
+ 
+@@ -2951,7 +2881,7 @@ msgstr "বিৱৰণসমূহ"
+ #: ../panels/network/wireless-security/ws-leap.ui.h:2
+ #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
+ #: ../panels/user-accounts/data/account-dialog.ui.h:9
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+ msgid "_Password"
+ msgstr "পাছৱাৰ্ড (_P)"
+ 
+@@ -3651,12 +3581,12 @@ msgid "Show Details in Lock Screen"
+ msgstr "পৰ্দা লক কৰাত বিৱৰণসমূহ দেখুৱাওক"
+ 
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1733 ../panels/power/cc-power-panel.c:1740
+-#: ../panels/privacy/cc-privacy-panel.c:77
+-#: ../panels/privacy/cc-privacy-panel.c:117
+-#: ../panels/universal-access/cc-ua-panel.c:253
+-#: ../panels/universal-access/cc-ua-panel.c:610
+-#: ../panels/universal-access/cc-ua-panel.c:736
++#: ../panels/power/cc-power-panel.c:1744 ../panels/power/cc-power-panel.c:1751
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ msgid "On"
+ msgstr "অন "
+ 
+@@ -3779,18 +3709,18 @@ msgstr ""
+ "এটা একাওন্টে যোগ কৰিলে আপোনাৰ এপ্লিকেচনে ইয়াক দস্তাবেজসমূহ, মেইল, পৰিচয়সমূহ, "
+ "কেলেন্ডাৰ, চেট আৰু অধিকৰ বাবে অভিগম কৰিবলে অনুমতি প্ৰাপ্ত কৰে।"
+ 
+-#: ../panels/power/cc-power-panel.c:187
++#: ../panels/power/cc-power-panel.c:189
+ msgid "Unknown time"
+ msgstr "অজ্ঞাত সময়"
+ 
+-#: ../panels/power/cc-power-panel.c:193
++#: ../panels/power/cc-power-panel.c:195
+ #, c-format
+ msgid "%i minute"
+ msgid_plural "%i minutes"
+ msgstr[0] "%i মিনিট"
+ msgstr[1] "%i মিনিট"
+ 
+-#: ../panels/power/cc-power-panel.c:205
++#: ../panels/power/cc-power-panel.c:207
+ #, c-format
+ msgid "%i hour"
+ msgid_plural "%i hours"
+@@ -3799,226 +3729,226 @@ msgstr[1] "%i ঘন্টা"
+ 
+ #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
+ #. * Swap order with "%2$s %2$i %1$s %1$i if needed
+-#: ../panels/power/cc-power-panel.c:213
++#: ../panels/power/cc-power-panel.c:215
+ #, c-format
+ msgid "%i %s %i %s"
+ msgstr "%i %s %i %s"
+ 
+-#: ../panels/power/cc-power-panel.c:214
++#: ../panels/power/cc-power-panel.c:216
+ msgid "hour"
+ msgid_plural "hours"
+ msgstr[0] "ঘন্টা"
+ msgstr[1] "ঘন্টা"
+ 
+-#: ../panels/power/cc-power-panel.c:215
++#: ../panels/power/cc-power-panel.c:217
+ msgid "minute"
+ msgid_plural "minutes"
+ msgstr[0] "মিনিট"
+ msgstr[1] "মিনিট"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:234
++#: ../panels/power/cc-power-panel.c:236
+ #, c-format
+ msgid "%s until fully charged"
+ msgstr "সম্পূৰ্ণ চাৰ্জ হবলে %s অৱশিষ্ট"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:241
++#: ../panels/power/cc-power-panel.c:243
+ #, c-format
+ msgid "Caution: %s remaining"
+ msgstr "সাৱধান: %s অৱশিষ্ট"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:246
++#: ../panels/power/cc-power-panel.c:248
+ #, c-format
+ msgid "%s remaining"
+ msgstr "%s অৱশিষ্ট"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:251 ../panels/power/cc-power-panel.c:279
++#: ../panels/power/cc-power-panel.c:253 ../panels/power/cc-power-panel.c:281
+ msgid "Fully charged"
+ msgstr "সম্পূৰ্ণ চাৰ্জ হৈছে"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:255 ../panels/power/cc-power-panel.c:283
++#: ../panels/power/cc-power-panel.c:257 ../panels/power/cc-power-panel.c:285
+ msgid "Empty"
+ msgstr "ৰিক্ত"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:270
++#: ../panels/power/cc-power-panel.c:272
+ msgid "Charging"
+ msgstr "চাৰ্জ কৰা হৈ আছে"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:275
++#: ../panels/power/cc-power-panel.c:277
+ msgid "Discharging"
+ msgstr "চাৰ্জ শেষ হৈ আছে"
+ 
+-#: ../panels/power/cc-power-panel.c:393
++#: ../panels/power/cc-power-panel.c:395
+ msgctxt "Battery name"
+ msgid "Main"
+ msgstr "মূখ্য"
+ 
+-#: ../panels/power/cc-power-panel.c:395
++#: ../panels/power/cc-power-panel.c:397
+ msgctxt "Battery name"
+ msgid "Extra"
+ msgstr "অতিৰিক্ত"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:486
++#: ../panels/power/cc-power-panel.c:469
+ msgid "Wireless mouse"
+ msgstr "বেতাঁৰ মাউছ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:490
++#: ../panels/power/cc-power-panel.c:472
+ msgid "Wireless keyboard"
+ msgstr "বেতাঁৰ কিবৰ্ড"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:494
++#: ../panels/power/cc-power-panel.c:475
+ msgid "Uninterruptible power supply"
+ msgstr "ব্যাঘাতহিন শক্তিৰ যোগান"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:499
++#: ../panels/power/cc-power-panel.c:478
+ msgid "Personal digital assistant"
+ msgstr "ব্যক্তিগত অঙ্কীয় সহায়ক"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:503
++#: ../panels/power/cc-power-panel.c:481
+ msgid "Cellphone"
+ msgstr "চেলফোন"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:507
++#: ../panels/power/cc-power-panel.c:484
+ msgid "Media player"
+ msgstr "মিডিয়া প্লেয়াৰ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:511
++#: ../panels/power/cc-power-panel.c:487
+ msgid "Tablet"
+ msgstr "টেবলেট"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:515
++#: ../panels/power/cc-power-panel.c:490
+ msgid "Computer"
+ msgstr "কমপিউটাৰ"
+ 
+ #. TRANSLATORS: secondary battery, misc
+-#: ../panels/power/cc-power-panel.c:519 ../panels/power/cc-power-panel.c:729
+-#: ../panels/power/cc-power-panel.c:2064
++#: ../panels/power/cc-power-panel.c:493 ../panels/power/cc-power-panel.c:740
++#: ../panels/power/cc-power-panel.c:2075
+ msgid "Battery"
+ msgstr "বেটাৰি"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:528
++#: ../panels/power/cc-power-panel.c:539
+ msgctxt "Battery power"
+ msgid "Charging"
+ msgstr "চাৰ্জ কৰা হৈ আছে"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:535
++#: ../panels/power/cc-power-panel.c:546
+ msgctxt "Battery power"
+ msgid "Caution"
+ msgstr "সাৱধানী"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:540
++#: ../panels/power/cc-power-panel.c:551
+ msgctxt "Battery power"
+ msgid "Low"
+ msgstr "নিম্ন"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:545
++#: ../panels/power/cc-power-panel.c:556
+ msgctxt "Battery power"
+ msgid "Good"
+ msgstr "ভাল"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:550
++#: ../panels/power/cc-power-panel.c:561
+ msgctxt "Battery power"
+ msgid "Fully charged"
+ msgstr "সম্পূৰ্ণ চাৰ্জ হৈছে"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:554
++#: ../panels/power/cc-power-panel.c:565
+ msgctxt "Battery power"
+ msgid "Empty"
+ msgstr "ৰিক্ত"
+ 
+-#: ../panels/power/cc-power-panel.c:727
++#: ../panels/power/cc-power-panel.c:738
+ msgid "Batteries"
+ msgstr "বেটাৰিসমূহ"
+ 
+-#: ../panels/power/cc-power-panel.c:1133
++#: ../panels/power/cc-power-panel.c:1144
+ msgid "When _idle"
+ msgstr "যেতিয়া অলস (_i)"
+ 
+-#: ../panels/power/cc-power-panel.c:1502
++#: ../panels/power/cc-power-panel.c:1513
+ msgid "Power Saving"
+ msgstr "শক্তি সংৰক্ষণ কৰা"
+ 
+-#: ../panels/power/cc-power-panel.c:1530
++#: ../panels/power/cc-power-panel.c:1541
+ msgid "_Screen brightness"
+ msgstr "পৰ্দাৰ উজ্জ্বলতা (_S)"
+ 
+-#: ../panels/power/cc-power-panel.c:1536
++#: ../panels/power/cc-power-panel.c:1547
+ msgid "_Keyboard brightness"
+ msgstr "কিবৰ্ডৰ উজ্জ্বলতা (_K)"
+ 
+-#: ../panels/power/cc-power-panel.c:1546
++#: ../panels/power/cc-power-panel.c:1557
+ msgid "_Dim screen when inactive"
+ msgstr "যেতিয়া নিষ্ক্ৰিয় তেতিয়া পৰ্দা স্লান কৰিব (_D)"
+ 
+-#: ../panels/power/cc-power-panel.c:1571
++#: ../panels/power/cc-power-panel.c:1582
+ msgid "_Blank screen"
+ msgstr "ৰিক্ত পৰ্দা (_B)"
+ 
+-#: ../panels/power/cc-power-panel.c:1608
++#: ../panels/power/cc-power-panel.c:1619
+ msgid "_Wi-Fi"
+ msgstr "Wi-Fi (_W)"
+ 
+-#: ../panels/power/cc-power-panel.c:1613
++#: ../panels/power/cc-power-panel.c:1624
+ msgid "Turns off wireless devices"
+ msgstr "বেতাঁৰ ডিভাইচসমূহ বন্ধ কৰে"
+ 
+-#: ../panels/power/cc-power-panel.c:1638
++#: ../panels/power/cc-power-panel.c:1649
+ msgid "_Mobile broadband"
+ msgstr "মবাইল ব্ৰডবেণ্ড (_M)"
+ 
+-#: ../panels/power/cc-power-panel.c:1643
++#: ../panels/power/cc-power-panel.c:1654
+ msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
+ msgstr "মবাইল ব্ৰডবেণ্ড (3G, 4G, WiMax, ইত্যাদি) ডিভাইচসমূহ বন্ধ কৰে"
+ 
+-#: ../panels/power/cc-power-panel.c:1678
++#: ../panels/power/cc-power-panel.c:1689
+ msgid "_Bluetooth"
+ msgstr "ব্লুটুথ (_B)"
+ 
+-#: ../panels/power/cc-power-panel.c:1729
++#: ../panels/power/cc-power-panel.c:1740
+ msgid "When on battery power"
+ msgstr "যেতিয়া বেটাৰি শক্তিত চলি থাকে"
+ 
+-#: ../panels/power/cc-power-panel.c:1731
++#: ../panels/power/cc-power-panel.c:1742
+ msgid "When plugged in"
+ msgstr "যেতিয়া প্লাগ ইন কৰা আছে"
+ 
+-#: ../panels/power/cc-power-panel.c:1860
++#: ../panels/power/cc-power-panel.c:1871
+ msgid "Suspend & Power Off"
+ msgstr "স্থগিত কৰি বন্ধ কৰক"
+ 
+-#: ../panels/power/cc-power-panel.c:1893
++#: ../panels/power/cc-power-panel.c:1904
+ msgid "_Automatic suspend"
+ msgstr "স্বচালিতভাৱে স্থগিত কৰা (_A)"
+ 
+-#: ../panels/power/cc-power-panel.c:1917
++#: ../panels/power/cc-power-panel.c:1928
+ msgid "When battery power is _critical"
+ msgstr "যেতিয়া বেটাৰি শক্তি মাৰাত্মকভাৱে কম (_c)"
+ 
+-#: ../panels/power/cc-power-panel.c:1974
++#: ../panels/power/cc-power-panel.c:1985
+ msgid "Power Off"
+ msgstr "বন্ধ কৰক"
+ 
+-#: ../panels/power/cc-power-panel.c:2111
++#: ../panels/power/cc-power-panel.c:2122
+ msgid "Devices"
+ msgstr "ডিভাইচ"
+ 
+@@ -4122,7 +4052,7 @@ msgid "Authenticate"
+ msgstr "প্ৰমাণীত কৰক"
+ 
+ #: ../panels/printers/authentication-dialog.ui.h:5
+-#: ../panels/sharing/sharing.ui.h:23
++#: ../panels/sharing/sharing.ui.h:21
+ #: ../panels/user-accounts/data/account-dialog.ui.h:6
+ msgid "Password"
+ msgstr "পাছৱাৰ্ড"
+@@ -4490,12 +4420,12 @@ msgid "%s Active Jobs"
+ msgstr "%s সক্ৰিয় কাৰ্য্যসমূহ"
+ 
+ #. Translators: This item is a server which needs authentication to show its printers
+-#: ../panels/printers/pp-new-printer-dialog.c:1667
++#: ../panels/printers/pp-new-printer-dialog.c:1669
+ msgid "Server requires authentication"
+ msgstr "চাৰ্ভাৰৰ প্ৰমাণীকৰণৰ প্ৰয়োজন"
+ 
+ #. Translators: No printers were found
+-#: ../panels/printers/pp-new-printer-dialog.c:1704
++#: ../panels/printers/pp-new-printer-dialog.c:1706
+ msgid "No printers detected."
+ msgstr "কোনো প্ৰিন্টাৰ চিনাক্ত কৰা হোৱা নাই।"
+ 
+@@ -4667,6 +4597,10 @@ msgstr "কাৰ্য্যসমূহ"
+ msgid "Show _Jobs"
+ msgstr "কাৰ্য্যসমূহ দেখুৱাওক (_J)"
+ 
++#: ../panels/printers/printers.ui.h:12
++msgid "Model"
++msgstr "আৰ্হি"
++
+ #: ../panels/printers/printers.ui.h:15
+ msgid "label"
+ msgstr "লেবেল"
+@@ -4703,39 +4637,39 @@ msgstr ""
+ "ক্ষমা কৰিব! চিস্টেম প্ৰিন্টিং সেৱা\n"
+ "উপলব্ধ নাই যেন লাগিছে।"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:245 ../panels/privacy/privacy.ui.h:26
++#: ../panels/privacy/cc-privacy-panel.c:248 ../panels/privacy/privacy.ui.h:26
+ msgid "Screen Lock"
+ msgstr "পৰ্দাৰ লক"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:358 ../panels/privacy/privacy.ui.h:20
++#: ../panels/privacy/cc-privacy-panel.c:361 ../panels/privacy/privacy.ui.h:20
+ msgid "Usage & History"
+ msgstr "ব্যৱহাৰ আৰু ইতিহাস"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:486
++#: ../panels/privacy/cc-privacy-panel.c:489
+ msgid "Empty all items from Trash?"
+ msgstr "আবৰ্জনাৰ পৰা সকলো বস্তু আতৰাব নে?"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:487
++#: ../panels/privacy/cc-privacy-panel.c:490
+ msgid "All items in the Trash will be permanently deleted."
+ msgstr "আবৰ্জনাৰ সকলো বস্তু স্থায়ীভাৱে মচি পেলোৱা হব।"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:488 ../panels/privacy/privacy.ui.h:32
++#: ../panels/privacy/cc-privacy-panel.c:491 ../panels/privacy/privacy.ui.h:32
+ msgid "_Empty Trash"
+ msgstr "আবৰ্জনা খালি কৰক (_E)"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:511
++#: ../panels/privacy/cc-privacy-panel.c:514
+ msgid "Delete all the temporary files?"
+ msgstr "সকলো অস্থায়ী ফাইল মচি পেলাব নে?"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:512
++#: ../panels/privacy/cc-privacy-panel.c:515
+ msgid "All the temporary files will be permanently deleted."
+ msgstr "সকলো অস্থায়ী ফাইল স্থায়ীভাৱে মচি পেলোৱা হব।"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:513 ../panels/privacy/privacy.ui.h:33
++#: ../panels/privacy/cc-privacy-panel.c:516 ../panels/privacy/privacy.ui.h:33
+ msgid "_Purge Temporary Files"
+ msgstr "অস্থায়ী ফাইলসমূহ শোধন কৰক (_P)"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:535 ../panels/privacy/privacy.ui.h:31
++#: ../panels/privacy/cc-privacy-panel.c:538 ../panels/privacy/privacy.ui.h:31
+ msgid "Purge Trash & Temporary Files"
+ msgstr "আবৰ্জনা শোধন আৰু অস্থায়ী ফাইলসমূহ"
+ 
+@@ -5086,21 +5020,21 @@ msgstr "তললে স্থানান্তৰ কৰক"
+ msgid "Preferences"
+ msgstr "পছন্দসমূহ"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:274
++#: ../panels/sharing/cc-sharing-panel.c:285
+ msgctxt "service is enabled"
+ msgid "On"
+ msgstr "অন"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:276
++#: ../panels/sharing/cc-sharing-panel.c:287
+ msgctxt "service is disabled"
+ msgid "Off"
+ msgstr "অফ"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:418
++#: ../panels/sharing/cc-sharing-panel.c:422
+ msgid "Choose a Folder"
+ msgstr "এটা ফোল্ডাৰ বাছক"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:702
++#: ../panels/sharing/cc-sharing-panel.c:736
+ msgid "Copy"
+ msgstr "কপি কৰক"
+ 
+@@ -5143,71 +5077,63 @@ msgstr ""
+ "কৰাৰ অনুমতি দিয়ে"
+ 
+ #: ../panels/sharing/sharing.ui.h:3
+-msgid "Share Public Folder"
+-msgstr "ৰাজহুৱা ফোল্ডাৰ অংশীদাৰী কৰক"
+-
+-#: ../panels/sharing/sharing.ui.h:4
+ msgid "Only Receive From Trusted Devices"
+ msgstr "কেৱল ভৰষাবান ডিভাইচসমূহৰ পৰা গ্ৰহণ কৰক"
+ 
+-#: ../panels/sharing/sharing.ui.h:5
++#: ../panels/sharing/sharing.ui.h:4
+ msgid "Save Received Files to Downloads Folder"
+ msgstr "গ্ৰহণ কৰা ফাইলসমূহ ডাউনল'ডসমূহ ফোল্ডাৰত সংৰক্ষণ কৰক"
+ 
+-#: ../panels/sharing/sharing.ui.h:6
+-msgid "Only share with Trusted Devices"
+-msgstr "কেৱল ভৰষাবান ডিভাইচসমূহৰ সৈতে অংশীদাৰী কৰক"
+-
+-#: ../panels/sharing/sharing.ui.h:7
++#: ../panels/sharing/sharing.ui.h:5
+ msgid "Computer Name"
+ msgstr "কমপিউটাৰৰ নাম"
+ 
+-#: ../panels/sharing/sharing.ui.h:8
++#: ../panels/sharing/sharing.ui.h:6
+ msgid "Personal File Sharing"
+ msgstr "ব্যক্তিগত ফাইল অংশীদাৰী"
+ 
+-#: ../panels/sharing/sharing.ui.h:9
++#: ../panels/sharing/sharing.ui.h:7
+ msgid "Screen Sharing"
+ msgstr "পৰ্দা অংশীদাৰী"
+ 
+-#: ../panels/sharing/sharing.ui.h:10
++#: ../panels/sharing/sharing.ui.h:8
+ msgid "Media Sharing"
+ msgstr "মাধ্যমৰ অংশীদাৰী"
+ 
+-#: ../panels/sharing/sharing.ui.h:11
++#: ../panels/sharing/sharing.ui.h:9
+ msgid "Remote Login"
+ msgstr "দূৰৱৰ্তী লগিন"
+ 
+-#: ../panels/sharing/sharing.ui.h:12
++#: ../panels/sharing/sharing.ui.h:10
+ msgid "Some services are disabled because of no network access."
+ msgstr "কোনো নেটৱাৰ্ক অভিগম নথকা বাবে কিছুমান সেৱা অসামৰ্থবান কৰা আছে।"
+ 
+-#: ../panels/sharing/sharing.ui.h:13
++#: ../panels/sharing/sharing.ui.h:11
+ msgid "Share Music, Photos and Videos with others on the current network."
+ msgstr ""
+ "বৰ্তমান নেটৱাৰ্কত অন্যৰ সৈতে সংগীত, ফ'টোসমূহ আৰু ভিডিঅ'সমূহ অংশীদাৰী কৰক।"
+ 
+-#: ../panels/sharing/sharing.ui.h:14
++#: ../panels/sharing/sharing.ui.h:12
+ msgid "Share Media On This Network"
+ msgstr "এই নেটৱাৰ্কত মাধ্যম অংশীদাৰী কৰক"
+ 
+-#: ../panels/sharing/sharing.ui.h:15
++#: ../panels/sharing/sharing.ui.h:13
+ msgid "Shared Folders"
+ msgstr "অংশীদাৰী কৰা ফোল্ডাৰসমূহ"
+ 
+-#: ../panels/sharing/sharing.ui.h:16
++#: ../panels/sharing/sharing.ui.h:14
+ msgid "column"
+ msgstr "স্তম্ভ"
+ 
+-#: ../panels/sharing/sharing.ui.h:17
++#: ../panels/sharing/sharing.ui.h:15
+ msgid "Add Folder"
+ msgstr "ফোল্ডাৰ যোগ কৰক"
+ 
+-#: ../panels/sharing/sharing.ui.h:18
++#: ../panels/sharing/sharing.ui.h:16
+ msgid "Remove Folder"
+ msgstr "ফোল্ডাৰ আতৰাওক"
+ 
+-#: ../panels/sharing/sharing.ui.h:20
++#: ../panels/sharing/sharing.ui.h:18
+ #, no-c-format
+ msgid ""
+ "Personal File Sharing allows you to share your Public folder with others on "
+@@ -5217,15 +5143,15 @@ msgstr ""
+ "\">dav://%s</a> ব্যৱহাৰ কৰি আপোনাৰ ৰাজহুৱা ফোল্ডাৰক অন্যৰ সৈতে অংশীদাৰী কৰাৰ "
+ "অনুমতি দিয়ে"
+ 
+-#: ../panels/sharing/sharing.ui.h:21
++#: ../panels/sharing/sharing.ui.h:19
+ msgid "Share Public Folder On This Network"
+ msgstr "এই নেটৱাৰ্কত ৰাজহুৱা ফোল্ডাৰ অংশীদাৰী কৰক"
+ 
+-#: ../panels/sharing/sharing.ui.h:22
++#: ../panels/sharing/sharing.ui.h:20
+ msgid "Require Password"
+ msgstr "পাছৱাৰ্ডৰ প্ৰয়োজন"
+ 
+-#: ../panels/sharing/sharing.ui.h:25
++#: ../panels/sharing/sharing.ui.h:23
+ #, no-c-format
+ msgid ""
+ "Allow remote users to connect using the Secure Shell command:\n"
+@@ -5236,7 +5162,7 @@ msgstr ""
+ "দিয়ক:\n"
+ "<a href=\"ssh %s\">ssh %s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:28
++#: ../panels/sharing/sharing.ui.h:26
+ #, no-c-format
+ msgid ""
+ "Allow remote users to view or control your screen by connecting to: <a href="
+@@ -5245,19 +5171,19 @@ msgstr ""
+ "দূৰৱৰ্তী ব্যৱহাৰকাৰীসকলক <a href=\"vnc://%s\">vnc://%s</a> ৰ সৈতে সংযোগ কৰি "
+ "আপোনাৰ পৰ্দা দৰ্শন অথবা নিয়ন্ত্ৰণ কৰাৰ অনুমতি দিয়ক"
+ 
+-#: ../panels/sharing/sharing.ui.h:29
++#: ../panels/sharing/sharing.ui.h:27
+ msgid "Remote View"
+ msgstr "দূৰৱৰ্তী দৰ্শন"
+ 
+-#: ../panels/sharing/sharing.ui.h:30
++#: ../panels/sharing/sharing.ui.h:28
+ msgid "Remote Control"
+ msgstr "দূৰৱৰ্তী নিয়ন্ত্ৰণ"
+ 
+-#: ../panels/sharing/sharing.ui.h:31
++#: ../panels/sharing/sharing.ui.h:29
+ msgid "Approve All Connections"
+ msgstr "সকলো সংযোগৰ অনুমতি দিয়ক"
+ 
+-#: ../panels/sharing/sharing.ui.h:32
++#: ../panels/sharing/sharing.ui.h:30
+ msgid "Show Password"
+ msgstr "পাছৱাৰ্ড দেখুৱাওক"
+ 
+@@ -5952,7 +5878,7 @@ msgid "_Full Name"
+ msgstr "সম্পূৰ্ণ নাম (_F)"
+ 
+ #: ../panels/user-accounts/data/account-dialog.ui.h:5
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+ msgid "Account _Type"
+ msgstr "একাওন্টৰ ধৰণ (_T)"
+ 
+@@ -6109,69 +6035,35 @@ msgstr "বৰ্তমান পাছৱাৰ্ড (_P)"
+ msgid "Ch_ange"
+ msgstr "পৰিবৰ্তন কৰক (_a)"
+ 
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:1
+-msgid "Changing photo for:"
+-msgstr "ছবি পৰিবৰ্তন কৰা হৈ আছে:"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
+-msgid ""
+-"Choose a picture that will be shown at the login screen for this account."
+-msgstr "এই একাওন্টৰ বাবে লগিন পৰ্দাত দেখাব লগিয়া এটা ছবি বাছক।"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
+-msgid "Gallery"
+-msgstr "গেলাৰী"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:4
+-#: ../panels/user-accounts/um-photo-dialog.c:218
+-msgid "Browse for more pictures"
+-msgstr "অধিক ছবিৰ বাবে ব্ৰাউছ কৰক"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:5
+-msgid "Take a photograph"
+-msgstr "এটা ছবি লওক"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:6
+-msgid "Browse"
+-msgstr "ব্ৰাউছাৰ"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:7
+-msgid "Photograph"
+-msgstr "ছবি"
+-
+ #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+-msgid "Account Information"
+-msgstr "একাওন্ট তথ্য"
+-
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Add User Account"
+ msgstr "ব্যৱহাৰকাৰী একাওন্ট যোগ কৰক"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Remove User Account"
+ msgstr "ব্যৱহাৰকাৰী একাওন্ট আতৰাওক"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+ msgid "Login Options"
+ msgstr "লগিন বিকল্পসমূহ"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+ msgid "A_utomatic Login"
+ msgstr "স্বচালিত লগিন (_u)"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+ msgid "_Fingerprint Login"
+ msgstr "আঙ্গুলিৰ ছাপ লগিন (_F)"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+ msgid "User Icon"
+ msgstr "ব্যৱহাৰকাৰী আইকন"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+ msgid "_Language"
+ msgstr "ভাষা (_L)"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+ msgid "Last Login"
+ msgstr "সৰ্বশেষ লগিন"
+ 
+@@ -6594,6 +6486,10 @@ msgstr "পাছৱাৰ্ড সলনি কৰিব পৰা নগল"
+ msgid "The passwords do not match."
+ msgstr "পাছৱাৰ্ডসমূহ মিল নাখায়।"
+ 
++#: ../panels/user-accounts/um-photo-dialog.c:218
++msgid "Browse for more pictures"
++msgstr "অধিক ছবিৰ বাবে ব্ৰাউছ কৰক"
++
+ #: ../panels/user-accounts/um-photo-dialog.c:443
+ msgid "Disable image"
+ msgstr "ছবি অসামৰ্থবান কৰক"
+@@ -6797,7 +6693,7 @@ msgstr ""
+ "বুটাম "
+ "টিপক আৰু নতুন কি'সমূহ টিপি ধৰক অথবা পৰিষ্কাৰ কৰিবলৈ Backspace টিপক।"
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:82
++#: ../panels/wacom/calibrator/calibrator-gui.c:84
+ msgid ""
+ "Please tap the target markers as they appear on screen to calibrate the "
+ "tablet."
+@@ -6805,7 +6701,7 @@ msgstr ""
+ "টেবলেট মানাংকন কৰিবলে লক্ষ্য চিহ্নকসমূহক সিহত পৰ্দাত উপস্থিত হোৱা নিচিনা টেপ "
+ "কৰক।"
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:86
++#: ../panels/wacom/calibrator/calibrator-gui.c:88
+ msgid "Mis-click detected, restarting..."
+ msgstr "ভুল-ক্লিক চিনাক্ত কৰা হৈছে, পুনৰাম্ভ কৰা হৈছে..."
+ 
+@@ -6858,7 +6754,7 @@ msgstr "এটা মনিটৰলে মেপ কৰক"
+ msgid "%d of %d"
+ msgstr "%d ৰ %d"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:522
++#: ../panels/wacom/cc-wacom-page.c:531
+ msgid "Display Mapping"
+ msgstr "প্ৰদৰ্শন মেপিং"
+ 
+@@ -6995,22 +6891,22 @@ msgstr "সোঁ Touchstrip অৱস্থা চুইচ"
+ msgid "Mode Switch #%d"
+ msgstr "অৱস্থা চুইচ #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1336
++#: ../panels/wacom/gsd-wacom-device.c:1335
+ #, c-format
+ msgid "Left Button #%d"
+ msgstr "বাঁও বুটাম #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1339
++#: ../panels/wacom/gsd-wacom-device.c:1338
+ #, c-format
+ msgid "Right Button #%d"
+ msgstr "সোঁ বুটাম #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1342
++#: ../panels/wacom/gsd-wacom-device.c:1341
+ #, c-format
+ msgid "Top Button #%d"
+ msgstr "উপৰ বুটাম #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1345
++#: ../panels/wacom/gsd-wacom-device.c:1344
+ #, c-format
+ msgid "Bottom Button #%d"
+ msgstr "তলৰ বুটাম #%d"
+@@ -7116,11 +7012,11 @@ msgstr "প্ৰদৰ্শন কৰিবলে পেনেল"
+ msgid "[PANEL] [ARGUMENT…]"
+ msgstr "[PANEL] [ARGUMENT…]"
+ 
+-#: ../shell/cc-application.c:142
++#: ../shell/cc-application.c:145
+ msgid "- Settings"
+ msgstr "- সংহতিসমূহ"
+ 
+-#: ../shell/cc-application.c:160
++#: ../shell/cc-application.c:163
+ #, c-format
+ msgid ""
+ "%s\n"
+@@ -7129,39 +7025,39 @@ msgstr ""
+ "%s\n"
+ "উপলব্ধ কমান্ড শাৰী বিকল্পসমূহৰ এটা সম্পূৰ্ণ তালিকা চাবলে '%s --help' চাওক।\n"
+ 
+-#: ../shell/cc-application.c:190
++#: ../shell/cc-application.c:193
+ msgid "Available panels:"
+ msgstr "উপলব্ধ পেনেলসমূহ:"
+ 
+-#: ../shell/cc-application.c:325
++#: ../shell/cc-application.c:328
+ msgid "Help"
+ msgstr "সহায়"
+ 
+-#: ../shell/cc-application.c:326
++#: ../shell/cc-application.c:329
+ msgid "Quit"
+ msgstr "প্ৰস্থান কৰক"
+ 
+-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1479
++#: ../shell/cc-window.c:61 ../shell/cc-window.c:1486
+ msgid "All Settings"
+ msgstr "সকলো সংহতি"
+ 
+ #. Add categories
+-#: ../shell/cc-window.c:866
++#: ../shell/cc-window.c:868
+ msgctxt "category"
+ msgid "Personal"
+ msgstr "ব্যক্তিগত"
+ 
+-#: ../shell/cc-window.c:867
++#: ../shell/cc-window.c:869
+ msgctxt "category"
+ msgid "Hardware"
+ msgstr "হাৰ্ডৱেৰ"
+ 
+-#: ../shell/cc-window.c:868
++#: ../shell/cc-window.c:870
+ msgctxt "category"
+ msgid "System"
+ msgstr "চিস্টেম"
+ 
+-#: ../shell/cc-window.c:1588 ../shell/gnome-control-center.desktop.in.in.h:1
++#: ../shell/cc-window.c:1597 ../shell/gnome-control-center.desktop.in.in.h:1
+ msgid "Settings"
+ msgstr "সংহতিসমূহ"
+ 
+@@ -7169,6 +7065,77 @@ msgstr "সংহতিসমূহ"
+ msgid "Preferences;Settings;"
+ msgstr "পছন্দসমূহ;সংহতিসমূহ;"
+ 
++#~ msgid "Device type:"
++#~ msgstr "ডিভাইচৰ ধৰণ:"
++
++#~ msgid "Manufacturer:"
++#~ msgstr "উৎপাদক:"
++
++#~ msgid "Model:"
++#~ msgstr "আৰ্হি:"
++
++#~ msgid ""
++#~ "Image files can be dragged on this window to auto-complete the above "
++#~ "fields."
++#~ msgstr ""
++#~ "উপৰোক্ত ক্ষেত্ৰসমূহ স্বচালিতভাৱে-সম্পূৰ্ণ কৰিবলে ছবি ফাইলসমূহক এই উইন্ডোত টানি আনিব "
++#~ "পাৰি।"
++
++#~ msgid "Show your primary display on this screen also"
++#~ msgstr "আপোনাৰ প্ৰাথমিক প্ৰদৰ্শনক এই পৰ্দাত দেখুৱাওক"
++
++#~ msgid "Combine"
++#~ msgstr "সংমিশ্ৰণ কৰক"
++
++#~ msgid "Join with the primary display to create an extra space"
++#~ msgstr "এটা অতিৰিক্ত স্থান সৃষ্টি কৰিবলৈ প্ৰাথমিক প্ৰদৰ্শনৰ সৈতে সংযুক্ত কৰক"
++
++#~ msgid "Don't use the display"
++#~ msgstr "প্ৰদৰ্শন ব্যৱহাৰ নকৰিব"
++
++#~ msgid "Refresh Rate"
++#~ msgstr "সতেজ কৰাৰ হাৰ"
++
++#~ msgid "Mouse Preferences"
++#~ msgstr "মাউছ সম্পৰ্কিত পছন্দ"
++
++#~ msgid "Select the interface to use for the new service"
++#~ msgstr "নতুন সেৱাৰ বাবে ব্যৱহাৰ কৰিবলে আন্তঃপৃষ্ঠ বাছক"
++
++#~ msgid "C_reate…"
++#~ msgstr "সৃষ্টি কৰক (_r)…"
++
++#~ msgid "_Interface"
++#~ msgstr "আন্তঃপৃষ্ঠ (_I)"
++
++#~ msgid "Share Public Folder"
++#~ msgstr "ৰাজহুৱা ফোল্ডাৰ অংশীদাৰী কৰক"
++
++#~ msgid "Only share with Trusted Devices"
++#~ msgstr "কেৱল ভৰষাবান ডিভাইচসমূহৰ সৈতে অংশীদাৰী কৰক"
++
++#~ msgid "Changing photo for:"
++#~ msgstr "ছবি পৰিবৰ্তন কৰা হৈ আছে:"
++
++#~ msgid ""
++#~ "Choose a picture that will be shown at the login screen for this account."
++#~ msgstr "এই একাওন্টৰ বাবে লগিন পৰ্দাত দেখাব লগিয়া এটা ছবি বাছক।"
++
++#~ msgid "Gallery"
++#~ msgstr "গেলাৰী"
++
++#~ msgid "Take a photograph"
++#~ msgstr "এটা ছবি লওক"
++
++#~ msgid "Browse"
++#~ msgstr "ব্ৰাউছাৰ"
++
++#~ msgid "Photograph"
++#~ msgstr "ছবি"
++
++#~ msgid "Account Information"
++#~ msgstr "একাওন্ট তথ্য"
++
+ #~ msgid "Left Shift"
+ #~ msgstr "Left Shift"
+ 
+diff --git a/po/cs.po b/po/cs.po
+index 1809b83..202f711 100644
+--- a/po/cs.po
++++ b/po/cs.po
+@@ -16,15 +16,15 @@
+ # Ondřej Kopka <ondrej.kopka@gmail.com>, 2011.
+ # Adam Matoušek <adamatousek@gmail.com>, 2012.
+ # Jiri Eischmann <jiri@eischmann.cz>, 2013.
+-# Marek Černocký <marek@manet.cz>, 2011, 2012, 2013.
++# Marek Černocký <marek@manet.cz>, 2011, 2012, 2013, 2014.
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: gnome-control-center\n"
++"Project-Id-Version: gnome-control-center gnome-3.10\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "control-center&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-09-20 21:45+0000\n"
+-"PO-Revision-Date: 2013-09-22 09:18+0200\n"
++"POT-Creation-Date: 2014-01-10 18:08+0000\n"
++"PO-Revision-Date: 2014-01-11 23:27+0100\n"
+ "Last-Translator: Marek Černocký <marek@manet.cz>\n"
+ "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
+ "Language: cs\n"
+@@ -80,7 +80,7 @@ msgid "Span"
+ msgstr "Rozšířit"
+ 
+ #. translators: This is the title of the wallpaper chooser dialog.
+-#: ../panels/background/cc-background-chooser-dialog.c:293
++#: ../panels/background/cc-background-chooser-dialog.c:292
+ msgid "Select Background"
+ msgstr "Zvolit pozadí"
+ 
+@@ -101,32 +101,32 @@ msgid "Flickr"
+ msgstr "Flickr"
+ 
+ #. translators: No pictures were found
+-#: ../panels/background/cc-background-chooser-dialog.c:393
++#: ../panels/background/cc-background-chooser-dialog.c:385
+ msgid "No Pictures Found"
+ msgstr "Nenalezen žádný obrázek"
+ 
+ #. translators: %s here is the name of the Pictures directory, the string should be translated in
+ #. * the context "You can add images to your Pictures folder and they will show up here"
+-#: ../panels/background/cc-background-chooser-dialog.c:408
++#: ../panels/background/cc-background-chooser-dialog.c:400
+ #, c-format
+ msgid "You can add images to your %s folder and they will show up here"
+ msgstr "Můžete obrázky přidat do své složky %s a potom se zde objeví"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:436
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:631
+-#: ../panels/color/cc-color-panel.c:220 ../panels/color/cc-color-panel.c:967
+-#: ../panels/display/cc-display-panel.c:1495
+-#: ../panels/display/cc-display-panel.c:1910
++#: ../panels/background/cc-background-chooser-dialog.c:429
++#: ../panels/bluetooth/cc-bluetooth-panel.c:640
++#: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
++#: ../panels/display/cc-display-panel.c:1510
++#: ../panels/display/cc-display-panel.c:1952
+ #: ../panels/network/connection-editor/vpn-helpers.c:245
+ #: ../panels/network/connection-editor/vpn-helpers.c:374
+-#: ../panels/network/net-device-wifi.c:1201
+-#: ../panels/network/net-device-wifi.c:1407
++#: ../panels/network/net-device-wifi.c:1194
++#: ../panels/network/net-device-wifi.c:1402
+ #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
+ #: ../panels/printers/cc-printers-panel.c:1946
+ #: ../panels/printers/new-printer-dialog.ui.h:2
+-#: ../panels/privacy/cc-privacy-panel.c:467
++#: ../panels/privacy/cc-privacy-panel.c:470
+ #: ../panels/search/cc-search-locations-dialog.c:682
+-#: ../panels/sharing/cc-sharing-panel.c:421
++#: ../panels/sharing/cc-sharing-panel.c:425
+ #: ../panels/user-accounts/um-fingerprint-dialog.c:269
+ #: ../panels/user-accounts/um-photo-dialog.c:96
+ #: ../panels/user-accounts/um-photo-dialog.c:221
+@@ -134,9 +134,8 @@ msgstr "Můžete obrázky přidat do své složky %s a potom se zde objeví"
+ msgid "_Cancel"
+ msgstr "_Zrušit"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:437
++#: ../panels/background/cc-background-chooser-dialog.c:430
+ #: ../panels/printers/ppd-selection-dialog.ui.h:3
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:9
+ #: ../panels/user-accounts/um-photo-dialog.c:98
+ msgid "Select"
+ msgstr "Vybrat"
+@@ -156,7 +155,7 @@ msgstr "%d × %d"
+ msgid "No Desktop Background"
+ msgstr "Bez pozadí pracovní plochy"
+ 
+-#: ../panels/background/cc-background-panel.c:492
++#: ../panels/background/cc-background-panel.c:493
+ msgid "Current background"
+ msgstr "Aktuální pozadí"
+ 
+@@ -173,7 +172,7 @@ msgstr "tapeta;obrazovka;plocha;"
+ msgid "Set Up New Device"
+ msgstr "Nastavit nové zařízení"
+ 
+-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
++#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
+ msgid "Remove Device"
+ msgstr "Odebrat zařízení"
+ 
+@@ -227,50 +226,50 @@ msgstr "Nastavení klávesnice"
+ msgid "Send Files…"
+ msgstr "Poslat soubory…"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
+ msgid "Yes"
+ msgstr "Ano"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
+ msgid "No"
+ msgstr "Ne"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:470
++#: ../panels/bluetooth/cc-bluetooth-panel.c:479
+ msgid "Bluetooth is disabled"
+ msgstr "Bluetooth je vypnuto"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:475
++#: ../panels/bluetooth/cc-bluetooth-panel.c:484
+ msgid "Bluetooth is disabled by hardware switch"
+ msgstr "Bluetooth je vypnuto hardwarovým vypínačem"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:479
++#: ../panels/bluetooth/cc-bluetooth-panel.c:488
+ msgid "No Bluetooth adapters found"
+ msgstr "Nebyl nalezen žádný adaptér Bluetooth"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:578
++#: ../panels/bluetooth/cc-bluetooth-panel.c:587
+ msgid "Visibility"
+ msgstr "Viditelnost"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:582
++#: ../panels/bluetooth/cc-bluetooth-panel.c:591
+ #, c-format
+ msgid "Visibility of “%s”"
+ msgstr "Viditelnost zařízení „%s“"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:626
++#: ../panels/bluetooth/cc-bluetooth-panel.c:635
+ #, c-format
+ msgid "Remove '%s' from the list of devices?"
+ msgstr "Odebrat „%s“ ze seznamu zařízení?"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:628
++#: ../panels/bluetooth/cc-bluetooth-panel.c:637
+ msgid ""
+ "If you remove the device, you will have to set it up again before next use."
+ msgstr ""
+ "Pokud zařízení odeberete, budete jej muset před dalším použitím znovu "
+ "nastavit."
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:632
++#: ../panels/bluetooth/cc-bluetooth-panel.c:641
+ #: ../panels/online-accounts/cc-online-accounts-panel.c:844
+ msgid "_Remove"
+ msgstr "Odeb_rat"
+@@ -284,14 +283,14 @@ msgid "Turn Bluetooth on and off and connect your devices"
+ msgstr "Zapnout a vypnout bluetooth a připojit se k zařízením"
+ 
+ #. TRANSLATORS: The user has to attach the sensor to the screen
+-#: ../panels/color/cc-color-calibrate.c:360
++#: ../panels/color/cc-color-calibrate.c:361
+ msgid "Place your calibration device over the square and press 'Start'"
+ msgstr "Umístěte kalibrační zařízení na čtverec a stiskněte „Začít“"
+ 
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:366
++#: ../panels/color/cc-color-calibrate.c:367
+ msgid ""
+ "Move your calibration device to the calibrate position and press 'Continue'"
+ msgstr ""
+@@ -300,7 +299,7 @@ msgstr ""
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:372
++#: ../panels/color/cc-color-calibrate.c:373
+ msgid ""
+ "Move your calibration device to the surface position and press 'Continue'"
+ msgstr ""
+@@ -309,54 +308,54 @@ msgstr ""
+ #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
+ #. * is built into the palmrest and we need to fullscreen the
+ #. * sample widget and shut the lid.
+-#: ../panels/color/cc-color-calibrate.c:378
++#: ../panels/color/cc-color-calibrate.c:379
+ msgid "Shut the laptop lid"
+ msgstr "Zavřete víko notebooku"
+ 
+ #. TRANSLATORS: We suck, the calibation failed and we have no
+ #. * good idea why or any suggestions
+-#: ../panels/color/cc-color-calibrate.c:409
++#: ../panels/color/cc-color-calibrate.c:410
+ msgid "An internal error occurred that could not be recovered."
+ msgstr "Došlo k vnitřní chybě, z které už se nelze obnovit."
+ 
+ #. TRANSLATORS: Some required-at-runtime tools were not
+ #. * installed, which should only affect insane distros
+-#: ../panels/color/cc-color-calibrate.c:414
++#: ../panels/color/cc-color-calibrate.c:415
+ msgid "Tools required for calibration are not installed."
+ msgstr "Nástroje vyžadované pro kalibraci nejsou nainstalované."
+ 
+ #. TRANSLATORS: The profile failed for some reason
+-#: ../panels/color/cc-color-calibrate.c:420
++#: ../panels/color/cc-color-calibrate.c:421
+ msgid "The profile could not be generated."
+ msgstr "Profil nemohl být vygenerován."
+ 
+ #. TRANSLATORS: The user specified a whitepoint that was
+ #. * unobtainable with the hardware they've got -- see
+ #. * https://en.wikipedia.org/wiki/White_point for details
+-#: ../panels/color/cc-color-calibrate.c:426
++#: ../panels/color/cc-color-calibrate.c:427
+ msgid "The target whitepoint was not obtainable."
+ msgstr "Cílový bílý bod nebyl dosažitelný."
+ 
+ #. TRANSLATORS: the display calibration process is finished
+-#: ../panels/color/cc-color-calibrate.c:466
++#: ../panels/color/cc-color-calibrate.c:467
+ msgid "Complete!"
+ msgstr "Dokončeno!"
+ 
+ #. TRANSLATORS: the display calibration failed, and we also show
+ #. * the translated (or untranslated) error string after this
+-#: ../panels/color/cc-color-calibrate.c:474
++#: ../panels/color/cc-color-calibrate.c:475
+ msgid "Calibration failed!"
+ msgstr "Kalibrace selhala!"
+ 
+ #. TRANSLATORS: The user can now remove the sensor from the screen
+-#: ../panels/color/cc-color-calibrate.c:481
++#: ../panels/color/cc-color-calibrate.c:482
+ msgid "You can remove the calibration device."
+ msgstr "Můžete oddělat kalibrační zařízení."
+ 
+ #. TRANSLATORS: The user has to be careful not to knock the
+ #. * display off the screen (although we do cope if this is
+ #. * detected early enough)
+-#: ../panels/color/cc-color-calibrate.c:552
++#: ../panels/color/cc-color-calibrate.c:553
+ msgid "Do not disturb the calibration device while in progress"
+ msgstr "Nestrkejte do kalibračního zařízení během procesu kalibrace"
+ 
+@@ -418,48 +417,48 @@ msgstr "Nezkalibrováno"
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile has been auto-generated for this hardware
+-#: ../panels/color/cc-color-panel.c:135
++#: ../panels/color/cc-color-panel.c:137
+ msgid "Default: "
+ msgstr "Výchozí:"
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile his a standard space like AdobeRGB
+-#: ../panels/color/cc-color-panel.c:143
++#: ../panels/color/cc-color-panel.c:145
+ msgid "Colorspace: "
+ msgstr "Prostor barev:"
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile is a test profile
+-#: ../panels/color/cc-color-panel.c:150
++#: ../panels/color/cc-color-panel.c:152
+ msgid "Test profile: "
+ msgstr "Testovací profil: "
+ 
+ #. TRANSLATORS: an ICC profile is a file containing colorspace data
+-#: ../panels/color/cc-color-panel.c:218
++#: ../panels/color/cc-color-panel.c:219
+ msgid "Select ICC Profile File"
+ msgstr "Výběr souboru s profilem ICC"
+ 
+-#: ../panels/color/cc-color-panel.c:221
++#: ../panels/color/cc-color-panel.c:222
+ msgid "_Import"
+ msgstr "_Importovat"
+ 
+ #. TRANSLATORS: filter name on the file->open dialog
+-#: ../panels/color/cc-color-panel.c:232
++#: ../panels/color/cc-color-panel.c:233
+ msgid "Supported ICC profiles"
+ msgstr "Podporované profily ICC"
+ 
+ #. TRANSLATORS: filter name on the file->open dialog
+-#: ../panels/color/cc-color-panel.c:239
++#: ../panels/color/cc-color-panel.c:240
+ #: ../panels/network/wireless-security/eap-method-fast.c:410
+ msgid "All files"
+ msgstr "Všechny soubory"
+ 
+-#: ../panels/color/cc-color-panel.c:586
++#: ../panels/color/cc-color-panel.c:579
+ msgid "Screen"
+ msgstr "Obrazovka"
+ 
+ #. TRANSLATORS: this is when the upload of the profile failed
+-#: ../panels/color/cc-color-panel.c:912
++#: ../panels/color/cc-color-panel.c:903
+ #, c-format
+ msgid "Failed to upload file: %s"
+ msgstr "Selhalo odeslání souboru: %s"
+@@ -467,40 +466,40 @@ msgstr "Selhalo odeslání souboru: %s"
+ #. TRANSLATORS: these are instructions on how to recover
+ #. * the ICC profile on the native operating system and are
+ #. * only shown when the user uses a LiveCD to calibrate
+-#: ../panels/color/cc-color-panel.c:926
++#: ../panels/color/cc-color-panel.c:917
+ msgid "The profile has been uploaded to:"
+ msgstr "Profil byl odeslán na:"
+ 
+-#: ../panels/color/cc-color-panel.c:928
++#: ../panels/color/cc-color-panel.c:919
+ msgid "Write down this URL."
+ msgstr "Zapište si tuto adresu URL."
+ 
+-#: ../panels/color/cc-color-panel.c:929
++#: ../panels/color/cc-color-panel.c:920
+ msgid "Restart this computer and boot your normal operating system."
+ msgstr "Restartujte tento počítač a zaveďte svůj normální operační systém."
+ 
+-#: ../panels/color/cc-color-panel.c:930
++#: ../panels/color/cc-color-panel.c:921
+ msgid "Type the URL into your browser to download and install the profile."
+ msgstr ""
+ "Zadejte adresu URL do svého prohlížeče, aby se stáhl a nainstaloval profil."
+ 
+ #. TRANSLATORS: this is the dialog to save the ICC profile
+-#: ../panels/color/cc-color-panel.c:964
++#: ../panels/color/cc-color-panel.c:955
+ msgid "Save Profile"
+ msgstr "Uložit profil"
+ 
+-#: ../panels/color/cc-color-panel.c:968
++#: ../panels/color/cc-color-panel.c:959
+ #: ../panels/network/connection-editor/vpn-helpers.c:375
+ msgid "_Save"
+ msgstr "_Uložit"
+ 
+ #. TRANSLATORS: this is when the button is sensitive
+-#: ../panels/color/cc-color-panel.c:1328
++#: ../panels/color/cc-color-panel.c:1315
+ msgid "Create a color profile for the selected device"
+ msgstr "Vytvořit barevný profil pro vybrané zařízení"
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1343 ../panels/color/cc-color-panel.c:1367
++#: ../panels/color/cc-color-panel.c:1330 ../panels/color/cc-color-panel.c:1354
+ msgid ""
+ "The measuring instrument is not detected. Please check it is turned on and "
+ "correctly connected."
+@@ -509,12 +508,12 @@ msgstr ""
+ "a zapnutá."
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1377
++#: ../panels/color/cc-color-panel.c:1364
+ msgid "The measuring instrument does not support printer profiling."
+ msgstr "Měřící sonda nepodporuje profilování tiskáren."
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1388
++#: ../panels/color/cc-color-panel.c:1375
+ msgid "The device type is not currently supported."
+ msgstr "Typ zařízení není v současnosti podporován."
+ 
+@@ -601,7 +600,6 @@ msgstr "Kalibrace displeje"
+ #: ../panels/color/color-calibrate.ui.h:2
+ #: ../panels/printers/authentication-dialog.ui.h:2
+ #: ../panels/printers/ppd-selection-dialog.ui.h:2
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:8
+ #: ../panels/user-accounts/um-account-dialog.c:1470
+ msgid "Cancel"
+ msgstr "Zrušit"
+@@ -622,10 +620,10 @@ msgid "Done"
+ msgstr "Hotovo"
+ 
+ #. Timeout parameters
+-#. 5000 = 5 sec
++#. 15000 = 15 sec
+ #. 750 = 0.75 sec
+ #. Text printed on screen
+-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
++#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:83
+ msgid "Screen Calibration"
+ msgstr "Kalibrace obrazovky"
+ 
+@@ -770,168 +768,148 @@ msgstr ""
+ "podrobnosti.</a>"
+ 
+ #: ../panels/color/color.ui.h:30
+-msgid "Device type:"
+-msgstr "Typ zařízení:"
+-
+-#: ../panels/color/color.ui.h:31
+-msgid "Manufacturer:"
+-msgstr "Výrobce:"
+-
+-#: ../panels/color/color.ui.h:32
+-msgid "Model:"
+-msgstr "Model:"
+-
+-#: ../panels/color/color.ui.h:33
+-msgid ""
+-"Image files can be dragged on this window to auto-complete the above fields."
+-msgstr ""
+-"Soubory s obrázky můžete do tohoto okna přetáhnout a tím předchozí pole "
+-"automaticky dokončit."
+-
+-#: ../panels/color/color.ui.h:34
+-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+-msgid "Color"
+-msgstr "Barvy"
+-
+-#: ../panels/color/color.ui.h:35
+ msgid "Each device needs an up to date color profile to be color managed."
+ msgstr ""
+ "Aby u jednotlivých zařízení byla uplatněna správa barev, potřebují aktuální "
+ "barevné profily."
+ 
+-#: ../panels/color/color.ui.h:36
++#: ../panels/color/color.ui.h:31
+ msgid "Learn more"
+ msgstr "Dozvědět se více"
+ 
+-#: ../panels/color/color.ui.h:37
++#: ../panels/color/color.ui.h:32
+ msgid "Learn more about color management"
+ msgstr "Dozvědět se více o správě barev"
+ 
+-#: ../panels/color/color.ui.h:38
++#: ../panels/color/color.ui.h:33
+ msgid "Set for all users"
+ msgstr "Pro všechny uživatele"
+ 
+-#: ../panels/color/color.ui.h:39
++#: ../panels/color/color.ui.h:34
+ msgid "Set this profile for all users on this computer"
+ msgstr "Nastavit tento profil pro všechny uživatele tohoto počítače"
+ 
+-#: ../panels/color/color.ui.h:40
++#: ../panels/color/color.ui.h:35
+ msgid "Enable"
+ msgstr "Povolit"
+ 
+-#: ../panels/color/color.ui.h:41
++#: ../panels/color/color.ui.h:36
+ msgid "Add profile"
+ msgstr "Přidat profil"
+ 
+-#: ../panels/color/color.ui.h:42
++#: ../panels/color/color.ui.h:37
+ #: ../panels/wacom/gnome-wacom-properties.ui.h:10
+ msgid "Calibrate…"
+ msgstr "Kalibrovat…"
+ 
+-#: ../panels/color/color.ui.h:43
++#: ../panels/color/color.ui.h:38
+ msgid "Calibrate the device"
+ msgstr "Kalibrovat zařízení"
+ 
+-#: ../panels/color/color.ui.h:44
++#: ../panels/color/color.ui.h:39
+ msgid "Remove profile"
+ msgstr "Odebrat profil"
+ 
+-#: ../panels/color/color.ui.h:45
++#: ../panels/color/color.ui.h:40
+ msgid "View details"
+ msgstr "Zobrazit detaily"
+ 
+-#: ../panels/color/color.ui.h:46
++#: ../panels/color/color.ui.h:41
+ msgid "Unable to detect any devices that can be color managed"
+ msgstr "Nelze najít žádná zařízení, u kterých lze provádět správu barev"
+ 
+-#: ../panels/color/color.ui.h:47
++#: ../panels/color/color.ui.h:42
+ msgid "LCD"
+ msgstr "LCD"
+ 
+-#: ../panels/color/color.ui.h:48
++#: ../panels/color/color.ui.h:43
+ msgid "LED"
+ msgstr "LED"
+ 
+-#: ../panels/color/color.ui.h:49
++#: ../panels/color/color.ui.h:44
+ msgid "CRT"
+ msgstr "CRT"
+ 
+-#: ../panels/color/color.ui.h:50
++#: ../panels/color/color.ui.h:45
+ msgid "Projector"
+ msgstr "Projektor"
+ 
+-#: ../panels/color/color.ui.h:51
++#: ../panels/color/color.ui.h:46
+ msgid "Plasma"
+ msgstr "Plasma"
+ 
+-#: ../panels/color/color.ui.h:52
++#: ../panels/color/color.ui.h:47
+ msgid "LCD (CCFL backlight)"
+ msgstr "LCD (podsvětlení výbojkami CCFL)"
+ 
+-#: ../panels/color/color.ui.h:53
++#: ../panels/color/color.ui.h:48
+ msgid "LCD (RGB LED backlight)"
+ msgstr "LCD (podsvětlení RGB LED)"
+ 
+-#: ../panels/color/color.ui.h:54
++#: ../panels/color/color.ui.h:49
+ msgid "LCD (white LED backlight)"
+ msgstr "LCD (podsvětlení bílými LED)"
+ 
+-#: ../panels/color/color.ui.h:55
++#: ../panels/color/color.ui.h:50
+ msgid "Wide gamut LCD (CCFL backlight)"
+ msgstr "Široký gamut LCD (podsvětlení výbojkami CCFL)"
+ 
+-#: ../panels/color/color.ui.h:56
++#: ../panels/color/color.ui.h:51
+ msgid "Wide gamut LCD (RGB LED backlight)"
+ msgstr "Široký gamut LCD (podsvětlení RGB LED)"
+ 
+-#: ../panels/color/color.ui.h:57
++#: ../panels/color/color.ui.h:52
+ msgctxt "Calibration quality"
+ msgid "High"
+ msgstr "Vysoká"
+ 
+-#: ../panels/color/color.ui.h:58
++#: ../panels/color/color.ui.h:53
+ msgid "40 minutes"
+ msgstr "40 minut"
+ 
+-#: ../panels/color/color.ui.h:59
++#: ../panels/color/color.ui.h:54
+ msgctxt "Calibration quality"
+ msgid "Medium"
+ msgstr "Střední"
+ 
+-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:4
++#: ../panels/color/color.ui.h:55 ../panels/power/power.ui.h:4
+ #: ../panels/privacy/privacy.ui.h:7
+ msgid "30 minutes"
+ msgstr "30 minut"
+ 
+-#: ../panels/color/color.ui.h:61
++#: ../panels/color/color.ui.h:56
+ msgctxt "Calibration quality"
+ msgid "Low"
+ msgstr "Nízká"
+ 
+-#: ../panels/color/color.ui.h:62 ../panels/power/power.ui.h:3
++#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:3
+ msgid "15 minutes"
+ msgstr "15 minut"
+ 
+-#: ../panels/color/color.ui.h:63
++#: ../panels/color/color.ui.h:58
+ msgid "Native to display"
+ msgstr "Nativní pro zobrazení"
+ 
+-#: ../panels/color/color.ui.h:64
++#: ../panels/color/color.ui.h:59
+ msgid "D50 (Printing and publishing)"
+ msgstr "D50 (tisk a publikování)"
+ 
+-#: ../panels/color/color.ui.h:65
++#: ../panels/color/color.ui.h:60
+ msgid "D55"
+ msgstr "D55"
+ 
+-#: ../panels/color/color.ui.h:66
++#: ../panels/color/color.ui.h:61
+ msgid "D65 (Photography and graphics)"
+ msgstr "D65 (fotografie a grafika)"
+ 
+-#: ../panels/color/color.ui.h:67
++#: ../panels/color/color.ui.h:62
+ msgid "D75"
+ msgstr "D75"
+ 
++#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
++msgid "Color"
++msgstr "Barvy"
++
+ #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+ msgid ""
+ "Calibrate the color of your devices, such as displays, cameras or printers"
+@@ -982,33 +960,33 @@ msgid "Language"
+ msgstr "Jazyk"
+ 
+ #: ../panels/common/language-chooser.ui.h:2
+-#: ../panels/mouse/cc-mouse-panel.c:120 ../panels/region/format-chooser.ui.h:2
++#: ../panels/mouse/cc-mouse-panel.c:111 ../panels/region/format-chooser.ui.h:2
+ msgid "_Done"
+ msgstr "_Hotovo"
+ 
+ #. Translators: This is the full date and time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:352
++#: ../panels/datetime/cc-datetime-panel.c:363
+ msgid "%e %B %Y, %l:%M %p"
+ msgstr "%e. %B %Y, %l:%M %p"
+ 
+ #. Translators: This is the full date and time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:357
++#: ../panels/datetime/cc-datetime-panel.c:368
+ msgid "%e %B %Y, %R"
+ msgstr "%e. %B %Y, %k:%M"
+ 
+ #. Translators: UTC here means the Coordinated Universal Time.
+ #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
+-#: ../panels/datetime/cc-datetime-panel.c:573
++#: ../panels/datetime/cc-datetime-panel.c:584
+ msgid "UTC%:::z"
+ msgstr "UTC%:::z"
+ 
+ #. Translators: This is the time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:578
++#: ../panels/datetime/cc-datetime-panel.c:589
+ msgid "%l:%M %p"
+ msgstr "%l:%M %p"
+ 
+ #. Translators: This is the time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:583
++#: ../panels/datetime/cc-datetime-panel.c:594
+ msgid "%R"
+ msgstr "%k:%M"
+ 
+@@ -1147,143 +1125,109 @@ msgstr "Změnit nastavení systémového času a data"
+ msgid "To change time or date settings, you need to authenticate."
+ msgstr "Abyste mohli měnit nastavení času a data, musíte se autentizovat."
+ 
+-#: ../panels/display/cc-display-panel.c:473
++#: ../panels/display/cc-display-panel.c:486
+ msgid "Lid Closed"
+ msgstr "Víko zavřeno"
+ 
+ #. translators: "Mirrored" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:476
++#: ../panels/display/cc-display-panel.c:489
+ msgid "Mirrored"
+ msgstr "Zrcadlený"
+ 
+-#: ../panels/display/cc-display-panel.c:478
+-#: ../panels/display/cc-display-panel.c:2043
+-#: ../panels/display/display-capplet.ui.h:1
++#: ../panels/display/cc-display-panel.c:491
++#: ../panels/display/cc-display-panel.c:2101
+ msgid "Primary"
+ msgstr "Hlavní"
+ 
+-#: ../panels/display/cc-display-panel.c:480
++#: ../panels/display/cc-display-panel.c:493
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1727 ../panels/power/cc-power-panel.c:1738
+-#: ../panels/privacy/cc-privacy-panel.c:77
+-#: ../panels/privacy/cc-privacy-panel.c:117
+-#: ../panels/universal-access/cc-ua-panel.c:253
+-#: ../panels/universal-access/cc-ua-panel.c:610
+-#: ../panels/universal-access/cc-ua-panel.c:736
++#: ../panels/power/cc-power-panel.c:1738 ../panels/power/cc-power-panel.c:1749
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ #: ../panels/universal-access/uap.ui.h:6
+ msgid "Off"
+ msgstr "Vypnuto"
+ 
+-#: ../panels/display/cc-display-panel.c:483
++#: ../panels/display/cc-display-panel.c:496
+ msgid "Secondary"
+ msgstr "Vedlejší"
+ 
+-#: ../panels/display/cc-display-panel.c:1491
++#: ../panels/display/cc-display-panel.c:1506
+ msgid "Arrange Combined Displays"
+ msgstr "Uspořádání sloučených displejů"
+ 
+-#: ../panels/display/cc-display-panel.c:1497
+-#: ../panels/display/cc-display-panel.c:1913
++#: ../panels/display/cc-display-panel.c:1512
++#: ../panels/display/cc-display-panel.c:1955
+ #: ../panels/network/connection-editor/connection-editor.ui.h:1
+ msgid "_Apply"
+ msgstr "_Použít"
+ 
+-#: ../panels/display/cc-display-panel.c:1518
++#: ../panels/display/cc-display-panel.c:1533
+ msgid "Drag displays to rearrange them"
+ msgstr "Pořadí displejů změňte přetažením"
+ 
+-#. size
+-#: ../panels/display/cc-display-panel.c:1977
++#: ../panels/display/cc-display-panel.c:2037
+ msgid "Size"
+ msgstr "Velikost"
+ 
+ #. aspect ratio
+-#: ../panels/display/cc-display-panel.c:1992
+-#: ../panels/display/display-capplet.ui.h:12
++#: ../panels/display/cc-display-panel.c:2050
+ msgid "Aspect Ratio"
+ msgstr "Poměr stran"
+ 
+-#: ../panels/display/cc-display-panel.c:2013
+-#: ../panels/display/display-capplet.ui.h:13
++#: ../panels/display/cc-display-panel.c:2071
+ #: ../panels/printers/pp-options-dialog.c:86
+ msgid "Resolution"
+ msgstr "Rozlišení"
+ 
+-#: ../panels/display/cc-display-panel.c:2044
+-#: ../panels/display/display-capplet.ui.h:2
++#: ../panels/display/cc-display-panel.c:2102
+ msgid "Show the top bar and Activities Overview on this display"
+ msgstr "Na tomto displeji zobrazovat horní lištu a přehled činností"
+ 
+-#: ../panels/display/cc-display-panel.c:2050
++#: ../panels/display/cc-display-panel.c:2108
+ msgid "Secondary Display"
+ msgstr "Vedlejší displej"
+ 
+-#: ../panels/display/cc-display-panel.c:2051
++#: ../panels/display/cc-display-panel.c:2109
+ msgid "Join this display with another to create an extra workspace"
+ msgstr "Spojit tento displej s jiným pro vytvoření dodatečné pracovní plochy"
+ 
+-#: ../panels/display/cc-display-panel.c:2058
+-#: ../panels/display/display-capplet.ui.h:3
++#: ../panels/display/cc-display-panel.c:2116
+ msgid "Presentation"
+ msgstr "Prezentace"
+ 
+-#: ../panels/display/cc-display-panel.c:2059
+-#: ../panels/display/display-capplet.ui.h:4
++#: ../panels/display/cc-display-panel.c:2117
+ msgid "Show slideshows and media only"
+ msgstr "Zobrazovat jen promítání a multimédia"
+ 
+ #. translators: "Mirror" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:2064
+-#: ../panels/display/display-capplet.ui.h:5
++#: ../panels/display/cc-display-panel.c:2122
+ msgid "Mirror"
+ msgstr "Zrcadlit"
+ 
+-#: ../panels/display/cc-display-panel.c:2065
++#: ../panels/display/cc-display-panel.c:2123
+ msgid "Show your existing view on both displays"
+ msgstr "Zobrazit stávající zobrazení na obou displejích"
+ 
+-#: ../panels/display/cc-display-panel.c:2071
+-#: ../panels/display/display-capplet.ui.h:9
++#: ../panels/display/cc-display-panel.c:2129
+ msgid "Turn Off"
+ msgstr "Vypnout"
+ 
+-#: ../panels/display/cc-display-panel.c:2072
++#: ../panels/display/cc-display-panel.c:2130
+ msgid "Don't use this display"
+ msgstr "Tento displej nepoužívat"
+ 
+-#: ../panels/display/cc-display-panel.c:2289
++#: ../panels/display/cc-display-panel.c:2345
+ msgid "Could not get screen information"
+ msgstr "Nelze získat informace o obrazovce"
+ 
+-#: ../panels/display/cc-display-panel.c:2320
++#: ../panels/display/cc-display-panel.c:2376
+ msgid "_Arrange Combined Displays"
+ msgstr "Uspořádat sloučené displeje"
+ 
+-#: ../panels/display/display-capplet.ui.h:6
+-msgid "Show your primary display on this screen also"
+-msgstr "Zobrazit váš hlavní displej i na této obrazovce"
+-
+-#: ../panels/display/display-capplet.ui.h:7
+-msgid "Combine"
+-msgstr "Sloučit"
+-
+-#: ../panels/display/display-capplet.ui.h:8
+-msgid "Join with the primary display to create an extra space"
+-msgstr "Spojit s hlavním displejem pro vytvoření dodatečné plochy"
+-
+-#: ../panels/display/display-capplet.ui.h:10
+-msgid "Don't use the display"
+-msgstr "Displej nepoužívat"
+-
+-#: ../panels/display/display-capplet.ui.h:11
+-#: ../panels/printers/printers.ui.h:12
+-msgid "Model"
+-msgstr "Model"
+-
+-#: ../panels/display/display-capplet.ui.h:14
+-msgid "Refresh Rate"
+-msgstr "Obnovovací frekvence"
+-
+ #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
+ msgid "Displays"
+ msgstr "Displeje"
+@@ -1298,54 +1242,54 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
+ msgstr "panel;projektor;xrandr;obrazovka;rozlišení;občerstvit;"
+ 
+ #. TRANSLATORS: AP type
+-#: ../panels/info/cc-info-panel.c:450 ../panels/network/panel-common.c:127
++#: ../panels/info/cc-info-panel.c:452 ../panels/network/panel-common.c:127
+ msgid "Unknown"
+ msgstr "Není známo"
+ 
+-#: ../panels/info/cc-info-panel.c:532
++#: ../panels/info/cc-info-panel.c:539
+ #, c-format
+ msgid "%s %d-bit"
+ msgstr "%s %dbitová"
+ 
+-#: ../panels/info/cc-info-panel.c:534
++#: ../panels/info/cc-info-panel.c:541
+ #, c-format
+ msgid "%d-bit"
+ msgstr "%dbitová"
+ 
+-#: ../panels/info/cc-info-panel.c:1214
++#: ../panels/info/cc-info-panel.c:1221
+ msgid "Ask what to do"
+ msgstr "Zeptat se na další postup"
+ 
+-#: ../panels/info/cc-info-panel.c:1218
++#: ../panels/info/cc-info-panel.c:1225
+ msgid "Do nothing"
+ msgstr "Nic nedělat"
+ 
+-#: ../panels/info/cc-info-panel.c:1222
++#: ../panels/info/cc-info-panel.c:1229
+ msgid "Open folder"
+ msgstr "Otevřít složku"
+ 
+-#: ../panels/info/cc-info-panel.c:1313
++#: ../panels/info/cc-info-panel.c:1320
+ msgid "Other Media"
+ msgstr "Ostatní média"
+ 
+-#: ../panels/info/cc-info-panel.c:1344
++#: ../panels/info/cc-info-panel.c:1351
+ msgid "Select an application for audio CDs"
+ msgstr "Vyberte aplikaci pro zvuková CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1345
++#: ../panels/info/cc-info-panel.c:1352
+ msgid "Select an application for video DVDs"
+ msgstr "Vyberte aplikaci pro DVD s videem"
+ 
+-#: ../panels/info/cc-info-panel.c:1346
++#: ../panels/info/cc-info-panel.c:1353
+ msgid "Select an application to run when a music player is connected"
+ msgstr ""
+ "Vyberte aplikaci, která má být spuštěna po připojení hudebního přehrávače"
+ 
+-#: ../panels/info/cc-info-panel.c:1347
++#: ../panels/info/cc-info-panel.c:1354
+ msgid "Select an application to run when a camera is connected"
+ msgstr "Vyberte aplikaci, která má být spuštěna po připojení fotoaparátu"
+ 
+-#: ../panels/info/cc-info-panel.c:1348
++#: ../panels/info/cc-info-panel.c:1355
+ msgid "Select an application for software CDs"
+ msgstr "Vyberte aplikaci pro CD se softwarem"
+ 
+@@ -1354,89 +1298,89 @@ msgstr "Vyberte aplikaci pro CD se softwarem"
+ #. * If the shared-mime-info translation works for your language,
+ #. * simply leave these untranslated.
+ #.
+-#: ../panels/info/cc-info-panel.c:1360
++#: ../panels/info/cc-info-panel.c:1367
+ msgid "audio DVD"
+ msgstr "zvukové DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1361
++#: ../panels/info/cc-info-panel.c:1368
+ msgid "blank Blu-ray disc"
+ msgstr "prázdný disk Blu-ray"
+ 
+-#: ../panels/info/cc-info-panel.c:1362
++#: ../panels/info/cc-info-panel.c:1369
+ msgid "blank CD disc"
+ msgstr "prázdný disk CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1363
++#: ../panels/info/cc-info-panel.c:1370
+ msgid "blank DVD disc"
+ msgstr "prázdný disk DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1364
++#: ../panels/info/cc-info-panel.c:1371
+ msgid "blank HD DVD disc"
+ msgstr "prázdný disk HD DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1365
++#: ../panels/info/cc-info-panel.c:1372
+ msgid "Blu-ray video disc"
+ msgstr "videodisk Blu-ray"
+ 
+-#: ../panels/info/cc-info-panel.c:1366
++#: ../panels/info/cc-info-panel.c:1373
+ msgid "e-book reader"
+ msgstr "čtečka elektronických knih"
+ 
+-#: ../panels/info/cc-info-panel.c:1367
++#: ../panels/info/cc-info-panel.c:1374
+ msgid "HD DVD video disc"
+ msgstr "videodisk HD DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1368
++#: ../panels/info/cc-info-panel.c:1375
+ msgid "Picture CD"
+ msgstr "Picture CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1369
++#: ../panels/info/cc-info-panel.c:1376
+ msgid "Super Video CD"
+ msgstr "Super Video CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1370
++#: ../panels/info/cc-info-panel.c:1377
+ msgid "Video CD"
+ msgstr "Video CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1371
++#: ../panels/info/cc-info-panel.c:1378
+ msgid "Windows software"
+ msgstr "Software Windows"
+ 
+-#: ../panels/info/cc-info-panel.c:1372
++#: ../panels/info/cc-info-panel.c:1379
+ msgid "Software"
+ msgstr "Software"
+ 
+-#: ../panels/info/cc-info-panel.c:1495
++#: ../panels/info/cc-info-panel.c:1502
+ #: ../panels/keyboard/keyboard-shortcuts.c:1696
+ msgid "Section"
+ msgstr "Oddíl"
+ 
+-#: ../panels/info/cc-info-panel.c:1504 ../panels/info/info.ui.h:13
++#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:13
+ msgid "Overview"
+ msgstr "Přehled"
+ 
+-#: ../panels/info/cc-info-panel.c:1510 ../panels/info/info.ui.h:20
++#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:20
+ msgid "Default Applications"
+ msgstr "Výchozí aplikace"
+ 
+-#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:28
++#: ../panels/info/cc-info-panel.c:1522 ../panels/info/info.ui.h:28
+ msgid "Removable Media"
+ msgstr "Vyměnitelná média"
+ 
+-#: ../panels/info/cc-info-panel.c:1540
++#: ../panels/info/cc-info-panel.c:1547
+ #, c-format
+ msgid "Version %s"
+ msgstr "Verze %s"
+ 
+-#: ../panels/info/cc-info-panel.c:1590
++#: ../panels/info/cc-info-panel.c:1597
+ msgid "Install Updates"
+ msgstr "Instalovat aktualizace"
+ 
+-#: ../panels/info/cc-info-panel.c:1594
++#: ../panels/info/cc-info-panel.c:1601
+ msgid "System Up-To-Date"
+ msgstr "Systém je aktuální"
+ 
+-#: ../panels/info/cc-info-panel.c:1598
++#: ../panels/info/cc-info-panel.c:1605
+ msgid "Checking for Updates"
+ msgstr "Kontrolují se aktualizace"
+ 
+@@ -1602,7 +1546,7 @@ msgid "Eject"
+ msgstr "Vysunout"
+ 
+ #: ../panels/keyboard/01-input-sources.xml.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+ #: ../panels/universal-access/uap.ui.h:11
+ msgid "Typing"
+ msgstr "Psaní"
+@@ -1761,7 +1705,6 @@ msgid "Modifiers-only switch to next source"
+ msgstr "Přepínač na další zdroj pouze pro modifikátory"
+ 
+ #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Keyboard"
+ msgstr "Klávesnice"
+ 
+@@ -1786,76 +1729,76 @@ msgstr "_Název:"
+ msgid "C_ommand:"
+ msgstr "_Příkaz:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Repeat Keys"
+ msgstr "Opakování kláves"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+ msgid "Key presses _repeat when key is held down"
+ msgstr "Stisk klávesy se _opakuje, pokud klávesa zůstává stisknuta"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+ msgid "_Delay:"
+ msgstr "Zpož_dění:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+ msgid "_Speed:"
+ msgstr "Rychlo_st:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
+ msgctxt "keyboard, delay"
+ msgid "Short"
+ msgstr "Krátké"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+ msgctxt "keyboard, speed"
+ msgid "Slow"
+ msgstr "Pomalé"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+ msgid "Repeat keys speed"
+ msgstr "Rychlost opakování kláves"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+ msgctxt "keyboard, delay"
+ msgid "Long"
+ msgstr "Dlouhé"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+ msgctxt "keyboard, speed"
+ msgid "Fast"
+ msgstr "Rychlé"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+ msgid "Cursor Blinking"
+ msgstr "Blikání kurzoru"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+ msgid "Cursor _blinks in text fields"
+ msgstr "_Kurzor bliká v textových polích"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+ msgid "S_peed:"
+ msgstr "_Rychlost:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+ msgid "Cursor blink speed"
+ msgstr "Rychlost blikání kurzoru"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+ #: ../panels/region/region.ui.h:5
+ msgid "Input Sources"
+ msgstr "Vstupní zdroje"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+ msgid "Add Shortcut"
+ msgstr "Přidat klávesovou zkratku"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
+ msgid "Remove Shortcut"
+ msgstr "Odebrat klávesovou zkratku"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
+ msgid ""
+ "To edit a shortcut, click the row and hold down the new keys or press "
+ "Backspace to clear."
+@@ -1863,7 +1806,7 @@ msgstr ""
+ "Zkratku upravíte kliknutím na odpovídající řádek a podržením nových kláves, "
+ "vymazání provedete klávesou Backspace."
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+ msgid "Shortcuts"
+ msgstr "Zkratky"
+ 
+@@ -1906,11 +1849,11 @@ msgstr "Změníte-li přiřazení zkratky k „%s“, zkratka „%s“ bude vypn
+ msgid "_Reassign"
+ msgstr "Z_měnit přiřazení"
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:100
++#: ../panels/mouse/cc-mouse-panel.c:95
+ msgid "Test Your _Settings"
+ msgstr "_Vyzkoušejte své nastavení"
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:117
++#: ../panels/mouse/cc-mouse-panel.c:108
+ msgid "Test Your Settings"
+ msgstr "Test vašeho nastavení"
+ 
+@@ -1933,91 +1876,87 @@ msgstr ""
+ "posouvat;"
+ 
+ #: ../panels/mouse/gnome-mouse-properties.ui.h:1
+-msgid "Mouse Preferences"
+-msgstr "Předvolby myši"
+-
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgid "General"
+ msgstr "Obecné"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
++#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgctxt "double click, speed"
+ msgid "Slow"
+ msgstr "Pomalé"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
++#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+ msgid "Double-click timeout"
+ msgstr "Časový limit dvojitého kliknutí"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
++#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+ msgctxt "double click, speed"
+ msgid "Fast"
+ msgstr "Rychlé"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
++#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+ msgid "_Double-click"
+ msgstr "_Dvojité kliknutí"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
++#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+ msgid "Primary _button"
+ msgstr "Hlavní _tlačítko"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
++#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+ msgctxt "mouse, left button as primary"
+ msgid "_Left"
+ msgstr "_Levé"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
++#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+ msgctxt "mouse, right button as primary"
+ msgid "_Right"
+ msgstr "P_ravé"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
++#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+ msgid "Mouse"
+ msgstr "Myš"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
++#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+ msgid "_Pointer speed"
+ msgstr "_Rychlost ukazatele"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
++#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+ msgctxt "mouse pointer, speed"
+ msgid "Slow"
+ msgstr "Pomalý"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
++#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+ msgctxt "mouse pointer, speed"
+ msgid "Fast"
+ msgstr "Rychlý"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
++#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+ msgid "Touchpad"
+ msgstr "Touchpad"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
++#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+ msgctxt "touchpad pointer, speed"
+ msgid "Slow"
+ msgstr "Pomalý"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
++#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+ msgctxt "touchpad pointer, speed"
+ msgid "Fast"
+ msgstr "Rychlý"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
++#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+ msgid "Disable while _typing"
+ msgstr "Vypnou_t při psaní"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
++#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+ msgid "Tap to _click"
+ msgstr "_Klepnout ťuknutím"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
++#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+ msgid "Two _finger scroll"
+ msgstr "Posuv dvě_ma prsty"
+ 
+ #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible.
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:21
++#: ../panels/mouse/gnome-mouse-properties.ui.h:20
+ msgid "_Natural scrolling"
+ msgstr "Přiroze_ný posuv"
+ 
+@@ -2060,7 +1999,7 @@ msgstr "Kliknutí, vedlejší tlačítko"
+ msgid "Air_plane Mode"
+ msgstr "Režim „_Letadlo“"
+ 
+-#: ../panels/network/cc-network-panel.c:928
++#: ../panels/network/cc-network-panel.c:930
+ msgid "Network proxy"
+ msgstr "Proxy sítě"
+ 
+@@ -2068,14 +2007,14 @@ msgstr "Proxy sítě"
+ #. * window for vpn connections, it is also used to display
+ #. * vpn connections in the device list.
+ #.
+-#: ../panels/network/cc-network-panel.c:1107 ../panels/network/net-vpn.c:285
+-#: ../panels/network/net-vpn.c:438
++#: ../panels/network/cc-network-panel.c:1109 ../panels/network/net-vpn.c:278
++#: ../panels/network/net-vpn.c:431
+ #, c-format
+ msgid "%s VPN"
+ msgstr "VPN %s"
+ 
+ #. TRANSLATORS: the user is running a NM that is not API compatible
+-#: ../panels/network/cc-network-panel.c:1242
++#: ../panels/network/cc-network-panel.c:1244
+ msgid "The system network services are not compatible with this version."
+ msgstr "Systémová služba sítě není kompatibilní s touto verzí."
+ 
+@@ -2109,35 +2048,35 @@ msgstr "automaticky"
+ 
+ #. TRANSLATORS: this WEP WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:52
+-#: ../panels/network/net-device-wifi.c:221
+-#: ../panels/network/net-device-wifi.c:382
++#: ../panels/network/net-device-wifi.c:216
++#: ../panels/network/net-device-wifi.c:377
+ msgid "WEP"
+ msgstr "WEP"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:56
+-#: ../panels/network/net-device-wifi.c:225
+-#: ../panels/network/net-device-wifi.c:387
++#: ../panels/network/net-device-wifi.c:220
++#: ../panels/network/net-device-wifi.c:382
+ #: ../panels/network/network-wifi.ui.h:17
+ msgid "WPA"
+ msgstr "WPA"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:60
+-#: ../panels/network/net-device-wifi.c:229
++#: ../panels/network/net-device-wifi.c:224
+ msgid "WPA2"
+ msgstr "WPA2"
+ 
+ #. TRANSLATORS: this Enterprise WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:65
+-#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:229
+ msgid "Enterprise"
+ msgstr "Firemní"
+ 
+ # Zabezpečení
+ #: ../panels/network/connection-editor/ce-page-details.c:70
+-#: ../panels/network/net-device-wifi.c:239
+-#: ../panels/network/net-device-wifi.c:372
++#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:367
+ msgctxt "Wifi security"
+ msgid "None"
+ msgstr "Žádné"
+@@ -2158,8 +2097,8 @@ msgid "Yesterday"
+ msgstr "včera"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:106
+-#: ../panels/network/net-device-ethernet.c:125
+-#: ../panels/network/net-device-wifi.c:476
++#: ../panels/network/net-device-ethernet.c:122
++#: ../panels/network/net-device-wifi.c:471
+ #, c-format
+ msgid "%i day ago"
+ msgid_plural "%i days ago"
+@@ -2170,40 +2109,40 @@ msgstr[2] "před %i dny"
+ #. Translators: network device speed
+ #: ../panels/network/connection-editor/ce-page-details.c:155
+ #: ../panels/network/net-device-ethernet.c:53
+-#: ../panels/network/net-device-wifi.c:534
++#: ../panels/network/net-device-wifi.c:528
+ #, c-format
+ msgid "%d Mb/s"
+ msgstr "%d Mb/s"
+ 
+ # Síla signálu
+ #: ../panels/network/connection-editor/ce-page-details.c:181
+-#: ../panels/network/net-device-wifi.c:563
++#: ../panels/network/net-device-wifi.c:557
+ msgctxt "Signal strength"
+ msgid "None"
+ msgstr "Žádná"
+ 
+ # Síla signálu
+ #: ../panels/network/connection-editor/ce-page-details.c:183
+-#: ../panels/network/net-device-wifi.c:565
++#: ../panels/network/net-device-wifi.c:559
+ msgctxt "Signal strength"
+ msgid "Weak"
+ msgstr "Slabá"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:185
+-#: ../panels/network/net-device-wifi.c:567
++#: ../panels/network/net-device-wifi.c:561
+ msgctxt "Signal strength"
+ msgid "Ok"
+ msgstr "Dostačující"
+ 
+ # Síla signálu
+ #: ../panels/network/connection-editor/ce-page-details.c:187
+-#: ../panels/network/net-device-wifi.c:569
++#: ../panels/network/net-device-wifi.c:563
+ msgctxt "Signal strength"
+ msgid "Good"
+ msgstr "Dobrá"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:189
+-#: ../panels/network/net-device-wifi.c:571
++#: ../panels/network/net-device-wifi.c:565
+ msgctxt "Signal strength"
+ msgid "Excellent"
+ msgstr "Výborná"
+@@ -2349,15 +2288,15 @@ msgid "Link speed"
+ msgstr "Rychlost spojení"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:4
+-#: ../panels/network/net-device-ethernet.c:158
++#: ../panels/network/net-device-ethernet.c:155
+ #: ../panels/network/network-simple.ui.h:3
+ #: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
+ msgid "IPv4 Address"
+ msgstr "Adresa IPv4"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:5
+-#: ../panels/network/net-device-ethernet.c:159
+-#: ../panels/network/net-device-ethernet.c:163
++#: ../panels/network/net-device-ethernet.c:156
++#: ../panels/network/net-device-ethernet.c:160
+ #: ../panels/network/network-mobile.ui.h:4
+ #: ../panels/network/network-simple.ui.h:4
+ #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
+@@ -2365,14 +2304,14 @@ msgid "IPv6 Address"
+ msgstr "Adresa IPv6"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:6
+-#: ../panels/network/net-device-ethernet.c:166
++#: ../panels/network/net-device-ethernet.c:163
+ #: ../panels/network/network-simple.ui.h:2
+ #: ../panels/network/network-wifi.ui.h:7
+ msgid "Hardware Address"
+ msgstr "Hardwarová adresa"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:7
+-#: ../panels/network/net-device-ethernet.c:170
++#: ../panels/network/net-device-ethernet.c:167
+ #: ../panels/network/network-mobile.ui.h:5
+ #: ../panels/network/network-simple.ui.h:5
+ #: ../panels/network/network-wifi.ui.h:8
+@@ -2382,7 +2321,7 @@ msgstr "Výchozí směrování"
+ #: ../panels/network/connection-editor/details-page.ui.h:8
+ #: ../panels/network/connection-editor/ip4-page.ui.h:3
+ #: ../panels/network/connection-editor/ip6-page.ui.h:3
+-#: ../panels/network/net-device-ethernet.c:172
++#: ../panels/network/net-device-ethernet.c:169
+ #: ../panels/network/network-mobile.ui.h:6
+ #: ../panels/network/network-simple.ui.h:6
+ #: ../panels/network/network-wifi.ui.h:9
+@@ -2528,7 +2467,7 @@ msgid "_Add"
+ msgstr "Přid_at"
+ 
+ #: ../panels/network/connection-editor/net-connection-editor.c:595
+-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
++#: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
+ msgid "VPN"
+ msgstr "VPN"
+ 
+@@ -2537,22 +2476,26 @@ msgid "Bond"
+ msgstr "Svazek"
+ 
+ #: ../panels/network/connection-editor/net-connection-editor.c:597
++msgid "Team"
++msgstr "Tým"
++
++#: ../panels/network/connection-editor/net-connection-editor.c:598
+ msgid "Bridge"
+ msgstr "Most"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:598
++#: ../panels/network/connection-editor/net-connection-editor.c:599
+ msgid "VLAN"
+ msgstr "VLAN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:749
++#: ../panels/network/connection-editor/net-connection-editor.c:750
+ msgid "Could not load VPN plugins"
+ msgstr "Nelze načíst zásuvné moduly VPN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:818
++#: ../panels/network/connection-editor/net-connection-editor.c:819
+ msgid "Import from file…"
+ msgstr "Importovat ze souboru…"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:889
++#: ../panels/network/connection-editor/net-connection-editor.c:890
+ msgid "Add Network Connection"
+ msgstr "Přidat síťové připojení"
+ 
+@@ -2562,7 +2505,7 @@ msgid "_Reset"
+ msgstr "_Resetovat"
+ 
+ #: ../panels/network/connection-editor/reset-page.ui.h:2
+-#: ../panels/network/net-device-wifi.c:1408
++#: ../panels/network/net-device-wifi.c:1403
+ #: ../panels/network/network-wifi.ui.h:40
+ msgid "_Forget"
+ msgstr "_Zapomenout"
+@@ -2611,7 +2554,7 @@ msgstr "Vybrat soubor pro import"
+ 
+ #: ../panels/network/connection-editor/vpn-helpers.c:246
+ #: ../panels/printers/cc-printers-panel.c:1947
+-#: ../panels/sharing/cc-sharing-panel.c:422
++#: ../panels/sharing/cc-sharing-panel.c:426
+ #: ../panels/user-accounts/um-photo-dialog.c:222
+ msgid "_Open"
+ msgstr "_Otevřít"
+@@ -2698,29 +2641,29 @@ msgstr "Podřízená zařízení ve svazku"
+ msgid "Bridge slaves"
+ msgstr "Podřízená zařízení v mostu"
+ 
+-#: ../panels/network/net-device-ethernet.c:111
+-#: ../panels/network/net-device-wifi.c:462
++#: ../panels/network/net-device-ethernet.c:108
++#: ../panels/network/net-device-wifi.c:457
+ msgid "never"
+ msgstr "nikdy"
+ 
+-#: ../panels/network/net-device-ethernet.c:121
+-#: ../panels/network/net-device-wifi.c:472
++#: ../panels/network/net-device-ethernet.c:118
++#: ../panels/network/net-device-wifi.c:467
+ msgid "today"
+ msgstr "dnes"
+ 
+-#: ../panels/network/net-device-ethernet.c:123
+-#: ../panels/network/net-device-wifi.c:474
++#: ../panels/network/net-device-ethernet.c:120
++#: ../panels/network/net-device-wifi.c:469
+ msgid "yesterday"
+ msgstr "včera"
+ 
+-#: ../panels/network/net-device-ethernet.c:161
++#: ../panels/network/net-device-ethernet.c:158
+ #: ../panels/network/network-mobile.ui.h:3
+ #: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
+ #: ../panels/printers/printers.ui.h:13
+ msgid "IP Address"
+ msgstr "Adresa IP"
+ 
+-#: ../panels/network/net-device-ethernet.c:177
++#: ../panels/network/net-device-ethernet.c:174
+ #: ../panels/network/network-wifi.ui.h:10
+ msgid "Last used"
+ msgstr "Naposledy použito"
+@@ -2730,14 +2673,14 @@ msgstr "Naposledy použito"
+ #. * profile. It is also used to display ethernet in the
+ #. * device list.
+ #.
+-#: ../panels/network/net-device-ethernet.c:287
++#: ../panels/network/net-device-ethernet.c:284
+ #: ../panels/network/network-ethernet.ui.h:1
+ #: ../panels/network/network-simple.ui.h:1
+ msgid "Wired"
+ msgstr "Drátová"
+ 
+-#: ../panels/network/net-device-ethernet.c:355
+-#: ../panels/network/net-device-wifi.c:1549
++#: ../panels/network/net-device-ethernet.c:352
++#: ../panels/network/net-device-wifi.c:1558
+ #: ../panels/network/network-ethernet.ui.h:3
+ #: ../panels/network/network-mobile.ui.h:8
+ #: ../panels/network/network-simple.ui.h:8
+@@ -2745,17 +2688,21 @@ msgstr "Drátová"
+ msgid "Options…"
+ msgstr "Volby…"
+ 
+-#: ../panels/network/net-device-ethernet.c:492
++#: ../panels/network/net-device-ethernet.c:489
+ #, c-format
+ msgid "Profile %d"
+ msgstr "Profil %d"
+ 
+-#: ../panels/network/net-device-mobile.c:239
++#: ../panels/network/net-device-mobile.c:232
+ msgid "Add new connection"
+ msgstr "Přidat nové připojení"
+ 
++#: ../panels/network/net-device-team.c:77
++msgid "Team slaves"
++msgstr "Podřízená zařízení v týmu"
++
+ # Příliš neformální?
+-#: ../panels/network/net-device-wifi.c:1117
++#: ../panels/network/net-device-wifi.c:1110
+ msgid ""
+ "If you have a connection to the Internet other than wireless, you can set up "
+ "a wireless hotspot to share the connection with others."
+@@ -2763,13 +2710,13 @@ msgstr ""
+ "Používáte-li k přístupu na Internet připojení jiné než bezdrátové, můžete "
+ "nastavit bezdrátový přístupový bod pro sdílení připojení s ostatními."
+ 
+-#: ../panels/network/net-device-wifi.c:1121
++#: ../panels/network/net-device-wifi.c:1114
+ #, c-format
+ msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+ msgstr ""
+ "Zapnutím bezdrátového přístupového bodu bude připojení k <b>%s</b> ztraceno."
+ 
+-#: ../panels/network/net-device-wifi.c:1125
++#: ../panels/network/net-device-wifi.c:1118
+ msgid ""
+ "It is not possible to access the Internet through your wireless while the "
+ "hotspot is active."
+@@ -2777,23 +2724,23 @@ msgstr ""
+ "Není možné se k Internetu připojovat prostřednictvím bezdrátového připojení "
+ "zatímco je aktivní režim přístupového bodu."
+ 
+-#: ../panels/network/net-device-wifi.c:1199
++#: ../panels/network/net-device-wifi.c:1192
+ msgid "Stop hotspot and disconnect any users?"
+ msgstr "Zastavit přístupový bod a odpojit případné uživatele?"
+ 
+-#: ../panels/network/net-device-wifi.c:1202
++#: ../panels/network/net-device-wifi.c:1195
+ msgid "_Stop Hotspot"
+ msgstr "Za_stavit přístupový bod"
+ 
+-#: ../panels/network/net-device-wifi.c:1274
++#: ../panels/network/net-device-wifi.c:1267
+ msgid "System policy prohibits use as a Hotspot"
+ msgstr "Systémová zásada zakazuje použití jako přístupový bod"
+ 
+-#: ../panels/network/net-device-wifi.c:1277
++#: ../panels/network/net-device-wifi.c:1270
+ msgid "Wireless device does not support Hotspot mode"
+ msgstr "Bezdrátové zařízení nepodporuje režim přístupového bodu"
+ 
+-#: ../panels/network/net-device-wifi.c:1404
++#: ../panels/network/net-device-wifi.c:1399
+ msgid ""
+ "Network details for the selected networks, including passwords and any "
+ "custom configuration will be lost."
+@@ -2801,19 +2748,19 @@ msgstr ""
+ "Informace o síti pro vybrané sítě, včetně hesel a vlastního nastavení, budou "
+ "ztraceny."
+ 
+-#: ../panels/network/net-device-wifi.c:1714
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
++#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+ msgid "History"
+ msgstr "Historie"
+ 
+-#: ../panels/network/net-device-wifi.c:1718 ../panels/power/power.ui.h:21
++#: ../panels/network/net-device-wifi.c:1730 ../panels/power/power.ui.h:21
+ #: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596
+-#: ../panels/wacom/cc-wacom-page.c:525
++#: ../panels/wacom/cc-wacom-page.c:534
+ msgid "_Close"
+ msgstr "_Zavřít"
+ 
+ #. translators: This is the label for the "Forget wireless network" functionality
+-#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/network/net-device-wifi.c:1738
+ msgctxt "Wi-Fi Network"
+ msgid "_Forget"
+ msgstr "_Zapomenout"
+@@ -2834,7 +2781,7 @@ msgstr ""
+ msgid "This is not recommended for untrusted public networks."
+ msgstr "Nedoporučuje se v nedůvěryhodných veřejných sítích."
+ 
+-#: ../panels/network/net-proxy.c:417
++#: ../panels/network/net-proxy.c:410
+ msgid "Proxy"
+ msgstr "Proxy"
+ 
+@@ -2850,17 +2797,17 @@ msgstr "IMEI"
+ msgid "Provider"
+ msgstr "Poskytovatel"
+ 
+-#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
++#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:2
+ msgctxt "proxy method"
+ msgid "None"
+ msgstr "Žádná"
+ 
+-#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
++#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:3
+ msgctxt "proxy method"
+ msgid "Manual"
+ msgstr "Ručně"
+ 
+-#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
++#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:4
+ msgctxt "proxy method"
+ msgid "Automatic"
+ msgstr "Automaticky"
+@@ -2913,19 +2860,7 @@ msgstr "Port proxy Socks"
+ msgid "Turn device off"
+ msgstr "Vypnout zařízení"
+ 
+-#: ../panels/network/network.ui.h:1
+-msgid "Select the interface to use for the new service"
+-msgstr "Vyberte rozhraní, které se má použít pro novou službu"
+-
+-#: ../panels/network/network.ui.h:2
+-msgid "C_reate…"
+-msgstr "V_ytvořit…"
+-
+-#: ../panels/network/network.ui.h:3
+-msgid "_Interface"
+-msgstr "_Rozhraní"
+-
+-#: ../panels/network/network.ui.h:8
++#: ../panels/network/network.ui.h:5
+ msgid "Add Device"
+ msgstr "Přidat zařízení"
+ 
+@@ -2964,7 +2899,7 @@ msgstr "podrobnosti"
+ #: ../panels/network/wireless-security/ws-leap.ui.h:2
+ #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
+ #: ../panels/user-accounts/data/account-dialog.ui.h:9
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+ msgid "_Password"
+ msgstr "_Heslo"
+ 
+@@ -3660,12 +3595,12 @@ msgid "Show Details in Lock Screen"
+ msgstr "Zobrazovat na uzamčené obrazovce podrobnosti"
+ 
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1733 ../panels/power/cc-power-panel.c:1740
+-#: ../panels/privacy/cc-privacy-panel.c:77
+-#: ../panels/privacy/cc-privacy-panel.c:117
+-#: ../panels/universal-access/cc-ua-panel.c:253
+-#: ../panels/universal-access/cc-ua-panel.c:610
+-#: ../panels/universal-access/cc-ua-panel.c:736
++#: ../panels/power/cc-power-panel.c:1744 ../panels/power/cc-power-panel.c:1751
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ msgid "On"
+ msgstr "Zapnuto"
+ 
+@@ -3786,11 +3721,11 @@ msgstr ""
+ "Přidání účtu umožní aplikacím přistupovat k jeho dokumentům, poště, "
+ "kontaktům, kalendáři, diskuzím a dalším."
+ 
+-#: ../panels/power/cc-power-panel.c:187
++#: ../panels/power/cc-power-panel.c:189
+ msgid "Unknown time"
+ msgstr "Neznámý čas"
+ 
+-#: ../panels/power/cc-power-panel.c:193
++#: ../panels/power/cc-power-panel.c:195
+ #, c-format
+ msgid "%i minute"
+ msgid_plural "%i minutes"
+@@ -3798,7 +3733,7 @@ msgstr[0] "%i minuta"
+ msgstr[1] "%i minuty"
+ msgstr[2] "%i minut"
+ 
+-#: ../panels/power/cc-power-panel.c:205
++#: ../panels/power/cc-power-panel.c:207
+ #, c-format
+ msgid "%i hour"
+ msgid_plural "%i hours"
+@@ -3808,19 +3743,19 @@ msgstr[2] "%i hodin"
+ 
+ #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
+ #. * Swap order with "%2$s %2$i %1$s %1$i if needed
+-#: ../panels/power/cc-power-panel.c:213
++#: ../panels/power/cc-power-panel.c:215
+ #, c-format
+ msgid "%i %s %i %s"
+ msgstr "%i %s %i %s"
+ 
+-#: ../panels/power/cc-power-panel.c:214
++#: ../panels/power/cc-power-panel.c:216
+ msgid "hour"
+ msgid_plural "hours"
+ msgstr[0] "hodina"
+ msgstr[1] "hodiny"
+ msgstr[2] "hodin"
+ 
+-#: ../panels/power/cc-power-panel.c:215
++#: ../panels/power/cc-power-panel.c:217
+ msgid "minute"
+ msgid_plural "minutes"
+ msgstr[0] "minuta"
+@@ -3828,208 +3763,208 @@ msgstr[1] "minuty"
+ msgstr[2] "minut"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:234
++#: ../panels/power/cc-power-panel.c:236
+ #, c-format
+ msgid "%s until fully charged"
+ msgstr "%s do plného nabití"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:241
++#: ../panels/power/cc-power-panel.c:243
+ #, c-format
+ msgid "Caution: %s remaining"
+ msgstr "Pozor, zbývá %s"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:246
++#: ../panels/power/cc-power-panel.c:248
+ #, c-format
+ msgid "%s remaining"
+ msgstr "Zbývá %s"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:251 ../panels/power/cc-power-panel.c:279
++#: ../panels/power/cc-power-panel.c:253 ../panels/power/cc-power-panel.c:281
+ msgid "Fully charged"
+ msgstr "Plně nabito"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:255 ../panels/power/cc-power-panel.c:283
++#: ../panels/power/cc-power-panel.c:257 ../panels/power/cc-power-panel.c:285
+ msgid "Empty"
+ msgstr "Vybitá"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:270
++#: ../panels/power/cc-power-panel.c:272
+ msgid "Charging"
+ msgstr "Nabíjí se"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:275
++#: ../panels/power/cc-power-panel.c:277
+ msgid "Discharging"
+ msgstr "Vybíjí se"
+ 
+-#: ../panels/power/cc-power-panel.c:393
++#: ../panels/power/cc-power-panel.c:395
+ msgctxt "Battery name"
+ msgid "Main"
+ msgstr "Hlavní"
+ 
+-#: ../panels/power/cc-power-panel.c:395
++#: ../panels/power/cc-power-panel.c:397
+ msgctxt "Battery name"
+ msgid "Extra"
+ msgstr "Přídavná"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:486
++#: ../panels/power/cc-power-panel.c:469
+ msgid "Wireless mouse"
+ msgstr "Bezdrátová myš"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:490
++#: ../panels/power/cc-power-panel.c:472
+ msgid "Wireless keyboard"
+ msgstr "Bezdrátová klávesnice"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:494
++#: ../panels/power/cc-power-panel.c:475
+ msgid "Uninterruptible power supply"
+ msgstr "Záložní zdroj napájení"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:499
++#: ../panels/power/cc-power-panel.c:478
+ msgid "Personal digital assistant"
+ msgstr "Osobní digitální asistent (PDA)"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:503
++#: ../panels/power/cc-power-panel.c:481
+ msgid "Cellphone"
+ msgstr "Mobilní telefon"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:507
++#: ../panels/power/cc-power-panel.c:484
+ msgid "Media player"
+ msgstr "Multimediální přehrávač"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:511
++#: ../panels/power/cc-power-panel.c:487
+ msgid "Tablet"
+ msgstr "Tablet"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:515
++#: ../panels/power/cc-power-panel.c:490
+ msgid "Computer"
+ msgstr "Počítač"
+ 
+ #. TRANSLATORS: secondary battery, misc
+-#: ../panels/power/cc-power-panel.c:519 ../panels/power/cc-power-panel.c:729
+-#: ../panels/power/cc-power-panel.c:2064
++#: ../panels/power/cc-power-panel.c:493 ../panels/power/cc-power-panel.c:740
++#: ../panels/power/cc-power-panel.c:2075
+ msgid "Battery"
+ msgstr "Baterie"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:528
++#: ../panels/power/cc-power-panel.c:539
+ msgctxt "Battery power"
+ msgid "Charging"
+ msgstr "Nabíjí se"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:535
++#: ../panels/power/cc-power-panel.c:546
+ msgctxt "Battery power"
+ msgid "Caution"
+ msgstr "Pozor"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:540
++#: ../panels/power/cc-power-panel.c:551
+ msgctxt "Battery power"
+ msgid "Low"
+ msgstr "Nízká"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:545
++#: ../panels/power/cc-power-panel.c:556
+ msgctxt "Battery power"
+ msgid "Good"
+ msgstr "Dobrá"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:550
++#: ../panels/power/cc-power-panel.c:561
+ msgctxt "Battery power"
+ msgid "Fully charged"
+ msgstr "Plně nabitá"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:554
++#: ../panels/power/cc-power-panel.c:565
+ msgctxt "Battery power"
+ msgid "Empty"
+ msgstr "Vybitá"
+ 
+-#: ../panels/power/cc-power-panel.c:727
++#: ../panels/power/cc-power-panel.c:738
+ msgid "Batteries"
+ msgstr "Baterie"
+ 
+-#: ../panels/power/cc-power-panel.c:1133
++#: ../panels/power/cc-power-panel.c:1144
+ msgid "When _idle"
+ msgstr "Při _nečinnosti"
+ 
+-#: ../panels/power/cc-power-panel.c:1502
++#: ../panels/power/cc-power-panel.c:1513
+ msgid "Power Saving"
+ msgstr "Šetření energií"
+ 
+-#: ../panels/power/cc-power-panel.c:1530
++#: ../panels/power/cc-power-panel.c:1541
+ msgid "_Screen brightness"
+ msgstr "_Jas obrazovky"
+ 
+-#: ../panels/power/cc-power-panel.c:1536
++#: ../panels/power/cc-power-panel.c:1547
+ msgid "_Keyboard brightness"
+ msgstr "_Jas klávesnice"
+ 
+-#: ../panels/power/cc-power-panel.c:1546
++#: ../panels/power/cc-power-panel.c:1557
+ msgid "_Dim screen when inactive"
+ msgstr "_Ztlumit jas obrazovky při neaktivitě"
+ 
+-#: ../panels/power/cc-power-panel.c:1571
++#: ../panels/power/cc-power-panel.c:1582
+ msgid "_Blank screen"
+ msgstr "_Vypnout obrazovku"
+ 
+-#: ../panels/power/cc-power-panel.c:1608
++#: ../panels/power/cc-power-panel.c:1619
+ msgid "_Wi-Fi"
+ msgstr "_Wi-Fi"
+ 
+-#: ../panels/power/cc-power-panel.c:1613
++#: ../panels/power/cc-power-panel.c:1624
+ msgid "Turns off wireless devices"
+ msgstr "Vypne bezdrátová zařízení"
+ 
+-#: ../panels/power/cc-power-panel.c:1638
++#: ../panels/power/cc-power-panel.c:1649
+ msgid "_Mobile broadband"
+ msgstr "_Mobilní připojení"
+ 
+-#: ../panels/power/cc-power-panel.c:1643
++#: ../panels/power/cc-power-panel.c:1654
+ msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
+ msgstr "Vypne mobilní širokopásmová zařízení (3G, 4G, WiMax atd.)"
+ 
+-#: ../panels/power/cc-power-panel.c:1678
++#: ../panels/power/cc-power-panel.c:1689
+ msgid "_Bluetooth"
+ msgstr "_Bluetooth"
+ 
+-#: ../panels/power/cc-power-panel.c:1729
++#: ../panels/power/cc-power-panel.c:1740
+ msgid "When on battery power"
+ msgstr "Při napájení z baterie"
+ 
+-#: ../panels/power/cc-power-panel.c:1731
++#: ../panels/power/cc-power-panel.c:1742
+ msgid "When plugged in"
+ msgstr "Při napájení ze sítě"
+ 
+-#: ../panels/power/cc-power-panel.c:1860
++#: ../panels/power/cc-power-panel.c:1871
+ msgid "Suspend & Power Off"
+ msgstr "Uspávání a vypínání"
+ 
+-#: ../panels/power/cc-power-panel.c:1893
++#: ../panels/power/cc-power-panel.c:1904
+ msgid "_Automatic suspend"
+ msgstr "_Automaticky uspat"
+ 
+-#: ../panels/power/cc-power-panel.c:1917
++#: ../panels/power/cc-power-panel.c:1928
+ msgid "When battery power is _critical"
+ msgstr "Když je napájení z baterie kriti_cky nízké"
+ 
+-#: ../panels/power/cc-power-panel.c:1974
++#: ../panels/power/cc-power-panel.c:1985
+ msgid "Power Off"
+ msgstr "Vypnout"
+ 
+-#: ../panels/power/cc-power-panel.c:2111
++#: ../panels/power/cc-power-panel.c:2122
+ msgid "Devices"
+ msgstr "Zařízení"
+ 
+@@ -4134,7 +4069,7 @@ msgid "Authenticate"
+ msgstr "Ověření totožnosti"
+ 
+ #: ../panels/printers/authentication-dialog.ui.h:5
+-#: ../panels/sharing/sharing.ui.h:23
++#: ../panels/sharing/sharing.ui.h:21
+ #: ../panels/user-accounts/data/account-dialog.ui.h:6
+ msgid "Password"
+ msgstr "Heslo"
+@@ -4502,12 +4437,12 @@ msgid "%s Active Jobs"
+ msgstr "Aktivní úlohy – %s"
+ 
+ #. Translators: This item is a server which needs authentication to show its printers
+-#: ../panels/printers/pp-new-printer-dialog.c:1667
++#: ../panels/printers/pp-new-printer-dialog.c:1669
+ msgid "Server requires authentication"
+ msgstr "Server požaduje ověření totožnosti"
+ 
+ #. Translators: No printers were found
+-#: ../panels/printers/pp-new-printer-dialog.c:1704
++#: ../panels/printers/pp-new-printer-dialog.c:1706
+ msgid "No printers detected."
+ msgstr "Nenalezeny žádné tiskárny"
+ 
+@@ -4679,6 +4614,10 @@ msgstr "Úlohy"
+ msgid "Show _Jobs"
+ msgstr "Zobrazit ú_lohy"
+ 
++#: ../panels/printers/printers.ui.h:12
++msgid "Model"
++msgstr "Model"
++
+ #: ../panels/printers/printers.ui.h:15
+ msgid "label"
+ msgstr "popisek"
+@@ -4715,39 +4654,39 @@ msgstr ""
+ "Bohužel to vypadá, že systémová\n"
+ "služba tisku není dostupná."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:245 ../panels/privacy/privacy.ui.h:26
++#: ../panels/privacy/cc-privacy-panel.c:248 ../panels/privacy/privacy.ui.h:26
+ msgid "Screen Lock"
+ msgstr "Zamykání obrazovky"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:358 ../panels/privacy/privacy.ui.h:20
++#: ../panels/privacy/cc-privacy-panel.c:361 ../panels/privacy/privacy.ui.h:20
+ msgid "Usage & History"
+ msgstr "Použití a historie"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:486
++#: ../panels/privacy/cc-privacy-panel.c:489
+ msgid "Empty all items from Trash?"
+ msgstr "Vysypat všechny položky z koše?"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:487
++#: ../panels/privacy/cc-privacy-panel.c:490
+ msgid "All items in the Trash will be permanently deleted."
+ msgstr "Všechny položky v koši budou trvale smazány."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:488 ../panels/privacy/privacy.ui.h:32
++#: ../panels/privacy/cc-privacy-panel.c:491 ../panels/privacy/privacy.ui.h:32
+ msgid "_Empty Trash"
+ msgstr "_Vyprázdnit koš"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:511
++#: ../panels/privacy/cc-privacy-panel.c:514
+ msgid "Delete all the temporary files?"
+ msgstr "Odstranit dočasné soubory?"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:512
++#: ../panels/privacy/cc-privacy-panel.c:515
+ msgid "All the temporary files will be permanently deleted."
+ msgstr "Všechny dočasné soubory budou trvale smazány."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:513 ../panels/privacy/privacy.ui.h:33
++#: ../panels/privacy/cc-privacy-panel.c:516 ../panels/privacy/privacy.ui.h:33
+ msgid "_Purge Temporary Files"
+ msgstr "Odstranit dočasné soubor_y"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:535 ../panels/privacy/privacy.ui.h:31
++#: ../panels/privacy/cc-privacy-panel.c:538 ../panels/privacy/privacy.ui.h:31
+ msgid "Purge Trash & Temporary Files"
+ msgstr "Vyčistit koš a dočasné soubory"
+ 
+@@ -5099,21 +5038,21 @@ msgstr "Posunout níž"
+ msgid "Preferences"
+ msgstr "Předvolby"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:274
++#: ../panels/sharing/cc-sharing-panel.c:285
+ msgctxt "service is enabled"
+ msgid "On"
+ msgstr "Zapnuto"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:276
++#: ../panels/sharing/cc-sharing-panel.c:287
+ msgctxt "service is disabled"
+ msgid "Off"
+ msgstr "Vypnuto"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:418
++#: ../panels/sharing/cc-sharing-panel.c:422
+ msgid "Choose a Folder"
+ msgstr "Výběr složky"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:702
++#: ../panels/sharing/cc-sharing-panel.c:736
+ msgid "Copy"
+ msgstr "Kopírovat"
+ 
+@@ -5157,70 +5096,62 @@ msgstr ""
+ "podporujícími bluetooth"
+ 
+ #: ../panels/sharing/sharing.ui.h:3
+-msgid "Share Public Folder"
+-msgstr "Sdílet veřejnou složku"
+-
+-#: ../panels/sharing/sharing.ui.h:4
+ msgid "Only Receive From Trusted Devices"
+ msgstr "Přijímat pouze od důvěryhodných zařízení"
+ 
+-#: ../panels/sharing/sharing.ui.h:5
++#: ../panels/sharing/sharing.ui.h:4
+ msgid "Save Received Files to Downloads Folder"
+ msgstr "Ukládat přijaté soubory do složky Stažené"
+ 
+-#: ../panels/sharing/sharing.ui.h:6
+-msgid "Only share with Trusted Devices"
+-msgstr "Sdílet pouze s důvěryhodnými zařízeními"
+-
+-#: ../panels/sharing/sharing.ui.h:7
++#: ../panels/sharing/sharing.ui.h:5
+ msgid "Computer Name"
+ msgstr "Název počítače"
+ 
+-#: ../panels/sharing/sharing.ui.h:8
++#: ../panels/sharing/sharing.ui.h:6
+ msgid "Personal File Sharing"
+ msgstr "Sdílení osobních souborů"
+ 
+-#: ../panels/sharing/sharing.ui.h:9
++#: ../panels/sharing/sharing.ui.h:7
+ msgid "Screen Sharing"
+ msgstr "Sdílení obrazovky"
+ 
+-#: ../panels/sharing/sharing.ui.h:10
++#: ../panels/sharing/sharing.ui.h:8
+ msgid "Media Sharing"
+ msgstr "Sdílení médií"
+ 
+-#: ../panels/sharing/sharing.ui.h:11
++#: ../panels/sharing/sharing.ui.h:9
+ msgid "Remote Login"
+ msgstr "Vzdálené přihlášení"
+ 
+-#: ../panels/sharing/sharing.ui.h:12
++#: ../panels/sharing/sharing.ui.h:10
+ msgid "Some services are disabled because of no network access."
+ msgstr "Některé služby jsou zakázány kvůli tomu, že není přístup k síti."
+ 
+-#: ../panels/sharing/sharing.ui.h:13
++#: ../panels/sharing/sharing.ui.h:11
+ msgid "Share Music, Photos and Videos with others on the current network."
+ msgstr "Sdílet hudbu, fotografie a videa s ostatními v aktuální síti."
+ 
+-#: ../panels/sharing/sharing.ui.h:14
++#: ../panels/sharing/sharing.ui.h:12
+ msgid "Share Media On This Network"
+ msgstr "Sdílet média v této síti"
+ 
+-#: ../panels/sharing/sharing.ui.h:15
++#: ../panels/sharing/sharing.ui.h:13
+ msgid "Shared Folders"
+ msgstr "Sdílené složky"
+ 
+-#: ../panels/sharing/sharing.ui.h:16
++#: ../panels/sharing/sharing.ui.h:14
+ msgid "column"
+ msgstr "sloupec"
+ 
+-#: ../panels/sharing/sharing.ui.h:17
++#: ../panels/sharing/sharing.ui.h:15
+ msgid "Add Folder"
+ msgstr "Přidat složku"
+ 
+-#: ../panels/sharing/sharing.ui.h:18
++#: ../panels/sharing/sharing.ui.h:16
+ msgid "Remove Folder"
+ msgstr "Odebrat složku"
+ 
+-#: ../panels/sharing/sharing.ui.h:20
++#: ../panels/sharing/sharing.ui.h:18
+ #, no-c-format
+ msgid ""
+ "Personal File Sharing allows you to share your Public folder with others on "
+@@ -5229,15 +5160,15 @@ msgstr ""
+ "Sdílení osobních souborů vám umožňuje sdílet složku Veřejné s ostatními v "
+ "aktuální síti pomocí: <a href=\"dav://%s\">dav://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:21
++#: ../panels/sharing/sharing.ui.h:19
+ msgid "Share Public Folder On This Network"
+ msgstr "Sdílet složku Veřejné v této síti"
+ 
+-#: ../panels/sharing/sharing.ui.h:22
++#: ../panels/sharing/sharing.ui.h:20
+ msgid "Require Password"
+ msgstr "Vyžadovat heslo"
+ 
+-#: ../panels/sharing/sharing.ui.h:25
++#: ../panels/sharing/sharing.ui.h:23
+ #, no-c-format
+ msgid ""
+ "Allow remote users to connect using the Secure Shell command:\n"
+@@ -5246,7 +5177,7 @@ msgstr ""
+ "Umožnit ostatním uživatelům, aby se připojili příkazem Secure Shell:\n"
+ "<a href=\"ssh %s\">ssh %s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:28
++#: ../panels/sharing/sharing.ui.h:26
+ #, no-c-format
+ msgid ""
+ "Allow remote users to view or control your screen by connecting to: <a href="
+@@ -5255,19 +5186,19 @@ msgstr ""
+ "Umožnit vzdáleným uživatelům, aby viděli a ovládali vaši obrazovku přes: <a "
+ "href=\"vnc://%s\">vnc://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:29
++#: ../panels/sharing/sharing.ui.h:27
+ msgid "Remote View"
+ msgstr "Vzdálené zobrazení"
+ 
+-#: ../panels/sharing/sharing.ui.h:30
++#: ../panels/sharing/sharing.ui.h:28
+ msgid "Remote Control"
+ msgstr "Vzdálené ovládání"
+ 
+-#: ../panels/sharing/sharing.ui.h:31
++#: ../panels/sharing/sharing.ui.h:29
+ msgid "Approve All Connections"
+ msgstr "Povolit všechna připojení"
+ 
+-#: ../panels/sharing/sharing.ui.h:32
++#: ../panels/sharing/sharing.ui.h:30
+ msgid "Show Password"
+ msgstr "Zobrazit heslo"
+ 
+@@ -5967,7 +5898,7 @@ msgid "_Full Name"
+ msgstr "_Celé jméno"
+ 
+ #: ../panels/user-accounts/data/account-dialog.ui.h:5
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+ msgid "Account _Type"
+ msgstr "_Typ účtu"
+ 
+@@ -6122,70 +6053,35 @@ msgstr "Současné _heslo"
+ msgid "Ch_ange"
+ msgstr "Změn_it"
+ 
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:1
+-msgid "Changing photo for:"
+-msgstr "Změna fotografie pro:"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
+-msgid ""
+-"Choose a picture that will be shown at the login screen for this account."
+-msgstr ""
+-"Vyberte obrázek, který bude zobrazen na přihlašovací obrazovce u tohoto účtu."
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
+-msgid "Gallery"
+-msgstr "Galerie"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:4
+-#: ../panels/user-accounts/um-photo-dialog.c:218
+-msgid "Browse for more pictures"
+-msgstr "Najít více obrázků"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:5
+-msgid "Take a photograph"
+-msgstr "Pořídit fotografii"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:6
+-msgid "Browse"
+-msgstr "Procházet"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:7
+-msgid "Photograph"
+-msgstr "Fotografie"
+-
+ #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+-msgid "Account Information"
+-msgstr "Informace o účtu"
+-
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Add User Account"
+ msgstr "Přidat uživatelský účet"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Remove User Account"
+ msgstr "Odebrat uživatelský účet"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+ msgid "Login Options"
+ msgstr "Volby přihlašování"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+ msgid "A_utomatic Login"
+ msgstr "A_utomatické přihlašování"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+ msgid "_Fingerprint Login"
+ msgstr "Přihlášení otiskem _prstu"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+ msgid "User Icon"
+ msgstr "Ikona uživatele"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+ msgid "_Language"
+ msgstr "Jazy_k"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+ msgid "Last Login"
+ msgstr "Poslední přihlášení"
+ 
+@@ -6603,6 +6499,10 @@ msgstr "Heslo nelze změnit"
+ msgid "The passwords do not match."
+ msgstr "Hesla si neodpovídají."
+ 
++#: ../panels/user-accounts/um-photo-dialog.c:218
++msgid "Browse for more pictures"
++msgstr "Najít více obrázků"
++
+ #: ../panels/user-accounts/um-photo-dialog.c:443
+ msgid "Disable image"
+ msgstr "Vypnout obrázek"
+@@ -6806,7 +6706,7 @@ msgstr ""
+ "klávesnici zkratkové tlačítko a držíte zmáčknuté nové klávesy, případně je "
+ "pomocí Backspace smažete."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:82
++#: ../panels/wacom/calibrator/calibrator-gui.c:84
+ msgid ""
+ "Please tap the target markers as they appear on screen to calibrate the "
+ "tablet."
+@@ -6814,7 +6714,7 @@ msgstr ""
+ "Klepněte prosím na terčíky, které se objevily na obrazovce a tím "
+ "zkalibrujete tablet."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:86
++#: ../panels/wacom/calibrator/calibrator-gui.c:88
+ msgid "Mis-click detected, restarting..."
+ msgstr "Zjištěno chybějící kliknutí, začíná se znovu…"
+ 
+@@ -6867,7 +6767,7 @@ msgstr "Mapovat na jedinou obrazovku"
+ msgid "%d of %d"
+ msgstr "%d z %d"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:522
++#: ../panels/wacom/cc-wacom-page.c:531
+ msgid "Display Mapping"
+ msgstr "Mapování zobrazení"
+ 
+@@ -7002,22 +6902,22 @@ msgstr "Přepínač režimů pravého dotykového pruhu"
+ msgid "Mode Switch #%d"
+ msgstr "Přepínač režimů č. %d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1336
++#: ../panels/wacom/gsd-wacom-device.c:1335
+ #, c-format
+ msgid "Left Button #%d"
+ msgstr "Levé tlačítko č. %d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1339
++#: ../panels/wacom/gsd-wacom-device.c:1338
+ #, c-format
+ msgid "Right Button #%d"
+ msgstr "Pravé tlačítko č. %d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1342
++#: ../panels/wacom/gsd-wacom-device.c:1341
+ #, c-format
+ msgid "Top Button #%d"
+ msgstr "Horní tlačítko č. %d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1345
++#: ../panels/wacom/gsd-wacom-device.c:1344
+ #, c-format
+ msgid "Bottom Button #%d"
+ msgstr "Dolní tlačítko č. %d"
+@@ -7149,27 +7049,27 @@ msgstr "Nápověda"
+ msgid "Quit"
+ msgstr "Ukončit"
+ 
+-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1479
++#: ../shell/cc-window.c:61 ../shell/cc-window.c:1486
+ msgid "All Settings"
+ msgstr "Všechna nastavení"
+ 
+ #. Add categories
+-#: ../shell/cc-window.c:866
++#: ../shell/cc-window.c:868
+ msgctxt "category"
+ msgid "Personal"
+ msgstr "Osobní"
+ 
+-#: ../shell/cc-window.c:867
++#: ../shell/cc-window.c:869
+ msgctxt "category"
+ msgid "Hardware"
+ msgstr "Hardware"
+ 
+-#: ../shell/cc-window.c:868
++#: ../shell/cc-window.c:870
+ msgctxt "category"
+ msgid "System"
+ msgstr "Systém"
+ 
+-#: ../shell/cc-window.c:1588 ../shell/gnome-control-center.desktop.in.in.h:1
++#: ../shell/cc-window.c:1597 ../shell/gnome-control-center.desktop.in.in.h:1
+ msgid "Settings"
+ msgstr "Nastavení"
+ 
+diff --git a/po/es.po b/po/es.po
+index 1c5ab5e..38e2510 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -14,23 +14,23 @@
+ # 

+ # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.

+ # 

+-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
, 2013.
++# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
, 2013, 2014.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-control-center master\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "control-center&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-09-20 21:45+0000\n"
+-"PO-Revision-Date: 2013-09-22 12:06+0200\n"
++"POT-Creation-Date: 2014-01-13 09:16+0000\n"
++"PO-Revision-Date: 2014-01-13 13:40+0100\n"
+ "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
+-"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
++"Language-Team: Español <gnome-es-list@gnome.org>\n"
+ "Language: de\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: Gtranslator 2.91.6\n"
++"Plural-Forms: nplurals=2; plural=(n!=1);\n"
++"X-Generator: Gtranslator 2.91.5\n"
+ 
+ #: ../panels/background/background.ui.h:1
+ #: ../panels/background/gnome-background-panel.desktop.in.in.h:1
+@@ -77,7 +77,7 @@ msgid "Span"
+ msgstr "Expandir"
+ 
+ #. translators: This is the title of the wallpaper chooser dialog.
+-#: ../panels/background/cc-background-chooser-dialog.c:293
++#: ../panels/background/cc-background-chooser-dialog.c:292
+ msgid "Select Background"
+ msgstr "Seleccionar fondo"
+ 
+@@ -98,32 +98,32 @@ msgid "Flickr"
+ msgstr "Flickr"
+ 
+ #. translators: No pictures were found
+-#: ../panels/background/cc-background-chooser-dialog.c:393
++#: ../panels/background/cc-background-chooser-dialog.c:385
+ msgid "No Pictures Found"
+ msgstr "No se han encontrado imágenes"
+ 
+ #. translators: %s here is the name of the Pictures directory, the string should be translated in
+ #. * the context "You can add images to your Pictures folder and they will show up here"
+-#: ../panels/background/cc-background-chooser-dialog.c:408
++#: ../panels/background/cc-background-chooser-dialog.c:400
+ #, c-format
+ msgid "You can add images to your %s folder and they will show up here"
+ msgstr "Puede añadir imágenes a su carpeta %s y se mostrarán aquí"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:436
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:631
+-#: ../panels/color/cc-color-panel.c:220 ../panels/color/cc-color-panel.c:967
+-#: ../panels/display/cc-display-panel.c:1495
+-#: ../panels/display/cc-display-panel.c:1910
++#: ../panels/background/cc-background-chooser-dialog.c:429
++#: ../panels/bluetooth/cc-bluetooth-panel.c:640
++#: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
++#: ../panels/display/cc-display-panel.c:1510
++#: ../panels/display/cc-display-panel.c:1952
+ #: ../panels/network/connection-editor/vpn-helpers.c:245
+ #: ../panels/network/connection-editor/vpn-helpers.c:374
+-#: ../panels/network/net-device-wifi.c:1201
+-#: ../panels/network/net-device-wifi.c:1407
++#: ../panels/network/net-device-wifi.c:1194
++#: ../panels/network/net-device-wifi.c:1402
+ #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
+ #: ../panels/printers/cc-printers-panel.c:1946
+ #: ../panels/printers/new-printer-dialog.ui.h:2
+-#: ../panels/privacy/cc-privacy-panel.c:467
++#: ../panels/privacy/cc-privacy-panel.c:470
+ #: ../panels/search/cc-search-locations-dialog.c:682
+-#: ../panels/sharing/cc-sharing-panel.c:421
++#: ../panels/sharing/cc-sharing-panel.c:425
+ #: ../panels/user-accounts/um-fingerprint-dialog.c:269
+ #: ../panels/user-accounts/um-photo-dialog.c:96
+ #: ../panels/user-accounts/um-photo-dialog.c:221
+@@ -131,9 +131,8 @@ msgstr "Puede añadir imágenes a su carpeta %s y se mostrarán aquí"
+ msgid "_Cancel"
+ msgstr "_Cancelar"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:437
++#: ../panels/background/cc-background-chooser-dialog.c:430
+ #: ../panels/printers/ppd-selection-dialog.ui.h:3
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:9
+ #: ../panels/user-accounts/um-photo-dialog.c:98
+ msgid "Select"
+ msgstr "Seleccionar"
+@@ -153,7 +152,7 @@ msgstr "%d × %d"
+ msgid "No Desktop Background"
+ msgstr "Sin fondo de escritorio"
+ 
+-#: ../panels/background/cc-background-panel.c:492
++#: ../panels/background/cc-background-panel.c:493
+ msgid "Current background"
+ msgstr "Fondo actual"
+ 
+@@ -170,7 +169,7 @@ msgstr "Fondo de pantalla;Pantalla;Escritorio;"
+ msgid "Set Up New Device"
+ msgstr "Configurar un dispositivo nuevo"
+ 
+-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
++#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
+ msgid "Remove Device"
+ msgstr "Quitar dispositivo"
+ 
+@@ -224,50 +223,50 @@ msgstr "Configuración del teclado"
+ msgid "Send Files…"
+ msgstr "Enviar archivos…"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
+ msgid "Yes"
+ msgstr "Sí"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
+ msgid "No"
+ msgstr "No"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:470
++#: ../panels/bluetooth/cc-bluetooth-panel.c:479
+ msgid "Bluetooth is disabled"
+ msgstr "Bluetooth está desactivado"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:475
++#: ../panels/bluetooth/cc-bluetooth-panel.c:484
+ msgid "Bluetooth is disabled by hardware switch"
+ msgstr "El Bluetooth está físicamente desactivado"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:479
++#: ../panels/bluetooth/cc-bluetooth-panel.c:488
+ msgid "No Bluetooth adapters found"
+ msgstr "No se encontraron adaptadores Bluetooth"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:578
++#: ../panels/bluetooth/cc-bluetooth-panel.c:587
+ msgid "Visibility"
+ msgstr "Visibilidad"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:582
++#: ../panels/bluetooth/cc-bluetooth-panel.c:591
+ #, c-format
+ msgid "Visibility of “%s”"
+ msgstr "Visibilidad de «%s»"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:626
++#: ../panels/bluetooth/cc-bluetooth-panel.c:635
+ #, c-format
+ msgid "Remove '%s' from the list of devices?"
+ msgstr "¿Quitar «%s» de la lista de dispositivos?"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:628
++#: ../panels/bluetooth/cc-bluetooth-panel.c:637
+ msgid ""
+ "If you remove the device, you will have to set it up again before next use."
+ msgstr ""
+ "Si quita el dispositivo, deberá configurarlo otra vez antes de usarlo "
+ "nuevamente."
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:632
++#: ../panels/bluetooth/cc-bluetooth-panel.c:641
+ #: ../panels/online-accounts/cc-online-accounts-panel.c:844
+ msgid "_Remove"
+ msgstr "_Quitar"
+@@ -281,7 +280,7 @@ msgid "Turn Bluetooth on and off and connect your devices"
+ msgstr "Activar y desactivar Bluetooth y conectar sus dispositivos"
+ 
+ #. TRANSLATORS: The user has to attach the sensor to the screen
+-#: ../panels/color/cc-color-calibrate.c:360
++#: ../panels/color/cc-color-calibrate.c:361
+ msgid "Place your calibration device over the square and press 'Start'"
+ msgstr ""
+ "Coloque su dispositivo de calibración sobre el cuadrado y pulse «Iniciar»"
+@@ -289,7 +288,7 @@ msgstr ""
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:366
++#: ../panels/color/cc-color-calibrate.c:367
+ msgid ""
+ "Move your calibration device to the calibrate position and press 'Continue'"
+ msgstr ""
+@@ -299,7 +298,7 @@ msgstr ""
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:372
++#: ../panels/color/cc-color-calibrate.c:373
+ msgid ""
+ "Move your calibration device to the surface position and press 'Continue'"
+ msgstr ""
+@@ -309,54 +308,54 @@ msgstr ""
+ #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
+ #. * is built into the palmrest and we need to fullscreen the
+ #. * sample widget and shut the lid.
+-#: ../panels/color/cc-color-calibrate.c:378
++#: ../panels/color/cc-color-calibrate.c:379
+ msgid "Shut the laptop lid"
+ msgstr "Apagar la tapa del portátil"
+ 
+ #. TRANSLATORS: We suck, the calibation failed and we have no
+ #. * good idea why or any suggestions
+-#: ../panels/color/cc-color-calibrate.c:409
++#: ../panels/color/cc-color-calibrate.c:410
+ msgid "An internal error occurred that could not be recovered."
+ msgstr "Ocurrió un error interno y no se pudo recuperar."
+ 
+ #. TRANSLATORS: Some required-at-runtime tools were not
+ #. * installed, which should only affect insane distros
+-#: ../panels/color/cc-color-calibrate.c:414
++#: ../panels/color/cc-color-calibrate.c:415
+ msgid "Tools required for calibration are not installed."
+ msgstr "Las herramientas requeridas para la calibración no están instaladas."
+ 
+ #. TRANSLATORS: The profile failed for some reason
+-#: ../panels/color/cc-color-calibrate.c:420
++#: ../panels/color/cc-color-calibrate.c:421
+ msgid "The profile could not be generated."
+ msgstr "No se puede generar el perfil"
+ 
+ #. TRANSLATORS: The user specified a whitepoint that was
+ #. * unobtainable with the hardware they've got -- see
+ #. * https://en.wikipedia.org/wiki/White_point for details
+-#: ../panels/color/cc-color-calibrate.c:426
++#: ../panels/color/cc-color-calibrate.c:427
+ msgid "The target whitepoint was not obtainable."
+ msgstr "No se pudo obtener el punto blanco del objetivo"
+ 
+ #. TRANSLATORS: the display calibration process is finished
+-#: ../panels/color/cc-color-calibrate.c:466
++#: ../panels/color/cc-color-calibrate.c:467
+ msgid "Complete!"
+ msgstr "Completado"
+ 
+ #. TRANSLATORS: the display calibration failed, and we also show
+ #. * the translated (or untranslated) error string after this
+-#: ../panels/color/cc-color-calibrate.c:474
++#: ../panels/color/cc-color-calibrate.c:475
+ msgid "Calibration failed!"
+ msgstr "Falló la configuración."
+ 
+ #. TRANSLATORS: The user can now remove the sensor from the screen
+-#: ../panels/color/cc-color-calibrate.c:481
++#: ../panels/color/cc-color-calibrate.c:482
+ msgid "You can remove the calibration device."
+ msgstr "Puede quitar el dispositivo de calibración."
+ 
+ #. TRANSLATORS: The user has to be careful not to knock the
+ #. * display off the screen (although we do cope if this is
+ #. * detected early enough)
+-#: ../panels/color/cc-color-calibrate.c:552
++#: ../panels/color/cc-color-calibrate.c:553
+ msgid "Do not disturb the calibration device while in progress"
+ msgstr "No interrumpir al dispositivo de calibración cuando está en progreso"
+ 
+@@ -418,48 +417,48 @@ msgstr "Sin calibrar"
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile has been auto-generated for this hardware
+-#: ../panels/color/cc-color-panel.c:135
++#: ../panels/color/cc-color-panel.c:137
+ msgid "Default: "
+ msgstr "Predeterminado: "
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile his a standard space like AdobeRGB
+-#: ../panels/color/cc-color-panel.c:143
++#: ../panels/color/cc-color-panel.c:145
+ msgid "Colorspace: "
+ msgstr "Espacio de color: "
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile is a test profile
+-#: ../panels/color/cc-color-panel.c:150
++#: ../panels/color/cc-color-panel.c:152
+ msgid "Test profile: "
+ msgstr "Perfil de color: "
+ 
+ #. TRANSLATORS: an ICC profile is a file containing colorspace data
+-#: ../panels/color/cc-color-panel.c:218
++#: ../panels/color/cc-color-panel.c:219
+ msgid "Select ICC Profile File"
+ msgstr "Seleccionar archivo de perfil ICC"
+ 
+-#: ../panels/color/cc-color-panel.c:221
++#: ../panels/color/cc-color-panel.c:222
+ msgid "_Import"
+ msgstr "_Importar"
+ 
+ #. TRANSLATORS: filter name on the file->open dialog
+-#: ../panels/color/cc-color-panel.c:232
++#: ../panels/color/cc-color-panel.c:233
+ msgid "Supported ICC profiles"
+ msgstr "Perfiles ICC soportados"
+ 
+ #. TRANSLATORS: filter name on the file->open dialog
+-#: ../panels/color/cc-color-panel.c:239
++#: ../panels/color/cc-color-panel.c:240
+ #: ../panels/network/wireless-security/eap-method-fast.c:410
+ msgid "All files"
+ msgstr "Todos los archivos"
+ 
+-#: ../panels/color/cc-color-panel.c:586
++#: ../panels/color/cc-color-panel.c:579
+ msgid "Screen"
+ msgstr "Pantalla"
+ 
+ #. TRANSLATORS: this is when the upload of the profile failed
+-#: ../panels/color/cc-color-panel.c:912
++#: ../panels/color/cc-color-panel.c:903
+ #, c-format
+ msgid "Failed to upload file: %s"
+ msgstr "Falló al subir el archivo: %s"
+@@ -467,39 +466,39 @@ msgstr "Falló al subir el archivo: %s"
+ #. TRANSLATORS: these are instructions on how to recover
+ #. * the ICC profile on the native operating system and are
+ #. * only shown when the user uses a LiveCD to calibrate
+-#: ../panels/color/cc-color-panel.c:926
++#: ../panels/color/cc-color-panel.c:917
+ msgid "The profile has been uploaded to:"
+ msgstr "El perfil se ha subido a:"
+ 
+-#: ../panels/color/cc-color-panel.c:928
++#: ../panels/color/cc-color-panel.c:919
+ msgid "Write down this URL."
+ msgstr "Anote este URL"
+ 
+-#: ../panels/color/cc-color-panel.c:929
++#: ../panels/color/cc-color-panel.c:920
+ msgid "Restart this computer and boot your normal operating system."
+ msgstr "Reinicie el equipo y arranque su sistema operativo normal."
+ 
+-#: ../panels/color/cc-color-panel.c:930
++#: ../panels/color/cc-color-panel.c:921
+ msgid "Type the URL into your browser to download and install the profile."
+ msgstr "Escriba el URL en su navegador para descargar e instalar el perfil."
+ 
+ #. TRANSLATORS: this is the dialog to save the ICC profile
+-#: ../panels/color/cc-color-panel.c:964
++#: ../panels/color/cc-color-panel.c:955
+ msgid "Save Profile"
+ msgstr "Guardar perfil"
+ 
+-#: ../panels/color/cc-color-panel.c:968
++#: ../panels/color/cc-color-panel.c:959
+ #: ../panels/network/connection-editor/vpn-helpers.c:375
+ msgid "_Save"
+ msgstr "_Guardar"
+ 
+ #. TRANSLATORS: this is when the button is sensitive
+-#: ../panels/color/cc-color-panel.c:1328
++#: ../panels/color/cc-color-panel.c:1315
+ msgid "Create a color profile for the selected device"
+ msgstr "Crear un perfil de color para el dispositivo seleccionado"
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1343 ../panels/color/cc-color-panel.c:1367
++#: ../panels/color/cc-color-panel.c:1330 ../panels/color/cc-color-panel.c:1354
+ msgid ""
+ "The measuring instrument is not detected. Please check it is turned on and "
+ "correctly connected."
+@@ -508,12 +507,12 @@ msgstr ""
+ "correctamente conectado."
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1377
++#: ../panels/color/cc-color-panel.c:1364
+ msgid "The measuring instrument does not support printer profiling."
+ msgstr "El instrumento de medida no soporta perfilado de impresoras."
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1388
++#: ../panels/color/cc-color-panel.c:1375
+ msgid "The device type is not currently supported."
+ msgstr "El tipo de dispositivo actualmente no está soportado."
+ 
+@@ -602,7 +601,6 @@ msgstr "Calibración de la pantalla"
+ #: ../panels/color/color-calibrate.ui.h:2
+ #: ../panels/printers/authentication-dialog.ui.h:2
+ #: ../panels/printers/ppd-selection-dialog.ui.h:2
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:8
+ #: ../panels/user-accounts/um-account-dialog.c:1470
+ msgid "Cancel"
+ msgstr "Cancelar"
+@@ -623,10 +621,10 @@ msgid "Done"
+ msgstr "Hecho"
+ 
+ #. Timeout parameters
+-#. 5000 = 5 sec
++#. 15000 = 15 sec
+ #. 750 = 0.75 sec
+ #. Text printed on screen
+-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
++#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:83
+ msgid "Screen Calibration"
+ msgstr "Calibración de la pantalla"
+ 
+@@ -771,168 +769,148 @@ msgstr ""
+ "href=\"\">Mostrar detalles.</a>"
+ 
+ #: ../panels/color/color.ui.h:30
+-msgid "Device type:"
+-msgstr "Tipo de dispositivo:"
+-
+-#: ../panels/color/color.ui.h:31
+-msgid "Manufacturer:"
+-msgstr "Fabricante:"
+-
+-#: ../panels/color/color.ui.h:32
+-msgid "Model:"
+-msgstr "Modelo:"
+-
+-#: ../panels/color/color.ui.h:33
+-msgid ""
+-"Image files can be dragged on this window to auto-complete the above fields."
+-msgstr ""
+-"Se pueden arrastrar archivos de imagen en esta ventana para autocompletar "
+-"los campos superiores."
+-
+-#: ../panels/color/color.ui.h:34
+-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+-msgid "Color"
+-msgstr "Color"
+-
+-#: ../panels/color/color.ui.h:35
+ msgid "Each device needs an up to date color profile to be color managed."
+ msgstr ""
+ "Cada dispositivo necesita un perfil de color actualizado para poder "
+ "gestionar el color."
+ 
+-#: ../panels/color/color.ui.h:36
++#: ../panels/color/color.ui.h:31
+ msgid "Learn more"
+ msgstr "Aprender más"
+ 
+-#: ../panels/color/color.ui.h:37
++#: ../panels/color/color.ui.h:32
+ msgid "Learn more about color management"
+ msgstr "Aprenda más acerca de la gestión de color"
+ 
+-#: ../panels/color/color.ui.h:38
++#: ../panels/color/color.ui.h:33
+ msgid "Set for all users"
+ msgstr "Establecer para todos los usuarios"
+ 
+-#: ../panels/color/color.ui.h:39
++#: ../panels/color/color.ui.h:34
+ msgid "Set this profile for all users on this computer"
+ msgstr "Establecer este perfil para todos los usuarios de este equipo"
+ 
+-#: ../panels/color/color.ui.h:40
++#: ../panels/color/color.ui.h:35
+ msgid "Enable"
+ msgstr "Activar"
+ 
+-#: ../panels/color/color.ui.h:41
++#: ../panels/color/color.ui.h:36
+ msgid "Add profile"
+ msgstr "Añadir perfil"
+ 
+-#: ../panels/color/color.ui.h:42
++#: ../panels/color/color.ui.h:37
+ #: ../panels/wacom/gnome-wacom-properties.ui.h:10
+ msgid "Calibrate…"
+ msgstr "Calibrar…"
+ 
+-#: ../panels/color/color.ui.h:43
++#: ../panels/color/color.ui.h:38
+ msgid "Calibrate the device"
+ msgstr "Calibrar el dispositivo"
+ 
+-#: ../panels/color/color.ui.h:44
++#: ../panels/color/color.ui.h:39
+ msgid "Remove profile"
+ msgstr "Quitar perfil"
+ 
+-#: ../panels/color/color.ui.h:45
++#: ../panels/color/color.ui.h:40
+ msgid "View details"
+ msgstr "Ver detalles"
+ 
+-#: ../panels/color/color.ui.h:46
++#: ../panels/color/color.ui.h:41
+ msgid "Unable to detect any devices that can be color managed"
+ msgstr "So se han detectado dispositivos que se puedan gestionar por color"
+ 
+-#: ../panels/color/color.ui.h:47
++#: ../panels/color/color.ui.h:42
+ msgid "LCD"
+ msgstr "LCD"
+ 
+-#: ../panels/color/color.ui.h:48
++#: ../panels/color/color.ui.h:43
+ msgid "LED"
+ msgstr "LED"
+ 
+-#: ../panels/color/color.ui.h:49
++#: ../panels/color/color.ui.h:44
+ msgid "CRT"
+ msgstr "CRT"
+ 
+-#: ../panels/color/color.ui.h:50
++#: ../panels/color/color.ui.h:45
+ msgid "Projector"
+ msgstr "Proyector"
+ 
+-#: ../panels/color/color.ui.h:51
++#: ../panels/color/color.ui.h:46
+ msgid "Plasma"
+ msgstr "Plasma"
+ 
+-#: ../panels/color/color.ui.h:52
++#: ../panels/color/color.ui.h:47
+ msgid "LCD (CCFL backlight)"
+ msgstr "LCD (CCFL retroiluminado)"
+ 
+-#: ../panels/color/color.ui.h:53
++#: ../panels/color/color.ui.h:48
+ msgid "LCD (RGB LED backlight)"
+ msgstr "LCD (RGB LED retroiluminado)"
+ 
+-#: ../panels/color/color.ui.h:54
++#: ../panels/color/color.ui.h:49
+ msgid "LCD (white LED backlight)"
+ msgstr "LCD (LED blanco retroiluminado)"
+ 
+-#: ../panels/color/color.ui.h:55
++#: ../panels/color/color.ui.h:50
+ msgid "Wide gamut LCD (CCFL backlight)"
+ msgstr "Gama LCD amplio (CCFL retroiluminado)"
+ 
+-#: ../panels/color/color.ui.h:56
++#: ../panels/color/color.ui.h:51
+ msgid "Wide gamut LCD (RGB LED backlight)"
+ msgstr "Gama LCD amplio (RGB LED retroiluminado)"
+ 
+-#: ../panels/color/color.ui.h:57
++#: ../panels/color/color.ui.h:52
+ msgctxt "Calibration quality"
+ msgid "High"
+ msgstr "Alta"
+ 
+-#: ../panels/color/color.ui.h:58
++#: ../panels/color/color.ui.h:53
+ msgid "40 minutes"
+ msgstr "40 minutos"
+ 
+-#: ../panels/color/color.ui.h:59
++#: ../panels/color/color.ui.h:54
+ msgctxt "Calibration quality"
+ msgid "Medium"
+ msgstr "Media"
+ 
+-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:4
++#: ../panels/color/color.ui.h:55 ../panels/power/power.ui.h:4
+ #: ../panels/privacy/privacy.ui.h:7
+ msgid "30 minutes"
+ msgstr "30 minutos"
+ 
+-#: ../panels/color/color.ui.h:61
++#: ../panels/color/color.ui.h:56
+ msgctxt "Calibration quality"
+ msgid "Low"
+ msgstr "Baja"
+ 
+-#: ../panels/color/color.ui.h:62 ../panels/power/power.ui.h:3
++#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:3
+ msgid "15 minutes"
+ msgstr "15 minutos"
+ 
+-#: ../panels/color/color.ui.h:63
++#: ../panels/color/color.ui.h:58
+ msgid "Native to display"
+ msgstr "Nativo de la pantalla"
+ 
+-#: ../panels/color/color.ui.h:64
++#: ../panels/color/color.ui.h:59
+ msgid "D50 (Printing and publishing)"
+ msgstr "D50 (Impresiones y publicaciones)"
+ 
+-#: ../panels/color/color.ui.h:65
++#: ../panels/color/color.ui.h:60
+ msgid "D55"
+ msgstr "D55"
+ 
+-#: ../panels/color/color.ui.h:66
++#: ../panels/color/color.ui.h:61
+ msgid "D65 (Photography and graphics)"
+ msgstr "D65 (Fotografía y gráficos)"
+ 
+-#: ../panels/color/color.ui.h:67
++#: ../panels/color/color.ui.h:62
+ msgid "D75"
+ msgstr "D75"
+ 
++#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
++msgid "Color"
++msgstr "Color"
++
+ #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+ msgid ""
+ "Calibrate the color of your devices, such as displays, cameras or printers"
+@@ -984,33 +962,33 @@ msgid "Language"
+ msgstr "Idioma"
+ 
+ #: ../panels/common/language-chooser.ui.h:2
+-#: ../panels/mouse/cc-mouse-panel.c:120 ../panels/region/format-chooser.ui.h:2
++#: ../panels/mouse/cc-mouse-panel.c:111 ../panels/region/format-chooser.ui.h:2
+ msgid "_Done"
+ msgstr "_Hecho"
+ 
+ #. Translators: This is the full date and time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:352
++#: ../panels/datetime/cc-datetime-panel.c:363
+ msgid "%e %B %Y, %l:%M %p"
+ msgstr "%d/%b/%Y, %I:%M"
+ 
+ #. Translators: This is the full date and time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:357
++#: ../panels/datetime/cc-datetime-panel.c:368
+ msgid "%e %B %Y, %R"
+ msgstr "%d/%b/%Y, %H:%M"
+ 
+ #. Translators: UTC here means the Coordinated Universal Time.
+ #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
+-#: ../panels/datetime/cc-datetime-panel.c:573
++#: ../panels/datetime/cc-datetime-panel.c:584
+ msgid "UTC%:::z"
+ msgstr "UTC%:::z"
+ 
+ #. Translators: This is the time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:578
++#: ../panels/datetime/cc-datetime-panel.c:589
+ msgid "%l:%M %p"
+ msgstr "%H:%M"
+ 
+ #. Translators: This is the time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:583
++#: ../panels/datetime/cc-datetime-panel.c:594
+ msgid "%R"
+ msgstr "%R"
+ 
+@@ -1150,144 +1128,109 @@ msgid "To change time or date settings, you need to authenticate."
+ msgstr ""
+ "Para cambiar la configuración de la fecha o de la hora, debe autenticarse."
+ 
+-#: ../panels/display/cc-display-panel.c:473
++#: ../panels/display/cc-display-panel.c:486
+ msgid "Lid Closed"
+ msgstr "Tapa cerrada"
+ 
+ #. translators: "Mirrored" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:476
++#: ../panels/display/cc-display-panel.c:489
+ msgid "Mirrored"
+ msgstr "En espejo"
+ 
+-#: ../panels/display/cc-display-panel.c:478
+-#: ../panels/display/cc-display-panel.c:2043
+-#: ../panels/display/display-capplet.ui.h:1
++#: ../panels/display/cc-display-panel.c:491
++#: ../panels/display/cc-display-panel.c:2101
+ msgid "Primary"
+ msgstr "Primaria"
+ 
+-#: ../panels/display/cc-display-panel.c:480
++#: ../panels/display/cc-display-panel.c:493
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1727 ../panels/power/cc-power-panel.c:1738
+-#: ../panels/privacy/cc-privacy-panel.c:77
+-#: ../panels/privacy/cc-privacy-panel.c:117
+-#: ../panels/universal-access/cc-ua-panel.c:253
+-#: ../panels/universal-access/cc-ua-panel.c:610
+-#: ../panels/universal-access/cc-ua-panel.c:736
++#: ../panels/power/cc-power-panel.c:1738 ../panels/power/cc-power-panel.c:1749
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ #: ../panels/universal-access/uap.ui.h:6
+ msgid "Off"
+ msgstr "Apagado"
+ 
+-#: ../panels/display/cc-display-panel.c:483
++#: ../panels/display/cc-display-panel.c:496
+ msgid "Secondary"
+ msgstr "Secundaria"
+ 
+-#: ../panels/display/cc-display-panel.c:1491
++#: ../panels/display/cc-display-panel.c:1506
+ msgid "Arrange Combined Displays"
+ msgstr "Ordenar las pantallas combinadas"
+ 
+-#: ../panels/display/cc-display-panel.c:1497
+-#: ../panels/display/cc-display-panel.c:1913
++#: ../panels/display/cc-display-panel.c:1512
++#: ../panels/display/cc-display-panel.c:1955
+ #: ../panels/network/connection-editor/connection-editor.ui.h:1
+ msgid "_Apply"
+ msgstr "_Aplicar"
+ 
+-#: ../panels/display/cc-display-panel.c:1518
++#: ../panels/display/cc-display-panel.c:1533
+ msgid "Drag displays to rearrange them"
+ msgstr "Arrastrar las pantallas para reordenarlas"
+ 
+-#. size
+-#: ../panels/display/cc-display-panel.c:1977
++#: ../panels/display/cc-display-panel.c:2037
+ msgid "Size"
+ msgstr "Tamaño"
+ 
+ #. aspect ratio
+-#: ../panels/display/cc-display-panel.c:1992
+-#: ../panels/display/display-capplet.ui.h:12
++#: ../panels/display/cc-display-panel.c:2050
+ msgid "Aspect Ratio"
+ msgstr "Proporción de aspecto"
+ 
+-#: ../panels/display/cc-display-panel.c:2013
+-#: ../panels/display/display-capplet.ui.h:13
++#: ../panels/display/cc-display-panel.c:2071
+ #: ../panels/printers/pp-options-dialog.c:86
+ msgid "Resolution"
+ msgstr "Resolución"
+ 
+-#: ../panels/display/cc-display-panel.c:2044
+-#: ../panels/display/display-capplet.ui.h:2
++#: ../panels/display/cc-display-panel.c:2102
+ msgid "Show the top bar and Activities Overview on this display"
+ msgstr "Mostrar la barra superior y la vista de actividades en esta pantalla"
+ 
+-#: ../panels/display/cc-display-panel.c:2050
++#: ../panels/display/cc-display-panel.c:2108
+ msgid "Secondary Display"
+ msgstr "Pantalla secundaria"
+ 
+-#: ../panels/display/cc-display-panel.c:2051
++#: ../panels/display/cc-display-panel.c:2109
+ msgid "Join this display with another to create an extra workspace"
+ msgstr "Unir esta pantalla a otra para crear un área de trabajo adicional"
+ 
+-#: ../panels/display/cc-display-panel.c:2058
+-#: ../panels/display/display-capplet.ui.h:3
++#: ../panels/display/cc-display-panel.c:2116
+ msgid "Presentation"
+ msgstr "Presentación"
+ 
+-#: ../panels/display/cc-display-panel.c:2059
+-#: ../panels/display/display-capplet.ui.h:4
++#: ../panels/display/cc-display-panel.c:2117
+ msgid "Show slideshows and media only"
+ msgstr "Mostrar sólo diapositivas y multimedia"
+ 
+ #. translators: "Mirror" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:2064
+-#: ../panels/display/display-capplet.ui.h:5
++#: ../panels/display/cc-display-panel.c:2122
+ msgid "Mirror"
+ msgstr "Espejo"
+ 
+-#: ../panels/display/cc-display-panel.c:2065
++#: ../panels/display/cc-display-panel.c:2123
+ msgid "Show your existing view on both displays"
+ msgstr "Mostrar la vista existente en ambas pantallas"
+ 
+-#: ../panels/display/cc-display-panel.c:2071
+-#: ../panels/display/display-capplet.ui.h:9
++#: ../panels/display/cc-display-panel.c:2129
+ msgid "Turn Off"
+ msgstr "Apagar"
+ 
+-#: ../panels/display/cc-display-panel.c:2072
+-#| msgid "Don't use the display"
++#: ../panels/display/cc-display-panel.c:2130
+ msgid "Don't use this display"
+ msgstr "No usar esta pantalla"
+ 
+-#: ../panels/display/cc-display-panel.c:2289
++#: ../panels/display/cc-display-panel.c:2345
+ msgid "Could not get screen information"
+ msgstr "No se pudo obtener la información de la pantalla"
+ 
+-#: ../panels/display/cc-display-panel.c:2320
++#: ../panels/display/cc-display-panel.c:2376
+ msgid "_Arrange Combined Displays"
+ msgstr "_Ordenar las pantallas combinadas"
+ 
+-#: ../panels/display/display-capplet.ui.h:6
+-msgid "Show your primary display on this screen also"
+-msgstr "Mostrar su pantalla primaria también en este monitor"
+-
+-#: ../panels/display/display-capplet.ui.h:7
+-msgid "Combine"
+-msgstr "Combinar"
+-
+-#: ../panels/display/display-capplet.ui.h:8
+-msgid "Join with the primary display to create an extra space"
+-msgstr "Unir a la pantalla primaria para crear un espacio adicional"
+-
+-#: ../panels/display/display-capplet.ui.h:10
+-msgid "Don't use the display"
+-msgstr "No usar la pantalla"
+-
+-#: ../panels/display/display-capplet.ui.h:11
+-#: ../panels/printers/printers.ui.h:12
+-msgid "Model"
+-msgstr "Modelo"
+-
+-#: ../panels/display/display-capplet.ui.h:14
+-msgid "Refresh Rate"
+-msgstr "Tasa de refresco"
+-
+ #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
+ msgid "Displays"
+ msgstr "Pantallas"
+@@ -1302,55 +1245,55 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
+ msgstr "Panel;Proyector;xranrd;Pantalla;Resolución;Actualizar;"
+ 
+ #. TRANSLATORS: AP type
+-#: ../panels/info/cc-info-panel.c:450 ../panels/network/panel-common.c:127
++#: ../panels/info/cc-info-panel.c:452 ../panels/network/panel-common.c:127
+ msgid "Unknown"
+ msgstr "Desconocido"
+ 
+-#: ../panels/info/cc-info-panel.c:532
++#: ../panels/info/cc-info-panel.c:539
+ #, c-format
+ msgid "%s %d-bit"
+ msgstr "%s %d-bit"
+ 
+-#: ../panels/info/cc-info-panel.c:534
++#: ../panels/info/cc-info-panel.c:541
+ #, c-format
+ msgid "%d-bit"
+ msgstr "%d-bit"
+ 
+-#: ../panels/info/cc-info-panel.c:1214
++#: ../panels/info/cc-info-panel.c:1221
+ msgid "Ask what to do"
+ msgstr "Preguntar qué hacer"
+ 
+-#: ../panels/info/cc-info-panel.c:1218
++#: ../panels/info/cc-info-panel.c:1225
+ msgid "Do nothing"
+ msgstr "No hacer nada"
+ 
+-#: ../panels/info/cc-info-panel.c:1222
++#: ../panels/info/cc-info-panel.c:1229
+ msgid "Open folder"
+ msgstr "Abrir carpeta"
+ 
+-#: ../panels/info/cc-info-panel.c:1313
++#: ../panels/info/cc-info-panel.c:1320
+ msgid "Other Media"
+ msgstr "Otros soportes"
+ 
+-#: ../panels/info/cc-info-panel.c:1344
++#: ../panels/info/cc-info-panel.c:1351
+ msgid "Select an application for audio CDs"
+ msgstr "Seleccionar una aplicación para CD de sonido"
+ 
+-#: ../panels/info/cc-info-panel.c:1345
++#: ../panels/info/cc-info-panel.c:1352
+ msgid "Select an application for video DVDs"
+ msgstr "Seleccionar una aplicación para DVD de vídeo"
+ 
+-#: ../panels/info/cc-info-panel.c:1346
++#: ../panels/info/cc-info-panel.c:1353
+ msgid "Select an application to run when a music player is connected"
+ msgstr ""
+ "Seleccionar una aplicación que ejecutar cuando se conecta un reproductor de "
+ "música"
+ 
+-#: ../panels/info/cc-info-panel.c:1347
++#: ../panels/info/cc-info-panel.c:1354
+ msgid "Select an application to run when a camera is connected"
+ msgstr "Seleccionar una aplicación que ejecutar cuando se conecta una cámara"
+ 
+-#: ../panels/info/cc-info-panel.c:1348
++#: ../panels/info/cc-info-panel.c:1355
+ msgid "Select an application for software CDs"
+ msgstr "Seleccionar una aplicación para CD de software"
+ 
+@@ -1359,89 +1302,89 @@ msgstr "Seleccionar una aplicación para CD de software"
+ #. * If the shared-mime-info translation works for your language,
+ #. * simply leave these untranslated.
+ #.
+-#: ../panels/info/cc-info-panel.c:1360
++#: ../panels/info/cc-info-panel.c:1367
+ msgid "audio DVD"
+ msgstr "DVD de sonido"
+ 
+-#: ../panels/info/cc-info-panel.c:1361
++#: ../panels/info/cc-info-panel.c:1368
+ msgid "blank Blu-ray disc"
+ msgstr "disco Blu-ray virgen"
+ 
+-#: ../panels/info/cc-info-panel.c:1362
++#: ../panels/info/cc-info-panel.c:1369
+ msgid "blank CD disc"
+ msgstr "CD virgen"
+ 
+-#: ../panels/info/cc-info-panel.c:1363
++#: ../panels/info/cc-info-panel.c:1370
+ msgid "blank DVD disc"
+ msgstr "DVD virgen"
+ 
+-#: ../panels/info/cc-info-panel.c:1364
++#: ../panels/info/cc-info-panel.c:1371
+ msgid "blank HD DVD disc"
+ msgstr "disco HD DVD virgen"
+ 
+-#: ../panels/info/cc-info-panel.c:1365
++#: ../panels/info/cc-info-panel.c:1372
+ msgid "Blu-ray video disc"
+ msgstr "Disco Blu-ray de vídeo"
+ 
+-#: ../panels/info/cc-info-panel.c:1366
++#: ../panels/info/cc-info-panel.c:1373
+ msgid "e-book reader"
+ msgstr "lector de libros electrónicos"
+ 
+-#: ../panels/info/cc-info-panel.c:1367
++#: ../panels/info/cc-info-panel.c:1374
+ msgid "HD DVD video disc"
+ msgstr "Disco HD DVD de vídeo"
+ 
+-#: ../panels/info/cc-info-panel.c:1368
++#: ../panels/info/cc-info-panel.c:1375
+ msgid "Picture CD"
+ msgstr "CD de imágenes"
+ 
+-#: ../panels/info/cc-info-panel.c:1369
++#: ../panels/info/cc-info-panel.c:1376
+ msgid "Super Video CD"
+ msgstr "Super Video CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1370
++#: ../panels/info/cc-info-panel.c:1377
+ msgid "Video CD"
+ msgstr "Video CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1371
++#: ../panels/info/cc-info-panel.c:1378
+ msgid "Windows software"
+ msgstr "Software de Windows"
+ 
+-#: ../panels/info/cc-info-panel.c:1372
++#: ../panels/info/cc-info-panel.c:1379
+ msgid "Software"
+ msgstr "Software"
+ 
+-#: ../panels/info/cc-info-panel.c:1495
++#: ../panels/info/cc-info-panel.c:1502
+ #: ../panels/keyboard/keyboard-shortcuts.c:1696
+ msgid "Section"
+ msgstr "Sección"
+ 
+-#: ../panels/info/cc-info-panel.c:1504 ../panels/info/info.ui.h:13
++#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:13
+ msgid "Overview"
+ msgstr "Visión general"
+ 
+-#: ../panels/info/cc-info-panel.c:1510 ../panels/info/info.ui.h:20
++#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:20
+ msgid "Default Applications"
+ msgstr "Aplicaciones predeterminadas"
+ 
+-#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:28
++#: ../panels/info/cc-info-panel.c:1522 ../panels/info/info.ui.h:28
+ msgid "Removable Media"
+ msgstr "Soportes extraíbles"
+ 
+-#: ../panels/info/cc-info-panel.c:1540
++#: ../panels/info/cc-info-panel.c:1547
+ #, c-format
+ msgid "Version %s"
+ msgstr "Versión %s"
+ 
+-#: ../panels/info/cc-info-panel.c:1590
++#: ../panels/info/cc-info-panel.c:1597
+ msgid "Install Updates"
+ msgstr "Instalar actualizaciones"
+ 
+-#: ../panels/info/cc-info-panel.c:1594
++#: ../panels/info/cc-info-panel.c:1601
+ msgid "System Up-To-Date"
+ msgstr "Sistema al día"
+ 
+-#: ../panels/info/cc-info-panel.c:1598
++#: ../panels/info/cc-info-panel.c:1605
+ msgid "Checking for Updates"
+ msgstr "Comprobando actualizaciones"
+ 
+@@ -1607,7 +1550,7 @@ msgid "Eject"
+ msgstr "Expulsar"
+ 
+ #: ../panels/keyboard/01-input-sources.xml.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+ #: ../panels/universal-access/uap.ui.h:11
+ msgid "Typing"
+ msgstr "Escritura"
+@@ -1766,7 +1709,6 @@ msgid "Modifiers-only switch to next source"
+ msgstr "Sólo los modificadores cambian a la fuente siguiente"
+ 
+ #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Keyboard"
+ msgstr "Teclado"
+ 
+@@ -1793,77 +1735,77 @@ msgstr "_Nombre:"
+ msgid "C_ommand:"
+ msgstr "C_omando:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Repeat Keys"
+ msgstr "Repetición de teclas"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+ msgid "Key presses _repeat when key is held down"
+ msgstr ""
+ "La pulsaciones de teclas se _repiten cuando la tecla se mantiene pulsada"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+ msgid "_Delay:"
+ msgstr "_Retardo:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+ msgid "_Speed:"
+ msgstr "Ve_locidad:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
+ msgctxt "keyboard, delay"
+ msgid "Short"
+ msgstr "Corto"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+ msgctxt "keyboard, speed"
+ msgid "Slow"
+ msgstr "Lenta"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+ msgid "Repeat keys speed"
+ msgstr "Velocidad de repetición de teclas"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+ msgctxt "keyboard, delay"
+ msgid "Long"
+ msgstr "Largo"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+ msgctxt "keyboard, speed"
+ msgid "Fast"
+ msgstr "Rápida"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+ msgid "Cursor Blinking"
+ msgstr "Parpadeo del cursor"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+ msgid "Cursor _blinks in text fields"
+ msgstr "El cursor pa_rpadea en los campos de texto"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+ msgid "S_peed:"
+ msgstr "Ve_locidad:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+ msgid "Cursor blink speed"
+ msgstr "Velocidad de parpadeo del cursor"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+ #: ../panels/region/region.ui.h:5
+ msgid "Input Sources"
+ msgstr "Fuente de entrada"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+ msgid "Add Shortcut"
+ msgstr "Añadir atajo"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
+ msgid "Remove Shortcut"
+ msgstr "Quitar atajo"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
+ msgid ""
+ "To edit a shortcut, click the row and hold down the new keys or press "
+ "Backspace to clear."
+@@ -1871,7 +1813,7 @@ msgstr ""
+ "Para editar un atajo nuevo pulse en la fila y mantenga pulsadas las teclas "
+ "nuevas, o pulse Retroceso para eliminarla."
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+ msgid "Shortcuts"
+ msgstr "Atajos"
+ 
+@@ -1915,11 +1857,11 @@ msgstr "Si reasigna la combinación a «%s» se desactivará la combinación «%
+ msgid "_Reassign"
+ msgstr "_Reasignar"
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:100
++#: ../panels/mouse/cc-mouse-panel.c:95
+ msgid "Test Your _Settings"
+ msgstr "_Probar su configuración"
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:117
++#: ../panels/mouse/cc-mouse-panel.c:108
+ msgid "Test Your Settings"
+ msgstr "Probar su configuración"
+ 
+@@ -1941,91 +1883,87 @@ msgstr ""
+ "trackpad;puntero;pulsar;pulsación;doble;botón;trackball;desplazamiento;"
+ 
+ #: ../panels/mouse/gnome-mouse-properties.ui.h:1
+-msgid "Mouse Preferences"
+-msgstr "Preferencias del ratón"
+-
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgid "General"
+ msgstr "General"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
++#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgctxt "double click, speed"
+ msgid "Slow"
+ msgstr "Lenta"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
++#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+ msgid "Double-click timeout"
+ msgstr "Tiempo de espera de la pulsación doble"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
++#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+ msgctxt "double click, speed"
+ msgid "Fast"
+ msgstr "Rápida"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
++#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+ msgid "_Double-click"
+ msgstr "_Doble pulsación"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
++#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+ msgid "Primary _button"
+ msgstr "_Botón primario"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
++#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+ msgctxt "mouse, left button as primary"
+ msgid "_Left"
+ msgstr "_Izquierdo"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
++#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+ msgctxt "mouse, right button as primary"
+ msgid "_Right"
+ msgstr "_Derecho"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
++#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+ msgid "Mouse"
+ msgstr "Ratón"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
++#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+ msgid "_Pointer speed"
+ msgstr "_Velocidad del puntero"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
++#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+ msgctxt "mouse pointer, speed"
+ msgid "Slow"
+ msgstr "Lento"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
++#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+ msgctxt "mouse pointer, speed"
+ msgid "Fast"
+ msgstr "Rápido"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
++#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+ msgid "Touchpad"
+ msgstr "Touchpad"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
++#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+ msgctxt "touchpad pointer, speed"
+ msgid "Slow"
+ msgstr "Lento"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
++#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+ msgctxt "touchpad pointer, speed"
+ msgid "Fast"
+ msgstr "Rápido"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
++#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+ msgid "Disable while _typing"
+ msgstr "Desac_tivar al escribir"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
++#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+ msgid "Tap to _click"
+ msgstr "Tocar para pulsar"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
++#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+ msgid "Two _finger scroll"
+ msgstr "Despla_zamiento con dos dedos"
+ 
+ #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible.
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:21
++#: ../panels/mouse/gnome-mouse-properties.ui.h:20
+ msgid "_Natural scrolling"
+ msgstr "Desplazamiento _natural"
+ 
+@@ -2068,7 +2006,7 @@ msgstr "Una sola pulsación, botón secundario"
+ msgid "Air_plane Mode"
+ msgstr "Modo a_vión"
+ 
+-#: ../panels/network/cc-network-panel.c:928
++#: ../panels/network/cc-network-panel.c:930
+ msgid "Network proxy"
+ msgstr "Proxy de la red"
+ 
+@@ -2076,14 +2014,14 @@ msgstr "Proxy de la red"
+ #. * window for vpn connections, it is also used to display
+ #. * vpn connections in the device list.
+ #.
+-#: ../panels/network/cc-network-panel.c:1107 ../panels/network/net-vpn.c:285
+-#: ../panels/network/net-vpn.c:438
++#: ../panels/network/cc-network-panel.c:1109 ../panels/network/net-vpn.c:278
++#: ../panels/network/net-vpn.c:431
+ #, c-format
+ msgid "%s VPN"
+ msgstr "VPN «%s»"
+ 
+ #. TRANSLATORS: the user is running a NM that is not API compatible
+-#: ../panels/network/cc-network-panel.c:1242
++#: ../panels/network/cc-network-panel.c:1244
+ msgid "The system network services are not compatible with this version."
+ msgstr "Los servicios de red del sistema no son compatibles con esta versión."
+ 
+@@ -2117,34 +2055,34 @@ msgstr "automático"
+ 
+ #. TRANSLATORS: this WEP WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:52
+-#: ../panels/network/net-device-wifi.c:221
+-#: ../panels/network/net-device-wifi.c:382
++#: ../panels/network/net-device-wifi.c:216
++#: ../panels/network/net-device-wifi.c:377
+ msgid "WEP"
+ msgstr "WEP"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:56
+-#: ../panels/network/net-device-wifi.c:225
+-#: ../panels/network/net-device-wifi.c:387
++#: ../panels/network/net-device-wifi.c:220
++#: ../panels/network/net-device-wifi.c:382
+ #: ../panels/network/network-wifi.ui.h:17
+ msgid "WPA"
+ msgstr "WPA"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:60
+-#: ../panels/network/net-device-wifi.c:229
++#: ../panels/network/net-device-wifi.c:224
+ msgid "WPA2"
+ msgstr "WPA2"
+ 
+ #. TRANSLATORS: this Enterprise WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:65
+-#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:229
+ msgid "Enterprise"
+ msgstr "Empresa"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:70
+-#: ../panels/network/net-device-wifi.c:239
+-#: ../panels/network/net-device-wifi.c:372
++#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:367
+ msgctxt "Wifi security"
+ msgid "None"
+ msgstr "Ninguna"
+@@ -2165,8 +2103,8 @@ msgid "Yesterday"
+ msgstr "Ayer"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:106
+-#: ../panels/network/net-device-ethernet.c:125
+-#: ../panels/network/net-device-wifi.c:476
++#: ../panels/network/net-device-ethernet.c:122
++#: ../panels/network/net-device-wifi.c:471
+ #, c-format
+ msgid "%i day ago"
+ msgid_plural "%i days ago"
+@@ -2176,37 +2114,37 @@ msgstr[1] "hace %i días"
+ #. Translators: network device speed
+ #: ../panels/network/connection-editor/ce-page-details.c:155
+ #: ../panels/network/net-device-ethernet.c:53
+-#: ../panels/network/net-device-wifi.c:534
++#: ../panels/network/net-device-wifi.c:528
+ #, c-format
+ msgid "%d Mb/s"
+ msgstr "%d Mb/s"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:181
+-#: ../panels/network/net-device-wifi.c:563
++#: ../panels/network/net-device-wifi.c:557
+ msgctxt "Signal strength"
+ msgid "None"
+ msgstr "Ninguna"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:183
+-#: ../panels/network/net-device-wifi.c:565
++#: ../panels/network/net-device-wifi.c:559
+ msgctxt "Signal strength"
+ msgid "Weak"
+ msgstr "Débil"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:185
+-#: ../panels/network/net-device-wifi.c:567
++#: ../panels/network/net-device-wifi.c:561
+ msgctxt "Signal strength"
+ msgid "Ok"
+ msgstr "Aceptar"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:187
+-#: ../panels/network/net-device-wifi.c:569
++#: ../panels/network/net-device-wifi.c:563
+ msgctxt "Signal strength"
+ msgid "Good"
+ msgstr "Buena"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:189
+-#: ../panels/network/net-device-wifi.c:571
++#: ../panels/network/net-device-wifi.c:565
+ msgctxt "Signal strength"
+ msgid "Excellent"
+ msgstr "Excelente"
+@@ -2352,15 +2290,15 @@ msgid "Link speed"
+ msgstr "Velocidad de conexión"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:4
+-#: ../panels/network/net-device-ethernet.c:158
++#: ../panels/network/net-device-ethernet.c:155
+ #: ../panels/network/network-simple.ui.h:3
+ #: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
+ msgid "IPv4 Address"
+ msgstr "Dirección IPv4"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:5
+-#: ../panels/network/net-device-ethernet.c:159
+-#: ../panels/network/net-device-ethernet.c:163
++#: ../panels/network/net-device-ethernet.c:156
++#: ../panels/network/net-device-ethernet.c:160
+ #: ../panels/network/network-mobile.ui.h:4
+ #: ../panels/network/network-simple.ui.h:4
+ #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
+@@ -2368,14 +2306,14 @@ msgid "IPv6 Address"
+ msgstr "Dirección IPv6"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:6
+-#: ../panels/network/net-device-ethernet.c:166
++#: ../panels/network/net-device-ethernet.c:163
+ #: ../panels/network/network-simple.ui.h:2
+ #: ../panels/network/network-wifi.ui.h:7
+ msgid "Hardware Address"
+ msgstr "Dirección física"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:7
+-#: ../panels/network/net-device-ethernet.c:170
++#: ../panels/network/net-device-ethernet.c:167
+ #: ../panels/network/network-mobile.ui.h:5
+ #: ../panels/network/network-simple.ui.h:5
+ #: ../panels/network/network-wifi.ui.h:8
+@@ -2385,7 +2323,7 @@ msgstr "Ruta predeterminada"
+ #: ../panels/network/connection-editor/details-page.ui.h:8
+ #: ../panels/network/connection-editor/ip4-page.ui.h:3
+ #: ../panels/network/connection-editor/ip6-page.ui.h:3
+-#: ../panels/network/net-device-ethernet.c:172
++#: ../panels/network/net-device-ethernet.c:169
+ #: ../panels/network/network-mobile.ui.h:6
+ #: ../panels/network/network-simple.ui.h:6
+ #: ../panels/network/network-wifi.ui.h:9
+@@ -2531,7 +2469,7 @@ msgid "_Add"
+ msgstr "_Añadir"
+ 
+ #: ../panels/network/connection-editor/net-connection-editor.c:595
+-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
++#: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
+ msgid "VPN"
+ msgstr "VPN"
+ 
+@@ -2539,23 +2477,23 @@ msgstr "VPN"
+ msgid "Bond"
+ msgstr "Bond"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:597
++#: ../panels/network/connection-editor/net-connection-editor.c:598
+ msgid "Bridge"
+ msgstr "Puente"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:598
++#: ../panels/network/connection-editor/net-connection-editor.c:599
+ msgid "VLAN"
+ msgstr "VLAN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:749
++#: ../panels/network/connection-editor/net-connection-editor.c:750
+ msgid "Could not load VPN plugins"
+ msgstr "No se pudieron cargar los complementos de VPN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:818
++#: ../panels/network/connection-editor/net-connection-editor.c:819
+ msgid "Import from file…"
+ msgstr "Importar desde un archivo…"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:889
++#: ../panels/network/connection-editor/net-connection-editor.c:890
+ msgid "Add Network Connection"
+ msgstr "Añadir conexión de red"
+ 
+@@ -2565,7 +2503,7 @@ msgid "_Reset"
+ msgstr "_Reiniciar"
+ 
+ #: ../panels/network/connection-editor/reset-page.ui.h:2
+-#: ../panels/network/net-device-wifi.c:1408
++#: ../panels/network/net-device-wifi.c:1403
+ #: ../panels/network/network-wifi.ui.h:40
+ msgid "_Forget"
+ msgstr "_Olvidar"
+@@ -2614,7 +2552,7 @@ msgstr "Seleccione el archivo que importar"
+ 
+ #: ../panels/network/connection-editor/vpn-helpers.c:246
+ #: ../panels/printers/cc-printers-panel.c:1947
+-#: ../panels/sharing/cc-sharing-panel.c:422
++#: ../panels/sharing/cc-sharing-panel.c:426
+ #: ../panels/user-accounts/um-photo-dialog.c:222
+ msgid "_Open"
+ msgstr "_Abrir"
+@@ -2701,29 +2639,29 @@ msgstr "Asociar esclavos"
+ msgid "Bridge slaves"
+ msgstr "Asociar esclavos"
+ 
+-#: ../panels/network/net-device-ethernet.c:111
+-#: ../panels/network/net-device-wifi.c:462
++#: ../panels/network/net-device-ethernet.c:108
++#: ../panels/network/net-device-wifi.c:457
+ msgid "never"
+ msgstr "nunca"
+ 
+-#: ../panels/network/net-device-ethernet.c:121
+-#: ../panels/network/net-device-wifi.c:472
++#: ../panels/network/net-device-ethernet.c:118
++#: ../panels/network/net-device-wifi.c:467
+ msgid "today"
+ msgstr "hoy"
+ 
+-#: ../panels/network/net-device-ethernet.c:123
+-#: ../panels/network/net-device-wifi.c:474
++#: ../panels/network/net-device-ethernet.c:120
++#: ../panels/network/net-device-wifi.c:469
+ msgid "yesterday"
+ msgstr "ayer"
+ 
+-#: ../panels/network/net-device-ethernet.c:161
++#: ../panels/network/net-device-ethernet.c:158
+ #: ../panels/network/network-mobile.ui.h:3
+ #: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
+ #: ../panels/printers/printers.ui.h:13
+ msgid "IP Address"
+ msgstr "Dirección IP"
+ 
+-#: ../panels/network/net-device-ethernet.c:177
++#: ../panels/network/net-device-ethernet.c:174
+ #: ../panels/network/network-wifi.ui.h:10
+ msgid "Last used"
+ msgstr "Usada última vez"
+@@ -2733,14 +2671,14 @@ msgstr "Usada última vez"
+ #. * profile. It is also used to display ethernet in the
+ #. * device list.
+ #.
+-#: ../panels/network/net-device-ethernet.c:287
++#: ../panels/network/net-device-ethernet.c:284
+ #: ../panels/network/network-ethernet.ui.h:1
+ #: ../panels/network/network-simple.ui.h:1
+ msgid "Wired"
+ msgstr "Cableada"
+ 
+-#: ../panels/network/net-device-ethernet.c:355
+-#: ../panels/network/net-device-wifi.c:1549
++#: ../panels/network/net-device-ethernet.c:352
++#: ../panels/network/net-device-wifi.c:1558
+ #: ../panels/network/network-ethernet.ui.h:3
+ #: ../panels/network/network-mobile.ui.h:8
+ #: ../panels/network/network-simple.ui.h:8
+@@ -2748,16 +2686,21 @@ msgstr "Cableada"
+ msgid "Options…"
+ msgstr "Opciones…"
+ 
+-#: ../panels/network/net-device-ethernet.c:492
++#: ../panels/network/net-device-ethernet.c:489
+ #, c-format
+ msgid "Profile %d"
+ msgstr "Perfil %d"
+ 
+-#: ../panels/network/net-device-mobile.c:239
++#: ../panels/network/net-device-mobile.c:232
+ msgid "Add new connection"
+ msgstr "Añadir una conexión nueva"
+ 
+-#: ../panels/network/net-device-wifi.c:1117
++#: ../panels/network/net-device-team.c:77
++#| msgid "Bridge slaves"
++msgid "Team slaves"
++msgstr "Esclavos del equipo"
++
++#: ../panels/network/net-device-wifi.c:1110
+ msgid ""
+ "If you have a connection to the Internet other than wireless, you can set up "
+ "a wireless hotspot to share the connection with others."
+@@ -2765,12 +2708,12 @@ msgstr ""
+ "Si tiene otra conexión a Internet aparte de la inalámbrica, puede configurar "
+ "un «hotspot» inalámbrico para compartir su conexión a Internet con otros."
+ 
+-#: ../panels/network/net-device-wifi.c:1121
++#: ../panels/network/net-device-wifi.c:1114
+ #, c-format
+ msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+ msgstr "Cambiar al «hotspot» inalámbrico le desconectará de <b>%s</b>."
+ 
+-#: ../panels/network/net-device-wifi.c:1125
++#: ../panels/network/net-device-wifi.c:1118
+ msgid ""
+ "It is not possible to access the Internet through your wireless while the "
+ "hotspot is active."
+@@ -2778,23 +2721,23 @@ msgstr ""
+ "No es posible acceder a Internet usando la conexión inalámbrica mientras el "
+ "«hotspot» está activado."
+ 
+-#: ../panels/network/net-device-wifi.c:1199
++#: ../panels/network/net-device-wifi.c:1192
+ msgid "Stop hotspot and disconnect any users?"
+ msgstr "¿Detener el «hotspot» y desconectar a los usuarios?"
+ 
+-#: ../panels/network/net-device-wifi.c:1202
++#: ../panels/network/net-device-wifi.c:1195
+ msgid "_Stop Hotspot"
+ msgstr "_Detener «hotspot»"
+ 
+-#: ../panels/network/net-device-wifi.c:1274
++#: ../panels/network/net-device-wifi.c:1267
+ msgid "System policy prohibits use as a Hotspot"
+ msgstr "La política del sistema prohíbe usarlo como punto de acceso"
+ 
+-#: ../panels/network/net-device-wifi.c:1277
++#: ../panels/network/net-device-wifi.c:1270
+ msgid "Wireless device does not support Hotspot mode"
+ msgstr "El dispositivo inalámbrico no soporta el modo de punto de acceso"
+ 
+-#: ../panels/network/net-device-wifi.c:1404
++#: ../panels/network/net-device-wifi.c:1399
+ msgid ""
+ "Network details for the selected networks, including passwords and any "
+ "custom configuration will be lost."
+@@ -2802,19 +2745,19 @@ msgstr ""
+ "Se perderán los detalles de las redes seleccionadas, incluyendo la "
+ "contraseña y cualquier configuración personalizada."
+ 
+-#: ../panels/network/net-device-wifi.c:1714
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
++#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+ msgid "History"
+ msgstr "Histórico"
+ 
+-#: ../panels/network/net-device-wifi.c:1718 ../panels/power/power.ui.h:21
++#: ../panels/network/net-device-wifi.c:1730 ../panels/power/power.ui.h:21
+ #: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596
+-#: ../panels/wacom/cc-wacom-page.c:525
++#: ../panels/wacom/cc-wacom-page.c:534
+ msgid "_Close"
+ msgstr "_Cerrar"
+ 
+ #. translators: This is the label for the "Forget wireless network" functionality
+-#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/network/net-device-wifi.c:1738
+ msgctxt "Wi-Fi Network"
+ msgid "_Forget"
+ msgstr "_Olvidar"
+@@ -2835,7 +2778,7 @@ msgstr ""
+ msgid "This is not recommended for untrusted public networks."
+ msgstr "No se recomienda para redes públicas en las que no se confía."
+ 
+-#: ../panels/network/net-proxy.c:417
++#: ../panels/network/net-proxy.c:410
+ msgid "Proxy"
+ msgstr "Proxy"
+ 
+@@ -2851,17 +2794,17 @@ msgstr "IMEI"
+ msgid "Provider"
+ msgstr "Proveedor"
+ 
+-#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
++#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:2
+ msgctxt "proxy method"
+ msgid "None"
+ msgstr "Ninguno"
+ 
+-#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
++#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:3
+ msgctxt "proxy method"
+ msgid "Manual"
+ msgstr "Manual"
+ 
+-#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
++#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:4
+ msgctxt "proxy method"
+ msgid "Automatic"
+ msgstr "Automático"
+@@ -2914,19 +2857,7 @@ msgstr "Puerto para proxy Socks"
+ msgid "Turn device off"
+ msgstr "Apagar dispositivo"
+ 
+-#: ../panels/network/network.ui.h:1
+-msgid "Select the interface to use for the new service"
+-msgstr "Seleccionar la interfaz que usar para el servicio nuevo"
+-
+-#: ../panels/network/network.ui.h:2
+-msgid "C_reate…"
+-msgstr "C_rear…"
+-
+-#: ../panels/network/network.ui.h:3
+-msgid "_Interface"
+-msgstr "_Interfaz"
+-
+-#: ../panels/network/network.ui.h:8
++#: ../panels/network/network.ui.h:5
+ msgid "Add Device"
+ msgstr "Añadir dispositivo"
+ 
+@@ -2965,7 +2896,7 @@ msgstr "detalles"
+ #: ../panels/network/wireless-security/ws-leap.ui.h:2
+ #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
+ #: ../panels/user-accounts/data/account-dialog.ui.h:9
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+ msgid "_Password"
+ msgstr "_Contraseña"
+ 
+@@ -3661,12 +3592,12 @@ msgid "Show Details in Lock Screen"
+ msgstr "Mostrar detalles en la pantalla de bloqueo"
+ 
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1733 ../panels/power/cc-power-panel.c:1740
+-#: ../panels/privacy/cc-privacy-panel.c:77
+-#: ../panels/privacy/cc-privacy-panel.c:117
+-#: ../panels/universal-access/cc-ua-panel.c:253
+-#: ../panels/universal-access/cc-ua-panel.c:610
+-#: ../panels/universal-access/cc-ua-panel.c:736
++#: ../panels/power/cc-power-panel.c:1744 ../panels/power/cc-power-panel.c:1751
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ msgid "On"
+ msgstr "Encendido"
+ 
+@@ -3787,18 +3718,18 @@ msgstr ""
+ "añadir una cuenta permite que sus aplicaciones accedan a documentos, correo-"
+ "e, contactos, calendario, chat y más."
+ 
+-#: ../panels/power/cc-power-panel.c:187
++#: ../panels/power/cc-power-panel.c:189
+ msgid "Unknown time"
+ msgstr "Tiempo desconocido"
+ 
+-#: ../panels/power/cc-power-panel.c:193
++#: ../panels/power/cc-power-panel.c:195
+ #, c-format
+ msgid "%i minute"
+ msgid_plural "%i minutes"
+ msgstr[0] "%i minuto"
+ msgstr[1] "%i minutos"
+ 
+-#: ../panels/power/cc-power-panel.c:205
++#: ../panels/power/cc-power-panel.c:207
+ #, c-format
+ msgid "%i hour"
+ msgid_plural "%i hours"
+@@ -3807,226 +3738,226 @@ msgstr[1] "%i horas"
+ 
+ #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
+ #. * Swap order with "%2$s %2$i %1$s %1$i if needed
+-#: ../panels/power/cc-power-panel.c:213
++#: ../panels/power/cc-power-panel.c:215
+ #, c-format
+ msgid "%i %s %i %s"
+ msgstr "%i %s %i %s"
+ 
+-#: ../panels/power/cc-power-panel.c:214
++#: ../panels/power/cc-power-panel.c:216
+ msgid "hour"
+ msgid_plural "hours"
+ msgstr[0] "hora"
+ msgstr[1] "horas"
+ 
+-#: ../panels/power/cc-power-panel.c:215
++#: ../panels/power/cc-power-panel.c:217
+ msgid "minute"
+ msgid_plural "minutes"
+ msgstr[0] "minuto"
+ msgstr[1] "minutos"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:234
++#: ../panels/power/cc-power-panel.c:236
+ #, c-format
+ msgid "%s until fully charged"
+ msgstr "%s hasta que se cargue del todo"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:241
++#: ../panels/power/cc-power-panel.c:243
+ #, c-format
+ msgid "Caution: %s remaining"
+ msgstr "Advertencia: quedan %s"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:246
++#: ../panels/power/cc-power-panel.c:248
+ #, c-format
+ msgid "%s remaining"
+ msgstr "%s restante"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:251 ../panels/power/cc-power-panel.c:279
++#: ../panels/power/cc-power-panel.c:253 ../panels/power/cc-power-panel.c:281
+ msgid "Fully charged"
+ msgstr "Cargada completamente"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:255 ../panels/power/cc-power-panel.c:283
++#: ../panels/power/cc-power-panel.c:257 ../panels/power/cc-power-panel.c:285
+ msgid "Empty"
+ msgstr "Vacía"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:270
++#: ../panels/power/cc-power-panel.c:272
+ msgid "Charging"
+ msgstr "Cargando"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:275
++#: ../panels/power/cc-power-panel.c:277
+ msgid "Discharging"
+ msgstr "Descargando"
+ 
+-#: ../panels/power/cc-power-panel.c:393
++#: ../panels/power/cc-power-panel.c:395
+ msgctxt "Battery name"
+ msgid "Main"
+ msgstr "Principal"
+ 
+-#: ../panels/power/cc-power-panel.c:395
++#: ../panels/power/cc-power-panel.c:397
+ msgctxt "Battery name"
+ msgid "Extra"
+ msgstr "Adicional"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:486
++#: ../panels/power/cc-power-panel.c:469
+ msgid "Wireless mouse"
+ msgstr "Ratón inalámbrico"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:490
++#: ../panels/power/cc-power-panel.c:472
+ msgid "Wireless keyboard"
+ msgstr "Teclado inalámbrico"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:494
++#: ../panels/power/cc-power-panel.c:475
+ msgid "Uninterruptible power supply"
+ msgstr "Fuente de alimentación no interrumplible"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:499
++#: ../panels/power/cc-power-panel.c:478
+ msgid "Personal digital assistant"
+ msgstr "Asistente digital personal"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:503
++#: ../panels/power/cc-power-panel.c:481
+ msgid "Cellphone"
+ msgstr "Teléfono móvil"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:507
++#: ../panels/power/cc-power-panel.c:484
+ msgid "Media player"
+ msgstr "Reproductor multimedia"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:511
++#: ../panels/power/cc-power-panel.c:487
+ msgid "Tablet"
+ msgstr "Tableta"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:515
++#: ../panels/power/cc-power-panel.c:490
+ msgid "Computer"
+ msgstr "Equipo"
+ 
+ #. TRANSLATORS: secondary battery, misc
+-#: ../panels/power/cc-power-panel.c:519 ../panels/power/cc-power-panel.c:729
+-#: ../panels/power/cc-power-panel.c:2064
++#: ../panels/power/cc-power-panel.c:493 ../panels/power/cc-power-panel.c:740
++#: ../panels/power/cc-power-panel.c:2075
+ msgid "Battery"
+ msgstr "Batería"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:528
++#: ../panels/power/cc-power-panel.c:539
+ msgctxt "Battery power"
+ msgid "Charging"
+ msgstr "Cargando"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:535
++#: ../panels/power/cc-power-panel.c:546
+ msgctxt "Battery power"
+ msgid "Caution"
+ msgstr "Precaución"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:540
++#: ../panels/power/cc-power-panel.c:551
+ msgctxt "Battery power"
+ msgid "Low"
+ msgstr "Baja"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:545
++#: ../panels/power/cc-power-panel.c:556
+ msgctxt "Battery power"
+ msgid "Good"
+ msgstr "Bien"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:550
++#: ../panels/power/cc-power-panel.c:561
+ msgctxt "Battery power"
+ msgid "Fully charged"
+ msgstr "Cargada completamente"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:554
++#: ../panels/power/cc-power-panel.c:565
+ msgctxt "Battery power"
+ msgid "Empty"
+ msgstr "Vacía"
+ 
+-#: ../panels/power/cc-power-panel.c:727
++#: ../panels/power/cc-power-panel.c:738
+ msgid "Batteries"
+ msgstr "Baterías"
+ 
+-#: ../panels/power/cc-power-panel.c:1133
++#: ../panels/power/cc-power-panel.c:1144
+ msgid "When _idle"
+ msgstr "Cuando esté _inactivo"
+ 
+-#: ../panels/power/cc-power-panel.c:1502
++#: ../panels/power/cc-power-panel.c:1513
+ msgid "Power Saving"
+ msgstr "Ahorro de energía"
+ 
+-#: ../panels/power/cc-power-panel.c:1530
++#: ../panels/power/cc-power-panel.c:1541
+ msgid "_Screen brightness"
+ msgstr "_Brillo de la pantalla"
+ 
+-#: ../panels/power/cc-power-panel.c:1536
++#: ../panels/power/cc-power-panel.c:1547
+ msgid "_Keyboard brightness"
+ msgstr "_Brillo del teclado"
+ 
+-#: ../panels/power/cc-power-panel.c:1546
++#: ../panels/power/cc-power-panel.c:1557
+ msgid "_Dim screen when inactive"
+ msgstr "_Oscurecer la pantalla cuando esté inactiva"
+ 
+-#: ../panels/power/cc-power-panel.c:1571
++#: ../panels/power/cc-power-panel.c:1582
+ msgid "_Blank screen"
+ msgstr "_Apagar la pantalla"
+ 
+-#: ../panels/power/cc-power-panel.c:1608
++#: ../panels/power/cc-power-panel.c:1619
+ msgid "_Wi-Fi"
+ msgstr "_Wi-Fi"
+ 
+-#: ../panels/power/cc-power-panel.c:1613
++#: ../panels/power/cc-power-panel.c:1624
+ msgid "Turns off wireless devices"
+ msgstr "Apaga los dispositivos inalámbricos"
+ 
+-#: ../panels/power/cc-power-panel.c:1638
++#: ../panels/power/cc-power-panel.c:1649
+ msgid "_Mobile broadband"
+ msgstr "Banda ancha _móvil"
+ 
+-#: ../panels/power/cc-power-panel.c:1643
++#: ../panels/power/cc-power-panel.c:1654
+ msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
+ msgstr "Apaga los dispositivos de banda ancha móvil (3G, 4G, WiMax, etc.)"
+ 
+-#: ../panels/power/cc-power-panel.c:1678
++#: ../panels/power/cc-power-panel.c:1689
+ msgid "_Bluetooth"
+ msgstr "_Bluetooth"
+ 
+-#: ../panels/power/cc-power-panel.c:1729
++#: ../panels/power/cc-power-panel.c:1740
+ msgid "When on battery power"
+ msgstr "En modo batería"
+ 
+-#: ../panels/power/cc-power-panel.c:1731
++#: ../panels/power/cc-power-panel.c:1742
+ msgid "When plugged in"
+ msgstr "Cuando está conectado a la red"
+ 
+-#: ../panels/power/cc-power-panel.c:1860
++#: ../panels/power/cc-power-panel.c:1871
+ msgid "Suspend & Power Off"
+ msgstr "Suspender y apagar"
+ 
+-#: ../panels/power/cc-power-panel.c:1893
++#: ../panels/power/cc-power-panel.c:1904
+ msgid "_Automatic suspend"
+ msgstr "Suspender _automáticamente"
+ 
+-#: ../panels/power/cc-power-panel.c:1917
++#: ../panels/power/cc-power-panel.c:1928
+ msgid "When battery power is _critical"
+ msgstr "_Cuando la carga está críticamente baja"
+ 
+-#: ../panels/power/cc-power-panel.c:1974
++#: ../panels/power/cc-power-panel.c:1985
+ msgid "Power Off"
+ msgstr "Apagar"
+ 
+-#: ../panels/power/cc-power-panel.c:2111
++#: ../panels/power/cc-power-panel.c:2122
+ msgid "Devices"
+ msgstr "Dispositivos"
+ 
+@@ -4132,7 +4063,7 @@ msgid "Authenticate"
+ msgstr "Autenticar"
+ 
+ #: ../panels/printers/authentication-dialog.ui.h:5
+-#: ../panels/sharing/sharing.ui.h:23
++#: ../panels/sharing/sharing.ui.h:21
+ #: ../panels/user-accounts/data/account-dialog.ui.h:6
+ msgid "Password"
+ msgstr "Contraseña"
+@@ -4500,12 +4431,12 @@ msgid "%s Active Jobs"
+ msgstr "%s trabajos activos"
+ 
+ #. Translators: This item is a server which needs authentication to show its printers
+-#: ../panels/printers/pp-new-printer-dialog.c:1667
++#: ../panels/printers/pp-new-printer-dialog.c:1669
+ msgid "Server requires authentication"
+ msgstr "El servidor requiere autenticación"
+ 
+ #. Translators: No printers were found
+-#: ../panels/printers/pp-new-printer-dialog.c:1704
++#: ../panels/printers/pp-new-printer-dialog.c:1706
+ msgid "No printers detected."
+ msgstr "No se ha detectado ninguna impresora."
+ 
+@@ -4678,6 +4609,10 @@ msgstr "Trabajos"
+ msgid "Show _Jobs"
+ msgstr "Mostrar _tareas"
+ 
++#: ../panels/printers/printers.ui.h:12
++msgid "Model"
++msgstr "Modelo"
++
+ #: ../panels/printers/printers.ui.h:15
+ msgid "label"
+ msgstr "etiqueta"
+@@ -4714,39 +4649,39 @@ msgstr ""
+ "El servicio del sistema de impresión\n"
+ "parece no estar disponible."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:245 ../panels/privacy/privacy.ui.h:26
++#: ../panels/privacy/cc-privacy-panel.c:248 ../panels/privacy/privacy.ui.h:26
+ msgid "Screen Lock"
+ msgstr "Bloqueo de pantalla"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:358 ../panels/privacy/privacy.ui.h:20
++#: ../panels/privacy/cc-privacy-panel.c:361 ../panels/privacy/privacy.ui.h:20
+ msgid "Usage & History"
+ msgstr "Uso e histórico"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:486
++#: ../panels/privacy/cc-privacy-panel.c:489
+ msgid "Empty all items from Trash?"
+ msgstr "¿Quiere vaciar todos los elementos de la papelera?"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:487
++#: ../panels/privacy/cc-privacy-panel.c:490
+ msgid "All items in the Trash will be permanently deleted."
+ msgstr "Todos los elementos de la papelera se eliminarán de manera permanente."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:488 ../panels/privacy/privacy.ui.h:32
++#: ../panels/privacy/cc-privacy-panel.c:491 ../panels/privacy/privacy.ui.h:32
+ msgid "_Empty Trash"
+ msgstr "_Vaciar papelera"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:511
++#: ../panels/privacy/cc-privacy-panel.c:514
+ msgid "Delete all the temporary files?"
+ msgstr "¿Quiere eliminar todos los archivos temporales?"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:512
++#: ../panels/privacy/cc-privacy-panel.c:515
+ msgid "All the temporary files will be permanently deleted."
+ msgstr "Todos los archivos temporales se eliminarán de manera permanente."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:513 ../panels/privacy/privacy.ui.h:33
++#: ../panels/privacy/cc-privacy-panel.c:516 ../panels/privacy/privacy.ui.h:33
+ msgid "_Purge Temporary Files"
+ msgstr "_Limpiar archivos temporales"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:535 ../panels/privacy/privacy.ui.h:31
++#: ../panels/privacy/cc-privacy-panel.c:538 ../panels/privacy/privacy.ui.h:31
+ msgid "Purge Trash & Temporary Files"
+ msgstr "Vaciar papelera y archivos temporales"
+ 
+@@ -5101,21 +5036,21 @@ msgstr "Bajar"
+ msgid "Preferences"
+ msgstr "Preferencias"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:274
++#: ../panels/sharing/cc-sharing-panel.c:285
+ msgctxt "service is enabled"
+ msgid "On"
+ msgstr "Encendido"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:276
++#: ../panels/sharing/cc-sharing-panel.c:287
+ msgctxt "service is disabled"
+ msgid "Off"
+ msgstr "Apagado"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:418
++#: ../panels/sharing/cc-sharing-panel.c:422
+ msgid "Choose a Folder"
+ msgstr "Elija una carpeta"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:702
++#: ../panels/sharing/cc-sharing-panel.c:736
+ msgid "Copy"
+ msgstr "Copiar"
+ 
+@@ -5159,70 +5094,62 @@ msgstr ""
+ "dispositivos con Bluetooth activado"
+ 
+ #: ../panels/sharing/sharing.ui.h:3
+-msgid "Share Public Folder"
+-msgstr "Compartir carpeta pública"
+-
+-#: ../panels/sharing/sharing.ui.h:4
+ msgid "Only Receive From Trusted Devices"
+ msgstr "Recibir sólo cde dispositivos de confianza"
+ 
+-#: ../panels/sharing/sharing.ui.h:5
++#: ../panels/sharing/sharing.ui.h:4
+ msgid "Save Received Files to Downloads Folder"
+ msgstr "Guardar los archivos recibidos en la carpeta de descargas"
+ 
+-#: ../panels/sharing/sharing.ui.h:6
+-msgid "Only share with Trusted Devices"
+-msgstr "Compartir sólo con dispositivos de confianza"
+-
+-#: ../panels/sharing/sharing.ui.h:7
++#: ../panels/sharing/sharing.ui.h:5
+ msgid "Computer Name"
+ msgstr "Nombre del equipo"
+ 
+-#: ../panels/sharing/sharing.ui.h:8
++#: ../panels/sharing/sharing.ui.h:6
+ msgid "Personal File Sharing"
+ msgstr "Compartición de archivos personales"
+ 
+-#: ../panels/sharing/sharing.ui.h:9
++#: ../panels/sharing/sharing.ui.h:7
+ msgid "Screen Sharing"
+ msgstr "Compartición de la pantalla"
+ 
+-#: ../panels/sharing/sharing.ui.h:10
++#: ../panels/sharing/sharing.ui.h:8
+ msgid "Media Sharing"
+ msgstr "Compartición multimedia"
+ 
+-#: ../panels/sharing/sharing.ui.h:11
++#: ../panels/sharing/sharing.ui.h:9
+ msgid "Remote Login"
+ msgstr "Inicio de sesión remoto"
+ 
+-#: ../panels/sharing/sharing.ui.h:12
++#: ../panels/sharing/sharing.ui.h:10
+ msgid "Some services are disabled because of no network access."
+ msgstr "Se han desactivado algunos servicios porque no hay acceso a la red."
+ 
+-#: ../panels/sharing/sharing.ui.h:13
++#: ../panels/sharing/sharing.ui.h:11
+ msgid "Share Music, Photos and Videos with others on the current network."
+ msgstr "Compartir música, fotos y vídeos con otros en la red actual."
+ 
+-#: ../panels/sharing/sharing.ui.h:14
++#: ../panels/sharing/sharing.ui.h:12
+ msgid "Share Media On This Network"
+ msgstr "Compartir multimedia en esta red"
+ 
+-#: ../panels/sharing/sharing.ui.h:15
++#: ../panels/sharing/sharing.ui.h:13
+ msgid "Shared Folders"
+ msgstr "Carpetas compartidas"
+ 
+-#: ../panels/sharing/sharing.ui.h:16
++#: ../panels/sharing/sharing.ui.h:14
+ msgid "column"
+ msgstr "columna"
+ 
+-#: ../panels/sharing/sharing.ui.h:17
++#: ../panels/sharing/sharing.ui.h:15
+ msgid "Add Folder"
+ msgstr "Añadir carpeta"
+ 
+-#: ../panels/sharing/sharing.ui.h:18
++#: ../panels/sharing/sharing.ui.h:16
+ msgid "Remove Folder"
+ msgstr "Quitar carpeta"
+ 
+-#: ../panels/sharing/sharing.ui.h:20
++#: ../panels/sharing/sharing.ui.h:18
+ #, no-c-format
+ msgid ""
+ "Personal File Sharing allows you to share your Public folder with others on "
+@@ -5232,15 +5159,15 @@ msgstr ""
+ "«Público» con otros en su red actual usando: <a href=\"dav://%s\">dav://%s</"
+ "a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:21
++#: ../panels/sharing/sharing.ui.h:19
+ msgid "Share Public Folder On This Network"
+ msgstr "Compartir la carpeta pública en esta red"
+ 
+-#: ../panels/sharing/sharing.ui.h:22
++#: ../panels/sharing/sharing.ui.h:20
+ msgid "Require Password"
+ msgstr "Solicitar contraseña"
+ 
+-#: ../panels/sharing/sharing.ui.h:25
++#: ../panels/sharing/sharing.ui.h:23
+ #, no-c-format
+ msgid ""
+ "Allow remote users to connect using the Secure Shell command:\n"
+@@ -5249,7 +5176,7 @@ msgstr ""
+ "Permitir a los usuarios remotos conectar usando el comando de shell segura:\n"
+ "<a href=\"ssh %s\">ssh %s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:28
++#: ../panels/sharing/sharing.ui.h:26
+ #, no-c-format
+ msgid ""
+ "Allow remote users to view or control your screen by connecting to: <a href="
+@@ -5258,19 +5185,19 @@ msgstr ""
+ "Permitir a los usuarios remotos ver o controlar su pantalla conectándose a: "
+ "<a href=\"vnc://%s\">vnc://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:29
++#: ../panels/sharing/sharing.ui.h:27
+ msgid "Remote View"
+ msgstr "Vista remota"
+ 
+-#: ../panels/sharing/sharing.ui.h:30
++#: ../panels/sharing/sharing.ui.h:28
+ msgid "Remote Control"
+ msgstr "Control remoto"
+ 
+-#: ../panels/sharing/sharing.ui.h:31
++#: ../panels/sharing/sharing.ui.h:29
+ msgid "Approve All Connections"
+ msgstr "Aprobar todas las conexiones"
+ 
+-#: ../panels/sharing/sharing.ui.h:32
++#: ../panels/sharing/sharing.ui.h:30
+ msgid "Show Password"
+ msgstr "Mostrar contraseña"
+ 
+@@ -5969,7 +5896,7 @@ msgid "_Full Name"
+ msgstr "Nombre _completo"
+ 
+ #: ../panels/user-accounts/data/account-dialog.ui.h:5
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+ msgid "Account _Type"
+ msgstr "_Tipo de cuenta"
+ 
+@@ -6126,71 +6053,35 @@ msgstr "Contraseña _actual"
+ msgid "Ch_ange"
+ msgstr "Cam_biar"
+ 
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:1
+-msgid "Changing photo for:"
+-msgstr "Cambiando la foto para:"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
+-msgid ""
+-"Choose a picture that will be shown at the login screen for this account."
+-msgstr ""
+-"Elegir una imagen que se mostrará en la pantalla de inicio de sesión para "
+-"esta cuenta."
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
+-msgid "Gallery"
+-msgstr "Colección"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:4
+-#: ../panels/user-accounts/um-photo-dialog.c:218
+-msgid "Browse for more pictures"
+-msgstr "Examinar para buscar más imágenes"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:5
+-msgid "Take a photograph"
+-msgstr "Tomar una fotografía"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:6
+-msgid "Browse"
+-msgstr "Examinar"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:7
+-msgid "Photograph"
+-msgstr "Fotografía"
+-
+ #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+-msgid "Account Information"
+-msgstr "Información de la cuenta"
+-
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Add User Account"
+ msgstr "Añadir cuenta de usuario"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Remove User Account"
+ msgstr "Quitar cuenta de usuario"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+ msgid "Login Options"
+ msgstr "Opciones de inicio de sesión"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+ msgid "A_utomatic Login"
+ msgstr "_Inicio de sesión automático"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+ msgid "_Fingerprint Login"
+ msgstr "Inicio de sesión con _huella"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+ msgid "User Icon"
+ msgstr "Icono de usuario"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+ msgid "_Language"
+ msgstr "_Idioma"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+ msgid "Last Login"
+ msgstr "Último inicio de sesión"
+ 
+@@ -6607,6 +6498,10 @@ msgstr "No se pudo cambiar la contraseña"
+ msgid "The passwords do not match."
+ msgstr "Las contraseñas no coinciden."
+ 
++#: ../panels/user-accounts/um-photo-dialog.c:218
++msgid "Browse for more pictures"
++msgstr "Examinar para buscar más imágenes"
++
+ #: ../panels/user-accounts/um-photo-dialog.c:443
+ msgid "Disable image"
+ msgstr "Desactivar imagen"
+@@ -6808,7 +6703,7 @@ msgstr ""
+ "atajo del teclado y mantenga pulsadas las teclas neuvas o pulse Retroceso "
+ "para borrarlo."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:82
++#: ../panels/wacom/calibrator/calibrator-gui.c:84
+ msgid ""
+ "Please tap the target markers as they appear on screen to calibrate the "
+ "tablet."
+@@ -6816,7 +6711,7 @@ msgstr ""
+ "Pulse los marcadores objetivo a medida que aparecen en la pantalla para "
+ "calibrar la tableta."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:86
++#: ../panels/wacom/calibrator/calibrator-gui.c:88
+ msgid "Mis-click detected, restarting..."
+ msgstr "Pulsación errónea detectada, reiniciando…"
+ 
+@@ -6869,7 +6764,7 @@ msgstr "Mapear una única pantalla"
+ msgid "%d of %d"
+ msgstr "%d de %d"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:522
++#: ../panels/wacom/cc-wacom-page.c:531
+ msgid "Display Mapping"
+ msgstr "Mostrar mapeo"
+ 
+@@ -7006,22 +6901,22 @@ msgstr "Modo de cambio de la banda táctil derecha"
+ msgid "Mode Switch #%d"
+ msgstr "Modo de cambio nº %d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1336
++#: ../panels/wacom/gsd-wacom-device.c:1335
+ #, c-format
+ msgid "Left Button #%d"
+ msgstr "Botón izquierdo nº %d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1339
++#: ../panels/wacom/gsd-wacom-device.c:1338
+ #, c-format
+ msgid "Right Button #%d"
+ msgstr "Botón derecho nº %d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1342
++#: ../panels/wacom/gsd-wacom-device.c:1341
+ #, c-format
+ msgid "Top Button #%d"
+ msgstr "Botón superior nº %d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1345
++#: ../panels/wacom/gsd-wacom-device.c:1344
+ #, c-format
+ msgid "Bottom Button #%d"
+ msgstr "Botón inferior nº %d"
+@@ -7153,27 +7048,27 @@ msgstr "Ayuda"
+ msgid "Quit"
+ msgstr "Salir"
+ 
+-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1479
++#: ../shell/cc-window.c:61 ../shell/cc-window.c:1486
+ msgid "All Settings"
+ msgstr "Todas las configuraciones"
+ 
+ #. Add categories
+-#: ../shell/cc-window.c:866
++#: ../shell/cc-window.c:868
+ msgctxt "category"
+ msgid "Personal"
+ msgstr "Personal"
+ 
+-#: ../shell/cc-window.c:867
++#: ../shell/cc-window.c:869
+ msgctxt "category"
+ msgid "Hardware"
+ msgstr "Hardware"
+ 
+-#: ../shell/cc-window.c:868
++#: ../shell/cc-window.c:870
+ msgctxt "category"
+ msgid "System"
+ msgstr "Sistema"
+ 
+-#: ../shell/cc-window.c:1588 ../shell/gnome-control-center.desktop.in.in.h:1
++#: ../shell/cc-window.c:1597 ../shell/gnome-control-center.desktop.in.in.h:1
+ msgid "Settings"
+ msgstr "Configuración"
+ 
+@@ -7181,6 +7076,79 @@ msgstr "Configuración"
+ msgid "Preferences;Settings;"
+ msgstr "Preferencias;Configuración;"
+ 
++#~ msgid "Device type:"
++#~ msgstr "Tipo de dispositivo:"
++
++#~ msgid "Manufacturer:"
++#~ msgstr "Fabricante:"
++
++#~ msgid "Model:"
++#~ msgstr "Modelo:"
++
++#~ msgid ""
++#~ "Image files can be dragged on this window to auto-complete the above "
++#~ "fields."
++#~ msgstr ""
++#~ "Se pueden arrastrar archivos de imagen en esta ventana para autocompletar "
++#~ "los campos superiores."
++
++#~ msgid "Show your primary display on this screen also"
++#~ msgstr "Mostrar su pantalla primaria también en este monitor"
++
++#~ msgid "Combine"
++#~ msgstr "Combinar"
++
++#~ msgid "Join with the primary display to create an extra space"
++#~ msgstr "Unir a la pantalla primaria para crear un espacio adicional"
++
++#~ msgid "Don't use the display"
++#~ msgstr "No usar la pantalla"
++
++#~ msgid "Refresh Rate"
++#~ msgstr "Tasa de refresco"
++
++#~ msgid "Mouse Preferences"
++#~ msgstr "Preferencias del ratón"
++
++#~ msgid "Select the interface to use for the new service"
++#~ msgstr "Seleccionar la interfaz que usar para el servicio nuevo"
++
++#~ msgid "C_reate…"
++#~ msgstr "C_rear…"
++
++#~ msgid "_Interface"
++#~ msgstr "_Interfaz"
++
++#~ msgid "Share Public Folder"
++#~ msgstr "Compartir carpeta pública"
++
++#~ msgid "Only share with Trusted Devices"
++#~ msgstr "Compartir sólo con dispositivos de confianza"
++
++#~ msgid "Changing photo for:"
++#~ msgstr "Cambiando la foto para:"
++
++#~ msgid ""
++#~ "Choose a picture that will be shown at the login screen for this account."
++#~ msgstr ""
++#~ "Elegir una imagen que se mostrará en la pantalla de inicio de sesión para "
++#~ "esta cuenta."
++
++#~ msgid "Gallery"
++#~ msgstr "Colección"
++
++#~ msgid "Take a photograph"
++#~ msgstr "Tomar una fotografía"
++
++#~ msgid "Browse"
++#~ msgstr "Examinar"
++
++#~ msgid "Photograph"
++#~ msgstr "Fotografía"
++
++#~ msgid "Account Information"
++#~ msgstr "Información de la cuenta"
++
+ #~ msgid "Switch between AM and PM."
+ #~ msgstr "Alternar entre AM y PM"
+ 
+diff --git a/po/fr.po b/po/fr.po
+index 8291b7d..e4f9d37 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -35,7 +35,7 @@ msgstr ""
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "control-center&keywords=I18N+L10N&component=general\n"
+ "POT-Creation-Date: 2013-09-20 21:45+0000\n"
+-"PO-Revision-Date: 2013-09-21 17:37+0200\n"
++"PO-Revision-Date: 2014-02-09 17:52+0100\n"
+ "Last-Translator: Alain Lojewski <allomervan@gmail.com>\n"
+ "Language-Team: français <GNOME French Team <gnomefr@traduc.org>\n"
+ "Language: \n"
+@@ -56,7 +56,7 @@ msgstr "Évolue au cours de la journée"
+ 
+ #: ../panels/background/background.ui.h:4
+ msgid "Lock Screen"
+-msgstr "Verrouiller l'écran"
++msgstr "Écran de verrouillage"
+ 
+ #: ../panels/background/background.ui.h:5
+ msgctxt "background, style"
+@@ -2710,11 +2710,11 @@ msgstr ""
+ 
+ #: ../panels/network/net-device-bond.c:77
+ msgid "Bond slaves"
+-msgstr "Esclaves lien"
++msgstr "Lien d'esclaves"
+ 
+ #: ../panels/network/net-device-bridge.c:77
+ msgid "Bridge slaves"
+-msgstr "Esclaves pont"
++msgstr "Pont d'esclaves"
+ 
+ #: ../panels/network/net-device-ethernet.c:111
+ #: ../panels/network/net-device-wifi.c:462
+diff --git a/po/gl.po b/po/gl.po
+index 8d30c87..491f74f 100644
+--- a/po/gl.po
++++ b/po/gl.po
+@@ -12,13 +12,13 @@
+ # Antón Méixome <meixome@certima.net>, 2010.
+ # Fran Diéguez <frandieguez@gnome.org>, 2009, 2010, 2011, 2012.
+ # Leandro Regueiro <leandro.regueiro@gmail.com>, 2011, 2012.
+-# Fran Dieguez <frandieguez@gnome.org>, 2012, 2013.
++# Fran Dieguez <frandieguez@gnome.org>, 2012, 2013, 2014.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-control-center-master-po-gl-72290.merged\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2013-09-20 23:58+0200\n"
+-"PO-Revision-Date: 2013-09-21 12:08+0200\n"
++"POT-Creation-Date: 2014-01-20 23:41+0100\n"
++"PO-Revision-Date: 2014-01-20 23:41+0200\n"
+ "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
+ "Language-Team: gnome-l10n-gl@gnome.org\n"
+ "Language: gl\n"
+@@ -74,7 +74,7 @@ msgid "Span"
+ msgstr "Expandir"
+ 
+ #. translators: This is the title of the wallpaper chooser dialog.
+-#: ../panels/background/cc-background-chooser-dialog.c:293
++#: ../panels/background/cc-background-chooser-dialog.c:292
+ msgid "Select Background"
+ msgstr "Seleccionar fondo"
+ 
+@@ -95,32 +95,32 @@ msgid "Flickr"
+ msgstr "Flickr"
+ 
+ #. translators: No pictures were found
+-#: ../panels/background/cc-background-chooser-dialog.c:393
++#: ../panels/background/cc-background-chooser-dialog.c:385
+ msgid "No Pictures Found"
+ msgstr "Non se atopou ningunha imaxe"
+ 
+ #. translators: %s here is the name of the Pictures directory, the string should be translated in
+ #. * the context "You can add images to your Pictures folder and they will show up here"
+-#: ../panels/background/cc-background-chooser-dialog.c:408
++#: ../panels/background/cc-background-chooser-dialog.c:400
+ #, c-format
+ msgid "You can add images to your %s folder and they will show up here"
+ msgstr "Pode engadir máis imaxes ao seu cartafol %s para que se mostren aquí"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:436
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:631
+-#: ../panels/color/cc-color-panel.c:220 ../panels/color/cc-color-panel.c:967
+-#: ../panels/display/cc-display-panel.c:1495
+-#: ../panels/display/cc-display-panel.c:1910
++#: ../panels/background/cc-background-chooser-dialog.c:429
++#: ../panels/bluetooth/cc-bluetooth-panel.c:640
++#: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
++#: ../panels/display/cc-display-panel.c:1510
++#: ../panels/display/cc-display-panel.c:1952
+ #: ../panels/network/connection-editor/vpn-helpers.c:245
+ #: ../panels/network/connection-editor/vpn-helpers.c:374
+-#: ../panels/network/net-device-wifi.c:1201
+-#: ../panels/network/net-device-wifi.c:1407
++#: ../panels/network/net-device-wifi.c:1194
++#: ../panels/network/net-device-wifi.c:1402
+ #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
+ #: ../panels/printers/cc-printers-panel.c:1946
+ #: ../panels/printers/new-printer-dialog.ui.h:2
+-#: ../panels/privacy/cc-privacy-panel.c:467
++#: ../panels/privacy/cc-privacy-panel.c:470
+ #: ../panels/search/cc-search-locations-dialog.c:682
+-#: ../panels/sharing/cc-sharing-panel.c:421
++#: ../panels/sharing/cc-sharing-panel.c:425
+ #: ../panels/user-accounts/um-fingerprint-dialog.c:269
+ #: ../panels/user-accounts/um-photo-dialog.c:96
+ #: ../panels/user-accounts/um-photo-dialog.c:221
+@@ -128,9 +128,8 @@ msgstr "Pode engadir máis imaxes ao seu cartafol %s para que se mostren aquí"
+ msgid "_Cancel"
+ msgstr "_Cancelar"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:437
++#: ../panels/background/cc-background-chooser-dialog.c:430
+ #: ../panels/printers/ppd-selection-dialog.ui.h:3
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:9
+ #: ../panels/user-accounts/um-photo-dialog.c:98
+ msgid "Select"
+ msgstr "Seleccionar"
+@@ -150,7 +149,7 @@ msgstr "%d × %d"
+ msgid "No Desktop Background"
+ msgstr "Sen fondo de escritorio"
+ 
+-#: ../panels/background/cc-background-panel.c:492
++#: ../panels/background/cc-background-panel.c:493
+ msgid "Current background"
+ msgstr "Fondo actual"
+ 
+@@ -167,7 +166,7 @@ msgstr "Fondo de pantalla;Pantalla;Escritorio;"
+ msgid "Set Up New Device"
+ msgstr "Configurar un dispositivo novo"
+ 
+-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
++#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
+ msgid "Remove Device"
+ msgstr "Retirar dispositivo"
+ 
+@@ -221,50 +220,50 @@ msgstr "Preferencias do teclado"
+ msgid "Send Files…"
+ msgstr "Enviar ficheiros…"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
+ msgid "Yes"
+ msgstr "Si"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
+ msgid "No"
+ msgstr "Non"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:470
++#: ../panels/bluetooth/cc-bluetooth-panel.c:479
+ msgid "Bluetooth is disabled"
+ msgstr "Bluetooth está desactivado"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:475
++#: ../panels/bluetooth/cc-bluetooth-panel.c:484
+ msgid "Bluetooth is disabled by hardware switch"
+ msgstr "O Bluetooth está fisicamente desactivado"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:479
++#: ../panels/bluetooth/cc-bluetooth-panel.c:488
+ msgid "No Bluetooth adapters found"
+ msgstr "Non se atoparon adaptadores Bluetooth"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:578
++#: ../panels/bluetooth/cc-bluetooth-panel.c:587
+ msgid "Visibility"
+ msgstr "Visibilidade"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:582
++#: ../panels/bluetooth/cc-bluetooth-panel.c:591
+ #, c-format
+ msgid "Visibility of “%s”"
+ msgstr "Visibilidade de «%s»"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:626
++#: ../panels/bluetooth/cc-bluetooth-panel.c:635
+ #, c-format
+ msgid "Remove '%s' from the list of devices?"
+ msgstr "Retirar «%s» da lista de dispositivos?"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:628
++#: ../panels/bluetooth/cc-bluetooth-panel.c:637
+ msgid ""
+ "If you remove the device, you will have to set it up again before next use."
+ msgstr ""
+ "Se retira o dispositivo, deberá configuralo de novo antes de usalo a "
+ "seguinte vez."
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:632
++#: ../panels/bluetooth/cc-bluetooth-panel.c:641
+ #: ../panels/online-accounts/cc-online-accounts-panel.c:844
+ msgid "_Remove"
+ msgstr "_Retirar"
+@@ -278,14 +277,14 @@ msgid "Turn Bluetooth on and off and connect your devices"
+ msgstr "Active ou desactive o Bluetooth e conecte os seus dispositivos"
+ 
+ #. TRANSLATORS: The user has to attach the sensor to the screen
+-#: ../panels/color/cc-color-calibrate.c:360
++#: ../panels/color/cc-color-calibrate.c:361
+ msgid "Place your calibration device over the square and press 'Start'"
+ msgstr "Poña o dispositivo de calibración no cadrado e prema «Comezar»"
+ 
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:366
++#: ../panels/color/cc-color-calibrate.c:367
+ msgid ""
+ "Move your calibration device to the calibrate position and press 'Continue'"
+ msgstr ""
+@@ -294,7 +293,7 @@ msgstr ""
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:372
++#: ../panels/color/cc-color-calibrate.c:373
+ msgid ""
+ "Move your calibration device to the surface position and press 'Continue'"
+ msgstr ""
+@@ -304,54 +303,54 @@ msgstr ""
+ #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
+ #. * is built into the palmrest and we need to fullscreen the
+ #. * sample widget and shut the lid.
+-#: ../panels/color/cc-color-calibrate.c:378
++#: ../panels/color/cc-color-calibrate.c:379
+ msgid "Shut the laptop lid"
+ msgstr "Pechar a tapa do portátil"
+ 
+ #. TRANSLATORS: We suck, the calibation failed and we have no
+ #. * good idea why or any suggestions
+-#: ../panels/color/cc-color-calibrate.c:409
++#: ../panels/color/cc-color-calibrate.c:410
+ msgid "An internal error occurred that could not be recovered."
+ msgstr "Produciuse un erro interno que non pode recuperarse."
+ 
+ #. TRANSLATORS: Some required-at-runtime tools were not
+ #. * installed, which should only affect insane distros
+-#: ../panels/color/cc-color-calibrate.c:414
++#: ../panels/color/cc-color-calibrate.c:415
+ msgid "Tools required for calibration are not installed."
+ msgstr "As ferramentas requiridas para o calibrado non están instaladas."
+ 
+ #. TRANSLATORS: The profile failed for some reason
+-#: ../panels/color/cc-color-calibrate.c:420
++#: ../panels/color/cc-color-calibrate.c:421
+ msgid "The profile could not be generated."
+ msgstr "Non foi posíbel xerar o perfil."
+ 
+ #. TRANSLATORS: The user specified a whitepoint that was
+ #. * unobtainable with the hardware they've got -- see
+ #. * https://en.wikipedia.org/wiki/White_point for details
+-#: ../panels/color/cc-color-calibrate.c:426
++#: ../panels/color/cc-color-calibrate.c:427
+ msgid "The target whitepoint was not obtainable."
+ msgstr "Non foi posíbel obter o punto branco obxectivo."
+ 
+ #. TRANSLATORS: the display calibration process is finished
+-#: ../panels/color/cc-color-calibrate.c:466
++#: ../panels/color/cc-color-calibrate.c:467
+ msgid "Complete!"
+ msgstr "Completado!"
+ 
+ #. TRANSLATORS: the display calibration failed, and we also show
+ #. * the translated (or untranslated) error string after this
+-#: ../panels/color/cc-color-calibrate.c:474
++#: ../panels/color/cc-color-calibrate.c:475
+ msgid "Calibration failed!"
+ msgstr "Calibrado fallado!"
+ 
+ #. TRANSLATORS: The user can now remove the sensor from the screen
+-#: ../panels/color/cc-color-calibrate.c:481
++#: ../panels/color/cc-color-calibrate.c:482
+ msgid "You can remove the calibration device."
+ msgstr "Pode quitar o dispositivo de calibrado."
+ 
+ #. TRANSLATORS: The user has to be careful not to knock the
+ #. * display off the screen (although we do cope if this is
+ #. * detected early enough)
+-#: ../panels/color/cc-color-calibrate.c:552
++#: ../panels/color/cc-color-calibrate.c:553
+ msgid "Do not disturb the calibration device while in progress"
+ msgstr "Non moleste o dispositivo de calibrado mentres está traballando"
+ 
+@@ -413,48 +412,48 @@ msgstr "Non calibrado"
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile has been auto-generated for this hardware
+-#: ../panels/color/cc-color-panel.c:135
++#: ../panels/color/cc-color-panel.c:137
+ msgid "Default: "
+ msgstr "Predeterminado: "
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile his a standard space like AdobeRGB
+-#: ../panels/color/cc-color-panel.c:143
++#: ../panels/color/cc-color-panel.c:145
+ msgid "Colorspace: "
+ msgstr "Espazo de cor: "
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile is a test profile
+-#: ../panels/color/cc-color-panel.c:150
++#: ../panels/color/cc-color-panel.c:152
+ msgid "Test profile: "
+ msgstr "Probar perfíl: "
+ 
+ #. TRANSLATORS: an ICC profile is a file containing colorspace data
+-#: ../panels/color/cc-color-panel.c:218
++#: ../panels/color/cc-color-panel.c:219
+ msgid "Select ICC Profile File"
+ msgstr "Seleccionar ficheiro de perfil ICC"
+ 
+-#: ../panels/color/cc-color-panel.c:221
++#: ../panels/color/cc-color-panel.c:222
+ msgid "_Import"
+ msgstr "_Importar"
+ 
+ #. TRANSLATORS: filter name on the file->open dialog
+-#: ../panels/color/cc-color-panel.c:232
++#: ../panels/color/cc-color-panel.c:233
+ msgid "Supported ICC profiles"
+ msgstr "Perfiles ICC admitidos"
+ 
+ #. TRANSLATORS: filter name on the file->open dialog
+-#: ../panels/color/cc-color-panel.c:239
++#: ../panels/color/cc-color-panel.c:240
+ #: ../panels/network/wireless-security/eap-method-fast.c:410
+ msgid "All files"
+ msgstr "Todos os ficheiros"
+ 
+-#: ../panels/color/cc-color-panel.c:586
++#: ../panels/color/cc-color-panel.c:579
+ msgid "Screen"
+ msgstr "Pantalla"
+ 
+ #. TRANSLATORS: this is when the upload of the profile failed
+-#: ../panels/color/cc-color-panel.c:912
++#: ../panels/color/cc-color-panel.c:903
+ #, c-format
+ msgid "Failed to upload file: %s"
+ msgstr "Produciuse un erro ao subir o ficheiro: %s"
+@@ -462,39 +461,39 @@ msgstr "Produciuse un erro ao subir o ficheiro: %s"
+ #. TRANSLATORS: these are instructions on how to recover
+ #. * the ICC profile on the native operating system and are
+ #. * only shown when the user uses a LiveCD to calibrate
+-#: ../panels/color/cc-color-panel.c:926
++#: ../panels/color/cc-color-panel.c:917
+ msgid "The profile has been uploaded to:"
+ msgstr "O perfil foi subido a:"
+ 
+-#: ../panels/color/cc-color-panel.c:928
++#: ../panels/color/cc-color-panel.c:919
+ msgid "Write down this URL."
+ msgstr "Anote este URL."
+ 
+-#: ../panels/color/cc-color-panel.c:929
++#: ../panels/color/cc-color-panel.c:920
+ msgid "Restart this computer and boot your normal operating system."
+ msgstr "Reinicie este computador e arrinque o sistema operativo normal."
+ 
+-#: ../panels/color/cc-color-panel.c:930
++#: ../panels/color/cc-color-panel.c:921
+ msgid "Type the URL into your browser to download and install the profile."
+ msgstr "Escriba o URL no seu navegador para descargar e instalar este perfil."
+ 
+ #. TRANSLATORS: this is the dialog to save the ICC profile
+-#: ../panels/color/cc-color-panel.c:964
++#: ../panels/color/cc-color-panel.c:955
+ msgid "Save Profile"
+ msgstr "Gardar perfil"
+ 
+-#: ../panels/color/cc-color-panel.c:968
++#: ../panels/color/cc-color-panel.c:959
+ #: ../panels/network/connection-editor/vpn-helpers.c:375
+ msgid "_Save"
+ msgstr "_Gardar"
+ 
+ #. TRANSLATORS: this is when the button is sensitive
+-#: ../panels/color/cc-color-panel.c:1328
++#: ../panels/color/cc-color-panel.c:1315
+ msgid "Create a color profile for the selected device"
+ msgstr "Crear un perfil de cor para o dispositivo seleccionado"
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1343 ../panels/color/cc-color-panel.c:1367
++#: ../panels/color/cc-color-panel.c:1330 ../panels/color/cc-color-panel.c:1354
+ msgid ""
+ "The measuring instrument is not detected. Please check it is turned on and "
+ "correctly connected."
+@@ -503,12 +502,12 @@ msgstr ""
+ "correctamente conectado."
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1377
++#: ../panels/color/cc-color-panel.c:1364
+ msgid "The measuring instrument does not support printer profiling."
+ msgstr "O instrumento de medida non admite perfilado de impresoras."
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1388
++#: ../panels/color/cc-color-panel.c:1375
+ msgid "The device type is not currently supported."
+ msgstr "O tipo de dispositivo non é compatíbel actualmente."
+ 
+@@ -596,7 +595,6 @@ msgstr "Calibración de pantalla"
+ #: ../panels/color/color-calibrate.ui.h:2
+ #: ../panels/printers/authentication-dialog.ui.h:2
+ #: ../panels/printers/ppd-selection-dialog.ui.h:2
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:8
+ #: ../panels/user-accounts/um-account-dialog.c:1470
+ msgid "Cancel"
+ msgstr "Cancelar"
+@@ -617,10 +615,10 @@ msgid "Done"
+ msgstr "Feito"
+ 
+ #. Timeout parameters
+-#. 5000 = 5 sec
++#. 15000 = 15 sec
+ #. 750 = 0.75 sec
+ #. Text printed on screen
+-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
++#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:83
+ msgid "Screen Calibration"
+ msgstr "Calibración de pantalla"
+ 
+@@ -765,168 +763,148 @@ msgstr ""
+ "href=\"\">Mostrar detalles</a>"
+ 
+ #: ../panels/color/color.ui.h:30
+-msgid "Device type:"
+-msgstr "Tipo de dispositivo:"
+-
+-#: ../panels/color/color.ui.h:31
+-msgid "Manufacturer:"
+-msgstr "Fabricante:"
+-
+-#: ../panels/color/color.ui.h:32
+-msgid "Model:"
+-msgstr "Modelo:"
+-
+-#: ../panels/color/color.ui.h:33
+-msgid ""
+-"Image files can be dragged on this window to auto-complete the above fields."
+-msgstr ""
+-"Pódense arrastrar ficheiros de imaxe nesta xanela para autocompletar os "
+-"campos superiores."
+-
+-#: ../panels/color/color.ui.h:34
+-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+-msgid "Color"
+-msgstr "Cor"
+-
+-#: ../panels/color/color.ui.h:35
+ msgid "Each device needs an up to date color profile to be color managed."
+ msgstr ""
+ "Cada dispositivo necesita un perfil de cor actualizado para poder xestionar "
+ "a cor."
+ 
+-#: ../panels/color/color.ui.h:36
++#: ../panels/color/color.ui.h:31
+ msgid "Learn more"
+ msgstr "Aprender máis"
+ 
+-#: ../panels/color/color.ui.h:37
++#: ../panels/color/color.ui.h:32
+ msgid "Learn more about color management"
+ msgstr "Aprenda máis sobre a xestión de cor"
+ 
+-#: ../panels/color/color.ui.h:38
++#: ../panels/color/color.ui.h:33
+ msgid "Set for all users"
+ msgstr "Estabelecer para todos os usuarios"
+ 
+-#: ../panels/color/color.ui.h:39
++#: ../panels/color/color.ui.h:34
+ msgid "Set this profile for all users on this computer"
+ msgstr "Estabelecer este perfíl para todos os usuarios deste equipo"
+ 
+-#: ../panels/color/color.ui.h:40
++#: ../panels/color/color.ui.h:35
+ msgid "Enable"
+ msgstr "Activado"
+ 
+-#: ../panels/color/color.ui.h:41
++#: ../panels/color/color.ui.h:36
+ msgid "Add profile"
+ msgstr "Engadir perfil"
+ 
+-#: ../panels/color/color.ui.h:42
++#: ../panels/color/color.ui.h:37
+ #: ../panels/wacom/gnome-wacom-properties.ui.h:10
+ msgid "Calibrate…"
+ msgstr "Calibrar…"
+ 
+-#: ../panels/color/color.ui.h:43
++#: ../panels/color/color.ui.h:38
+ msgid "Calibrate the device"
+ msgstr "Calibrar o dispositivo"
+ 
+-#: ../panels/color/color.ui.h:44
++#: ../panels/color/color.ui.h:39
+ msgid "Remove profile"
+ msgstr "Retirar perfil"
+ 
+-#: ../panels/color/color.ui.h:45
++#: ../panels/color/color.ui.h:40
+ msgid "View details"
+ msgstr "Ver detalles"
+ 
+-#: ../panels/color/color.ui.h:46
++#: ../panels/color/color.ui.h:41
+ msgid "Unable to detect any devices that can be color managed"
+ msgstr "Non foi posíbel detectar un dispositivo no que poida xestionarse a cor"
+ 
+-#: ../panels/color/color.ui.h:47
++#: ../panels/color/color.ui.h:42
+ msgid "LCD"
+ msgstr "LCD"
+ 
+-#: ../panels/color/color.ui.h:48
++#: ../panels/color/color.ui.h:43
+ msgid "LED"
+ msgstr "LED"
+ 
+-#: ../panels/color/color.ui.h:49
++#: ../panels/color/color.ui.h:44
+ msgid "CRT"
+ msgstr "CRT"
+ 
+-#: ../panels/color/color.ui.h:50
++#: ../panels/color/color.ui.h:45
+ msgid "Projector"
+ msgstr "Proxector"
+ 
+-#: ../panels/color/color.ui.h:51
++#: ../panels/color/color.ui.h:46
+ msgid "Plasma"
+ msgstr "Plasma"
+ 
+-#: ../panels/color/color.ui.h:52
++#: ../panels/color/color.ui.h:47
+ msgid "LCD (CCFL backlight)"
+ msgstr "LCD (retroiluminación CCFL)"
+ 
+-#: ../panels/color/color.ui.h:53
++#: ../panels/color/color.ui.h:48
+ msgid "LCD (RGB LED backlight)"
+ msgstr "LCD (retroiluminación LED RGB)"
+ 
+-#: ../panels/color/color.ui.h:54
++#: ../panels/color/color.ui.h:49
+ msgid "LCD (white LED backlight)"
+ msgstr "LCD (retroiluminación LED branca)"
+ 
+-#: ../panels/color/color.ui.h:55
++#: ../panels/color/color.ui.h:50
+ msgid "Wide gamut LCD (CCFL backlight)"
+ msgstr "Gamut amplo LCD (retroiluminación CCFL)"
+ 
+-#: ../panels/color/color.ui.h:56
++#: ../panels/color/color.ui.h:51
+ msgid "Wide gamut LCD (RGB LED backlight)"
+ msgstr "Gamut amplo LCD (retroiluminación LED RGB)"
+ 
+-#: ../panels/color/color.ui.h:57
++#: ../panels/color/color.ui.h:52
+ msgctxt "Calibration quality"
+ msgid "High"
+ msgstr "Alta"
+ 
+-#: ../panels/color/color.ui.h:58
++#: ../panels/color/color.ui.h:53
+ msgid "40 minutes"
+ msgstr "40 minutos"
+ 
+-#: ../panels/color/color.ui.h:59
++#: ../panels/color/color.ui.h:54
+ msgctxt "Calibration quality"
+ msgid "Medium"
+ msgstr "Media"
+ 
+-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:4
++#: ../panels/color/color.ui.h:55 ../panels/power/power.ui.h:4
+ #: ../panels/privacy/privacy.ui.h:7
+ msgid "30 minutes"
+ msgstr "30 minutos"
+ 
+-#: ../panels/color/color.ui.h:61
++#: ../panels/color/color.ui.h:56
+ msgctxt "Calibration quality"
+ msgid "Low"
+ msgstr "Baixa"
+ 
+-#: ../panels/color/color.ui.h:62 ../panels/power/power.ui.h:3
++#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:3
+ msgid "15 minutes"
+ msgstr "15 minutos"
+ 
+-#: ../panels/color/color.ui.h:63
++#: ../panels/color/color.ui.h:58
+ msgid "Native to display"
+ msgstr "Nativa da pantalla"
+ 
+-#: ../panels/color/color.ui.h:64
++#: ../panels/color/color.ui.h:59
+ msgid "D50 (Printing and publishing)"
+ msgstr "D50 (Impresión e publicación)"
+ 
+-#: ../panels/color/color.ui.h:65
++#: ../panels/color/color.ui.h:60
+ msgid "D55"
+ msgstr "D55"
+ 
+-#: ../panels/color/color.ui.h:66
++#: ../panels/color/color.ui.h:61
+ msgid "D65 (Photography and graphics)"
+ msgstr "D65 (Fotografía e gráficos)"
+ 
+-#: ../panels/color/color.ui.h:67
++#: ../panels/color/color.ui.h:62
+ msgid "D75"
+ msgstr "D75"
+ 
++#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
++msgid "Color"
++msgstr "Cor"
++
+ #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+ msgid ""
+ "Calibrate the color of your devices, such as displays, cameras or printers"
+@@ -978,33 +956,33 @@ msgid "Language"
+ msgstr "Idioma"
+ 
+ #: ../panels/common/language-chooser.ui.h:2
+-#: ../panels/mouse/cc-mouse-panel.c:120 ../panels/region/format-chooser.ui.h:2
++#: ../panels/mouse/cc-mouse-panel.c:111 ../panels/region/format-chooser.ui.h:2
+ msgid "_Done"
+ msgstr "_Feito"
+ 
+ #. Translators: This is the full date and time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:352
++#: ../panels/datetime/cc-datetime-panel.c:363
+ msgid "%e %B %Y, %l:%M %p"
+ msgstr "%e %B %Y, %l:%M %p"
+ 
+ #. Translators: This is the full date and time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:357
++#: ../panels/datetime/cc-datetime-panel.c:368
+ msgid "%e %B %Y, %R"
+ msgstr "%e %B %Y, %R"
+ 
+ #. Translators: UTC here means the Coordinated Universal Time.
+ #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
+-#: ../panels/datetime/cc-datetime-panel.c:573
++#: ../panels/datetime/cc-datetime-panel.c:584
+ msgid "UTC%:::z"
+ msgstr "UTC%:::z"
+ 
+ #. Translators: This is the time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:578
++#: ../panels/datetime/cc-datetime-panel.c:589
+ msgid "%l:%M %p"
+ msgstr "%l:%M %p"
+ 
+ #. Translators: This is the time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:583
++#: ../panels/datetime/cc-datetime-panel.c:594
+ msgid "%R"
+ msgstr "%R"
+ 
+@@ -1143,144 +1121,110 @@ msgstr "Cambiar as preferencias da data e hora do sistema"
+ msgid "To change time or date settings, you need to authenticate."
+ msgstr "Para cambiar as preferencias de data e hora debe autenticarse."
+ 
+-#: ../panels/display/cc-display-panel.c:473
++#: ../panels/display/cc-display-panel.c:486
+ msgid "Lid Closed"
+ msgstr "Tapa pechada"
+ 
+ #. translators: "Mirrored" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:476
++#: ../panels/display/cc-display-panel.c:489
+ msgid "Mirrored"
+ msgstr "Espellada"
+ 
+-#: ../panels/display/cc-display-panel.c:478
+-#: ../panels/display/cc-display-panel.c:2043
+-#: ../panels/display/display-capplet.ui.h:1
++#: ../panels/display/cc-display-panel.c:491
++#: ../panels/display/cc-display-panel.c:2101
+ msgid "Primary"
+ msgstr "Primaria"
+ 
+-#: ../panels/display/cc-display-panel.c:480
++#: ../panels/display/cc-display-panel.c:493
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1727 ../panels/power/cc-power-panel.c:1738
+-#: ../panels/privacy/cc-privacy-panel.c:77
+-#: ../panels/privacy/cc-privacy-panel.c:117
+-#: ../panels/universal-access/cc-ua-panel.c:253
+-#: ../panels/universal-access/cc-ua-panel.c:610
+-#: ../panels/universal-access/cc-ua-panel.c:736
++#: ../panels/power/cc-power-panel.c:1738 ../panels/power/cc-power-panel.c:1749
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ #: ../panels/universal-access/uap.ui.h:6
+ msgid "Off"
+ msgstr "Desactivado"
+ 
+-#: ../panels/display/cc-display-panel.c:483
++#: ../panels/display/cc-display-panel.c:496
+ msgid "Secondary"
+ msgstr "Secundaria"
+ 
+-#: ../panels/display/cc-display-panel.c:1491
++#: ../panels/display/cc-display-panel.c:1506
+ msgid "Arrange Combined Displays"
+ msgstr "Ordenar pantallas combinadas"
+ 
+-#: ../panels/display/cc-display-panel.c:1497
+-#: ../panels/display/cc-display-panel.c:1913
++#: ../panels/display/cc-display-panel.c:1512
++#: ../panels/display/cc-display-panel.c:1955
+ #: ../panels/network/connection-editor/connection-editor.ui.h:1
+ msgid "_Apply"
+ msgstr "_Aplicar"
+ 
+-#: ../panels/display/cc-display-panel.c:1518
++#: ../panels/display/cc-display-panel.c:1533
+ msgid "Drag displays to rearrange them"
+ msgstr "Arrastre as pantallas para reordenalas"
+ 
+-#. size
+-#: ../panels/display/cc-display-panel.c:1977
++#: ../panels/display/cc-display-panel.c:2037
+ msgid "Size"
+ msgstr "Tamaño"
+ 
+ #. aspect ratio
+-#: ../panels/display/cc-display-panel.c:1992
+-#: ../panels/display/display-capplet.ui.h:12
++#: ../panels/display/cc-display-panel.c:2050
+ msgid "Aspect Ratio"
+ msgstr "Proporción de aspecto"
+ 
+-#: ../panels/display/cc-display-panel.c:2013
+-#: ../panels/display/display-capplet.ui.h:13
++#: ../panels/display/cc-display-panel.c:2071
+ #: ../panels/printers/pp-options-dialog.c:86
+ msgid "Resolution"
+ msgstr "Resolución"
+ 
+-#: ../panels/display/cc-display-panel.c:2044
+-#: ../panels/display/display-capplet.ui.h:2
++#: ../panels/display/cc-display-panel.c:2102
+ msgid "Show the top bar and Activities Overview on this display"
+ msgstr "Mostrar a barra superior e a Vista de actividades nesta pantalla"
+ 
+-#: ../panels/display/cc-display-panel.c:2050
++#: ../panels/display/cc-display-panel.c:2108
+ msgid "Secondary Display"
+ msgstr "Pantalla secundaria"
+ 
+-#: ../panels/display/cc-display-panel.c:2051
++#: ../panels/display/cc-display-panel.c:2109
+ msgid "Join this display with another to create an extra workspace"
+ msgstr ""
+ "Unir esta pantalla con outra para crear un espazo de traballo adicional"
+ 
+-#: ../panels/display/cc-display-panel.c:2058
+-#: ../panels/display/display-capplet.ui.h:3
++#: ../panels/display/cc-display-panel.c:2116
+ msgid "Presentation"
+ msgstr "Presentación"
+ 
+-#: ../panels/display/cc-display-panel.c:2059
+-#: ../panels/display/display-capplet.ui.h:4
++#: ../panels/display/cc-display-panel.c:2117
+ msgid "Show slideshows and media only"
+ msgstr "Mostrar só as presentacións e o multimedia"
+ 
+ #. translators: "Mirror" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:2064
+-#: ../panels/display/display-capplet.ui.h:5
++#: ../panels/display/cc-display-panel.c:2122
+ msgid "Mirror"
+ msgstr "Espello"
+ 
+-#: ../panels/display/cc-display-panel.c:2065
++#: ../panels/display/cc-display-panel.c:2123
+ msgid "Show your existing view on both displays"
+ msgstr "Mostra a súa vista existente nas dúas pantallas"
+ 
+-#: ../panels/display/cc-display-panel.c:2071
+-#: ../panels/display/display-capplet.ui.h:9
++#: ../panels/display/cc-display-panel.c:2129
+ msgid "Turn Off"
+ msgstr "Apagar"
+ 
+-#: ../panels/display/cc-display-panel.c:2072
++#: ../panels/display/cc-display-panel.c:2130
+ msgid "Don't use this display"
+ msgstr "Non usar este monitor"
+ 
+-#: ../panels/display/cc-display-panel.c:2289
++#: ../panels/display/cc-display-panel.c:2345
+ msgid "Could not get screen information"
+ msgstr "Non foi posíbel obter a información da pantalla"
+ 
+-#: ../panels/display/cc-display-panel.c:2320
++#: ../panels/display/cc-display-panel.c:2376
+ msgid "_Arrange Combined Displays"
+ msgstr "_Ordenar pantallas combinadas"
+ 
+-#: ../panels/display/display-capplet.ui.h:6
+-msgid "Show your primary display on this screen also"
+-msgstr "Mostrar a súa pantalla primaria neste monitor tamén"
+-
+-#: ../panels/display/display-capplet.ui.h:7
+-msgid "Combine"
+-msgstr "Combinar"
+-
+-#: ../panels/display/display-capplet.ui.h:8
+-msgid "Join with the primary display to create an extra space"
+-msgstr "Unir coa pantalla primaria para crear un espazo adicional"
+-
+-#: ../panels/display/display-capplet.ui.h:10
+-msgid "Don't use the display"
+-msgstr "Non usar esta pantalla"
+-
+-#: ../panels/display/display-capplet.ui.h:11
+-#: ../panels/printers/printers.ui.h:12
+-msgid "Model"
+-msgstr "Modelo"
+-
+-#: ../panels/display/display-capplet.ui.h:14
+-msgid "Refresh Rate"
+-msgstr "Taxa de refresco"
+-
+ #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
+ msgid "Displays"
+ msgstr "Pantallas"
+@@ -1295,55 +1239,55 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
+ msgstr "Panel;Proxector;xrandr;Pantalla;Resolución;Refresco;"
+ 
+ #. TRANSLATORS: AP type
+-#: ../panels/info/cc-info-panel.c:450 ../panels/network/panel-common.c:127
++#: ../panels/info/cc-info-panel.c:452 ../panels/network/panel-common.c:127
+ msgid "Unknown"
+ msgstr "Descoñecido"
+ 
+-#: ../panels/info/cc-info-panel.c:532
++#: ../panels/info/cc-info-panel.c:539
+ #, c-format
+ msgid "%s %d-bit"
+ msgstr "%s %d-bit"
+ 
+-#: ../panels/info/cc-info-panel.c:534
++#: ../panels/info/cc-info-panel.c:541
+ #, c-format
+ msgid "%d-bit"
+ msgstr "%d-bit"
+ 
+-#: ../panels/info/cc-info-panel.c:1214
++#: ../panels/info/cc-info-panel.c:1221
+ msgid "Ask what to do"
+ msgstr "Preguntar que facer"
+ 
+-#: ../panels/info/cc-info-panel.c:1218
++#: ../panels/info/cc-info-panel.c:1225
+ msgid "Do nothing"
+ msgstr "Non facer nada"
+ 
+-#: ../panels/info/cc-info-panel.c:1222
++#: ../panels/info/cc-info-panel.c:1229
+ msgid "Open folder"
+ msgstr "Abrir cartafol"
+ 
+-#: ../panels/info/cc-info-panel.c:1313
++#: ../panels/info/cc-info-panel.c:1320
+ msgid "Other Media"
+ msgstr "Outros soportes"
+ 
+-#: ../panels/info/cc-info-panel.c:1344
++#: ../panels/info/cc-info-panel.c:1351
+ msgid "Select an application for audio CDs"
+ msgstr "Seleccione un aplicativo para os CD de son"
+ 
+-#: ../panels/info/cc-info-panel.c:1345
++#: ../panels/info/cc-info-panel.c:1352
+ msgid "Select an application for video DVDs"
+ msgstr "Seleccione un aplicativo para os DVD de vídeo"
+ 
+-#: ../panels/info/cc-info-panel.c:1346
++#: ../panels/info/cc-info-panel.c:1353
+ msgid "Select an application to run when a music player is connected"
+ msgstr ""
+ "Seleccione un aplicativo que executar cando se conecta un reprodutor de "
+ "música"
+ 
+-#: ../panels/info/cc-info-panel.c:1347
++#: ../panels/info/cc-info-panel.c:1354
+ msgid "Select an application to run when a camera is connected"
+ msgstr "Seleccione un aplicativo que executar cando se conecta unha cámara"
+ 
+-#: ../panels/info/cc-info-panel.c:1348
++#: ../panels/info/cc-info-panel.c:1355
+ msgid "Select an application for software CDs"
+ msgstr "Seleccione un aplicativo para os CD de software"
+ 
+@@ -1352,89 +1296,89 @@ msgstr "Seleccione un aplicativo para os CD de software"
+ #. * If the shared-mime-info translation works for your language,
+ #. * simply leave these untranslated.
+ #.
+-#: ../panels/info/cc-info-panel.c:1360
++#: ../panels/info/cc-info-panel.c:1367
+ msgid "audio DVD"
+ msgstr "DVD de son"
+ 
+-#: ../panels/info/cc-info-panel.c:1361
++#: ../panels/info/cc-info-panel.c:1368
+ msgid "blank Blu-ray disc"
+ msgstr "disco Blu-ray virxe"
+ 
+-#: ../panels/info/cc-info-panel.c:1362
++#: ../panels/info/cc-info-panel.c:1369
+ msgid "blank CD disc"
+ msgstr "CD virxe"
+ 
+-#: ../panels/info/cc-info-panel.c:1363
++#: ../panels/info/cc-info-panel.c:1370
+ msgid "blank DVD disc"
+ msgstr "DVD virxe"
+ 
+-#: ../panels/info/cc-info-panel.c:1364
++#: ../panels/info/cc-info-panel.c:1371
+ msgid "blank HD DVD disc"
+ msgstr "disco HD DVD virxe"
+ 
+-#: ../panels/info/cc-info-panel.c:1365
++#: ../panels/info/cc-info-panel.c:1372
+ msgid "Blu-ray video disc"
+ msgstr "Disco Blu-ray de vídeo"
+ 
+-#: ../panels/info/cc-info-panel.c:1366
++#: ../panels/info/cc-info-panel.c:1373
+ msgid "e-book reader"
+ msgstr "lector de libros electrónicos"
+ 
+-#: ../panels/info/cc-info-panel.c:1367
++#: ../panels/info/cc-info-panel.c:1374
+ msgid "HD DVD video disc"
+ msgstr "Disco HD DVD de vídeo"
+ 
+-#: ../panels/info/cc-info-panel.c:1368
++#: ../panels/info/cc-info-panel.c:1375
+ msgid "Picture CD"
+ msgstr "CD de imaxes"
+ 
+-#: ../panels/info/cc-info-panel.c:1369
++#: ../panels/info/cc-info-panel.c:1376
+ msgid "Super Video CD"
+ msgstr "Super Vídeo CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1370
++#: ../panels/info/cc-info-panel.c:1377
+ msgid "Video CD"
+ msgstr "Vídeo CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1371
++#: ../panels/info/cc-info-panel.c:1378
+ msgid "Windows software"
+ msgstr "Software de Windows"
+ 
+-#: ../panels/info/cc-info-panel.c:1372
++#: ../panels/info/cc-info-panel.c:1379
+ msgid "Software"
+ msgstr "Software"
+ 
+-#: ../panels/info/cc-info-panel.c:1495
++#: ../panels/info/cc-info-panel.c:1502
+ #: ../panels/keyboard/keyboard-shortcuts.c:1696
+ msgid "Section"
+ msgstr "Sección"
+ 
+-#: ../panels/info/cc-info-panel.c:1504 ../panels/info/info.ui.h:13
++#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:13
+ msgid "Overview"
+ msgstr "Visión xeral"
+ 
+-#: ../panels/info/cc-info-panel.c:1510 ../panels/info/info.ui.h:20
++#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:20
+ msgid "Default Applications"
+ msgstr "Aplicativos predeterminados"
+ 
+-#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:28
++#: ../panels/info/cc-info-panel.c:1522 ../panels/info/info.ui.h:28
+ msgid "Removable Media"
+ msgstr "Soportes extraíbeis"
+ 
+-#: ../panels/info/cc-info-panel.c:1540
++#: ../panels/info/cc-info-panel.c:1547
+ #, c-format
+ msgid "Version %s"
+ msgstr "Versión %s"
+ 
+-#: ../panels/info/cc-info-panel.c:1590
++#: ../panels/info/cc-info-panel.c:1597
+ msgid "Install Updates"
+ msgstr "Instalar actualizacións"
+ 
+-#: ../panels/info/cc-info-panel.c:1594
++#: ../panels/info/cc-info-panel.c:1601
+ msgid "System Up-To-Date"
+ msgstr "Sistema actualizado"
+ 
+-#: ../panels/info/cc-info-panel.c:1598
++#: ../panels/info/cc-info-panel.c:1605
+ msgid "Checking for Updates"
+ msgstr "Buscar actualizacións"
+ 
+@@ -1600,7 +1544,7 @@ msgid "Eject"
+ msgstr "Expulsar"
+ 
+ #: ../panels/keyboard/01-input-sources.xml.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+ #: ../panels/universal-access/uap.ui.h:11
+ msgid "Typing"
+ msgstr "Escritura"
+@@ -1759,7 +1703,6 @@ msgid "Modifiers-only switch to next source"
+ msgstr "Só modificadores cambian á seguinte orixe"
+ 
+ #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Keyboard"
+ msgstr "Teclado"
+ 
+@@ -1785,76 +1728,76 @@ msgstr "_Nome:"
+ msgid "C_ommand:"
+ msgstr "_Orde:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Repeat Keys"
+ msgstr "Repetición de teclas"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+ msgid "Key presses _repeat when key is held down"
+ msgstr "As pulsacións de teclas _repítense cando a tecla se mantén premida"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+ msgid "_Delay:"
+ msgstr "_Atraso:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+ msgid "_Speed:"
+ msgstr "_Velocidade:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
+ msgctxt "keyboard, delay"
+ msgid "Short"
+ msgstr "Curto"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+ msgctxt "keyboard, speed"
+ msgid "Slow"
+ msgstr "Lenta"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+ msgid "Repeat keys speed"
+ msgstr "Velocidade de repetición de teclas"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+ msgctxt "keyboard, delay"
+ msgid "Long"
+ msgstr "Longo"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+ msgctxt "keyboard, speed"
+ msgid "Fast"
+ msgstr "Rápida"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+ msgid "Cursor Blinking"
+ msgstr "Parpadeo do cursor"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+ msgid "Cursor _blinks in text fields"
+ msgstr "O cursor _parpadea nos campos de texto"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+ msgid "S_peed:"
+ msgstr "_Velocidade:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+ msgid "Cursor blink speed"
+ msgstr "Velocidade de parpadeo do cursor"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+ #: ../panels/region/region.ui.h:5
+ msgid "Input Sources"
+ msgstr "Orixes de entrada"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+ msgid "Add Shortcut"
+ msgstr "Engadir atallo"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
+ msgid "Remove Shortcut"
+ msgstr "Retirar atallo"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
+ msgid ""
+ "To edit a shortcut, click the row and hold down the new keys or press "
+ "Backspace to clear."
+@@ -1862,7 +1805,7 @@ msgstr ""
+ "Para editar unha tecla de atallo prema na fila correspondente e prema unha "
+ "combinación de teclas nova, ou prema a tecla de «Retroceso» para limpar todo."
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+ msgid "Shortcuts"
+ msgstr "Atallos de teclado"
+ 
+@@ -1905,11 +1848,11 @@ msgstr "Se reasigna o atallo para «%s», desactivarase o atallo «%s»."
+ msgid "_Reassign"
+ msgstr "_Reasignar"
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:100
++#: ../panels/mouse/cc-mouse-panel.c:95
+ msgid "Test Your _Settings"
+ msgstr "Comprobar a súa _configuración"
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:117
++#: ../panels/mouse/cc-mouse-panel.c:108
+ msgid "Test Your Settings"
+ msgstr "Comprobar a súa configuración"
+ 
+@@ -1930,91 +1873,87 @@ msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
+ msgstr "área táctil;punteiro;premer;dobre;pulsación;botón;desprazamento;"
+ 
+ #: ../panels/mouse/gnome-mouse-properties.ui.h:1
+-msgid "Mouse Preferences"
+-msgstr "Preferencias do rato"
+-
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgid "General"
+ msgstr "Xeral"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
++#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgctxt "double click, speed"
+ msgid "Slow"
+ msgstr "Lento"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
++#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+ msgid "Double-click timeout"
+ msgstr "Tempo de espera da pulsación dobre"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
++#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+ msgctxt "double click, speed"
+ msgid "Fast"
+ msgstr "Rápido"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
++#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+ msgid "_Double-click"
+ msgstr "_Dupla pulsación"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
++#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+ msgid "Primary _button"
+ msgstr "_Botón primario"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
++#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+ msgctxt "mouse, left button as primary"
+ msgid "_Left"
+ msgstr "_Esquerda"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
++#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+ msgctxt "mouse, right button as primary"
+ msgid "_Right"
+ msgstr "_Dereita"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
++#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+ msgid "Mouse"
+ msgstr "Rato"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
++#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+ msgid "_Pointer speed"
+ msgstr "Velocidade do _punteiro"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
++#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+ msgctxt "mouse pointer, speed"
+ msgid "Slow"
+ msgstr "Lento"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
++#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+ msgctxt "mouse pointer, speed"
+ msgid "Fast"
+ msgstr "Rápido"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
++#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+ msgid "Touchpad"
+ msgstr "Área táctil"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
++#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+ msgctxt "touchpad pointer, speed"
+ msgid "Slow"
+ msgstr "Lento"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
++#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+ msgctxt "touchpad pointer, speed"
+ msgid "Fast"
+ msgstr "Rápido"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
++#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+ msgid "Disable while _typing"
+ msgstr "Desac_tivar ao escribir"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
++#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+ msgid "Tap to _click"
+ msgstr "Tocar para _premer"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
++#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+ msgid "Two _finger scroll"
+ msgstr "Despra_zamento con dous dedos"
+ 
+ #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible.
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:21
++#: ../panels/mouse/gnome-mouse-properties.ui.h:20
+ msgid "_Natural scrolling"
+ msgstr "Desprazamento _natural"
+ 
+@@ -2057,7 +1996,7 @@ msgstr "Un clic, botón secundario"
+ msgid "Air_plane Mode"
+ msgstr "Modo a_vión"
+ 
+-#: ../panels/network/cc-network-panel.c:928
++#: ../panels/network/cc-network-panel.c:930
+ msgid "Network proxy"
+ msgstr "Proxy da rede"
+ 
+@@ -2065,14 +2004,14 @@ msgstr "Proxy da rede"
+ #. * window for vpn connections, it is also used to display
+ #. * vpn connections in the device list.
+ #.
+-#: ../panels/network/cc-network-panel.c:1107 ../panels/network/net-vpn.c:285
+-#: ../panels/network/net-vpn.c:438
++#: ../panels/network/cc-network-panel.c:1109 ../panels/network/net-vpn.c:278
++#: ../panels/network/net-vpn.c:431
+ #, c-format
+ msgid "%s VPN"
+ msgstr "VPN «%s»"
+ 
+ #. TRANSLATORS: the user is running a NM that is not API compatible
+-#: ../panels/network/cc-network-panel.c:1242
++#: ../panels/network/cc-network-panel.c:1244
+ msgid "The system network services are not compatible with this version."
+ msgstr "Os servizos de rede do sistema non son compatíbeis con esta versión."
+ 
+@@ -2106,34 +2045,34 @@ msgstr "automático"
+ 
+ #. TRANSLATORS: this WEP WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:52
+-#: ../panels/network/net-device-wifi.c:221
+-#: ../panels/network/net-device-wifi.c:382
++#: ../panels/network/net-device-wifi.c:216
++#: ../panels/network/net-device-wifi.c:377
+ msgid "WEP"
+ msgstr "WEP"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:56
+-#: ../panels/network/net-device-wifi.c:225
+-#: ../panels/network/net-device-wifi.c:387
++#: ../panels/network/net-device-wifi.c:220
++#: ../panels/network/net-device-wifi.c:382
+ #: ../panels/network/network-wifi.ui.h:17
+ msgid "WPA"
+ msgstr "WPA"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:60
+-#: ../panels/network/net-device-wifi.c:229
++#: ../panels/network/net-device-wifi.c:224
+ msgid "WPA2"
+ msgstr "WPA2"
+ 
+ #. TRANSLATORS: this Enterprise WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:65
+-#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:229
+ msgid "Enterprise"
+ msgstr "Empresarial"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:70
+-#: ../panels/network/net-device-wifi.c:239
+-#: ../panels/network/net-device-wifi.c:372
++#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:367
+ msgctxt "Wifi security"
+ msgid "None"
+ msgstr "Ningunha"
+@@ -2154,8 +2093,8 @@ msgid "Yesterday"
+ msgstr "Mañá"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:106
+-#: ../panels/network/net-device-ethernet.c:125
+-#: ../panels/network/net-device-wifi.c:476
++#: ../panels/network/net-device-ethernet.c:122
++#: ../panels/network/net-device-wifi.c:471
+ #, c-format
+ msgid "%i day ago"
+ msgid_plural "%i days ago"
+@@ -2165,37 +2104,37 @@ msgstr[1] "Hai %i días"
+ #. Translators: network device speed
+ #: ../panels/network/connection-editor/ce-page-details.c:155
+ #: ../panels/network/net-device-ethernet.c:53
+-#: ../panels/network/net-device-wifi.c:534
++#: ../panels/network/net-device-wifi.c:528
+ #, c-format
+ msgid "%d Mb/s"
+ msgstr "%d Mb/s"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:181
+-#: ../panels/network/net-device-wifi.c:563
++#: ../panels/network/net-device-wifi.c:557
+ msgctxt "Signal strength"
+ msgid "None"
+ msgstr "Ningunha"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:183
+-#: ../panels/network/net-device-wifi.c:565
++#: ../panels/network/net-device-wifi.c:559
+ msgctxt "Signal strength"
+ msgid "Weak"
+ msgstr "Débil"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:185
+-#: ../panels/network/net-device-wifi.c:567
++#: ../panels/network/net-device-wifi.c:561
+ msgctxt "Signal strength"
+ msgid "Ok"
+ msgstr "Aceptábel"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:187
+-#: ../panels/network/net-device-wifi.c:569
++#: ../panels/network/net-device-wifi.c:563
+ msgctxt "Signal strength"
+ msgid "Good"
+ msgstr "Boa"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:189
+-#: ../panels/network/net-device-wifi.c:571
++#: ../panels/network/net-device-wifi.c:565
+ msgctxt "Signal strength"
+ msgid "Excellent"
+ msgstr "Excelente"
+@@ -2341,15 +2280,15 @@ msgid "Link speed"
+ msgstr "Velocidade da ligazón"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:4
+-#: ../panels/network/net-device-ethernet.c:158
++#: ../panels/network/net-device-ethernet.c:155
+ #: ../panels/network/network-simple.ui.h:3
+ #: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
+ msgid "IPv4 Address"
+ msgstr "Enderezo IPv4"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:5
+-#: ../panels/network/net-device-ethernet.c:159
+-#: ../panels/network/net-device-ethernet.c:163
++#: ../panels/network/net-device-ethernet.c:156
++#: ../panels/network/net-device-ethernet.c:160
+ #: ../panels/network/network-mobile.ui.h:4
+ #: ../panels/network/network-simple.ui.h:4
+ #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
+@@ -2357,14 +2296,14 @@ msgid "IPv6 Address"
+ msgstr "Enderezo IPv6"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:6
+-#: ../panels/network/net-device-ethernet.c:166
++#: ../panels/network/net-device-ethernet.c:163
+ #: ../panels/network/network-simple.ui.h:2
+ #: ../panels/network/network-wifi.ui.h:7
+ msgid "Hardware Address"
+ msgstr "Enderezo hardware"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:7
+-#: ../panels/network/net-device-ethernet.c:170
++#: ../panels/network/net-device-ethernet.c:167
+ #: ../panels/network/network-mobile.ui.h:5
+ #: ../panels/network/network-simple.ui.h:5
+ #: ../panels/network/network-wifi.ui.h:8
+@@ -2374,7 +2313,7 @@ msgstr "Ruta predeterminada"
+ #: ../panels/network/connection-editor/details-page.ui.h:8
+ #: ../panels/network/connection-editor/ip4-page.ui.h:3
+ #: ../panels/network/connection-editor/ip6-page.ui.h:3
+-#: ../panels/network/net-device-ethernet.c:172
++#: ../panels/network/net-device-ethernet.c:169
+ #: ../panels/network/network-mobile.ui.h:6
+ #: ../panels/network/network-simple.ui.h:6
+ #: ../panels/network/network-wifi.ui.h:9
+@@ -2520,7 +2459,7 @@ msgid "_Add"
+ msgstr "_Engadir"
+ 
+ #: ../panels/network/connection-editor/net-connection-editor.c:595
+-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
++#: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
+ msgid "VPN"
+ msgstr "VPN"
+ 
+@@ -2528,23 +2467,23 @@ msgstr "VPN"
+ msgid "Bond"
+ msgstr "Bond"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:597
++#: ../panels/network/connection-editor/net-connection-editor.c:598
+ msgid "Bridge"
+ msgstr "Bridge"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:598
++#: ../panels/network/connection-editor/net-connection-editor.c:599
+ msgid "VLAN"
+ msgstr "VLAN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:749
++#: ../panels/network/connection-editor/net-connection-editor.c:750
+ msgid "Could not load VPN plugins"
+ msgstr "Non foi posíbel cargar os engadidos de VPN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:818
++#: ../panels/network/connection-editor/net-connection-editor.c:819
+ msgid "Import from file…"
+ msgstr "Importar desde ficheiro…"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:889
++#: ../panels/network/connection-editor/net-connection-editor.c:890
+ msgid "Add Network Connection"
+ msgstr "Engadir conexión de rede"
+ 
+@@ -2554,7 +2493,7 @@ msgid "_Reset"
+ msgstr "_Restabelecer"
+ 
+ #: ../panels/network/connection-editor/reset-page.ui.h:2
+-#: ../panels/network/net-device-wifi.c:1408
++#: ../panels/network/net-device-wifi.c:1403
+ #: ../panels/network/network-wifi.ui.h:40
+ msgid "_Forget"
+ msgstr "_Esquecer"
+@@ -2603,7 +2542,7 @@ msgstr "Seleccione o ficheiro para importar"
+ 
+ #: ../panels/network/connection-editor/vpn-helpers.c:246
+ #: ../panels/printers/cc-printers-panel.c:1947
+-#: ../panels/sharing/cc-sharing-panel.c:422
++#: ../panels/sharing/cc-sharing-panel.c:426
+ #: ../panels/user-accounts/um-photo-dialog.c:222
+ msgid "_Open"
+ msgstr "_Abrir"
+@@ -2690,29 +2629,29 @@ msgstr "Escravos Bond"
+ msgid "Bridge slaves"
+ msgstr "Escravos Bridge"
+ 
+-#: ../panels/network/net-device-ethernet.c:111
+-#: ../panels/network/net-device-wifi.c:462
++#: ../panels/network/net-device-ethernet.c:108
++#: ../panels/network/net-device-wifi.c:457
+ msgid "never"
+ msgstr "nunca"
+ 
+-#: ../panels/network/net-device-ethernet.c:121
+-#: ../panels/network/net-device-wifi.c:472
++#: ../panels/network/net-device-ethernet.c:118
++#: ../panels/network/net-device-wifi.c:467
+ msgid "today"
+ msgstr "hoxe"
+ 
+-#: ../panels/network/net-device-ethernet.c:123
+-#: ../panels/network/net-device-wifi.c:474
++#: ../panels/network/net-device-ethernet.c:120
++#: ../panels/network/net-device-wifi.c:469
+ msgid "yesterday"
+ msgstr "onte"
+ 
+-#: ../panels/network/net-device-ethernet.c:161
++#: ../panels/network/net-device-ethernet.c:158
+ #: ../panels/network/network-mobile.ui.h:3
+ #: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
+ #: ../panels/printers/printers.ui.h:13
+ msgid "IP Address"
+ msgstr "Enderezo IP"
+ 
+-#: ../panels/network/net-device-ethernet.c:177
++#: ../panels/network/net-device-ethernet.c:174
+ #: ../panels/network/network-wifi.ui.h:10
+ msgid "Last used"
+ msgstr "Última vez usada"
+@@ -2722,14 +2661,14 @@ msgstr "Última vez usada"
+ #. * profile. It is also used to display ethernet in the
+ #. * device list.
+ #.
+-#: ../panels/network/net-device-ethernet.c:287
++#: ../panels/network/net-device-ethernet.c:284
+ #: ../panels/network/network-ethernet.ui.h:1
+ #: ../panels/network/network-simple.ui.h:1
+ msgid "Wired"
+ msgstr "Con fíos"
+ 
+-#: ../panels/network/net-device-ethernet.c:355
+-#: ../panels/network/net-device-wifi.c:1549
++#: ../panels/network/net-device-ethernet.c:352
++#: ../panels/network/net-device-wifi.c:1558
+ #: ../panels/network/network-ethernet.ui.h:3
+ #: ../panels/network/network-mobile.ui.h:8
+ #: ../panels/network/network-simple.ui.h:8
+@@ -2737,16 +2676,20 @@ msgstr "Con fíos"
+ msgid "Options…"
+ msgstr "Opcións…"
+ 
+-#: ../panels/network/net-device-ethernet.c:492
++#: ../panels/network/net-device-ethernet.c:489
+ #, c-format
+ msgid "Profile %d"
+ msgstr "Perfil %d"
+ 
+-#: ../panels/network/net-device-mobile.c:239
++#: ../panels/network/net-device-mobile.c:232
+ msgid "Add new connection"
+ msgstr "Engadir nova conexión"
+ 
+-#: ../panels/network/net-device-wifi.c:1117
++#: ../panels/network/net-device-team.c:77
++msgid "Team slaves"
++msgstr "Escravos do equipo"
++
++#: ../panels/network/net-device-wifi.c:1110
+ msgid ""
+ "If you have a connection to the Internet other than wireless, you can set up "
+ "a wireless hotspot to share the connection with others."
+@@ -2754,12 +2697,12 @@ msgstr ""
+ "Se ten unha conexión a Internet aparte da sen fíos, pode configurar un punto "
+ "de acceso sen fíos para compartir a súa conexión a Internet con outros."
+ 
+-#: ../panels/network/net-device-wifi.c:1121
++#: ../panels/network/net-device-wifi.c:1114
+ #, c-format
+ msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+ msgstr "Cambiar ao «hotspot» sen fíos desconectaralle de <b>%s</b>."
+ 
+-#: ../panels/network/net-device-wifi.c:1125
++#: ../panels/network/net-device-wifi.c:1118
+ msgid ""
+ "It is not possible to access the Internet through your wireless while the "
+ "hotspot is active."
+@@ -2767,23 +2710,23 @@ msgstr ""
+ "Non é posíbel acceder á internet usando a conexión sen fíos mentres o "
+ "«hotspot» está activado."
+ 
+-#: ../panels/network/net-device-wifi.c:1199
++#: ../panels/network/net-device-wifi.c:1192
+ msgid "Stop hotspot and disconnect any users?"
+ msgstr "Desexa deter o «hotspot» e desconectar aos usuarios?"
+ 
+-#: ../panels/network/net-device-wifi.c:1202
++#: ../panels/network/net-device-wifi.c:1195
+ msgid "_Stop Hotspot"
+ msgstr "_Deter «hotspot»"
+ 
+-#: ../panels/network/net-device-wifi.c:1274
++#: ../panels/network/net-device-wifi.c:1267
+ msgid "System policy prohibits use as a Hotspot"
+ msgstr "A normativa do sistema prohibe o uso un «Hotspot»"
+ 
+-#: ../panels/network/net-device-wifi.c:1277
++#: ../panels/network/net-device-wifi.c:1270
+ msgid "Wireless device does not support Hotspot mode"
+ msgstr "O dispositivo Wireless non é compatíbel co modo «Hotspot»"
+ 
+-#: ../panels/network/net-device-wifi.c:1404
++#: ../panels/network/net-device-wifi.c:1399
+ msgid ""
+ "Network details for the selected networks, including passwords and any "
+ "custom configuration will be lost."
+@@ -2791,19 +2734,19 @@ msgstr ""
+ "Perderase a información das redes seleccionadas, incluíndo os contrasinals e "
+ "calquera configuración personalizada."
+ 
+-#: ../panels/network/net-device-wifi.c:1714
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
++#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+ msgid "History"
+ msgstr "Historial"
+ 
+-#: ../panels/network/net-device-wifi.c:1718 ../panels/power/power.ui.h:21
++#: ../panels/network/net-device-wifi.c:1730 ../panels/power/power.ui.h:21
+ #: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596
+-#: ../panels/wacom/cc-wacom-page.c:525
++#: ../panels/wacom/cc-wacom-page.c:534
+ msgid "_Close"
+ msgstr "_Pechar"
+ 
+ #. translators: This is the label for the "Forget wireless network" functionality
+-#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/network/net-device-wifi.c:1738
+ msgctxt "Wi-Fi Network"
+ msgid "_Forget"
+ msgstr "_Esquecer"
+@@ -2824,7 +2767,7 @@ msgstr ""
+ msgid "This is not recommended for untrusted public networks."
+ msgstr "Non se recomenda para redes públicas nas que non se confía."
+ 
+-#: ../panels/network/net-proxy.c:417
++#: ../panels/network/net-proxy.c:410
+ msgid "Proxy"
+ msgstr "Proxy"
+ 
+@@ -2840,17 +2783,17 @@ msgstr "IMEI"
+ msgid "Provider"
+ msgstr "Fornecedor"
+ 
+-#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
++#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:2
+ msgctxt "proxy method"
+ msgid "None"
+ msgstr "Ningún"
+ 
+-#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
++#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:3
+ msgctxt "proxy method"
+ msgid "Manual"
+ msgstr "Manual"
+ 
+-#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
++#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:4
+ msgctxt "proxy method"
+ msgid "Automatic"
+ msgstr "Automático"
+@@ -2903,19 +2846,7 @@ msgstr "Porto do proxy para Socks"
+ msgid "Turn device off"
+ msgstr "Desactivar dispositivo"
+ 
+-#: ../panels/network/network.ui.h:1
+-msgid "Select the interface to use for the new service"
+-msgstr "Seleccione a interface a usar para o novo servizo"
+-
+-#: ../panels/network/network.ui.h:2
+-msgid "C_reate…"
+-msgstr "C_rear…"
+-
+-#: ../panels/network/network.ui.h:3
+-msgid "_Interface"
+-msgstr "_Interface"
+-
+-#: ../panels/network/network.ui.h:8
++#: ../panels/network/network.ui.h:5
+ msgid "Add Device"
+ msgstr "Engadir dispositivo"
+ 
+@@ -2954,7 +2885,7 @@ msgstr "detalles"
+ #: ../panels/network/wireless-security/ws-leap.ui.h:2
+ #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
+ #: ../panels/user-accounts/data/account-dialog.ui.h:9
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+ msgid "_Password"
+ msgstr "_Contrasinal:"
+ 
+@@ -3650,12 +3581,12 @@ msgid "Show Details in Lock Screen"
+ msgstr "Mostrar detalles na pantalla de bloqueo"
+ 
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1733 ../panels/power/cc-power-panel.c:1740
+-#: ../panels/privacy/cc-privacy-panel.c:77
+-#: ../panels/privacy/cc-privacy-panel.c:117
+-#: ../panels/universal-access/cc-ua-panel.c:253
+-#: ../panels/universal-access/cc-ua-panel.c:610
+-#: ../panels/universal-access/cc-ua-panel.c:736
++#: ../panels/power/cc-power-panel.c:1744 ../panels/power/cc-power-panel.c:1751
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ msgid "On"
+ msgstr "Activado"
+ 
+@@ -3776,18 +3707,18 @@ msgstr ""
+ "Engadir unha conta permite que os seus aplicativos accedan a documentos, "
+ "correo-e, contactos, calendario, conversas e máis."
+ 
+-#: ../panels/power/cc-power-panel.c:187
++#: ../panels/power/cc-power-panel.c:189
+ msgid "Unknown time"
+ msgstr "Hora descoñecida"
+ 
+-#: ../panels/power/cc-power-panel.c:193
++#: ../panels/power/cc-power-panel.c:195
+ #, c-format
+ msgid "%i minute"
+ msgid_plural "%i minutes"
+ msgstr[0] "%i minuto"
+ msgstr[1] "%i minutos"
+ 
+-#: ../panels/power/cc-power-panel.c:205
++#: ../panels/power/cc-power-panel.c:207
+ #, c-format
+ msgid "%i hour"
+ msgid_plural "%i hours"
+@@ -3796,226 +3727,226 @@ msgstr[1] "%i horas"
+ 
+ #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
+ #. * Swap order with "%2$s %2$i %1$s %1$i if needed
+-#: ../panels/power/cc-power-panel.c:213
++#: ../panels/power/cc-power-panel.c:215
+ #, c-format
+ msgid "%i %s %i %s"
+ msgstr "%i %s %i %s"
+ 
+-#: ../panels/power/cc-power-panel.c:214
++#: ../panels/power/cc-power-panel.c:216
+ msgid "hour"
+ msgid_plural "hours"
+ msgstr[0] "hora"
+ msgstr[1] "horas"
+ 
+-#: ../panels/power/cc-power-panel.c:215
++#: ../panels/power/cc-power-panel.c:217
+ msgid "minute"
+ msgid_plural "minutes"
+ msgstr[0] "minuto"
+ msgstr[1] "minutos"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:234
++#: ../panels/power/cc-power-panel.c:236
+ #, c-format
+ msgid "%s until fully charged"
+ msgstr "%s até estar cargado completamente"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:241
++#: ../panels/power/cc-power-panel.c:243
+ #, c-format
+ msgid "Caution: %s remaining"
+ msgstr "Precaución: %s restante"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:246
++#: ../panels/power/cc-power-panel.c:248
+ #, c-format
+ msgid "%s remaining"
+ msgstr "%s restante"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:251 ../panels/power/cc-power-panel.c:279
++#: ../panels/power/cc-power-panel.c:253 ../panels/power/cc-power-panel.c:281
+ msgid "Fully charged"
+ msgstr "Cargada completamente"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:255 ../panels/power/cc-power-panel.c:283
++#: ../panels/power/cc-power-panel.c:257 ../panels/power/cc-power-panel.c:285
+ msgid "Empty"
+ msgstr "Baleira"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:270
++#: ../panels/power/cc-power-panel.c:272
+ msgid "Charging"
+ msgstr "Cargando"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:275
++#: ../panels/power/cc-power-panel.c:277
+ msgid "Discharging"
+ msgstr "Descargándose"
+ 
+-#: ../panels/power/cc-power-panel.c:393
++#: ../panels/power/cc-power-panel.c:395
+ msgctxt "Battery name"
+ msgid "Main"
+ msgstr "Principal"
+ 
+-#: ../panels/power/cc-power-panel.c:395
++#: ../panels/power/cc-power-panel.c:397
+ msgctxt "Battery name"
+ msgid "Extra"
+ msgstr "Adicional"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:486
++#: ../panels/power/cc-power-panel.c:469
+ msgid "Wireless mouse"
+ msgstr "Rato sen fíos"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:490
++#: ../panels/power/cc-power-panel.c:472
+ msgid "Wireless keyboard"
+ msgstr "Teclado sen fíos"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:494
++#: ../panels/power/cc-power-panel.c:475
+ msgid "Uninterruptible power supply"
+ msgstr "Fonte de alimentación non interrompíbel"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:499
++#: ../panels/power/cc-power-panel.c:478
+ msgid "Personal digital assistant"
+ msgstr "Asistente persoal dixital"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:503
++#: ../panels/power/cc-power-panel.c:481
+ msgid "Cellphone"
+ msgstr "Teléfono móbil"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:507
++#: ../panels/power/cc-power-panel.c:484
+ msgid "Media player"
+ msgstr "Reprodutor de música"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:511
++#: ../panels/power/cc-power-panel.c:487
+ msgid "Tablet"
+ msgstr "Tableta"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:515
++#: ../panels/power/cc-power-panel.c:490
+ msgid "Computer"
+ msgstr "Computador"
+ 
+ #. TRANSLATORS: secondary battery, misc
+-#: ../panels/power/cc-power-panel.c:519 ../panels/power/cc-power-panel.c:729
+-#: ../panels/power/cc-power-panel.c:2064
++#: ../panels/power/cc-power-panel.c:493 ../panels/power/cc-power-panel.c:740
++#: ../panels/power/cc-power-panel.c:2075
+ msgid "Battery"
+ msgstr "Batería"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:528
++#: ../panels/power/cc-power-panel.c:539
+ msgctxt "Battery power"
+ msgid "Charging"
+ msgstr "Cargando"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:535
++#: ../panels/power/cc-power-panel.c:546
+ msgctxt "Battery power"
+ msgid "Caution"
+ msgstr "Precaución"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:540
++#: ../panels/power/cc-power-panel.c:551
+ msgctxt "Battery power"
+ msgid "Low"
+ msgstr "Baixa"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:545
++#: ../panels/power/cc-power-panel.c:556
+ msgctxt "Battery power"
+ msgid "Good"
+ msgstr "Boa"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:550
++#: ../panels/power/cc-power-panel.c:561
+ msgctxt "Battery power"
+ msgid "Fully charged"
+ msgstr "Cargada completamente"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:554
++#: ../panels/power/cc-power-panel.c:565
+ msgctxt "Battery power"
+ msgid "Empty"
+ msgstr "Baleir"
+ 
+-#: ../panels/power/cc-power-panel.c:727
++#: ../panels/power/cc-power-panel.c:738
+ msgid "Batteries"
+ msgstr "Baterías"
+ 
+-#: ../panels/power/cc-power-panel.c:1133
++#: ../panels/power/cc-power-panel.c:1144
+ msgid "When _idle"
+ msgstr "Ao estar _inactivo"
+ 
+-#: ../panels/power/cc-power-panel.c:1502
++#: ../panels/power/cc-power-panel.c:1513
+ msgid "Power Saving"
+ msgstr "Aforro de enerxí­a"
+ 
+-#: ../panels/power/cc-power-panel.c:1530
++#: ../panels/power/cc-power-panel.c:1541
+ msgid "_Screen brightness"
+ msgstr "Brillo da pantall_a"
+ 
+-#: ../panels/power/cc-power-panel.c:1536
++#: ../panels/power/cc-power-panel.c:1547
+ msgid "_Keyboard brightness"
+ msgstr "Brillo do _teclado"
+ 
+-#: ../panels/power/cc-power-panel.c:1546
++#: ../panels/power/cc-power-panel.c:1557
+ msgid "_Dim screen when inactive"
+ msgstr "_Escurecer a pantalla se está inactivo"
+ 
+-#: ../panels/power/cc-power-panel.c:1571
++#: ../panels/power/cc-power-panel.c:1582
+ msgid "_Blank screen"
+ msgstr "Pantalla en _branco"
+ 
+-#: ../panels/power/cc-power-panel.c:1608
++#: ../panels/power/cc-power-panel.c:1619
+ msgid "_Wi-Fi"
+ msgstr "_Wifi"
+ 
+-#: ../panels/power/cc-power-panel.c:1613
++#: ../panels/power/cc-power-panel.c:1624
+ msgid "Turns off wireless devices"
+ msgstr "Desactiva os dispositivos sen fíos"
+ 
+-#: ../panels/power/cc-power-panel.c:1638
++#: ../panels/power/cc-power-panel.c:1649
+ msgid "_Mobile broadband"
+ msgstr "Banda larga _móbil"
+ 
+-#: ../panels/power/cc-power-panel.c:1643
++#: ../panels/power/cc-power-panel.c:1654
+ msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
+ msgstr "Desactiva os dispositivos de banda larga móbil (3G, 4G, WiMax, etc.)"
+ 
+-#: ../panels/power/cc-power-panel.c:1678
++#: ../panels/power/cc-power-panel.c:1689
+ msgid "_Bluetooth"
+ msgstr "_Bluetooth"
+ 
+-#: ../panels/power/cc-power-panel.c:1729
++#: ../panels/power/cc-power-panel.c:1740
+ msgid "When on battery power"
+ msgstr "Ao usar enerxía da batería"
+ 
+-#: ../panels/power/cc-power-panel.c:1731
++#: ../panels/power/cc-power-panel.c:1742
+ msgid "When plugged in"
+ msgstr "Ao estar enchufado"
+ 
+-#: ../panels/power/cc-power-panel.c:1860
++#: ../panels/power/cc-power-panel.c:1871
+ msgid "Suspend & Power Off"
+ msgstr "Suspender e apagar"
+ 
+-#: ../panels/power/cc-power-panel.c:1893
++#: ../panels/power/cc-power-panel.c:1904
+ msgid "_Automatic suspend"
+ msgstr "Suspensión _automática"
+ 
+-#: ../panels/power/cc-power-panel.c:1917
++#: ../panels/power/cc-power-panel.c:1928
+ msgid "When battery power is _critical"
+ msgstr "Cando a enerxía da batería é _crítica"
+ 
+-#: ../panels/power/cc-power-panel.c:1974
++#: ../panels/power/cc-power-panel.c:1985
+ msgid "Power Off"
+ msgstr "Apagar"
+ 
+-#: ../panels/power/cc-power-panel.c:2111
++#: ../panels/power/cc-power-panel.c:2122
+ msgid "Devices"
+ msgstr "Dispositivos"
+ 
+@@ -4033,8 +3964,8 @@ msgstr ""
+ msgid ""
+ "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+ msgstr ""
+-"Enerxía;Durmir;Suspender;Hibernar;Batería;Brillo;Escurecer;En "
+-"branco;Monitor;DPMS;Inactivo;"
++"Enerxía;Durmir;Suspender;Hibernar;Batería;Brillo;Escurecer;En branco;Monitor;"
++"DPMS;Inactivo;"
+ 
+ #: ../panels/power/power.ui.h:1
+ msgid "Hibernate"
+@@ -4121,7 +4052,7 @@ msgid "Authenticate"
+ msgstr "Autenticar"
+ 
+ #: ../panels/printers/authentication-dialog.ui.h:5
+-#: ../panels/sharing/sharing.ui.h:23
++#: ../panels/sharing/sharing.ui.h:21
+ #: ../panels/user-accounts/data/account-dialog.ui.h:6
+ msgid "Password"
+ msgstr "Contrasinal"
+@@ -4489,12 +4420,12 @@ msgid "%s Active Jobs"
+ msgstr "%s traballos activos"
+ 
+ #. Translators: This item is a server which needs authentication to show its printers
+-#: ../panels/printers/pp-new-printer-dialog.c:1667
++#: ../panels/printers/pp-new-printer-dialog.c:1669
+ msgid "Server requires authentication"
+ msgstr "O servidor require autenticación"
+ 
+ #. Translators: No printers were found
+-#: ../panels/printers/pp-new-printer-dialog.c:1704
++#: ../panels/printers/pp-new-printer-dialog.c:1706
+ msgid "No printers detected."
+ msgstr "Non se detectactou ningunha impresora."
+ 
+@@ -4667,6 +4598,10 @@ msgstr "Traballos"
+ msgid "Show _Jobs"
+ msgstr "Mostrar _traballos"
+ 
++#: ../panels/printers/printers.ui.h:12
++msgid "Model"
++msgstr "Modelo"
++
+ #: ../panels/printers/printers.ui.h:15
+ msgid "label"
+ msgstr "etiqueta"
+@@ -4703,39 +4638,39 @@ msgstr ""
+ "O servizo do sistema de impresión\n"
+ "semella que non está dispoñíbel."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:245 ../panels/privacy/privacy.ui.h:26
++#: ../panels/privacy/cc-privacy-panel.c:248 ../panels/privacy/privacy.ui.h:26
+ msgid "Screen Lock"
+ msgstr "Bloqueo de pantalla"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:358 ../panels/privacy/privacy.ui.h:20
++#: ../panels/privacy/cc-privacy-panel.c:361 ../panels/privacy/privacy.ui.h:20
+ msgid "Usage & History"
+ msgstr "Uso e historial"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:486
++#: ../panels/privacy/cc-privacy-panel.c:489
+ msgid "Empty all items from Trash?"
+ msgstr "Desexa baleirar todos os elementos do lixo?"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:487
++#: ../panels/privacy/cc-privacy-panel.c:490
+ msgid "All items in the Trash will be permanently deleted."
+ msgstr "Pérdese permanentemente todos os elementos do lixo."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:488 ../panels/privacy/privacy.ui.h:32
++#: ../panels/privacy/cc-privacy-panel.c:491 ../panels/privacy/privacy.ui.h:32
+ msgid "_Empty Trash"
+ msgstr "_Baleirar o lixo"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:511
++#: ../panels/privacy/cc-privacy-panel.c:514
+ msgid "Delete all the temporary files?"
+ msgstr "Desexa eliminar todos os ficheiros temporais?"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:512
++#: ../panels/privacy/cc-privacy-panel.c:515
+ msgid "All the temporary files will be permanently deleted."
+ msgstr "Todos os ficheiros temporais eliminaranse de forma permanente."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:513 ../panels/privacy/privacy.ui.h:33
++#: ../panels/privacy/cc-privacy-panel.c:516 ../panels/privacy/privacy.ui.h:33
+ msgid "_Purge Temporary Files"
+ msgstr "_Eliminar os ficheiros temporais"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:535 ../panels/privacy/privacy.ui.h:31
++#: ../panels/privacy/cc-privacy-panel.c:538 ../panels/privacy/privacy.ui.h:31
+ msgid "Purge Trash & Temporary Files"
+ msgstr "Limpar o lixo e ficheiros temporais"
+ 
+@@ -4753,8 +4688,8 @@ msgid ""
+ "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+ "network;identity;"
+ msgstr ""
+-"pantalla;bloqueo;diagnóstico;peches;privado;recente;temporal;tmp;índice;nome"
+-";rede;identidade;"
++"pantalla;bloqueo;diagnóstico;peches;privado;recente;temporal;tmp;índice;nome;"
++"rede;identidade;"
+ 
+ #: ../panels/privacy/privacy.ui.h:1
+ msgid "Screen Turns Off"
+@@ -5088,21 +5023,21 @@ msgstr "Baixar"
+ msgid "Preferences"
+ msgstr "Preferencias"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:274
++#: ../panels/sharing/cc-sharing-panel.c:285
+ msgctxt "service is enabled"
+ msgid "On"
+ msgstr "Activado"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:276
++#: ../panels/sharing/cc-sharing-panel.c:287
+ msgctxt "service is disabled"
+ msgid "Off"
+ msgstr "Desactivado"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:418
++#: ../panels/sharing/cc-sharing-panel.c:422
+ msgid "Choose a Folder"
+ msgstr "Seleccione un cartafol"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:702
++#: ../panels/sharing/cc-sharing-panel.c:736
+ msgid "Copy"
+ msgstr "Copiar"
+ 
+@@ -5145,70 +5080,62 @@ msgstr ""
+ "dispositivos con Bluetooth"
+ 
+ #: ../panels/sharing/sharing.ui.h:3
+-msgid "Share Public Folder"
+-msgstr "Compartir un cartafol público"
+-
+-#: ../panels/sharing/sharing.ui.h:4
+ msgid "Only Receive From Trusted Devices"
+ msgstr "Só recibir sobre dispositivos confiábeis"
+ 
+-#: ../panels/sharing/sharing.ui.h:5
++#: ../panels/sharing/sharing.ui.h:4
+ msgid "Save Received Files to Downloads Folder"
+ msgstr "Gardar os ficheiros recibidos no cartafol Descargas"
+ 
+-#: ../panels/sharing/sharing.ui.h:6
+-msgid "Only share with Trusted Devices"
+-msgstr "Só compartir con dispositivos confiábeis"
+-
+-#: ../panels/sharing/sharing.ui.h:7
++#: ../panels/sharing/sharing.ui.h:5
+ msgid "Computer Name"
+ msgstr "Nome do computador"
+ 
+-#: ../panels/sharing/sharing.ui.h:8
++#: ../panels/sharing/sharing.ui.h:6
+ msgid "Personal File Sharing"
+ msgstr "Compartición de ficheiros persoais"
+ 
+-#: ../panels/sharing/sharing.ui.h:9
++#: ../panels/sharing/sharing.ui.h:7
+ msgid "Screen Sharing"
+ msgstr "Compartición de pantalla"
+ 
+-#: ../panels/sharing/sharing.ui.h:10
++#: ../panels/sharing/sharing.ui.h:8
+ msgid "Media Sharing"
+ msgstr "Compartición de multimedia"
+ 
+-#: ../panels/sharing/sharing.ui.h:11
++#: ../panels/sharing/sharing.ui.h:9
+ msgid "Remote Login"
+ msgstr "Inicio de sesión remoto"
+ 
+-#: ../panels/sharing/sharing.ui.h:12
++#: ../panels/sharing/sharing.ui.h:10
+ msgid "Some services are disabled because of no network access."
+ msgstr "Algúns servizos están desactivados devido a que non ten acceso á rede."
+ 
+-#: ../panels/sharing/sharing.ui.h:13
++#: ../panels/sharing/sharing.ui.h:11
+ msgid "Share Music, Photos and Videos with others on the current network."
+ msgstr "Compartir música, fotos e vídeos con outros na súa rede."
+ 
+-#: ../panels/sharing/sharing.ui.h:14
++#: ../panels/sharing/sharing.ui.h:12
+ msgid "Share Media On This Network"
+ msgstr "Compartir multimedia con esta rede"
+ 
+-#: ../panels/sharing/sharing.ui.h:15
++#: ../panels/sharing/sharing.ui.h:13
+ msgid "Shared Folders"
+ msgstr "Compartir cartafoles"
+ 
+-#: ../panels/sharing/sharing.ui.h:16
++#: ../panels/sharing/sharing.ui.h:14
+ msgid "column"
+ msgstr "columna"
+ 
+-#: ../panels/sharing/sharing.ui.h:17
++#: ../panels/sharing/sharing.ui.h:15
+ msgid "Add Folder"
+ msgstr "Engadir cartafol"
+ 
+-#: ../panels/sharing/sharing.ui.h:18
++#: ../panels/sharing/sharing.ui.h:16
+ msgid "Remove Folder"
+ msgstr "Quitar cartafol"
+ 
+-#: ../panels/sharing/sharing.ui.h:20
++#: ../panels/sharing/sharing.ui.h:18
+ #, no-c-format
+ msgid ""
+ "Personal File Sharing allows you to share your Public folder with others on "
+@@ -5218,15 +5145,15 @@ msgstr ""
+ "Público con outros na súa rede actual usando: <a href=\"dav://%s\">dav://%s</"
+ "a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:21
++#: ../panels/sharing/sharing.ui.h:19
+ msgid "Share Public Folder On This Network"
+ msgstr "Compartir o cartafol Público nesta rede"
+ 
+-#: ../panels/sharing/sharing.ui.h:22
++#: ../panels/sharing/sharing.ui.h:20
+ msgid "Require Password"
+ msgstr "Requirir contrasinal"
+ 
+-#: ../panels/sharing/sharing.ui.h:25
++#: ../panels/sharing/sharing.ui.h:23
+ #, no-c-format
+ msgid ""
+ "Allow remote users to connect using the Secure Shell command:\n"
+@@ -5235,7 +5162,7 @@ msgstr ""
+ "Permitir a usuarios remotos conectarse usando a orde de Shell segura: <a "
+ "href=\"ssh %s\">ssh %s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:28
++#: ../panels/sharing/sharing.ui.h:26
+ #, no-c-format
+ msgid ""
+ "Allow remote users to view or control your screen by connecting to: <a href="
+@@ -5244,19 +5171,19 @@ msgstr ""
+ "Permitir a usuarios remotos ver ou controlar a súa pantalla conectándose a: "
+ "<a href=\"vnc://%s\">vnc://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:29
++#: ../panels/sharing/sharing.ui.h:27
+ msgid "Remote View"
+ msgstr "Vista remota"
+ 
+-#: ../panels/sharing/sharing.ui.h:30
++#: ../panels/sharing/sharing.ui.h:28
+ msgid "Remote Control"
+ msgstr "Control remoto"
+ 
+-#: ../panels/sharing/sharing.ui.h:31
++#: ../panels/sharing/sharing.ui.h:29
+ msgid "Approve All Connections"
+ msgstr "Aprobar todas as conexións"
+ 
+-#: ../panels/sharing/sharing.ui.h:32
++#: ../panels/sharing/sharing.ui.h:30
+ msgid "Show Password"
+ msgstr "Mostrar contrasinal"
+ 
+@@ -5501,9 +5428,9 @@ msgid ""
+ "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
+ "AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
+ msgstr ""
+-"Teclado;Rato;a11y;Accesibilidade;Contraste;Ampliación;Lector de "
+-"pantalla;texto;tipo de letra;tamaño;AccessX;Teclas persistentes;Teclas "
+-"lentas;Rexeite de teclas;Teclas do rato;"
++"Teclado;Rato;a11y;Accesibilidade;Contraste;Ampliación;Lector de pantalla;"
++"texto;tipo de letra;tamaño;AccessX;Teclas persistentes;Teclas lentas;Rexeite "
++"de teclas;Teclas do rato;"
+ 
+ #: ../panels/universal-access/uap.ui.h:1
+ msgid "_Always Show Universal Access Menu"
+@@ -5951,7 +5878,7 @@ msgid "_Full Name"
+ msgstr "Nome _completo"
+ 
+ #: ../panels/user-accounts/data/account-dialog.ui.h:5
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+ msgid "Account _Type"
+ msgstr "_Tipo de conta"
+ 
+@@ -6107,71 +6034,35 @@ msgstr "_Contrasinal actual"
+ msgid "Ch_ange"
+ msgstr "C_ambiar"
+ 
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:1
+-msgid "Changing photo for:"
+-msgstr "Cambiando a foto para:"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
+-msgid ""
+-"Choose a picture that will be shown at the login screen for this account."
+-msgstr ""
+-"Seleccione a foto que se mostrará na pantalla de inicio de sesión para esta "
+-"conta."
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
+-msgid "Gallery"
+-msgstr "Galería"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:4
+-#: ../panels/user-accounts/um-photo-dialog.c:218
+-msgid "Browse for more pictures"
+-msgstr "Explorar para buscar máis imaxes"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:5
+-msgid "Take a photograph"
+-msgstr "Sacar unha fotografía"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:6
+-msgid "Browse"
+-msgstr "Examinar"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:7
+-msgid "Photograph"
+-msgstr "Fotografía"
+-
+ #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+-msgid "Account Information"
+-msgstr "Información da conta"
+-
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Add User Account"
+ msgstr "Engadir conta de usuario"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Remove User Account"
+ msgstr "Retirar conta de usuario"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+ msgid "Login Options"
+ msgstr "Preferencias de inicio de sesión"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+ msgid "A_utomatic Login"
+ msgstr "_Inicio de sesión automático"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+ msgid "_Fingerprint Login"
+ msgstr "Inicio de sesión con _pegadas dixitais"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+ msgid "User Icon"
+ msgstr "Icona de usuario"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+ msgid "_Language"
+ msgstr "_Idioma:"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+ msgid "Last Login"
+ msgstr "Último inicio de sesión"
+ 
+@@ -6588,6 +6479,10 @@ msgstr "Non foi posíbel cambiar o contrasinal"
+ msgid "The passwords do not match."
+ msgstr "Os contrasinais non coinciden."
+ 
++#: ../panels/user-accounts/um-photo-dialog.c:218
++msgid "Browse for more pictures"
++msgstr "Explorar para buscar máis imaxes"
++
+ #: ../panels/user-accounts/um-photo-dialog.c:443
+ msgid "Disable image"
+ msgstr "Desactivar imaxe"
+@@ -6789,7 +6684,7 @@ msgstr ""
+ "tecla», prema o botón do atallo de teclado e prema as novas teclas ou prema "
+ "«Retroceso» para limpar todo."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:82
++#: ../panels/wacom/calibrator/calibrator-gui.c:84
+ msgid ""
+ "Please tap the target markers as they appear on screen to calibrate the "
+ "tablet."
+@@ -6797,7 +6692,7 @@ msgstr ""
+ "Prema nos marcadores obxectivo a medida que aparezan na pantalla para "
+ "calibrar a tableta."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:86
++#: ../panels/wacom/calibrator/calibrator-gui.c:88
+ msgid "Mis-click detected, restarting..."
+ msgstr "Pulsación errónea detectada, reiniciando…"
+ 
+@@ -6850,7 +6745,7 @@ msgstr "Asignar a unha única pantalla"
+ msgid "%d of %d"
+ msgstr "%d de %d"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:522
++#: ../panels/wacom/cc-wacom-page.c:531
+ msgid "Display Mapping"
+ msgstr "Mostrar mapeo"
+ 
+@@ -6987,22 +6882,22 @@ msgstr "Modo de cambio da banda táctil dereita"
+ msgid "Mode Switch #%d"
+ msgstr "Modo conmutador #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1336
++#: ../panels/wacom/gsd-wacom-device.c:1335
+ #, c-format
+ msgid "Left Button #%d"
+ msgstr "Botón esquerdo #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1339
++#: ../panels/wacom/gsd-wacom-device.c:1338
+ #, c-format
+ msgid "Right Button #%d"
+ msgstr "Botón dereito #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1342
++#: ../panels/wacom/gsd-wacom-device.c:1341
+ #, c-format
+ msgid "Top Button #%d"
+ msgstr "Botón superior #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1345
++#: ../panels/wacom/gsd-wacom-device.c:1344
+ #, c-format
+ msgid "Bottom Button #%d"
+ msgstr "Botón inferior #%d"
+@@ -7108,11 +7003,11 @@ msgstr "Panel a mostrar"
+ msgid "[PANEL] [ARGUMENT…]"
+ msgstr "[PANEL] [ARGUMENTO…]"
+ 
+-#: ../shell/cc-application.c:142
++#: ../shell/cc-application.c:145
+ msgid "- Settings"
+ msgstr "- Preferencias"
+ 
+-#: ../shell/cc-application.c:160
++#: ../shell/cc-application.c:163
+ #, c-format
+ msgid ""
+ "%s\n"
+@@ -7122,39 +7017,39 @@ msgstr ""
+ "Execute «%s --help» para ver unha lista completa de preferencias de orde "
+ "dispoñíbeis.\n"
+ 
+-#: ../shell/cc-application.c:190
++#: ../shell/cc-application.c:193
+ msgid "Available panels:"
+ msgstr "Paneis dispoñíbeis:"
+ 
+-#: ../shell/cc-application.c:325
++#: ../shell/cc-application.c:328
+ msgid "Help"
+ msgstr "Axuda"
+ 
+-#: ../shell/cc-application.c:326
++#: ../shell/cc-application.c:329
+ msgid "Quit"
+ msgstr "Saír"
+ 
+-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1479
++#: ../shell/cc-window.c:61 ../shell/cc-window.c:1486
+ msgid "All Settings"
+ msgstr "Todas as preferencias"
+ 
+ #. Add categories
+-#: ../shell/cc-window.c:866
++#: ../shell/cc-window.c:868
+ msgctxt "category"
+ msgid "Personal"
+ msgstr "Persoal"
+ 
+-#: ../shell/cc-window.c:867
++#: ../shell/cc-window.c:869
+ msgctxt "category"
+ msgid "Hardware"
+ msgstr "Hardware"
+ 
+-#: ../shell/cc-window.c:868
++#: ../shell/cc-window.c:870
+ msgctxt "category"
+ msgid "System"
+ msgstr "Sistema"
+ 
+-#: ../shell/cc-window.c:1588 ../shell/gnome-control-center.desktop.in.in.h:1
++#: ../shell/cc-window.c:1597 ../shell/gnome-control-center.desktop.in.in.h:1
+ msgid "Settings"
+ msgstr "Preferencias"
+ 
+@@ -7162,6 +7057,79 @@ msgstr "Preferencias"
+ msgid "Preferences;Settings;"
+ msgstr "Preferencias;Configuración;"
+ 
++#~ msgid "Device type:"
++#~ msgstr "Tipo de dispositivo:"
++
++#~ msgid "Manufacturer:"
++#~ msgstr "Fabricante:"
++
++#~ msgid "Model:"
++#~ msgstr "Modelo:"
++
++#~ msgid ""
++#~ "Image files can be dragged on this window to auto-complete the above "
++#~ "fields."
++#~ msgstr ""
++#~ "Pódense arrastrar ficheiros de imaxe nesta xanela para autocompletar os "
++#~ "campos superiores."
++
++#~ msgid "Show your primary display on this screen also"
++#~ msgstr "Mostrar a súa pantalla primaria neste monitor tamén"
++
++#~ msgid "Combine"
++#~ msgstr "Combinar"
++
++#~ msgid "Join with the primary display to create an extra space"
++#~ msgstr "Unir coa pantalla primaria para crear un espazo adicional"
++
++#~ msgid "Don't use the display"
++#~ msgstr "Non usar esta pantalla"
++
++#~ msgid "Refresh Rate"
++#~ msgstr "Taxa de refresco"
++
++#~ msgid "Mouse Preferences"
++#~ msgstr "Preferencias do rato"
++
++#~ msgid "Select the interface to use for the new service"
++#~ msgstr "Seleccione a interface a usar para o novo servizo"
++
++#~ msgid "C_reate…"
++#~ msgstr "C_rear…"
++
++#~ msgid "_Interface"
++#~ msgstr "_Interface"
++
++#~ msgid "Share Public Folder"
++#~ msgstr "Compartir un cartafol público"
++
++#~ msgid "Only share with Trusted Devices"
++#~ msgstr "Só compartir con dispositivos confiábeis"
++
++#~ msgid "Changing photo for:"
++#~ msgstr "Cambiando a foto para:"
++
++#~ msgid ""
++#~ "Choose a picture that will be shown at the login screen for this account."
++#~ msgstr ""
++#~ "Seleccione a foto que se mostrará na pantalla de inicio de sesión para "
++#~ "esta conta."
++
++#~ msgid "Gallery"
++#~ msgstr "Galería"
++
++#~ msgid "Take a photograph"
++#~ msgstr "Sacar unha fotografía"
++
++#~ msgid "Browse"
++#~ msgstr "Examinar"
++
++#~ msgid "Photograph"
++#~ msgstr "Fotografía"
++
++#~ msgid "Account Information"
++#~ msgstr "Información da conta"
++
+ #~ msgid "Switch between AM and PM."
+ #~ msgstr "Alternar entre AM e PM."
+ 
+diff --git a/po/id.po b/po/id.po
+index 5c77b48..7f2583f 100644
+--- a/po/id.po
++++ b/po/id.po
+@@ -12,8 +12,8 @@ msgstr ""
+ "Project-Id-Version: gnome-control-center master\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "control-center&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-09-20 21:45+0000\n"
+-"PO-Revision-Date: 2013-09-23 09:37+0700\n"
++"POT-Creation-Date: 2014-01-29 16:22+0000\n"
++"PO-Revision-Date: 2014-02-01 19:50+0700\n"
+ "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
+ "Language-Team: Indonesian <gnome@i15n.org>\n"
+ "Language: id\n"
+@@ -21,7 +21,7 @@ msgstr ""
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=1; plural=0;\n"
+-"X-Generator: Poedit 1.5.7\n"
++"X-Generator: Poedit 1.6.3\n"
+ 
+ #: ../panels/background/background.ui.h:1
+ #: ../panels/background/gnome-background-panel.desktop.in.in.h:1
+@@ -68,7 +68,7 @@ msgid "Span"
+ msgstr "Jarak"
+ 
+ #. translators: This is the title of the wallpaper chooser dialog.
+-#: ../panels/background/cc-background-chooser-dialog.c:293
++#: ../panels/background/cc-background-chooser-dialog.c:292
+ msgid "Select Background"
+ msgstr "Pilih Latar Belakang"
+ 
+@@ -89,33 +89,33 @@ msgid "Flickr"
+ msgstr "Flickr"
+ 
+ #. translators: No pictures were found
+-#: ../panels/background/cc-background-chooser-dialog.c:393
++#: ../panels/background/cc-background-chooser-dialog.c:385
+ msgid "No Pictures Found"
+ msgstr "Tak Ditemukan Gambar"
+ 
+ #. translators: %s here is the name of the Pictures directory, the string should be translated in
+ #. * the context "You can add images to your Pictures folder and they will show up here"
+-#: ../panels/background/cc-background-chooser-dialog.c:408
++#: ../panels/background/cc-background-chooser-dialog.c:400
+ #, c-format
+ msgid "You can add images to your %s folder and they will show up here"
+ msgstr ""
+ "Anda dapat menambahkan citra ke folder %s Anda dan mereka akan muncul di sini"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:436
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:631
+-#: ../panels/color/cc-color-panel.c:220 ../panels/color/cc-color-panel.c:967
+-#: ../panels/display/cc-display-panel.c:1495
+-#: ../panels/display/cc-display-panel.c:1910
++#: ../panels/background/cc-background-chooser-dialog.c:429
++#: ../panels/bluetooth/cc-bluetooth-panel.c:640
++#: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
++#: ../panels/display/cc-display-panel.c:1510
++#: ../panels/display/cc-display-panel.c:1952
+ #: ../panels/network/connection-editor/vpn-helpers.c:245
+ #: ../panels/network/connection-editor/vpn-helpers.c:374
+-#: ../panels/network/net-device-wifi.c:1201
+-#: ../panels/network/net-device-wifi.c:1407
++#: ../panels/network/net-device-wifi.c:1194
++#: ../panels/network/net-device-wifi.c:1402
+ #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
+ #: ../panels/printers/cc-printers-panel.c:1946
+ #: ../panels/printers/new-printer-dialog.ui.h:2
+-#: ../panels/privacy/cc-privacy-panel.c:467
++#: ../panels/privacy/cc-privacy-panel.c:470
+ #: ../panels/search/cc-search-locations-dialog.c:682
+-#: ../panels/sharing/cc-sharing-panel.c:421
++#: ../panels/sharing/cc-sharing-panel.c:425
+ #: ../panels/user-accounts/um-fingerprint-dialog.c:269
+ #: ../panels/user-accounts/um-photo-dialog.c:96
+ #: ../panels/user-accounts/um-photo-dialog.c:221
+@@ -123,9 +123,8 @@ msgstr ""
+ msgid "_Cancel"
+ msgstr "Ba_tal"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:437
++#: ../panels/background/cc-background-chooser-dialog.c:430
+ #: ../panels/printers/ppd-selection-dialog.ui.h:3
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:9
+ #: ../panels/user-accounts/um-photo-dialog.c:98
+ msgid "Select"
+ msgstr "Pilih"
+@@ -145,7 +144,7 @@ msgstr "%d × %d"
+ msgid "No Desktop Background"
+ msgstr "Tanpa Latar Belakang Desktop"
+ 
+-#: ../panels/background/cc-background-panel.c:492
++#: ../panels/background/cc-background-panel.c:493
+ msgid "Current background"
+ msgstr "Latar belakang kini"
+ 
+@@ -162,7 +161,7 @@ msgstr "Gambar latar;Layar;Desktop"
+ msgid "Set Up New Device"
+ msgstr "Setel Perangkat Baru"
+ 
+-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
++#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
+ msgid "Remove Device"
+ msgstr "Hapus Perangkat"
+ 
+@@ -216,50 +215,50 @@ msgstr "Pengaturan Papan Tik"
+ msgid "Send Files…"
+ msgstr "Kirim Berkas…"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
+ msgid "Yes"
+ msgstr "Ya"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
+ msgid "No"
+ msgstr "Tidak"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:470
++#: ../panels/bluetooth/cc-bluetooth-panel.c:479
+ msgid "Bluetooth is disabled"
+ msgstr "Bluetooth dinonaktifkan"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:475
++#: ../panels/bluetooth/cc-bluetooth-panel.c:484
+ msgid "Bluetooth is disabled by hardware switch"
+ msgstr "Bluetooth dinonaktifkan oleh saklar perangkat keras"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:479
++#: ../panels/bluetooth/cc-bluetooth-panel.c:488
+ msgid "No Bluetooth adapters found"
+ msgstr "Adaptor Bluetooth tidak ditemukan"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:578
++#: ../panels/bluetooth/cc-bluetooth-panel.c:587
+ msgid "Visibility"
+ msgstr "Kenampakan"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:582
++#: ../panels/bluetooth/cc-bluetooth-panel.c:591
+ #, c-format
+ msgid "Visibility of “%s”"
+ msgstr "Kenampakan “%s”"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:626
++#: ../panels/bluetooth/cc-bluetooth-panel.c:635
+ #, c-format
+ msgid "Remove '%s' from the list of devices?"
+ msgstr "Hapus '%s' dari daftar perangkat?"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:628
++#: ../panels/bluetooth/cc-bluetooth-panel.c:637
+ msgid ""
+ "If you remove the device, you will have to set it up again before next use."
+ msgstr ""
+ "Bila Anda menghapus suatu perangkat, maka Anda harus menyiapkannya lagi "
+ "sebelum dipakai."
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:632
++#: ../panels/bluetooth/cc-bluetooth-panel.c:641
+ #: ../panels/online-accounts/cc-online-accounts-panel.c:844
+ msgid "_Remove"
+ msgstr "_Hapus"
+@@ -273,14 +272,14 @@ msgid "Turn Bluetooth on and off and connect your devices"
+ msgstr "Nyalakan dan matikan Bluetooth dan sambungkan perangkat Anda"
+ 
+ #. TRANSLATORS: The user has to attach the sensor to the screen
+-#: ../panels/color/cc-color-calibrate.c:360
++#: ../panels/color/cc-color-calibrate.c:361
+ msgid "Place your calibration device over the square and press 'Start'"
+ msgstr "Tempatkan perangkat kalibrasi di atas kotak dan tekan 'Mulai'"
+ 
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:366
++#: ../panels/color/cc-color-calibrate.c:367
+ msgid ""
+ "Move your calibration device to the calibrate position and press 'Continue'"
+ msgstr ""
+@@ -289,7 +288,7 @@ msgstr ""
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:372
++#: ../panels/color/cc-color-calibrate.c:373
+ msgid ""
+ "Move your calibration device to the surface position and press 'Continue'"
+ msgstr ""
+@@ -298,54 +297,54 @@ msgstr ""
+ #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
+ #. * is built into the palmrest and we need to fullscreen the
+ #. * sample widget and shut the lid.
+-#: ../panels/color/cc-color-calibrate.c:378
++#: ../panels/color/cc-color-calibrate.c:379
+ msgid "Shut the laptop lid"
+ msgstr "Tutup lid laptop"
+ 
+ #. TRANSLATORS: We suck, the calibation failed and we have no
+ #. * good idea why or any suggestions
+-#: ../panels/color/cc-color-calibrate.c:409
++#: ../panels/color/cc-color-calibrate.c:410
+ msgid "An internal error occurred that could not be recovered."
+ msgstr "Terjadi galat internal yang tak dapat dipulihkan."
+ 
+ #. TRANSLATORS: Some required-at-runtime tools were not
+ #. * installed, which should only affect insane distros
+-#: ../panels/color/cc-color-calibrate.c:414
++#: ../panels/color/cc-color-calibrate.c:415
+ msgid "Tools required for calibration are not installed."
+ msgstr "Perkakas yang diperlukan untuk kalibrasi tak terpasang."
+ 
+ #. TRANSLATORS: The profile failed for some reason
+-#: ../panels/color/cc-color-calibrate.c:420
++#: ../panels/color/cc-color-calibrate.c:421
+ msgid "The profile could not be generated."
+ msgstr "Profil tak dapat dijangkitkan."
+ 
+ #. TRANSLATORS: The user specified a whitepoint that was
+ #. * unobtainable with the hardware they've got -- see
+ #. * https://en.wikipedia.org/wiki/White_point for details
+-#: ../panels/color/cc-color-calibrate.c:426
++#: ../panels/color/cc-color-calibrate.c:427
+ msgid "The target whitepoint was not obtainable."
+ msgstr "Titik putik target tak dapat dicapai."
+ 
+ #. TRANSLATORS: the display calibration process is finished
+-#: ../panels/color/cc-color-calibrate.c:466
++#: ../panels/color/cc-color-calibrate.c:467
+ msgid "Complete!"
+ msgstr "Komplit!"
+ 
+ #. TRANSLATORS: the display calibration failed, and we also show
+ #. * the translated (or untranslated) error string after this
+-#: ../panels/color/cc-color-calibrate.c:474
++#: ../panels/color/cc-color-calibrate.c:475
+ msgid "Calibration failed!"
+ msgstr "Kalibrasi gagal!"
+ 
+ #. TRANSLATORS: The user can now remove the sensor from the screen
+-#: ../panels/color/cc-color-calibrate.c:481
++#: ../panels/color/cc-color-calibrate.c:482
+ msgid "You can remove the calibration device."
+ msgstr "Anda dapat melepas perangkat kalibrasi."
+ 
+ #. TRANSLATORS: The user has to be careful not to knock the
+ #. * display off the screen (although we do cope if this is
+ #. * detected early enough)
+-#: ../panels/color/cc-color-calibrate.c:552
++#: ../panels/color/cc-color-calibrate.c:553
+ msgid "Do not disturb the calibration device while in progress"
+ msgstr "Jangan mengganggu perangkat kalibrasi ketika tengah berlangsung"
+ 
+@@ -407,48 +406,48 @@ msgstr "Tak dikalibrasi"
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile has been auto-generated for this hardware
+-#: ../panels/color/cc-color-panel.c:135
++#: ../panels/color/cc-color-panel.c:137
+ msgid "Default: "
+ msgstr "Baku: "
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile his a standard space like AdobeRGB
+-#: ../panels/color/cc-color-panel.c:143
++#: ../panels/color/cc-color-panel.c:145
+ msgid "Colorspace: "
+ msgstr "Ruang warna: "
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile is a test profile
+-#: ../panels/color/cc-color-panel.c:150
++#: ../panels/color/cc-color-panel.c:152
+ msgid "Test profile: "
+ msgstr "Profil uji: "
+ 
+ #. TRANSLATORS: an ICC profile is a file containing colorspace data
+-#: ../panels/color/cc-color-panel.c:218
++#: ../panels/color/cc-color-panel.c:219
+ msgid "Select ICC Profile File"
+ msgstr "Pilih Berkas Profil ICC"
+ 
+-#: ../panels/color/cc-color-panel.c:221
++#: ../panels/color/cc-color-panel.c:222
+ msgid "_Import"
+ msgstr "_Impor"
+ 
+ #. TRANSLATORS: filter name on the file->open dialog
+-#: ../panels/color/cc-color-panel.c:232
++#: ../panels/color/cc-color-panel.c:233
+ msgid "Supported ICC profiles"
+ msgstr "Profil ICC yang didukung"
+ 
+ #. TRANSLATORS: filter name on the file->open dialog
+-#: ../panels/color/cc-color-panel.c:239
++#: ../panels/color/cc-color-panel.c:240
+ #: ../panels/network/wireless-security/eap-method-fast.c:410
+ msgid "All files"
+ msgstr "Semua berkas"
+ 
+-#: ../panels/color/cc-color-panel.c:586
++#: ../panels/color/cc-color-panel.c:579
+ msgid "Screen"
+ msgstr "Layar"
+ 
+ #. TRANSLATORS: this is when the upload of the profile failed
+-#: ../panels/color/cc-color-panel.c:912
++#: ../panels/color/cc-color-panel.c:903
+ #, c-format
+ msgid "Failed to upload file: %s"
+ msgstr "Gagal mengunggah berkas: %s"
+@@ -456,40 +455,40 @@ msgstr "Gagal mengunggah berkas: %s"
+ #. TRANSLATORS: these are instructions on how to recover
+ #. * the ICC profile on the native operating system and are
+ #. * only shown when the user uses a LiveCD to calibrate
+-#: ../panels/color/cc-color-panel.c:926
++#: ../panels/color/cc-color-panel.c:917
+ msgid "The profile has been uploaded to:"
+ msgstr "Profil telah diunggah ke:"
+ 
+-#: ../panels/color/cc-color-panel.c:928
++#: ../panels/color/cc-color-panel.c:919
+ msgid "Write down this URL."
+ msgstr "Catan URL ini"
+ 
+-#: ../panels/color/cc-color-panel.c:929
++#: ../panels/color/cc-color-panel.c:920
+ msgid "Restart this computer and boot your normal operating system."
+ msgstr "Mulai ulang komputer ini dan boot sistem operasi normal Anda."
+ 
+-#: ../panels/color/cc-color-panel.c:930
++#: ../panels/color/cc-color-panel.c:921
+ msgid "Type the URL into your browser to download and install the profile."
+ msgstr ""
+ "Ketikkan URL ke dalam peramban Anda untuk mengunduh dan memasang profil."
+ 
+ #. TRANSLATORS: this is the dialog to save the ICC profile
+-#: ../panels/color/cc-color-panel.c:964
++#: ../panels/color/cc-color-panel.c:955
+ msgid "Save Profile"
+ msgstr "Simpan profil"
+ 
+-#: ../panels/color/cc-color-panel.c:968
++#: ../panels/color/cc-color-panel.c:959
+ #: ../panels/network/connection-editor/vpn-helpers.c:375
+ msgid "_Save"
+ msgstr "_Simpan"
+ 
+ #. TRANSLATORS: this is when the button is sensitive
+-#: ../panels/color/cc-color-panel.c:1328
++#: ../panels/color/cc-color-panel.c:1315
+ msgid "Create a color profile for the selected device"
+ msgstr "Buat profil warna bagi perangkat yang dipilih"
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1343 ../panels/color/cc-color-panel.c:1367
++#: ../panels/color/cc-color-panel.c:1330 ../panels/color/cc-color-panel.c:1354
+ msgid ""
+ "The measuring instrument is not detected. Please check it is turned on and "
+ "correctly connected."
+@@ -498,12 +497,12 @@ msgstr ""
+ "dari disambung dengan benar."
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1377
++#: ../panels/color/cc-color-panel.c:1364
+ msgid "The measuring instrument does not support printer profiling."
+ msgstr "Instrumen pengukur tak mendukung pembuatan profil pencetak."
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1388
++#: ../panels/color/cc-color-panel.c:1375
+ msgid "The device type is not currently supported."
+ msgstr "Jenis perangkat belum didukung."
+ 
+@@ -590,7 +589,6 @@ msgstr "Kalibrasi Tampilan"
+ #: ../panels/color/color-calibrate.ui.h:2
+ #: ../panels/printers/authentication-dialog.ui.h:2
+ #: ../panels/printers/ppd-selection-dialog.ui.h:2
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:8
+ #: ../panels/user-accounts/um-account-dialog.c:1470
+ msgid "Cancel"
+ msgstr "Batal"
+@@ -611,10 +609,10 @@ msgid "Done"
+ msgstr "Selesai"
+ 
+ #. Timeout parameters
+-#. 5000 = 5 sec
++#. 15000 = 15 sec
+ #. 750 = 0.75 sec
+ #. Text printed on screen
+-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
++#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:83
+ msgid "Screen Calibration"
+ msgstr "Kalibrasi Layar"
+ 
+@@ -760,167 +758,147 @@ msgstr ""
+ "\"\">Tampilkan rincian.</a>"
+ 
+ #: ../panels/color/color.ui.h:30
+-msgid "Device type:"
+-msgstr "Tipe perangkat:"
+-
+-#: ../panels/color/color.ui.h:31
+-msgid "Manufacturer:"
+-msgstr "Pabrikan:"
+-
+-#: ../panels/color/color.ui.h:32
+-msgid "Model:"
+-msgstr "Model:"
+-
+-#: ../panels/color/color.ui.h:33
+-msgid ""
+-"Image files can be dragged on this window to auto-complete the above fields."
+-msgstr ""
+-"Berkas gambar dapat diseret ke jendela ini untuk melengkapi otomatis ruas-"
+-"ruas di atas."
+-
+-#: ../panels/color/color.ui.h:34
+-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+-msgid "Color"
+-msgstr "Warna"
+-
+-#: ../panels/color/color.ui.h:35
+ msgid "Each device needs an up to date color profile to be color managed."
+ msgstr ""
+ "Setiap perangkat perlu profil warna terkini untuk menjadi terkelola warnanya."
+ 
+-#: ../panels/color/color.ui.h:36
++#: ../panels/color/color.ui.h:31
+ msgid "Learn more"
+ msgstr "Pelajari lebih jauh"
+ 
+-#: ../panels/color/color.ui.h:37
++#: ../panels/color/color.ui.h:32
+ msgid "Learn more about color management"
+ msgstr "Pelajari lebih jauh tentang manajemen warna"
+ 
+-#: ../panels/color/color.ui.h:38
++#: ../panels/color/color.ui.h:33
+ msgid "Set for all users"
+ msgstr "Tata bagi semua pengguna"
+ 
+-#: ../panels/color/color.ui.h:39
++#: ../panels/color/color.ui.h:34
+ msgid "Set this profile for all users on this computer"
+ msgstr "Tata profil ini bagi semua pengguna pada komputer ini"
+ 
+-#: ../panels/color/color.ui.h:40
++#: ../panels/color/color.ui.h:35
+ msgid "Enable"
+ msgstr "Aktifkan"
+ 
+-#: ../panels/color/color.ui.h:41
++#: ../panels/color/color.ui.h:36
+ msgid "Add profile"
+ msgstr "Tambah profil"
+ 
+-#: ../panels/color/color.ui.h:42
++#: ../panels/color/color.ui.h:37
+ #: ../panels/wacom/gnome-wacom-properties.ui.h:10
+ msgid "Calibrate…"
+ msgstr "Mengalibrasi…"
+ 
+-#: ../panels/color/color.ui.h:43
++#: ../panels/color/color.ui.h:38
+ msgid "Calibrate the device"
+ msgstr "Kalibrasikan perangkat"
+ 
+-#: ../panels/color/color.ui.h:44
++#: ../panels/color/color.ui.h:39
+ msgid "Remove profile"
+ msgstr "Hapus profil"
+ 
+-#: ../panels/color/color.ui.h:45
++#: ../panels/color/color.ui.h:40
+ msgid "View details"
+ msgstr "Lihat rincian"
+ 
+-#: ../panels/color/color.ui.h:46
++#: ../panels/color/color.ui.h:41
+ msgid "Unable to detect any devices that can be color managed"
+ msgstr "Tak bisa mendeteksi sebarang perangkat yang dapat dikelola warnanya"
+ 
+-#: ../panels/color/color.ui.h:47
++#: ../panels/color/color.ui.h:42
+ msgid "LCD"
+ msgstr "LCD"
+ 
+-#: ../panels/color/color.ui.h:48
++#: ../panels/color/color.ui.h:43
+ msgid "LED"
+ msgstr "LED"
+ 
+-#: ../panels/color/color.ui.h:49
++#: ../panels/color/color.ui.h:44
+ msgid "CRT"
+ msgstr "CRT"
+ 
+-#: ../panels/color/color.ui.h:50
++#: ../panels/color/color.ui.h:45
+ msgid "Projector"
+ msgstr "Projektor"
+ 
+-#: ../panels/color/color.ui.h:51
++#: ../panels/color/color.ui.h:46
+ msgid "Plasma"
+ msgstr "Plasma"
+ 
+-#: ../panels/color/color.ui.h:52
++#: ../panels/color/color.ui.h:47
+ msgid "LCD (CCFL backlight)"
+ msgstr "LCD (cahaya latar CCFL)"
+ 
+-#: ../panels/color/color.ui.h:53
++#: ../panels/color/color.ui.h:48
+ msgid "LCD (RGB LED backlight)"
+ msgstr "LCD (cahaya lagar LED RGB)"
+ 
+-#: ../panels/color/color.ui.h:54
++#: ../panels/color/color.ui.h:49
+ msgid "LCD (white LED backlight)"
+ msgstr "LCD (cahaya latar LED putih)"
+ 
+-#: ../panels/color/color.ui.h:55
++#: ../panels/color/color.ui.h:50
+ msgid "Wide gamut LCD (CCFL backlight)"
+ msgstr "LCD gamut lebar (cahaya latar CCFL)"
+ 
+-#: ../panels/color/color.ui.h:56
++#: ../panels/color/color.ui.h:51
+ msgid "Wide gamut LCD (RGB LED backlight)"
+ msgstr "LCD gamut lebar (cahaya latar LED RGB)"
+ 
+-#: ../panels/color/color.ui.h:57
++#: ../panels/color/color.ui.h:52
+ msgctxt "Calibration quality"
+ msgid "High"
+ msgstr "Tinggi"
+ 
+-#: ../panels/color/color.ui.h:58
++#: ../panels/color/color.ui.h:53
+ msgid "40 minutes"
+ msgstr "40 menit"
+ 
+-#: ../panels/color/color.ui.h:59
++#: ../panels/color/color.ui.h:54
+ msgctxt "Calibration quality"
+ msgid "Medium"
+ msgstr "Sedang"
+ 
+-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:4
++#: ../panels/color/color.ui.h:55 ../panels/power/power.ui.h:4
+ #: ../panels/privacy/privacy.ui.h:7
+ msgid "30 minutes"
+ msgstr "30 menit"
+ 
+-#: ../panels/color/color.ui.h:61
++#: ../panels/color/color.ui.h:56
+ msgctxt "Calibration quality"
+ msgid "Low"
+ msgstr "Rendah"
+ 
+-#: ../panels/color/color.ui.h:62 ../panels/power/power.ui.h:3
++#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:3
+ msgid "15 minutes"
+ msgstr "15 menit"
+ 
+-#: ../panels/color/color.ui.h:63
++#: ../panels/color/color.ui.h:58
+ msgid "Native to display"
+ msgstr "Asli ke tampilan"
+ 
+-#: ../panels/color/color.ui.h:64
++#: ../panels/color/color.ui.h:59
+ msgid "D50 (Printing and publishing)"
+ msgstr "D50 (Pencetakan dan penerbitan)"
+ 
+-#: ../panels/color/color.ui.h:65
++#: ../panels/color/color.ui.h:60
+ msgid "D55"
+ msgstr "D55"
+ 
+-#: ../panels/color/color.ui.h:66
++#: ../panels/color/color.ui.h:61
+ msgid "D65 (Photography and graphics)"
+ msgstr "D65 (Fotografi and grafis)"
+ 
+-#: ../panels/color/color.ui.h:67
++#: ../panels/color/color.ui.h:62
+ msgid "D75"
+ msgstr "D75"
+ 
++#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
++msgid "Color"
++msgstr "Warna"
++
+ #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+ msgid ""
+ "Calibrate the color of your devices, such as displays, cameras or printers"
+@@ -972,33 +950,33 @@ msgid "Language"
+ msgstr "Bahasa"
+ 
+ #: ../panels/common/language-chooser.ui.h:2
+-#: ../panels/mouse/cc-mouse-panel.c:120 ../panels/region/format-chooser.ui.h:2
++#: ../panels/mouse/cc-mouse-panel.c:111 ../panels/region/format-chooser.ui.h:2
+ msgid "_Done"
+ msgstr "Selesa_i"
+ 
+ #. Translators: This is the full date and time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:352
++#: ../panels/datetime/cc-datetime-panel.c:363
+ msgid "%e %B %Y, %l:%M %p"
+ msgstr "%e %B %Y, %l:%M %p"
+ 
+ #. Translators: This is the full date and time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:357
++#: ../panels/datetime/cc-datetime-panel.c:368
+ msgid "%e %B %Y, %R"
+ msgstr "%e %B %Y, %R"
+ 
+ #. Translators: UTC here means the Coordinated Universal Time.
+ #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
+-#: ../panels/datetime/cc-datetime-panel.c:573
++#: ../panels/datetime/cc-datetime-panel.c:584
+ msgid "UTC%:::z"
+ msgstr "UTC%:::z"
+ 
+ #. Translators: This is the time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:578
++#: ../panels/datetime/cc-datetime-panel.c:589
+ msgid "%l:%M %p"
+ msgstr "%l:%M %p"
+ 
+ #. Translators: This is the time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:583
++#: ../panels/datetime/cc-datetime-panel.c:594
+ msgid "%R"
+ msgstr "%R"
+ 
+@@ -1137,143 +1115,109 @@ msgstr "Ubah pengaturan waktu dan tanggal sistem"
+ msgid "To change time or date settings, you need to authenticate."
+ msgstr "Untuk mengubah tatanan waktu atau tanggal, Anda perlu diotentikasi."
+ 
+-#: ../panels/display/cc-display-panel.c:473
++#: ../panels/display/cc-display-panel.c:486
+ msgid "Lid Closed"
+ msgstr "Lid Tertutup"
+ 
+ #. translators: "Mirrored" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:476
++#: ../panels/display/cc-display-panel.c:489
+ msgid "Mirrored"
+ msgstr "Tampilan Kembar"
+ 
+-#: ../panels/display/cc-display-panel.c:478
+-#: ../panels/display/cc-display-panel.c:2043
+-#: ../panels/display/display-capplet.ui.h:1
++#: ../panels/display/cc-display-panel.c:491
++#: ../panels/display/cc-display-panel.c:2101
+ msgid "Primary"
+ msgstr "Primer"
+ 
+-#: ../panels/display/cc-display-panel.c:480
++#: ../panels/display/cc-display-panel.c:493
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1727 ../panels/power/cc-power-panel.c:1738
+-#: ../panels/privacy/cc-privacy-panel.c:77
+-#: ../panels/privacy/cc-privacy-panel.c:117
+-#: ../panels/universal-access/cc-ua-panel.c:253
+-#: ../panels/universal-access/cc-ua-panel.c:610
+-#: ../panels/universal-access/cc-ua-panel.c:736
++#: ../panels/power/cc-power-panel.c:1743 ../panels/power/cc-power-panel.c:1754
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ #: ../panels/universal-access/uap.ui.h:6
+ msgid "Off"
+ msgstr "Mati"
+ 
+-#: ../panels/display/cc-display-panel.c:483
++#: ../panels/display/cc-display-panel.c:496
+ msgid "Secondary"
+ msgstr "Sekunder"
+ 
+-#: ../panels/display/cc-display-panel.c:1491
++#: ../panels/display/cc-display-panel.c:1506
+ msgid "Arrange Combined Displays"
+ msgstr "Atur Tampilan Kombinasi"
+ 
+-#: ../panels/display/cc-display-panel.c:1497
+-#: ../panels/display/cc-display-panel.c:1913
++#: ../panels/display/cc-display-panel.c:1512
++#: ../panels/display/cc-display-panel.c:1955
+ #: ../panels/network/connection-editor/connection-editor.ui.h:1
+ msgid "_Apply"
+ msgstr "Ter_apkan"
+ 
+-#: ../panels/display/cc-display-panel.c:1518
++#: ../panels/display/cc-display-panel.c:1533
+ msgid "Drag displays to rearrange them"
+ msgstr "Seret tampilan untuk mengatur ulang mereka"
+ 
+-#. size
+-#: ../panels/display/cc-display-panel.c:1977
++#: ../panels/display/cc-display-panel.c:2037
+ msgid "Size"
+ msgstr "Ukuran"
+ 
+ #. aspect ratio
+-#: ../panels/display/cc-display-panel.c:1992
+-#: ../panels/display/display-capplet.ui.h:12
++#: ../panels/display/cc-display-panel.c:2050
+ msgid "Aspect Ratio"
+ msgstr "Rasio Aspek"
+ 
+-#: ../panels/display/cc-display-panel.c:2013
+-#: ../panels/display/display-capplet.ui.h:13
++#: ../panels/display/cc-display-panel.c:2071
+ #: ../panels/printers/pp-options-dialog.c:86
+ msgid "Resolution"
+ msgstr "Resolusi"
+ 
+-#: ../panels/display/cc-display-panel.c:2044
+-#: ../panels/display/display-capplet.ui.h:2
++#: ../panels/display/cc-display-panel.c:2102
+ msgid "Show the top bar and Activities Overview on this display"
+ msgstr "Tunjukkan bilah puncak dan Ringkasan Aktivitas pada tampilan ini"
+ 
+-#: ../panels/display/cc-display-panel.c:2050
++#: ../panels/display/cc-display-panel.c:2108
+ msgid "Secondary Display"
+ msgstr "Tampilan Sekunder"
+ 
+-#: ../panels/display/cc-display-panel.c:2051
++#: ../panels/display/cc-display-panel.c:2109
+ msgid "Join this display with another to create an extra workspace"
+ msgstr "Gabungkan tampilan ini dengan lainnya untuk membuat ruang kerja ekstra"
+ 
+-#: ../panels/display/cc-display-panel.c:2058
+-#: ../panels/display/display-capplet.ui.h:3
++#: ../panels/display/cc-display-panel.c:2116
+ msgid "Presentation"
+ msgstr "Presentasi"
+ 
+-#: ../panels/display/cc-display-panel.c:2059
+-#: ../panels/display/display-capplet.ui.h:4
++#: ../panels/display/cc-display-panel.c:2117
+ msgid "Show slideshows and media only"
+ msgstr "Tampilkan hanya pertunjukan salindia dan media"
+ 
+ #. translators: "Mirror" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:2064
+-#: ../panels/display/display-capplet.ui.h:5
++#: ../panels/display/cc-display-panel.c:2122
+ msgid "Mirror"
+ msgstr "Cermin"
+ 
+-#: ../panels/display/cc-display-panel.c:2065
++#: ../panels/display/cc-display-panel.c:2123
+ msgid "Show your existing view on both displays"
+ msgstr "Tayangkan tilikan saat ini pada kedua tampilan"
+ 
+-#: ../panels/display/cc-display-panel.c:2071
+-#: ../panels/display/display-capplet.ui.h:9
++#: ../panels/display/cc-display-panel.c:2129
+ msgid "Turn Off"
+ msgstr "Matikan"
+ 
+-#: ../panels/display/cc-display-panel.c:2072
++#: ../panels/display/cc-display-panel.c:2130
+ msgid "Don't use this display"
+ msgstr "Jangan pakai tampilan ini"
+ 
+-#: ../panels/display/cc-display-panel.c:2289
++#: ../panels/display/cc-display-panel.c:2345
+ msgid "Could not get screen information"
+ msgstr "Tidak mendapatkan informasi layar"
+ 
+-#: ../panels/display/cc-display-panel.c:2320
++#: ../panels/display/cc-display-panel.c:2376
+ msgid "_Arrange Combined Displays"
+ msgstr "_Atur Tampilan Kombinasi"
+ 
+-#: ../panels/display/display-capplet.ui.h:6
+-msgid "Show your primary display on this screen also"
+-msgstr "Tayangkan tampilan primer Anda juga pada layar ini"
+-
+-#: ../panels/display/display-capplet.ui.h:7
+-msgid "Combine"
+-msgstr "Kombinasikan"
+-
+-#: ../panels/display/display-capplet.ui.h:8
+-msgid "Join with the primary display to create an extra space"
+-msgstr "Gabungkan dengan tampilan primer untuk membuat ruang ekstra"
+-
+-#: ../panels/display/display-capplet.ui.h:10
+-msgid "Don't use the display"
+-msgstr "Jangan pakai tampilan ini"
+-
+-#: ../panels/display/display-capplet.ui.h:11
+-#: ../panels/printers/printers.ui.h:12
+-msgid "Model"
+-msgstr "Model"
+-
+-#: ../panels/display/display-capplet.ui.h:14
+-msgid "Refresh Rate"
+-msgstr "Laju Penyegaran"
+-
+ #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
+ msgid "Displays"
+ msgstr "Tampilan"
+@@ -1288,53 +1232,53 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
+ msgstr "Panel;Projektor;xrandr;Layar;Resolusi;Segarkan;"
+ 
+ #. TRANSLATORS: AP type
+-#: ../panels/info/cc-info-panel.c:450 ../panels/network/panel-common.c:127
++#: ../panels/info/cc-info-panel.c:452 ../panels/network/panel-common.c:127
+ msgid "Unknown"
+ msgstr "Unknown"
+ 
+-#: ../panels/info/cc-info-panel.c:532
++#: ../panels/info/cc-info-panel.c:539
+ #, c-format
+ msgid "%s %d-bit"
+ msgstr "%s %d-bit"
+ 
+-#: ../panels/info/cc-info-panel.c:534
++#: ../panels/info/cc-info-panel.c:541
+ #, c-format
+ msgid "%d-bit"
+ msgstr "%d-bit"
+ 
+-#: ../panels/info/cc-info-panel.c:1214
++#: ../panels/info/cc-info-panel.c:1221
+ msgid "Ask what to do"
+ msgstr "Tanya apa yang akan dilakukan"
+ 
+-#: ../panels/info/cc-info-panel.c:1218
++#: ../panels/info/cc-info-panel.c:1225
+ msgid "Do nothing"
+ msgstr "Jangan lakukan apa pun"
+ 
+-#: ../panels/info/cc-info-panel.c:1222
++#: ../panels/info/cc-info-panel.c:1229
+ msgid "Open folder"
+ msgstr "Buka folder"
+ 
+-#: ../panels/info/cc-info-panel.c:1313
++#: ../panels/info/cc-info-panel.c:1320
+ msgid "Other Media"
+ msgstr "Media Lain"
+ 
+-#: ../panels/info/cc-info-panel.c:1344
++#: ../panels/info/cc-info-panel.c:1351
+ msgid "Select an application for audio CDs"
+ msgstr "Pilih aplikasi bagi CD musik"
+ 
+-#: ../panels/info/cc-info-panel.c:1345
++#: ../panels/info/cc-info-panel.c:1352
+ msgid "Select an application for video DVDs"
+ msgstr "Pilih aplikasi bagi DVD video"
+ 
+-#: ../panels/info/cc-info-panel.c:1346
++#: ../panels/info/cc-info-panel.c:1353
+ msgid "Select an application to run when a music player is connected"
+ msgstr "Pilih aplikasi yang dijalankan ketika pemutar musik disambungkan"
+ 
+-#: ../panels/info/cc-info-panel.c:1347
++#: ../panels/info/cc-info-panel.c:1354
+ msgid "Select an application to run when a camera is connected"
+ msgstr "Pilih aplikasi yang dijalankan ketika kamera disambungkan"
+ 
+-#: ../panels/info/cc-info-panel.c:1348
++#: ../panels/info/cc-info-panel.c:1355
+ msgid "Select an application for software CDs"
+ msgstr "Pilih aplikasi bagi CD perangkat lunak"
+ 
+@@ -1343,89 +1287,89 @@ msgstr "Pilih aplikasi bagi CD perangkat lunak"
+ #. * If the shared-mime-info translation works for your language,
+ #. * simply leave these untranslated.
+ #.
+-#: ../panels/info/cc-info-panel.c:1360
++#: ../panels/info/cc-info-panel.c:1367
+ msgid "audio DVD"
+ msgstr "DVD suara"
+ 
+-#: ../panels/info/cc-info-panel.c:1361
++#: ../panels/info/cc-info-panel.c:1368
+ msgid "blank Blu-ray disc"
+ msgstr "diska Blu-ray kosong"
+ 
+-#: ../panels/info/cc-info-panel.c:1362
++#: ../panels/info/cc-info-panel.c:1369
+ msgid "blank CD disc"
+ msgstr "diska CD kosong"
+ 
+-#: ../panels/info/cc-info-panel.c:1363
++#: ../panels/info/cc-info-panel.c:1370
+ msgid "blank DVD disc"
+ msgstr "diska DVD kosong"
+ 
+-#: ../panels/info/cc-info-panel.c:1364
++#: ../panels/info/cc-info-panel.c:1371
+ msgid "blank HD DVD disc"
+ msgstr "diska HD DVD kosong"
+ 
+-#: ../panels/info/cc-info-panel.c:1365
++#: ../panels/info/cc-info-panel.c:1372
+ msgid "Blu-ray video disc"
+ msgstr "diska video Blu-ray"
+ 
+-#: ../panels/info/cc-info-panel.c:1366
++#: ../panels/info/cc-info-panel.c:1373
+ msgid "e-book reader"
+ msgstr "pembaca e-book"
+ 
+-#: ../panels/info/cc-info-panel.c:1367
++#: ../panels/info/cc-info-panel.c:1374
+ msgid "HD DVD video disc"
+ msgstr "diska video HD DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1368
++#: ../panels/info/cc-info-panel.c:1375
+ msgid "Picture CD"
+ msgstr "CD gambar"
+ 
+-#: ../panels/info/cc-info-panel.c:1369
++#: ../panels/info/cc-info-panel.c:1376
+ msgid "Super Video CD"
+ msgstr "CD Super Video"
+ 
+-#: ../panels/info/cc-info-panel.c:1370
++#: ../panels/info/cc-info-panel.c:1377
+ msgid "Video CD"
+ msgstr "CD video"
+ 
+-#: ../panels/info/cc-info-panel.c:1371
++#: ../panels/info/cc-info-panel.c:1378
+ msgid "Windows software"
+ msgstr "Perangkat lunak Windows"
+ 
+-#: ../panels/info/cc-info-panel.c:1372
++#: ../panels/info/cc-info-panel.c:1379
+ msgid "Software"
+ msgstr "Perangkat Lunak"
+ 
+-#: ../panels/info/cc-info-panel.c:1495
++#: ../panels/info/cc-info-panel.c:1502
+ #: ../panels/keyboard/keyboard-shortcuts.c:1696
+ msgid "Section"
+ msgstr "Seksi"
+ 
+-#: ../panels/info/cc-info-panel.c:1504 ../panels/info/info.ui.h:13
++#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:13
+ msgid "Overview"
+ msgstr "Ringkasan"
+ 
+-#: ../panels/info/cc-info-panel.c:1510 ../panels/info/info.ui.h:20
++#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:20
+ msgid "Default Applications"
+ msgstr "Aplikasi Baku"
+ 
+-#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:28
++#: ../panels/info/cc-info-panel.c:1522 ../panels/info/info.ui.h:28
+ msgid "Removable Media"
+ msgstr "Media Lepasan"
+ 
+-#: ../panels/info/cc-info-panel.c:1540
++#: ../panels/info/cc-info-panel.c:1547
+ #, c-format
+ msgid "Version %s"
+ msgstr "Versi %s"
+ 
+-#: ../panels/info/cc-info-panel.c:1590
++#: ../panels/info/cc-info-panel.c:1597
+ msgid "Install Updates"
+ msgstr "Pasang Pemutakhiran"
+ 
+-#: ../panels/info/cc-info-panel.c:1594
++#: ../panels/info/cc-info-panel.c:1601
+ msgid "System Up-To-Date"
+ msgstr "Sistem Mutakhir"
+ 
+-#: ../panels/info/cc-info-panel.c:1598
++#: ../panels/info/cc-info-panel.c:1605
+ msgid "Checking for Updates"
+ msgstr "Memeriksa Pemutakhiran"
+ 
+@@ -1590,7 +1534,7 @@ msgid "Eject"
+ msgstr "Keluarkan"
+ 
+ #: ../panels/keyboard/01-input-sources.xml.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+ #: ../panels/universal-access/uap.ui.h:11
+ msgid "Typing"
+ msgstr "Mengetik"
+@@ -1749,7 +1693,6 @@ msgid "Modifiers-only switch to next source"
+ msgstr "Hanya modifier bertukar ke sumber selanjutnya"
+ 
+ #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Keyboard"
+ msgstr "Papan Ketik"
+ 
+@@ -1774,76 +1717,76 @@ msgstr "_Nama:"
+ msgid "C_ommand:"
+ msgstr "P_erintah:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Repeat Keys"
+ msgstr "Tombol Pengulangan"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+ msgid "Key presses _repeat when key is held down"
+ msgstr "Tombol akan diulangi saat tombol te_rsebut ditekan dalam beberapa saat"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+ msgid "_Delay:"
+ msgstr "Je_da:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+ msgid "_Speed:"
+ msgstr "_Speed:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
+ msgctxt "keyboard, delay"
+ msgid "Short"
+ msgstr "Singkat"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+ msgctxt "keyboard, speed"
+ msgid "Slow"
+ msgstr "Lambat"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+ msgid "Repeat keys speed"
+ msgstr "Kecepatan pengulangan kunci"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+ msgctxt "keyboard, delay"
+ msgid "Long"
+ msgstr "Lama"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+ msgctxt "keyboard, speed"
+ msgid "Fast"
+ msgstr "Cepat"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+ msgid "Cursor Blinking"
+ msgstr "Kursor Berkedip"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+ msgid "Cursor _blinks in text fields"
+ msgstr "Pendaran _kursor di area teks"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+ msgid "S_peed:"
+ msgstr "S_peed:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+ msgid "Cursor blink speed"
+ msgstr "Kecepatan kedip kursor"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+ #: ../panels/region/region.ui.h:5
+ msgid "Input Sources"
+ msgstr "Sumber Masukan"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+ msgid "Add Shortcut"
+ msgstr "Tambah Pintasan"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
+ msgid "Remove Shortcut"
+ msgstr "Hapus Pintasan"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
+ msgid ""
+ "To edit a shortcut, click the row and hold down the new keys or press "
+ "Backspace to clear."
+@@ -1851,7 +1794,7 @@ msgstr ""
+ "Untuk mengedit tombol cara pintas, klik pada baris dan tahan tombol baru, "
+ "atau tekan spasi mundur untuk menghapus."
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+ msgid "Shortcuts"
+ msgstr "Pintas"
+ 
+@@ -1897,11 +1840,11 @@ msgstr ""
+ msgid "_Reassign"
+ msgstr "Alih _Fungsikan"
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:100
++#: ../panels/mouse/cc-mouse-panel.c:95
+ msgid "Test Your _Settings"
+ msgstr "Uji Penga_turan Anda"
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:117
++#: ../panels/mouse/cc-mouse-panel.c:108
+ msgid "Test Your Settings"
+ msgstr "Uji Pengaturan Anda"
+ 
+@@ -1921,91 +1864,87 @@ msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
+ msgstr "Trackpad;Pointer;Klik;Sentuh;Ganda;Tombol;Trackball;Gulir;"
+ 
+ #: ../panels/mouse/gnome-mouse-properties.ui.h:1
+-msgid "Mouse Preferences"
+-msgstr "Preferensi Tetikus"
+-
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgid "General"
+ msgstr "Umum"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
++#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgctxt "double click, speed"
+ msgid "Slow"
+ msgstr "Lambat"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
++#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+ msgid "Double-click timeout"
+ msgstr "Tenggat klik ganda"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
++#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+ msgctxt "double click, speed"
+ msgid "Fast"
+ msgstr "Cepat"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
++#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+ msgid "_Double-click"
+ msgstr "Klik _ganda"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
++#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+ msgid "Primary _button"
+ msgstr "Tom_bol primer"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
++#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+ msgctxt "mouse, left button as primary"
+ msgid "_Left"
+ msgstr "K_iri"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
++#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+ msgctxt "mouse, right button as primary"
+ msgid "_Right"
+ msgstr "K_anan"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
++#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+ msgid "Mouse"
+ msgstr "Tetikus"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
++#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+ msgid "_Pointer speed"
+ msgstr "Kece_patan penunjuk"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
++#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+ msgctxt "mouse pointer, speed"
+ msgid "Slow"
+ msgstr "Lambat"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
++#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+ msgctxt "mouse pointer, speed"
+ msgid "Fast"
+ msgstr "Cepat"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
++#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+ msgid "Touchpad"
+ msgstr "Touchpad"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
++#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+ msgctxt "touchpad pointer, speed"
+ msgid "Slow"
+ msgstr "Lambat"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
++#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+ msgctxt "touchpad pointer, speed"
+ msgid "Fast"
+ msgstr "Cepat"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
++#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+ msgid "Disable while _typing"
+ msgstr "Matikan ke_tika mengetik"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
++#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+ msgid "Tap to _click"
+ msgstr "_Ketuk untuk mengklik"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
++#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+ msgid "Two _finger scroll"
+ msgstr "Menggulung dua _jari"
+ 
+ #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible.
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:21
++#: ../panels/mouse/gnome-mouse-properties.ui.h:20
+ msgid "_Natural scrolling"
+ msgstr "Pe_ngguliran alami"
+ 
+@@ -2048,7 +1987,7 @@ msgstr "Klik tunggal, tombol sekunder"
+ msgid "Air_plane Mode"
+ msgstr "Mode _Pesawat Terbang"
+ 
+-#: ../panels/network/cc-network-panel.c:928
++#: ../panels/network/cc-network-panel.c:930
+ msgid "Network proxy"
+ msgstr "Proxy jaringan"
+ 
+@@ -2056,14 +1995,14 @@ msgstr "Proxy jaringan"
+ #. * window for vpn connections, it is also used to display
+ #. * vpn connections in the device list.
+ #.
+-#: ../panels/network/cc-network-panel.c:1107 ../panels/network/net-vpn.c:285
+-#: ../panels/network/net-vpn.c:438
++#: ../panels/network/cc-network-panel.c:1109 ../panels/network/net-vpn.c:278
++#: ../panels/network/net-vpn.c:431
+ #, c-format
+ msgid "%s VPN"
+ msgstr "VPN %s"
+ 
+ #. TRANSLATORS: the user is running a NM that is not API compatible
+-#: ../panels/network/cc-network-panel.c:1242
++#: ../panels/network/cc-network-panel.c:1244
+ msgid "The system network services are not compatible with this version."
+ msgstr "Layanan jaringan sistem tak kompatibel dengan versi ini."
+ 
+@@ -2097,34 +2036,34 @@ msgstr "otomatis"
+ 
+ #. TRANSLATORS: this WEP WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:52
+-#: ../panels/network/net-device-wifi.c:221
+-#: ../panels/network/net-device-wifi.c:382
++#: ../panels/network/net-device-wifi.c:216
++#: ../panels/network/net-device-wifi.c:377
+ msgid "WEP"
+ msgstr "WEP"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:56
+-#: ../panels/network/net-device-wifi.c:225
+-#: ../panels/network/net-device-wifi.c:387
++#: ../panels/network/net-device-wifi.c:220
++#: ../panels/network/net-device-wifi.c:382
+ #: ../panels/network/network-wifi.ui.h:17
+ msgid "WPA"
+ msgstr "WPA"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:60
+-#: ../panels/network/net-device-wifi.c:229
++#: ../panels/network/net-device-wifi.c:224
+ msgid "WPA2"
+ msgstr "WPA2"
+ 
+ #. TRANSLATORS: this Enterprise WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:65
+-#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:229
+ msgid "Enterprise"
+ msgstr "Enterprise"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:70
+-#: ../panels/network/net-device-wifi.c:239
+-#: ../panels/network/net-device-wifi.c:372
++#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:367
+ msgctxt "Wifi security"
+ msgid "None"
+ msgstr "Nihil"
+@@ -2145,8 +2084,8 @@ msgid "Yesterday"
+ msgstr "Kemarin"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:106
+-#: ../panels/network/net-device-ethernet.c:125
+-#: ../panels/network/net-device-wifi.c:476
++#: ../panels/network/net-device-ethernet.c:122
++#: ../panels/network/net-device-wifi.c:471
+ #, c-format
+ msgid "%i day ago"
+ msgid_plural "%i days ago"
+@@ -2155,37 +2094,37 @@ msgstr[0] "%i hari yang lalu"
+ #. Translators: network device speed
+ #: ../panels/network/connection-editor/ce-page-details.c:155
+ #: ../panels/network/net-device-ethernet.c:53
+-#: ../panels/network/net-device-wifi.c:534
++#: ../panels/network/net-device-wifi.c:528
+ #, c-format
+ msgid "%d Mb/s"
+ msgstr "%d Mb/s"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:181
+-#: ../panels/network/net-device-wifi.c:563
++#: ../panels/network/net-device-wifi.c:557
+ msgctxt "Signal strength"
+ msgid "None"
+ msgstr "Nihil"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:183
+-#: ../panels/network/net-device-wifi.c:565
++#: ../panels/network/net-device-wifi.c:559
+ msgctxt "Signal strength"
+ msgid "Weak"
+ msgstr "Lemah"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:185
+-#: ../panels/network/net-device-wifi.c:567
++#: ../panels/network/net-device-wifi.c:561
+ msgctxt "Signal strength"
+ msgid "Ok"
+ msgstr "Ok"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:187
+-#: ../panels/network/net-device-wifi.c:569
++#: ../panels/network/net-device-wifi.c:563
+ msgctxt "Signal strength"
+ msgid "Good"
+ msgstr "Bagus"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:189
+-#: ../panels/network/net-device-wifi.c:571
++#: ../panels/network/net-device-wifi.c:565
+ msgctxt "Signal strength"
+ msgid "Excellent"
+ msgstr "Sempurna"
+@@ -2331,15 +2270,15 @@ msgid "Link speed"
+ msgstr "Kecepatan link"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:4
+-#: ../panels/network/net-device-ethernet.c:158
++#: ../panels/network/net-device-ethernet.c:155
+ #: ../panels/network/network-simple.ui.h:3
+ #: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
+ msgid "IPv4 Address"
+ msgstr "Alamat IPv4"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:5
+-#: ../panels/network/net-device-ethernet.c:159
+-#: ../panels/network/net-device-ethernet.c:163
++#: ../panels/network/net-device-ethernet.c:156
++#: ../panels/network/net-device-ethernet.c:160
+ #: ../panels/network/network-mobile.ui.h:4
+ #: ../panels/network/network-simple.ui.h:4
+ #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
+@@ -2347,14 +2286,14 @@ msgid "IPv6 Address"
+ msgstr "Alamat IPv6"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:6
+-#: ../panels/network/net-device-ethernet.c:166
++#: ../panels/network/net-device-ethernet.c:163
+ #: ../panels/network/network-simple.ui.h:2
+ #: ../panels/network/network-wifi.ui.h:7
+ msgid "Hardware Address"
+ msgstr "Alamat Perangkat Keras"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:7
+-#: ../panels/network/net-device-ethernet.c:170
++#: ../panels/network/net-device-ethernet.c:167
+ #: ../panels/network/network-mobile.ui.h:5
+ #: ../panels/network/network-simple.ui.h:5
+ #: ../panels/network/network-wifi.ui.h:8
+@@ -2364,7 +2303,7 @@ msgstr "Rute Default"
+ #: ../panels/network/connection-editor/details-page.ui.h:8
+ #: ../panels/network/connection-editor/ip4-page.ui.h:3
+ #: ../panels/network/connection-editor/ip6-page.ui.h:3
+-#: ../panels/network/net-device-ethernet.c:172
++#: ../panels/network/net-device-ethernet.c:169
+ #: ../panels/network/network-mobile.ui.h:6
+ #: ../panels/network/network-simple.ui.h:6
+ #: ../panels/network/network-wifi.ui.h:9
+@@ -2510,7 +2449,7 @@ msgid "_Add"
+ msgstr "T_ambah"
+ 
+ #: ../panels/network/connection-editor/net-connection-editor.c:595
+-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
++#: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
+ msgid "VPN"
+ msgstr "VPN"
+ 
+@@ -2518,23 +2457,23 @@ msgstr "VPN"
+ msgid "Bond"
+ msgstr "Bond"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:597
++#: ../panels/network/connection-editor/net-connection-editor.c:598
+ msgid "Bridge"
+ msgstr "Bridge"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:598
++#: ../panels/network/connection-editor/net-connection-editor.c:599
+ msgid "VLAN"
+ msgstr "VLAN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:749
++#: ../panels/network/connection-editor/net-connection-editor.c:750
+ msgid "Could not load VPN plugins"
+ msgstr "Tak dapat memuat plugin VPN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:818
++#: ../panels/network/connection-editor/net-connection-editor.c:819
+ msgid "Import from file…"
+ msgstr "Impor dari berkas…"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:889
++#: ../panels/network/connection-editor/net-connection-editor.c:890
+ msgid "Add Network Connection"
+ msgstr "Tambah Koneksi Jaringan"
+ 
+@@ -2544,7 +2483,7 @@ msgid "_Reset"
+ msgstr "_Reset"
+ 
+ #: ../panels/network/connection-editor/reset-page.ui.h:2
+-#: ../panels/network/net-device-wifi.c:1408
++#: ../panels/network/net-device-wifi.c:1403
+ #: ../panels/network/network-wifi.ui.h:40
+ msgid "_Forget"
+ msgstr "_Lupakan"
+@@ -2592,7 +2531,7 @@ msgstr "Pilih berkas untuk diimpor"
+ 
+ #: ../panels/network/connection-editor/vpn-helpers.c:246
+ #: ../panels/printers/cc-printers-panel.c:1947
+-#: ../panels/sharing/cc-sharing-panel.c:422
++#: ../panels/sharing/cc-sharing-panel.c:426
+ #: ../panels/user-accounts/um-photo-dialog.c:222
+ msgid "_Open"
+ msgstr "_Buka"
+@@ -2681,29 +2620,29 @@ msgstr "Slave bond"
+ msgid "Bridge slaves"
+ msgstr "Slave bridge"
+ 
+-#: ../panels/network/net-device-ethernet.c:111
+-#: ../panels/network/net-device-wifi.c:462
++#: ../panels/network/net-device-ethernet.c:108
++#: ../panels/network/net-device-wifi.c:457
+ msgid "never"
+ msgstr "tak pernah"
+ 
+-#: ../panels/network/net-device-ethernet.c:121
+-#: ../panels/network/net-device-wifi.c:472
++#: ../panels/network/net-device-ethernet.c:118
++#: ../panels/network/net-device-wifi.c:467
+ msgid "today"
+ msgstr "hari ini"
+ 
+-#: ../panels/network/net-device-ethernet.c:123
+-#: ../panels/network/net-device-wifi.c:474
++#: ../panels/network/net-device-ethernet.c:120
++#: ../panels/network/net-device-wifi.c:469
+ msgid "yesterday"
+ msgstr "kemarin"
+ 
+-#: ../panels/network/net-device-ethernet.c:161
++#: ../panels/network/net-device-ethernet.c:158
+ #: ../panels/network/network-mobile.ui.h:3
+ #: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
+ #: ../panels/printers/printers.ui.h:13
+ msgid "IP Address"
+ msgstr "Alamat IP"
+ 
+-#: ../panels/network/net-device-ethernet.c:177
++#: ../panels/network/net-device-ethernet.c:174
+ #: ../panels/network/network-wifi.ui.h:10
+ msgid "Last used"
+ msgstr "Terakhir dipakai"
+@@ -2713,14 +2652,14 @@ msgstr "Terakhir dipakai"
+ #. * profile. It is also used to display ethernet in the
+ #. * device list.
+ #.
+-#: ../panels/network/net-device-ethernet.c:287
++#: ../panels/network/net-device-ethernet.c:284
+ #: ../panels/network/network-ethernet.ui.h:1
+ #: ../panels/network/network-simple.ui.h:1
+ msgid "Wired"
+ msgstr "Kabel"
+ 
+-#: ../panels/network/net-device-ethernet.c:355
+-#: ../panels/network/net-device-wifi.c:1549
++#: ../panels/network/net-device-ethernet.c:352
++#: ../panels/network/net-device-wifi.c:1558
+ #: ../panels/network/network-ethernet.ui.h:3
+ #: ../panels/network/network-mobile.ui.h:8
+ #: ../panels/network/network-simple.ui.h:8
+@@ -2728,16 +2667,21 @@ msgstr "Kabel"
+ msgid "Options…"
+ msgstr "Opsi…"
+ 
+-#: ../panels/network/net-device-ethernet.c:492
++#: ../panels/network/net-device-ethernet.c:489
+ #, c-format
+ msgid "Profile %d"
+ msgstr "Profil %d"
+ 
+-#: ../panels/network/net-device-mobile.c:239
++#: ../panels/network/net-device-mobile.c:232
+ msgid "Add new connection"
+ msgstr "Tambah sambungan baru"
+ 
+-#: ../panels/network/net-device-wifi.c:1117
++#: ../panels/network/net-device-team.c:77
++#| msgid "Bridge slaves"
++msgid "Team slaves"
++msgstr "Slave tim"
++
++#: ../panels/network/net-device-wifi.c:1110
+ msgid ""
+ "If you have a connection to the Internet other than wireless, you can set up "
+ "a wireless hotspot to share the connection with others."
+@@ -2746,12 +2690,12 @@ msgstr ""
+ "menggunakannya sebagai hotspot nirkabel untuk berbagi koneksi dengan yang "
+ "lain."
+ 
+-#: ../panels/network/net-device-wifi.c:1121
++#: ../panels/network/net-device-wifi.c:1114
+ #, c-format
+ msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+ msgstr "Mengaktifkan hotspot nirkabel akan memutuskan Anda dari <b>%s</b>."
+ 
+-#: ../panels/network/net-device-wifi.c:1125
++#: ../panels/network/net-device-wifi.c:1118
+ msgid ""
+ "It is not possible to access the Internet through your wireless while the "
+ "hotspot is active."
+@@ -2759,23 +2703,23 @@ msgstr ""
+ "Anda tidak dapat mengakses Internet melalui nirkabel Anda selama hotspot "
+ "aktif."
+ 
+-#: ../panels/network/net-device-wifi.c:1199
++#: ../panels/network/net-device-wifi.c:1192
+ msgid "Stop hotspot and disconnect any users?"
+ msgstr "Hentikan hotspot dan putuskan semua pengguna?"
+ 
+-#: ../panels/network/net-device-wifi.c:1202
++#: ../panels/network/net-device-wifi.c:1195
+ msgid "_Stop Hotspot"
+ msgstr "_Stop Hotspot"
+ 
+-#: ../panels/network/net-device-wifi.c:1274
++#: ../panels/network/net-device-wifi.c:1267
+ msgid "System policy prohibits use as a Hotspot"
+ msgstr "Kebijakan sistem melarang pemakaian sebagai Hotspot"
+ 
+-#: ../panels/network/net-device-wifi.c:1277
++#: ../panels/network/net-device-wifi.c:1270
+ msgid "Wireless device does not support Hotspot mode"
+ msgstr "Perangkat nirkabel tak mendukung mode Hotspot"
+ 
+-#: ../panels/network/net-device-wifi.c:1404
++#: ../panels/network/net-device-wifi.c:1399
+ msgid ""
+ "Network details for the selected networks, including passwords and any "
+ "custom configuration will be lost."
+@@ -2783,19 +2727,19 @@ msgstr ""
+ "Rincian jaringan bagi jaringan yang dipilih, termasuk sandi dan sebarang "
+ "konfigurasi gubahan akan hilang."
+ 
+-#: ../panels/network/net-device-wifi.c:1714
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
++#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+ msgid "History"
+ msgstr "Riwayat"
+ 
+-#: ../panels/network/net-device-wifi.c:1718 ../panels/power/power.ui.h:21
++#: ../panels/network/net-device-wifi.c:1730 ../panels/power/power.ui.h:21
+ #: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596
+-#: ../panels/wacom/cc-wacom-page.c:525
++#: ../panels/wacom/cc-wacom-page.c:534
+ msgid "_Close"
+ msgstr "_Tutup"
+ 
+ #. translators: This is the label for the "Forget wireless network" functionality
+-#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/network/net-device-wifi.c:1738
+ msgctxt "Wi-Fi Network"
+ msgid "_Forget"
+ msgstr "_Lupakan"
+@@ -2815,7 +2759,7 @@ msgstr ""
+ msgid "This is not recommended for untrusted public networks."
+ msgstr "Ini tak dianjurkan bagi jaringan publik yang tak terpercaya."
+ 
+-#: ../panels/network/net-proxy.c:417
++#: ../panels/network/net-proxy.c:410
+ msgid "Proxy"
+ msgstr "Proksi"
+ 
+@@ -2831,17 +2775,17 @@ msgstr "IMEI"
+ msgid "Provider"
+ msgstr "Penyedia"
+ 
+-#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
++#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:2
+ msgctxt "proxy method"
+ msgid "None"
+ msgstr "Tak ada"
+ 
+-#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
++#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:3
+ msgctxt "proxy method"
+ msgid "Manual"
+ msgstr "Manual"
+ 
+-#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
++#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:4
+ msgctxt "proxy method"
+ msgid "Automatic"
+ msgstr "Otomatis"
+@@ -2894,19 +2838,7 @@ msgstr "Port proksi SOCKS"
+ msgid "Turn device off"
+ msgstr "Matikan perangkat"
+ 
+-#: ../panels/network/network.ui.h:1
+-msgid "Select the interface to use for the new service"
+-msgstr "Pilih antarmuka untuk dipakai bagi layanan baru"
+-
+-#: ../panels/network/network.ui.h:2
+-msgid "C_reate…"
+-msgstr "_Buat…"
+-
+-#: ../panels/network/network.ui.h:3
+-msgid "_Interface"
+-msgstr "_Antar muka"
+-
+-#: ../panels/network/network.ui.h:8
++#: ../panels/network/network.ui.h:5
+ msgid "Add Device"
+ msgstr "Tambah Perangkat"
+ 
+@@ -2945,7 +2877,7 @@ msgstr "rincian"
+ #: ../panels/network/wireless-security/ws-leap.ui.h:2
+ #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
+ #: ../panels/user-accounts/data/account-dialog.ui.h:9
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+ msgid "_Password"
+ msgstr "_Sandi"
+ 
+@@ -3641,12 +3573,12 @@ msgid "Show Details in Lock Screen"
+ msgstr "Tampilkan Rincian dalam Layar Terkunci"
+ 
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1733 ../panels/power/cc-power-panel.c:1740
+-#: ../panels/privacy/cc-privacy-panel.c:77
+-#: ../panels/privacy/cc-privacy-panel.c:117
+-#: ../panels/universal-access/cc-ua-panel.c:253
+-#: ../panels/universal-access/cc-ua-panel.c:610
+-#: ../panels/universal-access/cc-ua-panel.c:736
++#: ../panels/power/cc-power-panel.c:1749 ../panels/power/cc-power-panel.c:1756
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ msgid "On"
+ msgstr "Nyala"
+ 
+@@ -3768,17 +3700,17 @@ msgstr ""
+ "Dengan menambah akun, aplikasi Anda dapat mengakses dokumen, surat, kontak, "
+ "kalender, percakapan dan lainnya yang dimiliki oleh akun Anda."
+ 
+-#: ../panels/power/cc-power-panel.c:187
++#: ../panels/power/cc-power-panel.c:189
+ msgid "Unknown time"
+ msgstr "Waktu tak diketahui"
+ 
+-#: ../panels/power/cc-power-panel.c:193
++#: ../panels/power/cc-power-panel.c:195
+ #, c-format
+ msgid "%i minute"
+ msgid_plural "%i minutes"
+ msgstr[0] "%i menit"
+ 
+-#: ../panels/power/cc-power-panel.c:205
++#: ../panels/power/cc-power-panel.c:207
+ #, c-format
+ msgid "%i hour"
+ msgid_plural "%i hours"
+@@ -3786,224 +3718,224 @@ msgstr[0] "%i jam"
+ 
+ #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
+ #. * Swap order with "%2$s %2$i %1$s %1$i if needed
+-#: ../panels/power/cc-power-panel.c:213
++#: ../panels/power/cc-power-panel.c:215
+ #, c-format
+ msgid "%i %s %i %s"
+ msgstr "%i %s %i %s"
+ 
+-#: ../panels/power/cc-power-panel.c:214
++#: ../panels/power/cc-power-panel.c:216
+ msgid "hour"
+ msgid_plural "hours"
+ msgstr[0] "jam"
+ 
+-#: ../panels/power/cc-power-panel.c:215
++#: ../panels/power/cc-power-panel.c:217
+ msgid "minute"
+ msgid_plural "minutes"
+ msgstr[0] "menit"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:234
++#: ../panels/power/cc-power-panel.c:236
+ #, c-format
+ msgid "%s until fully charged"
+ msgstr "%s sampai terisi penuh"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:241
++#: ../panels/power/cc-power-panel.c:243
+ #, c-format
+ msgid "Caution: %s remaining"
+ msgstr "Hati-hati: %s tersisa"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:246
++#: ../panels/power/cc-power-panel.c:248
+ #, c-format
+ msgid "%s remaining"
+ msgstr "%s tersisa"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:251 ../panels/power/cc-power-panel.c:279
++#: ../panels/power/cc-power-panel.c:253 ../panels/power/cc-power-panel.c:281
+ msgid "Fully charged"
+ msgstr "Terisi penuh"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:255 ../panels/power/cc-power-panel.c:283
++#: ../panels/power/cc-power-panel.c:257 ../panels/power/cc-power-panel.c:285
+ msgid "Empty"
+ msgstr "Kosong"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:270
++#: ../panels/power/cc-power-panel.c:272
+ msgid "Charging"
+ msgstr "Mengisi"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:275
++#: ../panels/power/cc-power-panel.c:277
+ msgid "Discharging"
+ msgstr "Mengosongkan"
+ 
+-#: ../panels/power/cc-power-panel.c:393
++#: ../panels/power/cc-power-panel.c:400
+ msgctxt "Battery name"
+ msgid "Main"
+ msgstr "Utama"
+ 
+-#: ../panels/power/cc-power-panel.c:395
++#: ../panels/power/cc-power-panel.c:402
+ msgctxt "Battery name"
+ msgid "Extra"
+ msgstr "Ekstra"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:486
++#: ../panels/power/cc-power-panel.c:474
+ msgid "Wireless mouse"
+ msgstr "Tetikus nirkabel"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:490
++#: ../panels/power/cc-power-panel.c:477
+ msgid "Wireless keyboard"
+ msgstr "Papan tik nirkabel"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:494
++#: ../panels/power/cc-power-panel.c:480
+ msgid "Uninterruptible power supply"
+ msgstr "Pasokan tenaga tak putus"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:499
++#: ../panels/power/cc-power-panel.c:483
+ msgid "Personal digital assistant"
+ msgstr "Asisten dijital pribadi"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:503
++#: ../panels/power/cc-power-panel.c:486
+ msgid "Cellphone"
+ msgstr "Telepon seluler"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:507
++#: ../panels/power/cc-power-panel.c:489
+ msgid "Media player"
+ msgstr "Pemutar media"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:511
++#: ../panels/power/cc-power-panel.c:492
+ msgid "Tablet"
+ msgstr "Tablet"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:515
++#: ../panels/power/cc-power-panel.c:495
+ msgid "Computer"
+ msgstr "Komputer"
+ 
+ #. TRANSLATORS: secondary battery, misc
+-#: ../panels/power/cc-power-panel.c:519 ../panels/power/cc-power-panel.c:729
+-#: ../panels/power/cc-power-panel.c:2064
++#: ../panels/power/cc-power-panel.c:498 ../panels/power/cc-power-panel.c:745
++#: ../panels/power/cc-power-panel.c:2080
+ msgid "Battery"
+ msgstr "Baterai"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:528
++#: ../panels/power/cc-power-panel.c:544
+ msgctxt "Battery power"
+ msgid "Charging"
+ msgstr "Mengisi"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:535
++#: ../panels/power/cc-power-panel.c:551
+ msgctxt "Battery power"
+ msgid "Caution"
+ msgstr "Awas"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:540
++#: ../panels/power/cc-power-panel.c:556
+ msgctxt "Battery power"
+ msgid "Low"
+ msgstr "Lemah"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:545
++#: ../panels/power/cc-power-panel.c:561
+ msgctxt "Battery power"
+ msgid "Good"
+ msgstr "Bagus"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:550
++#: ../panels/power/cc-power-panel.c:566
+ msgctxt "Battery power"
+ msgid "Fully charged"
+ msgstr "Terisi penuh"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:554
++#: ../panels/power/cc-power-panel.c:570
+ msgctxt "Battery power"
+ msgid "Empty"
+ msgstr "Kosong"
+ 
+-#: ../panels/power/cc-power-panel.c:727
++#: ../panels/power/cc-power-panel.c:743
+ msgid "Batteries"
+ msgstr "Baterai "
+ 
+-#: ../panels/power/cc-power-panel.c:1133
++#: ../panels/power/cc-power-panel.c:1149
+ msgid "When _idle"
+ msgstr "Ket_ika menganggur"
+ 
+-#: ../panels/power/cc-power-panel.c:1502
++#: ../panels/power/cc-power-panel.c:1518
+ msgid "Power Saving"
+ msgstr "Penghematan Daya"
+ 
+-#: ../panels/power/cc-power-panel.c:1530
++#: ../panels/power/cc-power-panel.c:1546
+ msgid "_Screen brightness"
+ msgstr "Kecerahan _layar"
+ 
+-#: ../panels/power/cc-power-panel.c:1536
++#: ../panels/power/cc-power-panel.c:1552
+ msgid "_Keyboard brightness"
+ msgstr "_Kecerahan papan tik"
+ 
+-#: ../panels/power/cc-power-panel.c:1546
++#: ../panels/power/cc-power-panel.c:1562
+ msgid "_Dim screen when inactive"
+ msgstr "Re_dupkan layar ketika tak aktif"
+ 
+-#: ../panels/power/cc-power-panel.c:1571
++#: ../panels/power/cc-power-panel.c:1587
+ msgid "_Blank screen"
+ msgstr "Kosongkan layar"
+ 
+-#: ../panels/power/cc-power-panel.c:1608
++#: ../panels/power/cc-power-panel.c:1624
+ msgid "_Wi-Fi"
+ msgstr "_Wi-Fi"
+ 
+-#: ../panels/power/cc-power-panel.c:1613
++#: ../panels/power/cc-power-panel.c:1629
+ msgid "Turns off wireless devices"
+ msgstr "Matikan perangkat nirkabel"
+ 
+-#: ../panels/power/cc-power-panel.c:1638
++#: ../panels/power/cc-power-panel.c:1654
+ msgid "_Mobile broadband"
+ msgstr "Data _seluler"
+ 
+-#: ../panels/power/cc-power-panel.c:1643
++#: ../panels/power/cc-power-panel.c:1659
+ msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
+ msgstr "Matikan perangkat data seluler (3G, 4G, WiMax, dsb.)"
+ 
+-#: ../panels/power/cc-power-panel.c:1678
++#: ../panels/power/cc-power-panel.c:1694
+ msgid "_Bluetooth"
+ msgstr "_Bluetooth"
+ 
+-#: ../panels/power/cc-power-panel.c:1729
++#: ../panels/power/cc-power-panel.c:1745
+ msgid "When on battery power"
+ msgstr "Ketika memakai baterai"
+ 
+-#: ../panels/power/cc-power-panel.c:1731
++#: ../panels/power/cc-power-panel.c:1747
+ msgid "When plugged in"
+ msgstr "Ketika ditancapkan"
+ 
+-#: ../panels/power/cc-power-panel.c:1860
++#: ../panels/power/cc-power-panel.c:1876
+ msgid "Suspend & Power Off"
+ msgstr "Suspensi & Matikan"
+ 
+-#: ../panels/power/cc-power-panel.c:1893
++#: ../panels/power/cc-power-panel.c:1909
+ msgid "_Automatic suspend"
+ msgstr "Suspensi otom_atis"
+ 
+-#: ../panels/power/cc-power-panel.c:1917
++#: ../panels/power/cc-power-panel.c:1933
+ msgid "When battery power is _critical"
+ msgstr "Ketika muatan baterai _kritis"
+ 
+-#: ../panels/power/cc-power-panel.c:1974
++#: ../panels/power/cc-power-panel.c:1990
+ msgid "Power Off"
+ msgstr "Matikan"
+ 
+-#: ../panels/power/cc-power-panel.c:2111
++#: ../panels/power/cc-power-panel.c:2127
+ msgid "Devices"
+ msgstr "Perangkat"
+ 
+@@ -4108,7 +4040,7 @@ msgid "Authenticate"
+ msgstr "Otentikasikan"
+ 
+ #: ../panels/printers/authentication-dialog.ui.h:5
+-#: ../panels/sharing/sharing.ui.h:23
++#: ../panels/sharing/sharing.ui.h:21
+ #: ../panels/user-accounts/data/account-dialog.ui.h:6
+ msgid "Password"
+ msgstr "Sandi"
+@@ -4474,12 +4406,12 @@ msgid "%s Active Jobs"
+ msgstr "%s Tugas Aktif"
+ 
+ #. Translators: This item is a server which needs authentication to show its printers
+-#: ../panels/printers/pp-new-printer-dialog.c:1667
++#: ../panels/printers/pp-new-printer-dialog.c:1669
+ msgid "Server requires authentication"
+ msgstr "Server memerlukan otentikasi"
+ 
+ #. Translators: No printers were found
+-#: ../panels/printers/pp-new-printer-dialog.c:1704
++#: ../panels/printers/pp-new-printer-dialog.c:1706
+ msgid "No printers detected."
+ msgstr "Pencetak tak terdeteksi."
+ 
+@@ -4652,6 +4584,10 @@ msgstr "Tugas"
+ msgid "Show _Jobs"
+ msgstr "Tampilkan _Tugas"
+ 
++#: ../panels/printers/printers.ui.h:12
++msgid "Model"
++msgstr "Model"
++
+ #: ../panels/printers/printers.ui.h:15
+ msgid "label"
+ msgstr "label"
+@@ -4688,39 +4624,39 @@ msgstr ""
+ "Maaf! Layanan pencetakan sistem\n"
+ "sepertinya tak tersedia."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:245 ../panels/privacy/privacy.ui.h:26
++#: ../panels/privacy/cc-privacy-panel.c:248 ../panels/privacy/privacy.ui.h:26
+ msgid "Screen Lock"
+ msgstr "Kunci Layar"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:358 ../panels/privacy/privacy.ui.h:20
++#: ../panels/privacy/cc-privacy-panel.c:361 ../panels/privacy/privacy.ui.h:20
+ msgid "Usage & History"
+ msgstr "Pemakaian & Riwayat"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:486
++#: ../panels/privacy/cc-privacy-panel.c:489
+ msgid "Empty all items from Trash?"
+ msgstr "Kosongkan semua butir dari Tong Sampah?"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:487
++#: ../panels/privacy/cc-privacy-panel.c:490
+ msgid "All items in the Trash will be permanently deleted."
+ msgstr "Semua butir dalam Tong Sampah akan dihapus secara permanen."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:488 ../panels/privacy/privacy.ui.h:32
++#: ../panels/privacy/cc-privacy-panel.c:491 ../panels/privacy/privacy.ui.h:32
+ msgid "_Empty Trash"
+ msgstr "_Kosongkan Tong Sampah"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:511
++#: ../panels/privacy/cc-privacy-panel.c:514
+ msgid "Delete all the temporary files?"
+ msgstr "Hapus semua berkas temporer?"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:512
++#: ../panels/privacy/cc-privacy-panel.c:515
+ msgid "All the temporary files will be permanently deleted."
+ msgstr "Semua berkas temporer akan dihapus secara permanen."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:513 ../panels/privacy/privacy.ui.h:33
++#: ../panels/privacy/cc-privacy-panel.c:516 ../panels/privacy/privacy.ui.h:33
+ msgid "_Purge Temporary Files"
+ msgstr "Bersihkan Berkas Tem_porer"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:535 ../panels/privacy/privacy.ui.h:31
++#: ../panels/privacy/cc-privacy-panel.c:538 ../panels/privacy/privacy.ui.h:31
+ msgid "Purge Trash & Temporary Files"
+ msgstr "Kosongkan Tong Sampah & Berkas Temporer"
+ 
+@@ -5076,21 +5012,21 @@ msgstr "Turun"
+ msgid "Preferences"
+ msgstr "Preferensi"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:274
++#: ../panels/sharing/cc-sharing-panel.c:285
+ msgctxt "service is enabled"
+ msgid "On"
+ msgstr "Nyala"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:276
++#: ../panels/sharing/cc-sharing-panel.c:287
+ msgctxt "service is disabled"
+ msgid "Off"
+ msgstr "Mati"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:418
++#: ../panels/sharing/cc-sharing-panel.c:422
+ msgid "Choose a Folder"
+ msgstr "Pilih Folder"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:702
++#: ../panels/sharing/cc-sharing-panel.c:736
+ msgid "Copy"
+ msgstr "Salin"
+ 
+@@ -5133,72 +5069,64 @@ msgstr ""
+ "perangkat lain yang dilengkapi Bluetooth"
+ 
+ #: ../panels/sharing/sharing.ui.h:3
+-msgid "Share Public Folder"
+-msgstr "Berbagi Pakai Folder Publik"
+-
+-#: ../panels/sharing/sharing.ui.h:4
+ msgid "Only Receive From Trusted Devices"
+ msgstr "Hanya Terima Dari Perangkat Terpercaya"
+ 
+-#: ../panels/sharing/sharing.ui.h:5
++#: ../panels/sharing/sharing.ui.h:4
+ msgid "Save Received Files to Downloads Folder"
+ msgstr "Simpan Berkas Yang Diterima ke Folder Unduhan"
+ 
+-#: ../panels/sharing/sharing.ui.h:6
+-msgid "Only share with Trusted Devices"
+-msgstr "Hanya berbagi dengan Perangkat Terpercaya"
+-
+-#: ../panels/sharing/sharing.ui.h:7
++#: ../panels/sharing/sharing.ui.h:5
+ msgid "Computer Name"
+ msgstr "Nama Komputer"
+ 
+-#: ../panels/sharing/sharing.ui.h:8
++#: ../panels/sharing/sharing.ui.h:6
+ msgid "Personal File Sharing"
+ msgstr "Berbagi Pakai Berkas Pribadi"
+ 
+-#: ../panels/sharing/sharing.ui.h:9
++#: ../panels/sharing/sharing.ui.h:7
+ msgid "Screen Sharing"
+ msgstr "Berbagi Pakai Layar"
+ 
+-#: ../panels/sharing/sharing.ui.h:10
++#: ../panels/sharing/sharing.ui.h:8
+ msgid "Media Sharing"
+ msgstr "Berbagi Pakai Media"
+ 
+-#: ../panels/sharing/sharing.ui.h:11
++#: ../panels/sharing/sharing.ui.h:9
+ msgid "Remote Login"
+ msgstr "Log Masuk Jarak Jauh"
+ 
+-#: ../panels/sharing/sharing.ui.h:12
++#: ../panels/sharing/sharing.ui.h:10
+ msgid "Some services are disabled because of no network access."
+ msgstr "Beberapa layanan dimatikan karena tidak ada akses jaringan."
+ 
+-#: ../panels/sharing/sharing.ui.h:13
++#: ../panels/sharing/sharing.ui.h:11
+ msgid "Share Music, Photos and Videos with others on the current network."
+ msgstr ""
+ "Berbagi pakai Musik, Foto, dan Video dengan orang lain pada jaringan saat "
+ "ini."
+ 
+-#: ../panels/sharing/sharing.ui.h:14
++#: ../panels/sharing/sharing.ui.h:12
+ msgid "Share Media On This Network"
+ msgstr "Berbagi Pakai Media Pada Jaringan Ini"
+ 
+-#: ../panels/sharing/sharing.ui.h:15
++#: ../panels/sharing/sharing.ui.h:13
+ msgid "Shared Folders"
+ msgstr "Folder Terkongsi"
+ 
+-#: ../panels/sharing/sharing.ui.h:16
++#: ../panels/sharing/sharing.ui.h:14
+ msgid "column"
+ msgstr "kolom"
+ 
+-#: ../panels/sharing/sharing.ui.h:17
++#: ../panels/sharing/sharing.ui.h:15
+ msgid "Add Folder"
+ msgstr "Tambah Folder"
+ 
+-#: ../panels/sharing/sharing.ui.h:18
++#: ../panels/sharing/sharing.ui.h:16
+ msgid "Remove Folder"
+ msgstr "Hapus Folder"
+ 
+-#: ../panels/sharing/sharing.ui.h:20
++#: ../panels/sharing/sharing.ui.h:18
+ #, no-c-format
+ msgid ""
+ "Personal File Sharing allows you to share your Public folder with others on "
+@@ -5208,15 +5136,15 @@ msgstr ""
+ "Anda dengan orang lain pada jaringan Anda kini memakai: <a href=\"dav://%s"
+ "\">dav://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:21
++#: ../panels/sharing/sharing.ui.h:19
+ msgid "Share Public Folder On This Network"
+ msgstr "Berbagi Pakai Folder Publik Pada Jaringan Ini"
+ 
+-#: ../panels/sharing/sharing.ui.h:22
++#: ../panels/sharing/sharing.ui.h:20
+ msgid "Require Password"
+ msgstr "Memerlukan Sandi"
+ 
+-#: ../panels/sharing/sharing.ui.h:25
++#: ../panels/sharing/sharing.ui.h:23
+ #, no-c-format
+ msgid ""
+ "Allow remote users to connect using the Secure Shell command:\n"
+@@ -5225,7 +5153,7 @@ msgstr ""
+ "Ijinkan pengguna jarak jauh menyambung memakai perintah Secure Shell:\n"
+ "<a href=\"ssh %s\">ssh %s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:28
++#: ../panels/sharing/sharing.ui.h:26
+ #, no-c-format
+ msgid ""
+ "Allow remote users to view or control your screen by connecting to: <a href="
+@@ -5234,19 +5162,19 @@ msgstr ""
+ "Ijinkan pengguna jarak jauh menilik atau mengendalikan layar Anda dengan "
+ "menyambung ke: <a href=\"vnc://%s\">vnc://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:29
++#: ../panels/sharing/sharing.ui.h:27
+ msgid "Remote View"
+ msgstr "Tilikan Jarak Jauh"
+ 
+-#: ../panels/sharing/sharing.ui.h:30
++#: ../panels/sharing/sharing.ui.h:28
+ msgid "Remote Control"
+ msgstr "Kendali Jarak Jauh"
+ 
+-#: ../panels/sharing/sharing.ui.h:31
++#: ../panels/sharing/sharing.ui.h:29
+ msgid "Approve All Connections"
+ msgstr "Setujui Semua Koneksi"
+ 
+-#: ../panels/sharing/sharing.ui.h:32
++#: ../panels/sharing/sharing.ui.h:30
+ msgid "Show Password"
+ msgstr "Tampilkan Sandi"
+ 
+@@ -5941,7 +5869,7 @@ msgid "_Full Name"
+ msgstr "Nama _Lengkap"
+ 
+ #: ../panels/user-accounts/data/account-dialog.ui.h:5
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+ msgid "Account _Type"
+ msgstr "_Tipe Akun"
+ 
+@@ -6096,69 +6024,35 @@ msgstr "_Sandi Sekarang"
+ msgid "Ch_ange"
+ msgstr "Ub_ah"
+ 
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:1
+-msgid "Changing photo for:"
+-msgstr "Mengubah foto bagi:"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
+-msgid ""
+-"Choose a picture that will be shown at the login screen for this account."
+-msgstr "Pilih gambar yang akan ditampilkan pada layar log masuk bagi akun ini."
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
+-msgid "Gallery"
+-msgstr "Galeri"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:4
+-#: ../panels/user-accounts/um-photo-dialog.c:218
+-msgid "Browse for more pictures"
+-msgstr "Ramban lebih banyak gambar"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:5
+-msgid "Take a photograph"
+-msgstr "Ambil foto"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:6
+-msgid "Browse"
+-msgstr "Ramban"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:7
+-msgid "Photograph"
+-msgstr "Foto"
+-
+ #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+-msgid "Account Information"
+-msgstr "Informasi Akun"
+-
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Add User Account"
+ msgstr "Tambah Akun Pengguna"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Remove User Account"
+ msgstr "Hapus Akun Pengguna"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+ msgid "Login Options"
+ msgstr "Pilihan Log Masuk"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+ msgid "A_utomatic Login"
+ msgstr "Log Mas_uk Otomatis"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+ msgid "_Fingerprint Login"
+ msgstr "Log Masuk _Sidik Jari"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+ msgid "User Icon"
+ msgstr "Ikon Pengguna"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+ msgid "_Language"
+ msgstr "_Bahasa"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+ msgid "Last Login"
+ msgstr "Log Masuk Terakhir"
+ 
+@@ -6574,6 +6468,10 @@ msgstr "Sandi tak dapat diubah"
+ msgid "The passwords do not match."
+ msgstr "Sandi tak cocok."
+ 
++#: ../panels/user-accounts/um-photo-dialog.c:218
++msgid "Browse for more pictures"
++msgstr "Ramban lebih banyak gambar"
++
+ #: ../panels/user-accounts/um-photo-dialog.c:443
+ msgid "Disable image"
+ msgstr "Tanpa gambar"
+@@ -6775,7 +6673,7 @@ msgstr ""
+ "tekan tombol pintasan papan tik dan tahan tombol baru atau tekan Backspace "
+ "untuk menghapus."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:82
++#: ../panels/wacom/calibrator/calibrator-gui.c:84
+ msgid ""
+ "Please tap the target markers as they appear on screen to calibrate the "
+ "tablet."
+@@ -6783,7 +6681,7 @@ msgstr ""
+ "Sentuhlah penanda target yang muncul pada layar untuk melakukan kalibrasi "
+ "pada tablet."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:86
++#: ../panels/wacom/calibrator/calibrator-gui.c:88
+ msgid "Mis-click detected, restarting..."
+ msgstr "Salah klik terdeteksi, memulai ulang..."
+ 
+@@ -6836,7 +6734,7 @@ msgstr "Petakan ke monitor tunggal"
+ msgid "%d of %d"
+ msgstr "%d dari %d"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:522
++#: ../panels/wacom/cc-wacom-page.c:531
+ msgid "Display Mapping"
+ msgstr "Pemetaan Tampilan"
+ 
+@@ -6971,22 +6869,22 @@ msgstr "Penukaran Mode Touchstrip Kanan"
+ msgid "Mode Switch #%d"
+ msgstr "Penukaran Mode #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1336
++#: ../panels/wacom/gsd-wacom-device.c:1335
+ #, c-format
+ msgid "Left Button #%d"
+ msgstr "Tombol Kiri #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1339
++#: ../panels/wacom/gsd-wacom-device.c:1338
+ #, c-format
+ msgid "Right Button #%d"
+ msgstr "Tombol Kanan #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1342
++#: ../panels/wacom/gsd-wacom-device.c:1341
+ #, c-format
+ msgid "Top Button #%d"
+ msgstr "Tombol Puncak #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1345
++#: ../panels/wacom/gsd-wacom-device.c:1344
+ #, c-format
+ msgid "Bottom Button #%d"
+ msgstr "Tombol Dasar #%d"
+@@ -7092,11 +6990,11 @@ msgstr "Panel yang hendak ditampilkan"
+ msgid "[PANEL] [ARGUMENT…]"
+ msgstr "[PANEL] [ARGUMEN…]"
+ 
+-#: ../shell/cc-application.c:142
++#: ../shell/cc-application.c:145
+ msgid "- Settings"
+ msgstr "- Pengaturan"
+ 
+-#: ../shell/cc-application.c:160
++#: ../shell/cc-application.c:163
+ #, c-format
+ msgid ""
+ "%s\n"
+@@ -7106,42 +7004,114 @@ msgstr ""
+ "Jalankan '%s --help' untuk melihat daftar lengkap dari pilihan baris "
+ "perintah.\n"
+ 
+-#: ../shell/cc-application.c:190
++#: ../shell/cc-application.c:193
+ msgid "Available panels:"
+ msgstr "Panel yang tersedia:"
+ 
+-#: ../shell/cc-application.c:325
++#: ../shell/cc-application.c:328
+ msgid "Help"
+ msgstr "Bantuan"
+ 
+-#: ../shell/cc-application.c:326
++#: ../shell/cc-application.c:329
+ msgid "Quit"
+ msgstr "Keluar"
+ 
+-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1479
++#: ../shell/cc-window.c:61 ../shell/cc-window.c:1486
+ msgid "All Settings"
+ msgstr "Semua Pengaturan"
+ 
+ #. Add categories
+-#: ../shell/cc-window.c:866
++#: ../shell/cc-window.c:868
+ msgctxt "category"
+ msgid "Personal"
+ msgstr "Pribadi"
+ 
+-#: ../shell/cc-window.c:867
++#: ../shell/cc-window.c:869
+ msgctxt "category"
+ msgid "Hardware"
+ msgstr "Perangkat keras"
+ 
+-#: ../shell/cc-window.c:868
++#: ../shell/cc-window.c:870
+ msgctxt "category"
+ msgid "System"
+ msgstr "Sistem"
+ 
+-#: ../shell/cc-window.c:1588 ../shell/gnome-control-center.desktop.in.in.h:1
++#: ../shell/cc-window.c:1597 ../shell/gnome-control-center.desktop.in.in.h:1
+ msgid "Settings"
+ msgstr "Pengaturan"
+ 
+ #: ../shell/gnome-control-center.desktop.in.in.h:2
+ msgid "Preferences;Settings;"
+ msgstr "Preferensi;Pengaturan;"
++
++#~ msgid "Device type:"
++#~ msgstr "Tipe perangkat:"
++
++#~ msgid "Manufacturer:"
++#~ msgstr "Pabrikan:"
++
++#~ msgid "Model:"
++#~ msgstr "Model:"
++
++#~ msgid ""
++#~ "Image files can be dragged on this window to auto-complete the above "
++#~ "fields."
++#~ msgstr ""
++#~ "Berkas gambar dapat diseret ke jendela ini untuk melengkapi otomatis ruas-"
++#~ "ruas di atas."
++
++#~ msgid "Show your primary display on this screen also"
++#~ msgstr "Tayangkan tampilan primer Anda juga pada layar ini"
++
++#~ msgid "Combine"
++#~ msgstr "Kombinasikan"
++
++#~ msgid "Join with the primary display to create an extra space"
++#~ msgstr "Gabungkan dengan tampilan primer untuk membuat ruang ekstra"
++
++#~ msgid "Don't use the display"
++#~ msgstr "Jangan pakai tampilan ini"
++
++#~ msgid "Refresh Rate"
++#~ msgstr "Laju Penyegaran"
++
++#~ msgid "Mouse Preferences"
++#~ msgstr "Preferensi Tetikus"
++
++#~ msgid "Select the interface to use for the new service"
++#~ msgstr "Pilih antarmuka untuk dipakai bagi layanan baru"
++
++#~ msgid "C_reate…"
++#~ msgstr "_Buat…"
++
++#~ msgid "_Interface"
++#~ msgstr "_Antar muka"
++
++#~ msgid "Share Public Folder"
++#~ msgstr "Berbagi Pakai Folder Publik"
++
++#~ msgid "Only share with Trusted Devices"
++#~ msgstr "Hanya berbagi dengan Perangkat Terpercaya"
++
++#~ msgid "Changing photo for:"
++#~ msgstr "Mengubah foto bagi:"
++
++#~ msgid ""
++#~ "Choose a picture that will be shown at the login screen for this account."
++#~ msgstr ""
++#~ "Pilih gambar yang akan ditampilkan pada layar log masuk bagi akun ini."
++
++#~ msgid "Gallery"
++#~ msgstr "Galeri"
++
++#~ msgid "Take a photograph"
++#~ msgstr "Ambil foto"
++
++#~ msgid "Browse"
++#~ msgstr "Ramban"
++
++#~ msgid "Photograph"
++#~ msgstr "Foto"
++
++#~ msgid "Account Information"
++#~ msgstr "Informasi Akun"
+diff --git a/po/kn.po b/po/kn.po
+index aee1853..0fa0d4f 100644
+--- a/po/kn.po
++++ b/po/kn.po
+@@ -2,23 +2,23 @@
+ # translation of gnome-control-center.HEAD.po to
+ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+ # This file is distributed under the same license as the PACKAGE package.
+-#
++# 
+ # Shankar Prasad <svenkate@redhat.com>, 2008, 2009, 2010, 2011, 2012, 2013.
++# Shankar <svenkate@redhat.com>, 2013. #zanata
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: gnome-control-center.master.kn\n"
+-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+-"control-center&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-05-13 19:43+0000\n"
+-"PO-Revision-Date: 2013-05-14 15:38+0530\n"
+-"Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
+-"Language-Team: American English <kde-i18n-doc@kde.org>\n"
+-"Language: en_US\n"
++"Project-Id-Version: PACKAGE VERSION\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2013-11-13 15:30+0530\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: Lokalize 1.5\n"
++"PO-Revision-Date: 2013-10-21 04:25-0400\n"
++"Last-Translator: Shankar <svenkate@redhat.com>\n"
++"Language-Team: American English <kde-i18n-doc@kde.org>\n"
++"Language: kn\n"
++"Plural-Forms: nplurals=2; plural=(n != 1);\n"
++"X-Generator: Zanata 3.2.3\n"
+ 
+ #. This refers to a slideshow background
+ #: ../panels/background/background.ui.h:2
+@@ -56,27 +56,27 @@ msgid "Span"
+ msgstr "ಹರಡು"
+ 
+ #. translators: This is the title of the wallpaper chooser dialog.
+-#: ../panels/background/cc-background-chooser-dialog.c:199
++#: ../panels/background/cc-background-chooser-dialog.c:202
+ msgid "Select Background"
+ msgstr "ಹಿನ್ನಲೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡು"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:218
++#: ../panels/background/cc-background-chooser-dialog.c:221
+ msgid "Wallpapers"
+ msgstr "ವಾಲ್‌ಪೇಪರುಗಳು"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:227
++#: ../panels/background/cc-background-chooser-dialog.c:230
+ msgid "Pictures"
+ msgstr "ಚಿತ್ರಗಳು"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:235
++#: ../panels/background/cc-background-chooser-dialog.c:238
+ msgid "Colors"
+ msgstr "ಬಣ್ಣಗಳು"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:244
++#: ../panels/background/cc-background-chooser-dialog.c:247
+ msgid "Flickr"
+ msgstr "Flickr"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:286
++#: ../panels/background/cc-background-chooser-dialog.c:289
+ #: ../panels/printers/ppd-selection-dialog.ui.h:3
+ #: ../panels/user-accounts/data/photo-dialog.ui.h:9
+ #: ../panels/user-accounts/um-photo-dialog.c:98
+@@ -98,7 +98,7 @@ msgstr "%d × %d"
+ msgid "No Desktop Background"
+ msgstr "ಯಾವುದೆ ಗಣಕತೆರೆ ಹಿನ್ನಲೆ ಚಿತ್ರವಿಲ್ಲ"
+ 
+-#: ../panels/background/cc-background-panel.c:453
++#: ../panels/background/cc-background-panel.c:457
+ msgid "Current background"
+ msgstr "ಈಗಿನ ಹಿನ್ನಲೆ ಚಿತ್ರ"
+ 
+@@ -215,8 +215,7 @@ msgid ""
+ "If you remove the device, you will have to set it up again before next use."
+ msgstr ""
+ "ನೀವು ಈ ಸಾಧನವನ್ನು ತೆಗೆದುಹಾಕಿದಲ್ಲಿ, ಮುಂದಿನ ಬಾರಿ ಬಳಸುವ ಮೊದಲು ಇದನ್ನು ಪುನಃ "
+-"ಇನ್ನೊಮ್ಮೆ "
+-"ಸಿದ್ಧಗೊಳಿಸಬೇಕಾಗುತ್ತದೆ."
++"ಇನ್ನೊಮ್ಮೆ ಸಿದ್ಧಗೊಳಿಸಬೇಕಾಗುತ್ತದೆ."
+ 
+ #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
+ msgid "Bluetooth"
+@@ -515,7 +514,7 @@ msgstr "ಕ್ಯಾಲಿಬ್ರೇಶನ್ ಅನ್ನು ತೋರಿಸ
+ #: ../panels/printers/authentication-dialog.ui.h:2
+ #: ../panels/printers/ppd-selection-dialog.ui.h:2
+ #: ../panels/user-accounts/data/photo-dialog.ui.h:8
+-#: ../panels/user-accounts/um-account-dialog.c:1082
++#: ../panels/user-accounts/um-account-dialog.c:1144
+ msgid "Cancel"
+ msgstr "ರದ್ದು ಮಾಡು"
+ 
+@@ -545,11 +544,9 @@ msgid ""
+ "screen. The longer you spend on calibration, the better the quality of the "
+ "color profile."
+ msgstr ""
+-"ಕ್ಯಾಲಿಬ್ರೇಶನ್‌ನಿಂದಾಗಿ ನಿಮ್ಮ ತೆರೆಯ ಬಣ್ಣವನ್ನು ವ್ಯವಸ್ಥಾಪಿಸಲು ಅಗತ್ಯವಿರುವ ಪ್ರೊಫೈಲ್ "
+-"ಒಂದು ನಿಮಗೆ "
+-"ದೊರೆಯುತ್ತದೆ. ಕ್ಯಾಲಿಬ್ರೇಶನ್‌ಗಾಗಿ ಹೆಚ್ಚು ಹೊತ್ತು ವ್ಯಯಿಸಿದಷ್ಟೂ ಬಣ್ಣದ ಪ್ರೊಫೈಲ್‌ನ "
+-"ಗುಣಮಟ್ಟ "
+-"ಉತ್ತಮಗೊಳ್ಳುತ್ತದೆ."
++"ಕ್ಯಾಲಿಬ್ರೇಶನ್‌ನಿಂದಾಗಿ ನಿಮ್ಮ ತೆರೆಯ ಬಣ್ಣವನ್ನು ವ್ಯವಸ್ಥಾಪಿಸಲು ಅಗತ್ಯವಿರುವ "
++"ಪ್ರೊಫೈಲ್ ಒಂದು ನಿಮಗೆ ದೊರೆಯುತ್ತದೆ. ಕ್ಯಾಲಿಬ್ರೇಶನ್‌ಗಾಗಿ ಹೆಚ್ಚು ಹೊತ್ತು "
++"ವ್ಯಯಿಸಿದಷ್ಟೂ ಬಣ್ಣದ ಪ್ರೊಫೈಲ್‌ನ ಗುಣಮಟ್ಟ ಉತ್ತಮಗೊಳ್ಳುತ್ತದೆ."
+ 
+ #: ../panels/color/color.ui.h:3
+ msgid ""
+@@ -593,8 +590,7 @@ msgid ""
+ "D65 illuminant."
+ msgstr ""
+ "ಪ್ರದರ್ಶಕ ಗುರಿ ಶ್ವೇತ ಬಿಂದುವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ. ಹೆಚ್ಚಿನ ಪ್ರದರ್ಶಕಗಳನ್ನು ಒಂದು D65 "
+-"ಪ್ರಕಾಶತೆಗೆ "
+-"ಸರಿಹೊಂದಿಸಬೇಕಾಗಿರುತ್ತದೆ."
++"ಪ್ರಕಾಶತೆಗೆ ಸರಿಹೊಂದಿಸಬೇಕಾಗಿರುತ್ತದೆ."
+ 
+ #: ../panels/color/color.ui.h:14
+ msgid "Profile Whitepoint"
+@@ -606,16 +602,15 @@ msgid ""
+ "management will be most accurate at this brightness level."
+ msgstr ""
+ "ಪ್ರದರ್ಶಕವನ್ನು ನಿಮಗೆ ಸಾಮಾನ್ಯವೆನಿಸುವ ಪ್ರಕಾಶತೆಗೆ ಹೊಂದಿಸಿ. ಈ ಪ್ರಕಾಶತೆಯ ಮಟ್ಟದಲ್ಲಿ "
+-"ಬಣ್ಣ "
+-"ವ್ಯವಸ್ಥಾಪನೆಯು ಅತ್ಯಂತ ನಿಖರವಾಗಿರುತ್ತದೆ."
++"ಬಣ್ಣ ವ್ಯವಸ್ಥಾಪನೆಯು ಅತ್ಯಂತ ನಿಖರವಾಗಿರುತ್ತದೆ."
+ 
+ #: ../panels/color/color.ui.h:16
+ msgid ""
+ "Alternatively, you can use the brightness level used with one of the other "
+ "profiles for this device."
+ msgstr ""
+-"ಪರ್ಯಾಯವಾಗಿ, ಈ ಸಾಧನಕ್ಕಾಗಿ ಬೇರೆ ಪ್ರೊಫೈಲ್‌ಗಳಲ್ಲಿ ಬಳಸಲಾದ ಪ್ರಕಾಶತೆಯ ಮಟ್ಟವನ್ನು ನೀವು "
+-"ಬಳಸಬಹುದು."
++"ಪರ್ಯಾಯವಾಗಿ, ಈ ಸಾಧನಕ್ಕಾಗಿ ಬೇರೆ ಪ್ರೊಫೈಲ್‌ಗಳಲ್ಲಿ ಬಳಸಲಾದ ಪ್ರಕಾಶತೆಯ ಮಟ್ಟವನ್ನು "
++"ನೀವು ಬಳಸಬಹುದು."
+ 
+ #: ../panels/color/color.ui.h:17
+ msgid "Display Brightness"
+@@ -627,8 +622,7 @@ msgid ""
+ "for different lighting conditions."
+ msgstr ""
+ "ನೀವು ಬಣ್ಣದ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಬೇರೊಂದು ಗಣಕದಲ್ಲಿ, ಅಥವ ವಿವಿಧ ಬೆಳಕಿನ ಸ್ಥಿತಿಗಳಿಗಾಗಿನ "
+-"ಪ್ರೊಫೈಲ್ "
+-"ಅನ್ನು ರಚಿಸಲು ಬಳಸಬಹುದು."
++"ಪ್ರೊಫೈಲ್ ಅನ್ನು ರಚಿಸಲು ಬಳಸಬಹುದು."
+ 
+ #: ../panels/color/color.ui.h:19
+ msgid "Profile Name:"
+@@ -648,14 +642,13 @@ msgstr "ರಫ್ತು"
+ 
+ #: ../panels/color/color.ui.h:23
+ msgid ""
+-"You may find these instructions on how to use the profile on <a href=\"linux"
+-"\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a href=\"windows"
+-"\">Microsoft Windows</a> systems useful."
++"You may find these instructions on how to use the profile on <a href="
++"\"linux\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a href="
++"\"windows\">Microsoft Windows</a> systems useful."
+ msgstr ""
+ "<a href=\"linux\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a href="
+-"\"windows\">Microsoft Windows</a> ವ್ಯವಸ್ಥೆಗಳಲ್ಲಿ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಹೇಗೆ ಬಳಸುವುದು "
+-"ಎಂದು "
+-"ತಿಳಿಯಲು ಈ ವಿವರಗಳು ಉಪಯುಕ್ತವೆನಿಸುತ್ತದೆ."
++"\"windows\">Microsoft Windows</a> ವ್ಯವಸ್ಥೆಗಳಲ್ಲಿ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಹೇಗೆ "
++"ಬಳಸುವುದು ಎಂದು ತಿಳಿಯಲು ಈ ವಿವರಗಳು ಉಪಯುಕ್ತವೆನಿಸುತ್ತದೆ."
+ 
+ #: ../panels/color/color.ui.h:24
+ #: ../panels/user-accounts/um-fingerprint-dialog.c:743
+@@ -671,9 +664,8 @@ msgid ""
+ "Problems detected. The profile may not work correctly. <a href=\"\">Show "
+ "details.</a>"
+ msgstr ""
+-"ತೊಂದರೆಯು ಕಂಡುಬಂದಿದೆ. ಪ್ರೊಫೈಲ್ ಸರಿಯಾಗಿ ಕೆಲಸ ಮಾಡುವುದಿಲ್ಲ. <a href=\"\">"
+-"ವಿವರಗಳನ್ನು "
+-"ತೋರಿಸು.</a>"
++"ತೊಂದರೆಯು ಕಂಡುಬಂದಿದೆ. ಪ್ರೊಫೈಲ್ ಸರಿಯಾಗಿ ಕೆಲಸ ಮಾಡುವುದಿಲ್ಲ. <a href="
++"\"\">ವಿವರಗಳನ್ನು ತೋರಿಸು.</a>"
+ 
+ #: ../panels/color/color.ui.h:27
+ msgid "Device type:"
+@@ -702,9 +694,8 @@ msgstr "ಬಣ್ಣ"
+ #: ../panels/color/color.ui.h:32
+ msgid "Each device needs an up to date color profile to be color managed."
+ msgstr ""
+-"ಪ್ರತಿಯೊಂದು ಸಾಧನದಲ್ಲಿ ಬಣ್ಣವನ್ನು ನಿರ್ವಹಿಸಲು ಅದಕ್ಕೆ ಇತ್ತೀಚಿನ (ಅಪ್‌ ಟು ಡೇಟ್) ಬಣ್ಣ "
+-"ಪ್ರೊಫೈಲಿನ "
+-"ಅಗತ್ಯವಿರುತ್ತದೆ."
++"ಪ್ರತಿಯೊಂದು ಸಾಧನದಲ್ಲಿ ಬಣ್ಣವನ್ನು ನಿರ್ವಹಿಸಲು ಅದಕ್ಕೆ ಇತ್ತೀಚಿನ (ಅಪ್‌ ಟು ಡೇಟ್) "
++"ಬಣ್ಣ ಪ್ರೊಫೈಲಿನ ಅಗತ್ಯವಿರುತ್ತದೆ."
+ 
+ #: ../panels/color/color.ui.h:33
+ msgid "Learn more"
+@@ -832,33 +823,33 @@ msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
+ msgstr "ಬಣ್ಣ;ICC;ಪ್ರೊಫೈಲ್;ಕ್ಯಾಲಿಬ್ರೇಟ್;ಮುದ್ರಕ;ಪ್ರದರ್ಶಕ;"
+ 
+ #. Add some common regions
+-#: ../panels/common/cc-common-language.c:677
++#: ../panels/common/cc-common-language.c:680
+ msgid "United States"
+ msgstr "ಯುನೈಟೆಡ್ ಸ್ಟೇಟ್ಸ್‍"
+ 
+-#: ../panels/common/cc-common-language.c:678
++#: ../panels/common/cc-common-language.c:681
+ msgid "Germany"
+ msgstr "ಜರ್ಮನಿ"
+ 
+-#: ../panels/common/cc-common-language.c:679
++#: ../panels/common/cc-common-language.c:682
+ msgid "France"
+ msgstr "ಫ್ರಾನ್ಸ್‍"
+ 
+-#: ../panels/common/cc-common-language.c:680
++#: ../panels/common/cc-common-language.c:683
+ msgid "Spain"
+ msgstr "ಸ್ಪೇನ್"
+ 
+-#: ../panels/common/cc-common-language.c:681
++#: ../panels/common/cc-common-language.c:684
+ msgid "China"
+ msgstr "ಚೈನಾ"
+ 
+-#: ../panels/common/cc-common-language.c:747
++#: ../panels/common/cc-common-language.c:754
+ msgid "Other…"
+ msgstr "ಇತರೆ…"
+ 
+ #: ../panels/common/cc-language-chooser.c:176
+ #: ../panels/region/cc-format-chooser.c:266
+-#: ../panels/region/cc-input-chooser.c:174
++#: ../panels/region/cc-input-chooser.c:171
+ msgid "More…"
+ msgstr "ಇನ್ನಷ್ಟು …"
+ 
+@@ -866,98 +857,66 @@ msgstr "ಇನ್ನಷ್ಟು …"
+ msgid "No languages found"
+ msgstr "ಯಾವುದೆ ಭಾಷೆಗಳು ಕಂಡು ಬಂದಿಲ್ಲ"
+ 
+-#. translators:
+-#. * The device has been disabled
+-#: ../panels/common/cc-util.c:28 ../panels/keyboard/cc-keyboard-option.c:276
+-#: ../panels/keyboard/cc-keyboard-option.c:408
+-#: ../panels/keyboard/keyboard-shortcuts.c:1160
+-#: ../panels/network/network-wifi.ui.h:29
+-#: ../panels/sound/gvc/gvc-mixer-control.c:1830
+-#: ../panels/user-accounts/um-fingerprint-dialog.c:215
+-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+-msgid "Disabled"
+-msgstr "ಅಶಕ್ತಗೊಂಡ"
+-
+-#: ../panels/common/cc-util.c:29
++#: ../panels/common/cc-util.c:116
+ msgid "Left Shift"
+ msgstr "ಎಡ Shift"
+ 
+-#: ../panels/common/cc-util.c:30
++#: ../panels/common/cc-util.c:117
+ msgid "Left Alt"
+ msgstr "ಎಡ Alt"
+ 
+-#: ../panels/common/cc-util.c:31
++#: ../panels/common/cc-util.c:118
+ msgid "Left Ctrl"
+ msgstr "ಎಡ Ctrl"
+ 
+-#: ../panels/common/cc-util.c:32
++#: ../panels/common/cc-util.c:119
+ msgid "Right Shift"
+ msgstr "ಬಲ Shift"
+ 
+-#: ../panels/common/cc-util.c:33
++#: ../panels/common/cc-util.c:120
+ msgid "Right Alt"
+ msgstr "ಬಲ Alt"
+ 
+-#: ../panels/common/cc-util.c:34
++#: ../panels/common/cc-util.c:121
+ msgid "Right Ctrl"
+ msgstr "ಬಲ Ctrl"
+ 
+-#: ../panels/common/cc-util.c:35
++#: ../panels/common/cc-util.c:122
+ msgid "Left Alt+Shift"
+ msgstr "ಎಡ Alt+Shift"
+ 
+-#: ../panels/common/cc-util.c:36
+-msgid "Right Alt+Shift"
+-msgstr "ಬಲ Alt+Shift"
+-
+-#: ../panels/common/cc-util.c:37
++#: ../panels/common/cc-util.c:123
+ msgid "Left Ctrl+Shift"
+ msgstr "ಎಡ Ctrl+Shift"
+ 
+-#: ../panels/common/cc-util.c:38
++#: ../panels/common/cc-util.c:124
+ msgid "Right Ctrl+Shift"
+ msgstr "ಬಲ Ctrl+Shift"
+ 
+-#: ../panels/common/cc-util.c:39
+-msgid "Left+Right Shift"
+-msgstr "ಎಡ+ಬಲ Shift"
+-
+-#: ../panels/common/cc-util.c:40 ../panels/region/input-options.ui.h:11
+-msgid "Left+Right Alt"
+-msgstr "ಎಡ+ಬಲ Alt"
+-
+-#: ../panels/common/cc-util.c:41
+-msgid "Left+Right Ctrl"
+-msgstr "ಎಡ+ಬಲ Ctrl"
+-
+-#: ../panels/common/cc-util.c:42
++#: ../panels/common/cc-util.c:125
+ msgid "Alt+Shift"
+ msgstr "Alt+Shift"
+ 
+-#: ../panels/common/cc-util.c:43
++#: ../panels/common/cc-util.c:126
+ msgid "Ctrl+Shift"
+ msgstr "Ctrl+Shift"
+ 
+-#: ../panels/common/cc-util.c:44
++#: ../panels/common/cc-util.c:127
+ msgid "Alt+Ctrl"
+ msgstr "Alt+Ctrl"
+ 
+-#: ../panels/common/cc-util.c:45
++#: ../panels/common/cc-util.c:128
+ msgid "Caps"
+ msgstr "ಕ್ಯಾಪ್ಸ್"
+ 
+-#: ../panels/common/cc-util.c:46
++#: ../panels/common/cc-util.c:129
+ msgid "Shift+Caps"
+ msgstr "Shift+ಕ್ಯಾಪ್ಸ್‍"
+ 
+-#: ../panels/common/cc-util.c:47
++#: ../panels/common/cc-util.c:130
+ msgid "Alt+Caps"
+ msgstr "Alt+ಕ್ಯಾಪ್ಸ್"
+ 
+-#: ../panels/common/cc-util.c:48
+-msgid "Ctrl+Caps"
+-msgstr "Ctrl+ಕ್ಯಾಪ್ಸ್"
+-
+ #: ../panels/common/language-chooser.ui.h:1 ../panels/region/region.ui.h:1
+ msgid "Language"
+ msgstr "ಭಾಷೆ"
+@@ -1093,22 +1052,22 @@ msgstr "ನಿಮ್ಮ ಪ್ರದೇಶ ಹಾಗೆ ಭಾಷೆಯ ಸಿ
+ msgid "To change time or date settings, you need to authenticate."
+ msgstr "ಸಮಯ ಅಥವ ದಿನಾಂಕದ ಸಿದ್ಧತೆಗಳನ್ನು ಬದಲಾಯಿಸಲು, ನೀವು ದೃಢೀಕರಿಸಬೇಕಾಗುತ್ತದೆ."
+ 
+-#: ../panels/display/cc-display-panel.c:483
++#: ../panels/display/cc-display-panel.c:491
+ msgctxt "display panel, rotation"
+ msgid "Normal"
+ msgstr "ಸಾಮಾನ್ಯ"
+ 
+-#: ../panels/display/cc-display-panel.c:484
++#: ../panels/display/cc-display-panel.c:492
+ msgctxt "display panel, rotation"
+ msgid "Counterclockwise"
+ msgstr "ಅಪ್ರದಕ್ಷಿಣೆ"
+ 
+-#: ../panels/display/cc-display-panel.c:485
++#: ../panels/display/cc-display-panel.c:493
+ msgctxt "display panel, rotation"
+ msgid "Clockwise"
+ msgstr "ಪ್ರದಕ್ಷಿಣೆ"
+ 
+-#: ../panels/display/cc-display-panel.c:486
++#: ../panels/display/cc-display-panel.c:494
+ msgctxt "display panel, rotation"
+ msgid "180 Degrees"
+ msgstr "180 ಡಿಗ್ರಿಗಳು"
+@@ -1118,59 +1077,58 @@ msgstr "180 ಡಿಗ್ರಿಗಳು"
+ #. * screen is the same as your external projector.  Here, "Mirrored" is being
+ #. * used as an adjective.  For example, the Spanish translation could be
+ #. * "Pantallas en Espejo".
+-#.
++#. 
+ #. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
+ #. Translators:  this is the feature where what you see on your
+ #. * laptop's screen is the same as your external projector.
+ #. * Here, "Mirrored" is being used as an adjective.  For example,
+ #. * the Spanish translation could be "Pantallas en Espejo".
+-#.
+-#: ../panels/display/cc-display-panel.c:625
++#. 
++#: ../panels/display/cc-display-panel.c:633
+ #: ../panels/display/cc-rr-labeler.c:418
+ msgid "Mirrored Displays"
+ msgstr "ಪ್ರತಿಬಿಂಬಿತ ಪ್ರದರ್ಶಕಗಳು"
+ 
+-#: ../panels/display/cc-display-panel.c:649
++#: ../panels/display/cc-display-panel.c:657
+ #: ../panels/display/display-capplet.ui.h:1
+ msgid "Monitor"
+ msgstr "ಪರದೆ"
+ 
+-#: ../panels/display/cc-display-panel.c:1669
++#: ../panels/display/cc-display-panel.c:1702
+ msgid "Drag to change primary display."
+ msgstr "ಪ್ರಾಥಮಿಕ ಪ್ರದರ್ಶಕವನ್ನು ಬದಲಾಯಿಸಲು ಎಳೆಯಿರಿ."
+ 
+-#: ../panels/display/cc-display-panel.c:1727
++#: ../panels/display/cc-display-panel.c:1760
+ msgid ""
+ "Select a monitor to change its properties; drag it to rearrange its "
+ "placement."
+ msgstr ""
+ "ಒಂದು ತೆರೆಯ ಗುಣಗಳನ್ನು ಬದಲಾಯಿಸಲು ಅದನ್ನು ಆಯ್ಕೆ ಮಾಡಿ; ಅದರ ಸ್ಥಾನವನ್ನು ಬದಲಾಯಿಸಲು "
+-"ಅದನ್ನು "
+-"ಎಳೆಯಿರಿ."
++"ಅದನ್ನು ಎಳೆಯಿರಿ."
+ 
+-#: ../panels/display/cc-display-panel.c:2115
++#: ../panels/display/cc-display-panel.c:2157
+ msgid "%a %R"
+ msgstr "%a %R"
+ 
+-#: ../panels/display/cc-display-panel.c:2117
++#: ../panels/display/cc-display-panel.c:2159
+ msgid "%a %l:%M %p"
+ msgstr "%a %l:%M %p"
+ 
+-#: ../panels/display/cc-display-panel.c:2279
+-#: ../panels/display/cc-display-panel.c:2331
++#: ../panels/display/cc-display-panel.c:2321
++#: ../panels/display/cc-display-panel.c:2373
+ #, c-format
+ msgid "Failed to apply configuration: %s"
+ msgstr "ಸಂರಚನೆಯನ್ನು ಅನ್ವಯಿಸುವಲ್ಲಿ ದೋಷ: %s"
+ 
+-#: ../panels/display/cc-display-panel.c:2359
++#: ../panels/display/cc-display-panel.c:2401
+ msgid "Could not save the monitor configuration"
+ msgstr "ತೆರೆಯ ಸಂರಚನೆಯನ್ನು ಉಳಿಸಲು ಆಗಲಿಲ್ಲ"
+ 
+-#: ../panels/display/cc-display-panel.c:2419
++#: ../panels/display/cc-display-panel.c:2461
+ msgid "Could not detect displays"
+ msgstr "ಪ್ರದರ್ಶಕಗಳನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
+ 
+-#: ../panels/display/cc-display-panel.c:2614
++#: ../panels/display/cc-display-panel.c:2673
+ msgid "Could not get screen information"
+ msgstr "ತೆರೆಯ ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ"
+ 
+@@ -1215,49 +1173,45 @@ msgstr "ಪ್ಯಾನಲ್;ಪ್ರೊಜೆಕ್ಟರ್;xrandr;ತೆರ
+ msgid "Unknown"
+ msgstr "ಗೊತ್ತಿರದ"
+ 
+-#: ../panels/info/cc-info-panel.c:551
+-#, c-format
+-msgid "%s %d-bit"
+-msgstr "%s %d-bit"
+-
+-#: ../panels/info/cc-info-panel.c:553
++#. translators: This is the the type of OS architecture, eg: "64-bit" or "32-bit"
++#: ../panels/info/cc-info-panel.c:599
+ #, c-format
+ msgid "%d-bit"
+ msgstr "%d-ಬಿಟ್"
+ 
+-#: ../panels/info/cc-info-panel.c:1228
++#: ../panels/info/cc-info-panel.c:1277
+ msgid "Ask what to do"
+ msgstr "ಏನು ಮಾಡಬೇಕು ಎಂದು ಕೇಳು"
+ 
+-#: ../panels/info/cc-info-panel.c:1232
++#: ../panels/info/cc-info-panel.c:1281
+ msgid "Do nothing"
+ msgstr "ಏನೂ ಮಾಡಬೇಡ"
+ 
+-#: ../panels/info/cc-info-panel.c:1236
++#: ../panels/info/cc-info-panel.c:1285
+ msgid "Open folder"
+ msgstr "ಕಡತಕೋಶವನ್ನು ತೆರೆ"
+ 
+-#: ../panels/info/cc-info-panel.c:1327
++#: ../panels/info/cc-info-panel.c:1376
+ msgid "Other Media"
+ msgstr "ಇತರೆ ಮಾಧ್ಯಮ"
+ 
+-#: ../panels/info/cc-info-panel.c:1358
++#: ../panels/info/cc-info-panel.c:1407
+ msgid "Select an application for audio CDs"
+ msgstr "ಆಡಿಯೊ CD ಗಳಿಗಾಗಿ ಒಂದು ಅನ್ವಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
+ 
+-#: ../panels/info/cc-info-panel.c:1359
++#: ../panels/info/cc-info-panel.c:1408
+ msgid "Select an application for video DVDs"
+ msgstr "ವೀಡಿಯೊ DVD ಗಳಿಗಾಗಿ ಒಂದು ಅನ್ವಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
+ 
+-#: ../panels/info/cc-info-panel.c:1360
++#: ../panels/info/cc-info-panel.c:1409
+ msgid "Select an application to run when a music player is connected"
+ msgstr "ಸಂಗೀತದ ಪ್ಲೇಯರನ್ನು ಜೋಡಿಸಿದಾಗ ಚಲಾಯಿಸಲು ಒಂದು ಅನ್ವಯವನ್ನು ಆರಿಸಿ"
+ 
+-#: ../panels/info/cc-info-panel.c:1361
++#: ../panels/info/cc-info-panel.c:1410
+ msgid "Select an application to run when a camera is connected"
+ msgstr "ಕ್ಯಾಮೆರವನ್ನು ಜೋಡಿಸಿದಾಗ ಚಲಾಯಿಸಲು ಒಂದು ಅನ್ವಯವನ್ನು ಆರಿಸಿ"
+ 
+-#: ../panels/info/cc-info-panel.c:1362
++#: ../panels/info/cc-info-panel.c:1411
+ msgid "Select an application for software CDs"
+ msgstr "ತಂತ್ರಾಂಶ CD ಗಳಿಗಾಗಿ ಒಂದು ಅನ್ವಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
+ 
+@@ -1265,90 +1219,90 @@ msgstr "ತಂತ್ರಾಂಶ CD ಗಳಿಗಾಗಿ ಒಂದು ಅನ್
+ #. * strings, just here to fix capitalization of the English originals.
+ #. * If the shared-mime-info translation works for your language,
+ #. * simply leave these untranslated.
+-#.
+-#: ../panels/info/cc-info-panel.c:1374
++#. 
++#: ../panels/info/cc-info-panel.c:1423
+ msgid "audio DVD"
+ msgstr "audio DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1375
++#: ../panels/info/cc-info-panel.c:1424
+ msgid "blank Blu-ray disc"
+ msgstr "ಖಾಲಿ ಬ್ಲೂ-ರೇ ಡಿಸ್ಕ್"
+ 
+-#: ../panels/info/cc-info-panel.c:1376
++#: ../panels/info/cc-info-panel.c:1425
+ msgid "blank CD disc"
+ msgstr "ಖಾಲಿ CD ಡಿಸ್ಕ್"
+ 
+-#: ../panels/info/cc-info-panel.c:1377
++#: ../panels/info/cc-info-panel.c:1426
+ msgid "blank DVD disc"
+ msgstr "ಖಾಲಿ DVD ಡಿಸ್ಕ್"
+ 
+-#: ../panels/info/cc-info-panel.c:1378
++#: ../panels/info/cc-info-panel.c:1427
+ msgid "blank HD DVD disc"
+ msgstr "ಖಾಲಿ HD DVD ಡಿಸ್ಕ್"
+ 
+-#: ../panels/info/cc-info-panel.c:1379
++#: ../panels/info/cc-info-panel.c:1428
+ msgid "Blu-ray video disc"
+ msgstr "ಬ್ಲೂ-ರೇ ವೀಡಿಯೊ ಡಿಸ್ಕ್"
+ 
+-#: ../panels/info/cc-info-panel.c:1380
++#: ../panels/info/cc-info-panel.c:1429
+ msgid "e-book reader"
+ msgstr "ಇ-ಪುಸ್ತಕ ಓದುಗ"
+ 
+-#: ../panels/info/cc-info-panel.c:1381
++#: ../panels/info/cc-info-panel.c:1430
+ msgid "HD DVD video disc"
+ msgstr "HD DVD ವಿಡಿಯೋ ಡಿಸ್ಕ್ "
+ 
+-#: ../panels/info/cc-info-panel.c:1382
++#: ../panels/info/cc-info-panel.c:1431
+ msgid "Picture CD"
+ msgstr "ಚಿತ್ರ CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1383
++#: ../panels/info/cc-info-panel.c:1432
+ msgid "Super Video CD"
+ msgstr "ಸೂಪರ ವೀಡಿಯೊ CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1384
++#: ../panels/info/cc-info-panel.c:1433
+ msgid "Video CD"
+ msgstr "ವೀಡಿಯೊ CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1385
++#: ../panels/info/cc-info-panel.c:1434
+ msgid "Windows software"
+ msgstr "ಕಿಟಕಿ ಅಂಚು"
+ 
+-#: ../panels/info/cc-info-panel.c:1386
++#: ../panels/info/cc-info-panel.c:1435
+ msgid "Software"
+ msgstr "ತಂತ್ರಾಂಶ"
+ 
+-#: ../panels/info/cc-info-panel.c:1509
++#: ../panels/info/cc-info-panel.c:1558
+ #: ../panels/keyboard/keyboard-shortcuts.c:1697
+ msgid "Section"
+ msgstr "ವಿಭಾಗ"
+ 
+-#: ../panels/info/cc-info-panel.c:1518 ../panels/info/info.ui.h:13
++#: ../panels/info/cc-info-panel.c:1567 ../panels/info/info.ui.h:12
+ msgid "Overview"
+ msgstr "ಅವಲೋಕನ"
+ 
+-#: ../panels/info/cc-info-panel.c:1524 ../panels/info/info.ui.h:20
++#: ../panels/info/cc-info-panel.c:1573 ../panels/info/info.ui.h:19
+ msgid "Default Applications"
+ msgstr "ಪೂರ್ವನಿಯೋಜಿತ ಅನ್ವಯಗಳು"
+ 
+-#: ../panels/info/cc-info-panel.c:1529 ../panels/info/info.ui.h:28
++#: ../panels/info/cc-info-panel.c:1578 ../panels/info/info.ui.h:27
+ msgid "Removable Media"
+ msgstr "ತೆಗೆಯಬಹುದಾದ ಮಾಧ್ಯಮ"
+ 
+-#: ../panels/info/cc-info-panel.c:1554
++#: ../panels/info/cc-info-panel.c:1603
+ #, c-format
+ msgid "Version %s"
+ msgstr "ಆವೃತ್ತಿ %s"
+ 
+-#: ../panels/info/cc-info-panel.c:1604
++#: ../panels/info/cc-info-panel.c:1658
+ msgid "Install Updates"
+ msgstr "ಅಪ್‌ಡೇಟ್‌ಗಳನ್ನು ಅನುಸ್ಥಾಪಿಸು"
+ 
+-#: ../panels/info/cc-info-panel.c:1608
++#: ../panels/info/cc-info-panel.c:1662
+ msgid "System Up-To-Date"
+ msgstr "ವ್ಯವಸ್ಥೆಯು ಅಪ್-ಟು-ಡೇಟ್ ಆಗಿದೆ"
+ 
+-#: ../panels/info/cc-info-panel.c:1612
++#: ../panels/info/cc-info-panel.c:1666
+ msgid "Checking for Updates"
+ msgstr "ಅಪ್‌ಡೇಟ್‌ಗಳಿಗಾಗಿ ಪರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ"
+ 
+@@ -1365,12 +1319,9 @@ msgstr "ನಿಮ್ಮ ವ್ಯವಸ್ಥೆಯ ಬಗೆಗಿನ ಮಾಹ
+ #. sure that you use the same "translation" for those keywords
+ #: ../panels/info/gnome-info-panel.desktop.in.in.h:4
+ msgid ""
+-"device;system;information;memory;processor;version;default;application;"
+-"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
++"device;system;information;memory;processor;version;default;application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
+ msgstr ""
+-"ಸಾಧನ;ವ್ಯವಸ್ಥೆ;ಮಾಹಿತಿ;ಮೆಮೊರಿ;ಸಂಸ್ಕಾರಕ;ಆವೃತ್ತಿ;ಪೂರ್ವನಿಯೋಜಿತ;ಅನ್ವಯ;ಇಚ್ಛೆಯ;cd;dvd;"
+-"usb;"
+-"ಆಡಿಯೊ;ವೀಡಿಯೊ;ಡಿಸ್ಕ್‍;ತೆಗೆಯಬಹುದಾದ;ಮಾಧ್ಯಮ;ಸ್ವಯಂಚಾಲನೆ;"
++"ಸಾಧನ;ವ್ಯವಸ್ಥೆ;ಮಾಹಿತಿ;ಮೆಮೊರಿ;ಸಂಸ್ಕಾರಕ;ಆವೃತ್ತಿ;ಪೂರ್ವನಿಯೋಜಿತ;ಅನ್ವಯ;ಇಚ್ಛೆಯ;cd;dvd;usb;ಆಡಿಯೊ;ವೀಡಿಯೊ;ಡಿಸ್ಕ್‍;ತೆಗೆಯಬಹುದಾದ;ಮಾಧ್ಯಮ;ಸ್ವಯಂಚಾಲನೆ;"
+ 
+ #: ../panels/info/info.ui.h:1
+ msgid "Select how other media should be handled"
+@@ -1396,76 +1347,76 @@ msgstr "ಮೆಮೊರಿ"
+ msgid "Processor"
+ msgstr "ಸಂಸ್ಕಾರಕ"
+ 
+-#. To translators: this field contains the distro name, version and type
+-#: ../panels/info/info.ui.h:8
+-msgid "Base system"
+-msgstr "ಮೂಲ ವ್ಯವಸ್ಥೆ"
++# translation auto-copied from project control-center, version 3.8.3, document gnome-control-center-2.0, author Shankar
++#: ../panels/info/info.ui.h:7
++msgid "OS Type"
++msgstr "OS ಬಗೆ"
+ 
+-#: ../panels/info/info.ui.h:9
++#: ../panels/info/info.ui.h:8
+ msgid "Disk"
+ msgstr "ಡಿಸ್ಕ್‍"
+ 
+-#: ../panels/info/info.ui.h:10
++#: ../panels/info/info.ui.h:9
+ msgid "Calculating…"
+ msgstr "ಲೆಕ್ಕಹಾಕಲಾಗುತ್ತಿದೆ..."
+ 
+-#: ../panels/info/info.ui.h:11
++#: ../panels/info/info.ui.h:10
+ msgid "Graphics"
+ msgstr "ಗ್ರಾಫಿಕ್ಸ್‍"
+ 
+-#: ../panels/info/info.ui.h:12
++#: ../panels/info/info.ui.h:11
+ msgid "Virtualization"
+ msgstr "ವರ್ಚುವಲೈಸೇಶನ್"
+ 
+-#: ../panels/info/info.ui.h:14
++#: ../panels/info/info.ui.h:13
+ msgid "_Web"
+ msgstr "ಜಾಲ (_W)"
+ 
+-#: ../panels/info/info.ui.h:15
++#: ../panels/info/info.ui.h:14
+ msgid "_Mail"
+ msgstr "ಮೈಲ್ (_M)"
+ 
+-#: ../panels/info/info.ui.h:16
++#: ../panels/info/info.ui.h:15
+ msgid "_Calendar"
+ msgstr "ಕ್ಯಾಲೆಂಡರ್ (_C)"
+ 
+-#: ../panels/info/info.ui.h:17
++#: ../panels/info/info.ui.h:16
+ msgid "M_usic"
+ msgstr "ಸಂಗೀತ (_u)"
+ 
+-#: ../panels/info/info.ui.h:18
++#: ../panels/info/info.ui.h:17
+ msgid "_Video"
+ msgstr "ವೀಡಿಯೊ (_V)"
+ 
+-#: ../panels/info/info.ui.h:19
++#: ../panels/info/info.ui.h:18
+ msgid "_Photos"
+ msgstr "ಫೋಟೊಗಳು (_P)"
+ 
+-#: ../panels/info/info.ui.h:21
++#: ../panels/info/info.ui.h:20
+ msgid "Select how media should be handled"
+ msgstr "ಮಾಧ್ಯಮವನ್ನು ಹೇಗೆ ನಿಭಾಯಿಸಬೇಕೆಂದು ಆಯ್ಕೆ ಮಾಡಿ"
+ 
+-#: ../panels/info/info.ui.h:22
++#: ../panels/info/info.ui.h:21
+ msgid "CD _audio"
+ msgstr "CD ಆಡಿಯೊ  (_a)"
+ 
+-#: ../panels/info/info.ui.h:23
++#: ../panels/info/info.ui.h:22
+ msgid "_DVD video"
+ msgstr "_DVD ವೀಡಿಯೊ"
+ 
+-#: ../panels/info/info.ui.h:24
++#: ../panels/info/info.ui.h:23
+ msgid "_Music player"
+ msgstr "ಸಂಗೀತ ಚಾಲಕ (_M)"
+ 
+-#: ../panels/info/info.ui.h:25
++#: ../panels/info/info.ui.h:24
+ msgid "_Software"
+ msgstr "ತಂತ್ರಾಂಶ (_S)"
+ 
+-#: ../panels/info/info.ui.h:26
++#: ../panels/info/info.ui.h:25
+ msgid "_Other Media…"
+ msgstr "ಇತರೆ ಮಾಧ್ಯಮ (_O)…"
+ 
+-#: ../panels/info/info.ui.h:27
++#: ../panels/info/info.ui.h:26
+ msgid "_Never prompt or start programs on media insertion"
+ msgstr "ಮಾಧ್ಯಮವನ್ನು ತೂರಿಸಿದಾಗ ಕೇಳಬೇಡ ಅಥವ ಪ್ರೊಗ್ರಾಮ್ ಅನ್ನು ಆರಂಭಿಸಬೇಡ (_N)"
+ 
+@@ -1636,15 +1587,27 @@ msgstr "ಪಠ್ಯದ ಗಾತ್ರವನ್ನು ಕುಗ್ಗಿಸು"
+ msgid "High contrast on or off"
+ msgstr "ಅತ್ಯಂತ ವೈದೃಶ್ಯ ಆನ್ ಅಥವ ಆಫ್"
+ 
+-#: ../panels/keyboard/cc-keyboard-option.c:362
++#. translators:
++#. * The device has been disabled
++#: ../panels/keyboard/cc-keyboard-option.c:272
++#: ../panels/keyboard/cc-keyboard-option.c:383
++#: ../panels/keyboard/keyboard-shortcuts.c:1160
++#: ../panels/network/network-wifi.ui.h:29
++#: ../panels/sound/gvc/gvc-mixer-control.c:1830
++#: ../panels/user-accounts/um-fingerprint-dialog.c:215
++#: ../panels/user-accounts/um-fingerprint-dialog.c:216
++msgid "Disabled"
++msgstr "ಅಶಕ್ತಗೊಂಡ"
++
++#: ../panels/keyboard/cc-keyboard-option.c:346
+ msgid "Alternative Characters Key"
+ msgstr "ಪರ್ಯಾಯ ಅಕ್ಷರಗಳ ಕೀಲಿ"
+ 
+-#: ../panels/keyboard/cc-keyboard-option.c:367
++#: ../panels/keyboard/cc-keyboard-option.c:351
+ msgid "Compose Key"
+ msgstr "ಕಂಪೋಸ್ ಕೀಲಿ"
+ 
+-#: ../panels/keyboard/cc-keyboard-option.c:371
++#: ../panels/keyboard/cc-keyboard-option.c:356
+ msgid "Modifiers-only switch to next source"
+ msgstr "ಮಾರ್ಪಡಕ-ಕೇವಲ ಮುಂದಿನ ಆಕರಕ್ಕೆ ಬದಲಾಯಿಸು"
+ 
+@@ -1751,8 +1714,8 @@ msgid ""
+ "To edit a shortcut, click the row and hold down the new keys or press "
+ "Backspace to clear."
+ msgstr ""
+-"ಒಂದು ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಯನ್ನು ಸಂಪಾದಿಸಲು, ಸಾಲಿನಲ್ಲಿ ಕ್ಲಿಕ್ಕಿಸಿ ಹಾಗು ಹೊಸ ಕೀಲಿಗಳನ್ನು "
+-"ಒತ್ತಿಹಿಡಿಯಿರಿ ಅಥವ ಅಳಿಸಲು ಬ್ಯಾಕ್‍ಸ್ಪೇಸನ್ನು ಒತ್ತಿ."
++"ಒಂದು ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಯನ್ನು ಸಂಪಾದಿಸಲು, ಸಾಲಿನಲ್ಲಿ ಕ್ಲಿಕ್ಕಿಸಿ ಹಾಗು ಹೊಸ "
++"ಕೀಲಿಗಳನ್ನು ಒತ್ತಿಹಿಡಿಯಿರಿ ಅಥವ ಅಳಿಸಲು ಬ್ಯಾಕ್‍ಸ್ಪೇಸನ್ನು ಒತ್ತಿ."
+ 
+ #: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
+ msgid "Shortcuts"
+@@ -1775,23 +1738,22 @@ msgid ""
+ "Please try with a key such as Control, Alt or Shift at the same time."
+ msgstr ""
+ "ಶಾರ್ಟ್-ಕಟ್ \"%s\" ಅನ್ನು ಬಳಸಲಾಗುವುದಿಲ್ಲ ಏಕೆಂದರೆ ಈ ಕೀಲಿಯನ್ನು ಬಳಸಿಕೊಂಡು ಇದನ್ನು "
+-"ಟೈಪ್ "
+-"ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ.\n"
+-"ದಯವಿಟ್ಟು ಒಂದೆ ಸಮಯದಲ್ಲಿ Control, Alt ಅಥವ Shift ನಂತಹ ಕೀಲಿಯನ್ನು ಬಳಸಲು ಪ್ರಯತ್ನಿಸಿ."
++"ಟೈಪ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ.\n"
++"ದಯವಿಟ್ಟು ಒಂದೆ ಸಮಯದಲ್ಲಿ Control, Alt ಅಥವ Shift ನಂತಹ ಕೀಲಿಯನ್ನು ಬಳಸಲು "
++"ಪ್ರಯತ್ನಿಸಿ."
+ 
+ #: ../panels/keyboard/keyboard-shortcuts.c:1333
+ #, c-format
+-msgid ""
+-"The shortcut \"%s\" is already used for\n"
++msgid "The shortcut \"%s\" is already used for\n"
+ "\"%s\""
+-msgstr ""
+-"\"%s\" ಶಾರ್ಟ್-ಕಟ್ ಅನ್ನು ಇದಕ್ಕಾಗಿ ಈಗಾಗಲೆ ಬಳಸಲಾಗಿದೆ\n"
++msgstr "\"%s\" ಶಾರ್ಟ್-ಕಟ್ ಅನ್ನು ಇದಕ್ಕಾಗಿ ಈಗಾಗಲೆ ಬಳಸಲಾಗಿದೆ\n"
+ "\"%s\""
+ 
+ #: ../panels/keyboard/keyboard-shortcuts.c:1338
+ #, c-format
+ msgid ""
+ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
++""
+ msgstr ""
+ "ಶಾರ್ಟ್-ಕಟ್‌ ಅನ್ನು \"%s\" ಗೆ ನಿಯೋಜಿಸಿದಲ್ಲಿ, \"%s\" ಶಾರ್ಟ್-ಕಟ್‌ "
+ "ಅಶಕ್ತಗೊಳ್ಳುತ್ತದೆ."
+@@ -1927,22 +1889,22 @@ msgstr "ಒಂದೇ ಕ್ಲಿಕ್, ಎರಡನೆಯ ಗುಂಡಿ"
+ msgid "Air_plane Mode"
+ msgstr "ವಿಮಾನದ ಸ್ಥಿತಿ (_p)"
+ 
+-#: ../panels/network/cc-network-panel.c:912
++#: ../panels/network/cc-network-panel.c:914
+ msgid "Network proxy"
+ msgstr "ಜಾಲಬಂಧ ಪ್ರಾಕ್ಸಿ"
+ 
+ #. Translators: this is the title of the connection details
+ #. * window for vpn connections, it is also used to display
+ #. * vpn connections in the device list.
+-#.
+-#: ../panels/network/cc-network-panel.c:1091 ../panels/network/net-vpn.c:284
+-#: ../panels/network/net-vpn.c:419
++#. 
++#: ../panels/network/cc-network-panel.c:1093 ../panels/network/net-vpn.c:285
++#: ../panels/network/net-vpn.c:438
+ #, c-format
+ msgid "%s VPN"
+ msgstr "%s VPN"
+ 
+ #. TRANSLATORS: the user is running a NM that is not API compatible
+-#: ../panels/network/cc-network-panel.c:1226
++#: ../panels/network/cc-network-panel.c:1228
+ msgid "The system network services are not compatible with this version."
+ msgstr "ವ್ಯವಸ್ಥೆಯ ಜಾಲಬಂಧ ಸೇವೆಗಳು ಈ ಆವೃತ್ತಿಯೊಂದಿಗೆ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ."
+ 
+@@ -2014,12 +1976,12 @@ msgid "Never"
+ msgstr "ಎಂದೂ ಬೇಡ"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:102
+-#: ../panels/user-accounts/um-utils.c:770
++#: ../panels/user-accounts/um-utils.c:789
+ msgid "Today"
+ msgstr "ಇಂದು"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:104
+-#: ../panels/user-accounts/um-utils.c:773
++#: ../panels/user-accounts/um-utils.c:792
+ msgid "Yesterday"
+ msgstr "ನಿನ್ನೆ"
+ 
+@@ -2362,46 +2324,46 @@ msgstr "ಅದರ ಜಾಲಬಂಧದಲ್ಲಿರುವ ಸಂಪನ್ಮ
+ msgid "IPv_6"
+ msgstr "IPv_6"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:268
++#: ../panels/network/connection-editor/net-connection-editor.c:270
+ msgid "Unable to open connection editor"
+ msgstr "ಸಂಪರ್ಕ ಸಂಪಾದಕವನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:286
++#: ../panels/network/connection-editor/net-connection-editor.c:288
+ msgid "New Profile"
+ msgstr "ಹೊಸ ಪ್ರೊಫೈಲ್"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:511
++#: ../panels/network/connection-editor/net-connection-editor.c:513
+ #: ../panels/printers/new-printer-dialog.ui.h:3
+-#: ../panels/user-accounts/um-account-dialog.c:1083
++#: ../panels/user-accounts/um-account-dialog.c:1145
+ msgid "_Add"
+ msgstr "ಸೇರಿಸು (_A)"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:593
++#: ../panels/network/connection-editor/net-connection-editor.c:595
+ #: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
+ msgid "VPN"
+ msgstr "VPN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:594
++#: ../panels/network/connection-editor/net-connection-editor.c:596
+ msgid "Bond"
+ msgstr "ಬಾಂಡ್"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:595
++#: ../panels/network/connection-editor/net-connection-editor.c:597
+ msgid "Bridge"
+ msgstr "ಬ್ರಿಜ್"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:596
++#: ../panels/network/connection-editor/net-connection-editor.c:598
+ msgid "VLAN"
+ msgstr "VLAN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:746
++#: ../panels/network/connection-editor/net-connection-editor.c:748
+ msgid "Could not load VPN plugins"
+ msgstr "VPN ಪ್ಲಗ್‌ಇನ್‌ಗಳನ್ನು ಲೋಡ್‌ ಮಾಡಲಾಗಲಿಲ್ಲ"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:810
++#: ../panels/network/connection-editor/net-connection-editor.c:812
+ msgid "Import from file…"
+ msgstr "ಕಡತದಿಂದ ಆಮದು ಮಾಡು..."
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:877
++#: ../panels/network/connection-editor/net-connection-editor.c:879
+ msgid "Add Network Connection"
+ msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕವನ್ನು ಸೇರಿಸು"
+ 
+@@ -2429,8 +2391,8 @@ msgid ""
+ "Remove all details relating to this network and do not try to automatically "
+ "connect"
+ msgstr ""
+-"ಈ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಬಂಧಿಸದ ಎಲ್ಲಾ ವಿವರಗಳನ್ನು ತೆಗೆದುಹಾಕು ಮತ್ತು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಪರ್ಕ "
+-"ಸಾಧಿಸಲು ಪ್ರಯತ್ನಿಸಬೇಡ"
++"ಈ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಬಂಧಿಸದ ಎಲ್ಲಾ ವಿವರಗಳನ್ನು ತೆಗೆದುಹಾಕು ಮತ್ತು ಸ್ವಯಂಚಾಲಿತವಾಗಿ "
++"ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಪ್ರಯತ್ನಿಸಬೇಡ"
+ 
+ #: ../panels/network/connection-editor/security-page.ui.h:1
+ #: ../panels/network/network-wifi.ui.h:14
+@@ -2478,12 +2440,10 @@ msgstr "VPN ಸಂಪರ್ಕವನ್ನು ರಫ್ತು ಮಾಡಲು 
+ 
+ #: ../panels/network/connection-editor/vpn-helpers.c:336
+ #, c-format
+-msgid ""
+-"The VPN connection '%s' could not be exported to %s.\n"
++msgid "The VPN connection '%s' could not be exported to %s.\n"
+ "\n"
+ "Error: %s."
+-msgstr ""
+-"'%s' VPN ಸಂಪರ್ಕವನ್ನು %s ಎಂಬಲ್ಲಿಗೆ ರಫ್ತು ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.\n"
++msgstr "'%s' VPN ಸಂಪರ್ಕವನ್ನು %s ಎಂಬಲ್ಲಿಗೆ ರಫ್ತು ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.\n"
+ "\n"
+ "ದೋಷ: %s."
+ 
+@@ -2525,9 +2485,11 @@ msgstr "ಅಂತರಜಾಲದೊಂದಿಗೆ ನೀವು ಹೇಗೆ ಸ
+ 
+ #. Translators: those are keywords for the network control-center panel
+ #: ../panels/network/gnome-network-panel.desktop.in.in.h:4
+-msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
++msgid ""
++"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+ msgstr ""
+-"ಜಾಲಬಂಧ;ವೈರ್ಲೆಸ್;ವೈ-ಫೈ;ವೈಫೈ;IP;LAN;ಪ್ರಾಕ್ಸಿ;WAN;ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್;ಮಾಡೆಮ್;ಬ್ಲೂಟೂತ್;"
++"ಜಾಲಬಂಧ;ವೈರ್ಲೆಸ್;ವೈ-"
++"ಫೈ;ವೈಫೈ;IP;LAN;ಪ್ರಾಕ್ಸಿ;WAN;ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್;ಮಾಡೆಮ್;ಬ್ಲೂಟೂತ್;"
+ 
+ #: ../panels/network/net-device-bond.c:77
+ msgid "Bond slaves"
+@@ -2568,7 +2530,7 @@ msgstr "ಕೊನೆಯ ಬಾರಿಗೆ ಬಳಸಿದ್ದು"
+ #. * details window for ethernet, if there is only a single
+ #. * profile. It is also used to display ethernet in the
+ #. * device list.
+-#.
++#. 
+ #: ../panels/network/net-device-ethernet.c:288
+ #: ../panels/network/network-ethernet.ui.h:1
+ #: ../panels/network/network-simple.ui.h:1
+@@ -2576,7 +2538,7 @@ msgid "Wired"
+ msgstr "ತಂತಿಯುಕ್ತ"
+ 
+ #: ../panels/network/net-device-ethernet.c:356
+-#: ../panels/network/net-device-wifi.c:1549
++#: ../panels/network/net-device-wifi.c:1563
+ #: ../panels/network/network-ethernet.ui.h:3
+ #: ../panels/network/network-vpn.ui.h:8 ../panels/universal-access/uap.ui.h:23
+ msgid "Options…"
+@@ -2597,8 +2559,8 @@ msgid ""
+ "a wireless hotspot to share the connection with others."
+ msgstr ""
+ "ನೀವು ವೈರ್ಲೆಸ್ ಅನ್ನು ಹೊರತುಪಡಿಸಿ ಬೇರೇ ರೀತಿಯ ಅಂತರಜಾಲ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿದ್ದಲ್ಲಿ, "
+-"ನಿಮ್ಮ "
+-"ಅಂತರಜಾಲ ಸಂಪರ್ಕವನ್ನು ಇತರರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಲು ನೀವು ಒಂದು ವೈರ್ಲೆಸ್ ಬಹುದಾಗಿರುತ್ತದೆ."
++"ನಿಮ್ಮ ಅಂತರಜಾಲ ಸಂಪರ್ಕವನ್ನು ಇತರರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಲು ನೀವು ಒಂದು ವೈರ್ಲೆಸ್ "
++"ಬಹುದಾಗಿರುತ್ತದೆ."
+ 
+ #: ../panels/network/net-device-wifi.c:1124
+ #, c-format
+@@ -2613,13 +2575,13 @@ msgid ""
+ "hotspot is active."
+ msgstr ""
+ "ಹಾಟ್‌ಸ್ಪಾಟ್ ಸಕ್ರಿಯವಾಗಿದ್ದಾಗ ನಿಮ್ಮ ವೈರ್ಲೆಸ್‌ ಮುಖಾಂತರ ಅಂತರಜಾಲದೊಂದಿಗೆ ಸಂಪರ್ಕ "
+-"ಜೋಡಿಸುವುದು "
+-"ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ."
++"ಜೋಡಿಸುವುದು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ."
+ 
+ #: ../panels/network/net-device-wifi.c:1202
+ msgid "Stop hotspot and disconnect any users?"
+ msgstr ""
+-"ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಅನ್ನು ನಿಲ್ಲಿಸಲು ಮತ್ತು ಅದರ ಯಾವುದೆ ಬಳಕೆದಾರರನ್ನು ಸಂಪರ್ಕ ತಪ್ಪಿಸಬೇಕೆ?"
++"ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಅನ್ನು ನಿಲ್ಲಿಸಲು ಮತ್ತು ಅದರ ಯಾವುದೆ ಬಳಕೆದಾರರನ್ನು ಸಂಪರ್ಕ "
++"ತಪ್ಪಿಸಬೇಕೆ?"
+ 
+ #: ../panels/network/net-device-wifi.c:1205
+ msgid "_Stop Hotspot"
+@@ -2641,13 +2603,13 @@ msgstr ""
+ "ಗುಪ್ತಪದಗಳು ಮತ್ತು ಯಾವುದೆ ಅಗತ್ಯಾನುಗುಣ ಸಂರಚನೆಯೂ ಸಹ ಸೇರಿದಂತೆ  ಆಯ್ಕೆ ಮಾಡಲಾದ "
+ "ಜಾಲಬಂಧಗಳಿಗಾಗಿ ಜಾಲಬಂಧ ವಿವರಗಳು ನಾಶಗೊಳ್ಳುತ್ತವೆ."
+ 
+-#: ../panels/network/net-device-wifi.c:1712
++#: ../panels/network/net-device-wifi.c:1729
+ #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
+ msgid "History"
+ msgstr "ಇತಿಹಾಸ"
+ 
+ #. translators: This is the label for the "Forget wireless network" functionality
+-#: ../panels/network/net-device-wifi.c:1724
++#: ../panels/network/net-device-wifi.c:1741
+ msgctxt "Wi-Fi Network"
+ msgid "_Forget"
+ msgstr "ಮರೆತುಬಿಡು (_F)"
+@@ -2657,7 +2619,8 @@ msgstr "ಮರೆತುಬಿಡು (_F)"
+ msgid ""
+ "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
+ msgstr ""
+-"ಸಂರಚನಾ URL ಅನ್ನು ಒದಗಿಸದೇ ಇದ್ದಲ್ಲಿ ವೆಬ್ ಪ್ರಾಕ್ಸಿ ಆಟೋಡಿಸ್ಕವರಿಯನ್ನು ಬಳಸಲಾಗುತ್ತದೆ."
++"ಸಂರಚನಾ URL ಅನ್ನು ಒದಗಿಸದೇ ಇದ್ದಲ್ಲಿ ವೆಬ್ ಪ್ರಾಕ್ಸಿ ಆಟೋಡಿಸ್ಕವರಿಯನ್ನು "
++"ಬಳಸಲಾಗುತ್ತದೆ."
+ 
+ #. TRANSLATORS: WPAD is bad: if you enable it on an untrusted
+ #. * network, then anyone else on that network can tell your
+@@ -2667,7 +2630,7 @@ msgstr ""
+ msgid "This is not recommended for untrusted public networks."
+ msgstr "ಇದನ್ನು ನಂಬಿಕೆಗೆ ಅನರ್ಹವಾದ ಸಾರ್ವಜನಿಕ ಜಾಲಬಂಧಗಳಲ್ಲಿ ಇದು ಒಳ್ಳೆಯದಲ್ಲ"
+ 
+-#: ../panels/network/net-proxy.c:408
++#: ../panels/network/net-proxy.c:417
+ msgid "Proxy"
+ msgstr "ಪ್ರಾಕ್ಸಿ"
+ 
+@@ -2860,9 +2823,8 @@ msgid ""
+ "Reset the settings for this connection to their defaults, but remember as a "
+ "preferred connection."
+ msgstr ""
+-"ಈ ಸಂಪರ್ಕಕ್ಕಾಗಿನ ಸಿದ್ಧತೆಗಳನ್ನು ಅವುಗಳ ಪೂರ್ವನಿಯೋಜಿತಕ್ಕೆ ಮರುಹೊಂದಿಸು, ಆದರೆ ಆದ್ಯತೆಯ "
+-"ಸಂಪರ್ಕ "
+-"ಎಂದು ನೆನಪಿಡು."
++"ಈ ಸಂಪರ್ಕಕ್ಕಾಗಿನ ಸಿದ್ಧತೆಗಳನ್ನು ಅವುಗಳ ಪೂರ್ವನಿಯೋಜಿತಕ್ಕೆ ಮರುಹೊಂದಿಸು, ಆದರೆ "
++"ಆದ್ಯತೆಯ ಸಂಪರ್ಕ ಎಂದು ನೆನಪಿಡು."
+ 
+ #: ../panels/network/network-wifi.ui.h:42
+ msgid ""
+@@ -2870,8 +2832,7 @@ msgid ""
+ "connect to it."
+ msgstr ""
+ "ಈ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಎಲ್ಲಾ ವಿವರಗಳನ್ನು ತೆಗೆದುಹಾಕು ಮತ್ತು ಸ್ವಯಂಚಾಲಿತವಾಗಿ "
+-"ಸಂಪರ್ಕ "
+-"ಸಾಧಿಸಲು ಪ್ರಯತ್ನಿಸಬೇಡ."
++"ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಪ್ರಯತ್ನಿಸಬೇಡ."
+ 
+ #: ../panels/network/network-wifi.ui.h:43
+ msgid "reset"
+@@ -3226,10 +3187,8 @@ msgid ""
+ "Authority certificate?"
+ msgstr ""
+ "ಸರ್ಟಿಫಿಕೇಟ್ ಅತಾರಿಟಿ (CA) ಪ್ರಮಾಣಪತ್ರವನ್ನು ಬಳಸದೆ ಇದ್ದಲ್ಲಿ ಸಂಪರ್ಕಗಳು ಅಸುರಕ್ಷಿತ, "
+-"ದುಷ್ಟ Wi-"
+-"Fi ಜಾಲಬಂಧಗಳಾಗಲು ಕಾರಣವಾಗಬಹುದು. ನೀವು ಸರ್ಟಿಫಿಕೇಟ್ ಅತಾರಿಟಿ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ "
+-"ಮಾಡಲು "
+-"ಬಯಸುವಿರಾ?"
++"ದುಷ್ಟ Wi-Fi ಜಾಲಬಂಧಗಳಾಗಲು ಕಾರಣವಾಗಬಹುದು. ನೀವು ಸರ್ಟಿಫಿಕೇಟ್ ಅತಾರಿಟಿ "
++"ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಲು ಬಯಸುವಿರಾ?"
+ 
+ #: ../panels/network/wireless-security/eap-method.c:281
+ msgid "Ignore"
+@@ -3361,10 +3320,9 @@ msgid ""
+ "\n"
+ "(You can password-protect your private key with openssl)"
+ msgstr ""
+-"ಆಯ್ಕೆ ಮಾಡಲಾದ ಖಾಸಗಿ ಕೀಲಿಯು ಒಂದು ಗುಪ್ತಪದದಿಂದ ಸಂರಕ್ಷಿತಗೊಂಡಿರುವಂತೆ ಕಾಣಿಸುತ್ತಿಲ್ಲ. "
+-" "
+-"ಇದರಿಂದಾಗಿ ನಿಮ್ಮ ಸುರಕ್ಷತಾ ರುಜುವಾತನ್ನು ರಾಜಿ ಮಾಡಿಕೊಂಡಂತಾಗುತ್ತದೆ.  ದಯವಿಟ್ಟು ಒಂದು "
+-"ಗುಪ್ತಪದದಿಂದ ಸಂರಿಕ್ಷಿತಗೊಂಡಂತಹ ಖಾಸಗಿ ಕೀಲಿಯನ್ನು ಒದಗಿಸಿ.\n"
++"ಆಯ್ಕೆ ಮಾಡಲಾದ ಖಾಸಗಿ ಕೀಲಿಯು ಒಂದು ಗುಪ್ತಪದದಿಂದ ಸಂರಕ್ಷಿತಗೊಂಡಿರುವಂತೆ ಕಾಣಿಸುತ್ತಿಲ್ಲ."
++"  ಇದರಿಂದಾಗಿ ನಿಮ್ಮ ಸುರಕ್ಷತಾ ರುಜುವಾತನ್ನು ರಾಜಿ ಮಾಡಿಕೊಂಡಂತಾಗುತ್ತದೆ.  ದಯವಿಟ್ಟು "
++"ಒಂದು ಗುಪ್ತಪದದಿಂದ ಸಂರಿಕ್ಷಿತಗೊಂಡಂತಹ ಖಾಸಗಿ ಕೀಲಿಯನ್ನು ಒದಗಿಸಿ.\n"
+ "\n"
+ "(ನೀವು ನಿಮ್ಮ ಖಾಸಗಿ ಕೀಲಿಯನ್ನು openssl ಬಳಸಿಕೊಂಡು ಸಂರಕ್ಷಿಸಿ)"
+ 
+@@ -3504,14 +3462,14 @@ msgid "Show Details in Lock Screen"
+ msgstr "ಲಾಕ್ ಮಾಡಿದ ತೆರೆಯಲ್ಲಿ ವಿವರಗಳನ್ನು ತೋರಿಸು"
+ 
+ #: ../panels/notifications/cc-notifications-panel.c:203
+-#: ../panels/power/cc-power-panel.c:1637 ../panels/power/cc-power-panel.c:1644
++#: ../panels/power/cc-power-panel.c:1618 ../panels/power/cc-power-panel.c:1625
+ #: ../panels/privacy/cc-privacy-panel.c:78
+ #: ../panels/privacy/cc-privacy-panel.c:145
+ msgid "On"
+ msgstr "ಚಾಲಿತ"
+ 
+ #: ../panels/notifications/cc-notifications-panel.c:203
+-#: ../panels/power/cc-power-panel.c:1631 ../panels/power/cc-power-panel.c:1642
++#: ../panels/power/cc-power-panel.c:1612 ../panels/power/cc-power-panel.c:1623
+ #: ../panels/privacy/cc-privacy-panel.c:78
+ #: ../panels/privacy/cc-privacy-panel.c:145
+ msgid "Off"
+@@ -3541,7 +3499,7 @@ msgid "Show in Lock Screen"
+ msgstr "ಲಾಕ್ ಮಾಡಿದ ತೆರೆಯಲ್ಲಿ ತೋರಿಸು"
+ 
+ #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:190
+-#: ../panels/region/cc-input-chooser.c:1091
++#: ../panels/region/cc-input-chooser.c:1088
+ #: ../panels/search/cc-search-locations-dialog.c:480
+ msgid "Other"
+ msgstr "ಇತರೆ"
+@@ -3608,12 +3566,10 @@ msgstr "ಅಂತರಜಾಲದಲ್ಲಿನ ಖಾತೆಗಳು"
+ msgid "Connect to your online accounts and decide what to use them for"
+ msgstr ""
+ "ನಿಮ್ಮ ಆನ್‌ಲೈನ್ ಖಾತೆಗಳೊಂದಿಗೆ ಸಂಪರ್ಕ ಜೋಡಿಸಿ ಮತ್ತು ಅವುಗಳನ್ನು ಯಾವ ಕೆಲಸಕ್ಕೆ "
+-"ಬಳಸಬೇಕು "
+-"ಎನ್ನುವುದನ್ನು ನಿರ್ಧರಿಸಿ"
++"ಬಳಸಬೇಕು ಎನ್ನುವುದನ್ನು ನಿರ್ಧರಿಸಿ"
+ 
+ #. Translators: those are keywords for the online-accounts control-center panel
+ #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
+-#| msgid "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
+ msgid ""
+ "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
+ msgstr ""
+@@ -3636,22 +3592,22 @@ msgid ""
+ "Adding an account allows your applications to access it for documents, mail, "
+ "contacts, calendar, chat and more."
+ msgstr ""
+-"ಒಂದು ಖಾತೆಯನ್ನು ಸೇರಿಸುವುದರಿಂದ ಅದನ್ನು ನಿಮ್ಮ ಅನ್ವಯಗಳನ್ನು ದಸ್ತಾವೇಜುಗಳಿಗೆ, ಅಂಚೆಗೆ, "
+-"ಸಂಪರ್ಕವಿಳಾಸಗಳಿಗೆ, ಕ್ಯಾಲೆಂಡರಿಗೆ, ಹರಟೆ ಮತ್ತು ಮುಂತಾದವುಗಳಿಗಾಗಿ ನಿಲುಕಿಸಿಕೊಳ್ಳಲು "
+-"ಸಾಧ್ಯವಾಗುತ್ತದೆ."
++"ಒಂದು ಖಾತೆಯನ್ನು ಸೇರಿಸುವುದರಿಂದ ಅದನ್ನು ನಿಮ್ಮ ಅನ್ವಯಗಳನ್ನು ದಸ್ತಾವೇಜುಗಳಿಗೆ, "
++"ಅಂಚೆಗೆ, ಸಂಪರ್ಕವಿಳಾಸಗಳಿಗೆ, ಕ್ಯಾಲೆಂಡರಿಗೆ, ಹರಟೆ ಮತ್ತು ಮುಂತಾದವುಗಳಿಗಾಗಿ "
++"ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ."
+ 
+-#: ../panels/power/cc-power-panel.c:184
++#: ../panels/power/cc-power-panel.c:183
+ msgid "Unknown time"
+ msgstr "ಗೊತ್ತಿರದ ಸಮಯ"
+ 
+-#: ../panels/power/cc-power-panel.c:190
++#: ../panels/power/cc-power-panel.c:189
+ #, c-format
+ msgid "%i minute"
+ msgid_plural "%i minutes"
+ msgstr[0] "%i ನಿಮಿಷ"
+ msgstr[1] "%i ನಿಮಿಷಗಳು"
+ 
+-#: ../panels/power/cc-power-panel.c:202
++#: ../panels/power/cc-power-panel.c:201
+ #, c-format
+ msgid "%i hour"
+ msgid_plural "%i hours"
+@@ -3660,228 +3616,223 @@ msgstr[1] "%i ಗಂಟೆಗಳು"
+ 
+ #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
+ #. * Swap order with "%2$s %2$i %1$s %1$i if needed
+-#: ../panels/power/cc-power-panel.c:210
++#: ../panels/power/cc-power-panel.c:209
+ #, c-format
+ msgid "%i %s %i %s"
+ msgstr "%i %s %i %s"
+ 
+-#: ../panels/power/cc-power-panel.c:211
++#: ../panels/power/cc-power-panel.c:210
+ msgid "hour"
+ msgid_plural "hours"
+ msgstr[0] "ಗಂಟೆ"
+ msgstr[1] "ಗಂಟೆಗಳು"
+ 
+-#: ../panels/power/cc-power-panel.c:212
++#: ../panels/power/cc-power-panel.c:211
+ msgid "minute"
+ msgid_plural "minutes"
+ msgstr[0] "ನಿಮಿಷ"
+ msgstr[1] "ನಿಮಿಷಗಳು"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:231
++#: ../panels/power/cc-power-panel.c:230
+ #, c-format
+ msgid "%s until fully charged"
+ msgstr "ಚಾರ್ಜ್ ಮಾಡಿದಾಗಿನಿಂದ  %s"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:238
++#: ../panels/power/cc-power-panel.c:237
+ #, c-format
+ msgid "Caution: %s remaining"
+ msgstr "ಎಚ್ಚರಿಕೆ, %s ಬಾಕಿ ಇದೆ"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:243
++#: ../panels/power/cc-power-panel.c:242
+ #, c-format
+ msgid "%s remaining"
+ msgstr "%s ಬಾಕಿ ಇದೆ"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:248 ../panels/power/cc-power-panel.c:276
++#: ../panels/power/cc-power-panel.c:247 ../panels/power/cc-power-panel.c:275
+ msgid "Fully charged"
+ msgstr "ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆಗಿದೆ"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:252 ../panels/power/cc-power-panel.c:280
++#: ../panels/power/cc-power-panel.c:251 ../panels/power/cc-power-panel.c:279
+ msgid "Empty"
+ msgstr "ಖಾಲಿ"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:267
++#: ../panels/power/cc-power-panel.c:266
+ msgid "Charging"
+ msgstr "ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:272
++#: ../panels/power/cc-power-panel.c:271
+ msgid "Discharging"
+ msgstr "ಡಿಸ್‌ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ"
+ 
+-#: ../panels/power/cc-power-panel.c:324
+-#, c-format
+-msgid "Estimated battery capacity: %s"
+-msgstr "ಬ್ಯಾಟರಿಯ ಅಂದಾಜು ಸಾಮರ್ಥ್ಯ: %s"
+-
+-#: ../panels/power/cc-power-panel.c:404
++#: ../panels/power/cc-power-panel.c:385
+ msgctxt "Battery name"
+ msgid "Main"
+ msgstr "ಮುಖ್ಯ"
+ 
+-#: ../panels/power/cc-power-panel.c:406
++#: ../panels/power/cc-power-panel.c:387
+ msgctxt "Battery name"
+ msgid "Extra"
+ msgstr "ಹೆಚ್ಚುವರಿ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:493
++#: ../panels/power/cc-power-panel.c:474
+ msgid "Wireless mouse"
+ msgstr "ತಂತಿರಹಿತ ಮೌಸ್"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:497
++#: ../panels/power/cc-power-panel.c:478
+ msgid "Wireless keyboard"
+ msgstr "ತಂತಿರಹಿತ ಕೀಲಿಮಣೆ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:501
++#: ../panels/power/cc-power-panel.c:482
+ msgid "Uninterruptible power supply"
+ msgstr "ತಡೆರಹಿತ ವಿದ್ಯುತ್ ಪೂರೈಕೆ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:506
++#: ../panels/power/cc-power-panel.c:487
+ msgid "Personal digital assistant"
+ msgstr "ವೈಯಕ್ತಿಕ ಡಿಜಿಟಲ್ ಸಹಾಯಕ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:510
++#: ../panels/power/cc-power-panel.c:491
+ msgid "Cellphone"
+ msgstr "ಸೆಲ್‌ಫೋನ್"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:514
++#: ../panels/power/cc-power-panel.c:495
+ msgid "Media player"
+ msgstr "ಮಾಧ್ಯಮ ಚಾಲಕ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:518
++#: ../panels/power/cc-power-panel.c:499
+ msgid "Tablet"
+ msgstr "ಕಿಸೆಗಣಕ (ಟ್ಯಾಬ್ಲೆಟ್)"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:522
++#: ../panels/power/cc-power-panel.c:503
+ msgid "Computer"
+ msgstr "ಗಣಕ"
+ 
+ #. TRANSLATORS: secondary battery, misc
+-#: ../panels/power/cc-power-panel.c:526 ../panels/power/cc-power-panel.c:734
+-#: ../panels/power/cc-power-panel.c:1938
++#: ../panels/power/cc-power-panel.c:507 ../panels/power/cc-power-panel.c:715
++#: ../panels/power/cc-power-panel.c:1919
+ msgid "Battery"
+ msgstr "ಬ್ಯಾಟರಿ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:535
++#: ../panels/power/cc-power-panel.c:516
+ msgctxt "Battery power"
+ msgid "Charging"
+ msgstr "ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:542
++#: ../panels/power/cc-power-panel.c:523
+ msgctxt "Battery power"
+ msgid "Caution"
+ msgstr "ಎಚ್ಚರಿಕೆ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:547
++#: ../panels/power/cc-power-panel.c:528
+ msgctxt "Battery power"
+ msgid "Low"
+ msgstr "ಕೆಳ ಮಟ್ಟದ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:552
++#: ../panels/power/cc-power-panel.c:533
+ msgctxt "Battery power"
+ msgid "Good"
+ msgstr "ಉತ್ತಮ"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:557
++#: ../panels/power/cc-power-panel.c:538
+ msgctxt "Battery power"
+ msgid "Fully charged"
+ msgstr "ಸಂಪುರ್ಣವಾಗಿ ಚಾರ್ಜ್ ಆಗಿದೆ"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:561
++#: ../panels/power/cc-power-panel.c:542
+ msgctxt "Battery power"
+ msgid "Empty"
+ msgstr "ಖಾಲಿ"
+ 
+-#: ../panels/power/cc-power-panel.c:732
++#: ../panels/power/cc-power-panel.c:713
+ msgid "Batteries"
+ msgstr "ಬ್ಯಾಟರಿಗಳು"
+ 
+-#: ../panels/power/cc-power-panel.c:1074
++#: ../panels/power/cc-power-panel.c:1055
+ msgid "When _idle"
+ msgstr "ಜಡವಾಗಿದ್ದಾಗ (_i)"
+ 
+-#: ../panels/power/cc-power-panel.c:1401
++#: ../panels/power/cc-power-panel.c:1382
+ msgid "Power Saving"
+ msgstr "ವಿದ್ಯುಚ್ಛಕ್ತಿ ಉಳಿತಾಯ"
+ 
+-#: ../panels/power/cc-power-panel.c:1430
++#: ../panels/power/cc-power-panel.c:1411
+ msgid "_Screen Brightness"
+ msgstr "ತೆರೆಯ ಪ್ರಕಾಶತೆ (_S)"
+ 
+-#: ../panels/power/cc-power-panel.c:1458
++#: ../panels/power/cc-power-panel.c:1439
+ msgid "_Dim Screen when Inactive"
+ msgstr "ಚಟುವಟಿಕೆ ಇಲ್ಲದಾಗ ತೆರೆಯನ್ನು ಮಂದಗೊಳಿ (_D)"
+ 
+-#: ../panels/power/cc-power-panel.c:1481
++#: ../panels/power/cc-power-panel.c:1462
+ msgid "_Blank Screen"
+ msgstr "ಖಾಲಿ ತೆರೆ (_B)"
+ 
+-#: ../panels/power/cc-power-panel.c:1516
++#: ../panels/power/cc-power-panel.c:1497
+ msgid "_Wi-Fi"
+ msgstr "ವೈ-ಫೈ (_W)"
+ 
+-#: ../panels/power/cc-power-panel.c:1521
++#: ../panels/power/cc-power-panel.c:1502
+ msgid "Turns off wireless devices"
+ msgstr "ವೈರ್ಲೆಸ್ ಸಾಧನಗಳನ್ನು ಆಫ್ ಮಾಡುತ್ತದೆ"
+ 
+-#: ../panels/power/cc-power-panel.c:1544
++#: ../panels/power/cc-power-panel.c:1525
+ msgid "_Mobile Broadband"
+ msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ (_M)"
+ 
+-#: ../panels/power/cc-power-panel.c:1549
++#: ../panels/power/cc-power-panel.c:1530
+ msgid "Turns off Mobile Broadband (3G, 4G, WiMax, etc.) devices"
+ msgstr ""
+ "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್‌ (3G, 4G, WiMax, ಇತರೆ.) ಸಾಧನಗಳನ್ನು ಆಫ್ ಮಾಡುತ್ತದೆ "
+ 
+-#: ../panels/power/cc-power-panel.c:1582
++#: ../panels/power/cc-power-panel.c:1563
+ msgid "_Bluetooth"
+ msgstr "ಬ್ಲೂಟೂತ್ (_B)"
+ 
+-#: ../panels/power/cc-power-panel.c:1633
++#: ../panels/power/cc-power-panel.c:1614
+ msgid "When on battery power"
+ msgstr "ಬ್ಯಾಟರಿ ವಿದ್ಯುಚ್ಛಕ್ತಿಯನ್ನು ಬಳಸುವಾಗ"
+ 
+-#: ../panels/power/cc-power-panel.c:1635
++#: ../panels/power/cc-power-panel.c:1616
+ msgid "When plugged in"
+ msgstr "ವಿದ್ಯುಚ್ಧಕ್ತಿ ಸಂಪರ್ಕ ಜೋಡಿಸಿದಾಗ"
+ 
+-#: ../panels/power/cc-power-panel.c:1762
++#: ../panels/power/cc-power-panel.c:1743
+ msgid "Suspend & Power Off"
+ msgstr "ಅಮಾನತುಗೊಳಿಸು ಮತ್ತು ಆಫ್ ಮಾಡು"
+ 
+-#: ../panels/power/cc-power-panel.c:1793
++#: ../panels/power/cc-power-panel.c:1774
+ msgid "_Automatic Suspend"
+ msgstr "ಸ್ವಯಂಚಾಲಿತ ಅಮಾನತು (_A)"
+ 
+-#: ../panels/power/cc-power-panel.c:1815
++#: ../panels/power/cc-power-panel.c:1796
+ msgid "When Battery Power is _Critical"
+ msgstr "ಬ್ಯಾಟರಿಯ ವಿದ್ಯುಚ್ಛಕ್ತಿಯು ಸಂದಿಗ್ಧ ಮಟ್ಟದಲ್ಲಿದ್ದಾಗ (_C)"
+ 
+-#: ../panels/power/cc-power-panel.c:1848
++#: ../panels/power/cc-power-panel.c:1829
+ msgid "Power Off"
+ msgstr "ಆಫ್ ಮಾಡು"
+ 
+-#: ../panels/power/cc-power-panel.c:1990
++#: ../panels/power/cc-power-panel.c:1966
+ msgid "Devices"
+ msgstr "ಸಾಧನಗಳು"
+ 
+@@ -3899,8 +3850,7 @@ msgstr ""
+ msgid ""
+ "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+ msgstr ""
+-"ವಿದ್ಯುಚ್ಛಕ್ತಿ;ನಿದ್ರಿಸು;ಅಮಾನತು;ಹೈಬರ್ನೇಟ್;ಬ್ಯಾಟರಿ;ಪ್ರಕಾಶತೆ;ಮಂದ;ಖಾಲಿ;ತೆರೆ;DPMS;ಜಡ"
+-";"
++"ವಿದ್ಯುಚ್ಛಕ್ತಿ;ನಿದ್ರಿಸು;ಅಮಾನತು;ಹೈಬರ್ನೇಟ್;ಬ್ಯಾಟರಿ;ಪ್ರಕಾಶತೆ;ಮಂದ;ಖಾಲಿ;ತೆರೆ;DPMS;ಜಡ;"
+ 
+ #: ../panels/power/power.ui.h:1
+ msgid "Hibernate"
+@@ -3991,7 +3941,7 @@ msgid "Authenticate"
+ msgstr "ದೃಢೀಕರಿಸು"
+ 
+ #: ../panels/printers/authentication-dialog.ui.h:5
+-#: ../panels/sharing/sharing.ui.h:22
++#: ../panels/sharing/sharing.ui.h:23
+ msgid "Password"
+ msgstr "ಗುಪ್ತಪದ"
+ 
+@@ -4158,8 +4108,7 @@ msgid ""
+ "PPD.GZ)"
+ msgstr ""
+ "PostScript ಪ್ರಿಂಟರ್ ಡಿಸ್ಕ್ರಿಪ್ಶನ್ ಕಡತಗಳು (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, "
+-"*.PPD."
+-"GZ)"
++"*.PPD.GZ)"
+ 
+ #: ../panels/printers/cc-printers-panel.c:2254
+ msgid "No suitable driver found"
+@@ -4197,8 +4146,7 @@ msgstr "ಮುದ್ರಕಗಳು"
+ msgid "Add printers, view printer jobs and decide how you want to print"
+ msgstr ""
+ "ಮುದ್ರಕಗಳನ್ನು ಸೇರಿಸಿ, ಮುದ್ರಣ ಕಾರ್ಯಗಳನ್ನು ನೋಡಿ ಮತ್ತು ನೀವು ಹೇಗೆ ಮುದ್ರಿಸಲು "
+-"ಬಯಸುವಿರಿ "
+-"ಎನ್ನುವುದನ್ನು ನಿರ್ಧರಿಸಿ"
++"ಬಯಸುವಿರಿ ಎನ್ನುವುದನ್ನು ನಿರ್ಧರಿಸಿ"
+ 
+ #. Translators: those are keywords for the printing control-center panel
+ #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
+@@ -4233,7 +4181,7 @@ msgid "Add a New Printer"
+ msgstr "ಒಂದು ಹೊಸ ಮುದ್ರಕವನ್ನು ಸೇರಿಸಿ"
+ 
+ #: ../panels/printers/new-printer-dialog.ui.h:2
+-#: ../panels/user-accounts/um-user-panel.c:467
++#: ../panels/user-accounts/um-user-panel.c:508
+ msgid "_Cancel"
+ msgstr "ರದ್ದು ಮಾಡು (_C)"
+ 
+@@ -4354,7 +4302,7 @@ msgid "%s Active Jobs"
+ msgstr "%s ಸಕ್ರಿಯ ಕಾರ್ಯಗಳು"
+ 
+ #. Translators: No printers were found
+-#: ../panels/printers/pp-new-printer-dialog.c:1465
++#: ../panels/printers/pp-new-printer-dialog.c:1468
+ msgid "No printers detected."
+ msgstr "ಯಾವುದೆ ಮುದ್ರಕಗಳು ಕಂಡುಬಂದಿಲ್ಲ"
+ 
+@@ -4383,64 +4331,64 @@ msgid "GhostScript pre-filtering"
+ msgstr "GhostScript ಪೂರ್ವ-ಸೋಸುವಿಕೆ"
+ 
+ #. Translators: This option sets number of pages printed on one sheet
+-#: ../panels/printers/pp-options-dialog.c:533
++#: ../panels/printers/pp-options-dialog.c:532
+ msgid "Pages per side"
+ msgstr "ಪ್ರತಿ ಬದಿಯ ಪುಟಗಳು"
+ 
+ #. Translators: This option sets whether to print on both sides of paper
+-#: ../panels/printers/pp-options-dialog.c:545
++#: ../panels/printers/pp-options-dialog.c:544
+ msgid "Two-sided"
+ msgstr "ಎರಡೂ-ಬದಿಯ"
+ 
+ #. Translators: This option sets orientation of print (portrait, landscape...)
+-#: ../panels/printers/pp-options-dialog.c:557
++#: ../panels/printers/pp-options-dialog.c:556
+ msgid "Orientation"
+ msgstr "ಅಭಿಮುಖ"
+ 
+ #. Translators: "General" tab contains general printer options
+-#: ../panels/printers/pp-options-dialog.c:654
++#: ../panels/printers/pp-options-dialog.c:653
+ msgctxt "Printer Option Group"
+ msgid "General"
+ msgstr "ಸಾಮಾನ್ಯ"
+ 
+ #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
+-#: ../panels/printers/pp-options-dialog.c:657
++#: ../panels/printers/pp-options-dialog.c:656
+ msgctxt "Printer Option Group"
+ msgid "Page Setup"
+ msgstr "ಪುಟ ಸಿದ್ಧತೆ"
+ 
+ #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, duplex unit, etc.)
+-#: ../panels/printers/pp-options-dialog.c:660
++#: ../panels/printers/pp-options-dialog.c:659
+ msgctxt "Printer Option Group"
+ msgid "Installable Options"
+ msgstr "ಅನುಸ್ಥಾಪನೆಯ ಆಯ್ಕೆಗಳು"
+ 
+ #. Translators: "Job" tab contains settings for jobs
+-#: ../panels/printers/pp-options-dialog.c:663
++#: ../panels/printers/pp-options-dialog.c:662
+ msgctxt "Printer Option Group"
+ msgid "Job"
+ msgstr "ಕಾರ್ಯ"
+ 
+ #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
+-#: ../panels/printers/pp-options-dialog.c:666
++#: ../panels/printers/pp-options-dialog.c:665
+ msgctxt "Printer Option Group"
+ msgid "Image Quality"
+ msgstr "ಚಿತ್ರದ ಗುಣಮಟ್ಟ"
+ 
+ #. Translators: "Color" tab contains color settings (e.g. color printing)
+-#: ../panels/printers/pp-options-dialog.c:669
++#: ../panels/printers/pp-options-dialog.c:668
+ msgctxt "Printer Option Group"
+ msgid "Color"
+ msgstr "ಬಣ್ಣ"
+ 
+ #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
+-#: ../panels/printers/pp-options-dialog.c:672
++#: ../panels/printers/pp-options-dialog.c:671
+ msgctxt "Printer Option Group"
+ msgid "Finishing"
+ msgstr "ಪೂರ್ಣಗೊಳಿಕೆ"
+ 
+ #. Translators: "Advanced" tab contains all others settings
+-#: ../panels/printers/pp-options-dialog.c:675
++#: ../panels/printers/pp-options-dialog.c:674
+ msgctxt "Printer Option Group"
+ msgid "Advanced"
+ msgstr "ಸುಧಾರಿತ"
+@@ -4564,11 +4512,9 @@ msgstr "ಹೊಸ ಮುದ್ರಕವನ್ನು ಸೇರಿಸಿ"
+ 
+ #. Translators: The CUPS server is not running (we can not connect to it).
+ #: ../panels/printers/printers.ui.h:26
+-msgid ""
+-"Sorry! The system printing service\n"
++msgid "Sorry! The system printing service\n"
+ "doesn't seem to be available."
+-msgstr ""
+-"ಕ್ಷಮಿಸಿ! ವ್ಯವಸ್ಥೆಯ ಮುದ್ರಣ ಸೇವೆಯು\n"
++msgstr "ಕ್ಷಮಿಸಿ! ವ್ಯವಸ್ಥೆಯ ಮುದ್ರಣ ಸೇವೆಯು\n"
+ "ಲಭ್ಯವಿರುವಂತೆ ತೋರುತ್ತಿಲ್ಲ."
+ 
+ #: ../panels/privacy/cc-privacy-panel.c:105
+@@ -4603,17 +4549,14 @@ msgstr "ಗೌಪ್ಯತೆ"
+ msgid "Protect your personal information and control what others might see"
+ msgstr ""
+ "ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿಗಳನ್ನು ಸಂರಕ್ಷಿಸಿ ಮತ್ತು ಬೇರೆಯವರು ಏನನ್ನು ನೋಡುತ್ತಾರೆ "
+-"ಎನ್ನುವುದನ್ನು "
+-"ನಿಯಂತ್ರಿಸಿ"
++"ಎನ್ನುವುದನ್ನು ನಿಯಂತ್ರಿಸಿ"
+ 
+ #. Translators: those are keywords for the privacy control-center panel
+ #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4
+ msgid ""
+-"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+-"network;identity;"
++"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;network;identity;"
+ msgstr ""
+-"ತೆರೆ;ಲಾಕ್;ದೋಷಪತ್ತೆ;ಕುಸಿತ;ಖಾಸಗಿ;ಇತ್ತೀಚಿನ;ತಾತ್ಕಾಲಿಕ;tmp;ಸೂಚಿ;ಹೆಸರು;ಜಾಲಬಂಧ;ಗುರುತು"
+-";"
++"ತೆರೆ;ಲಾಕ್;ದೋಷಪತ್ತೆ;ಕುಸಿತ;ಖಾಸಗಿ;ಇತ್ತೀಚಿನ;ತಾತ್ಕಾಲಿಕ;tmp;ಸೂಚಿ;ಹೆಸರು;ಜಾಲಬಂಧ;ಗುರುತು;"
+ 
+ #: ../panels/privacy/privacy.ui.h:1
+ msgid "Screen Turns Off"
+@@ -4690,9 +4633,9 @@ msgid ""
+ "Remembering your history makes things easier to find again. These items are "
+ "never shared over the network."
+ msgstr ""
+-"ನಿಮ್ಮ ವ್ಯವಸ್ಥೆಯ ಇತಿಹಾಸವನ್ನು ನೆನಪಿಟ್ಟುಕೊಳ್ಳುವುದರಿಂದ ಅಗತ್ಯವಾದ ವಸ್ತುಗಳನ್ನು ಮತ್ತೆ "
+-"ಹುಡುಕಲು "
+-"ಸುಲಭವಾಗಿರುತ್ತದೆ. ಈ ಅಂಶಗಳನ್ನು ಎಂದಿಗೂ ಸಹ ಜಾಲಬಂಧದ ಮುಖಾಂತರ ಹಂಚಿಕೊಳ್ಳಲಾಗುವುದಿಲ್ಲ."
++"ನಿಮ್ಮ ವ್ಯವಸ್ಥೆಯ ಇತಿಹಾಸವನ್ನು ನೆನಪಿಟ್ಟುಕೊಳ್ಳುವುದರಿಂದ ಅಗತ್ಯವಾದ ವಸ್ತುಗಳನ್ನು "
++"ಮತ್ತೆ ಹುಡುಕಲು ಸುಲಭವಾಗಿರುತ್ತದೆ. ಈ ಅಂಶಗಳನ್ನು ಎಂದಿಗೂ ಸಹ ಜಾಲಬಂಧದ ಮುಖಾಂತರ "
++"ಹಂಚಿಕೊಳ್ಳಲಾಗುವುದಿಲ್ಲ."
+ 
+ #: ../panels/privacy/privacy.ui.h:28
+ msgid "Cl_ear Recent History"
+@@ -4737,8 +4680,7 @@ msgid ""
+ "free of unnecessary sensitive information."
+ msgstr ""
+ "ನಿಮ್ಮ ಗಣಕವು ಅನಗತ್ಯವಾದ ಸಂವೇದನಾ ಮಾಹಿತಿಯನ್ನು ಇರಿಸಿಕೊಳ್ಳುವುದನ್ನು ತಪ್ಪಿಸಲು ಕಸ "
+-"(ಟ್ರ್ಯಾಶ್) "
+-"ಮತ್ತು ತಾತ್ಕಾಲಿಕ ಕಡತಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಹೊರತಳ್ಳಿ."
++"(ಟ್ರ್ಯಾಶ್) ಮತ್ತು ತಾತ್ಕಾಲಿಕ ಕಡತಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಹೊರತಳ್ಳಿ."
+ 
+ #: ../panels/privacy/privacy.ui.h:40
+ msgid "Automatically Empty _Trash"
+@@ -4766,13 +4708,14 @@ msgstr "ಮೆಟ್ರಿಕ್"
+ msgid "No regions found"
+ msgstr "ಯಾವುದೆ ಜಾಗಗಳು ಕಂಡು ಬಂದಿಲ್ಲ"
+ 
+-#: ../panels/region/cc-input-chooser.c:188
++#: ../panels/region/cc-input-chooser.c:185
+ msgid "No input sources found"
+ msgstr "ಯಾವುದೆ ಇನ್‌ಪುಟ್‌ ಮೂಲಗಳು ಕಂಡುಬಂದಿಲ್ಲ"
+ 
+ #: ../panels/region/cc-region-panel.c:240
+ msgid "Your session needs to be restarted for changes to take effect"
+-msgstr "ಬದಲಾವಣೆಗಳು ಕಾರ್ಯರೂಪಕ್ಕೆ ಬರಲು ನಿಮ್ಮ ಅಧಿವೇಶನವನ್ನು ಮರಳಿ ಆರಂಭಿಸಬೇಕಾಗುತ್ತದೆ"
++msgstr ""
++"ಬದಲಾವಣೆಗಳು ಕಾರ್ಯರೂಪಕ್ಕೆ ಬರಲು ನಿಮ್ಮ ಅಧಿವೇಶನವನ್ನು ಮರಳಿ ಆರಂಭಿಸಬೇಕಾಗುತ್ತದೆ"
+ 
+ #: ../panels/region/cc-region-panel.c:241
+ msgid "Restart Now"
+@@ -4783,19 +4726,19 @@ msgctxt "Language"
+ msgid "None"
+ msgstr "ಯಾವುದೂ ಇಲ್ಲ"
+ 
+-#: ../panels/region/cc-region-panel.c:1058
++#: ../panels/region/cc-region-panel.c:847
++msgid "No input source selected"
++msgstr "ಯಾವುದೆ ಇನ್‌ಪುಟ್ ಮೂಲವನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿಲ್ಲ"
++
++#: ../panels/region/cc-region-panel.c:1078
+ msgid "Sorry"
+ msgstr "ಕ್ಷಮಿಸಿ"
+ 
+-#: ../panels/region/cc-region-panel.c:1060
++#: ../panels/region/cc-region-panel.c:1080
+ msgid "Input methods can't be used on the login screen"
+ msgstr "ಪ್ರವೇಶ ತೆರೆಯಲ್ಲಿ ಇನ್‌ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ"
+ 
+-#: ../panels/region/cc-region-panel.c:1509
+-msgid "No input source selected"
+-msgstr "ಯಾವುದೆ ಇನ್‌ಪುಟ್ ಮೂಲವನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿಲ್ಲ"
+-
+-#: ../panels/region/cc-region-panel.c:1690
++#: ../panels/region/cc-region-panel.c:1710
+ msgid "Login Screen"
+ msgstr "ಪ್ರವೇಶ ತೆರೆ"
+ 
+@@ -4835,8 +4778,8 @@ msgstr "ಪ್ರದೇಶ ಹಾಗು ಭಾಷೆ"
+ msgid ""
+ "Select your display language, formats, keyboard layouts and input sources"
+ msgstr ""
+-"ನಿಮ್ಮ ಪ್ರದರ್ಶನದ ಭಾಷೆ, ವಿನ್ಯಾಸಗಳು, ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸಗಳು ಮತ್ತು ಇನ್‌ಪುಟ್ ಮೂಲಗಳನ್ನು "
+-"ಆರಿಸಿ"
++"ನಿಮ್ಮ ಪ್ರದರ್ಶನದ ಭಾಷೆ, ವಿನ್ಯಾಸಗಳು, ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸಗಳು ಮತ್ತು ಇನ್‌ಪುಟ್ "
++"ಮೂಲಗಳನ್ನು ಆರಿಸಿ"
+ 
+ #. Translators: those are keywords for the region control-center panel
+ #: ../panels/region/gnome-region-panel.desktop.in.in.h:4
+@@ -4887,6 +4830,10 @@ msgstr "ನೀವು ಈ ಸುಲಭಆಯ್ಕೆಗಳನ್ನು ಕೀಲ
+ msgid "Alternative switch to next source"
+ msgstr "ಮುಂದಿನ ಮೂಲಕ್ಕೆ ಪರ್ಯಾಯ ಸ್ವಿಚ್"
+ 
++#: ../panels/region/input-options.ui.h:11
++msgid "Left+Right Alt"
++msgstr "ಎಡ+ಬಲ Alt"
++
+ #: ../panels/region/region.ui.h:2
+ msgid "English (United Kingdom)"
+ msgstr "ಇಂಗ್ಲೀಷ್ (ಯುನೈಟೆಡ್ ಕಿಂಗ್‌ಡಮ್)"
+@@ -4932,8 +4879,7 @@ msgid ""
+ "Control which applications show search results in the Activities Overview"
+ msgstr ""
+ "ಯಾವ ಅನ್ವಯಗಳು ಚಟುವಟಿಕೆಗಳ ಅವಲೋಕನದಲ್ಲಿ ಹುಡುಕು ಫಲಿತಾಂಶವನ್ನು ತೋರಿಸುತ್ತದೆ "
+-"ಎನ್ನುವುದನ್ನು "
+-"ನಿಯಂತ್ರಿಸಿ"
++"ಎನ್ನುವುದನ್ನು ನಿಯಂತ್ರಿಸಿ"
+ 
+ #. Translators: those are keywords for the search control-center panel
+ #: ../panels/search/gnome-search-panel.desktop.in.in.h:4
+@@ -4966,11 +4912,11 @@ msgctxt "service is disabled"
+ msgid "Off"
+ msgstr "ಆಫ್"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:407
++#: ../panels/sharing/cc-sharing-panel.c:410
+ msgid "Choose a Folder"
+ msgstr "ಒಂದು ಕಡತಕೋಶವನ್ನು ಆರಿಸು"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:585
++#: ../panels/sharing/cc-sharing-panel.c:602
+ msgid "Copy"
+ msgstr "ಪ್ರತಿಮಾಡು"
+ 
+@@ -4980,16 +4926,15 @@ msgstr "ಹಂಚಿಕೆ"
+ 
+ #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
+ msgid "Control what you want to share with others"
+-msgstr "ನೀವು ಬೇರೆಯವರೊಂದಿಗೆ ಏನನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಬಯಸುವಿರಿ ಎನ್ನುವುದನ್ನು ನಿಯಂತ್ರಿಸಿ"
++msgstr ""
++"ನೀವು ಬೇರೆಯವರೊಂದಿಗೆ ಏನನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಬಯಸುವಿರಿ ಎನ್ನುವುದನ್ನು ನಿಯಂತ್ರಿಸಿ"
+ 
+ #. Translators: those are keywords for the sharing control-center panel
+ #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4
+ msgid ""
+-"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;"
+-"pictures;photos;movies;server;renderer;"
++"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;pictures;photos;movies;server;renderer;"
+ msgstr ""
+-"ಹಂಚು;ಹಂಚಿಕೆ;ssh;ಆತಿಥೇಯ;ಹೆಸರು;ದೂರಸ್ಥ;ಗಣಕತೆರೆ;ಬ್ಲೂಟೂತ್;obex;ಮಾಧ್ಯಮ;ಆಡಿಯೊ;ವೀಡಿಯೊ;"
+-"ಚಿತ್ರಗಳು;ಫೋಟೊಗಳು;ಚಲನಚಿತ್ರಗಳು;ಪೂರೈಕೆಗಣಕ;ನಿರೂಪಕ;"
++"ಹಂಚು;ಹಂಚಿಕೆ;ssh;ಆತಿಥೇಯ;ಹೆಸರು;ದೂರಸ್ಥ;ಗಣಕತೆರೆ;ಬ್ಲೂಟೂತ್;obex;ಮಾಧ್ಯಮ;ಆಡಿಯೊ;ವೀಡಿಯೊ;ಚಿತ್ರಗಳು;ಫೋಟೊಗಳು;ಚಲನಚಿತ್ರಗಳು;ಪೂರೈಕೆಗಣಕ;ನಿರೂಪಕ;"
+ 
+ #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
+ msgid "Enable or disable remote login"
+@@ -5010,8 +4955,7 @@ msgid ""
+ "devices"
+ msgstr ""
+ "ಬ್ಲೂಟೂತ್ ಹಂಚಿಕೆಯು ಕಡತಗಳನ್ನು ಇತರೆ ಬ್ಲೂಟೂತ್ ಸಕ್ರಿಯಗೊಳಿಸಲಾದ ಸಾಧನಗಳೊಂದಿಗೆ "
+-"ಹಂಚಿಕೊಳ್ಳಲು "
+-"ಅನುವು ಮಾಡಿಕೊಡುತ್ತದೆ"
++"ಹಂಚಿಕೊಳ್ಳಲು ಅನುವು ಮಾಡಿಕೊಡುತ್ತದೆ"
+ 
+ #: ../panels/sharing/sharing.ui.h:3
+ msgid "Share Public Folder"
+@@ -5034,66 +4978,70 @@ msgid "Computer Name"
+ msgstr "ಗಣಕದ ಹೆಸರು"
+ 
+ #: ../panels/sharing/sharing.ui.h:8
+-msgid "Remote Login"
+-msgstr "ದೂರಸ್ಥ ಪ್ರವೇಶ"
++msgid "Personal File Sharing"
++msgstr "ವೈಯಕ್ತಿಕ ಕಡತ ವಿನಿಮಯ"
+ 
+ #: ../panels/sharing/sharing.ui.h:9
+-msgid "Some services are disabled because of no network access."
+-msgstr "ಯಾವುದೆ ಜಾಲಬಂಧ ಸೇವೆಯು ಇರದ ಕಾರಣ ಕೆಲವು ಸೇವೆಗಳು ನಿಷ್ಕ್ರಿಯವಾಗಿರುತ್ತವೆ."
++msgid "Screen Sharing"
++msgstr "ತೆರೆ ಹಂಚಿಕೆ"
+ 
+ #: ../panels/sharing/sharing.ui.h:10
+ msgid "Media Sharing"
+ msgstr "ಮಾಧ್ಯಮ ಹಂಚಿಕೊಳ್ಳುವಿಕೆ"
+ 
+ #: ../panels/sharing/sharing.ui.h:11
++msgid "Remote Login"
++msgstr "ದೂರಸ್ಥ ಪ್ರವೇಶ"
++
++#: ../panels/sharing/sharing.ui.h:12
++msgid "Some services are disabled because of no network access."
++msgstr "ಯಾವುದೆ ಜಾಲಬಂಧ ಸೇವೆಯು ಇರದ ಕಾರಣ ಕೆಲವು ಸೇವೆಗಳು ನಿಷ್ಕ್ರಿಯವಾಗಿರುತ್ತವೆ."
++
++#: ../panels/sharing/sharing.ui.h:13
+ msgid "Share Music, Photos and Videos with others on the current network."
+ msgstr ""
+ "ಪ್ರಸಕ್ತ ಜಾಲಬಂಧದಲ್ಲಿರುವ ಇತರರೊಂದಿಗೆ ಸಂಗೀತ, ಚಿತ್ರಗಳು ಮತ್ತು ವೀಡಿಯೊಗಳನ್ನು "
+ "ಹಂಚಿಕೊಳ್ಳಿ."
+ 
+-#: ../panels/sharing/sharing.ui.h:12
++#: ../panels/sharing/sharing.ui.h:14
+ msgid "Share Media On This Network"
+ msgstr "ಈ ಜಾಲಬಂಧದಲ್ಲಿ ಮಾಧ್ಯಮವನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"
+ 
+-#: ../panels/sharing/sharing.ui.h:13
++#: ../panels/sharing/sharing.ui.h:15
+ msgid "Shared Folders"
+ msgstr "ಹಂಚಲಾದ ಕಡತಕೋಶಗಳು"
+ 
+-#: ../panels/sharing/sharing.ui.h:14
++#: ../panels/sharing/sharing.ui.h:16
+ msgid "column"
+ msgstr "ಉದ್ದಸಾಲು"
+ 
+-#: ../panels/sharing/sharing.ui.h:15
++#: ../panels/sharing/sharing.ui.h:17
+ msgid "Add Folder"
+ msgstr "ಕಡತಕೋಶವನ್ನು ಸೇರಿಸು"
+ 
+-#: ../panels/sharing/sharing.ui.h:16
++#: ../panels/sharing/sharing.ui.h:18
+ msgid "Remove Folder"
+ msgstr "ಕಡತಕೋಶವನ್ನು ತೆಗೆದುಹಾಕು"
+ 
+-#: ../panels/sharing/sharing.ui.h:17
+-msgid "Personal File Sharing"
+-msgstr "ವೈಯಕ್ತಿಕ ಕಡತ ವಿನಿಮಯ"
+-
+-#: ../panels/sharing/sharing.ui.h:19
++#: ../panels/sharing/sharing.ui.h:20
+ #, no-c-format
+ msgid ""
+ "Personal File Sharing allows you to share your Public folder with others on "
+ "your current network using: <a href=\"dav://%s\">dav://%s</a>"
+ msgstr ""
+ "ವೈಯಕ್ತಿಕ ಕಡತ ಹಂಚಿಕೆಯನ್ನು ಬಳಸಿಕೊಂಡು ನೀವು ಸಾರ್ವಜನಿಕ ಕಡತಕೋಶವನ್ನು ನಿಮ್ಮ ಪ್ರಸಕ್ತ "
+-"ಜಾಲಬಂಧದಲ್ಲಿರುವವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಿರುತ್ತದೆ: <a href=\"dav://%s\">dav://"
+-"%s</a>"
++"ಜಾಲಬಂಧದಲ್ಲಿರುವವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಿರುತ್ತದೆ: <a href=\"dav://%s\">dav:/"
++"/%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:20
++#: ../panels/sharing/sharing.ui.h:21
+ msgid "Share Public Folder On This Network"
+ msgstr "ಸಾರ್ವಜನಿಕ ಕಡತಕೋಶವನ್ನು ಈ ಜಾಲಬಂಧದಲ್ಲಿ ಹಂಚಿಕೊಳ್ಳಿ"
+ 
+-#: ../panels/sharing/sharing.ui.h:21
++#: ../panels/sharing/sharing.ui.h:22
+ msgid "Require Password"
+ msgstr "ಗುಪ್ತಪದದ ಅಗತ್ಯವಿದೆ"
+ 
+-#: ../panels/sharing/sharing.ui.h:24
++#: ../panels/sharing/sharing.ui.h:25
+ #, no-c-format
+ msgid ""
+ "Allow remote users to connect using the Secure Shell command:\n"
+@@ -5102,10 +5050,6 @@ msgstr ""
+ "ಈ ಸೆಕ್ಯೂರ್ ಶೆಲ್ ಆದೇಶವನ್ನು ಬಳಸಿಕೊಂಡು ದೂರಸ್ಥ ಬಳಕೆದಾರರು ಸಂಪರ್ಕಸಾಧಿಸಲು ಅನುಮತಿಸಿ:\n"
+ "<a href=\"ssh %s\">ssh %s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:26
+-msgid "Screen Sharing"
+-msgstr "ತೆರೆ ಹಂಚಿಕೆ"
+-
+ #: ../panels/sharing/sharing.ui.h:28
+ #, no-c-format
+ msgid ""
+@@ -5222,8 +5166,8 @@ msgctxt "volume"
+ msgid "Unamplified"
+ msgstr "ವರ್ಧಿಸದ"
+ 
+-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:260
+-#: ../panels/sound/gvc-mixer-dialog.c:526
++#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:261
++#: ../panels/sound/gvc-mixer-dialog.c:527
+ msgid "_Profile:"
+ msgstr "ಪ್ರೊಫೈಲ್ (_P):"
+ 
+@@ -5249,73 +5193,73 @@ msgstr[1] "%u ಇನ್‌ಪುಟ್‌ಗಳು"
+ msgid "System Sounds"
+ msgstr "ವ್ಯವಸ್ಥೆಯ ಧ್ವನಿಗಳು"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:262
++#: ../panels/sound/gvc-mixer-dialog.c:263
+ msgid "_Test Speakers"
+ msgstr "ಸ್ಪೀಕರುಗಳನ್ನು ಪರೀಕ್ಷಿಸು (_T)"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:431
++#: ../panels/sound/gvc-mixer-dialog.c:432
+ msgid "Peak detect"
+ msgstr "ಉತ್ತುಂಗದ ಪತ್ತೆ"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1508
++#: ../panels/sound/gvc-mixer-dialog.c:1510
+ #: ../panels/sound/gvc-sound-theme-chooser.c:595
+ msgid "Name"
+ msgstr "ಹೆಸರು"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1527
++#: ../panels/sound/gvc-mixer-dialog.c:1529
+ msgid "Device"
+ msgstr "ಸಾಧನ"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1590
++#: ../panels/sound/gvc-mixer-dialog.c:1592
+ #, c-format
+ msgid "Speaker Testing for %s"
+ msgstr "%s ಗಾಗಿನ ಸ್ಪೀಕರುಗಳ ಪರೀಕ್ಷೆ"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1644
++#: ../panels/sound/gvc-mixer-dialog.c:1649
+ msgid "_Output volume:"
+ msgstr "ಔಟ್‌ಪುಟ್ ಧ್ವನಿ ಪ್ರಮಾಣ (_O):"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1658
++#: ../panels/sound/gvc-mixer-dialog.c:1663
+ msgid "Output"
+ msgstr "ಔಟ್‌ಪುಟ್"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1663
++#: ../panels/sound/gvc-mixer-dialog.c:1668
+ msgid "C_hoose a device for sound output:"
+ msgstr "ಧ್ವನಿಯ ಇನ್‌ಪುಟ್‌ಗಾಗಿ ಒಂದು ಸಾಧನವನ್ನು ಆರಿಸಿ (_h):"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1688
++#: ../panels/sound/gvc-mixer-dialog.c:1693
+ msgid "Settings for the selected device:"
+ msgstr "ಆಯ್ಕೆ ಮಾಡಿದ ಸಾಧನದ ಸಿದ್ಧತೆಗಳು:"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1699
++#: ../panels/sound/gvc-mixer-dialog.c:1704
+ msgid "Input"
+ msgstr "ಇನ್‌ಪುಟ್"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1706
++#: ../panels/sound/gvc-mixer-dialog.c:1711
+ msgid "_Input volume:"
+ msgstr "ಇನ್‌ಪುಟ್‌ ಧ್ವನಿ ಪ್ರಮಾಣ (_I):"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1729
++#: ../panels/sound/gvc-mixer-dialog.c:1734
+ msgid "Input level:"
+ msgstr "ಇನ್‌ಪುಟ್‌ ಹಂತ:"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1757
++#: ../panels/sound/gvc-mixer-dialog.c:1762
+ msgid "C_hoose a device for sound input:"
+ msgstr "ಧ್ವನಿಯ ಔಟ್‌ಪುಟ್‌ಗಾಗಿ ಒಂದು ಸಾಧನವನ್ನು ಆರಿಸಿ (_h):"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1784
++#: ../panels/sound/gvc-mixer-dialog.c:1789
+ msgid "Sound Effects"
+ msgstr "ಧ್ವನಿ ಪರಿಣಾಮಗಳು"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1791
++#: ../panels/sound/gvc-mixer-dialog.c:1796
+ msgid "_Alert volume:"
+ msgstr "ಎಚ್ಚರಿಕೆ ಧ್ವನಿ ಪ್ರಮಾಣ (_A):"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1804
++#: ../panels/sound/gvc-mixer-dialog.c:1809
+ msgid "Applications"
+ msgstr "ಅನ್ವಯಗಳು"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1808
++#: ../panels/sound/gvc-mixer-dialog.c:1813
+ msgid "No application is currently playing or recording audio."
+ msgstr "ಯಾವುದೆ ಅನ್ವಯವು ಪ್ರಸ್ತುತ ಧ್ವನಿಯನ್ನು ಚಲಾಯಿಸುತ್ತಿಲ್ಲ."
+ 
+@@ -5376,11 +5320,12 @@ msgstr "ನೋಡಲು, ಕೇಳಲು, ಬರೆಯಲು, ತೋರಿಸಲ
+ #. Translators: those are keywords for the universal access control-center panel
+ #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
+ msgid ""
+-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
+-"AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
++"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen "
++"Reader;text;font;size;AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
+ msgstr ""
+-"ಕೀಲಿಮಣೆ;ಮೌಸ್;a11y;ನಿಲುಕು;ವೈದ್ರಶ್ಯ;ಗಾತ್ರಬದಲಾವಣೆ;ತೆರೆ ಓದುಗ;ಪಠ್ಯ;ಅಕ್ಷರಶೈಲಿ;ಗಾತ್ರ;"
+-"AccessX;ಅಂಟು ಕೀಲಿಗಳು;ನಿಧಾನಗತಿಯ ಕೀಲಿಗಳು;ಪುಟಿಯುವ ಕೀಲಿಗಳು;ಮೌಸ್‌ ಕೀಲಿಗಳು;"
++"ಕೀಲಿಮಣೆ;ಮೌಸ್;a11y;ನಿಲುಕು;ವೈದ್ರಶ್ಯ;ಗಾತ್ರಬದಲಾವಣೆ;ತೆರೆ "
++"ಓದುಗ;ಪಠ್ಯ;ಅಕ್ಷರಶೈಲಿ;ಗಾತ್ರ;AccessX;ಅಂಟು ಕೀಲಿಗಳು;ನಿಧಾನಗತಿಯ ಕೀಲಿಗಳು;ಪುಟಿಯುವ "
++"ಕೀಲಿಗಳು;ಮೌಸ್‌ ಕೀಲಿಗಳು;"
+ 
+ #: ../panels/universal-access/uap.ui.h:1
+ #: ../panels/universal-access/zoom-options.ui.h:35
+@@ -5553,8 +5498,7 @@ msgstr "ನಿಧಾನಗತಿಯ ಕೀಲಿಗಳು"
+ msgid "Puts a delay between when a key is pressed and when it is accepted"
+ msgstr ""
+ "ಕೀಲಿಯನ್ನು ಯಾವಾಗ ಒತ್ತಲಾಗುತ್ತದೆ ಮತ್ತು ಯಾವಾಗ ಅಂಗೀಕರಿಸಲ್ಪಡುತ್ತದೆ ಎನ್ನುವುದರ ನಡುವೆ "
+-"ಒಂದು "
+-"ವಿಳಂಬವನ್ನು ಸೇರಿಸುತ್ತದೆ"
++"ಒಂದು ವಿಳಂಬವನ್ನು ಸೇರಿಸುತ್ತದೆ"
+ 
+ #: ../panels/universal-access/uap.ui.h:47
+ msgid "A_cceptance delay:"
+@@ -5982,8 +5926,7 @@ msgid ""
+ "using your fingerprint reader."
+ msgstr ""
+ "ನಿಮ್ಮ ಬೆರಳಗುರುತನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಉಳಿಸಲಾಗಿದೆ. ಈಗ ನೀವು ನಿಮ್ಮ ಬೆರಳಗುರುತಿನ "
+-"ಓದುಗನನ್ನು "
+-"ಬಳಸಿಕೊಂಡು ಪ್ರವೇಶಿಸಬಹುದಾಗಿದೆ."
++"ಓದುಗನನ್ನು ಬಳಸಿಕೊಂಡು ಪ್ರವೇಶಿಸಬಹುದಾಗಿದೆ."
+ 
+ #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1
+ msgid "Users"
+@@ -6145,7 +6088,7 @@ msgid "Authentication is required to change user data"
+ msgstr "ಬಳಕೆದಾರರ ಮಾಹಿತಿಯನ್ನು ಬದಲಾಯಿಸಲು ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ"
+ 
+ #: ../panels/user-accounts/pw-utils.c:94
+-#: ../panels/user-accounts/um-password-dialog.c:597
++#: ../panels/user-accounts/um-password-dialog.c:613
+ msgctxt "Password strength"
+ msgid "Too short"
+ msgstr "ಬಹಳ ಚಿಕ್ಕದಾಗಿದೆ"
+@@ -6156,25 +6099,25 @@ msgid "Not good enough"
+ msgstr "ಸಾಕಷ್ಟು ಉತ್ತಮವಾಗಿಲ್ಲ"
+ 
+ #: ../panels/user-accounts/pw-utils.c:108
+-#: ../panels/user-accounts/um-password-dialog.c:598
++#: ../panels/user-accounts/um-password-dialog.c:614
+ msgctxt "Password strength"
+ msgid "Weak"
+ msgstr "ದುರ್ಬಲ"
+ 
+ #: ../panels/user-accounts/pw-utils.c:111
+-#: ../panels/user-accounts/um-password-dialog.c:599
++#: ../panels/user-accounts/um-password-dialog.c:615
+ msgctxt "Password strength"
+ msgid "Fair"
+ msgstr "ಪರವಾಗಿಲ್ಲ"
+ 
+ #: ../panels/user-accounts/pw-utils.c:114
+-#: ../panels/user-accounts/um-password-dialog.c:600
++#: ../panels/user-accounts/um-password-dialog.c:616
+ msgctxt "Password strength"
+ msgid "Good"
+ msgstr "ಉತ್ತಮ"
+ 
+ #: ../panels/user-accounts/pw-utils.c:117
+-#: ../panels/user-accounts/um-password-dialog.c:601
++#: ../panels/user-accounts/um-password-dialog.c:617
+ msgctxt "Password strength"
+ msgid "Strong"
+ msgstr "ಸದೃಢ"
+@@ -6228,24 +6171,24 @@ msgstr "ಹೊಸ ಗುಪ್ತಪದವು ಸಾಕಷ್ಟು ವಿಭಿ
+ msgid "Unknown error"
+ msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ"
+ 
+-#: ../panels/user-accounts/um-account-dialog.c:186
++#: ../panels/user-accounts/um-account-dialog.c:194
+ msgid "Failed to add account"
+ msgstr "ಖಾತೆಯನ್ನು ಸೇರಿಸಲು ವಿಫಲಗೊಂಡಿದೆ"
+ 
+-#: ../panels/user-accounts/um-account-dialog.c:407
+-#: ../panels/user-accounts/um-account-dialog.c:448
++#: ../panels/user-accounts/um-account-dialog.c:431
++#: ../panels/user-accounts/um-account-dialog.c:477
+ msgid "Failed to register account"
+ msgstr "ಖಾತೆಯನ್ನು ನೋಂದಾಯಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
+ 
+-#: ../panels/user-accounts/um-account-dialog.c:581
++#: ../panels/user-accounts/um-account-dialog.c:615
+ msgid "No supported way to authenticate with this domain"
+ msgstr "ಈ ಡೊಮೈನ್‌ನೊಂದಿಗೆ ದೃಢೀಕರಿಸಲು ಯಾವುದೆ ಮಾರ್ಗವಿಲ್ಲ"
+ 
+-#: ../panels/user-accounts/um-account-dialog.c:635
++#: ../panels/user-accounts/um-account-dialog.c:674
+ msgid "Failed to join domain"
+ msgstr "ಡೊಮೈನ್ ಅನ್ನು ಸೇರುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
+ 
+-#: ../panels/user-accounts/um-account-dialog.c:703
++#: ../panels/user-accounts/um-account-dialog.c:747
+ msgid "Failed to log into domain"
+ msgstr "ಡೊಮೈನ್ ಅನ್ನು ಪ್ರವೇಶಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
+ 
+@@ -6318,7 +6261,7 @@ msgstr "ನೆರವಿಗಾಗಿ ನಿಮ್ಮ ಗಣಕ ವ್ಯವಸ್
+ #. * The variable is the name of the device, for example:
+ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
+ #. * 'Digital Persona U.are.U 4000/4000B' device."
+-#.
++#. 
+ #: ../panels/user-accounts/um-fingerprint-dialog.c:734
+ #, c-format
+ msgid ""
+@@ -6360,35 +6303,35 @@ msgstr "ದಯವಿಟ್ಟು ನಿಮ್ಮ ಈಗಿನ ಗುಪ್ತಪ
+ msgid "Password could not be changed"
+ msgstr "ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸಲಾಗಿಲ್ಲ."
+ 
+-#: ../panels/user-accounts/um-password-dialog.c:301
++#: ../panels/user-accounts/um-password-dialog.c:304
+ msgid "You need to enter a new password"
+ msgstr "ನೀವು ಒಂದು ಹೊಸ ಗುಪ್ತಪದವನ್ನು ನಮೂದಿಸಿಬೇಕು"
+ 
+-#: ../panels/user-accounts/um-password-dialog.c:304
++#: ../panels/user-accounts/um-password-dialog.c:307
+ msgid "The new password is not strong enough"
+ msgstr "ಹೊಸ ಗುಪ್ತಪದವು ಸಾಕಷ್ಟು ದೃಢವಾಗಿದೆ"
+ 
+-#: ../panels/user-accounts/um-password-dialog.c:310
++#: ../panels/user-accounts/um-password-dialog.c:313
+ msgid "You need to confirm the password"
+ msgstr "ನೀವು ಒಂದು ಗುಪ್ತಪದವನ್ನು ಖಚಿತಪಡಿಸಬೇಕು"
+ 
+-#: ../panels/user-accounts/um-password-dialog.c:313
++#: ../panels/user-accounts/um-password-dialog.c:316
+ msgid "The passwords do not match"
+ msgstr "ಗುಪ್ತಪದಗಳು ಒಂದೇ ಸಮವಾಗಿಲ್ಲ"
+ 
+-#: ../panels/user-accounts/um-password-dialog.c:319
++#: ../panels/user-accounts/um-password-dialog.c:322
+ msgid "You need to enter your current password"
+ msgstr "ನಿಮ್ಮ ಈಗಿನ ಗುಪ್ತಪದವನ್ನು ನಮೂದಿಸಿಬೇಕು"
+ 
+-#: ../panels/user-accounts/um-password-dialog.c:322
++#: ../panels/user-accounts/um-password-dialog.c:325
+ msgid "The current password is not correct"
+ msgstr "ನಿಮ್ಮ ಈಗಿನ ಗುಪ್ತಪದವು ಸರಿಯಾಗಿಲ್ಲ"
+ 
+-#: ../panels/user-accounts/um-password-dialog.c:385
++#: ../panels/user-accounts/um-password-dialog.c:388
+ msgid "Passwords do not match"
+ msgstr "ಗುಪ್ತಪದಗಳು ಒಂದೇ ಸಮವಾಗಿಲ್ಲ"
+ 
+-#: ../panels/user-accounts/um-password-dialog.c:439
++#: ../panels/user-accounts/um-password-dialog.c:450
+ msgid "Wrong password"
+ msgstr "ಗುಪ್ತಪದ ತಪ್ಪಾಗಿದೆ"
+ 
+@@ -6433,34 +6376,37 @@ msgstr "ಗುಪ್ತಪದ ತಪ್ಪಾಗಿದೆ; ಇನ್ನೊಮ್
+ msgid "Couldn't connect to the %s domain: %s"
+ msgstr "%s ಡೊಮೈನ್‌ಗೆ ಸಂಪರ್ಕಿತಗೊಳಿಸಲಾಗಿಲ್ಲ: %s"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:376
++#: ../panels/user-accounts/um-user-panel.c:193
++msgid "Other Accounts"
++msgstr "ಇತರೆ ಖಾತೆಗಳು"
++
++#: ../panels/user-accounts/um-user-panel.c:412
+ msgid "Failed to delete user"
+ msgstr "ಬಳಕೆದಾರನನ್ನು ಅಳಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:436
++#: ../panels/user-accounts/um-user-panel.c:477
+ msgid "You cannot delete your own account."
+ msgstr "ನೀವು ನಿಮ್ಮದೆ ಖಾತೆಯನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:445
++#: ../panels/user-accounts/um-user-panel.c:486
+ #, c-format
+ msgid "%s is still logged in"
+ msgstr "%s ಇನ್ನೂ ಸಹ ಒಳಗಿದ್ದಾರೆ"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:449
++#: ../panels/user-accounts/um-user-panel.c:490
+ msgid ""
+ "Deleting a user while they are logged in can leave the system in an "
+ "inconsistent state."
+ msgstr ""
+ "ಬಳಕೆದಾರರು ಒಳಗೆ ಪ್ರವೇಶಿಸಿದಾಗ ಅವರನ್ನು ಅಳಿಸುವುದರಿಂದ ವ್ಯವಸ್ಥೆಯು ಒಂದು ಅಸ್ಥಿರ "
+-"ಸ್ಥಿತಿಯಲ್ಲಿ "
+-"ಇರಿಸುತ್ತದೆ."
++"ಸ್ಥಿತಿಯಲ್ಲಿ ಇರಿಸುತ್ತದೆ."
+ 
+-#: ../panels/user-accounts/um-user-panel.c:458
++#: ../panels/user-accounts/um-user-panel.c:499
+ #, c-format
+ msgid "Do you want to keep %s's files?"
+ msgstr "ನೀವು %s ರವರ ಕಡತಗಳನ್ನು ಇರಿಸಿಕೊಳ್ಳಲು ಬಯಸುವಿರಾ?"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:462
++#: ../panels/user-accounts/um-user-panel.c:503
+ msgid ""
+ "It is possible to keep the home directory, mail spool and temporary files "
+ "around when deleting a user account."
+@@ -6468,100 +6414,90 @@ msgstr ""
+ "ಬಳಕೆದಾರರ ಖಾತೆಯನ್ನು ಅಳಿಸುವಾಗ ನೆಲೆ ಕೋಶವನ್ನು, ಅಂಚೆ ಸ್ಪೂಲ್ ಅನ್ನು ಮತ್ತು ತಾತ್ಕಾಲಿಕ "
+ "ಕಡತಗಳನ್ನು ಹಾಗೆಯೆ ಇರಿಸಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಿರುತ್ತದೆ."
+ 
+-#: ../panels/user-accounts/um-user-panel.c:465
++#: ../panels/user-accounts/um-user-panel.c:506
+ msgid "_Delete Files"
+ msgstr "ಕಡತಗಳನ್ನು ಅಳಿಸು (_D)"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:466
++#: ../panels/user-accounts/um-user-panel.c:507
+ msgid "_Keep Files"
+ msgstr "ಕಡತಗಳನ್ನು ಇರಿಸಿಕೊ (_K)"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:518
++#: ../panels/user-accounts/um-user-panel.c:559
+ msgctxt "Password mode"
+ msgid "Account disabled"
+ msgstr "ಖಾತೆಯನ್ನು ಅಶಕ್ತಗೊಳಿಸಲಾಗಿದೆ"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:526
++#: ../panels/user-accounts/um-user-panel.c:567
+ msgctxt "Password mode"
+ msgid "To be set at next login"
+ msgstr "ಮುಂದಿನ ಬಾರಿ ಪ್ರವೇಶಿಸಿದಾಗ ಹೊಂದಿಸಲಾಗುತ್ತದೆ"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:529
++#: ../panels/user-accounts/um-user-panel.c:570
+ msgctxt "Password mode"
+ msgid "None"
+ msgstr "ಯಾವುದೂ ಇಲ್ಲ"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:578
++#: ../panels/user-accounts/um-user-panel.c:619
+ msgid "Logged in"
+ msgstr "ಪ್ರವೇಶಿಸಲಾಗಿದೆ"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:942
++#: ../panels/user-accounts/um-user-panel.c:995
+ msgid "Failed to contact the accounts service"
+ msgstr "ಖಾತೆಗಳ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಲು ವಿಫಲಗೊಂಡಿದೆ"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:944
++#: ../panels/user-accounts/um-user-panel.c:997
+ msgid "Please make sure that the AccountService is installed and enabled."
+ msgstr ""
+ "AccountService ಅನ್ನು ಅನುಸ್ಥಾಪಿಸಲಾಗಿದೆಯೆ ಮತ್ತು ಸಕ್ರಿಯಗೊಂಡಿದೆಯೆ ಎಂದು "
+ "ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."
+ 
+-#: ../panels/user-accounts/um-user-panel.c:985
+-msgid ""
+-"To make changes,\n"
++#: ../panels/user-accounts/um-user-panel.c:1038
++msgid "To make changes,\n"
+ "click the * icon first"
+-msgstr ""
+-"ಬದಲಾವಣೆಗಳನ್ನು ಮಾಡಲು,\n"
++msgstr "ಬದಲಾವಣೆಗಳನ್ನು ಮಾಡಲು,\n"
+ "* ಚಿಹ್ನೆಯ ಮೇಲೆ ಮೊದಲು ಕ್ಲಿಕ್ ಮಾಡಿ"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:1023
++#: ../panels/user-accounts/um-user-panel.c:1076
+ msgid "Create a user account"
+ msgstr "ಬಳಕೆದಾರನನ್ನು ರಚಿಸು"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:1034
+-#: ../panels/user-accounts/um-user-panel.c:1320
+-msgid ""
+-"To create a user account,\n"
++#: ../panels/user-accounts/um-user-panel.c:1087
++#: ../panels/user-accounts/um-user-panel.c:1377
++msgid "To create a user account,\n"
+ "click the * icon first"
+-msgstr ""
+-"ಬಳಕೆದಾರ ಖಾತೆಯನ್ನು ರಚಿಸಲು,\n"
++msgstr "ಬಳಕೆದಾರ ಖಾತೆಯನ್ನು ರಚಿಸಲು,\n"
+ "ಮೊದಲು * ಚಿಹ್ನೆಯ ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:1043
++#: ../panels/user-accounts/um-user-panel.c:1097
+ msgid "Delete the selected user account"
+ msgstr "ಆಯ್ದ ಬಳಕೆದಾರ ಖಾತೆಯನ್ನು ಅಳಿಸಿ"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:1055
+-#: ../panels/user-accounts/um-user-panel.c:1325
+-msgid ""
+-"To delete the selected user account,\n"
++#: ../panels/user-accounts/um-user-panel.c:1109
++#: ../panels/user-accounts/um-user-panel.c:1382
++msgid "To delete the selected user account,\n"
+ "click the * icon first"
+-msgstr ""
+-"ಆಯ್ದ ಬಳಕೆದಾರ ಖಾತೆಯನ್ನು ಅಳಿಸಲು,\n"
++msgstr "ಆಯ್ದ ಬಳಕೆದಾರ ಖಾತೆಯನ್ನು ಅಳಿಸಲು,\n"
+ "ಮೊದಲು * ಚಿಹ್ನೆಯ ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:1229
++#: ../panels/user-accounts/um-user-panel.c:1292
+ msgid "My Account"
+ msgstr "ನನ್ನ ಖಾತೆ"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:1238
+-msgid "Other Accounts"
+-msgstr "ಇತರೆ ಖಾತೆಗಳು"
+-
+-#: ../panels/user-accounts/um-utils.c:516
++#: ../panels/user-accounts/um-utils.c:535
+ #, c-format
+ msgid "A user with the username '%s' already exists"
+ msgstr "'%s' ಎಂಬ ಹೆಸರಿನ ಒಬ್ಬ ಬಳಕೆದಾರ ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದಾರೆ"
+ 
+-#: ../panels/user-accounts/um-utils.c:520
++#: ../panels/user-accounts/um-utils.c:539
+ #, c-format
+ msgid "The username is too long"
+ msgstr "ಬಳಕೆದಾರ ಹೆಸರು ಬಹಳ ದೊಡ್ಡದಾಗಿದೆ"
+ 
+-#: ../panels/user-accounts/um-utils.c:523
++#: ../panels/user-accounts/um-utils.c:542
+ msgid "The username cannot start with a '-'"
+ msgstr "ಬಳಕೆದಾರ ಹೆಸರು '-' ಇಂದ ಆರಂಭಗೊಳ್ಳುವಂತಿಲ್ಲ"
+ 
+-#: ../panels/user-accounts/um-utils.c:526
++#: ../panels/user-accounts/um-utils.c:545
+ msgid ""
+ "The username must only consist of:\n"
+ " ➣ letters from the English alphabet\n"
+@@ -6587,8 +6523,7 @@ msgid ""
+ "tablet."
+ msgstr ""
+ "ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಕ್ಯಾಲಿಬ್ರೇಟ್ ಮಾಡಲು ತೆರೆಯ ಮೇಲೆ ಗುರಿಯ ಗುರುತುಗಳು ಕಾಣಿಸಿಕೊಂಡಾಗ "
+-"ಅವುಗಳ "
+-"ಮೇಲೆ ಮೆಲ್ಲಗೆ ತಟ್ಟಿ."
++"ಅವುಗಳ ಮೇಲೆ ಮೆಲ್ಲಗೆ ತಟ್ಟಿ."
+ 
+ #: ../panels/wacom/calibrator/gui_gtk.c:368
+ msgid "Mis-click detected, restarting..."
+@@ -6907,7 +6842,7 @@ msgstr "[PANEL] [ARGUMENT…]"
+ msgid "- Settings"
+ msgstr "- ಸಿದ್ಧತೆಗಳು"
+ 
+-#: ../shell/cc-application.c:123
++#: ../shell/cc-application.c:132
+ #, c-format
+ msgid ""
+ "%s\n"
+@@ -6916,15 +6851,15 @@ msgstr ""
+ "%s\n"
+ "ಲಭ್ಯವಿರುವ ಎಲ್ಲಾ ಆಜ್ಞಾ ಸಾಲಿನ ಆಯ್ಕೆಗಳನ್ನು ನೋಡಲು '%s --help' ಅನ್ನು ಚಲಾಯಿಸಿ.\n"
+ 
+-#: ../shell/cc-application.c:153
++#: ../shell/cc-application.c:162
+ msgid "Available panels:"
+ msgstr "ಲಭ್ಯವಿರುವ ಪ್ಯಾನಲ್‌ಗಳು:"
+ 
+-#: ../shell/cc-application.c:270
++#: ../shell/cc-application.c:279
+ msgid "Help"
+ msgstr "ನೆರವು"
+ 
+-#: ../shell/cc-application.c:271
++#: ../shell/cc-application.c:280
+ msgid "Quit"
+ msgstr "ನಿರ್ಗಮಿಸು"
+ 
+@@ -6933,2661 +6868,25 @@ msgid "Settings"
+ msgstr "ಸಿದ್ಧತೆಗಳು"
+ 
+ #. Add categories
+-#: ../shell/cc-window.c:858
++#: ../shell/cc-window.c:861
+ msgctxt "category"
+ msgid "Personal"
+ msgstr "ವೈಯಕ್ತಿಕ"
+ 
+-#: ../shell/cc-window.c:859
++#: ../shell/cc-window.c:862
+ msgctxt "category"
+ msgid "Hardware"
+ msgstr "ಯಂತ್ರಾಂಶ"
+ 
+-#: ../shell/cc-window.c:860
++#: ../shell/cc-window.c:863
+ msgctxt "category"
+ msgid "System"
+ msgstr "ವ್ಯವಸ್ಥೆ"
+ 
+-#: ../shell/cc-window.c:1411
++#: ../shell/cc-window.c:1436
+ msgid "All Settings"
+ msgstr "ಎಲ್ಲಾ ಸಿದ್ಧತೆಗಳು"
+ 
+ #: ../shell/gnome-control-center.desktop.in.in.h:2
+ msgid "Preferences;Settings;"
+ msgstr "ಆದ್ಯತೆಗಳು;ಸಿದ್ಧತೆಗಳು;"
+-
+-#~ msgid "blablabla"
+-#~ msgstr "blablabla"
+-
+-#~ msgid ""
+-#~ "Address\n"
+-#~ "section\n"
+-#~ "goes\n"
+-#~ "here"
+-#~ msgstr ""
+-#~ "ವಿಳಾಸದ\n"
+-#~ "ಭಾಗವನ್ನು\n"
+-#~ "ಇಲ್ಲಿ\n"
+-#~ "ಬರೆಯಬೇಕು"
+-
+-#~ msgid ""
+-#~ "DNS\n"
+-#~ "section\n"
+-#~ "goes\n"
+-#~ "here"
+-#~ msgstr ""
+-#~ "DNS\n"
+-#~ "ಭಾಗವನ್ನು\n"
+-#~ "ಇಲ್ಲಿ\n"
+-#~ "ಬರೆಯಬೇಕು"
+-
+-#~ msgid ""
+-#~ "Routes\n"
+-#~ "section\n"
+-#~ "goes\n"
+-#~ "here"
+-#~ msgstr ""
+-#~ "ರೌಟ್‌ಗಳ\n"
+-#~ "ಭಾಗವನ್ನು\n"
+-#~ "ಇಲ್ಲಿ\n"
+-#~ "ಬರೆಯಬೇಕು"
+-
+-#~ msgid "00:24:16:31:8G:7A"
+-#~ msgstr "00:24:16:31:8G:7A"
+-
+-#~ msgid "LCD (CCFL backlight)"
+-#~ msgstr "LCD (CCFL ಬ್ಯಾಕ್‌ಲೈಟ್)"
+-
+-#~ msgid "LCD (RGB LED backlight)"
+-#~ msgstr "LCD (RGB LED ಬ್ಯಾಕ್‌ಲೈಟ್)"
+-
+-#~ msgid "LCD (white LED backlight)"
+-#~ msgstr "LCD (ವೈಟ್ LED ಬ್ಯಾಕ್‌ಲೈಟ್)"
+-
+-#~ msgid "Wide gamut LCD (CCFL backlight)"
+-#~ msgstr "ಅಗಲ ಗ್ಯಾಮುಟ್ LCD (CCFL ಬ್ಯಾಕ್‌ಲೈಟ್)"
+-
+-#~ msgid "Wide gamut LCD (RGB LED backlight)"
+-#~ msgstr "ಅಗಲ ಗ್ಯಾಮುಟ್ LCD (RGB LED ಬ್ಯಾಕ್‌ಲೈಟ್)"
+-
+-#~ msgid "Firewall _Zone"
+-#~ msgstr "ತಡೆಗೋಡೆ (ಫೈರ್ವಾಲ್) ವಲಯ (_Z)"
+-
+-#~ msgctxt "Firewall zone"
+-#~ msgid "Default"
+-#~ msgstr "ಪೂರ್ವನಿಯೋಜಿತ"
+-
+-#~ msgid "The zone defines the trust level of the connection"
+-#~ msgstr "ಸಂಪರ್ಕದ ನಂಬಿಕೆಯ ಮಟ್ಟವನ್ನು ಸೂಚಿಸುವ ವಲಯ"
+-
+-#~ msgid "Change the background"
+-#~ msgstr "ಹಿನ್ನಲೆ ಚಿತ್ರವನ್ನು ಬದಲಾಯಿಸಿ"
+-
+-#~ msgid "Configure Bluetooth settings"
+-#~ msgstr "ಬ್ಲೂಟೂತ್ ಸಿದ್ಧತೆಗಳನ್ನು ಸಂರಚಿಸು"
+-
+-#~ msgid "Browse Files..."
+-#~ msgstr "ಕಡತಗಳಿಗಾಗಿ ನೋಡು..."
+-
+-#~ msgctxt "Power"
+-#~ msgid "Bluetooth"
+-#~ msgstr "ಬ್ಲೂಟೂತ್"
+-
+-#~ msgid "Create virtual device"
+-#~ msgstr "ವರ್ಚುವಲ್ ಸಾಧನವೊಂದನ್ನು ರಚಿಸು"
+-
+-#~ msgid "Available Profiles for Displays"
+-#~ msgstr "ಪ್ರದರ್ಶಕಗಳಿಗಾಗಿ ಲಭ್ಯವಿರುವ ಪ್ರೊಫೈಲುಗಳು"
+-
+-#~ msgid "Available Profiles for Scanners"
+-#~ msgstr "ಸ್ಕ್ಯಾನ್‌ಗಳಿಗಾಗಿ ಲಭ್ಯವಿರುವ ಪ್ರೊಫೈಲುಗಳು"
+-
+-#~ msgid "Available Profiles for Printers"
+-#~ msgstr "ಮುದ್ರಕಗಳಿಗಾಗಿ ಲಭ್ಯವಿರುವ ಪ್ರೊಫೈಲುಗಳು"
+-
+-#~ msgid "Available Profiles for Cameras"
+-#~ msgstr "ಕ್ಯಾಮೆರಾಗಳಿಗಾಗಿ ಲಭ್ಯವಿರುವ ಪ್ರೊಫೈಲುಗಳು"
+-
+-#~ msgid "Available Profiles for Webcams"
+-#~ msgstr "ವೆಬ್‌ಕ್ಯಾಮ್‌ಗಳಿಗಾಗಿ ಲಭ್ಯವಿರುವ ಪ್ರೊಫೈಲುಗಳು"
+-
+-#~ msgid "%i year"
+-#~ msgid_plural "%i years"
+-#~ msgstr[0] "%i ವರ್ಷ"
+-#~ msgstr[1] "%i ವರ್ಷಗಳು"
+-
+-#~ msgid "%i month"
+-#~ msgid_plural "%i months"
+-#~ msgstr[0] "%i ತಿಂಗಳು"
+-#~ msgstr[1] "%i ತಿಂಗಳುಗಳು"
+-
+-#~ msgid "%i week"
+-#~ msgid_plural "%i weeks"
+-#~ msgstr[0] "%i ವಾರ"
+-#~ msgstr[1] "%i ವಾರಗಳು"
+-
+-#~ msgid "Less than 1 week"
+-#~ msgstr "1 ವಾರಕ್ಕಿಂತ ಕಡಿಮೆ"
+-
+-#~ msgid "This device is not color managed."
+-#~ msgstr "ಸಾಧನದ ವರ್ಣವನ್ನು ನಿರ್ವಹಿಸಲಾಗಿಲ್ಲ."
+-
+-#~ msgid "This device is using manufacturing calibrated data."
+-#~ msgstr "ಸಾಧನವು ತಯಾರಕರಿಂದ ಕ್ಯಾಲಿಬ್ರೇಟ್ ಮಾಹಿತಿಯನ್ನು ಬಳಸುತ್ತಿದೆ."
+-
+-#~ msgid ""
+-#~ "This device does not have a profile suitable for whole-screen color "
+-#~ "correction."
+-#~ msgstr "ಸಾಧನವು ಸಂಪೂರ್ಣ-ತೆರೆಯ ಬಣ್ಣವನ್ನು ಸರಿಪಡಿಸಲು ಸೂಕ್ತವಾದ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಹೊಂದಿಲ್ಲ."
+-
+-#~ msgid "Not specified"
+-#~ msgstr "ಸೂಚಿಸದೆ ಇರುವ"
+-
+-#~ msgid "No devices supporting color management detected"
+-#~ msgstr "ವರ್ಣ ವ್ಯವಸ್ಥಾಪಯನ್ನು ಬೆಂಬಲಿಸುವ ಯಾವುದೆ ಸಾಧನಗಳು ಕಂಡುಬಂದಿಲ್ಲ"
+-
+-#~ msgid "Add device"
+-#~ msgstr "ಸಾಧನವನ್ನು ಸೇರಿಸು"
+-
+-#~ msgid "Add a virtual device"
+-#~ msgstr "ವರ್ಚುವಲ್ ಸಾಧನವೊಂದನ್ನು ಸೇರಿಸು"
+-
+-#~ msgid "Remove a device"
+-#~ msgstr "ಸಾಧನವನ್ನು ತೆಗೆದು ಹಾಕು"
+-
+-#~ msgid "Color management settings"
+-#~ msgstr "ಬಣ್ಣ ನಿರ್ವಹಣೆಯ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "English"
+-#~ msgstr "ಇಂಗ್ಲಿಷ್"
+-
+-#~ msgid "British English"
+-#~ msgstr "ಬ್ರಿಟಿಷ್ ಇಂಗ್ಲಿಷ್"
+-
+-#~ msgid "German"
+-#~ msgstr "ಜರ್ಮನ್"
+-
+-#~ msgid "French"
+-#~ msgstr "ಫ್ರೆಂಚ್"
+-
+-#~ msgid "Spanish"
+-#~ msgstr "ಸ್ಪಾನಿಶ್"
+-
+-#~ msgid "Chinese (simplified)"
+-#~ msgstr "ಚೈನೀಸ್ (ಸಿಂಪ್ಲಿಫೈಡ್)"
+-
+-#~ msgid "Russian"
+-#~ msgstr "ರಶ್ಯನ್"
+-
+-#~ msgid "Arabic"
+-#~ msgstr "ಅರೇಬಿಕ್"
+-
+-#~ msgid "Select a region"
+-#~ msgstr "ಒಂದು ಪ್ರದೇಶವನ್ನು ಆರಿಸು"
+-
+-#~ msgid "Unspecified"
+-#~ msgstr "ಸೂಚಿಸದೆ ಇರುವ"
+-
+-#~ msgid "Select a language"
+-#~ msgstr "ಒಂದು ಭಾಷೆಯನ್ನು ಆರಿಸು"
+-
+-#~ msgid "_Select"
+-#~ msgstr "ಆರಿಸಿ (_S)"
+-
+-#~ msgid "Date and Time preferences panel"
+-#~ msgstr "ದಿನಾಂಕ ಮತ್ತು ಸಮಯದ ಆದ್ಯತೆಗಳ ಫಲಕ"
+-
+-#~ msgid "%d x %d (%s)"
+-#~ msgstr "%d x %d (%s)"
+-
+-#~ msgid "%d x %d"
+-#~ msgstr "%d x %d"
+-
+-#~ msgid "VESA: %s"
+-#~ msgstr "VESA: %s"
+-
+-#~ msgid "Unknown model"
+-#~ msgstr "ಗೊತ್ತಿರದ ಮಾದರಿ"
+-
+-#~ msgid "The next login will attempt to use the standard experience."
+-#~ msgstr "ಮುಂದಿನ ಲಾಗಿನ್‌ನಲ್ಲಿ ಸಾಮಾನ್ಯವಾದ ಅನುಭವವನ್ನು ಒದಗಿಸಲು ಪ್ರಯತ್ನಿಸಲಾಗುತ್ತದೆ."
+-
+-#~ msgid ""
+-#~ "The next login will use the fallback mode intended for unsupported "
+-#~ "graphics hardware."
+-#~ msgstr ""
+-#~ "ಬೆಂಬಲವಿರದ ಗ್ರಾಫಿಕ್ಸ್ ಯಂತ್ರಾಂಶದ ಕಾರಣದಿಂದಾಗಿ ಮುಂದಿನ ಬಾರಿಯ ಪ್ರವೇಶದ ಸಮಯದಲ್ಲಿ "
+-#~ "ಹಿಮ್ಮರಳಿಕೆ (ಫಾಲ್‌ಬ್ಯಾಕ್) ಕ್ರಮವನ್ನು ಬಳಸಲಾಗುತ್ತದೆ."
+-
+-#~ msgctxt "Experience"
+-#~ msgid "Fallback"
+-#~ msgstr "ಫಾಲ್‍ಬ್ಯಾಕ್"
+-
+-#~ msgid "System Information"
+-#~ msgstr "ವ್ಯವಸ್ಥೆಯ ಮಾಹಿತಿ"
+-
+-#~ msgid "OS type"
+-#~ msgstr "OS ಬಗೆ"
+-
+-#~ msgid "_Other Media..."
+-#~ msgstr "ಇತರೆ ಮಾಧ್ಯಮ (_O)..."
+-
+-#~ msgid "Experience"
+-#~ msgstr "ಅನುಭವ"
+-
+-#~ msgid "Forced _Fallback Mode"
+-#~ msgstr "ಒತ್ತಾಯಪೂರ್ವಕ ಹಿಮ್ಮರಳುವ ಕ್ರಮ (_F)"
+-
+-#~ msgid "Change keyboard settings"
+-#~ msgstr "ಕೀಲಿಮಣೆ ಸಿದ್ಧತೆಗಳನ್ನು ಬದಲಾಯಿಸು"
+-
+-#~ msgid "Layout Settings"
+-#~ msgstr "ವಿನ್ಯಾಸದ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "Set your mouse and touchpad preferences"
+-#~ msgstr "ನಿಮ್ಮ ಮೌಸ್‌ ಹಾಗು ಟಚ್‌ಪ್ಯಾಡ್‌ನ ಆದ್ಯತೆಗಳನ್ನು ಹೊಂದಿಸಿ"
+-
+-#~ msgid "Network settings"
+-#~ msgstr "ಜಾಲಬಂಧಧ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "Network;Wireless;IP;LAN;Proxy;"
+-#~ msgstr "ಜಾಲಬಂಧ;ವೈರ್ಲೆಸ್;IP;LAN;ಪ್ರಾಕ್ಸಿ;"
+-
+-#~ msgid "Out of range"
+-#~ msgstr "ವ್ಯಾಪ್ತಿಯ ಹೊರಗಿದೆ"
+-
+-#~ msgid "_Options..."
+-#~ msgstr "ಆಯ್ಕೆಗಳು (_O)..."
+-
+-#~ msgid "C_reate..."
+-#~ msgstr "ರಚಿಸಿ (_r)..."
+-
+-#~ msgid "_Configure..."
+-#~ msgstr "ಸಂರಚಿಸು (_C)..."
+-
+-#~ msgid "Wireless"
+-#~ msgstr "ವೈರ್ಲೆಸ್"
+-
+-#~| msgid "Disconnected"
+-#~ msgid "_Disconnect"
+-#~ msgstr "ಸಂಪರ್ಕ ತಪ್ಪಿಸು (_D)"
+-
+-#~| msgid "Connected"
+-#~ msgid "_Connect"
+-#~ msgstr "ಸಂಪರ್ಕಸಾಧಿಸು (_C)"
+-
+-#~ msgid "Mesh"
+-#~ msgstr "ಜಾಲರಿ"
+-
+-#~ msgid "Disconnected"
+-#~ msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕಲಾಗಿದೆ"
+-
+-#~ msgid "Carrier/link changed"
+-#~ msgstr "ವಾಹಕ/ಕೊಂಡಿ ಬದಲಾಗಿದೆ"
+-
+-#~ msgid "Expired credentials. Please log in again."
+-#~ msgstr "ರುಜುವಾತುಗಳ ವಾಯಿದೆ ತೀರಿದೆ. ದಯವಿಟ್ಟು ಇನ್ನೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ."
+-
+-#~ msgid "_Log In"
+-#~ msgstr "ಒಳಪ್ರವೇಶಿಸು (_L)"
+-
+-#~ msgid "Manage online accounts"
+-#~ msgstr "ಅಂತರಜಾಲದಲ್ಲಿನ ಖಾತೆಗಳನ್ನು ನಿರ್ವಹಿಸು"
+-
+-#~ msgid "Caution low battery, %s remaining"
+-#~ msgstr "ಎಚ್ಚರಿಕೆ, ಬ್ಯಾಟರಿಯಲ್ಲಿ ವಿದ್ಯುಚ್ಛಕ್ತಿ ಕಡಿಮೆಯಾಗಿದೆ, %s ಬಾಕಿ ಇದೆ"
+-
+-#~ msgid "Using battery power - %s remaining"
+-#~ msgstr "ಬ್ಯಾಟರಿ ವಿದ್ಯುಚ್ಛಕ್ತಿಯನ್ನು ಬಳಸಲಾಗುತ್ತಿದೆ - %s ಬಾಕಿ ಇದೆ"
+-
+-#~ msgid "Using battery power"
+-#~ msgstr "ಬ್ಯಾಟರಿ ವಿದ್ಯುಚ್ಛಕ್ತಿಯನ್ನು ಬಳಸಲಾಗುತ್ತಿದೆ"
+-
+-#~ msgid "Charging - fully charged"
+-#~ msgstr "ಚಾರ್ಜ್ ಮಾಡುವಿಕೆ - ಸಂಪೂರ್ಣವಾಗಿ ಚಾರ್ಜ್ ಆಗಿದೆ"
+-
+-#~ msgid "Using UPS power - %s remaining"
+-#~ msgstr "UPS ವಿದ್ಯುಚ್ಛಕ್ತಿಯನ್ನು ಬಳಸಲಾಗುತ್ತಿದೆ - %s ಬಾಕಿ ಇದೆ"
+-
+-#~ msgid "Caution low UPS"
+-#~ msgstr "ಎಚ್ಚರಿಕೆ, UPSನಲ್ಲಿ ವಿದ್ಯುಚ್ಛಕ್ತಿ ಕಡಿಮೆಯಾಗಿದೆ"
+-
+-#~ msgid "Using UPS power"
+-#~ msgstr "UPS ವಿದ್ಯುಚ್ಛಕ್ತಿಯನ್ನು ಬಳಸಲಾಗುತ್ತಿದೆ"
+-
+-#~ msgid "Your secondary battery is fully charged"
+-#~ msgstr "ನಿಮ್ಮ ಸೆಕೆಂಡರಿ ಬ್ಯಾಟರಿಯು ಸಂಪೂರ್ಣವಾಗಿ ಚಾರ್ಜ್ ಆಗಿದೆ"
+-
+-#~ msgid "Your secondary battery is empty"
+-#~ msgstr "ನಿಮ್ಮ ಎರಡನೆಯ ಬ್ಯಾಟರಿ ಖಾಲಿ ಇದೆ"
+-
+-#~ msgctxt "Battery power"
+-#~ msgid "Charging - fully charged"
+-#~ msgstr "ಚಾರ್ಜ್ ಮಾಡುವಿಕೆ - ಸಂಪೂರ್ಣವಾಗಿ ಚಾರ್ಜ್ ಆಗಿದೆ"
+-
+-#~ msgid ""
+-#~ "Tip: <a href=\"screen\">screen brightness</a> affects how much power is "
+-#~ "used"
+-#~ msgstr ""
+-#~ "ಸೂಚನೆ: <a href=\"screen\">ತೆರೆಯ ಪ್ರಕಾಶತೆ</a>ಯು ಎಷ್ಟು ವಿದ್ಯುಚ್ಛಕ್ತಿಯು "
+-#~ "ಬಳಸಲ್ಪಡುತ್ತದೆ ಎನ್ನುವುದರ ಮೇಲೆ ಪರಿಣಾಮ ಬೀರುತ್ತದೆ"
+-
+-#~ msgid "Power management settings"
+-#~ msgstr "ವಿದ್ಯುಚ್ಛಕ್ತಿ ನಿರ್ವಹಣೆಯ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "Don't suspend"
+-#~ msgstr "ಅಮಾನತ್ತಿನಲ್ಲಿಡಬೇಡ"
+-
+-#~ msgid "Suspend when inactive for"
+-#~ msgstr "ಇಷ್ಟು ಸಮಯ ಚಟುವಟಿಕೆ ಇಲ್ಲದಿದ್ದಾಗ ಅಮಾನತಿನಲ್ಲಿರಿಸು"
+-
+-#~ msgctxt "printer state"
+-#~ msgid "Paused"
+-#~ msgstr "ವಿರಮಿಸಲಾಗಿದೆ"
+-
+-#~ msgid "Change printer settings"
+-#~ msgstr "ಮುದ್ರಕದ ಸಿದ್ಧತೆಗಳನ್ನು ಬದಲಾಯಿಸು"
+-
+-#~ msgid "%s Options"
+-#~ msgstr "%s ಆಯ್ಕೆಗಳು"
+-
+-#~ msgid "Manufacturers"
+-#~ msgstr "ತಯಾರಕರು"
+-
+-#~ msgid "Drivers"
+-#~ msgstr "ಚಾಲಕಗಳು"
+-
+-#~ msgid "_Show"
+-#~ msgstr "ತೋರಿಸು (_S)"
+-
+-#~ msgid "Change your region and language settings"
+-#~ msgstr "ನಿಮ್ಮ ಪ್ರದೇಶ ಹಾಗೆ ಭಾಷೆಯ ಸಿದ್ಧತೆಗಳನ್ನು ಆರಿಸಿ"
+-
+-#~ msgid "Choose an input source"
+-#~ msgstr "ಇನ್‌ಪುಟ್ ಆಕರವನ್ನು ಆಯ್ಕೆ ಮಾಡು"
+-
+-#~ msgid "Select an input source to add"
+-#~ msgstr "ಸೇರಿಸಲು ಇನ್‌ಪುಟ್ ಆಕರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
+-
+-#~ msgid ""
+-#~ "The login screen, system accounts and new user accounts use the system-"
+-#~ "wide Region and Language settings."
+-#~ msgstr ""
+-#~ "ಪ್ರವೇಶದ ಹೆಸರು, ವ್ಯವಸ್ಥೆಯ ಖಾತೆಗಳು ಮತ್ತು ಹೊಸ ಬಳಕೆದಾರ ಖಾತೆಗಳು ಗಣಕದಾದ್ಯಂತದ ಪ್ರದೇಶ "
+-#~ "ಮತ್ತು ಭಾಷೆಯ ಸಿದ್ಧತೆಗಳನ್ನು ಬಳಸಲಾಗುತ್ತದೆ."
+-
+-#~ msgid ""
+-#~ "The login screen, system accounts and new user accounts use the system-"
+-#~ "wide Region and Language settings. You may change the system settings to "
+-#~ "match yours."
+-#~ msgstr ""
+-#~ "ಪ್ರವೇಶದ ಹೆಸರು, ವ್ಯವಸ್ಥೆಯ ಖಾತೆಗಳು ಮತ್ತು ಹೊಸ ಬಳಕೆದಾರ ಖಾತೆಗಳು ಗಣಕದಾದ್ಯಂತದ ಪ್ರದೇಶ "
+-#~ "ಮತ್ತು ಭಾಷೆಯ ಸಿದ್ಧತೆಗಳನ್ನು ಬಳಸಲಾಗುತ್ತದೆ. ವ್ಯವಸ್ಥೆಯ ಸಿದ್ಧತೆಗಳನ್ನು ನಿಮಗೆ "
+-#~ "ಹೊಂದಿಕೆಯಾಗುವಂತೆ ಬದಲಾಯಿಸಬಹುದು."
+-
+-#~ msgid "Copy Settings"
+-#~ msgstr "ಸಿದ್ಧತೆಗಳನ್ನು ಪ್ರತಿಮಾಡು"
+-
+-#~ msgid "Copy Settings..."
+-#~ msgstr "ಸಿದ್ಧತೆಗಳನ್ನು ಪ್ರತಿಮಾಡು..."
+-
+-#~ msgid "Region and Language"
+-#~ msgstr "ಪ್ರದೇಶ ಹಾಗು ಭಾಷೆ"
+-
+-#~ msgid ""
+-#~ "Select a display language (change will be applied next time you log in)"
+-#~ msgstr ""
+-#~ "ಒಂದು ಪ್ರದರ್ಶಕ ಭಾಷೆಯನ್ನು ಆರಿಸಿ (ಬದಲಾವಣೆಗಳು ನೀವು ಮುಂದಿನ ಬಾರಿ ಪ್ರವೇಶಿಸಿದಾಗ "
+-#~ "ಕಾರ್ಯಗತಗೊಳ್ಳುತ್ತವೆ)"
+-
+-#~ msgid "Add Language"
+-#~ msgstr "ಭಾಷೆಯನ್ನು ಸೇರಿಸು"
+-
+-#~ msgid "Remove Language"
+-#~ msgstr "ಭಾಷೆಯನ್ನು ತೆಗೆದುಹಾಕು"
+-
+-#~ msgid "Install languages..."
+-#~ msgstr "ಭಾಷೆಗಳನ್ನು ಅನುಸ್ಥಾಪಿಸು..."
+-
+-#~ msgid "Select a region (change will be applied the next time you log in)"
+-#~ msgstr ""
+-#~ "ಒಂದು ಪ್ರದೇಶವನ್ನು ಆರಿಸಿ (ಬದಲಾವಣೆಗಳು ನೀವು ಮುಂದಿನ ಬಾರಿ ಪ್ರವೇಶಿಸಿದಾಗ "
+-#~ "ಕಾರ್ಯಗತಗೊಳ್ಳುತ್ತವೆ)"
+-
+-#~ msgid "Add Region"
+-#~ msgstr "ಪ್ರದೇಶವನ್ನು ಸೇರಿಸು"
+-
+-#~ msgid "Currency"
+-#~ msgstr "ಕರೆನ್ಸಿ"
+-
+-#~ msgid "Examples"
+-#~ msgstr "ಉದಾಹರಣೆಗಳು"
+-
+-#~ msgid "Select keyboards or other input sources"
+-#~ msgstr "ಕೀಲಿಮಣೆಗಳು ಅಥವ ಇತರೆ ಇನ್‌ಪುಟ್ ಮೂಲಗಳನ್ನು ಆರಿಸಿ"
+-
+-#~ msgid "Remove Input Source"
+-#~ msgstr "ಇನ್‌ಪುಟ್‌ ಮೂಲವನ್ನು ತೆಗೆದುಹಾಕಿ"
+-
+-#~ msgid "Move Input Source Up"
+-#~ msgstr "ಇನ್‌ಪುಟ್‌ ಮೂಲವನ್ನು ಮೇಲಕ್ಕೆ ಸ್ಥಳಾಂತರಿಸಿ"
+-
+-#~ msgid "Show Keyboard Layout"
+-#~ msgstr "ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸ ತೋರಿಸು"
+-
+-#~ msgid "Ctrl+Alt+Space"
+-#~ msgstr "Ctrl+Alt+Space"
+-
+-#~| msgid "Sound Settings"
+-#~ msgid "Shortcut Settings"
+-#~ msgstr "ಸುಲಭ-ಆಯ್ಕೆಗಳ (ಶಾರ್ಟ್-ಕಟ್) ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "Display language:"
+-#~ msgstr "ಭಾಷೆಯನ್ನು ತೋರಿಸು:"
+-
+-#~ msgid "Input source:"
+-#~ msgstr "ಇನ್‌ಪುಟ್‌ ಆಕರ:"
+-
+-#~ msgid "Format:"
+-#~ msgstr "ವಿನ್ಯಾಸ:"
+-
+-#~ msgid "Your settings"
+-#~ msgstr "ನಿಮ್ಮ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "System settings"
+-#~ msgstr "ವ್ಯವಸ್ಥೆಯ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "Brightness & Lock"
+-#~ msgstr "ಪ್ರಕಾಶತೆ ಮತ್ತು ಲಾಕ್"
+-
+-#~ msgid "Screen brightness and lock settings"
+-#~ msgstr "ತೆರೆಯ ಪ್ರಕಾಶತೆ ಮತ್ತು ಬಂಧಿಸುವ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "Brightness;Lock;Dim;Blank;Monitor;"
+-#~ msgstr "ಪ್ರಕಾಶತೆ;ಲಾಕ್;ಮಂದ;ಖಾಲಿ;ತೆರೆ;"
+-
+-#~ msgid "_Dim screen to save power"
+-#~ msgstr "ವಿದ್ಯುಚ್ಛಕ್ತಿಯನ್ನು ಉಳಿಸಲು ತೆರೆಯನ್ನು ಮಬ್ಬುಗೊಳಿಸು (_D)"
+-
+-#~ msgid "Don't lock when at home"
+-#~ msgstr "ನೆಲೆಯಲ್ಲಿದ್ದಾಗ ಲಾಕ್ ಮಾಡಬೇಡ"
+-
+-#~ msgid "Locations..."
+-#~ msgstr "ಸ್ಥಳಗಳು..."
+-
+-#~ msgid "Lock"
+-#~ msgstr "ಲಾಕ್ ಮಾಡು"
+-
+-#~ msgid "Enable debugging code"
+-#~ msgstr "ದೋಷನಿವಾರಣಾ ಸಂಕೇತವನ್ನು ಶಕ್ತಗೊಳಿಸು"
+-
+-#~ msgid "Version of this application"
+-#~ msgstr "ಅನ್ವಯದ ಆವೃತ್ತಿ"
+-
+-#~ msgid " — GNOME Volume Control Applet"
+-#~ msgstr " — GNOME ಧ್ವನಿ ಪ್ರಮಾಣ ನಿಯಂತ್ರಣ ಆಪ್ಲೆಟ್"
+-
+-#~ msgid "Show desktop volume control"
+-#~ msgstr "ಗಣಕತೆರೆ ಧ್ವನಿ ನಿಯಂತ್ರಣವನ್ನು ತೋರಿಸಿ"
+-
+-#~ msgid "Sound Output Volume"
+-#~ msgstr "ಧ್ವನಿಯ ಔಟ್‌ಪುಟ್‌ ಧ್ವನಿ ಪ್ರಮಾಣ"
+-
+-#~ msgid "Microphone Volume"
+-#~ msgstr "ಮೈಕ್ರೊಫೋನ್ ಧ್ವನಿ ಪ್ರಮಾಣ"
+-
+-#~ msgid "Failed to start Sound Preferences: %s"
+-#~ msgstr "ಧ್ವನಿಯ ಆದ್ಯತೆಗಳನ್ನು ಆರಂಭಿಸಲು ವಿಫಲಗೊಂಡಿದೆ: %s"
+-
+-#~ msgid "_Mute"
+-#~ msgstr "ಮೂಕ (_M)"
+-
+-#~ msgid "_Sound Preferences"
+-#~ msgstr "ಧ್ವನಿ ಆದ್ಯತೆಗಳು (_S)"
+-
+-#~ msgid "Muted"
+-#~ msgstr "ಮೂಕಗೊಳಿಸಲಾಗಿದೆ"
+-
+-#~ msgid "Universal Access Preferences"
+-#~ msgstr "ಜಾಗತಿಕ ನಿಲುಕಣೆಯ ಆದ್ಯತೆಗಳು"
+-
+-#~ msgid "Options..."
+-#~ msgstr "ಆಯ್ಕೆಗಳು..."
+-
+-#~ msgctxt "Zoom Grayscale"
+-#~ msgid "Color"
+-#~ msgstr "ಬಣ್ಣ"
+-
+-#~ msgctxt "Zoom Grayscale"
+-#~ msgid "None"
+-#~ msgstr "ಯಾವುದೂ ಇಲ್ಲ"
+-
+-#~ msgid "User Accounts"
+-#~ msgstr "ಬಳಕೆದಾರ ಖಾತೆಗಳು"
+-
+-#~ msgid "_Hint"
+-#~ msgstr "ಸುಳಿವು (_H)"
+-
+-#~ msgid ""
+-#~ "This hint may be displayed at the login screen.  It will be visible to "
+-#~ "all users of this system.  Do <b>not</b> include the password here."
+-#~ msgstr ""
+-#~ "ಈ ಸುಳಿವನ್ನು ಪ್ರವೇಶ ತೆರಯಲ್ಲಿ ತೋರಿಸಲಾಗುತ್ತದೆ.  ಇದು ವ್ಯವಸ್ಥೆಯ ಎಲ್ಲಾ ಬಳಕೆದಾರರಿಗೂ "
+-#~ "ಕಾಣಿಸುತ್ತದೆ.  ಇಲ್ಲಿ ಗುಪ್ತಪದವನ್ನು <b>ಸೇರಿಸಬೇಡಿ </b>."
+-
+-#~ msgid "Fair"
+-#~ msgstr "ಪರವಾಗಿಲ್ಲ"
+-
+-#~ msgid "Browse for more pictures..."
+-#~ msgstr "ಹೆಚ್ಚಿನ ಚಿತ್ರಗಳಿಗಾಗಿ ನೋಡು..."
+-
+-#~ msgid "No user with the name '%s' exists."
+-#~ msgstr "'%s' ಎಂಬ ಹೆಸರಿನ ಒಬ್ಬ ಬಳಕೆದಾರ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ"
+-
+-#~ msgid "This user does not exist."
+-#~ msgstr "ಈ ಬಳಕೆದಾರ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ."
+-
+-#~ msgid "Set your Wacom tablet preferences"
+-#~ msgstr "ನಿಮ್ಮ ವೇಕಾಮ್ ಗ್ರಾಫಿಕ್ಸ್ ಕಿಸೆಗಣಕ (ಟ್ಯಾಬ್ಲೆಟ್) ಆದ್ಯತೆಗಳನ್ನು ಹೊಂದಿಸಿ"
+-
+-#~ msgid "Map Buttons..."
+-#~ msgstr "ಮ್ಯಾಪ್‌ ಗುಂಡಿಗಳು..."
+-
+-#~ msgid "Calibrate..."
+-#~ msgstr "ಕ್ಯಾಲಿಬ್ರೇಟ್ ಮಾಡು..."
+-
+-#~ msgid "- System Settings"
+-#~ msgstr "- ವ್ಯವಸ್ಥೆಯ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "Control Center"
+-#~ msgstr "ನಿಯಂತ್ರಣ ಕೇಂದ್ರ"
+-
+-#~ msgid "System Settings"
+-#~ msgstr "ವ್ಯವಸ್ಥೆಯ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "Security Key"
+-#~ msgstr "ಸುರಕ್ಷತಾ ಕೀಲಿ"
+-
+-#~ msgid "Subnet Mask"
+-#~ msgstr "ಸಬ್‌ನೆಟ್ ಮಾಸ್ಕ್‍"
+-
+-#~| msgid "Wallpapers"
+-#~ msgid "Add wallpaper"
+-#~ msgstr "ವಾಲ್‌ಪೇಪರುಗಳನ್ನು ಸೇರಿಸು"
+-
+-#~| msgid "Wallpapers"
+-#~ msgid "Remove wallpaper"
+-#~ msgstr "ವಾಲ್‌ಪೇಪರುಗಳನ್ನು ತೆಗೆದುಹಾಕು"
+-
+-#~ msgid "Swap colors"
+-#~ msgstr "ಬಣ್ಣಗಳನ್ನು ಅದಲು ಬದಲು ಮಾಡು"
+-
+-#~| msgid "Seco_ndary click:"
+-#~ msgid "Secondary color"
+-#~ msgstr "ಅಪ್ರಮುಖ ಬಣ್ಣ"
+-
+-#~ msgid "Horizontal Gradient"
+-#~ msgstr "ಅಡ್ಡಲಾದ ಬದಲಾವಣೆ"
+-
+-#~ msgid "Vertical Gradient"
+-#~ msgstr "ಲಂಬವಾದ ಬದಲಾವಣೆ"
+-
+-#~ msgid "Solid Color"
+-#~ msgstr "ಗಾಢ ಬಣ್ಣ"
+-
+-#~ msgid "Colors & Gradients"
+-#~ msgstr "ಬಣ್ಣಗಳು ಹಾಗು ಗ್ರೇಡಿಯಂಟ್‌ಗಳು"
+-
+-#~ msgid "Take a screenshot"
+-#~ msgstr "ತೆರೆಚಿತ್ರವನ್ನು ತೆಗೆದುಕೊ"
+-
+-#~ msgid "Shortcut"
+-#~ msgstr "ಶಾರ್ಟ್-ಕಟ್"
+-
+-#~ msgid "_Right-handed"
+-#~ msgstr "ಬಲಗೈಯ (_R)"
+-
+-#~ msgid "_Left-handed"
+-#~ msgstr "ಎಡಗೈಯ (_L)"
+-
+-#~ msgid "Sh_ow position of pointer when the Control key is pressed"
+-#~ msgstr "ಕಂಟ್ರೋಲ್ ಕೀಲಿಯನ್ನು ಒತ್ತಿದಾಗ ಸೂಚಕದ ಸ್ಥಾನವನ್ನು ಸೂಚಿಸು (_o)"
+-
+-#~ msgid "A_cceleration:"
+-#~ msgstr "ವೇಗವರ್ಧನೆ(_c):"
+-
+-#~ msgid "_Sensitivity:"
+-#~ msgstr "ಸಂವೇದನೆ (_S):"
+-
+-#~ msgid "Drag and Drop"
+-#~ msgstr "ಎಳೆ ಹಾಗು ಹಾಕು"
+-
+-#~ msgid "Thr_eshold:"
+-#~ msgstr "ಮಿತಿ (_e):"
+-
+-#~ msgid "Drag Threshold"
+-#~ msgstr "ಎಳೆಯುವ ಮಿತಿ"
+-
+-#~ msgid "Double-Click Timeout"
+-#~ msgstr "ಎರಡು-ಬಾರಿ ಕ್ಲಿಕ್ಕಿಸುವ ಕಾಲಾವಧಿ ಮೀರಿಕೆ"
+-
+-#~ msgid "_Timeout:"
+-#~ msgstr "ಮೀರಿದ ಸಮಯ (_T):"
+-
+-#~ msgid "To test your settings, try to double-click on the face."
+-#~ msgstr ""
+-#~ "ಎರಡು ಬಾರಿಯ ಕ್ಲಿಕ್‌ನ ಸಿದ್ಧತೆಗಳನ್ನು ಪರೀಕ್ಷಿಸಲು, ಮುಖದ ಮೇಲೆ ಎರಡುಬಾರಿ ಕ್ಲಿಕ್ಕಿಸಿ."
+-
+-#~ msgid "Enable _mouse clicks with touchpad"
+-#~ msgstr "ಟಚ್‌ಪ್ಯಾಡ್‌ನೊಂದಿಗೆ ಮೌಸ್‌ನ ಕ್ಲಿಕ್‌ಗಳನ್ನು ಶಕ್ತಗೊಳಿಸು (_m)"
+-
+-#~ msgid "Scrolling"
+-#~ msgstr "ಚಲನೆ(ಸ್ಕ್ರಾಲಿಂಗ್)"
+-
+-#~ msgid "_Disabled"
+-#~ msgstr "ಅಶಕ್ತಗೊಂಡ (_D)"
+-
+-#~ msgid "_Edge scrolling"
+-#~ msgstr "ಅಂಚಿನ ಚಲನೆ (_E)"
+-
+-#~ msgid "A_ddress:"
+-#~ msgstr "ವಿಳಾಸ(_d):"
+-
+-#~ msgid "_Search by Address"
+-#~ msgstr "ವಿಳಾಸದ ಮೇರೆಗೆ ಹುಡುಕು (_S)"
+-
+-#~ msgid "Getting devices..."
+-#~ msgstr "ಸಾಧನಗಳನ್ನು ಸ್ವೀಕರಿಸಲಾಗುತ್ತಿದೆ..."
+-
+-#~ msgctxt "printer type"
+-#~ msgid "Local"
+-#~ msgstr "ಸ್ಥಳೀಯ"
+-
+-#~ msgctxt "printer type"
+-#~ msgid "Network"
+-#~ msgstr "ಜಾಲಬಂಧ"
+-
+-#~ msgid "Device types"
+-#~ msgstr "ಸಾಧನದ ಬಗೆಗಳು"
+-
+-#~ msgid "Automatic configuration"
+-#~ msgstr "ಸ್ವಯಂಚಾಲಿತ ಸಂರಚನೆ"
+-
+-#~ msgid "Opening firewall for mDNS connections"
+-#~ msgstr "mDNS ಸಂಪರ್ಕಗಳಿಗಾಗಿ ಫೈರ್ವಾಲ್ ಅನ್ನು ತೆರೆಯಲಾಗುತ್ತಿದೆ"
+-
+-#~ msgid "Opening firewall for Samba connections"
+-#~ msgstr "Samba ಸಂಪರ್ಕಗಳಿಗಾಗಿ ಫೈರ್ವಾಲ್ ಅನ್ನು ತೆರೆಯಲಾಗುತ್ತಿದೆ"
+-
+-#~ msgid "Opening firewall for IPP connections"
+-#~ msgstr "IPP ಸಂಪರ್ಕಗಳಿಗಾಗಿ ಫೈರ್ವಾಲ್ ಅನ್ನು ತೆರೆಯಲಾಗುತ್ತಿದೆ"
+-
+-#~ msgid "C_hoose a device to configure:"
+-#~ msgstr "ಸಂರಚಿಸಲು ಒಂದು ಸಾಧನವನ್ನು ಆರಿಸಿ (_h):"
+-
+-#~ msgid "Dasher"
+-#~ msgstr "ಡ್ಯಾಶರ್"
+-
+-#~ msgid "Nomon"
+-#~ msgstr "Nomon"
+-
+-#~ msgid "Caribou"
+-#~ msgstr "Caribou"
+-
+-#~ msgid "Account _type"
+-#~ msgstr "ಖಾತೆಯ ಬಗೆ (_t)"
+-
+-#~ msgid "Acti_on:"
+-#~ msgstr "ಕಾರ್ಯ (_o):"
+-
+-#~| msgid "Other..."
+-#~ msgctxt "Wireless access point"
+-#~ msgid "Other..."
+-#~ msgstr "ಇತರೆ..."
+-
+-#~ msgid "This is your only connection to the internet."
+-#~ msgstr "ಇದು ಅಂತರಜಾಲದೊಂದಿಗಿನ ನಿಮ್ಮ ಏಕಮಾತ್ರ ಸಂಪರ್ಕವಾಗಿದೆ."
+-
+-#~ msgid "_Network Name"
+-#~ msgstr "ಜಾಲಬಂಧ ಹೆಸರು (_N)"
+-
+-#~| msgid "Disabled"
+-#~ msgid "Disable VPN"
+-#~ msgstr "VPN ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು"
+-
+-#~| msgid "_HTTP Proxy"
+-#~ msgid "HTTP Port"
+-#~ msgstr "HTTP ಸಂಪರ್ಕಸ್ಥಾನ"
+-
+-#~| msgid "H_TTPS Proxy"
+-#~ msgid "HTTPS Port"
+-#~ msgstr "HTTPS ಸಂಪರ್ಕಸ್ಥಾನ"
+-
+-#~| msgid "_FTP Proxy"
+-#~ msgid "FTP Port"
+-#~ msgstr "FTP ಸಂಪರ್ಕಸ್ಥಾನ"
+-
+-#~ msgid "To add a new account, first select the account type"
+-#~ msgstr "ಹೊಸ ಖಾತೆಯೊಂದನ್ನು ಸೇರಿಸಲು, ಮೊದಲು ಖಾತೆಯ ಬಗೆಯನ್ನು ಆರಿಸಿ"
+-
+-#~ msgid "_Add..."
+-#~ msgstr "ಸೇರಿಸು(_A)..."
+-
+-#~| msgid "_Type:"
+-#~ msgid "Tip:"
+-#~ msgstr "ಸಲಹೆ:"
+-
+-#~| msgid "Brightness"
+-#~ msgid "Brightness Settings"
+-#~ msgstr "ಪ್ರಕಾಶತೆಯ ಸಿದ್ಧತೆಗಳು"
+-
+-#~ msgid "affect how much power is used"
+-#~ msgstr "ಎಷ್ಟು ವಿದ್ಯುಚ್ಛಕ್ತಿಯನ್ನು ಬಳಸಲಾಗಿದೆ ಎಂಬುದರ ಮೇಲೆ ಪರಿಣಾಮ ಬೀರುತ್ತದೆ"
+-
+-#~| msgid "Back"
+-#~ msgid "_Back"
+-#~ msgstr "ಹಿಂದಕ್ಕೆ (_B)"
+-
+-#~ msgid "Add User"
+-#~ msgstr "ಬಳಕೆದಾರನನ್ನು ಸೇರಿಸು"
+-
+-#~ msgid "Allowed users"
+-#~ msgstr "ಅನುಮತಿ ಇರುವ ಬಳಕೆದಾರರು"
+-
+-#~| msgid "Layout"
+-#~ msgid "Add Layout"
+-#~ msgstr "ವಿನ್ಯಾಸವನ್ನು ಸೇರಿಸು"
+-
+-#~| msgid "Choose a Layout"
+-#~ msgid "Remove Layout"
+-#~ msgstr "ವಿನ್ಯಾಸವನ್ನು ತೆಗೆದು ಹಾಕು"
+-
+-#~| msgid "Preview fonts"
+-#~ msgid "Preview Layout"
+-#~ msgstr "ವಿನ್ಯಾಸದ ಮುನ್ನೋಟ"
+-
+-#, fuzzy
+-#~| msgid "Use previous window's layout in new windows"
+-#~ msgid "New windows use the previous window's layout"
+-#~ msgstr "ಹೊಸ ವಿಂಡೋಗಳಲ್ಲಿ ಹಿಂದಿನ ವಿಂಡೋದ ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ"
+-
+-#~ msgid "View and edit keyboard layout options"
+-#~ msgstr "ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸ ಆಯ್ಕೆಗಳನ್ನು ನೋಡಿ ಹಾಗು ಸಂಪಾದಿಸಿ"
+-
+-#~ msgid "Reset to De_faults"
+-#~ msgstr "ಪೂರ್ವನಿಯೋಜಿತಕ್ಕೆ ಮರುಹೊಂದಿಸು (_f)"
+-
+-#~ msgid "Layouts"
+-#~ msgstr "ವಿನ್ಯಾಸಗಳು"
+-
+-#~ msgid "Layout"
+-#~ msgstr "ವಿನ್ಯಾಸ"
+-
+-#, fuzzy
+-#~| msgid "Change set"
+-#~ msgid "Change contrast:"
+-#~ msgstr "ಬದಲಾವಣೆ ಸೆಟ್"
+-
+-#~| msgid "Text size:"
+-#~ msgid "_Text size:"
+-#~ msgstr "ಪಠ್ಯದ ಗಾತ್ರ (_T):"
+-
+-#~ msgid "Increase size:"
+-#~ msgstr "ಪಠ್ಯದ ಗಾತ್ರವನ್ನು ಹೆಚ್ಚಿಸು:"
+-
+-#~ msgid "Decrease size:"
+-#~ msgstr "ಪಠ್ಯದ ಗಾತ್ರವನ್ನು ಕುಗ್ಗಿಸು:"
+-
+-#~ msgctxt "universal access, seeing"
+-#~ msgid "Display"
+-#~ msgstr "ತೋರಿಸು"
+-
+-#~ msgctxt "universal access, seeing"
+-#~ msgid "Zoom"
+-#~ msgstr "ಗಾತ್ರಬದಲಿಸು"
+-
+-#~ msgid "Screen keyboard"
+-#~ msgstr "ತೆರೆ ಕೀಲಿಮಣೆ"
+-
+-#~ msgid "Typing Assistant"
+-#~ msgstr "ಟೈಪಿಂಗ್ ಸಹಾಯಕ"
+-
+-#~ msgid "Type here to test settings"
+-#~ msgstr "ಸಿದ್ಧತೆಗಳನ್ನು ಪರೀಕ್ಷಿಸಲು ಇಲ್ಲಿ ಟೈಪ್ ಮಾಡಿ"
+-
+-#~| msgid "Screen"
+-#~ msgid "1/2 Screen"
+-#~ msgstr "ತೆರೆಯ 1/2"
+-
+-#~| msgid "Screen"
+-#~ msgid "3/4 Screen"
+-#~ msgstr "ತೆರೆಯ 3/4"
+-
+-#~ msgid "Create new account"
+-#~ msgstr "ಹೊಸ ಬಳಕೆದಾರನನ್ನು ರಚಿಸಿ"
+-
+-#~ msgid "_Account Type"
+-#~ msgstr "ಖಾತೆಯ ಬಗೆ (_A)"
+-
+-#~ msgid "Cr_eate"
+-#~ msgstr "ರಚಿಸು (_e)"
+-
+-#~ msgid "Choose a generated password"
+-#~ msgstr "ಉತ್ಪಾದಿಸಲಾದ ಗುಪ್ತಪದವನ್ನು ಆರಿಸಿ"
+-
+-#~ msgid "More choices..."
+-#~ msgstr "ಇನ್ನಷ್ಷು ಆಯ್ಕೆಗಳು..."
+-
+-#~ msgid "Wacom Graphics Tablet"
+-#~ msgstr "ವೇಕಾಮ್ ಗ್ರಾಫಿಕ್ಸ್ ಕಿಸೆಗಣಕ (ಟ್ಯಾಬ್ಲೆಟ್)"
+-
+-#~ msgid "Current network location"
+-#~ msgstr "ಪ್ರಸಕ್ತ ಜಾಲಬಂಧ ಸ್ಥಳ"
+-
+-#~ msgid "More backgrounds URL"
+-#~ msgstr "ಹೆಚ್ಚಿನ ಹಿನ್ನಲೆ ಚಿತ್ರಗಳ URL"
+-
+-#~ msgid "More themes URL"
+-#~ msgstr "ಹೆಚ್ಚಿನ ಪರಿಸರ ವಿನ್ಯಾಸಗಳ URL"
+-
+-#~ msgid ""
+-#~ "Set this to your current location name. This is used to determine the "
+-#~ "appropriate network proxy configuration."
+-#~ msgstr ""
+-#~ "ಇದನ್ನು ನಿಮ್ಮ ಪ್ರಸಕ್ತ ಸ್ಥಳದ ಹೆಸರಿಗೆ ಹೊಂದಿಸಿ. ಇದನ್ನು ಸೂಕ್ತವಾದ ಜಾಲಬಂಧ ಪ್ರಾಕ್ಸಿ "
+-#~ "ಸಂರಚನೆಯನ್ನು ನಿರ್ಧರಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ."
+-
+-#~ msgid ""
+-#~ "URL for where to get more desktop backgrounds. If set to an empty string "
+-#~ "the link will not appear."
+-#~ msgstr ""
+-#~ "ಎಲ್ಲಿಂದ ಹೆಚ್ಚಿನ ಗಣಕತೆರೆ ಹಿನ್ನಲೆ ಚಿತ್ರಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳಬೇಕೊ ಅಲ್ಲಿಯ URL. ಖಾಲಿಯಾಗಿ "
+-#~ "ಇರಿಸಿದಲ್ಲಿ ಕೊಂಡಿಯು ಕಾಣಿಸಿಕೊಳ್ಳುವುದಿಲ್ಲ."
+-
+-#~ msgid ""
+-#~ "URL for where to get more desktop themes. If set to an empty string the "
+-#~ "link will not appear."
+-#~ msgstr ""
+-#~ "ಎಲ್ಲಿಂದ ಹೆಚ್ಚಿನ ಗಣಕತೆರೆ ಪರಿಸರವಿನ್ಯಾಸಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳಬೇಕೊ ಅಲ್ಲಿಯ URL. ಖಾಲಿಯಾಗಿ "
+-#~ "ಇರಿಸಿದಲ್ಲಿ ಕೊಂಡಿಯು ಕಾಣಿಸಿಕೊಳ್ಳುವುದಿಲ್ಲ."
+-
+-#~ msgid "Unlock"
+-#~ msgstr "ಅನ್‌ಲಾಕ್ ಮಾಡು"
+-
+-#~ msgid "Locked"
+-#~ msgstr "ಲಾಕ್ ಮಾಡಲಾಗಿದೆ"
+-
+-#~ msgid ""
+-#~ "Dialog is unlocked.\n"
+-#~ "Click to prevent further changes"
+-#~ msgstr ""
+-#~ "ಸಂವಾದ ಚೌಕವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲಾಗಿದೆ.\n"
+-#~ "ಇನ್ನಷ್ಟು ಬದಲಾವಣೆಗಳಾಗದಂತೆ ಕ್ಲಿಕ್ ಮಾಡಿ"
+-
+-#~ msgid ""
+-#~ "Dialog is locked.\n"
+-#~ "Click to make changes"
+-#~ msgstr ""
+-#~ "ಸಂವಾದ ಚೌಕವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲಾಗಿದೆ\n"
+-#~ "ಬದಲಾವಣೆಗಳನ್ನು ಮಾಡಲು ಕ್ಲಿಕ್ ಮಾಡಿ"
+-
+-#~| msgid "Please contact your system administrator for help."
+-#~ msgid ""
+-#~ "System policy prevents changes.\n"
+-#~ "Contact your system administrator"
+-#~ msgstr ""
+-#~ "ವ್ಯವಸ್ಥೆಯ ನಿಯಮವು ಬದಲಾವಣೆಗಳನ್ನು ಮಾಡದಂತೆ ತಡೆಯುತ್ತಿದೆ.\n"
+-#~ "ನೆರವಿಗಾಗಿ ನಿಮ್ಮ ಗಣಕ ವ್ಯವಸ್ಥಾಪಕರನ್ನು ಸಂಪರ್ಕಿಸಿ"
+-
+-#~ msgid "Key"
+-#~ msgstr "ಕೀಲಿ"
+-
+-#~ msgid "GConf key to which this property editor is attached"
+-#~ msgstr "ಈ ಗುಣಲಕ್ಷಣ ಸಂಪಾದಕಕ್ಕೆ ಲಗತ್ತಿಸಲಾದ GConf ಕೀಲಿ"
+-
+-#~ msgid "Callback"
+-#~ msgstr "ಕಾಲ್‍ಬ್ಯಾಕ್"
+-
+-#~ msgid "Issue this callback when the value associated with key gets changed"
+-#~ msgstr "ಕೀಲಿಗೆ ಸಂಬಂದಪಟ್ಟ ಮೌಲ್ಯವನ್ನು ಬದಲಾಯಿಸಿದಲ್ಲಿ ಈ ಕಾಲ್‌ಬ್ಯಾಕ್ ಅನ್ನು ಒದಗಿಸು"
+-
+-#~ msgid "Change set"
+-#~ msgstr "ಬದಲಾವಣೆ ಸೆಟ್"
+-
+-#~ msgid ""
+-#~ "GConf change set containing data to be forwarded to the gconf client on "
+-#~ "apply"
+-#~ msgstr ""
+-#~ "ಅನ್ವಯಿಸಿದಾಗ gconf ಕ್ಲೈಂಟಿಗೆ ರವಾನಿಸಬೇಕಿರುವ ದತ್ತಾಂಶವನ್ನು ಹೊಂದಿರುವ GConf ಬದಲಾವಣೆ "
+-#~ "ಸೆಟ್"
+-
+-#~ msgid "Conversion to widget callback"
+-#~ msgstr "ವಿಜೆಟ್‌ ಕಾಲ್‌ಬ್ಯಾಕ್‌ಗೆ ಪರಿವರ್ತನೆ"
+-
+-#~ msgid ""
+-#~ "Callback to be issued when data are to be converted from GConf to the "
+-#~ "widget"
+-#~ msgstr "ವಿಜೆಟ್‌ಗೆ GConf ನಿಂದ ದತ್ತಾಂಶವನ್ನು ಮಾರ್ಪಡಿಸಬೇಕಾದಾಗ ಒದಗಿಸಬೇಕಿರುವ ಕಾಲ್‌ಬ್ಯಾಕ್"
+-
+-#~ msgid "Conversion from widget callback"
+-#~ msgstr "ವಿಜೆಟ್‌ ಕಾಲ್‌ಬ್ಯಾಕ್‌ನಿಂದ ಪರಿವರ್ತನೆ"
+-
+-#~ msgid ""
+-#~ "Callback to be issued when data are to be converted to GConf from the "
+-#~ "widget"
+-#~ msgstr "ವಿಜೆಟ್‌ನಿಂದ GConf ಗೆ ದತ್ತಾಂಶವನ್ನು ಮಾರ್ಪಡಿಸಬೇಕಾದಾಗ ಒದಗಿಸಬೇಕಿರುವ ಕಾಲ್‌ಬ್ಯಾಕ್"
+-
+-#~ msgid "UI Control"
+-#~ msgstr "UI ನಿಯಂತ್ರಣ"
+-
+-#~ msgid "Object that controls the property (normally a widget)"
+-#~ msgstr "ಗುಣಗಳನ್ನು ನಿಯಂತ್ರಿಸುವ ಆಬ್ಜೆಕ್ಟ್‍ (ಸಾಮಾನ್ಯವಾಗಿ ಒಂದು ವಿಜೆಟ್)"
+-
+-#~ msgid "Property editor object data"
+-#~ msgstr "ಗುಣ ಸಂಪಾದಕದ ಆಬ್ಜೆಕ್ಟ್‍ ದತ್ತಾಂಶ"
+-
+-#~ msgid "Custom data required by the specific property editor"
+-#~ msgstr "ನಿಗದಿತ ಗುಣಲಕ್ಷಣದ ಸಂಪಾದಕಕ್ಕೆ ಅಗತ್ಯವಿರುವ ಇಚ್ಛೆಯ ದತ್ತಾಂಶ"
+-
+-#~ msgid "Property editor data freeing callback"
+-#~ msgstr "ಗುಣಲಕ್ಷಣದ ಸಂಪಾದಕ ದತ್ತಾಂಶ ಮುಕ್ತಗೊಳಿಕೆಯ ಕಾಲ್‌ಬ್ಯಾಕ್‌"
+-
+-#~ msgid ""
+-#~ "Callback to be issued when property editor object data is to be freed"
+-#~ msgstr ""
+-#~ "ಗುಣಲಕ್ಷಣದ ಸಂಪಾದಕ ವಸ್ತುವಿನ ದತ್ತಾಂಶವನ್ನು ಮುಕ್ತಗೊಳಿಸಿದಾಗ ಸಲ್ಲಿಸಬೇಕಿರುವ ಕಾಲ್‌ಬ್ಯಾಕ್"
+-
+-#~ msgid ""
+-#~ "Couldn't find the file '%s'.\n"
+-#~ "\n"
+-#~ "Please make sure it exists and try again, or choose a different "
+-#~ "background picture."
+-#~ msgstr ""
+-#~ "'%s' ಕಡತವನ್ನು ಪತ್ತೆ ಹಚ್ಚಲಾಗಿಲ್ಲ.\n"
+-#~ "\n"
+-#~ "ಅದು ಇದೆಯೆಂದು ಖಚಿತಪಡಿಸಿಕೊಂಡು ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ, ಅಥವ ಬೇರೊಂದು "
+-#~ "ಹಿನ್ನಲೆಚಿತ್ರವನ್ನು ಆರಿಸಿ."
+-
+-#~ msgid ""
+-#~ "I don't know how to open the file '%s'.\n"
+-#~ "Perhaps it's a kind of picture that is not yet supported.\n"
+-#~ "\n"
+-#~ "Please select a different picture instead."
+-#~ msgstr ""
+-#~ "'%s' ಕಡತವನ್ನು ಹೇಗೆ ತೆರೆಯಬೇಕೆಂದು ನನಗೆ ತಿಳಿದಿಲ್ಲ.\n"
+-#~ "ಬಹುಷಃ ಇದು ಒಂದು ಬೆಂಬಲಿತವಾಗಿರದ ಚಿತ್ರದ ಬಗೆ ಇರಬೇಕು.\n"
+-#~ "\n"
+-#~ "ದಯವಿಟ್ಟು ಒಂದು ಬದಲಿ ಚಿತ್ರವನ್ನು ಆರಿಸಿ."
+-
+-#~ msgid "Please select an image."
+-#~ msgstr "ದಯವಿಟ್ಟು ಒಂದು ಚಿತ್ರವನ್ನು ಆರಿಸಿ."
+-
+-#~ msgid "24-Hour Time"
+-#~ msgstr "24-ಗಂಟೆಯ ಸಮಯ"
+-
+-#~ msgid "Upside-down"
+-#~ msgstr "ತಲೆ-ಕೆಳಗೆ"
+-
+-#~ msgid "Could not get session bus while applying display configuration"
+-#~ msgstr "ಪ್ರದರ್ಶಕದ ಸಂರಚನೆಯನ್ನು ಅನ್ವಯಿಸುವಾಗ ಅಧಿವೇಶನದ ಬಸ್ ಅನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ"
+-
+-#~ msgid "%.1f KB"
+-#~ msgstr "%.1f KB"
+-
+-#~ msgid "%.1f MB"
+-#~ msgstr "%.1f MB"
+-
+-#~ msgid "%.1f GB"
+-#~ msgstr "%.1f GB"
+-
+-#~ msgid "%.1f TB"
+-#~ msgstr "%.1f TB"
+-
+-#~ msgid "%.1f PB"
+-#~ msgstr "%.1f PB"
+-
+-#~ msgid "%.1f EB"
+-#~ msgstr "%.1f EB"
+-
+-#~| msgid "System"
+-#~ msgid "System Info"
+-#~ msgstr "ವ್ಯವಸ್ಥೆಯ ಮಾಹಿತಿ"
+-
+-#~ msgid "Photos"
+-#~ msgstr "ಚಿತ್ರಗಳು"
+-
+-#~ msgid "Updates Available"
+-#~ msgstr "ಅಪ್‌ಡೇಟ್‌ಗಳು ಲಭ್ಯವಿದೆ"
+-
+-#~| msgid "Best co_ntrast"
+-#~ msgid "Toggle contrast"
+-#~ msgstr "ವೈದೃಶ್ಯವನ್ನು ಬದಲಾಯಿಸಿ"
+-
+-#~ msgid "Toggle magnifier"
+-#~ msgstr "ಮ್ಯಾಗ್ನಿಫಯರ್ ಅನ್ನು ಬದಲಾಯಿಸಿ"
+-
+-#~| msgid "Linux Screen Reader"
+-#~ msgid "Toggle screen reader"
+-#~ msgstr "ತೆರೆ ಓದುಗನನ್ನು ಬದಲಾಯಿಸಿ"
+-
+-#~ msgid "New shortcut..."
+-#~ msgstr "ಹೊಸ ಶಾರ್ಟ್-ಕಟ್..."
+-
+-#~ msgid "Accelerator key"
+-#~ msgstr "ವೇಗವರ್ಧಕ ಕೀಲಿ"
+-
+-#~ msgid "Accelerator modifiers"
+-#~ msgstr "ವೇಗವರ್ಧಕ ಮಾರ್ಪಡಿಸುವವು"
+-
+-#~ msgid "Accelerator keycode"
+-#~ msgstr "ವೇಗವರ್ಧಕ ಕೀಲಿಕೋಡ್"
+-
+-#~ msgid "Accel Mode"
+-#~ msgstr "Accel ಕ್ರಮ"
+-
+-#~ msgid "The type of accelerator."
+-#~ msgstr "ವೇಗವರ್ಧಕದ ಬಗೆ."
+-
+-#~ msgid "Error saving the new shortcut"
+-#~ msgstr "ಹೊಸ ಶಾರ್ಟ್-ಕಟ್ ಅನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
+-
+-#~ msgid "Too many custom shortcuts"
+-#~ msgstr "ಬಹಳಷ್ಟು ಇಚ್ಛೆಯ ಶಾರ್ಟ್-ಕಟ್‌ಗಳು"
+-
+-#~ msgid "Media and Autorun"
+-#~ msgstr "ಮಾಧ್ಯಮ ಹಾಗು ಸ್ವಯಂಚಾಲನೆ"
+-
+-#~ msgid "Configure media and autorun preferences"
+-#~ msgstr "ಮಾಧ್ಯಮ ಹಾಗು ಸ್ವಯಂಚಾಲನೆಯ ಆದ್ಯತೆಗಳನ್ನು ಸಂರಚಿಸಿ"
+-
+-#~ msgid "cd;dvd;usb;audio;video;disc;"
+-#~ msgstr "cd;dvd;usb;audio;video;disc;"
+-
+-#~ msgid "---"
+-#~ msgstr "---"
+-
+-#~ msgid "Use default layout in new windows"
+-#~ msgstr "ಹೊಸ ವಿಂಡೋಗಳಲ್ಲಿ ಪೂರ್ವನಿಯೋಜಿತ ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ"
+-
+-#~ msgid "_Acceleration:"
+-#~ msgstr "ವೇಗವರ್ಧನೆ (_A):"
+-
+-#~| msgid "S_peed:"
+-#~ msgid "Speed"
+-#~ msgstr "ವೇಗ"
+-
+-#~ msgid "Battery charging"
+-#~ msgstr "ಬ್ಯಾಟರಿ ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ"
+-
+-#~ msgid "Battery discharging"
+-#~ msgstr "ಬ್ಯಾಟರಿ ಡಿಸ್ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ"
+-
+-#~ msgid "%.0lf%% charged"
+-#~ msgstr "%.0lf%% ಚಾರ್ಜ್ ಆಗಿದೆ"
+-
+-#~ msgid "Ask me"
+-#~ msgstr "ನನ್ನನ್ನು ಕೇಳು"
+-
+-#~ msgid "On AC power:"
+-#~ msgstr "AC ವಿದ್ಯುಚ್ಛಕ್ತಿಯಲ್ಲಿ:"
+-
+-#~ msgid "Put the computer to sleep when inactive:"
+-#~ msgstr "ನಿಷ್ಕ್ರಿಯವಾಗಿದ್ದಾಗ ಗಣಕವನ್ನು ಜಡಸ್ಥಿತಿಗೆ ಕಳುಹಿಸು:"
+-
+-#~ msgid "Shutdown"
+-#~ msgstr "ಸ್ಥಗಿತಗೊಳಿಸು"
+-
+-#~ msgid "When the power button is pressed:"
+-#~ msgstr "ವಿದ್ಯುತ್ ಗುಂಡಿಯನ್ನು ಒತ್ತಿದಾಗ:"
+-
+-#~ msgid "When the sleep button is pressed:"
+-#~ msgstr "ಜಡವಾಗಿಸುವ ಗುಂಡಿಯನ್ನು ಒತ್ತಿದಾಗ:"
+-
+-#~| msgid "Mutt"
+-#~ msgid "Mute"
+-#~ msgstr "ಮೂಕ"
+-
+-#, fuzzy
+-#~| msgid "_Keyboard Accessibility"
+-#~ msgid "Keyboard;Mouse;a11y;Accessibility;"
+-#~ msgstr "ಕೀಲಿಮಣೆ ನಿಲುಕಣೆ (_K)"
+-
+-#~ msgctxt "universal access, contrast"
+-#~ msgid "<span size=\"x-large\">High/Inverse</span>"
+-#~ msgstr "<span size=\"x-large\">ಉತ್ತಮ/ವಿಲೋಮ</span>"
+-
+-#~ msgctxt "universal access, contrast"
+-#~ msgid "<span size=\"x-large\">High</span>"
+-#~ msgstr "<span size=\"x-large\">ಉತ್ತಮ</span>"
+-
+-#~ msgctxt "universal access, contrast"
+-#~ msgid "<span size=\"x-large\">Low</span>"
+-#~ msgstr "<span size=\"x-large\">ಕೆಳ ಮಟ್ಟದ</span>"
+-
+-#~ msgctxt "universal access, contrast"
+-#~ msgid "<span size=\"x-large\">Normal</span>"
+-#~ msgstr "<span size=\"x-large\">ಸಾಮಾನ್ಯ</span>"
+-
+-#~ msgid "Image/label border"
+-#~ msgstr "ಚಿತ್ರ/ಲೇಬಲ್ ಅಂಚು"
+-
+-#~ msgid "Width of border around the label and image in the alert dialog"
+-#~ msgstr "ಎಚ್ಚರಿಕಾ ಸಂವಾದದಲ್ಲಿನ ಲೇಬಲ್‌ನ ಹಾಗು ಚಿತ್ರದ ಸುತ್ತಮುತ್ತಲಿನ ಅಂಚಿನ ಅಗಲ"
+-
+-#~ msgid "The type of alert"
+-#~ msgstr "ಎಚ್ಚರಿಕೆಯ ಬಗೆ"
+-
+-#~ msgid "The buttons shown in the alert dialog"
+-#~ msgstr "ಎಚ್ಚರಿಕೆ ಸಂವಾದದಲ್ಲಿ ತೋರಿಸಲಾದ ಗುಂಡಿಗಳು"
+-
+-#~ msgid "Place your left thumb on %s"
+-#~ msgstr "ನಿಮ್ಮ ಎಡ ಹೆಬ್ಬೆರಳನ್ನು %s ಮೇಲೆ ಇರಿಸಿ"
+-
+-#~ msgid "Swipe your left thumb on %s"
+-#~ msgstr "ನಿಮ್ಮ ಎಡ ಹೆಬ್ಬೆರಳನ್ನು %s ನ ಮೇಲೆ ಸ್ವೈಪ್‌ ಮಾಡಿ"
+-
+-#~ msgid "Place your left index finger on %s"
+-#~ msgstr "ನಿಮ್ಮ ಎಡ ತೋರುಬೆರಳನ್ನು %s ಮೇಲೆ ಇರಿಸಿ"
+-
+-#~ msgid "Swipe your left index finger on %s"
+-#~ msgstr "ನಿಮ್ಮ ಎಡ ತೋರು ಬೆರಳನ್ನು %s ನ ಮೇಲೆ ಸ್ವೈಪ್‌ ಮಾಡಿ"
+-
+-#~ msgid "Place your left middle finger on %s"
+-#~ msgstr "ನಿಮ್ಮ ಎಡ ಮಧ್ಯದ ಬೆರಳನ್ನು %s ನ ಮೇಲೆ ಇರಿಸಿ"
+-
+-#~ msgid "Swipe your left middle finger on %s"
+-#~ msgstr "ನಿಮ್ಮ ಎಡ ಮಧ್ಯದ ಬೆರಳನ್ನು %s ನ ಮೇಲೆ ಸ್ವೈಪ್‌ ಮಾಡಿ"
+-
+-#~ msgid "Place your left ring finger on %s"
+-#~ msgstr "ನಿಮ್ಮ ಎಡ ಉಂಗುರ ಬೆರಳನ್ನು %s ಮೇಲೆ ಇರಿಸಿ"
+-
+-#~ msgid "Swipe your left ring finger on %s"
+-#~ msgstr "ನಿಮ್ಮ ಎಡ ಉಂಗುರದ ಬೆರಳನ್ನು %s ನ ಮೇಲೆ ಸ್ವೈಪ್‌ ಮಾಡಿ"
+-
+-#~ msgid "Place your left little finger on %s"
+-#~ msgstr "ನಿಮ್ಮ ಎಡ ಕಿರು ಬೆರಳನ್ನು %s ಮೇಲೆ ಇರಿಸಿ"
+-
+-#~ msgid "Swipe your left little finger on %s"
+-#~ msgstr "ನಿಮ್ಮ ಎಡ ಕಿರು ಬೆರಳನ್ನು %s ನ ಮೇಲೆ ಸ್ವೈಪ್‌ ಮಾಡಿ"
+-
+-#~ msgid "Place your right thumb on %s"
+-#~ msgstr "ನಿಮ್ಮ ಬಲ ಹೆಬ್ಬೆರಳನ್ನು %s ಮೇಲೆ ಇರಿಸಿ"
+-
+-#~ msgid "Swipe your right thumb on %s"
+-#~ msgstr "ನಿಮ್ಮ ಬಲ ಹೆಬ್ಬೆರಳನ್ನು %s ನ ಮೇಲೆ ಸ್ವೈಪ್‌ ಮಾಡಿ"
+-
+-#~ msgid "Place your right index finger on %s"
+-#~ msgstr "ನಿಮ್ಮ ಬಲ ತೋರು ಬೆರಳನ್ನು %s ಮೇಲೆ ಇರಿಸಿ"
+-
+-#~ msgid "Swipe your right index finger on %s"
+-#~ msgstr "ನಿಮ್ಮ ಬಲ ತೋರು ಬೆರಳನ್ನು %s ನ ಮೇಲೆ ಸ್ವೈಪ್‌ ಮಾಡಿ"
+-
+-#~ msgid "Place your right middle finger on %s"
+-#~ msgstr "ನಿಮ್ಮ ಬಲ ಮಧ್ಯದ ಬೆರಳನ್ನು %s ಮೇಲೆ ಇರಿಸಿ"
+-
+-#~ msgid "Swipe your right middle finger on %s"
+-#~ msgstr "ನಿಮ್ಮ ಎಡ ಮಧ್ಯದ ಬೆರಳನ್ನು %s ನ ಮೇಲೆ ಸ್ವೈಪ್‌ ಮಾಡಿ"
+-
+-#~ msgid "Place your right ring finger on %s"
+-#~ msgstr "ನಿಮ್ಮ ಬಲ ಉಂಗುರದ ಬೆರಳನ್ನು %s ಮೇಲೆ ಇರಿಸಿ"
+-
+-#~ msgid "Swipe your right ring finger on %s"
+-#~ msgstr "ನಿಮ್ಮ ಬಲ ಉಂಗುರದ ಬೆರಳನ್ನು %s ನ ಮೇಲೆ ಸ್ವೈಪ್‌ ಮಾಡಿ"
+-
+-#~ msgid "Place your right little finger on %s"
+-#~ msgstr "ನಿಮ್ಮ ಬಲ ಕಿರು ಬೆರಳನ್ನು %s ಮೇಲೆ ಇರಿಸಿ"
+-
+-#~ msgid "Swipe your right little finger on %s"
+-#~ msgstr "ನಿಮ್ಮ ಬಲ ಕಿರು ಬೆರಳನ್ನು %s ನ ಮೇಲೆ ಸ್ವೈಪ್‌ ಮಾಡಿ"
+-
+-#~ msgid "Place your finger on the reader again"
+-#~ msgstr "ನಿಮ್ಮ ಬೆರಳನ್ನು ಓದುಗನ ಮೇಲೆ ಇನ್ನೊಮ್ಮೆ ಇರಿಸಿ"
+-
+-#~ msgid "Swipe your finger again"
+-#~ msgstr "ನಿಮ್ಮ ಬೆರಳನ್ನು ಇನ್ನೊಮ್ಮೆ ಸ್ವೈಪ್‌ ಮಾಡಿ"
+-
+-#~ msgid "Swipe was too short, try again"
+-#~ msgstr "ಸ್ವೈಪ್ ಮಾಡಿದ ಕಾಲಾವಧಿ ಬಹಳ ಸಣ್ಣದಾಗಿದೆ, ಇನ್ನೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ"
+-
+-#~ msgid "Your finger was not centered, try swiping your finger again"
+-#~ msgstr "ನಿಮ್ಮ ಬೆರಳು ಮಧ್ಯದಲ್ಲಿ ಇಲ್ಲ, ನಿಮ್ಮ ಬೆರಳನ್ನು ಇನ್ನೊಮ್ಮೆ ಸ್ವೈಪ್‌ ಮಾಡಿ ಪ್ರಯತ್ನಿಸಿ"
+-
+-#~ msgid "Remove your finger, and try swiping your finger again"
+-#~ msgstr "ನಿಮ್ಮ ಬೆರಳನ್ನು ತೆಗೆಯಿರಿ, ಹಾಗು ಬೆರಳನ್ನು ಇನ್ನೊಮ್ಮೆ ಸ್ವೈಪ್‌ ಮಾಡಿ ಪ್ರಯತ್ನಿಸಿ"
+-
+-#~ msgid "No Image"
+-#~ msgstr "ಯಾವುದೆ ಚಿತ್ರವಿಲ್ಲ"
+-
+-#~ msgid "Images"
+-#~ msgstr "ಚಿತ್ರಗಳು"
+-
+-#~ msgid "All Files"
+-#~ msgstr "ಎಲ್ಲಾ ಕಡತಗಳು"
+-
+-#~ msgid ""
+-#~ "There was an error while trying to get the addressbook information\n"
+-#~ "Evolution Data Server can't handle the protocol"
+-#~ msgstr ""
+-#~ "ವಿಳಾಸ ಪುಸ್ತಕ ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಲು ಪ್ರಯತ್ನಿಸುವಾಗ ಒಂದು ದೋಷವು ಎದುರಾಗಿದೆ\n"
+-#~ "ಎವಲ್ಯೂಶನ್ ದತ್ತಾಂಶ ಪರಿಚಾರಕವು ಈ ಪ್ರೋಟೊಕಾಲನ್ನು ನಿಭಾಯಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ"
+-
+-#~ msgid "Unable to open address book"
+-#~ msgstr "ವಿಳಾಸ ಪುಸ್ತಕವನ್ನು ತೆರೆಯಲಾಗಲಿಲ್ಲ"
+-
+-#~ msgid "About %s"
+-#~ msgstr "%s ನ ಬಗ್ಗೆ"
+-
+-#~ msgid "A_IM/iChat:"
+-#~ msgstr "A_IM/iChat:"
+-
+-#~ msgid "C_ompany:"
+-#~ msgstr "ಕಂಪನಿ(_o):"
+-
+-#~ msgid "Change Passwo_rd..."
+-#~ msgstr "ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸು(_r)..."
+-
+-#~ msgid "Ci_ty:"
+-#~ msgstr "ಊರು(_t):"
+-
+-#~ msgid "Cou_ntry:"
+-#~ msgstr "ದೇಶ(_n):"
+-
+-#~ msgid "Disable _Fingerprint Login..."
+-#~ msgstr "ಬೆರಳಗುರುತಿನ ಪ್ರವೇಶವನ್ನು ಅಶಕ್ತಗೊಳಿಸು(_F)..."
+-
+-#~ msgid "Email"
+-#~ msgstr "ಇಮೇಲ್"
+-
+-#~ msgid "Enable _Fingerprint Login..."
+-#~ msgstr "ಬೆರಳಗುರುತಿನ ಪ್ರವೇಶವನ್ನು ಶಕ್ತಗೊಳಿಸು(_F)..."
+-
+-#~ msgid "Hom_e:"
+-#~ msgstr "ಮನೆ(_e):"
+-
+-#~ msgid "IC_Q:"
+-#~ msgstr "IC_Q:"
+-
+-#~ msgid "Instant Messaging"
+-#~ msgstr "ಇನ್‌ಸ್ಟಂಟ್ ಮೆಸೇಜಿಂಗ್"
+-
+-#~ msgid "M_SN:"
+-#~ msgstr "M_SN:"
+-
+-#~ msgid "P.O. _box:"
+-#~ msgstr "P.O. ಪೆಟ್ಟಿಗೆ(_b):"
+-
+-#~ msgid "P._O. box:"
+-#~ msgstr "P._O. ಪೆಟ್ಟಿಗೆ:"
+-
+-#~ msgid "State/Pro_vince:"
+-#~ msgstr "ರಾಜ್ಯ/ಪ್ರದೇಶ(_v):"
+-
+-#~ msgid "Web _log:"
+-#~ msgstr "ಜಾಲ ದಾಖಲೆ(_l):"
+-
+-#~ msgid "Wor_k:"
+-#~ msgstr "ಕೆಲಸ(_k):"
+-
+-#~ msgid "Work"
+-#~ msgstr "ಕೆಲಸ"
+-
+-#~ msgid "Work _fax:"
+-#~ msgstr "ಕೆಲಸದಲ್ಲಿನ ಫ್ಯಾಕ್ಸ್‍(_f):"
+-
+-#~ msgid "ZIP/_Postal code:"
+-#~ msgstr "ಝಿಪ್/ಅಂಚೆ ಕೋಡ್(_P):"
+-
+-#, fuzzy
+-#~ msgid "_GroupWise:"
+-#~ msgstr "ಗುಂಪಿನ ಕ್ರಮ(_G):"
+-
+-#~ msgid "_Home page:"
+-#~ msgstr "ನೆಲೆ ಪುಟ(_H):"
+-
+-#~ msgid "_Home:"
+-#~ msgstr "ಮನೆ(_H):"
+-
+-#~ msgid "_State/Province:"
+-#~ msgstr "ರಾಜ್ಯ/ಪ್ರದೇಶ(_S):"
+-
+-#~ msgid "_Work:"
+-#~ msgstr "ಕೆಲಸ(_W):"
+-
+-#~ msgid "_XMPP:"
+-#~ msgstr "_XMPP:"
+-
+-#~ msgid "_ZIP/Postal code:"
+-#~ msgstr "_ZIP/ಅಂಚೆ ಕೋಡ್:"
+-
+-#~ msgid "Swipe finger on reader"
+-#~ msgstr "ಬೆರಳನ್ನು ಓದುಗನ ಮೇಲೆ ಇನ್ನೊಮ್ಮೆ ಸ್ವೈಪ್ ಮಾಡಿ"
+-
+-#~ msgid "Place finger on reader"
+-#~ msgstr "ಬೆರಳನ್ನು ಓದುಗನ ಮೇಲೆ ಇರಿಸಿ"
+-
+-#~ msgid "Child exited unexpectedly"
+-#~ msgstr "ಚೈಲ್ಡ್‍ ಅನಿರೀಕ್ಷಿತವಾಗಿ ನಿರ್ಗಮಿಸಿದೆ"
+-
+-#~ msgid "Could not shutdown backend_stdin IO channel: %s"
+-#~ msgstr "backend_stdin IO ಮಾರ್ಗವನ್ನು ಮುಚ್ಚಲಾಗಿಲ್ಲ: %s"
+-
+-#~ msgid "Could not shutdown backend_stdout IO channel: %s"
+-#~ msgstr "backend_stdout IO ಮಾರ್ಗವನ್ನು ಮುಚ್ಚಲಾಗಿಲ್ಲ: %s"
+-
+-#~ msgid "System error: %s."
+-#~ msgstr "ಗಣಕ ದೋಷ: %s."
+-
+-#~ msgid "Unable to launch %s: %s"
+-#~ msgstr "%s ಅನ್ನು ಆರಂಭಿಸಲಾಗಿಲ್ಲ: %s"
+-
+-#~ msgid "Unable to launch backend"
+-#~ msgstr "ಬ್ಯಾಕೆಂಡನ್ನು ಆರಂಭಿಸಲಾಗಿಲ್ಲ"
+-
+-#~ msgid "A system error has occurred"
+-#~ msgstr "ಒಂದು ಗಣಕ ದೋಷವು ಎದುರಾಗಿದೆ"
+-
+-#~ msgid "Click <b>Change password</b> to change your password."
+-#~ msgstr ""
+-#~ "ನಿಮ್ಮ ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸಲು <b>ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸು</b> ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ."
+-
+-#~ msgid ""
+-#~ "Please type your password again in the <b>Retype new password</b> field."
+-#~ msgstr ""
+-#~ "<b> ಹೊಸ ಗುಪ್ತಪದವನ್ನು ಪುನಃ ನಮೂದಿಸು</b> ಕ್ಷೇತ್ರದಲ್ಲಿ ದಯವಿಟ್ಟು ನಿಮ್ಮ ಗುಪ್ತಪದವನ್ನು "
+-#~ "ಪುನಃ ನಮೂದಿಸಿ."
+-
+-#~ msgid "Change pa_ssword"
+-#~ msgstr "ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸು(_s)"
+-
+-#~ msgid "Change your password"
+-#~ msgstr "ನಿಮ್ಮ ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸಿ"
+-
+-#~ msgid ""
+-#~ "To change your password, enter your current password in the field below "
+-#~ "and click <b>Authenticate</b>.\n"
+-#~ "After you have authenticated, enter your new password, retype it for "
+-#~ "verification and click <b>Change password</b>."
+-#~ msgstr ""
+-#~ "ನಿಮ್ಮ ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸಲು, ನಿಮ್ಮ ಈಗಿನ ಗುಪ್ತಪದವನ್ನು ಈ ಕೆಳಗಿನ ಕ್ಷೇತ್ರದಲ್ಲಿ "
+-#~ "ನಮೂದಿಸಿ ಹಾಗು <b>ದೃಢೀಕರಿಸು</b> ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ. \n"
+-#~ "ನೀವು ದೃಢೀಕರಿಸಿದ ನಂತರ, ನಿಮ್ಮ ಹೊಸ ಗುಪ್ತಪದವನ್ನು ನಮೂದಿಸಿ, ಅದರ ಪರಿಶೀಲನೆಗೆ ಪುನಃ "
+-#~ "ಟೈಪಿಸಿ ಹಾಗು<b>ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸು</b> ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ."
+-
+-#~ msgid "Accessible Lo_gin"
+-#~ msgstr "ನಿಲುಕಿಸಿಕೊಳ್ಳಬಹುದಾದಂತಹ ಪ್ರವೇಶ(_g)"
+-
+-#~ msgid "Assistive Technologies"
+-#~ msgstr "ಸಹಾಯಕ ತಂತ್ರಜ್ಞಾನಗಳು"
+-
+-#~ msgid "Assistive Technologies Preferences"
+-#~ msgstr "ಸಹಾಯಕ ತಂತ್ರಜ್ಞಾನದ ಆದ್ಯತೆಗಳು"
+-
+-#~ msgid ""
+-#~ "Changes to enable assistive technologies will not take effect until your "
+-#~ "next log in."
+-#~ msgstr ""
+-#~ "ನೀವು ಮುಂದಿನ ಬಾರಿ ಪ್ರವೇಶಿಸುವವರೆಗೂ ಸಹಾಯಕ ತಂತ್ರಜ್ಞಾನಗಳಿಗೆ ಮಾಡಲಾದ ಬದಲಾವಣೆಗಳು "
+-#~ "ಕಾರ್ಯರೂಪಕ್ಕೆ ಬರುವುದಿಲ್ಲ."
+-
+-#~ msgid "Close and _Log Out"
+-#~ msgstr "ಮುಚ್ಚು ಹಾಗು ನಿರ್ಗಮಿಸು(_L)"
+-
+-#~ msgid "Jump to Preferred Applications dialog"
+-#~ msgstr "ಇಚ್ಛೆಯ ಅನ್ವಯಗಳ ಸಂವಾದಕ್ಕೆ ತೆರಳು"
+-
+-#~ msgid "Jump to the Accessible Login dialog"
+-#~ msgstr "ನಿಲುಕಣಾ ಪ್ರವೇಶ ಸಂವಾದಕ್ಕೆ ತೆರಳು"
+-
+-#~ msgid "Jump to the Keyboard Accessibility dialog"
+-#~ msgstr "ಕೀಲಿಮಣೆ ನಿಲುಕಣೆ ಸಂವಾದಕ್ಕೆ ತೆರಳು"
+-
+-#~ msgid "Jump to the Mouse Accessibility dialog"
+-#~ msgstr "ಕೀಲಿಮಣೆ ನಿಲುಕಣೆ ಸಂವಾದಕ್ಕೆ ತೆರಳು"
+-
+-#~ msgid "_Enable assistive technologies"
+-#~ msgstr "ಸಹಾಯಕ ತಂತ್ರಜ್ಞಾನವನ್ನು ಶಕ್ತಗೊಳಿಸು(_E)"
+-
+-#~ msgid "_Mouse Accessibility"
+-#~ msgstr "ಮೌಸ್‌ನ ನಿಲುಕಣೆ(_M)"
+-
+-#~ msgid "_Preferred Applications"
+-#~ msgstr "ಅಪೇಕ್ಷಿತ ಅನ್ವಯಗಳು(_P)"
+-
+-#~ msgid "Choose which accessibility features to enable when you log in"
+-#~ msgstr ""
+-#~ "ನೀವು ಪ್ರವೇಶಿಸಿದಾಗ ಯಾವ ನಿಲುಕಣಾ ಸವಲತ್ತುಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಬೇಕು ಎಂದು ಆಯ್ಕೆ ಮಾಡಿ"
+-
+-#~ msgid "Font may be too large"
+-#~ msgstr "ಅಕ್ಷರಶೈಲಿಯು ಬಹಳ ದೊಡ್ಡದಾಗಿದೆ"
+-
+-#~ msgid ""
+-#~ "The font selected is %d point large, and may make it difficult to "
+-#~ "effectively use the computer.  It is recommended that you select a size "
+-#~ "smaller than %d."
+-#~ msgid_plural ""
+-#~ "The font selected is %d points large, and may make it difficult to "
+-#~ "effectively use the computer. It is recommended that you select a size "
+-#~ "smaller than %d."
+-#~ msgstr[0] ""
+-#~ "ಆರಿಸಲಾದ ಅಕ್ಷರಶೈಲಿಯು %d ಪಾಯಿಂಟಿನಷ್ಟು ದೊಡ್ಡದಾಗಿದೆ, ಹಾಗು ಇದು ಗಣಕವನ್ನು "
+-#~ "ಪರಿಣಾಮಕಾರಿಯಾಗಿ ಬಳಸಲು ಕಷ್ಟವಾಗಿಸುತ್ತದೆ.  ಆದ್ದರಿಂದ %d ಗಿಂತ ಚಿಕ್ಕ ಗಾತ್ರದ "
+-#~ "ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸಲು ಸಲಹೆ ಮಾಡಲಾಗುತ್ತದೆ."
+-#~ msgstr[1] ""
+-#~ "ಆರಿಸಲಾದ ಅಕ್ಷರಶೈಲಿಯು %d ಪಾಯಿಂಟ್‍ಗಳಷ್ಟು ದೊಡ್ಡದಾಗಿದೆ, ಹಾಗು ಇದು ಗಣಕವನ್ನು "
+-#~ "ಪರಿಣಾಮಕಾರಿಯಾಗಿ ಬಳಸಲು ಕಷ್ಟವಾಗಿಸುತ್ತದೆ.  ಆದ್ದರಿಂದ %d ಗಿಂತ ಚಿಕ್ಕ ಗಾತ್ರದ "
+-#~ "ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸಲು ಸಲಹೆ ಮಾಡಲಾಗುತ್ತದೆ."
+-
+-#~ msgid ""
+-#~ "The font selected is %d point large, and may make it difficult to "
+-#~ "effectively use the computer.  It is recommended that you select a "
+-#~ "smaller sized font."
+-#~ msgid_plural ""
+-#~ "The font selected is %d points large, and may make it difficult to "
+-#~ "effectively use the computer. It is recommended that you select a smaller "
+-#~ "sized font."
+-#~ msgstr[0] ""
+-#~ "ಆರಿಸಲಾದ ಅಕ್ಷರಶೈಲಿಯು %d ಪಾಯಿಂಟಿನಷ್ಟು ದೊಡ್ಡದಾಗಿದೆ, ಹಾಗು ಇದು ಗಣಕವನ್ನು "
+-#~ "ಪರಿಣಾಮಕಾರಿಯಾಗಿ ಬಳಸಲು ಕಷ್ಟವಾಗಿಸುತ್ತದೆ.  ಆದ್ದರಿಂದ ಚಿಕ್ಕ ಗಾತ್ರದ ಅಕ್ಷರಶೈಲಿಯನ್ನು "
+-#~ "ಬಳಸಲು ಸಲಹೆ ಮಾಡಲಾಗುತ್ತದೆ."
+-#~ msgstr[1] ""
+-#~ "ಆರಿಸಲಾದ ಅಕ್ಷರಶೈಲಿಯು %d ಪಾಯಿಂಟ್‍ಗಳಷ್ಟು ದೊಡ್ಡದಾಗಿದೆ, ಹಾಗು ಇದು ಗಣಕವನ್ನು "
+-#~ "ಪರಿಣಾಮಕಾರಿಯಾಗಿ ಬಳಸಲು ಕಷ್ಟವಾಗಿಸುತ್ತದೆ.  ಆದ್ದರಿಂದ ಚಿಕ್ಕ ಗಾತ್ರದ ಅಕ್ಷರಶೈಲಿಯನ್ನು "
+-#~ "ಬಳಸಲು ಸಲಹೆ ಮಾಡಲಾಗುತ್ತದೆ."
+-
+-#~ msgid "Use previous font"
+-#~ msgstr "ಹಿಂದಿನ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸು"
+-
+-#~ msgid "Use selected font"
+-#~ msgstr "ಆರಿಸಲಾದ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸು"
+-
+-#~ msgid "Specify the filename of a theme to install"
+-#~ msgstr "ಅನುಸ್ಥಾಪಿಸಲು ಒಂದು ಪರಿಸರವಿನ್ಯಾಸ ಇರುವ ಕಡತವನ್ನು ಸೂಚಿಸಿ"
+-
+-#~ msgid ""
+-#~ "Specify the name of the page to show (theme|background|fonts|interface)"
+-#~ msgstr "ತೋರಿಸಲು ಪುಟದ ಹೆಸರನ್ನು ಸೂಚಿಸಿ"
+-
+-#~ msgid "[WALLPAPER...]"
+-#~ msgstr "[WALLPAPER...]"
+-
+-#~ msgid ""
+-#~ "This theme will not look as intended because the required GTK+ theme "
+-#~ "engine '%s' is not installed."
+-#~ msgstr ""
+-#~ "ಈ ಪರಿಸರವಿನ್ಯಾಸವು ಅಂದುಕೊಂಡಂತೆ ಕಾಣಿಸುವುದಿಲ್ಲ ಏಕೆಂದರೆ ಅಗತ್ಯವಿರುವ GTK+ "
+-#~ "ಪರಿಸರವಿನ್ಯಾಸ ಎಂಜಿನ್ '%s' ಅನ್ನು ಅನುಸ್ಥಾಪಿಸಲಾಗಿಲ್ಲ."
+-
+-#~ msgid "Apply Background"
+-#~ msgstr "ಹಿನ್ನಲೆ ಚಿತ್ರವನ್ನು ಅನ್ವಯಿಸು"
+-
+-#~ msgid "Apply Font"
+-#~ msgstr "ಅಕ್ಷರಶೈಲಿಯನ್ನು ಅನ್ವಯಿಸು"
+-
+-#~ msgid "Revert Font"
+-#~ msgstr "ಅಕ್ಷರಶೈಲಿಯನ್ನು ಪೂರ್ವಸ್ಥಿತಿಗೆ ಮರಳಿಸು"
+-
+-#~ msgid ""
+-#~ "The current theme suggests a background and a font. Also, the last "
+-#~ "applied font suggestion can be reverted."
+-#~ msgstr ""
+-#~ "ಪ್ರಸಕ್ತ ಪರಿಸರ ವಿನ್ಯಾಸವು ಒಂದು ಹಿನ್ನಲೆ ಚಿತ್ರವನ್ನು ಹಾಗು ಒಂದು ಅಕ್ಷರಶೈಲಿಯನ್ನು ಸಲಹೆ "
+-#~ "ಮಾಡುತ್ತದೆ. ಹಾಗು ಹಿಂದೆ ಅನ್ವಯಿಸಲಾದ ಅಕ್ಷರಶೈಲಿ ಸಲಹೆಯ ಪೂರ್ವ ಸ್ಥಿತಿಗೆ ಮರಳಿಸಿಬಹುದು."
+-
+-#~ msgid ""
+-#~ "The current theme suggests a background. Also, the last applied font "
+-#~ "suggestion can be reverted."
+-#~ msgstr ""
+-#~ "ಪ್ರಸಕ್ತ ಪರಿಸರ ವಿನ್ಯಾಸವು ಒಂದು ಹಿನ್ನಲೆ ಚಿತ್ರವನ್ನು ಸಲಹೆ ಮಾಡುತ್ತದೆ. ಹಾಗು ಹಿಂದೆ "
+-#~ "ಅನ್ವಯಿಸಲಾದ ಅಕ್ಷರಶೈಲಿ ಸಲಹೆಯ ಪೂರ್ವ ಸ್ಥಿತಿಗೆ ಮರಳಿಸಿಬಹುದು."
+-
+-#~ msgid "The current theme suggests a background and a font."
+-#~ msgstr "ಈಗಿನ ಪರಿಸರವಿನ್ಯಾಸ‍ ಒಂದು ಹಿನ್ನಲೆ ಚಿತ್ರ ಹಾಗು ಅಕ್ಷರಶೈಲಿಯನ್ನು ಸೂಚಿಸುತ್ತದೆ."
+-
+-#~ msgid ""
+-#~ "The current theme suggests a font. Also, the last applied font suggestion "
+-#~ "can be reverted."
+-#~ msgstr ""
+-#~ "ಪ್ರಸಕ್ತ ಪರಿಸರ ವಿನ್ಯಾಸವು ಒಂದು ಅಕ್ಷರಶೈಲಿಯನ್ನು ಸಲಹೆ ಮಾಡುತ್ತದೆ. ಹಾಗು ಹಿಂದೆ "
+-#~ "ಅನ್ವಯಿಸಲಾದ ಅಕ್ಷರಶೈಲಿ ಸಲಹೆಯ ಪೂರ್ವ ಸ್ಥಿತಿಗೆ ಮರಳಿಸಿಬಹುದು."
+-
+-#~ msgid "The current theme suggests a background."
+-#~ msgstr "ಈಗಿನ ಪರಿಸರವಿನ್ಯಾಸ‍ ಒಂದು ಹಿನ್ನಲೆ ಚಿತ್ರವನ್ನು ಸೂಚಿಸುತ್ತದೆ."
+-
+-#~ msgid "The last applied font suggestion can be reverted."
+-#~ msgstr "ಹಿಂದೆ ಅನ್ವಯಿಸಲಾದ ಅಕ್ಷರಶೈಲಿ ಸಲಹೆಯ ಪೂರ್ವ ಸ್ಥಿತಿಗೆ ಮರಳಿಸಿಬಹುದು."
+-
+-#~ msgid "The current theme suggests a font."
+-#~ msgstr "ಈಗಿನ ಪರಿಸರವಿನ್ಯಾಸ‍ ಒಂದು ಅಕ್ಷರಶೈಲಿಯನ್ನು ಸೂಚಿಸುತ್ತದೆ."
+-
+-#~ msgid "Best _shapes"
+-#~ msgstr "ಉತ್ತಮ ಆಕಾರಗಳು(_s)"
+-
+-#~ msgid "C_ustomize..."
+-#~ msgstr "ಇಚ್ಛೆಯಂತೆ ಬದಲಾಯಿಸಿ(_u)..."
+-
+-#~ msgid "Changing your cursor theme takes effect the next time you log in."
+-#~ msgstr ""
+-#~ "ನಿಮ್ಮ ತೆರೆಸೂಚಕದ ಪರಿಸರವಿನ್ಯಾಸ‍ದ ಬದಲಾವಣೆಯು ನೀವು ಮುಂದಿನ ಬಾರಿ ಪ್ರವೇಶಿಸಿದಾಗ "
+-#~ "ಕಾರ್ಯರೂಪಕ್ಕೆ ಬರುತ್ತದೆ."
+-
+-#~ msgid "Controls"
+-#~ msgstr "ನಿಯಂತ್ರಣಗಳು"
+-
+-#~ msgid "Customize Theme"
+-#~ msgstr "ಪರಿಸರವಿನ್ಯಾಸವನ್ನು ಇಚ್ಛೆಗೆ ತಕ್ಕಂತೆ ಬದಲಾಯಿಸಿ"
+-
+-#~ msgid "D_etails..."
+-#~ msgstr "ವಿವರಗಳು(_e)..."
+-
+-#~ msgid "Des_ktop font:"
+-#~ msgstr "ಗಣಕತೆರೆಯ ಅಕ್ಷರಶೈಲಿ(_k):"
+-
+-#~ msgid "Font Rendering Details"
+-#~ msgstr "ಅಕ್ಷರಶೈಲಿಯ ರೆಂಡರಿಂಗ್ ವಿವರಗಳು"
+-
+-#~ msgid "Get more backgrounds online"
+-#~ msgstr "ಇನ್ನಷ್ಟು ಹಿನ್ನಲೆ ಚಿತ್ರಗಳನ್ನು ಆನ್‌ಲೈನಿನಲ್ಲಿ ಪಡೆದುಕೊಳ್ಳಿ"
+-
+-#~ msgid "Get more themes online"
+-#~ msgstr "ಇನ್ನಷ್ಟು ಪರಿಸರವಿನ್ಯಾಸಗಳನ್ನು ಆನ್‌ಲೈನಿನಲ್ಲಿ ಪಡೆದುಕೊಳ್ಳಿ"
+-
+-#~ msgid "Gra_yscale"
+-#~ msgstr "ಗ್ರೇಸ್ಕೇಲ್(_y)"
+-
+-#~ msgid "Icons"
+-#~ msgstr "ಚಿಹ್ನೆಗಳು"
+-
+-#~ msgid "Icons only"
+-#~ msgstr "ಚಿಹ್ನೆಗಳು ಮಾತ್ರ"
+-
+-#~ msgid "N_one"
+-#~ msgstr "ಯಾವುದೂ ಇಲ್ಲ(_o)"
+-
+-#~ msgid "Open a dialog to specify the color"
+-#~ msgstr "ಬಣ್ಣವನ್ನು ಸೂಚಿಸಲು ಒಂದು ಸಂವಾದವನ್ನು ತೆರೆ"
+-
+-#~ msgid "R_esolution:"
+-#~ msgstr "ರೆಸಲ್ಯೂಶನ್(_e):"
+-
+-#~ msgid "Save Theme As..."
+-#~ msgstr "ಪರಿಸರವಿನ್ಯಾಸವನ್ನು ಹೀಗೆ ಉಳಿಸು..."
+-
+-#~ msgid "Save _As..."
+-#~ msgstr "ಹೀಗೆ ಉಳಿಸು(_A)..."
+-
+-#~ msgid "Sub_pixel (LCDs)"
+-#~ msgstr "ಉಪಪಿಕ್ಸೆಲ್ (LCDಗಳು)(_p)"
+-
+-#~ msgid "Sub_pixel smoothing (LCDs)"
+-#~ msgstr "ಉಪಪಿಕ್ಸೆಲ್ ಮೃದುಗೊಳಿಕೆ(_p) (LCDಗಳು)"
+-
+-#~ msgid "Subpixel Order"
+-#~ msgstr "ಉಪಪಿಕ್ಸೆಲ್ ಅನುಕ್ರಮ"
+-
+-#~ msgid "Text below items"
+-#~ msgstr "ಅಂಶಗಳ ಕೆಳಗೆ ಪಠ್ಯ"
+-
+-#~ msgid "Text beside items"
+-#~ msgstr "ಅಂಶಗಳ ಬದಿಯಲ್ಲಿನ ಪಠ್ಯ"
+-
+-#~ msgid "Text only"
+-#~ msgstr "ಪಠ್ಯ ಮಾತ್ರ"
+-
+-#~ msgid "The current controls theme does not support color schemes."
+-#~ msgstr "ಈಗಿನ ನಿಯಂತ್ರಣಗಳ ಪರಿಸರವಿನ್ಯಾಸ ಬಣ್ಣದ ಸ್ಕೀಮ್‍ಗಳನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."
+-
+-#~ msgid "Theme"
+-#~ msgstr "ಪರಿಸರವಿನ್ಯಾಸ"
+-
+-#~ msgid "VB_GR"
+-#~ msgstr "VB_GR"
+-
+-#~ msgid "_BGR"
+-#~ msgstr "_BGR"
+-
+-#~ msgid "_Description:"
+-#~ msgstr "ವಿವರಣೆ(_D):"
+-
+-#~ msgid "_Document font:"
+-#~ msgstr "ದಸ್ತಾವೇಜಿನ ಅಕ್ಷರಶೈಲಿ(_D):"
+-
+-#~ msgid "_Fixed width font:"
+-#~ msgstr "ಅಕ್ಷರಶೈಲಿಯ ನಿಗದಿತ ಅಗಲ(_F):"
+-
+-#~ msgid "_Monochrome"
+-#~ msgstr "ಏಕವರ್ಣ(_M)"
+-
+-#~ msgid "_None"
+-#~ msgstr "ಯಾವುದೂ ಇಲ್ಲ(_N)"
+-
+-#~ msgid "_RGB"
+-#~ msgstr "_RGB"
+-
+-#~ msgid "_Reset to Defaults"
+-#~ msgstr "ಪೂರ್ವನಿಯೋಜಿತಕ್ಕೆ ಮರುಹೊಂದಿಸು(_R)"
+-
+-#~ msgid "_Selected items:"
+-#~ msgstr "ಆರಿಸಲಾದ ಅಂಶಗಳು(_S):"
+-
+-#~ msgid "_Size:"
+-#~ msgstr "ಗಾತ್ರ:(_S):"
+-
+-#~ msgid "_Slight"
+-#~ msgstr "ಸ್ವಲ್ಪ(_S)"
+-
+-#~ msgid "_Tooltips:"
+-#~ msgstr "ಉಪಕರಣ ಸಲಹೆಗಳು(_T):"
+-
+-#~ msgid "_VRGB"
+-#~ msgstr "_VRGB"
+-
+-#~ msgid "_Window title font:"
+-#~ msgstr "ವಿಂಡೊ ಶೀರ್ಷಿಕೆ ಅಕ್ಷರಶೈಲಿ(_W):"
+-
+-#~ msgid "_Windows:"
+-#~ msgstr "ವಿಂಡೋಗಳು(_W):"
+-
+-#~ msgid "dots per inch"
+-#~ msgstr "ಪ್ರತಿ ಇಂಚಿನ ಚುಕ್ಕೆಗಳು"
+-
+-#~ msgid "Customize the look of the desktop"
+-#~ msgstr "ಗಣಕತೆರೆಯನ್ನು ನೋಟವನ್ನು ಇಚ್ಛೆಗೆ ತಕ್ಕಂತೆ ಬದಲಾಯಿಸಿ"
+-
+-#~ msgid "Installs themes packages for various parts of the desktop"
+-#~ msgstr "ಗಣಕತೆರೆಯ ವಿವಿಧ ಭಾಗಗಳಿಗೆ ಪ್ಯಾಕೇಜುಗಳ ಪರಿಸರವಿನ್ಯಾಸ‍ಗಳನ್ನು ಅನುಸ್ಥಾಪಿಸಿ"
+-
+-#~ msgid "Theme Installer"
+-#~ msgstr "ಪರಿಸರವಿನ್ಯಾಸ ಅನುಸ್ಥಾಪಕ"
+-
+-#~ msgid "Gnome Theme Package"
+-#~ msgstr "Gnome ಪ್ಯಾಕೇಜ್ ಅನುಸ್ಥಾಪಕ"
+-
+-#~ msgid "Slide Show"
+-#~ msgstr "ಜಾರುಫಲಕದ ಪ್ರದರ್ಶನ"
+-
+-#~ msgid "Image"
+-#~ msgstr "ಚಿತ್ರ"
+-
+-#~ msgid ""
+-#~ "<b>%s</b>\n"
+-#~ "%s, %s\n"
+-#~ "Folder: %s"
+-#~ msgstr ""
+-#~ "<b>%s</b>\n"
+-#~ "%s, %s\n"
+-#~ "ಕಡತಕೋಶ: %s"
+-
+-#~ msgid ""
+-#~ "<b>%s</b>\n"
+-#~ "%s\n"
+-#~ "Folder: %s"
+-#~ msgstr ""
+-#~ "<b>%s</b>\n"
+-#~ "%s\n"
+-#~ "ಕಡತಕೋಶ: %s"
+-
+-#~ msgid "Cannot install theme"
+-#~ msgstr "ಪರಿಸರವಿನ್ಯಾಸವನ್ನು ಅನುಸ್ಥಾಪಿಸಲಾಗಲಿಲ್ಲ"
+-
+-#~ msgid "The %s utility is not installed."
+-#~ msgstr "%s ಉಪಯುಕ್ತತೆಯು ಅನುಸ್ಥಾಪಿತಗೊಂಡಿಲ್ಲ."
+-
+-#~ msgid "There was a problem while extracting the theme."
+-#~ msgstr "ಪರಿಸರವಿನ್ಯಾಸವನ್ನು ಹೊರತೆಗೆಯುವಾಗ ಒಂದು ತೊಂದರೆ ಎದುರಾಗಿದೆ."
+-
+-#~ msgid "There was an error installing the selected file"
+-#~ msgstr "ಆರಿಸಲಾದ ಕಡತವನ್ನು ಅನುಸ್ಥಾಪಿಸುವಾಗ ಒಂದು ದೋಷವು ಕಂಡುಬಂದಿದೆ"
+-
+-#~ msgid "\"%s\" does not appear to be a valid theme."
+-#~ msgstr "\"%s\" ಒಂದು ಮಾನ್ಯವಾದ ಪರಿಸರವಿನ್ಯಾಸ‍ದಂತೆ ಕಾಣಿಸುತ್ತಿಲ್ಲ."
+-
+-#~ msgid ""
+-#~ "\"%s\" does not appear to be a valid theme. It may be a theme engine "
+-#~ "which you need to compile."
+-#~ msgstr ""
+-#~ "\"%s\" ಒಂದು ಮಾನ್ಯವಾದ ಪರಿಸರವಿನ್ಯಾಸ‍ದಂತೆ ಕಾಣಿಸುತ್ತಿಲ್ಲ. ಬಹುಷಃ ಇದು ನೀವು "
+-#~ "ಸಂಕಲಿಸಬೇಕಿರುವ ಒಂದು ಪರಿಸರವಿನ್ಯಾಸ ಎಂಜಿನ್ ಇರಬಹುದು."
+-
+-#~ msgid "Installation for theme \"%s\" failed."
+-#~ msgstr "\"%s\" ಪರಿಸರವಿನ್ಯಾಸ‍ಕ್ಕಾಗಿನ ಅನುಸ್ಥಾಪನೆಯು ವಿಫಲಗೊಂಡಿದೆ."
+-
+-#~ msgid "The theme \"%s\" has been installed."
+-#~ msgstr "\"%s\" ಪರಿಸರವಿನ್ಯಾಸ ಅನುಸ್ಥಾಪನೆಗೊಂಡಿದೆ."
+-
+-#~ msgid "Would you like to apply it now, or keep your current theme?"
+-#~ msgstr "ನೀವದನ್ನು ಅನ್ವಯಿಸಲು ಬಯಸುತ್ತೀರೆ, ಅಥವ ಈಗಿರುವುದನ್ನೆ ಇರಿಸಿಕೊಳ್ಳಲು ಬಯಸುತ್ತೀರೆ?"
+-
+-#~ msgid "Keep Current Theme"
+-#~ msgstr "ಈಗಿರುವ ಥೀಮನ್ನು ಇರಿಸಿಕೊ"
+-
+-#~ msgid "Apply New Theme"
+-#~ msgstr "ಹೊಸ ಥೀಮನ್ನು ಅನ್ವಯಿಸು"
+-
+-#~ msgid "GNOME Theme %s correctly installed"
+-#~ msgstr "GNOME ಪರಿಸರವಿನ್ಯಾಸ %s ಸರಿಯಾಗಿ ಅನುಸ್ಥಾಪಿತಗೊಂಡಿದೆ"
+-
+-#~ msgid "New themes have been successfully installed."
+-#~ msgstr "ಹೊಸ ಪರಿಸರವಿನ್ಯಾಸ‍ಗಳು ಯಶಸ್ವಿಯಾಗಿ ಅನುಸ್ಥಾಪಿಸಲ್ಪಟ್ಟಿವೆ."
+-
+-#~ msgid "No theme file location specified to install"
+-#~ msgstr "ಅನುಸ್ಥಾಪಿಸಲು ಯಾವುದೆ ಪರಿಸರವಿನ್ಯಾಸ ಕಡತದ ಸ್ಥಳಗಳು ಸೂಚಿಸಲಾಗಿಲ್ಲ"
+-
+-#~ msgid ""
+-#~ "Insufficient permissions to install the theme in:\n"
+-#~ "%s"
+-#~ msgstr ""
+-#~ "ಪರಿಸರವಿನ್ಯಾಸವನ್ನು ಇಲ್ಲಿ ಅನುಸ್ಥಾಪಿಸಲು ಸಾಕಷ್ಟು ಅನುಮತಿಗಳಿಲ್ಲ:\n"
+-#~ "%s"
+-
+-#~ msgid "Select Theme"
+-#~ msgstr "ಪರಿಸರವಿನ್ಯಾಸವನ್ನು ಆರಿಸು"
+-
+-#~ msgid "Theme Packages"
+-#~ msgstr "ಪರಿಸರವಿನ್ಯಾಸ ಪ್ಯಾಕೇಜ್‍ಗಳು"
+-
+-#~ msgid "Theme name must be present"
+-#~ msgstr "ಪರಿಸರವಿನ್ಯಾಸ‍ದ ಹೆಸರು ಇರಲೇಬೇಕು"
+-
+-#~ msgid "The theme already exists. Would you like to replace it?"
+-#~ msgstr "ಈ ಪರಿಸರವಿನ್ಯಾಸ ಈಗಾಗಲೆ ಇದೆ. ನೀವದನ್ನು ಬದಲಾಯಿಸಲು ಬಯಸುತ್ತೀರೆ?"
+-
+-#~ msgid "Would you like to delete this theme?"
+-#~ msgstr "ಈ ಪರಿಸರವಿನ್ಯಾಸವನ್ನು ನೀವು ಅಳಿಸಿ ಹಾಕಲು ಇಚ್ಚಿಸುತ್ತೀರೆ?"
+-
+-#~ msgid "Could not install theme engine"
+-#~ msgstr "ಪರಿಸರವಿನ್ಯಾಸದ ಎಂಜಿನ್‌ ಅನ್ನು ಅನುಸ್ಥಾಪಿಸಲಾಗಲಿಲ್ಲ"
+-
+-#~ msgid ""
+-#~ "Unable to start the settings manager 'gnome-settings-daemon'.\n"
+-#~ "Without the GNOME settings manager running, some preferences may not take "
+-#~ "effect. This could indicate a problem with DBus, or a non-GNOME (e.g. "
+-#~ "KDE) settings manager may already be active and conflicting with the "
+-#~ "GNOME settings manager."
+-#~ msgstr ""
+-#~ "ಸಿದ್ಧತಾ ವ್ಯವಸ್ಥಾಪಕ 'gnome-settings-daemon' ಅನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.\n"
+-#~ "GNOME ಸಿದ್ಧತವಾ ವ್ಯವಸ್ಥಾಪಕವು ಚಲಾಯಿತಗೊಳ್ಳದೆ, ಕೆಲವು ಆದ್ಯತೆಗಳು ಕಾರ್ಯರೂಪಕ್ಕೆ "
+-#~ "ಬರುವುದಿಲ್ಲ. ಇದು DBus ನಲ್ಲಿನ ಒಂದು ತೊಂದರೆಯನ್ನು ಸೂಚಿಸುತ್ತದೆ, ಅಥವ ಒಂದು GNOME "
+-#~ "ನದಾಗಿರದ (ಉದಾ. KDE) ಒಂದು ಸಿದ್ಧತಾ ವ್ಯವಸ್ಥಾಪಕವು ಈಗಾಗಲೆ ಸಕ್ರಿಯವಾಗಿದ್ದು ಅದು GNOME ನ "
+-#~ "ಸಿದ್ಧತಾ ವ್ಯವಸ್ಥಾಪಕದೊಂದಿಗೆ ಘರ್ಷಣೆಗೆ ಕಾರಣವಾಗಿರಬಹುದು."
+-
+-#~ msgid "Unable to load stock icon '%s'\n"
+-#~ msgstr "ಶೇಖರಣಾ ಚಿಹ್ನೆ '%s' ಅನ್ನು ಲೋಡ್‌ ಮಾಡಲು ಆಗಲಿಲ್ಲ\n"
+-
+-#~ msgid "There was an error displaying help: %s"
+-#~ msgstr "ಸಹಾಯವನ್ನು ತೋರಿಸುವಾಗ ಒಂದು ದೋಷ ಎದುರಾಗಿದೆ: %s"
+-
+-#~ msgid "Copying file: %u of %u"
+-#~ msgstr "ಕಡತವನ್ನು ನಕಲಿಸಲಾಗುತ್ತಿದೆ: %u, %u ನಲ್ಲಿ"
+-
+-#~ msgid "Copying '%s'"
+-#~ msgstr "'%s' ಅನ್ನು ನಕಲಿಸಲಾಗುತ್ತಿದೆ"
+-
+-#~ msgid "Parent Window"
+-#~ msgstr "ಮೂಲ ವಿಂಡೊ"
+-
+-#~ msgid "Parent window of the dialog"
+-#~ msgstr "ಸಂವಾದದ ಮೂಲ ವಿಂಡೊ"
+-
+-#~ msgid "From URI"
+-#~ msgstr "URI ಇಂದ"
+-
+-#~ msgid "URI currently transferring from"
+-#~ msgstr "URI ಪ್ರಸಕ್ತ ಇಲ್ಲಿಂದ ವರ್ಗಾಯಿತಗೊಳ್ಳುತ್ತಿದೆ"
+-
+-#~ msgid "To URI"
+-#~ msgstr "URI ಗೆ"
+-
+-#~ msgid "URI currently transferring to"
+-#~ msgstr "URI ಪ್ರಸಕ್ತ ಇಲ್ಲಿಗೆ ವರ್ಗಾಯಿತಗೊಳ್ಳುತ್ತಿದೆ"
+-
+-#~ msgid "Fraction completed"
+-#~ msgstr "ಮುಗಿಸಲಾದ ಅನುಪಾತ"
+-
+-#~ msgid "Fraction of transfer currently completed"
+-#~ msgstr "ಈಗ ಮುಗಿಸಲಾದ ವರ್ಗಾವಣೆಯ ಅಂಶ"
+-
+-#~ msgid "Current URI index"
+-#~ msgstr "ಈಗಿನ URI ಇಂಡೆಕ್ಸ್‍"
+-
+-#~ msgid "Current URI index - starts from 1"
+-#~ msgstr "ಈಗಿನ URI ಇಂಡೆಕ್ಸ್‍ - 1 ರಿಂದ ಆರಂಭಗೊಳ್ಳುತ್ತದೆ"
+-
+-#~ msgid "Total URIs"
+-#~ msgstr "ಒಟ್ಟು URIಗಳು"
+-
+-#~ msgid "Total number of URIs"
+-#~ msgstr "ಒಟ್ಟು ಸಂಖ್ಯೆಯ URIಗಳು"
+-
+-#~ msgid "File '%s' already exists. Do you want to overwrite it?"
+-#~ msgstr "ಕಡತ '%s' ಈಗಾಗಲೆ ಇದೆ. ನೀವದನ್ನು ಬದಲಾಯಿಸಲು ಬಯಸುತ್ತೀರೆ?"
+-
+-#~ msgid "_Skip"
+-#~ msgstr "ಉಪೇಕ್ಷಿಸಿ (_S)"
+-
+-#~ msgid "Overwrite _All"
+-#~ msgstr "ಎಲ್ಲವನ್ನೂ ತಿದ್ದಿಬರೆ(_A)"
+-
+-#~ msgid "Default Pointer - Current"
+-#~ msgstr "ಪೂರ್ವನಿಯೋಜಿತ ಸೂಚಕ - ಈಗಿರುವ"
+-
+-#~ msgid "White Pointer"
+-#~ msgstr "ಬಿಳಿಬಣ್ಣದ ಸೂಚಕ"
+-
+-#~ msgid "White Pointer - Current"
+-#~ msgstr "ಬಿಳಿಬಣ್ಣದ ಸೂಚಕ - ಈಗಿರುವ"
+-
+-#~ msgid "Large Pointer - Current"
+-#~ msgstr "ದೊಡ್ಡದಾದ ಸೂಚಕ - ಈಗಿರುವ"
+-
+-#~ msgid "Large White Pointer - Current"
+-#~ msgstr "ದೊಡ್ಡದಾದ ಬಿಳಿಯಬಣ್ಣದ ಸೂಚಕ - ಈಗಿರುವ"
+-
+-#~ msgid ""
+-#~ "This theme will not look as intended because the required GTK+ theme '%s' "
+-#~ "is not installed."
+-#~ msgstr ""
+-#~ "ಈ ಪರಿಸರವಿನ್ಯಾಸವು ಅಂದುಕೊಂಡಂತೆ ಕಾಣಿಸುವುದಿಲ್ಲ ಏಕೆಂದರೆ ಅಗತ್ಯವಿರುವ GTK+ "
+-#~ "ಪರಿಸರವಿನ್ಯಾಸ '%s' ಅನ್ನು ಅನುಸ್ಥಾಪಿಸಲಾಗಿಲ್ಲ."
+-
+-#~ msgid ""
+-#~ "This theme will not look as intended because the required window manager "
+-#~ "theme '%s' is not installed."
+-#~ msgstr ""
+-#~ "ಈ ಪರಿಸರವಿನ್ಯಾಸವು ಅಂದುಕೊಂಡಂತೆ ಕಾಣಿಸುವುದಿಲ್ಲ ಏಕೆಂದರೆ ಅಗತ್ಯವಿರುವ ವಿಂಡೊ ವ್ಯವಸ್ಥಾಪಕ "
+-#~ "ಪರಿಸರವಿನ್ಯಾಸ '%s' ಅನ್ನು ಅನುಸ್ಥಾಪಿಸಲಾಗಿಲ್ಲ."
+-
+-#~ msgid ""
+-#~ "This theme will not look as intended because the required icon theme '%s' "
+-#~ "is not installed."
+-#~ msgstr ""
+-#~ "ಈ ಪರಿಸರವಿನ್ಯಾಸವು ಅಂದುಕೊಂಡಂತೆ ಕಾಣಿಸುವುದಿಲ್ಲ ಏಕೆಂದರೆ ಅಗತ್ಯವಿರುವ ಚಿಹ್ನೆ "
+-#~ "ಪರಿಸರವಿನ್ಯಾಸ '%s' ಅನ್ನು ಅನುಸ್ಥಾಪಿಸಲಾಗಿಲ್ಲ."
+-
+-#~ msgid "Preferred Applications"
+-#~ msgstr "ಅಪೇಕ್ಷಿತ ಅನ್ವಯಗಳು"
+-
+-#~ msgid "Start the preferred visual assistive technology"
+-#~ msgstr "ಇಚ್ಛೆಯ ದೃಶ್ಯರೂಪದ ಸಹಾಯಕ ತಂತ್ರಜ್ಞಾನವನ್ನು ಆರಂಭಿಸು"
+-
+-#~ msgid "Visual Assistance"
+-#~ msgstr "ದೃಶ್ಯರೂಪದ ಸಹಾಯಕ"
+-
+-#~ msgid "Could not load the main interface"
+-#~ msgstr "ಮುಖ್ಯ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್‌ ಮಾಡಲಾಗಲಿಲ್ಲ"
+-
+-#~ msgid ""
+-#~ "Specify the name of the page to show (internet|multimedia|system|a11y)"
+-#~ msgstr "ತೋರಿಸಲು ಪುಟದ ಹೆಸರನ್ನು ಸೂಚಿಸಿ"
+-
+-#~ msgid "All %s occurrences will be replaced with actual link"
+-#~ msgstr "ಎಲ್ಲಾ %s ಸಂಭವಿಸುವಿಕೆಗಳು ನಿಜವಾದ ಸಂಪರ್ಕಕೊಂಡಿಯೊಂದಿಗೆ ಬದಲಾಯಿಸಲಾಗುತ್ತದೆ"
+-
+-#~ msgid "Co_mmand:"
+-#~ msgstr "ಆಜ್ಞೆ(_m):"
+-
+-#~ msgid "E_xecute flag:"
+-#~ msgstr "ಫ್ಲಾಗನ್ನು ಕಾರ್ಯಗತಗೊಳಿಸು(_x):"
+-
+-#~ msgid "Image Viewer"
+-#~ msgstr "ಚಿತ್ರ ವೀಕ್ಷಕ"
+-
+-#~ msgid "Instant Messenger"
+-#~ msgstr "ಇನ್‌ಸ್ಟಂಟ್ ಮೆಸೆಂಜರ್"
+-
+-#~ msgid "Internet"
+-#~ msgstr "ಅಂತರ್ಜಾಲ"
+-
+-#~ msgid "Mail Reader"
+-#~ msgstr "ಮೈಲ್ ಓದುಗ"
+-
+-#~ msgid "Mobility"
+-#~ msgstr "ಚಲನೆ"
+-
+-#~ msgid "Open link in new _tab"
+-#~ msgstr "ಕೊಂಡಿಯನ್ನು ಹೊಸ ಹಾಳೆಯಲ್ಲಿ ತೆರೆ(_t)"
+-
+-#~ msgid "Open link in new _window"
+-#~ msgstr "ಕೊಂಡಿಯನ್ನು ಹೊಸ ವಿಂಡೊದಲ್ಲಿ ತೆರೆ(_w)"
+-
+-#~ msgid "Open link with web browser _default"
+-#~ msgstr "ಕೊಂಡಿಯನ್ನು ಪೂರ್ವನಿಯೋಜಿತ ಜಾಲ ವೀಕ್ಷಕದಲ್ಲಿ ತೆರೆ (_d)"
+-
+-#~ msgid "Run at st_art"
+-#~ msgstr "ಆರಂಭದಲ್ಲಿ ಚಲಾಯಿಸು(_a)"
+-
+-#~ msgid "Run in t_erminal"
+-#~ msgstr "ಟರ್ಮಿನಲ್‍ನಲ್ಲಿ ಚಲಾಯಿಸು (_e)"
+-
+-#~ msgid "Terminal Emulator"
+-#~ msgstr "ಟರ್ಮಿನಲ್ ಎಮ್ಯುಲೇಟರ್"
+-
+-#~ msgid "Text Editor"
+-#~ msgstr "ಪಠ್ಯ ಸಂಪಾದಕ"
+-
+-#~ msgid "_Run at start"
+-#~ msgstr "ಆರಂಭದಲ್ಲಿ ಚಲಾಯಿಸು(_R)"
+-
+-#~ msgid "Balsa"
+-#~ msgstr "Balsa"
+-
+-#~ msgid "Banshee Music Player"
+-#~ msgstr "Banshee ಸಂಗೀತ ಪ್ಲೇಯರ್"
+-
+-#~ msgid "Claws Mail"
+-#~ msgstr "Claws ಮೈಲ್"
+-
+-#~ msgid "Debian Sensible Browser"
+-#~ msgstr "ಡಿಬಿಯನ್ ಸೆನ್ಸಿಬಲ್ ವೀಕ್ಷಕ"
+-
+-#~ msgid "Debian Terminal Emulator"
+-#~ msgstr "ಡಿಬಿಯನ್ ಟರ್ಮಿನಲ್ ಎಮ್ಯುಲೇಟರ್"
+-
+-#~ msgid "ETerm"
+-#~ msgstr "ETerm"
+-
+-#~ msgid "Encompass"
+-#~ msgstr "Encompass"
+-
+-#~ msgid "Evolution Mail Reader"
+-#~ msgstr "Evolution ಮೈಲ್ ಓದುಗ"
+-
+-#~ msgid "Firefox"
+-#~ msgstr "Firefox"
+-
+-#~ msgid "GNOME Magnifier without Screen Reader"
+-#~ msgstr "Screen Reader ಇಲ್ಲದೆ GNOME ಮ್ಯಾಗ್ನಿಫೈಯರ್"
+-
+-#~ msgid "GNOME Terminal"
+-#~ msgstr "GNOME ಟರ್ಮಿನಲ್"
+-
+-#~ msgid "Gnopernicus"
+-#~ msgstr "Gnopernicus"
+-
+-#~ msgid "Gnopernicus with Magnifier"
+-#~ msgstr "ಮ್ಯಾಗ್ನಿಫೈರಿನೊಂದಿಗೆ Gnopernicus"
+-
+-#~ msgid "Iceape"
+-#~ msgstr "Iceape"
+-
+-#~ msgid "Iceape Mail"
+-#~ msgstr "Iceape ಮೈಲ್"
+-
+-#~ msgid "Icedove"
+-#~ msgstr "Icedove"
+-
+-#~ msgid "Iceweasel"
+-#~ msgstr "Iceweasel"
+-
+-#~ msgid "KDE Magnifier without Screen Reader"
+-#~ msgstr "Screen Reader ಇಲ್ಲದ KDE ಮ್ಯಾಗ್ನಿಫೈಯರ್"
+-
+-#~ msgid "Konqueror"
+-#~ msgstr "Konqueror"
+-
+-#~ msgid "Konsole"
+-#~ msgstr "Konsole"
+-
+-#~ msgid "Linux Screen Reader with Magnifier"
+-#~ msgstr "ಮ್ಯಾಗ್ನಿಫೈರಿನೊಂದಿಗೆ Linux Screen Reader"
+-
+-#~ msgid "Listen"
+-#~ msgstr "Listen"
+-
+-#~ msgid "Midori"
+-#~ msgstr "Midori"
+-
+-#~ msgid "Mozilla"
+-#~ msgstr "Mozilla"
+-
+-#~ msgid "Mozilla 1.6"
+-#~ msgstr "Mozilla 1.6"
+-
+-#~ msgid "Mozilla Mail"
+-#~ msgstr "Mozilla Mail"
+-
+-#~ msgid "Mozilla Thunderbird"
+-#~ msgstr "Mozilla Thunderbird"
+-
+-#~ msgid "NXterm"
+-#~ msgstr "NXterm"
+-
+-#~ msgid "Netscape Communicator"
+-#~ msgstr "Netscape Communicator"
+-
+-#~ msgid "Opera"
+-#~ msgstr "Opera"
+-
+-#~ msgid "Orca"
+-#~ msgstr "Orca"
+-
+-#~ msgid "RXVT"
+-#~ msgstr "RXVT"
+-
+-#~ msgid "Rhythmbox Music Player"
+-#~ msgstr "Rhythmbox ಸಂಗೀತ ಪ್ಲೇಯರ್"
+-
+-#~ msgid "SeaMonkey"
+-#~ msgstr "SeaMonkey"
+-
+-#~ msgid "SeaMonkey Mail"
+-#~ msgstr "SeaMonkey Mail"
+-
+-#~ msgid "Sylpheed"
+-#~ msgstr "Sylpheed"
+-
+-#~ msgid "Sylpheed-Claws"
+-#~ msgstr "Sylpheed-Claws"
+-
+-#~ msgid "Thunderbird"
+-#~ msgstr "Thunderbird"
+-
+-#~ msgid "Totem Movie Player"
+-#~ msgstr "Totem ಚಲನಚಿತ್ರ ಪ್ಲೇಯರ್"
+-
+-#~ msgid "Include _panel"
+-#~ msgstr "ಫಲಕವನ್ನು ಒಳಗೊಳ್ಳಿಸು(_p)"
+-
+-#, fuzzy
+-#~ msgid "Monitor Preferences"
+-#~ msgstr "ಮೌಸ್ ಆದ್ಯತೆಗಳು"
+-
+-#~ msgid "Panel icon"
+-#~ msgstr "ಫಲಕದ ಚಿಹ್ನೆ"
+-
+-#~ msgid "Re_fresh rate:"
+-#~ msgstr "ಪುನಶ್ಚೇತದ ದರ(_f):"
+-
+-#~ msgid "_Detect monitors"
+-#~ msgstr "ತೆರೆಗಳನ್ನು ಪತ್ತೆ ಮಾಡು(_D)"
+-
+-#~ msgid "Monitors"
+-#~ msgstr "ತೆರೆಗಳು"
+-
+-#~ msgid "Upside Down"
+-#~ msgstr "ತಲೆ ಕೆಳಗೆ"
+-
+-#~ msgid "%d Hz"
+-#~ msgstr "%d Hz"
+-
+-#~ msgid "Monitor: %s"
+-#~ msgstr "ತೆರೆ: %s"
+-
+-#, fuzzy
+-#~ msgid "The monitor configuration has been saved"
+-#~ msgstr "ತೆರೆಯ ಸಂರಚನೆಯನ್ನು ಉಳಿಸಲು ಆಗಲಿಲ್ಲ"
+-
+-#, fuzzy
+-#~ msgid "Could not set the default configuration for monitors"
+-#~ msgstr "ತೆರೆಯ ಸಂರಚನೆಯನ್ನು ಉಳಿಸಲು ಆಗಲಿಲ್ಲ"
+-
+-#~ msgid "Desktop"
+-#~ msgstr "ಗಣಕತೆರೆ"
+-
+-#~ msgid "Error unsetting accelerator in configuration database: %s"
+-#~ msgstr "ಸಂರಚನಾ ದತ್ತಸಂಚಯದಲ್ಲಿ ಹೊಂದಿಸಲಾಗಿದ್ದ ಹೊಸ ವೇಗವರ್ಧಕವನ್ನು ತೆಗೆಯುವಲ್ಲಿ ದೋಷ: %s"
+-
+-#~ msgid "Assign shortcut keys to commands"
+-#~ msgstr "ಆಜ್ಞೆಗಳಿಗೆ ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳನ್ನು ನಿಯೋಜಿಸು"
+-
+-#~ msgid ""
+-#~ "Just apply settings and quit (compatibility only; now handled by daemon)"
+-#~ msgstr ""
+-#~ "ಸಿದ್ಧತೆಗಳನ್ನು ಅನ್ವಯಿಸು ಹಾಗು ನಿರ್ಗಮಿಸು (ಸಹವರ್ತನೀಯತೆ ಮಾತ್ರ; ಈಗ ಡೆಮನ್‍ನಿಂದ "
+-#~ "ನಿಭಾಯಿಸಲ್ಪಡುತ್ತದೆ)"
+-
+-#~ msgid "Start the page with the typing break settings showing"
+-#~ msgstr "ನಮೂದಿಸುವ ವಿರಾಮ ಸಿದ್ಧತೆಗಳನ್ನು ತೋರಿಸುವ ಪುಟಗಳೊಂದಿಗೆ ಆರಂಭಿಸು"
+-
+-#~ msgid "Start the page with the accessibility settings showing"
+-#~ msgstr "ನಿಲುಕಣಾ ಸಿದ್ಧತೆಗಳು ಕಾಣಿಸುವುದರೊಂದಿಗೆ ಪುಟವನ್ನು ಆರಂಭಿಸು"
+-
+-#~ msgid "- GNOME Keyboard Preferences"
+-#~ msgstr "- GNOME ಕೀಲಿಮಣೆ ಆದ್ಯತೆಗಳು"
+-
+-#~ msgid "Beep when a _toggle key is pressed"
+-#~ msgstr "ಹೊರಳಿಕೆ ಕೀಲಿಯು ಒತ್ತಲ್ಪಟ್ಟಾಗ ಬೀಪ್ ಸದ್ದನ್ನು ಮಾಡು(_t)"
+-
+-#~ msgid "Beep when key is _accepted"
+-#~ msgstr "ಕೀಲಿಯು ಅಂಗೀಕರಿಸಲ್ಪಟ್ಟಾಗ ಬೀಪ್ ಸದ್ದನ್ನು ಮಾಡು(_a) "
+-
+-#~ msgid "Beep when key is _rejected"
+-#~ msgstr "ಕೀಲಿಯು ತಿರಸ್ಕರಿಸಲ್ಪಟ್ಟಾಗ ಬೀಪ್ ಸದ್ದನ್ನು ಮಾಡು(_r) "
+-
+-#~ msgid "Keyboard Accessibility Audio Feedback"
+-#~ msgstr "ಕೀಲಿಮಣೆ ನಿಲುಕಣೆ ಧ್ವನಿರೂಪದ ಪ್ರತಿಕ್ರಿಯೆ(ಫೀಡ್‌ಬ್ಯಾಕ್)"
+-
+-#~ msgid "Show _visual feedback for the alert sound"
+-#~ msgstr "ಎಚ್ಚರಿಕೆಯ ಧ್ವನಿಗಾಗಿನ ದೃಶ್ಯರೂಪದ ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು(ಫೀಡ್‌ಬ್ಯಾಕ್‌) ತೋರಿಸು(_v)"
+-
+-#~ msgid "Visual cues for sounds"
+-#~ msgstr "ಧ್ವನಿಗಳಿಗಾಗಿನ ದೃಶ್ಯರೂಪದ ಆರಂಭ ಸೂಚನೆ"
+-
+-#~ msgid "All_ow postponing of breaks"
+-#~ msgstr "ವಿರಾಮಗಳನ್ನು ಮುಂದಕ್ಕೆ ಹಾಕುವುದನ್ನು ಅನುಮತಿಸು(_o)"
+-
+-#~ msgid "Audio _Feedback..."
+-#~ msgstr "ಧ್ವನಿ ರೂಪದ ಪ್ರತಿಕ್ರಿಯೆ(_F)..."
+-
+-#~ msgid "Check if breaks are allowed to be postponed"
+-#~ msgstr "ವಿರಾಮಗಳನ್ನು ಮುಂದಕ್ಕೆ ಹಾಕಲು ಅನುಮತಿ ಇದೆಯೆ ಎಂದು ಪರಿಶೀಲಿಸಿ"
+-
+-#~ msgid "Duration of the break when typing is disallowed"
+-#~ msgstr "ನಮೂದಿಸುವ ಅನುಮತಿ ಇಲ್ಲದೆ ಇರುವಾಗಿನ ವಿರಾಮದ ಕಾಲಾವಧಿ"
+-
+-#~ msgid "Duration of work before forcing a break"
+-#~ msgstr "ಒಂದು ವಿರಾಮವನ್ನು ಹೇರುವ ಮೊದಲಿನ ಕೆಲಸದ ಕಾಲಾವಧಿ"
+-
+-#~ msgid "Keyboard Preferences"
+-#~ msgstr "ಕೀಲಿಮಣೆ ಆದ್ಯತೆಗಳು"
+-
+-#~ msgid "Keyboard _model:"
+-#~ msgstr "ಕೀಲಿಮಣೆ ಮಾದರಿ(_m):"
+-
+-#~ msgid ""
+-#~ "Lock screen after a certain duration to help prevent repetitive keyboard "
+-#~ "use injuries"
+-#~ msgstr ""
+-#~ "ಪುನರಾವರ್ತಿತ ಕೀಲಮಣೆ ಬಳಕೆಯಿಂದ ಉಂಟಾಗುವ ಹಾನಿಯನ್ನು ತಪ್ಪಿಸುವ ಸಲುವಾಗಿ ನಿರ್ದಿಷ್ಟ "
+-#~ "ಕಾಲಾವಧಿಯ ನಂತರ ತೆರೆಯನ್ನು ಲಾಕ್ ಮಾಡು"
+-
+-#~ msgid "_Accessibility features can be toggled with keyboard shortcuts"
+-#~ msgstr ""
+-#~ "ನಿಲುಕಣಾ ಸವಲತ್ತುಗಳನ್ನು ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ಗಳನ್ನು ಉಪಯೋಗಿಸಿಕೊಂಡು ಟಾಗಲ್ ಮಾಡಬಹುದು(_A)"
+-
+-#~ msgid "_Break interval lasts:"
+-#~ msgstr "ವಿರಾಮದ ಕಾಲಾವಧಿಯ ತೀರುವಿಕೆ(_B):"
+-
+-#~ msgid "_Lock screen to enforce typing break"
+-#~ msgstr "ನಮೂದಿಸುವ ವಿರಾಮವನ್ನು ಹೇರಲು ತೆರೆಯನ್ನು ಲಾಕ್ ಮಾಡು(_L)"
+-
+-#~ msgid "_Only accept long keypresses"
+-#~ msgstr "ಕೇವಲ ಹೆಚ್ಚು ಸಮಯದ ಕೀಲಿ ಒತ್ತುವಿಕೆಯನ್ನು ಮಾತ್ರ ಅನುಮತಿಸು(_O)"
+-
+-#~ msgid "_Simulate simultaneous keypresses"
+-#~ msgstr "ಒಂದರ ನಂತರ ಇನ್ನೊಂದು ಕೀಲಿ ಒತ್ತುವಿಕೆಗಳನ್ನು ಸಿಮುಲೇಟ್ ಮಾಡು (_S)"
+-
+-#~ msgid "_Work interval lasts:"
+-#~ msgstr "ಕೆಲಸದ ಅವಧಿಯ ತೀರುವಿಕೆ(_W):"
+-
+-#~ msgid "Preview:"
+-#~ msgstr "ಮುನ್ನೋಟ:"
+-
+-#~ msgid "_Country:"
+-#~ msgstr "ದೇಶ(_C):"
+-
+-#~ msgid "_Variants:"
+-#~ msgstr "ವೇರಿಯಂಟ್‌ಗಳು(_V):"
+-
+-#~ msgid "Choose a Keyboard Model"
+-#~ msgstr "ಒಂದು ಕೀಲಿಮಣೆಯ ಮಾದರಿಯನ್ನು ಆರಿಸು"
+-
+-#~ msgid "_Models:"
+-#~ msgstr "ಮಾದರಿಗಳು(_M):"
+-
+-#~ msgid "_Vendors:"
+-#~ msgstr "ಮಾರಾಟಗಾರರು(_V):"
+-
+-#~ msgid "gesture|Move left"
+-#~ msgstr "ಎಡಕ್ಕೆ ಚಲಿಸು"
+-
+-#~ msgid "gesture|Move right"
+-#~ msgstr "ಬಲಕ್ಕೆ ಚಲಿಸು"
+-
+-#~ msgid "gesture|Move up"
+-#~ msgstr "ಮೇಲಕ್ಕೆ ಚಲಿಸು"
+-
+-#~ msgid "gesture|Move down"
+-#~ msgstr "ಕೆಳಕ್ಕೆ ಚಲಿಸು"
+-
+-#~ msgid "gesture|Disabled"
+-#~ msgstr "ಅಶಕ್ತಗೊಂಡ"
+-
+-#~ msgid "Specify the name of the page to show (general|accessibility)"
+-#~ msgstr "ತೋರಿಸಲು ಪುಟದ ಹೆಸರನ್ನು ಸೂಚಿಸಿ"
+-
+-#~ msgid "- GNOME Mouse Preferences"
+-#~ msgstr "- GNOME ಮೌಸ್‌ ಆದ್ಯತೆಗಳು"
+-
+-#~ msgid "Choose type of click _beforehand"
+-#~ msgstr "ಕ್ಲಿಕ್‌ನ ಬಗೆಯನ್ನು ಮುಂಚಿತವಾಗಿ ಆಯ್ಕೆ ಮಾಡು(_b)"
+-
+-#~ msgid "Choose type of click with mo_use gestures"
+-#~ msgstr "ಮೌಸ್‌ನ ಹಾವಭಾವದೊಂದಿಗೆ ಕ್ಲಿಕ್‌ನ ಬಗೆಯನ್ನು ಆರಿಸಿ(_u)"
+-
+-#~ msgid "D_rag click:"
+-#~ msgstr "ಎಳೆಯುವ ಕ್ಲಿಕ್(_r):"
+-
+-#~ msgid "Show click type _window"
+-#~ msgstr "ಕ್ಲಿಕ್ ಬಗೆಯ ವಿಂಡೋವನ್ನು ತೋರಿಸು(_w)"
+-
+-#~ msgid ""
+-#~ "You can also use the Dwell Click panel applet to choose the click type."
+-#~ msgstr ""
+-#~ "ಕ್ಲಿಕ್‌ ಬಗೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡಲು ನೀವು ಡ್ವೆಲ್‌ ಕ್ಲಿಕ್ ಫಲಕ ಆಪ್ಲೆಟ್ ಅನ್ನೂ ಸಹ ನೀವು "
+-#~ "ಬಳಸಬಹುದಾಗಿದೆ."
+-
+-#~ msgid "_Single click:"
+-#~ msgstr "ಒಂದು ಕ್ಲಿಕ್(_S):"
+-
+-#~ msgid "Location already exists"
+-#~ msgstr "ಸ್ಥಳವು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ"
+-
+-#~ msgid "Set your network proxy preferences"
+-#~ msgstr "ಜಾಲಬಂಧ ಪ್ರಾಕ್ಸಿಯ ಆದ್ಯತೆಗಳನ್ನು ಹೊಂದಿಸಿ"
+-
+-#~ msgid "<b>Di_rect internet connection</b>"
+-#~ msgstr "<b>ನೇರ ಅಂತರ್ಜಾಲ ಸಂಪರ್ಕ(_r)</b>"
+-
+-#~ msgid "<b>_Manual proxy configuration</b>"
+-#~ msgstr "<b>ಹಸ್ತಮುಖೇಯನ ಪ್ರಾಕ್ಸಿ ಸಂರಚನೆ(_A)</b>"
+-
+-#~ msgid "HTTP Proxy Details"
+-#~ msgstr "HTTP ಪ್ರಾಕ್ಸಿ ವಿವರಗಳು"
+-
+-#~ msgid "Ignore Host List"
+-#~ msgstr "ಅತಿಥೇಯ ಪಟ್ಟಿಯನ್ನು ಆಲಕ್ಷಿಸು"
+-
+-#~ msgid "Network Proxy Preferences"
+-#~ msgstr "ಜಾಲಬಂಧ ಪ್ರಾಕ್ಸಿ ಆದ್ಯತೆಗಳು"
+-
+-#~ msgid "U_sername:"
+-#~ msgstr "ಬಳಕೆದಾರಹೆಸರು(_s):"
+-
+-#~ msgid "_Location name:"
+-#~ msgstr "ಸ್ಥಳದ ಹೆಸರು(_L):"
+-
+-#~ msgid "_Secure HTTP proxy:"
+-#~ msgstr "ಸುರಕ್ಷಿತ HTTP ಪ್ರಾಕ್ಸಿ (_S):"
+-
+-#~ msgid "_Use the same proxy for all protocols"
+-#~ msgstr "ಇದೆ ಪ್ರಾಕ್ಸಿಯನ್ನು ಎಲ್ಲಾ ಪ್ರೊಟೋಕಾಲ್‍ಗೂ ಬಳಸಿ(_U)"
+-
+-#~ msgid "Cannot start the preferences application for your window manager"
+-#~ msgstr "ನಿಮ್ಮ ವಿಂಡೋ ಮ್ಯಾನೇಜರಿಗಾಗಿನ ಆದ್ಯತೆಗಳ ಅನ್ವಯವನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
+-
+-#~ msgid "_Alt"
+-#~ msgstr "_Alt"
+-
+-#~ msgid "H_yper"
+-#~ msgstr "ಹೈಪರ್(_y)"
+-
+-#~ msgid "S_uper (or \"Windows logo\")"
+-#~ msgstr "ಸೂಪರ್ (ಅಥವ \"Windows logo\") (_u)"
+-
+-#~ msgid "Movement Key"
+-#~ msgstr "ಚಲನಾ ಕೀಲಿ"
+-
+-#~ msgid "To move a window, press-and-hold this key then grab the window:"
+-#~ msgstr ""
+-#~ "ಒಂದು ವಿಂಡೊವನ್ನು ಜರುಗಿಸಲು, ಈ ಕೀಲಿಯನ್ನು ಒತ್ತಿ ಹಿಡಿದು ನಂತರ ವಿಂಡೋವನ್ನು ಎಳೆಯಿರಿ:"
+-
+-#~ msgid "Window Preferences"
+-#~ msgstr "ವಿಂಡೊ ಆದ್ಯತೆಗಳು"
+-
+-#~ msgid "Window Selection"
+-#~ msgstr "ವಿಂಡೊ ಆಯ್ಕೆ"
+-
+-#~ msgid "_Double-click titlebar to perform this action:"
+-#~ msgstr "ಈ ಕಾರ್ಯವನ್ನು ನಿರ್ವಹಿಸಲು ಶೀರ್ಷಿಕೆಪಟ್ಟಿಯ ಮೇಲೆ ಎರಡು-ಬಾರಿ ಕ್ಲಿಕ್ಕಿಸಿ(_D):"
+-
+-#~ msgid "_Interval before raising:"
+-#~ msgstr "ಏರಿಸುವ ಮುಂಚಿನ ಕಾಲಾವಧಿ(_I):"
+-
+-#~ msgid "_Raise selected windows after an interval"
+-#~ msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ವಿಂಡೋವನ್ನು ಒಂದು ಕಾಲಾವಧಿಯ ನಂತರ ಏರಿಸು(_R)"
+-
+-#~ msgid "_Select windows when the mouse moves over them"
+-#~ msgstr "ವಿಂಡೋಗಳ ಮೇಲೆ ಮೌಸನ್ನು ಇರಿಸಿದಾಗ ಅವನ್ನು ಆರಿಸು(_S)"
+-
+-#~ msgid "Set your window properties"
+-#~ msgstr "ನಿಮ್ಮ ವಿಂಡೊ ಗುಣಲಕ್ಷಣಗಳನ್ನು ಹೊಂದಿಸಿ"
+-
+-#~ msgid "Windows"
+-#~ msgstr "ವಿಂಡೋಗಳು"
+-
+-#~ msgid "Window manager \"%s\" has not registered a configuration tool\n"
+-#~ msgstr "ವಿಂಡೋ ವ್ಯವಸ್ಥಾಪಕ \"%s\" ವು ಸಂರಚನಾ ಉಪಕರಣದಲ್ಲಿ ನೋಂದಾಯಿಸಲ್ಪಟ್ಟಿಲ್ಲ\n"
+-
+-#~ msgid "Maximize Vertically"
+-#~ msgstr "ಲಂಬವಾಗಿ ಹಿಗ್ಗಿಸು"
+-
+-#~ msgid "Maximize Horizontally"
+-#~ msgstr "ಅಡ್ಡಲಾಗಿ ಹಿಗ್ಗಿಸು"
+-
+-#~ msgid "Hide on start (useful to preload the shell)"
+-#~ msgstr "ಆರಂಭದಲ್ಲಿ ಅಡಗಿಸು (ಶೆಲ್‌ ಅನ್ನು ಮೊದಲೆ ಲೋಡ್ ಮಾಡಲು ಸಹಾಯಕವಾಗುತ್ತದೆ)"
+-
+-#~ msgid "Groups"
+-#~ msgstr "ಸಮೂಹಗಳು"
+-
+-#~ msgid "Common Tasks"
+-#~ msgstr "ಮಾಮೂಲಿ ಕಾರ್ಯಗಳು"
+-
+-#~ msgid "Close the control-center when a task is activated"
+-#~ msgstr "ಕಾರ್ಯವು ಸಕ್ರಿಯಗೊಂಡಾಗ ನಿಯಂತ್ರಣ ಕೇಂದ್ರವನ್ನು ಮುಚ್ಚು"
+-
+-#~ msgid "Exit shell on add or remove action performed"
+-#~ msgstr "ಸೇರಿಸು ಅಥವ ತೆಗೆದುಹಾಕುವ ಕ್ರಿಯೆಯು ನಡೆಸಲ್ಪಟ್ಟಾಗ ಶೆಲ್‍ನಿಂದ ನಿರ್ಗಮಿಸು"
+-
+-#~ msgid "Exit shell on help action performed"
+-#~ msgstr "ಸಹಾಯ ಕ್ರಿಯೆಯು ನಡೆಸಲ್ಪಟ್ಟಾಗ ಶೆಲ್‍ನಿಂದ ನಿರ್ಗಮಿಸು"
+-
+-#~ msgid "Exit shell on start action performed"
+-#~ msgstr "ಆರಂಭ ಕ್ರಿಯೆಯು ನಡೆಸಲ್ಪಟ್ಟಾಗ ಶೆಲ್‍ನಿಂದ ನಿರ್ಗಮಿಸು"
+-
+-#~ msgid "Exit shell on upgrade or uninstall action performed"
+-#~ msgstr "ಅಪ್‍ಗ್ರೇಡ್ ಅಥವ ಅನ್ಇನ್‍ಸ್ಟಾಲ್ ಕ್ರಿಯೆಯು ನಡೆಸಲ್ಪಟ್ಟಾಗ ಶೆಲ್‍ನಿಂದ ನಿರ್ಗಮಿಸು"
+-
+-#~ msgid ""
+-#~ "Indicates whether to close the shell when a help action is performed."
+-#~ msgstr "ಒಂದು ಸಹಾಯ ಕ್ರಿಯೆಯು ನಡೆಸಲ್ಪಟ್ಟಾಗ ಶೆಲ್ ಅನ್ನು ಮುಚ್ಚಬೇಕೆ ಎಂದು ಸೂಚಿಸುತ್ತದೆ."
+-
+-#~ msgid ""
+-#~ "Indicates whether to close the shell when a start action is performed."
+-#~ msgstr "ಒಂದು ಆರಂಭ ಕ್ರಿಯೆಯು ನಡೆಸಲ್ಪಟ್ಟಾಗ ಶೆಲ್ ಅನ್ನು ಮುಚ್ಚಬೇಕೆ ಎಂದು ಸೂಚಿಸುತ್ತದೆ."
+-
+-#~ msgid ""
+-#~ "Indicates whether to close the shell when an add or remove action is "
+-#~ "performed."
+-#~ msgstr ""
+-#~ "ಸೇರಿಸು ಅಥವ ತೆಗೆದುಹಾಕುವ ಕ್ರಿಯೆಯು ನಡೆಸಲ್ಪಟ್ಟಾಗ ಶೆಲ್ ಅನ್ನು ಮುಚ್ಚಬೇಕೆ ಎಂದು "
+-#~ "ಸೂಚಿಸುತ್ತದೆ."
+-
+-#~ msgid ""
+-#~ "Indicates whether to close the shell when an upgrade or uninstall action "
+-#~ "is performed."
+-#~ msgstr ""
+-#~ "ನವೀಕರಣ ಅಥವ ಅನುಸ್ಥಾಪಿಸಲಾಗಿದ್ದನ್ನು ತೆಗೆದುಹಾಕುವ ಕ್ರಿಯೆಯು ನಡೆಸಲ್ಪಟ್ಟಾಗ ಶೆಲ್ ಅನ್ನು "
+-#~ "ಮುಚ್ಚಬೇಕೆ ಎಂದು ಸೂಚಿಸುತ್ತದೆ."
+-
+-#~ msgid "Task names and associated .desktop files"
+-#~ msgstr "ಕಾರ್ಯದ ಹೆಸರುಗಳು ಹಾಗು ಸಂಬಂಧಿಸಲ್ಪಟ್ಟ .desktop ಕಡತಗಳು"
+-
+-#~ msgid ""
+-#~ "The task name to be displayed in the control-center followed by a \";\" "
+-#~ "separator then the filename of an associated .desktop file to launch for "
+-#~ "that task."
+-#~ msgstr ""
+-#~ "ನಿಯಂತ್ರಣ-ಕೇಂದ್ರದಲ್ಲಿ(ಕಂಟ್ರೋಲ್-ಸೆಂಟರ್) ತೋರಿಸಬೇಕಿರುವ ಕಾರ್ಯದ ಹೆಸರು. ಇದು ಒಂದು \";\" "
+-#~ "ವಿಭಜಕವನ್ನು ಹಾಗು ನಂತರ ಆ ಕಾರ್ಯವನ್ನು ಆರಂಭಿಸಲು ಅಗತ್ಯವಿರುವ ಅದಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ."
+-#~ "desktop ಕಡತದ ಹೆಸರನ್ನು ಹೊಂದಿರುತ್ತದೆ."
+-
+-#~ msgid ""
+-#~ "[Change Theme;gtk-theme-selector.desktop,Set Preferred Applications;"
+-#~ "default-applications.desktop,Add Printer;gnome-cups-manager.desktop]"
+-#~ msgstr ""
+-#~ "[ಪರಿಸರವಿನ್ಯಾಸವನ್ನು ಬದಲಾಯಿಸು;gtk-theme-selector.desktop,ಇಚ್ಛೆಯ ಅನ್ವಯವನ್ನು "
+-#~ "ಹೊಂದಿಸು;default-applications.desktop,ಮುದ್ರಕವನ್ನು ಸೇರಿಸು;gnome-cups-manager."
+-#~ "desktop]"
+-
+-#~ msgid ""
+-#~ "if true, the control-center will close when a \"Common Task\" is "
+-#~ "activated."
+-#~ msgstr ""
+-#~ "true ಆದರೆ (ನಿಜವೆಂದಾದರೆ), \"ಸಾಮಾನ್ಯ ಕಾರ್ಯ\"ವು ಸಕ್ರಿಯಗೊಳಿಸಲ್ಪಟ್ಟಾಗ ನಿಯಂತ್ರಣ-"
+-#~ "ಕೇಂದ್ರವು ಮುಚ್ಚಲ್ಪಡುತ್ತದೆ."
+-
+-#~ msgid "The GNOME configuration tool"
+-#~ msgstr "GNOME ಸಂರಚನಾ ಉಪಕರಣ"
+-
+-#~ msgid "_Postpone Break"
+-#~ msgstr "ವಿರಾಮವನ್ನು ಮುಂದೂಡು(_P)"
+-
+-#~ msgid "_Take a Break"
+-#~ msgstr "ಒಂದು ವಿರಾಮವನ್ನು ತೆಗೆದುಕೊ(_T)"
+-
+-#~ msgid "%d minute until the next break"
+-#~ msgid_plural "%d minutes until the next break"
+-#~ msgstr[0] "ಮುಂದಿನ ವಿರಾಮಕ್ಕೆ %d ನಿಮಿಷದ ಸಮಯವಿದೆ"
+-#~ msgstr[1] "ಮುಂದಿನ ವಿರಾಮಕ್ಕೆ %d ನಿಮಿಷಗಳ ಸಮಯವಿದೆ"
+-
+-#~ msgid "Less than one minute until the next break"
+-#~ msgstr "ಮುಂದಿನ ವಿರಾಮಕ್ಕೆ ಒಂದು ನಿಮಿಷಕ್ಕೂ ಕಡಿಮೆ ಸಮಯವಿದೆ"
+-
+-#~ msgid ""
+-#~ "Unable to bring up the typing break properties dialog with the following "
+-#~ "error: %s"
+-#~ msgstr ""
+-#~ "ಈ ಕೆಳಗಿನ ದೋಷದ ಕಾರಣದಿಂದಾಗಿ ನಮೂದಿಸುವ ವಿರಾಮದ ಗುಣಲಕ್ಷಣಗಳ ಸಂವಾದವನ್ನು ತೋರಿಸಲು "
+-#~ "ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
+-
+-#~ msgid "Written by Richard Hult <richard@imendio.com>"
+-#~ msgstr "Richard Hult <richard@imendio.com> ರವರಿಂದ ಬರೆಯಲ್ಪಿಟ್ಟಿದೆ"
+-
+-#~ msgid "Eye candy added by Anders Carlsson"
+-#~ msgstr "ಐ ಕ್ಯಾಂಡಿಯನ್ನು ಸೇರ್ಪಡಿಸಿದವರು Anders Carlsson"
+-
+-#~ msgid "A computer break reminder."
+-#~ msgstr "ಒಂದು ಗಣಕದ ವಿರಾಮದ ಜ್ಞಾಪನೆ."
+-
+-#~ msgid "translator-credits"
+-#~ msgstr "ಶಂಕರ್ ಪ್ರಸಾದ್ ಎಂ. ವಿ. <svenkate@redhat.com>"
+-
+-#~ msgid "Don't check whether the notification area exists"
+-#~ msgstr "ಸೂಚನಾ ಸ್ಥಳವು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇದೆಯೆ ಎಂದು ಪರಿಶೀಲಿಸಬೇಡ"
+-
+-#~ msgid ""
+-#~ "The typing monitor uses the notification area to display information. You "
+-#~ "don't seem to have a notification area on your panel. You can add it by "
+-#~ "right-clicking on your panel and choosing 'Add to panel', selecting "
+-#~ "'Notification area' and clicking 'Add'."
+-#~ msgstr ""
+-#~ "ಟೈಪಿಂಗ್ ಮೇಲ್ವಿಚಾರಕವು ಮಾಹಿತಿಯನ್ನು ತೋರಿಸಲು ಸೂಚನಾ ಜಾಗವನ್ನು ಬಳಸುತ್ತದೆ. ನಿಮ್ಮಲ್ಲಿನ "
+-#~ "ಫಲಕದಲ್ಲಿ ಒಂದು ಸೂಚನಾ ಜಾಗವು ಇದ್ದಂತೆ ತೋರುತ್ತಿಲ್ಲ. ನೀವದನ್ನು ಸೇರಿಸಲು ಫಲಕದ ಮೇಲೆ ಬಲ "
+-#~ "ಕ್ಲಿಕ್ಕಿಸಿ ಹಾಗು 'ಫಲಕಕ್ಕೆ ಸೇರಿಸು' ಅನ್ನು ಆರಿಸಿ, 'ಸೂಚನಾ ಜಾಗ' ಹಾಗು 'ಸೇರಿಸು' ಅನ್ನು "
+-#~ "ಆಯ್ಕೆಮಾಡಿ."
+-
+-#~ msgid "If set to true, then OpenType fonts will be thumbnailed."
+-#~ msgstr "ನಿಜಕ್ಕೆ ಹೊಂದಿಸಿದಲ್ಲಿ, ಓಪನ್‍ಟೈಪ್ ಅಕ್ಷರಶೈಲಿಗಳು ತಂಬ್‍ನೈಲ್ ಆಗುತ್ತದೆ."
+-
+-#~ msgid "If set to true, then PCF fonts will be thumbnailed."
+-#~ msgstr "ನಿಜಕ್ಕೆ ಹೊಂದಿಸಿದಲ್ಲಿ, PCF ಅಕ್ಷರಶೈಲಿಗಳು ತಂಬ್‍ನೈಲ್ ಆಗುತ್ತದೆ."
+-
+-#~ msgid "If set to true, then TrueType fonts will be thumbnailed."
+-#~ msgstr "ನಿಜಕ್ಕೆ ಹೊಂದಿಸಿದಲ್ಲಿ, ಟ್ರುಟೈಪ್ ಅಕ್ಷರಶೈಲಿಗಳು ತಂಬ್‍ನೈಲ್ ಆಗುತ್ತದೆ."
+-
+-#~ msgid "If set to true, then Type1 fonts will be thumbnailed."
+-#~ msgstr "ನಿಜಕ್ಕೆ ಹೊಂದಿಸಿದಲ್ಲಿ, ಟೈಪ್1 ಅಕ್ಷರಶೈಲಿಗಳು ತಂಬ್‍ನೈಲ್ ಆಗುತ್ತದೆ."
+-
+-#~ msgid ""
+-#~ "Set this key to the command used to create thumbnails for OpenType fonts."
+-#~ msgstr ""
+-#~ "ಈ ಕೀಲಿಯನ್ನು ಓಪನ್‍ಟೈಪ್ ಅಕ್ಷರಶೈಲಿಗಳಿಗಾಗಿನ ತಂಬ್‍ನೈಲ್‍ಗಳನ್ನು ಸೃಜಿಸಲು ಬಳಸಲ್ಪಡುವ ಆಜ್ಞೆಗೆ "
+-#~ "ಹೊಂದಿಸು."
+-
+-#~ msgid "Set this key to the command used to create thumbnails for PCF fonts."
+-#~ msgstr ""
+-#~ "ಈ ಕೀಲಿಯನ್ನು PCF ಅಕ್ಷರಶೈಲಿಗಳಿಗಾಗಿನ ತಂಬ್‍ನೈಲ್‍ಗಳನ್ನು ಸೃಜಿಸಲು ಬಳಸಲ್ಪಡುವ ಆಜ್ಞೆಗೆ "
+-#~ "ಹೊಂದಿಸು."
+-
+-#~ msgid ""
+-#~ "Set this key to the command used to create thumbnails for TrueType fonts."
+-#~ msgstr ""
+-#~ "ಈ ಕೀಲಿಯನ್ನು ಟ್ರುಟೈಪ್ ಅಕ್ಷರಶೈಲಿಗಳಿಗಾಗಿನ ತಂಬ್‍ನೈಲ್‍ಗಳನ್ನು ಸೃಜಿಸಲು ಬಳಸಲ್ಪಡುವ ಆಜ್ಞೆಗೆ "
+-#~ "ಹೊಂದಿಸು."
+-
+-#~ msgid ""
+-#~ "Set this key to the command used to create thumbnails for Type1 fonts."
+-#~ msgstr ""
+-#~ "ಈ ಕೀಲಿಯನ್ನು ಟೈಪ್1 ಅಕ್ಷರಶೈಲಿಗಳಿಗಾಗಿನ ತಂಬ್‍ನೈಲ್‍ಗಳನ್ನು ಸೃಜಿಸಲು ಬಳಸಲ್ಪಡುವ ಆಜ್ಞೆಗೆ "
+-#~ "ಹೊಂದಿಸು."
+-
+-#~ msgid "Thumbnail command for OpenType fonts"
+-#~ msgstr "ಓಪನ್‍ಟೈಪ್ ಅಕ್ಷರಶೈಲಿಗಳಿಗಾಗಿನ ತಂಬ್‍ನೈಲ್ ಆಜ್ಞೆ"
+-
+-#~ msgid "Thumbnail command for PCF fonts"
+-#~ msgstr "PCF ಅಕ್ಷರಶೈಲಿಗಳಿಗಾಗಿನ ತಂಬ್‍ನೈಲ್ ಆಜ್ಞೆ"
+-
+-#~ msgid "Thumbnail command for TrueType fonts"
+-#~ msgstr "ಟ್ರುಟೈಪ್ ಅಕ್ಷರಶೈಲಿಗಳಿಗಾಗಿನ ತಂಬ್‍ನೈಲ್ ಆಜ್ಞೆ"
+-
+-#~ msgid "Thumbnail command for Type1 fonts"
+-#~ msgstr "ಟೈಪ್1 ಅಕ್ಷರಶೈಲಿಗಳಿಗಾಗಿನ ತಂಬ್‍ನೈಲ್ ಆಜ್ಞೆ"
+-
+-#~ msgid "Whether to thumbnail OpenType fonts"
+-#~ msgstr "ಓಪನ್‍ಟೈಪ್ ಅಕ್ಷರಶೈಲಿಗಳನ್ನು ತಂಬ್‍ನೈಲ್ ಮಾಡಬೇಕೆ"
+-
+-#~ msgid "Whether to thumbnail PCF fonts"
+-#~ msgstr "PCF ಅಕ್ಷರಶೈಲಿಗಳನ್ನು ತಂಬ್‍ನೈಲ್ ಮಾಡಬೇಕೆ"
+-
+-#~ msgid "Whether to thumbnail TrueType fonts"
+-#~ msgstr "ಟ್ರುಟೈಪ್ ಅಕ್ಷರಶೈಲಿಗಳನ್ನು ತಂಬ್‍ನೈಲ್ ಮಾಡಬೇಕೆ"
+-
+-#~ msgid "Whether to thumbnail Type1 fonts"
+-#~ msgstr "ಟೈಪ್1 ಅಕ್ಷರಶೈಲಿಗಳನ್ನು ತಂಬ್‍ನೈಲ್ ಮಾಡಬೇಕೆ"
+-
+-#~ msgid "Size:"
+-#~ msgstr "ಗಾತ್ರ:"
+-
+-#~ msgid "Copyright:"
+-#~ msgstr "ಹಕ್ಕು:"
+-
+-#~ msgid "Description:"
+-#~ msgstr "ವಿವರಣೆ:"
+-
+-#~ msgid "Installed"
+-#~ msgstr "ಅನುಸ್ಥಾಪಿತಗೊಂಡಿದೆ"
+-
+-#~ msgid "usage: %s fontfile\n"
+-#~ msgstr "ಬಳಕೆ: %s ಅಕ್ಷರಶೈಲಿಕಡತ\n"
+-
+-#~ msgid "I_nstall Font"
+-#~ msgstr "ಅಕ್ಷರಶೈಲಿಯನ್ನು ಅನುಸ್ಥಾಪಿಸು(_n)"
+-
+-#~ msgid "Font Viewer"
+-#~ msgstr "ಅಕ್ಷರಶೈಲಿ ವೀಕ್ಷಕ"
+-
+-#~ msgid "Text to thumbnail (default: Aa)"
+-#~ msgstr "ಪಠ್ಯದಿಂದ ತಂಬ್‍ನೈಲ್‍ಗೆ (ಪೂರ್ವನಿಯೋಜಿತ: Aa)"
+-
+-#~ msgid "TEXT"
+-#~ msgstr "TEXT"
+-
+-#~ msgid "Font size (default: 64)"
+-#~ msgstr "ಅಕ್ಷರಶೈಲಿಯ ಗಾತ್ರ (ಪೂರ್ವನಿಯೋಜಿತ: 64)"
+-
+-#~ msgid "SIZE"
+-#~ msgstr "SIZE"
+-
+-#~ msgid "FONT-FILE OUTPUT-FILE"
+-#~ msgstr "FONT-FILE OUTPUT-FILE"
+-
+-#~ msgid "Your filter \"%s\" does not match any items."
+-#~ msgstr "ನಿಮ್ಮ ಫಿಲ್ಟರ್ \"%s\" ಯಾವುದೆ ಅಂಶಗಳಿಗೆ ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ."
+-
+-#~ msgid "Upgrade"
+-#~ msgstr "ನವೀಕರಿಸಿ"
+-
+-#~ msgid "Uninstall"
+-#~ msgstr "ಅನುಸ್ಥಾಪಿಸಿದ್ದನ್ನು ತೆಗೆದುಹಾಕು"
+-
+-#~ msgid "Add to Favorites"
+-#~ msgstr "ನೆಚ್ಚಿನವುಗಳಿಗೆ ಸೇರಿಸು"
+-
+-#~ msgid "Remove from Startup Programs"
+-#~ msgstr "ಆರಂಭಿಕ ಪ್ರೋಗ್ರಾಂಗಳಿಂದ ತೆಗೆದು ಹಾಕು"
+-
+-#~ msgid "Add to Startup Programs"
+-#~ msgstr "ಆರಂಭಿಕ ಪ್ರೋಗ್ರಾಂಗಳಿಂದ ಸೇರಿಸು"
+-
+-#~ msgid "New Spreadsheet"
+-#~ msgstr "ಹೊಸ ಸ್ಪ್ರೆಡ್-ಶೀಟ್"
+-
+-#~ msgid "New Document"
+-#~ msgstr "ಹೊಸ ದಸ್ತಾವೇಜು"
+-
+-#~ msgid "Documents"
+-#~ msgstr "ದಸ್ತಾವೇಜುಗಳು"
+-
+-#~ msgid "<b>Open</b>"
+-#~ msgstr "<b>ತೆಗೆ</b>"
+-
+-#~ msgid "Rename..."
+-#~ msgstr "ಮರುಹೆಸರಿಸು..."
+-
+-#~ msgid "Move to Trash"
+-#~ msgstr "ಕಸದ ಬುಟ್ಟಿಗೆ ವರ್ಗಾಯಿಸು"
+-
+-#~ msgid "Delete"
+-#~ msgstr "ಅಳಿಸಿಹಾಕು"
+-
+-#~ msgid "If you delete an item, it is permanently lost."
+-#~ msgstr "ನೀವು ಒಂದು ಅಂಶವನ್ನು ಅಳಿಸಿ ಹಾಕಿದರೆ, ಅದು ಶಾಶ್ವತವಾಗಿ ಕಾಣೆಯಾಗುತ್ತದೆ."
+-
+-#~ msgid "Open with \"%s\""
+-#~ msgstr "\"%s\" ನೊಂದಿಗೆ ತೆರೆ"
+-
+-#~ msgid "Open in File Manager"
+-#~ msgstr "ಕಡತ ವ್ಯವಸ್ಥಾಪಕದಲ್ಲಿ ತೆರೆ"
+-
+-#~ msgid "?"
+-#~ msgstr "?"
+-
+-#~ msgid "%l:%M %p"
+-#~ msgstr "%l:%M %p"
+-
+-#~ msgid "Today %l:%M %p"
+-#~ msgstr "ಇಂದು %l:%M %p"
+-
+-#~ msgid "Yesterday %l:%M %p"
+-#~ msgstr "ನಿನ್ನೆ %l:%M %p"
+-
+-#~ msgid "%b %d %l:%M %p"
+-#~ msgstr "%b %d %l:%M %p"
+-
+-#~ msgid "%b %d %Y"
+-#~ msgstr "%b %d %Y"
+-
+-#~ msgid "Find Now"
+-#~ msgstr "ಈಗ ಹುಡುಕು"
+-
+-#~ msgid "<b>Open %s</b>"
+-#~ msgstr "<b>%s ಅನ್ನು ತೆರೆ</b>"
+-
+-#~ msgid "Remove from System Items"
+-#~ msgstr "ಗಣಕ ಅಂಶಗಳಿಂದ ತೆಗೆದು ಹಾಕು"
+-
+-#~ msgid "_Jabber:"
+-#~ msgstr "ಜಬ್ಬಾರ್(_J):"
+-
+-#~ msgid "Set the current background as the system-wide default"
+-#~ msgstr "ವ್ಯವಸ್ಥೆಯಾದ್ಯಂತದ ಪೂರ್ವನಿಯೋಜಿತ ಮುದ್ರಕವಾಗಿ ಹೊಂದಿಸಲು ಬಯಸುತ್ತೀರೆ"
+-
+-#~ msgid "KDE Konsole"
+-#~ msgstr "KDE Konsole"
+-
+-#~ msgid "KTerm"
+-#~ msgstr "KTerm"
+-
+-#~ msgid "Netscape"
+-#~ msgstr "ನೆಟ್‌ಸ್ಕೇಪ್"
+-
+-#~ msgid "Display Preferences"
+-#~ msgstr "ಪ್ರದರ್ಶಕದ ಆದ್ಯತೆಗಳು"
+-
+-#~ msgid "Drag the monitors to set their place"
+-#~ msgstr "ತೆರೆಗಳನ್ನು ಅವುಗಳ ಸ್ಥಳದಲ್ಲಿ ಹೊಂದಿಸಲು ಎಳೆಯಿರಿ"
+-
+-#~ msgid "Change screen resolution"
+-#~ msgstr "ತೆರೆಯ ರೆಸಲ್ಯೂಶನ್ ಅನ್ನು ಬದಲಾಯಿಸು"
+-
+-#~ msgid "_Selected layouts:"
+-#~ msgstr "ಆರಿಸಲಾದ ಲೇಔಟ್‍ಗಳು(_S):"
+-
+-#~ msgid "C_ontrol"
+-#~ msgstr "ನಿಯಂತ್ರಣ(_o)"
+-
+-#~ msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+-#~ msgstr "The quick brown fox jumps over the lazy dog. 0123456789"
+-
+-#~ msgid "Menus and Toolbars"
+-#~ msgstr "ಮೆನುಗಳು ಹಾಗು ಉಪಕರಣಪಟ್ಟಿಕೆಗಳು"
+-
+-#~ msgid "Show _icons in menus"
+-#~ msgstr "ಚಿಹ್ನೆಗಳನ್ನು ಮೆನು ಅಲ್ಲಿ ತೋರಿಸು(_i)"
+-
+-#~ msgid "Toolbar _button labels:"
+-#~ msgstr "ಉಪಕರಣಪಟ್ಟಿಯ ಗುಂಡಿಯ ಲೇಬಲ್‍ಗಳು(_b):"
+-
+-#~ msgid "_Editable menu shortcut keys"
+-#~ msgstr "ಸಂಪಾದಿಸಬಲ್ಲ ಮೆನು ಶಾರ್ಟ್-ಕಟ್ ಕೀಲಿಗಳು(_E)"
+diff --git a/po/lt.po b/po/lt.po
+index f872140..d5ae58e 100644
+--- a/po/lt.po
++++ b/po/lt.po
+@@ -9,15 +9,15 @@
+ # Vytautas Liuolia <vytautas.liuolia@gmail.com>, 2008.
+ # Mantas Kriaučiūnas <mantas@akl.lt>, 2011.
+ # Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2011.
+-# Aurimas Černius <aurisc4@gmail.com>, 2010, 2013.
++# Aurimas Černius <aurisc4@gmail.com>, 2010, 2013, 2014.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-control-center master\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "control-center&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-09-20 21:45+0000\n"
+-"PO-Revision-Date: 2013-09-22 17:37+0300\n"
++"POT-Creation-Date: 2014-01-10 18:08+0000\n"
++"PO-Revision-Date: 2014-01-11 23:54+0200\n"
+ "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
+ "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
+ "Language: lt\n"
+@@ -77,7 +77,7 @@ msgid "Span"
+ msgstr "Apgaubti"
+ 
+ #. translators: This is the title of the wallpaper chooser dialog.
+-#: ../panels/background/cc-background-chooser-dialog.c:293
++#: ../panels/background/cc-background-chooser-dialog.c:292
+ msgid "Select Background"
+ msgstr "Pasirinkti foną"
+ 
+@@ -98,32 +98,32 @@ msgid "Flickr"
+ msgstr "Flickr"
+ 
+ #. translators: No pictures were found
+-#: ../panels/background/cc-background-chooser-dialog.c:393
++#: ../panels/background/cc-background-chooser-dialog.c:385
+ msgid "No Pictures Found"
+ msgstr "Nerasta paveikslėlių"
+ 
+ #. translators: %s here is the name of the Pictures directory, the string should be translated in
+ #. * the context "You can add images to your Pictures folder and they will show up here"
+-#: ../panels/background/cc-background-chooser-dialog.c:408
++#: ../panels/background/cc-background-chooser-dialog.c:400
+ #, c-format
+ msgid "You can add images to your %s folder and they will show up here"
+ msgstr "Galite pridėti paveikslėlių į aplanką %s ir juos matysite čia"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:436
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:631
+-#: ../panels/color/cc-color-panel.c:220 ../panels/color/cc-color-panel.c:967
+-#: ../panels/display/cc-display-panel.c:1495
+-#: ../panels/display/cc-display-panel.c:1910
++#: ../panels/background/cc-background-chooser-dialog.c:429
++#: ../panels/bluetooth/cc-bluetooth-panel.c:640
++#: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
++#: ../panels/display/cc-display-panel.c:1510
++#: ../panels/display/cc-display-panel.c:1952
+ #: ../panels/network/connection-editor/vpn-helpers.c:245
+ #: ../panels/network/connection-editor/vpn-helpers.c:374
+-#: ../panels/network/net-device-wifi.c:1201
+-#: ../panels/network/net-device-wifi.c:1407
++#: ../panels/network/net-device-wifi.c:1194
++#: ../panels/network/net-device-wifi.c:1402
+ #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
+ #: ../panels/printers/cc-printers-panel.c:1946
+ #: ../panels/printers/new-printer-dialog.ui.h:2
+-#: ../panels/privacy/cc-privacy-panel.c:467
++#: ../panels/privacy/cc-privacy-panel.c:470
+ #: ../panels/search/cc-search-locations-dialog.c:682
+-#: ../panels/sharing/cc-sharing-panel.c:421
++#: ../panels/sharing/cc-sharing-panel.c:425
+ #: ../panels/user-accounts/um-fingerprint-dialog.c:269
+ #: ../panels/user-accounts/um-photo-dialog.c:96
+ #: ../panels/user-accounts/um-photo-dialog.c:221
+@@ -131,9 +131,8 @@ msgstr "Galite pridėti paveikslėlių į aplanką %s ir juos matysite čia"
+ msgid "_Cancel"
+ msgstr "_Atsisakyti"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:437
++#: ../panels/background/cc-background-chooser-dialog.c:430
+ #: ../panels/printers/ppd-selection-dialog.ui.h:3
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:9
+ #: ../panels/user-accounts/um-photo-dialog.c:98
+ msgid "Select"
+ msgstr "Pasirinkti"
+@@ -153,7 +152,7 @@ msgstr "%d × %d"
+ msgid "No Desktop Background"
+ msgstr "Nėra darbastalio fono"
+ 
+-#: ../panels/background/cc-background-panel.c:492
++#: ../panels/background/cc-background-panel.c:493
+ msgid "Current background"
+ msgstr "Dabartinis fonas"
+ 
+@@ -170,7 +169,7 @@ msgstr "Fonas;Ekranas;Darbastalis;"
+ msgid "Set Up New Device"
+ msgstr "Nustatyti naują įrenginį"
+ 
+-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
++#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
+ msgid "Remove Device"
+ msgstr "Pašalinti įrenginį"
+ 
+@@ -224,50 +223,50 @@ msgstr "Klaviatūros nustatymai"
+ msgid "Send Files…"
+ msgstr "Siųsti failus..."
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
+ msgid "Yes"
+ msgstr "Taip"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
+ msgid "No"
+ msgstr "Ne"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:470
++#: ../panels/bluetooth/cc-bluetooth-panel.c:479
+ msgid "Bluetooth is disabled"
+ msgstr "Bluetooth yra išjungtas"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:475
++#: ../panels/bluetooth/cc-bluetooth-panel.c:484
+ msgid "Bluetooth is disabled by hardware switch"
+ msgstr "Bluetooth yra išjungtas aparatiniu jungikliu"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:479
++#: ../panels/bluetooth/cc-bluetooth-panel.c:488
+ msgid "No Bluetooth adapters found"
+ msgstr "Nėra Bluetooth adapterių"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:578
++#: ../panels/bluetooth/cc-bluetooth-panel.c:587
+ msgid "Visibility"
+ msgstr "Matomumas"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:582
++#: ../panels/bluetooth/cc-bluetooth-panel.c:591
+ #, c-format
+ msgid "Visibility of “%s”"
+ msgstr "„%s“ matomumas"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:626
++#: ../panels/bluetooth/cc-bluetooth-panel.c:635
+ #, c-format
+ msgid "Remove '%s' from the list of devices?"
+ msgstr "Pašalinti „%s“ iš įrenginių sąrašo?"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:628
++#: ../panels/bluetooth/cc-bluetooth-panel.c:637
+ msgid ""
+ "If you remove the device, you will have to set it up again before next use."
+ msgstr ""
+ "Jei pašalinsite šį įrenginį, prieš kitą naudojimą jį vėl turėsite iš naujo "
+ "nustatyti."
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:632
++#: ../panels/bluetooth/cc-bluetooth-panel.c:641
+ #: ../panels/online-accounts/cc-online-accounts-panel.c:844
+ msgid "_Remove"
+ msgstr "_Pašalinti"
+@@ -281,7 +280,7 @@ msgid "Turn Bluetooth on and off and connect your devices"
+ msgstr "Įjunkite arba išjunkite Bluetooth ir junkitės prie savo įrenginių"
+ 
+ #. TRANSLATORS: The user has to attach the sensor to the screen
+-#: ../panels/color/cc-color-calibrate.c:360
++#: ../panels/color/cc-color-calibrate.c:361
+ msgid "Place your calibration device over the square and press 'Start'"
+ msgstr ""
+ "Pridėkite kalibravimo įrenginį prie stačiakampio ir spauskite „Pradėti“"
+@@ -289,7 +288,7 @@ msgstr ""
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:366
++#: ../panels/color/cc-color-calibrate.c:367
+ msgid ""
+ "Move your calibration device to the calibrate position and press 'Continue'"
+ msgstr ""
+@@ -298,7 +297,7 @@ msgstr ""
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:372
++#: ../panels/color/cc-color-calibrate.c:373
+ msgid ""
+ "Move your calibration device to the surface position and press 'Continue'"
+ msgstr "Perkelkite kalibravimo įrenginį prie paviršiaus ir spauskite „Tęsti“"
+@@ -306,54 +305,54 @@ msgstr "Perkelkite kalibravimo įrenginį prie paviršiaus ir spauskite „Tęst
+ #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
+ #. * is built into the palmrest and we need to fullscreen the
+ #. * sample widget and shut the lid.
+-#: ../panels/color/cc-color-calibrate.c:378
++#: ../panels/color/cc-color-calibrate.c:379
+ msgid "Shut the laptop lid"
+ msgstr "Užverkite nešiojamą kompiuterį"
+ 
+ #. TRANSLATORS: We suck, the calibation failed and we have no
+ #. * good idea why or any suggestions
+-#: ../panels/color/cc-color-calibrate.c:409
++#: ../panels/color/cc-color-calibrate.c:410
+ msgid "An internal error occurred that could not be recovered."
+ msgstr "Įvyko vidinė klaida, kurios negalima atstatyti."
+ 
+ #. TRANSLATORS: Some required-at-runtime tools were not
+ #. * installed, which should only affect insane distros
+-#: ../panels/color/cc-color-calibrate.c:414
++#: ../panels/color/cc-color-calibrate.c:415
+ msgid "Tools required for calibration are not installed."
+ msgstr "Kalibravimui reikalingi įrankiai nėra įdiegti."
+ 
+ #. TRANSLATORS: The profile failed for some reason
+-#: ../panels/color/cc-color-calibrate.c:420
++#: ../panels/color/cc-color-calibrate.c:421
+ msgid "The profile could not be generated."
+ msgstr "Nepavyko sugeneruoti profilio."
+ 
+ #. TRANSLATORS: The user specified a whitepoint that was
+ #. * unobtainable with the hardware they've got -- see
+ #. * https://en.wikipedia.org/wiki/White_point for details
+-#: ../panels/color/cc-color-calibrate.c:426
++#: ../panels/color/cc-color-calibrate.c:427
+ msgid "The target whitepoint was not obtainable."
+ msgstr "Nepavyko gauti tikslo balto taško."
+ 
+ #. TRANSLATORS: the display calibration process is finished
+-#: ../panels/color/cc-color-calibrate.c:466
++#: ../panels/color/cc-color-calibrate.c:467
+ msgid "Complete!"
+ msgstr "Atlikta!"
+ 
+ #. TRANSLATORS: the display calibration failed, and we also show
+ #. * the translated (or untranslated) error string after this
+-#: ../panels/color/cc-color-calibrate.c:474
++#: ../panels/color/cc-color-calibrate.c:475
+ msgid "Calibration failed!"
+ msgstr "Kalibracija nepavyko!"
+ 
+ #. TRANSLATORS: The user can now remove the sensor from the screen
+-#: ../panels/color/cc-color-calibrate.c:481
++#: ../panels/color/cc-color-calibrate.c:482
+ msgid "You can remove the calibration device."
+ msgstr "Galite pašalinti kalibravimo įrenginį."
+ 
+ #. TRANSLATORS: The user has to be careful not to knock the
+ #. * display off the screen (although we do cope if this is
+ #. * detected early enough)
+-#: ../panels/color/cc-color-calibrate.c:552
++#: ../panels/color/cc-color-calibrate.c:553
+ msgid "Do not disturb the calibration device while in progress"
+ msgstr "Nelieskite kalibravimo įrenginio kol vykdoma"
+ 
+@@ -415,48 +414,48 @@ msgstr "Nekalibruotas"
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile has been auto-generated for this hardware
+-#: ../panels/color/cc-color-panel.c:135
++#: ../panels/color/cc-color-panel.c:137
+ msgid "Default: "
+ msgstr "Numatytasis: "
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile his a standard space like AdobeRGB
+-#: ../panels/color/cc-color-panel.c:143
++#: ../panels/color/cc-color-panel.c:145
+ msgid "Colorspace: "
+ msgstr "Spalvų erdvė:"
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile is a test profile
+-#: ../panels/color/cc-color-panel.c:150
++#: ../panels/color/cc-color-panel.c:152
+ msgid "Test profile: "
+ msgstr "Bandomasis profilis: "
+ 
+ #. TRANSLATORS: an ICC profile is a file containing colorspace data
+-#: ../panels/color/cc-color-panel.c:218
++#: ../panels/color/cc-color-panel.c:219
+ msgid "Select ICC Profile File"
+ msgstr "Pasirinkite ICC profilio failą"
+ 
+-#: ../panels/color/cc-color-panel.c:221
++#: ../panels/color/cc-color-panel.c:222
+ msgid "_Import"
+ msgstr "_Importuoti"
+ 
+ #. TRANSLATORS: filter name on the file->open dialog
+-#: ../panels/color/cc-color-panel.c:232
++#: ../panels/color/cc-color-panel.c:233
+ msgid "Supported ICC profiles"
+ msgstr "Palaikomi ICC profiliai"
+ 
+ #. TRANSLATORS: filter name on the file->open dialog
+-#: ../panels/color/cc-color-panel.c:239
++#: ../panels/color/cc-color-panel.c:240
+ #: ../panels/network/wireless-security/eap-method-fast.c:410
+ msgid "All files"
+ msgstr "Visi failai"
+ 
+-#: ../panels/color/cc-color-panel.c:586
++#: ../panels/color/cc-color-panel.c:579
+ msgid "Screen"
+ msgstr "Ekranas"
+ 
+ #. TRANSLATORS: this is when the upload of the profile failed
+-#: ../panels/color/cc-color-panel.c:912
++#: ../panels/color/cc-color-panel.c:903
+ #, c-format
+ msgid "Failed to upload file: %s"
+ msgstr "Nepavyko nusiųsti failo: %s"
+@@ -464,39 +463,39 @@ msgstr "Nepavyko nusiųsti failo: %s"
+ #. TRANSLATORS: these are instructions on how to recover
+ #. * the ICC profile on the native operating system and are
+ #. * only shown when the user uses a LiveCD to calibrate
+-#: ../panels/color/cc-color-panel.c:926
++#: ../panels/color/cc-color-panel.c:917
+ msgid "The profile has been uploaded to:"
+ msgstr "Profilis buvo nusiųstas į:"
+ 
+-#: ../panels/color/cc-color-panel.c:928
++#: ../panels/color/cc-color-panel.c:919
+ msgid "Write down this URL."
+ msgstr "Užsirašyti šį URL."
+ 
+-#: ../panels/color/cc-color-panel.c:929
++#: ../panels/color/cc-color-panel.c:920
+ msgid "Restart this computer and boot your normal operating system."
+ msgstr "Paleisti kompiuterį iš naujo ir įkelti normalią operacinę sistemą."
+ 
+-#: ../panels/color/cc-color-panel.c:930
++#: ../panels/color/cc-color-panel.c:921
+ msgid "Type the URL into your browser to download and install the profile."
+ msgstr "Įveskite URL naršyklėje profilio parsiuntimui ir įdiegimui."
+ 
+ #. TRANSLATORS: this is the dialog to save the ICC profile
+-#: ../panels/color/cc-color-panel.c:964
++#: ../panels/color/cc-color-panel.c:955
+ msgid "Save Profile"
+ msgstr "Įrašyti profilį"
+ 
+-#: ../panels/color/cc-color-panel.c:968
++#: ../panels/color/cc-color-panel.c:959
+ #: ../panels/network/connection-editor/vpn-helpers.c:375
+ msgid "_Save"
+ msgstr "Į_rašyti"
+ 
+ #. TRANSLATORS: this is when the button is sensitive
+-#: ../panels/color/cc-color-panel.c:1328
++#: ../panels/color/cc-color-panel.c:1315
+ msgid "Create a color profile for the selected device"
+ msgstr "Sukurti spalvų profilį pasirinktam įrenginiui"
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1343 ../panels/color/cc-color-panel.c:1367
++#: ../panels/color/cc-color-panel.c:1330 ../panels/color/cc-color-panel.c:1354
+ msgid ""
+ "The measuring instrument is not detected. Please check it is turned on and "
+ "correctly connected."
+@@ -505,12 +504,12 @@ msgstr ""
+ "prijungtas."
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1377
++#: ../panels/color/cc-color-panel.c:1364
+ msgid "The measuring instrument does not support printer profiling."
+ msgstr "Matavimo prietaisas nepalaiko spausdintuvo profiliavimo."
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1388
++#: ../panels/color/cc-color-panel.c:1375
+ msgid "The device type is not currently supported."
+ msgstr "Įrenginio tipas šiuo metu nepalaikomas."
+ 
+@@ -597,7 +596,6 @@ msgstr "Vaizduoklio kalibravimas"
+ #: ../panels/color/color-calibrate.ui.h:2
+ #: ../panels/printers/authentication-dialog.ui.h:2
+ #: ../panels/printers/ppd-selection-dialog.ui.h:2
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:8
+ #: ../panels/user-accounts/um-account-dialog.c:1470
+ msgid "Cancel"
+ msgstr "Atsisakyti"
+@@ -618,10 +616,10 @@ msgid "Done"
+ msgstr "Atlikta"
+ 
+ #. Timeout parameters
+-#. 5000 = 5 sec
++#. 15000 = 15 sec
+ #. 750 = 0.75 sec
+ #. Text printed on screen
+-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
++#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:83
+ msgid "Screen Calibration"
+ msgstr "Ekrano kalibravimas"
+ 
+@@ -765,168 +763,148 @@ msgstr ""
+ "</a>"
+ 
+ #: ../panels/color/color.ui.h:30
+-msgid "Device type:"
+-msgstr "Įrenginio tipas:"
+-
+-#: ../panels/color/color.ui.h:31
+-msgid "Manufacturer:"
+-msgstr "Gamintojas:"
+-
+-#: ../panels/color/color.ui.h:32
+-msgid "Model:"
+-msgstr "Modelis:"
+-
+-#: ../panels/color/color.ui.h:33
+-msgid ""
+-"Image files can be dragged on this window to auto-complete the above fields."
+-msgstr ""
+-"Paveikslėlių failai gali būti tempiami į šį langą automatiniam laukų "
+-"užpildymui."
+-
+-#: ../panels/color/color.ui.h:34
+-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+-msgid "Color"
+-msgstr "Spalva"
+-
+-#: ../panels/color/color.ui.h:35
+ msgid "Each device needs an up to date color profile to be color managed."
+ msgstr ""
+ "Spalvų derinimui reikia pakankamai naujo spalvų profilio kiekvienam "
+ "įrenginiui."
+ 
+-#: ../panels/color/color.ui.h:36
++#: ../panels/color/color.ui.h:31
+ msgid "Learn more"
+ msgstr "Sužinoti daugiau"
+ 
+-#: ../panels/color/color.ui.h:37
++#: ../panels/color/color.ui.h:32
+ msgid "Learn more about color management"
+ msgstr "Sužinokite daugiau apie spalvų derinimą"
+ 
+-#: ../panels/color/color.ui.h:38
++#: ../panels/color/color.ui.h:33
+ msgid "Set for all users"
+ msgstr "Nustatyti visiems naudotojams"
+ 
+-#: ../panels/color/color.ui.h:39
++#: ../panels/color/color.ui.h:34
+ msgid "Set this profile for all users on this computer"
+ msgstr "Nustatyti šį profilį visiems šio kompiuterio naudotojams"
+ 
+-#: ../panels/color/color.ui.h:40
++#: ../panels/color/color.ui.h:35
+ msgid "Enable"
+ msgstr "Įjungti"
+ 
+-#: ../panels/color/color.ui.h:41
++#: ../panels/color/color.ui.h:36
+ msgid "Add profile"
+ msgstr "Pridėti profilį"
+ 
+-#: ../panels/color/color.ui.h:42
++#: ../panels/color/color.ui.h:37
+ #: ../panels/wacom/gnome-wacom-properties.ui.h:10
+ msgid "Calibrate…"
+ msgstr "Kalibruoti..."
+ 
+-#: ../panels/color/color.ui.h:43
++#: ../panels/color/color.ui.h:38
+ msgid "Calibrate the device"
+ msgstr "Kalibruoti įrenginį"
+ 
+-#: ../panels/color/color.ui.h:44
++#: ../panels/color/color.ui.h:39
+ msgid "Remove profile"
+ msgstr "Pašalinti profilį"
+ 
+-#: ../panels/color/color.ui.h:45
++#: ../panels/color/color.ui.h:40
+ msgid "View details"
+ msgstr "Išsamiau"
+ 
+-#: ../panels/color/color.ui.h:46
++#: ../panels/color/color.ui.h:41
+ msgid "Unable to detect any devices that can be color managed"
+ msgstr "Nepavyko aptikti įrenginių spalvų valdymui"
+ 
+-#: ../panels/color/color.ui.h:47
++#: ../panels/color/color.ui.h:42
+ msgid "LCD"
+ msgstr "LCD"
+ 
+-#: ../panels/color/color.ui.h:48
++#: ../panels/color/color.ui.h:43
+ msgid "LED"
+ msgstr "LED"
+ 
+-#: ../panels/color/color.ui.h:49
++#: ../panels/color/color.ui.h:44
+ msgid "CRT"
+ msgstr "CRT"
+ 
+-#: ../panels/color/color.ui.h:50
++#: ../panels/color/color.ui.h:45
+ msgid "Projector"
+ msgstr "Projektorius"
+ 
+-#: ../panels/color/color.ui.h:51
++#: ../panels/color/color.ui.h:46
+ msgid "Plasma"
+ msgstr "Plazminis monitorius"
+ 
+-#: ../panels/color/color.ui.h:52
++#: ../panels/color/color.ui.h:47
+ msgid "LCD (CCFL backlight)"
+ msgstr "LCD (CCFL apšvietimas)"
+ 
+-#: ../panels/color/color.ui.h:53
++#: ../panels/color/color.ui.h:48
+ msgid "LCD (RGB LED backlight)"
+ msgstr "LCD (RGB LED apšvietimas)"
+ 
+-#: ../panels/color/color.ui.h:54
++#: ../panels/color/color.ui.h:49
+ msgid "LCD (white LED backlight)"
+ msgstr "LCD (balta LED apšvietimas)"
+ 
+-#: ../panels/color/color.ui.h:55
++#: ../panels/color/color.ui.h:50
+ msgid "Wide gamut LCD (CCFL backlight)"
+ msgstr "Didelės raškos LCD (CCFL apšvietimas)"
+ 
+-#: ../panels/color/color.ui.h:56
++#: ../panels/color/color.ui.h:51
+ msgid "Wide gamut LCD (RGB LED backlight)"
+ msgstr "Didelės raiškos LCD (RGB LED apšvietimas)"
+ 
+-#: ../panels/color/color.ui.h:57
++#: ../panels/color/color.ui.h:52
+ msgctxt "Calibration quality"
+ msgid "High"
+ msgstr "Aukšta"
+ 
+-#: ../panels/color/color.ui.h:58
++#: ../panels/color/color.ui.h:53
+ msgid "40 minutes"
+ msgstr "40 minučių"
+ 
+-#: ../panels/color/color.ui.h:59
++#: ../panels/color/color.ui.h:54
+ msgctxt "Calibration quality"
+ msgid "Medium"
+ msgstr "Vidutinė"
+ 
+-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:4
++#: ../panels/color/color.ui.h:55 ../panels/power/power.ui.h:4
+ #: ../panels/privacy/privacy.ui.h:7
+ msgid "30 minutes"
+ msgstr "30 minučių"
+ 
+-#: ../panels/color/color.ui.h:61
++#: ../panels/color/color.ui.h:56
+ msgctxt "Calibration quality"
+ msgid "Low"
+ msgstr "Žema"
+ 
+-#: ../panels/color/color.ui.h:62 ../panels/power/power.ui.h:3
++#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:3
+ msgid "15 minutes"
+ msgstr "15 minučių"
+ 
+-#: ../panels/color/color.ui.h:63
++#: ../panels/color/color.ui.h:58
+ msgid "Native to display"
+ msgstr "Kūrimo vaizduoklis"
+ 
+-#: ../panels/color/color.ui.h:64
++#: ../panels/color/color.ui.h:59
+ msgid "D50 (Printing and publishing)"
+ msgstr "D50 (spaudimas ir pateikimas)"
+ 
+-#: ../panels/color/color.ui.h:65
++#: ../panels/color/color.ui.h:60
+ msgid "D55"
+ msgstr "D55"
+ 
+-#: ../panels/color/color.ui.h:66
++#: ../panels/color/color.ui.h:61
+ msgid "D65 (Photography and graphics)"
+ msgstr "D65 (fotografija ir grafika)"
+ 
+-#: ../panels/color/color.ui.h:67
++#: ../panels/color/color.ui.h:62
+ msgid "D75"
+ msgstr "D75"
+ 
++#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
++msgid "Color"
++msgstr "Spalva"
++
+ #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+ msgid ""
+ "Calibrate the color of your devices, such as displays, cameras or printers"
+@@ -979,33 +957,33 @@ msgid "Language"
+ msgstr "Kalba"
+ 
+ #: ../panels/common/language-chooser.ui.h:2
+-#: ../panels/mouse/cc-mouse-panel.c:120 ../panels/region/format-chooser.ui.h:2
++#: ../panels/mouse/cc-mouse-panel.c:111 ../panels/region/format-chooser.ui.h:2
+ msgid "_Done"
+ msgstr "_Atlikta"
+ 
+ #. Translators: This is the full date and time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:352
++#: ../panels/datetime/cc-datetime-panel.c:363
+ msgid "%e %B %Y, %l:%M %p"
+ msgstr "%Y %B %d, %l:%M %p"
+ 
+ #. Translators: This is the full date and time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:357
++#: ../panels/datetime/cc-datetime-panel.c:368
+ msgid "%e %B %Y, %R"
+ msgstr "%Y %B %d, %R"
+ 
+ #. Translators: UTC here means the Coordinated Universal Time.
+ #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
+-#: ../panels/datetime/cc-datetime-panel.c:573
++#: ../panels/datetime/cc-datetime-panel.c:584
+ msgid "UTC%:::z"
+ msgstr "UTC%:::z"
+ 
+ #. Translators: This is the time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:578
++#: ../panels/datetime/cc-datetime-panel.c:589
+ msgid "%l:%M %p"
+ msgstr "%l:%M %p"
+ 
+ #. Translators: This is the time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:583
++#: ../panels/datetime/cc-datetime-panel.c:594
+ msgid "%R"
+ msgstr "%R"
+ 
+@@ -1144,144 +1122,109 @@ msgstr "Keiskite sistemos laiko ir datos nustatymus"
+ msgid "To change time or date settings, you need to authenticate."
+ msgstr "Datos ir laiko nustatymams pakeisti reikia patvirtinti tapatybę."
+ 
+-#: ../panels/display/cc-display-panel.c:473
++#: ../panels/display/cc-display-panel.c:486
+ msgid "Lid Closed"
+ msgstr "Užvertas"
+ 
+ #. translators: "Mirrored" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:476
++#: ../panels/display/cc-display-panel.c:489
+ msgid "Mirrored"
+ msgstr "Dubliuoti"
+ 
+-#: ../panels/display/cc-display-panel.c:478
+-#: ../panels/display/cc-display-panel.c:2043
+-#: ../panels/display/display-capplet.ui.h:1
++#: ../panels/display/cc-display-panel.c:491
++#: ../panels/display/cc-display-panel.c:2101
+ msgid "Primary"
+ msgstr "Pagrindinis"
+ 
+-#: ../panels/display/cc-display-panel.c:480
++#: ../panels/display/cc-display-panel.c:493
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1727 ../panels/power/cc-power-panel.c:1738
+-#: ../panels/privacy/cc-privacy-panel.c:77
+-#: ../panels/privacy/cc-privacy-panel.c:117
+-#: ../panels/universal-access/cc-ua-panel.c:253
+-#: ../panels/universal-access/cc-ua-panel.c:610
+-#: ../panels/universal-access/cc-ua-panel.c:736
++#: ../panels/power/cc-power-panel.c:1738 ../panels/power/cc-power-panel.c:1749
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ #: ../panels/universal-access/uap.ui.h:6
+ msgid "Off"
+ msgstr "Išjungta"
+ 
+-#: ../panels/display/cc-display-panel.c:483
++#: ../panels/display/cc-display-panel.c:496
+ msgid "Secondary"
+ msgstr "Antrinis"
+ 
+-#: ../panels/display/cc-display-panel.c:1491
++#: ../panels/display/cc-display-panel.c:1506
+ msgid "Arrange Combined Displays"
+ msgstr "Išdėstyti vaizduoklius"
+ 
+-#: ../panels/display/cc-display-panel.c:1497
+-#: ../panels/display/cc-display-panel.c:1913
++#: ../panels/display/cc-display-panel.c:1512
++#: ../panels/display/cc-display-panel.c:1955
+ #: ../panels/network/connection-editor/connection-editor.ui.h:1
+ msgid "_Apply"
+ msgstr "_Pritaikyti"
+ 
+-#: ../panels/display/cc-display-panel.c:1518
++#: ../panels/display/cc-display-panel.c:1533
+ msgid "Drag displays to rearrange them"
+ msgstr "Tempkite vaizduoklius jų išdėstymui"
+ 
+-#. size
+-#: ../panels/display/cc-display-panel.c:1977
++#: ../panels/display/cc-display-panel.c:2037
+ msgid "Size"
+ msgstr "Dydis"
+ 
+ #. aspect ratio
+-#: ../panels/display/cc-display-panel.c:1992
+-#: ../panels/display/display-capplet.ui.h:12
++#: ../panels/display/cc-display-panel.c:2050
+ msgid "Aspect Ratio"
+ msgstr "Proporcija"
+ 
+-#: ../panels/display/cc-display-panel.c:2013
+-#: ../panels/display/display-capplet.ui.h:13
++#: ../panels/display/cc-display-panel.c:2071
+ #: ../panels/printers/pp-options-dialog.c:86
+ msgid "Resolution"
+ msgstr "Skiriamoji geba"
+ 
+-#: ../panels/display/cc-display-panel.c:2044
+-#: ../panels/display/display-capplet.ui.h:2
++#: ../panels/display/cc-display-panel.c:2102
+ msgid "Show the top bar and Activities Overview on this display"
+ msgstr "Rodyti viršutinę juostą ir veiklų apžvalgą šiame vaizduoklyje"
+ 
+-#: ../panels/display/cc-display-panel.c:2050
++#: ../panels/display/cc-display-panel.c:2108
+ msgid "Secondary Display"
+ msgstr "Antrinis vaizduoklis"
+ 
+-#: ../panels/display/cc-display-panel.c:2051
++#: ../panels/display/cc-display-panel.c:2109
+ msgid "Join this display with another to create an extra workspace"
+ msgstr "Prijungti šį vaizduoklį prie kito papildomai darbo vietai sukurti"
+ 
+-#: ../panels/display/cc-display-panel.c:2058
+-#: ../panels/display/display-capplet.ui.h:3
++#: ../panels/display/cc-display-panel.c:2116
+ msgid "Presentation"
+ msgstr "Pateiktis"
+ 
+-#: ../panels/display/cc-display-panel.c:2059
+-#: ../panels/display/display-capplet.ui.h:4
++#: ../panels/display/cc-display-panel.c:2117
+ msgid "Show slideshows and media only"
+ msgstr "Rodyti tik skaidres ir daugialypę terpę"
+ 
+ #. translators: "Mirror" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:2064
+-#: ../panels/display/display-capplet.ui.h:5
++#: ../panels/display/cc-display-panel.c:2122
+ msgid "Mirror"
+ msgstr "Veidrodis"
+ 
+-#: ../panels/display/cc-display-panel.c:2065
++#: ../panels/display/cc-display-panel.c:2123
+ msgid "Show your existing view on both displays"
+ msgstr "Rodyti jūsų esamą vaizdą abiejuose vaizduokliuose"
+ 
+-#: ../panels/display/cc-display-panel.c:2071
+-#: ../panels/display/display-capplet.ui.h:9
++#: ../panels/display/cc-display-panel.c:2129
+ msgid "Turn Off"
+ msgstr "Išjungti"
+ 
+-#: ../panels/display/cc-display-panel.c:2072
+-#| msgid "Don't use the display"
++#: ../panels/display/cc-display-panel.c:2130
+ msgid "Don't use this display"
+ msgstr "Nenaudoti šio vaizduoklio"
+ 
+-#: ../panels/display/cc-display-panel.c:2289
++#: ../panels/display/cc-display-panel.c:2345
+ msgid "Could not get screen information"
+ msgstr "Nepavyko gauti ekrano informacijos"
+ 
+-#: ../panels/display/cc-display-panel.c:2320
++#: ../panels/display/cc-display-panel.c:2376
+ msgid "_Arrange Combined Displays"
+ msgstr "Iš_dėstyti sujungtus vaizduoklius"
+ 
+-#: ../panels/display/display-capplet.ui.h:6
+-msgid "Show your primary display on this screen also"
+-msgstr "Rodyti jūsų pagrindinį vaizduoklį taip pat ir šiame ekrane"
+-
+-#: ../panels/display/display-capplet.ui.h:7
+-msgid "Combine"
+-msgstr "Sujungti"
+-
+-#: ../panels/display/display-capplet.ui.h:8
+-msgid "Join with the primary display to create an extra space"
+-msgstr "Prijungti prie pagrindinio vaizduoklio papildomai vietai sukurti"
+-
+-#: ../panels/display/display-capplet.ui.h:10
+-msgid "Don't use the display"
+-msgstr "Nenaudoti vaizduoklio"
+-
+-#: ../panels/display/display-capplet.ui.h:11
+-#: ../panels/printers/printers.ui.h:12
+-msgid "Model"
+-msgstr "Modelis"
+-
+-#: ../panels/display/display-capplet.ui.h:14
+-msgid "Refresh Rate"
+-msgstr "Atnaujinimo dažnis"
+-
+ #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
+ msgid "Displays"
+ msgstr "Ekranai"
+@@ -1296,53 +1239,53 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
+ msgstr "Skydelis;Projektorius;xrandr;Ekranas;Raiška;Atnaujinimas;"
+ 
+ #. TRANSLATORS: AP type
+-#: ../panels/info/cc-info-panel.c:450 ../panels/network/panel-common.c:127
++#: ../panels/info/cc-info-panel.c:452 ../panels/network/panel-common.c:127
+ msgid "Unknown"
+ msgstr "Nežinomas"
+ 
+-#: ../panels/info/cc-info-panel.c:532
++#: ../panels/info/cc-info-panel.c:539
+ #, c-format
+ msgid "%s %d-bit"
+ msgstr "%s %d-bitų"
+ 
+-#: ../panels/info/cc-info-panel.c:534
++#: ../panels/info/cc-info-panel.c:541
+ #, c-format
+ msgid "%d-bit"
+ msgstr "%d-bitų"
+ 
+-#: ../panels/info/cc-info-panel.c:1214
++#: ../panels/info/cc-info-panel.c:1221
+ msgid "Ask what to do"
+ msgstr "Klausti, ką daryti"
+ 
+-#: ../panels/info/cc-info-panel.c:1218
++#: ../panels/info/cc-info-panel.c:1225
+ msgid "Do nothing"
+ msgstr "Nieko nedaryti"
+ 
+-#: ../panels/info/cc-info-panel.c:1222
++#: ../panels/info/cc-info-panel.c:1229
+ msgid "Open folder"
+ msgstr "Atverti aplanką"
+ 
+-#: ../panels/info/cc-info-panel.c:1313
++#: ../panels/info/cc-info-panel.c:1320
+ msgid "Other Media"
+ msgstr "Kitos laikmenos"
+ 
+-#: ../panels/info/cc-info-panel.c:1344
++#: ../panels/info/cc-info-panel.c:1351
+ msgid "Select an application for audio CDs"
+ msgstr "Parinkite programą, kuria norėtumėte klausytis garso CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1345
++#: ../panels/info/cc-info-panel.c:1352
+ msgid "Select an application for video DVDs"
+ msgstr "Parinkite programą vaizdo DVD rodymui"
+ 
+-#: ../panels/info/cc-info-panel.c:1346
++#: ../panels/info/cc-info-panel.c:1353
+ msgid "Select an application to run when a music player is connected"
+ msgstr "Pasirinkite paleistiną programą, kai muzikos grotuvas prijungiamas"
+ 
+-#: ../panels/info/cc-info-panel.c:1347
++#: ../panels/info/cc-info-panel.c:1354
+ msgid "Select an application to run when a camera is connected"
+ msgstr "Pasirinkite paleistiną programą, kai prijungiamas fotoaparatas"
+ 
+-#: ../panels/info/cc-info-panel.c:1348
++#: ../panels/info/cc-info-panel.c:1355
+ msgid "Select an application for software CDs"
+ msgstr "Parinkite programą programinės įrangos CD paleidimui"
+ 
+@@ -1351,89 +1294,89 @@ msgstr "Parinkite programą programinės įrangos CD paleidimui"
+ #. * If the shared-mime-info translation works for your language,
+ #. * simply leave these untranslated.
+ #.
+-#: ../panels/info/cc-info-panel.c:1360
++#: ../panels/info/cc-info-panel.c:1367
+ msgid "audio DVD"
+ msgstr "garso DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1361
++#: ../panels/info/cc-info-panel.c:1368
+ msgid "blank Blu-ray disc"
+ msgstr "tuščias Blu-ray diskas"
+ 
+-#: ../panels/info/cc-info-panel.c:1362
++#: ../panels/info/cc-info-panel.c:1369
+ msgid "blank CD disc"
+ msgstr "tuščias CD diskas"
+ 
+-#: ../panels/info/cc-info-panel.c:1363
++#: ../panels/info/cc-info-panel.c:1370
+ msgid "blank DVD disc"
+ msgstr "tuščias DVD diskas"
+ 
+-#: ../panels/info/cc-info-panel.c:1364
++#: ../panels/info/cc-info-panel.c:1371
+ msgid "blank HD DVD disc"
+ msgstr "tuščias HD DVD diskas"
+ 
+-#: ../panels/info/cc-info-panel.c:1365
++#: ../panels/info/cc-info-panel.c:1372
+ msgid "Blu-ray video disc"
+ msgstr "Blu-ray vaizdo diskas"
+ 
+-#: ../panels/info/cc-info-panel.c:1366
++#: ../panels/info/cc-info-panel.c:1373
+ msgid "e-book reader"
+ msgstr "el. knygų skaitytuvas"
+ 
+-#: ../panels/info/cc-info-panel.c:1367
++#: ../panels/info/cc-info-panel.c:1374
+ msgid "HD DVD video disc"
+ msgstr "HD DVD vaizdo diskas"
+ 
+-#: ../panels/info/cc-info-panel.c:1368
++#: ../panels/info/cc-info-panel.c:1375
+ msgid "Picture CD"
+ msgstr "Paveikslėlių CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1369
++#: ../panels/info/cc-info-panel.c:1376
+ msgid "Super Video CD"
+ msgstr "Super vaizdo CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1370
++#: ../panels/info/cc-info-panel.c:1377
+ msgid "Video CD"
+ msgstr "Vaizdo CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1371
++#: ../panels/info/cc-info-panel.c:1378
+ msgid "Windows software"
+ msgstr "Windows programinė įranga"
+ 
+-#: ../panels/info/cc-info-panel.c:1372
++#: ../panels/info/cc-info-panel.c:1379
+ msgid "Software"
+ msgstr "Programinė įranga"
+ 
+-#: ../panels/info/cc-info-panel.c:1495
++#: ../panels/info/cc-info-panel.c:1502
+ #: ../panels/keyboard/keyboard-shortcuts.c:1696
+ msgid "Section"
+ msgstr "Skyrius"
+ 
+-#: ../panels/info/cc-info-panel.c:1504 ../panels/info/info.ui.h:13
++#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:13
+ msgid "Overview"
+ msgstr "Apžvalga"
+ 
+-#: ../panels/info/cc-info-panel.c:1510 ../panels/info/info.ui.h:20
++#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:20
+ msgid "Default Applications"
+ msgstr "Numatytosios programos"
+ 
+-#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:28
++#: ../panels/info/cc-info-panel.c:1522 ../panels/info/info.ui.h:28
+ msgid "Removable Media"
+ msgstr "Išimamos laikmenos"
+ 
+-#: ../panels/info/cc-info-panel.c:1540
++#: ../panels/info/cc-info-panel.c:1547
+ #, c-format
+ msgid "Version %s"
+ msgstr "Versija %s"
+ 
+-#: ../panels/info/cc-info-panel.c:1590
++#: ../panels/info/cc-info-panel.c:1597
+ msgid "Install Updates"
+ msgstr "Įdiegti atnaujinimus"
+ 
+-#: ../panels/info/cc-info-panel.c:1594
++#: ../panels/info/cc-info-panel.c:1601
+ msgid "System Up-To-Date"
+ msgstr "Sistema yra atnaujinta"
+ 
+-#: ../panels/info/cc-info-panel.c:1598
++#: ../panels/info/cc-info-panel.c:1605
+ msgid "Checking for Updates"
+ msgstr "Ieškoma atnaujinimų"
+ 
+@@ -1599,7 +1542,7 @@ msgid "Eject"
+ msgstr "Išstumti"
+ 
+ #: ../panels/keyboard/01-input-sources.xml.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+ #: ../panels/universal-access/uap.ui.h:11
+ msgid "Typing"
+ msgstr "Spausdinimas"
+@@ -1758,7 +1701,6 @@ msgid "Modifiers-only switch to next source"
+ msgstr "Tik modifikatoriai perjungia į kitą šaltinį"
+ 
+ #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Keyboard"
+ msgstr "Klaviatūra"
+ 
+@@ -1784,76 +1726,76 @@ msgstr "_Pavadinimas:"
+ msgid "C_ommand:"
+ msgstr "Ko_manda:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Repeat Keys"
+ msgstr "Kartojimo klavišai"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+ msgid "Key presses _repeat when key is held down"
+ msgstr "Klavišų paspaudimai _kartojami, kai laikomas nuspaustas klavišas"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+ msgid "_Delay:"
+ msgstr "_Delsa:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+ msgid "_Speed:"
+ msgstr "_Greitis:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
+ msgctxt "keyboard, delay"
+ msgid "Short"
+ msgstr "Trumpas"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+ msgctxt "keyboard, speed"
+ msgid "Slow"
+ msgstr "Lėtas"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+ msgid "Repeat keys speed"
+ msgstr "Kartojamų klavišų greitis"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+ msgctxt "keyboard, delay"
+ msgid "Long"
+ msgstr "Ilgas"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+ msgctxt "keyboard, speed"
+ msgid "Fast"
+ msgstr "Greitas"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+ msgid "Cursor Blinking"
+ msgstr "Žymeklio mirksėjimas"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+ msgid "Cursor _blinks in text fields"
+ msgstr "Žymeklis teksto laukeliuose _mirksi"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+ msgid "S_peed:"
+ msgstr "G_reitis:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+ msgid "Cursor blink speed"
+ msgstr "Žymeklio mirksėjimo greitis"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+ #: ../panels/region/region.ui.h:5
+ msgid "Input Sources"
+ msgstr "Įvesties šaltiniai"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+ msgid "Add Shortcut"
+ msgstr "Pridėti trumpinį"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
+ msgid "Remove Shortcut"
+ msgstr "Pašalinti trumpinį"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
+ msgid ""
+ "To edit a shortcut, click the row and hold down the new keys or press "
+ "Backspace to clear."
+@@ -1861,7 +1803,7 @@ msgstr ""
+ "Norėdami pakeisti spartųjį klavišą, spustelėkite atitinkamą eilutę ir "
+ "paspauskite spartųjį klavišą arba spauskite Backspace išvalymui."
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+ msgid "Shortcuts"
+ msgstr "Trumpiniai"
+ 
+@@ -1904,11 +1846,11 @@ msgstr "Jei priskirsite spartųjį klavišą komandai „%s“, „%s“ bus iš
+ msgid "_Reassign"
+ msgstr "_Priskirti iš naujo"
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:100
++#: ../panels/mouse/cc-mouse-panel.c:95
+ msgid "Test Your _Settings"
+ msgstr "Tikrinkite savo _nustatymus"
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:117
++#: ../panels/mouse/cc-mouse-panel.c:108
+ msgid "Test Your Settings"
+ msgstr "Tikrinkite savo nustatymus"
+ 
+@@ -1931,91 +1873,87 @@ msgstr ""
+ "Rutulinis manipuliatorius;Slinkiklis;"
+ 
+ #: ../panels/mouse/gnome-mouse-properties.ui.h:1
+-msgid "Mouse Preferences"
+-msgstr "Pelės nustatymai"
+-
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgid "General"
+ msgstr "Bendri"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
++#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgctxt "double click, speed"
+ msgid "Slow"
+ msgstr "Lėtas"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
++#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+ msgid "Double-click timeout"
+ msgstr "Dvigubo paspaudimo laikas"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
++#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+ msgctxt "double click, speed"
+ msgid "Fast"
+ msgstr "Greitas"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
++#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+ msgid "_Double-click"
+ msgstr "_Dvigubas paspaudimas"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
++#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+ msgid "Primary _button"
+ msgstr "Pagrindinis _mygtukas"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
++#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+ msgctxt "mouse, left button as primary"
+ msgid "_Left"
+ msgstr "_Kairė"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
++#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+ msgctxt "mouse, right button as primary"
+ msgid "_Right"
+ msgstr "_Dešinė"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
++#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+ msgid "Mouse"
+ msgstr "Pelė"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
++#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+ msgid "_Pointer speed"
+ msgstr "Žymeklio _greitis"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
++#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+ msgctxt "mouse pointer, speed"
+ msgid "Slow"
+ msgstr "Lėtas"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
++#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+ msgctxt "mouse pointer, speed"
+ msgid "Fast"
+ msgstr "Greitas"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
++#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+ msgid "Touchpad"
+ msgstr "Jutiklinis kilimėlis"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
++#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+ msgctxt "touchpad pointer, speed"
+ msgid "Slow"
+ msgstr "Lėtas"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
++#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+ msgctxt "touchpad pointer, speed"
+ msgid "Fast"
+ msgstr "Greitas"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
++#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+ msgid "Disable while _typing"
+ msgstr "Spausdinimo _metu išjungti"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
++#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+ msgid "Tap to _click"
+ msgstr "Palieskite _paspaudimui"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
++#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+ msgid "Two _finger scroll"
+ msgstr "Slinktis dviem _pirštais"
+ 
+ #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible.
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:21
++#: ../panels/mouse/gnome-mouse-properties.ui.h:20
+ msgid "_Natural scrolling"
+ msgstr "_Natūralus slinkimas"
+ 
+@@ -2058,7 +1996,7 @@ msgstr "Vienas paspaudimas, antraeilis mygtukas"
+ msgid "Air_plane Mode"
+ msgstr "_Skrydžio veiksena"
+ 
+-#: ../panels/network/cc-network-panel.c:928
++#: ../panels/network/cc-network-panel.c:930
+ msgid "Network proxy"
+ msgstr "Tarpinis tinklo serveris"
+ 
+@@ -2066,14 +2004,14 @@ msgstr "Tarpinis tinklo serveris"
+ #. * window for vpn connections, it is also used to display
+ #. * vpn connections in the device list.
+ #.
+-#: ../panels/network/cc-network-panel.c:1107 ../panels/network/net-vpn.c:285
+-#: ../panels/network/net-vpn.c:438
++#: ../panels/network/cc-network-panel.c:1109 ../panels/network/net-vpn.c:278
++#: ../panels/network/net-vpn.c:431
+ #, c-format
+ msgid "%s VPN"
+ msgstr "%s VPN"
+ 
+ #. TRANSLATORS: the user is running a NM that is not API compatible
+-#: ../panels/network/cc-network-panel.c:1242
++#: ../panels/network/cc-network-panel.c:1244
+ msgid "The system network services are not compatible with this version."
+ msgstr "Sistemos tinklo tarnybos nesuderinamos su šia versija."
+ 
+@@ -2107,34 +2045,34 @@ msgstr "automatinis"
+ 
+ #. TRANSLATORS: this WEP WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:52
+-#: ../panels/network/net-device-wifi.c:221
+-#: ../panels/network/net-device-wifi.c:382
++#: ../panels/network/net-device-wifi.c:216
++#: ../panels/network/net-device-wifi.c:377
+ msgid "WEP"
+ msgstr "WEP"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:56
+-#: ../panels/network/net-device-wifi.c:225
+-#: ../panels/network/net-device-wifi.c:387
++#: ../panels/network/net-device-wifi.c:220
++#: ../panels/network/net-device-wifi.c:382
+ #: ../panels/network/network-wifi.ui.h:17
+ msgid "WPA"
+ msgstr "WPA"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:60
+-#: ../panels/network/net-device-wifi.c:229
++#: ../panels/network/net-device-wifi.c:224
+ msgid "WPA2"
+ msgstr "WPA2"
+ 
+ #. TRANSLATORS: this Enterprise WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:65
+-#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:229
+ msgid "Enterprise"
+ msgstr "Enterprise"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:70
+-#: ../panels/network/net-device-wifi.c:239
+-#: ../panels/network/net-device-wifi.c:372
++#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:367
+ msgctxt "Wifi security"
+ msgid "None"
+ msgstr "Nėra"
+@@ -2155,8 +2093,8 @@ msgid "Yesterday"
+ msgstr "Vakar"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:106
+-#: ../panels/network/net-device-ethernet.c:125
+-#: ../panels/network/net-device-wifi.c:476
++#: ../panels/network/net-device-ethernet.c:122
++#: ../panels/network/net-device-wifi.c:471
+ #, c-format
+ msgid "%i day ago"
+ msgid_plural "%i days ago"
+@@ -2167,37 +2105,37 @@ msgstr[2] "Prieš %i dienų"
+ #. Translators: network device speed
+ #: ../panels/network/connection-editor/ce-page-details.c:155
+ #: ../panels/network/net-device-ethernet.c:53
+-#: ../panels/network/net-device-wifi.c:534
++#: ../panels/network/net-device-wifi.c:528
+ #, c-format
+ msgid "%d Mb/s"
+ msgstr "%d Mb/s"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:181
+-#: ../panels/network/net-device-wifi.c:563
++#: ../panels/network/net-device-wifi.c:557
+ msgctxt "Signal strength"
+ msgid "None"
+ msgstr "Joks"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:183
+-#: ../panels/network/net-device-wifi.c:565
++#: ../panels/network/net-device-wifi.c:559
+ msgctxt "Signal strength"
+ msgid "Weak"
+ msgstr "Silpnas"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:185
+-#: ../panels/network/net-device-wifi.c:567
++#: ../panels/network/net-device-wifi.c:561
+ msgctxt "Signal strength"
+ msgid "Ok"
+ msgstr "Gerai"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:187
+-#: ../panels/network/net-device-wifi.c:569
++#: ../panels/network/net-device-wifi.c:563
+ msgctxt "Signal strength"
+ msgid "Good"
+ msgstr "Geras"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:189
+-#: ../panels/network/net-device-wifi.c:571
++#: ../panels/network/net-device-wifi.c:565
+ msgctxt "Signal strength"
+ msgid "Excellent"
+ msgstr "Puikus"
+@@ -2343,15 +2281,15 @@ msgid "Link speed"
+ msgstr "Saito greitis"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:4
+-#: ../panels/network/net-device-ethernet.c:158
++#: ../panels/network/net-device-ethernet.c:155
+ #: ../panels/network/network-simple.ui.h:3
+ #: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
+ msgid "IPv4 Address"
+ msgstr "IPv4 adresas"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:5
+-#: ../panels/network/net-device-ethernet.c:159
+-#: ../panels/network/net-device-ethernet.c:163
++#: ../panels/network/net-device-ethernet.c:156
++#: ../panels/network/net-device-ethernet.c:160
+ #: ../panels/network/network-mobile.ui.h:4
+ #: ../panels/network/network-simple.ui.h:4
+ #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
+@@ -2359,14 +2297,14 @@ msgid "IPv6 Address"
+ msgstr "IPv6 adresas"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:6
+-#: ../panels/network/net-device-ethernet.c:166
++#: ../panels/network/net-device-ethernet.c:163
+ #: ../panels/network/network-simple.ui.h:2
+ #: ../panels/network/network-wifi.ui.h:7
+ msgid "Hardware Address"
+ msgstr "Aparatinis adresas"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:7
+-#: ../panels/network/net-device-ethernet.c:170
++#: ../panels/network/net-device-ethernet.c:167
+ #: ../panels/network/network-mobile.ui.h:5
+ #: ../panels/network/network-simple.ui.h:5
+ #: ../panels/network/network-wifi.ui.h:8
+@@ -2376,7 +2314,7 @@ msgstr "Numatytasis kelias"
+ #: ../panels/network/connection-editor/details-page.ui.h:8
+ #: ../panels/network/connection-editor/ip4-page.ui.h:3
+ #: ../panels/network/connection-editor/ip6-page.ui.h:3
+-#: ../panels/network/net-device-ethernet.c:172
++#: ../panels/network/net-device-ethernet.c:169
+ #: ../panels/network/network-mobile.ui.h:6
+ #: ../panels/network/network-simple.ui.h:6
+ #: ../panels/network/network-wifi.ui.h:9
+@@ -2522,7 +2460,7 @@ msgid "_Add"
+ msgstr "_Pridėti"
+ 
+ #: ../panels/network/connection-editor/net-connection-editor.c:595
+-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
++#: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
+ msgid "VPN"
+ msgstr "VPN"
+ 
+@@ -2531,22 +2469,26 @@ msgid "Bond"
+ msgstr "Bond"
+ 
+ #: ../panels/network/connection-editor/net-connection-editor.c:597
++msgid "Team"
++msgstr "Team"
++
++#: ../panels/network/connection-editor/net-connection-editor.c:598
+ msgid "Bridge"
+ msgstr "Bridge"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:598
++#: ../panels/network/connection-editor/net-connection-editor.c:599
+ msgid "VLAN"
+ msgstr "VLAN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:749
++#: ../panels/network/connection-editor/net-connection-editor.c:750
+ msgid "Could not load VPN plugins"
+ msgstr "Nepavyko įkelti VPN įskiepių"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:818
++#: ../panels/network/connection-editor/net-connection-editor.c:819
+ msgid "Import from file…"
+ msgstr "Importuoti iš failo…"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:889
++#: ../panels/network/connection-editor/net-connection-editor.c:890
+ msgid "Add Network Connection"
+ msgstr "Pridėti tinklo ryšį"
+ 
+@@ -2556,7 +2498,7 @@ msgid "_Reset"
+ msgstr "_Atstatyti"
+ 
+ #: ../panels/network/connection-editor/reset-page.ui.h:2
+-#: ../panels/network/net-device-wifi.c:1408
++#: ../panels/network/net-device-wifi.c:1403
+ #: ../panels/network/network-wifi.ui.h:40
+ msgid "_Forget"
+ msgstr "_Pamiršti"
+@@ -2605,7 +2547,7 @@ msgstr "Pasirinkite failą importavimui"
+ 
+ #: ../panels/network/connection-editor/vpn-helpers.c:246
+ #: ../panels/printers/cc-printers-panel.c:1947
+-#: ../panels/sharing/cc-sharing-panel.c:422
++#: ../panels/sharing/cc-sharing-panel.c:426
+ #: ../panels/user-accounts/um-photo-dialog.c:222
+ msgid "_Open"
+ msgstr "_Atverti"
+@@ -2692,29 +2634,29 @@ msgstr "Prijungimai"
+ msgid "Bridge slaves"
+ msgstr "Sujungti antraeilius"
+ 
+-#: ../panels/network/net-device-ethernet.c:111
+-#: ../panels/network/net-device-wifi.c:462
++#: ../panels/network/net-device-ethernet.c:108
++#: ../panels/network/net-device-wifi.c:457
+ msgid "never"
+ msgstr "niekada"
+ 
+-#: ../panels/network/net-device-ethernet.c:121
+-#: ../panels/network/net-device-wifi.c:472
++#: ../panels/network/net-device-ethernet.c:118
++#: ../panels/network/net-device-wifi.c:467
+ msgid "today"
+ msgstr "šiandien"
+ 
+-#: ../panels/network/net-device-ethernet.c:123
+-#: ../panels/network/net-device-wifi.c:474
++#: ../panels/network/net-device-ethernet.c:120
++#: ../panels/network/net-device-wifi.c:469
+ msgid "yesterday"
+ msgstr "vakar"
+ 
+-#: ../panels/network/net-device-ethernet.c:161
++#: ../panels/network/net-device-ethernet.c:158
+ #: ../panels/network/network-mobile.ui.h:3
+ #: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
+ #: ../panels/printers/printers.ui.h:13
+ msgid "IP Address"
+ msgstr "IP adresas"
+ 
+-#: ../panels/network/net-device-ethernet.c:177
++#: ../panels/network/net-device-ethernet.c:174
+ #: ../panels/network/network-wifi.ui.h:10
+ msgid "Last used"
+ msgstr "Paskutinį kartą naudota"
+@@ -2724,14 +2666,14 @@ msgstr "Paskutinį kartą naudota"
+ #. * profile. It is also used to display ethernet in the
+ #. * device list.
+ #.
+-#: ../panels/network/net-device-ethernet.c:287
++#: ../panels/network/net-device-ethernet.c:284
+ #: ../panels/network/network-ethernet.ui.h:1
+ #: ../panels/network/network-simple.ui.h:1
+ msgid "Wired"
+ msgstr "Laidinis"
+ 
+-#: ../panels/network/net-device-ethernet.c:355
+-#: ../panels/network/net-device-wifi.c:1549
++#: ../panels/network/net-device-ethernet.c:352
++#: ../panels/network/net-device-wifi.c:1558
+ #: ../panels/network/network-ethernet.ui.h:3
+ #: ../panels/network/network-mobile.ui.h:8
+ #: ../panels/network/network-simple.ui.h:8
+@@ -2739,16 +2681,21 @@ msgstr "Laidinis"
+ msgid "Options…"
+ msgstr "Parinktys..."
+ 
+-#: ../panels/network/net-device-ethernet.c:492
++#: ../panels/network/net-device-ethernet.c:489
+ #, c-format
+ msgid "Profile %d"
+ msgstr "Profilis %d"
+ 
+-#: ../panels/network/net-device-mobile.c:239
++#: ../panels/network/net-device-mobile.c:232
+ msgid "Add new connection"
+ msgstr "Pridėti naują ryšį"
+ 
+-#: ../panels/network/net-device-wifi.c:1117
++#: ../panels/network/net-device-team.c:77
++#| msgid "Bridge slaves"
++msgid "Team slaves"
++msgstr "Team antraeiliai"
++
++#: ../panels/network/net-device-wifi.c:1110
+ msgid ""
+ "If you have a connection to the Internet other than wireless, you can set up "
+ "a wireless hotspot to share the connection with others."
+@@ -2756,12 +2703,12 @@ msgstr ""
+ "Jei turite kitokį interneto ryšį nei belaidis, galite nustatyti belaidį "
+ "prieigos tašką ir dalintis interneto ryšiu su kitais."
+ 
+-#: ../panels/network/net-device-wifi.c:1121
++#: ../panels/network/net-device-wifi.c:1114
+ #, c-format
+ msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+ msgstr "Persijungimas prie belaidžio prieigos taško atjungs jus nuo <b>%s</b>."
+ 
+-#: ../panels/network/net-device-wifi.c:1125
++#: ../panels/network/net-device-wifi.c:1118
+ msgid ""
+ "It is not possible to access the Internet through your wireless while the "
+ "hotspot is active."
+@@ -2769,23 +2716,23 @@ msgstr ""
+ "Neįmanoma pasiekti interneto per jūsų belaidį, kol prieigos taškas yra "
+ "aktyvus."
+ 
+-#: ../panels/network/net-device-wifi.c:1199
++#: ../panels/network/net-device-wifi.c:1192
+ msgid "Stop hotspot and disconnect any users?"
+ msgstr "Stabdyti prieigos tašką ir atjungti visus naudotojus?"
+ 
+-#: ../panels/network/net-device-wifi.c:1202
++#: ../panels/network/net-device-wifi.c:1195
+ msgid "_Stop Hotspot"
+ msgstr "_Stabdyti prieigos tašką"
+ 
+-#: ../panels/network/net-device-wifi.c:1274
++#: ../panels/network/net-device-wifi.c:1267
+ msgid "System policy prohibits use as a Hotspot"
+ msgstr "Sistemos taisyklės neleidžia naudoti kaip prieigos taško"
+ 
+-#: ../panels/network/net-device-wifi.c:1277
++#: ../panels/network/net-device-wifi.c:1270
+ msgid "Wireless device does not support Hotspot mode"
+ msgstr "Belaidis įrenginys nepalaiko prieigos taško veiksenos"
+ 
+-#: ../panels/network/net-device-wifi.c:1404
++#: ../panels/network/net-device-wifi.c:1399
+ msgid ""
+ "Network details for the selected networks, including passwords and any "
+ "custom configuration will be lost."
+@@ -2793,19 +2740,19 @@ msgstr ""
+ "Tinklo nustatymai pasirinktiems tinklams įskaitant slaptažodžius ir bet "
+ "kokius asmeninius nustatymus bus prarasti."
+ 
+-#: ../panels/network/net-device-wifi.c:1714
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
++#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+ msgid "History"
+ msgstr "Istorija"
+ 
+-#: ../panels/network/net-device-wifi.c:1718 ../panels/power/power.ui.h:21
++#: ../panels/network/net-device-wifi.c:1730 ../panels/power/power.ui.h:21
+ #: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596
+-#: ../panels/wacom/cc-wacom-page.c:525
++#: ../panels/wacom/cc-wacom-page.c:534
+ msgid "_Close"
+ msgstr "_Užverti"
+ 
+ #. translators: This is the label for the "Forget wireless network" functionality
+-#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/network/net-device-wifi.c:1738
+ msgctxt "Wi-Fi Network"
+ msgid "_Forget"
+ msgstr "_Pamiršti"
+@@ -2826,7 +2773,7 @@ msgstr ""
+ msgid "This is not recommended for untrusted public networks."
+ msgstr "Tai nerekomenduojama nepatikimiems viešiesiems tinklams."
+ 
+-#: ../panels/network/net-proxy.c:417
++#: ../panels/network/net-proxy.c:410
+ msgid "Proxy"
+ msgstr "Tarpinis serveris"
+ 
+@@ -2842,17 +2789,17 @@ msgstr "IMEI"
+ msgid "Provider"
+ msgstr "Tiekėjas"
+ 
+-#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
++#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:2
+ msgctxt "proxy method"
+ msgid "None"
+ msgstr "Joks"
+ 
+-#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
++#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:3
+ msgctxt "proxy method"
+ msgid "Manual"
+ msgstr "Rankinis"
+ 
+-#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
++#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:4
+ msgctxt "proxy method"
+ msgid "Automatic"
+ msgstr "Automatinis"
+@@ -2905,19 +2852,7 @@ msgstr "Socks tarpinio serverio prievadas"
+ msgid "Turn device off"
+ msgstr "Išjungti įrenginį"
+ 
+-#: ../panels/network/network.ui.h:1
+-msgid "Select the interface to use for the new service"
+-msgstr "Pasirinkite naudotiną sąsają šiai tarnybai"
+-
+-#: ../panels/network/network.ui.h:2
+-msgid "C_reate…"
+-msgstr "Suku_rti..."
+-
+-#: ../panels/network/network.ui.h:3
+-msgid "_Interface"
+-msgstr "_Sąsaja"
+-
+-#: ../panels/network/network.ui.h:8
++#: ../panels/network/network.ui.h:5
+ msgid "Add Device"
+ msgstr "Pridėti įrenginį"
+ 
+@@ -2956,7 +2891,7 @@ msgstr "išsamiau"
+ #: ../panels/network/wireless-security/ws-leap.ui.h:2
+ #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
+ #: ../panels/user-accounts/data/account-dialog.ui.h:9
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+ msgid "_Password"
+ msgstr "_Slaptažodis"
+ 
+@@ -3652,12 +3587,12 @@ msgid "Show Details in Lock Screen"
+ msgstr "Rodyti detales užrakinimo ekrano"
+ 
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1733 ../panels/power/cc-power-panel.c:1740
+-#: ../panels/privacy/cc-privacy-panel.c:77
+-#: ../panels/privacy/cc-privacy-panel.c:117
+-#: ../panels/universal-access/cc-ua-panel.c:253
+-#: ../panels/universal-access/cc-ua-panel.c:610
+-#: ../panels/universal-access/cc-ua-panel.c:736
++#: ../panels/power/cc-power-panel.c:1744 ../panels/power/cc-power-panel.c:1751
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ msgid "On"
+ msgstr "Įjungta"
+ 
+@@ -3779,11 +3714,11 @@ msgstr ""
+ "Paskyros pridėjimas leidžia jūsų programoms ją prieiti dokumentams, paštui, "
+ "kontaktams, kalendoriui, pokalbiams ir kt."
+ 
+-#: ../panels/power/cc-power-panel.c:187
++#: ../panels/power/cc-power-panel.c:189
+ msgid "Unknown time"
+ msgstr "Nežinomas laikas"
+ 
+-#: ../panels/power/cc-power-panel.c:193
++#: ../panels/power/cc-power-panel.c:195
+ #, c-format
+ msgid "%i minute"
+ msgid_plural "%i minutes"
+@@ -3791,7 +3726,7 @@ msgstr[0] "%i minutė"
+ msgstr[1] "%i minutės"
+ msgstr[2] "%i minučių"
+ 
+-#: ../panels/power/cc-power-panel.c:205
++#: ../panels/power/cc-power-panel.c:207
+ #, c-format
+ msgid "%i hour"
+ msgid_plural "%i hours"
+@@ -3801,19 +3736,19 @@ msgstr[2] "%i valandų"
+ 
+ #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
+ #. * Swap order with "%2$s %2$i %1$s %1$i if needed
+-#: ../panels/power/cc-power-panel.c:213
++#: ../panels/power/cc-power-panel.c:215
+ #, c-format
+ msgid "%i %s %i %s"
+ msgstr "%i %s %i %s"
+ 
+-#: ../panels/power/cc-power-panel.c:214
++#: ../panels/power/cc-power-panel.c:216
+ msgid "hour"
+ msgid_plural "hours"
+ msgstr[0] "valanda"
+ msgstr[1] "valandos"
+ msgstr[2] "valandų"
+ 
+-#: ../panels/power/cc-power-panel.c:215
++#: ../panels/power/cc-power-panel.c:217
+ msgid "minute"
+ msgid_plural "minutes"
+ msgstr[0] "minutė"
+@@ -3821,208 +3756,208 @@ msgstr[1] "minutės"
+ msgstr[2] "minučių"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:234
++#: ../panels/power/cc-power-panel.c:236
+ #, c-format
+ msgid "%s until fully charged"
+ msgstr "%s iki pilno įkrovimo"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:241
++#: ../panels/power/cc-power-panel.c:243
+ #, c-format
+ msgid "Caution: %s remaining"
+ msgstr "Įspėjame: liko %s"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:246
++#: ../panels/power/cc-power-panel.c:248
+ #, c-format
+ msgid "%s remaining"
+ msgstr "Liko %s"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:251 ../panels/power/cc-power-panel.c:279
++#: ../panels/power/cc-power-panel.c:253 ../panels/power/cc-power-panel.c:281
+ msgid "Fully charged"
+ msgstr "Pilnai įkrautas"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:255 ../panels/power/cc-power-panel.c:283
++#: ../panels/power/cc-power-panel.c:257 ../panels/power/cc-power-panel.c:285
+ msgid "Empty"
+ msgstr "Tuščia"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:270
++#: ../panels/power/cc-power-panel.c:272
+ msgid "Charging"
+ msgstr "Įkraunama"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:275
++#: ../panels/power/cc-power-panel.c:277
+ msgid "Discharging"
+ msgstr "Įšsikrauna"
+ 
+-#: ../panels/power/cc-power-panel.c:393
++#: ../panels/power/cc-power-panel.c:395
+ msgctxt "Battery name"
+ msgid "Main"
+ msgstr "Pagrindinė"
+ 
+-#: ../panels/power/cc-power-panel.c:395
++#: ../panels/power/cc-power-panel.c:397
+ msgctxt "Battery name"
+ msgid "Extra"
+ msgstr "Papildoma"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:486
++#: ../panels/power/cc-power-panel.c:469
+ msgid "Wireless mouse"
+ msgstr "Belaidė pelė"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:490
++#: ../panels/power/cc-power-panel.c:472
+ msgid "Wireless keyboard"
+ msgstr "Belaidė klaviatūra"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:494
++#: ../panels/power/cc-power-panel.c:475
+ msgid "Uninterruptible power supply"
+ msgstr "Nenutrūkstamos srovės šaltinis"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:499
++#: ../panels/power/cc-power-panel.c:478
+ msgid "Personal digital assistant"
+ msgstr "Asmeninis skaitmeninis pagalbininkas"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:503
++#: ../panels/power/cc-power-panel.c:481
+ msgid "Cellphone"
+ msgstr "Mobilusis telefonas"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:507
++#: ../panels/power/cc-power-panel.c:484
+ msgid "Media player"
+ msgstr "Daugialypės terpės grotuvas"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:511
++#: ../panels/power/cc-power-panel.c:487
+ msgid "Tablet"
+ msgstr "Planšetė"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:515
++#: ../panels/power/cc-power-panel.c:490
+ msgid "Computer"
+ msgstr "Kompiuteris"
+ 
+ #. TRANSLATORS: secondary battery, misc
+-#: ../panels/power/cc-power-panel.c:519 ../panels/power/cc-power-panel.c:729
+-#: ../panels/power/cc-power-panel.c:2064
++#: ../panels/power/cc-power-panel.c:493 ../panels/power/cc-power-panel.c:740
++#: ../panels/power/cc-power-panel.c:2075
+ msgid "Battery"
+ msgstr "Akumuliatorius"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:528
++#: ../panels/power/cc-power-panel.c:539
+ msgctxt "Battery power"
+ msgid "Charging"
+ msgstr "Įkraunama"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:535
++#: ../panels/power/cc-power-panel.c:546
+ msgctxt "Battery power"
+ msgid "Caution"
+ msgstr "Įspėjimas"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:540
++#: ../panels/power/cc-power-panel.c:551
+ msgctxt "Battery power"
+ msgid "Low"
+ msgstr "Žemas"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:545
++#: ../panels/power/cc-power-panel.c:556
+ msgctxt "Battery power"
+ msgid "Good"
+ msgstr "Geras"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:550
++#: ../panels/power/cc-power-panel.c:561
+ msgctxt "Battery power"
+ msgid "Fully charged"
+ msgstr "Pilnai įkrautas"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:554
++#: ../panels/power/cc-power-panel.c:565
+ msgctxt "Battery power"
+ msgid "Empty"
+ msgstr "Tuščia"
+ 
+-#: ../panels/power/cc-power-panel.c:727
++#: ../panels/power/cc-power-panel.c:738
+ msgid "Batteries"
+ msgstr "Baterijos"
+ 
+-#: ../panels/power/cc-power-panel.c:1133
++#: ../panels/power/cc-power-panel.c:1144
+ msgid "When _idle"
+ msgstr "Kai la_isva"
+ 
+-#: ../panels/power/cc-power-panel.c:1502
++#: ../panels/power/cc-power-panel.c:1513
+ msgid "Power Saving"
+ msgstr "Energijos taupymas"
+ 
+-#: ../panels/power/cc-power-panel.c:1530
++#: ../panels/power/cc-power-panel.c:1541
+ msgid "_Screen brightness"
+ msgstr "_Ekrano ryškumas"
+ 
+-#: ../panels/power/cc-power-panel.c:1536
++#: ../panels/power/cc-power-panel.c:1547
+ msgid "_Keyboard brightness"
+ msgstr "_Klaviatūros ryškumas"
+ 
+-#: ../panels/power/cc-power-panel.c:1546
++#: ../panels/power/cc-power-panel.c:1557
+ msgid "_Dim screen when inactive"
+ msgstr "_Pritemdyti ekraną, kai kompiuteris nenaudojamas"
+ 
+-#: ../panels/power/cc-power-panel.c:1571
++#: ../panels/power/cc-power-panel.c:1582
+ msgid "_Blank screen"
+ msgstr "_Tuščias ekranas"
+ 
+-#: ../panels/power/cc-power-panel.c:1608
++#: ../panels/power/cc-power-panel.c:1619
+ msgid "_Wi-Fi"
+ msgstr "_Wi-Fi"
+ 
+-#: ../panels/power/cc-power-panel.c:1613
++#: ../panels/power/cc-power-panel.c:1624
+ msgid "Turns off wireless devices"
+ msgstr "Išjungia visus belaidžius įrenginius"
+ 
+-#: ../panels/power/cc-power-panel.c:1638
++#: ../panels/power/cc-power-panel.c:1649
+ msgid "_Mobile broadband"
+ msgstr "_Mobilus plačiajuostis"
+ 
+-#: ../panels/power/cc-power-panel.c:1643
++#: ../panels/power/cc-power-panel.c:1654
+ msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
+ msgstr "Išjungia mobilius plačiajuosčius (3G, 4G, WiMax, ir kt.) įrenginius"
+ 
+-#: ../panels/power/cc-power-panel.c:1678
++#: ../panels/power/cc-power-panel.c:1689
+ msgid "_Bluetooth"
+ msgstr "_Bluetooth"
+ 
+-#: ../panels/power/cc-power-panel.c:1729
++#: ../panels/power/cc-power-panel.c:1740
+ msgid "When on battery power"
+ msgstr "Naudojant baterijos energiją"
+ 
+-#: ../panels/power/cc-power-panel.c:1731
++#: ../panels/power/cc-power-panel.c:1742
+ msgid "When plugged in"
+ msgstr "Prijungus prie elektros tinklo"
+ 
+-#: ../panels/power/cc-power-panel.c:1860
++#: ../panels/power/cc-power-panel.c:1871
+ msgid "Suspend & Power Off"
+ msgstr "Užmigdyti ir išjungti"
+ 
+-#: ../panels/power/cc-power-panel.c:1893
++#: ../panels/power/cc-power-panel.c:1904
+ msgid "_Automatic suspend"
+ msgstr "_Automatinis užmigdymas"
+ 
+-#: ../panels/power/cc-power-panel.c:1917
++#: ../panels/power/cc-power-panel.c:1928
+ msgid "When battery power is _critical"
+ msgstr "Kai baterijos įkrovos lygis _kritiškai žemas"
+ 
+-#: ../panels/power/cc-power-panel.c:1974
++#: ../panels/power/cc-power-panel.c:1985
+ msgid "Power Off"
+ msgstr "Išjungti"
+ 
+-#: ../panels/power/cc-power-panel.c:2111
++#: ../panels/power/cc-power-panel.c:2122
+ msgid "Devices"
+ msgstr "Įrenginiai"
+ 
+@@ -4127,7 +4062,7 @@ msgid "Authenticate"
+ msgstr "Patvirtinti tapatybę"
+ 
+ #: ../panels/printers/authentication-dialog.ui.h:5
+-#: ../panels/sharing/sharing.ui.h:23
++#: ../panels/sharing/sharing.ui.h:21
+ #: ../panels/user-accounts/data/account-dialog.ui.h:6
+ msgid "Password"
+ msgstr "Slaptažodis"
+@@ -4495,12 +4430,12 @@ msgid "%s Active Jobs"
+ msgstr "%s aktyvūs darbai"
+ 
+ #. Translators: This item is a server which needs authentication to show its printers
+-#: ../panels/printers/pp-new-printer-dialog.c:1667
++#: ../panels/printers/pp-new-printer-dialog.c:1669
+ msgid "Server requires authentication"
+ msgstr "Serveris reikalauja patvirtinti tapatybę"
+ 
+ #. Translators: No printers were found
+-#: ../panels/printers/pp-new-printer-dialog.c:1704
++#: ../panels/printers/pp-new-printer-dialog.c:1706
+ msgid "No printers detected."
+ msgstr "Nerasta spausdintuvų."
+ 
+@@ -4673,6 +4608,10 @@ msgstr "Darbai"
+ msgid "Show _Jobs"
+ msgstr "Rodyti _darbus"
+ 
++#: ../panels/printers/printers.ui.h:12
++msgid "Model"
++msgstr "Modelis"
++
+ #: ../panels/printers/printers.ui.h:15
+ msgid "label"
+ msgstr "žyma"
+@@ -4709,39 +4648,39 @@ msgstr ""
+ "Atleiskite! Sistemos spausdinimo tarnyba\n"
+ "atrodo nėra pasiekiama."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:245 ../panels/privacy/privacy.ui.h:26
++#: ../panels/privacy/cc-privacy-panel.c:248 ../panels/privacy/privacy.ui.h:26
+ msgid "Screen Lock"
+ msgstr "Ekrano užrakinimas"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:358 ../panels/privacy/privacy.ui.h:20
++#: ../panels/privacy/cc-privacy-panel.c:361 ../panels/privacy/privacy.ui.h:20
+ msgid "Usage & History"
+ msgstr "Naudojimas ir istorija"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:486
++#: ../panels/privacy/cc-privacy-panel.c:489
+ msgid "Empty all items from Trash?"
+ msgstr "Išvalyti visus elementus iš šiukšlinės?"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:487
++#: ../panels/privacy/cc-privacy-panel.c:490
+ msgid "All items in the Trash will be permanently deleted."
+ msgstr "Visi šiukšlinės elementai bus negrįžtamai ištrinti."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:488 ../panels/privacy/privacy.ui.h:32
++#: ../panels/privacy/cc-privacy-panel.c:491 ../panels/privacy/privacy.ui.h:32
+ msgid "_Empty Trash"
+ msgstr "Iš_valyti šiukšlinę"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:511
++#: ../panels/privacy/cc-privacy-panel.c:514
+ msgid "Delete all the temporary files?"
+ msgstr "Ištrinti visus laikinuosius failus?"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:512
++#: ../panels/privacy/cc-privacy-panel.c:515
+ msgid "All the temporary files will be permanently deleted."
+ msgstr "Visi laikinieji failai bus negrįžtamai ištrinti."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:513 ../panels/privacy/privacy.ui.h:33
++#: ../panels/privacy/cc-privacy-panel.c:516 ../panels/privacy/privacy.ui.h:33
+ msgid "_Purge Temporary Files"
+ msgstr "Išvalyti laikinuosius _failus"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:535 ../panels/privacy/privacy.ui.h:31
++#: ../panels/privacy/cc-privacy-panel.c:538 ../panels/privacy/privacy.ui.h:31
+ msgid "Purge Trash & Temporary Files"
+ msgstr "Išvalyti šiukšlinę ir laikinuosius failus"
+ 
+@@ -5093,21 +5032,21 @@ msgstr "Perkelti žemyn"
+ msgid "Preferences"
+ msgstr "Nustatymai"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:274
++#: ../panels/sharing/cc-sharing-panel.c:285
+ msgctxt "service is enabled"
+ msgid "On"
+ msgstr "Įjungta"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:276
++#: ../panels/sharing/cc-sharing-panel.c:287
+ msgctxt "service is disabled"
+ msgid "Off"
+ msgstr "Išjungta"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:418
++#: ../panels/sharing/cc-sharing-panel.c:422
+ msgid "Choose a Folder"
+ msgstr "Pasirinkite aplanką"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:702
++#: ../panels/sharing/cc-sharing-panel.c:736
+ msgid "Copy"
+ msgstr "Kopijuoti"
+ 
+@@ -5151,71 +5090,63 @@ msgstr ""
+ "gebančiais įrenginiais"
+ 
+ #: ../panels/sharing/sharing.ui.h:3
+-msgid "Share Public Folder"
+-msgstr "Dalintis viešu aplanku"
+-
+-#: ../panels/sharing/sharing.ui.h:4
+ msgid "Only Receive From Trusted Devices"
+ msgstr "Priimti tik iš įrenginių, kuriais pasitikima"
+ 
+-#: ../panels/sharing/sharing.ui.h:5
++#: ../panels/sharing/sharing.ui.h:4
+ msgid "Save Received Files to Downloads Folder"
+ msgstr "Įrašyti gautus failus parsiuntimų aplanke"
+ 
+-#: ../panels/sharing/sharing.ui.h:6
+-msgid "Only share with Trusted Devices"
+-msgstr "Dalintis tik su įrenginiais, kuriais pasitikima"
+-
+-#: ../panels/sharing/sharing.ui.h:7
++#: ../panels/sharing/sharing.ui.h:5
+ msgid "Computer Name"
+ msgstr "Kompiuterio pavadinimas"
+ 
+-#: ../panels/sharing/sharing.ui.h:8
++#: ../panels/sharing/sharing.ui.h:6
+ msgid "Personal File Sharing"
+ msgstr "Dalinimasis asmeniniais failais"
+ 
+-#: ../panels/sharing/sharing.ui.h:9
++#: ../panels/sharing/sharing.ui.h:7
+ msgid "Screen Sharing"
+ msgstr "Ekrano viešinimas"
+ 
+-#: ../panels/sharing/sharing.ui.h:10
++#: ../panels/sharing/sharing.ui.h:8
+ msgid "Media Sharing"
+ msgstr "Dalinimasis daugialype terpe"
+ 
+-#: ../panels/sharing/sharing.ui.h:11
++#: ../panels/sharing/sharing.ui.h:9
+ msgid "Remote Login"
+ msgstr "Nuotolinis prisijungimas"
+ 
+-#: ../panels/sharing/sharing.ui.h:12
++#: ../panels/sharing/sharing.ui.h:10
+ msgid "Some services are disabled because of no network access."
+ msgstr "Kai kurios tarnybos yra išjungtos, nes nėra tinklo prieigos."
+ 
+-#: ../panels/sharing/sharing.ui.h:13
++#: ../panels/sharing/sharing.ui.h:11
+ msgid "Share Music, Photos and Videos with others on the current network."
+ msgstr ""
+ "Dalintis muzika, nuotraukomis ir vaizdo įrašais su kitais vietiniame tinkle."
+ 
+-#: ../panels/sharing/sharing.ui.h:14
++#: ../panels/sharing/sharing.ui.h:12
+ msgid "Share Media On This Network"
+ msgstr "Dalintis medija šiame tinkle"
+ 
+-#: ../panels/sharing/sharing.ui.h:15
++#: ../panels/sharing/sharing.ui.h:13
+ msgid "Shared Folders"
+ msgstr "Bendrinami aplankai"
+ 
+-#: ../panels/sharing/sharing.ui.h:16
++#: ../panels/sharing/sharing.ui.h:14
+ msgid "column"
+ msgstr "stulpelis"
+ 
+-#: ../panels/sharing/sharing.ui.h:17
++#: ../panels/sharing/sharing.ui.h:15
+ msgid "Add Folder"
+ msgstr "Pridėti aplanką"
+ 
+-#: ../panels/sharing/sharing.ui.h:18
++#: ../panels/sharing/sharing.ui.h:16
+ msgid "Remove Folder"
+ msgstr "Pašalinti aplanką"
+ 
+-#: ../panels/sharing/sharing.ui.h:20
++#: ../panels/sharing/sharing.ui.h:18
+ #, no-c-format
+ msgid ""
+ "Personal File Sharing allows you to share your Public folder with others on "
+@@ -5224,15 +5155,15 @@ msgstr ""
+ "Dalinimasis asmeniniais failais leidžia bendrinti viešą aplanką su kitais "
+ "esamame tinkle naudojant: <a href=\"dav://%s\">dav://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:21
++#: ../panels/sharing/sharing.ui.h:19
+ msgid "Share Public Folder On This Network"
+ msgstr "Dalintis viešų aplanku šiame tinkle"
+ 
+-#: ../panels/sharing/sharing.ui.h:22
++#: ../panels/sharing/sharing.ui.h:20
+ msgid "Require Password"
+ msgstr "Reikalausi slaptažodžio"
+ 
+-#: ../panels/sharing/sharing.ui.h:25
++#: ../panels/sharing/sharing.ui.h:23
+ #, no-c-format
+ msgid ""
+ "Allow remote users to connect using the Secure Shell command:\n"
+@@ -5242,7 +5173,7 @@ msgstr ""
+ "komandą:\n"
+ "<a href=\"ssh %s>ssh %s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:28
++#: ../panels/sharing/sharing.ui.h:26
+ #, no-c-format
+ msgid ""
+ "Allow remote users to view or control your screen by connecting to: <a href="
+@@ -5251,19 +5182,19 @@ msgstr ""
+ "Leisti nutolusiems naudotojams matyti ar valdyti jūsų ekraną prisijungiant "
+ "prie: <a href=\"vnc://%s\">vnc://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:29
++#: ../panels/sharing/sharing.ui.h:27
+ msgid "Remote View"
+ msgstr "Nutolęs rodinys"
+ 
+-#: ../panels/sharing/sharing.ui.h:30
++#: ../panels/sharing/sharing.ui.h:28
+ msgid "Remote Control"
+ msgstr "Nutolęs valdymas"
+ 
+-#: ../panels/sharing/sharing.ui.h:31
++#: ../panels/sharing/sharing.ui.h:29
+ msgid "Approve All Connections"
+ msgstr "Patvirtinti visus ryšius"
+ 
+-#: ../panels/sharing/sharing.ui.h:32
++#: ../panels/sharing/sharing.ui.h:30
+ msgid "Show Password"
+ msgstr "Rodyti slaptažodį"
+ 
+@@ -5960,7 +5891,7 @@ msgid "_Full Name"
+ msgstr "_Pilnas vardas"
+ 
+ #: ../panels/user-accounts/data/account-dialog.ui.h:5
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+ msgid "Account _Type"
+ msgstr "Paskyros _tipas"
+ 
+@@ -6117,70 +6048,35 @@ msgstr "_Dabartinis slaptažodis"
+ msgid "Ch_ange"
+ msgstr "Pa_keisti"
+ 
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:1
+-msgid "Changing photo for:"
+-msgstr "Keičiama nuotrauka naudotojui:"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
+-msgid ""
+-"Choose a picture that will be shown at the login screen for this account."
+-msgstr ""
+-"Pasirinkite paveikslėlį, kuris bus rodomas prisijungimo ekrane šiai paskyrai."
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
+-msgid "Gallery"
+-msgstr "Galerija"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:4
+-#: ../panels/user-accounts/um-photo-dialog.c:218
+-msgid "Browse for more pictures"
+-msgstr "Naršyti daugiau paveikslėlių"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:5
+-msgid "Take a photograph"
+-msgstr "Padaryti nuotrauką"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:6
+-msgid "Browse"
+-msgstr "Naršyti"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:7
+-msgid "Photograph"
+-msgstr "Nuotrauka"
+-
+ #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+-msgid "Account Information"
+-msgstr "Paskyros duomenys"
+-
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Add User Account"
+ msgstr "Pridėti naudotojo paskyrą"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Remove User Account"
+ msgstr "Pašalinti naudotojo paskyrą"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+ msgid "Login Options"
+ msgstr "Prisijungimo parinktys"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+ msgid "A_utomatic Login"
+ msgstr "A_utomatinis prisijungimas"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+ msgid "_Fingerprint Login"
+ msgstr "Prisijungimas _piršto atspaudu"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+ msgid "User Icon"
+ msgstr "Naudotojo piktograma"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+ msgid "_Language"
+ msgstr "_Kalba"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+ msgid "Last Login"
+ msgstr "Paskutinis prisijungimas"
+ 
+@@ -6597,6 +6493,10 @@ msgstr "Nepavyko pakeisti slaptažodžio"
+ msgid "The passwords do not match."
+ msgstr "Slaptažodžiai nesutampa."
+ 
++#: ../panels/user-accounts/um-photo-dialog.c:218
++msgid "Browse for more pictures"
++msgstr "Naršyti daugiau paveikslėlių"
++
+ #: ../panels/user-accounts/um-photo-dialog.c:443
+ msgid "Disable image"
+ msgstr "Išjungti paveikslėlį"
+@@ -6797,7 +6697,7 @@ msgstr ""
+ "kombinaciją“, paspauskite klaviatūros trumpinio mygtuką ir laikykite naujus "
+ "klavišus arba spauskite grįžtamąjį trynimą išvalymui."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:82
++#: ../panels/wacom/calibrator/calibrator-gui.c:84
+ msgid ""
+ "Please tap the target markers as they appear on screen to calibrate the "
+ "tablet."
+@@ -6805,7 +6705,7 @@ msgstr ""
+ "Palieskite taikinio žymeklius jiems pasirodžius ekrane planšetės "
+ "kalibravimui."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:86
++#: ../panels/wacom/calibrator/calibrator-gui.c:88
+ msgid "Mis-click detected, restarting..."
+ msgstr "Aptiktas klaidingas paspaudimas, perleidžiama..."
+ 
+@@ -6858,7 +6758,7 @@ msgstr "Rodyti viename monitoriuje"
+ msgid "%d of %d"
+ msgstr "%d iš %d"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:522
++#: ../panels/wacom/cc-wacom-page.c:531
+ msgid "Display Mapping"
+ msgstr "Vaizduoklio susiejimas"
+ 
+@@ -6995,22 +6895,22 @@ msgstr "Dešiniųjų liečiamųjų juostelių veiksenos jungiklis"
+ msgid "Mode Switch #%d"
+ msgstr "Veiksenos jungiklis #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1336
++#: ../panels/wacom/gsd-wacom-device.c:1335
+ #, c-format
+ msgid "Left Button #%d"
+ msgstr "Kairysis mygtukas #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1339
++#: ../panels/wacom/gsd-wacom-device.c:1338
+ #, c-format
+ msgid "Right Button #%d"
+ msgstr "Dešinysis mygtukas #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1342
++#: ../panels/wacom/gsd-wacom-device.c:1341
+ #, c-format
+ msgid "Top Button #%d"
+ msgstr "Viršutinis mygtukas #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1345
++#: ../panels/wacom/gsd-wacom-device.c:1344
+ #, c-format
+ msgid "Bottom Button #%d"
+ msgstr "Apatinis mygtukas #%d"
+@@ -7141,27 +7041,27 @@ msgstr "Žinynas"
+ msgid "Quit"
+ msgstr "Išeiti"
+ 
+-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1479
++#: ../shell/cc-window.c:61 ../shell/cc-window.c:1486
+ msgid "All Settings"
+ msgstr "Visi nustatymai"
+ 
+ #. Add categories
+-#: ../shell/cc-window.c:866
++#: ../shell/cc-window.c:868
+ msgctxt "category"
+ msgid "Personal"
+ msgstr "Asmeninis"
+ 
+-#: ../shell/cc-window.c:867
++#: ../shell/cc-window.c:869
+ msgctxt "category"
+ msgid "Hardware"
+ msgstr "Aparatinė įranga"
+ 
+-#: ../shell/cc-window.c:868
++#: ../shell/cc-window.c:870
+ msgctxt "category"
+ msgid "System"
+ msgstr "Sistema"
+ 
+-#: ../shell/cc-window.c:1588 ../shell/gnome-control-center.desktop.in.in.h:1
++#: ../shell/cc-window.c:1597 ../shell/gnome-control-center.desktop.in.in.h:1
+ msgid "Settings"
+ msgstr "Nustatymai"
+ 
+@@ -7169,3 +7069,75 @@ msgstr "Nustatymai"
+ msgid "Preferences;Settings;"
+ msgstr "Nustatymai;Parinktys;"
+ 
++#~ msgid "Device type:"
++#~ msgstr "Įrenginio tipas:"
++
++#~ msgid "Manufacturer:"
++#~ msgstr "Gamintojas:"
++
++#~ msgid "Model:"
++#~ msgstr "Modelis:"
++
++#~ msgid ""
++#~ "Image files can be dragged on this window to auto-complete the above "
++#~ "fields."
++#~ msgstr ""
++#~ "Paveikslėlių failai gali būti tempiami į šį langą automatiniam laukų "
++#~ "užpildymui."
++
++#~ msgid "Show your primary display on this screen also"
++#~ msgstr "Rodyti jūsų pagrindinį vaizduoklį taip pat ir šiame ekrane"
++
++#~ msgid "Combine"
++#~ msgstr "Sujungti"
++
++#~ msgid "Join with the primary display to create an extra space"
++#~ msgstr "Prijungti prie pagrindinio vaizduoklio papildomai vietai sukurti"
++
++#~ msgid "Don't use the display"
++#~ msgstr "Nenaudoti vaizduoklio"
++
++#~ msgid "Refresh Rate"
++#~ msgstr "Atnaujinimo dažnis"
++
++#~ msgid "Mouse Preferences"
++#~ msgstr "Pelės nustatymai"
++
++#~ msgid "Select the interface to use for the new service"
++#~ msgstr "Pasirinkite naudotiną sąsają šiai tarnybai"
++
++#~ msgid "C_reate…"
++#~ msgstr "Suku_rti..."
++
++#~ msgid "_Interface"
++#~ msgstr "_Sąsaja"
++
++#~ msgid "Share Public Folder"
++#~ msgstr "Dalintis viešu aplanku"
++
++#~ msgid "Only share with Trusted Devices"
++#~ msgstr "Dalintis tik su įrenginiais, kuriais pasitikima"
++
++#~ msgid "Changing photo for:"
++#~ msgstr "Keičiama nuotrauka naudotojui:"
++
++#~ msgid ""
++#~ "Choose a picture that will be shown at the login screen for this account."
++#~ msgstr ""
++#~ "Pasirinkite paveikslėlį, kuris bus rodomas prisijungimo ekrane šiai "
++#~ "paskyrai."
++
++#~ msgid "Gallery"
++#~ msgstr "Galerija"
++
++#~ msgid "Take a photograph"
++#~ msgstr "Padaryti nuotrauką"
++
++#~ msgid "Browse"
++#~ msgstr "Naršyti"
++
++#~ msgid "Photograph"
++#~ msgstr "Nuotrauka"
++
++#~ msgid "Account Information"
++#~ msgstr "Paskyros duomenys"
+diff --git a/po/pa.po b/po/pa.po
+index 22039c5..a369a7b 100644
+--- a/po/pa.po
++++ b/po/pa.po
+@@ -6,15 +6,15 @@
+ #
+ # Amanpreet Singh Alam <amanlinux@netscape.net>, 2004.
+ # Amanpreet Singh Alam <aalam@users.sf.net>, 2005,2006,2007,2008,2009.
+-# A S Alam <aalam@users.sf.net>, 2009, 2010, 2011, 2012, 2013.
++# A S Alam <aalam@users.sf.net>, 2009, 2010, 2011, 2012, 2013, 2014.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-control-center.HEAD\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "control-center&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-09-20 21:45+0000\n"
+-"PO-Revision-Date: 2013-09-24 07:54-0500\n"
+-"Last-Translator: A S Alam <aalam@users.sf.net>\n"
++"POT-Creation-Date: 2014-02-01 19:44+0000\n"
++"PO-Revision-Date: 2014-02-01 16:55-0600\n"
++"Last-Translator: Aman Alam <aalam@users.sf.net>\n"
+ "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
+ "Language: pa\n"
+ "MIME-Version: 1.0\n"
+@@ -68,7 +68,7 @@ msgid "Span"
+ msgstr "ਸਪੈਨ"
+ 
+ #. translators: This is the title of the wallpaper chooser dialog.
+-#: ../panels/background/cc-background-chooser-dialog.c:293
++#: ../panels/background/cc-background-chooser-dialog.c:292
+ msgid "Select Background"
+ msgstr "ਬੈਕਗਰਾਊਂਡ ਚੁਣੋ"
+ 
+@@ -89,33 +89,33 @@ msgid "Flickr"
+ msgstr "ਫਲਿੱਕਰ"
+ 
+ #. translators: No pictures were found
+-#: ../panels/background/cc-background-chooser-dialog.c:393
++#: ../panels/background/cc-background-chooser-dialog.c:385
+ msgid "No Pictures Found"
+ msgstr "ਕੋਈ ਤਸਵੀਰ ਨਹੀਂ ਲੱਭੀ"
+ 
+ #. translators: %s here is the name of the Pictures directory, the string should be translated in
+ #. * the context "You can add images to your Pictures folder and they will show up here"
+-#: ../panels/background/cc-background-chooser-dialog.c:408
++#: ../panels/background/cc-background-chooser-dialog.c:400
+ #, c-format
+ msgid "You can add images to your %s folder and they will show up here"
+ msgstr ""
+ "ਤੁਸੀਂ ਆਪਣੇ %s ਫੋਲਡਰ ਵਿੱਚ ਚਿੱਤਰ ਸ਼ਾਮਿਲ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਉਹ ਇੱਥੇ ਵੇਖਾਈ ਦੇਣਗੇ"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:436
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:631
+-#: ../panels/color/cc-color-panel.c:220 ../panels/color/cc-color-panel.c:967
+-#: ../panels/display/cc-display-panel.c:1495
+-#: ../panels/display/cc-display-panel.c:1910
++#: ../panels/background/cc-background-chooser-dialog.c:429
++#: ../panels/bluetooth/cc-bluetooth-panel.c:640
++#: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
++#: ../panels/display/cc-display-panel.c:1510
++#: ../panels/display/cc-display-panel.c:1952
+ #: ../panels/network/connection-editor/vpn-helpers.c:245
+ #: ../panels/network/connection-editor/vpn-helpers.c:374
+-#: ../panels/network/net-device-wifi.c:1201
+-#: ../panels/network/net-device-wifi.c:1407
++#: ../panels/network/net-device-wifi.c:1194
++#: ../panels/network/net-device-wifi.c:1402
+ #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
+ #: ../panels/printers/cc-printers-panel.c:1946
+ #: ../panels/printers/new-printer-dialog.ui.h:2
+-#: ../panels/privacy/cc-privacy-panel.c:467
++#: ../panels/privacy/cc-privacy-panel.c:470
+ #: ../panels/search/cc-search-locations-dialog.c:682
+-#: ../panels/sharing/cc-sharing-panel.c:421
++#: ../panels/sharing/cc-sharing-panel.c:425
+ #: ../panels/user-accounts/um-fingerprint-dialog.c:269
+ #: ../panels/user-accounts/um-photo-dialog.c:96
+ #: ../panels/user-accounts/um-photo-dialog.c:221
+@@ -123,9 +123,8 @@ msgstr ""
+ msgid "_Cancel"
+ msgstr "ਰੱਦ ਕਰੋ(_C)"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:437
++#: ../panels/background/cc-background-chooser-dialog.c:430
+ #: ../panels/printers/ppd-selection-dialog.ui.h:3
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:9
+ #: ../panels/user-accounts/um-photo-dialog.c:98
+ msgid "Select"
+ msgstr "ਚੁਣੋ"
+@@ -145,7 +144,7 @@ msgstr "%d × %d"
+ msgid "No Desktop Background"
+ msgstr "ਕੋਈ ਡੈਸਕਟਾਪ ਬੈਕਗਰਾਊਂਡ ਨਹੀਂ"
+ 
+-#: ../panels/background/cc-background-panel.c:492
++#: ../panels/background/cc-background-panel.c:493
+ msgid "Current background"
+ msgstr "ਮੌਜੂਦਾ ਬੈਕਗਰਾਊਂਡ"
+ 
+@@ -162,7 +161,7 @@ msgstr "ਵਾਲਪੇਪਰ;ਸਕਰੀਨ;ਡੈਸਕਟਾਪ;Wallpaper;Sc
+ msgid "Set Up New Device"
+ msgstr "ਨਵਾਂ ਜੰਤਰ ਸੈੱਟਅੱਪ"
+ 
+-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
++#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
+ msgid "Remove Device"
+ msgstr "ਜੰਤਰ ਹਟਾਓ"
+ 
+@@ -216,49 +215,49 @@ msgstr "ਕੀਬੋਰਡ ਸੈਟਿੰਗ"
+ msgid "Send Files…"
+ msgstr "...ਫਾਇਲਾਂ ਭੇਜੋ"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
+ msgid "Yes"
+ msgstr "ਹਾਂ"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
+ msgid "No"
+ msgstr "ਨਹੀਂ"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:470
++#: ../panels/bluetooth/cc-bluetooth-panel.c:479
+ msgid "Bluetooth is disabled"
+ msgstr "ਬਲਿਊਟੁੱਥ ਆਯੋਗ ਹੈ"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:475
++#: ../panels/bluetooth/cc-bluetooth-panel.c:484
+ msgid "Bluetooth is disabled by hardware switch"
+ msgstr "ਬਲਿਊਟੁੱਥ ਨੂੰ ਹਾਰਡਵੇਅਰ ਸਵਿੱਚ ਰਾਹੀਂ ਬੰਦ ਕੀਤਾ ਹੋਇਆ ਹੈ"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:479
++#: ../panels/bluetooth/cc-bluetooth-panel.c:488
+ msgid "No Bluetooth adapters found"
+ msgstr "ਕੋਈ ਬਲਿਊਟੁੱਥ ਐਡਪਟਰ ਮੌਜੂਦ ਨਹੀਂ"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:578
++#: ../panels/bluetooth/cc-bluetooth-panel.c:587
+ msgid "Visibility"
+ msgstr "ਦਿੱਖ"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:582
++#: ../panels/bluetooth/cc-bluetooth-panel.c:591
+ #, c-format
+ msgid "Visibility of “%s”"
+ msgstr "“%s” ਦੀ ਦਿੱਖ"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:626
++#: ../panels/bluetooth/cc-bluetooth-panel.c:635
+ #, c-format
+ msgid "Remove '%s' from the list of devices?"
+ msgstr "ਕੀ ਜੰਤਰਾਂ ਦੀ ਲਿਸਟ ਵਿੱਚੋਂ '%s' ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:628
++#: ../panels/bluetooth/cc-bluetooth-panel.c:637
+ msgid ""
+ "If you remove the device, you will have to set it up again before next use."
+ msgstr ""
+ "ਜੇ ਤੁਸੀਂ ਜੰਤਰ ਹਟਾਇਆ ਤਾਂ ਤੁਹਾਨੂੰ ਇਸ ਨੂੰ ਅਗਲੀ ਵਾਰ ਵਰਤਣ ਸਮੇਂ ਸੈੱਟਅੱਪ ਕਰਨਾ ਪਵੇਗਾ।"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:632
++#: ../panels/bluetooth/cc-bluetooth-panel.c:641
+ #: ../panels/online-accounts/cc-online-accounts-panel.c:844
+ msgid "_Remove"
+ msgstr "ਹਟਾਓ(_R)"
+@@ -272,14 +271,14 @@ msgid "Turn Bluetooth on and off and connect your devices"
+ msgstr "ਬਲਿਊਟੁੱਥ ਜੰਤਰ ਨੂੰ ਚਾਲੂ ਤੇ ਬੰਦ ਕਰੋ ਅਤੇ ਆਪਣੇ ਜੰਤਰਾਂ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ"
+ 
+ #. TRANSLATORS: The user has to attach the sensor to the screen
+-#: ../panels/color/cc-color-calibrate.c:360
++#: ../panels/color/cc-color-calibrate.c:361
+ msgid "Place your calibration device over the square and press 'Start'"
+ msgstr "ਆਪਣੇ ਕੈਲੀਬਰੇਸ਼ਨ ਜੰਤਰ ਨੂੰ ਵਰਗ ਉੱਤੇ ਰੱਖੋ ਅਤੇ 'ਸ਼ੁਰੂ' ਨੂੰ ਦੱਬੋ।"
+ 
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:366
++#: ../panels/color/cc-color-calibrate.c:367
+ msgid ""
+ "Move your calibration device to the calibrate position and press 'Continue'"
+ msgstr ""
+@@ -288,7 +287,7 @@ msgstr ""
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:372
++#: ../panels/color/cc-color-calibrate.c:373
+ msgid ""
+ "Move your calibration device to the surface position and press 'Continue'"
+ msgstr "ਆਪਣੇ ਕੈਲੀਬਰੇਸ਼ਨ ਜੰਤਰ ਨੂੰ ਤਲ ਸਥਿਤੀ ਉਤੇ ਲੈ ਜਾਉ ਅਤੇ 'ਜਾਰੀ ਰੱਖੋ' ਦੱਬੋ"
+@@ -296,54 +295,54 @@ msgstr "ਆਪਣੇ ਕੈਲੀਬਰੇਸ਼ਨ ਜੰਤਰ ਨੂੰ ਤਲ 
+ #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
+ #. * is built into the palmrest and we need to fullscreen the
+ #. * sample widget and shut the lid.
+-#: ../panels/color/cc-color-calibrate.c:378
++#: ../panels/color/cc-color-calibrate.c:379
+ msgid "Shut the laptop lid"
+ msgstr "ਲੈਪਟਾਪ ਢੱਕਣ ਬੰਦ"
+ 
+ #. TRANSLATORS: We suck, the calibation failed and we have no
+ #. * good idea why or any suggestions
+-#: ../panels/color/cc-color-calibrate.c:409
++#: ../panels/color/cc-color-calibrate.c:410
+ msgid "An internal error occurred that could not be recovered."
+ msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ ਆਈ ਹੈ, ਜਿਸ ਤੋਂ ਉਭਰਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ।"
+ 
+ #. TRANSLATORS: Some required-at-runtime tools were not
+ #. * installed, which should only affect insane distros
+-#: ../panels/color/cc-color-calibrate.c:414
++#: ../panels/color/cc-color-calibrate.c:415
+ msgid "Tools required for calibration are not installed."
+ msgstr "ਕੈਲੀਬਰੇਸ਼ਨ ਲਈ ਲੋੜੀਦੇ ਟੂਲ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ।"
+ 
+ #. TRANSLATORS: The profile failed for some reason
+-#: ../panels/color/cc-color-calibrate.c:420
++#: ../panels/color/cc-color-calibrate.c:421
+ msgid "The profile could not be generated."
+ msgstr "ਪਰੋਫਾਇਲ ਤਿਆਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
+ 
+ #. TRANSLATORS: The user specified a whitepoint that was
+ #. * unobtainable with the hardware they've got -- see
+ #. * https://en.wikipedia.org/wiki/White_point for details
+-#: ../panels/color/cc-color-calibrate.c:426
++#: ../panels/color/cc-color-calibrate.c:427
+ msgid "The target whitepoint was not obtainable."
+ msgstr "ਟਾਰਗੇਟ ਚਿੱਟਾ-ਬਿੰਦੂ ਪ੍ਰਾਪਤੀ ਯੋਗ ਨਹੀਂ"
+ 
+ #. TRANSLATORS: the display calibration process is finished
+-#: ../panels/color/cc-color-calibrate.c:466
++#: ../panels/color/cc-color-calibrate.c:467
+ msgid "Complete!"
+ msgstr "ਪੂਰੇ ਹੋਏ!"
+ 
+ #. TRANSLATORS: the display calibration failed, and we also show
+ #. * the translated (or untranslated) error string after this
+-#: ../panels/color/cc-color-calibrate.c:474
++#: ../panels/color/cc-color-calibrate.c:475
+ msgid "Calibration failed!"
+ msgstr "ਕੈਲੀਬਰੇਸ਼ਨ ਫੇਲ੍ਹ ਹੋਈ!"
+ 
+ #. TRANSLATORS: The user can now remove the sensor from the screen
+-#: ../panels/color/cc-color-calibrate.c:481
++#: ../panels/color/cc-color-calibrate.c:482
+ msgid "You can remove the calibration device."
+ msgstr "ਤੁਸੀਂ ਕੈਲੀਬਰੇਸ਼ਨ ਜੰਤਰ ਹਟਾ ਸਕਦੇ ਹੋ।"
+ 
+ #. TRANSLATORS: The user has to be careful not to knock the
+ #. * display off the screen (although we do cope if this is
+ #. * detected early enough)
+-#: ../panels/color/cc-color-calibrate.c:552
++#: ../panels/color/cc-color-calibrate.c:553
+ msgid "Do not disturb the calibration device while in progress"
+ msgstr "ਕੈਲੀਬਰੇਸ਼ਨ ਜੰਤਰ ਨੂੰ ਚੱਲਣ ਦੇ ਦੌਰਾਨ ਛੇੜੋ ਨਾ"
+ 
+@@ -405,48 +404,48 @@ msgstr "ਕੈਲੀਬਰੇਟ ਨਹੀਂ"
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile has been auto-generated for this hardware
+-#: ../panels/color/cc-color-panel.c:135
++#: ../panels/color/cc-color-panel.c:137
+ msgid "Default: "
+ msgstr "ਡਿਫਾਲਟ: "
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile his a standard space like AdobeRGB
+-#: ../panels/color/cc-color-panel.c:143
++#: ../panels/color/cc-color-panel.c:145
+ msgid "Colorspace: "
+ msgstr "ਰੰਗ-ਸਪੇਸ: "
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile is a test profile
+-#: ../panels/color/cc-color-panel.c:150
++#: ../panels/color/cc-color-panel.c:152
+ msgid "Test profile: "
+ msgstr "ਪਰੋਫਾਇਲ ਟੈਸਟ: "
+ 
+ #. TRANSLATORS: an ICC profile is a file containing colorspace data
+-#: ../panels/color/cc-color-panel.c:218
++#: ../panels/color/cc-color-panel.c:219
+ msgid "Select ICC Profile File"
+ msgstr "ICC ਪਰੋਫਾਇਲ ਫਾਇਲ ਚੁਣੋ"
+ 
+-#: ../panels/color/cc-color-panel.c:221
++#: ../panels/color/cc-color-panel.c:222
+ msgid "_Import"
+ msgstr "ਇੰਪੋਰਟ(_I)"
+ 
+ #. TRANSLATORS: filter name on the file->open dialog
+-#: ../panels/color/cc-color-panel.c:232
++#: ../panels/color/cc-color-panel.c:233
+ msgid "Supported ICC profiles"
+ msgstr "ਸਹਾਇਕ ICC ਪਰੋਫਾਇਲ"
+ 
+ #. TRANSLATORS: filter name on the file->open dialog
+-#: ../panels/color/cc-color-panel.c:239
++#: ../panels/color/cc-color-panel.c:240
+ #: ../panels/network/wireless-security/eap-method-fast.c:410
+ msgid "All files"
+ msgstr "ਸਭ ਫਾਇਲਾਂ"
+ 
+-#: ../panels/color/cc-color-panel.c:586
++#: ../panels/color/cc-color-panel.c:579
+ msgid "Screen"
+ msgstr "ਸਕਰੀਨ"
+ 
+ #. TRANSLATORS: this is when the upload of the profile failed
+-#: ../panels/color/cc-color-panel.c:912
++#: ../panels/color/cc-color-panel.c:903
+ #, c-format
+ msgid "Failed to upload file: %s"
+ msgstr "ਫਾਇਲ ਅੱਪਲੋਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %s"
+@@ -454,40 +453,40 @@ msgstr "ਫਾਇਲ ਅੱਪਲੋਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %s"
+ #. TRANSLATORS: these are instructions on how to recover
+ #. * the ICC profile on the native operating system and are
+ #. * only shown when the user uses a LiveCD to calibrate
+-#: ../panels/color/cc-color-panel.c:926
++#: ../panels/color/cc-color-panel.c:917
+ msgid "The profile has been uploaded to:"
+ msgstr "ਪਰੋਫਾਇਲ ਨੂੰ ਅੱਪਲੋਡ ਕੀਤਾ ਜਾ ਚੁੱਕਾ ਹੈ:"
+ 
+-#: ../panels/color/cc-color-panel.c:928
++#: ../panels/color/cc-color-panel.c:919
+ msgid "Write down this URL."
+ msgstr "ਇਹ URL ਲਿਖ ਲਵੋ।"
+ 
+-#: ../panels/color/cc-color-panel.c:929
++#: ../panels/color/cc-color-panel.c:920
+ msgid "Restart this computer and boot your normal operating system."
+ msgstr ""
+ "ਆਪਣੇ ਕੰਪਿਊਟਰ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰੋ ਅਟੇ ਆਪਣੇ ਸਧਾਰਨ ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ ਨੂੰ ਬੂਟ ਕਰੋ।"
+ 
+-#: ../panels/color/cc-color-panel.c:930
++#: ../panels/color/cc-color-panel.c:921
+ msgid "Type the URL into your browser to download and install the profile."
+ msgstr "ਪਰੋਫਾਇਲ ਨੂੰ ਡਾਊਨਲੋਡ ਕਰਕੇ ਇੰਸਟਾਲ ਕਰਨ ਥਈ URL ਨੂੰ ਆਪਣੇ ਬਰਾਊਜ਼ਰ ਵਿੱਚ ਲਿਖੋ।"
+ 
+ #. TRANSLATORS: this is the dialog to save the ICC profile
+-#: ../panels/color/cc-color-panel.c:964
++#: ../panels/color/cc-color-panel.c:955
+ msgid "Save Profile"
+ msgstr "ਪਰੋਫਾਇਲ ਸੰਭਾਲੋ"
+ 
+-#: ../panels/color/cc-color-panel.c:968
++#: ../panels/color/cc-color-panel.c:959
+ #: ../panels/network/connection-editor/vpn-helpers.c:375
+ msgid "_Save"
+ msgstr "ਸੰਭਾਲੋ(_S)"
+ 
+ #. TRANSLATORS: this is when the button is sensitive
+-#: ../panels/color/cc-color-panel.c:1328
++#: ../panels/color/cc-color-panel.c:1315
+ msgid "Create a color profile for the selected device"
+ msgstr "ਚੁਣੇ ਜੰਤਰ ਲਈ ਇੱਕ ਰੰਗ ਪਰੋਫਾਇਲ ਬਣਾਉ"
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1343 ../panels/color/cc-color-panel.c:1367
++#: ../panels/color/cc-color-panel.c:1330 ../panels/color/cc-color-panel.c:1354
+ msgid ""
+ "The measuring instrument is not detected. Please check it is turned on and "
+ "correctly connected."
+@@ -496,12 +495,12 @@ msgstr ""
+ "ਹੋਇਆ ਹੈ।"
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1377
++#: ../panels/color/cc-color-panel.c:1364
+ msgid "The measuring instrument does not support printer profiling."
+ msgstr "ਮਾਪ ਜੰਤਰ ਪਰਿੰਟਿੰਗ ਪਰੋਫਾਇਲਿੰਗ ਲਈ ਸਹਾਇਕ ਨਹੀਂ।"
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1388
++#: ../panels/color/cc-color-panel.c:1375
+ msgid "The device type is not currently supported."
+ msgstr "ਜੰਤਰ ਕਿਸਮ ਹਾਲੇ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
+ 
+@@ -588,7 +587,6 @@ msgstr "ਡਿਸਪਲੇਅ ਕੈਲੀਬਰੇਸ਼ਨ"
+ #: ../panels/color/color-calibrate.ui.h:2
+ #: ../panels/printers/authentication-dialog.ui.h:2
+ #: ../panels/printers/ppd-selection-dialog.ui.h:2
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:8
+ #: ../panels/user-accounts/um-account-dialog.c:1470
+ msgid "Cancel"
+ msgstr "ਰੱਦ ਕਰੋ"
+@@ -609,10 +607,10 @@ msgid "Done"
+ msgstr "ਮੁਕੰਮਲ"
+ 
+ #. Timeout parameters
+-#. 5000 = 5 sec
++#. 15000 = 15 sec
+ #. 750 = 0.75 sec
+ #. Text printed on screen
+-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
++#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:83
+ msgid "Screen Calibration"
+ msgstr "ਸਕਰੀਨ ਕੈਲੀਬਰੇਸ਼ਨ"
+ 
+@@ -762,166 +760,146 @@ msgstr ""
+ "ਸਮੱਸਿਆ ਆਈ ਹੈ। ਪਰੋਫਾਇਲ ਠੀਕ ਤਰ੍ਹਾਂ ਸ਼ਾਇਦ ਕੰਮ ਨਾ ਕਰੇ।  <a href=\"\">ਵੇਰਵਾ ਵੇਖੋ</a>"
+ 
+ #: ../panels/color/color.ui.h:30
+-msgid "Device type:"
+-msgstr "ਜੰਤਰ ਕਿਸਮ:"
+-
+-#: ../panels/color/color.ui.h:31
+-msgid "Manufacturer:"
+-msgstr "ਨਿਰਮਾਤਾ:"
+-
+-#: ../panels/color/color.ui.h:32
+-msgid "Model:"
+-msgstr "ਮਾਡਲ:"
+-
+-#: ../panels/color/color.ui.h:33
+-msgid ""
+-"Image files can be dragged on this window to auto-complete the above fields."
+-msgstr ""
+-"ਉੱਤੇ ਦਿੱਤੇ ਖੇਤਰ ਆਟੋਮੈਟਿਕ ਭਰਨ ਲਈ ਚਿੱਤਰ ਫਾਇਲਾਂ ਨੂੰ ਇਸ ਵਿੰਡੋ ਉੱਤੇ ਸੁੱਟਿਆ ਜਾ ਸਕਦਾ "
+-"ਹੈ।"
+-
+-#: ../panels/color/color.ui.h:34
+-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+-msgid "Color"
+-msgstr "ਰੰਗ"
+-
+-#: ../panels/color/color.ui.h:35
+ msgid "Each device needs an up to date color profile to be color managed."
+ msgstr "ਹਰੇਕ ਜੰਤਰ ਲਈ ਰੰਗ ਪਰਬੰਧ ਲਈ ਮਿਤੀ ਰੰਗ ਪਰੋਫਾਇਲ ਅੱਪਡੇਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"
+ 
+-#: ../panels/color/color.ui.h:36
++#: ../panels/color/color.ui.h:31
+ msgid "Learn more"
+ msgstr "ਹੋਰ ਸਿੱਖੋ"
+ 
+-#: ../panels/color/color.ui.h:37
++#: ../panels/color/color.ui.h:32
+ msgid "Learn more about color management"
+ msgstr "ਰੰਗ ਪਰਬੰਧ ਬਾਰੇ ਸਿੱਖੋ"
+ 
+-#: ../panels/color/color.ui.h:38
++#: ../panels/color/color.ui.h:33
+ msgid "Set for all users"
+ msgstr "ਸਭ ਯੂਜ਼ਰ ਲਈ ਸੈੱਟ ਕਰੋ"
+ 
+-#: ../panels/color/color.ui.h:39
++#: ../panels/color/color.ui.h:34
+ msgid "Set this profile for all users on this computer"
+ msgstr "ਇਹ ਪਰੋਫਾਇਲ ਨੂੰ ਇਸ ਕੰਪਿਊਟਰ ਦੇ ਸਭ ਯੂਜ਼ਰ ਲਈ ਸੈੱਟ ਕਰੋ"
+ 
+-#: ../panels/color/color.ui.h:40
++#: ../panels/color/color.ui.h:35
+ msgid "Enable"
+ msgstr "ਯੋਗ"
+ 
+-#: ../panels/color/color.ui.h:41
++#: ../panels/color/color.ui.h:36
+ msgid "Add profile"
+ msgstr "ਪਰੋਫਾਇਲ ਸ਼ਾਮਿਲ"
+ 
+-#: ../panels/color/color.ui.h:42
++#: ../panels/color/color.ui.h:37
+ #: ../panels/wacom/gnome-wacom-properties.ui.h:10
+ msgid "Calibrate…"
+ msgstr "ਕੈਲੇਬਰੇਟ…"
+ 
+-#: ../panels/color/color.ui.h:43
++#: ../panels/color/color.ui.h:38
+ msgid "Calibrate the device"
+ msgstr "ਜੰਤਰ ਕੈਲੀਬਰੇਟ ਕਰੋ"
+ 
+-#: ../panels/color/color.ui.h:44
++#: ../panels/color/color.ui.h:39
+ msgid "Remove profile"
+ msgstr "ਪਰੋਫਾਇਲ ਹਟਾਓ"
+ 
+-#: ../panels/color/color.ui.h:45
++#: ../panels/color/color.ui.h:40
+ msgid "View details"
+ msgstr "ਵੇਰਵਾ ਵੇਖੋ"
+ 
+-#: ../panels/color/color.ui.h:46
++#: ../panels/color/color.ui.h:41
+ msgid "Unable to detect any devices that can be color managed"
+ msgstr "ਕਿਸੇ ਵੀ ਜੰਤਰ ਨੂੰ ਖੋਜਣ ਲਈ ਅਸਮਰੱਥ, ਜੋ ਕਿ ਰੰਗਾਂ ਦਾ ਪਰਬੰਧ ਕਰ ਸਕਦਾ ਹੈ"
+ 
+-#: ../panels/color/color.ui.h:47
++#: ../panels/color/color.ui.h:42
+ msgid "LCD"
+ msgstr "LCD"
+ 
+-#: ../panels/color/color.ui.h:48
++#: ../panels/color/color.ui.h:43
+ msgid "LED"
+ msgstr "LED"
+ 
+-#: ../panels/color/color.ui.h:49
++#: ../panels/color/color.ui.h:44
+ msgid "CRT"
+ msgstr "CRT"
+ 
+-#: ../panels/color/color.ui.h:50
++#: ../panels/color/color.ui.h:45
+ msgid "Projector"
+ msgstr "ਪਰੋਜੈਕਟਰ"
+ 
+-#: ../panels/color/color.ui.h:51
++#: ../panels/color/color.ui.h:46
+ msgid "Plasma"
+ msgstr "ਪਲਾਜ਼ਮਾ"
+ 
+-#: ../panels/color/color.ui.h:52
++#: ../panels/color/color.ui.h:47
+ msgid "LCD (CCFL backlight)"
+ msgstr "LCD (CCFL ਬੈਕਲਾਈਟ)"
+ 
+-#: ../panels/color/color.ui.h:53
++#: ../panels/color/color.ui.h:48
+ msgid "LCD (RGB LED backlight)"
+ msgstr "LCD (RGB LED ਬੈਕਲਾਈਟ)"
+ 
+-#: ../panels/color/color.ui.h:54
++#: ../panels/color/color.ui.h:49
+ msgid "LCD (white LED backlight)"
+ msgstr "LCD (ਵਾਈਟ LED ਬੈਕਲਾਈਟ)"
+ 
+-#: ../panels/color/color.ui.h:55
++#: ../panels/color/color.ui.h:50
+ msgid "Wide gamut LCD (CCFL backlight)"
+ msgstr "ਵਾਈਡ ਗਾਮੁਟ LCD (CCFL ਬੈਕਲਾਈਟ)"
+ 
+-#: ../panels/color/color.ui.h:56
++#: ../panels/color/color.ui.h:51
+ msgid "Wide gamut LCD (RGB LED backlight)"
+ msgstr "ਵਾਈਡ ਗਾਮੁਟ LCD (RGB LED ਬੈਕਲਾਈਟ)"
+ 
+-#: ../panels/color/color.ui.h:57
++#: ../panels/color/color.ui.h:52
+ msgctxt "Calibration quality"
+ msgid "High"
+ msgstr "ਉੱਚ"
+ 
+-#: ../panels/color/color.ui.h:58
++#: ../panels/color/color.ui.h:53
+ msgid "40 minutes"
+ msgstr "੪੦ ਮਿੰਟ"
+ 
+-#: ../panels/color/color.ui.h:59
++#: ../panels/color/color.ui.h:54
+ msgctxt "Calibration quality"
+ msgid "Medium"
+ msgstr "ਮੱਧਮ"
+ 
+-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:4
++#: ../panels/color/color.ui.h:55 ../panels/power/power.ui.h:4
+ #: ../panels/privacy/privacy.ui.h:7
+ msgid "30 minutes"
+ msgstr "੩੦ ਮਿੰਟ"
+ 
+-#: ../panels/color/color.ui.h:61
++#: ../panels/color/color.ui.h:56
+ msgctxt "Calibration quality"
+ msgid "Low"
+ msgstr "ਘੱਟ"
+ 
+-#: ../panels/color/color.ui.h:62 ../panels/power/power.ui.h:3
++#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:3
+ msgid "15 minutes"
+ msgstr "੧੫ ਮਿੰਟ"
+ 
+-#: ../panels/color/color.ui.h:63
++#: ../panels/color/color.ui.h:58
+ msgid "Native to display"
+ msgstr "ਡਿਸਪਲੇਅ ਲਈ ਨੇਟਿਵ"
+ 
+-#: ../panels/color/color.ui.h:64
++#: ../panels/color/color.ui.h:59
+ msgid "D50 (Printing and publishing)"
+ msgstr "D50 (ਪਰਿੰਟ ਤੇ ਪਬਲਿਸ਼ ਕਰਨ)"
+ 
+-#: ../panels/color/color.ui.h:65
++#: ../panels/color/color.ui.h:60
+ msgid "D55"
+ msgstr "D55"
+ 
+-#: ../panels/color/color.ui.h:66
++#: ../panels/color/color.ui.h:61
+ msgid "D65 (Photography and graphics)"
+ msgstr "D65 (ਫੋਟੋਗਰਾਫ਼ੀ ਅਤੇ ਗਰਾਫਿਕਸ)"
+ 
+-#: ../panels/color/color.ui.h:67
++#: ../panels/color/color.ui.h:62
+ msgid "D75"
+ msgstr "D75"
+ 
++#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
++msgid "Color"
++msgstr "ਰੰਗ"
++
+ #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+ msgid ""
+ "Calibrate the color of your devices, such as displays, cameras or printers"
+@@ -974,33 +952,33 @@ msgid "Language"
+ msgstr "ਭਾਸ਼ਾ"
+ 
+ #: ../panels/common/language-chooser.ui.h:2
+-#: ../panels/mouse/cc-mouse-panel.c:120 ../panels/region/format-chooser.ui.h:2
++#: ../panels/mouse/cc-mouse-panel.c:111 ../panels/region/format-chooser.ui.h:2
+ msgid "_Done"
+ msgstr "ਮੁਕੰਮਲ(_D)"
+ 
+ #. Translators: This is the full date and time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:352
++#: ../panels/datetime/cc-datetime-panel.c:363
+ msgid "%e %B %Y, %l:%M %p"
+ msgstr "%e %B %Y, %l:%M %p"
+ 
+ #. Translators: This is the full date and time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:357
++#: ../panels/datetime/cc-datetime-panel.c:368
+ msgid "%e %B %Y, %R"
+ msgstr "%e %B %Y, %R"
+ 
+ #. Translators: UTC here means the Coordinated Universal Time.
+ #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
+-#: ../panels/datetime/cc-datetime-panel.c:573
++#: ../panels/datetime/cc-datetime-panel.c:584
+ msgid "UTC%:::z"
+ msgstr "UTC%:::z"
+ 
+ #. Translators: This is the time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:578
++#: ../panels/datetime/cc-datetime-panel.c:589
+ msgid "%l:%M %p"
+ msgstr "%l:%M %p"
+ 
+ #. Translators: This is the time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:583
++#: ../panels/datetime/cc-datetime-panel.c:594
+ msgid "%R"
+ msgstr "%R"
+ 
+@@ -1139,144 +1117,109 @@ msgstr "ਸਿਸਟਮ ਸਮਾਂ ਤੇ ਮਿਤੀ ਸੈਟਿੰਗ ਬ
+ msgid "To change time or date settings, you need to authenticate."
+ msgstr "ਸਮਾਂ ਜਾਂ ਮਿਤੀ ਸੈਟਿੰਗ ਬਦਲਣ ਲਈ, ਤੁਹਾਨੂੰ ਪਰਮਾਣਿਤ ਹੋਣ ਦੀ ਲੋੜ ਹੈ।"
+ 
+-#: ../panels/display/cc-display-panel.c:473
++#: ../panels/display/cc-display-panel.c:486
+ msgid "Lid Closed"
+ msgstr "Lid ਬੰਦ ਕੀਤਾ"
+ 
+ #. translators: "Mirrored" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:476
++#: ../panels/display/cc-display-panel.c:489
+ msgid "Mirrored"
+ msgstr "ਮਿਰਰ ਕੀਤੇ"
+ 
+-#: ../panels/display/cc-display-panel.c:478
+-#: ../panels/display/cc-display-panel.c:2043
+-#: ../panels/display/display-capplet.ui.h:1
++#: ../panels/display/cc-display-panel.c:491
++#: ../panels/display/cc-display-panel.c:2101
+ msgid "Primary"
+ msgstr "ਪ੍ਰਾਇਮਰੀ"
+ 
+-#: ../panels/display/cc-display-panel.c:480
++#: ../panels/display/cc-display-panel.c:493
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1727 ../panels/power/cc-power-panel.c:1738
+-#: ../panels/privacy/cc-privacy-panel.c:77
+-#: ../panels/privacy/cc-privacy-panel.c:117
+-#: ../panels/universal-access/cc-ua-panel.c:253
+-#: ../panels/universal-access/cc-ua-panel.c:610
+-#: ../panels/universal-access/cc-ua-panel.c:736
++#: ../panels/power/cc-power-panel.c:1743 ../panels/power/cc-power-panel.c:1754
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ #: ../panels/universal-access/uap.ui.h:6
+ msgid "Off"
+ msgstr "ਬੰਦ"
+ 
+-#: ../panels/display/cc-display-panel.c:483
++#: ../panels/display/cc-display-panel.c:496
+ msgid "Secondary"
+ msgstr "ਸੈਕੰਡਰੀ"
+ 
+-#: ../panels/display/cc-display-panel.c:1491
++#: ../panels/display/cc-display-panel.c:1506
+ msgid "Arrange Combined Displays"
+ msgstr "ਜੋੜੇ ਡਿਸਪਲੇਅ ਲਗਾਉ"
+ 
+-#: ../panels/display/cc-display-panel.c:1497
+-#: ../panels/display/cc-display-panel.c:1913
++#: ../panels/display/cc-display-panel.c:1512
++#: ../panels/display/cc-display-panel.c:1955
+ #: ../panels/network/connection-editor/connection-editor.ui.h:1
+ msgid "_Apply"
+ msgstr "ਲਾਗੂ ਕਰੋ(_A)"
+ 
+-#: ../panels/display/cc-display-panel.c:1518
++#: ../panels/display/cc-display-panel.c:1533
+ msgid "Drag displays to rearrange them"
+ msgstr "ਡਿਸਪਲੇਅ ਦਾ ਪ੍ਰਬੰਧ ਕਰਨ ਲਈ ਖਿੱਚੋ (ਡਰੈਗ)"
+ 
+-#. size
+-#: ../panels/display/cc-display-panel.c:1977
++#: ../panels/display/cc-display-panel.c:2037
+ msgid "Size"
+ msgstr "ਅਕਾਰ"
+ 
+ #. aspect ratio
+-#: ../panels/display/cc-display-panel.c:1992
+-#: ../panels/display/display-capplet.ui.h:12
++#: ../panels/display/cc-display-panel.c:2050
+ msgid "Aspect Ratio"
+ msgstr "ਅਕਾਰ ਅਨੁਪਾਤ"
+ 
+-#: ../panels/display/cc-display-panel.c:2013
+-#: ../panels/display/display-capplet.ui.h:13
++#: ../panels/display/cc-display-panel.c:2071
+ #: ../panels/printers/pp-options-dialog.c:86
+ msgid "Resolution"
+ msgstr "ਰੈਜ਼ੋਲੂਸ਼ਨ"
+ 
+-#: ../panels/display/cc-display-panel.c:2044
+-#: ../panels/display/display-capplet.ui.h:2
++#: ../panels/display/cc-display-panel.c:2102
+ msgid "Show the top bar and Activities Overview on this display"
+ msgstr "ਟਾਪ ਪੱਟੀ ਅਤੇ ਸਰਗਰਮੀ ਝਲਕ ਨੂੰ ਇਸ ਡਿਸਪਲੇਅ ਉੱਤੇ ਵੇਖਾਓ"
+ 
+-#: ../panels/display/cc-display-panel.c:2050
++#: ../panels/display/cc-display-panel.c:2108
+ msgid "Secondary Display"
+ msgstr "ਸੈਕੰਡਰੀ ਡਿਸਪਲੇਅ"
+ 
+-#: ../panels/display/cc-display-panel.c:2051
++#: ../panels/display/cc-display-panel.c:2109
+ msgid "Join this display with another to create an extra workspace"
+ msgstr "ਵਾਧੂ ਵਰਕਸਪੇਸ ਬਣਾਉਣ ਲਈ ਡਿਸਪਲੇਅ ਨੂੰ ਹੋਰ ਨਾਲ ਜੋੜੋ"
+ 
+-#: ../panels/display/cc-display-panel.c:2058
+-#: ../panels/display/display-capplet.ui.h:3
++#: ../panels/display/cc-display-panel.c:2116
+ msgid "Presentation"
+ msgstr "ਪਰਿਜ਼ੈੱਨਟੇਸ਼ਨ"
+ 
+-#: ../panels/display/cc-display-panel.c:2059
+-#: ../panels/display/display-capplet.ui.h:4
++#: ../panels/display/cc-display-panel.c:2117
+ msgid "Show slideshows and media only"
+ msgstr "ਕੇਵਲ ਸਲਾਈਡਸ਼ੋ ਤੇ ਮੀਡਿਆ ਹੀ ਵੇਖਾਓ"
+ 
+ #. translators: "Mirror" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:2064
+-#: ../panels/display/display-capplet.ui.h:5
++#: ../panels/display/cc-display-panel.c:2122
+ msgid "Mirror"
+ msgstr "ਮਿੱਰਰ"
+ 
+-#: ../panels/display/cc-display-panel.c:2065
++#: ../panels/display/cc-display-panel.c:2123
+ msgid "Show your existing view on both displays"
+ msgstr "ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਵਿਊ ਨੂੰ ਦੋਵੇਂ ਡਿਸਪਲੇਅ ਉੱਤੇ ਵੇਖਾਓ"
+ 
+-#: ../panels/display/cc-display-panel.c:2071
+-#: ../panels/display/display-capplet.ui.h:9
++#: ../panels/display/cc-display-panel.c:2129
+ msgid "Turn Off"
+ msgstr "ਬੰਦ ਕਰੋ"
+ 
+-#: ../panels/display/cc-display-panel.c:2072
+-#| msgid "Don't use the display"
++#: ../panels/display/cc-display-panel.c:2130
+ msgid "Don't use this display"
+ msgstr "ਇਹ ਡਿਸਪਲੇਅ ਨਾ ਵਰਤੋਂ"
+ 
+-#: ../panels/display/cc-display-panel.c:2289
++#: ../panels/display/cc-display-panel.c:2345
+ msgid "Could not get screen information"
+ msgstr "ਸਕਰੀਨ ਜਾਣਕਾਰੀ ਲਈ ਨਹੀਂ ਜਾ ਸਕੀ"
+ 
+-#: ../panels/display/cc-display-panel.c:2320
++#: ../panels/display/cc-display-panel.c:2376
+ msgid "_Arrange Combined Displays"
+ msgstr "ਜੋੜੇ ਡਿਸਪਲੇਅ ਲਗਾਉ"
+ 
+-#: ../panels/display/display-capplet.ui.h:6
+-msgid "Show your primary display on this screen also"
+-msgstr "ਆਪਣੇ ਪ੍ਰਾਇਮਰੀ ਡਿਸਪਲੇਅ ਨੂੰ ਇਸ ਸਕਰੀਨ ਉੱਤੇ ਵੀ ਵੇਖਾਓ"
+-
+-#: ../panels/display/display-capplet.ui.h:7
+-msgid "Combine"
+-msgstr "ਜੋੜੋ"
+-
+-#: ../panels/display/display-capplet.ui.h:8
+-msgid "Join with the primary display to create an extra space"
+-msgstr "ਵਾਧੂ ਥਾਂ ਬਣਾਉਣ ਲਈ ਪ੍ਰਾਇਮਰੀ ਡਿਸਪਲੇਅ ਨਾਲ ਜੋੜੋ"
+-
+-#: ../panels/display/display-capplet.ui.h:10
+-msgid "Don't use the display"
+-msgstr "ਡਿਸਪਲੇਅ ਵਰਤਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
+-
+-#: ../panels/display/display-capplet.ui.h:11
+-#: ../panels/printers/printers.ui.h:12
+-msgid "Model"
+-msgstr "ਮਾਡਲ"
+-
+-#: ../panels/display/display-capplet.ui.h:14
+-msgid "Refresh Rate"
+-msgstr "ਤਾਜ਼ਾ ਕਰਨ ਦਰ"
+-
+ #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
+ msgid "Displays"
+ msgstr "ਡਿਸਪਲੇਅ"
+@@ -1291,53 +1234,53 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
+ msgstr "ਪੈਨਲ;ਪਰੋਜੈਕਟਰ;xrandr;ਸਕਰੀਨ;ਰੈਜ਼ੋਲੂਸ਼ਨ;ਤਾਜ਼ਾ;"
+ 
+ #. TRANSLATORS: AP type
+-#: ../panels/info/cc-info-panel.c:450 ../panels/network/panel-common.c:127
++#: ../panels/info/cc-info-panel.c:452 ../panels/network/panel-common.c:127
+ msgid "Unknown"
+ msgstr "ਅਣਜਾਣ"
+ 
+-#: ../panels/info/cc-info-panel.c:532
++#: ../panels/info/cc-info-panel.c:539
+ #, c-format
+ msgid "%s %d-bit"
+ msgstr "%s %d-ਬਿੱਟ"
+ 
+-#: ../panels/info/cc-info-panel.c:534
++#: ../panels/info/cc-info-panel.c:541
+ #, c-format
+ msgid "%d-bit"
+ msgstr "%d-ਬਿੱਟ"
+ 
+-#: ../panels/info/cc-info-panel.c:1214
++#: ../panels/info/cc-info-panel.c:1221
+ msgid "Ask what to do"
+ msgstr "ਪੁੱਛੋ ਕਿ ਕੀ ਕਰਨਾ ਹੈ"
+ 
+-#: ../panels/info/cc-info-panel.c:1218
++#: ../panels/info/cc-info-panel.c:1225
+ msgid "Do nothing"
+ msgstr "ਕੁਝ ਨਹੀਂ"
+ 
+-#: ../panels/info/cc-info-panel.c:1222
++#: ../panels/info/cc-info-panel.c:1229
+ msgid "Open folder"
+ msgstr "ਫੋਲਡਰ ਖੋਲ੍ਹੋ"
+ 
+-#: ../panels/info/cc-info-panel.c:1313
++#: ../panels/info/cc-info-panel.c:1320
+ msgid "Other Media"
+ msgstr "ਹੋਰ ਮੀਡਿਆ"
+ 
+-#: ../panels/info/cc-info-panel.c:1344
++#: ../panels/info/cc-info-panel.c:1351
+ msgid "Select an application for audio CDs"
+ msgstr "ਆਡੀਓ ਸੀਡੀ ਲਈ ਐਪਲੀਕੇਸ਼ਨ ਚੁਣੋ"
+ 
+-#: ../panels/info/cc-info-panel.c:1345
++#: ../panels/info/cc-info-panel.c:1352
+ msgid "Select an application for video DVDs"
+ msgstr "ਵਿਡੀਓ ਡੀਵੀਡੀ ਲਈ ਐਪਲੀਕੇਸ਼ਨ ਚੁਣੋ"
+ 
+-#: ../panels/info/cc-info-panel.c:1346
++#: ../panels/info/cc-info-panel.c:1353
+ msgid "Select an application to run when a music player is connected"
+ msgstr "ਜਦੋਂ ਸੰਗੀਤ ਪਲੇਅਰ ਕੁਨੈਕਟ ਕੀਤਾ ਜਾਵੇ ਤਾਂ ਚਲਾਉਣ ਲਈ ਐਪਲੀਕੇਸ਼ਨ ਚੁਣੋ"
+ 
+-#: ../panels/info/cc-info-panel.c:1347
++#: ../panels/info/cc-info-panel.c:1354
+ msgid "Select an application to run when a camera is connected"
+ msgstr "ਜਦੋਂ ਕੈਮਰਾ ਕੁਨੈਕਟ ਕੀਤਾ ਜਾਵੇ ਤਾਂ ਚਲਾਉਣ ਲਈ ਐਪਲੀਕੇਸ਼ਨ ਚੁਣੋ"
+ 
+-#: ../panels/info/cc-info-panel.c:1348
++#: ../panels/info/cc-info-panel.c:1355
+ msgid "Select an application for software CDs"
+ msgstr "ਸਾਫਟਵੇਅਰ ਸੀਡੀ ਲਈ ਐਪਲੀਕੇਸ਼ਨ ਚੁਣੋ"
+ 
+@@ -1346,89 +1289,89 @@ msgstr "ਸਾਫਟਵੇਅਰ ਸੀਡੀ ਲਈ ਐਪਲੀਕੇਸ਼ਨ
+ #. * If the shared-mime-info translation works for your language,
+ #. * simply leave these untranslated.
+ #.
+-#: ../panels/info/cc-info-panel.c:1360
++#: ../panels/info/cc-info-panel.c:1367
+ msgid "audio DVD"
+ msgstr "ਆਡੀਓ ਡੀਵੀਡੀ"
+ 
+-#: ../panels/info/cc-info-panel.c:1361
++#: ../panels/info/cc-info-panel.c:1368
+ msgid "blank Blu-ray disc"
+ msgstr "ਖਾਲੀ ਬਲੁ-ਰੇ ਡਿਸਕ"
+ 
+-#: ../panels/info/cc-info-panel.c:1362
++#: ../panels/info/cc-info-panel.c:1369
+ msgid "blank CD disc"
+ msgstr "ਖਾਲੀ CD ਡਿਸਕ"
+ 
+-#: ../panels/info/cc-info-panel.c:1363
++#: ../panels/info/cc-info-panel.c:1370
+ msgid "blank DVD disc"
+ msgstr "ਖਾਲੀ DVD ਡਿਸਕ"
+ 
+-#: ../panels/info/cc-info-panel.c:1364
++#: ../panels/info/cc-info-panel.c:1371
+ msgid "blank HD DVD disc"
+ msgstr "ਖਾਲੀ HD DVD ਡਿਸਕ"
+ 
+-#: ../panels/info/cc-info-panel.c:1365
++#: ../panels/info/cc-info-panel.c:1372
+ msgid "Blu-ray video disc"
+ msgstr "ਬਲੁ-ਰੇ ਵਿਡੀਓ ਡਿਸਕ"
+ 
+-#: ../panels/info/cc-info-panel.c:1366
++#: ../panels/info/cc-info-panel.c:1373
+ msgid "e-book reader"
+ msgstr "ਈ-ਬੁੱਕ ਰੀਡਰ"
+ 
+-#: ../panels/info/cc-info-panel.c:1367
++#: ../panels/info/cc-info-panel.c:1374
+ msgid "HD DVD video disc"
+ msgstr "HD DVD ਵਿਡੀਓ ਡਿਸਕ"
+ 
+-#: ../panels/info/cc-info-panel.c:1368
++#: ../panels/info/cc-info-panel.c:1375
+ msgid "Picture CD"
+ msgstr "ਤਸਵੀਰ ਸੀਡੀ"
+ 
+-#: ../panels/info/cc-info-panel.c:1369
++#: ../panels/info/cc-info-panel.c:1376
+ msgid "Super Video CD"
+ msgstr "ਸੁਪਰ ਵਿਡੀਓ ਸੀਡੀ"
+ 
+-#: ../panels/info/cc-info-panel.c:1370
++#: ../panels/info/cc-info-panel.c:1377
+ msgid "Video CD"
+ msgstr "ਵਿਡੀਓ ਸੀਡੀ"
+ 
+-#: ../panels/info/cc-info-panel.c:1371
++#: ../panels/info/cc-info-panel.c:1378
+ msgid "Windows software"
+ msgstr "ਵਿੰਡੋਜ਼ ਸਾਫਟਵੇਅਰ"
+ 
+-#: ../panels/info/cc-info-panel.c:1372
++#: ../panels/info/cc-info-panel.c:1379
+ msgid "Software"
+ msgstr "ਸਾਫਟਵੇਅਰ"
+ 
+-#: ../panels/info/cc-info-panel.c:1495
++#: ../panels/info/cc-info-panel.c:1502
+ #: ../panels/keyboard/keyboard-shortcuts.c:1696
+ msgid "Section"
+ msgstr "ਭਾਗ"
+ 
+-#: ../panels/info/cc-info-panel.c:1504 ../panels/info/info.ui.h:13
++#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:13
+ msgid "Overview"
+ msgstr "ਸੰਖੇਪ"
+ 
+-#: ../panels/info/cc-info-panel.c:1510 ../panels/info/info.ui.h:20
++#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:20
+ msgid "Default Applications"
+ msgstr "ਡਿਫਾਲਟ ਐਪਲੀਕੇਸ਼ਨ"
+ 
+-#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:28
++#: ../panels/info/cc-info-panel.c:1522 ../panels/info/info.ui.h:28
+ msgid "Removable Media"
+ msgstr "ਹਟਾਉਣਯੋਗ ਮੀਡਿਆ"
+ 
+-#: ../panels/info/cc-info-panel.c:1540
++#: ../panels/info/cc-info-panel.c:1547
+ #, c-format
+ msgid "Version %s"
+ msgstr "ਵਰਜਨ %s"
+ 
+-#: ../panels/info/cc-info-panel.c:1590
++#: ../panels/info/cc-info-panel.c:1597
+ msgid "Install Updates"
+ msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕਰੋ"
+ 
+-#: ../panels/info/cc-info-panel.c:1594
++#: ../panels/info/cc-info-panel.c:1601
+ msgid "System Up-To-Date"
+ msgstr "ਸਿਸਟਮ ਅੱਪ-ਟੂ-ਡੇਟ ਹੈ"
+ 
+-#: ../panels/info/cc-info-panel.c:1598
++#: ../panels/info/cc-info-panel.c:1605
+ msgid "Checking for Updates"
+ msgstr "ਅੱਪਡੇਟ ਲਈ ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+ 
+@@ -1595,7 +1538,7 @@ msgid "Eject"
+ msgstr "ਬਾਹਰ ਕੱਢੋ"
+ 
+ #: ../panels/keyboard/01-input-sources.xml.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+ #: ../panels/universal-access/uap.ui.h:11
+ msgid "Typing"
+ msgstr "ਲਿਖਣਾ"
+@@ -1754,7 +1697,6 @@ msgid "Modifiers-only switch to next source"
+ msgstr "ਮਾਡੀਫਾਇਰ-ਕੇਵਲ ਅਗਲੇ ਸਰੋਤ ਲਈ ਬਦਲੋ"
+ 
+ #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Keyboard"
+ msgstr "ਕੀ-ਬੋਰਡ"
+ 
+@@ -1779,76 +1721,76 @@ msgstr "ਨਵਾਂ(_N):"
+ msgid "C_ommand:"
+ msgstr "ਕਮਾਂਡ(_o):"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Repeat Keys"
+ msgstr "ਦੁਹਰਾਉ ਸਵਿੱਚਾਂ"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+ msgid "Key presses _repeat when key is held down"
+ msgstr "ਸਵਿੱਚ-ਦਹਰਾਉ, ਜਦੋ ਕਿ ਸਵਿੱਚ ਨੂੰ ਦਬਾਈ ਰੱਖਿਆ ਜਾਵੇ"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+ msgid "_Delay:"
+ msgstr "ਦੇਰੀ(_D):"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+ msgid "_Speed:"
+ msgstr "ਸਪੀਡ(_S):"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
+ msgctxt "keyboard, delay"
+ msgid "Short"
+ msgstr "ਛੋਟਾ"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+ msgctxt "keyboard, speed"
+ msgid "Slow"
+ msgstr "ਹੌਲੀ"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+ msgid "Repeat keys speed"
+ msgstr "ਸਵਿੱਚਾਂ ਨੂੰ ਮੁੜ-ਦਬਾਉਣ ਗਤੀ"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+ msgctxt "keyboard, delay"
+ msgid "Long"
+ msgstr "ਲੰਮਾ"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+ msgctxt "keyboard, speed"
+ msgid "Fast"
+ msgstr "ਤੇਜ਼"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+ msgid "Cursor Blinking"
+ msgstr "ਝਪਕਦੀ ਕਰਸਰ"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+ msgid "Cursor _blinks in text fields"
+ msgstr "ਟੈਕਸਟ ਖੇਤਰਾਂ ਵਿੱਚ ਕਰਸਰ ਝਪਕਾਓ(_b)"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+ msgid "S_peed:"
+ msgstr "ਸਪੀਡ(_p):"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+ msgid "Cursor blink speed"
+ msgstr "ਕਰਸਰ ਝਪਕਣ ਗਤੀ"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+ #: ../panels/region/region.ui.h:5
+ msgid "Input Sources"
+ msgstr "ਇੰਪੁੱਟ ਸਰੋਤ"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+ msgid "Add Shortcut"
+ msgstr "ਸ਼ਾਰਟਕੱਟ ਸ਼ਾਮਿਲ"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
+ msgid "Remove Shortcut"
+ msgstr "ਸ਼ਾਰਟਕੱਟ ਹਟਾਓ"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
+ msgid ""
+ "To edit a shortcut, click the row and hold down the new keys or press "
+ "Backspace to clear."
+@@ -1856,7 +1798,7 @@ msgstr ""
+ "ਸ਼ਾਰਟਕੱਟ ਸੋਧਣ ਲਈ, ਕਤਾਰ ਕਲਿੱਕ ਕਰੋ ਅਤੇ ਨਵੀਆਂ ਸਵਿੱਚ ਹੋਲਡ ਕਰਕੇ ਰੱਖੋ ਜਾਂ ਬੈਕਸਪੇਸ "
+ "ਸਾਫ਼ ਕਰਨ ਲਈ ਵਰਤੋਂ।"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+ msgid "Shortcuts"
+ msgstr "ਸ਼ਾਰਟਕੱਟ"
+ 
+@@ -1901,11 +1843,11 @@ msgstr "ਜੇ ਤੁਸੀਂ ਸ਼ਾਰਟਕੱਟ \"%s\" ਲਈ ਦਿੱ
+ msgid "_Reassign"
+ msgstr "ਮੁੜ-ਜਾਰੀ(_R)"
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:100
++#: ../panels/mouse/cc-mouse-panel.c:95
+ msgid "Test Your _Settings"
+ msgstr "ਆਪਣੀ ਸੈਟਿੰਗ ਜਾਂਚੋ(_S)"
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:117
++#: ../panels/mouse/cc-mouse-panel.c:108
+ msgid "Test Your Settings"
+ msgstr "ਆਪਣੀ ਸੈਟਿੰਗ ਜਾਂਚੋ"
+ 
+@@ -1928,91 +1870,87 @@ msgstr ""
+ "ਬਟਨ;ਟਰੈਕਬਾਲ;Scroll;"
+ 
+ #: ../panels/mouse/gnome-mouse-properties.ui.h:1
+-msgid "Mouse Preferences"
+-msgstr "ਮਾਊਸ ਪਸੰਦ"
+-
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgid "General"
+ msgstr "ਆਮ"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
++#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgctxt "double click, speed"
+ msgid "Slow"
+ msgstr "ਹੌਲੀ"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
++#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+ msgid "Double-click timeout"
+ msgstr "ਡਬਲ ਕਲਿੱਕ ਟਾਈਮ-ਆਉਟ"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
++#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+ msgctxt "double click, speed"
+ msgid "Fast"
+ msgstr "ਤੇਜ਼"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
++#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+ msgid "_Double-click"
+ msgstr "ਡਬਲ ਕਲਿੱਕ(_D)"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
++#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+ msgid "Primary _button"
+ msgstr "ਪ੍ਰਾਇਮਰੀ ਬਟਨ(_b)"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
++#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+ msgctxt "mouse, left button as primary"
+ msgid "_Left"
+ msgstr "ਖੱਬੇ(_L)"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
++#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+ msgctxt "mouse, right button as primary"
+ msgid "_Right"
+ msgstr "ਸੱਜੇ(_R)"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
++#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+ msgid "Mouse"
+ msgstr "ਮਾਊਸ"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
++#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+ msgid "_Pointer speed"
+ msgstr "ਪੁਆਇੰਟਰ ਸਪੀਡ(_P)"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
++#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+ msgctxt "mouse pointer, speed"
+ msgid "Slow"
+ msgstr "ਹੌਲੀ"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
++#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+ msgctxt "mouse pointer, speed"
+ msgid "Fast"
+ msgstr "ਤੇਜ਼"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
++#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+ msgid "Touchpad"
+ msgstr "ਟੱਚਪੈਡ"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
++#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+ msgctxt "touchpad pointer, speed"
+ msgid "Slow"
+ msgstr "ਹੌਲੀ"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
++#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+ msgctxt "touchpad pointer, speed"
+ msgid "Fast"
+ msgstr "ਤੇਜ਼"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
++#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+ msgid "Disable while _typing"
+ msgstr "ਲਿਖਣ ਦੌਰਾਨ ਬੰਦ ਕਰੋ(_t)"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
++#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+ msgid "Tap to _click"
+ msgstr "ਕਲਿੱਕ ਲਈ ਛੂਹੋ(_c)"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
++#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+ msgid "Two _finger scroll"
+ msgstr "ਦੋ ਉਂਗਲ ਸਕਰੋਲ(_f)"
+ 
+ #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible.
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:21
++#: ../panels/mouse/gnome-mouse-properties.ui.h:20
+ msgid "_Natural scrolling"
+ msgstr "ਸਧਾਰਨ ਸਕਰੋਲਿੰਗ(_N)"
+ 
+@@ -2055,7 +1993,7 @@ msgstr "ਇੱਕ ਵਾਰ ਕਲਿੱਕ, ਸੈਕੰਡਰੀ ਬਟਨ"
+ msgid "Air_plane Mode"
+ msgstr "ਏਅਰਪਲੇਨ ਮੋਡ(_p)"
+ 
+-#: ../panels/network/cc-network-panel.c:928
++#: ../panels/network/cc-network-panel.c:930
+ msgid "Network proxy"
+ msgstr "ਨੈੱਟਵਰਕ ਪਰਾਕਸੀ"
+ 
+@@ -2063,14 +2001,14 @@ msgstr "ਨੈੱਟਵਰਕ ਪਰਾਕਸੀ"
+ #. * window for vpn connections, it is also used to display
+ #. * vpn connections in the device list.
+ #.
+-#: ../panels/network/cc-network-panel.c:1107 ../panels/network/net-vpn.c:285
+-#: ../panels/network/net-vpn.c:438
++#: ../panels/network/cc-network-panel.c:1109 ../panels/network/net-vpn.c:278
++#: ../panels/network/net-vpn.c:431
+ #, c-format
+ msgid "%s VPN"
+ msgstr "%s VPN"
+ 
+ #. TRANSLATORS: the user is running a NM that is not API compatible
+-#: ../panels/network/cc-network-panel.c:1242
++#: ../panels/network/cc-network-panel.c:1244
+ msgid "The system network services are not compatible with this version."
+ msgstr "ਸਿਸਟਮ ਨੈੱਟਵਰਕ ਸਰਵਿਸ ਇਸ ਵਰਜਨ ਨਾਲ ਕੰਮ ਨਹੀਂ ਕਰਦੀ ਹੈ।"
+ 
+@@ -2104,34 +2042,34 @@ msgstr "ਆਟੋਮੈਟਿਕ"
+ 
+ #. TRANSLATORS: this WEP WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:52
+-#: ../panels/network/net-device-wifi.c:221
+-#: ../panels/network/net-device-wifi.c:382
++#: ../panels/network/net-device-wifi.c:216
++#: ../panels/network/net-device-wifi.c:377
+ msgid "WEP"
+ msgstr "WEP"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:56
+-#: ../panels/network/net-device-wifi.c:225
+-#: ../panels/network/net-device-wifi.c:387
++#: ../panels/network/net-device-wifi.c:220
++#: ../panels/network/net-device-wifi.c:382
+ #: ../panels/network/network-wifi.ui.h:17
+ msgid "WPA"
+ msgstr "WPA"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:60
+-#: ../panels/network/net-device-wifi.c:229
++#: ../panels/network/net-device-wifi.c:224
+ msgid "WPA2"
+ msgstr "WPA2"
+ 
+ #. TRANSLATORS: this Enterprise WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:65
+-#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:229
+ msgid "Enterprise"
+ msgstr "ਇੰਟਰਪ੍ਰਾਈਜ਼"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:70
+-#: ../panels/network/net-device-wifi.c:239
+-#: ../panels/network/net-device-wifi.c:372
++#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:367
+ msgctxt "Wifi security"
+ msgid "None"
+ msgstr "ਕੋਈ ਨਹੀਂ"
+@@ -2152,8 +2090,8 @@ msgid "Yesterday"
+ msgstr "ਕੱਲ੍ਹ"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:106
+-#: ../panels/network/net-device-ethernet.c:125
+-#: ../panels/network/net-device-wifi.c:476
++#: ../panels/network/net-device-ethernet.c:122
++#: ../panels/network/net-device-wifi.c:471
+ #, c-format
+ msgid "%i day ago"
+ msgid_plural "%i days ago"
+@@ -2163,37 +2101,37 @@ msgstr[1] "%i ਦਿਨ ਪਹਿਲਾਂ"
+ #. Translators: network device speed
+ #: ../panels/network/connection-editor/ce-page-details.c:155
+ #: ../panels/network/net-device-ethernet.c:53
+-#: ../panels/network/net-device-wifi.c:534
++#: ../panels/network/net-device-wifi.c:528
+ #, c-format
+ msgid "%d Mb/s"
+ msgstr "%d Mb/s"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:181
+-#: ../panels/network/net-device-wifi.c:563
++#: ../panels/network/net-device-wifi.c:557
+ msgctxt "Signal strength"
+ msgid "None"
+ msgstr "ਕੋਈ ਨਹੀਂ"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:183
+-#: ../panels/network/net-device-wifi.c:565
++#: ../panels/network/net-device-wifi.c:559
+ msgctxt "Signal strength"
+ msgid "Weak"
+ msgstr "ਕਮਜ਼ੋਰ"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:185
+-#: ../panels/network/net-device-wifi.c:567
++#: ../panels/network/net-device-wifi.c:561
+ msgctxt "Signal strength"
+ msgid "Ok"
+ msgstr "ਠੀਕ ਹੈ"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:187
+-#: ../panels/network/net-device-wifi.c:569
++#: ../panels/network/net-device-wifi.c:563
+ msgctxt "Signal strength"
+ msgid "Good"
+ msgstr "ਚੰਗਾ"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:189
+-#: ../panels/network/net-device-wifi.c:571
++#: ../panels/network/net-device-wifi.c:565
+ msgctxt "Signal strength"
+ msgid "Excellent"
+ msgstr "ਬਹੁਤ ਵਧੀਆ"
+@@ -2339,15 +2277,15 @@ msgid "Link speed"
+ msgstr "ਲਿੰਕ ਸਪੀਡ"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:4
+-#: ../panels/network/net-device-ethernet.c:158
++#: ../panels/network/net-device-ethernet.c:155
+ #: ../panels/network/network-simple.ui.h:3
+ #: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
+ msgid "IPv4 Address"
+ msgstr "IPv4 ਐਡਰੈੱਸ"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:5
+-#: ../panels/network/net-device-ethernet.c:159
+-#: ../panels/network/net-device-ethernet.c:163
++#: ../panels/network/net-device-ethernet.c:156
++#: ../panels/network/net-device-ethernet.c:160
+ #: ../panels/network/network-mobile.ui.h:4
+ #: ../panels/network/network-simple.ui.h:4
+ #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
+@@ -2355,14 +2293,14 @@ msgid "IPv6 Address"
+ msgstr "IPv6 ਐਡਰੈੱਸ"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:6
+-#: ../panels/network/net-device-ethernet.c:166
++#: ../panels/network/net-device-ethernet.c:163
+ #: ../panels/network/network-simple.ui.h:2
+ #: ../panels/network/network-wifi.ui.h:7
+ msgid "Hardware Address"
+ msgstr "ਹਾਰਡਵੇਅਰ ਐਡਰੈੱਸ"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:7
+-#: ../panels/network/net-device-ethernet.c:170
++#: ../panels/network/net-device-ethernet.c:167
+ #: ../panels/network/network-mobile.ui.h:5
+ #: ../panels/network/network-simple.ui.h:5
+ #: ../panels/network/network-wifi.ui.h:8
+@@ -2372,7 +2310,7 @@ msgstr "ਡਿਫਾਲਟ ਰੂਟ"
+ #: ../panels/network/connection-editor/details-page.ui.h:8
+ #: ../panels/network/connection-editor/ip4-page.ui.h:3
+ #: ../panels/network/connection-editor/ip6-page.ui.h:3
+-#: ../panels/network/net-device-ethernet.c:172
++#: ../panels/network/net-device-ethernet.c:169
+ #: ../panels/network/network-mobile.ui.h:6
+ #: ../panels/network/network-simple.ui.h:6
+ #: ../panels/network/network-wifi.ui.h:9
+@@ -2518,7 +2456,7 @@ msgid "_Add"
+ msgstr "ਸ਼ਾਮਲ(_A)"
+ 
+ #: ../panels/network/connection-editor/net-connection-editor.c:595
+-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
++#: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
+ msgid "VPN"
+ msgstr "VPN"
+ 
+@@ -2526,23 +2464,23 @@ msgstr "VPN"
+ msgid "Bond"
+ msgstr "ਬੌਂਡ"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:597
++#: ../panels/network/connection-editor/net-connection-editor.c:598
+ msgid "Bridge"
+ msgstr "ਬਰਿੱਜ਼"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:598
++#: ../panels/network/connection-editor/net-connection-editor.c:599
+ msgid "VLAN"
+ msgstr "VLAN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:749
++#: ../panels/network/connection-editor/net-connection-editor.c:750
+ msgid "Could not load VPN plugins"
+ msgstr "VPN ਪਲੱਗਇਨ ਲੋਡ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾ ਸਕੀਆਂ"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:818
++#: ../panels/network/connection-editor/net-connection-editor.c:819
+ msgid "Import from file…"
+ msgstr "…ਫਾਇਲ ਤੋਂ ਇੰਪੋਰਟ ਕਰੋ"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:889
++#: ../panels/network/connection-editor/net-connection-editor.c:890
+ msgid "Add Network Connection"
+ msgstr "ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਲ"
+ 
+@@ -2552,7 +2490,7 @@ msgid "_Reset"
+ msgstr "ਮੁਡ਼-ਸੈੱਟ(_R)"
+ 
+ #: ../panels/network/connection-editor/reset-page.ui.h:2
+-#: ../panels/network/net-device-wifi.c:1408
++#: ../panels/network/net-device-wifi.c:1403
+ #: ../panels/network/network-wifi.ui.h:40
+ msgid "_Forget"
+ msgstr "ਭੁੱਲ ਜਾਓ(_F)"
+@@ -2599,7 +2537,7 @@ msgstr "ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫਾਇਲ ਚੁਣੋ"
+ 
+ #: ../panels/network/connection-editor/vpn-helpers.c:246
+ #: ../panels/printers/cc-printers-panel.c:1947
+-#: ../panels/sharing/cc-sharing-panel.c:422
++#: ../panels/sharing/cc-sharing-panel.c:426
+ #: ../panels/user-accounts/um-photo-dialog.c:222
+ msgid "_Open"
+ msgstr "ਖੋਲ੍ਹੋ(_O)"
+@@ -2687,29 +2625,29 @@ msgstr "ਬੌਂਡ ਸਲੇਵ"
+ msgid "Bridge slaves"
+ msgstr "ਬਰਿੱਜ ਸਲੇਵ"
+ 
+-#: ../panels/network/net-device-ethernet.c:111
+-#: ../panels/network/net-device-wifi.c:462
++#: ../panels/network/net-device-ethernet.c:108
++#: ../panels/network/net-device-wifi.c:457
+ msgid "never"
+ msgstr "ਕਦੇ ਨਹੀਂ"
+ 
+-#: ../panels/network/net-device-ethernet.c:121
+-#: ../panels/network/net-device-wifi.c:472
++#: ../panels/network/net-device-ethernet.c:118
++#: ../panels/network/net-device-wifi.c:467
+ msgid "today"
+ msgstr "ਅੱਜ"
+ 
+-#: ../panels/network/net-device-ethernet.c:123
+-#: ../panels/network/net-device-wifi.c:474
++#: ../panels/network/net-device-ethernet.c:120
++#: ../panels/network/net-device-wifi.c:469
+ msgid "yesterday"
+ msgstr "ਕੱਲ੍ਹ"
+ 
+-#: ../panels/network/net-device-ethernet.c:161
++#: ../panels/network/net-device-ethernet.c:158
+ #: ../panels/network/network-mobile.ui.h:3
+ #: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
+ #: ../panels/printers/printers.ui.h:13
+ msgid "IP Address"
+ msgstr "IP ਐਡਰੈੱਸ"
+ 
+-#: ../panels/network/net-device-ethernet.c:177
++#: ../panels/network/net-device-ethernet.c:174
+ #: ../panels/network/network-wifi.ui.h:10
+ msgid "Last used"
+ msgstr "ਆਖਰੀ ਵਰਤੋਂ"
+@@ -2719,14 +2657,14 @@ msgstr "ਆਖਰੀ ਵਰਤੋਂ"
+ #. * profile. It is also used to display ethernet in the
+ #. * device list.
+ #.
+-#: ../panels/network/net-device-ethernet.c:287
++#: ../panels/network/net-device-ethernet.c:284
+ #: ../panels/network/network-ethernet.ui.h:1
+ #: ../panels/network/network-simple.ui.h:1
+ msgid "Wired"
+ msgstr "ਤਾਰ ਵਾਲਾ"
+ 
+-#: ../panels/network/net-device-ethernet.c:355
+-#: ../panels/network/net-device-wifi.c:1549
++#: ../panels/network/net-device-ethernet.c:352
++#: ../panels/network/net-device-wifi.c:1558
+ #: ../panels/network/network-ethernet.ui.h:3
+ #: ../panels/network/network-mobile.ui.h:8
+ #: ../panels/network/network-simple.ui.h:8
+@@ -2734,16 +2672,21 @@ msgstr "ਤਾਰ ਵਾਲਾ"
+ msgid "Options…"
+ msgstr "…ਚੋਣਾਂ"
+ 
+-#: ../panels/network/net-device-ethernet.c:492
++#: ../panels/network/net-device-ethernet.c:489
+ #, c-format
+ msgid "Profile %d"
+ msgstr "ਪਰੋਫਾਇਲ %d"
+ 
+-#: ../panels/network/net-device-mobile.c:239
++#: ../panels/network/net-device-mobile.c:232
+ msgid "Add new connection"
+ msgstr "ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਲ ਕਰੋ"
+ 
+-#: ../panels/network/net-device-wifi.c:1117
++#: ../panels/network/net-device-team.c:77
++#| msgid "Bridge slaves"
++msgid "Team slaves"
++msgstr "ਟੀਮ  ਸਲੇਵ"
++
++#: ../panels/network/net-device-wifi.c:1110
+ msgid ""
+ "If you have a connection to the Internet other than wireless, you can set up "
+ "a wireless hotspot to share the connection with others."
+@@ -2752,36 +2695,36 @@ msgstr ""
+ "ਨੂੰ ਹੋਰਾਂ ਨਾਲ ਆਪਣੇ ਇੰਟਰਨੈੱਟ "
+ "ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਵਰਤ ਸਕਦੇ ਹੋ।"
+ 
+-#: ../panels/network/net-device-wifi.c:1121
++#: ../panels/network/net-device-wifi.c:1114
+ #, c-format
+ msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+ msgstr ""
+ "ਬੇਤਾਰ ਹਾਟਸਪਾਟ ਚਾਲੂ ਕਰਨ ਨਾਲ ਤੁਹਾਨੂੰ <b>%s</b> ਤੋਂ ਡਿਸ-ਕੁਨੈਕਟ ਕੀਤਾ ਜਾਵੇਗਾ।"
+ 
+-#: ../panels/network/net-device-wifi.c:1125
++#: ../panels/network/net-device-wifi.c:1118
+ msgid ""
+ "It is not possible to access the Internet through your wireless while the "
+ "hotspot is active."
+ msgstr ""
+ "ਤੁਹਾਡੇ ਬੇਤਾਰ ਰਾਹੀਂ ਇੰਟਰਨੈੱਟ ਵਰਤਣਾ ਸੰਭਵ ਨਹੀਂ ਹੈ, ਜਦੋਂ ਕਿ ਹਾਟਸਪਾਟ ਸਰਗਰਮ ਹੋਵੇ।"
+ 
+-#: ../panels/network/net-device-wifi.c:1199
++#: ../panels/network/net-device-wifi.c:1192
+ msgid "Stop hotspot and disconnect any users?"
+ msgstr "ਕੀ ਹਾਟਸਪਾਟ ਰੋਕਣਾ ਹੈ ਅਤੇ ਯੂਜ਼ਰ ਨੂੰ ਡਿਸ-ਕੁਨੈਕਟ ਕਰਨਾ ਹੈ?"
+ 
+-#: ../panels/network/net-device-wifi.c:1202
++#: ../panels/network/net-device-wifi.c:1195
+ msgid "_Stop Hotspot"
+ msgstr "ਹਾਟਸਪਾਟ ਰੋਕੋ(_S)"
+ 
+-#: ../panels/network/net-device-wifi.c:1274
++#: ../panels/network/net-device-wifi.c:1267
+ msgid "System policy prohibits use as a Hotspot"
+ msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਹਾਟ-ਸਪਾਟ ਵਜੋਂ ਵਰਤਣ ਤੋਂ ਰੋਕਦੀ ਹੈ"
+ 
+-#: ../panels/network/net-device-wifi.c:1277
++#: ../panels/network/net-device-wifi.c:1270
+ msgid "Wireless device does not support Hotspot mode"
+ msgstr "ਵਾਇਰਲੈਸ ਜੰਤਰ ਹਾਟਸਪਾਟ ਮੋਡ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
+ 
+-#: ../panels/network/net-device-wifi.c:1404
++#: ../panels/network/net-device-wifi.c:1399
+ msgid ""
+ "Network details for the selected networks, including passwords and any "
+ "custom configuration will be lost."
+@@ -2790,19 +2733,19 @@ msgstr ""
+ "ਦਿੱਤੀ ਸੀ, ਖਤਮ ਹੋ "
+ "ਜਾਵੇਗਾ।"
+ 
+-#: ../panels/network/net-device-wifi.c:1714
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
++#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+ msgid "History"
+ msgstr "ਅਤੀਤ"
+ 
+-#: ../panels/network/net-device-wifi.c:1718 ../panels/power/power.ui.h:21
++#: ../panels/network/net-device-wifi.c:1730 ../panels/power/power.ui.h:21
+ #: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596
+-#: ../panels/wacom/cc-wacom-page.c:525
++#: ../panels/wacom/cc-wacom-page.c:534
+ msgid "_Close"
+ msgstr "ਬੰਦ ਕਰੋ(_C)"
+ 
+ #. translators: This is the label for the "Forget wireless network" functionality
+-#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/network/net-device-wifi.c:1738
+ msgctxt "Wi-Fi Network"
+ msgid "_Forget"
+ msgstr "ਭੁੱਲ ਜਾਓ(_F)"
+@@ -2822,7 +2765,7 @@ msgstr ""
+ msgid "This is not recommended for untrusted public networks."
+ msgstr "ਇਹ ਪਬਲਿਕ ਨੈੱਟਵਰਕ ਬੇ-ਭਰੋਸੇਯੋਗ ਨੈੱਟਵਰਕ ਲਈ ਸਿਫਾਰਸ਼ ਨਹੀਂ ਕੀਤਾ ਜਾਂਦਾ।"
+ 
+-#: ../panels/network/net-proxy.c:417
++#: ../panels/network/net-proxy.c:410
+ msgid "Proxy"
+ msgstr "ਪਰਾਕਸੀ"
+ 
+@@ -2838,17 +2781,17 @@ msgstr "IMEI"
+ msgid "Provider"
+ msgstr "ਪਰੋਵਾਇਡਰ"
+ 
+-#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
++#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:2
+ msgctxt "proxy method"
+ msgid "None"
+ msgstr "ਕੋਈ ਨਹੀਂ"
+ 
+-#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
++#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:3
+ msgctxt "proxy method"
+ msgid "Manual"
+ msgstr "ਦਸਤੀ"
+ 
+-#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
++#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:4
+ msgctxt "proxy method"
+ msgid "Automatic"
+ msgstr "ਆਟੋਮੈਟਿਕ"
+@@ -2901,19 +2844,7 @@ msgstr "Socks ਪੋਰਟ ਪੋਰਟ"
+ msgid "Turn device off"
+ msgstr "ਜੰਤਰ ਬੰਦ"
+ 
+-#: ../panels/network/network.ui.h:1
+-msgid "Select the interface to use for the new service"
+-msgstr "ਨਵੀਂ ਸਰਵਿਸ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਇੰਟਰਫੇਸ ਚੁਣੋ"
+-
+-#: ../panels/network/network.ui.h:2
+-msgid "C_reate…"
+-msgstr "…ਬਣਾਓ(_r)"
+-
+-#: ../panels/network/network.ui.h:3
+-msgid "_Interface"
+-msgstr "ਇੰਟਰਫੇਸ(_i)"
+-
+-#: ../panels/network/network.ui.h:8
++#: ../panels/network/network.ui.h:5
+ msgid "Add Device"
+ msgstr "ਜੰਤਰ ਸ਼ਾਮਲ"
+ 
+@@ -2952,7 +2883,7 @@ msgstr "ਵੇਰਵਾ"
+ #: ../panels/network/wireless-security/ws-leap.ui.h:2
+ #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
+ #: ../panels/user-accounts/data/account-dialog.ui.h:9
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+ msgid "_Password"
+ msgstr "ਪਾਸਵਰਡ(_P)"
+ 
+@@ -3648,12 +3579,12 @@ msgid "Show Details in Lock Screen"
+ msgstr "ਲਾਕ ਸਕਰੀਨ ਵਿੱਚ ਵੇਰਵਾ ਵੇਖਾਓ"
+ 
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1733 ../panels/power/cc-power-panel.c:1740
+-#: ../panels/privacy/cc-privacy-panel.c:77
+-#: ../panels/privacy/cc-privacy-panel.c:117
+-#: ../panels/universal-access/cc-ua-panel.c:253
+-#: ../panels/universal-access/cc-ua-panel.c:610
+-#: ../panels/universal-access/cc-ua-panel.c:736
++#: ../panels/power/cc-power-panel.c:1749 ../panels/power/cc-power-panel.c:1756
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ msgid "On"
+ msgstr "ਚਾਲੂ"
+ 
+@@ -3777,18 +3708,18 @@ msgstr ""
+ "ਚੈਟ ਅਤੇ ਹੋਰ ਚੀਜ਼ਾਂ "
+ "ਵਰਤ ਸਕਦੀਆਂ ਹਨ।"
+ 
+-#: ../panels/power/cc-power-panel.c:187
++#: ../panels/power/cc-power-panel.c:189
+ msgid "Unknown time"
+ msgstr "ਅਣਜਾਣ ਸਮਾਂ"
+ 
+-#: ../panels/power/cc-power-panel.c:193
++#: ../panels/power/cc-power-panel.c:195
+ #, c-format
+ msgid "%i minute"
+ msgid_plural "%i minutes"
+ msgstr[0] "%i ਮਿੰਟ"
+ msgstr[1] "%i ਮਿੰਟ"
+ 
+-#: ../panels/power/cc-power-panel.c:205
++#: ../panels/power/cc-power-panel.c:207
+ #, c-format
+ msgid "%i hour"
+ msgid_plural "%i hours"
+@@ -3797,226 +3728,226 @@ msgstr[1] "%i ਘੰਟੇ"
+ 
+ #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
+ #. * Swap order with "%2$s %2$i %1$s %1$i if needed
+-#: ../panels/power/cc-power-panel.c:213
++#: ../panels/power/cc-power-panel.c:215
+ #, c-format
+ msgid "%i %s %i %s"
+ msgstr "%i %s %i %s"
+ 
+-#: ../panels/power/cc-power-panel.c:214
++#: ../panels/power/cc-power-panel.c:216
+ msgid "hour"
+ msgid_plural "hours"
+ msgstr[0] "ਘੰਟਾ"
+ msgstr[1] "ਘੰਟੇ"
+ 
+-#: ../panels/power/cc-power-panel.c:215
++#: ../panels/power/cc-power-panel.c:217
+ msgid "minute"
+ msgid_plural "minutes"
+ msgstr[0] "ਮਿੰਟ"
+ msgstr[1] "ਮਿੰਟ"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:234
++#: ../panels/power/cc-power-panel.c:236
+ #, c-format
+ msgid "%s until fully charged"
+ msgstr "ਪੂਰਾ ਚਾਰਜ ਹੋਣ ਲਈ %s"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:241
++#: ../panels/power/cc-power-panel.c:243
+ #, c-format
+ msgid "Caution: %s remaining"
+ msgstr "ਸਾਵਧਾਨ: %s ਬਾਕੀ"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:246
++#: ../panels/power/cc-power-panel.c:248
+ #, c-format
+ msgid "%s remaining"
+ msgstr "%s ਬਾਕੀ"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:251 ../panels/power/cc-power-panel.c:279
++#: ../panels/power/cc-power-panel.c:253 ../panels/power/cc-power-panel.c:281
+ msgid "Fully charged"
+ msgstr "ਪੂਰੀ ਚਾਰਜ"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:255 ../panels/power/cc-power-panel.c:283
++#: ../panels/power/cc-power-panel.c:257 ../panels/power/cc-power-panel.c:285
+ msgid "Empty"
+ msgstr "ਖਾਲੀ"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:270
++#: ../panels/power/cc-power-panel.c:272
+ msgid "Charging"
+ msgstr "ਚਾਰਜ ਹੋ ਰਹੀ ਹੈ"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:275
++#: ../panels/power/cc-power-panel.c:277
+ msgid "Discharging"
+ msgstr "ਡਿਸਚਾਰਜ ਹੋ ਰਹੀ ਹੈ"
+ 
+-#: ../panels/power/cc-power-panel.c:393
++#: ../panels/power/cc-power-panel.c:400
+ msgctxt "Battery name"
+ msgid "Main"
+ msgstr "ਮੁੱਖ"
+ 
+-#: ../panels/power/cc-power-panel.c:395
++#: ../panels/power/cc-power-panel.c:402
+ msgctxt "Battery name"
+ msgid "Extra"
+ msgstr "ਵਾਧੂ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:486
++#: ../panels/power/cc-power-panel.c:474
+ msgid "Wireless mouse"
+ msgstr "ਬੇਤਾਰ ਮਾਊਸ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:490
++#: ../panels/power/cc-power-panel.c:477
+ msgid "Wireless keyboard"
+ msgstr "ਬੇਤਾਰ ਕੀ-ਬੋਰਡ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:494
++#: ../panels/power/cc-power-panel.c:480
+ msgid "Uninterruptible power supply"
+ msgstr "ਗ਼ੈਰ-ਰੁਕਾਵਟ-ਯੋਗ ਪਾਵਰ ਸਪਲਾਈ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:499
++#: ../panels/power/cc-power-panel.c:483
+ msgid "Personal digital assistant"
+ msgstr "ਨਿੱਜੀ ਡਿਜ਼ਿਟਲ ਸਹਾਇਕ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:503
++#: ../panels/power/cc-power-panel.c:486
+ msgid "Cellphone"
+ msgstr "ਸੈਲਫੋਨ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:507
++#: ../panels/power/cc-power-panel.c:489
+ msgid "Media player"
+ msgstr "ਮੀਡਿਆ ਪਲੇਅਰ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:511
++#: ../panels/power/cc-power-panel.c:492
+ msgid "Tablet"
+ msgstr "ਟੇਬਲੇਟ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:515
++#: ../panels/power/cc-power-panel.c:495
+ msgid "Computer"
+ msgstr "ਕੰਪਿਊਟਰ"
+ 
+ #. TRANSLATORS: secondary battery, misc
+-#: ../panels/power/cc-power-panel.c:519 ../panels/power/cc-power-panel.c:729
+-#: ../panels/power/cc-power-panel.c:2064
++#: ../panels/power/cc-power-panel.c:498 ../panels/power/cc-power-panel.c:745
++#: ../panels/power/cc-power-panel.c:2080
+ msgid "Battery"
+ msgstr "ਬੈਟਰੀ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:528
++#: ../panels/power/cc-power-panel.c:544
+ msgctxt "Battery power"
+ msgid "Charging"
+ msgstr "ਚਾਰਜ ਹੋ ਰਹੀ ਹੈ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:535
++#: ../panels/power/cc-power-panel.c:551
+ msgctxt "Battery power"
+ msgid "Caution"
+ msgstr "ਸਾਵਧਾਨ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:540
++#: ../panels/power/cc-power-panel.c:556
+ msgctxt "Battery power"
+ msgid "Low"
+ msgstr "ਘੱਟ"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:545
++#: ../panels/power/cc-power-panel.c:561
+ msgctxt "Battery power"
+ msgid "Good"
+ msgstr "ਚੰਗੀ"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:550
++#: ../panels/power/cc-power-panel.c:566
+ msgctxt "Battery power"
+ msgid "Fully charged"
+ msgstr "ਪੂਰੀ ਚਾਰਜ"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:554
++#: ../panels/power/cc-power-panel.c:570
+ msgctxt "Battery power"
+ msgid "Empty"
+ msgstr "ਖਾਲੀ"
+ 
+-#: ../panels/power/cc-power-panel.c:727
++#: ../panels/power/cc-power-panel.c:743
+ msgid "Batteries"
+ msgstr "ਬੈਟਰੀਆਂ"
+ 
+-#: ../panels/power/cc-power-panel.c:1133
++#: ../panels/power/cc-power-panel.c:1149
+ msgid "When _idle"
+ msgstr "ਜਦੋਂ ਵੇਹਲਾ ਹੈ(_i)"
+ 
+-#: ../panels/power/cc-power-panel.c:1502
++#: ../panels/power/cc-power-panel.c:1518
+ msgid "Power Saving"
+ msgstr "ਪਾਵਰ ਬੱਚਤ"
+ 
+-#: ../panels/power/cc-power-panel.c:1530
++#: ../panels/power/cc-power-panel.c:1546
+ msgid "_Screen brightness"
+ msgstr "ਸਕਰੀਨ ਚਮਕ(_S)"
+ 
+-#: ../panels/power/cc-power-panel.c:1536
++#: ../panels/power/cc-power-panel.c:1552
+ msgid "_Keyboard brightness"
+ msgstr "ਕੀ-ਬੋਰਡ ਚਮਕ(_K)"
+ 
+-#: ../panels/power/cc-power-panel.c:1546
++#: ../panels/power/cc-power-panel.c:1562
+ msgid "_Dim screen when inactive"
+ msgstr "ਨਾ-ਸਰਗਰਮ ਹੋਵੇ ਤਾਂ ਸਕਰੀਨ ਡਿਮ ਕਰੋ(_D)"
+ 
+-#: ../panels/power/cc-power-panel.c:1571
++#: ../panels/power/cc-power-panel.c:1587
+ msgid "_Blank screen"
+ msgstr "ਖਾਲੀ ਸਕਰੀਨ(_B)"
+ 
+-#: ../panels/power/cc-power-panel.c:1608
++#: ../panels/power/cc-power-panel.c:1624
+ msgid "_Wi-Fi"
+ msgstr "ਵਾਈ-ਫਾਈ(_W)"
+ 
+-#: ../panels/power/cc-power-panel.c:1613
++#: ../panels/power/cc-power-panel.c:1629
+ msgid "Turns off wireless devices"
+ msgstr "ਬੇਤਾਰ ਜੰਤਰ ਬੰਦ ਹਨ"
+ 
+-#: ../panels/power/cc-power-panel.c:1638
++#: ../panels/power/cc-power-panel.c:1654
+ msgid "_Mobile broadband"
+ msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ(_M)"
+ 
+-#: ../panels/power/cc-power-panel.c:1643
++#: ../panels/power/cc-power-panel.c:1659
+ msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
+ msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ (3G, 4G, WiMax ਆਦਿ) ਜੰਤਰ ਬੰਦ ਕਰੋ"
+ 
+-#: ../panels/power/cc-power-panel.c:1678
++#: ../panels/power/cc-power-panel.c:1694
+ msgid "_Bluetooth"
+ msgstr "ਬਲਿਊਟੁੱਥ(_B)"
+ 
+-#: ../panels/power/cc-power-panel.c:1729
++#: ../panels/power/cc-power-panel.c:1745
+ msgid "When on battery power"
+ msgstr "ਜਦੋਂ ਬੈਟਰੀ ਪਾਵਰ ਉੱਤੇ ਹੋਵੇ"
+ 
+-#: ../panels/power/cc-power-panel.c:1731
++#: ../panels/power/cc-power-panel.c:1747
+ msgid "When plugged in"
+ msgstr "ਜਦੋਂ ਪਲੱਗ ਲੱਗਾ ਹੋਵੇ"
+ 
+-#: ../panels/power/cc-power-panel.c:1860
++#: ../panels/power/cc-power-panel.c:1876
+ msgid "Suspend & Power Off"
+ msgstr "ਸਸਪੈਂਡ ਅਤੇ ਬੰਦ"
+ 
+-#: ../panels/power/cc-power-panel.c:1893
++#: ../panels/power/cc-power-panel.c:1909
+ msgid "_Automatic suspend"
+ msgstr "ਆਟੋਮੈਟਿਕ ਸਸਪੈਂਡ(_A)"
+ 
+-#: ../panels/power/cc-power-panel.c:1917
++#: ../panels/power/cc-power-panel.c:1933
+ msgid "When battery power is _critical"
+ msgstr "ਜਦੋਂ ਬੈਟਰੀ ਪਾਵਰ ਨਾਜ਼ੁਕ ਰੂਪ 'ਚ ਘੱਟ ਹੋਵੇ (_c)"
+ 
+-#: ../panels/power/cc-power-panel.c:1974
++#: ../panels/power/cc-power-panel.c:1990
+ msgid "Power Off"
+ msgstr "ਬੰਦ ਕਰੋ"
+ 
+-#: ../panels/power/cc-power-panel.c:2111
++#: ../panels/power/cc-power-panel.c:2127
+ msgid "Devices"
+ msgstr "ਜੰਤਰ"
+ 
+@@ -4121,7 +4052,7 @@ msgid "Authenticate"
+ msgstr "ਪਰਮਾਣਿਤ"
+ 
+ #: ../panels/printers/authentication-dialog.ui.h:5
+-#: ../panels/sharing/sharing.ui.h:23
++#: ../panels/sharing/sharing.ui.h:21
+ #: ../panels/user-accounts/data/account-dialog.ui.h:6
+ msgid "Password"
+ msgstr "ਪਾਸਵਰਡ"
+@@ -4486,12 +4417,12 @@ msgid "%s Active Jobs"
+ msgstr "%s ਸਰਗਰਮ ਜਾਬ"
+ 
+ #. Translators: This item is a server which needs authentication to show its printers
+-#: ../panels/printers/pp-new-printer-dialog.c:1667
++#: ../panels/printers/pp-new-printer-dialog.c:1669
+ msgid "Server requires authentication"
+ msgstr "ਸਰਵਰ ਲਈ ਪਰਮਾਣਕਿਤਾ ਚਾਹੀਦੀ ਹੈ"
+ 
+ #. Translators: No printers were found
+-#: ../panels/printers/pp-new-printer-dialog.c:1704
++#: ../panels/printers/pp-new-printer-dialog.c:1706
+ msgid "No printers detected."
+ msgstr "ਕੋਈ ਪਰਿੰਟਰ ਨਹੀਂ ਮਿਲਿਆ।"
+ 
+@@ -4662,6 +4593,10 @@ msgstr "ਜਾਬ"
+ msgid "Show _Jobs"
+ msgstr "ਜਾਬ ਵੇਖਾਉ(_J)"
+ 
++#: ../panels/printers/printers.ui.h:12
++msgid "Model"
++msgstr "ਮਾਡਲ"
++
+ #: ../panels/printers/printers.ui.h:15
+ msgid "label"
+ msgstr "ਲੇਬਲ"
+@@ -4698,39 +4633,39 @@ msgstr ""
+ "ਅਫਸੋਸ! ਸਿਸਟਮ ਪਰਿੰਟਿਗ ਸੇਵ\n"
+ "ਉਪਲੱਬਧ ਨਹੀਂ ਜਾਪਦੀ ਹੈ।"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:245 ../panels/privacy/privacy.ui.h:26
++#: ../panels/privacy/cc-privacy-panel.c:248 ../panels/privacy/privacy.ui.h:26
+ msgid "Screen Lock"
+ msgstr "ਸਕਰੀਨ ਲਾਕ"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:358 ../panels/privacy/privacy.ui.h:20
++#: ../panels/privacy/cc-privacy-panel.c:361 ../panels/privacy/privacy.ui.h:20
+ msgid "Usage & History"
+ msgstr "ਵਰਤੋਂ ਤੇ ਅਤੀਤ"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:486
++#: ../panels/privacy/cc-privacy-panel.c:489
+ msgid "Empty all items from Trash?"
+ msgstr "ਰੱਦੀ 'ਚੋਂ ਸਭ ਆਈਟਮਾਂ ਹਟਾਉਣੀਆਂ ਹਨ?"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:487
++#: ../panels/privacy/cc-privacy-panel.c:490
+ msgid "All items in the Trash will be permanently deleted."
+ msgstr "ਰੱਦੀ ਵਿੱਚ ਮੌਜੂਦਾ ਆਈਟਮਾਂ ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ।"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:488 ../panels/privacy/privacy.ui.h:32
++#: ../panels/privacy/cc-privacy-panel.c:491 ../panels/privacy/privacy.ui.h:32
+ msgid "_Empty Trash"
+ msgstr "ਰੱਦੀ ਖਾਲੀ ਕਰੋ(_E)"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:511
++#: ../panels/privacy/cc-privacy-panel.c:514
+ msgid "Delete all the temporary files?"
+ msgstr "ਸਭ ਆਰਜ਼ੀ ਫਾਇਲਾਂ ਹਟਾਉਣੀਆਂ ਹਨ?"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:512
++#: ../panels/privacy/cc-privacy-panel.c:515
+ msgid "All the temporary files will be permanently deleted."
+ msgstr "ਸਭ ਆਰਜ਼ੀ ਫਾਇਲਾਂ ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ।"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:513 ../panels/privacy/privacy.ui.h:33
++#: ../panels/privacy/cc-privacy-panel.c:516 ../panels/privacy/privacy.ui.h:33
+ msgid "_Purge Temporary Files"
+ msgstr "ਆਰਜ਼ੀ ਫਾਇਲਾਂ ਨੂੰ ਨਸ਼ਟ ਕਰੋ(_P)"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:535 ../panels/privacy/privacy.ui.h:31
++#: ../panels/privacy/cc-privacy-panel.c:538 ../panels/privacy/privacy.ui.h:31
+ msgid "Purge Trash & Temporary Files"
+ msgstr "ਰੱਦੀ ਅਤੇ ਆਰਜ਼ੀ ਫਾਇਲਾਂ ਨਸ਼ਟ ਕਰੋ"
+ 
+@@ -5084,21 +5019,21 @@ msgstr "ਹੇਠਾਂ ਭੇਜੋ"
+ msgid "Preferences"
+ msgstr "ਮੇਰੀ ਪਸੰਦ"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:274
++#: ../panels/sharing/cc-sharing-panel.c:285
+ msgctxt "service is enabled"
+ msgid "On"
+ msgstr "ਚਾਲੂ"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:276
++#: ../panels/sharing/cc-sharing-panel.c:287
+ msgctxt "service is disabled"
+ msgid "Off"
+ msgstr "ਬੰਦ"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:418
++#: ../panels/sharing/cc-sharing-panel.c:422
+ msgid "Choose a Folder"
+ msgstr "ਫੋਲਡਰ ਚੁਣੋ"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:702
++#: ../panels/sharing/cc-sharing-panel.c:736
+ msgid "Copy"
+ msgstr "ਕਾਪੀ ਕਰੋ"
+ 
+@@ -5142,70 +5077,62 @@ msgstr ""
+ "ਸਕਦੇ ਹੋ"
+ 
+ #: ../panels/sharing/sharing.ui.h:3
+-msgid "Share Public Folder"
+-msgstr "ਪਬਲਿਕ ਫੋਲਡਰ ਸਾਂਝਾ ਕਰੋ"
+-
+-#: ../panels/sharing/sharing.ui.h:4
+ msgid "Only Receive From Trusted Devices"
+ msgstr "ਕੇਵਲ ਟਰੱਸਟ ਕੀਤੇ ਜੰਤਰਾਂ ਤੋਂ ਹੀ ਪ੍ਰਾਪਤ ਕਰੋ"
+ 
+-#: ../panels/sharing/sharing.ui.h:5
++#: ../panels/sharing/sharing.ui.h:4
+ msgid "Save Received Files to Downloads Folder"
+ msgstr "ਪ੍ਰਾਪਤ ਕੀਤੀਆਂ ਫਾਇਲਾਂ ਨੂੰ ਡਾਊਨਲੋਡ ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲੋ"
+ 
+-#: ../panels/sharing/sharing.ui.h:6
+-msgid "Only share with Trusted Devices"
+-msgstr "ਟਰਸਟ ਕੀਤੇ ਜੰਤਰਾਂ ਨਾਲ ਹੀ ਸਾਂਝਾ ਕਰੋ"
+-
+-#: ../panels/sharing/sharing.ui.h:7
++#: ../panels/sharing/sharing.ui.h:5
+ msgid "Computer Name"
+ msgstr "ਕੰਪਿਊਟਰ ਨਾਂ"
+ 
+-#: ../panels/sharing/sharing.ui.h:8
++#: ../panels/sharing/sharing.ui.h:6
+ msgid "Personal File Sharing"
+ msgstr "ਨਿੱਜੀ ਫਾਇਲ ਸਾਂਝ"
+ 
+-#: ../panels/sharing/sharing.ui.h:9
++#: ../panels/sharing/sharing.ui.h:7
+ msgid "Screen Sharing"
+ msgstr "ਸਕਰੀਨ ਸਾਂਝ"
+ 
+-#: ../panels/sharing/sharing.ui.h:10
++#: ../panels/sharing/sharing.ui.h:8
+ msgid "Media Sharing"
+ msgstr "ਮੀਡਿਆ ਸਾਂਝ"
+ 
+-#: ../panels/sharing/sharing.ui.h:11
++#: ../panels/sharing/sharing.ui.h:9
+ msgid "Remote Login"
+ msgstr "ਰਿਮੋਟ ਲਾਗਇਨ"
+ 
+-#: ../panels/sharing/sharing.ui.h:12
++#: ../panels/sharing/sharing.ui.h:10
+ msgid "Some services are disabled because of no network access."
+ msgstr "ਕੁਝ ਸਰਵਿਸਾਂ ਬੰਦ ਹਨ, ਕਿਉਂਕਿ ਕੋਈ ਨੈੱਟਵਰਕ ਪਹੁੰਚ ਨਹੀਂ ਹੈ।"
+ 
+-#: ../panels/sharing/sharing.ui.h:13
++#: ../panels/sharing/sharing.ui.h:11
+ msgid "Share Music, Photos and Videos with others on the current network."
+ msgstr "ਮੌਜੂਦਾ ਨੈੱਟਵਰਕ ਉੱਤੇ ਹੋਰਾਂ ਨਾਲ ਸੰਗੀਤ, ਫੋਟੋ ਤੇ ਵਿਡੀਓ ਨੂੰ ਸਾਂਝਾ ਕਰੋ।"
+ 
+-#: ../panels/sharing/sharing.ui.h:14
++#: ../panels/sharing/sharing.ui.h:12
+ msgid "Share Media On This Network"
+ msgstr "ਇਹ ਨੈੱਟਵਰਕ ਉੱਤੇ ਮੀਡਿਆ ਸਾਂਝਾ ਕਰੋ"
+ 
+-#: ../panels/sharing/sharing.ui.h:15
++#: ../panels/sharing/sharing.ui.h:13
+ msgid "Shared Folders"
+ msgstr "ਸਾਂਝੇ ਕੀਤੇ ਫੋਲਡਰ"
+ 
+-#: ../panels/sharing/sharing.ui.h:16
++#: ../panels/sharing/sharing.ui.h:14
+ msgid "column"
+ msgstr "ਕਾਲਮ"
+ 
+-#: ../panels/sharing/sharing.ui.h:17
++#: ../panels/sharing/sharing.ui.h:15
+ msgid "Add Folder"
+ msgstr "ਫੋਲਡਰ ਸ਼ਾਮਲ"
+ 
+-#: ../panels/sharing/sharing.ui.h:18
++#: ../panels/sharing/sharing.ui.h:16
+ msgid "Remove Folder"
+ msgstr "ਫੋਲਡਰ ਹਟਾਓ"
+ 
+-#: ../panels/sharing/sharing.ui.h:20
++#: ../panels/sharing/sharing.ui.h:18
+ #, no-c-format
+ msgid ""
+ "Personal File Sharing allows you to share your Public folder with others on "
+@@ -5215,15 +5142,15 @@ msgstr ""
+ "ਨੈੱਟਵਰਕ ਉੱਤੇ <a href="
+ "\"dav://%s\">dav://%s</a> ਦੀ ਵਰਤੋਂ ਨਾਲ ਸਾਂਝਾ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ"
+ 
+-#: ../panels/sharing/sharing.ui.h:21
++#: ../panels/sharing/sharing.ui.h:19
+ msgid "Share Public Folder On This Network"
+ msgstr "ਇਹ ਨੈੱਟਵਰਕ ਉੱਤੇ ਪਬਲਿਕ ਫੋਲਡਰ ਸਾਂਝਾ ਕਰੋ"
+ 
+-#: ../panels/sharing/sharing.ui.h:22
++#: ../panels/sharing/sharing.ui.h:20
+ msgid "Require Password"
+ msgstr "ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ"
+ 
+-#: ../panels/sharing/sharing.ui.h:25
++#: ../panels/sharing/sharing.ui.h:23
+ #, no-c-format
+ msgid ""
+ "Allow remote users to connect using the Secure Shell command:\n"
+@@ -5232,7 +5159,7 @@ msgstr ""
+ "ਰਿਮੋਟ ਯੂਜ਼ਰ ਨੂੰ ਸੁਰੱਖਿਅਤ ਸ਼ੈੱਲ ਕਮਾਂਡ ਰਾਹੀਂ ਕੁਨੈਕਟ ਹੋਣ ਦਿਉ:\n"
+ "<a href=\"ssh %s\">ssh %s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:28
++#: ../panels/sharing/sharing.ui.h:26
+ #, no-c-format
+ msgid ""
+ "Allow remote users to view or control your screen by connecting to: <a href="
+@@ -5242,19 +5169,19 @@ msgstr ""
+ "href=\"vnc://"
+ "%s\">vnc://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:29
++#: ../panels/sharing/sharing.ui.h:27
+ msgid "Remote View"
+ msgstr "ਰਿਮੋਟ ਝਲਕ"
+ 
+-#: ../panels/sharing/sharing.ui.h:30
++#: ../panels/sharing/sharing.ui.h:28
+ msgid "Remote Control"
+ msgstr "ਰਿਮੋਟ ਕੰਟਰੋਲ"
+ 
+-#: ../panels/sharing/sharing.ui.h:31
++#: ../panels/sharing/sharing.ui.h:29
+ msgid "Approve All Connections"
+ msgstr "ਸਭ ਕੁਨੈਕਸ਼ਨ ਮਨਜ਼ੂਰ"
+ 
+-#: ../panels/sharing/sharing.ui.h:32
++#: ../panels/sharing/sharing.ui.h:30
+ msgid "Show Password"
+ msgstr "ਪਾਸਵਰਡ ਵੇਖੋ"
+ 
+@@ -5948,7 +5875,7 @@ msgid "_Full Name"
+ msgstr "ਪੂਰਾ ਨਾਂ(_F)"
+ 
+ #: ../panels/user-accounts/data/account-dialog.ui.h:5
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+ msgid "Account _Type"
+ msgstr "ਅਕਾਊਂਟ ਕਿਸਮ(_T)"
+ 
+@@ -6104,69 +6031,35 @@ msgstr "ਮੌਜੂਦਾ ਪਾਸਵਰਡ(_P)"
+ msgid "Ch_ange"
+ msgstr "ਬਦਲੋ(_a)"
+ 
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:1
+-msgid "Changing photo for:"
+-msgstr "ਫੋਟੋ ਬਦਲੀ ਜਾ ਰਹੀ ਹੈ:"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
+-msgid ""
+-"Choose a picture that will be shown at the login screen for this account."
+-msgstr "ਤਸਵੀਰ ਚੁਣੋ, ਜੋ ਕਿ ਇਸ ਅਕਾਊਂਟ ਲਈ ਲਾਗਇਨ ਸਕਰੀਨ ਉੱਤੇ ਵੇਖਾਈ ਜਾਵੇਗੀ।"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
+-msgid "Gallery"
+-msgstr "ਗੈਲਰੀ"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:4
+-#: ../panels/user-accounts/um-photo-dialog.c:218
+-msgid "Browse for more pictures"
+-msgstr "ਹੋਰ ਤਸਵੀਰਾਂ ਵੇਖੋ"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:5
+-msgid "Take a photograph"
+-msgstr "ਫੋਟੋ ਲਵੋ"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:6
+-msgid "Browse"
+-msgstr "ਝਲਕ"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:7
+-msgid "Photograph"
+-msgstr "ਤਸਵੀਰ"
+-
+ #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+-msgid "Account Information"
+-msgstr "ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ"
+-
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Add User Account"
+ msgstr "ਯੂਜ਼ਰ ਅਕਾਊਂਟ ਸ਼ਾਮਲ"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Remove User Account"
+ msgstr "ਯੂਜ਼ਰ ਅਕਾਊਂਟ ਹਟਾਓ"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+ msgid "Login Options"
+ msgstr "ਲਾਗਇਨ ਚੋਣ"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+ msgid "A_utomatic Login"
+ msgstr "ਆਟੋਮੈਟਿਕ ਲਾਗਇਨ(_u)"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+ msgid "_Fingerprint Login"
+ msgstr "ਫਿੰਗਰਪਰਿੰਟ ਲਾਗਇਨ(_F)"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+ msgid "User Icon"
+ msgstr "ਯੂਜ਼ਰ ਆਈਕਾਨ"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+ msgid "_Language"
+ msgstr "ਭਾਸ਼ਾ(_L)"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+ msgid "Last Login"
+ msgstr "ਆਖਰੀ ਲਾਗਇਨ"
+ 
+@@ -6583,6 +6476,10 @@ msgstr "ਪਾਸਵਰਡ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ।"
+ msgid "The passwords do not match."
+ msgstr "ਪਾਸਵਰਡ ਮਿਲਦਾ ਨਹੀਂ ਹੈ।"
+ 
++#: ../panels/user-accounts/um-photo-dialog.c:218
++msgid "Browse for more pictures"
++msgstr "ਹੋਰ ਤਸਵੀਰਾਂ ਵੇਖੋ"
++
+ #: ../panels/user-accounts/um-photo-dialog.c:443
+ msgid "Disable image"
+ msgstr "ਚਿੱਤਰ ਹਟਾਓ"
+@@ -6785,7 +6682,7 @@ msgstr ""
+ "ਨਵੀਆਂ ਸਵਿੱਚਾਂ "
+ "ਲਈ ਹੋਲਡ ਕਰਕੇ ਰੱਖੋ ਜਾਂ ਬੈਕਸਪੇਸ ਸਾਫ਼ ਕਰਨ ਲਈ ਵਰਤੋਂ।"
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:82
++#: ../panels/wacom/calibrator/calibrator-gui.c:84
+ msgid ""
+ "Please tap the target markers as they appear on screen to calibrate the "
+ "tablet."
+@@ -6793,7 +6690,7 @@ msgstr ""
+ "ਟਾਰਗੇਟ ਮਾਰਕਰ ਲਈ ਟੈਪ ਕਰੋ ਜਿਵੇਂ ਕਿ ਉਹ ਸਕਰੀਨ ਉੱਤੇ ਟੇਬਲੇਟ ਨੂੰ ਕੈਲੀਬਰੇਟ ਕਰਨ ਲਈ "
+ "ਵੇਖਾਈ ਦਿੰਦਾ ਹੈ।"
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:86
++#: ../panels/wacom/calibrator/calibrator-gui.c:88
+ msgid "Mis-click detected, restarting..."
+ msgstr "ਮਿਸ-ਕਲਿੱਕ ਮਿਲਿਆ, ਮੁੜ-ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+ 
+@@ -6846,7 +6743,7 @@ msgstr "ਇੱਕਲੇ ਮਾਨੀਟਰ ਲਈ ਮੈਪ ਕਰੋ"
+ msgid "%d of %d"
+ msgstr "%2$d ਵਿੱਚੋਂ %1$d"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:522
++#: ../panels/wacom/cc-wacom-page.c:531
+ msgid "Display Mapping"
+ msgstr "ਡਿਸਪਲੇਅ ਮਿਲਾਨ"
+ 
+@@ -6981,22 +6878,22 @@ msgstr "ਸੱਜਾ ਟੱਚਸਟਰਿਪ ਮੋਡ ਬਦਲੋ"
+ msgid "Mode Switch #%d"
+ msgstr "ਮੋਡ ਬਦਲੋ #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1336
++#: ../panels/wacom/gsd-wacom-device.c:1335
+ #, c-format
+ msgid "Left Button #%d"
+ msgstr "ਖੱਬਾ ਬਟਨ #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1339
++#: ../panels/wacom/gsd-wacom-device.c:1338
+ #, c-format
+ msgid "Right Button #%d"
+ msgstr "ਸੱਜਾ ਬਟਨ #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1342
++#: ../panels/wacom/gsd-wacom-device.c:1341
+ #, c-format
+ msgid "Top Button #%d"
+ msgstr "ਟਾਪ ਬਟਨ #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1345
++#: ../panels/wacom/gsd-wacom-device.c:1344
+ #, c-format
+ msgid "Bottom Button #%d"
+ msgstr "ਤਲ ਬਟਨ #%d"
+@@ -7102,11 +6999,11 @@ msgstr "ਵੇਖਾਉਣ ਲਈ ਪੈਨਲ"
+ msgid "[PANEL] [ARGUMENT…]"
+ msgstr "[PANEL] [ARGUMENT…]"
+ 
+-#: ../shell/cc-application.c:142
++#: ../shell/cc-application.c:145
+ msgid "- Settings"
+ msgstr "- ਸੈਟਿੰਗ"
+ 
+-#: ../shell/cc-application.c:160
++#: ../shell/cc-application.c:163
+ #, c-format
+ msgid ""
+ "%s\n"
+@@ -7115,39 +7012,39 @@ msgstr ""
+ "%s\n"
+ "Run '%s --help' to see a full list of available command line options.\n"
+ 
+-#: ../shell/cc-application.c:190
++#: ../shell/cc-application.c:193
+ msgid "Available panels:"
+ msgstr "ਉਪਲੱਬਧ ਪੈਨਲ:"
+ 
+-#: ../shell/cc-application.c:325
++#: ../shell/cc-application.c:328
+ msgid "Help"
+ msgstr "ਮੱਦਦ"
+ 
+-#: ../shell/cc-application.c:326
++#: ../shell/cc-application.c:329
+ msgid "Quit"
+ msgstr "ਬਾਹਰ"
+ 
+-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1479
++#: ../shell/cc-window.c:61 ../shell/cc-window.c:1486
+ msgid "All Settings"
+ msgstr "ਸਭ ਸੈਟਿੰਗ"
+ 
+ #. Add categories
+-#: ../shell/cc-window.c:866
++#: ../shell/cc-window.c:868
+ msgctxt "category"
+ msgid "Personal"
+ msgstr "ਨਿੱਜੀ"
+ 
+-#: ../shell/cc-window.c:867
++#: ../shell/cc-window.c:869
+ msgctxt "category"
+ msgid "Hardware"
+ msgstr "ਹਾਰਡਵੇਅਰ"
+ 
+-#: ../shell/cc-window.c:868
++#: ../shell/cc-window.c:870
+ msgctxt "category"
+ msgid "System"
+ msgstr "ਸਿਸਟਮ"
+ 
+-#: ../shell/cc-window.c:1588 ../shell/gnome-control-center.desktop.in.in.h:1
++#: ../shell/cc-window.c:1597 ../shell/gnome-control-center.desktop.in.in.h:1
+ msgid "Settings"
+ msgstr "ਸੈਟਿੰਗ"
+ 
+@@ -7155,6 +7052,75 @@ msgstr "ਸੈਟਿੰਗ"
+ msgid "Preferences;Settings;"
+ msgstr "ਮੇਰੀ ਪਸੰਦ;ਸੈਟਿੰਗ;"
+ 
++#~ msgid "Device type:"
++#~ msgstr "ਜੰਤਰ ਕਿਸਮ:"
++
++#~ msgid "Manufacturer:"
++#~ msgstr "ਨਿਰਮਾਤਾ:"
++
++#~ msgid "Model:"
++#~ msgstr "ਮਾਡਲ:"
++
++#~ msgid ""
++#~ "Image files can be dragged on this window to auto-complete the above "
++#~ "fields."
++#~ msgstr "ਉੱਤੇ ਦਿੱਤੇ ਖੇਤਰ ਆਟੋਮੈਟਿਕ ਭਰਨ ਲਈ ਚਿੱਤਰ ਫਾਇਲਾਂ ਨੂੰ ਇਸ ਵਿੰਡੋ ਉੱਤੇ ਸੁੱਟਿਆ ਜਾ ਸਕਦਾ ਹੈ।"
++
++#~ msgid "Show your primary display on this screen also"
++#~ msgstr "ਆਪਣੇ ਪ੍ਰਾਇਮਰੀ ਡਿਸਪਲੇਅ ਨੂੰ ਇਸ ਸਕਰੀਨ ਉੱਤੇ ਵੀ ਵੇਖਾਓ"
++
++#~ msgid "Combine"
++#~ msgstr "ਜੋੜੋ"
++
++#~ msgid "Join with the primary display to create an extra space"
++#~ msgstr "ਵਾਧੂ ਥਾਂ ਬਣਾਉਣ ਲਈ ਪ੍ਰਾਇਮਰੀ ਡਿਸਪਲੇਅ ਨਾਲ ਜੋੜੋ"
++
++#~ msgid "Don't use the display"
++#~ msgstr "ਡਿਸਪਲੇਅ ਵਰਤਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
++
++#~ msgid "Refresh Rate"
++#~ msgstr "ਤਾਜ਼ਾ ਕਰਨ ਦਰ"
++
++#~ msgid "Mouse Preferences"
++#~ msgstr "ਮਾਊਸ ਪਸੰਦ"
++
++#~ msgid "Select the interface to use for the new service"
++#~ msgstr "ਨਵੀਂ ਸਰਵਿਸ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਇੰਟਰਫੇਸ ਚੁਣੋ"
++
++#~ msgid "C_reate…"
++#~ msgstr "…ਬਣਾਓ(_r)"
++
++#~ msgid "_Interface"
++#~ msgstr "ਇੰਟਰਫੇਸ(_i)"
++
++#~ msgid "Share Public Folder"
++#~ msgstr "ਪਬਲਿਕ ਫੋਲਡਰ ਸਾਂਝਾ ਕਰੋ"
++
++#~ msgid "Only share with Trusted Devices"
++#~ msgstr "ਟਰਸਟ ਕੀਤੇ ਜੰਤਰਾਂ ਨਾਲ ਹੀ ਸਾਂਝਾ ਕਰੋ"
++
++#~ msgid "Changing photo for:"
++#~ msgstr "ਫੋਟੋ ਬਦਲੀ ਜਾ ਰਹੀ ਹੈ:"
++
++#~ msgid ""
++#~ "Choose a picture that will be shown at the login screen for this account."
++#~ msgstr "ਤਸਵੀਰ ਚੁਣੋ, ਜੋ ਕਿ ਇਸ ਅਕਾਊਂਟ ਲਈ ਲਾਗਇਨ ਸਕਰੀਨ ਉੱਤੇ ਵੇਖਾਈ ਜਾਵੇਗੀ।"
++
++#~ msgid "Gallery"
++#~ msgstr "ਗੈਲਰੀ"
++
++#~ msgid "Take a photograph"
++#~ msgstr "ਫੋਟੋ ਲਵੋ"
++
++#~ msgid "Browse"
++#~ msgstr "ਝਲਕ"
++
++#~ msgid "Photograph"
++#~ msgstr "ਤਸਵੀਰ"
++
++#~ msgid "Account Information"
++#~ msgstr "ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ"
++
+ #~ msgid "Estimated battery capacity: %s"
+ #~ msgstr "ਅੰਦਾਜ਼ਨ ਬੈਟਰੀ ਸਮੱਰਥਾ: %s"
+ 
+diff --git a/po/pl.po b/po/pl.po
+index 58c42e2..2f64a48 100644
+--- a/po/pl.po
++++ b/po/pl.po
+@@ -8,15 +8,15 @@
+ # Artur Flinta <aflinta@at.kernel.pl>, 2003-2007.
+ # Tomasz Dominikowski <dominikowski@gmail.com>, 2007-2009.
+ # Wadim Dziedzic <wdziedzic@aviary.pl>, 2007.
+-# Piotr Drąg <piotrdrag@gmail.com>, 2009-2013.
++# Piotr Drąg <piotrdrag@gmail.com>, 2009-2014.
+ # Wojciech Szczęsny <wszczesny@aviary.pl>, 2013.
+-# Aviary.pl <gnomepl@aviary.pl>, 2007-2013.
++# Aviary.pl <gnomepl@aviary.pl>, 2007-2014.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-control-center\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2013-09-21 18:44+0200\n"
+-"PO-Revision-Date: 2013-09-21 18:45+0200\n"
++"POT-Creation-Date: 2014-01-15 00:43+0100\n"
++"PO-Revision-Date: 2014-01-15 00:44+0100\n"
+ "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
+ "Language-Team: Polish <gnomepl@aviary.pl>\n"
+ "Language: pl\n"
+@@ -73,7 +73,7 @@ msgid "Span"
+ msgstr "Rozdzielenie"
+ 
+ #. translators: This is the title of the wallpaper chooser dialog.
+-#: ../panels/background/cc-background-chooser-dialog.c:293
++#: ../panels/background/cc-background-chooser-dialog.c:292
+ msgid "Select Background"
+ msgstr "Wybór tła"
+ 
+@@ -94,32 +94,32 @@ msgid "Flickr"
+ msgstr "Flickr"
+ 
+ #. translators: No pictures were found
+-#: ../panels/background/cc-background-chooser-dialog.c:393
++#: ../panels/background/cc-background-chooser-dialog.c:385
+ msgid "No Pictures Found"
+ msgstr "Nie odnaleziono żadnych obrazów"
+ 
+ #. translators: %s here is the name of the Pictures directory, the string should be translated in
+ #. * the context "You can add images to your Pictures folder and they will show up here"
+-#: ../panels/background/cc-background-chooser-dialog.c:408
++#: ../panels/background/cc-background-chooser-dialog.c:400
+ #, c-format
+ msgid "You can add images to your %s folder and they will show up here"
+ msgstr "Po dodaniu obrazów do katalogu %s pojawią się one w tym miejscu"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:436
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:631
+-#: ../panels/color/cc-color-panel.c:220 ../panels/color/cc-color-panel.c:967
+-#: ../panels/display/cc-display-panel.c:1495
+-#: ../panels/display/cc-display-panel.c:1910
++#: ../panels/background/cc-background-chooser-dialog.c:429
++#: ../panels/bluetooth/cc-bluetooth-panel.c:640
++#: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
++#: ../panels/display/cc-display-panel.c:1510
++#: ../panels/display/cc-display-panel.c:1952
+ #: ../panels/network/connection-editor/vpn-helpers.c:245
+ #: ../panels/network/connection-editor/vpn-helpers.c:374
+-#: ../panels/network/net-device-wifi.c:1201
+-#: ../panels/network/net-device-wifi.c:1407
++#: ../panels/network/net-device-wifi.c:1194
++#: ../panels/network/net-device-wifi.c:1402
+ #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
+ #: ../panels/printers/cc-printers-panel.c:1946
+ #: ../panels/printers/new-printer-dialog.ui.h:2
+-#: ../panels/privacy/cc-privacy-panel.c:467
++#: ../panels/privacy/cc-privacy-panel.c:470
+ #: ../panels/search/cc-search-locations-dialog.c:682
+-#: ../panels/sharing/cc-sharing-panel.c:421
++#: ../panels/sharing/cc-sharing-panel.c:425
+ #: ../panels/user-accounts/um-fingerprint-dialog.c:269
+ #: ../panels/user-accounts/um-photo-dialog.c:96
+ #: ../panels/user-accounts/um-photo-dialog.c:221
+@@ -127,9 +127,8 @@ msgstr "Po dodaniu obrazów do katalogu %s pojawią się one w tym miejscu"
+ msgid "_Cancel"
+ msgstr "_Anuluj"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:437
++#: ../panels/background/cc-background-chooser-dialog.c:430
+ #: ../panels/printers/ppd-selection-dialog.ui.h:3
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:9
+ #: ../panels/user-accounts/um-photo-dialog.c:98
+ msgid "Select"
+ msgstr "Wybierz"
+@@ -149,7 +148,7 @@ msgstr "%d × %d"
+ msgid "No Desktop Background"
+ msgstr "Bez tła pulpitu"
+ 
+-#: ../panels/background/cc-background-panel.c:492
++#: ../panels/background/cc-background-panel.c:493
+ msgid "Current background"
+ msgstr "Obecne tło"
+ 
+@@ -166,7 +165,7 @@ msgstr "Tapeta;Ekran;Pulpit;"
+ msgid "Set Up New Device"
+ msgstr "Ustaw nowe urządzenie"
+ 
+-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
++#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
+ msgid "Remove Device"
+ msgstr "Usuń urządzenie"
+ 
+@@ -220,50 +219,50 @@ msgstr "Ustawienia klawiatury"
+ msgid "Send Files…"
+ msgstr "Wyślij pliki…"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
+ msgid "Yes"
+ msgstr "Tak"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
+ msgid "No"
+ msgstr "Nie"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:470
++#: ../panels/bluetooth/cc-bluetooth-panel.c:479
+ msgid "Bluetooth is disabled"
+ msgstr "Bluetooth jest wyłączony"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:475
++#: ../panels/bluetooth/cc-bluetooth-panel.c:484
+ msgid "Bluetooth is disabled by hardware switch"
+ msgstr "Bluetooth został wyłączony przełącznikiem sprzętowym"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:479
++#: ../panels/bluetooth/cc-bluetooth-panel.c:488
+ msgid "No Bluetooth adapters found"
+ msgstr "Nie odnaleziono adapterów Bluetooth"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:578
++#: ../panels/bluetooth/cc-bluetooth-panel.c:587
+ msgid "Visibility"
+ msgstr "Widoczność"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:582
++#: ../panels/bluetooth/cc-bluetooth-panel.c:591
+ #, c-format
+ msgid "Visibility of “%s”"
+ msgstr "Widoczność \"%s\""
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:626
++#: ../panels/bluetooth/cc-bluetooth-panel.c:635
+ #, c-format
+ msgid "Remove '%s' from the list of devices?"
+ msgstr "Usunąć \"%s\" z listy urządzeń?"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:628
++#: ../panels/bluetooth/cc-bluetooth-panel.c:637
+ msgid ""
+ "If you remove the device, you will have to set it up again before next use."
+ msgstr ""
+ "Usunięcie urządzenia spowoduje konieczność jego ponownej konfiguracji przed "
+ "kolejnym użyciem."
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:632
++#: ../panels/bluetooth/cc-bluetooth-panel.c:641
+ #: ../panels/online-accounts/cc-online-accounts-panel.c:844
+ msgid "_Remove"
+ msgstr "_Usuń"
+@@ -277,7 +276,7 @@ msgid "Turn Bluetooth on and off and connect your devices"
+ msgstr "Włączanie Bluetooth i łączenie z urządzeniami"
+ 
+ #. TRANSLATORS: The user has to attach the sensor to the screen
+-#: ../panels/color/cc-color-calibrate.c:360
++#: ../panels/color/cc-color-calibrate.c:361
+ msgid "Place your calibration device over the square and press 'Start'"
+ msgstr ""
+ "Proszę umieścić urządzenie na kwadracie i nacisnąć przycisk \"Rozpocznij\""
+@@ -285,7 +284,7 @@ msgstr ""
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:366
++#: ../panels/color/cc-color-calibrate.c:367
+ msgid ""
+ "Move your calibration device to the calibrate position and press 'Continue'"
+ msgstr ""
+@@ -295,7 +294,7 @@ msgstr ""
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:372
++#: ../panels/color/cc-color-calibrate.c:373
+ msgid ""
+ "Move your calibration device to the surface position and press 'Continue'"
+ msgstr ""
+@@ -305,54 +304,54 @@ msgstr ""
+ #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
+ #. * is built into the palmrest and we need to fullscreen the
+ #. * sample widget and shut the lid.
+-#: ../panels/color/cc-color-calibrate.c:378
++#: ../panels/color/cc-color-calibrate.c:379
+ msgid "Shut the laptop lid"
+ msgstr "Proszę zamknąć pokrywę laptopa"
+ 
+ #. TRANSLATORS: We suck, the calibation failed and we have no
+ #. * good idea why or any suggestions
+-#: ../panels/color/cc-color-calibrate.c:409
++#: ../panels/color/cc-color-calibrate.c:410
+ msgid "An internal error occurred that could not be recovered."
+ msgstr "Wystąpił wewnętrzny błąd, z którego nie można przywrócić."
+ 
+ #. TRANSLATORS: Some required-at-runtime tools were not
+ #. * installed, which should only affect insane distros
+-#: ../panels/color/cc-color-calibrate.c:414
++#: ../panels/color/cc-color-calibrate.c:415
+ msgid "Tools required for calibration are not installed."
+ msgstr "Narzędzia wymagane do kalibracji nie są zainstalowane."
+ 
+ #. TRANSLATORS: The profile failed for some reason
+-#: ../panels/color/cc-color-calibrate.c:420
++#: ../panels/color/cc-color-calibrate.c:421
+ msgid "The profile could not be generated."
+ msgstr "Nie można utworzyć profilu."
+ 
+ #. TRANSLATORS: The user specified a whitepoint that was
+ #. * unobtainable with the hardware they've got -- see
+ #. * https://en.wikipedia.org/wiki/White_point for details
+-#: ../panels/color/cc-color-calibrate.c:426
++#: ../panels/color/cc-color-calibrate.c:427
+ msgid "The target whitepoint was not obtainable."
+ msgstr "Nie można uzyskać docelowego punktu bieli."
+ 
+ #. TRANSLATORS: the display calibration process is finished
+-#: ../panels/color/cc-color-calibrate.c:466
++#: ../panels/color/cc-color-calibrate.c:467
+ msgid "Complete!"
+ msgstr "Ukończono"
+ 
+ #. TRANSLATORS: the display calibration failed, and we also show
+ #. * the translated (or untranslated) error string after this
+-#: ../panels/color/cc-color-calibrate.c:474
++#: ../panels/color/cc-color-calibrate.c:475
+ msgid "Calibration failed!"
+ msgstr "Kalibracja się nie powiodła"
+ 
+ #. TRANSLATORS: The user can now remove the sensor from the screen
+-#: ../panels/color/cc-color-calibrate.c:481
++#: ../panels/color/cc-color-calibrate.c:482
+ msgid "You can remove the calibration device."
+ msgstr "Można usunąć urządzenie kalibracji."
+ 
+ #. TRANSLATORS: The user has to be careful not to knock the
+ #. * display off the screen (although we do cope if this is
+ #. * detected early enough)
+-#: ../panels/color/cc-color-calibrate.c:552
++#: ../panels/color/cc-color-calibrate.c:553
+ msgid "Do not disturb the calibration device while in progress"
+ msgstr "Nie należy usuwać urządzenia podczas trwania kalibracji"
+ 
+@@ -414,48 +413,48 @@ msgstr "Nieskalibrowane"
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile has been auto-generated for this hardware
+-#: ../panels/color/cc-color-panel.c:135
++#: ../panels/color/cc-color-panel.c:137
+ msgid "Default: "
+ msgstr "Domyślny: "
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile his a standard space like AdobeRGB
+-#: ../panels/color/cc-color-panel.c:143
++#: ../panels/color/cc-color-panel.c:145
+ msgid "Colorspace: "
+ msgstr "Przestrzeń kolorów: "
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile is a test profile
+-#: ../panels/color/cc-color-panel.c:150
++#: ../panels/color/cc-color-panel.c:152
+ msgid "Test profile: "
+ msgstr "Profil testowy: "
+ 
+ #. TRANSLATORS: an ICC profile is a file containing colorspace data
+-#: ../panels/color/cc-color-panel.c:218
++#: ../panels/color/cc-color-panel.c:219
+ msgid "Select ICC Profile File"
+ msgstr "Wybór pliku profilu ICC"
+ 
+-#: ../panels/color/cc-color-panel.c:221
++#: ../panels/color/cc-color-panel.c:222
+ msgid "_Import"
+ msgstr "Zai_mportuj"
+ 
+ #. TRANSLATORS: filter name on the file->open dialog
+-#: ../panels/color/cc-color-panel.c:232
++#: ../panels/color/cc-color-panel.c:233
+ msgid "Supported ICC profiles"
+ msgstr "Obsługiwane profile ICC"
+ 
+ #. TRANSLATORS: filter name on the file->open dialog
+-#: ../panels/color/cc-color-panel.c:239
++#: ../panels/color/cc-color-panel.c:240
+ #: ../panels/network/wireless-security/eap-method-fast.c:410
+ msgid "All files"
+ msgstr "Wszystkie pliki"
+ 
+-#: ../panels/color/cc-color-panel.c:586
++#: ../panels/color/cc-color-panel.c:579
+ msgid "Screen"
+ msgstr "Ekran"
+ 
+ #. TRANSLATORS: this is when the upload of the profile failed
+-#: ../panels/color/cc-color-panel.c:912
++#: ../panels/color/cc-color-panel.c:903
+ #, c-format
+ msgid "Failed to upload file: %s"
+ msgstr "Wysłanie pliku się nie powiodło: %s"
+@@ -463,42 +462,42 @@ msgstr "Wysłanie pliku się nie powiodło: %s"
+ #. TRANSLATORS: these are instructions on how to recover
+ #. * the ICC profile on the native operating system and are
+ #. * only shown when the user uses a LiveCD to calibrate
+-#: ../panels/color/cc-color-panel.c:926
++#: ../panels/color/cc-color-panel.c:917
+ msgid "The profile has been uploaded to:"
+ msgstr "Profil został wysłany do:"
+ 
+-#: ../panels/color/cc-color-panel.c:928
++#: ../panels/color/cc-color-panel.c:919
+ msgid "Write down this URL."
+ msgstr "Proszę zapisać ten adres URL."
+ 
+-#: ../panels/color/cc-color-panel.c:929
++#: ../panels/color/cc-color-panel.c:920
+ msgid "Restart this computer and boot your normal operating system."
+ msgstr ""
+ "Proszę ponownie uruchomić komputer i uruchomić normalny system operacyjny."
+ 
+-#: ../panels/color/cc-color-panel.c:930
++#: ../panels/color/cc-color-panel.c:921
+ msgid "Type the URL into your browser to download and install the profile."
+ msgstr ""
+ "Wpisanie tego adresu URL w przeglądarce spowoduje pobranie i instalację "
+ "profilu."
+ 
+ #. TRANSLATORS: this is the dialog to save the ICC profile
+-#: ../panels/color/cc-color-panel.c:964
++#: ../panels/color/cc-color-panel.c:955
+ msgid "Save Profile"
+ msgstr "Zapis profilu"
+ 
+-#: ../panels/color/cc-color-panel.c:968
++#: ../panels/color/cc-color-panel.c:959
+ #: ../panels/network/connection-editor/vpn-helpers.c:375
+ msgid "_Save"
+ msgstr "_Zapisz"
+ 
+ #. TRANSLATORS: this is when the button is sensitive
+-#: ../panels/color/cc-color-panel.c:1328
++#: ../panels/color/cc-color-panel.c:1315
+ msgid "Create a color profile for the selected device"
+ msgstr "Tworzy profil kolorów dla wybranego urządzenia"
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1343 ../panels/color/cc-color-panel.c:1367
++#: ../panels/color/cc-color-panel.c:1330 ../panels/color/cc-color-panel.c:1354
+ msgid ""
+ "The measuring instrument is not detected. Please check it is turned on and "
+ "correctly connected."
+@@ -507,12 +506,12 @@ msgstr ""
+ "poprawnie podłączone."
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1377
++#: ../panels/color/cc-color-panel.c:1364
+ msgid "The measuring instrument does not support printer profiling."
+ msgstr "Urządzenie pomiarowe nie obsługuje profilowania drukarek."
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1388
++#: ../panels/color/cc-color-panel.c:1375
+ msgid "The device type is not currently supported."
+ msgstr "Typ urządzenia nie jest obecnie obsługiwany."
+ 
+@@ -599,7 +598,6 @@ msgstr "Kalibracja ekranu"
+ #: ../panels/color/color-calibrate.ui.h:2
+ #: ../panels/printers/authentication-dialog.ui.h:2
+ #: ../panels/printers/ppd-selection-dialog.ui.h:2
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:8
+ #: ../panels/user-accounts/um-account-dialog.c:1470
+ msgid "Cancel"
+ msgstr "Anuluj"
+@@ -620,10 +618,10 @@ msgid "Done"
+ msgstr "Gotowe"
+ 
+ #. Timeout parameters
+-#. 5000 = 5 sec
++#. 15000 = 15 sec
+ #. 750 = 0.75 sec
+ #. Text printed on screen
+-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
++#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:83
+ msgid "Screen Calibration"
+ msgstr "Kalibracja ekranu"
+ 
+@@ -767,168 +765,148 @@ msgstr ""
+ "szczegóły.</a>"
+ 
+ #: ../panels/color/color.ui.h:30
+-msgid "Device type:"
+-msgstr "Typ urządzenia:"
+-
+-#: ../panels/color/color.ui.h:31
+-msgid "Manufacturer:"
+-msgstr "Producent:"
+-
+-#: ../panels/color/color.ui.h:32
+-msgid "Model:"
+-msgstr "Model:"
+-
+-#: ../panels/color/color.ui.h:33
+-msgid ""
+-"Image files can be dragged on this window to auto-complete the above fields."
+-msgstr ""
+-"Pliki obrazów mogą zostać przeniesione do tego okna, aby automatycznie "
+-"uzupełnić powyższe pola."
+-
+-#: ../panels/color/color.ui.h:34
+-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+-msgid "Color"
+-msgstr "Kolor"
+-
+-#: ../panels/color/color.ui.h:35
+ msgid "Each device needs an up to date color profile to be color managed."
+ msgstr ""
+ "Każde urządzenie wymaga aktualnego profilu kolorów, aby podlegać zarządzaniu "
+ "kolorami."
+ 
+-#: ../panels/color/color.ui.h:36
++#: ../panels/color/color.ui.h:31
+ msgid "Learn more"
+ msgstr "Dowiedz się więcej"
+ 
+-#: ../panels/color/color.ui.h:37
++#: ../panels/color/color.ui.h:32
+ msgid "Learn more about color management"
+ msgstr "Więcej informacji o zarządzaniu kolorami"
+ 
+-#: ../panels/color/color.ui.h:38
++#: ../panels/color/color.ui.h:33
+ msgid "Set for all users"
+ msgstr "Ustaw dla wszystkich użytkowników"
+ 
+-#: ../panels/color/color.ui.h:39
++#: ../panels/color/color.ui.h:34
+ msgid "Set this profile for all users on this computer"
+ msgstr "Ustawia ten profil dla wszystkich użytkowników tego komputera"
+ 
+-#: ../panels/color/color.ui.h:40
++#: ../panels/color/color.ui.h:35
+ msgid "Enable"
+ msgstr "Włącz"
+ 
+-#: ../panels/color/color.ui.h:41
++#: ../panels/color/color.ui.h:36
+ msgid "Add profile"
+ msgstr "Dodaj profil"
+ 
+-#: ../panels/color/color.ui.h:42
++#: ../panels/color/color.ui.h:37
+ #: ../panels/wacom/gnome-wacom-properties.ui.h:10
+ msgid "Calibrate…"
+ msgstr "Skalibruj…"
+ 
+-#: ../panels/color/color.ui.h:43
++#: ../panels/color/color.ui.h:38
+ msgid "Calibrate the device"
+ msgstr "Kalibruje urządzenie"
+ 
+-#: ../panels/color/color.ui.h:44
++#: ../panels/color/color.ui.h:39
+ msgid "Remove profile"
+ msgstr "Usuń profil"
+ 
+-#: ../panels/color/color.ui.h:45
++#: ../panels/color/color.ui.h:40
+ msgid "View details"
+ msgstr "Wyświetl szczegóły"
+ 
+-#: ../panels/color/color.ui.h:46
++#: ../panels/color/color.ui.h:41
+ msgid "Unable to detect any devices that can be color managed"
+ msgstr "Nie można wykryć urządzeń, które mogą korzystać z zarządzania kolorami"
+ 
+-#: ../panels/color/color.ui.h:47
++#: ../panels/color/color.ui.h:42
+ msgid "LCD"
+ msgstr "LCD"
+ 
+-#: ../panels/color/color.ui.h:48
++#: ../panels/color/color.ui.h:43
+ msgid "LED"
+ msgstr "LED"
+ 
+-#: ../panels/color/color.ui.h:49
++#: ../panels/color/color.ui.h:44
+ msgid "CRT"
+ msgstr "CRT"
+ 
+-#: ../panels/color/color.ui.h:50
++#: ../panels/color/color.ui.h:45
+ msgid "Projector"
+ msgstr "Projektor"
+ 
+-#: ../panels/color/color.ui.h:51
++#: ../panels/color/color.ui.h:46
+ msgid "Plasma"
+ msgstr "Ekran plazmowy"
+ 
+-#: ../panels/color/color.ui.h:52
++#: ../panels/color/color.ui.h:47
+ msgid "LCD (CCFL backlight)"
+ msgstr "LCD (podświetlanie CCFL)"
+ 
+-#: ../panels/color/color.ui.h:53
++#: ../panels/color/color.ui.h:48
+ msgid "LCD (RGB LED backlight)"
+ msgstr "LCD (podświetlanie RGB LED)"
+ 
+-#: ../panels/color/color.ui.h:54
++#: ../panels/color/color.ui.h:49
+ msgid "LCD (white LED backlight)"
+ msgstr "LCD (białe podświetlanie LED)"
+ 
+-#: ../panels/color/color.ui.h:55
++#: ../panels/color/color.ui.h:50
+ msgid "Wide gamut LCD (CCFL backlight)"
+ msgstr "LCD o szerokim gamucie (podświetlanie CCFL)"
+ 
+-#: ../panels/color/color.ui.h:56
++#: ../panels/color/color.ui.h:51
+ msgid "Wide gamut LCD (RGB LED backlight)"
+ msgstr "LCD o szerokim gamucie (podświetlanie RGB LED)"
+ 
+-#: ../panels/color/color.ui.h:57
++#: ../panels/color/color.ui.h:52
+ msgctxt "Calibration quality"
+ msgid "High"
+ msgstr "Wysoka"
+ 
+-#: ../panels/color/color.ui.h:58
++#: ../panels/color/color.ui.h:53
+ msgid "40 minutes"
+ msgstr "40 minut"
+ 
+-#: ../panels/color/color.ui.h:59
++#: ../panels/color/color.ui.h:54
+ msgctxt "Calibration quality"
+ msgid "Medium"
+ msgstr "Średnia"
+ 
+-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:4
++#: ../panels/color/color.ui.h:55 ../panels/power/power.ui.h:4
+ #: ../panels/privacy/privacy.ui.h:7
+ msgid "30 minutes"
+ msgstr "30 minut"
+ 
+-#: ../panels/color/color.ui.h:61
++#: ../panels/color/color.ui.h:56
+ msgctxt "Calibration quality"
+ msgid "Low"
+ msgstr "Niska"
+ 
+-#: ../panels/color/color.ui.h:62 ../panels/power/power.ui.h:3
++#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:3
+ msgid "15 minutes"
+ msgstr "15 minut"
+ 
+-#: ../panels/color/color.ui.h:63
++#: ../panels/color/color.ui.h:58
+ msgid "Native to display"
+ msgstr "Natywna wartość dla ekranu"
+ 
+-#: ../panels/color/color.ui.h:64
++#: ../panels/color/color.ui.h:59
+ msgid "D50 (Printing and publishing)"
+ msgstr "D50 (drukowanie i publikowanie)"
+ 
+-#: ../panels/color/color.ui.h:65
++#: ../panels/color/color.ui.h:60
+ msgid "D55"
+ msgstr "D55"
+ 
+-#: ../panels/color/color.ui.h:66
++#: ../panels/color/color.ui.h:61
+ msgid "D65 (Photography and graphics)"
+ msgstr "D65 (fotografia i grafika)"
+ 
+-#: ../panels/color/color.ui.h:67
++#: ../panels/color/color.ui.h:62
+ msgid "D75"
+ msgstr "D75"
+ 
++#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
++msgid "Color"
++msgstr "Kolor"
++
+ #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+ msgid ""
+ "Calibrate the color of your devices, such as displays, cameras or printers"
+@@ -980,33 +958,33 @@ msgid "Language"
+ msgstr "Język"
+ 
+ #: ../panels/common/language-chooser.ui.h:2
+-#: ../panels/mouse/cc-mouse-panel.c:120 ../panels/region/format-chooser.ui.h:2
++#: ../panels/mouse/cc-mouse-panel.c:111 ../panels/region/format-chooser.ui.h:2
+ msgid "_Done"
+ msgstr "_Gotowe"
+ 
+ #. Translators: This is the full date and time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:352
++#: ../panels/datetime/cc-datetime-panel.c:363
+ msgid "%e %B %Y, %l:%M %p"
+ msgstr "%e %B %Y, %l∶%M %p"
+ 
+ #. Translators: This is the full date and time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:357
++#: ../panels/datetime/cc-datetime-panel.c:368
+ msgid "%e %B %Y, %R"
+ msgstr "%e %B %Y, %H∶%M"
+ 
+ #. Translators: UTC here means the Coordinated Universal Time.
+ #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
+-#: ../panels/datetime/cc-datetime-panel.c:573
++#: ../panels/datetime/cc-datetime-panel.c:584
+ msgid "UTC%:::z"
+ msgstr "UTC%:::z"
+ 
+ #. Translators: This is the time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:578
++#: ../panels/datetime/cc-datetime-panel.c:589
+ msgid "%l:%M %p"
+ msgstr "%l∶%M %p"
+ 
+ #. Translators: This is the time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:583
++#: ../panels/datetime/cc-datetime-panel.c:594
+ msgid "%R"
+ msgstr "%H∶%M"
+ 
+@@ -1145,146 +1123,110 @@ msgstr "Zmiana ustawień czasu i daty systemu"
+ msgid "To change time or date settings, you need to authenticate."
+ msgstr "Wymagane jest uwierzytelnienie, aby zmienić ustawienia czasu lub daty."
+ 
+-#: ../panels/display/cc-display-panel.c:473
++#: ../panels/display/cc-display-panel.c:486
+ msgid "Lid Closed"
+ msgstr "Zamknięto pokrywę"
+ 
+ #. translators: "Mirrored" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:476
++#: ../panels/display/cc-display-panel.c:489
+ msgid "Mirrored"
+ msgstr "Ten sam obraz na wszystkich ekranach"
+ 
+-#: ../panels/display/cc-display-panel.c:478
+-#: ../panels/display/cc-display-panel.c:2043
+-#: ../panels/display/display-capplet.ui.h:1
++#: ../panels/display/cc-display-panel.c:491
++#: ../panels/display/cc-display-panel.c:2101
+ msgid "Primary"
+ msgstr "Podstawowy"
+ 
+-#: ../panels/display/cc-display-panel.c:480
++#: ../panels/display/cc-display-panel.c:493
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1727 ../panels/power/cc-power-panel.c:1738
+-#: ../panels/privacy/cc-privacy-panel.c:77
+-#: ../panels/privacy/cc-privacy-panel.c:117
+-#: ../panels/universal-access/cc-ua-panel.c:253
+-#: ../panels/universal-access/cc-ua-panel.c:610
+-#: ../panels/universal-access/cc-ua-panel.c:736
++#: ../panels/power/cc-power-panel.c:1738 ../panels/power/cc-power-panel.c:1749
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ #: ../panels/universal-access/uap.ui.h:6
+ msgid "Off"
+ msgstr "Wyłączone"
+ 
+-#: ../panels/display/cc-display-panel.c:483
++#: ../panels/display/cc-display-panel.c:496
+ msgid "Secondary"
+ msgstr "Dodatkowy"
+ 
+-#: ../panels/display/cc-display-panel.c:1491
++#: ../panels/display/cc-display-panel.c:1506
+ msgid "Arrange Combined Displays"
+ msgstr "Zmiana położenia połączonych ekranów"
+ 
+-#: ../panels/display/cc-display-panel.c:1497
+-#: ../panels/display/cc-display-panel.c:1913
++#: ../panels/display/cc-display-panel.c:1512
++#: ../panels/display/cc-display-panel.c:1955
+ #: ../panels/network/connection-editor/connection-editor.ui.h:1
+ msgid "_Apply"
+ msgstr "_Zastosuj"
+ 
+-#: ../panels/display/cc-display-panel.c:1518
++#: ../panels/display/cc-display-panel.c:1533
+ msgid "Drag displays to rearrange them"
+ msgstr "Przeciąganie zmienia położenie"
+ 
+-#. size
+-#: ../panels/display/cc-display-panel.c:1977
++#: ../panels/display/cc-display-panel.c:2037
+ msgid "Size"
+ msgstr "Rozmiar"
+ 
+ #. aspect ratio
+-#: ../panels/display/cc-display-panel.c:1992
+-#: ../panels/display/display-capplet.ui.h:12
++#: ../panels/display/cc-display-panel.c:2050
+ msgid "Aspect Ratio"
+ msgstr "Proporcje"
+ 
+-#: ../panels/display/cc-display-panel.c:2013
+-#: ../panels/display/display-capplet.ui.h:13
++#: ../panels/display/cc-display-panel.c:2071
+ #: ../panels/printers/pp-options-dialog.c:86
+ msgid "Resolution"
+ msgstr "Rozdzielczość"
+ 
+-#: ../panels/display/cc-display-panel.c:2044
+-#: ../panels/display/display-capplet.ui.h:2
++#: ../panels/display/cc-display-panel.c:2102
+ msgid "Show the top bar and Activities Overview on this display"
+ msgstr "Wyświetlanie górnego paska i ekranu podglądu na tym ekranie"
+ 
+-#: ../panels/display/cc-display-panel.c:2050
++#: ../panels/display/cc-display-panel.c:2108
+ msgid "Secondary Display"
+ msgstr "Dodatkowy ekran"
+ 
+-#: ../panels/display/cc-display-panel.c:2051
++#: ../panels/display/cc-display-panel.c:2109
+ msgid "Join this display with another to create an extra workspace"
+ msgstr ""
+ "Połączenie tego ekranu z innym, aby udostępnić dodatkową przestrzeń do pracy"
+ 
+-#: ../panels/display/cc-display-panel.c:2058
+-#: ../panels/display/display-capplet.ui.h:3
++#: ../panels/display/cc-display-panel.c:2116
+ msgid "Presentation"
+ msgstr "Prezentacje"
+ 
+-#: ../panels/display/cc-display-panel.c:2059
+-#: ../panels/display/display-capplet.ui.h:4
++#: ../panels/display/cc-display-panel.c:2117
+ msgid "Show slideshows and media only"
+ msgstr "Wyświetlanie tylko prezentacji i multimediów"
+ 
+ #. translators: "Mirror" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:2064
+-#: ../panels/display/display-capplet.ui.h:5
++#: ../panels/display/cc-display-panel.c:2122
+ msgid "Mirror"
+ msgstr "Ten sam obraz na wszystkich ekranach"
+ 
+-#: ../panels/display/cc-display-panel.c:2065
++#: ../panels/display/cc-display-panel.c:2123
+ msgid "Show your existing view on both displays"
+ msgstr "Wyświetlanie tego samego obrazu na obu ekranach"
+ 
+-#: ../panels/display/cc-display-panel.c:2071
+-#: ../panels/display/display-capplet.ui.h:9
++#: ../panels/display/cc-display-panel.c:2129
+ msgid "Turn Off"
+ msgstr "Wyłączenie"
+ 
+-#: ../panels/display/cc-display-panel.c:2072
++#: ../panels/display/cc-display-panel.c:2130
+ msgid "Don't use this display"
+ msgstr "Bez używania tego ekranu"
+ 
+-#: ../panels/display/cc-display-panel.c:2289
++#: ../panels/display/cc-display-panel.c:2345
+ msgid "Could not get screen information"
+ msgstr "Nie można uzyskać informacji o rozdzielczości ekranu"
+ 
+-#: ../panels/display/cc-display-panel.c:2320
++#: ../panels/display/cc-display-panel.c:2376
+ msgid "_Arrange Combined Displays"
+ msgstr "Zmi_eń położenie połączonych ekranów"
+ 
+-#: ../panels/display/display-capplet.ui.h:6
+-msgid "Show your primary display on this screen also"
+-msgstr "Wyświetlanie podstawowego ekranu także na tym ekranie"
+-
+-#: ../panels/display/display-capplet.ui.h:7
+-msgid "Combine"
+-msgstr "Połączone ekrany"
+-
+-#: ../panels/display/display-capplet.ui.h:8
+-msgid "Join with the primary display to create an extra space"
+-msgstr ""
+-"Połączenie z ekranem podstawowym, aby udostępnić dodatkową przestrzeń do "
+-"pracy"
+-
+-#: ../panels/display/display-capplet.ui.h:10
+-msgid "Don't use the display"
+-msgstr "Bez używania tego ekranu"
+-
+-#: ../panels/display/display-capplet.ui.h:11
+-#: ../panels/printers/printers.ui.h:12
+-msgid "Model"
+-msgstr "Model"
+-
+-#: ../panels/display/display-capplet.ui.h:14
+-msgid "Refresh Rate"
+-msgstr "Odświeżanie"
+-
+ #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
+ msgid "Displays"
+ msgstr "Ekrany"
+@@ -1299,53 +1241,53 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
+ msgstr "Panel;Projektor;xrandr;Ekran;Monitor;Rozdzielczość;Odświeżanie;"
+ 
+ #. TRANSLATORS: AP type
+-#: ../panels/info/cc-info-panel.c:450 ../panels/network/panel-common.c:127
++#: ../panels/info/cc-info-panel.c:452 ../panels/network/panel-common.c:127
+ msgid "Unknown"
+ msgstr "Nieznany"
+ 
+-#: ../panels/info/cc-info-panel.c:532
++#: ../panels/info/cc-info-panel.c:539
+ #, c-format
+ msgid "%s %d-bit"
+ msgstr "%s %d-bitowy"
+ 
+-#: ../panels/info/cc-info-panel.c:534
++#: ../panels/info/cc-info-panel.c:541
+ #, c-format
+ msgid "%d-bit"
+ msgstr "%d-bitowy"
+ 
+-#: ../panels/info/cc-info-panel.c:1214
++#: ../panels/info/cc-info-panel.c:1221
+ msgid "Ask what to do"
+ msgstr "Pytanie, co robić"
+ 
+-#: ../panels/info/cc-info-panel.c:1218
++#: ../panels/info/cc-info-panel.c:1225
+ msgid "Do nothing"
+ msgstr "Nierobienie niczego"
+ 
+-#: ../panels/info/cc-info-panel.c:1222
++#: ../panels/info/cc-info-panel.c:1229
+ msgid "Open folder"
+ msgstr "Otwarcie katalogu"
+ 
+-#: ../panels/info/cc-info-panel.c:1313
++#: ../panels/info/cc-info-panel.c:1320
+ msgid "Other Media"
+ msgstr "Inne nośniki"
+ 
+-#: ../panels/info/cc-info-panel.c:1344
++#: ../panels/info/cc-info-panel.c:1351
+ msgid "Select an application for audio CDs"
+ msgstr "Wybór programu dla płyt CD-Audio"
+ 
+-#: ../panels/info/cc-info-panel.c:1345
++#: ../panels/info/cc-info-panel.c:1352
+ msgid "Select an application for video DVDs"
+ msgstr "Wybór programu dla płyt wideo DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1346
++#: ../panels/info/cc-info-panel.c:1353
+ msgid "Select an application to run when a music player is connected"
+ msgstr "Wybór programu do uruchomienia po podłączeniu odtwarzacza multimediów"
+ 
+-#: ../panels/info/cc-info-panel.c:1347
++#: ../panels/info/cc-info-panel.c:1354
+ msgid "Select an application to run when a camera is connected"
+ msgstr "Wybór programu do uruchomienia po podłączeniu aparatu"
+ 
+-#: ../panels/info/cc-info-panel.c:1348
++#: ../panels/info/cc-info-panel.c:1355
+ msgid "Select an application for software CDs"
+ msgstr "Wybór programu dla płyt CD z oprogramowaniem"
+ 
+@@ -1354,89 +1296,89 @@ msgstr "Wybór programu dla płyt CD z oprogramowaniem"
+ #. * If the shared-mime-info translation works for your language,
+ #. * simply leave these untranslated.
+ #.
+-#: ../panels/info/cc-info-panel.c:1360
++#: ../panels/info/cc-info-panel.c:1367
+ msgid "audio DVD"
+ msgstr "Płyta DVD-Audio"
+ 
+-#: ../panels/info/cc-info-panel.c:1361
++#: ../panels/info/cc-info-panel.c:1368
+ msgid "blank Blu-ray disc"
+ msgstr "Pusta płyta Blu-ray"
+ 
+-#: ../panels/info/cc-info-panel.c:1362
++#: ../panels/info/cc-info-panel.c:1369
+ msgid "blank CD disc"
+ msgstr "Pusta płyta CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1363
++#: ../panels/info/cc-info-panel.c:1370
+ msgid "blank DVD disc"
+ msgstr "Pusta płyta DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1364
++#: ../panels/info/cc-info-panel.c:1371
+ msgid "blank HD DVD disc"
+ msgstr "Pusta płyta HD DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1365
++#: ../panels/info/cc-info-panel.c:1372
+ msgid "Blu-ray video disc"
+ msgstr "Płyta wideo Blu-ray"
+ 
+-#: ../panels/info/cc-info-panel.c:1366
++#: ../panels/info/cc-info-panel.c:1373
+ msgid "e-book reader"
+ msgstr "Czytnik e-booków"
+ 
+-#: ../panels/info/cc-info-panel.c:1367
++#: ../panels/info/cc-info-panel.c:1374
+ msgid "HD DVD video disc"
+ msgstr "Płyta wideo HD DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1368
++#: ../panels/info/cc-info-panel.c:1375
+ msgid "Picture CD"
+ msgstr "Picture CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1369
++#: ../panels/info/cc-info-panel.c:1376
+ msgid "Super Video CD"
+ msgstr "Super Video CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1370
++#: ../panels/info/cc-info-panel.c:1377
+ msgid "Video CD"
+ msgstr "Video CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1371
++#: ../panels/info/cc-info-panel.c:1378
+ msgid "Windows software"
+ msgstr "Oprogramowanie systemu Windows"
+ 
+-#: ../panels/info/cc-info-panel.c:1372
++#: ../panels/info/cc-info-panel.c:1379
+ msgid "Software"
+ msgstr "Oprogramowanie"
+ 
+-#: ../panels/info/cc-info-panel.c:1495
++#: ../panels/info/cc-info-panel.c:1502
+ #: ../panels/keyboard/keyboard-shortcuts.c:1696
+ msgid "Section"
+ msgstr "Sekcja"
+ 
+-#: ../panels/info/cc-info-panel.c:1504 ../panels/info/info.ui.h:13
++#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:13
+ msgid "Overview"
+ msgstr "Przegląd"
+ 
+-#: ../panels/info/cc-info-panel.c:1510 ../panels/info/info.ui.h:20
++#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:20
+ msgid "Default Applications"
+ msgstr "Domyślne programy"
+ 
+-#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:28
++#: ../panels/info/cc-info-panel.c:1522 ../panels/info/info.ui.h:28
+ msgid "Removable Media"
+ msgstr "Nośniki wymienne"
+ 
+-#: ../panels/info/cc-info-panel.c:1540
++#: ../panels/info/cc-info-panel.c:1547
+ #, c-format
+ msgid "Version %s"
+ msgstr "Wersja %s"
+ 
+-#: ../panels/info/cc-info-panel.c:1590
++#: ../panels/info/cc-info-panel.c:1597
+ msgid "Install Updates"
+ msgstr "Zainstaluj aktualizacje"
+ 
+-#: ../panels/info/cc-info-panel.c:1594
++#: ../panels/info/cc-info-panel.c:1601
+ msgid "System Up-To-Date"
+ msgstr "System jest aktualny"
+ 
+-#: ../panels/info/cc-info-panel.c:1598
++#: ../panels/info/cc-info-panel.c:1605
+ msgid "Checking for Updates"
+ msgstr "Wyszukiwanie aktualizacji"
+ 
+@@ -1602,7 +1544,7 @@ msgid "Eject"
+ msgstr "Wysunięcie"
+ 
+ #: ../panels/keyboard/01-input-sources.xml.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+ #: ../panels/universal-access/uap.ui.h:11
+ msgid "Typing"
+ msgstr "Pisanie"
+@@ -1761,7 +1703,6 @@ msgid "Modifiers-only switch to next source"
+ msgstr "Przełączenie na następne źródło tylko dla modyfikatorów"
+ 
+ #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Keyboard"
+ msgstr "Klawiatura"
+ 
+@@ -1788,76 +1729,76 @@ msgstr "_Nazwa:"
+ msgid "C_ommand:"
+ msgstr "P_olecenie:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Repeat Keys"
+ msgstr "Powtarzanie klawiszy"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+ msgid "Key presses _repeat when key is held down"
+ msgstr "Powtarza_nie naciśnięcia klawisza po jego przytrzymaniu"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+ msgid "_Delay:"
+ msgstr "_Opóźnienie:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+ msgid "_Speed:"
+ msgstr "Prę_dkość:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
+ msgctxt "keyboard, delay"
+ msgid "Short"
+ msgstr "Krótkie"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+ msgctxt "keyboard, speed"
+ msgid "Slow"
+ msgstr "Powolna"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+ msgid "Repeat keys speed"
+ msgstr "Prędkość powtarzania klawiszy"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+ msgctxt "keyboard, delay"
+ msgid "Long"
+ msgstr "Długie"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+ msgctxt "keyboard, speed"
+ msgid "Fast"
+ msgstr "Szybka"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+ msgid "Cursor Blinking"
+ msgstr "Miganie kursora"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+ msgid "Cursor _blinks in text fields"
+ msgstr "Miganie _kursora w polach tekstowych"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+ msgid "S_peed:"
+ msgstr "_Prędkość:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+ msgid "Cursor blink speed"
+ msgstr "Prędkość migania kursora"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+ #: ../panels/region/region.ui.h:5
+ msgid "Input Sources"
+ msgstr "Źródła wprowadzania"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+ msgid "Add Shortcut"
+ msgstr "Dodaj skrót"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
+ msgid "Remove Shortcut"
+ msgstr "Usuń skrót"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
+ msgid ""
+ "To edit a shortcut, click the row and hold down the new keys or press "
+ "Backspace to clear."
+@@ -1865,7 +1806,7 @@ msgstr ""
+ "Aby zmodyfikować skrót, należy kliknąć na wierszu i wcisnąć nowe klawisze "
+ "lub nacisnąć klawisz Backspace, aby wyczyścić obecny."
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+ msgid "Shortcuts"
+ msgstr "Skróty"
+ 
+@@ -1909,11 +1850,11 @@ msgstr ""
+ msgid "_Reassign"
+ msgstr "_Zmień"
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:100
++#: ../panels/mouse/cc-mouse-panel.c:95
+ msgid "Test Your _Settings"
+ msgstr "Test _ustawień"
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:117
++#: ../panels/mouse/cc-mouse-panel.c:108
+ msgid "Test Your Settings"
+ msgstr "Test ustawień"
+ 
+@@ -1936,91 +1877,87 @@ msgstr ""
+ "Trackball;Touchpad;Przewijanie;"
+ 
+ #: ../panels/mouse/gnome-mouse-properties.ui.h:1
+-msgid "Mouse Preferences"
+-msgstr "Preferencje myszy"
+-
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgid "General"
+ msgstr "Ogólne"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
++#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgctxt "double click, speed"
+ msgid "Slow"
+ msgstr "Powolne"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
++#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+ msgid "Double-click timeout"
+ msgstr "Opóźnienie podwójnego kliknięcia"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
++#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+ msgctxt "double click, speed"
+ msgid "Fast"
+ msgstr "Szybkie"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
++#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+ msgid "_Double-click"
+ msgstr "_Podwójne kliknięcie"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
++#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+ msgid "Primary _button"
+ msgstr "Przy_cisk podstawowy"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
++#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+ msgctxt "mouse, left button as primary"
+ msgid "_Left"
+ msgstr "_Lewy"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
++#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+ msgctxt "mouse, right button as primary"
+ msgid "_Right"
+ msgstr "P_rawy"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
++#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+ msgid "Mouse"
+ msgstr "Mysz"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
++#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+ msgid "_Pointer speed"
+ msgstr "Prędkość _kursora"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
++#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+ msgctxt "mouse pointer, speed"
+ msgid "Slow"
+ msgstr "Powolna"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
++#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+ msgctxt "mouse pointer, speed"
+ msgid "Fast"
+ msgstr "Szybka"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
++#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+ msgid "Touchpad"
+ msgstr "Panel dotykowy"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
++#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+ msgctxt "touchpad pointer, speed"
+ msgid "Slow"
+ msgstr "Powolna"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
++#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+ msgctxt "touchpad pointer, speed"
+ msgid "Fast"
+ msgstr "Szybka"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
++#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+ msgid "Disable while _typing"
+ msgstr "Wyłączenie po_dczas pisania"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
++#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+ msgid "Tap to _click"
+ msgstr "Klikanie przez _stuknięcie"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
++#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+ msgid "Two _finger scroll"
+ msgstr "P_rzewijanie dwoma palcami"
+ 
+ #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible.
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:21
++#: ../panels/mouse/gnome-mouse-properties.ui.h:20
+ msgid "_Natural scrolling"
+ msgstr "_Naturalne przewijanie"
+ 
+@@ -2063,7 +2000,7 @@ msgstr "Pojedyncze kliknięcie, przycisk pomocniczy"
+ msgid "Air_plane Mode"
+ msgstr "Tryb _samolotowy"
+ 
+-#: ../panels/network/cc-network-panel.c:928
++#: ../panels/network/cc-network-panel.c:930
+ msgid "Network proxy"
+ msgstr "Pośrednik sieciowy"
+ 
+@@ -2071,14 +2008,14 @@ msgstr "Pośrednik sieciowy"
+ #. * window for vpn connections, it is also used to display
+ #. * vpn connections in the device list.
+ #.
+-#: ../panels/network/cc-network-panel.c:1107 ../panels/network/net-vpn.c:285
+-#: ../panels/network/net-vpn.c:438
++#: ../panels/network/cc-network-panel.c:1109 ../panels/network/net-vpn.c:278
++#: ../panels/network/net-vpn.c:431
+ #, c-format
+ msgid "%s VPN"
+ msgstr "%s VPN"
+ 
+ #. TRANSLATORS: the user is running a NM that is not API compatible
+-#: ../panels/network/cc-network-panel.c:1242
++#: ../panels/network/cc-network-panel.c:1244
+ msgid "The system network services are not compatible with this version."
+ msgstr "Systemowe usługi sieciowe są niezgodne z tą wersją."
+ 
+@@ -2112,34 +2049,34 @@ msgstr "automatycznie"
+ 
+ #. TRANSLATORS: this WEP WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:52
+-#: ../panels/network/net-device-wifi.c:221
+-#: ../panels/network/net-device-wifi.c:382
++#: ../panels/network/net-device-wifi.c:216
++#: ../panels/network/net-device-wifi.c:377
+ msgid "WEP"
+ msgstr "WEP"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:56
+-#: ../panels/network/net-device-wifi.c:225
+-#: ../panels/network/net-device-wifi.c:387
++#: ../panels/network/net-device-wifi.c:220
++#: ../panels/network/net-device-wifi.c:382
+ #: ../panels/network/network-wifi.ui.h:17
+ msgid "WPA"
+ msgstr "WPA"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:60
+-#: ../panels/network/net-device-wifi.c:229
++#: ../panels/network/net-device-wifi.c:224
+ msgid "WPA2"
+ msgstr "WPA2"
+ 
+ #. TRANSLATORS: this Enterprise WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:65
+-#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:229
+ msgid "Enterprise"
+ msgstr "Enterprise"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:70
+-#: ../panels/network/net-device-wifi.c:239
+-#: ../panels/network/net-device-wifi.c:372
++#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:367
+ msgctxt "Wifi security"
+ msgid "None"
+ msgstr "Brak"
+@@ -2160,8 +2097,8 @@ msgid "Yesterday"
+ msgstr "Wczoraj"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:106
+-#: ../panels/network/net-device-ethernet.c:125
+-#: ../panels/network/net-device-wifi.c:476
++#: ../panels/network/net-device-ethernet.c:122
++#: ../panels/network/net-device-wifi.c:471
+ #, c-format
+ msgid "%i day ago"
+ msgid_plural "%i days ago"
+@@ -2172,37 +2109,37 @@ msgstr[2] "%i dni temu"
+ #. Translators: network device speed
+ #: ../panels/network/connection-editor/ce-page-details.c:155
+ #: ../panels/network/net-device-ethernet.c:53
+-#: ../panels/network/net-device-wifi.c:534
++#: ../panels/network/net-device-wifi.c:528
+ #, c-format
+ msgid "%d Mb/s"
+ msgstr "%d Mb/s"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:181
+-#: ../panels/network/net-device-wifi.c:563
++#: ../panels/network/net-device-wifi.c:557
+ msgctxt "Signal strength"
+ msgid "None"
+ msgstr "Brak"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:183
+-#: ../panels/network/net-device-wifi.c:565
++#: ../panels/network/net-device-wifi.c:559
+ msgctxt "Signal strength"
+ msgid "Weak"
+ msgstr "Słaby"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:185
+-#: ../panels/network/net-device-wifi.c:567
++#: ../panels/network/net-device-wifi.c:561
+ msgctxt "Signal strength"
+ msgid "Ok"
+ msgstr "Dostateczny"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:187
+-#: ../panels/network/net-device-wifi.c:569
++#: ../panels/network/net-device-wifi.c:563
+ msgctxt "Signal strength"
+ msgid "Good"
+ msgstr "Dobry"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:189
+-#: ../panels/network/net-device-wifi.c:571
++#: ../panels/network/net-device-wifi.c:565
+ msgctxt "Signal strength"
+ msgid "Excellent"
+ msgstr "Doskonały"
+@@ -2348,15 +2285,15 @@ msgid "Link speed"
+ msgstr "Prędkość połączenia"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:4
+-#: ../panels/network/net-device-ethernet.c:158
++#: ../panels/network/net-device-ethernet.c:155
+ #: ../panels/network/network-simple.ui.h:3
+ #: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
+ msgid "IPv4 Address"
+ msgstr "Adres IPv4"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:5
+-#: ../panels/network/net-device-ethernet.c:159
+-#: ../panels/network/net-device-ethernet.c:163
++#: ../panels/network/net-device-ethernet.c:156
++#: ../panels/network/net-device-ethernet.c:160
+ #: ../panels/network/network-mobile.ui.h:4
+ #: ../panels/network/network-simple.ui.h:4
+ #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
+@@ -2364,14 +2301,14 @@ msgid "IPv6 Address"
+ msgstr "Adres IPv6"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:6
+-#: ../panels/network/net-device-ethernet.c:166
++#: ../panels/network/net-device-ethernet.c:163
+ #: ../panels/network/network-simple.ui.h:2
+ #: ../panels/network/network-wifi.ui.h:7
+ msgid "Hardware Address"
+ msgstr "Adres sprzętowy"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:7
+-#: ../panels/network/net-device-ethernet.c:170
++#: ../panels/network/net-device-ethernet.c:167
+ #: ../panels/network/network-mobile.ui.h:5
+ #: ../panels/network/network-simple.ui.h:5
+ #: ../panels/network/network-wifi.ui.h:8
+@@ -2381,7 +2318,7 @@ msgstr "Domyślna trasa"
+ #: ../panels/network/connection-editor/details-page.ui.h:8
+ #: ../panels/network/connection-editor/ip4-page.ui.h:3
+ #: ../panels/network/connection-editor/ip6-page.ui.h:3
+-#: ../panels/network/net-device-ethernet.c:172
++#: ../panels/network/net-device-ethernet.c:169
+ #: ../panels/network/network-mobile.ui.h:6
+ #: ../panels/network/network-simple.ui.h:6
+ #: ../panels/network/network-wifi.ui.h:9
+@@ -2527,7 +2464,7 @@ msgid "_Add"
+ msgstr "_Dodaj"
+ 
+ #: ../panels/network/connection-editor/net-connection-editor.c:595
+-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
++#: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
+ msgid "VPN"
+ msgstr "VPN"
+ 
+@@ -2535,23 +2472,23 @@ msgstr "VPN"
+ msgid "Bond"
+ msgstr "Łączenie"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:597
++#: ../panels/network/connection-editor/net-connection-editor.c:598
+ msgid "Bridge"
+ msgstr "Mostek"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:598
++#: ../panels/network/connection-editor/net-connection-editor.c:599
+ msgid "VLAN"
+ msgstr "VLAN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:749
++#: ../panels/network/connection-editor/net-connection-editor.c:750
+ msgid "Could not load VPN plugins"
+ msgstr "Nie można wczytać wtyczek VPN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:818
++#: ../panels/network/connection-editor/net-connection-editor.c:819
+ msgid "Import from file…"
+ msgstr "Zaimportuj z pliku…"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:889
++#: ../panels/network/connection-editor/net-connection-editor.c:890
+ msgid "Add Network Connection"
+ msgstr "Dodanie połączenia sieciowego"
+ 
+@@ -2561,7 +2498,7 @@ msgid "_Reset"
+ msgstr "_Przywróć"
+ 
+ #: ../panels/network/connection-editor/reset-page.ui.h:2
+-#: ../panels/network/net-device-wifi.c:1408
++#: ../panels/network/net-device-wifi.c:1403
+ #: ../panels/network/network-wifi.ui.h:40
+ msgid "_Forget"
+ msgstr "_Zapomnij"
+@@ -2610,7 +2547,7 @@ msgstr "Wybór pliku do zaimportowania"
+ 
+ #: ../panels/network/connection-editor/vpn-helpers.c:246
+ #: ../panels/printers/cc-printers-panel.c:1947
+-#: ../panels/sharing/cc-sharing-panel.c:422
++#: ../panels/sharing/cc-sharing-panel.c:426
+ #: ../panels/user-accounts/um-photo-dialog.c:222
+ msgid "_Open"
+ msgstr "_Otwórz"
+@@ -2697,29 +2634,29 @@ msgstr "Łączone podrzędne"
+ msgid "Bridge slaves"
+ msgstr "Mostkowane podrzędne"
+ 
+-#: ../panels/network/net-device-ethernet.c:111
+-#: ../panels/network/net-device-wifi.c:462
++#: ../panels/network/net-device-ethernet.c:108
++#: ../panels/network/net-device-wifi.c:457
+ msgid "never"
+ msgstr "nigdy"
+ 
+-#: ../panels/network/net-device-ethernet.c:121
+-#: ../panels/network/net-device-wifi.c:472
++#: ../panels/network/net-device-ethernet.c:118
++#: ../panels/network/net-device-wifi.c:467
+ msgid "today"
+ msgstr "dzisiaj"
+ 
+-#: ../panels/network/net-device-ethernet.c:123
+-#: ../panels/network/net-device-wifi.c:474
++#: ../panels/network/net-device-ethernet.c:120
++#: ../panels/network/net-device-wifi.c:469
+ msgid "yesterday"
+ msgstr "wczoraj"
+ 
+-#: ../panels/network/net-device-ethernet.c:161
++#: ../panels/network/net-device-ethernet.c:158
+ #: ../panels/network/network-mobile.ui.h:3
+ #: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
+ #: ../panels/printers/printers.ui.h:13
+ msgid "IP Address"
+ msgstr "Adres IP"
+ 
+-#: ../panels/network/net-device-ethernet.c:177
++#: ../panels/network/net-device-ethernet.c:174
+ #: ../panels/network/network-wifi.ui.h:10
+ msgid "Last used"
+ msgstr "Ostatnio użyta"
+@@ -2729,14 +2666,14 @@ msgstr "Ostatnio użyta"
+ #. * profile. It is also used to display ethernet in the
+ #. * device list.
+ #.
+-#: ../panels/network/net-device-ethernet.c:287
++#: ../panels/network/net-device-ethernet.c:284
+ #: ../panels/network/network-ethernet.ui.h:1
+ #: ../panels/network/network-simple.ui.h:1
+ msgid "Wired"
+ msgstr "Przewodowe"
+ 
+-#: ../panels/network/net-device-ethernet.c:355
+-#: ../panels/network/net-device-wifi.c:1549
++#: ../panels/network/net-device-ethernet.c:352
++#: ../panels/network/net-device-wifi.c:1558
+ #: ../panels/network/network-ethernet.ui.h:3
+ #: ../panels/network/network-mobile.ui.h:8
+ #: ../panels/network/network-simple.ui.h:8
+@@ -2744,16 +2681,20 @@ msgstr "Przewodowe"
+ msgid "Options…"
+ msgstr "Opcje…"
+ 
+-#: ../panels/network/net-device-ethernet.c:492
++#: ../panels/network/net-device-ethernet.c:489
+ #, c-format
+ msgid "Profile %d"
+ msgstr "Profil %d"
+ 
+-#: ../panels/network/net-device-mobile.c:239
++#: ../panels/network/net-device-mobile.c:232
+ msgid "Add new connection"
+ msgstr "Dodaj nowe połączenie"
+ 
+-#: ../panels/network/net-device-wifi.c:1117
++#: ../panels/network/net-device-team.c:77
++msgid "Team slaves"
++msgstr "Zespołowe podrzędne"
++
++#: ../panels/network/net-device-wifi.c:1110
+ msgid ""
+ "If you have a connection to the Internet other than wireless, you can set up "
+ "a wireless hotspot to share the connection with others."
+@@ -2761,14 +2702,14 @@ msgstr ""
+ "Jeśli komputer ma połączenie z Internetem inne niż bezprzewodowe, to można "
+ "ustawić hotspot bezprzewodowy do współdzielenia połączenia z innymi."
+ 
+-#: ../panels/network/net-device-wifi.c:1121
++#: ../panels/network/net-device-wifi.c:1114
+ #, c-format
+ msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+ msgstr ""
+ "Przełączanie na hotspot bezprzewodowy spowoduje rozłączenie z sieci <b>%s</"
+ "b>."
+ 
+-#: ../panels/network/net-device-wifi.c:1125
++#: ../panels/network/net-device-wifi.c:1118
+ msgid ""
+ "It is not possible to access the Internet through your wireless while the "
+ "hotspot is active."
+@@ -2776,23 +2717,23 @@ msgstr ""
+ "Nie można połączyć się z Internetem bezprzewodowo, kiedy hotspot jest "
+ "aktywny."
+ 
+-#: ../panels/network/net-device-wifi.c:1199
++#: ../panels/network/net-device-wifi.c:1192
+ msgid "Stop hotspot and disconnect any users?"
+ msgstr "Zatrzymać hotspot i rozłączyć wszystkich użytkowników?"
+ 
+-#: ../panels/network/net-device-wifi.c:1202
++#: ../panels/network/net-device-wifi.c:1195
+ msgid "_Stop Hotspot"
+ msgstr "_Zatrzymaj hotspot"
+ 
+-#: ../panels/network/net-device-wifi.c:1274
++#: ../panels/network/net-device-wifi.c:1267
+ msgid "System policy prohibits use as a Hotspot"
+ msgstr "Polityka systemu uniemożliwia użycie jako hotspot"
+ 
+-#: ../panels/network/net-device-wifi.c:1277
++#: ../panels/network/net-device-wifi.c:1270
+ msgid "Wireless device does not support Hotspot mode"
+ msgstr "Urządzenie bezprzewodowe nie obsługuje trybu hotspot"
+ 
+-#: ../panels/network/net-device-wifi.c:1404
++#: ../panels/network/net-device-wifi.c:1399
+ msgid ""
+ "Network details for the selected networks, including passwords and any "
+ "custom configuration will be lost."
+@@ -2800,19 +2741,19 @@ msgstr ""
+ "Informacje o zaznaczonych sieciach, w tym hasła i konfiguracja, zostaną "
+ "utracone."
+ 
+-#: ../panels/network/net-device-wifi.c:1714
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
++#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+ msgid "History"
+ msgstr "Historia"
+ 
+-#: ../panels/network/net-device-wifi.c:1718 ../panels/power/power.ui.h:21
++#: ../panels/network/net-device-wifi.c:1730 ../panels/power/power.ui.h:21
+ #: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596
+-#: ../panels/wacom/cc-wacom-page.c:525
++#: ../panels/wacom/cc-wacom-page.c:534
+ msgid "_Close"
+ msgstr "_Zamknij"
+ 
+ #. translators: This is the label for the "Forget wireless network" functionality
+-#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/network/net-device-wifi.c:1738
+ msgctxt "Wi-Fi Network"
+ msgid "_Forget"
+ msgstr "_Zapomnij"
+@@ -2833,7 +2774,7 @@ msgstr ""
+ msgid "This is not recommended for untrusted public networks."
+ msgstr "Nie jest zalecane dla niezaufanych sieci publicznych."
+ 
+-#: ../panels/network/net-proxy.c:417
++#: ../panels/network/net-proxy.c:410
+ msgid "Proxy"
+ msgstr "Pośrednik"
+ 
+@@ -2849,17 +2790,17 @@ msgstr "IMEI"
+ msgid "Provider"
+ msgstr "Dostawca"
+ 
+-#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
++#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:2
+ msgctxt "proxy method"
+ msgid "None"
+ msgstr "Brak"
+ 
+-#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
++#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:3
+ msgctxt "proxy method"
+ msgid "Manual"
+ msgstr "Ręczna"
+ 
+-#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
++#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:4
+ msgctxt "proxy method"
+ msgid "Automatic"
+ msgstr "Automatyczna"
+@@ -2912,19 +2853,7 @@ msgstr "Port pośrednika SOCKS"
+ msgid "Turn device off"
+ msgstr "Wyłącz urządzenie"
+ 
+-#: ../panels/network/network.ui.h:1
+-msgid "Select the interface to use for the new service"
+-msgstr "Wybór interfejsu do użycia dla nowej usługi"
+-
+-#: ../panels/network/network.ui.h:2
+-msgid "C_reate…"
+-msgstr "_Utwórz…"
+-
+-#: ../panels/network/network.ui.h:3
+-msgid "_Interface"
+-msgstr "_Interfejs"
+-
+-#: ../panels/network/network.ui.h:8
++#: ../panels/network/network.ui.h:5
+ msgid "Add Device"
+ msgstr "Dodaj urządzenie"
+ 
+@@ -2963,7 +2892,7 @@ msgstr "informacje"
+ #: ../panels/network/wireless-security/ws-leap.ui.h:2
+ #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
+ #: ../panels/user-accounts/data/account-dialog.ui.h:9
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+ msgid "_Password"
+ msgstr "_Hasło"
+ 
+@@ -3661,12 +3590,12 @@ msgid "Show Details in Lock Screen"
+ msgstr "Wyświetlanie szczegółów na ekranie blokady"
+ 
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1733 ../panels/power/cc-power-panel.c:1740
+-#: ../panels/privacy/cc-privacy-panel.c:77
+-#: ../panels/privacy/cc-privacy-panel.c:117
+-#: ../panels/universal-access/cc-ua-panel.c:253
+-#: ../panels/universal-access/cc-ua-panel.c:610
+-#: ../panels/universal-access/cc-ua-panel.c:736
++#: ../panels/power/cc-power-panel.c:1744 ../panels/power/cc-power-panel.c:1751
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ msgid "On"
+ msgstr "Włączone"
+ 
+@@ -3787,11 +3716,11 @@ msgstr ""
+ "Dodanie konta umożliwia programom dostęp do dokumentów, poczty, kontaktów, "
+ "kalendarza, komunikatora i wielu innych."
+ 
+-#: ../panels/power/cc-power-panel.c:187
++#: ../panels/power/cc-power-panel.c:189
+ msgid "Unknown time"
+ msgstr "Nieznany czas"
+ 
+-#: ../panels/power/cc-power-panel.c:193
++#: ../panels/power/cc-power-panel.c:195
+ #, c-format
+ msgid "%i minute"
+ msgid_plural "%i minutes"
+@@ -3799,7 +3728,7 @@ msgstr[0] "%i minuta"
+ msgstr[1] "%i minuty"
+ msgstr[2] "%i minut"
+ 
+-#: ../panels/power/cc-power-panel.c:205
++#: ../panels/power/cc-power-panel.c:207
+ #, c-format
+ msgid "%i hour"
+ msgid_plural "%i hours"
+@@ -3809,19 +3738,19 @@ msgstr[2] "%i godzin"
+ 
+ #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
+ #. * Swap order with "%2$s %2$i %1$s %1$i if needed
+-#: ../panels/power/cc-power-panel.c:213
++#: ../panels/power/cc-power-panel.c:215
+ #, c-format
+ msgid "%i %s %i %s"
+ msgstr "%i %s %i %s"
+ 
+-#: ../panels/power/cc-power-panel.c:214
++#: ../panels/power/cc-power-panel.c:216
+ msgid "hour"
+ msgid_plural "hours"
+ msgstr[0] "godzina"
+ msgstr[1] "godziny"
+ msgstr[2] "godzin"
+ 
+-#: ../panels/power/cc-power-panel.c:215
++#: ../panels/power/cc-power-panel.c:217
+ msgid "minute"
+ msgid_plural "minutes"
+ msgstr[0] "minuta"
+@@ -3829,208 +3758,208 @@ msgstr[1] "minuty"
+ msgstr[2] "minut"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:234
++#: ../panels/power/cc-power-panel.c:236
+ #, c-format
+ msgid "%s until fully charged"
+ msgstr "Do pełnego naładowania: %s"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:241
++#: ../panels/power/cc-power-panel.c:243
+ #, c-format
+ msgid "Caution: %s remaining"
+ msgstr "Ostrzeżenie, pozostało: %s"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:246
++#: ../panels/power/cc-power-panel.c:248
+ #, c-format
+ msgid "%s remaining"
+ msgstr "Pozostało: %s"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:251 ../panels/power/cc-power-panel.c:279
++#: ../panels/power/cc-power-panel.c:253 ../panels/power/cc-power-panel.c:281
+ msgid "Fully charged"
+ msgstr "W pełni naładowany"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:255 ../panels/power/cc-power-panel.c:283
++#: ../panels/power/cc-power-panel.c:257 ../panels/power/cc-power-panel.c:285
+ msgid "Empty"
+ msgstr "Pusty"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:270
++#: ../panels/power/cc-power-panel.c:272
+ msgid "Charging"
+ msgstr "Ładowanie"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:275
++#: ../panels/power/cc-power-panel.c:277
+ msgid "Discharging"
+ msgstr "Rozładowywanie"
+ 
+-#: ../panels/power/cc-power-panel.c:393
++#: ../panels/power/cc-power-panel.c:395
+ msgctxt "Battery name"
+ msgid "Main"
+ msgstr "Główny"
+ 
+-#: ../panels/power/cc-power-panel.c:395
++#: ../panels/power/cc-power-panel.c:397
+ msgctxt "Battery name"
+ msgid "Extra"
+ msgstr "Dodatkowy"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:486
++#: ../panels/power/cc-power-panel.c:469
+ msgid "Wireless mouse"
+ msgstr "Mysz bezprzewodowa"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:490
++#: ../panels/power/cc-power-panel.c:472
+ msgid "Wireless keyboard"
+ msgstr "Klawiatura bezprzewodowa"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:494
++#: ../panels/power/cc-power-panel.c:475
+ msgid "Uninterruptible power supply"
+ msgstr "Urządzenie UPS"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:499
++#: ../panels/power/cc-power-panel.c:478
+ msgid "Personal digital assistant"
+ msgstr "Urządzenie PDA"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:503
++#: ../panels/power/cc-power-panel.c:481
+ msgid "Cellphone"
+ msgstr "Telefon komórkowy"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:507
++#: ../panels/power/cc-power-panel.c:484
+ msgid "Media player"
+ msgstr "Odtwarzacz multimediów"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:511
++#: ../panels/power/cc-power-panel.c:487
+ msgid "Tablet"
+ msgstr "Tablet"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:515
++#: ../panels/power/cc-power-panel.c:490
+ msgid "Computer"
+ msgstr "Komputer"
+ 
+ #. TRANSLATORS: secondary battery, misc
+-#: ../panels/power/cc-power-panel.c:519 ../panels/power/cc-power-panel.c:729
+-#: ../panels/power/cc-power-panel.c:2064
++#: ../panels/power/cc-power-panel.c:493 ../panels/power/cc-power-panel.c:740
++#: ../panels/power/cc-power-panel.c:2075
+ msgid "Battery"
+ msgstr "Akumulator"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:528
++#: ../panels/power/cc-power-panel.c:539
+ msgctxt "Battery power"
+ msgid "Charging"
+ msgstr "Ładowanie"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:535
++#: ../panels/power/cc-power-panel.c:546
+ msgctxt "Battery power"
+ msgid "Caution"
+ msgstr "Ostrzeżenie"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:540
++#: ../panels/power/cc-power-panel.c:551
+ msgctxt "Battery power"
+ msgid "Low"
+ msgstr "Niski"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:545
++#: ../panels/power/cc-power-panel.c:556
+ msgctxt "Battery power"
+ msgid "Good"
+ msgstr "Dobry"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:550
++#: ../panels/power/cc-power-panel.c:561
+ msgctxt "Battery power"
+ msgid "Fully charged"
+ msgstr "W pełni naładowany"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:554
++#: ../panels/power/cc-power-panel.c:565
+ msgctxt "Battery power"
+ msgid "Empty"
+ msgstr "Pusty"
+ 
+-#: ../panels/power/cc-power-panel.c:727
++#: ../panels/power/cc-power-panel.c:738
+ msgid "Batteries"
+ msgstr "Akumulatory"
+ 
+-#: ../panels/power/cc-power-panel.c:1133
++#: ../panels/power/cc-power-panel.c:1144
+ msgid "When _idle"
+ msgstr "Podczas _bezczynności"
+ 
+-#: ../panels/power/cc-power-panel.c:1502
++#: ../panels/power/cc-power-panel.c:1513
+ msgid "Power Saving"
+ msgstr "Oszczędzanie energii"
+ 
+-#: ../panels/power/cc-power-panel.c:1530
++#: ../panels/power/cc-power-panel.c:1541
+ msgid "_Screen brightness"
+ msgstr "_Jasność ekranu"
+ 
+-#: ../panels/power/cc-power-panel.c:1536
++#: ../panels/power/cc-power-panel.c:1547
+ msgid "_Keyboard brightness"
+ msgstr "J_asność klawiatury"
+ 
+-#: ../panels/power/cc-power-panel.c:1546
++#: ../panels/power/cc-power-panel.c:1557
+ msgid "_Dim screen when inactive"
+ msgstr "_Przygaszanie ekranu podczas bezczynności"
+ 
+-#: ../panels/power/cc-power-panel.c:1571
++#: ../panels/power/cc-power-panel.c:1582
+ msgid "_Blank screen"
+ msgstr "_Wygaszanie ekranu"
+ 
+-#: ../panels/power/cc-power-panel.c:1608
++#: ../panels/power/cc-power-panel.c:1619
+ msgid "_Wi-Fi"
+ msgstr "_Wi-Fi"
+ 
+-#: ../panels/power/cc-power-panel.c:1613
++#: ../panels/power/cc-power-panel.c:1624
+ msgid "Turns off wireless devices"
+ msgstr "Wyłącza urządzenia bezprzewodowe"
+ 
+-#: ../panels/power/cc-power-panel.c:1638
++#: ../panels/power/cc-power-panel.c:1649
+ msgid "_Mobile broadband"
+ msgstr "_Komórkowe"
+ 
+-#: ../panels/power/cc-power-panel.c:1643
++#: ../panels/power/cc-power-panel.c:1654
+ msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
+ msgstr "Wyłącza urządzenia komórkowe (3G, 4G, WiMax itp.)"
+ 
+-#: ../panels/power/cc-power-panel.c:1678
++#: ../panels/power/cc-power-panel.c:1689
+ msgid "_Bluetooth"
+ msgstr "_Bluetooth"
+ 
+-#: ../panels/power/cc-power-panel.c:1729
++#: ../panels/power/cc-power-panel.c:1740
+ msgid "When on battery power"
+ msgstr "Na zasilaniu z akumulatora"
+ 
+-#: ../panels/power/cc-power-panel.c:1731
++#: ../panels/power/cc-power-panel.c:1742
+ msgid "When plugged in"
+ msgstr "Kiedy jest podłączony"
+ 
+-#: ../panels/power/cc-power-panel.c:1860
++#: ../panels/power/cc-power-panel.c:1871
+ msgid "Suspend & Power Off"
+ msgstr "Usypianie i wyłączanie komputera"
+ 
+-#: ../panels/power/cc-power-panel.c:1893
++#: ../panels/power/cc-power-panel.c:1904
+ msgid "_Automatic suspend"
+ msgstr "_Automatyczne usypianie"
+ 
+-#: ../panels/power/cc-power-panel.c:1917
++#: ../panels/power/cc-power-panel.c:1928
+ msgid "When battery power is _critical"
+ msgstr "Kiedy poziom naładowania akumulatora jest _krytycznie niski"
+ 
+-#: ../panels/power/cc-power-panel.c:1974
++#: ../panels/power/cc-power-panel.c:1985
+ msgid "Power Off"
+ msgstr "Wyłączenie komputera"
+ 
+-#: ../panels/power/cc-power-panel.c:2111
++#: ../panels/power/cc-power-panel.c:2122
+ msgid "Devices"
+ msgstr "Urządzenia"
+ 
+@@ -4138,7 +4067,7 @@ msgid "Authenticate"
+ msgstr "Uwierzytelnij"
+ 
+ #: ../panels/printers/authentication-dialog.ui.h:5
+-#: ../panels/sharing/sharing.ui.h:23
++#: ../panels/sharing/sharing.ui.h:21
+ #: ../panels/user-accounts/data/account-dialog.ui.h:6
+ msgid "Password"
+ msgstr "Hasło"
+@@ -4506,12 +4435,12 @@ msgid "%s Active Jobs"
+ msgstr "Aktywne zadania drukarki %s"
+ 
+ #. Translators: This item is a server which needs authentication to show its printers
+-#: ../panels/printers/pp-new-printer-dialog.c:1667
++#: ../panels/printers/pp-new-printer-dialog.c:1669
+ msgid "Server requires authentication"
+ msgstr "Serwer wymaga uwierzytelnienia"
+ 
+ #. Translators: No printers were found
+-#: ../panels/printers/pp-new-printer-dialog.c:1704
++#: ../panels/printers/pp-new-printer-dialog.c:1706
+ msgid "No printers detected."
+ msgstr "Nie wykryto drukarek."
+ 
+@@ -4684,6 +4613,10 @@ msgstr "Zadania"
+ msgid "Show _Jobs"
+ msgstr "Wyświetl _zadania"
+ 
++#: ../panels/printers/printers.ui.h:12
++msgid "Model"
++msgstr "Model"
++
+ #: ../panels/printers/printers.ui.h:15
+ msgid "label"
+ msgstr "etykieta"
+@@ -4718,39 +4651,39 @@ msgid ""
+ "doesn't seem to be available."
+ msgstr "Systemowa usługa drukowania jest niedostępna."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:245 ../panels/privacy/privacy.ui.h:26
++#: ../panels/privacy/cc-privacy-panel.c:248 ../panels/privacy/privacy.ui.h:26
+ msgid "Screen Lock"
+ msgstr "Blokada ekranu"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:358 ../panels/privacy/privacy.ui.h:20
++#: ../panels/privacy/cc-privacy-panel.c:361 ../panels/privacy/privacy.ui.h:20
+ msgid "Usage & History"
+ msgstr "Użycie i historia"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:486
++#: ../panels/privacy/cc-privacy-panel.c:489
+ msgid "Empty all items from Trash?"
+ msgstr "Usunąć wszystkie elementy z kosza?"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:487
++#: ../panels/privacy/cc-privacy-panel.c:490
+ msgid "All items in the Trash will be permanently deleted."
+ msgstr "Wszystkie elementy w koszu zostaną trwale usunięte."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:488 ../panels/privacy/privacy.ui.h:32
++#: ../panels/privacy/cc-privacy-panel.c:491 ../panels/privacy/privacy.ui.h:32
+ msgid "_Empty Trash"
+ msgstr "_Opróżnij kosz"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:511
++#: ../panels/privacy/cc-privacy-panel.c:514
+ msgid "Delete all the temporary files?"
+ msgstr "Usunąć wszystkie pliki tymczasowe?"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:512
++#: ../panels/privacy/cc-privacy-panel.c:515
+ msgid "All the temporary files will be permanently deleted."
+ msgstr "Wszystkie pliki tymczasowe zostaną trwale usunięte."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:513 ../panels/privacy/privacy.ui.h:33
++#: ../panels/privacy/cc-privacy-panel.c:516 ../panels/privacy/privacy.ui.h:33
+ msgid "_Purge Temporary Files"
+ msgstr "_Usuń pliki tymczasowe"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:535 ../panels/privacy/privacy.ui.h:31
++#: ../panels/privacy/cc-privacy-panel.c:538 ../panels/privacy/privacy.ui.h:31
+ msgid "Purge Trash & Temporary Files"
+ msgstr "Usuwanie plików w koszu i plików tymczasowych"
+ 
+@@ -5104,21 +5037,21 @@ msgstr "Przenieś w dół"
+ msgid "Preferences"
+ msgstr "Preferencje"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:274
++#: ../panels/sharing/cc-sharing-panel.c:285
+ msgctxt "service is enabled"
+ msgid "On"
+ msgstr "Włączone"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:276
++#: ../panels/sharing/cc-sharing-panel.c:287
+ msgctxt "service is disabled"
+ msgid "Off"
+ msgstr "Wyłączone"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:418
++#: ../panels/sharing/cc-sharing-panel.c:422
+ msgid "Choose a Folder"
+ msgstr "Wybór katalogu"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:702
++#: ../panels/sharing/cc-sharing-panel.c:736
+ msgid "Copy"
+ msgstr "Skopiuj"
+ 
+@@ -5162,71 +5095,63 @@ msgstr ""
+ "urządzeniami obsługującymi Bluetooth"
+ 
+ #: ../panels/sharing/sharing.ui.h:3
+-msgid "Share Public Folder"
+-msgstr "Współdzielenie katalogu publicznego"
+-
+-#: ../panels/sharing/sharing.ui.h:4
+ msgid "Only Receive From Trusted Devices"
+ msgstr "Pobieranie tylko od zaufanych urządzeń"
+ 
+-#: ../panels/sharing/sharing.ui.h:5
++#: ../panels/sharing/sharing.ui.h:4
+ msgid "Save Received Files to Downloads Folder"
+ msgstr "Zapisywanie pobranych plików w katalogu Pobrane"
+ 
+-#: ../panels/sharing/sharing.ui.h:6
+-msgid "Only share with Trusted Devices"
+-msgstr "Współdzielenie tylko z zaufanymi urządzeniami"
+-
+-#: ../panels/sharing/sharing.ui.h:7
++#: ../panels/sharing/sharing.ui.h:5
+ msgid "Computer Name"
+ msgstr "Nazwa komputera"
+ 
+-#: ../panels/sharing/sharing.ui.h:8
++#: ../panels/sharing/sharing.ui.h:6
+ msgid "Personal File Sharing"
+ msgstr "Współdzielenie plików osobistych"
+ 
+-#: ../panels/sharing/sharing.ui.h:9
++#: ../panels/sharing/sharing.ui.h:7
+ msgid "Screen Sharing"
+ msgstr "Współdzielenie ekranu"
+ 
+-#: ../panels/sharing/sharing.ui.h:10
++#: ../panels/sharing/sharing.ui.h:8
+ msgid "Media Sharing"
+ msgstr "Współdzielenie multimediów"
+ 
+-#: ../panels/sharing/sharing.ui.h:11
++#: ../panels/sharing/sharing.ui.h:9
+ msgid "Remote Login"
+ msgstr "Zdalne logowanie"
+ 
+-#: ../panels/sharing/sharing.ui.h:12
++#: ../panels/sharing/sharing.ui.h:10
+ msgid "Some services are disabled because of no network access."
+ msgstr "Niektóre usługi są wyłączone z powodu braku dostępu do sieci."
+ 
+-#: ../panels/sharing/sharing.ui.h:13
++#: ../panels/sharing/sharing.ui.h:11
+ msgid "Share Music, Photos and Videos with others on the current network."
+ msgstr ""
+ "Współdzielenie muzyki, zdjęć i filmów z innymi użytkownikami bieżącej sieci."
+ 
+-#: ../panels/sharing/sharing.ui.h:14
++#: ../panels/sharing/sharing.ui.h:12
+ msgid "Share Media On This Network"
+ msgstr "Współdzielenie multimediów w tej sieci"
+ 
+-#: ../panels/sharing/sharing.ui.h:15
++#: ../panels/sharing/sharing.ui.h:13
+ msgid "Shared Folders"
+ msgstr "Współdzielone katalogi"
+ 
+-#: ../panels/sharing/sharing.ui.h:16
++#: ../panels/sharing/sharing.ui.h:14
+ msgid "column"
+ msgstr "kolumna"
+ 
+-#: ../panels/sharing/sharing.ui.h:17
++#: ../panels/sharing/sharing.ui.h:15
+ msgid "Add Folder"
+ msgstr "Dodaj katalog"
+ 
+-#: ../panels/sharing/sharing.ui.h:18
++#: ../panels/sharing/sharing.ui.h:16
+ msgid "Remove Folder"
+ msgstr "Usuń katalog"
+ 
+-#: ../panels/sharing/sharing.ui.h:20
++#: ../panels/sharing/sharing.ui.h:18
+ #, no-c-format
+ msgid ""
+ "Personal File Sharing allows you to share your Public folder with others on "
+@@ -5236,15 +5161,15 @@ msgstr ""
+ "z innymi użytkownikami bieżącej sieci używając: <a href=\"dav://%s\">dav://"
+ "%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:21
++#: ../panels/sharing/sharing.ui.h:19
+ msgid "Share Public Folder On This Network"
+ msgstr "Współdzielenie katalogu publicznego w tej sieci"
+ 
+-#: ../panels/sharing/sharing.ui.h:22
++#: ../panels/sharing/sharing.ui.h:20
+ msgid "Require Password"
+ msgstr "Wymaganie hasła"
+ 
+-#: ../panels/sharing/sharing.ui.h:25
++#: ../panels/sharing/sharing.ui.h:23
+ #, no-c-format
+ msgid ""
+ "Allow remote users to connect using the Secure Shell command:\n"
+@@ -5253,7 +5178,7 @@ msgstr ""
+ "Umożliwia zdalnym użytkownikom na łączenie się używając polecenia SSH:\n"
+ "<a href=\"ssh %s\">ssh %s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:28
++#: ../panels/sharing/sharing.ui.h:26
+ #, no-c-format
+ msgid ""
+ "Allow remote users to view or control your screen by connecting to: <a href="
+@@ -5262,19 +5187,19 @@ msgstr ""
+ "Umożliwia zdalnym użytkownikom na wyświetlanie lub kontrolowanie ekranu "
+ "przez połączenie się z: <a href=\"vnc://%s\">vnc://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:29
++#: ../panels/sharing/sharing.ui.h:27
+ msgid "Remote View"
+-msgstr "Widok zdalny"
++msgstr "Zdalny widok"
+ 
+-#: ../panels/sharing/sharing.ui.h:30
++#: ../panels/sharing/sharing.ui.h:28
+ msgid "Remote Control"
+-msgstr "Usuń kontrolę"
++msgstr "Zdalna kontrola"
+ 
+-#: ../panels/sharing/sharing.ui.h:31
++#: ../panels/sharing/sharing.ui.h:29
+ msgid "Approve All Connections"
+ msgstr "Akceptowanie wszystkich połączeń"
+ 
+-#: ../panels/sharing/sharing.ui.h:32
++#: ../panels/sharing/sharing.ui.h:30
+ msgid "Show Password"
+ msgstr "Wyświetlanie hasła"
+ 
+@@ -5973,7 +5898,7 @@ msgid "_Full Name"
+ msgstr "Imię i _nazwisko"
+ 
+ #: ../panels/user-accounts/data/account-dialog.ui.h:5
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+ msgid "Account _Type"
+ msgstr "_Typ konta"
+ 
+@@ -6130,71 +6055,35 @@ msgstr "Obecne _hasło"
+ msgid "Ch_ange"
+ msgstr "_Zmień"
+ 
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:1
+-msgid "Changing photo for:"
+-msgstr "Zmienianie zdjęcia dla:"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
+-msgid ""
+-"Choose a picture that will be shown at the login screen for this account."
+-msgstr ""
+-"Proszę wybrać obraz, który będzie wyświetlany na ekranie logowania dla tego "
+-"konta."
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
+-msgid "Gallery"
+-msgstr "Galeria"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:4
+-#: ../panels/user-accounts/um-photo-dialog.c:218
+-msgid "Browse for more pictures"
+-msgstr "Przeglądanie innych obrazów"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:5
+-msgid "Take a photograph"
+-msgstr "Zrób zdjęcie"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:6
+-msgid "Browse"
+-msgstr "Przeglądaj"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:7
+-msgid "Photograph"
+-msgstr "Zdjęcie"
+-
+ #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+-msgid "Account Information"
+-msgstr "Informacje o koncie"
+-
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Add User Account"
+ msgstr "Dodaj konto użytkownika"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Remove User Account"
+ msgstr "Usuń konto użytkownika"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+ msgid "Login Options"
+ msgstr "Opcje logowania"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+ msgid "A_utomatic Login"
+ msgstr "Logowanie a_utomatyczne"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+ msgid "_Fingerprint Login"
+ msgstr "Logowania za pomocą _odcisku palca"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+ msgid "User Icon"
+ msgstr "Ikona użytkownika"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+ msgid "_Language"
+ msgstr "_Język"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+ msgid "Last Login"
+ msgstr "Ostatnie logowanie"
+ 
+@@ -6618,6 +6507,10 @@ msgstr "Nie można zmienić hasła"
+ msgid "The passwords do not match."
+ msgstr "Hasła się nie zgadzają."
+ 
++#: ../panels/user-accounts/um-photo-dialog.c:218
++msgid "Browse for more pictures"
++msgstr "Przeglądanie innych obrazów"
++
+ #: ../panels/user-accounts/um-photo-dialog.c:443
+ msgid "Disable image"
+ msgstr "Wyłącz obraz"
+@@ -6820,7 +6713,7 @@ msgstr ""
+ "przycisk skrótu klawiszowego i przytrzymać nowe klawisze lub nacisnąć "
+ "klawisz Backspace, aby wyczyścić obecne."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:82
++#: ../panels/wacom/calibrator/calibrator-gui.c:84
+ msgid ""
+ "Please tap the target markers as they appear on screen to calibrate the "
+ "tablet."
+@@ -6828,7 +6721,7 @@ msgstr ""
+ "Proszę stuknąć znaczniki docelowe po ich pojawieniu się na ekranie, aby "
+ "skalibrować tablet."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:86
++#: ../panels/wacom/calibrator/calibrator-gui.c:88
+ msgid "Mis-click detected, restarting..."
+ msgstr "Wykryto błędne kliknięcie, uruchamianie ponownie..."
+ 
+@@ -6881,7 +6774,7 @@ msgstr "Mapowanie do pojedynczego monitora"
+ msgid "%d of %d"
+ msgstr "%d z %d"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:522
++#: ../panels/wacom/cc-wacom-page.c:531
+ msgid "Display Mapping"
+ msgstr "Mapowanie ekranu"
+ 
+@@ -7018,22 +6911,22 @@ msgstr "Przełącznik trybu prawego TouchStrip"
+ msgid "Mode Switch #%d"
+ msgstr "Przełącznik trybu #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1336
++#: ../panels/wacom/gsd-wacom-device.c:1335
+ #, c-format
+ msgid "Left Button #%d"
+ msgstr "Lewy przycisk #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1339
++#: ../panels/wacom/gsd-wacom-device.c:1338
+ #, c-format
+ msgid "Right Button #%d"
+ msgstr "Prawy przycisk #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1342
++#: ../panels/wacom/gsd-wacom-device.c:1341
+ #, c-format
+ msgid "Top Button #%d"
+ msgstr "Górny przycisk #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1345
++#: ../panels/wacom/gsd-wacom-device.c:1344
+ #, c-format
+ msgid "Bottom Button #%d"
+ msgstr "Dolny przycisk #%d"
+@@ -7139,11 +7032,11 @@ msgstr "Panel do wyświetlenia"
+ msgid "[PANEL] [ARGUMENT…]"
+ msgstr "[PANEL] [PARAMETR…]"
+ 
+-#: ../shell/cc-application.c:142
++#: ../shell/cc-application.c:145
+ msgid "- Settings"
+ msgstr "- ustawienia"
+ 
+-#: ../shell/cc-application.c:160
++#: ../shell/cc-application.c:163
+ #, c-format
+ msgid ""
+ "%s\n"
+@@ -7153,39 +7046,39 @@ msgstr ""
+ "Polecenie \"%s --help\" wyświetla pełną listę dostępnych opcji wiersza "
+ "poleceń.\n"
+ 
+-#: ../shell/cc-application.c:190
++#: ../shell/cc-application.c:193
+ msgid "Available panels:"
+ msgstr "Dostępne panele:"
+ 
+-#: ../shell/cc-application.c:325
++#: ../shell/cc-application.c:328
+ msgid "Help"
+ msgstr "Pomoc"
+ 
+-#: ../shell/cc-application.c:326
++#: ../shell/cc-application.c:329
+ msgid "Quit"
+ msgstr "Zakończ"
+ 
+-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1479
++#: ../shell/cc-window.c:61 ../shell/cc-window.c:1486
+ msgid "All Settings"
+ msgstr "Wszystkie ustawienia"
+ 
+ #. Add categories
+-#: ../shell/cc-window.c:866
++#: ../shell/cc-window.c:868
+ msgctxt "category"
+ msgid "Personal"
+ msgstr "Osobiste"
+ 
+-#: ../shell/cc-window.c:867
++#: ../shell/cc-window.c:869
+ msgctxt "category"
+ msgid "Hardware"
+ msgstr "Sprzęt"
+ 
+-#: ../shell/cc-window.c:868
++#: ../shell/cc-window.c:870
+ msgctxt "category"
+ msgid "System"
+ msgstr "System"
+ 
+-#: ../shell/cc-window.c:1588 ../shell/gnome-control-center.desktop.in.in.h:1
++#: ../shell/cc-window.c:1597 ../shell/gnome-control-center.desktop.in.in.h:1
+ msgid "Settings"
+ msgstr "Ustawienia"
+ 
+diff --git a/po/pt_BR.po b/po/pt_BR.po
+index 08ce7da..ed24c59 100644
+--- a/po/pt_BR.po
++++ b/po/pt_BR.po
+@@ -1,5 +1,5 @@
+ # Brazilian Portuguese translation of GNOME Control Center.
+-# Copyright (C) 1999-2013 The GNOME Control Center authors.
++# Copyright (C) 1999-2014 The GNOME Control Center authors.
+ # This file is distributed under the same license as the gnome-control-center package.
+ # Ivan Passos <ivan@cyclades.com>, 1999.
+ # Sandro Nunes Henrique <sandro@conectiva.com.br>, 1999.
+@@ -22,7 +22,7 @@
+ # Antonio Fernandes C. Neto <fernandes@pelivre.org>, 2010, 2013.
+ # Hugo Vaz Sampaio <hvazsampaio@gmail.com>, 2010.
+ # Djavan Fagundes <djavan@comum.org>, 2012.
+-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2012, 2013.
++# Rafael Ferreira <rafael.f.f1@gmail.com>, 2012, 2013, 2014.
+ # Georges Basile Stavracas Neto <georges.stavracas@gmail.com>, 2013.
+ # Enrico Nicoletto <liverig@gmail.com>, 2012, 2013.
+ #
+@@ -31,16 +31,16 @@ msgstr ""
+ "Project-Id-Version: gnome-control-center\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "control-center&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-11-03 14:06+0000\n"
+-"PO-Revision-Date: 2013-09-20 22:38-0300\n"
+-"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
++"POT-Creation-Date: 2014-01-18 03:01+0000\n"
++"PO-Revision-Date: 2014-01-20 04:58-0300\n"
++"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
+ "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
+ "Language: pt_BR\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: Poedit 1.5.4\n"
++"X-Generator: Poedit 1.6.3\n"
+ "X-Project-Style: gnome\n"
+ 
+ #: ../panels/background/background.ui.h:1
+@@ -121,11 +121,11 @@ msgstr "Nenhuma imagem encontrada"
+ msgid "You can add images to your %s folder and they will show up here"
+ msgstr "Você pode adicionar imagens para a pasta %s e elas aparecerão aqui."
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:428
++#: ../panels/background/cc-background-chooser-dialog.c:429
+ #: ../panels/bluetooth/cc-bluetooth-panel.c:640
+ #: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
+-#: ../panels/display/cc-display-panel.c:1509
+-#: ../panels/display/cc-display-panel.c:1924
++#: ../panels/display/cc-display-panel.c:1510
++#: ../panels/display/cc-display-panel.c:1952
+ #: ../panels/network/connection-editor/vpn-helpers.c:245
+ #: ../panels/network/connection-editor/vpn-helpers.c:374
+ #: ../panels/network/net-device-wifi.c:1194
+@@ -135,7 +135,7 @@ msgstr "Você pode adicionar imagens para a pasta %s e elas aparecerão aqui."
+ #: ../panels/printers/new-printer-dialog.ui.h:2
+ #: ../panels/privacy/cc-privacy-panel.c:470
+ #: ../panels/search/cc-search-locations-dialog.c:682
+-#: ../panels/sharing/cc-sharing-panel.c:435
++#: ../panels/sharing/cc-sharing-panel.c:425
+ #: ../panels/user-accounts/um-fingerprint-dialog.c:269
+ #: ../panels/user-accounts/um-photo-dialog.c:96
+ #: ../panels/user-accounts/um-photo-dialog.c:221
+@@ -143,7 +143,7 @@ msgstr "Você pode adicionar imagens para a pasta %s e elas aparecerão aqui."
+ msgid "_Cancel"
+ msgstr "_Cancelar"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:429
++#: ../panels/background/cc-background-chooser-dialog.c:430
+ #: ../panels/printers/ppd-selection-dialog.ui.h:3
+ #: ../panels/user-accounts/um-photo-dialog.c:98
+ msgid "Select"
+@@ -636,7 +636,7 @@ msgstr "Concluído"
+ #. 15000 = 15 sec
+ #. 750 = 0.75 sec
+ #. Text printed on screen
+-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
++#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:83
+ msgid "Screen Calibration"
+ msgstr "Calibração de tela"
+ 
+@@ -1148,21 +1148,21 @@ msgid "To change time or date settings, you need to authenticate."
+ msgstr ""
+ "Para modificar configurações de data ou hora você precisa se autenticar."
+ 
+-#: ../panels/display/cc-display-panel.c:485
++#: ../panels/display/cc-display-panel.c:486
+ msgid "Lid Closed"
+ msgstr "Tampa fechada"
+ 
+ #. translators: "Mirrored" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:488
++#: ../panels/display/cc-display-panel.c:489
+ msgid "Mirrored"
+ msgstr "Espelhadas"
+ 
+-#: ../panels/display/cc-display-panel.c:490
+-#: ../panels/display/cc-display-panel.c:2057
++#: ../panels/display/cc-display-panel.c:491
++#: ../panels/display/cc-display-panel.c:2101
+ msgid "Primary"
+ msgstr "Primária"
+ 
+-#: ../panels/display/cc-display-panel.c:492
++#: ../panels/display/cc-display-panel.c:493
+ #: ../panels/notifications/cc-notifications-panel.c:205
+ #: ../panels/power/cc-power-panel.c:1738 ../panels/power/cc-power-panel.c:1749
+ #: ../panels/privacy/cc-privacy-panel.c:80
+@@ -1174,82 +1174,81 @@ msgstr "Primária"
+ msgid "Off"
+ msgstr "Off"
+ 
+-#: ../panels/display/cc-display-panel.c:495
++#: ../panels/display/cc-display-panel.c:496
+ msgid "Secondary"
+ msgstr "Secundária"
+ 
+-#: ../panels/display/cc-display-panel.c:1505
++#: ../panels/display/cc-display-panel.c:1506
+ msgid "Arrange Combined Displays"
+ msgstr "Organizar telas combinadas"
+ 
+-#: ../panels/display/cc-display-panel.c:1511
+-#: ../panels/display/cc-display-panel.c:1927
++#: ../panels/display/cc-display-panel.c:1512
++#: ../panels/display/cc-display-panel.c:1955
+ #: ../panels/network/connection-editor/connection-editor.ui.h:1
+ msgid "_Apply"
+ msgstr "_Aplicar"
+ 
+-#: ../panels/display/cc-display-panel.c:1532
++#: ../panels/display/cc-display-panel.c:1533
+ msgid "Drag displays to rearrange them"
+ msgstr "Arraste as telas para organizá-las"
+ 
+-#. size
+-#: ../panels/display/cc-display-panel.c:1991
++#: ../panels/display/cc-display-panel.c:2037
+ msgid "Size"
+ msgstr "Tamanho"
+ 
+ #. aspect ratio
+-#: ../panels/display/cc-display-panel.c:2006
++#: ../panels/display/cc-display-panel.c:2050
+ msgid "Aspect Ratio"
+ msgstr "Taxa de proporção"
+ 
+-#: ../panels/display/cc-display-panel.c:2027
++#: ../panels/display/cc-display-panel.c:2071
+ #: ../panels/printers/pp-options-dialog.c:86
+ msgid "Resolution"
+ msgstr "Resolução"
+ 
+ # Geralmente o "panorama de atividades" é mencionado em maiúsculo. Seria o caso aqui?
+-#: ../panels/display/cc-display-panel.c:2058
++#: ../panels/display/cc-display-panel.c:2102
+ msgid "Show the top bar and Activities Overview on this display"
+ msgstr "Mostrar a barra superior e o panorama de atividades nesta tela"
+ 
+-#: ../panels/display/cc-display-panel.c:2064
++#: ../panels/display/cc-display-panel.c:2108
+ msgid "Secondary Display"
+ msgstr "Tela secundária"
+ 
+-#: ../panels/display/cc-display-panel.c:2065
++#: ../panels/display/cc-display-panel.c:2109
+ msgid "Join this display with another to create an extra workspace"
+ msgstr "Une esta tela a outra para criar um espaço de trabalho extra"
+ 
+-#: ../panels/display/cc-display-panel.c:2072
++#: ../panels/display/cc-display-panel.c:2116
+ msgid "Presentation"
+ msgstr "Apresentação"
+ 
+-#: ../panels/display/cc-display-panel.c:2073
++#: ../panels/display/cc-display-panel.c:2117
+ msgid "Show slideshows and media only"
+ msgstr "Mostra apenas apresentações de slides e mídia"
+ 
+ #. translators: "Mirror" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:2078
++#: ../panels/display/cc-display-panel.c:2122
+ msgid "Mirror"
+ msgstr "Espelhar"
+ 
+-#: ../panels/display/cc-display-panel.c:2079
++#: ../panels/display/cc-display-panel.c:2123
+ msgid "Show your existing view on both displays"
+ msgstr "Mostra sua visão existente em ambas as telas"
+ 
+-#: ../panels/display/cc-display-panel.c:2085
++#: ../panels/display/cc-display-panel.c:2129
+ msgid "Turn Off"
+ msgstr "Desligar"
+ 
+-#: ../panels/display/cc-display-panel.c:2086
++#: ../panels/display/cc-display-panel.c:2130
+ msgid "Don't use this display"
+ msgstr "Não usar esta tela"
+ 
+-#: ../panels/display/cc-display-panel.c:2301
++#: ../panels/display/cc-display-panel.c:2345
+ msgid "Could not get screen information"
+ msgstr "Não foi possível obter informação sobre a tela"
+ 
+-#: ../panels/display/cc-display-panel.c:2332
++#: ../panels/display/cc-display-panel.c:2376
+ msgid "_Arrange Combined Displays"
+ msgstr "Organiz_ar telas combinadas"
+ 
+@@ -1267,55 +1266,55 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
+ msgstr "Painel;Projetor;xrandr;Tela;Resolução;Atualizar;"
+ 
+ #. TRANSLATORS: AP type
+-#: ../panels/info/cc-info-panel.c:451 ../panels/network/panel-common.c:127
++#: ../panels/info/cc-info-panel.c:452 ../panels/network/panel-common.c:127
+ msgid "Unknown"
+ msgstr "Desconhecido"
+ 
+-#: ../panels/info/cc-info-panel.c:534
++#: ../panels/info/cc-info-panel.c:539
+ #, c-format
+ msgid "%s %d-bit"
+ msgstr "%s %d-bit"
+ 
+-#: ../panels/info/cc-info-panel.c:536
++#: ../panels/info/cc-info-panel.c:541
+ #, c-format
+ msgid "%d-bit"
+ msgstr "%d-bit"
+ 
+-#: ../panels/info/cc-info-panel.c:1216
++#: ../panels/info/cc-info-panel.c:1221
+ msgid "Ask what to do"
+ msgstr "Pergunte o que fazer"
+ 
+-#: ../panels/info/cc-info-panel.c:1220
++#: ../panels/info/cc-info-panel.c:1225
+ msgid "Do nothing"
+ msgstr "Não fazer nada"
+ 
+-#: ../panels/info/cc-info-panel.c:1224
++#: ../panels/info/cc-info-panel.c:1229
+ msgid "Open folder"
+ msgstr "Abrir pasta"
+ 
+-#: ../panels/info/cc-info-panel.c:1315
++#: ../panels/info/cc-info-panel.c:1320
+ msgid "Other Media"
+ msgstr "Outra mídia"
+ 
+-#: ../panels/info/cc-info-panel.c:1346
++#: ../panels/info/cc-info-panel.c:1351
+ msgid "Select an application for audio CDs"
+ msgstr "Selecione um aplicativo para CDs de áudio"
+ 
+-#: ../panels/info/cc-info-panel.c:1347
++#: ../panels/info/cc-info-panel.c:1352
+ msgid "Select an application for video DVDs"
+ msgstr "Selecione um aplicativo para DVDs de vídeo"
+ 
+-#: ../panels/info/cc-info-panel.c:1348
++#: ../panels/info/cc-info-panel.c:1353
+ msgid "Select an application to run when a music player is connected"
+ msgstr ""
+ "Selecione um aplicativo para executar quando um reprodutor de música é "
+ "conectado"
+ 
+-#: ../panels/info/cc-info-panel.c:1349
++#: ../panels/info/cc-info-panel.c:1354
+ msgid "Select an application to run when a camera is connected"
+ msgstr "Selecione um aplicativo para executar quando uma câmera é conectada"
+ 
+-#: ../panels/info/cc-info-panel.c:1350
++#: ../panels/info/cc-info-panel.c:1355
+ msgid "Select an application for software CDs"
+ msgstr "Selecione um aplicativo para CDs de software"
+ 
+@@ -1324,89 +1323,89 @@ msgstr "Selecione um aplicativo para CDs de software"
+ #. * If the shared-mime-info translation works for your language,
+ #. * simply leave these untranslated.
+ #.
+-#: ../panels/info/cc-info-panel.c:1362
++#: ../panels/info/cc-info-panel.c:1367
+ msgid "audio DVD"
+ msgstr "DVD de áudio"
+ 
+-#: ../panels/info/cc-info-panel.c:1363
++#: ../panels/info/cc-info-panel.c:1368
+ msgid "blank Blu-ray disc"
+ msgstr "Disco Blu-ray vazio"
+ 
+-#: ../panels/info/cc-info-panel.c:1364
++#: ../panels/info/cc-info-panel.c:1369
+ msgid "blank CD disc"
+ msgstr "Disco CD vazio"
+ 
+-#: ../panels/info/cc-info-panel.c:1365
++#: ../panels/info/cc-info-panel.c:1370
+ msgid "blank DVD disc"
+ msgstr "Disco DVD vazio"
+ 
+-#: ../panels/info/cc-info-panel.c:1366
++#: ../panels/info/cc-info-panel.c:1371
+ msgid "blank HD DVD disc"
+ msgstr "Disco HD DVD vazio"
+ 
+-#: ../panels/info/cc-info-panel.c:1367
++#: ../panels/info/cc-info-panel.c:1372
+ msgid "Blu-ray video disc"
+ msgstr "Disco Blu-ray de vídeo"
+ 
+-#: ../panels/info/cc-info-panel.c:1368
++#: ../panels/info/cc-info-panel.c:1373
+ msgid "e-book reader"
+ msgstr "Leitor de e-book"
+ 
+-#: ../panels/info/cc-info-panel.c:1369
++#: ../panels/info/cc-info-panel.c:1374
+ msgid "HD DVD video disc"
+ msgstr "Disco HD DVD de vídeo"
+ 
+-#: ../panels/info/cc-info-panel.c:1370
++#: ../panels/info/cc-info-panel.c:1375
+ msgid "Picture CD"
+ msgstr "CD de imagem"
+ 
+-#: ../panels/info/cc-info-panel.c:1371
++#: ../panels/info/cc-info-panel.c:1376
+ msgid "Super Video CD"
+ msgstr "Super Video CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1372
++#: ../panels/info/cc-info-panel.c:1377
+ msgid "Video CD"
+ msgstr "CD de vídeo"
+ 
+-#: ../panels/info/cc-info-panel.c:1373
++#: ../panels/info/cc-info-panel.c:1378
+ msgid "Windows software"
+ msgstr "Software do Windows"
+ 
+-#: ../panels/info/cc-info-panel.c:1374
++#: ../panels/info/cc-info-panel.c:1379
+ msgid "Software"
+ msgstr "Software"
+ 
+-#: ../panels/info/cc-info-panel.c:1497
++#: ../panels/info/cc-info-panel.c:1502
+ #: ../panels/keyboard/keyboard-shortcuts.c:1696
+ msgid "Section"
+ msgstr "Seção"
+ 
+-#: ../panels/info/cc-info-panel.c:1506 ../panels/info/info.ui.h:13
++#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:13
+ msgid "Overview"
+ msgstr "Visão geral"
+ 
+-#: ../panels/info/cc-info-panel.c:1512 ../panels/info/info.ui.h:20
++#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:20
+ msgid "Default Applications"
+ msgstr "Aplicativos padrões"
+ 
+-#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:28
++#: ../panels/info/cc-info-panel.c:1522 ../panels/info/info.ui.h:28
+ msgid "Removable Media"
+ msgstr "Mídia removível"
+ 
+-#: ../panels/info/cc-info-panel.c:1542
++#: ../panels/info/cc-info-panel.c:1547
+ #, c-format
+ msgid "Version %s"
+ msgstr "Versão %s"
+ 
+-#: ../panels/info/cc-info-panel.c:1592
++#: ../panels/info/cc-info-panel.c:1597
+ msgid "Install Updates"
+ msgstr "Instalar atualizações"
+ 
+-#: ../panels/info/cc-info-panel.c:1596
++#: ../panels/info/cc-info-panel.c:1601
+ msgid "System Up-To-Date"
+ msgstr "Sistema atualizado"
+ 
+-#: ../panels/info/cc-info-panel.c:1600
++#: ../panels/info/cc-info-panel.c:1605
+ msgid "Checking for Updates"
+ msgstr "Verificar atualizações"
+ 
+@@ -2502,23 +2501,23 @@ msgstr "VPN"
+ msgid "Bond"
+ msgstr "Vínculo"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:597
++#: ../panels/network/connection-editor/net-connection-editor.c:598
+ msgid "Bridge"
+ msgstr "Ponte"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:598
++#: ../panels/network/connection-editor/net-connection-editor.c:599
+ msgid "VLAN"
+ msgstr "VLAN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:749
++#: ../panels/network/connection-editor/net-connection-editor.c:750
+ msgid "Could not load VPN plugins"
+ msgstr "Não foi possível carregar os plug-ins de VPN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:818
++#: ../panels/network/connection-editor/net-connection-editor.c:819
+ msgid "Import from file…"
+ msgstr "Importar de arquivo…"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:889
++#: ../panels/network/connection-editor/net-connection-editor.c:890
+ msgid "Add Network Connection"
+ msgstr "Adicionar conexão de rede"
+ 
+@@ -2577,7 +2576,7 @@ msgstr "Selecione um arquivo para importar"
+ 
+ #: ../panels/network/connection-editor/vpn-helpers.c:246
+ #: ../panels/printers/cc-printers-panel.c:1947
+-#: ../panels/sharing/cc-sharing-panel.c:436
++#: ../panels/sharing/cc-sharing-panel.c:426
+ #: ../panels/user-accounts/um-photo-dialog.c:222
+ msgid "_Open"
+ msgstr "_Abrir"
+@@ -2720,6 +2719,11 @@ msgstr "Perfil %d"
+ msgid "Add new connection"
+ msgstr "Adicionar nova conexão"
+ 
++#: ../panels/network/net-device-team.c:77
++#| msgid "Bridge slaves"
++msgid "Team slaves"
++msgstr "Uniões escravas"
++
+ #: ../panels/network/net-device-wifi.c:1110
+ msgid ""
+ "If you have a connection to the Internet other than wireless, you can set up "
+@@ -4092,7 +4096,7 @@ msgid "Authenticate"
+ msgstr "Autenticar"
+ 
+ #: ../panels/printers/authentication-dialog.ui.h:5
+-#: ../panels/sharing/sharing.ui.h:23
++#: ../panels/sharing/sharing.ui.h:21
+ #: ../panels/user-accounts/data/account-dialog.ui.h:6
+ msgid "Password"
+ msgstr "Senha"
+@@ -5079,11 +5083,11 @@ msgctxt "service is disabled"
+ msgid "Off"
+ msgstr "Off"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:432
++#: ../panels/sharing/cc-sharing-panel.c:422
+ msgid "Choose a Folder"
+ msgstr "Escolha uma pasta"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:739
++#: ../panels/sharing/cc-sharing-panel.c:736
+ msgid "Copy"
+ msgstr "Copiar"
+ 
+@@ -5125,70 +5129,62 @@ msgstr ""
+ "outros dispositivos Bluetooth habilitados"
+ 
+ #: ../panels/sharing/sharing.ui.h:3
+-msgid "Share Public Folder"
+-msgstr "Compartilhar pasta pública"
+-
+-#: ../panels/sharing/sharing.ui.h:4
+ msgid "Only Receive From Trusted Devices"
+ msgstr "Apenas receber de dispositivos confiáveis"
+ 
+-#: ../panels/sharing/sharing.ui.h:5
++#: ../panels/sharing/sharing.ui.h:4
+ msgid "Save Received Files to Downloads Folder"
+ msgstr "Salvar arquivos recebidos na pasta de Downloads"
+ 
+-#: ../panels/sharing/sharing.ui.h:6
+-msgid "Only share with Trusted Devices"
+-msgstr "Apenas compartilhar com dispositivos confiáveis"
+-
+-#: ../panels/sharing/sharing.ui.h:7
++#: ../panels/sharing/sharing.ui.h:5
+ msgid "Computer Name"
+ msgstr "Nome do computador"
+ 
+-#: ../panels/sharing/sharing.ui.h:8
++#: ../panels/sharing/sharing.ui.h:6
+ msgid "Personal File Sharing"
+ msgstr "Compartilhamento de arquivos pessoais"
+ 
+-#: ../panels/sharing/sharing.ui.h:9
++#: ../panels/sharing/sharing.ui.h:7
+ msgid "Screen Sharing"
+ msgstr "Compartilhamento de tela"
+ 
+-#: ../panels/sharing/sharing.ui.h:10
++#: ../panels/sharing/sharing.ui.h:8
+ msgid "Media Sharing"
+ msgstr "Compartilhamento de multimídia"
+ 
+-#: ../panels/sharing/sharing.ui.h:11
++#: ../panels/sharing/sharing.ui.h:9
+ msgid "Remote Login"
+ msgstr "Sessão remota"
+ 
+-#: ../panels/sharing/sharing.ui.h:12
++#: ../panels/sharing/sharing.ui.h:10
+ msgid "Some services are disabled because of no network access."
+ msgstr "Alguns serviços estão desabilitados devido a falta de acesso à rede."
+ 
+-#: ../panels/sharing/sharing.ui.h:13
++#: ../panels/sharing/sharing.ui.h:11
+ msgid "Share Music, Photos and Videos with others on the current network."
+ msgstr "Compartilhe músicas, fotos e vídeos com outros na rede atual."
+ 
+-#: ../panels/sharing/sharing.ui.h:14
++#: ../panels/sharing/sharing.ui.h:12
+ msgid "Share Media On This Network"
+ msgstr "Compartilhar multimídia nesta rede"
+ 
+-#: ../panels/sharing/sharing.ui.h:15
++#: ../panels/sharing/sharing.ui.h:13
+ msgid "Shared Folders"
+ msgstr "Pastas compartilhadas"
+ 
+-#: ../panels/sharing/sharing.ui.h:16
++#: ../panels/sharing/sharing.ui.h:14
+ msgid "column"
+ msgstr "coluna"
+ 
+-#: ../panels/sharing/sharing.ui.h:17
++#: ../panels/sharing/sharing.ui.h:15
+ msgid "Add Folder"
+ msgstr "Adicionar pasta"
+ 
+-#: ../panels/sharing/sharing.ui.h:18
++#: ../panels/sharing/sharing.ui.h:16
+ msgid "Remove Folder"
+ msgstr "Remover pasta"
+ 
+-#: ../panels/sharing/sharing.ui.h:20
++#: ../panels/sharing/sharing.ui.h:18
+ #, no-c-format
+ msgid ""
+ "Personal File Sharing allows you to share your Public folder with others on "
+@@ -5198,15 +5194,15 @@ msgstr ""
+ "pasta pública com outros na sua rede atual usando: <a href=\"dav://%s"
+ "\">dav://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:21
++#: ../panels/sharing/sharing.ui.h:19
+ msgid "Share Public Folder On This Network"
+ msgstr "Compartilhar pasta pública nesta rede"
+ 
+-#: ../panels/sharing/sharing.ui.h:22
++#: ../panels/sharing/sharing.ui.h:20
+ msgid "Require Password"
+ msgstr "Exigir senha"
+ 
+-#: ../panels/sharing/sharing.ui.h:25
++#: ../panels/sharing/sharing.ui.h:23
+ #, no-c-format
+ msgid ""
+ "Allow remote users to connect using the Secure Shell command:\n"
+@@ -5215,7 +5211,7 @@ msgstr ""
+ "Permita que usuários remotos conectem-se usando o comando SSH:\n"
+ "<a href=\"ssh %s\">ssh %s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:28
++#: ../panels/sharing/sharing.ui.h:26
+ #, no-c-format
+ msgid ""
+ "Allow remote users to view or control your screen by connecting to: <a href="
+@@ -5224,19 +5220,19 @@ msgstr ""
+ "Permita que usuários remotos vejam e controlem sua tela conectando a: <a "
+ "href=\"vnc://%s\">vnc://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:29
++#: ../panels/sharing/sharing.ui.h:27
+ msgid "Remote View"
+ msgstr "Visão remota"
+ 
+-#: ../panels/sharing/sharing.ui.h:30
++#: ../panels/sharing/sharing.ui.h:28
+ msgid "Remote Control"
+ msgstr "Controle remoto"
+ 
+-#: ../panels/sharing/sharing.ui.h:31
++#: ../panels/sharing/sharing.ui.h:29
+ msgid "Approve All Connections"
+ msgstr "Aprovar todas as conexões"
+ 
+-#: ../panels/sharing/sharing.ui.h:32
++#: ../panels/sharing/sharing.ui.h:30
+ msgid "Show Password"
+ msgstr "Mostrar senha"
+ 
+@@ -6745,7 +6741,7 @@ msgstr ""
+ "pressione o botão de atalho no teclado e mantenha pressionada as novas "
+ "teclas ou pressione a tecla Backspace para limpar."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:82
++#: ../panels/wacom/calibrator/calibrator-gui.c:84
+ msgid ""
+ "Please tap the target markers as they appear on screen to calibrate the "
+ "tablet."
+@@ -6753,7 +6749,7 @@ msgstr ""
+ "Por gentileza, \"bata\" nos marcadores-alvo a medida que eles aparecem na "
+ "tela para calibrar o tablet."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:86
++#: ../panels/wacom/calibrator/calibrator-gui.c:88
+ msgid "Mis-click detected, restarting..."
+ msgstr "Foi detectado clique errado, reiniciando..."
+ 
+@@ -7065,11 +7061,11 @@ msgstr "Painel para exibir"
+ msgid "[PANEL] [ARGUMENT…]"
+ msgstr "[PAINEL] [ARGUMENTO…]"
+ 
+-#: ../shell/cc-application.c:142
++#: ../shell/cc-application.c:145
+ msgid "- Settings"
+ msgstr "- Configurações"
+ 
+-#: ../shell/cc-application.c:160
++#: ../shell/cc-application.c:163
+ #, c-format
+ msgid ""
+ "%s\n"
+@@ -7079,15 +7075,15 @@ msgstr ""
+ "Execute '%s --help' para ver uma lista completa de opções de linha de "
+ "comando disponíveis.\n"
+ 
+-#: ../shell/cc-application.c:190
++#: ../shell/cc-application.c:193
+ msgid "Available panels:"
+ msgstr "Painéis disponíveis:"
+ 
+-#: ../shell/cc-application.c:325
++#: ../shell/cc-application.c:328
+ msgid "Help"
+ msgstr "Ajuda"
+ 
+-#: ../shell/cc-application.c:326
++#: ../shell/cc-application.c:329
+ msgid "Quit"
+ msgstr "Sair"
+ 
+@@ -7119,6 +7115,12 @@ msgstr "Configurações"
+ msgid "Preferences;Settings;"
+ msgstr "Preferências;Configurações;Ajustes;"
+ 
++#~ msgid "Share Public Folder"
++#~ msgstr "Compartilhar pasta pública"
++
++#~ msgid "Only share with Trusted Devices"
++#~ msgstr "Apenas compartilhar com dispositivos confiáveis"
++
+ #~ msgid "Device type:"
+ #~ msgstr "Tipo de dispositivo:"
+ 
+diff --git a/po/ru.po b/po/ru.po
+index 4f3f78d..72fe108 100644
+--- a/po/ru.po
++++ b/po/ru.po
+@@ -15,15 +15,15 @@
+ # Yuri Kozlov <yuray@komyakino.ru>, 2010, 2012.
+ # Dmitry Shachnev <mitya57@ubuntu.com>, 2012.
+ # Yuri Myasoedov <omerta13@yandex.ru>, 2012.
+-# Stas Solovey <whats_up@tut.by>, 2012, 2013.
++# Stas Solovey <whats_up@tut.by>, 2012, 2013, 2014.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: ru\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "control-center&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-10-15 21:30+0000\n"
+-"PO-Revision-Date: 2013-10-14 21:32+0300\n"
++"POT-Creation-Date: 2014-01-29 04:52+0000\n"
++"PO-Revision-Date: 2014-01-29 16:39+0300\n"
+ "Last-Translator: Stas Solovey <whats_up@tut.by>\n"
+ "Language-Team: Русский <gnome-cyr@gnome.org>\n"
+ "Language: ru\n"
+@@ -111,11 +111,11 @@ msgstr "Изображения не найдены"
+ msgid "You can add images to your %s folder and they will show up here"
+ msgstr "Можно добавить изображения в папку %s и они будут показаны здесь"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:428
++#: ../panels/background/cc-background-chooser-dialog.c:429
+ #: ../panels/bluetooth/cc-bluetooth-panel.c:640
+ #: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
+-#: ../panels/display/cc-display-panel.c:1509
+-#: ../panels/display/cc-display-panel.c:1924
++#: ../panels/display/cc-display-panel.c:1510
++#: ../panels/display/cc-display-panel.c:1952
+ #: ../panels/network/connection-editor/vpn-helpers.c:245
+ #: ../panels/network/connection-editor/vpn-helpers.c:374
+ #: ../panels/network/net-device-wifi.c:1194
+@@ -125,7 +125,7 @@ msgstr "Можно добавить изображения в папку %s и 
+ #: ../panels/printers/new-printer-dialog.ui.h:2
+ #: ../panels/privacy/cc-privacy-panel.c:470
+ #: ../panels/search/cc-search-locations-dialog.c:682
+-#: ../panels/sharing/cc-sharing-panel.c:435
++#: ../panels/sharing/cc-sharing-panel.c:425
+ #: ../panels/user-accounts/um-fingerprint-dialog.c:269
+ #: ../panels/user-accounts/um-photo-dialog.c:96
+ #: ../panels/user-accounts/um-photo-dialog.c:221
+@@ -133,7 +133,7 @@ msgstr "Можно добавить изображения в папку %s и 
+ msgid "_Cancel"
+ msgstr "_Отмена"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:429
++#: ../panels/background/cc-background-chooser-dialog.c:430
+ #: ../panels/printers/ppd-selection-dialog.ui.h:3
+ #: ../panels/user-accounts/um-photo-dialog.c:98
+ msgid "Select"
+@@ -622,7 +622,7 @@ msgstr "Выполнено"
+ #. 15000 = 15 sec
+ #. 750 = 0.75 sec
+ #. Text printed on screen
+-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
++#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:83
+ msgid "Screen Calibration"
+ msgstr "Калибровка экрана"
+ 
+@@ -967,15 +967,17 @@ msgstr "Язык"
+ msgid "_Done"
+ msgstr "_Выполнено"
+ 
++# fix даты
+ #. Translators: This is the full date and time format used in 12-hour mode.
+ #: ../panels/datetime/cc-datetime-panel.c:363
+ msgid "%e %B %Y, %l:%M %p"
+-msgstr "%e %B %Y, %l:%M %p"
++msgstr "%e %b., %Y, %l:%M %p"
+ 
++# fix даты
+ #. Translators: This is the full date and time format used in 24-hour mode.
+ #: ../panels/datetime/cc-datetime-panel.c:368
+ msgid "%e %B %Y, %R"
+-msgstr "%e %B %Y, %R"
++msgstr "%e %b., %Y, %R"
+ 
+ #. Translators: UTC here means the Coordinated Universal Time.
+ #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
+@@ -1128,23 +1130,23 @@ msgstr "Изменить системное время и дату"
+ msgid "To change time or date settings, you need to authenticate."
+ msgstr "Для изменения времени или даты требуется аутентификация."
+ 
+-#: ../panels/display/cc-display-panel.c:485
++#: ../panels/display/cc-display-panel.c:486
+ msgid "Lid Closed"
+ msgstr "Крышка ноутбука закрыта"
+ 
+ #. translators: "Mirrored" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:488
++#: ../panels/display/cc-display-panel.c:489
+ msgid "Mirrored"
+ msgstr "Дублируемый"
+ 
+-#: ../panels/display/cc-display-panel.c:490
+-#: ../panels/display/cc-display-panel.c:2057
++#: ../panels/display/cc-display-panel.c:491
++#: ../panels/display/cc-display-panel.c:2101
+ msgid "Primary"
+ msgstr "Основной"
+ 
+-#: ../panels/display/cc-display-panel.c:492
++#: ../panels/display/cc-display-panel.c:493
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1738 ../panels/power/cc-power-panel.c:1749
++#: ../panels/power/cc-power-panel.c:1743 ../panels/power/cc-power-panel.c:1754
+ #: ../panels/privacy/cc-privacy-panel.c:80
+ #: ../panels/privacy/cc-privacy-panel.c:120
+ #: ../panels/universal-access/cc-ua-panel.c:257
+@@ -1154,81 +1156,80 @@ msgstr "Основной"
+ msgid "Off"
+ msgstr "Выключен"
+ 
+-#: ../panels/display/cc-display-panel.c:495
++#: ../panels/display/cc-display-panel.c:496
+ msgid "Secondary"
+ msgstr "Дополнительный"
+ 
+-#: ../panels/display/cc-display-panel.c:1505
++#: ../panels/display/cc-display-panel.c:1506
+ msgid "Arrange Combined Displays"
+ msgstr "Упорядочить сгруппированные экраны"
+ 
+-#: ../panels/display/cc-display-panel.c:1511
+-#: ../panels/display/cc-display-panel.c:1927
++#: ../panels/display/cc-display-panel.c:1512
++#: ../panels/display/cc-display-panel.c:1955
+ #: ../panels/network/connection-editor/connection-editor.ui.h:1
+ msgid "_Apply"
+ msgstr "_Применить"
+ 
+-#: ../panels/display/cc-display-panel.c:1532
++#: ../panels/display/cc-display-panel.c:1533
+ msgid "Drag displays to rearrange them"
+ msgstr "Перетащите экраны, чтобы изменить их порядок"
+ 
+-#. size
+-#: ../panels/display/cc-display-panel.c:1991
++#: ../panels/display/cc-display-panel.c:2037
+ msgid "Size"
+ msgstr "Размер"
+ 
+ #. aspect ratio
+-#: ../panels/display/cc-display-panel.c:2006
++#: ../panels/display/cc-display-panel.c:2050
+ msgid "Aspect Ratio"
+ msgstr "Соотношение сторон"
+ 
+-#: ../panels/display/cc-display-panel.c:2027
++#: ../panels/display/cc-display-panel.c:2071
+ #: ../panels/printers/pp-options-dialog.c:86
+ msgid "Resolution"
+ msgstr "Разрешение"
+ 
+-#: ../panels/display/cc-display-panel.c:2058
++#: ../panels/display/cc-display-panel.c:2102
+ msgid "Show the top bar and Activities Overview on this display"
+ msgstr "Показывать верхнюю панель и режим обзора на этом дисплее"
+ 
+-#: ../panels/display/cc-display-panel.c:2064
++#: ../panels/display/cc-display-panel.c:2108
+ msgid "Secondary Display"
+ msgstr "Дополнительный экран"
+ 
+-#: ../panels/display/cc-display-panel.c:2065
++#: ../panels/display/cc-display-panel.c:2109
+ msgid "Join this display with another to create an extra workspace"
+ msgstr "Объединить этот дисплей с другим для увеличения рабочего пространства"
+ 
+-#: ../panels/display/cc-display-panel.c:2072
++#: ../panels/display/cc-display-panel.c:2116
+ msgid "Presentation"
+ msgstr "Презентация"
+ 
+-#: ../panels/display/cc-display-panel.c:2073
++#: ../panels/display/cc-display-panel.c:2117
+ msgid "Show slideshows and media only"
+ msgstr "Показывать только слайд-шоу и мультимедиа"
+ 
+ #. translators: "Mirror" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:2078
++#: ../panels/display/cc-display-panel.c:2122
+ msgid "Mirror"
+ msgstr "Зеркало"
+ 
+-#: ../panels/display/cc-display-panel.c:2079
++#: ../panels/display/cc-display-panel.c:2123
+ msgid "Show your existing view on both displays"
+ msgstr "Показывать текущий вид на обоих дисплеях"
+ 
+-#: ../panels/display/cc-display-panel.c:2085
++#: ../panels/display/cc-display-panel.c:2129
+ msgid "Turn Off"
+ msgstr "Выключить"
+ 
+-#: ../panels/display/cc-display-panel.c:2086
++#: ../panels/display/cc-display-panel.c:2130
+ msgid "Don't use this display"
+ msgstr "Не использовать этот монитор"
+ 
+-#: ../panels/display/cc-display-panel.c:2301
++#: ../panels/display/cc-display-panel.c:2345
+ msgid "Could not get screen information"
+ msgstr "Не удалось получить информацию об экране"
+ 
+-#: ../panels/display/cc-display-panel.c:2332
++#: ../panels/display/cc-display-panel.c:2376
+ msgid "_Arrange Combined Displays"
+ msgstr "_Расположить объединённые дисплеи"
+ 
+@@ -1246,53 +1247,53 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
+ msgstr "Панель;Проектор;xrandr;Экран;Разрешение;Обновить;"
+ 
+ #. TRANSLATORS: AP type
+-#: ../panels/info/cc-info-panel.c:451 ../panels/network/panel-common.c:127
++#: ../panels/info/cc-info-panel.c:452 ../panels/network/panel-common.c:127
+ msgid "Unknown"
+ msgstr "Неизвестно"
+ 
+-#: ../panels/info/cc-info-panel.c:534
++#: ../panels/info/cc-info-panel.c:539
+ #, c-format
+ msgid "%s %d-bit"
+ msgstr "%s %d-бит"
+ 
+-#: ../panels/info/cc-info-panel.c:536
++#: ../panels/info/cc-info-panel.c:541
+ #, c-format
+ msgid "%d-bit"
+ msgstr "%d-бит"
+ 
+-#: ../panels/info/cc-info-panel.c:1216
++#: ../panels/info/cc-info-panel.c:1221
+ msgid "Ask what to do"
+ msgstr "Спрашивать, что делать"
+ 
+-#: ../panels/info/cc-info-panel.c:1220
++#: ../panels/info/cc-info-panel.c:1225
+ msgid "Do nothing"
+ msgstr "Ничего не делать"
+ 
+-#: ../panels/info/cc-info-panel.c:1224
++#: ../panels/info/cc-info-panel.c:1229
+ msgid "Open folder"
+ msgstr "Открыть папку"
+ 
+-#: ../panels/info/cc-info-panel.c:1315
++#: ../panels/info/cc-info-panel.c:1320
+ msgid "Other Media"
+ msgstr "Другой носитель"
+ 
+-#: ../panels/info/cc-info-panel.c:1346
++#: ../panels/info/cc-info-panel.c:1351
+ msgid "Select an application for audio CDs"
+ msgstr "Выберите приложение для звуковых компакт-дисков"
+ 
+-#: ../panels/info/cc-info-panel.c:1347
++#: ../panels/info/cc-info-panel.c:1352
+ msgid "Select an application for video DVDs"
+ msgstr "Выберите приложения для видео DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1348
++#: ../panels/info/cc-info-panel.c:1353
+ msgid "Select an application to run when a music player is connected"
+ msgstr "Выберите приложение, запускаемое при подключении музыкального плеера"
+ 
+-#: ../panels/info/cc-info-panel.c:1349
++#: ../panels/info/cc-info-panel.c:1354
+ msgid "Select an application to run when a camera is connected"
+ msgstr "Выберите приложение, запускаемое при подключении камеры"
+ 
+-#: ../panels/info/cc-info-panel.c:1350
++#: ../panels/info/cc-info-panel.c:1355
+ msgid "Select an application for software CDs"
+ msgstr "Выберите приложение для компакт-дисков с программами"
+ 
+@@ -1301,89 +1302,89 @@ msgstr "Выберите приложение для компакт-дисков
+ #. * If the shared-mime-info translation works for your language,
+ #. * simply leave these untranslated.
+ #.
+-#: ../panels/info/cc-info-panel.c:1362
++#: ../panels/info/cc-info-panel.c:1367
+ msgid "audio DVD"
+ msgstr "звуковой DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1363
++#: ../panels/info/cc-info-panel.c:1368
+ msgid "blank Blu-ray disc"
+ msgstr "чистый диск Blu-ray"
+ 
+-#: ../panels/info/cc-info-panel.c:1364
++#: ../panels/info/cc-info-panel.c:1369
+ msgid "blank CD disc"
+ msgstr "чистый компакт-диск"
+ 
+-#: ../panels/info/cc-info-panel.c:1365
++#: ../panels/info/cc-info-panel.c:1370
+ msgid "blank DVD disc"
+ msgstr "чистый диск DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1366
++#: ../panels/info/cc-info-panel.c:1371
+ msgid "blank HD DVD disc"
+ msgstr "чистый диск HD DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1367
++#: ../panels/info/cc-info-panel.c:1372
+ msgid "Blu-ray video disc"
+ msgstr "видеодиск Blu-ray"
+ 
+-#: ../panels/info/cc-info-panel.c:1368
++#: ../panels/info/cc-info-panel.c:1373
+ msgid "e-book reader"
+ msgstr "устройство чтения электронных книг"
+ 
+-#: ../panels/info/cc-info-panel.c:1369
++#: ../panels/info/cc-info-panel.c:1374
+ msgid "HD DVD video disc"
+ msgstr "видеодиск HD DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1370
++#: ../panels/info/cc-info-panel.c:1375
+ msgid "Picture CD"
+ msgstr "диск Picture CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1371
++#: ../panels/info/cc-info-panel.c:1376
+ msgid "Super Video CD"
+ msgstr "компакт-диск Super Video"
+ 
+-#: ../panels/info/cc-info-panel.c:1372
++#: ../panels/info/cc-info-panel.c:1377
+ msgid "Video CD"
+ msgstr "видеодиск VCD"
+ 
+-#: ../panels/info/cc-info-panel.c:1373
++#: ../panels/info/cc-info-panel.c:1378
+ msgid "Windows software"
+ msgstr "приложение Windows"
+ 
+-#: ../panels/info/cc-info-panel.c:1374
++#: ../panels/info/cc-info-panel.c:1379
+ msgid "Software"
+ msgstr "Приложение"
+ 
+-#: ../panels/info/cc-info-panel.c:1497
++#: ../panels/info/cc-info-panel.c:1502
+ #: ../panels/keyboard/keyboard-shortcuts.c:1696
+ msgid "Section"
+ msgstr "Раздел"
+ 
+-#: ../panels/info/cc-info-panel.c:1506 ../panels/info/info.ui.h:13
++#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:13
+ msgid "Overview"
+ msgstr "Обзор"
+ 
+-#: ../panels/info/cc-info-panel.c:1512 ../panels/info/info.ui.h:20
++#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:20
+ msgid "Default Applications"
+ msgstr "Приложения по умолчанию"
+ 
+-#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:28
++#: ../panels/info/cc-info-panel.c:1522 ../panels/info/info.ui.h:28
+ msgid "Removable Media"
+ msgstr "Съёмный носитель"
+ 
+-#: ../panels/info/cc-info-panel.c:1542
++#: ../panels/info/cc-info-panel.c:1547
+ #, c-format
+ msgid "Version %s"
+ msgstr "Версия %s"
+ 
+-#: ../panels/info/cc-info-panel.c:1592
++#: ../panels/info/cc-info-panel.c:1597
+ msgid "Install Updates"
+ msgstr "Установить обновления"
+ 
+-#: ../panels/info/cc-info-panel.c:1596
++#: ../panels/info/cc-info-panel.c:1601
+ msgid "System Up-To-Date"
+ msgstr "Нет обновлений"
+ 
+-#: ../panels/info/cc-info-panel.c:1600
++#: ../panels/info/cc-info-panel.c:1605
+ msgid "Checking for Updates"
+ msgstr "Проверка на наличие обновлений"
+ 
+@@ -2476,23 +2477,23 @@ msgstr "VPN"
+ msgid "Bond"
+ msgstr "Связка"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:597
++#: ../panels/network/connection-editor/net-connection-editor.c:598
+ msgid "Bridge"
+ msgstr "Мост"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:598
++#: ../panels/network/connection-editor/net-connection-editor.c:599
+ msgid "VLAN"
+ msgstr "VLAN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:749
++#: ../panels/network/connection-editor/net-connection-editor.c:750
+ msgid "Could not load VPN plugins"
+ msgstr "Не удалось загрузить модули VPN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:818
++#: ../panels/network/connection-editor/net-connection-editor.c:819
+ msgid "Import from file…"
+ msgstr "Импортировать из файла…"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:889
++#: ../panels/network/connection-editor/net-connection-editor.c:890
+ msgid "Add Network Connection"
+ msgstr "Добавить сетевое подключение"
+ 
+@@ -2551,7 +2552,7 @@ msgstr "Выберите файл для импортирования"
+ 
+ #: ../panels/network/connection-editor/vpn-helpers.c:246
+ #: ../panels/printers/cc-printers-panel.c:1947
+-#: ../panels/sharing/cc-sharing-panel.c:436
++#: ../panels/sharing/cc-sharing-panel.c:426
+ #: ../panels/user-accounts/um-photo-dialog.c:222
+ msgid "_Open"
+ msgstr "_Открыть"
+@@ -2694,6 +2695,12 @@ msgstr "Профиль %d"
+ msgid "Add new connection"
+ msgstr "Добавить новое подключение"
+ 
++#: ../panels/network/net-device-team.c:77
++#, fuzzy
++#| msgid "Bridge slaves"
++msgid "Team slaves"
++msgstr "Подчинённые моста"
++
+ #: ../panels/network/net-device-wifi.c:1110
+ msgid ""
+ "If you have a connection to the Internet other than wireless, you can set up "
+@@ -3588,7 +3595,7 @@ msgid "Show Details in Lock Screen"
+ msgstr "Показывать подробности в уведомлениях при заблокированном экране"
+ 
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1744 ../panels/power/cc-power-panel.c:1751
++#: ../panels/power/cc-power-panel.c:1749 ../panels/power/cc-power-panel.c:1756
+ #: ../panels/privacy/cc-privacy-panel.c:80
+ #: ../panels/privacy/cc-privacy-panel.c:120
+ #: ../panels/universal-access/cc-ua-panel.c:257
+@@ -3794,173 +3801,173 @@ msgstr "Зарядка"
+ msgid "Discharging"
+ msgstr "Разрядка"
+ 
+-#: ../panels/power/cc-power-panel.c:395
++#: ../panels/power/cc-power-panel.c:400
+ msgctxt "Battery name"
+ msgid "Main"
+ msgstr "Основная"
+ 
+-#: ../panels/power/cc-power-panel.c:397
++#: ../panels/power/cc-power-panel.c:402
+ msgctxt "Battery name"
+ msgid "Extra"
+ msgstr "Дополнительная"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:469
++#: ../panels/power/cc-power-panel.c:474
+ msgid "Wireless mouse"
+ msgstr "Беспроводная мышь"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:472
++#: ../panels/power/cc-power-panel.c:477
+ msgid "Wireless keyboard"
+ msgstr "Беспроводная клавиатура"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:475
++#: ../panels/power/cc-power-panel.c:480
+ msgid "Uninterruptible power supply"
+ msgstr "Источник бесперебойного питания"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:478
++#: ../panels/power/cc-power-panel.c:483
+ msgid "Personal digital assistant"
+ msgstr "КПК"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:481
++#: ../panels/power/cc-power-panel.c:486
+ msgid "Cellphone"
+ msgstr "Мобильный телефон"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:484
++#: ../panels/power/cc-power-panel.c:489
+ msgid "Media player"
+ msgstr "Медиапроигрыватель"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:487
++#: ../panels/power/cc-power-panel.c:492
+ msgid "Tablet"
+ msgstr "Планшет"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:490
++#: ../panels/power/cc-power-panel.c:495
+ msgid "Computer"
+ msgstr "Компьютер"
+ 
+ #. TRANSLATORS: secondary battery, misc
+-#: ../panels/power/cc-power-panel.c:493 ../panels/power/cc-power-panel.c:740
+-#: ../panels/power/cc-power-panel.c:2075
++#: ../panels/power/cc-power-panel.c:498 ../panels/power/cc-power-panel.c:745
++#: ../panels/power/cc-power-panel.c:2080
+ msgid "Battery"
+ msgstr "Батарея"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:539
++#: ../panels/power/cc-power-panel.c:544
+ msgctxt "Battery power"
+ msgid "Charging"
+ msgstr "Зарядка"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:546
++#: ../panels/power/cc-power-panel.c:551
+ msgctxt "Battery power"
+ msgid "Caution"
+ msgstr "Внимание"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:551
++#: ../panels/power/cc-power-panel.c:556
+ msgctxt "Battery power"
+ msgid "Low"
+ msgstr "Низкий"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:556
++#: ../panels/power/cc-power-panel.c:561
+ msgctxt "Battery power"
+ msgid "Good"
+ msgstr "Хороший"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:561
++#: ../panels/power/cc-power-panel.c:566
+ msgctxt "Battery power"
+ msgid "Fully charged"
+ msgstr "Полностью заряжена"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:565
++#: ../panels/power/cc-power-panel.c:570
+ msgctxt "Battery power"
+ msgid "Empty"
+ msgstr "Полностью разряжена"
+ 
+-#: ../panels/power/cc-power-panel.c:738
++#: ../panels/power/cc-power-panel.c:743
+ msgid "Batteries"
+ msgstr "Батареи"
+ 
+-#: ../panels/power/cc-power-panel.c:1144
++#: ../panels/power/cc-power-panel.c:1149
+ msgid "When _idle"
+ msgstr "При п_ростое"
+ 
+-#: ../panels/power/cc-power-panel.c:1513
++#: ../panels/power/cc-power-panel.c:1518
+ msgid "Power Saving"
+ msgstr "Энергосбережение"
+ 
+-#: ../panels/power/cc-power-panel.c:1541
++#: ../panels/power/cc-power-panel.c:1546
+ msgid "_Screen brightness"
+ msgstr "Яркость _экрана"
+ 
+-#: ../panels/power/cc-power-panel.c:1547
++#: ../panels/power/cc-power-panel.c:1552
+ msgid "_Keyboard brightness"
+ msgstr "Яркость подсветки _клавиатуры"
+ 
+-#: ../panels/power/cc-power-panel.c:1557
++#: ../panels/power/cc-power-panel.c:1562
+ msgid "_Dim screen when inactive"
+ msgstr "У_меньшать яркость экрана при простое"
+ 
+-#: ../panels/power/cc-power-panel.c:1582
++#: ../panels/power/cc-power-panel.c:1587
+ msgid "_Blank screen"
+ msgstr "_Выключение экрана"
+ 
+-#: ../panels/power/cc-power-panel.c:1619
++#: ../panels/power/cc-power-panel.c:1624
+ msgid "_Wi-Fi"
+ msgstr "_Wi-Fi"
+ 
+-#: ../panels/power/cc-power-panel.c:1624
++#: ../panels/power/cc-power-panel.c:1629
+ msgid "Turns off wireless devices"
+ msgstr "Выключение беспроводных устройств"
+ 
+-#: ../panels/power/cc-power-panel.c:1649
++#: ../panels/power/cc-power-panel.c:1654
+ msgid "_Mobile broadband"
+ msgstr "_Мобильное широкополосное"
+ 
+-#: ../panels/power/cc-power-panel.c:1654
++#: ../panels/power/cc-power-panel.c:1659
+ msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
+ msgstr ""
+ "Выключение устройств мобильного широкополосного доступа (3G, 4G, WiMax и т."
+ "д.)"
+ 
+-#: ../panels/power/cc-power-panel.c:1689
++#: ../panels/power/cc-power-panel.c:1694
+ msgid "_Bluetooth"
+ msgstr "_Bluetooth"
+ 
+-#: ../panels/power/cc-power-panel.c:1740
++#: ../panels/power/cc-power-panel.c:1745
+ msgid "When on battery power"
+ msgstr "При работе от батареи"
+ 
+-#: ../panels/power/cc-power-panel.c:1742
++#: ../panels/power/cc-power-panel.c:1747
+ msgid "When plugged in"
+ msgstr "При подключении"
+ 
+-#: ../panels/power/cc-power-panel.c:1871
++#: ../panels/power/cc-power-panel.c:1876
+ msgid "Suspend & Power Off"
+ msgstr "Ждущий режим и выключение"
+ 
+-#: ../panels/power/cc-power-panel.c:1904
++#: ../panels/power/cc-power-panel.c:1909
+ msgid "_Automatic suspend"
+ msgstr "_Автоматический ждущий режим"
+ 
+-#: ../panels/power/cc-power-panel.c:1928
++#: ../panels/power/cc-power-panel.c:1933
+ msgid "When battery power is _critical"
+ msgstr "При _критическом заряде батареи"
+ 
+-#: ../panels/power/cc-power-panel.c:1985
++#: ../panels/power/cc-power-panel.c:1990
+ msgid "Power Off"
+ msgstr "Выключить"
+ 
+-#: ../panels/power/cc-power-panel.c:2122
++#: ../panels/power/cc-power-panel.c:2127
+ msgid "Devices"
+ msgstr "Устройства"
+ 
+@@ -4079,7 +4086,7 @@ msgid "Authenticate"
+ msgstr "Аутентификация"
+ 
+ #: ../panels/printers/authentication-dialog.ui.h:5
+-#: ../panels/sharing/sharing.ui.h:23
++#: ../panels/sharing/sharing.ui.h:21
+ #: ../panels/user-accounts/data/account-dialog.ui.h:6
+ msgid "Password"
+ msgstr "Пароль"
+@@ -5055,11 +5062,11 @@ msgctxt "service is disabled"
+ msgid "Off"
+ msgstr "Выключен"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:432
++#: ../panels/sharing/cc-sharing-panel.c:422
+ msgid "Choose a Folder"
+ msgstr "Выберите папку"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:739
++#: ../panels/sharing/cc-sharing-panel.c:736
+ msgid "Copy"
+ msgstr "Копировать"
+ 
+@@ -5104,71 +5111,63 @@ msgstr ""
+ "устройствами, поддерживающими Bluetooth"
+ 
+ #: ../panels/sharing/sharing.ui.h:3
+-msgid "Share Public Folder"
+-msgstr "Общий доступ к папке"
+-
+-#: ../panels/sharing/sharing.ui.h:4
+ msgid "Only Receive From Trusted Devices"
+ msgstr "Приём файлов только от доверенных устройств"
+ 
+-#: ../panels/sharing/sharing.ui.h:5
++#: ../panels/sharing/sharing.ui.h:4
+ msgid "Save Received Files to Downloads Folder"
+ msgstr "Сохранять принятые файлы в папку «Загрузки»"
+ 
+-#: ../panels/sharing/sharing.ui.h:6
+-msgid "Only share with Trusted Devices"
+-msgstr "Доступ только доверенным устройствам"
+-
+-#: ../panels/sharing/sharing.ui.h:7
++#: ../panels/sharing/sharing.ui.h:5
+ msgid "Computer Name"
+ msgstr "Имя компьютера"
+ 
+-#: ../panels/sharing/sharing.ui.h:8
++#: ../panels/sharing/sharing.ui.h:6
+ msgid "Personal File Sharing"
+ msgstr "Общий доступ к файлам"
+ 
+-#: ../panels/sharing/sharing.ui.h:9
++#: ../panels/sharing/sharing.ui.h:7
+ msgid "Screen Sharing"
+ msgstr "Общий доступ к экрану"
+ 
+-#: ../panels/sharing/sharing.ui.h:10
++#: ../panels/sharing/sharing.ui.h:8
+ msgid "Media Sharing"
+ msgstr "Общий доступ к мультимедиа"
+ 
+-#: ../panels/sharing/sharing.ui.h:11
++#: ../panels/sharing/sharing.ui.h:9
+ msgid "Remote Login"
+ msgstr "Удалённая авторизация"
+ 
+-#: ../panels/sharing/sharing.ui.h:12
++#: ../panels/sharing/sharing.ui.h:10
+ msgid "Some services are disabled because of no network access."
+ msgstr "Некоторые службы отключены из-за отсутствия доступа к сети."
+ 
+-#: ../panels/sharing/sharing.ui.h:13
++#: ../panels/sharing/sharing.ui.h:11
+ msgid "Share Music, Photos and Videos with others on the current network."
+ msgstr ""
+ "Обмен музыкой, фотографиями и видео с другими пользователями данной сети."
+ 
+-#: ../panels/sharing/sharing.ui.h:14
++#: ../panels/sharing/sharing.ui.h:12
+ msgid "Share Media On This Network"
+ msgstr "Общий доступ к мультимедиа в данной сети"
+ 
+-#: ../panels/sharing/sharing.ui.h:15
++#: ../panels/sharing/sharing.ui.h:13
+ msgid "Shared Folders"
+ msgstr "Общедоступные папки"
+ 
+-#: ../panels/sharing/sharing.ui.h:16
++#: ../panels/sharing/sharing.ui.h:14
+ msgid "column"
+ msgstr "столбец"
+ 
+-#: ../panels/sharing/sharing.ui.h:17
++#: ../panels/sharing/sharing.ui.h:15
+ msgid "Add Folder"
+ msgstr "Добавить папку"
+ 
+-#: ../panels/sharing/sharing.ui.h:18
++#: ../panels/sharing/sharing.ui.h:16
+ msgid "Remove Folder"
+ msgstr "Удалить папку"
+ 
+-#: ../panels/sharing/sharing.ui.h:20
++#: ../panels/sharing/sharing.ui.h:18
+ #, no-c-format
+ msgid ""
+ "Personal File Sharing allows you to share your Public folder with others on "
+@@ -5177,15 +5176,15 @@ msgstr ""
+ "Общий доступ к файлам позволяет открыть доступ к папкам для других "
+ "пользователей сети с помощью: <a href=\"dav://%s\">dav://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:21
++#: ../panels/sharing/sharing.ui.h:19
+ msgid "Share Public Folder On This Network"
+ msgstr "Общий доступ к папке в данной сети"
+ 
+-#: ../panels/sharing/sharing.ui.h:22
++#: ../panels/sharing/sharing.ui.h:20
+ msgid "Require Password"
+ msgstr "Требовать пароль"
+ 
+-#: ../panels/sharing/sharing.ui.h:25
++#: ../panels/sharing/sharing.ui.h:23
+ #, no-c-format
+ msgid ""
+ "Allow remote users to connect using the Secure Shell command:\n"
+@@ -5194,7 +5193,7 @@ msgstr ""
+ "Позволить удалённым пользователям подключаться, используя команду SSH:\n"
+ "<a href=\"ssh %s\">ssh %s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:28
++#: ../panels/sharing/sharing.ui.h:26
+ #, no-c-format
+ msgid ""
+ "Allow remote users to view or control your screen by connecting to: <a href="
+@@ -5203,19 +5202,19 @@ msgstr ""
+ "Разрешить удалённым пользователям просматривать и управлять вашим экраном, "
+ "подключившись к: <a href=\"vnc://%s\">vnc://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:29
++#: ../panels/sharing/sharing.ui.h:27
+ msgid "Remote View"
+ msgstr "Удалённый просмотр"
+ 
+-#: ../panels/sharing/sharing.ui.h:30
++#: ../panels/sharing/sharing.ui.h:28
+ msgid "Remote Control"
+ msgstr "Удалённое управление"
+ 
+-#: ../panels/sharing/sharing.ui.h:31
++#: ../panels/sharing/sharing.ui.h:29
+ msgid "Approve All Connections"
+ msgstr "Подтвердить все подключения"
+ 
+-#: ../panels/sharing/sharing.ui.h:32
++#: ../panels/sharing/sharing.ui.h:30
+ msgid "Show Password"
+ msgstr "Показать пароль"
+ 
+@@ -5370,7 +5369,7 @@ msgstr "Выход"
+ 
+ #: ../panels/sound/gvc-mixer-dialog.c:1668
+ msgid "C_hoose a device for sound output:"
+-msgstr "_Выберите устройство для ввода звука:"
++msgstr "_Выберите устройство для вывода звука:"
+ 
+ #: ../panels/sound/gvc-mixer-dialog.c:1693
+ msgid "Settings for the selected device:"
+@@ -5390,7 +5389,7 @@ msgstr "Уровень записи:"
+ 
+ #: ../panels/sound/gvc-mixer-dialog.c:1762
+ msgid "C_hoose a device for sound input:"
+-msgstr "_Выберите устройство для вывода звука:"
++msgstr "_Выберите устройство для ввода звука:"
+ 
+ #: ../panels/sound/gvc-mixer-dialog.c:1789
+ msgid "Sound Effects"
+@@ -6723,7 +6722,7 @@ msgstr ""
+ "нажмите кнопку комбинации клавиш и нажмите новые клавиши или нажмите "
+ "Backspace для очистки."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:82
++#: ../panels/wacom/calibrator/calibrator-gui.c:84
+ msgid ""
+ "Please tap the target markers as they appear on screen to calibrate the "
+ "tablet."
+@@ -6731,7 +6730,7 @@ msgstr ""
+ "Коснитесь маркеров, которые будут появляться на экране, чтобы откалибровать "
+ "планшет."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:86
++#: ../panels/wacom/calibrator/calibrator-gui.c:88
+ msgid "Mis-click detected, restarting..."
+ msgstr "Обнаружено ложное нажатие, выполняется перезапуск…"
+ 
+@@ -7044,11 +7043,11 @@ msgstr "Область для отображения"
+ msgid "[PANEL] [ARGUMENT…]"
+ msgstr "[ПАНЕЛЬ] [АРГУМЕНТ…]"
+ 
+-#: ../shell/cc-application.c:142
++#: ../shell/cc-application.c:145
+ msgid "- Settings"
+ msgstr "— Параметры"
+ 
+-#: ../shell/cc-application.c:160
++#: ../shell/cc-application.c:163
+ #, c-format
+ msgid ""
+ "%s\n"
+@@ -7058,15 +7057,15 @@ msgstr ""
+ "Выполните «%s --help», чтобы показать список всех доступных параметров "
+ "командной строки.\n"
+ 
+-#: ../shell/cc-application.c:190
++#: ../shell/cc-application.c:193
+ msgid "Available panels:"
+ msgstr "Доступные панели:"
+ 
+-#: ../shell/cc-application.c:325
++#: ../shell/cc-application.c:328
+ msgid "Help"
+ msgstr "Справка"
+ 
+-#: ../shell/cc-application.c:326
++#: ../shell/cc-application.c:329
+ msgid "Quit"
+ msgstr "Завершить"
+ 
+@@ -7097,3 +7096,9 @@ msgstr "Параметры"
+ #: ../shell/gnome-control-center.desktop.in.in.h:2
+ msgid "Preferences;Settings;"
+ msgstr "Настройка;Параметры;"
++
++#~ msgid "Share Public Folder"
++#~ msgstr "Общий доступ к папке"
++
++#~ msgid "Only share with Trusted Devices"
++#~ msgstr "Доступ только доверенным устройствам"
+diff --git a/po/sl.po b/po/sl.po
+index 8a192eb..d3f0df1 100644
+--- a/po/sl.po
++++ b/po/sl.po
+@@ -5,15 +5,15 @@
+ # Andraž Tori <andraz.tori1@guest.arnes.si>, 2004.
+ # Matjaž Horvat <m@owca.info>, 2005-2006.
+ # Matic Žgur <mr.zgur@gmail.com>, 2006-2007.
+-# Matej Urbančič <mateju@svn.gnome.org>, 2007-2013.
++# Matej Urbančič <mateju@svn.gnome.org>, 2007-2014.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-control-center master\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "control-center&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-09-21 17:26+0000\n"
+-"PO-Revision-Date: 2013-09-21 20:19+0100\n"
++"POT-Creation-Date: 2014-01-20 06:59+0000\n"
++"PO-Revision-Date: 2014-01-20 19:08+0100\n"
+ "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
+ "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
+ "Language: sl_SI\n"
+@@ -70,7 +70,7 @@ msgid "Span"
+ msgstr "Razmakni"
+ 
+ #. translators: This is the title of the wallpaper chooser dialog.
+-#: ../panels/background/cc-background-chooser-dialog.c:293
++#: ../panels/background/cc-background-chooser-dialog.c:292
+ msgid "Select Background"
+ msgstr "Izbor ozadja"
+ 
+@@ -91,32 +91,32 @@ msgid "Flickr"
+ msgstr "Flickr"
+ 
+ #. translators: No pictures were found
+-#: ../panels/background/cc-background-chooser-dialog.c:393
++#: ../panels/background/cc-background-chooser-dialog.c:385
+ msgid "No Pictures Found"
+ msgstr "Ni najdenih slik"
+ 
+ #. translators: %s here is the name of the Pictures directory, the string should be translated in
+ #. * the context "You can add images to your Pictures folder and they will show up here"
+-#: ../panels/background/cc-background-chooser-dialog.c:408
++#: ../panels/background/cc-background-chooser-dialog.c:400
+ #, c-format
+ msgid "You can add images to your %s folder and they will show up here"
+ msgstr "Slike, dodane v mapo %s, bodo prikazane v tem pogledu"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:436
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:631
+-#: ../panels/color/cc-color-panel.c:220 ../panels/color/cc-color-panel.c:967
+-#: ../panels/display/cc-display-panel.c:1495
+-#: ../panels/display/cc-display-panel.c:1910
++#: ../panels/background/cc-background-chooser-dialog.c:429
++#: ../panels/bluetooth/cc-bluetooth-panel.c:640
++#: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
++#: ../panels/display/cc-display-panel.c:1510
++#: ../panels/display/cc-display-panel.c:1952
+ #: ../panels/network/connection-editor/vpn-helpers.c:245
+ #: ../panels/network/connection-editor/vpn-helpers.c:374
+-#: ../panels/network/net-device-wifi.c:1201
+-#: ../panels/network/net-device-wifi.c:1407
++#: ../panels/network/net-device-wifi.c:1194
++#: ../panels/network/net-device-wifi.c:1402
+ #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
+ #: ../panels/printers/cc-printers-panel.c:1946
+ #: ../panels/printers/new-printer-dialog.ui.h:2
+-#: ../panels/privacy/cc-privacy-panel.c:467
++#: ../panels/privacy/cc-privacy-panel.c:470
+ #: ../panels/search/cc-search-locations-dialog.c:682
+-#: ../panels/sharing/cc-sharing-panel.c:421
++#: ../panels/sharing/cc-sharing-panel.c:425
+ #: ../panels/user-accounts/um-fingerprint-dialog.c:269
+ #: ../panels/user-accounts/um-photo-dialog.c:96
+ #: ../panels/user-accounts/um-photo-dialog.c:221
+@@ -124,9 +124,8 @@ msgstr "Slike, dodane v mapo %s, bodo prikazane v tem pogledu"
+ msgid "_Cancel"
+ msgstr "_Prekliči"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:437
++#: ../panels/background/cc-background-chooser-dialog.c:430
+ #: ../panels/printers/ppd-selection-dialog.ui.h:3
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:9
+ #: ../panels/user-accounts/um-photo-dialog.c:98
+ msgid "Select"
+ msgstr "Izberi"
+@@ -146,7 +145,7 @@ msgstr "%d × %d"
+ msgid "No Desktop Background"
+ msgstr "Ni ozadja namizja"
+ 
+-#: ../panels/background/cc-background-panel.c:492
++#: ../panels/background/cc-background-panel.c:493
+ msgid "Current background"
+ msgstr "Trenutno ozadje"
+ 
+@@ -163,7 +162,7 @@ msgstr "Slika ozadja;Zaslon;Namizje"
+ msgid "Set Up New Device"
+ msgstr "Nastavi novo napravo"
+ 
+-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
++#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
+ msgid "Remove Device"
+ msgstr "Odstrani napravo"
+ 
+@@ -217,50 +216,50 @@ msgstr "Nastavitve tipkovnice"
+ msgid "Send Files…"
+ msgstr "Pošlji datoteke ..."
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
+ msgid "Yes"
+ msgstr "Da"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
+ msgid "No"
+ msgstr "Ne"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:470
++#: ../panels/bluetooth/cc-bluetooth-panel.c:479
+ msgid "Bluetooth is disabled"
+ msgstr "Vmesnik Bluetooth je onemogočen"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:475
++#: ../panels/bluetooth/cc-bluetooth-panel.c:484
+ msgid "Bluetooth is disabled by hardware switch"
+ msgstr "Naprava Bluetooth je onemogočena s strojnim stikalom"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:479
++#: ../panels/bluetooth/cc-bluetooth-panel.c:488
+ msgid "No Bluetooth adapters found"
+ msgstr "Ni navzočih naprav Bluetooth"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:578
++#: ../panels/bluetooth/cc-bluetooth-panel.c:587
+ msgid "Visibility"
+ msgstr "Vidnost"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:582
++#: ../panels/bluetooth/cc-bluetooth-panel.c:591
+ #, c-format
+ msgid "Visibility of “%s”"
+ msgstr "Vidnost “%s”"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:626
++#: ../panels/bluetooth/cc-bluetooth-panel.c:635
+ #, c-format
+ msgid "Remove '%s' from the list of devices?"
+ msgstr "Ali naj se naprava '%s' odstrani s seznama?"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:628
++#: ../panels/bluetooth/cc-bluetooth-panel.c:637
+ msgid ""
+ "If you remove the device, you will have to set it up again before next use."
+ msgstr ""
+ "V primeru, da napravo odstranite, jo bo treba pred naslednjo uporabo, "
+ "ponovno nastaviti."
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:632
++#: ../panels/bluetooth/cc-bluetooth-panel.c:641
+ #: ../panels/online-accounts/cc-online-accounts-panel.c:844
+ msgid "_Remove"
+ msgstr "_Odstrani"
+@@ -274,7 +273,7 @@ msgid "Turn Bluetooth on and off and connect your devices"
+ msgstr "Vklopite in izklopite Bluetooth in povežite svoje naprave."
+ 
+ #. TRANSLATORS: The user has to attach the sensor to the screen
+-#: ../panels/color/cc-color-calibrate.c:360
++#: ../panels/color/cc-color-calibrate.c:361
+ msgid "Place your calibration device over the square and press 'Start'"
+ msgstr ""
+ "Postavite napravo za umerjanje na označen kvadrat in pritisnite tipko za "
+@@ -283,7 +282,7 @@ msgstr ""
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:366
++#: ../panels/color/cc-color-calibrate.c:367
+ msgid ""
+ "Move your calibration device to the calibrate position and press 'Continue'"
+ msgstr ""
+@@ -293,7 +292,7 @@ msgstr ""
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:372
++#: ../panels/color/cc-color-calibrate.c:373
+ msgid ""
+ "Move your calibration device to the surface position and press 'Continue'"
+ msgstr ""
+@@ -303,54 +302,54 @@ msgstr ""
+ #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
+ #. * is built into the palmrest and we need to fullscreen the
+ #. * sample widget and shut the lid.
+-#: ../panels/color/cc-color-calibrate.c:378
++#: ../panels/color/cc-color-calibrate.c:379
+ msgid "Shut the laptop lid"
+ msgstr "Zapri pokrov prenosnika"
+ 
+ #. TRANSLATORS: We suck, the calibation failed and we have no
+ #. * good idea why or any suggestions
+-#: ../panels/color/cc-color-calibrate.c:409
++#: ../panels/color/cc-color-calibrate.c:410
+ msgid "An internal error occurred that could not be recovered."
+ msgstr "Prišlo je do notranje napake, ki ne ni mogoče razrešiti."
+ 
+ #. TRANSLATORS: Some required-at-runtime tools were not
+ #. * installed, which should only affect insane distros
+-#: ../panels/color/cc-color-calibrate.c:414
++#: ../panels/color/cc-color-calibrate.c:415
+ msgid "Tools required for calibration are not installed."
+ msgstr "Orodja, zahtevana za umerjanje, niso nameščena."
+ 
+ #. TRANSLATORS: The profile failed for some reason
+-#: ../panels/color/cc-color-calibrate.c:420
++#: ../panels/color/cc-color-calibrate.c:421
+ msgid "The profile could not be generated."
+ msgstr "Profila ni mogoče ustvariti."
+ 
+ #. TRANSLATORS: The user specified a whitepoint that was
+ #. * unobtainable with the hardware they've got -- see
+ #. * https://en.wikipedia.org/wiki/White_point for details
+-#: ../panels/color/cc-color-calibrate.c:426
++#: ../panels/color/cc-color-calibrate.c:427
+ msgid "The target whitepoint was not obtainable."
+ msgstr "Ciljne bele točke ni bilo mogoče pridobiti."
+ 
+ #. TRANSLATORS: the display calibration process is finished
+-#: ../panels/color/cc-color-calibrate.c:466
++#: ../panels/color/cc-color-calibrate.c:467
+ msgid "Complete!"
+ msgstr "Dokončano!"
+ 
+ #. TRANSLATORS: the display calibration failed, and we also show
+ #. * the translated (or untranslated) error string after this
+-#: ../panels/color/cc-color-calibrate.c:474
++#: ../panels/color/cc-color-calibrate.c:475
+ msgid "Calibration failed!"
+ msgstr "Umerjanje je spodletelo!"
+ 
+ #. TRANSLATORS: The user can now remove the sensor from the screen
+-#: ../panels/color/cc-color-calibrate.c:481
++#: ../panels/color/cc-color-calibrate.c:482
+ msgid "You can remove the calibration device."
+ msgstr "Napravo za umerjanje je dovoljeno odstraniti."
+ 
+ #. TRANSLATORS: The user has to be careful not to knock the
+ #. * display off the screen (although we do cope if this is
+ #. * detected early enough)
+-#: ../panels/color/cc-color-calibrate.c:552
++#: ../panels/color/cc-color-calibrate.c:553
+ msgid "Do not disturb the calibration device while in progress"
+ msgstr "Ne motite umeritvene naprave med merjenjem"
+ 
+@@ -412,48 +411,48 @@ msgstr "Ni umerjeno"
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile has been auto-generated for this hardware
+-#: ../panels/color/cc-color-panel.c:135
++#: ../panels/color/cc-color-panel.c:137
+ msgid "Default: "
+ msgstr "Privzeto:"
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile his a standard space like AdobeRGB
+-#: ../panels/color/cc-color-panel.c:143
++#: ../panels/color/cc-color-panel.c:145
+ msgid "Colorspace: "
+ msgstr "Barvni prostor:"
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile is a test profile
+-#: ../panels/color/cc-color-panel.c:150
++#: ../panels/color/cc-color-panel.c:152
+ msgid "Test profile: "
+ msgstr "Preizkusni profil:"
+ 
+ #. TRANSLATORS: an ICC profile is a file containing colorspace data
+-#: ../panels/color/cc-color-panel.c:218
++#: ../panels/color/cc-color-panel.c:219
+ msgid "Select ICC Profile File"
+ msgstr "Izbor datoteke profila ICC"
+ 
+-#: ../panels/color/cc-color-panel.c:221
++#: ../panels/color/cc-color-panel.c:222
+ msgid "_Import"
+ msgstr "_Uvozi"
+ 
+ #. TRANSLATORS: filter name on the file->open dialog
+-#: ../panels/color/cc-color-panel.c:232
++#: ../panels/color/cc-color-panel.c:233
+ msgid "Supported ICC profiles"
+ msgstr "Podprti profili ICC"
+ 
+ #. TRANSLATORS: filter name on the file->open dialog
+-#: ../panels/color/cc-color-panel.c:239
++#: ../panels/color/cc-color-panel.c:240
+ #: ../panels/network/wireless-security/eap-method-fast.c:410
+ msgid "All files"
+ msgstr "Vse datoteke"
+ 
+-#: ../panels/color/cc-color-panel.c:586
++#: ../panels/color/cc-color-panel.c:579
+ msgid "Screen"
+ msgstr "Zaslon"
+ 
+ #. TRANSLATORS: this is when the upload of the profile failed
+-#: ../panels/color/cc-color-panel.c:912
++#: ../panels/color/cc-color-panel.c:903
+ #, c-format
+ msgid "Failed to upload file: %s"
+ msgstr "Pošiljanje datoteke je spodletelo: %s"
+@@ -461,39 +460,39 @@ msgstr "Pošiljanje datoteke je spodletelo: %s"
+ #. TRANSLATORS: these are instructions on how to recover
+ #. * the ICC profile on the native operating system and are
+ #. * only shown when the user uses a LiveCD to calibrate
+-#: ../panels/color/cc-color-panel.c:926
++#: ../panels/color/cc-color-panel.c:917
+ msgid "The profile has been uploaded to:"
+ msgstr "Profil je posodobljen na:"
+ 
+-#: ../panels/color/cc-color-panel.c:928
++#: ../panels/color/cc-color-panel.c:919
+ msgid "Write down this URL."
+ msgstr "Zapišite si ta naslov URL."
+ 
+-#: ../panels/color/cc-color-panel.c:929
++#: ../panels/color/cc-color-panel.c:920
+ msgid "Restart this computer and boot your normal operating system."
+ msgstr "Ponovno zaženite računalnik v običajno okolje."
+ 
+-#: ../panels/color/cc-color-panel.c:930
++#: ../panels/color/cc-color-panel.c:921
+ msgid "Type the URL into your browser to download and install the profile."
+ msgstr "Vpišite naslov URL v brskalnik za prejem in namestitev profila."
+ 
+ #. TRANSLATORS: this is the dialog to save the ICC profile
+-#: ../panels/color/cc-color-panel.c:964
++#: ../panels/color/cc-color-panel.c:955
+ msgid "Save Profile"
+ msgstr "Shrani profil"
+ 
+-#: ../panels/color/cc-color-panel.c:968
++#: ../panels/color/cc-color-panel.c:959
+ #: ../panels/network/connection-editor/vpn-helpers.c:375
+ msgid "_Save"
+ msgstr "_Shrani"
+ 
+ #. TRANSLATORS: this is when the button is sensitive
+-#: ../panels/color/cc-color-panel.c:1328
++#: ../panels/color/cc-color-panel.c:1315
+ msgid "Create a color profile for the selected device"
+ msgstr "Ustvari barvni profil za izbrane naprave"
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1343 ../panels/color/cc-color-panel.c:1367
++#: ../panels/color/cc-color-panel.c:1330 ../panels/color/cc-color-panel.c:1354
+ msgid ""
+ "The measuring instrument is not detected. Please check it is turned on and "
+ "correctly connected."
+@@ -502,12 +501,12 @@ msgstr ""
+ "na ustrezen način."
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1377
++#: ../panels/color/cc-color-panel.c:1364
+ msgid "The measuring instrument does not support printer profiling."
+ msgstr "Merilna naprava ne podpira profilliranja tiskalnika."
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1388
++#: ../panels/color/cc-color-panel.c:1375
+ msgid "The device type is not currently supported."
+ msgstr "Vrsta naprave trenutno ni podprta."
+ 
+@@ -594,7 +593,6 @@ msgstr "Umerjanje zaslona"
+ #: ../panels/color/color-calibrate.ui.h:2
+ #: ../panels/printers/authentication-dialog.ui.h:2
+ #: ../panels/printers/ppd-selection-dialog.ui.h:2
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:8
+ #: ../panels/user-accounts/um-account-dialog.c:1470
+ msgid "Cancel"
+ msgstr "Prekliči"
+@@ -615,10 +613,10 @@ msgid "Done"
+ msgstr "Končano"
+ 
+ #. Timeout parameters
+-#. 5000 = 5 sec
++#. 15000 = 15 sec
+ #. 750 = 0.75 sec
+ #. Text printed on screen
+-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
++#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:83
+ msgid "Screen Calibration"
+ msgstr "Umerjanje zaslona"
+ 
+@@ -763,168 +761,148 @@ msgstr ""
+ "\"\">Pokaži podrobnosti.</a>"
+ 
+ #: ../panels/color/color.ui.h:30
+-msgid "Device type:"
+-msgstr "Vrsta naprave:"
+-
+-#: ../panels/color/color.ui.h:31
+-msgid "Manufacturer:"
+-msgstr "Proizvajalec:"
+-
+-#: ../panels/color/color.ui.h:32
+-msgid "Model:"
+-msgstr "Model:"
+-
+-#: ../panels/color/color.ui.h:33
+-msgid ""
+-"Image files can be dragged on this window to auto-complete the above fields."
+-msgstr ""
+-"Slikovne datoteke je mogoče povleči v to okno za samodejno dopolnjevanje "
+-"vnosnih polj."
+-
+-#: ../panels/color/color.ui.h:34
+-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+-msgid "Color"
+-msgstr "Barva"
+-
+-#: ../panels/color/color.ui.h:35
+ msgid "Each device needs an up to date color profile to be color managed."
+ msgstr ""
+ "Vsaka naprava zahteva posodobljen barvni profil za ustrezno barvno "
+ "upravljanje."
+ 
+-#: ../panels/color/color.ui.h:36
++#: ../panels/color/color.ui.h:31
+ msgid "Learn more"
+ msgstr "Več podrobnosti"
+ 
+-#: ../panels/color/color.ui.h:37
++#: ../panels/color/color.ui.h:32
+ msgid "Learn more about color management"
+ msgstr "Več podrobnosti o upravljanju barv"
+ 
+-#: ../panels/color/color.ui.h:38
++#: ../panels/color/color.ui.h:33
+ msgid "Set for all users"
+ msgstr "Nastavi za vse uporabnike"
+ 
+-#: ../panels/color/color.ui.h:39
++#: ../panels/color/color.ui.h:34
+ msgid "Set this profile for all users on this computer"
+ msgstr "Nastavi profil za vse uporabnike tega računalnika"
+ 
+-#: ../panels/color/color.ui.h:40
++#: ../panels/color/color.ui.h:35
+ msgid "Enable"
+ msgstr "Omogoči"
+ 
+-#: ../panels/color/color.ui.h:41
++#: ../panels/color/color.ui.h:36
+ msgid "Add profile"
+ msgstr "Dodaj profil"
+ 
+-#: ../panels/color/color.ui.h:42
++#: ../panels/color/color.ui.h:37
+ #: ../panels/wacom/gnome-wacom-properties.ui.h:10
+ msgid "Calibrate…"
+ msgstr "Umeri ..."
+ 
+-#: ../panels/color/color.ui.h:43
++#: ../panels/color/color.ui.h:38
+ msgid "Calibrate the device"
+ msgstr "Umeri napravo"
+ 
+-#: ../panels/color/color.ui.h:44
++#: ../panels/color/color.ui.h:39
+ msgid "Remove profile"
+ msgstr "Odstrani profil"
+ 
+-#: ../panels/color/color.ui.h:45
++#: ../panels/color/color.ui.h:40
+ msgid "View details"
+ msgstr "Pogled podrobnosti"
+ 
+-#: ../panels/color/color.ui.h:46
++#: ../panels/color/color.ui.h:41
+ msgid "Unable to detect any devices that can be color managed"
+ msgstr "Ni mogoče zaznati naprav za katere je mogoče upravljati barvo"
+ 
+-#: ../panels/color/color.ui.h:47
++#: ../panels/color/color.ui.h:42
+ msgid "LCD"
+ msgstr "LCD"
+ 
+-#: ../panels/color/color.ui.h:48
++#: ../panels/color/color.ui.h:43
+ msgid "LED"
+ msgstr "LED"
+ 
+-#: ../panels/color/color.ui.h:49
++#: ../panels/color/color.ui.h:44
+ msgid "CRT"
+ msgstr "CRT"
+ 
+-#: ../panels/color/color.ui.h:50
++#: ../panels/color/color.ui.h:45
+ msgid "Projector"
+ msgstr "Projektor"
+ 
+-#: ../panels/color/color.ui.h:51
++#: ../panels/color/color.ui.h:46
+ msgid "Plasma"
+ msgstr "Plazma"
+ 
+-#: ../panels/color/color.ui.h:52
++#: ../panels/color/color.ui.h:47
+ msgid "LCD (CCFL backlight)"
+ msgstr "LCD (ozadnja osvetlitev CCFL)"
+ 
+-#: ../panels/color/color.ui.h:53
++#: ../panels/color/color.ui.h:48
+ msgid "LCD (RGB LED backlight)"
+ msgstr "LCD (RGB LED ozadnja svetloba)"
+ 
+-#: ../panels/color/color.ui.h:54
++#: ../panels/color/color.ui.h:49
+ msgid "LCD (white LED backlight)"
+ msgstr "LCD (bela LED ozadnja svetloba)"
+ 
+-#: ../panels/color/color.ui.h:55
++#: ../panels/color/color.ui.h:50
+ msgid "Wide gamut LCD (CCFL backlight)"
+ msgstr "Zaslon LCD s širokim barvnim obsegom (CCFL ozadnja svetloba)"
+ 
+-#: ../panels/color/color.ui.h:56
++#: ../panels/color/color.ui.h:51
+ msgid "Wide gamut LCD (RGB LED backlight)"
+ msgstr "Zaslon LCD s širokim barvnim obsegom (RGB LED ozadnja svetloba)"
+ 
+-#: ../panels/color/color.ui.h:57
++#: ../panels/color/color.ui.h:52
+ msgctxt "Calibration quality"
+ msgid "High"
+ msgstr "Visoka"
+ 
+-#: ../panels/color/color.ui.h:58
++#: ../panels/color/color.ui.h:53
+ msgid "40 minutes"
+ msgstr "40 minut"
+ 
+-#: ../panels/color/color.ui.h:59
++#: ../panels/color/color.ui.h:54
+ msgctxt "Calibration quality"
+ msgid "Medium"
+ msgstr "srednja"
+ 
+-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:4
++#: ../panels/color/color.ui.h:55 ../panels/power/power.ui.h:4
+ #: ../panels/privacy/privacy.ui.h:7
+ msgid "30 minutes"
+ msgstr "30 minut"
+ 
+-#: ../panels/color/color.ui.h:61
++#: ../panels/color/color.ui.h:56
+ msgctxt "Calibration quality"
+ msgid "Low"
+ msgstr "Nizka"
+ 
+-#: ../panels/color/color.ui.h:62 ../panels/power/power.ui.h:3
++#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:3
+ msgid "15 minutes"
+ msgstr "15 minut"
+ 
+-#: ../panels/color/color.ui.h:63
++#: ../panels/color/color.ui.h:58
+ msgid "Native to display"
+ msgstr "Lastno zaslonu"
+ 
+-#: ../panels/color/color.ui.h:64
++#: ../panels/color/color.ui.h:59
+ msgid "D50 (Printing and publishing)"
+ msgstr "D50 (tisk in založništvo)"
+ 
+-#: ../panels/color/color.ui.h:65
++#: ../panels/color/color.ui.h:60
+ msgid "D55"
+ msgstr "D55"
+ 
+-#: ../panels/color/color.ui.h:66
++#: ../panels/color/color.ui.h:61
+ msgid "D65 (Photography and graphics)"
+ msgstr "D65 (fotografija in grafika)"
+ 
+-#: ../panels/color/color.ui.h:67
++#: ../panels/color/color.ui.h:62
+ msgid "D75"
+ msgstr "D75"
+ 
++#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
++msgid "Color"
++msgstr "Barva"
++
+ #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+ msgid ""
+ "Calibrate the color of your devices, such as displays, cameras or printers"
+@@ -975,33 +953,33 @@ msgid "Language"
+ msgstr "Jezik"
+ 
+ #: ../panels/common/language-chooser.ui.h:2
+-#: ../panels/mouse/cc-mouse-panel.c:120 ../panels/region/format-chooser.ui.h:2
++#: ../panels/mouse/cc-mouse-panel.c:111 ../panels/region/format-chooser.ui.h:2
+ msgid "_Done"
+ msgstr "_Končano"
+ 
+ #. Translators: This is the full date and time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:352
++#: ../panels/datetime/cc-datetime-panel.c:363
+ msgid "%e %B %Y, %l:%M %p"
+ msgstr "%e %B %Y, %l:%M %p"
+ 
+ #. Translators: This is the full date and time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:357
++#: ../panels/datetime/cc-datetime-panel.c:368
+ msgid "%e %B %Y, %R"
+ msgstr "%e %B %Y, %R"
+ 
+ #. Translators: UTC here means the Coordinated Universal Time.
+ #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
+-#: ../panels/datetime/cc-datetime-panel.c:573
++#: ../panels/datetime/cc-datetime-panel.c:584
+ msgid "UTC%:::z"
+ msgstr "UTC%:::z"
+ 
+ #. Translators: This is the time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:578
++#: ../panels/datetime/cc-datetime-panel.c:589
+ msgid "%l:%M %p"
+ msgstr "%l:%M %p"
+ 
+ #. Translators: This is the time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:583
++#: ../panels/datetime/cc-datetime-panel.c:594
+ msgid "%R"
+ msgstr "%R"
+ 
+@@ -1141,143 +1119,109 @@ msgid "To change time or date settings, you need to authenticate."
+ msgstr ""
+ "Za spreminjanje nastavitev časa in datuma so zahtevana skrbniška dovoljenja."
+ 
+-#: ../panels/display/cc-display-panel.c:473
++#: ../panels/display/cc-display-panel.c:486
+ msgid "Lid Closed"
+ msgstr "Pokrov je zaprt"
+ 
+ #. translators: "Mirrored" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:476
++#: ../panels/display/cc-display-panel.c:489
+ msgid "Mirrored"
+ msgstr "Zrcalno"
+ 
+-#: ../panels/display/cc-display-panel.c:478
+-#: ../panels/display/cc-display-panel.c:2043
+-#: ../panels/display/display-capplet.ui.h:1
++#: ../panels/display/cc-display-panel.c:491
++#: ../panels/display/cc-display-panel.c:2101
+ msgid "Primary"
+ msgstr "Osnovno"
+ 
+-#: ../panels/display/cc-display-panel.c:480
++#: ../panels/display/cc-display-panel.c:493
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1727 ../panels/power/cc-power-panel.c:1738
+-#: ../panels/privacy/cc-privacy-panel.c:77
+-#: ../panels/privacy/cc-privacy-panel.c:117
+-#: ../panels/universal-access/cc-ua-panel.c:253
+-#: ../panels/universal-access/cc-ua-panel.c:610
+-#: ../panels/universal-access/cc-ua-panel.c:736
++#: ../panels/power/cc-power-panel.c:1738 ../panels/power/cc-power-panel.c:1749
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ #: ../panels/universal-access/uap.ui.h:6
+ msgid "Off"
+ msgstr "Onemogočeno"
+ 
+-#: ../panels/display/cc-display-panel.c:483
++#: ../panels/display/cc-display-panel.c:496
+ msgid "Secondary"
+ msgstr "Drugi"
+ 
+-#: ../panels/display/cc-display-panel.c:1491
++#: ../panels/display/cc-display-panel.c:1506
+ msgid "Arrange Combined Displays"
+ msgstr "Prikaže združen prikaz"
+ 
+-#: ../panels/display/cc-display-panel.c:1497
+-#: ../panels/display/cc-display-panel.c:1913
++#: ../panels/display/cc-display-panel.c:1512
++#: ../panels/display/cc-display-panel.c:1955
+ #: ../panels/network/connection-editor/connection-editor.ui.h:1
+ msgid "_Apply"
+ msgstr "_Uveljavi"
+ 
+-#: ../panels/display/cc-display-panel.c:1518
++#: ../panels/display/cc-display-panel.c:1533
+ msgid "Drag displays to rearrange them"
+ msgstr "Potegni zaslone za preurejanje"
+ 
+-#. size
+-#: ../panels/display/cc-display-panel.c:1977
++#: ../panels/display/cc-display-panel.c:2037
+ msgid "Size"
+ msgstr "Velikost"
+ 
+ #. aspect ratio
+-#: ../panels/display/cc-display-panel.c:1992
+-#: ../panels/display/display-capplet.ui.h:12
++#: ../panels/display/cc-display-panel.c:2050
+ msgid "Aspect Ratio"
+ msgstr "Razmerje velikosti"
+ 
+-#: ../panels/display/cc-display-panel.c:2013
+-#: ../panels/display/display-capplet.ui.h:13
++#: ../panels/display/cc-display-panel.c:2071
+ #: ../panels/printers/pp-options-dialog.c:86
+ msgid "Resolution"
+ msgstr "Ločljivost"
+ 
+-#: ../panels/display/cc-display-panel.c:2044
+-#: ../panels/display/display-capplet.ui.h:2
++#: ../panels/display/cc-display-panel.c:2102
+ msgid "Show the top bar and Activities Overview on this display"
+ msgstr "Pokaži vrhnjo vrstico in pregled dejavnosti na tem zaslonu"
+ 
+-#: ../panels/display/cc-display-panel.c:2050
++#: ../panels/display/cc-display-panel.c:2108
+ msgid "Secondary Display"
+ msgstr "Drugi zaslon"
+ 
+-#: ../panels/display/cc-display-panel.c:2051
++#: ../panels/display/cc-display-panel.c:2109
+ msgid "Join this display with another to create an extra workspace"
+ msgstr "Združi zaslon z drugim za ustvarjanje dodatne delovne površine"
+ 
+-#: ../panels/display/cc-display-panel.c:2058
+-#: ../panels/display/display-capplet.ui.h:3
++#: ../panels/display/cc-display-panel.c:2116
+ msgid "Presentation"
+ msgstr "Predstavitev"
+ 
+-#: ../panels/display/cc-display-panel.c:2059
+-#: ../panels/display/display-capplet.ui.h:4
++#: ../panels/display/cc-display-panel.c:2117
+ msgid "Show slideshows and media only"
+ msgstr "Pokaži le predstavitve in predstavne datoteke"
+ 
+ #. translators: "Mirror" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:2064
+-#: ../panels/display/display-capplet.ui.h:5
++#: ../panels/display/cc-display-panel.c:2122
+ msgid "Mirror"
+ msgstr "Zrcali"
+ 
+-#: ../panels/display/cc-display-panel.c:2065
++#: ../panels/display/cc-display-panel.c:2123
+ msgid "Show your existing view on both displays"
+ msgstr "Pokaži obstoječ pogled na obeh zaslonih"
+ 
+-#: ../panels/display/cc-display-panel.c:2071
+-#: ../panels/display/display-capplet.ui.h:9
++#: ../panels/display/cc-display-panel.c:2129
+ msgid "Turn Off"
+ msgstr "Izklopi"
+ 
+-#: ../panels/display/cc-display-panel.c:2072
++#: ../panels/display/cc-display-panel.c:2130
+ msgid "Don't use this display"
+ msgstr "Ne uporabi tega zaslona"
+ 
+-#: ../panels/display/cc-display-panel.c:2289
++#: ../panels/display/cc-display-panel.c:2345
+ msgid "Could not get screen information"
+ msgstr "Ni mogoče dobiti podatkov zaslona"
+ 
+-#: ../panels/display/cc-display-panel.c:2320
++#: ../panels/display/cc-display-panel.c:2376
+ msgid "_Arrange Combined Displays"
+ msgstr "_Preuredi združene zaslone"
+ 
+-#: ../panels/display/display-capplet.ui.h:6
+-msgid "Show your primary display on this screen also"
+-msgstr "Osnovni zaslon prikaži tudi na tem zaslonu"
+-
+-#: ../panels/display/display-capplet.ui.h:7
+-msgid "Combine"
+-msgstr "Združi"
+-
+-#: ../panels/display/display-capplet.ui.h:8
+-msgid "Join with the primary display to create an extra space"
+-msgstr "Združi z osnovnim zaslonom za omogočanje dodatnega prostora"
+-
+-#: ../panels/display/display-capplet.ui.h:10
+-msgid "Don't use the display"
+-msgstr "Ne uporabi zaslona"
+-
+-#: ../panels/display/display-capplet.ui.h:11
+-#: ../panels/printers/printers.ui.h:12
+-msgid "Model"
+-msgstr "Model"
+-
+-#: ../panels/display/display-capplet.ui.h:14
+-msgid "Refresh Rate"
+-msgstr "Hitrost osveževanja"
+-
+ #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
+ msgid "Displays"
+ msgstr "Zasloni"
+@@ -1292,54 +1236,54 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
+ msgstr "Pult;Projektor;xrandr;Zaslon;Ločljivost;Osveževanje;"
+ 
+ #. TRANSLATORS: AP type
+-#: ../panels/info/cc-info-panel.c:450 ../panels/network/panel-common.c:127
++#: ../panels/info/cc-info-panel.c:452 ../panels/network/panel-common.c:127
+ msgid "Unknown"
+ msgstr "Neznano"
+ 
+-#: ../panels/info/cc-info-panel.c:532
++#: ../panels/info/cc-info-panel.c:539
+ #, c-format
+ msgid "%s %d-bit"
+ msgstr "%s %d-bitni"
+ 
+-#: ../panels/info/cc-info-panel.c:534
++#: ../panels/info/cc-info-panel.c:541
+ #, c-format
+ msgid "%d-bit"
+ msgstr "%d-bitni"
+ 
+-#: ../panels/info/cc-info-panel.c:1214
++#: ../panels/info/cc-info-panel.c:1221
+ msgid "Ask what to do"
+ msgstr "Vprašaj kaj storiti"
+ 
+-#: ../panels/info/cc-info-panel.c:1218
++#: ../panels/info/cc-info-panel.c:1225
+ msgid "Do nothing"
+ msgstr "Ne naredi ničesar"
+ 
+-#: ../panels/info/cc-info-panel.c:1222
++#: ../panels/info/cc-info-panel.c:1229
+ msgid "Open folder"
+ msgstr "Odpri mapo"
+ 
+-#: ../panels/info/cc-info-panel.c:1313
++#: ../panels/info/cc-info-panel.c:1320
+ msgid "Other Media"
+ msgstr "Drug nosilci"
+ 
+-#: ../panels/info/cc-info-panel.c:1344
++#: ../panels/info/cc-info-panel.c:1351
+ msgid "Select an application for audio CDs"
+ msgstr "Izbor programa za zvočne CD-je"
+ 
+-#: ../panels/info/cc-info-panel.c:1345
++#: ../panels/info/cc-info-panel.c:1352
+ msgid "Select an application for video DVDs"
+ msgstr "Izberite program za video DVD-je"
+ 
+-#: ../panels/info/cc-info-panel.c:1346
++#: ../panels/info/cc-info-panel.c:1353
+ msgid "Select an application to run when a music player is connected"
+ msgstr ""
+ "Izberite kateri program naj se zažene, ko je predvajalnik glasbe povezan"
+ 
+-#: ../panels/info/cc-info-panel.c:1347
++#: ../panels/info/cc-info-panel.c:1354
+ msgid "Select an application to run when a camera is connected"
+ msgstr "Izberite program, ki naj teče, ko je povezan fotoaparat"
+ 
+-#: ../panels/info/cc-info-panel.c:1348
++#: ../panels/info/cc-info-panel.c:1355
+ msgid "Select an application for software CDs"
+ msgstr "Izbor programa za programske CD-je"
+ 
+@@ -1348,89 +1292,89 @@ msgstr "Izbor programa za programske CD-je"
+ #. * If the shared-mime-info translation works for your language,
+ #. * simply leave these untranslated.
+ #.
+-#: ../panels/info/cc-info-panel.c:1360
++#: ../panels/info/cc-info-panel.c:1367
+ msgid "audio DVD"
+ msgstr "zvočni DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1361
++#: ../panels/info/cc-info-panel.c:1368
+ msgid "blank Blu-ray disc"
+ msgstr "prazen Blu-Ray disk"
+ 
+-#: ../panels/info/cc-info-panel.c:1362
++#: ../panels/info/cc-info-panel.c:1369
+ msgid "blank CD disc"
+ msgstr "prazen CD disk"
+ 
+-#: ../panels/info/cc-info-panel.c:1363
++#: ../panels/info/cc-info-panel.c:1370
+ msgid "blank DVD disc"
+ msgstr "prazen DVD disk"
+ 
+-#: ../panels/info/cc-info-panel.c:1364
++#: ../panels/info/cc-info-panel.c:1371
+ msgid "blank HD DVD disc"
+ msgstr "Prazen HD DVD disk"
+ 
+-#: ../panels/info/cc-info-panel.c:1365
++#: ../panels/info/cc-info-panel.c:1372
+ msgid "Blu-ray video disc"
+ msgstr "Blu-ray video disk"
+ 
+-#: ../panels/info/cc-info-panel.c:1366
++#: ../panels/info/cc-info-panel.c:1373
+ msgid "e-book reader"
+ msgstr "Bralnik e-knjig"
+ 
+-#: ../panels/info/cc-info-panel.c:1367
++#: ../panels/info/cc-info-panel.c:1374
+ msgid "HD DVD video disc"
+ msgstr "HD DVD video disk"
+ 
+-#: ../panels/info/cc-info-panel.c:1368
++#: ../panels/info/cc-info-panel.c:1375
+ msgid "Picture CD"
+ msgstr "Slikovni CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1369
++#: ../panels/info/cc-info-panel.c:1376
+ msgid "Super Video CD"
+ msgstr "Super Video CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1370
++#: ../panels/info/cc-info-panel.c:1377
+ msgid "Video CD"
+ msgstr "Video CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1371
++#: ../panels/info/cc-info-panel.c:1378
+ msgid "Windows software"
+ msgstr "Programska oprema za okolje Windows"
+ 
+-#: ../panels/info/cc-info-panel.c:1372
++#: ../panels/info/cc-info-panel.c:1379
+ msgid "Software"
+ msgstr "Programska oprema"
+ 
+-#: ../panels/info/cc-info-panel.c:1495
++#: ../panels/info/cc-info-panel.c:1502
+ #: ../panels/keyboard/keyboard-shortcuts.c:1696
+ msgid "Section"
+ msgstr "Odsek"
+ 
+-#: ../panels/info/cc-info-panel.c:1504 ../panels/info/info.ui.h:13
++#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:13
+ msgid "Overview"
+ msgstr "Pregled"
+ 
+-#: ../panels/info/cc-info-panel.c:1510 ../panels/info/info.ui.h:20
++#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:20
+ msgid "Default Applications"
+ msgstr "Privzeti programi"
+ 
+-#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:28
++#: ../panels/info/cc-info-panel.c:1522 ../panels/info/info.ui.h:28
+ msgid "Removable Media"
+ msgstr "Odstranljivi nosilci"
+ 
+-#: ../panels/info/cc-info-panel.c:1540
++#: ../panels/info/cc-info-panel.c:1547
+ #, c-format
+ msgid "Version %s"
+ msgstr "Različica %s"
+ 
+-#: ../panels/info/cc-info-panel.c:1590
++#: ../panels/info/cc-info-panel.c:1597
+ msgid "Install Updates"
+ msgstr "Namesti posodobitve"
+ 
+-#: ../panels/info/cc-info-panel.c:1594
++#: ../panels/info/cc-info-panel.c:1601
+ msgid "System Up-To-Date"
+ msgstr "Sistem je posodobljen."
+ 
+-#: ../panels/info/cc-info-panel.c:1598
++#: ../panels/info/cc-info-panel.c:1605
+ msgid "Checking for Updates"
+ msgstr "Preverjanje za posodobitve"
+ 
+@@ -1596,7 +1540,7 @@ msgid "Eject"
+ msgstr "Izvrzi"
+ 
+ #: ../panels/keyboard/01-input-sources.xml.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+ #: ../panels/universal-access/uap.ui.h:11
+ msgid "Typing"
+ msgstr "Tipkanje"
+@@ -1755,7 +1699,6 @@ msgid "Modifiers-only switch to next source"
+ msgstr "Preklopi na naslednji vir le s spremenilniki"
+ 
+ #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Keyboard"
+ msgstr "Tipkovnica"
+ 
+@@ -1780,76 +1723,76 @@ msgstr "_Ime:"
+ msgid "C_ommand:"
+ msgstr "U_kaz:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Repeat Keys"
+ msgstr "Ponavljajoče tipke"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+ msgid "Key presses _repeat when key is held down"
+ msgstr "Ponavljanje p_ritiskov tipk, ko je tipka pritisnjena zadržano"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+ msgid "_Delay:"
+ msgstr "_Zamik:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+ msgid "_Speed:"
+ msgstr "_Hitrost:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
+ msgctxt "keyboard, delay"
+ msgid "Short"
+ msgstr "Kratek"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+ msgctxt "keyboard, speed"
+ msgid "Slow"
+ msgstr "Počasi"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+ msgid "Repeat keys speed"
+ msgstr "Hitrost ponovitve tipk"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+ msgctxt "keyboard, delay"
+ msgid "Long"
+ msgstr "Dolg"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+ msgctxt "keyboard, speed"
+ msgid "Fast"
+ msgstr "Hitro"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+ msgid "Cursor Blinking"
+ msgstr "Utripanje kazalke"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+ msgid "Cursor _blinks in text fields"
+ msgstr "Kazalka v besedilnih poljih _utripa"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+ msgid "S_peed:"
+ msgstr "_Hitrost:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+ msgid "Cursor blink speed"
+ msgstr "Hitrost utripanja kazalke"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+ #: ../panels/region/region.ui.h:5
+ msgid "Input Sources"
+ msgstr "Vhodni viri"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+ msgid "Add Shortcut"
+ msgstr "Dodaj tipkovno bližnjico"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
+ msgid "Remove Shortcut"
+ msgstr "Odstrani tipkovno bližnjico"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
+ msgid ""
+ "To edit a shortcut, click the row and hold down the new keys or press "
+ "Backspace to clear."
+@@ -1857,7 +1800,7 @@ msgstr ""
+ "Za urejanje bližnjice kliknite ustrezno vrstico in vnesite novo bližnjico "
+ "ali pa izbrišite staro."
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+ msgid "Shortcuts"
+ msgstr "Tipkovne bližnjice"
+ 
+@@ -1902,11 +1845,11 @@ msgstr ""
+ msgid "_Reassign"
+ msgstr "_Določitev bližnjice"
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:100
++#: ../panels/mouse/cc-mouse-panel.c:95
+ msgid "Test Your _Settings"
+ msgstr "Preizkus uporabljenih _nastavitev"
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:117
++#: ../panels/mouse/cc-mouse-panel.c:108
+ msgid "Test Your Settings"
+ msgstr "Preizkus nastavitev"
+ 
+@@ -1929,91 +1872,87 @@ msgstr ""
+ "Drsnik;"
+ 
+ #: ../panels/mouse/gnome-mouse-properties.ui.h:1
+-msgid "Mouse Preferences"
+-msgstr "Možnosti miške"
+-
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgid "General"
+ msgstr "Splošno"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
++#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgctxt "double click, speed"
+ msgid "Slow"
+ msgstr "Počasno"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
++#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+ msgid "Double-click timeout"
+ msgstr "Časovna omejitev dvojnega klika"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
++#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+ msgctxt "double click, speed"
+ msgid "Fast"
+ msgstr "Hitro"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
++#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+ msgid "_Double-click"
+ msgstr "_Dvojni klik"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
++#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+ msgid "Primary _button"
+ msgstr "Osnovni _gumb"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
++#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+ msgctxt "mouse, left button as primary"
+ msgid "_Left"
+ msgstr "_Levo"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
++#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+ msgctxt "mouse, right button as primary"
+ msgid "_Right"
+ msgstr "_Desno"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
++#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+ msgid "Mouse"
+ msgstr "Miška"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
++#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+ msgid "_Pointer speed"
+ msgstr "_Hitrost kazalnika"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
++#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+ msgctxt "mouse pointer, speed"
+ msgid "Slow"
+ msgstr "Počasno"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
++#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+ msgctxt "mouse pointer, speed"
+ msgid "Fast"
+ msgstr "Hitro"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
++#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+ msgid "Touchpad"
+ msgstr "Sledilna ploščica"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
++#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+ msgctxt "touchpad pointer, speed"
+ msgid "Slow"
+ msgstr "Počasno"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
++#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+ msgctxt "touchpad pointer, speed"
+ msgid "Fast"
+ msgstr "Hitro"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
++#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+ msgid "Disable while _typing"
+ msgstr "Onemogoči med _tipkanjem"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
++#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+ msgid "Tap to _click"
+ msgstr "Udarjanje za _klik"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
++#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+ msgid "Two _finger scroll"
+ msgstr "Dvo-_prstno drsenje"
+ 
+ #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible.
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:21
++#: ../panels/mouse/gnome-mouse-properties.ui.h:20
+ msgid "_Natural scrolling"
+ msgstr "_Naravno drsenje"
+ 
+@@ -2056,7 +1995,7 @@ msgstr "Enojni klik, drugi gumb"
+ msgid "Air_plane Mode"
+ msgstr "_Letalski način"
+ 
+-#: ../panels/network/cc-network-panel.c:928
++#: ../panels/network/cc-network-panel.c:930
+ msgid "Network proxy"
+ msgstr "Omrežni posredniški strežnik"
+ 
+@@ -2064,14 +2003,14 @@ msgstr "Omrežni posredniški strežnik"
+ #. * window for vpn connections, it is also used to display
+ #. * vpn connections in the device list.
+ #.
+-#: ../panels/network/cc-network-panel.c:1107 ../panels/network/net-vpn.c:285
+-#: ../panels/network/net-vpn.c:438
++#: ../panels/network/cc-network-panel.c:1109 ../panels/network/net-vpn.c:278
++#: ../panels/network/net-vpn.c:431
+ #, c-format
+ msgid "%s VPN"
+ msgstr "VPN %s"
+ 
+ #. TRANSLATORS: the user is running a NM that is not API compatible
+-#: ../panels/network/cc-network-panel.c:1242
++#: ../panels/network/cc-network-panel.c:1244
+ msgid "The system network services are not compatible with this version."
+ msgstr "Sistemske omrežne storitve niso podprte s to različico."
+ 
+@@ -2105,34 +2044,34 @@ msgstr "samodejno"
+ 
+ #. TRANSLATORS: this WEP WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:52
+-#: ../panels/network/net-device-wifi.c:221
+-#: ../panels/network/net-device-wifi.c:382
++#: ../panels/network/net-device-wifi.c:216
++#: ../panels/network/net-device-wifi.c:377
+ msgid "WEP"
+ msgstr "WEP"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:56
+-#: ../panels/network/net-device-wifi.c:225
+-#: ../panels/network/net-device-wifi.c:387
++#: ../panels/network/net-device-wifi.c:220
++#: ../panels/network/net-device-wifi.c:382
+ #: ../panels/network/network-wifi.ui.h:17
+ msgid "WPA"
+ msgstr "WPA"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:60
+-#: ../panels/network/net-device-wifi.c:229
++#: ../panels/network/net-device-wifi.c:224
+ msgid "WPA2"
+ msgstr "WPA2"
+ 
+ #. TRANSLATORS: this Enterprise WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:65
+-#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:229
+ msgid "Enterprise"
+ msgstr "Podjetniški"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:70
+-#: ../panels/network/net-device-wifi.c:239
+-#: ../panels/network/net-device-wifi.c:372
++#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:367
+ msgctxt "Wifi security"
+ msgid "None"
+ msgstr "Brez"
+@@ -2153,8 +2092,8 @@ msgid "Yesterday"
+ msgstr "Včeraj"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:106
+-#: ../panels/network/net-device-ethernet.c:125
+-#: ../panels/network/net-device-wifi.c:476
++#: ../panels/network/net-device-ethernet.c:122
++#: ../panels/network/net-device-wifi.c:471
+ #, c-format
+ msgid "%i day ago"
+ msgid_plural "%i days ago"
+@@ -2166,37 +2105,37 @@ msgstr[3] "pred %i dnevi"
+ #. Translators: network device speed
+ #: ../panels/network/connection-editor/ce-page-details.c:155
+ #: ../panels/network/net-device-ethernet.c:53
+-#: ../panels/network/net-device-wifi.c:534
++#: ../panels/network/net-device-wifi.c:528
+ #, c-format
+ msgid "%d Mb/s"
+ msgstr "%d Mb/s"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:181
+-#: ../panels/network/net-device-wifi.c:563
++#: ../panels/network/net-device-wifi.c:557
+ msgctxt "Signal strength"
+ msgid "None"
+ msgstr "Brez"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:183
+-#: ../panels/network/net-device-wifi.c:565
++#: ../panels/network/net-device-wifi.c:559
+ msgctxt "Signal strength"
+ msgid "Weak"
+ msgstr "Šibko"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:185
+-#: ../panels/network/net-device-wifi.c:567
++#: ../panels/network/net-device-wifi.c:561
+ msgctxt "Signal strength"
+ msgid "Ok"
+ msgstr "V redu"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:187
+-#: ../panels/network/net-device-wifi.c:569
++#: ../panels/network/net-device-wifi.c:563
+ msgctxt "Signal strength"
+ msgid "Good"
+ msgstr "Dobro"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:189
+-#: ../panels/network/net-device-wifi.c:571
++#: ../panels/network/net-device-wifi.c:565
+ msgctxt "Signal strength"
+ msgid "Excellent"
+ msgstr "Odlično"
+@@ -2342,15 +2281,15 @@ msgid "Link speed"
+ msgstr "Hitrost povezave"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:4
+-#: ../panels/network/net-device-ethernet.c:158
++#: ../panels/network/net-device-ethernet.c:155
+ #: ../panels/network/network-simple.ui.h:3
+ #: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
+ msgid "IPv4 Address"
+ msgstr "Naslov IPv4"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:5
+-#: ../panels/network/net-device-ethernet.c:159
+-#: ../panels/network/net-device-ethernet.c:163
++#: ../panels/network/net-device-ethernet.c:156
++#: ../panels/network/net-device-ethernet.c:160
+ #: ../panels/network/network-mobile.ui.h:4
+ #: ../panels/network/network-simple.ui.h:4
+ #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
+@@ -2358,14 +2297,14 @@ msgid "IPv6 Address"
+ msgstr "Naslov IPv6"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:6
+-#: ../panels/network/net-device-ethernet.c:166
++#: ../panels/network/net-device-ethernet.c:163
+ #: ../panels/network/network-simple.ui.h:2
+ #: ../panels/network/network-wifi.ui.h:7
+ msgid "Hardware Address"
+ msgstr "Strojni naslov"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:7
+-#: ../panels/network/net-device-ethernet.c:170
++#: ../panels/network/net-device-ethernet.c:167
+ #: ../panels/network/network-mobile.ui.h:5
+ #: ../panels/network/network-simple.ui.h:5
+ #: ../panels/network/network-wifi.ui.h:8
+@@ -2375,7 +2314,7 @@ msgstr "Privzeta smer"
+ #: ../panels/network/connection-editor/details-page.ui.h:8
+ #: ../panels/network/connection-editor/ip4-page.ui.h:3
+ #: ../panels/network/connection-editor/ip6-page.ui.h:3
+-#: ../panels/network/net-device-ethernet.c:172
++#: ../panels/network/net-device-ethernet.c:169
+ #: ../panels/network/network-mobile.ui.h:6
+ #: ../panels/network/network-simple.ui.h:6
+ #: ../panels/network/network-wifi.ui.h:9
+@@ -2521,7 +2460,7 @@ msgid "_Add"
+ msgstr "_Dodaj"
+ 
+ #: ../panels/network/connection-editor/net-connection-editor.c:595
+-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
++#: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
+ msgid "VPN"
+ msgstr "VPN"
+ 
+@@ -2529,23 +2468,23 @@ msgstr "VPN"
+ msgid "Bond"
+ msgstr "Vez"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:597
++#: ../panels/network/connection-editor/net-connection-editor.c:598
+ msgid "Bridge"
+ msgstr "Premoščanje"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:598
++#: ../panels/network/connection-editor/net-connection-editor.c:599
+ msgid "VLAN"
+ msgstr "VLAN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:749
++#: ../panels/network/connection-editor/net-connection-editor.c:750
+ msgid "Could not load VPN plugins"
+ msgstr "Ni mogoče naložiti vstavkov VPN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:818
++#: ../panels/network/connection-editor/net-connection-editor.c:819
+ msgid "Import from file…"
+ msgstr "Uvozi iz datoteke ..."
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:889
++#: ../panels/network/connection-editor/net-connection-editor.c:890
+ msgid "Add Network Connection"
+ msgstr "Dodaj omrežno povezavo"
+ 
+@@ -2555,7 +2494,7 @@ msgid "_Reset"
+ msgstr "_Ponastavi"
+ 
+ #: ../panels/network/connection-editor/reset-page.ui.h:2
+-#: ../panels/network/net-device-wifi.c:1408
++#: ../panels/network/net-device-wifi.c:1403
+ #: ../panels/network/network-wifi.ui.h:40
+ msgid "_Forget"
+ msgstr "_Izbriši"
+@@ -2603,7 +2542,7 @@ msgstr "Izbor datoteke za uvoz"
+ 
+ #: ../panels/network/connection-editor/vpn-helpers.c:246
+ #: ../panels/printers/cc-printers-panel.c:1947
+-#: ../panels/sharing/cc-sharing-panel.c:422
++#: ../panels/sharing/cc-sharing-panel.c:426
+ #: ../panels/user-accounts/um-photo-dialog.c:222
+ msgid "_Open"
+ msgstr "_Odpri"
+@@ -2692,29 +2631,29 @@ msgstr "Podrejene vezi"
+ msgid "Bridge slaves"
+ msgstr "Podrejene vezi"
+ 
+-#: ../panels/network/net-device-ethernet.c:111
+-#: ../panels/network/net-device-wifi.c:462
++#: ../panels/network/net-device-ethernet.c:108
++#: ../panels/network/net-device-wifi.c:457
+ msgid "never"
+ msgstr "nikoli"
+ 
+-#: ../panels/network/net-device-ethernet.c:121
+-#: ../panels/network/net-device-wifi.c:472
++#: ../panels/network/net-device-ethernet.c:118
++#: ../panels/network/net-device-wifi.c:467
+ msgid "today"
+ msgstr "danes"
+ 
+-#: ../panels/network/net-device-ethernet.c:123
+-#: ../panels/network/net-device-wifi.c:474
++#: ../panels/network/net-device-ethernet.c:120
++#: ../panels/network/net-device-wifi.c:469
+ msgid "yesterday"
+ msgstr "včeraj"
+ 
+-#: ../panels/network/net-device-ethernet.c:161
++#: ../panels/network/net-device-ethernet.c:158
+ #: ../panels/network/network-mobile.ui.h:3
+ #: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
+ #: ../panels/printers/printers.ui.h:13
+ msgid "IP Address"
+ msgstr "IP naslov"
+ 
+-#: ../panels/network/net-device-ethernet.c:177
++#: ../panels/network/net-device-ethernet.c:174
+ #: ../panels/network/network-wifi.ui.h:10
+ msgid "Last used"
+ msgstr "Nazadnje uporabljeno"
+@@ -2724,14 +2663,14 @@ msgstr "Nazadnje uporabljeno"
+ #. * profile. It is also used to display ethernet in the
+ #. * device list.
+ #.
+-#: ../panels/network/net-device-ethernet.c:287
++#: ../panels/network/net-device-ethernet.c:284
+ #: ../panels/network/network-ethernet.ui.h:1
+ #: ../panels/network/network-simple.ui.h:1
+ msgid "Wired"
+ msgstr "Žično"
+ 
+-#: ../panels/network/net-device-ethernet.c:355
+-#: ../panels/network/net-device-wifi.c:1549
++#: ../panels/network/net-device-ethernet.c:352
++#: ../panels/network/net-device-wifi.c:1558
+ #: ../panels/network/network-ethernet.ui.h:3
+ #: ../panels/network/network-mobile.ui.h:8
+ #: ../panels/network/network-simple.ui.h:8
+@@ -2739,16 +2678,21 @@ msgstr "Žično"
+ msgid "Options…"
+ msgstr "Možnosti ..."
+ 
+-#: ../panels/network/net-device-ethernet.c:492
++#: ../panels/network/net-device-ethernet.c:489
+ #, c-format
+ msgid "Profile %d"
+ msgstr "Profil %d"
+ 
+-#: ../panels/network/net-device-mobile.c:239
++#: ../panels/network/net-device-mobile.c:232
+ msgid "Add new connection"
+ msgstr "Dodaj novo povezavo"
+ 
+-#: ../panels/network/net-device-wifi.c:1117
++#: ../panels/network/net-device-team.c:77
++#| msgid "Bridge slaves"
++msgid "Team slaves"
++msgstr "Podrejene skupine"
++
++#: ../panels/network/net-device-wifi.c:1110
+ msgid ""
+ "If you have a connection to the Internet other than wireless, you can set up "
+ "a wireless hotspot to share the connection with others."
+@@ -2756,12 +2700,12 @@ msgstr ""
+ "V kolikor imate povezavo v omrežje, ki ni brezžična, jo lahko delite kot "
+ "vročo točko z drugimi uporabniki za dostop do interneta."
+ 
+-#: ../panels/network/net-device-wifi.c:1121
++#: ../panels/network/net-device-wifi.c:1114
+ #, c-format
+ msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+ msgstr "Preklop na brezžično vročo točko bo prekinilo povezavo z <b>%s</b>."
+ 
+-#: ../panels/network/net-device-wifi.c:1125
++#: ../panels/network/net-device-wifi.c:1118
+ msgid ""
+ "It is not possible to access the Internet through your wireless while the "
+ "hotspot is active."
+@@ -2769,25 +2713,25 @@ msgstr ""
+ "Ni mogoč dostop do interneta preko brezžične povezave, kadar je vroča točka "
+ "dejavna."
+ 
+-#: ../panels/network/net-device-wifi.c:1199
++#: ../panels/network/net-device-wifi.c:1192
+ msgid "Stop hotspot and disconnect any users?"
+ msgstr ""
+ "Ali naj se zaustavi vroča vstopna točka in se prekine povezava vseh "
+ "uporabnikov?"
+ 
+-#: ../panels/network/net-device-wifi.c:1202
++#: ../panels/network/net-device-wifi.c:1195
+ msgid "_Stop Hotspot"
+ msgstr "_Zaustavi vročo vstopno točko"
+ 
+-#: ../panels/network/net-device-wifi.c:1274
++#: ../panels/network/net-device-wifi.c:1267
+ msgid "System policy prohibits use as a Hotspot"
+ msgstr "Sistemska pravila onemogočajo uporabo vročih točk"
+ 
+-#: ../panels/network/net-device-wifi.c:1277
++#: ../panels/network/net-device-wifi.c:1270
+ msgid "Wireless device does not support Hotspot mode"
+ msgstr "Brezžična naprava ne podpira načina vročih točk"
+ 
+-#: ../panels/network/net-device-wifi.c:1404
++#: ../panels/network/net-device-wifi.c:1399
+ msgid ""
+ "Network details for the selected networks, including passwords and any "
+ "custom configuration will be lost."
+@@ -2795,19 +2739,19 @@ msgstr ""
+ "Omrežne podrobnosti o izbranem omrežju z nastavitvami po meri in "
+ "pripadajočimi gesli bodo izgubljene."
+ 
+-#: ../panels/network/net-device-wifi.c:1714
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
++#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+ msgid "History"
+ msgstr "Zgodovina"
+ 
+-#: ../panels/network/net-device-wifi.c:1718 ../panels/power/power.ui.h:21
++#: ../panels/network/net-device-wifi.c:1730 ../panels/power/power.ui.h:21
+ #: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596
+-#: ../panels/wacom/cc-wacom-page.c:525
++#: ../panels/wacom/cc-wacom-page.c:534
+ msgid "_Close"
+ msgstr "_Zapri"
+ 
+ #. translators: This is the label for the "Forget wireless network" functionality
+-#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/network/net-device-wifi.c:1738
+ msgctxt "Wi-Fi Network"
+ msgid "_Forget"
+ msgstr "_Izbriši"
+@@ -2828,7 +2772,7 @@ msgstr ""
+ msgid "This is not recommended for untrusted public networks."
+ msgstr "Možnost ni priporočljiva za nezavarovana javna omrežja."
+ 
+-#: ../panels/network/net-proxy.c:417
++#: ../panels/network/net-proxy.c:410
+ msgid "Proxy"
+ msgstr "Posredniški strežnik"
+ 
+@@ -2844,17 +2788,17 @@ msgstr "IMEI"
+ msgid "Provider"
+ msgstr "Ponudnik"
+ 
+-#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
++#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:2
+ msgctxt "proxy method"
+ msgid "None"
+ msgstr "Brez"
+ 
+-#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
++#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:3
+ msgctxt "proxy method"
+ msgid "Manual"
+ msgstr "Ročno"
+ 
+-#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
++#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:4
+ msgctxt "proxy method"
+ msgid "Automatic"
+ msgstr "Samodejno"
+@@ -2907,19 +2851,7 @@ msgstr "Vrata posredniškega strežnika SOCKS"
+ msgid "Turn device off"
+ msgstr "Izklopi napravo"
+ 
+-#: ../panels/network/network.ui.h:1
+-msgid "Select the interface to use for the new service"
+-msgstr "Izbor vmesnika za novo storitev"
+-
+-#: ../panels/network/network.ui.h:2
+-msgid "C_reate…"
+-msgstr "_Ustvari ..."
+-
+-#: ../panels/network/network.ui.h:3
+-msgid "_Interface"
+-msgstr "_Vmesnik"
+-
+-#: ../panels/network/network.ui.h:8
++#: ../panels/network/network.ui.h:5
+ msgid "Add Device"
+ msgstr "Dodaj napravo"
+ 
+@@ -2958,7 +2890,7 @@ msgstr "podrobnosti"
+ #: ../panels/network/wireless-security/ws-leap.ui.h:2
+ #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
+ #: ../panels/user-accounts/data/account-dialog.ui.h:9
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+ msgid "_Password"
+ msgstr "_Geslo"
+ 
+@@ -3654,12 +3586,12 @@ msgid "Show Details in Lock Screen"
+ msgstr "Pokaži podrobnosti tudi na zaklenjenem zaslonu"
+ 
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1733 ../panels/power/cc-power-panel.c:1740
+-#: ../panels/privacy/cc-privacy-panel.c:77
+-#: ../panels/privacy/cc-privacy-panel.c:117
+-#: ../panels/universal-access/cc-ua-panel.c:253
+-#: ../panels/universal-access/cc-ua-panel.c:610
+-#: ../panels/universal-access/cc-ua-panel.c:736
++#: ../panels/power/cc-power-panel.c:1744 ../panels/power/cc-power-panel.c:1751
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ msgid "On"
+ msgstr "Omogočeno"
+ 
+@@ -3781,11 +3713,11 @@ msgstr ""
+ "Z dodajanjem računa je omogočen dostop za dokumente, pošto, stike, koledar, "
+ "klepet in drugo."
+ 
+-#: ../panels/power/cc-power-panel.c:187
++#: ../panels/power/cc-power-panel.c:189
+ msgid "Unknown time"
+ msgstr "Neznan čas"
+ 
+-#: ../panels/power/cc-power-panel.c:193
++#: ../panels/power/cc-power-panel.c:195
+ #, c-format
+ msgid "%i minute"
+ msgid_plural "%i minutes"
+@@ -3794,7 +3726,7 @@ msgstr[1] "%i minuta"
+ msgstr[2] "%i minuti"
+ msgstr[3] "%i minute"
+ 
+-#: ../panels/power/cc-power-panel.c:205
++#: ../panels/power/cc-power-panel.c:207
+ #, c-format
+ msgid "%i hour"
+ msgid_plural "%i hours"
+@@ -3805,12 +3737,12 @@ msgstr[3] "%i ure"
+ 
+ #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
+ #. * Swap order with "%2$s %2$i %1$s %1$i if needed
+-#: ../panels/power/cc-power-panel.c:213
++#: ../panels/power/cc-power-panel.c:215
+ #, c-format
+ msgid "%i %s %i %s"
+ msgstr "%i %s %i %s"
+ 
+-#: ../panels/power/cc-power-panel.c:214
++#: ../panels/power/cc-power-panel.c:216
+ msgid "hour"
+ msgid_plural "hours"
+ msgstr[0] "ur"
+@@ -3818,7 +3750,7 @@ msgstr[1] "ura"
+ msgstr[2] "uri"
+ msgstr[3] "ure"
+ 
+-#: ../panels/power/cc-power-panel.c:215
++#: ../panels/power/cc-power-panel.c:217
+ msgid "minute"
+ msgid_plural "minutes"
+ msgstr[0] "minut"
+@@ -3827,210 +3759,210 @@ msgstr[2] "minuti"
+ msgstr[3] "minute"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:234
++#: ../panels/power/cc-power-panel.c:236
+ #, c-format
+ msgid "%s until fully charged"
+ msgstr "Še %s do polne napolnjenosti"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:241
++#: ../panels/power/cc-power-panel.c:243
+ #, c-format
+ msgid "Caution: %s remaining"
+ msgstr "Opozorilo: na voljo je še %s delovanja"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:246
++#: ../panels/power/cc-power-panel.c:248
+ #, c-format
+ msgid "%s remaining"
+ msgstr "Še %s do konca delovanja"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:251 ../panels/power/cc-power-panel.c:279
++#: ../panels/power/cc-power-panel.c:253 ../panels/power/cc-power-panel.c:281
+ msgid "Fully charged"
+ msgstr "Polna napolnjenost"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:255 ../panels/power/cc-power-panel.c:283
++#: ../panels/power/cc-power-panel.c:257 ../panels/power/cc-power-panel.c:285
+ msgid "Empty"
+ msgstr "Prazno"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:270
++#: ../panels/power/cc-power-panel.c:272
+ msgid "Charging"
+ msgstr "Polnjenje"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:275
++#: ../panels/power/cc-power-panel.c:277
+ msgid "Discharging"
+ msgstr "Praznjenje"
+ 
+-#: ../panels/power/cc-power-panel.c:393
++#: ../panels/power/cc-power-panel.c:395
+ msgctxt "Battery name"
+ msgid "Main"
+ msgstr "Glavno"
+ 
+-#: ../panels/power/cc-power-panel.c:395
++#: ../panels/power/cc-power-panel.c:397
+ msgctxt "Battery name"
+ msgid "Extra"
+ msgstr "Dodatno"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:486
++#: ../panels/power/cc-power-panel.c:469
+ msgid "Wireless mouse"
+ msgstr "Brezžična miška"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:490
++#: ../panels/power/cc-power-panel.c:472
+ msgid "Wireless keyboard"
+ msgstr "Brezžična tipkovnica"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:494
++#: ../panels/power/cc-power-panel.c:475
+ msgid "Uninterruptible power supply"
+ msgstr "Neprekinjen oskrba z napetostjo"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:499
++#: ../panels/power/cc-power-panel.c:478
+ msgid "Personal digital assistant"
+ msgstr "Digitalni pomočnik"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:503
++#: ../panels/power/cc-power-panel.c:481
+ msgid "Cellphone"
+ msgstr "Mobilni telefon"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:507
++#: ../panels/power/cc-power-panel.c:484
+ msgid "Media player"
+ msgstr "Predvajalnik predstavnih datotek"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:511
++#: ../panels/power/cc-power-panel.c:487
+ msgid "Tablet"
+ msgstr "Tablični računalnik"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:515
++#: ../panels/power/cc-power-panel.c:490
+ msgid "Computer"
+ msgstr "Računalnik"
+ 
+ #. TRANSLATORS: secondary battery, misc
+-#: ../panels/power/cc-power-panel.c:519 ../panels/power/cc-power-panel.c:729
+-#: ../panels/power/cc-power-panel.c:2064
++#: ../panels/power/cc-power-panel.c:493 ../panels/power/cc-power-panel.c:740
++#: ../panels/power/cc-power-panel.c:2075
+ msgid "Battery"
+ msgstr "Baterija"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:528
++#: ../panels/power/cc-power-panel.c:539
+ msgctxt "Battery power"
+ msgid "Charging"
+ msgstr "Polnjenje"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:535
++#: ../panels/power/cc-power-panel.c:546
+ msgctxt "Battery power"
+ msgid "Caution"
+ msgstr "Opozorilo"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:540
++#: ../panels/power/cc-power-panel.c:551
+ msgctxt "Battery power"
+ msgid "Low"
+ msgstr "Nizko"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:545
++#: ../panels/power/cc-power-panel.c:556
+ msgctxt "Battery power"
+ msgid "Good"
+ msgstr "Dobro"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:550
++#: ../panels/power/cc-power-panel.c:561
+ msgctxt "Battery power"
+ msgid "Fully charged"
+ msgstr "Polna napolnjenost"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:554
++#: ../panels/power/cc-power-panel.c:565
+ msgctxt "Battery power"
+ msgid "Empty"
+ msgstr "Prazno"
+ 
+-#: ../panels/power/cc-power-panel.c:727
++#: ../panels/power/cc-power-panel.c:738
+ msgid "Batteries"
+ msgstr "Baterije"
+ 
+-#: ../panels/power/cc-power-panel.c:1133
++#: ../panels/power/cc-power-panel.c:1144
+ msgid "When _idle"
+ msgstr "Ob _nedejavnosti"
+ 
+-#: ../panels/power/cc-power-panel.c:1502
++#: ../panels/power/cc-power-panel.c:1513
+ msgid "Power Saving"
+ msgstr "Varčevanje"
+ 
+-#: ../panels/power/cc-power-panel.c:1530
++#: ../panels/power/cc-power-panel.c:1541
+ msgid "_Screen brightness"
+ msgstr "_Svetlost zaslona"
+ 
+-#: ../panels/power/cc-power-panel.c:1536
++#: ../panels/power/cc-power-panel.c:1547
+ msgid "_Keyboard brightness"
+ msgstr "_Svetlost tipkovnice"
+ 
+-#: ../panels/power/cc-power-panel.c:1546
++#: ../panels/power/cc-power-panel.c:1557
+ msgid "_Dim screen when inactive"
+ msgstr "_Zamegli zaslon ob nedejavnosti"
+ 
+-#: ../panels/power/cc-power-panel.c:1571
++#: ../panels/power/cc-power-panel.c:1582
+ msgid "_Blank screen"
+ msgstr "_Prazen zaslon"
+ 
+-#: ../panels/power/cc-power-panel.c:1608
++#: ../panels/power/cc-power-panel.c:1619
+ msgid "_Wi-Fi"
+ msgstr "_Wi-Fi"
+ 
+-#: ../panels/power/cc-power-panel.c:1613
++#: ../panels/power/cc-power-panel.c:1624
+ msgid "Turns off wireless devices"
+ msgstr "Izklopi brezžične naprave"
+ 
+-#: ../panels/power/cc-power-panel.c:1638
++#: ../panels/power/cc-power-panel.c:1649
+ msgid "_Mobile broadband"
+ msgstr "_Mobilni širokopasovni dostop"
+ 
+-#: ../panels/power/cc-power-panel.c:1643
++#: ../panels/power/cc-power-panel.c:1654
+ msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
+ msgstr ""
+ "Izklopi naprave, ki uporabljajo širokopasovni mobilni dostop (3G, 4G, "
+ "WiMax, ...)"
+ 
+-#: ../panels/power/cc-power-panel.c:1678
++#: ../panels/power/cc-power-panel.c:1689
+ msgid "_Bluetooth"
+ msgstr "_Bluetooth"
+ 
+-#: ../panels/power/cc-power-panel.c:1729
++#: ../panels/power/cc-power-panel.c:1740
+ msgid "When on battery power"
+ msgstr "Med delovanjem na bateriji"
+ 
+-#: ../panels/power/cc-power-panel.c:1731
++#: ../panels/power/cc-power-panel.c:1742
+ msgid "When plugged in"
+ msgstr "Ob priklopu"
+ 
+-#: ../panels/power/cc-power-panel.c:1860
++#: ../panels/power/cc-power-panel.c:1871
+ msgid "Suspend & Power Off"
+ msgstr "Izklop in prehod v pripravljenost"
+ 
+-#: ../panels/power/cc-power-panel.c:1893
++#: ../panels/power/cc-power-panel.c:1904
+ msgid "_Automatic suspend"
+ msgstr "_Samodejno pošlji v pripravljenost"
+ 
+-#: ../panels/power/cc-power-panel.c:1917
++#: ../panels/power/cc-power-panel.c:1928
+ msgid "When battery power is _critical"
+ msgstr "Ko je polnost baterije _kritično nizka"
+ 
+-#: ../panels/power/cc-power-panel.c:1974
++#: ../panels/power/cc-power-panel.c:1985
+ msgid "Power Off"
+ msgstr "Izklop"
+ 
+-#: ../panels/power/cc-power-panel.c:2111
++#: ../panels/power/cc-power-panel.c:2122
+ msgid "Devices"
+ msgstr "Naprave"
+ 
+@@ -4136,7 +4068,7 @@ msgid "Authenticate"
+ msgstr "Overi"
+ 
+ #: ../panels/printers/authentication-dialog.ui.h:5
+-#: ../panels/sharing/sharing.ui.h:23
++#: ../panels/sharing/sharing.ui.h:21
+ #: ../panels/user-accounts/data/account-dialog.ui.h:6
+ msgid "Password"
+ msgstr "Geslo"
+@@ -4506,12 +4438,12 @@ msgid "%s Active Jobs"
+ msgstr "%s dejavni posli"
+ 
+ #. Translators: This item is a server which needs authentication to show its printers
+-#: ../panels/printers/pp-new-printer-dialog.c:1667
++#: ../panels/printers/pp-new-printer-dialog.c:1669
+ msgid "Server requires authentication"
+ msgstr "Strežnik zahteva overitev"
+ 
+ #. Translators: No printers were found
+-#: ../panels/printers/pp-new-printer-dialog.c:1704
++#: ../panels/printers/pp-new-printer-dialog.c:1706
+ msgid "No printers detected."
+ msgstr "Ni zaznanih tiskalnikov."
+ 
+@@ -4684,6 +4616,10 @@ msgstr "Posli"
+ msgid "Show _Jobs"
+ msgstr "Pokaži _posle"
+ 
++#: ../panels/printers/printers.ui.h:12
++msgid "Model"
++msgstr "Model"
++
+ #: ../panels/printers/printers.ui.h:15
+ msgid "label"
+ msgstr "oznaka"
+@@ -4720,39 +4656,39 @@ msgstr ""
+ "Videti je, da sistemska storitev\n"
+ "tiskanja ni na voljo."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:245 ../panels/privacy/privacy.ui.h:26
++#: ../panels/privacy/cc-privacy-panel.c:248 ../panels/privacy/privacy.ui.h:26
+ msgid "Screen Lock"
+ msgstr "Zaklep zaslona"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:358 ../panels/privacy/privacy.ui.h:20
++#: ../panels/privacy/cc-privacy-panel.c:361 ../panels/privacy/privacy.ui.h:20
+ msgid "Usage & History"
+ msgstr "Uporaba in zgodovina"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:486
++#: ../panels/privacy/cc-privacy-panel.c:489
+ msgid "Empty all items from Trash?"
+ msgstr "Ali naj se izbrišejo vsi predmeti iz smeti?"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:487
++#: ../panels/privacy/cc-privacy-panel.c:490
+ msgid "All items in the Trash will be permanently deleted."
+ msgstr "Vsi predmeti v smeteh bodo trajno izbrisani."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:488 ../panels/privacy/privacy.ui.h:32
++#: ../panels/privacy/cc-privacy-panel.c:491 ../panels/privacy/privacy.ui.h:32
+ msgid "_Empty Trash"
+ msgstr "Izprazni _smeti"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:511
++#: ../panels/privacy/cc-privacy-panel.c:514
+ msgid "Delete all the temporary files?"
+ msgstr "Ali naj se izbrišejo vse začasne datoteke?"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:512
++#: ../panels/privacy/cc-privacy-panel.c:515
+ msgid "All the temporary files will be permanently deleted."
+ msgstr "Vse začasne datoteke bodo trajno izbrisane."
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:513 ../panels/privacy/privacy.ui.h:33
++#: ../panels/privacy/cc-privacy-panel.c:516 ../panels/privacy/privacy.ui.h:33
+ msgid "_Purge Temporary Files"
+ msgstr "_Počisti začasne datoteke"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:535 ../panels/privacy/privacy.ui.h:31
++#: ../panels/privacy/cc-privacy-panel.c:538 ../panels/privacy/privacy.ui.h:31
+ msgid "Purge Trash & Temporary Files"
+ msgstr "Počisti smeti in začasne datoteke"
+ 
+@@ -5104,21 +5040,21 @@ msgstr "Premakni navzdol"
+ msgid "Preferences"
+ msgstr "Možnosti"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:274
++#: ../panels/sharing/cc-sharing-panel.c:285
+ msgctxt "service is enabled"
+ msgid "On"
+ msgstr "Omogočeno"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:276
++#: ../panels/sharing/cc-sharing-panel.c:287
+ msgctxt "service is disabled"
+ msgid "Off"
+ msgstr "Onemogočeno"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:418
++#: ../panels/sharing/cc-sharing-panel.c:422
+ msgid "Choose a Folder"
+ msgstr "Izbor mape"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:702
++#: ../panels/sharing/cc-sharing-panel.c:736
+ msgid "Copy"
+ msgstr "Kopiraj"
+ 
+@@ -5160,70 +5096,62 @@ msgstr ""
+ "omogočenim Bluetooth"
+ 
+ #: ../panels/sharing/sharing.ui.h:3
+-msgid "Share Public Folder"
+-msgstr "Souporaba mape"
+-
+-#: ../panels/sharing/sharing.ui.h:4
+ msgid "Only Receive From Trusted Devices"
+ msgstr "Prejmi le od zaupljivih naprav"
+ 
+-#: ../panels/sharing/sharing.ui.h:5
++#: ../panels/sharing/sharing.ui.h:4
+ msgid "Save Received Files to Downloads Folder"
+ msgstr "Shrani prejete datoteke v mapo prejemov"
+ 
+-#: ../panels/sharing/sharing.ui.h:6
+-msgid "Only share with Trusted Devices"
+-msgstr "V souporabi le z varnimi napravami"
+-
+-#: ../panels/sharing/sharing.ui.h:7
++#: ../panels/sharing/sharing.ui.h:5
+ msgid "Computer Name"
+ msgstr "Ime računalnika"
+ 
+-#: ../panels/sharing/sharing.ui.h:8
++#: ../panels/sharing/sharing.ui.h:6
+ msgid "Personal File Sharing"
+ msgstr "Osebna souporaba datotek"
+ 
+-#: ../panels/sharing/sharing.ui.h:9
++#: ../panels/sharing/sharing.ui.h:7
+ msgid "Screen Sharing"
+ msgstr "Souporaba zaslona"
+ 
+-#: ../panels/sharing/sharing.ui.h:10
++#: ../panels/sharing/sharing.ui.h:8
+ msgid "Media Sharing"
+ msgstr "Souporaba predstavnih datotek"
+ 
+-#: ../panels/sharing/sharing.ui.h:11
++#: ../panels/sharing/sharing.ui.h:9
+ msgid "Remote Login"
+ msgstr "Oddaljena prijava"
+ 
+-#: ../panels/sharing/sharing.ui.h:12
++#: ../panels/sharing/sharing.ui.h:10
+ msgid "Some services are disabled because of no network access."
+ msgstr "Nekatere storitve so onemogočene zaradi nedostopne povezave v omrežje."
+ 
+-#: ../panels/sharing/sharing.ui.h:13
++#: ../panels/sharing/sharing.ui.h:11
+ msgid "Share Music, Photos and Videos with others on the current network."
+ msgstr "Souporaba glasbe, fotografij in videov z drugimi na trenutnem omrežju."
+ 
+-#: ../panels/sharing/sharing.ui.h:14
++#: ../panels/sharing/sharing.ui.h:12
+ msgid "Share Media On This Network"
+ msgstr "Souporaba predstavne datoteke na omrežju"
+ 
+-#: ../panels/sharing/sharing.ui.h:15
++#: ../panels/sharing/sharing.ui.h:13
+ msgid "Shared Folders"
+ msgstr "Mape v souporabi"
+ 
+-#: ../panels/sharing/sharing.ui.h:16
++#: ../panels/sharing/sharing.ui.h:14
+ msgid "column"
+ msgstr "stolpec"
+ 
+-#: ../panels/sharing/sharing.ui.h:17
++#: ../panels/sharing/sharing.ui.h:15
+ msgid "Add Folder"
+ msgstr "Dodaj mapo"
+ 
+-#: ../panels/sharing/sharing.ui.h:18
++#: ../panels/sharing/sharing.ui.h:16
+ msgid "Remove Folder"
+ msgstr "Odstrani mapo"
+ 
+-#: ../panels/sharing/sharing.ui.h:20
++#: ../panels/sharing/sharing.ui.h:18
+ #, no-c-format
+ msgid ""
+ "Personal File Sharing allows you to share your Public folder with others on "
+@@ -5232,15 +5160,15 @@ msgstr ""
+ "Osebna souporaba datotek vam omogoča souporabo vaše mape Javno z drugimi na "
+ "trenutnem omrežju z uporabo: <a href=\"dav://%s\">dav://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:21
++#: ../panels/sharing/sharing.ui.h:19
+ msgid "Share Public Folder On This Network"
+ msgstr "Javno mapo pokaži v omrežju "
+ 
+-#: ../panels/sharing/sharing.ui.h:22
++#: ../panels/sharing/sharing.ui.h:20
+ msgid "Require Password"
+ msgstr "Zahtevaj geslo"
+ 
+-#: ../panels/sharing/sharing.ui.h:25
++#: ../panels/sharing/sharing.ui.h:23
+ #, no-c-format
+ msgid ""
+ "Allow remote users to connect using the Secure Shell command:\n"
+@@ -5249,7 +5177,7 @@ msgstr ""
+ "Oddaljenim uporabnikom dovoli povezavo z ukazom Secure Shell:\n"
+ "<a href=\"ssh %s\">ssh %s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:28
++#: ../panels/sharing/sharing.ui.h:26
+ #, no-c-format
+ msgid ""
+ "Allow remote users to view or control your screen by connecting to: <a href="
+@@ -5258,19 +5186,19 @@ msgstr ""
+ "Oddaljenim uporabnikom dovoli ogled ali nadzor vašega zaslona s povezavo z: "
+ "<a href=\"vnc://%s\">vnc://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:29
++#: ../panels/sharing/sharing.ui.h:27
+ msgid "Remote View"
+ msgstr "Oddaljeni pogled"
+ 
+-#: ../panels/sharing/sharing.ui.h:30
++#: ../panels/sharing/sharing.ui.h:28
+ msgid "Remote Control"
+ msgstr "Oddaljeni nadzor"
+ 
+-#: ../panels/sharing/sharing.ui.h:31
++#: ../panels/sharing/sharing.ui.h:29
+ msgid "Approve All Connections"
+ msgstr "Odobri vse povezave"
+ 
+-#: ../panels/sharing/sharing.ui.h:32
++#: ../panels/sharing/sharing.ui.h:30
+ msgid "Show Password"
+ msgstr "Pokaži geslo"
+ 
+@@ -5971,7 +5899,7 @@ msgid "_Full Name"
+ msgstr "Polno _ime"
+ 
+ #: ../panels/user-accounts/data/account-dialog.ui.h:5
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+ msgid "Account _Type"
+ msgstr "Vrsta _računa"
+ 
+@@ -6126,69 +6054,35 @@ msgstr "Trenutno _geslo"
+ msgid "Ch_ange"
+ msgstr "_Spremeni"
+ 
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:1
+-msgid "Changing photo for:"
+-msgstr "Spremeni sliko za:"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
+-msgid ""
+-"Choose a picture that will be shown at the login screen for this account."
+-msgstr "Izbor slike, ki bo prikazana na prijavnem zaslonu tega računa."
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
+-msgid "Gallery"
+-msgstr "Galerija"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:4
+-#: ../panels/user-accounts/um-photo-dialog.c:218
+-msgid "Browse for more pictures"
+-msgstr "Brskanje med več slikami"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:5
+-msgid "Take a photograph"
+-msgstr "Zajemi fotografijo"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:6
+-msgid "Browse"
+-msgstr "Prebrskaj"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:7
+-msgid "Photograph"
+-msgstr "Fotografija"
+-
+ #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+-msgid "Account Information"
+-msgstr "Podrobnosti računa"
+-
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Add User Account"
+ msgstr "Dodaj uporabniški račun"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Remove User Account"
+ msgstr "Odstrani uporabniški račun"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+ msgid "Login Options"
+ msgstr "Možnosti prijave"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+ msgid "A_utomatic Login"
+ msgstr "_Samodejna prijava"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+ msgid "_Fingerprint Login"
+ msgstr "Prijava s _prstnimi odtisi"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+ msgid "User Icon"
+ msgstr "Uporabniška ikona"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+ msgid "_Language"
+ msgstr "_Jezik"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+ msgid "Last Login"
+ msgstr "Zadnja prijava"
+ 
+@@ -6604,6 +6498,10 @@ msgstr "Gesla ni mogoče spremeniti."
+ msgid "The passwords do not match."
+ msgstr "Gesli se ne skladata."
+ 
++#: ../panels/user-accounts/um-photo-dialog.c:218
++msgid "Browse for more pictures"
++msgstr "Brskanje med več slikami"
++
+ #: ../panels/user-accounts/um-photo-dialog.c:443
+ msgid "Disable image"
+ msgstr "Onemogoči sliko"
+@@ -6805,13 +6703,13 @@ msgstr ""
+ "pritisniti gumb bližnjice tipkovnice in zadržati ustrezne želene tipke za "
+ "vnos nove. S povratno tipko se izbriše trenutna nastavitev."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:82
++#: ../panels/wacom/calibrator/calibrator-gui.c:84
+ msgid ""
+ "Please tap the target markers as they appear on screen to calibrate the "
+ "tablet."
+ msgstr "Z udarjanjem na ciljna mest se umeri zaslon zaslona na dotik."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:86
++#: ../panels/wacom/calibrator/calibrator-gui.c:88
+ msgid "Mis-click detected, restarting..."
+ msgstr "Zaznan je napačen klik, zato bo znova začeto ..."
+ 
+@@ -6864,7 +6762,7 @@ msgstr "Preslikaj na en zaslon"
+ msgid "%d of %d"
+ msgstr "%d od %d"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:522
++#: ../panels/wacom/cc-wacom-page.c:531
+ msgid "Display Mapping"
+ msgstr "Preslikava prikaza"
+ 
+@@ -7001,22 +6899,22 @@ msgstr "Desni gumb preklopa drsne ploščice"
+ msgid "Mode Switch #%d"
+ msgstr "Gumb preklopa #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1336
++#: ../panels/wacom/gsd-wacom-device.c:1335
+ #, c-format
+ msgid "Left Button #%d"
+ msgstr "Levi gumb #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1339
++#: ../panels/wacom/gsd-wacom-device.c:1338
+ #, c-format
+ msgid "Right Button #%d"
+ msgstr "Desni gumb #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1342
++#: ../panels/wacom/gsd-wacom-device.c:1341
+ #, c-format
+ msgid "Top Button #%d"
+ msgstr "Zgornji gumb #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1345
++#: ../panels/wacom/gsd-wacom-device.c:1344
+ #, c-format
+ msgid "Bottom Button #%d"
+ msgstr "Spodnji gumb #%d"
+@@ -7122,11 +7020,11 @@ msgstr "Pult za prikaz"
+ msgid "[PANEL] [ARGUMENT…]"
+ msgstr "[PULT][ARGUMENT ...]"
+ 
+-#: ../shell/cc-application.c:142
++#: ../shell/cc-application.c:145
+ msgid "- Settings"
+ msgstr "- Nastavitve"
+ 
+-#: ../shell/cc-application.c:160
++#: ../shell/cc-application.c:163
+ #, c-format
+ msgid ""
+ "%s\n"
+@@ -7135,39 +7033,39 @@ msgstr ""
+ "%s\n"
+ "Zaženite '%s --help' za pregled celotnega seznama možnosti ukazne vrstice.\n"
+ 
+-#: ../shell/cc-application.c:190
++#: ../shell/cc-application.c:193
+ msgid "Available panels:"
+ msgstr "Pulti na voljo:"
+ 
+-#: ../shell/cc-application.c:325
++#: ../shell/cc-application.c:328
+ msgid "Help"
+ msgstr "Pomoč"
+ 
+-#: ../shell/cc-application.c:326
++#: ../shell/cc-application.c:329
+ msgid "Quit"
+ msgstr "Končaj"
+ 
+-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1479
++#: ../shell/cc-window.c:61 ../shell/cc-window.c:1486
+ msgid "All Settings"
+ msgstr "Vse nastavitve"
+ 
+ #. Add categories
+-#: ../shell/cc-window.c:866
++#: ../shell/cc-window.c:868
+ msgctxt "category"
+ msgid "Personal"
+ msgstr "Osebno"
+ 
+-#: ../shell/cc-window.c:867
++#: ../shell/cc-window.c:869
+ msgctxt "category"
+ msgid "Hardware"
+ msgstr "Strojna oprema"
+ 
+-#: ../shell/cc-window.c:868
++#: ../shell/cc-window.c:870
+ msgctxt "category"
+ msgid "System"
+ msgstr "Sistem"
+ 
+-#: ../shell/cc-window.c:1588 ../shell/gnome-control-center.desktop.in.in.h:1
++#: ../shell/cc-window.c:1597 ../shell/gnome-control-center.desktop.in.in.h:1
+ msgid "Settings"
+ msgstr "Nastavitve"
+ 
+@@ -7175,6 +7073,77 @@ msgstr "Nastavitve"
+ msgid "Preferences;Settings;"
+ msgstr "Možnosti;Nastavitve;"
+ 
++#~ msgid "Device type:"
++#~ msgstr "Vrsta naprave:"
++
++#~ msgid "Manufacturer:"
++#~ msgstr "Proizvajalec:"
++
++#~ msgid "Model:"
++#~ msgstr "Model:"
++
++#~ msgid ""
++#~ "Image files can be dragged on this window to auto-complete the above "
++#~ "fields."
++#~ msgstr ""
++#~ "Slikovne datoteke je mogoče povleči v to okno za samodejno dopolnjevanje "
++#~ "vnosnih polj."
++
++#~ msgid "Show your primary display on this screen also"
++#~ msgstr "Osnovni zaslon prikaži tudi na tem zaslonu"
++
++#~ msgid "Combine"
++#~ msgstr "Združi"
++
++#~ msgid "Join with the primary display to create an extra space"
++#~ msgstr "Združi z osnovnim zaslonom za omogočanje dodatnega prostora"
++
++#~ msgid "Don't use the display"
++#~ msgstr "Ne uporabi zaslona"
++
++#~ msgid "Refresh Rate"
++#~ msgstr "Hitrost osveževanja"
++
++#~ msgid "Mouse Preferences"
++#~ msgstr "Možnosti miške"
++
++#~ msgid "Select the interface to use for the new service"
++#~ msgstr "Izbor vmesnika za novo storitev"
++
++#~ msgid "C_reate…"
++#~ msgstr "_Ustvari ..."
++
++#~ msgid "_Interface"
++#~ msgstr "_Vmesnik"
++
++#~ msgid "Share Public Folder"
++#~ msgstr "Souporaba mape"
++
++#~ msgid "Only share with Trusted Devices"
++#~ msgstr "V souporabi le z varnimi napravami"
++
++#~ msgid "Changing photo for:"
++#~ msgstr "Spremeni sliko za:"
++
++#~ msgid ""
++#~ "Choose a picture that will be shown at the login screen for this account."
++#~ msgstr "Izbor slike, ki bo prikazana na prijavnem zaslonu tega računa."
++
++#~ msgid "Gallery"
++#~ msgstr "Galerija"
++
++#~ msgid "Take a photograph"
++#~ msgstr "Zajemi fotografijo"
++
++#~ msgid "Browse"
++#~ msgstr "Prebrskaj"
++
++#~ msgid "Photograph"
++#~ msgstr "Fotografija"
++
++#~ msgid "Account Information"
++#~ msgstr "Podrobnosti računa"
++
+ #~ msgid "Switch between AM and PM."
+ #~ msgstr "Preklop med dopoldanskim in popoldanskim prikazom."
+ 
+diff --git a/po/sr.po b/po/sr.po
+index deb1403..142560e 100644
+--- a/po/sr.po
++++ b/po/sr.po
+@@ -5,16 +5,16 @@
+ # Reviewed on 2005-03-03 by: Данило Шеган <danilo@gnome.org>
+ # Translated on 2006-03-11 by: Слободан Д. Средојевић <slobo@akrep.be>
+ # Милош Поповић <gpopac@gmail.com>, 2010, 2011.
+-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011, 2012, 2013.
++# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011, 2012, 2013, 2014.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-control-center\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "control-center&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-10-02 17:36+0000\n"
+-"PO-Revision-Date: 2013-10-05 06:31+0200\n"
++"POT-Creation-Date: 2014-01-13 08:34+0000\n"
++"PO-Revision-Date: 2014-01-13 10:12+0200\n"
+ "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+-"Language-Team: Serbian <gnom@prevod.org>\n"
++"Language-Team: Serbian <(nothing)>\n"
+ "Language: sr\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -68,53 +68,53 @@ msgid "Span"
+ msgstr "Распрострто"
+ 
+ #. translators: This is the title of the wallpaper chooser dialog.
+-#: ../panels/background/cc-background-chooser-dialog.c:296
++#: ../panels/background/cc-background-chooser-dialog.c:292
+ msgid "Select Background"
+ msgstr "Изаберите позадину"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:315
++#: ../panels/background/cc-background-chooser-dialog.c:312
+ msgid "Wallpapers"
+ msgstr "Позадина"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:324
++#: ../panels/background/cc-background-chooser-dialog.c:321
+ msgid "Pictures"
+ msgstr "Слике"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:332
++#: ../panels/background/cc-background-chooser-dialog.c:329
+ msgid "Colors"
+ msgstr "Боје"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:341
++#: ../panels/background/cc-background-chooser-dialog.c:338
+ msgid "Flickr"
+ msgstr "Фликр"
+ 
+ #. translators: No pictures were found
+-#: ../panels/background/cc-background-chooser-dialog.c:396
++#: ../panels/background/cc-background-chooser-dialog.c:385
+ msgid "No Pictures Found"
+ msgstr "Нисам пронашао слике"
+ 
+ #. translators: %s here is the name of the Pictures directory, the string should be translated in
+ #. * the context "You can add images to your Pictures folder and they will show up here"
+-#: ../panels/background/cc-background-chooser-dialog.c:411
++#: ../panels/background/cc-background-chooser-dialog.c:400
+ #, c-format
+ msgid "You can add images to your %s folder and they will show up here"
+ msgstr "Можете да додате слике у вашу фасциклу %s и оне ће бити приказане овде"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:439
++#: ../panels/background/cc-background-chooser-dialog.c:429
+ #: ../panels/bluetooth/cc-bluetooth-panel.c:640
+ #: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
+-#: ../panels/display/cc-display-panel.c:1494
+-#: ../panels/display/cc-display-panel.c:1909
++#: ../panels/display/cc-display-panel.c:1510
++#: ../panels/display/cc-display-panel.c:1952
+ #: ../panels/network/connection-editor/vpn-helpers.c:245
+ #: ../panels/network/connection-editor/vpn-helpers.c:374
+-#: ../panels/network/net-device-wifi.c:1195
+-#: ../panels/network/net-device-wifi.c:1403
++#: ../panels/network/net-device-wifi.c:1194
++#: ../panels/network/net-device-wifi.c:1402
+ #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
+ #: ../panels/printers/cc-printers-panel.c:1946
+ #: ../panels/printers/new-printer-dialog.ui.h:2
+ #: ../panels/privacy/cc-privacy-panel.c:470
+ #: ../panels/search/cc-search-locations-dialog.c:682
+-#: ../panels/sharing/cc-sharing-panel.c:424
++#: ../panels/sharing/cc-sharing-panel.c:425
+ #: ../panels/user-accounts/um-fingerprint-dialog.c:269
+ #: ../panels/user-accounts/um-photo-dialog.c:96
+ #: ../panels/user-accounts/um-photo-dialog.c:221
+@@ -122,7 +122,7 @@ msgstr "Можете да додате слике у вашу фасциклу %
+ msgid "_Cancel"
+ msgstr "_Откажи"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:440
++#: ../panels/background/cc-background-chooser-dialog.c:430
+ #: ../panels/printers/ppd-selection-dialog.ui.h:3
+ #: ../panels/user-accounts/um-photo-dialog.c:98
+ msgid "Select"
+@@ -608,10 +608,10 @@ msgid "Done"
+ msgstr "Обављено"
+ 
+ #. Timeout parameters
+-#. 5000 = 5 sec
++#. 15000 = 15 sec
+ #. 750 = 0.75 sec
+ #. Text printed on screen
+-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
++#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:83
+ msgid "Screen Calibration"
+ msgstr "Калибрација екрана"
+ 
+@@ -954,28 +954,28 @@ msgid "_Done"
+ msgstr "_Урађено"
+ 
+ #. Translators: This is the full date and time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:358
++#: ../panels/datetime/cc-datetime-panel.c:363
+ msgid "%e %B %Y, %l:%M %p"
+ msgstr "%A, %e.%m.%Y. %l:%M %P"
+ 
+ #. Translators: This is the full date and time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:363
++#: ../panels/datetime/cc-datetime-panel.c:368
+ msgid "%e %B %Y, %R"
+ msgstr "%e. %B %Y. %R"
+ 
+ #. Translators: UTC here means the Coordinated Universal Time.
+ #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
+-#: ../panels/datetime/cc-datetime-panel.c:579
++#: ../panels/datetime/cc-datetime-panel.c:584
+ msgid "UTC%:::z"
+ msgstr "КУВ%:::z"
+ 
+ #. Translators: This is the time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:584
++#: ../panels/datetime/cc-datetime-panel.c:589
+ msgid "%l:%M %p"
+ msgstr "%l:%M %P"
+ 
+ #. Translators: This is the time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:589
++#: ../panels/datetime/cc-datetime-panel.c:594
+ msgid "%R"
+ msgstr "%R"
+ 
+@@ -1116,23 +1116,23 @@ msgid "To change time or date settings, you need to authenticate."
+ msgstr ""
+ "Да измените подешавања времена и датума, морате да потврдите идентитет."
+ 
+-#: ../panels/display/cc-display-panel.c:472
++#: ../panels/display/cc-display-panel.c:486
+ msgid "Lid Closed"
+ msgstr "Спуштен поклопац"
+ 
+ #. translators: "Mirrored" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:475
++#: ../panels/display/cc-display-panel.c:489
+ msgid "Mirrored"
+ msgstr "Пресликано"
+ 
+-#: ../panels/display/cc-display-panel.c:477
+-#: ../panels/display/cc-display-panel.c:2042
++#: ../panels/display/cc-display-panel.c:491
++#: ../panels/display/cc-display-panel.c:2101
+ msgid "Primary"
+ msgstr "Главни"
+ 
+-#: ../panels/display/cc-display-panel.c:479
++#: ../panels/display/cc-display-panel.c:493
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1729 ../panels/power/cc-power-panel.c:1740
++#: ../panels/power/cc-power-panel.c:1738 ../panels/power/cc-power-panel.c:1749
+ #: ../panels/privacy/cc-privacy-panel.c:80
+ #: ../panels/privacy/cc-privacy-panel.c:120
+ #: ../panels/universal-access/cc-ua-panel.c:257
+@@ -1142,82 +1142,80 @@ msgstr "Главни"
+ msgid "Off"
+ msgstr "Искљ."
+ 
+-#: ../panels/display/cc-display-panel.c:482
++#: ../panels/display/cc-display-panel.c:496
+ msgid "Secondary"
+ msgstr "Споредни"
+ 
+-#: ../panels/display/cc-display-panel.c:1490
++#: ../panels/display/cc-display-panel.c:1506
+ msgid "Arrange Combined Displays"
+ msgstr "Распоредите обједињене приказе"
+ 
+-#: ../panels/display/cc-display-panel.c:1496
+-#: ../panels/display/cc-display-panel.c:1912
++#: ../panels/display/cc-display-panel.c:1512
++#: ../panels/display/cc-display-panel.c:1955
+ #: ../panels/network/connection-editor/connection-editor.ui.h:1
+ msgid "_Apply"
+ msgstr "_Примени"
+ 
+-#: ../panels/display/cc-display-panel.c:1517
++#: ../panels/display/cc-display-panel.c:1533
+ msgid "Drag displays to rearrange them"
+ msgstr "Превуците приказе да их прераспоредите"
+ 
+-#. size
+-#: ../panels/display/cc-display-panel.c:1976
++#: ../panels/display/cc-display-panel.c:2037
+ msgid "Size"
+ msgstr "Величина"
+ 
+ #. aspect ratio
+-#: ../panels/display/cc-display-panel.c:1991
++#: ../panels/display/cc-display-panel.c:2050
+ msgid "Aspect Ratio"
+ msgstr "Размера"
+ 
+-#: ../panels/display/cc-display-panel.c:2012
++#: ../panels/display/cc-display-panel.c:2071
+ #: ../panels/printers/pp-options-dialog.c:86
+ msgid "Resolution"
+ msgstr "Резолуција"
+ 
+-#: ../panels/display/cc-display-panel.c:2043
++#: ../panels/display/cc-display-panel.c:2102
+ msgid "Show the top bar and Activities Overview on this display"
+ msgstr "Прикажи горњу траку и преглед активности на овом приказу"
+ 
+-#: ../panels/display/cc-display-panel.c:2049
++#: ../panels/display/cc-display-panel.c:2108
+ msgid "Secondary Display"
+ msgstr "Помоћни приказ"
+ 
+-#: ../panels/display/cc-display-panel.c:2050
++#: ../panels/display/cc-display-panel.c:2109
+ msgid "Join this display with another to create an extra workspace"
+ msgstr "Придружите овај приказ са другим да направите додатни радни простор"
+ 
+-#: ../panels/display/cc-display-panel.c:2057
++#: ../panels/display/cc-display-panel.c:2116
+ msgid "Presentation"
+ msgstr "Излагање"
+ 
+-#: ../panels/display/cc-display-panel.c:2058
++#: ../panels/display/cc-display-panel.c:2117
+ msgid "Show slideshows and media only"
+ msgstr "Прикажите само покретне приказе и медије"
+ 
+ #. translators: "Mirror" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:2063
++#: ../panels/display/cc-display-panel.c:2122
+ msgid "Mirror"
+ msgstr "Пресликано"
+ 
+-#: ../panels/display/cc-display-panel.c:2064
++#: ../panels/display/cc-display-panel.c:2123
+ msgid "Show your existing view on both displays"
+ msgstr "Прикажите ваш постојећи преглед на оба приказа"
+ 
+-#: ../panels/display/cc-display-panel.c:2070
++#: ../panels/display/cc-display-panel.c:2129
+ msgid "Turn Off"
+ msgstr "Искључи"
+ 
+-#: ../panels/display/cc-display-panel.c:2071
+-#| msgid "Don't use the display"
++#: ../panels/display/cc-display-panel.c:2130
+ msgid "Don't use this display"
+ msgstr "Не користи овај приказ"
+ 
+-#: ../panels/display/cc-display-panel.c:2286
++#: ../panels/display/cc-display-panel.c:2345
+ msgid "Could not get screen information"
+ msgstr "Не могу да добијем податке о екрану"
+ 
+-#: ../panels/display/cc-display-panel.c:2317
++#: ../panels/display/cc-display-panel.c:2376
+ msgid "_Arrange Combined Displays"
+ msgstr "_Распореди обједињене приказе"
+ 
+@@ -1235,53 +1233,53 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
+ msgstr "панел;пројектор;икс-рандр;екран;резолуција;освежавање;"
+ 
+ #. TRANSLATORS: AP type
+-#: ../panels/info/cc-info-panel.c:451 ../panels/network/panel-common.c:127
++#: ../panels/info/cc-info-panel.c:452 ../panels/network/panel-common.c:127
+ msgid "Unknown"
+ msgstr "Непознато"
+ 
+-#: ../panels/info/cc-info-panel.c:534
++#: ../panels/info/cc-info-panel.c:539
+ #, c-format
+ msgid "%s %d-bit"
+ msgstr "%s %d бита"
+ 
+-#: ../panels/info/cc-info-panel.c:536
++#: ../panels/info/cc-info-panel.c:541
+ #, c-format
+ msgid "%d-bit"
+ msgstr "%d-бита"
+ 
+-#: ../panels/info/cc-info-panel.c:1216
++#: ../panels/info/cc-info-panel.c:1221
+ msgid "Ask what to do"
+ msgstr "Питај шта да радиш"
+ 
+-#: ../panels/info/cc-info-panel.c:1220
++#: ../panels/info/cc-info-panel.c:1225
+ msgid "Do nothing"
+ msgstr "Не ради ништа"
+ 
+-#: ../panels/info/cc-info-panel.c:1224
++#: ../panels/info/cc-info-panel.c:1229
+ msgid "Open folder"
+ msgstr "Отвори фасциклу"
+ 
+-#: ../panels/info/cc-info-panel.c:1315
++#: ../panels/info/cc-info-panel.c:1320
+ msgid "Other Media"
+ msgstr "Остали медији"
+ 
+-#: ../panels/info/cc-info-panel.c:1346
++#: ../panels/info/cc-info-panel.c:1351
+ msgid "Select an application for audio CDs"
+ msgstr "Изаберите програм за аудио дискове (ЦД)"
+ 
+-#: ../panels/info/cc-info-panel.c:1347
++#: ../panels/info/cc-info-panel.c:1352
+ msgid "Select an application for video DVDs"
+ msgstr "Изаберите програм за видео дискове (ДВД)"
+ 
+-#: ../panels/info/cc-info-panel.c:1348
++#: ../panels/info/cc-info-panel.c:1353
+ msgid "Select an application to run when a music player is connected"
+ msgstr "Изаберите програм за покретање када је прикључен музички плејер"
+ 
+-#: ../panels/info/cc-info-panel.c:1349
++#: ../panels/info/cc-info-panel.c:1354
+ msgid "Select an application to run when a camera is connected"
+ msgstr "Изаберите програм за покретање када је прикључена камера"
+ 
+-#: ../panels/info/cc-info-panel.c:1350
++#: ../panels/info/cc-info-panel.c:1355
+ msgid "Select an application for software CDs"
+ msgstr "Изаберите програм за дискове са софтвером"
+ 
+@@ -1290,89 +1288,89 @@ msgstr "Изаберите програм за дискове са софтве
+ #. * If the shared-mime-info translation works for your language,
+ #. * simply leave these untranslated.
+ #.
+-#: ../panels/info/cc-info-panel.c:1362
++#: ../panels/info/cc-info-panel.c:1367
+ msgid "audio DVD"
+ msgstr "аудио ДВД"
+ 
+-#: ../panels/info/cc-info-panel.c:1363
++#: ../panels/info/cc-info-panel.c:1368
+ msgid "blank Blu-ray disc"
+ msgstr "празан Блу-реј диск"
+ 
+-#: ../panels/info/cc-info-panel.c:1364
++#: ../panels/info/cc-info-panel.c:1369
+ msgid "blank CD disc"
+ msgstr "празан ЦД диск"
+ 
+-#: ../panels/info/cc-info-panel.c:1365
++#: ../panels/info/cc-info-panel.c:1370
+ msgid "blank DVD disc"
+ msgstr "празан ДВД диск"
+ 
+-#: ../panels/info/cc-info-panel.c:1366
++#: ../panels/info/cc-info-panel.c:1371
+ msgid "blank HD DVD disc"
+ msgstr "празан ХД ДВД диск"
+ 
+-#: ../panels/info/cc-info-panel.c:1367
++#: ../panels/info/cc-info-panel.c:1372
+ msgid "Blu-ray video disc"
+ msgstr "Блу-реј видео диск"
+ 
+-#: ../panels/info/cc-info-panel.c:1368
++#: ../panels/info/cc-info-panel.c:1373
+ msgid "e-book reader"
+ msgstr "читач ел. књига"
+ 
+-#: ../panels/info/cc-info-panel.c:1369
++#: ../panels/info/cc-info-panel.c:1374
+ msgid "HD DVD video disc"
+ msgstr "ХД ДВД видео диск"
+ 
+-#: ../panels/info/cc-info-panel.c:1370
++#: ../panels/info/cc-info-panel.c:1375
+ msgid "Picture CD"
+ msgstr "ЦД са сликама"
+ 
+-#: ../panels/info/cc-info-panel.c:1371
++#: ../panels/info/cc-info-panel.c:1376
+ msgid "Super Video CD"
+ msgstr "Супер видео ЦД"
+ 
+-#: ../panels/info/cc-info-panel.c:1372
++#: ../panels/info/cc-info-panel.c:1377
+ msgid "Video CD"
+ msgstr "Видео ЦД"
+ 
+-#: ../panels/info/cc-info-panel.c:1373
++#: ../panels/info/cc-info-panel.c:1378
+ msgid "Windows software"
+ msgstr "Виндоуз програми"
+ 
+-#: ../panels/info/cc-info-panel.c:1374
++#: ../panels/info/cc-info-panel.c:1379
+ msgid "Software"
+ msgstr "Програми"
+ 
+-#: ../panels/info/cc-info-panel.c:1497
++#: ../panels/info/cc-info-panel.c:1502
+ #: ../panels/keyboard/keyboard-shortcuts.c:1696
+ msgid "Section"
+ msgstr "Одељак"
+ 
+-#: ../panels/info/cc-info-panel.c:1506 ../panels/info/info.ui.h:13
++#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:13
+ msgid "Overview"
+ msgstr "Преглед"
+ 
+-#: ../panels/info/cc-info-panel.c:1512 ../panels/info/info.ui.h:20
++#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:20
+ msgid "Default Applications"
+ msgstr "Основни програми"
+ 
+-#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:28
++#: ../panels/info/cc-info-panel.c:1522 ../panels/info/info.ui.h:28
+ msgid "Removable Media"
+ msgstr "Измењиви дискови"
+ 
+-#: ../panels/info/cc-info-panel.c:1542
++#: ../panels/info/cc-info-panel.c:1547
+ #, c-format
+ msgid "Version %s"
+ msgstr "Издање %s"
+ 
+-#: ../panels/info/cc-info-panel.c:1592
++#: ../panels/info/cc-info-panel.c:1597
+ msgid "Install Updates"
+ msgstr "Инсталирај ажурирања"
+ 
+-#: ../panels/info/cc-info-panel.c:1596
++#: ../panels/info/cc-info-panel.c:1601
+ msgid "System Up-To-Date"
+ msgstr "Ажурирања система"
+ 
+-#: ../panels/info/cc-info-panel.c:1600
++#: ../panels/info/cc-info-panel.c:1605
+ msgid "Checking for Updates"
+ msgstr "Проверавам ажурирања"
+ 
+@@ -2462,23 +2460,23 @@ msgstr "ВПН"
+ msgid "Bond"
+ msgstr "Веза"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:597
++#: ../panels/network/connection-editor/net-connection-editor.c:598
+ msgid "Bridge"
+ msgstr "Мост"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:598
++#: ../panels/network/connection-editor/net-connection-editor.c:599
+ msgid "VLAN"
+ msgstr "ВЛАН"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:749
++#: ../panels/network/connection-editor/net-connection-editor.c:750
+ msgid "Could not load VPN plugins"
+ msgstr "Не могу да учитам ВПН прикључке"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:818
++#: ../panels/network/connection-editor/net-connection-editor.c:819
+ msgid "Import from file…"
+ msgstr "Увези из датотеке…"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:889
++#: ../panels/network/connection-editor/net-connection-editor.c:890
+ msgid "Add Network Connection"
+ msgstr "Додавање мрежне везе"
+ 
+@@ -2488,7 +2486,7 @@ msgid "_Reset"
+ msgstr "_Поново постави"
+ 
+ #: ../panels/network/connection-editor/reset-page.ui.h:2
+-#: ../panels/network/net-device-wifi.c:1404
++#: ../panels/network/net-device-wifi.c:1403
+ #: ../panels/network/network-wifi.ui.h:40
+ msgid "_Forget"
+ msgstr "_Заборави"
+@@ -2537,7 +2535,7 @@ msgstr "Изаберите датотеку за увоз"
+ 
+ #: ../panels/network/connection-editor/vpn-helpers.c:246
+ #: ../panels/printers/cc-printers-panel.c:1947
+-#: ../panels/sharing/cc-sharing-panel.c:425
++#: ../panels/sharing/cc-sharing-panel.c:426
+ #: ../panels/user-accounts/um-photo-dialog.c:222
+ msgid "_Open"
+ msgstr "_Отвори"
+@@ -2663,7 +2661,7 @@ msgid "Wired"
+ msgstr "Жичана"
+ 
+ #: ../panels/network/net-device-ethernet.c:352
+-#: ../panels/network/net-device-wifi.c:1559
++#: ../panels/network/net-device-wifi.c:1558
+ #: ../panels/network/network-ethernet.ui.h:3
+ #: ../panels/network/network-mobile.ui.h:8
+ #: ../panels/network/network-simple.ui.h:8
+@@ -2680,7 +2678,12 @@ msgstr "Профил „%d“"
+ msgid "Add new connection"
+ msgstr "Додајте нову везу"
+ 
+-#: ../panels/network/net-device-wifi.c:1111
++#: ../panels/network/net-device-team.c:77
++#| msgid "Bridge slaves"
++msgid "Team slaves"
++msgstr "Поданици тима"
++
++#: ../panels/network/net-device-wifi.c:1110
+ msgid ""
+ "If you have a connection to the Internet other than wireless, you can set up "
+ "a wireless hotspot to share the connection with others."
+@@ -2688,12 +2691,12 @@ msgstr ""
+ "Ако имате неку другу везу на Интернет осим бежичне, можете да подесите "
+ "бежичну врућу тачку да делите везу са другима."
+ 
+-#: ../panels/network/net-device-wifi.c:1115
++#: ../panels/network/net-device-wifi.c:1114
+ #, c-format
+ msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+ msgstr "Укључивањем бежичне вруће тачке прекинућете везу са <b>%s</b>."
+ 
+-#: ../panels/network/net-device-wifi.c:1119
++#: ../panels/network/net-device-wifi.c:1118
+ msgid ""
+ "It is not possible to access the Internet through your wireless while the "
+ "hotspot is active."
+@@ -2701,23 +2704,23 @@ msgstr ""
+ "Није могуће приступити Интернету преко ваше бежичне док је укључена врућа "
+ "тачка."
+ 
+-#: ../panels/network/net-device-wifi.c:1193
++#: ../panels/network/net-device-wifi.c:1192
+ msgid "Stop hotspot and disconnect any users?"
+ msgstr "Да зауставим врућу тачку и да искључим све кориснике?"
+ 
+-#: ../panels/network/net-device-wifi.c:1196
++#: ../panels/network/net-device-wifi.c:1195
+ msgid "_Stop Hotspot"
+ msgstr "_Заустави врућу тачку"
+ 
+-#: ../panels/network/net-device-wifi.c:1268
++#: ../panels/network/net-device-wifi.c:1267
+ msgid "System policy prohibits use as a Hotspot"
+ msgstr "Политика система забрањује употребу као вруће тачке"
+ 
+-#: ../panels/network/net-device-wifi.c:1271
++#: ../panels/network/net-device-wifi.c:1270
+ msgid "Wireless device does not support Hotspot mode"
+ msgstr "Бежични уређај не подржава режим вруће тачке"
+ 
+-#: ../panels/network/net-device-wifi.c:1400
++#: ../panels/network/net-device-wifi.c:1399
+ msgid ""
+ "Network details for the selected networks, including passwords and any "
+ "custom configuration will be lost."
+@@ -2725,19 +2728,19 @@ msgstr ""
+ "Детаљи мреже за изабране мреже, укључујући лозинку и сва произвољна "
+ "подешавања ће бити изгубљени."
+ 
+-#: ../panels/network/net-device-wifi.c:1727
++#: ../panels/network/net-device-wifi.c:1726
+ #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+ msgid "History"
+ msgstr "Историјат"
+ 
+-#: ../panels/network/net-device-wifi.c:1731 ../panels/power/power.ui.h:21
++#: ../panels/network/net-device-wifi.c:1730 ../panels/power/power.ui.h:21
+ #: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596
+-#: ../panels/wacom/cc-wacom-page.c:525
++#: ../panels/wacom/cc-wacom-page.c:534
+ msgid "_Close"
+ msgstr "_Затвори"
+ 
+ #. translators: This is the label for the "Forget wireless network" functionality
+-#: ../panels/network/net-device-wifi.c:1739
++#: ../panels/network/net-device-wifi.c:1738
+ msgctxt "Wi-Fi Network"
+ msgid "_Forget"
+ msgstr "_Заборави"
+@@ -3571,7 +3574,7 @@ msgid "Show Details in Lock Screen"
+ msgstr "Прикажи податке у екрану закључавања"
+ 
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1735 ../panels/power/cc-power-panel.c:1742
++#: ../panels/power/cc-power-panel.c:1744 ../panels/power/cc-power-panel.c:1751
+ #: ../panels/privacy/cc-privacy-panel.c:80
+ #: ../panels/privacy/cc-privacy-panel.c:120
+ #: ../panels/universal-access/cc-ua-panel.c:257
+@@ -3793,160 +3796,160 @@ msgid "Extra"
+ msgstr "Додатна"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:488
++#: ../panels/power/cc-power-panel.c:469
+ msgid "Wireless mouse"
+ msgstr "Бежични миш"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:492
++#: ../panels/power/cc-power-panel.c:472
+ msgid "Wireless keyboard"
+ msgstr "Бежична тастатура"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:496
++#: ../panels/power/cc-power-panel.c:475
+ msgid "Uninterruptible power supply"
+ msgstr "Непрекидив извор напајања"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:501
++#: ../panels/power/cc-power-panel.c:478
+ msgid "Personal digital assistant"
+ msgstr "Лични дигитални помоћник"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:505
++#: ../panels/power/cc-power-panel.c:481
+ msgid "Cellphone"
+ msgstr "Мобилни телефон"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:509
++#: ../panels/power/cc-power-panel.c:484
+ msgid "Media player"
+ msgstr "Музички уређај"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:513
++#: ../panels/power/cc-power-panel.c:487
+ msgid "Tablet"
+ msgstr "Таблица"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:517
++#: ../panels/power/cc-power-panel.c:490
+ msgid "Computer"
+ msgstr "Рачунар"
+ 
+ #. TRANSLATORS: secondary battery, misc
+-#: ../panels/power/cc-power-panel.c:521 ../panels/power/cc-power-panel.c:731
+-#: ../panels/power/cc-power-panel.c:2066
++#: ../panels/power/cc-power-panel.c:493 ../panels/power/cc-power-panel.c:740
++#: ../panels/power/cc-power-panel.c:2075
+ msgid "Battery"
+ msgstr "Батерија"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:530
++#: ../panels/power/cc-power-panel.c:539
+ msgctxt "Battery power"
+ msgid "Charging"
+ msgstr "Пуни се"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:537
++#: ../panels/power/cc-power-panel.c:546
+ msgctxt "Battery power"
+ msgid "Caution"
+ msgstr "Упозорење"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:542
++#: ../panels/power/cc-power-panel.c:551
+ msgctxt "Battery power"
+ msgid "Low"
+ msgstr "Скоро празна"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:547
++#: ../panels/power/cc-power-panel.c:556
+ msgctxt "Battery power"
+ msgid "Good"
+ msgstr "Пуна"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:552
++#: ../panels/power/cc-power-panel.c:561
+ msgctxt "Battery power"
+ msgid "Fully charged"
+ msgstr "Потпуно пуна"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:556
++#: ../panels/power/cc-power-panel.c:565
+ msgctxt "Battery power"
+ msgid "Empty"
+ msgstr "Празна"
+ 
+-#: ../panels/power/cc-power-panel.c:729
++#: ../panels/power/cc-power-panel.c:738
+ msgid "Batteries"
+ msgstr "Батерије"
+ 
+-#: ../panels/power/cc-power-panel.c:1135
++#: ../panels/power/cc-power-panel.c:1144
+ msgid "When _idle"
+ msgstr "Када _мирује"
+ 
+-#: ../panels/power/cc-power-panel.c:1504
++#: ../panels/power/cc-power-panel.c:1513
+ msgid "Power Saving"
+ msgstr "Уштеда напајања"
+ 
+-#: ../panels/power/cc-power-panel.c:1532
++#: ../panels/power/cc-power-panel.c:1541
+ msgid "_Screen brightness"
+ msgstr "Осветљај _екрана"
+ 
+-#: ../panels/power/cc-power-panel.c:1538
++#: ../panels/power/cc-power-panel.c:1547
+ msgid "_Keyboard brightness"
+ msgstr "Осветљај _тастатуре"
+ 
+-#: ../panels/power/cc-power-panel.c:1548
++#: ../panels/power/cc-power-panel.c:1557
+ msgid "_Dim screen when inactive"
+ msgstr "_Затамни екран када је нерадан"
+ 
+-#: ../panels/power/cc-power-panel.c:1573
++#: ../panels/power/cc-power-panel.c:1582
+ msgid "_Blank screen"
+ msgstr "_Празан екран"
+ 
+-#: ../panels/power/cc-power-panel.c:1610
++#: ../panels/power/cc-power-panel.c:1619
+ msgid "_Wi-Fi"
+ msgstr "_Бежична"
+ 
+-#: ../panels/power/cc-power-panel.c:1615
++#: ../panels/power/cc-power-panel.c:1624
+ msgid "Turns off wireless devices"
+ msgstr "Искључите бежичне уређаје"
+ 
+-#: ../panels/power/cc-power-panel.c:1640
++#: ../panels/power/cc-power-panel.c:1649
+ msgid "_Mobile broadband"
+ msgstr "_Мобилна широкопојасна"
+ 
+-#: ../panels/power/cc-power-panel.c:1645
++#: ../panels/power/cc-power-panel.c:1654
+ msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
+ msgstr "Искључите уређаје мобилне (3Г, 4Г, ВиМакс, итд.) широкопојасне"
+ 
+-#: ../panels/power/cc-power-panel.c:1680
++#: ../panels/power/cc-power-panel.c:1689
+ msgid "_Bluetooth"
+ msgstr "_Блутут"
+ 
+-#: ../panels/power/cc-power-panel.c:1731
++#: ../panels/power/cc-power-panel.c:1740
+ msgid "When on battery power"
+ msgstr "Када се напаја са батерије"
+ 
+-#: ../panels/power/cc-power-panel.c:1733
++#: ../panels/power/cc-power-panel.c:1742
+ msgid "When plugged in"
+ msgstr "Када је укључен"
+ 
+-#: ../panels/power/cc-power-panel.c:1862
++#: ../panels/power/cc-power-panel.c:1871
+ msgid "Suspend & Power Off"
+ msgstr "Обустави и искључи"
+ 
+-#: ../panels/power/cc-power-panel.c:1895
++#: ../panels/power/cc-power-panel.c:1904
+ msgid "_Automatic suspend"
+ msgstr "_Сам обустави"
+ 
+-#: ../panels/power/cc-power-panel.c:1919
++#: ../panels/power/cc-power-panel.c:1928
+ msgid "When battery power is _critical"
+ msgstr "Кад је напајање батерије _критично"
+ 
+-#: ../panels/power/cc-power-panel.c:1976
++#: ../panels/power/cc-power-panel.c:1985
+ msgid "Power Off"
+ msgstr "Искључи"
+ 
+-#: ../panels/power/cc-power-panel.c:2113
++#: ../panels/power/cc-power-panel.c:2122
+ msgid "Devices"
+ msgstr "Уређаји"
+ 
+@@ -4057,7 +4060,7 @@ msgid "Authenticate"
+ msgstr "Потврди идентитет"
+ 
+ #: ../panels/printers/authentication-dialog.ui.h:5
+-#: ../panels/sharing/sharing.ui.h:23
++#: ../panels/sharing/sharing.ui.h:21
+ #: ../panels/user-accounts/data/account-dialog.ui.h:6
+ msgid "Password"
+ msgstr "Лозинка"
+@@ -5028,21 +5031,21 @@ msgstr "Помери доле"
+ msgid "Preferences"
+ msgstr "Поставке"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:274
++#: ../panels/sharing/cc-sharing-panel.c:285
+ msgctxt "service is enabled"
+ msgid "On"
+ msgstr "Укљ."
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:276
++#: ../panels/sharing/cc-sharing-panel.c:287
+ msgctxt "service is disabled"
+ msgid "Off"
+ msgstr "Искљ."
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:421
++#: ../panels/sharing/cc-sharing-panel.c:422
+ msgid "Choose a Folder"
+ msgstr "Изаберите фасциклу"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:719
++#: ../panels/sharing/cc-sharing-panel.c:736
+ msgid "Copy"
+ msgstr "Умножавање"
+ 
+@@ -5087,70 +5090,62 @@ msgstr ""
+ "уређајима"
+ 
+ #: ../panels/sharing/sharing.ui.h:3
+-msgid "Share Public Folder"
+-msgstr "Дели јавну фасциклу"
+-
+-#: ../panels/sharing/sharing.ui.h:4
+ msgid "Only Receive From Trusted Devices"
+ msgstr "Само примај са поверљивих уређаја"
+ 
+-#: ../panels/sharing/sharing.ui.h:5
++#: ../panels/sharing/sharing.ui.h:4
+ msgid "Save Received Files to Downloads Folder"
+ msgstr "Сачувај примљене датотеке у фасциклу преузимања"
+ 
+-#: ../panels/sharing/sharing.ui.h:6
+-msgid "Only share with Trusted Devices"
+-msgstr "Само дели са поверљивим уређајима"
+-
+-#: ../panels/sharing/sharing.ui.h:7
++#: ../panels/sharing/sharing.ui.h:5
+ msgid "Computer Name"
+ msgstr "Назив рачунара"
+ 
+-#: ../panels/sharing/sharing.ui.h:8
++#: ../panels/sharing/sharing.ui.h:6
+ msgid "Personal File Sharing"
+ msgstr "Дељење личних датотека"
+ 
+-#: ../panels/sharing/sharing.ui.h:9
++#: ../panels/sharing/sharing.ui.h:7
+ msgid "Screen Sharing"
+ msgstr "Дељење екрана"
+ 
+-#: ../panels/sharing/sharing.ui.h:10
++#: ../panels/sharing/sharing.ui.h:8
+ msgid "Media Sharing"
+ msgstr "Дељење медија"
+ 
+-#: ../panels/sharing/sharing.ui.h:11
++#: ../panels/sharing/sharing.ui.h:9
+ msgid "Remote Login"
+ msgstr "Удаљено пријављивање"
+ 
+-#: ../panels/sharing/sharing.ui.h:12
++#: ../panels/sharing/sharing.ui.h:10
+ msgid "Some services are disabled because of no network access."
+ msgstr "Неке услуге су искључене јер нема приступа на мрежу."
+ 
+-#: ../panels/sharing/sharing.ui.h:13
++#: ../panels/sharing/sharing.ui.h:11
+ msgid "Share Music, Photos and Videos with others on the current network."
+ msgstr "Делите музику, фотографије и снимке са другима на текућој мрежи."
+ 
+-#: ../panels/sharing/sharing.ui.h:14
++#: ../panels/sharing/sharing.ui.h:12
+ msgid "Share Media On This Network"
+ msgstr "Дели медије на овој мрежи"
+ 
+-#: ../panels/sharing/sharing.ui.h:15
++#: ../panels/sharing/sharing.ui.h:13
+ msgid "Shared Folders"
+ msgstr "Дељене фасцикле"
+ 
+-#: ../panels/sharing/sharing.ui.h:16
++#: ../panels/sharing/sharing.ui.h:14
+ msgid "column"
+ msgstr "колона"
+ 
+-#: ../panels/sharing/sharing.ui.h:17
++#: ../panels/sharing/sharing.ui.h:15
+ msgid "Add Folder"
+ msgstr "Додај фасциклу"
+ 
+-#: ../panels/sharing/sharing.ui.h:18
++#: ../panels/sharing/sharing.ui.h:16
+ msgid "Remove Folder"
+ msgstr "Уклони фасциклу"
+ 
+-#: ../panels/sharing/sharing.ui.h:20
++#: ../panels/sharing/sharing.ui.h:18
+ #, no-c-format
+ msgid ""
+ "Personal File Sharing allows you to share your Public folder with others on "
+@@ -5159,15 +5154,15 @@ msgstr ""
+ "Дељење личних датотека вам омогућава да делите вашу јавну фасциклу са "
+ "другима на вашој текућој мрежи користећи: <a href=\"dav://%s\">dav://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:21
++#: ../panels/sharing/sharing.ui.h:19
+ msgid "Share Public Folder On This Network"
+ msgstr "Дели јавну фасциклу на овој мрежи"
+ 
+-#: ../panels/sharing/sharing.ui.h:22
++#: ../panels/sharing/sharing.ui.h:20
+ msgid "Require Password"
+ msgstr "Захтева лозинку"
+ 
+-#: ../panels/sharing/sharing.ui.h:25
++#: ../panels/sharing/sharing.ui.h:23
+ #, no-c-format
+ msgid ""
+ "Allow remote users to connect using the Secure Shell command:\n"
+@@ -5176,7 +5171,7 @@ msgstr ""
+ "Омогућава корисницима да се повежу користећи наредбу безбедне шкољке:\n"
+ "<a href=\"ssh %s\">ssh %s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:28
++#: ../panels/sharing/sharing.ui.h:26
+ #, no-c-format
+ msgid ""
+ "Allow remote users to view or control your screen by connecting to: <a href="
+@@ -5185,19 +5180,19 @@ msgstr ""
+ "Омогућава удаљеним корисницима да виде или да управљају вашим екраном тако "
+ "што ће се повезати на: <a href=\"vnc://%s\">vnc://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:29
++#: ../panels/sharing/sharing.ui.h:27
+ msgid "Remote View"
+ msgstr "Удаљени преглед"
+ 
+-#: ../panels/sharing/sharing.ui.h:30
++#: ../panels/sharing/sharing.ui.h:28
+ msgid "Remote Control"
+ msgstr "Удаљено управљање"
+ 
+-#: ../panels/sharing/sharing.ui.h:31
++#: ../panels/sharing/sharing.ui.h:29
+ msgid "Approve All Connections"
+ msgstr "Одобри све везе"
+ 
+-#: ../panels/sharing/sharing.ui.h:32
++#: ../panels/sharing/sharing.ui.h:30
+ msgid "Show Password"
+ msgstr "Прикажи лозинку"
+ 
+@@ -6700,7 +6695,7 @@ msgstr ""
+ "дугме пречице тастатуре и држите притиснутим нове тастере или притисните "
+ "„Backspace“ да обришете пречицу."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:82
++#: ../panels/wacom/calibrator/calibrator-gui.c:84
+ msgid ""
+ "Please tap the target markers as they appear on screen to calibrate the "
+ "tablet."
+@@ -6708,7 +6703,7 @@ msgstr ""
+ "Молим лупните знаке мете који ће се појавити на екрану да калибришете "
+ "таблицу."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:86
++#: ../panels/wacom/calibrator/calibrator-gui.c:88
+ msgid "Mis-click detected, restarting..."
+ msgstr "Откривен је лош клик, почињем из почетка..."
+ 
+@@ -6761,7 +6756,7 @@ msgstr "Мапирај на једном монитору"
+ msgid "%d of %d"
+ msgstr "%d од %d"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:522
++#: ../panels/wacom/cc-wacom-page.c:531
+ msgid "Display Mapping"
+ msgstr "Приказује мапирање"
+ 
+@@ -6897,22 +6892,22 @@ msgstr "Режим прекидача десне додирне траке"
+ msgid "Mode Switch #%d"
+ msgstr "Режим прекидача #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1336
++#: ../panels/wacom/gsd-wacom-device.c:1335
+ #, c-format
+ msgid "Left Button #%d"
+ msgstr "Лево дугме #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1339
++#: ../panels/wacom/gsd-wacom-device.c:1338
+ #, c-format
+ msgid "Right Button #%d"
+ msgstr "Десно дугме #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1342
++#: ../panels/wacom/gsd-wacom-device.c:1341
+ #, c-format
+ msgid "Top Button #%d"
+ msgstr "Горње дугме #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1345
++#: ../panels/wacom/gsd-wacom-device.c:1344
+ #, c-format
+ msgid "Bottom Button #%d"
+ msgstr "Доње дугме #%d"
+@@ -7071,3 +7066,9 @@ msgstr "Подешавања"
+ #: ../shell/gnome-control-center.desktop.in.in.h:2
+ msgid "Preferences;Settings;"
+ msgstr "поставке;подешавања;"
++
++#~ msgid "Share Public Folder"
++#~ msgstr "Дели јавну фасциклу"
++
++#~ msgid "Only share with Trusted Devices"
++#~ msgstr "Само дели са поверљивим уређајима"
+diff --git a/po/sr@latin.po b/po/sr@latin.po
+index 416b408..2bfaf94 100644
+--- a/po/sr@latin.po
++++ b/po/sr@latin.po
+@@ -5,16 +5,16 @@
+ # Reviewed on 2005-03-03 by: Danilo Šegan <danilo@gnome.org>
+ # Translated on 2006-03-11 by: Slobodan D. Sredojević <slobo@akrep.be>
+ # Miloš Popović <gpopac@gmail.com>, 2010, 2011.
+-# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011, 2012, 2013.
++# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011, 2012, 2013, 2014.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-control-center\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "control-center&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-10-02 17:36+0000\n"
+-"PO-Revision-Date: 2013-10-05 06:31+0200\n"
++"POT-Creation-Date: 2014-01-13 08:34+0000\n"
++"PO-Revision-Date: 2014-01-13 10:12+0200\n"
+ "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
+-"Language-Team: Serbian <gnom@prevod.org>\n"
++"Language-Team: Serbian <(nothing)>\n"
+ "Language: sr\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -68,53 +68,53 @@ msgid "Span"
+ msgstr "Rasprostrto"
+ 
+ #. translators: This is the title of the wallpaper chooser dialog.
+-#: ../panels/background/cc-background-chooser-dialog.c:296
++#: ../panels/background/cc-background-chooser-dialog.c:292
+ msgid "Select Background"
+ msgstr "Izaberite pozadinu"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:315
++#: ../panels/background/cc-background-chooser-dialog.c:312
+ msgid "Wallpapers"
+ msgstr "Pozadina"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:324
++#: ../panels/background/cc-background-chooser-dialog.c:321
+ msgid "Pictures"
+ msgstr "Slike"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:332
++#: ../panels/background/cc-background-chooser-dialog.c:329
+ msgid "Colors"
+ msgstr "Boje"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:341
++#: ../panels/background/cc-background-chooser-dialog.c:338
+ msgid "Flickr"
+ msgstr "Flikr"
+ 
+ #. translators: No pictures were found
+-#: ../panels/background/cc-background-chooser-dialog.c:396
++#: ../panels/background/cc-background-chooser-dialog.c:385
+ msgid "No Pictures Found"
+ msgstr "Nisam pronašao slike"
+ 
+ #. translators: %s here is the name of the Pictures directory, the string should be translated in
+ #. * the context "You can add images to your Pictures folder and they will show up here"
+-#: ../panels/background/cc-background-chooser-dialog.c:411
++#: ../panels/background/cc-background-chooser-dialog.c:400
+ #, c-format
+ msgid "You can add images to your %s folder and they will show up here"
+ msgstr "Možete da dodate slike u vašu fasciklu %s i one će biti prikazane ovde"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:439
++#: ../panels/background/cc-background-chooser-dialog.c:429
+ #: ../panels/bluetooth/cc-bluetooth-panel.c:640
+ #: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
+-#: ../panels/display/cc-display-panel.c:1494
+-#: ../panels/display/cc-display-panel.c:1909
++#: ../panels/display/cc-display-panel.c:1510
++#: ../panels/display/cc-display-panel.c:1952
+ #: ../panels/network/connection-editor/vpn-helpers.c:245
+ #: ../panels/network/connection-editor/vpn-helpers.c:374
+-#: ../panels/network/net-device-wifi.c:1195
+-#: ../panels/network/net-device-wifi.c:1403
++#: ../panels/network/net-device-wifi.c:1194
++#: ../panels/network/net-device-wifi.c:1402
+ #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
+ #: ../panels/printers/cc-printers-panel.c:1946
+ #: ../panels/printers/new-printer-dialog.ui.h:2
+ #: ../panels/privacy/cc-privacy-panel.c:470
+ #: ../panels/search/cc-search-locations-dialog.c:682
+-#: ../panels/sharing/cc-sharing-panel.c:424
++#: ../panels/sharing/cc-sharing-panel.c:425
+ #: ../panels/user-accounts/um-fingerprint-dialog.c:269
+ #: ../panels/user-accounts/um-photo-dialog.c:96
+ #: ../panels/user-accounts/um-photo-dialog.c:221
+@@ -122,7 +122,7 @@ msgstr "Možete da dodate slike u vašu fasciklu %s i one će biti prikazane ovd
+ msgid "_Cancel"
+ msgstr "_Otkaži"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:440
++#: ../panels/background/cc-background-chooser-dialog.c:430
+ #: ../panels/printers/ppd-selection-dialog.ui.h:3
+ #: ../panels/user-accounts/um-photo-dialog.c:98
+ msgid "Select"
+@@ -608,10 +608,10 @@ msgid "Done"
+ msgstr "Obavljeno"
+ 
+ #. Timeout parameters
+-#. 5000 = 5 sec
++#. 15000 = 15 sec
+ #. 750 = 0.75 sec
+ #. Text printed on screen
+-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
++#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:83
+ msgid "Screen Calibration"
+ msgstr "Kalibracija ekrana"
+ 
+@@ -954,28 +954,28 @@ msgid "_Done"
+ msgstr "_Urađeno"
+ 
+ #. Translators: This is the full date and time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:358
++#: ../panels/datetime/cc-datetime-panel.c:363
+ msgid "%e %B %Y, %l:%M %p"
+ msgstr "%A, %e.%m.%Y. %l:%M %P"
+ 
+ #. Translators: This is the full date and time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:363
++#: ../panels/datetime/cc-datetime-panel.c:368
+ msgid "%e %B %Y, %R"
+ msgstr "%e. %B %Y. %R"
+ 
+ #. Translators: UTC here means the Coordinated Universal Time.
+ #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
+-#: ../panels/datetime/cc-datetime-panel.c:579
++#: ../panels/datetime/cc-datetime-panel.c:584
+ msgid "UTC%:::z"
+ msgstr "KUV%:::z"
+ 
+ #. Translators: This is the time format used in 12-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:584
++#: ../panels/datetime/cc-datetime-panel.c:589
+ msgid "%l:%M %p"
+ msgstr "%l:%M %P"
+ 
+ #. Translators: This is the time format used in 24-hour mode.
+-#: ../panels/datetime/cc-datetime-panel.c:589
++#: ../panels/datetime/cc-datetime-panel.c:594
+ msgid "%R"
+ msgstr "%R"
+ 
+@@ -1116,23 +1116,23 @@ msgid "To change time or date settings, you need to authenticate."
+ msgstr ""
+ "Da izmenite podešavanja vremena i datuma, morate da potvrdite identitet."
+ 
+-#: ../panels/display/cc-display-panel.c:472
++#: ../panels/display/cc-display-panel.c:486
+ msgid "Lid Closed"
+ msgstr "Spušten poklopac"
+ 
+ #. translators: "Mirrored" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:475
++#: ../panels/display/cc-display-panel.c:489
+ msgid "Mirrored"
+ msgstr "Preslikano"
+ 
+-#: ../panels/display/cc-display-panel.c:477
+-#: ../panels/display/cc-display-panel.c:2042
++#: ../panels/display/cc-display-panel.c:491
++#: ../panels/display/cc-display-panel.c:2101
+ msgid "Primary"
+ msgstr "Glavni"
+ 
+-#: ../panels/display/cc-display-panel.c:479
++#: ../panels/display/cc-display-panel.c:493
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1729 ../panels/power/cc-power-panel.c:1740
++#: ../panels/power/cc-power-panel.c:1738 ../panels/power/cc-power-panel.c:1749
+ #: ../panels/privacy/cc-privacy-panel.c:80
+ #: ../panels/privacy/cc-privacy-panel.c:120
+ #: ../panels/universal-access/cc-ua-panel.c:257
+@@ -1142,82 +1142,80 @@ msgstr "Glavni"
+ msgid "Off"
+ msgstr "Isklj."
+ 
+-#: ../panels/display/cc-display-panel.c:482
++#: ../panels/display/cc-display-panel.c:496
+ msgid "Secondary"
+ msgstr "Sporedni"
+ 
+-#: ../panels/display/cc-display-panel.c:1490
++#: ../panels/display/cc-display-panel.c:1506
+ msgid "Arrange Combined Displays"
+ msgstr "Rasporedite objedinjene prikaze"
+ 
+-#: ../panels/display/cc-display-panel.c:1496
+-#: ../panels/display/cc-display-panel.c:1912
++#: ../panels/display/cc-display-panel.c:1512
++#: ../panels/display/cc-display-panel.c:1955
+ #: ../panels/network/connection-editor/connection-editor.ui.h:1
+ msgid "_Apply"
+ msgstr "_Primeni"
+ 
+-#: ../panels/display/cc-display-panel.c:1517
++#: ../panels/display/cc-display-panel.c:1533
+ msgid "Drag displays to rearrange them"
+ msgstr "Prevucite prikaze da ih prerasporedite"
+ 
+-#. size
+-#: ../panels/display/cc-display-panel.c:1976
++#: ../panels/display/cc-display-panel.c:2037
+ msgid "Size"
+ msgstr "Veličina"
+ 
+ #. aspect ratio
+-#: ../panels/display/cc-display-panel.c:1991
++#: ../panels/display/cc-display-panel.c:2050
+ msgid "Aspect Ratio"
+ msgstr "Razmera"
+ 
+-#: ../panels/display/cc-display-panel.c:2012
++#: ../panels/display/cc-display-panel.c:2071
+ #: ../panels/printers/pp-options-dialog.c:86
+ msgid "Resolution"
+ msgstr "Rezolucija"
+ 
+-#: ../panels/display/cc-display-panel.c:2043
++#: ../panels/display/cc-display-panel.c:2102
+ msgid "Show the top bar and Activities Overview on this display"
+ msgstr "Prikaži gornju traku i pregled aktivnosti na ovom prikazu"
+ 
+-#: ../panels/display/cc-display-panel.c:2049
++#: ../panels/display/cc-display-panel.c:2108
+ msgid "Secondary Display"
+ msgstr "Pomoćni prikaz"
+ 
+-#: ../panels/display/cc-display-panel.c:2050
++#: ../panels/display/cc-display-panel.c:2109
+ msgid "Join this display with another to create an extra workspace"
+ msgstr "Pridružite ovaj prikaz sa drugim da napravite dodatni radni prostor"
+ 
+-#: ../panels/display/cc-display-panel.c:2057
++#: ../panels/display/cc-display-panel.c:2116
+ msgid "Presentation"
+ msgstr "Izlaganje"
+ 
+-#: ../panels/display/cc-display-panel.c:2058
++#: ../panels/display/cc-display-panel.c:2117
+ msgid "Show slideshows and media only"
+ msgstr "Prikažite samo pokretne prikaze i medije"
+ 
+ #. translators: "Mirror" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:2063
++#: ../panels/display/cc-display-panel.c:2122
+ msgid "Mirror"
+ msgstr "Preslikano"
+ 
+-#: ../panels/display/cc-display-panel.c:2064
++#: ../panels/display/cc-display-panel.c:2123
+ msgid "Show your existing view on both displays"
+ msgstr "Prikažite vaš postojeći pregled na oba prikaza"
+ 
+-#: ../panels/display/cc-display-panel.c:2070
++#: ../panels/display/cc-display-panel.c:2129
+ msgid "Turn Off"
+ msgstr "Isključi"
+ 
+-#: ../panels/display/cc-display-panel.c:2071
+-#| msgid "Don't use the display"
++#: ../panels/display/cc-display-panel.c:2130
+ msgid "Don't use this display"
+ msgstr "Ne koristi ovaj prikaz"
+ 
+-#: ../panels/display/cc-display-panel.c:2286
++#: ../panels/display/cc-display-panel.c:2345
+ msgid "Could not get screen information"
+ msgstr "Ne mogu da dobijem podatke o ekranu"
+ 
+-#: ../panels/display/cc-display-panel.c:2317
++#: ../panels/display/cc-display-panel.c:2376
+ msgid "_Arrange Combined Displays"
+ msgstr "_Rasporedi objedinjene prikaze"
+ 
+@@ -1235,53 +1233,53 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
+ msgstr "panel;projektor;iks-randr;ekran;rezolucija;osvežavanje;"
+ 
+ #. TRANSLATORS: AP type
+-#: ../panels/info/cc-info-panel.c:451 ../panels/network/panel-common.c:127
++#: ../panels/info/cc-info-panel.c:452 ../panels/network/panel-common.c:127
+ msgid "Unknown"
+ msgstr "Nepoznato"
+ 
+-#: ../panels/info/cc-info-panel.c:534
++#: ../panels/info/cc-info-panel.c:539
+ #, c-format
+ msgid "%s %d-bit"
+ msgstr "%s %d bita"
+ 
+-#: ../panels/info/cc-info-panel.c:536
++#: ../panels/info/cc-info-panel.c:541
+ #, c-format
+ msgid "%d-bit"
+ msgstr "%d-bita"
+ 
+-#: ../panels/info/cc-info-panel.c:1216
++#: ../panels/info/cc-info-panel.c:1221
+ msgid "Ask what to do"
+ msgstr "Pitaj šta da radiš"
+ 
+-#: ../panels/info/cc-info-panel.c:1220
++#: ../panels/info/cc-info-panel.c:1225
+ msgid "Do nothing"
+ msgstr "Ne radi ništa"
+ 
+-#: ../panels/info/cc-info-panel.c:1224
++#: ../panels/info/cc-info-panel.c:1229
+ msgid "Open folder"
+ msgstr "Otvori fasciklu"
+ 
+-#: ../panels/info/cc-info-panel.c:1315
++#: ../panels/info/cc-info-panel.c:1320
+ msgid "Other Media"
+ msgstr "Ostali mediji"
+ 
+-#: ../panels/info/cc-info-panel.c:1346
++#: ../panels/info/cc-info-panel.c:1351
+ msgid "Select an application for audio CDs"
+ msgstr "Izaberite program za audio diskove (CD)"
+ 
+-#: ../panels/info/cc-info-panel.c:1347
++#: ../panels/info/cc-info-panel.c:1352
+ msgid "Select an application for video DVDs"
+ msgstr "Izaberite program za video diskove (DVD)"
+ 
+-#: ../panels/info/cc-info-panel.c:1348
++#: ../panels/info/cc-info-panel.c:1353
+ msgid "Select an application to run when a music player is connected"
+ msgstr "Izaberite program za pokretanje kada je priključen muzički plejer"
+ 
+-#: ../panels/info/cc-info-panel.c:1349
++#: ../panels/info/cc-info-panel.c:1354
+ msgid "Select an application to run when a camera is connected"
+ msgstr "Izaberite program za pokretanje kada je priključena kamera"
+ 
+-#: ../panels/info/cc-info-panel.c:1350
++#: ../panels/info/cc-info-panel.c:1355
+ msgid "Select an application for software CDs"
+ msgstr "Izaberite program za diskove sa softverom"
+ 
+@@ -1290,89 +1288,89 @@ msgstr "Izaberite program za diskove sa softverom"
+ #. * If the shared-mime-info translation works for your language,
+ #. * simply leave these untranslated.
+ #.
+-#: ../panels/info/cc-info-panel.c:1362
++#: ../panels/info/cc-info-panel.c:1367
+ msgid "audio DVD"
+ msgstr "audio DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1363
++#: ../panels/info/cc-info-panel.c:1368
+ msgid "blank Blu-ray disc"
+ msgstr "prazan Blu-rej disk"
+ 
+-#: ../panels/info/cc-info-panel.c:1364
++#: ../panels/info/cc-info-panel.c:1369
+ msgid "blank CD disc"
+ msgstr "prazan CD disk"
+ 
+-#: ../panels/info/cc-info-panel.c:1365
++#: ../panels/info/cc-info-panel.c:1370
+ msgid "blank DVD disc"
+ msgstr "prazan DVD disk"
+ 
+-#: ../panels/info/cc-info-panel.c:1366
++#: ../panels/info/cc-info-panel.c:1371
+ msgid "blank HD DVD disc"
+ msgstr "prazan HD DVD disk"
+ 
+-#: ../panels/info/cc-info-panel.c:1367
++#: ../panels/info/cc-info-panel.c:1372
+ msgid "Blu-ray video disc"
+ msgstr "Blu-rej video disk"
+ 
+-#: ../panels/info/cc-info-panel.c:1368
++#: ../panels/info/cc-info-panel.c:1373
+ msgid "e-book reader"
+ msgstr "čitač el. knjiga"
+ 
+-#: ../panels/info/cc-info-panel.c:1369
++#: ../panels/info/cc-info-panel.c:1374
+ msgid "HD DVD video disc"
+ msgstr "HD DVD video disk"
+ 
+-#: ../panels/info/cc-info-panel.c:1370
++#: ../panels/info/cc-info-panel.c:1375
+ msgid "Picture CD"
+ msgstr "CD sa slikama"
+ 
+-#: ../panels/info/cc-info-panel.c:1371
++#: ../panels/info/cc-info-panel.c:1376
+ msgid "Super Video CD"
+ msgstr "Super video CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1372
++#: ../panels/info/cc-info-panel.c:1377
+ msgid "Video CD"
+ msgstr "Video CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1373
++#: ../panels/info/cc-info-panel.c:1378
+ msgid "Windows software"
+ msgstr "Vindouz programi"
+ 
+-#: ../panels/info/cc-info-panel.c:1374
++#: ../panels/info/cc-info-panel.c:1379
+ msgid "Software"
+ msgstr "Programi"
+ 
+-#: ../panels/info/cc-info-panel.c:1497
++#: ../panels/info/cc-info-panel.c:1502
+ #: ../panels/keyboard/keyboard-shortcuts.c:1696
+ msgid "Section"
+ msgstr "Odeljak"
+ 
+-#: ../panels/info/cc-info-panel.c:1506 ../panels/info/info.ui.h:13
++#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:13
+ msgid "Overview"
+ msgstr "Pregled"
+ 
+-#: ../panels/info/cc-info-panel.c:1512 ../panels/info/info.ui.h:20
++#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:20
+ msgid "Default Applications"
+ msgstr "Osnovni programi"
+ 
+-#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:28
++#: ../panels/info/cc-info-panel.c:1522 ../panels/info/info.ui.h:28
+ msgid "Removable Media"
+ msgstr "Izmenjivi diskovi"
+ 
+-#: ../panels/info/cc-info-panel.c:1542
++#: ../panels/info/cc-info-panel.c:1547
+ #, c-format
+ msgid "Version %s"
+ msgstr "Izdanje %s"
+ 
+-#: ../panels/info/cc-info-panel.c:1592
++#: ../panels/info/cc-info-panel.c:1597
+ msgid "Install Updates"
+ msgstr "Instaliraj ažuriranja"
+ 
+-#: ../panels/info/cc-info-panel.c:1596
++#: ../panels/info/cc-info-panel.c:1601
+ msgid "System Up-To-Date"
+ msgstr "Ažuriranja sistema"
+ 
+-#: ../panels/info/cc-info-panel.c:1600
++#: ../panels/info/cc-info-panel.c:1605
+ msgid "Checking for Updates"
+ msgstr "Proveravam ažuriranja"
+ 
+@@ -2462,23 +2460,23 @@ msgstr "VPN"
+ msgid "Bond"
+ msgstr "Veza"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:597
++#: ../panels/network/connection-editor/net-connection-editor.c:598
+ msgid "Bridge"
+ msgstr "Most"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:598
++#: ../panels/network/connection-editor/net-connection-editor.c:599
+ msgid "VLAN"
+ msgstr "VLAN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:749
++#: ../panels/network/connection-editor/net-connection-editor.c:750
+ msgid "Could not load VPN plugins"
+ msgstr "Ne mogu da učitam VPN priključke"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:818
++#: ../panels/network/connection-editor/net-connection-editor.c:819
+ msgid "Import from file…"
+ msgstr "Uvezi iz datoteke…"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:889
++#: ../panels/network/connection-editor/net-connection-editor.c:890
+ msgid "Add Network Connection"
+ msgstr "Dodavanje mrežne veze"
+ 
+@@ -2488,7 +2486,7 @@ msgid "_Reset"
+ msgstr "_Ponovo postavi"
+ 
+ #: ../panels/network/connection-editor/reset-page.ui.h:2
+-#: ../panels/network/net-device-wifi.c:1404
++#: ../panels/network/net-device-wifi.c:1403
+ #: ../panels/network/network-wifi.ui.h:40
+ msgid "_Forget"
+ msgstr "_Zaboravi"
+@@ -2537,7 +2535,7 @@ msgstr "Izaberite datoteku za uvoz"
+ 
+ #: ../panels/network/connection-editor/vpn-helpers.c:246
+ #: ../panels/printers/cc-printers-panel.c:1947
+-#: ../panels/sharing/cc-sharing-panel.c:425
++#: ../panels/sharing/cc-sharing-panel.c:426
+ #: ../panels/user-accounts/um-photo-dialog.c:222
+ msgid "_Open"
+ msgstr "_Otvori"
+@@ -2663,7 +2661,7 @@ msgid "Wired"
+ msgstr "Žičana"
+ 
+ #: ../panels/network/net-device-ethernet.c:352
+-#: ../panels/network/net-device-wifi.c:1559
++#: ../panels/network/net-device-wifi.c:1558
+ #: ../panels/network/network-ethernet.ui.h:3
+ #: ../panels/network/network-mobile.ui.h:8
+ #: ../panels/network/network-simple.ui.h:8
+@@ -2680,7 +2678,12 @@ msgstr "Profil „%d“"
+ msgid "Add new connection"
+ msgstr "Dodajte novu vezu"
+ 
+-#: ../panels/network/net-device-wifi.c:1111
++#: ../panels/network/net-device-team.c:77
++#| msgid "Bridge slaves"
++msgid "Team slaves"
++msgstr "Podanici tima"
++
++#: ../panels/network/net-device-wifi.c:1110
+ msgid ""
+ "If you have a connection to the Internet other than wireless, you can set up "
+ "a wireless hotspot to share the connection with others."
+@@ -2688,12 +2691,12 @@ msgstr ""
+ "Ako imate neku drugu vezu na Internet osim bežične, možete da podesite "
+ "bežičnu vruću tačku da delite vezu sa drugima."
+ 
+-#: ../panels/network/net-device-wifi.c:1115
++#: ../panels/network/net-device-wifi.c:1114
+ #, c-format
+ msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+ msgstr "Uključivanjem bežične vruće tačke prekinućete vezu sa <b>%s</b>."
+ 
+-#: ../panels/network/net-device-wifi.c:1119
++#: ../panels/network/net-device-wifi.c:1118
+ msgid ""
+ "It is not possible to access the Internet through your wireless while the "
+ "hotspot is active."
+@@ -2701,23 +2704,23 @@ msgstr ""
+ "Nije moguće pristupiti Internetu preko vaše bežične dok je uključena vruća "
+ "tačka."
+ 
+-#: ../panels/network/net-device-wifi.c:1193
++#: ../panels/network/net-device-wifi.c:1192
+ msgid "Stop hotspot and disconnect any users?"
+ msgstr "Da zaustavim vruću tačku i da isključim sve korisnike?"
+ 
+-#: ../panels/network/net-device-wifi.c:1196
++#: ../panels/network/net-device-wifi.c:1195
+ msgid "_Stop Hotspot"
+ msgstr "_Zaustavi vruću tačku"
+ 
+-#: ../panels/network/net-device-wifi.c:1268
++#: ../panels/network/net-device-wifi.c:1267
+ msgid "System policy prohibits use as a Hotspot"
+ msgstr "Politika sistema zabranjuje upotrebu kao vruće tačke"
+ 
+-#: ../panels/network/net-device-wifi.c:1271
++#: ../panels/network/net-device-wifi.c:1270
+ msgid "Wireless device does not support Hotspot mode"
+ msgstr "Bežični uređaj ne podržava režim vruće tačke"
+ 
+-#: ../panels/network/net-device-wifi.c:1400
++#: ../panels/network/net-device-wifi.c:1399
+ msgid ""
+ "Network details for the selected networks, including passwords and any "
+ "custom configuration will be lost."
+@@ -2725,19 +2728,19 @@ msgstr ""
+ "Detalji mreže za izabrane mreže, uključujući lozinku i sva proizvoljna "
+ "podešavanja će biti izgubljeni."
+ 
+-#: ../panels/network/net-device-wifi.c:1727
++#: ../panels/network/net-device-wifi.c:1726
+ #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+ msgid "History"
+ msgstr "Istorijat"
+ 
+-#: ../panels/network/net-device-wifi.c:1731 ../panels/power/power.ui.h:21
++#: ../panels/network/net-device-wifi.c:1730 ../panels/power/power.ui.h:21
+ #: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596
+-#: ../panels/wacom/cc-wacom-page.c:525
++#: ../panels/wacom/cc-wacom-page.c:534
+ msgid "_Close"
+ msgstr "_Zatvori"
+ 
+ #. translators: This is the label for the "Forget wireless network" functionality
+-#: ../panels/network/net-device-wifi.c:1739
++#: ../panels/network/net-device-wifi.c:1738
+ msgctxt "Wi-Fi Network"
+ msgid "_Forget"
+ msgstr "_Zaboravi"
+@@ -3571,7 +3574,7 @@ msgid "Show Details in Lock Screen"
+ msgstr "Prikaži podatke u ekranu zaključavanja"
+ 
+ #: ../panels/notifications/cc-notifications-panel.c:205
+-#: ../panels/power/cc-power-panel.c:1735 ../panels/power/cc-power-panel.c:1742
++#: ../panels/power/cc-power-panel.c:1744 ../panels/power/cc-power-panel.c:1751
+ #: ../panels/privacy/cc-privacy-panel.c:80
+ #: ../panels/privacy/cc-privacy-panel.c:120
+ #: ../panels/universal-access/cc-ua-panel.c:257
+@@ -3793,160 +3796,160 @@ msgid "Extra"
+ msgstr "Dodatna"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:488
++#: ../panels/power/cc-power-panel.c:469
+ msgid "Wireless mouse"
+ msgstr "Bežični miš"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:492
++#: ../panels/power/cc-power-panel.c:472
+ msgid "Wireless keyboard"
+ msgstr "Bežična tastatura"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:496
++#: ../panels/power/cc-power-panel.c:475
+ msgid "Uninterruptible power supply"
+ msgstr "Neprekidiv izvor napajanja"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:501
++#: ../panels/power/cc-power-panel.c:478
+ msgid "Personal digital assistant"
+ msgstr "Lični digitalni pomoćnik"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:505
++#: ../panels/power/cc-power-panel.c:481
+ msgid "Cellphone"
+ msgstr "Mobilni telefon"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:509
++#: ../panels/power/cc-power-panel.c:484
+ msgid "Media player"
+ msgstr "Muzički uređaj"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:513
++#: ../panels/power/cc-power-panel.c:487
+ msgid "Tablet"
+ msgstr "Tablica"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:517
++#: ../panels/power/cc-power-panel.c:490
+ msgid "Computer"
+ msgstr "Računar"
+ 
+ #. TRANSLATORS: secondary battery, misc
+-#: ../panels/power/cc-power-panel.c:521 ../panels/power/cc-power-panel.c:731
+-#: ../panels/power/cc-power-panel.c:2066
++#: ../panels/power/cc-power-panel.c:493 ../panels/power/cc-power-panel.c:740
++#: ../panels/power/cc-power-panel.c:2075
+ msgid "Battery"
+ msgstr "Baterija"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:530
++#: ../panels/power/cc-power-panel.c:539
+ msgctxt "Battery power"
+ msgid "Charging"
+ msgstr "Puni se"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:537
++#: ../panels/power/cc-power-panel.c:546
+ msgctxt "Battery power"
+ msgid "Caution"
+ msgstr "Upozorenje"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:542
++#: ../panels/power/cc-power-panel.c:551
+ msgctxt "Battery power"
+ msgid "Low"
+ msgstr "Skoro prazna"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:547
++#: ../panels/power/cc-power-panel.c:556
+ msgctxt "Battery power"
+ msgid "Good"
+ msgstr "Puna"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:552
++#: ../panels/power/cc-power-panel.c:561
+ msgctxt "Battery power"
+ msgid "Fully charged"
+ msgstr "Potpuno puna"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:556
++#: ../panels/power/cc-power-panel.c:565
+ msgctxt "Battery power"
+ msgid "Empty"
+ msgstr "Prazna"
+ 
+-#: ../panels/power/cc-power-panel.c:729
++#: ../panels/power/cc-power-panel.c:738
+ msgid "Batteries"
+ msgstr "Baterije"
+ 
+-#: ../panels/power/cc-power-panel.c:1135
++#: ../panels/power/cc-power-panel.c:1144
+ msgid "When _idle"
+ msgstr "Kada _miruje"
+ 
+-#: ../panels/power/cc-power-panel.c:1504
++#: ../panels/power/cc-power-panel.c:1513
+ msgid "Power Saving"
+ msgstr "Ušteda napajanja"
+ 
+-#: ../panels/power/cc-power-panel.c:1532
++#: ../panels/power/cc-power-panel.c:1541
+ msgid "_Screen brightness"
+ msgstr "Osvetljaj _ekrana"
+ 
+-#: ../panels/power/cc-power-panel.c:1538
++#: ../panels/power/cc-power-panel.c:1547
+ msgid "_Keyboard brightness"
+ msgstr "Osvetljaj _tastature"
+ 
+-#: ../panels/power/cc-power-panel.c:1548
++#: ../panels/power/cc-power-panel.c:1557
+ msgid "_Dim screen when inactive"
+ msgstr "_Zatamni ekran kada je neradan"
+ 
+-#: ../panels/power/cc-power-panel.c:1573
++#: ../panels/power/cc-power-panel.c:1582
+ msgid "_Blank screen"
+ msgstr "_Prazan ekran"
+ 
+-#: ../panels/power/cc-power-panel.c:1610
++#: ../panels/power/cc-power-panel.c:1619
+ msgid "_Wi-Fi"
+ msgstr "_Bežična"
+ 
+-#: ../panels/power/cc-power-panel.c:1615
++#: ../panels/power/cc-power-panel.c:1624
+ msgid "Turns off wireless devices"
+ msgstr "Isključite bežične uređaje"
+ 
+-#: ../panels/power/cc-power-panel.c:1640
++#: ../panels/power/cc-power-panel.c:1649
+ msgid "_Mobile broadband"
+ msgstr "_Mobilna širokopojasna"
+ 
+-#: ../panels/power/cc-power-panel.c:1645
++#: ../panels/power/cc-power-panel.c:1654
+ msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
+ msgstr "Isključite uređaje mobilne (3G, 4G, ViMaks, itd.) širokopojasne"
+ 
+-#: ../panels/power/cc-power-panel.c:1680
++#: ../panels/power/cc-power-panel.c:1689
+ msgid "_Bluetooth"
+ msgstr "_Blutut"
+ 
+-#: ../panels/power/cc-power-panel.c:1731
++#: ../panels/power/cc-power-panel.c:1740
+ msgid "When on battery power"
+ msgstr "Kada se napaja sa baterije"
+ 
+-#: ../panels/power/cc-power-panel.c:1733
++#: ../panels/power/cc-power-panel.c:1742
+ msgid "When plugged in"
+ msgstr "Kada je uključen"
+ 
+-#: ../panels/power/cc-power-panel.c:1862
++#: ../panels/power/cc-power-panel.c:1871
+ msgid "Suspend & Power Off"
+ msgstr "Obustavi i isključi"
+ 
+-#: ../panels/power/cc-power-panel.c:1895
++#: ../panels/power/cc-power-panel.c:1904
+ msgid "_Automatic suspend"
+ msgstr "_Sam obustavi"
+ 
+-#: ../panels/power/cc-power-panel.c:1919
++#: ../panels/power/cc-power-panel.c:1928
+ msgid "When battery power is _critical"
+ msgstr "Kad je napajanje baterije _kritično"
+ 
+-#: ../panels/power/cc-power-panel.c:1976
++#: ../panels/power/cc-power-panel.c:1985
+ msgid "Power Off"
+ msgstr "Isključi"
+ 
+-#: ../panels/power/cc-power-panel.c:2113
++#: ../panels/power/cc-power-panel.c:2122
+ msgid "Devices"
+ msgstr "Uređaji"
+ 
+@@ -4057,7 +4060,7 @@ msgid "Authenticate"
+ msgstr "Potvrdi identitet"
+ 
+ #: ../panels/printers/authentication-dialog.ui.h:5
+-#: ../panels/sharing/sharing.ui.h:23
++#: ../panels/sharing/sharing.ui.h:21
+ #: ../panels/user-accounts/data/account-dialog.ui.h:6
+ msgid "Password"
+ msgstr "Lozinka"
+@@ -5028,21 +5031,21 @@ msgstr "Pomeri dole"
+ msgid "Preferences"
+ msgstr "Postavke"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:274
++#: ../panels/sharing/cc-sharing-panel.c:285
+ msgctxt "service is enabled"
+ msgid "On"
+ msgstr "Uklj."
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:276
++#: ../panels/sharing/cc-sharing-panel.c:287
+ msgctxt "service is disabled"
+ msgid "Off"
+ msgstr "Isklj."
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:421
++#: ../panels/sharing/cc-sharing-panel.c:422
+ msgid "Choose a Folder"
+ msgstr "Izaberite fasciklu"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:719
++#: ../panels/sharing/cc-sharing-panel.c:736
+ msgid "Copy"
+ msgstr "Umnožavanje"
+ 
+@@ -5087,70 +5090,62 @@ msgstr ""
+ "uređajima"
+ 
+ #: ../panels/sharing/sharing.ui.h:3
+-msgid "Share Public Folder"
+-msgstr "Deli javnu fasciklu"
+-
+-#: ../panels/sharing/sharing.ui.h:4
+ msgid "Only Receive From Trusted Devices"
+ msgstr "Samo primaj sa poverljivih uređaja"
+ 
+-#: ../panels/sharing/sharing.ui.h:5
++#: ../panels/sharing/sharing.ui.h:4
+ msgid "Save Received Files to Downloads Folder"
+ msgstr "Sačuvaj primljene datoteke u fasciklu preuzimanja"
+ 
+-#: ../panels/sharing/sharing.ui.h:6
+-msgid "Only share with Trusted Devices"
+-msgstr "Samo deli sa poverljivim uređajima"
+-
+-#: ../panels/sharing/sharing.ui.h:7
++#: ../panels/sharing/sharing.ui.h:5
+ msgid "Computer Name"
+ msgstr "Naziv računara"
+ 
+-#: ../panels/sharing/sharing.ui.h:8
++#: ../panels/sharing/sharing.ui.h:6
+ msgid "Personal File Sharing"
+ msgstr "Deljenje ličnih datoteka"
+ 
+-#: ../panels/sharing/sharing.ui.h:9
++#: ../panels/sharing/sharing.ui.h:7
+ msgid "Screen Sharing"
+ msgstr "Deljenje ekrana"
+ 
+-#: ../panels/sharing/sharing.ui.h:10
++#: ../panels/sharing/sharing.ui.h:8
+ msgid "Media Sharing"
+ msgstr "Deljenje medija"
+ 
+-#: ../panels/sharing/sharing.ui.h:11
++#: ../panels/sharing/sharing.ui.h:9
+ msgid "Remote Login"
+ msgstr "Udaljeno prijavljivanje"
+ 
+-#: ../panels/sharing/sharing.ui.h:12
++#: ../panels/sharing/sharing.ui.h:10
+ msgid "Some services are disabled because of no network access."
+ msgstr "Neke usluge su isključene jer nema pristupa na mrežu."
+ 
+-#: ../panels/sharing/sharing.ui.h:13
++#: ../panels/sharing/sharing.ui.h:11
+ msgid "Share Music, Photos and Videos with others on the current network."
+ msgstr "Delite muziku, fotografije i snimke sa drugima na tekućoj mreži."
+ 
+-#: ../panels/sharing/sharing.ui.h:14
++#: ../panels/sharing/sharing.ui.h:12
+ msgid "Share Media On This Network"
+ msgstr "Deli medije na ovoj mreži"
+ 
+-#: ../panels/sharing/sharing.ui.h:15
++#: ../panels/sharing/sharing.ui.h:13
+ msgid "Shared Folders"
+ msgstr "Deljene fascikle"
+ 
+-#: ../panels/sharing/sharing.ui.h:16
++#: ../panels/sharing/sharing.ui.h:14
+ msgid "column"
+ msgstr "kolona"
+ 
+-#: ../panels/sharing/sharing.ui.h:17
++#: ../panels/sharing/sharing.ui.h:15
+ msgid "Add Folder"
+ msgstr "Dodaj fasciklu"
+ 
+-#: ../panels/sharing/sharing.ui.h:18
++#: ../panels/sharing/sharing.ui.h:16
+ msgid "Remove Folder"
+ msgstr "Ukloni fasciklu"
+ 
+-#: ../panels/sharing/sharing.ui.h:20
++#: ../panels/sharing/sharing.ui.h:18
+ #, no-c-format
+ msgid ""
+ "Personal File Sharing allows you to share your Public folder with others on "
+@@ -5159,15 +5154,15 @@ msgstr ""
+ "Deljenje ličnih datoteka vam omogućava da delite vašu javnu fasciklu sa "
+ "drugima na vašoj tekućoj mreži koristeći: <a href=\"dav://%s\">dav://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:21
++#: ../panels/sharing/sharing.ui.h:19
+ msgid "Share Public Folder On This Network"
+ msgstr "Deli javnu fasciklu na ovoj mreži"
+ 
+-#: ../panels/sharing/sharing.ui.h:22
++#: ../panels/sharing/sharing.ui.h:20
+ msgid "Require Password"
+ msgstr "Zahteva lozinku"
+ 
+-#: ../panels/sharing/sharing.ui.h:25
++#: ../panels/sharing/sharing.ui.h:23
+ #, no-c-format
+ msgid ""
+ "Allow remote users to connect using the Secure Shell command:\n"
+@@ -5176,7 +5171,7 @@ msgstr ""
+ "Omogućava korisnicima da se povežu koristeći naredbu bezbedne školjke:\n"
+ "<a href=\"ssh %s\">ssh %s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:28
++#: ../panels/sharing/sharing.ui.h:26
+ #, no-c-format
+ msgid ""
+ "Allow remote users to view or control your screen by connecting to: <a href="
+@@ -5185,19 +5180,19 @@ msgstr ""
+ "Omogućava udaljenim korisnicima da vide ili da upravljaju vašim ekranom tako "
+ "što će se povezati na: <a href=\"vnc://%s\">vnc://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:29
++#: ../panels/sharing/sharing.ui.h:27
+ msgid "Remote View"
+ msgstr "Udaljeni pregled"
+ 
+-#: ../panels/sharing/sharing.ui.h:30
++#: ../panels/sharing/sharing.ui.h:28
+ msgid "Remote Control"
+ msgstr "Udaljeno upravljanje"
+ 
+-#: ../panels/sharing/sharing.ui.h:31
++#: ../panels/sharing/sharing.ui.h:29
+ msgid "Approve All Connections"
+ msgstr "Odobri sve veze"
+ 
+-#: ../panels/sharing/sharing.ui.h:32
++#: ../panels/sharing/sharing.ui.h:30
+ msgid "Show Password"
+ msgstr "Prikaži lozinku"
+ 
+@@ -6700,7 +6695,7 @@ msgstr ""
+ "dugme prečice tastature i držite pritisnutim nove tastere ili pritisnite "
+ "„Backspace“ da obrišete prečicu."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:82
++#: ../panels/wacom/calibrator/calibrator-gui.c:84
+ msgid ""
+ "Please tap the target markers as they appear on screen to calibrate the "
+ "tablet."
+@@ -6708,7 +6703,7 @@ msgstr ""
+ "Molim lupnite znake mete koji će se pojaviti na ekranu da kalibrišete "
+ "tablicu."
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:86
++#: ../panels/wacom/calibrator/calibrator-gui.c:88
+ msgid "Mis-click detected, restarting..."
+ msgstr "Otkriven je loš klik, počinjem iz početka..."
+ 
+@@ -6761,7 +6756,7 @@ msgstr "Mapiraj na jednom monitoru"
+ msgid "%d of %d"
+ msgstr "%d od %d"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:522
++#: ../panels/wacom/cc-wacom-page.c:531
+ msgid "Display Mapping"
+ msgstr "Prikazuje mapiranje"
+ 
+@@ -6897,22 +6892,22 @@ msgstr "Režim prekidača desne dodirne trake"
+ msgid "Mode Switch #%d"
+ msgstr "Režim prekidača #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1336
++#: ../panels/wacom/gsd-wacom-device.c:1335
+ #, c-format
+ msgid "Left Button #%d"
+ msgstr "Levo dugme #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1339
++#: ../panels/wacom/gsd-wacom-device.c:1338
+ #, c-format
+ msgid "Right Button #%d"
+ msgstr "Desno dugme #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1342
++#: ../panels/wacom/gsd-wacom-device.c:1341
+ #, c-format
+ msgid "Top Button #%d"
+ msgstr "Gornje dugme #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1345
++#: ../panels/wacom/gsd-wacom-device.c:1344
+ #, c-format
+ msgid "Bottom Button #%d"
+ msgstr "Donje dugme #%d"
+@@ -7071,3 +7066,9 @@ msgstr "Podešavanja"
+ #: ../shell/gnome-control-center.desktop.in.in.h:2
+ msgid "Preferences;Settings;"
+ msgstr "postavke;podešavanja;"
++
++#~ msgid "Share Public Folder"
++#~ msgstr "Deli javnu fasciklu"
++
++#~ msgid "Only share with Trusted Devices"
++#~ msgstr "Samo deli sa poverljivim uređajima"
+diff --git a/po/ta.po b/po/ta.po
+index 02bfa24..2cf7306 100644
+--- a/po/ta.po
++++ b/po/ta.po
+@@ -16,8 +16,8 @@ msgstr ""
+ "Project-Id-Version: gnome-control-center.master.ta\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "control-center&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-04-25 07:05+0000\n"
+-"PO-Revision-Date: 2013-04-25 17:47+0000\n"
++"POT-Creation-Date: 2013-11-16 16:56+0000\n"
++"PO-Revision-Date: 2013-11-20 12:44+0630\n"
+ "Last-Translator: Shantha kumar <shkumar@redhat.com>\n"
+ "Language-Team: American English <>\n"
+ "Language: ta\n"
+@@ -39,92 +39,132 @@ msgstr ""
+ "\n"
+ "\n"
+ 
++#: ../panels/background/background.ui.h:1
++#: ../panels/background/gnome-background-panel.desktop.in.in.h:1
++msgid "Background"
++msgstr "பின்னணி"
++
+ #. This refers to a slideshow background
+-#: ../panels/background/background.ui.h:2
++#: ../panels/background/background.ui.h:3
+ msgid "Changes throughout the day"
+ msgstr "நாள் முழுதும் மாறும்"
+ 
+-#: ../panels/background/background.ui.h:3
++#: ../panels/background/background.ui.h:4
++msgid "Lock Screen"
++msgstr "திரையை பூட்டு"
++
++#: ../panels/background/background.ui.h:5
+ msgctxt "background, style"
+ msgid "Tile"
+ msgstr "ஓடுகளாக்க பரப்பு"
+ 
+-#: ../panels/background/background.ui.h:4
++#: ../panels/background/background.ui.h:6
+ msgctxt "background, style"
+ msgid "Zoom"
+ msgstr "அணுகிப்பார்"
+ 
+-#: ../panels/background/background.ui.h:5
++#: ../panels/background/background.ui.h:7
+ msgctxt "background, style"
+ msgid "Center"
+ msgstr "மையம்"
+ 
+-#: ../panels/background/background.ui.h:6
++#: ../panels/background/background.ui.h:8
+ msgctxt "background, style"
+ msgid "Scale"
+ msgstr "அளவாக்கம்"
+ 
+-#: ../panels/background/background.ui.h:7
++#: ../panels/background/background.ui.h:9
+ msgctxt "background, style"
+ msgid "Fill"
+ msgstr "நிரப்பு"
+ 
+-#: ../panels/background/background.ui.h:8
++#: ../panels/background/background.ui.h:10
+ msgctxt "background, style"
+ msgid "Span"
+ msgstr "வீச்சு"
+ 
+ #. translators: This is the title of the wallpaper chooser dialog.
+-#: ../panels/background/cc-background-chooser-dialog.c:199
++#: ../panels/background/cc-background-chooser-dialog.c:292
+ msgid "Select Background"
+ msgstr "பின்னணியை தேர்ந்தெடு"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:218
++#: ../panels/background/cc-background-chooser-dialog.c:312
+ msgid "Wallpapers"
+ msgstr "சுவர்-காகிதங்கள்"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:227
++#: ../panels/background/cc-background-chooser-dialog.c:321
+ msgid "Pictures"
+ msgstr "படங்கள் "
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:235
++#: ../panels/background/cc-background-chooser-dialog.c:329
+ msgid "Colors"
+ msgstr "வண்ணங்கள்"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:244
++#: ../panels/background/cc-background-chooser-dialog.c:338
+ msgid "Flickr"
+ msgstr "மினுமினு"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:286
++#. translators: No pictures were found
++#: ../panels/background/cc-background-chooser-dialog.c:385
++msgid "No Pictures Found"
++msgstr "படங்கள் இல்லை"
++
++#. translators: %s here is the name of the Pictures directory, the string should be translated in
++#. * the context "You can add images to your Pictures folder and they will show up here"
++#: ../panels/background/cc-background-chooser-dialog.c:400
++#, c-format
++msgid "You can add images to your %s folder and they will show up here"
++msgstr ""
++"உங்கள் %s கோப்புறையில் நீங்கள் படங்களைச் சேர்க்கலாம், அவை இங்கு "
++"காண்பிக்கப்படும்"
++
++#: ../panels/background/cc-background-chooser-dialog.c:428
++#: ../panels/bluetooth/cc-bluetooth-panel.c:640
++#: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
++#: ../panels/display/cc-display-panel.c:1509
++#: ../panels/display/cc-display-panel.c:1924
++#: ../panels/network/connection-editor/vpn-helpers.c:245
++#: ../panels/network/connection-editor/vpn-helpers.c:374
++#: ../panels/network/net-device-wifi.c:1194
++#: ../panels/network/net-device-wifi.c:1402
++#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
++#: ../panels/printers/cc-printers-panel.c:1946
++#: ../panels/printers/new-printer-dialog.ui.h:2
++#: ../panels/privacy/cc-privacy-panel.c:470
++#: ../panels/search/cc-search-locations-dialog.c:682
++#: ../panels/sharing/cc-sharing-panel.c:425
++#: ../panels/user-accounts/um-fingerprint-dialog.c:269
++#: ../panels/user-accounts/um-photo-dialog.c:96
++#: ../panels/user-accounts/um-photo-dialog.c:221
++#: ../panels/user-accounts/um-user-panel.c:508
++msgid "_Cancel"
++msgstr "_C நீக்கு"
++
++#: ../panels/background/cc-background-chooser-dialog.c:429
+ #: ../panels/printers/ppd-selection-dialog.ui.h:3
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:9
+ #: ../panels/user-accounts/um-photo-dialog.c:98
+ msgid "Select"
+ msgstr "தேர்வு செய்க "
+ 
+-#: ../panels/background/cc-background-item.c:150
++#: ../panels/background/cc-background-item.c:149
+ msgid "multiple sizes"
+ msgstr "பல அளவுகள்"
+ 
+ #. translators: 100 × 100px
+ #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
+-#: ../panels/background/cc-background-item.c:154
++#: ../panels/background/cc-background-item.c:153
+ #, c-format
+ msgid "%d × %d"
+ msgstr "%d × %d"
+ 
+-#: ../panels/background/cc-background-item.c:283
++#: ../panels/background/cc-background-item.c:281
+ msgid "No Desktop Background"
+ msgstr "பணிமேடை பின்னணி எதுவுமில்லை"
+ 
+-#: ../panels/background/cc-background-panel.c:453
++#: ../panels/background/cc-background-panel.c:493
+ msgid "Current background"
+ msgstr "நடப்பு பின்னணி"
+ 
+-#: ../panels/background/gnome-background-panel.desktop.in.in.h:1
+-msgid "Background"
+-msgstr "பின்னணி"
+-
+ #: ../panels/background/gnome-background-panel.desktop.in.in.h:2
+ msgid "Change your background image to a wallpaper or photo"
+ msgstr "உங்கள் பின்புலப் படத்தை வால்பேப்பர் அல்லது புகைப்படமாக மாற்றவும்"
+@@ -138,7 +178,7 @@ msgstr "சுவர்-காகிதங்கள் ;திரை;மேல
+ msgid "Set Up New Device"
+ msgstr "புதிய சாதனத்தை அமைக்கவும்"
+ 
+-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
++#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
+ msgid "Remove Device"
+ msgstr "சாதனத்தை நீக்கு"
+ 
+@@ -164,15 +204,15 @@ msgstr "பக்கம் 2"
+ msgid "Paired"
+ msgstr "ஜோடிசேர்த்த"
+ 
+-#: ../panels/bluetooth/bluetooth.ui.h:7 ../panels/wacom/cc-wacom-page.c:812
++#: ../panels/bluetooth/bluetooth.ui.h:7
+ msgid "Type"
+ msgstr "வகை"
+ 
+ #: ../panels/bluetooth/bluetooth.ui.h:8
+-#: ../panels/network/connection-editor/ce-page-ip4.c:189
+-#: ../panels/network/connection-editor/ce-page-ip4.c:441
+-#: ../panels/network/connection-editor/ce-page-ip6.c:191
+-#: ../panels/network/connection-editor/ce-page-ip6.c:445
++#: ../panels/network/connection-editor/ce-page-ip4.c:194
++#: ../panels/network/connection-editor/ce-page-ip4.c:456
++#: ../panels/network/connection-editor/ce-page-ip6.c:196
++#: ../panels/network/connection-editor/ce-page-ip6.c:460
+ msgid "Address"
+ msgstr "முகவரி"
+ 
+@@ -181,7 +221,6 @@ msgid "Mouse & Touchpad Settings"
+ msgstr "சொடுக்கி மற்றும் தொடுதிட்டு அமைப்புகள்"
+ 
+ #: ../panels/bluetooth/bluetooth.ui.h:10
+-#: ../panels/universal-access/uap.ui.h:38
+ msgid "Sound Settings"
+ msgstr "ஒலி அமைப்புகள்"
+ 
+@@ -193,48 +232,53 @@ msgstr "விசைப்பலகை அமைப்புகள்"
+ msgid "Send Files…"
+ msgstr "கோப்புகளை அனுப்பவும்..."
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:355
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
+ msgid "Yes"
+ msgstr "ஆம்"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:355
++#: ../panels/bluetooth/cc-bluetooth-panel.c:366
+ #: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
+ msgid "No"
+ msgstr "இல்லை"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:469
++#: ../panels/bluetooth/cc-bluetooth-panel.c:479
+ msgid "Bluetooth is disabled"
+ msgstr "ப்ளூடூத் செயல்நீக்கப்பட்டது"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:474
++#: ../panels/bluetooth/cc-bluetooth-panel.c:484
+ msgid "Bluetooth is disabled by hardware switch"
+ msgstr "ப்ளூடூத் வன்பொருள் மாற்றியால் செயல் நீக்கப்பட்டது"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:478
++#: ../panels/bluetooth/cc-bluetooth-panel.c:488
+ msgid "No Bluetooth adapters found"
+ msgstr "ப்ளூடூத் தகைவிகள் ஏதும் காணப்படவில்லை"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:577
++#: ../panels/bluetooth/cc-bluetooth-panel.c:587
+ msgid "Visibility"
+ msgstr "காண் தகைவு"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:581
++#: ../panels/bluetooth/cc-bluetooth-panel.c:591
+ #, c-format
+ msgid "Visibility of “%s”"
+ msgstr "%s இன் காண்தகைவு"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:625
++#: ../panels/bluetooth/cc-bluetooth-panel.c:635
+ #, c-format
+ msgid "Remove '%s' from the list of devices?"
+ msgstr "'%s' ஐ சாதனங்கள் பட்டியலிலிருந்து நீக்கலாமா?"
+ 
+-#: ../panels/bluetooth/cc-bluetooth-panel.c:627
++#: ../panels/bluetooth/cc-bluetooth-panel.c:637
+ msgid ""
+ "If you remove the device, you will have to set it up again before next use."
+ msgstr ""
+ "சாதனத்தை நீங்கள் நீக்கினால் அடுத்த பயனுக்கு முன் மீண்டும் வடிவமைக்க வேண்டும்."
+ 
++#: ../panels/bluetooth/cc-bluetooth-panel.c:641
++#: ../panels/online-accounts/cc-online-accounts-panel.c:844
++msgid "_Remove"
++msgstr "நீக்கு (_R)"
++
+ #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
+ msgid "Bluetooth"
+ msgstr "ப்ளூடூத்"
+@@ -245,7 +289,7 @@ msgstr ""
+ "Bluetooth ஐ ஆன் மற்றும் ஆஃப் செய்யவும் மற்றும் உங்கள் சாதனங்களை இணைக்கவும்"
+ 
+ #. TRANSLATORS: The user has to attach the sensor to the screen
+-#: ../panels/color/cc-color-calibrate.c:360
++#: ../panels/color/cc-color-calibrate.c:361
+ msgid "Place your calibration device over the square and press 'Start'"
+ msgstr ""
+ "உங்கள் அளவைவகுத்தல் சாதனத்தை சதுரத்தின் மீது வைத்து 'தொடங்கு' என்பதை "
+@@ -254,7 +298,7 @@ msgstr ""
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:366
++#: ../panels/color/cc-color-calibrate.c:367
+ msgid ""
+ "Move your calibration device to the calibrate position and press 'Continue'"
+ msgstr ""
+@@ -264,7 +308,7 @@ msgstr ""
+ #. TRANSLATORS: Some calibration devices need the user to move a
+ #. * dial or switch manually. We also show a picture showing them
+ #. * what to do...
+-#: ../panels/color/cc-color-calibrate.c:372
++#: ../panels/color/cc-color-calibrate.c:373
+ msgid ""
+ "Move your calibration device to the surface position and press 'Continue'"
+ msgstr ""
+@@ -274,54 +318,54 @@ msgstr ""
+ #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
+ #. * is built into the palmrest and we need to fullscreen the
+ #. * sample widget and shut the lid.
+-#: ../panels/color/cc-color-calibrate.c:378
++#: ../panels/color/cc-color-calibrate.c:379
+ msgid "Shut the laptop lid"
+ msgstr "மடிக்கணினி மூடியை மூடவும்"
+ 
+ #. TRANSLATORS: We suck, the calibation failed and we have no
+ #. * good idea why or any suggestions
+-#: ../panels/color/cc-color-calibrate.c:409
++#: ../panels/color/cc-color-calibrate.c:410
+ msgid "An internal error occurred that could not be recovered."
+ msgstr "சரிசெய்ய முடியாத ஒரு உள்ளமை பிழை நேர்ந்தது."
+ 
+ #. TRANSLATORS: Some required-at-runtime tools were not
+ #. * installed, which should only affect insane distros
+-#: ../panels/color/cc-color-calibrate.c:414
++#: ../panels/color/cc-color-calibrate.c:415
+ msgid "Tools required for calibration are not installed."
+ msgstr "அளவைவகுத்தலைச் செய்வதற்குத் தேவையான கருவிகள் நிறுவப்படவில்லை."
+ 
+ #. TRANSLATORS: The profile failed for some reason
+-#: ../panels/color/cc-color-calibrate.c:420
++#: ../panels/color/cc-color-calibrate.c:421
+ msgid "The profile could not be generated."
+ msgstr "சுயவிவரத்தை உருவாக்க முடியவில்லை."
+ 
+ #. TRANSLATORS: The user specified a whitepoint that was
+ #. * unobtainable with the hardware they've got -- see
+ #. * https://en.wikipedia.org/wiki/White_point for details
+-#: ../panels/color/cc-color-calibrate.c:426
++#: ../panels/color/cc-color-calibrate.c:427
+ msgid "The target whitepoint was not obtainable."
+ msgstr "இலக்கு வெண்புள்ளி அடையக்கூடியதாக இல்லை."
+ 
+ #. TRANSLATORS: the display calibration process is finished
+-#: ../panels/color/cc-color-calibrate.c:466
++#: ../panels/color/cc-color-calibrate.c:467
+ msgid "Complete!"
+ msgstr "முடிந்தது!"
+ 
+ #. TRANSLATORS: the display calibration failed, and we also show
+ #. * the translated (or untranslated) error string after this
+-#: ../panels/color/cc-color-calibrate.c:474
++#: ../panels/color/cc-color-calibrate.c:475
+ msgid "Calibration failed!"
+ msgstr "அளவைவகுத்தல் தோல்வி!"
+ 
+ #. TRANSLATORS: The user can now remove the sensor from the screen
+-#: ../panels/color/cc-color-calibrate.c:481
++#: ../panels/color/cc-color-calibrate.c:482
+ msgid "You can remove the calibration device."
+ msgstr "அளவைவகுத்தல் சாதனத்தை அகற்றலாம்."
+ 
+ #. TRANSLATORS: The user has to be careful not to knock the
+ #. * display off the screen (although we do cope if this is
+ #. * detected early enough)
+-#: ../panels/color/cc-color-calibrate.c:552
++#: ../panels/color/cc-color-calibrate.c:553
+ msgid "Do not disturb the calibration device while in progress"
+ msgstr "செயலில் இருக்கும் போது அளவைவகுத்தல் சாதனத்தைத் தொந்தரவு செய்ய வேண்டாம்"
+ 
+@@ -383,19 +427,19 @@ msgstr "அளவைவகுக்கப்படவில்லை"
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile has been auto-generated for this hardware
+-#: ../panels/color/cc-color-panel.c:136
++#: ../panels/color/cc-color-panel.c:137
+ msgid "Default: "
+ msgstr "முன்னிருப்பு:"
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile his a standard space like AdobeRGB
+-#: ../panels/color/cc-color-panel.c:144
++#: ../panels/color/cc-color-panel.c:145
+ msgid "Colorspace: "
+ msgstr "நிறவெளி:"
+ 
+ #. TRANSLATORS: this is a profile prefix to signify the
+ #. * profile is a test profile
+-#: ../panels/color/cc-color-panel.c:151
++#: ../panels/color/cc-color-panel.c:152
+ msgid "Test profile: "
+ msgstr "சோதனை வரிவுரு:"
+ 
+@@ -419,51 +463,56 @@ msgstr "ஆதரவுள்ள ஐசிசி வரிவுருக்க
+ msgid "All files"
+ msgstr "எல்லா கோப்புகள்"
+ 
+-#: ../panels/color/cc-color-panel.c:587
++#: ../panels/color/cc-color-panel.c:579
+ msgid "Screen"
+ msgstr "திரை"
+ 
+ #. TRANSLATORS: this is when the upload of the profile failed
+-#: ../panels/color/cc-color-panel.c:913
++#: ../panels/color/cc-color-panel.c:903
+ #, c-format
+-#| msgid "Failed to apply configuration: %s"
+ msgid "Failed to upload file: %s"
+ msgstr "கோப்பைப் பதிவேற்றுவதில் தோல்வியடைந்தது: %s"
+ 
+ #. TRANSLATORS: these are instructions on how to recover
+ #. * the ICC profile on the native operating system and are
+ #. * only shown when the user uses a LiveCD to calibrate
+-#: ../panels/color/cc-color-panel.c:927
++#: ../panels/color/cc-color-panel.c:917
+ msgid "The profile has been uploaded to:"
+ msgstr "சுயவிவரம் இங்கு பதிவேற்றப்பட்டது:"
+ 
+-#: ../panels/color/cc-color-panel.c:929
++#: ../panels/color/cc-color-panel.c:919
+ msgid "Write down this URL."
+ msgstr "இந்த URL ஐ எழுதிக்கொள்ளவும்."
+ 
+-#: ../panels/color/cc-color-panel.c:930
++#: ../panels/color/cc-color-panel.c:920
+ msgid "Restart this computer and boot your normal operating system."
+ msgstr ""
+ "இந்த கணினியை மறுதொடக்கம் செய்து உங்கள் வழக்கமான இயக்க முறைமையை பூட் செய்யவும்."
+ 
+-#: ../panels/color/cc-color-panel.c:931
++#: ../panels/color/cc-color-panel.c:921
+ msgid "Type the URL into your browser to download and install the profile."
+ msgstr ""
+ "சுயவிவரத்தைப் பதிவிறக்க இந்த URL ஐ உங்கள் உலாவியில் தட்டச்சு செய்து, "
+-"சுயவிவரத்தை நிறுவவும்."
++"சுயவிவரத்தை "
++"நிறுவவும்."
+ 
+ #. TRANSLATORS: this is the dialog to save the ICC profile
+-#: ../panels/color/cc-color-panel.c:965
++#: ../panels/color/cc-color-panel.c:955
+ msgid "Save Profile"
+ msgstr "சுயவிவரத்தைச் சேமி"
+ 
++#: ../panels/color/cc-color-panel.c:959
++#: ../panels/network/connection-editor/vpn-helpers.c:375
++msgid "_Save"
++msgstr "சேமி (_S)"
++
+ #. TRANSLATORS: this is when the button is sensitive
+-#: ../panels/color/cc-color-panel.c:1326
++#: ../panels/color/cc-color-panel.c:1315
+ msgid "Create a color profile for the selected device"
+ msgstr "தேர்ந்தெடுக்கப்பட்ட சாதனத்திற்கு வண்ன வரியுரு அமை:"
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1341 ../panels/color/cc-color-panel.c:1365
++#: ../panels/color/cc-color-panel.c:1330 ../panels/color/cc-color-panel.c:1354
+ msgid ""
+ "The measuring instrument is not detected. Please check it is turned on and "
+ "correctly connected."
+@@ -473,24 +522,24 @@ msgstr ""
+ "செய்து கொள்க."
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1375
++#: ../panels/color/cc-color-panel.c:1364
+ msgid "The measuring instrument does not support printer profiling."
+ msgstr "அளவீட்டு கருவி அச்சுப்பொறி வருவுருவாக்கத்தை ஆதரிக்கவில்லை."
+ 
+ #. TRANSLATORS: this is when the button is insensitive
+-#: ../panels/color/cc-color-panel.c:1386
++#: ../panels/color/cc-color-panel.c:1375
+ msgid "The device type is not currently supported."
+ msgstr "இந்த சாதன வகைக்கு இப்போது ஆதரவில்லை."
+ 
+ #. TRANSLATORS: standard spaces are well known colorspaces like
+ #. * sRGB, AdobeRGB and ProPhotoRGB
+-#: ../panels/color/cc-color-profile.c:101
++#: ../panels/color/cc-color-profile.c:102
+ msgid "Standard Space"
+ msgstr "தரநிலையான இடம்"
+ 
+ #. TRANSLATORS: test profiles do things like changing the screen
+ #. * a different color, or swap the red and green channels
+-#: ../panels/color/cc-color-profile.c:107
++#: ../panels/color/cc-color-profile.c:108
+ msgid "Test Profile"
+ msgstr "சோதனை சுயவிவரம்:"
+ 
+@@ -498,7 +547,7 @@ msgstr "சோதனை சுயவிவரம்:"
+ #. * by the color management system based on manufacturing data,
+ #. * for instance the default monitor profile is created from the
+ #. * primaries specified in the monitor EDID
+-#: ../panels/color/cc-color-profile.c:115
++#: ../panels/color/cc-color-profile.c:116
+ msgctxt "Automatically generated profile"
+ msgid "Automatic"
+ msgstr "தானியங்கு"
+@@ -506,13 +555,13 @@ msgstr "தானியங்கு"
+ #. TRANSLATORS: the profile quality - low quality profiles take
+ #. * much less time to generate but may be a poor reflection of the
+ #. * device capability
+-#: ../panels/color/cc-color-profile.c:125
++#: ../panels/color/cc-color-profile.c:126
+ msgctxt "Profile quality"
+ msgid "Low Quality"
+ msgstr "குறைந்த தரம்"
+ 
+ #. TRANSLATORS: the profile quality
+-#: ../panels/color/cc-color-profile.c:130
++#: ../panels/color/cc-color-profile.c:131
+ msgctxt "Profile quality"
+ msgid "Medium Quality"
+ msgstr "நடுநிலைத் தரம்"
+@@ -520,41 +569,41 @@ msgstr "நடுநிலைத் தரம்"
+ #. TRANSLATORS: the profile quality - high quality profiles take
+ #. * a *long* time, and have the best calibration and
+ #. * characterisation data.
+-#: ../panels/color/cc-color-profile.c:137
++#: ../panels/color/cc-color-profile.c:138
+ msgctxt "Profile quality"
+ msgid "High Quality"
+ msgstr "உயர் தரம்"
+ 
+ #. TRANSLATORS: this default RGB space is used for printers that
+ #. * do not have additional printer profiles specified in the PPD
+-#: ../panels/color/cc-color-profile.c:154
++#: ../panels/color/cc-color-profile.c:155
+ msgctxt "Colorspace fallback"
+ msgid "Default RGB"
+ msgstr "முன்னிருப்பு ஆர்ஜிபி"
+ 
+ #. TRANSLATORS: this default CMYK space is used for printers that
+ #. * do not have additional printer profiles specified in the PPD
+-#: ../panels/color/cc-color-profile.c:161
++#: ../panels/color/cc-color-profile.c:162
+ msgctxt "Colorspace fallback"
+ msgid "Default CMYK"
+ msgstr "முன்னிருப்பு சிஎம்ஒய்கே"
+ 
+ #. TRANSLATORS: this default gray space is used for printers that
+ #. * do not have additional printer profiles specified in the PPD
+-#: ../panels/color/cc-color-profile.c:168
++#: ../panels/color/cc-color-profile.c:169
+ msgctxt "Colorspace fallback"
+ msgid "Default Gray"
+ msgstr "முன்னிருப்பு சாம்பல்"
+ 
+-#: ../panels/color/cc-color-profile.c:192
++#: ../panels/color/cc-color-profile.c:193
+ msgid "Vendor supplied factory calibration data"
+ msgstr "விற்பனையாளர் வழங்கிய தொழிற்சாலை அளவைவகுத்தல் தரவு"
+ 
+-#: ../panels/color/cc-color-profile.c:201
++#: ../panels/color/cc-color-profile.c:202
+ msgid "Full-screen display correction not possible with this profile"
+ msgstr "இந்த சுயவிவரத்தில் முழுத்திரை காட்சி திருத்தம் செய்ய முடியாது"
+ 
+-#: ../panels/color/cc-color-profile.c:223
++#: ../panels/color/cc-color-profile.c:224
+ msgid "This profile may no longer be accurate"
+ msgstr "இந்த சுயவிவரம் இப்போது துல்லியமாக இல்லாமால் இருக்கலாம்"
+ 
+@@ -565,8 +614,7 @@ msgstr "காட்சி அளவைவகுத்தல்"
+ #: ../panels/color/color-calibrate.ui.h:2
+ #: ../panels/printers/authentication-dialog.ui.h:2
+ #: ../panels/printers/ppd-selection-dialog.ui.h:2
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:8
+-#: ../panels/user-accounts/um-account-dialog.c:1071
++#: ../panels/user-accounts/um-account-dialog.c:1470
+ msgid "Cancel"
+ msgstr "ரத்து செய்"
+ 
+@@ -585,8 +633,11 @@ msgstr "மீண்டும் தொடர்"
+ msgid "Done"
+ msgstr "முடிந்தது"
+ 
++#. Timeout parameters
++#. 15000 = 15 sec
++#. 750 = 0.75 sec
+ #. Text printed on screen
+-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/gui_gtk.c:78
++#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
+ msgid "Screen Calibration"
+ msgstr "திரை அளவீடு"
+ 
+@@ -695,7 +746,6 @@ msgid "Profile successfully created!"
+ msgstr "சுயவிவரம் வெற்றிகரமாக உருவாக்கப்பட்டது!"
+ 
+ #: ../panels/color/color.ui.h:22
+-#| msgid "Copying files"
+ msgid "Copy profile"
+ msgstr "சுயவிவரத்தை நகலெடு"
+ 
+@@ -704,12 +754,10 @@ msgid "Requires writable media"
+ msgstr "எழுதத்தக்க ஊடகம் தேவை"
+ 
+ #: ../panels/color/color.ui.h:24
+-#| msgid "Add profile"
+ msgid "Upload profile"
+ msgstr "சுயவிவரத்தைப் பதிவேற்று"
+ 
+ #: ../panels/color/color.ui.h:25
+-#| msgid "<b>Di_rect internet connection</b>"
+ msgid "Requires Internet connection"
+ msgstr "இணைய இணைப்பு தேவை"
+ 
+@@ -724,7 +772,7 @@ msgstr ""
+ "எப்படிப் பயன்படுத்துவது என்பது பற்றிய இந்த வழிமுறைகள் உங்களுக்குப் பயன்படலாம்."
+ 
+ #: ../panels/color/color.ui.h:27
+-#: ../panels/user-accounts/um-fingerprint-dialog.c:743
++#: ../panels/user-accounts/um-fingerprint-dialog.c:742
+ msgid "Summary"
+ msgstr "சுருக்கம்"
+ 
+@@ -742,168 +790,147 @@ msgstr ""
+ "காண்பி.</a>"
+ 
+ #: ../panels/color/color.ui.h:30
+-msgid "Device type:"
+-msgstr "சாதன வகை:"
+-
+-#: ../panels/color/color.ui.h:31
+-msgid "Manufacturer:"
+-msgstr "உருவாக்கியவர்: "
+-
+-#: ../panels/color/color.ui.h:32
+-msgid "Model:"
+-msgstr "மாதிரி:"
+-
+-#: ../panels/color/color.ui.h:33
+-msgid ""
+-"Image files can be dragged on this window to auto-complete the above fields."
+-msgstr ""
+-"மேல் காணும் புலங்களை தானியங்கியாக பூர்த்தி செய்ய பிம்ப கோப்புக்களை இந்த "
+-"சாளரத்தில் "
+-"இழுத்துவிடலாம்."
+-
+-#: ../panels/color/color.ui.h:34
+-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+-msgid "Color"
+-msgstr "நிறம்"
+-
+-#: ../panels/color/color.ui.h:35
+ msgid "Each device needs an up to date color profile to be color managed."
+ msgstr ""
+ "வண்ண மேலாண்மைக்கு ஒவ்வொரு சாதனமும் வண்ண வரிவுருவை இற்றைப்படுத்த வேண்டியுள்ளது."
+ 
+-#: ../panels/color/color.ui.h:36
++#: ../panels/color/color.ui.h:31
+ msgid "Learn more"
+ msgstr "மேலும் கற்க"
+ 
+-#: ../panels/color/color.ui.h:37
++#: ../panels/color/color.ui.h:32
+ msgid "Learn more about color management"
+ msgstr "நிற மேலாண்மை குறித்து மேலும் கற்க"
+ 
+-#: ../panels/color/color.ui.h:38
++#: ../panels/color/color.ui.h:33
+ msgid "Set for all users"
+ msgstr "எல்லாப்பயனருக்கும் அமை"
+ 
+-#: ../panels/color/color.ui.h:39
++#: ../panels/color/color.ui.h:34
+ msgid "Set this profile for all users on this computer"
+ msgstr "இந்த வரியுருவை இந்த கணினியில் எல்லா பயனர்களுக்கும் அமை"
+ 
+-#: ../panels/color/color.ui.h:40
++#: ../panels/color/color.ui.h:35
+ msgid "Enable"
+ msgstr "செயல்படுத்து"
+ 
+-#: ../panels/color/color.ui.h:41
++#: ../panels/color/color.ui.h:36
+ msgid "Add profile"
+ msgstr "வரிவுரு சேர்"
+ 
+-#: ../panels/color/color.ui.h:42
++#: ../panels/color/color.ui.h:37
+ #: ../panels/wacom/gnome-wacom-properties.ui.h:10
+ msgid "Calibrate…"
+ msgstr "அளவிடு..."
+ 
+-#: ../panels/color/color.ui.h:43
++#: ../panels/color/color.ui.h:38
+ msgid "Calibrate the device"
+ msgstr "சாதனத்தை அளவிடு "
+ 
+-#: ../panels/color/color.ui.h:44
++#: ../panels/color/color.ui.h:39
+ msgid "Remove profile"
+ msgstr "வரிவுருவை நீக்கு"
+ 
+-#: ../panels/color/color.ui.h:45
++#: ../panels/color/color.ui.h:40
+ msgid "View details"
+ msgstr "விவரங்களை காண்"
+ 
+-#: ../panels/color/color.ui.h:46
++#: ../panels/color/color.ui.h:41
+ msgid "Unable to detect any devices that can be color managed"
+ msgstr "நிற மேலாண்மை செய்யக்கூடிய சாதனங்கள் எதனையும் கண்டறிய முடியவில்லை"
+ 
+-#: ../panels/color/color.ui.h:47
++#: ../panels/color/color.ui.h:42
+ msgid "LCD"
+ msgstr "LCD"
+ 
+-#: ../panels/color/color.ui.h:48
++#: ../panels/color/color.ui.h:43
+ msgid "LED"
+ msgstr "LED"
+ 
+-#: ../panels/color/color.ui.h:49
++#: ../panels/color/color.ui.h:44
+ msgid "CRT"
+ msgstr "CRT"
+ 
+-#: ../panels/color/color.ui.h:50
++#: ../panels/color/color.ui.h:45
+ msgid "Projector"
+ msgstr "ஒளிப்படக்காட்டி"
+ 
+-#: ../panels/color/color.ui.h:51
++#: ../panels/color/color.ui.h:46
+ msgid "Plasma"
+ msgstr "பிளாஸ்மா"
+ 
+-#: ../panels/color/color.ui.h:52
++#: ../panels/color/color.ui.h:47
+ msgid "LCD (CCFL backlight)"
+ msgstr "LCD (CCFL பேக்லைட்)"
+ 
+-#: ../panels/color/color.ui.h:53
++#: ../panels/color/color.ui.h:48
+ msgid "LCD (RGB LED backlight)"
+ msgstr "LCD (RGB LED பேக்லைட்)"
+ 
+-#: ../panels/color/color.ui.h:54
++#: ../panels/color/color.ui.h:49
+ msgid "LCD (white LED backlight)"
+ msgstr "LCD (வெள்ளை LED பேக்லைட்)"
+ 
+-#: ../panels/color/color.ui.h:55
++#: ../panels/color/color.ui.h:50
+ msgid "Wide gamut LCD (CCFL backlight)"
+ msgstr "அகல கேமட் LCD (CCFL பேக்லைட்)"
+ 
+-#: ../panels/color/color.ui.h:56
++#: ../panels/color/color.ui.h:51
+ msgid "Wide gamut LCD (RGB LED backlight)"
+ msgstr "அகல கேமட் LCD (RGB LED பேக்லைட்)"
+ 
+-#: ../panels/color/color.ui.h:57
++#: ../panels/color/color.ui.h:52
+ msgctxt "Calibration quality"
+ msgid "High"
+ msgstr "அதிகம்"
+ 
+-#: ../panels/color/color.ui.h:58
++#: ../panels/color/color.ui.h:53
+ msgid "40 minutes"
+ msgstr "40 நிமிடங்கள்"
+ 
+-#: ../panels/color/color.ui.h:59
++#: ../panels/color/color.ui.h:54
+ msgctxt "Calibration quality"
+ msgid "Medium"
+ msgstr "நடுத்தரம்"
+ 
+-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:4
++#: ../panels/color/color.ui.h:55 ../panels/power/power.ui.h:4
+ #: ../panels/privacy/privacy.ui.h:7
+ msgid "30 minutes"
+ msgstr "30 நிமிடங்கள்"
+ 
+-#: ../panels/color/color.ui.h:61
++#: ../panels/color/color.ui.h:56
+ msgctxt "Calibration quality"
+ msgid "Low"
+ msgstr "குறைவு"
+ 
+-#: ../panels/color/color.ui.h:62 ../panels/power/power.ui.h:3
++#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:3
+ msgid "15 minutes"
+ msgstr "15 நிமிடங்கள்"
+ 
+-#: ../panels/color/color.ui.h:63
++#: ../panels/color/color.ui.h:58
+ msgid "Native to display"
+ msgstr "காட்சிக்கு உரியது"
+ 
+-#: ../panels/color/color.ui.h:64
++#: ../panels/color/color.ui.h:59
+ msgid "D50 (Printing and publishing)"
+ msgstr "D50 (அச்சு மற்றும் வெளியீடு)"
+ 
+-#: ../panels/color/color.ui.h:65
++#: ../panels/color/color.ui.h:60
+ msgid "D55"
+ msgstr "D55"
+ 
+-#: ../panels/color/color.ui.h:66
++#: ../panels/color/color.ui.h:61
+ msgid "D65 (Photography and graphics)"
+ msgstr "D65 (புகைப்படம் மற்றும் வரைபொருள்)"
+ 
+-#: ../panels/color/color.ui.h:67
++#: ../panels/color/color.ui.h:62
+ msgid "D75"
+ msgstr "D75"
+ 
++#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
++msgid "Color"
++msgstr "நிறம்"
++
+ #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+ msgid ""
+ "Calibrate the color of your devices, such as displays, cameras or printers"
+@@ -917,249 +944,192 @@ msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
+ msgstr "நிறம்;ஐசிசி;வரிவுரு;அளவீடுசெய்;அச்சுப்பொறி;தோற்றம்;"
+ 
+ #. Add some common regions
+-#: ../panels/common/cc-common-language.c:677
++#: ../panels/common/cc-common-language.c:685
+ msgid "United States"
+ msgstr "யுனைடட் ஸ்டேட்ஸ் "
+ 
+-#: ../panels/common/cc-common-language.c:678
++#: ../panels/common/cc-common-language.c:686
+ msgid "Germany"
+ msgstr "ஜெர்மனி "
+ 
+-#: ../panels/common/cc-common-language.c:679
++#: ../panels/common/cc-common-language.c:687
+ msgid "France"
+ msgstr "ப்ரான்ஸ்"
+ 
+-#: ../panels/common/cc-common-language.c:680
++#: ../panels/common/cc-common-language.c:688
+ msgid "Spain"
+ msgstr "ஸ்பெய்ன் "
+ 
+-#: ../panels/common/cc-common-language.c:681
++#: ../panels/common/cc-common-language.c:689
+ msgid "China"
+ msgstr "சைனா"
+ 
+-#: ../panels/common/cc-common-language.c:747
++#: ../panels/common/cc-common-language.c:759
+ msgid "Other…"
+ msgstr "மற்றவை…"
+ 
+-#: ../panels/common/cc-language-chooser.c:176
+-#: ../panels/region/cc-format-chooser.c:266
++#: ../panels/common/cc-language-chooser.c:123
++#: ../panels/region/cc-format-chooser.c:268
+ #: ../panels/region/cc-input-chooser.c:172
+ msgid "More…"
+ msgstr "மேலும்…"
+ 
+-#: ../panels/common/cc-language-chooser.c:193
++#: ../panels/common/cc-language-chooser.c:140
+ msgid "No languages found"
+ msgstr "மொழிகள் இல்லை"
+ 
+-#. translators:
+-#. * The device has been disabled
+-#: ../panels/common/cc-util.c:28 ../panels/keyboard/cc-keyboard-option.c:276
+-#: ../panels/keyboard/cc-keyboard-option.c:408
+-#: ../panels/keyboard/keyboard-shortcuts.c:1159
+-#: ../panels/network/network-wifi.ui.h:29
+-#: ../panels/sound/gvc/gvc-mixer-control.c:1830
+-#: ../panels/user-accounts/um-fingerprint-dialog.c:215
+-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+-msgid "Disabled"
+-msgstr "முடக்கப்பட்டது"
+-
+-#: ../panels/common/cc-util.c:29
+-msgid "Left Shift"
+-msgstr "இடது Shift"
+-
+-#: ../panels/common/cc-util.c:30
+-msgid "Left Alt"
+-msgstr "இடது Alt"
+-
+-#: ../panels/common/cc-util.c:31
+-msgid "Left Ctrl"
+-msgstr "இடது Ctrl"
+-
+-#: ../panels/common/cc-util.c:32
+-msgid "Right Shift"
+-msgstr "வலது Shift"
+-
+-#: ../panels/common/cc-util.c:33
+-msgid "Right Alt"
+-msgstr "வலது Alt"
+-
+-#: ../panels/common/cc-util.c:34
+-msgid "Right Ctrl"
+-msgstr "வலது Ctrl"
+-
+-#: ../panels/common/cc-util.c:35
+-msgid "Left Alt+Shift"
+-msgstr "இடது Alt+Shift"
+-
+-#: ../panels/common/cc-util.c:36
+-msgid "Right Alt+Shift"
+-msgstr "வலது Alt+Shift"
+-
+-#: ../panels/common/cc-util.c:37
+-msgid "Left Ctrl+Shift"
+-msgstr "இடது Ctrl+Shift"
+-
+-#: ../panels/common/cc-util.c:38
+-msgid "Right Ctrl+Shift"
+-msgstr "வலது Ctrl+Shift"
+-
+-#: ../panels/common/cc-util.c:39
+-msgid "Left+Right Shift"
+-msgstr "இடது+வலது Shift"
+-
+-#: ../panels/common/cc-util.c:40 ../panels/region/input-options.ui.h:11
+-msgid "Left+Right Alt"
+-msgstr "இடது+வலது Alt"
+-
+-#: ../panels/common/cc-util.c:41
+-msgid "Left+Right Ctrl"
+-msgstr "இடது+வலது Ctrl"
+-
+-#: ../panels/common/cc-util.c:42
+-msgid "Alt+Shift"
+-msgstr "Alt+Shift"
+-
+-#: ../panels/common/cc-util.c:43
+-msgid "Ctrl+Shift"
+-msgstr "Ctrl+Shift"
+-
+-#: ../panels/common/cc-util.c:44
+-msgid "Alt+Ctrl"
+-msgstr "Alt+Ctrl"
+-
+-#: ../panels/common/cc-util.c:45
+-msgid "Caps"
+-msgstr "Caps"
+-
+-#: ../panels/common/cc-util.c:46
+-msgid "Shift+Caps"
+-msgstr "Shift+Caps"
+-
+-#: ../panels/common/cc-util.c:47
+-msgid "Alt+Caps"
+-msgstr "Alt+Caps"
+-
+-#: ../panels/common/cc-util.c:48
+-msgid "Ctrl+Caps"
+-msgstr "Ctrl+Caps"
+-
+ #: ../panels/common/language-chooser.ui.h:1 ../panels/region/region.ui.h:1
+ msgid "Language"
+ msgstr "மொழி"
+ 
+ #: ../panels/common/language-chooser.ui.h:2
+-#: ../panels/region/format-chooser.ui.h:2
++#: ../panels/mouse/cc-mouse-panel.c:111 ../panels/region/format-chooser.ui.h:2
+ msgid "_Done"
+ msgstr "முடிந்தது (_D)"
+ 
++#. Translators: This is the full date and time format used in 12-hour mode.
++#: ../panels/datetime/cc-datetime-panel.c:363
++msgid "%e %B %Y, %l:%M %p"
++msgstr "%e %B %Y, %l:%M %p"
++
++#. Translators: This is the full date and time format used in 24-hour mode.
++#: ../panels/datetime/cc-datetime-panel.c:368
++msgid "%e %B %Y, %R"
++msgstr "%e %B %Y, %R"
++
++#. Translators: UTC here means the Coordinated Universal Time.
++#. * %:::z will be replaced by the offset from UTC e.g. UTC+02
++#: ../panels/datetime/cc-datetime-panel.c:584
++msgid "UTC%:::z"
++msgstr "UTC%:::z"
++
++#. Translators: This is the time format used in 12-hour mode.
++#: ../panels/datetime/cc-datetime-panel.c:589
++msgid "%l:%M %p"
++msgstr "%l:%M %p"
++
++#. Translators: This is the time format used in 24-hour mode.
++#: ../panels/datetime/cc-datetime-panel.c:594
++msgid "%R"
++msgstr "%R"
++
+ #: ../panels/datetime/datetime.ui.h:1
+-msgid "_Region:"
+-msgstr "_R வட்டாரம்:"
++msgid "January"
++msgstr "ஜனவரி"
+ 
+ #: ../panels/datetime/datetime.ui.h:2
+-msgid "_City:"
+-msgstr "நகரம் (_C):"
++msgid "February"
++msgstr "பெப்ரவரி"
+ 
+ #: ../panels/datetime/datetime.ui.h:3
+-msgid "_Network Time"
+-msgstr "_N பிணைய நேரம்"
++msgid "March"
++msgstr "மார்ச்"
++
++#: ../panels/datetime/datetime.ui.h:4
++msgid "April"
++msgstr "ஏப்ரல்"
+ 
+-#. Translator: this is the separator between hours and minutes, like in HH:MM
+ #: ../panels/datetime/datetime.ui.h:5
+-msgid ":"
+-msgstr ":"
++msgid "May"
++msgstr "மே"
+ 
+ #: ../panels/datetime/datetime.ui.h:6
+-msgid "Set the time one hour ahead."
+-msgstr "நேரத்தை ஒரு மனி முன்னே அமை."
++msgid "June"
++msgstr "ஜூன்"
+ 
+ #: ../panels/datetime/datetime.ui.h:7
+-msgid "Set the time one hour back."
+-msgstr "நேரத்தை ஒரு மனி பின்னே அமை."
++msgid "July"
++msgstr "ஜூலை"
+ 
+ #: ../panels/datetime/datetime.ui.h:8
+-msgid "Set the time one minute ahead."
+-msgstr "நேரத்தை ஒரு நிமிடம்  முன்னே அமை."
++msgid "August"
++msgstr "ஆகஸ்ட்"
+ 
+ #: ../panels/datetime/datetime.ui.h:9
+-msgid "Set the time one minute back."
+-msgstr "நேரத்தை ஒரு நிமிடம் பின்னே அமை."
++msgid "September"
++msgstr "செப்டம்பர்"
+ 
+ #: ../panels/datetime/datetime.ui.h:10
+-msgid "Switch between AM and PM."
+-msgstr "முற்பகல் பிற்பகலுக்குள் மாறு"
++msgid "October"
++msgstr "அக்டோபர்"
+ 
+ #: ../panels/datetime/datetime.ui.h:11
+-msgid "Month"
+-msgstr "மாதம்"
++msgid "November"
++msgstr "நவம்பர்"
+ 
+ #: ../panels/datetime/datetime.ui.h:12
+-msgid "Day"
+-msgstr "நாள்"
++msgid "December"
++msgstr "திசம்பர்"
+ 
+ #: ../panels/datetime/datetime.ui.h:13
+-msgid "Year"
+-msgstr "வருடம்"
++#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1
++msgid "Date & Time"
++msgstr "தேதி மற்றும் நேரம்"
+ 
+ #: ../panels/datetime/datetime.ui.h:14
+-msgid "24-hour"
+-msgstr "24-மணி"
+-
+-#: ../panels/datetime/datetime.ui.h:15
+-msgid "AM/PM"
+-msgstr "முப/பிப"
++msgid "Hour"
++msgstr "மணி"
+ 
++#. Translator: this is the separator between hours and minutes, like in HH∶MM
+ #: ../panels/datetime/datetime.ui.h:16
+-msgid "January"
+-msgstr "ஜனவரி"
++msgid "∶"
++msgstr "∶"
+ 
+ #: ../panels/datetime/datetime.ui.h:17
+-msgid "February"
+-msgstr "பெப்ரவரி"
++msgid "Minute"
++msgstr "நிமிடம்"
+ 
+ #: ../panels/datetime/datetime.ui.h:18
+-msgid "March"
+-msgstr "மார்ச்"
++msgid "Day"
++msgstr "நாள்"
+ 
+ #: ../panels/datetime/datetime.ui.h:19
+-msgid "April"
+-msgstr "ஏப்ரல்"
++msgid "Month"
++msgstr "மாதம்"
+ 
+ #: ../panels/datetime/datetime.ui.h:20
+-msgid "May"
+-msgstr "மே"
++msgid "Year"
++msgstr "வருடம்"
+ 
+ #: ../panels/datetime/datetime.ui.h:21
+-msgid "June"
+-msgstr "ஜூன்"
++msgid "Time Zone"
++msgstr "நேர மண்டலம்"
+ 
+ #: ../panels/datetime/datetime.ui.h:22
+-msgid "July"
+-msgstr "ஜூலை"
++msgid "Search for a city"
++msgstr "நகரத்தைத் தேடு"
+ 
+ #: ../panels/datetime/datetime.ui.h:23
+-msgid "August"
+-msgstr "ஆகஸ்ட்"
++msgid "Automatic _Date & Time"
++msgstr "தானியக்க தேதி மற்றும் நேரம் (_D)"
+ 
+ #: ../panels/datetime/datetime.ui.h:24
+-msgid "September"
+-msgstr "செப்டம்பர்"
++msgid "Requires internet access"
++msgstr "இணைய அணுகல் தேவை"
+ 
+ #: ../panels/datetime/datetime.ui.h:25
+-msgid "October"
+-msgstr "அக்டோபர்"
++msgid "Automatic Time _Zone"
++msgstr "தானியங்கு நேர மண்டலம் (_Z)"
+ 
+ #: ../panels/datetime/datetime.ui.h:26
+-msgid "November"
+-msgstr "நவம்பர்"
++msgid "Date & _Time"
++msgstr "தேதி மற்றும் நேரம்"
+ 
+ #: ../panels/datetime/datetime.ui.h:27
+-msgid "December"
+-msgstr "திசம்பர்"
++msgid "Time _Zone"
++msgstr "நேர மண்டலம் (_Z)"
+ 
+-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1
+-msgid "Date & Time"
+-msgstr "தேதி மற்றும் நேரம்"
++#: ../panels/datetime/datetime.ui.h:28
++msgid "Time _Format"
++msgstr "நேர வடிவமைப்பு (_F)"
++
++#: ../panels/datetime/datetime.ui.h:29
++msgid "24-hour"
++msgstr "24-மணி"
++
++#: ../panels/datetime/datetime.ui.h:30
++msgid "AM / PM"
++msgstr "AM / PM"
+ 
+ #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
+ msgid "Change the date and time, including time zone"
+@@ -1179,106 +1149,111 @@ msgid "To change time or date settings, you need to authenticate."
+ msgstr ""
+ "கணினி நேரம் மற்றும் தேதி அமைப்புகளை மாற்ற நீங்கள் உறுதிப்படுத்த வேண்டும்."
+ 
+-#: ../panels/display/cc-display-panel.c:483
+-msgctxt "display panel, rotation"
+-msgid "Normal"
+-msgstr "இயல்பான"
++#: ../panels/display/cc-display-panel.c:485
++msgid "Lid Closed"
++msgstr "மூடி மூடப்பட்டது"
+ 
+-#: ../panels/display/cc-display-panel.c:484
+-msgctxt "display panel, rotation"
+-msgid "Counterclockwise"
+-msgstr "இடம்புரியாக "
++#. translators: "Mirrored" describes when both displays show the same view
++#: ../panels/display/cc-display-panel.c:488
++msgid "Mirrored"
++msgstr "பிரதிபலிப்பு"
+ 
+-#: ../panels/display/cc-display-panel.c:485
+-msgctxt "display panel, rotation"
+-msgid "Clockwise"
+-msgstr "வலம்புரியாக "
+-
+-#: ../panels/display/cc-display-panel.c:486
+-msgctxt "display panel, rotation"
+-msgid "180 Degrees"
+-msgstr "180 பாகைகள்"
+-
+-#. Keep this string in sync with gnome-desktop/libgnome-desktop/gnome-rr-labeler.c
+-#. Translators:  this is the feature where what you see on your laptop's
+-#. * screen is the same as your external projector.  Here, "Mirrored" is being
+-#. * used as an adjective.  For example, the Spanish translation could be
+-#. * "Pantallas en Espejo".
+-#.
+-#. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
+-#. Translators:  this is the feature where what you see on your
+-#. * laptop's screen is the same as your external projector.
+-#. * Here, "Mirrored" is being used as an adjective.  For example,
+-#. * the Spanish translation could be "Pantallas en Espejo".
+-#.
+-#: ../panels/display/cc-display-panel.c:625
+-#: ../panels/display/cc-rr-labeler.c:418
+-msgid "Mirrored Displays"
+-msgstr "பிரதிபலிக்கும் திரைகாட்டிகள்"
++#: ../panels/display/cc-display-panel.c:490
++#: ../panels/display/cc-display-panel.c:2057
++msgid "Primary"
++msgstr "முதன்மை"
+ 
+-#: ../panels/display/cc-display-panel.c:649
+-#: ../panels/display/display-capplet.ui.h:1
+-msgid "Monitor"
+-msgstr "மானிட்டர்"
++#: ../panels/display/cc-display-panel.c:492
++#: ../panels/notifications/cc-notifications-panel.c:205
++#: ../panels/power/cc-power-panel.c:1738 ../panels/power/cc-power-panel.c:1749
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
++#: ../panels/universal-access/uap.ui.h:6
++msgid "Off"
++msgstr "ஆஃப்"
+ 
+-#: ../panels/display/cc-display-panel.c:1669
+-msgid "Drag to change primary display."
+-msgstr "முதன்மை காட்சியை மாற்ற இழுக்கவும்"
++#: ../panels/display/cc-display-panel.c:495
++msgid "Secondary"
++msgstr "இரண்டாம் நிலை"
+ 
+-#: ../panels/display/cc-display-panel.c:1727
+-msgid ""
+-"Select a monitor to change its properties; drag it to rearrange its "
+-"placement."
+-msgstr ""
+-"பண்புகளை  மாற்ற ஒரு திரையகத்தை   தேர்வு செய்க; அதன் இடத்தை  மாற்ற அதை  "
+-"இழுக்கவும்."
++#: ../panels/display/cc-display-panel.c:1505
++msgid "Arrange Combined Displays"
++msgstr "சேர்க்கை திரைகாட்டிகளை அடுக்கு"
++
++#: ../panels/display/cc-display-panel.c:1511
++#: ../panels/display/cc-display-panel.c:1927
++#: ../panels/network/connection-editor/connection-editor.ui.h:1
++msgid "_Apply"
++msgstr "செயல்படுத்து (_A)"
+ 
+-#: ../panels/display/cc-display-panel.c:2115
+-msgid "%a %R"
+-msgstr "%a %R"
++#: ../panels/display/cc-display-panel.c:1532
++msgid "Drag displays to rearrange them"
++msgstr "திரைகாட்டிகளின் வரிசையை மாற்ற அவற்றை இழுக்கவும்"
+ 
+-#: ../panels/display/cc-display-panel.c:2117
+-msgid "%a %l:%M %p"
+-msgstr "%b %d %l:%M %p"
++#. size
++#: ../panels/display/cc-display-panel.c:1991
++msgid "Size"
++msgstr "அளவு"
+ 
+-#: ../panels/display/cc-display-panel.c:2279
+-#: ../panels/display/cc-display-panel.c:2331
+-#, c-format
+-msgid "Failed to apply configuration: %s"
+-msgstr "வடிவமைப்பினை செயலாக்குவதில் பிழை: %s"
++#. aspect ratio
++#: ../panels/display/cc-display-panel.c:2006
++msgid "Aspect Ratio"
++msgstr "தோன்று விகிதம்"
+ 
+-#: ../panels/display/cc-display-panel.c:2359
+-msgid "Could not save the monitor configuration"
+-msgstr "மானிட்டர் கட்டமைப்பை சேமிக்க முடியவில்லை"
++#: ../panels/display/cc-display-panel.c:2027
++#: ../panels/printers/pp-options-dialog.c:86
++msgid "Resolution"
++msgstr "தெளிதிறன் "
+ 
+-#: ../panels/display/cc-display-panel.c:2419
+-msgid "Could not detect displays"
+-msgstr "காட்சிகளை கண்டறிய முடியவில்லை"
++#: ../panels/display/cc-display-panel.c:2058
++msgid "Show the top bar and Activities Overview on this display"
++msgstr ""
++"இந்த திரைகாட்டியில் மேல் பட்டியையும் செயல்பாடுகள் மேலோட்டத்தையும் காண்பி"
+ 
+-#: ../panels/display/cc-display-panel.c:2614
+-msgid "Could not get screen information"
+-msgstr "திரை தகவலை பெற முடியவில்லை"
++#: ../panels/display/cc-display-panel.c:2064
++msgid "Secondary Display"
++msgstr "இரண்டாம் நிலை திரைகாட்டி"
+ 
+-#: ../panels/display/display-capplet.ui.h:2
+-msgid "_Resolution"
+-msgstr "தெளிவுத்திறன் (_R)"
++#: ../panels/display/cc-display-panel.c:2065
++msgid "Join this display with another to create an extra workspace"
++msgstr ""
++"இந்தத் திரைகாட்டியை மற்றொன்றுடன் இணைத்து கூடுதல் பணியிடத்தை உருவாக்கலாம்"
++
++#: ../panels/display/cc-display-panel.c:2072
++msgid "Presentation"
++msgstr "விளக்கக்காட்சி"
++
++#: ../panels/display/cc-display-panel.c:2073
++msgid "Show slideshows and media only"
++msgstr "ஸ்லைடுகாட்சிகளையும் ஊடகங்களையும் மட்டும் காண்பி"
++
++#. translators: "Mirror" describes when both displays show the same view
++#: ../panels/display/cc-display-panel.c:2078
++msgid "Mirror"
++msgstr "பிரதிபலிப்பு"
+ 
+-#: ../panels/display/display-capplet.ui.h:3
+-msgid "R_otation"
+-msgstr "சுழற்சி (_o):"
++#: ../panels/display/cc-display-panel.c:2079
++msgid "Show your existing view on both displays"
++msgstr "இரண்டு திரைகாட்டிகளிலும் தற்போதுள்ள உங்கள் காட்சிவகையைக் காண்பிக்கவும்"
+ 
+-#. Note that mirror is a verb in this string
+-#: ../panels/display/display-capplet.ui.h:5
+-msgid "_Mirror displays"
+-msgstr "பிரதிபலிக்கும்  திரைகள் (_M)"
++#: ../panels/display/cc-display-panel.c:2085
++msgid "Turn Off"
++msgstr "அணை"
+ 
+-#: ../panels/display/display-capplet.ui.h:6
+-msgid "Note: may limit resolution options"
+-msgstr "குறிப்பு: தெளிதிறன் தேர்வுகளை கட்டுப்படுத்தலாம்"
++#: ../panels/display/cc-display-panel.c:2086
++msgid "Don't use this display"
++msgstr "இந்தத் திரைகாட்டியைப் பயன்படுத்த வேண்டாம்"
+ 
+-#: ../panels/display/display-capplet.ui.h:7
+-msgid "_Detect Displays"
+-msgstr "திரைகளை கண்டுபிடி"
++#: ../panels/display/cc-display-panel.c:2301
++msgid "Could not get screen information"
++msgstr "திரை தகவலை பெற முடியவில்லை"
++
++#: ../panels/display/cc-display-panel.c:2332
++msgid "_Arrange Combined Displays"
++msgstr "சேர்க்கை திரைகாட்டிகளை அடுக்கு (_A)"
+ 
+ #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
+ msgid "Displays"
+@@ -1297,53 +1272,53 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
+ msgstr "பலகம்;ஒளிப்படக்காட்டி;எக்ஸ்ரான்டர்;திரை;தெளிதிறன்;புதுப்பி;"
+ 
+ #. TRANSLATORS: AP type
+-#: ../panels/info/cc-info-panel.c:450 ../panels/network/panel-common.c:127
++#: ../panels/info/cc-info-panel.c:451 ../panels/network/panel-common.c:127
+ msgid "Unknown"
+ msgstr "தெரியாத"
+ 
+-#: ../panels/info/cc-info-panel.c:532
++#: ../panels/info/cc-info-panel.c:534
+ #, c-format
+ msgid "%s %d-bit"
+ msgstr "%s %d-பிட்"
+ 
+-#: ../panels/info/cc-info-panel.c:534
++#: ../panels/info/cc-info-panel.c:536
+ #, c-format
+ msgid "%d-bit"
+ msgstr "%d-பிட்"
+ 
+-#: ../panels/info/cc-info-panel.c:1209
++#: ../panels/info/cc-info-panel.c:1216
+ msgid "Ask what to do"
+ msgstr "என்ன செய்ய என்று கேள் "
+ 
+-#: ../panels/info/cc-info-panel.c:1213
++#: ../panels/info/cc-info-panel.c:1220
+ msgid "Do nothing"
+ msgstr "ஒன்றும் செய்யாதே"
+ 
+-#: ../panels/info/cc-info-panel.c:1217
++#: ../panels/info/cc-info-panel.c:1224
+ msgid "Open folder"
+ msgstr "அடைவினை திற"
+ 
+-#: ../panels/info/cc-info-panel.c:1308
++#: ../panels/info/cc-info-panel.c:1315
+ msgid "Other Media"
+ msgstr " மற்ற ஊடகம்"
+ 
+-#: ../panels/info/cc-info-panel.c:1339
++#: ../panels/info/cc-info-panel.c:1346
+ msgid "Select an application for audio CDs"
+ msgstr "ஒலி குறுந்தட்டுகளுக்கு  நிரலைத் தெரிவுசெய்யவும்"
+ 
+-#: ../panels/info/cc-info-panel.c:1340
++#: ../panels/info/cc-info-panel.c:1347
+ msgid "Select an application for video DVDs"
+ msgstr "விடியோ டிவிடி களுக்கு நிரலைத் தெரிவுசெய்யவும்"
+ 
+-#: ../panels/info/cc-info-panel.c:1341
++#: ../panels/info/cc-info-panel.c:1348
+ msgid "Select an application to run when a music player is connected"
+ msgstr "இசைப்பியை இணைத்தபோது துவக்க நிரலை தேர்ந்தெடுக்கவும்."
+ 
+-#: ../panels/info/cc-info-panel.c:1342
++#: ../panels/info/cc-info-panel.c:1349
+ msgid "Select an application to run when a camera is connected"
+ msgstr "காமிராவை இணைத்தபோது துவக்க நிரலை தேர்ந்தெடுக்கவும்."
+ 
+-#: ../panels/info/cc-info-panel.c:1343
++#: ../panels/info/cc-info-panel.c:1350
+ msgid "Select an application for software CDs"
+ msgstr "மென்பொருள் குறுந்தட்டுகளுக்கு நிரலைத் தெரிவுசெய்யவும்"
+ 
+@@ -1352,89 +1327,89 @@ msgstr "மென்பொருள் குறுந்தட்டுகள
+ #. * If the shared-mime-info translation works for your language,
+ #. * simply leave these untranslated.
+ #.
+-#: ../panels/info/cc-info-panel.c:1355
++#: ../panels/info/cc-info-panel.c:1362
+ msgid "audio DVD"
+ msgstr "ஒலி டிவிடி"
+ 
+-#: ../panels/info/cc-info-panel.c:1356
++#: ../panels/info/cc-info-panel.c:1363
+ msgid "blank Blu-ray disc"
+ msgstr "வெற்று ப்ளூ-ரே வட்டு"
+ 
+-#: ../panels/info/cc-info-panel.c:1357
++#: ../panels/info/cc-info-panel.c:1364
+ msgid "blank CD disc"
+ msgstr "வெற்று குறுந்தட்டு வட்டு"
+ 
+-#: ../panels/info/cc-info-panel.c:1358
++#: ../panels/info/cc-info-panel.c:1365
+ msgid "blank DVD disc"
+ msgstr "வெற்று டிவிடி வட்டு"
+ 
+-#: ../panels/info/cc-info-panel.c:1359
++#: ../panels/info/cc-info-panel.c:1366
+ msgid "blank HD DVD disc"
+ msgstr "வெற்று ஹெச்டி டிவிடி வட்டு"
+ 
+-#: ../panels/info/cc-info-panel.c:1360
++#: ../panels/info/cc-info-panel.c:1367
+ msgid "Blu-ray video disc"
+ msgstr "ப்ளூ-ரே விடியோ வட்டு"
+ 
+-#: ../panels/info/cc-info-panel.c:1361
++#: ../panels/info/cc-info-panel.c:1368
+ msgid "e-book reader"
+ msgstr "மின் புத்தக படிப்பி"
+ 
+-#: ../panels/info/cc-info-panel.c:1362
++#: ../panels/info/cc-info-panel.c:1369
+ msgid "HD DVD video disc"
+ msgstr "ஹெச்டி டிவிடி விடியோ வட்டு"
+ 
+-#: ../panels/info/cc-info-panel.c:1363
++#: ../panels/info/cc-info-panel.c:1370
+ msgid "Picture CD"
+ msgstr "படங்கள் குறுந்தட்டு"
+ 
+-#: ../panels/info/cc-info-panel.c:1364
++#: ../panels/info/cc-info-panel.c:1371
+ msgid "Super Video CD"
+ msgstr "சூப்பர் விடியோ குறுந்தட்டு"
+ 
+-#: ../panels/info/cc-info-panel.c:1365
++#: ../panels/info/cc-info-panel.c:1372
+ msgid "Video CD"
+ msgstr "வீடியோ குறுவட்டு"
+ 
+-#: ../panels/info/cc-info-panel.c:1366
++#: ../panels/info/cc-info-panel.c:1373
+ msgid "Windows software"
+ msgstr "சாளர மென்பொருள்"
+ 
+-#: ../panels/info/cc-info-panel.c:1367
++#: ../panels/info/cc-info-panel.c:1374
+ msgid "Software"
+ msgstr " மென்பொருள் "
+ 
+-#: ../panels/info/cc-info-panel.c:1490
++#: ../panels/info/cc-info-panel.c:1497
+ #: ../panels/keyboard/keyboard-shortcuts.c:1696
+ msgid "Section"
+ msgstr "பிரிவு"
+ 
+-#: ../panels/info/cc-info-panel.c:1499 ../panels/info/info.ui.h:13
++#: ../panels/info/cc-info-panel.c:1506 ../panels/info/info.ui.h:13
+ msgid "Overview"
+ msgstr "மேலோட்டம்"
+ 
+-#: ../panels/info/cc-info-panel.c:1505 ../panels/info/info.ui.h:20
++#: ../panels/info/cc-info-panel.c:1512 ../panels/info/info.ui.h:20
+ msgid "Default Applications"
+ msgstr "முன்னிருப்பு பயன்பாடுகள்"
+ 
+-#: ../panels/info/cc-info-panel.c:1510 ../panels/info/info.ui.h:28
++#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:28
+ msgid "Removable Media"
+ msgstr "நீக்கப்படக்கூடிய சாதனங்கள் "
+ 
+-#: ../panels/info/cc-info-panel.c:1535
++#: ../panels/info/cc-info-panel.c:1542
+ #, c-format
+ msgid "Version %s"
+ msgstr "பதிப்பு %s"
+ 
+-#: ../panels/info/cc-info-panel.c:1585
++#: ../panels/info/cc-info-panel.c:1592
+ msgid "Install Updates"
+ msgstr "மேம்படுத்தல்களை நிறுவு"
+ 
+-#: ../panels/info/cc-info-panel.c:1589
++#: ../panels/info/cc-info-panel.c:1596
+ msgid "System Up-To-Date"
+ msgstr "கணிணி தற்காலப்படுத்தப்பட்டது"
+ 
+-#: ../panels/info/cc-info-panel.c:1593
++#: ../panels/info/cc-info-panel.c:1600
+ msgid "Checking for Updates"
+ msgstr "மேம்பாடுகளுக்கு சோதிக்கிறது..."
+ 
+@@ -1600,8 +1575,8 @@ msgid "Eject"
+ msgstr "வெளியேற்று"
+ 
+ #: ../panels/keyboard/01-input-sources.xml.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+-#: ../panels/universal-access/uap.ui.h:66
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
++#: ../panels/universal-access/uap.ui.h:11
+ msgid "Typing"
+ msgstr "உள்ளிடல் "
+ 
+@@ -1673,6 +1648,10 @@ msgstr "ஒரு சாரளத்தின் திரைவெட்டை
+ msgid "Copy a screenshot of an area to clipboard"
+ msgstr "ஒரு இடத்தின் திரைவெட்டை ஒட்டுப்பலகைக்கு நகல் எடுக்கவும்."
+ 
++#: ../panels/keyboard/01-screenshot.xml.in.h:11
++msgid "Record a short screencast"
++msgstr "ஒரு சிறிய திரைக்காட்சியைப் பதிவு செய்"
++
+ #: ../panels/keyboard/01-system.xml.in.h:1
+ msgid "System"
+ msgstr "கணினி"
+@@ -1722,20 +1701,39 @@ msgstr "உரை அளவை குறைவாக்குக"
+ msgid "High contrast on or off"
+ msgstr "உயர் மாறுபாடு செயலில் அல்லது செயல் நீங்கி"
+ 
+-#: ../panels/keyboard/cc-keyboard-option.c:362
++#. translators:
++#. * The device has been disabled
++#: ../panels/keyboard/cc-keyboard-option.c:271
++#: ../panels/keyboard/cc-keyboard-option.c:390
++#: ../panels/keyboard/keyboard-shortcuts.c:1159
++#: ../panels/network/network-wifi.ui.h:29
++#: ../panels/sound/gvc/gvc-mixer-control.c:1830
++#: ../panels/user-accounts/um-fingerprint-dialog.c:215
++#: ../panels/user-accounts/um-fingerprint-dialog.c:216
++msgid "Disabled"
++msgstr "முடக்கப்பட்டது"
++
++#. Translators: This key is also known as 'third level
++#. * chooser'. AltGr is often used for this purpose. See
++#. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
++#.
++#: ../panels/keyboard/cc-keyboard-option.c:349
+ msgid "Alternative Characters Key"
+ msgstr "மாற்று எழுத்துருக்கள் விசை"
+ 
+-#: ../panels/keyboard/cc-keyboard-option.c:367
++#. Translators: The Compose key is used to initiate key
++#. * sequences that are combined to form a single character.
++#. * See http://en.wikipedia.org/wiki/Compose_key
++#.
++#: ../panels/keyboard/cc-keyboard-option.c:358
+ msgid "Compose Key"
+ msgstr "உருவாக்க விசை"
+ 
+-#: ../panels/keyboard/cc-keyboard-option.c:371
++#: ../panels/keyboard/cc-keyboard-option.c:363
+ msgid "Modifiers-only switch to next source"
+ msgstr "மாற்றிகள்-அடுத்த மூலத்திற்கு மட்டும் மாற்றவும்"
+ 
+ #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Keyboard"
+ msgstr "விசைப்பலகை"
+ 
+@@ -1763,77 +1761,76 @@ msgstr "(_N) பெயர்:"
+ msgid "C_ommand:"
+ msgstr "(_o) கட்டளை:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+ msgid "Repeat Keys"
+ msgstr "மறுசெயல் விசைகள்"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+ msgid "Key presses _repeat when key is held down"
+ msgstr "அமுக்கப்படும்போது விசை மறுபடியும் அச்சிடப்படும்."
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+ msgid "_Delay:"
+ msgstr "(_D) தாமதம்:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+ msgid "_Speed:"
+ msgstr "(_S) வேகம்:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
+ msgctxt "keyboard, delay"
+ msgid "Short"
+ msgstr "குறுகிய"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+ msgctxt "keyboard, speed"
+ msgid "Slow"
+ msgstr "மெதுவாக"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+ msgid "Repeat keys speed"
+ msgstr "தொடரும் விசைகளின் வேகம்"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+ msgctxt "keyboard, delay"
+ msgid "Long"
+ msgstr "நீண்ட"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+ msgctxt "keyboard, speed"
+ msgid "Fast"
+ msgstr "வேகமான"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+ msgid "Cursor Blinking"
+ msgstr "நிலைக்காட்டி சிமிட்டும்"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+ msgid "Cursor _blinks in text fields"
+ msgstr "(_b) நிலைக்காட்டி உரை  உள்ளே சிமிட்டும்"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+ msgid "S_peed:"
+ msgstr "(_p) வேகம்:"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+ msgid "Cursor blink speed"
+ msgstr "நிலைகாட்டி சிமிட்டும் வேகம்"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+ #: ../panels/region/region.ui.h:5
+ msgid "Input Sources"
+ msgstr " உள்ளீட்டு மூலங்கள்"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+ msgid "Add Shortcut"
+ msgstr "குறுக்கு வழியை சேர்"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
+ msgid "Remove Shortcut"
+ msgstr "குறுக்கு வழியை நீக்கு"
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+-#: ../panels/wacom/button-mapping.ui.h:3
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
+ msgid ""
+ "To edit a shortcut, click the row and hold down the new keys or press "
+ "Backspace to clear."
+@@ -1841,7 +1838,7 @@ msgstr ""
+ "குறுவழியை திருத்த பொருத்தமான வரியில் சொடுக்கு.  மற்றும் புதிய விசைகளை உள்ளிடு "
+ "அல்லது  துப்புரவாக்க பின்னோக்கு  விசையை அழுத்துக ."
+ 
+-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
++#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+ msgid "Shortcuts"
+ msgstr "குறுக்கு வழிகள்"
+ 
+@@ -1885,10 +1882,14 @@ msgstr ""
+ msgid "_Reassign"
+ msgstr "(_R) மறுஇருத்து "
+ 
+-#: ../panels/mouse/cc-mouse-panel.c:123
++#: ../panels/mouse/cc-mouse-panel.c:95
+ msgid "Test Your _Settings"
+ msgstr "உங்களுடைய அமைவுகளை சோதிக்கவும் (_S)"
+ 
++#: ../panels/mouse/cc-mouse-panel.c:108
++msgid "Test Your Settings"
++msgstr "உங்கள் அமைவுகளை சோதிக்கவும்"
++
+ #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
+ msgid "Mouse & Touchpad"
+ msgstr "சொடுக்கி மற்றும் தொடுதிட்டு"
+@@ -1903,149 +1904,134 @@ msgstr ""
+ 
+ #. Translators: those are keywords for the mouse and touchpad control-center panel
+ #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4
+-msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;"
+-msgstr "தொடர்திட்டு;சுட்டி;சொடுக்கு;தட்டு;இரட்டை;மென்மேடு;தொடர்பந்து;"
++msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
++msgstr "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
+ 
+ #: ../panels/mouse/gnome-mouse-properties.ui.h:1
+-msgid "Mouse Preferences"
+-msgstr "சொடுக்கி பண்புகள்"
+-
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgid "General"
+ msgstr "பொது"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+-#| msgctxt "keyboard, speed"
+-#| msgid "Slow"
++#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+ msgctxt "double click, speed"
+ msgid "Slow"
+ msgstr "மெதுவாக"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
++#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+ msgid "Double-click timeout"
+ msgstr "இரட்டை சொடுக்கு நேரம் முடிந்தது"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+-#| msgctxt "keyboard, speed"
+-#| msgid "Fast"
++#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+ msgctxt "double click, speed"
+ msgid "Fast"
+ msgstr "வேகமாக"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
++#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+ msgid "_Double-click"
+ msgstr "(_D) இரட்டிப்பு சொடுக்கு:"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
++#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+ msgid "Primary _button"
+ msgstr "_b முதன்மை நிறம்"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
++#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+ msgctxt "mouse, left button as primary"
+ msgid "_Left"
+ msgstr "இடது (_L)"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
++#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+ msgctxt "mouse, right button as primary"
+ msgid "_Right"
+ msgstr "வலது (_R)"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
++#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+ msgid "Mouse"
+ msgstr "சொடுக்கி"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
++#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+ msgid "_Pointer speed"
+ msgstr "_P இட சுட்டி வேகம்"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+-#| msgctxt "keyboard, speed"
+-#| msgid "Slow"
++#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+ msgctxt "mouse pointer, speed"
+ msgid "Slow"
+ msgstr "மெதுவாக"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+-#| msgctxt "keyboard, speed"
+-#| msgid "Fast"
++#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+ msgctxt "mouse pointer, speed"
+ msgid "Fast"
+ msgstr "வேகமாக"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
++#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+ msgid "Touchpad"
+ msgstr "தொடுதிட்டு"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+-#| msgctxt "keyboard, speed"
+-#| msgid "Slow"
++#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+ msgctxt "touchpad pointer, speed"
+ msgid "Slow"
+ msgstr "மெதுவாக"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+-#| msgctxt "keyboard, speed"
+-#| msgid "Fast"
++#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+ msgctxt "touchpad pointer, speed"
+ msgid "Fast"
+ msgstr "வேகமாக"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
++#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+ msgid "Disable while _typing"
+ msgstr "(_t) தட்டச்சும்போது செயல்நீக்கு"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
++#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+ msgid "Tap to _click"
+ msgstr "_c சொடுக்க தட்டவும்"
+ 
+-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
++#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+ msgid "Two _finger scroll"
+ msgstr "(_f) இரு விரல்கள் உருளல்"
+ 
++#. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible.
+ #: ../panels/mouse/gnome-mouse-properties.ui.h:20
+-msgid "C_ontent sticks to fingers"
+-msgstr "_o உள்ளடக்கம் விரலுக்கு ஒட்டும்"
++msgid "_Natural scrolling"
++msgstr "இயல்பான உருளல் (_N)"
+ 
+-#: ../panels/mouse/gnome-mouse-test.c:134
++#: ../panels/mouse/gnome-mouse-test.c:132
+ #: ../panels/mouse/gnome-mouse-test.ui.h:1
+ msgid "Try clicking, double clicking, scrolling"
+ msgstr "சொடுக்கல். இரட்டை சொடுக்கல், உருளல் ஆகியவற்றை முயற்சிக்கவும்"
+ 
+-#: ../panels/mouse/gnome-mouse-test.c:139
++#: ../panels/mouse/gnome-mouse-test.c:137
+ msgid "Five clicks, GEGL time!"
+ msgstr "ஐந்து கிளிக்குகள், GEGL நேரம்!"
+ 
+-#: ../panels/mouse/gnome-mouse-test.c:144
++#: ../panels/mouse/gnome-mouse-test.c:142
+ msgid "Double click, primary button"
+ msgstr "இரட்டை சொடுக்கு, முதன்மை பொத்தான்"
+ 
+-#: ../panels/mouse/gnome-mouse-test.c:144
++#: ../panels/mouse/gnome-mouse-test.c:142
+ msgid "Single click, primary button"
+ msgstr "ஒற்றை சொடுக்கு, முதன்மை பொத்தான்"
+ 
+-#: ../panels/mouse/gnome-mouse-test.c:147
++#: ../panels/mouse/gnome-mouse-test.c:145
+ msgid "Double click, middle button"
+ msgstr "இரட்டை சொடுக்கு, நடு பொத்தான்"
+ 
+-#: ../panels/mouse/gnome-mouse-test.c:147
++#: ../panels/mouse/gnome-mouse-test.c:145
+ msgid "Single click, middle button"
+ msgstr "ஒற்றை சொடுக்கு, நடு பொத்தான்"
+ 
+-#: ../panels/mouse/gnome-mouse-test.c:150
++#: ../panels/mouse/gnome-mouse-test.c:148
+ msgid "Double click, secondary button"
+ msgstr "இரட்டை சொடுக்கு, இரண்டாம் பொத்தான்"
+ 
+-#: ../panels/mouse/gnome-mouse-test.c:150
++#: ../panels/mouse/gnome-mouse-test.c:148
+ msgid "Single click, secondary button"
+ msgstr "ஒற்றை சொடுக்கு, இரண்டாம் பொத்தான்"
+ 
+ #. TRANSLATORS: this is to disable the radio hardware in the
+ #. * network panel
+-#: ../panels/network/cc-network-panel.c:364
++#: ../panels/network/cc-network-panel.c:358
+ msgid "Air_plane Mode"
+ msgstr "_p விமானப்பாங்கு"
+ 
+-#: ../panels/network/cc-network-panel.c:927
++#: ../panels/network/cc-network-panel.c:930
+ msgid "Network proxy"
+ msgstr "வலையமைப்பு பிரதிநிதி."
+ 
+@@ -2053,14 +2039,14 @@ msgstr "வலையமைப்பு பிரதிநிதி."
+ #. * window for vpn connections, it is also used to display
+ #. * vpn connections in the device list.
+ #.
+-#: ../panels/network/cc-network-panel.c:1106 ../panels/network/net-vpn.c:284
+-#: ../panels/network/net-vpn.c:419
++#: ../panels/network/cc-network-panel.c:1109 ../panels/network/net-vpn.c:278
++#: ../panels/network/net-vpn.c:431
+ #, c-format
+ msgid "%s VPN"
+ msgstr "%s VPN"
+ 
+ #. TRANSLATORS: the user is running a NM that is not API compatible
+-#: ../panels/network/cc-network-panel.c:1241
++#: ../panels/network/cc-network-panel.c:1244
+ msgid "The system network services are not compatible with this version."
+ msgstr "இந்த பதிப்புடன் கணினி வலைப்பின்னல் சேவைகள் இசையவில்லை"
+ 
+@@ -2094,34 +2080,34 @@ msgstr "தானியங்கு"
+ 
+ #. TRANSLATORS: this WEP WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:52
+-#: ../panels/network/net-device-wifi.c:224
+-#: ../panels/network/net-device-wifi.c:385
++#: ../panels/network/net-device-wifi.c:216
++#: ../panels/network/net-device-wifi.c:377
+ msgid "WEP"
+ msgstr "WEP"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:56
+-#: ../panels/network/net-device-wifi.c:228
+-#: ../panels/network/net-device-wifi.c:390
++#: ../panels/network/net-device-wifi.c:220
++#: ../panels/network/net-device-wifi.c:382
+ #: ../panels/network/network-wifi.ui.h:17
+ msgid "WPA"
+ msgstr "WPA"
+ 
+ #. TRANSLATORS: this WPA WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:60
+-#: ../panels/network/net-device-wifi.c:232
++#: ../panels/network/net-device-wifi.c:224
+ msgid "WPA2"
+ msgstr "WPA2"
+ 
+ #. TRANSLATORS: this Enterprise WiFi security
+ #: ../panels/network/connection-editor/ce-page-details.c:65
+-#: ../panels/network/net-device-wifi.c:237
++#: ../panels/network/net-device-wifi.c:229
+ msgid "Enterprise"
+ msgstr "என்டர்ப்ரைஸ்"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:70
+-#: ../panels/network/net-device-wifi.c:242
+-#: ../panels/network/net-device-wifi.c:375
++#: ../panels/network/net-device-wifi.c:234
++#: ../panels/network/net-device-wifi.c:367
+ msgctxt "Wifi security"
+ msgid "None"
+ msgstr "ஏதுமில்லை"
+@@ -2132,18 +2118,18 @@ msgid "Never"
+ msgstr "ஒரு போதும் இல்லை"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:102
+-#: ../panels/user-accounts/um-utils.c:770
++#: ../panels/user-accounts/um-utils.c:803
+ msgid "Today"
+ msgstr "இன்று"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:104
+-#: ../panels/user-accounts/um-utils.c:773
++#: ../panels/user-accounts/um-utils.c:806
+ msgid "Yesterday"
+ msgstr "நேற்று"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:106
+-#: ../panels/network/net-device-ethernet.c:126
+-#: ../panels/network/net-device-wifi.c:479
++#: ../panels/network/net-device-ethernet.c:122
++#: ../panels/network/net-device-wifi.c:471
+ #, c-format
+ msgid "%i day ago"
+ msgid_plural "%i days ago"
+@@ -2152,38 +2138,38 @@ msgstr[1] "%i நாட்கள் முன்"
+ 
+ #. Translators: network device speed
+ #: ../panels/network/connection-editor/ce-page-details.c:155
+-#: ../panels/network/net-device-ethernet.c:54
+-#: ../panels/network/net-device-wifi.c:537
++#: ../panels/network/net-device-ethernet.c:53
++#: ../panels/network/net-device-wifi.c:528
+ #, c-format
+ msgid "%d Mb/s"
+ msgstr "%d Mb/s"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:181
+-#: ../panels/network/net-device-wifi.c:566
++#: ../panels/network/net-device-wifi.c:557
+ msgctxt "Signal strength"
+ msgid "None"
+ msgstr "ஏதுமில்லை"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:183
+-#: ../panels/network/net-device-wifi.c:568
++#: ../panels/network/net-device-wifi.c:559
+ msgctxt "Signal strength"
+ msgid "Weak"
+ msgstr "வலுவற்றது"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:185
+-#: ../panels/network/net-device-wifi.c:570
++#: ../panels/network/net-device-wifi.c:561
+ msgctxt "Signal strength"
+ msgid "Ok"
+ msgstr "சரி"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:187
+-#: ../panels/network/net-device-wifi.c:572
++#: ../panels/network/net-device-wifi.c:563
+ msgctxt "Signal strength"
+ msgid "Good"
+ msgstr "நன்று"
+ 
+ #: ../panels/network/connection-editor/ce-page-details.c:189
+-#: ../panels/network/net-device-wifi.c:574
++#: ../panels/network/net-device-wifi.c:565
+ msgctxt "Signal strength"
+ msgid "Excellent"
+ msgstr "மிக நன்று"
+@@ -2195,78 +2181,78 @@ msgstr "மிக நன்று"
+ msgid "Identity"
+ msgstr "அடையாளம்"
+ 
+-#: ../panels/network/connection-editor/ce-page-ip4.c:202
+-#: ../panels/network/connection-editor/ce-page-ip4.c:454
++#: ../panels/network/connection-editor/ce-page-ip4.c:207
++#: ../panels/network/connection-editor/ce-page-ip4.c:469
+ msgid "Netmask"
+ msgstr "நெட்மாஸ்க்"
+ 
+-#: ../panels/network/connection-editor/ce-page-ip4.c:216
+-#: ../panels/network/connection-editor/ce-page-ip4.c:467
+-#: ../panels/network/connection-editor/ce-page-ip6.c:217
+-#: ../panels/network/connection-editor/ce-page-ip6.c:475
++#: ../panels/network/connection-editor/ce-page-ip4.c:221
++#: ../panels/network/connection-editor/ce-page-ip4.c:482
++#: ../panels/network/connection-editor/ce-page-ip6.c:222
++#: ../panels/network/connection-editor/ce-page-ip6.c:490
+ #: ../panels/network/network-vpn.ui.h:3
+ msgid "Gateway"
+ msgstr "நுழைவாயில்"
+ 
+-#: ../panels/network/connection-editor/ce-page-ip4.c:233
+-#: ../panels/network/connection-editor/ce-page-ip6.c:234
++#: ../panels/network/connection-editor/ce-page-ip4.c:238
++#: ../panels/network/connection-editor/ce-page-ip6.c:239
+ msgid "Delete Address"
+ msgstr "முகவரியை அழிக்கவும்"
+ 
+-#: ../panels/network/connection-editor/ce-page-ip4.c:285
+-#: ../panels/network/connection-editor/ce-page-ip6.c:286
++#: ../panels/network/connection-editor/ce-page-ip4.c:292
++#: ../panels/network/connection-editor/ce-page-ip6.c:293
+ msgid "Add"
+ msgstr "சேர்க்க"
+ 
+-#: ../panels/network/connection-editor/ce-page-ip4.c:350
+-#: ../panels/network/connection-editor/ce-page-ip6.c:354
++#: ../panels/network/connection-editor/ce-page-ip4.c:360
++#: ../panels/network/connection-editor/ce-page-ip6.c:364
+ msgid "Server"
+ msgstr "சேவையகம்"
+ 
+-#: ../panels/network/connection-editor/ce-page-ip4.c:367
+-#: ../panels/network/connection-editor/ce-page-ip6.c:371
++#: ../panels/network/connection-editor/ce-page-ip4.c:377
++#: ../panels/network/connection-editor/ce-page-ip6.c:381
+ msgid "Delete DNS Server"
+ msgstr "DNS சேவையகத்தை அழி"
+ 
+ #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
+-#: ../panels/network/connection-editor/ce-page-ip4.c:481
+-#: ../panels/network/connection-editor/ce-page-ip6.c:489
++#: ../panels/network/connection-editor/ce-page-ip4.c:496
++#: ../panels/network/connection-editor/ce-page-ip6.c:504
+ msgctxt "network parameters"
+ msgid "Metric"
+ msgstr "மெட்ரிக்"
+ 
+-#: ../panels/network/connection-editor/ce-page-ip4.c:502
+-#: ../panels/network/connection-editor/ce-page-ip6.c:510
++#: ../panels/network/connection-editor/ce-page-ip4.c:517
++#: ../panels/network/connection-editor/ce-page-ip6.c:525
+ msgid "Delete Route"
+ msgstr "பாதையை அழிக்கவும்"
+ 
+-#: ../panels/network/connection-editor/ce-page-ip4.c:616
++#: ../panels/network/connection-editor/ce-page-ip4.c:632
+ #: ../panels/network/network-wifi.ui.h:25
+ msgid "Automatic (DHCP)"
+ msgstr "தானியங்கு (DHCP)"
+ 
+-#: ../panels/network/connection-editor/ce-page-ip4.c:620
+-#: ../panels/network/connection-editor/ce-page-ip6.c:622
++#: ../panels/network/connection-editor/ce-page-ip4.c:636
++#: ../panels/network/connection-editor/ce-page-ip6.c:638
+ #: ../panels/network/network-wifi.ui.h:24
+ msgid "Manual"
+ msgstr "கைமுறை"
+ 
+-#: ../panels/network/connection-editor/ce-page-ip4.c:624
+-#: ../panels/network/connection-editor/ce-page-ip6.c:626
++#: ../panels/network/connection-editor/ce-page-ip4.c:640
++#: ../panels/network/connection-editor/ce-page-ip6.c:642
+ msgid "Link-Local Only"
+ msgstr "இணைப்பு-உள்ளமை மட்டும்"
+ 
+-#: ../panels/network/connection-editor/ce-page-ip4.c:925
++#: ../panels/network/connection-editor/ce-page-ip4.c:942
+ #: ../panels/network/network-wifi.ui.h:46
+ msgid "IPv4"
+ msgstr "IPv4"
+ 
+-#: ../panels/network/connection-editor/ce-page-ip6.c:204
+-#: ../panels/network/connection-editor/ce-page-ip6.c:458
++#: ../panels/network/connection-editor/ce-page-ip6.c:209
++#: ../panels/network/connection-editor/ce-page-ip6.c:473
+ msgid "Prefix"
+ msgstr "முன்னொட்டு"
+ 
+-#: ../panels/network/connection-editor/ce-page-ip6.c:614
++#: ../panels/network/connection-editor/ce-page-ip6.c:630
+ #: ../panels/network/connection-editor/ethernet-page.ui.h:1
+ #: ../panels/network/connection-editor/ip4-page.ui.h:4
+ #: ../panels/network/connection-editor/ip6-page.ui.h:4
+@@ -2274,11 +2260,11 @@ msgstr "முன்னொட்டு"
+ msgid "Automatic"
+ msgstr "தானியங்கு"
+ 
+-#: ../panels/network/connection-editor/ce-page-ip6.c:618
++#: ../panels/network/connection-editor/ce-page-ip6.c:634
+ msgid "Automatic, DHCP only"
+ msgstr "தானியங்கு, DHCP மட்டும்"
+ 
+-#: ../panels/network/connection-editor/ce-page-ip6.c:886
++#: ../panels/network/connection-editor/ce-page-ip6.c:902
+ #: ../panels/network/network-wifi.ui.h:47
+ msgid "IPv6"
+ msgstr "IPv6"
+@@ -2318,10 +2304,6 @@ msgstr "WPA & WPA2 தனிப்பட்ட"
+ msgid "WPA & WPA2 Enterprise"
+ msgstr "WPA & WPA2 கடவுச்சொல்"
+ 
+-#: ../panels/network/connection-editor/connection-editor.ui.h:1
+-msgid "_Apply"
+-msgstr "செயல்படுத்து (_A)"
+-
+ #: ../panels/network/connection-editor/details-page.ui.h:1
+ #: ../panels/network/network-wifi.ui.h:2
+ msgid "Signal Strength"
+@@ -2333,15 +2315,15 @@ msgid "Link speed"
+ msgstr "இணைப்பு வேகம்"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:4
+-#: ../panels/network/net-device-ethernet.c:159
++#: ../panels/network/net-device-ethernet.c:155
+ #: ../panels/network/network-simple.ui.h:3
+ #: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
+ msgid "IPv4 Address"
+ msgstr "IPv4 முகவரி"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:5
++#: ../panels/network/net-device-ethernet.c:156
+ #: ../panels/network/net-device-ethernet.c:160
+-#: ../panels/network/net-device-ethernet.c:164
+ #: ../panels/network/network-mobile.ui.h:4
+ #: ../panels/network/network-simple.ui.h:4
+ #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
+@@ -2349,14 +2331,14 @@ msgid "IPv6 Address"
+ msgstr "IPv6 முகவரி"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:6
+-#: ../panels/network/net-device-ethernet.c:167
++#: ../panels/network/net-device-ethernet.c:163
+ #: ../panels/network/network-simple.ui.h:2
+ #: ../panels/network/network-wifi.ui.h:7
+ msgid "Hardware Address"
+ msgstr "வன்பொருள் முகவரி"
+ 
+ #: ../panels/network/connection-editor/details-page.ui.h:7
+-#: ../panels/network/net-device-ethernet.c:171
++#: ../panels/network/net-device-ethernet.c:167
+ #: ../panels/network/network-mobile.ui.h:5
+ #: ../panels/network/network-simple.ui.h:5
+ #: ../panels/network/network-wifi.ui.h:8
+@@ -2366,7 +2348,7 @@ msgstr "முன்னிருப்பு வழி:"
+ #: ../panels/network/connection-editor/details-page.ui.h:8
+ #: ../panels/network/connection-editor/ip4-page.ui.h:3
+ #: ../panels/network/connection-editor/ip6-page.ui.h:3
+-#: ../panels/network/net-device-ethernet.c:173
++#: ../panels/network/net-device-ethernet.c:169
+ #: ../panels/network/network-mobile.ui.h:6
+ #: ../panels/network/network-simple.ui.h:6
+ #: ../panels/network/network-wifi.ui.h:9
+@@ -2508,36 +2490,36 @@ msgstr "புதிய சுயவிவரம்"
+ 
+ #: ../panels/network/connection-editor/net-connection-editor.c:511
+ #: ../panels/printers/new-printer-dialog.ui.h:3
+-#: ../panels/user-accounts/um-account-dialog.c:1072
++#: ../panels/user-accounts/um-account-dialog.c:1471
+ msgid "_Add"
+ msgstr "சேர் (_A)"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:593
+-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
++#: ../panels/network/connection-editor/net-connection-editor.c:595
++#: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
+ msgid "VPN"
+ msgstr "VPN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:594
++#: ../panels/network/connection-editor/net-connection-editor.c:596
+ msgid "Bond"
+ msgstr "பிணைப்பு"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:595
++#: ../panels/network/connection-editor/net-connection-editor.c:597
+ msgid "Bridge"
+ msgstr "பிரிட்ஜ்"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:596
++#: ../panels/network/connection-editor/net-connection-editor.c:598
+ msgid "VLAN"
+ msgstr "VLAN"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:746
++#: ../panels/network/connection-editor/net-connection-editor.c:749
+ msgid "Could not load VPN plugins"
+ msgstr "VPN செருகுநிரல்களை ஏற்ற முடியவில்லை"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:810
++#: ../panels/network/connection-editor/net-connection-editor.c:818
+ msgid "Import from file…"
+ msgstr "கோப்பிலிருந்து இறக்கவும்…"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:877
++#: ../panels/network/connection-editor/net-connection-editor.c:889
+ msgid "Add Network Connection"
+ msgstr "பிணைய இணைப்பைச் சேர்"
+ 
+@@ -2547,7 +2529,7 @@ msgid "_Reset"
+ msgstr "மீட்டமை (_R)"
+ 
+ #: ../panels/network/connection-editor/reset-page.ui.h:2
+-#: ../panels/network/net-device-wifi.c:1411
++#: ../panels/network/net-device-wifi.c:1403
+ #: ../panels/network/network-wifi.ui.h:40
+ msgid "_Forget"
+ msgstr "மற (_F)"
+@@ -2596,6 +2578,13 @@ msgstr ""
+ msgid "Select file to import"
+ msgstr "இறக்க கோப்பை தேர்ந்தெடுக்கவும்"
+ 
++#: ../panels/network/connection-editor/vpn-helpers.c:246
++#: ../panels/printers/cc-printers-panel.c:1947
++#: ../panels/sharing/cc-sharing-panel.c:426
++#: ../panels/user-accounts/um-photo-dialog.c:222
++msgid "_Open"
++msgstr "திற (_O)"
++
+ #: ../panels/network/connection-editor/vpn-helpers.c:294
+ #, c-format
+ msgid "A file named \"%s\" already exists."
+@@ -2663,8 +2652,6 @@ msgstr "நீங்கள் எப்படி இணையத்துடன
+ 
+ #. Translators: those are keywords for the network control-center panel
+ #: ../panels/network/gnome-network-panel.desktop.in.in.h:4
+-#| msgid ""
+-#| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+ msgid ""
+ "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
+ "vlan;bridge;bond;"
+@@ -2680,29 +2667,29 @@ msgstr "பிணைப்பு அடிமைகள்"
+ msgid "Bridge slaves"
+ msgstr "பிரிட்ஜ் அடிமைகள்"
+ 
+-#: ../panels/network/net-device-ethernet.c:112
+-#: ../panels/network/net-device-wifi.c:465
++#: ../panels/network/net-device-ethernet.c:108
++#: ../panels/network/net-device-wifi.c:457
+ msgid "never"
+ msgstr "ஒரு போதும் இல்லை"
+ 
+-#: ../panels/network/net-device-ethernet.c:122
+-#: ../panels/network/net-device-wifi.c:475
++#: ../panels/network/net-device-ethernet.c:118
++#: ../panels/network/net-device-wifi.c:467
+ msgid "today"
+ msgstr "இன்று"
+ 
+-#: ../panels/network/net-device-ethernet.c:124
+-#: ../panels/network/net-device-wifi.c:477
++#: ../panels/network/net-device-ethernet.c:120
++#: ../panels/network/net-device-wifi.c:469
+ msgid "yesterday"
+ msgstr "நேற்று"
+ 
+-#: ../panels/network/net-device-ethernet.c:162
++#: ../panels/network/net-device-ethernet.c:158
+ #: ../panels/network/network-mobile.ui.h:3
+ #: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
+ #: ../panels/printers/printers.ui.h:13
+ msgid "IP Address"
+ msgstr "IP முகவரி"
+ 
+-#: ../panels/network/net-device-ethernet.c:178
++#: ../panels/network/net-device-ethernet.c:174
+ #: ../panels/network/network-wifi.ui.h:10
+ msgid "Last used"
+ msgstr "கடைசியில் பயன்படுத்தப்பட்டது"
+@@ -2712,31 +2699,31 @@ msgstr "கடைசியில் பயன்படுத்தப்பட
+ #. * profile. It is also used to display ethernet in the
+ #. * device list.
+ #.
+-#: ../panels/network/net-device-ethernet.c:288
++#: ../panels/network/net-device-ethernet.c:284
+ #: ../panels/network/network-ethernet.ui.h:1
+ #: ../panels/network/network-simple.ui.h:1
+ msgid "Wired"
+ msgstr "ஒயர்டு"
+ 
+-#: ../panels/network/net-device-ethernet.c:356
+-#: ../panels/network/net-device-wifi.c:1549
++#: ../panels/network/net-device-ethernet.c:352
++#: ../panels/network/net-device-wifi.c:1558
+ #: ../panels/network/network-ethernet.ui.h:3
+ #: ../panels/network/network-mobile.ui.h:8
+ #: ../panels/network/network-simple.ui.h:8
+-#: ../panels/network/network-vpn.ui.h:8 ../panels/universal-access/uap.ui.h:23
++#: ../panels/network/network-vpn.ui.h:8
+ msgid "Options…"
+ msgstr "விருப்பங்கள்…"
+ 
+-#: ../panels/network/net-device-ethernet.c:491
++#: ../panels/network/net-device-ethernet.c:489
+ #, c-format
+ msgid "Profile %d"
+ msgstr "சுயவிவரம் %d"
+ 
+-#: ../panels/network/net-device-mobile.c:239
++#: ../panels/network/net-device-mobile.c:232
+ msgid "Add new connection"
+ msgstr "புதிய இணைப்பு சேர்"
+ 
+-#: ../panels/network/net-device-wifi.c:1120
++#: ../panels/network/net-device-wifi.c:1110
+ msgid ""
+ "If you have a connection to the Internet other than wireless, you can set up "
+ "a wireless hotspot to share the connection with others."
+@@ -2745,13 +2732,13 @@ msgstr ""
+ "பகிர்ந்துகொள்ள "
+ "நீங்கள் ஒரு வயர்லெஸ் ஹாட்ஸ்பாட்டை அமைத்துப் பயன்படுத்தலாம்."
+ 
+-#: ../panels/network/net-device-wifi.c:1124
++#: ../panels/network/net-device-wifi.c:1114
+ #, c-format
+ msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+ msgstr ""
+ "கம்பியில்லா வட்டத்துக்கு மாறுவது <b>%s</b> யிலிருந்ஹ்டு உங்களை துண்டிக்கும்."
+ 
+-#: ../panels/network/net-device-wifi.c:1128
++#: ../panels/network/net-device-wifi.c:1118
+ msgid ""
+ "It is not possible to access the Internet through your wireless while the "
+ "hotspot is active."
+@@ -2760,23 +2747,23 @@ msgstr ""
+ "நீங்கள் பிணையத்தை "
+ "அணுக இயலாது."
+ 
+-#: ../panels/network/net-device-wifi.c:1202
++#: ../panels/network/net-device-wifi.c:1192
+ msgid "Stop hotspot and disconnect any users?"
+ msgstr "செயலிடத்தை நிறுத்தி பயனர்களை இணைப்பு நீக்கவா?"
+ 
+-#: ../panels/network/net-device-wifi.c:1205
++#: ../panels/network/net-device-wifi.c:1195
+ msgid "_Stop Hotspot"
+ msgstr "_S செயலிடத்தை நிறுத்து"
+ 
+-#: ../panels/network/net-device-wifi.c:1277
++#: ../panels/network/net-device-wifi.c:1267
+ msgid "System policy prohibits use as a Hotspot"
+ msgstr "ஹாட்ஸ்பாட்டாக பயன்படுத்துவதை கணினி கொள்கை தடைசெய்கிறது"
+ 
+-#: ../panels/network/net-device-wifi.c:1280
++#: ../panels/network/net-device-wifi.c:1270
+ msgid "Wireless device does not support Hotspot mode"
+ msgstr "வயர்லெஸ் சாதனம் ஹாட்ஸ்பாட் பயன்முறையை ஆதரிக்கவில்லை"
+ 
+-#: ../panels/network/net-device-wifi.c:1407
++#: ../panels/network/net-device-wifi.c:1399
+ msgid ""
+ "Network details for the selected networks, including passwords and any "
+ "custom configuration will be lost."
+@@ -2785,13 +2772,19 @@ msgstr ""
+ "அமைவாக்கங்கள் உட்பட அனைத்து "
+ "விவரங்களும் இழக்கப்படும்."
+ 
+-#: ../panels/network/net-device-wifi.c:1712
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
++#: ../panels/network/net-device-wifi.c:1726
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+ msgid "History"
+ msgstr "வரலாறு"
+ 
++#: ../panels/network/net-device-wifi.c:1730 ../panels/power/power.ui.h:21
++#: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596
++#: ../panels/wacom/cc-wacom-page.c:534
++msgid "_Close"
++msgstr "மூடு (_C)"
++
+ #. translators: This is the label for the "Forget wireless network" functionality
+-#: ../panels/network/net-device-wifi.c:1724
++#: ../panels/network/net-device-wifi.c:1738
+ msgctxt "Wi-Fi Network"
+ msgid "_Forget"
+ msgstr "மற (_F)"
+@@ -2811,7 +2804,7 @@ msgstr ""
+ msgid "This is not recommended for untrusted public networks."
+ msgstr "நம்பகமில்லாத பொது வலைப்பின்னல்களுக்கு இதை பரிந்துரைக்கவில்லை"
+ 
+-#: ../panels/network/net-proxy.c:408
++#: ../panels/network/net-proxy.c:410
+ msgid "Proxy"
+ msgstr "பதிலாள்"
+ 
+@@ -2827,17 +2820,17 @@ msgstr "IMEI"
+ msgid "Provider"
+ msgstr "வழங்குபவர்"
+ 
+-#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
++#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:2
+ msgctxt "proxy method"
+ msgid "None"
+ msgstr "எதுவுமில்லை"
+ 
+-#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
++#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:3
+ msgctxt "proxy method"
+ msgid "Manual"
+ msgstr "கைமுறை"
+ 
+-#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
++#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:4
+ msgctxt "proxy method"
+ msgid "Automatic"
+ msgstr "தானியங்கி"
+@@ -2890,19 +2883,7 @@ msgstr "Socks ப்ராக்ஸி முனையம்"
+ msgid "Turn device off"
+ msgstr "சாதனத்தை ஆஃப் செய்"
+ 
+-#: ../panels/network/network.ui.h:1
+-msgid "Select the interface to use for the new service"
+-msgstr "புதிய சேவைக்கு இடைமுகத்தை தேர்ந்தெடு"
+-
+-#: ../panels/network/network.ui.h:2
+-msgid "C_reate…"
+-msgstr "உருவாக்கு... (_r)"
+-
+-#: ../panels/network/network.ui.h:3
+-msgid "_Interface"
+-msgstr "_I இடைமுகம்"
+-
+-#: ../panels/network/network.ui.h:8
++#: ../panels/network/network.ui.h:5
+ msgid "Add Device"
+ msgstr "சாதனத்தை சேர் "
+ 
+@@ -2940,13 +2921,12 @@ msgstr "விவரங்கள்"
+ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2
+ #: ../panels/network/wireless-security/ws-leap.ui.h:2
+ #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
+-#: ../panels/user-accounts/data/account-dialog.ui.h:11
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
++#: ../panels/user-accounts/data/account-dialog.ui.h:9
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+ msgid "_Password"
+ msgstr "கடவுச்சொல் (_P)"
+ 
+ #: ../panels/network/network-wifi.ui.h:18
+-#: ../panels/universal-access/uap.ui.h:8
+ msgid "None"
+ msgstr "ஏதுமில்லை"
+ 
+@@ -3442,7 +3422,7 @@ msgstr "இரண்டும்"
+ #: ../panels/network/wireless-security/eap-method-leap.ui.h:1
+ #: ../panels/network/wireless-security/eap-method-simple.ui.h:1
+ #: ../panels/network/wireless-security/ws-leap.ui.h:1
+-#: ../panels/user-accounts/data/account-dialog.ui.h:6
++#: ../panels/user-accounts/data/account-dialog.ui.h:3
+ msgid "_Username"
+ msgstr "(_U) பயனர் பெயர்:"
+ 
+@@ -3643,20 +3623,16 @@ msgctxt "notifications"
+ msgid "Show Details in Lock Screen"
+ msgstr "திரைப்பூட்டில் விவரங்களைக் காண்பி"
+ 
+-#: ../panels/notifications/cc-notifications-panel.c:203
+-#: ../panels/power/cc-power-panel.c:1637 ../panels/power/cc-power-panel.c:1644
+-#: ../panels/privacy/cc-privacy-panel.c:78
+-#: ../panels/privacy/cc-privacy-panel.c:145
++#: ../panels/notifications/cc-notifications-panel.c:205
++#: ../panels/power/cc-power-panel.c:1744 ../panels/power/cc-power-panel.c:1751
++#: ../panels/privacy/cc-privacy-panel.c:80
++#: ../panels/privacy/cc-privacy-panel.c:120
++#: ../panels/universal-access/cc-ua-panel.c:257
++#: ../panels/universal-access/cc-ua-panel.c:597
++#: ../panels/universal-access/cc-ua-panel.c:722
+ msgid "On"
+ msgstr "ஆன்"
+ 
+-#: ../panels/notifications/cc-notifications-panel.c:203
+-#: ../panels/power/cc-power-panel.c:1631 ../panels/power/cc-power-panel.c:1642
+-#: ../panels/privacy/cc-privacy-panel.c:78
+-#: ../panels/privacy/cc-privacy-panel.c:145
+-msgid "Off"
+-msgstr "ஆஃப்"
+-
+ #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
+ msgid "Notifications"
+ msgstr "அறிவிப்புகள்"
+@@ -3681,27 +3657,30 @@ msgstr "மேலெழு பதாகைகளைக் காண்பி"
+ msgid "Show in Lock Screen"
+ msgstr "திரைப்பூட்டில் காண்பி"
+ 
+-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:191
+-#: ../panels/region/cc-input-chooser.c:1073
+-#: ../panels/search/cc-search-locations-dialog.c:480
++#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:200
++msgctxt "Online Account"
+ msgid "Other"
+ msgstr "மற்றவை"
+ 
+ #. translators: This is the title of the "Add Account" dialog.
+-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:292
++#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:318
+ #: ../panels/online-accounts/online-accounts.ui.h:2
+ msgid "Add Account"
+ msgstr "கணக்கு சேர்"
+ 
+-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:331
++#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:357
+ msgid "Mail"
+ msgstr "மின்னஞ்சல்"
+ 
+-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:337
++#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:363
+ msgid "Contacts"
+ msgstr "தொடர்புகள்"
+ 
+-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:343
++#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:369
++msgid "Chat"
++msgstr "அரட்டை"
++
++#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:375
+ msgid "Resources"
+ msgstr "வளங்கள்"
+ 
+@@ -3709,38 +3688,34 @@ msgstr "வளங்கள்"
+ msgid "Error logging into the account"
+ msgstr "கணக்குக்குள் நுழைவதில் பிழை"
+ 
+-#: ../panels/online-accounts/cc-online-accounts-panel.c:497
++#: ../panels/online-accounts/cc-online-accounts-panel.c:495
+ msgid "Credentials have expired."
+ msgstr "சான்றளிப்புகள் காலாவதியாகிவிட்டன."
+ 
+-#: ../panels/online-accounts/cc-online-accounts-panel.c:501
++#: ../panels/online-accounts/cc-online-accounts-panel.c:499
+ msgid "Sign in to enable this account."
+ msgstr "இந்தக் கணக்கை செயல்படுத்த உள்நுழையவும்."
+ 
+-#: ../panels/online-accounts/cc-online-accounts-panel.c:506
++#: ../panels/online-accounts/cc-online-accounts-panel.c:504
+ msgid "_Sign In"
+ msgstr "உள்நுழை (_S)"
+ 
+-#: ../panels/online-accounts/cc-online-accounts-panel.c:747
++#: ../panels/online-accounts/cc-online-accounts-panel.c:745
+ msgid "Error creating account"
+ msgstr "கணக்கை உருவாக்குவதில் பிழை"
+ 
+-#: ../panels/online-accounts/cc-online-accounts-panel.c:787
++#: ../panels/online-accounts/cc-online-accounts-panel.c:805
+ msgid "Error removing account"
+ msgstr "கணக்கை நீக்குவதில் பிழை"
+ 
+-#: ../panels/online-accounts/cc-online-accounts-panel.c:823
++#: ../panels/online-accounts/cc-online-accounts-panel.c:841
+ msgid "Are you sure you want to remove the account?"
+ msgstr "கணக்கை அவசியம்  நீக்க உறுதியாக உள்ளீரா?"
+ 
+-#: ../panels/online-accounts/cc-online-accounts-panel.c:825
++#: ../panels/online-accounts/cc-online-accounts-panel.c:843
+ msgid "This will not remove the account on the server."
+ msgstr "இது சேவையகத்தில் கணக்கை நீக்காது."
+ 
+-#: ../panels/online-accounts/cc-online-accounts-panel.c:826
+-msgid "_Remove"
+-msgstr "நீக்கு (_R)"
+-
+ #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1
+ msgid "Online Accounts"
+ msgstr "ஆன் லைன்  கணக்குகள்"
+@@ -3753,11 +3728,12 @@ msgstr ""
+ 
+ #. Translators: those are keywords for the online-accounts control-center panel
+ #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
+-#| msgid "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
+ msgid ""
+ "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
++"Kerberos;IMAP;SMTP;"
+ msgstr ""
+ "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
++"Kerberos;IMAP;SMTP;"
+ 
+ #: ../panels/online-accounts/online-accounts.ui.h:1
+ msgid "No online accounts configured"
+@@ -3780,18 +3756,18 @@ msgstr ""
+ "தொடர்புகள், நாட்காட்டி, "
+ "அரட்டை மேலும் பலவற்றை அணுக அனுமதிக்கும்."
+ 
+-#: ../panels/power/cc-power-panel.c:184
++#: ../panels/power/cc-power-panel.c:189
+ msgid "Unknown time"
+ msgstr "தெரியாத நேரம்"
+ 
+-#: ../panels/power/cc-power-panel.c:190
++#: ../panels/power/cc-power-panel.c:195
+ #, c-format
+ msgid "%i minute"
+ msgid_plural "%i minutes"
+ msgstr[0] "%i நிமிடம்"
+ msgstr[1] "%i நிமிடங்கள்"
+ 
+-#: ../panels/power/cc-power-panel.c:202
++#: ../panels/power/cc-power-panel.c:207
+ #, c-format
+ msgid "%i hour"
+ msgid_plural "%i hours"
+@@ -3800,227 +3776,226 @@ msgstr[1] "%i மணிநேரங்கள்"
+ 
+ #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
+ #. * Swap order with "%2$s %2$i %1$s %1$i if needed
+-#: ../panels/power/cc-power-panel.c:210
++#: ../panels/power/cc-power-panel.c:215
+ #, c-format
+ msgid "%i %s %i %s"
+ msgstr "%i %s %i %s"
+ 
+-#: ../panels/power/cc-power-panel.c:211
++#: ../panels/power/cc-power-panel.c:216
+ msgid "hour"
+ msgid_plural "hours"
+ msgstr[0] "மணி"
+ msgstr[1] "மணிகள்"
+ 
+-#: ../panels/power/cc-power-panel.c:212
++#: ../panels/power/cc-power-panel.c:217
+ msgid "minute"
+ msgid_plural "minutes"
+ msgstr[0] "நிமிடம்"
+ msgstr[1] "நிமிடங்கள்"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:231
++#: ../panels/power/cc-power-panel.c:236
+ #, c-format
+ msgid "%s until fully charged"
+ msgstr "%s முழுவதும் சார்ஜ் செய்யப்படும் வரை"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:238
++#: ../panels/power/cc-power-panel.c:243
+ #, c-format
+ msgid "Caution: %s remaining"
+ msgstr "எச்சரிக்கை: %s மீதமுள்ளது"
+ 
+ #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+-#: ../panels/power/cc-power-panel.c:243
++#: ../panels/power/cc-power-panel.c:248
+ #, c-format
+ msgid "%s remaining"
+ msgstr "%s மீதமுள்ளது"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:248 ../panels/power/cc-power-panel.c:276
++#: ../panels/power/cc-power-panel.c:253 ../panels/power/cc-power-panel.c:281
+ msgid "Fully charged"
+ msgstr "முழுதும் சார்ஜ் செய்யப்பட்டது"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:252 ../panels/power/cc-power-panel.c:280
++#: ../panels/power/cc-power-panel.c:257 ../panels/power/cc-power-panel.c:285
+ msgid "Empty"
+ msgstr "வெற்று"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:267
++#: ../panels/power/cc-power-panel.c:272
+ msgid "Charging"
+ msgstr "மின் சக்தி ஏற்றம் ஆகிறது"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:272
++#: ../panels/power/cc-power-panel.c:277
+ msgid "Discharging"
+ msgstr "சக்தி இறங்குகிறது"
+ 
+-#: ../panels/power/cc-power-panel.c:324
+-#, c-format
+-msgid "Estimated battery capacity: %s"
+-msgstr "கணக்கிடப்பட்ட பேட்டரி திறன்: %s"
+-
+-#: ../panels/power/cc-power-panel.c:404
++#: ../panels/power/cc-power-panel.c:395
+ msgctxt "Battery name"
+ msgid "Main"
+ msgstr "முதன்மை"
+ 
+-#: ../panels/power/cc-power-panel.c:406
++#: ../panels/power/cc-power-panel.c:397
+ msgctxt "Battery name"
+ msgid "Extra"
+ msgstr "கூடுதல்"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:493
++#: ../panels/power/cc-power-panel.c:469
+ msgid "Wireless mouse"
+ msgstr "கம்பியில்லா சொடுக்கி"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:497
++#: ../panels/power/cc-power-panel.c:472
+ msgid "Wireless keyboard"
+ msgstr "கம்பியில்லா விசைப்பலகை"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:501
++#: ../panels/power/cc-power-panel.c:475
+ msgid "Uninterruptible power supply"
+ msgstr "தடையில்லா மின்சாரம்"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:506
++#: ../panels/power/cc-power-panel.c:478
+ msgid "Personal digital assistant"
+ msgstr "அந்தரங்க இரும உதவியாளர்"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:510
++#: ../panels/power/cc-power-panel.c:481
+ msgid "Cellphone"
+ msgstr "அலைபேசி"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:514
++#: ../panels/power/cc-power-panel.c:484
+ msgid "Media player"
+ msgstr "இசை இயக்கி"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:518
++#: ../panels/power/cc-power-panel.c:487
+ msgid "Tablet"
+ msgstr "தொடுபலகை"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:522
++#: ../panels/power/cc-power-panel.c:490
+ msgid "Computer"
+ msgstr "கணினி"
+ 
+ #. TRANSLATORS: secondary battery, misc
+-#: ../panels/power/cc-power-panel.c:526 ../panels/power/cc-power-panel.c:734
+-#: ../panels/power/cc-power-panel.c:1938
++#: ../panels/power/cc-power-panel.c:493 ../panels/power/cc-power-panel.c:740
++#: ../panels/power/cc-power-panel.c:2075
+ msgid "Battery"
+ msgstr "மின்கலம்"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:535
++#: ../panels/power/cc-power-panel.c:539
+ msgctxt "Battery power"
+ msgid "Charging"
+ msgstr "மின் சக்தி ஏற்றம் ஆகிறது"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:542
++#: ../panels/power/cc-power-panel.c:546
+ msgctxt "Battery power"
+ msgid "Caution"
+ msgstr "எச்சரிக்கை"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:547
++#: ../panels/power/cc-power-panel.c:551
+ msgctxt "Battery power"
+ msgid "Low"
+ msgstr "குறைவான"
+ 
+ #. TRANSLATORS: secondary battery
+-#: ../panels/power/cc-power-panel.c:552
++#: ../panels/power/cc-power-panel.c:556
+ msgctxt "Battery power"
+ msgid "Good"
+ msgstr "நன்று"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:557
++#: ../panels/power/cc-power-panel.c:561
+ msgctxt "Battery power"
+ msgid "Fully charged"
+ msgstr "முழுதும் சார்ஜ் செய்யப்பட்டது"
+ 
+ #. TRANSLATORS: primary battery
+-#: ../panels/power/cc-power-panel.c:561
++#: ../panels/power/cc-power-panel.c:565
+ msgctxt "Battery power"
+ msgid "Empty"
+ msgstr "வெற்று"
+ 
+-#: ../panels/power/cc-power-panel.c:732
++#: ../panels/power/cc-power-panel.c:738
+ msgid "Batteries"
+ msgstr "பேட்டரிகள்"
+ 
+-#: ../panels/power/cc-power-panel.c:1074
++#: ../panels/power/cc-power-panel.c:1144
+ msgid "When _idle"
+ msgstr "செயலின்றி இருக்கும் போது (_i)"
+ 
+-#: ../panels/power/cc-power-panel.c:1401
++#: ../panels/power/cc-power-panel.c:1513
+ msgid "Power Saving"
+ msgstr "மின்சக்தி சேமிப்பு"
+ 
+-#: ../panels/power/cc-power-panel.c:1430
+-msgid "_Screen Brightness"
++#: ../panels/power/cc-power-panel.c:1541
++msgid "_Screen brightness"
+ msgstr "திரை பிரகாசம் (_S)"
+ 
+-#: ../panels/power/cc-power-panel.c:1458
+-msgid "_Dim Screen when Inactive"
++#: ../panels/power/cc-power-panel.c:1547
++msgid "_Keyboard brightness"
++msgstr "விசைப்பலகை பிரகாசம் (_K)"
++
++#: ../panels/power/cc-power-panel.c:1557
++msgid "_Dim screen when inactive"
+ msgstr "செயலின்றி இருக்கையில் திரையை மங்கலாக்கு (_D)"
+ 
+-#: ../panels/power/cc-power-panel.c:1481
+-msgid "_Blank Screen"
++#: ../panels/power/cc-power-panel.c:1582
++msgid "_Blank screen"
+ msgstr "வெற்றுத் திரை (_B)"
+ 
+-#: ../panels/power/cc-power-panel.c:1516
++#: ../panels/power/cc-power-panel.c:1619
+ msgid "_Wi-Fi"
+ msgstr "_Wi-Fi"
+ 
+-#: ../panels/power/cc-power-panel.c:1521
++#: ../panels/power/cc-power-panel.c:1624
+ msgid "Turns off wireless devices"
+ msgstr "வயர்லெஸ் சாதனங்களை இயக்க நிறுத்தும்"
+ 
+-#: ../panels/power/cc-power-panel.c:1544
+-msgid "_Mobile Broadband"
++#: ../panels/power/cc-power-panel.c:1649
++msgid "_Mobile broadband"
+ msgstr "மொபைல் பிராட்பேண்டு (_M)"
+ 
+-#: ../panels/power/cc-power-panel.c:1549
+-msgid "Turns off Mobile Broadband (3G, 4G, WiMax, etc.) devices"
++#: ../panels/power/cc-power-panel.c:1654
++msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
+ msgstr "மொபைல் பிராட்பேன்ட் (3G, 4G, WiMax போன்ற) சாதனங்களை இயக்க நிறுத்தும்"
+ 
+-#: ../panels/power/cc-power-panel.c:1582
++#: ../panels/power/cc-power-panel.c:1689
+ msgid "_Bluetooth"
+ msgstr "_Bluetooth"
+ 
+-#: ../panels/power/cc-power-panel.c:1633
++#: ../panels/power/cc-power-panel.c:1740
+ msgid "When on battery power"
+ msgstr "பேட்டரி சக்தியில் இருக்கையில்"
+ 
+-#: ../panels/power/cc-power-panel.c:1635
++#: ../panels/power/cc-power-panel.c:1742
+ msgid "When plugged in"
+ msgstr "சொருகியுள்ள போது"
+ 
+-#: ../panels/power/cc-power-panel.c:1762
++#: ../panels/power/cc-power-panel.c:1871
+ msgid "Suspend & Power Off"
+ msgstr "இடைநிறுத்து & அணை"
+ 
+-#: ../panels/power/cc-power-panel.c:1793
+-msgid "_Automatic Suspend"
++#: ../panels/power/cc-power-panel.c:1904
++msgid "_Automatic suspend"
+ msgstr "தானியங்கு இடைநிறுத்தம் (_A)"
+ 
+-#: ../panels/power/cc-power-panel.c:1815
+-msgid "When Battery Power is _Critical"
++#: ../panels/power/cc-power-panel.c:1928
++msgid "When battery power is _critical"
+ msgstr "பேட்டரி மின்சாரம் மிகக் குறைவாகிப் போகையில் (_C)"
+ 
+-#: ../panels/power/cc-power-panel.c:1848
++#: ../panels/power/cc-power-panel.c:1985
+ msgid "Power Off"
+ msgstr "மின்சக்தி நிறுத்து"
+ 
+-#: ../panels/power/cc-power-panel.c:1990
++#: ../panels/power/cc-power-panel.c:2122
+ msgid "Devices"
+ msgstr "சாதனங்கள்"
+ 
+@@ -4108,10 +4083,6 @@ msgstr "12 நிமிடங்கள்"
+ msgid "Automatic Suspend"
+ msgstr "தானியங்கு இடைநிறுத்தம்"
+ 
+-#: ../panels/power/power.ui.h:21 ../panels/privacy/privacy.ui.h:10
+-msgid "_Close"
+-msgstr "மூடு (_C)"
+-
+ #: ../panels/power/power.ui.h:22
+ msgid "_Plugged In"
+ msgstr "செருகியுள்ள போது (_P)"
+@@ -4129,7 +4100,8 @@ msgid "Authenticate"
+ msgstr "அங்கீகாரம்"
+ 
+ #: ../panels/printers/authentication-dialog.ui.h:5
+-#: ../panels/sharing/sharing.ui.h:22
++#: ../panels/sharing/sharing.ui.h:21
++#: ../panels/user-accounts/data/account-dialog.ui.h:6
+ msgid "Password"
+ msgstr "கடவுச்சொல்"
+ 
+@@ -4370,15 +4342,21 @@ msgstr "அச்சு வேலையை ரத்து செய் "
+ msgid "Add a New Printer"
+ msgstr "புதிய அச்சுப்பொறியை சேர்"
+ 
+-#: ../panels/printers/new-printer-dialog.ui.h:2
+-#: ../panels/user-accounts/um-user-panel.c:467
+-msgid "_Cancel"
+-msgstr "_C நீக்கு"
++#. Translators: This button opens authentication dialog for selected server.
++#: ../panels/printers/new-printer-dialog.ui.h:5
++msgid "A_uthenticate"
++msgstr "அங்கீகரி (_u)"
+ 
+-#: ../panels/printers/new-printer-dialog.ui.h:4
++#: ../panels/printers/new-printer-dialog.ui.h:6
+ msgid "Search for network printers or filter result"
+ msgstr "வலைப்பின்னல் அச்சுப்பொறியை தேடவும்  அல்லது விடையை வடிக்கவும்"
+ 
++#. Translators: The entered text should contain network address of a printer or a text which will filter found devices (their names and locations)
++#: ../panels/printers/new-printer-dialog.ui.h:8
++msgid "Enter address of a printer or a text to filter results"
++msgstr ""
++"முடிவுகளை வடிகட்ட ஒரு அச்சுப்பொறியின் முகவரி அல்லது உரை ஒன்றை உள்ளிடவும்"
++
+ #: ../panels/printers/options-dialog.ui.h:1
+ msgid "Loading options…"
+ msgstr "விருப்பங்களை ஏற்றுகிறது..."
+@@ -4491,8 +4469,13 @@ msgstr "நேரம்"
+ msgid "%s Active Jobs"
+ msgstr "%s செயலில் உள்ள வேலைகள்"
+ 
++#. Translators: This item is a server which needs authentication to show its printers
++#: ../panels/printers/pp-new-printer-dialog.c:1669
++msgid "Server requires authentication"
++msgstr "சேவையகத்திற்கு அங்கீகாரம் தேவைப்படுகிறது"
++
+ #. Translators: No printers were found
+-#: ../panels/printers/pp-new-printer-dialog.c:1465
++#: ../panels/printers/pp-new-printer-dialog.c:1706
+ msgid "No printers detected."
+ msgstr "அச்சுப்பொறிகள் எதுவும் கண்டுபிடிக்கப்படவில்லை ."
+ 
+@@ -4512,73 +4495,69 @@ msgstr "காகித மூலம்"
+ msgid "Output Tray"
+ msgstr "வெளியீட்டு தட்டு"
+ 
+-#: ../panels/printers/pp-options-dialog.c:86
+-msgid "Resolution"
+-msgstr "தெளிதிறன் "
+-
+ #: ../panels/printers/pp-options-dialog.c:87
+ msgid "GhostScript pre-filtering"
+ msgstr "கோஸ்ட்ஸ்கிரிப்ட் முன் வடிகட்டல்"
+ 
+ #. Translators: This option sets number of pages printed on one sheet
+-#: ../panels/printers/pp-options-dialog.c:533
++#: ../panels/printers/pp-options-dialog.c:532
+ msgid "Pages per side"
+ msgstr "தாள்பக்கத்துக்கு பக்கங்கள்"
+ 
+ #. Translators: This option sets whether to print on both sides of paper
+-#: ../panels/printers/pp-options-dialog.c:545
++#: ../panels/printers/pp-options-dialog.c:544
+ msgid "Two-sided"
+ msgstr "இரு பக்கம்"
+ 
+ #. Translators: This option sets orientation of print (portrait, landscape...)
+-#: ../panels/printers/pp-options-dialog.c:557
++#: ../panels/printers/pp-options-dialog.c:556
+ msgid "Orientation"
+ msgstr "திசை"
+ 
+ #. Translators: "General" tab contains general printer options
+-#: ../panels/printers/pp-options-dialog.c:654
++#: ../panels/printers/pp-options-dialog.c:653
+ msgctxt "Printer Option Group"
+ msgid "General"
+ msgstr "பொது"
+ 
+ #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
+-#: ../panels/printers/pp-options-dialog.c:657
++#: ../panels/printers/pp-options-dialog.c:656
+ msgctxt "Printer Option Group"
+ msgid "Page Setup"
+ msgstr "பக்க அமைவு"
+ 
+ #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, duplex unit, etc.)
+-#: ../panels/printers/pp-options-dialog.c:660
++#: ../panels/printers/pp-options-dialog.c:659
+ msgctxt "Printer Option Group"
+ msgid "Installable Options"
+ msgstr "நிறுவக்கூடிய தேர்வுகள்"
+ 
+ #. Translators: "Job" tab contains settings for jobs
+-#: ../panels/printers/pp-options-dialog.c:663
++#: ../panels/printers/pp-options-dialog.c:662
+ msgctxt "Printer Option Group"
+ msgid "Job"
+ msgstr "வேலை"
+ 
+ #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
+-#: ../panels/printers/pp-options-dialog.c:666
++#: ../panels/printers/pp-options-dialog.c:665
+ msgctxt "Printer Option Group"
+ msgid "Image Quality"
+ msgstr "பிம்ப தரம்"
+ 
+ #. Translators: "Color" tab contains color settings (e.g. color printing)
+-#: ../panels/printers/pp-options-dialog.c:669
++#: ../panels/printers/pp-options-dialog.c:668
+ msgctxt "Printer Option Group"
+ msgid "Color"
+ msgstr "நிறம்"
+ 
+ #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
+-#: ../panels/printers/pp-options-dialog.c:672
++#: ../panels/printers/pp-options-dialog.c:671
+ msgctxt "Printer Option Group"
+ msgid "Finishing"
+ msgstr "முடிக்கிறது"
+ 
+ #. Translators: "Advanced" tab contains all others settings
+-#: ../panels/printers/pp-options-dialog.c:675
++#: ../panels/printers/pp-options-dialog.c:674
+ msgctxt "Printer Option Group"
+ msgid "Advanced"
+ msgstr "மேம்பட்ட"
+@@ -4630,7 +4609,7 @@ msgid "Driver"
+ msgstr "இயக்கி"
+ 
+ #. Translators: Samba server needs authentication of the user to show list of its printers.
+-#: ../panels/printers/pp-samba.c:247
++#: ../panels/printers/pp-samba.c:254
+ #, c-format
+ msgid "Enter your username and password to view printers available on %s."
+ msgstr ""
+@@ -4709,27 +4688,39 @@ msgstr ""
+ "மன்னிக்க! கணினியின் அச்சிடும் சேவை\n"
+ " கிடைப்பதாக தெரியவில்லை"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:105
+-msgid "Hidden"
+-msgstr "மறைக்கப்பட்டது"
+-
+-#: ../panels/privacy/cc-privacy-panel.c:105
+-msgid "Visible"
+-msgstr "புலப்படும்"
+-
+-#: ../panels/privacy/cc-privacy-panel.c:271 ../panels/privacy/privacy.ui.h:31
++#: ../panels/privacy/cc-privacy-panel.c:248 ../panels/privacy/privacy.ui.h:26
+ msgid "Screen Lock"
+ msgstr "திரைப்பூட்டு"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:338 ../panels/privacy/privacy.ui.h:9
+-msgid "Name & Visibility"
+-msgstr "பெயர் & புலப்படுதன்மை"
+-
+-#: ../panels/privacy/cc-privacy-panel.c:446 ../panels/privacy/privacy.ui.h:26
++#: ../panels/privacy/cc-privacy-panel.c:361 ../panels/privacy/privacy.ui.h:20
+ msgid "Usage & History"
+ msgstr "பயன்பாடு & வரலாறு"
+ 
+-#: ../panels/privacy/cc-privacy-panel.c:576 ../panels/privacy/privacy.ui.h:36
++#: ../panels/privacy/cc-privacy-panel.c:489
++msgid "Empty all items from Trash?"
++msgstr "குப்பைத் தொட்டியிலிருந்து அனைத்தையும் நீக்கி காலி செய்யவா?"
++
++#: ../panels/privacy/cc-privacy-panel.c:490
++msgid "All items in the Trash will be permanently deleted."
++msgstr "குப்பைத் தொட்டியில் உள்ளவை அனைத்தும் நிரந்தரமாக நீக்கப்படும்."
++
++#: ../panels/privacy/cc-privacy-panel.c:491 ../panels/privacy/privacy.ui.h:32
++msgid "_Empty Trash"
++msgstr "குப்பை தொட்டியை காலி செய் (_E)"
++
++#: ../panels/privacy/cc-privacy-panel.c:514
++msgid "Delete all the temporary files?"
++msgstr "தற்காலிகக் கோப்புகள் அனைத்தையும் அழிக்கவா?"
++
++#: ../panels/privacy/cc-privacy-panel.c:515
++msgid "All the temporary files will be permanently deleted."
++msgstr "தற்காலிகக் கோப்புகள் அனைத்தும் நிரந்தரமாக அழிக்கப்படும்."
++
++#: ../panels/privacy/cc-privacy-panel.c:516 ../panels/privacy/privacy.ui.h:33
++msgid "_Purge Temporary Files"
++msgstr "தற்காலிக கோப்புகளை அழி (_P)"
++
++#: ../panels/privacy/cc-privacy-panel.c:538 ../panels/privacy/privacy.ui.h:31
+ msgid "Purge Trash & Temporary Files"
+ msgstr "தேவையற்றதையும் தற்காலிகக் கோப்புகளையும் அழி"
+ 
+@@ -4762,69 +4753,51 @@ msgstr "திரை அணைகிறது"
+ msgid "30 seconds"
+ msgstr "30 நொடிகள்"
+ 
+-#: ../panels/privacy/privacy.ui.h:11
+-msgid "Control how you appear on the screen and the network."
+-msgstr ""
+-"திரையிலும் பிணையத்திலும் நீங்கள் எப்படி காண்பிக்கப்படுவீர்கள் என்பதைக் "
+-"கட்டுப்படுத்தவும்."
+-
+-#: ../panels/privacy/privacy.ui.h:12
+-msgid "Display _full name in top bar"
+-msgstr "மேல் பட்டியில் முழுப் பெயரைக் காண்பி (_f)"
+-
+-#: ../panels/privacy/privacy.ui.h:13
+-msgid "Display full name in _lock screen"
+-msgstr "திரைப்பூட்டில் முழுப் பெயரைக் காண்பி (_l)"
+-
+-#: ../panels/privacy/privacy.ui.h:14
+-msgid "_Stealth Mode"
+-msgstr "பதுங்கல் பயன்முறை (_S)"
+-
+-#: ../panels/privacy/privacy.ui.h:15
++#: ../panels/privacy/privacy.ui.h:9
+ msgid "Immediately"
+ msgstr "உடனடியாக"
+ 
+-#: ../panels/privacy/privacy.ui.h:16
++#: ../panels/privacy/privacy.ui.h:10
+ msgid "1 day"
+ msgstr "1 நாள்"
+ 
+-#: ../panels/privacy/privacy.ui.h:17
++#: ../panels/privacy/privacy.ui.h:11
+ msgid "2 days"
+ msgstr "2 நாட்கள்"
+ 
+-#: ../panels/privacy/privacy.ui.h:18
++#: ../panels/privacy/privacy.ui.h:12
+ msgid "3 days"
+ msgstr "3 நாட்கள்"
+ 
+-#: ../panels/privacy/privacy.ui.h:19
++#: ../panels/privacy/privacy.ui.h:13
+ msgid "4 days"
+ msgstr "4 நாட்கள்"
+ 
+-#: ../panels/privacy/privacy.ui.h:20
++#: ../panels/privacy/privacy.ui.h:14
+ msgid "5 days"
+ msgstr "5 நாட்கள்"
+ 
+-#: ../panels/privacy/privacy.ui.h:21
++#: ../panels/privacy/privacy.ui.h:15
+ msgid "6 days"
+ msgstr "6 நாட்கள்"
+ 
+-#: ../panels/privacy/privacy.ui.h:22
++#: ../panels/privacy/privacy.ui.h:16
+ msgid "7 days"
+ msgstr "7 நாட்கள்"
+ 
+-#: ../panels/privacy/privacy.ui.h:23
++#: ../panels/privacy/privacy.ui.h:17
+ msgid "14 days"
+ msgstr "14 நாட்கள்"
+ 
+-#: ../panels/privacy/privacy.ui.h:24
++#: ../panels/privacy/privacy.ui.h:18
+ msgid "30 days"
+ msgstr "30 நாட்கள்"
+ 
+-#: ../panels/privacy/privacy.ui.h:25
++#: ../panels/privacy/privacy.ui.h:19
+ msgid "Forever"
+ msgstr "எப்போதும் "
+ 
+-#: ../panels/privacy/privacy.ui.h:27
++#: ../panels/privacy/privacy.ui.h:21
+ msgid ""
+ "Remembering your history makes things easier to find again. These items are "
+ "never shared over the network."
+@@ -4833,45 +4806,37 @@ msgstr ""
+ "கண்டுபிடிக்க முடியும். "
+ "இவை பிணையத்தின் வழியாக எப்போதும் பகிரப்படாது."
+ 
+-#: ../panels/privacy/privacy.ui.h:28
++#: ../panels/privacy/privacy.ui.h:22
+ msgid "Cl_ear Recent History"
+ msgstr "சமீபத்திய வரலாற்றை அழி (_e)"
+ 
+-#: ../panels/privacy/privacy.ui.h:29
++#: ../panels/privacy/privacy.ui.h:24
+ msgid "_Recently Used"
+ msgstr "சமீபத்தில் பயன்படுத்தியது (_R)"
+ 
+-#: ../panels/privacy/privacy.ui.h:30
++#: ../panels/privacy/privacy.ui.h:25
+ msgid "Retain _History"
+ msgstr "வரலாற்றை வைத்திரு (_H)"
+ 
+-#: ../panels/privacy/privacy.ui.h:32
++#: ../panels/privacy/privacy.ui.h:27
+ msgid "The Screen Lock protects your privacy when you are away."
+ msgstr ""
+ "நீங்கள் கணினியை விட்டு விலகி இருக்கும் போது திரைப்பூட்டு உங்கள் தனியுரிமையைப் "
+ "பாதுகாக்கிறது."
+ 
+-#: ../panels/privacy/privacy.ui.h:33
++#: ../panels/privacy/privacy.ui.h:28
+ msgid "Automatic Screen _Lock"
+ msgstr "தானியங்கி திரைப்பூட்டு (_L)"
+ 
+-#: ../panels/privacy/privacy.ui.h:34
++#: ../panels/privacy/privacy.ui.h:29
+ msgid "Lock screen _after blank for"
+ msgstr "இவ்வளவு நேரம் வெறுமையாக இருந்த பிறகு திரையைப் பூட்டவும் (_a)"
+ 
+-#: ../panels/privacy/privacy.ui.h:35
++#: ../panels/privacy/privacy.ui.h:30
+ msgid "Show _Notifications"
+ msgstr "அறிவிப்புகளைக் காண்பி (_N)"
+ 
+-#: ../panels/privacy/privacy.ui.h:37
+-msgid "_Empty Trash"
+-msgstr "குப்பை தொட்டியை காலி செய் (_E)"
+-
+-#: ../panels/privacy/privacy.ui.h:38
+-msgid "_Purge Temporary Files"
+-msgstr "தற்காலிக கோப்புகளை அழி (_P)"
+-
+-#: ../panels/privacy/privacy.ui.h:39
++#: ../panels/privacy/privacy.ui.h:34
+ msgid ""
+ "Automatically purge the Trash and temporary files to help keep your computer "
+ "free of unnecessary sensitive information."
+@@ -4880,29 +4845,29 @@ msgstr ""
+ "இருக்க, "
+ "குப்பை தொட்டியையும் தற்காலிகக் கோப்புகளையும் தானாக அழிக்கவும்."
+ 
+-#: ../panels/privacy/privacy.ui.h:40
++#: ../panels/privacy/privacy.ui.h:35
+ msgid "Automatically empty _Trash"
+ msgstr "குப்பைதொட்டியை தானாக காலி செய் (_T)"
+ 
+-#: ../panels/privacy/privacy.ui.h:41
++#: ../panels/privacy/privacy.ui.h:36
+ msgid "Automatically purge Temporary _Files"
+ msgstr "தற்காலிகக் கோப்புகளை தானாக அழி (_F)"
+ 
+-#: ../panels/privacy/privacy.ui.h:42
++#: ../panels/privacy/privacy.ui.h:37
+ msgid "Purge _After"
+ msgstr "இத்தனை நாட்களுக்குப் பிறகு அழி (_A)"
+ 
+-#: ../panels/region/cc-format-chooser.c:122
++#: ../panels/region/cc-format-chooser.c:120
+ msgctxt "measurement format"
+ msgid "Imperial"
+ msgstr "இம்பீரியல்"
+ 
+-#: ../panels/region/cc-format-chooser.c:124
++#: ../panels/region/cc-format-chooser.c:122
+ msgctxt "measurement format"
+ msgid "Metric"
+ msgstr "மெட்ரிக்"
+ 
+-#: ../panels/region/cc-format-chooser.c:283
++#: ../panels/region/cc-format-chooser.c:285
+ msgid "No regions found"
+ msgstr "பகுதி காணப்படவில்லை"
+ 
+@@ -4910,32 +4875,37 @@ msgstr "பகுதி காணப்படவில்லை"
+ msgid "No input sources found"
+ msgstr "உள்ளீட்டு மூலங்கள் இல்லை"
+ 
+-#: ../panels/region/cc-region-panel.c:240
++#: ../panels/region/cc-input-chooser.c:1070
++msgctxt "Input Source"
++msgid "Other"
++msgstr "மற்றவை"
++
++#: ../panels/region/cc-region-panel.c:239
+ msgid "Your session needs to be restarted for changes to take effect"
+ msgstr "மாற்றங்கள் விளைவை ஏற்படுத்த உங்கள் அமர்வை மறுதொடக்கம் செய்ய வேண்டும்"
+ 
+-#: ../panels/region/cc-region-panel.c:241
++#: ../panels/region/cc-region-panel.c:240
+ msgid "Restart Now"
+ msgstr "இப்போது மறுதுவக்கு"
+ 
+-#: ../panels/region/cc-region-panel.c:566
++#: ../panels/region/cc-region-panel.c:569
+ msgctxt "Language"
+ msgid "None"
+ msgstr "எதுவுமில்லை"
+ 
+-#: ../panels/region/cc-region-panel.c:1058
++#: ../panels/region/cc-region-panel.c:853
++msgid "No input source selected"
++msgstr "உள்ளீட்டு மூலம் தேர்ந்தெடுக்கப்படவில்லை"
++
++#: ../panels/region/cc-region-panel.c:1084
+ msgid "Sorry"
+ msgstr "மன்னிக்கவும்"
+ 
+-#: ../panels/region/cc-region-panel.c:1060
++#: ../panels/region/cc-region-panel.c:1086
+ msgid "Input methods can't be used on the login screen"
+ msgstr "புகுபதிவு திரையில் உள்ளீட்டு முறைகளைப் பயன்படுத்த முடியாது"
+ 
+-#: ../panels/region/cc-region-panel.c:1509
+-msgid "No input source selected"
+-msgstr "உள்ளீட்டு மூலம் தேர்ந்தெடுக்கப்படவில்லை"
+-
+-#: ../panels/region/cc-region-panel.c:1690
++#: ../panels/region/cc-region-panel.c:1716
+ msgid "Login Screen"
+ msgstr "புகுபதிவு திரை"
+ 
+@@ -5028,6 +4998,10 @@ msgstr "இந்த குறுக்குவழிகளை நீங்க
+ msgid "Alternative switch to next source"
+ msgstr "அடுத்த மூலத்திற்கு மாற்று விசை"
+ 
++#: ../panels/region/input-options.ui.h:11
++msgid "Left+Right Alt"
++msgstr "இடது+வலது Alt"
++
+ #: ../panels/region/region.ui.h:2
+ msgid "English (United Kingdom)"
+ msgstr "ஆங்கிலம் (இங்கிலாந்து)"
+@@ -5046,23 +5020,34 @@ msgstr ""
+ "புகுபதிவு அமைப்புகள் கணினியில் புகுபதிவு செய்யும் போது அனைத்து பயனர்களாலும் "
+ "பயன்படுத்தப்படும்"
+ 
+-#: ../panels/search/cc-search-locations-dialog.c:276
++#: ../panels/search/cc-search-locations-dialog.c:275
+ msgid "Home"
+ msgstr "இல்லம்"
+ 
+-#: ../panels/search/cc-search-locations-dialog.c:476
++#: ../panels/search/cc-search-locations-dialog.c:477
++msgctxt "Search Location"
+ msgid "Places"
+ msgstr "இடங்கள்"
+ 
+-#: ../panels/search/cc-search-locations-dialog.c:478
++#: ../panels/search/cc-search-locations-dialog.c:479
++msgctxt "Search Location"
+ msgid "Bookmarks"
+ msgstr "புத்தகக்குறிகள்"
+ 
+-#: ../panels/search/cc-search-locations-dialog.c:676
++#: ../panels/search/cc-search-locations-dialog.c:481
++msgctxt "Search Location"
++msgid "Other"
++msgstr "மற்றவை"
++
++#: ../panels/search/cc-search-locations-dialog.c:679
+ msgid "Select Location"
+ msgstr "ஒரு இடத்தை தேர்ந்தெடுக்கவும்"
+ 
+-#: ../panels/search/cc-search-panel.c:182
++#: ../panels/search/cc-search-locations-dialog.c:683
++msgid "_OK"
++msgstr "சரி (_O)"
++
++#: ../panels/search/cc-search-panel.c:177
+ msgid "No applications found"
+ msgstr "பயன்பாடு எதுவும் இல்லை"
+ 
+@@ -5099,21 +5084,21 @@ msgstr "கீழே நகர்த்து"
+ msgid "Preferences"
+ msgstr "முன்னுரிமைகள்"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:259
++#: ../panels/sharing/cc-sharing-panel.c:285
+ msgctxt "service is enabled"
+ msgid "On"
+ msgstr "ஆன்"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:261
++#: ../panels/sharing/cc-sharing-panel.c:287
+ msgctxt "service is disabled"
+ msgid "Off"
+ msgstr "ஆஃப்"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:407
++#: ../panels/sharing/cc-sharing-panel.c:422
+ msgid "Choose a Folder"
+ msgstr "ஒரு கோப்புறையைத் தேர்ந்தெடுக்கவும்"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:585
++#: ../panels/sharing/cc-sharing-panel.c:736
+ msgid "Copy"
+ msgstr "நகலெடு"
+ 
+@@ -5158,36 +5143,36 @@ msgstr ""
+ "கோப்புகளைப் பகிர்ந்து கொள்ளலாம்"
+ 
+ #: ../panels/sharing/sharing.ui.h:3
+-msgid "Share Public Folder"
+-msgstr "பொதுக் கோப்புறையைப் பகிரவும்"
+-
+-#: ../panels/sharing/sharing.ui.h:4
+ msgid "Only Receive From Trusted Devices"
+ msgstr "நம்பகமான சாதனங்களிடமிருந்து மட்டும் பெறவும்"
+ 
+-#: ../panels/sharing/sharing.ui.h:5
++#: ../panels/sharing/sharing.ui.h:4
+ msgid "Save Received Files to Downloads Folder"
+ msgstr "பெறப்படும் கோப்புகளை பதிவிறக்கங்கள் கோப்புறையில் சேமிக்கவும்"
+ 
++#: ../panels/sharing/sharing.ui.h:5
++msgid "Computer Name"
++msgstr "கணினியின் பெயர்"
++
+ #: ../panels/sharing/sharing.ui.h:6
+-msgid "Only share with Trusted Devices"
+-msgstr "நம்பகமான சாதனங்களிடம் மட்டும் பகிரவும்"
++msgid "Personal File Sharing"
++msgstr "தனிப்பட்ட கோப்பு பகிர்வு"
+ 
+ #: ../panels/sharing/sharing.ui.h:7
+-msgid "Computer Name"
+-msgstr "கணினியின் பெயர்"
++msgid "Screen Sharing"
++msgstr "திரை பகிர்வு"
+ 
+ #: ../panels/sharing/sharing.ui.h:8
+-msgid "Remote Login"
+-msgstr "தொலைநிலை புகுபதிவு"
++msgid "Media Sharing"
++msgstr "மீடியா பகிர்வு"
+ 
+ #: ../panels/sharing/sharing.ui.h:9
+-msgid "Some services are disabled because of no network access."
+-msgstr "பிணைய அணுகல் இல்லாததால் சில சேவைகள் முடக்கப்பட்டுள்ளன."
++msgid "Remote Login"
++msgstr "தொலைநிலை புகுபதிவு"
+ 
+ #: ../panels/sharing/sharing.ui.h:10
+-msgid "Media Sharing"
+-msgstr "மீடியா பகிர்வு"
++msgid "Some services are disabled because of no network access."
++msgstr "பிணைய அணுகல் இல்லாததால் சில சேவைகள் முடக்கப்பட்டுள்ளன."
+ 
+ #: ../panels/sharing/sharing.ui.h:11
+ msgid "Share Music, Photos and Videos with others on the current network."
+@@ -5215,11 +5200,7 @@ msgstr "கோப்புறையைச் சேர்"
+ msgid "Remove Folder"
+ msgstr "கோப்புறையை நீக்கு"
+ 
+-#: ../panels/sharing/sharing.ui.h:17
+-msgid "Personal File Sharing"
+-msgstr "தனிப்பட்ட கோப்பு பகிர்வு"
+-
+-#: ../panels/sharing/sharing.ui.h:19
++#: ../panels/sharing/sharing.ui.h:18
+ #, no-c-format
+ msgid ""
+ "Personal File Sharing allows you to share your Public folder with others on "
+@@ -5231,15 +5212,15 @@ msgstr ""
+ "href=\"dav://%s"
+ "\">dav://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:20
++#: ../panels/sharing/sharing.ui.h:19
+ msgid "Share Public Folder On This Network"
+ msgstr "இந்தப் பிணையத்தில் பொதுக் கோப்புறையைப் பகிரவும்"
+ 
+-#: ../panels/sharing/sharing.ui.h:21
++#: ../panels/sharing/sharing.ui.h:20
+ msgid "Require Password"
+ msgstr "கடவுச்சொல் தேவை"
+ 
+-#: ../panels/sharing/sharing.ui.h:24
++#: ../panels/sharing/sharing.ui.h:23
+ #, no-c-format
+ msgid ""
+ "Allow remote users to connect using the Secure Shell command:\n"
+@@ -5250,10 +5231,6 @@ msgstr ""
+ "<a href=\"ssh %s\">ssh %s</a>"
+ 
+ #: ../panels/sharing/sharing.ui.h:26
+-msgid "Screen Sharing"
+-msgstr "திரை பகிர்வு"
+-
+-#: ../panels/sharing/sharing.ui.h:28
+ #, no-c-format
+ msgid ""
+ "Allow remote users to view or control your screen by connecting to: <a href="
+@@ -5263,19 +5240,19 @@ msgstr ""
+ "கட்டுப்படுத்தவும் "
+ "அனுமதிக்கவும்: <a href=\"vnc://%s\">vnc://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:29
++#: ../panels/sharing/sharing.ui.h:27
+ msgid "Remote View"
+ msgstr "தொலைநிலை பார்வை"
+ 
+-#: ../panels/sharing/sharing.ui.h:30
++#: ../panels/sharing/sharing.ui.h:28
+ msgid "Remote Control"
+ msgstr "தொலைநிலைக் கட்டுப்பாடு"
+ 
+-#: ../panels/sharing/sharing.ui.h:31
++#: ../panels/sharing/sharing.ui.h:29
+ msgid "Approve All Connections"
+ msgstr "அனைத்து இணைப்புகளையும் அங்கீகரி"
+ 
+-#: ../panels/sharing/sharing.ui.h:32
++#: ../panels/sharing/sharing.ui.h:30
+ msgid "Show Password"
+ msgstr "கடவுச்சொல்லை காட்டு"
+ 
+@@ -5369,8 +5346,8 @@ msgctxt "volume"
+ msgid "Unamplified"
+ msgstr "பெருக்காதது"
+ 
+-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:260
+-#: ../panels/sound/gvc-mixer-dialog.c:526
++#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:261
++#: ../panels/sound/gvc-mixer-dialog.c:527
+ msgid "_Profile:"
+ msgstr "_P விவரகுறிப்பு:"
+ 
+@@ -5396,73 +5373,73 @@ msgstr[1] "%u உள்ளீடுகள்"
+ msgid "System Sounds"
+ msgstr "கணினி ஒலிகள்"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:262
++#: ../panels/sound/gvc-mixer-dialog.c:263
+ msgid "_Test Speakers"
+ msgstr "_T ஒலி பெருக்கிகளை சோதி "
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:431
++#: ../panels/sound/gvc-mixer-dialog.c:432
+ msgid "Peak detect"
+ msgstr "உச்சிகளை கண்டுபிடி"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1508
++#: ../panels/sound/gvc-mixer-dialog.c:1510
+ #: ../panels/sound/gvc-sound-theme-chooser.c:595
+ msgid "Name"
+ msgstr "பெயர்"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1527
++#: ../panels/sound/gvc-mixer-dialog.c:1529
+ msgid "Device"
+ msgstr "சாதனம்"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1590
++#: ../panels/sound/gvc-mixer-dialog.c:1592
+ #, c-format
+ msgid "Speaker Testing for %s"
+ msgstr "%s க்கு ஒலி பெருக்கி சோதனை"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1644
++#: ../panels/sound/gvc-mixer-dialog.c:1649
+ msgid "_Output volume:"
+ msgstr "_O வெளியீடு ஒலி அளவு: "
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1658
++#: ../panels/sound/gvc-mixer-dialog.c:1663
+ msgid "Output"
+ msgstr "வெளிப்பாடு"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1663
++#: ../panels/sound/gvc-mixer-dialog.c:1668
+ msgid "C_hoose a device for sound output:"
+ msgstr "_h ஒலி வெளிப்பாடுக்கு சாதனத்தை தேர்ந்தெடு"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1688
++#: ../panels/sound/gvc-mixer-dialog.c:1693
+ msgid "Settings for the selected device:"
+ msgstr "தேர்ந்தெடுக்கப்பட்ட சாதனத்திற்கு அமைப்பு:"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1699
++#: ../panels/sound/gvc-mixer-dialog.c:1704
+ msgid "Input"
+ msgstr "உள்ளீடு"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1706
++#: ../panels/sound/gvc-mixer-dialog.c:1711
+ msgid "_Input volume:"
+ msgstr "(_I) உள்ளீட்டு ஒலி அளவு:"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1729
++#: ../panels/sound/gvc-mixer-dialog.c:1734
+ msgid "Input level:"
+ msgstr "(_I) உள்ளீட்டு மட்டம்:"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1757
++#: ../panels/sound/gvc-mixer-dialog.c:1762
+ msgid "C_hoose a device for sound input:"
+ msgstr "_h ஒலி உள்ளீட்டுக்கு சாதனம் தேர்ந்தெடு:"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1784
++#: ../panels/sound/gvc-mixer-dialog.c:1789
+ msgid "Sound Effects"
+ msgstr "ஒலி விளைவுகள்"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1791
++#: ../panels/sound/gvc-mixer-dialog.c:1796
+ msgid "_Alert volume:"
+ msgstr "_A எச்சரிக்கை அளவு:"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1804
++#: ../panels/sound/gvc-mixer-dialog.c:1809
+ msgid "Applications"
+ msgstr "பயன்பாடுகள்"
+ 
+-#: ../panels/sound/gvc-mixer-dialog.c:1808
++#: ../panels/sound/gvc-mixer-dialog.c:1813
+ msgid "No application is currently playing or recording audio."
+ msgstr "நடப்பில் எந்த பயன்பாடும் ஒலியை இயக்கவோ பதியவோ இல்லை"
+ 
+@@ -5511,11 +5488,6 @@ msgstr "சப்வூஃபர்"
+ msgid "Custom"
+ msgstr "தனிப்பயன்"
+ 
+-#: ../panels/universal-access/cc-ua-panel.c:281
+-#: ../panels/universal-access/cc-ua-panel.c:287
+-msgid "No shortcut set"
+-msgstr "சுருக்கு வழி அமைக்கவில்லை"
+-
+ #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
+ msgid "Make it easier to see, hear, type, point and click"
+ msgstr ""
+@@ -5529,311 +5501,260 @@ msgid ""
+ "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
+ "AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
+ msgstr ""
+-"விசைப்பலகை;சொடுக்கி;a11y;அணுகல்;மாறுபாடு;அணுகல்;திரைபடிப்பி;உரை;எழுத்துரு;அளாவ"
+-"ு;"
+-"அணுகல்x;ஒட்டுவிசைகள்;மெதுவிசைகள்;துள்ளுவிசைகள்;சொடுக்கிவிசைகள்;"
++"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
++"AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
+ 
+ #: ../panels/universal-access/uap.ui.h:1
+-#: ../panels/universal-access/zoom-options.ui.h:35
+-msgctxt "universal access, contrast"
+-msgid "Low"
+-msgstr "குறைவாக"
++msgid "_Always Show Universal Access Menu"
++msgstr "அனைவருக்குமான அணுகல் மெனுவை எப்போதும் காட்டு (_A)"
+ 
+ #: ../panels/universal-access/uap.ui.h:2
+-msgctxt "universal access, contrast"
+-msgid "Normal"
+-msgstr "இயல்பாக"
++msgid "Seeing"
++msgstr "காணல் "
+ 
+ #: ../panels/universal-access/uap.ui.h:3
+-#: ../panels/universal-access/zoom-options.ui.h:36
+-msgctxt "universal access, contrast"
+-msgid "High"
+-msgstr "அதிக"
++msgid "_High Contrast"
++msgstr "அதிக வேறுபாடு (_H)"
+ 
+ #: ../panels/universal-access/uap.ui.h:4
+-msgctxt "universal access, contrast"
+-msgid "High/Inverse"
+-msgstr "உயர் மாறுபாடு /எதிர்மறை"
++msgid "_Large Text"
++msgstr "பெரிய உரை (_L)"
+ 
+ #: ../panels/universal-access/uap.ui.h:5
+-msgid "On screen keyboard"
+-msgstr "திரை விசைப்பலகை"
+-
+-#: ../panels/universal-access/uap.ui.h:6
+-msgid "GOK"
+-msgstr "ஜிஓகே"
++msgid "_Zoom"
++msgstr "பெரிதாக்கு (_Z)"
+ 
+ #: ../panels/universal-access/uap.ui.h:7
+-msgid "OnBoard"
+-msgstr "உள்ளே"
++msgid "Screen _Reader"
++msgstr "திரைபடிப்பான் (_R)"
++
++#: ../panels/universal-access/uap.ui.h:8
++msgid "_Sound Keys"
++msgstr "ஒலி விசைகள் (_S)"
++
++#: ../panels/universal-access/uap.ui.h:9
++msgid "Hearing"
++msgstr "கேட்டல் "
+ 
+ #: ../panels/universal-access/uap.ui.h:10
+-#, no-c-format
+-msgid "75%"
+-msgstr "75%"
++msgid "_Visual Alerts"
++msgstr "காட்சி எச்சரிக்கைகள் (_V)"
+ 
+-#: ../panels/universal-access/uap.ui.h:11
+-msgctxt "universal access, text size"
+-msgid "Small"
+-msgstr "சிறிய"
++#: ../panels/universal-access/uap.ui.h:12
++msgid "Screen _Keyboard"
++msgstr "திரை விசைப்பலகை (_K)"
+ 
+ #: ../panels/universal-access/uap.ui.h:13
+-#, no-c-format
+-msgid "100%"
+-msgstr "100%"
++msgid "_Typing Assist (AccessX)"
++msgstr "தட்டச்சு உதவியாளர் (AccessX) (_T)"
+ 
+ #: ../panels/universal-access/uap.ui.h:14
+-msgctxt "universal access, text size"
+-msgid "Normal"
+-msgstr "இயல்பான"
++msgid "Pointing and Clicking"
++msgstr "சுட்டி சொடுக்கல் "
++
++#: ../panels/universal-access/uap.ui.h:15
++msgid "_Mouse Keys"
++msgstr "சொடுக்கி விசைகள் (_M)"
+ 
+ #: ../panels/universal-access/uap.ui.h:16
+-#, no-c-format
+-msgid "125%"
+-msgstr "125%"
++msgid "_Click Assist"
++msgstr "சொடுக்க உதவி (_C)"
+ 
+ #: ../panels/universal-access/uap.ui.h:17
+-msgctxt "universal access, text size"
+-msgid "Large"
+-msgstr "பெரிய"
++msgid "Screen Reader"
++msgstr "திரைபடிப்பான்"
++
++#: ../panels/universal-access/uap.ui.h:18
++msgid "The screen reader reads displayed text as you move the focus."
++msgstr ""
++"திரைபடிப்பான் நீங்கள் திரை கவனப் பகுதியை நகர்த்தும் போது அதற்குரிய உரையை "
++"படித்துக் "
++"காட்டும்."
+ 
+ #: ../panels/universal-access/uap.ui.h:19
+-#, no-c-format
+-msgid "150%"
+-msgstr "150%"
++msgid "_Screen Reader"
++msgstr "திரைபடிப்பான் (_S)"
+ 
+ #: ../panels/universal-access/uap.ui.h:20
+-msgctxt "universal access, text size"
+-msgid "Larger"
+-msgstr "இன்னும் பெரிய"
++msgid "Sound Keys"
++msgstr "ஒலி விசைகள்"
+ 
+ #: ../panels/universal-access/uap.ui.h:21
+-msgid "High Contrast"
+-msgstr "அதிக வேறுபாடு"
++msgid "Beep when Num Lock or Caps Lock are turned on."
++msgstr "Num Lock அல்லது Caps Lock இயக்கப்படும் போது பீப் ஒலி எழுப்பு."
+ 
+ #: ../panels/universal-access/uap.ui.h:22
+-msgid "Beep on Caps and Num Lock"
+-msgstr "தலைப்பெழுத்து மற்றும் எண் ஆகியன பூட்டப்படும்போது பீப் ஒலி எழுப்புக."
++msgid "Visual Alerts"
++msgstr "காட்சி எச்சரிக்கைகள்"
++
++#: ../panels/universal-access/uap.ui.h:23
++msgid "Use a visual indication when an alert sound occurs."
++msgstr "எச்சரிக்கை ஒலி எழுப்பப்படும் போது காட்சி அடையாளத்தையும் காட்டு."
+ 
+ #: ../panels/universal-access/uap.ui.h:24
+-msgid "Screen Reader"
+-msgstr "திரைபடிப்பான்"
++msgid "_Test flash"
++msgstr "_T மின்ஒளியை சோதி "
+ 
+ #: ../panels/universal-access/uap.ui.h:25
+-msgid "Turn on or off:"
+-msgstr "இயக்கு அல்லது நிறுத்து:"
++msgid "Flash the _window title"
++msgstr "சாளர தலைப்புப்பட்டையை பளிச்சிடு (_W)"
+ 
+ #: ../panels/universal-access/uap.ui.h:26
+-msgctxt "universal access, zoom"
+-msgid "Zoom"
+-msgstr "அணுகிப்பார்"
++msgid "Flash the entire _screen"
++msgstr "முழு திரையை பளிச்சிடு (_s)"
+ 
+ #: ../panels/universal-access/uap.ui.h:27
+-msgid "Zoom in:"
+-msgstr "அணுகிப்பார்:"
++msgid "Typing Assist"
++msgstr "தட்டச்சு உதவியாளர்"
+ 
+ #: ../panels/universal-access/uap.ui.h:28
+-msgid "Zoom out:"
+-msgstr "விலகிப்பார்:"
++msgid "_Sticky Keys"
++msgstr "ஒட்டு விசைகள் (_S)"
+ 
+ #: ../panels/universal-access/uap.ui.h:29
+-msgid "Large Text"
+-msgstr "பெரிய உரை"
+-
+-#: ../panels/universal-access/uap.ui.h:30
+-msgid "Seeing"
+-msgstr "காணல் "
+-
+-#: ../panels/universal-access/uap.ui.h:31
+-msgid "Visual Alerts"
+-msgstr "காட்சி எச்சரிக்கைகள்"
+-
+-#: ../panels/universal-access/uap.ui.h:32
+-msgid "Use a visual indication when an alert sound occurs"
+-msgstr "எச்சரிக்கை ஒலி நிகழும் போது காணக்கூடிய குறிப்பை காட்டு"
+-
+-#: ../panels/universal-access/uap.ui.h:33
+-msgid "Flash the window title"
+-msgstr "சாளரம் தலைப்புப்பட்டையை பளிச்சிடு"
+-
+-#: ../panels/universal-access/uap.ui.h:34
+-msgid "Flash the entire screen"
+-msgstr "முழு திரையை பளிச்சிடு "
+-
+-#: ../panels/universal-access/uap.ui.h:35
+-msgid "Closed Captioning"
+-msgstr "தலைப்பிடுதலை நிறுத்து"
+-
+-#: ../panels/universal-access/uap.ui.h:36
+-msgid "Display a textual description of speech and sounds"
+-msgstr "பேச்சு ஒலி ஆகியவற்றின் உரை விவரணத்தை காட்டுக."
+-
+-#: ../panels/universal-access/uap.ui.h:37
+-msgid "_Test flash"
+-msgstr "_T மின்ஒளியை சோதி "
+-
+-#: ../panels/universal-access/uap.ui.h:39
+-msgid "Hearing"
+-msgstr "கேட்டல் "
+-
+-#: ../panels/universal-access/uap.ui.h:40
+-msgid "On Screen Keyboard"
+-msgstr "திரை விசைப்பலகை"
+-
+-#: ../panels/universal-access/uap.ui.h:41
+-msgid "Sticky Keys"
+-msgstr "ஒட்டு விசைகள்"
+-
+-#: ../panels/universal-access/uap.ui.h:42
+ msgid "Treats a sequence of modifier keys as a key combination"
+ msgstr "மாற்றி விசைகளின் வரிசை ஒன்றை விசை தொகுப்பாக கொள்ளும்."
+ 
+-#: ../panels/universal-access/uap.ui.h:43
++#: ../panels/universal-access/uap.ui.h:30
+ msgid "_Disable if two keys are pressed together"
+ msgstr "_D இரண்டு விசைகளை ஒரே நேரத்தில் அழுத்தினால் செயல் நீக்கவும்."
+ 
+-#: ../panels/universal-access/uap.ui.h:44
++#: ../panels/universal-access/uap.ui.h:31
+ msgid "Beep when a _modifer key is pressed"
+ msgstr "(_m) மாற்றி விசை  அழுத்தினால் பீப் ஒலி எழுப்புக"
+ 
+-#: ../panels/universal-access/uap.ui.h:45
+-msgid "Slow Keys"
+-msgstr "மெது விசைகள்"
++#: ../panels/universal-access/uap.ui.h:32
++msgid "S_low Keys"
++msgstr "மெது விசைகள் (_L)"
+ 
+-#: ../panels/universal-access/uap.ui.h:46
++#: ../panels/universal-access/uap.ui.h:33
+ msgid "Puts a delay between when a key is pressed and when it is accepted"
+ msgstr ""
+ "ஒரு விசை அழுத்தப்படுவதற்கும் அது ஒப்புக்கொள்ளப் படுவதற்கும் இடையே ஒரு "
+ "இடைவெளியை அமை "
+ 
+-#: ../panels/universal-access/uap.ui.h:47
++#: ../panels/universal-access/uap.ui.h:34
+ msgid "A_cceptance delay:"
+ msgstr "_c ஒப்புக்கொள்ளல் தாமதம்:"
+ 
+-#: ../panels/universal-access/uap.ui.h:48
+-msgctxt "universal access, delay"
++#: ../panels/universal-access/uap.ui.h:35
++msgctxt "slow keys delay"
+ msgid "Short"
+ msgstr "குறுகிய"
+ 
+-#: ../panels/universal-access/uap.ui.h:49
++#: ../panels/universal-access/uap.ui.h:36
+ msgid "Slow keys typing delay"
+ msgstr "மெது விசைகள் தட்டச்சு தாமதம்"
+ 
+-#: ../panels/universal-access/uap.ui.h:50
+-msgctxt "universal access, delay"
++#: ../panels/universal-access/uap.ui.h:37
++msgctxt "slow keys delay"
+ msgid "Long"
+ msgstr "நீண்ட"
+ 
+-#. This string is part of a line of checkboxes: Beep when a key is [ ] pressed  [ ] accepted  [ ] rejected
+-#: ../panels/universal-access/uap.ui.h:52
+-msgid "Beep when a key is"
+-msgstr "எந்த விசையும்  அழுத்தினால் பீப் ஒலி எழுப்புக"
+-
+-#. This completes the sentence "Beep when a key is"
+-#: ../panels/universal-access/uap.ui.h:54
+-msgid "pressed"
+-msgstr "அழுத்தியது"
++#: ../panels/universal-access/uap.ui.h:38
++msgid "Beep when a key is pr_essed"
++msgstr "(_e) எந்த விசையும்  அழுத்தினால் பீப் ஒலி எழுப்புக"
+ 
+-#. This completes the sentence "Beep when a key is"
+-#: ../panels/universal-access/uap.ui.h:56
+-msgid "accepted"
+-msgstr "ஏற்கப்பட்டது"
++#: ../panels/universal-access/uap.ui.h:39
++msgid "Beep when a key is _accepted"
++msgstr "விசை ஏற்கப்பட்டால் பீப் ஒலி எழுப்புக (_a)"
+ 
+-#. This completes the sentence "Beep when a key is"
+-#: ../panels/universal-access/uap.ui.h:58
+-msgid "rejected"
+-msgstr "நிராகரிக்கப்பட்டது "
++#: ../panels/universal-access/uap.ui.h:40
++msgid "Beep when a key is _rejected"
++msgstr "_r விசை ஏற்கப்படவில்லையானால் பீப் ஒலி எழுப்புக"
+ 
+-#: ../panels/universal-access/uap.ui.h:59
+-msgid "Bounce Keys"
+-msgstr "எதிரொலிப்பு விசைகள்"
++#: ../panels/universal-access/uap.ui.h:41
++msgid "_Bounce Keys"
++msgstr "பவுன்ஸ் விசைகள் (_B)"
+ 
+-#: ../panels/universal-access/uap.ui.h:60
++#: ../panels/universal-access/uap.ui.h:42
+ msgid "Ignores fast duplicate keypresses"
+ msgstr "வேக இரட்டிப்பு விசை அழுத்தங்களை உதாசீனம் செய்க"
+ 
+-#: ../panels/universal-access/uap.ui.h:61
+-msgid "Acc_eptance delay:"
+-msgstr "_e ஒப்புக்கொள்ளல் தாமதம்:"
++#: ../panels/universal-access/uap.ui.h:43
++msgctxt "bounce keys delay"
++msgid "Short"
++msgstr "குறுகிய"
+ 
+-#: ../panels/universal-access/uap.ui.h:62
++#: ../panels/universal-access/uap.ui.h:44
+ msgid "Bounce keys typing delay"
+ msgstr "எதிரொலிப்பு விசைகள் தட்டச்சு தாமதம்"
+ 
+-#: ../panels/universal-access/uap.ui.h:63
+-msgid "Beep when a key is _rejected"
+-msgstr "_r விசை ஏற்கப்படவில்லையானால் பீப் ஒலி எழுப்புக"
++#: ../panels/universal-access/uap.ui.h:45
++msgctxt "bounce keys delay"
++msgid "Long"
++msgstr "நீண்ட"
+ 
+-#: ../panels/universal-access/uap.ui.h:64
+-msgid "Enable by Keyboard"
+-msgstr "விசைப்பலகையால் செயலாக்குக"
++#: ../panels/universal-access/uap.ui.h:46
++msgid "_Enable by Keyboard"
++msgstr "விசைப்பலகையால் செய்யப்படும் வசதியை இயக்கு (_E)"
+ 
+-#: ../panels/universal-access/uap.ui.h:65
++#: ../panels/universal-access/uap.ui.h:47
+ msgid "Turn accessibility features on and off using the keyboard"
+ msgstr " விசைப்பலகையில் இருந்து அணுகல் சிறப்பு இயல்புகளை இயக்கு/இயக்கம் நீக்கு"
+ 
+-#: ../panels/universal-access/uap.ui.h:67
+-msgid "Mouse Keys"
+-msgstr "சொடுக்கி விசைகள்"
+-
+-#: ../panels/universal-access/uap.ui.h:68
+-msgid "Control the pointer using the keypad"
+-msgstr "சுட்டியை விசைபலகத்தால் கட்டுப்படுத்துக."
+-
+-#: ../panels/universal-access/uap.ui.h:69
+-msgid "Video Mouse"
+-msgstr "வீடியோ சொடுக்கி"
+-
+-#: ../panels/universal-access/uap.ui.h:70
+-msgid "Control the pointer using the video camera."
+-msgstr "விடியோ காமிராவை வைத்து சுட்டியை கட்டுப்படுத்துக."
++#: ../panels/universal-access/uap.ui.h:48
++msgid "Click Assist"
++msgstr "சொடுக்க உதவி"
+ 
+-#: ../panels/universal-access/uap.ui.h:71
+-msgid "Simulated Secondary Click"
+-msgstr "இரண்டாம்  சொடுக்கு பாவைக்கப்பட்டது"
++#: ../panels/universal-access/uap.ui.h:49
++msgid "_Simulated Secondary Click"
++msgstr "பாவிக்கப்பட்ட இரண்டாம் நிலை சொடுக்கம்"
+ 
+-#: ../panels/universal-access/uap.ui.h:72
++#: ../panels/universal-access/uap.ui.h:50
+ msgid "Trigger a secondary click by holding down the primary button"
+ msgstr "முதன்மை  பொத்தானை அழுத்தியதன் மூலம் இரண்டாம் சொடுக்கை இடரவும்"
+ 
+-#: ../panels/universal-access/uap.ui.h:73
++#: ../panels/universal-access/uap.ui.h:51
++msgctxt "secondary click"
++msgid "Short"
++msgstr "குறுகிய"
++
++#: ../panels/universal-access/uap.ui.h:52
+ msgid "Secondary click delay"
+ msgstr "இரண்டாம் சொடுக்கு தாமதிப்பு"
+ 
+-#: ../panels/universal-access/uap.ui.h:74
+-msgid "Hover Click"
+-msgstr "ஹோவர் சொடுக்கு"
++#: ../panels/universal-access/uap.ui.h:53
++msgctxt "secondary click delay"
++msgid "Long"
++msgstr "நீண்ட"
+ 
+-#: ../panels/universal-access/uap.ui.h:75
++#: ../panels/universal-access/uap.ui.h:54
++msgid "_Hover Click"
++msgstr "மேல் நகர்வு சொடுக்கம் (_H)"
++
++#: ../panels/universal-access/uap.ui.h:55
+ msgid "Trigger a click when the pointer hovers"
+ msgstr "சுட்டி அசைவை நிறுத்தும்போது சொடுக்கை தூண்டு"
+ 
+-#: ../panels/universal-access/uap.ui.h:76
++#: ../panels/universal-access/uap.ui.h:56
+ msgid "D_elay:"
+ msgstr "_e தாமதம்:"
+ 
+-#: ../panels/universal-access/uap.ui.h:77
++#: ../panels/universal-access/uap.ui.h:57
++msgctxt "dwell click delay"
++msgid "Short"
++msgstr "குறுகிய"
++
++#: ../panels/universal-access/uap.ui.h:58
++msgctxt "dwell click delay"
++msgid "Long"
++msgstr "நீண்ட"
++
++#: ../panels/universal-access/uap.ui.h:59
+ msgid "Motion _threshold:"
+ msgstr "(_t) நகர்வு மாறு நிலை :"
+ 
+-#: ../panels/universal-access/uap.ui.h:78
+-msgctxt "universal access, threshold"
++#: ../panels/universal-access/uap.ui.h:60
++msgctxt "dwell click threshold"
+ msgid "Small"
+ msgstr "சிறிய"
+ 
+-#: ../panels/universal-access/uap.ui.h:79
+-msgctxt "universal access, threshold"
++#: ../panels/universal-access/uap.ui.h:61
++msgctxt "dwell click threshold"
+ msgid "Large"
+ msgstr "பெரிய"
+ 
+-#: ../panels/universal-access/uap.ui.h:80
+-msgid "Mouse Settings"
+-msgstr "சொடுக்கி அமைப்புகள்"
+-
+-#: ../panels/universal-access/uap.ui.h:81
+-msgid "Pointing and Clicking"
+-msgstr "சுட்டி சொடுக்கல் "
+-
+ #: ../panels/universal-access/zoom-options.c:357
+ msgctxt "Distance"
+ msgid "Short"
+@@ -5996,6 +5917,16 @@ msgctxt "universal access, brightness"
+ msgid "High"
+ msgstr "அதிகம்"
+ 
++#: ../panels/universal-access/zoom-options.ui.h:35
++msgctxt "universal access, contrast"
++msgid "Low"
++msgstr "குறைவாக"
++
++#: ../panels/universal-access/zoom-options.ui.h:36
++msgctxt "universal access, contrast"
++msgid "High"
++msgstr "அதிக"
++
+ #: ../panels/universal-access/zoom-options.ui.h:37
+ msgid "Color Effects:"
+ msgstr "நிற விளைவுகள்:"
+@@ -6018,48 +5949,60 @@ msgctxt "Account type"
+ msgid "Administrator"
+ msgstr "நிர்வாகி"
+ 
+-#: ../panels/user-accounts/data/account-dialog.ui.h:3
+-msgid "Add account"
+-msgstr "கணக்கை சேர்"
+-
+ #: ../panels/user-accounts/data/account-dialog.ui.h:4
+-msgid "_Local Account"
+-msgstr "_L உள்ளமை கணக்கு"
++msgid "_Full Name"
++msgstr "முழுப் பெயர் (_F)"
+ 
+ #: ../panels/user-accounts/data/account-dialog.ui.h:5
+-msgid "_Enterprise Login"
+-msgstr "_E என்டர்ப்ரைஸ் புகுபதிவு:"
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
++msgid "Account _Type"
++msgstr "_T கணக்கு வகை"
+ 
+ #: ../panels/user-accounts/data/account-dialog.ui.h:7
+-msgid "_Full name"
+-msgstr "முழுப் பெயர் (_F)"
++#: ../panels/user-accounts/data/password-dialog.ui.h:4
++msgid "Allow user to set a password when they next login"
++msgstr "பயனர் அடுத்த புகுபதிவில் கடவுச்சொல்லை அமைக்க அனுமதிக்கவும்"
+ 
+ #: ../panels/user-accounts/data/account-dialog.ui.h:8
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+-msgid "Account _Type"
+-msgstr "_T கணக்கு வகை"
+-
+-#: ../panels/user-accounts/data/account-dialog.ui.h:9
+-msgid "_Domain"
+-msgstr "(_D) களம்"
++#: ../panels/user-accounts/data/password-dialog.ui.h:5
++msgid "Set a password now"
++msgstr "கடவுச்சொல்லை இப்போது அமை"
+ 
+ #: ../panels/user-accounts/data/account-dialog.ui.h:10
+-msgid "_Login Name"
+-msgstr "உள் நுழை பெயர் (_L)"
++msgid "_Verify"
++msgstr "சரிபார் (_V)"
++
++#: ../panels/user-accounts/data/account-dialog.ui.h:11
++msgid ""
++"Enterprise login allows an existing centrally managed user account to be "
++"used on this device."
++msgstr ""
++"தொழில் ரீதியான புகுபதிவில், இந்த சாதனத்தில் மைய முறையில் நிர்வகிக்கப்படும் "
++"முன்பே உள்ள "
++"ஒரு பயனர் கணக்கைப் பயன்படுத்த முடிகிறது."
+ 
+ #: ../panels/user-accounts/data/account-dialog.ui.h:12
+-msgid "Tip: Enterprise domain or realm name"
+-msgstr "குறிப்பு: என்டர்ப்ரைஸ் களப்பெயர் அல்லது ஆட்சி பெயர்"
++msgid "_Domain"
++msgstr "(_D) களம்"
+ 
+ #: ../panels/user-accounts/data/account-dialog.ui.h:13
+-msgid "C_ontinue"
+-msgstr "_o தொடர்"
++msgid ""
++"Go online to add\n"
++"enterprise login accounts."
++msgstr ""
++"தொழில் ரீதியான கணக்குகளைச் சேர்க்க\n"
++"ஆன்லைனுக்குச் செல்லவும்."
++
++#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
++#: ../panels/user-accounts/data/account-dialog.ui.h:16
++msgid "_Enroll"
++msgstr "பதிவு செய்யவும் (_E)"
+ 
+-#: ../panels/user-accounts/data/account-dialog.ui.h:14
++#: ../panels/user-accounts/data/account-dialog.ui.h:17
+ msgid "Domain Administrator Login"
+ msgstr "டொமெய்ன் நிர்வாகி உள்நுழைவு"
+ 
+-#: ../panels/user-accounts/data/account-dialog.ui.h:15
++#: ../panels/user-accounts/data/account-dialog.ui.h:18
+ msgid ""
+ "In order to use enterprise logins, this computer needs to be\n"
+ "enrolled in the domain. Please have your network administrator\n"
+@@ -6069,11 +6012,11 @@ msgstr ""
+ " பதிவாக வேண்டும். தயை செய்து  உங்கள் வலையமைப்பு நிர்வாகியை \n"
+ "அவர்களது டொமெய்ன் கடவுச்சொல்லை இங்கே உள்ளிட வையுங்கள்."
+ 
+-#: ../panels/user-accounts/data/account-dialog.ui.h:18
++#: ../panels/user-accounts/data/account-dialog.ui.h:21
+ msgid "Administrator _Name"
+ msgstr "_N நிர்வாகி பெயர்"
+ 
+-#: ../panels/user-accounts/data/account-dialog.ui.h:19
++#: ../panels/user-accounts/data/account-dialog.ui.h:22
+ msgid "Administrator Password"
+ msgstr "நிர்வாகி கடவுச்சொல்"
+ 
+@@ -6110,7 +6053,7 @@ msgid "Right little finger"
+ msgstr "வலது சிறு விரல்"
+ 
+ #: ../panels/user-accounts/data/account-fingerprint.ui.h:9
+-#: ../panels/user-accounts/um-fingerprint-dialog.c:700
++#: ../panels/user-accounts/um-fingerprint-dialog.c:699
+ msgid "Enable Fingerprint Login"
+ msgstr "கைரேகை புகுபதிவை செயல்படுத்து"
+ 
+@@ -6153,137 +6096,51 @@ msgstr "உள்புகுகை;பெயர்;விரல்ரேகை;
+ msgid "Login History"
+ msgstr "புகுபதிவு வரலாறு"
+ 
+-#: ../panels/user-accounts/data/history-dialog.ui.h:3
+-msgid "Previous Week"
+-msgstr "முந்தைய வாரம்"
+-
+-#: ../panels/user-accounts/data/history-dialog.ui.h:4
+-msgid "Next Week"
+-msgstr "அடுத்த வாரம்"
+-
+-#: ../panels/user-accounts/data/history-dialog.ui.h:5
+-msgid "Next week"
+-msgstr "அடுத்த வாரம்"
+-
+ #: ../panels/user-accounts/data/password-dialog.ui.h:1
+-msgid "Set a password now"
+-msgstr "கடவுச்சொல்லை இப்போது அமை"
++msgid "_Verify New Password"
++msgstr "புதிய கடவுச் சொல்லைச் சரிபார் (_V)"
+ 
+ #: ../panels/user-accounts/data/password-dialog.ui.h:2
+-msgid "Choose password at next login"
+-msgstr "அடுத்த உள்புகுகையில் கடவுச்சொல்லை தேர்வு செய்யவும்"
++msgid "_New Password"
++msgstr "புதிய கடவுச் சொல் (_N)"
+ 
+ #: ../panels/user-accounts/data/password-dialog.ui.h:3
+-msgid "Log in without a password"
+-msgstr "கடவுச்சொல் இன்றி உள்நுழை"
+-
+-#: ../panels/user-accounts/data/password-dialog.ui.h:4
+-msgid "Disable this account"
+-msgstr "இந்த கணக்கை முடக்கு"
+-
+-#: ../panels/user-accounts/data/password-dialog.ui.h:5
+-msgid "Enable this account"
+-msgstr "இந்த கணக்கை செயலாக்கு"
++msgid "Current _Password"
++msgstr "நடப்பு கடவுச்சொல் (_p)"
+ 
+ #: ../panels/user-accounts/data/password-dialog.ui.h:6
+-msgid "C_onfirm password"
+-msgstr "_o கடவுச் சொல்லை உறுதி செய்க: "
+-
+-#: ../panels/user-accounts/data/password-dialog.ui.h:7
+-msgid "_New password"
+-msgstr "புதிய கடவுச் சொல்: (_N)"
+-
+-#: ../panels/user-accounts/data/password-dialog.ui.h:8
+-msgid "Generate a password"
+-msgstr "ஒரு கடவுச்சொல்லை உருவாக்கு"
+-
+-#: ../panels/user-accounts/data/password-dialog.ui.h:9
+-msgid "Current _password"
+-msgstr "நடப்பு கடவுச்சொல்: (_p)"
+-
+-#: ../panels/user-accounts/data/password-dialog.ui.h:10
+-msgid "_Action"
+-msgstr "செயல் (_A)"
+-
+-#: ../panels/user-accounts/data/password-dialog.ui.h:11
+-msgid "Changing password for"
+-msgstr "இவருக்கு கடவுச்சொல்லை மாற்றுகிறது: "
+-
+-#: ../panels/user-accounts/data/password-dialog.ui.h:12
+-msgid "_Show password"
+-msgstr "_S கடவுச்சொல்லை காட்டு"
+-
+-#: ../panels/user-accounts/data/password-dialog.ui.h:13
+-msgid "How to choose a strong password"
+-msgstr "வலிமையான கடவுச்சொல்லை தேர்ந்தெடுப்பது எப்படி"
+-
+-#: ../panels/user-accounts/data/password-dialog.ui.h:14
+ msgid "Ch_ange"
+ msgstr "_a மாற்று"
+ 
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:1
+-msgid "Changing photo for:"
+-msgstr "இவருக்கு படத்தை மாற்றுகிறது:"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
+-msgid ""
+-"Choose a picture that will be shown at the login screen for this account."
+-msgstr "இந்த கணக்குக்கு உள்புகுகை திரையில் காட்ட ஒரு படத்தை தேர்ந்தெடு."
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
+-msgid "Gallery"
+-msgstr "பிம்ப சேகரிப்பு "
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:4
+-#: ../panels/user-accounts/um-photo-dialog.c:218
+-msgid "Browse for more pictures"
+-msgstr "அதிக படங்களுக்கு உலாவி காண்க"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:5
+-msgid "Take a photograph"
+-msgstr "ஒரு போட்டோ எடுக்கவும் "
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:6
+-msgid "Browse"
+-msgstr "உலாவு"
+-
+-#: ../panels/user-accounts/data/photo-dialog.ui.h:7
+-msgid "Photograph"
+-msgstr "புகைப்படம்"
+-
+ #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+-msgid "Account Information"
+-msgstr "கணக்கு தகவல்"
+-
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Add User Account"
+ msgstr "பயனர் கணக்கு சேர்"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+ msgid "Remove User Account"
+ msgstr "பயனர் கணக்கு நீக்கு"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+ msgid "Login Options"
+ msgstr "புகு பதிகை தேர்வுகள்"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+ msgid "A_utomatic Login"
+ msgstr "_u தானியங்கி உள்நுழைவு"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+ msgid "_Fingerprint Login"
+ msgstr "_F கைரேகை புகுபதிவு:"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+ msgid "User Icon"
+ msgstr "பயனர் சின்னம்"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+ msgid "_Language"
+ msgstr "(_L) மொழி"
+ 
+-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
++#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+ msgid "Last Login"
+ msgstr "கடந்த புகுபதிவு"
+ 
+@@ -6295,40 +6152,152 @@ msgstr "பயனர் கணக்குகளை மேலாள்"
+ msgid "Authentication is required to change user data"
+ msgstr "பயனர் தரவை மாற்ற அனுமதி தேவை"
+ 
+-#: ../panels/user-accounts/pw-utils.c:94
+-#: ../panels/user-accounts/um-password-dialog.c:597
+-msgctxt "Password strength"
+-msgid "Too short"
+-msgstr "மிகச் சிறியது"
++#: ../panels/user-accounts/pw-utils.c:82
++msgctxt "Password hint"
++msgid "The new password needs to be different from the old one."
++msgstr "புதிய கடவுச்சொல் பழையதிலிருந்து வேறுபட்டிருக்க வேண்டும்."
++
++#: ../panels/user-accounts/pw-utils.c:84
++msgctxt "Password hint"
++msgid "Try changing some letters and numbers."
++msgstr "சில எழுத்துகளையும் எண்களையும் மாற்றி முயற்சிக்கவும்."
++
++#: ../panels/user-accounts/pw-utils.c:86 ../panels/user-accounts/pw-utils.c:94
++msgctxt "Password hint"
++msgid "Try changing the password a bit more."
++msgstr "கடவுச்சொல்லை இன்னும் கொஞ்சம் மாற்ற முயற்சிக்கவும்."
++
++#: ../panels/user-accounts/pw-utils.c:88
++msgctxt "Password hint"
++msgid "A password without your user name would be stronger."
++msgstr "உங்கள் பயனர் பெயரைக் கொண்டில்லாத கடவுச்சொல் இன்னும் வலிமையானது."
++
++#: ../panels/user-accounts/pw-utils.c:90
++msgctxt "Password hint"
++msgid "Try to avoid using your name in the password."
++msgstr ""
++"கடவுச்சொல்லில் உங்கள் பயனர் பெயரைப் பயன்படுத்துவதைத் தவிர்க்க முயற்சிக்கவும்."
+ 
+-#: ../panels/user-accounts/pw-utils.c:99
+-msgctxt "Password strength"
+-msgid "Not good enough"
+-msgstr "போதிய அளவு நன்றாக இல்லை"
++#: ../panels/user-accounts/pw-utils.c:92
++msgctxt "Password hint"
++msgid "Try to avoid some of the words included in the password."
++msgstr ""
++"சேர்க்கப்பட்டுள்ள சில சொற்களை கடவுச்சொல்லில் பயன்படுத்துவதைத் தவிர்க்க "
++"முயற்சிக்கவும்."
++
++#: ../panels/user-accounts/pw-utils.c:96
++msgctxt "Password hint"
++msgid "Try to avoid common words."
++msgstr "பொதுவான சொற்களைத் தவிர்க்க முயற்சிக்கவும்."
++
++#: ../panels/user-accounts/pw-utils.c:98
++msgctxt "Password hint"
++msgid "Try to avoid reordering existing words."
++msgstr "முன்பே உள்ள சொற்களை மறுவரிசைப்படுத்துவதைத் தவிர்க்க முயற்சிக்கவும்."
++
++#: ../panels/user-accounts/pw-utils.c:100
++msgctxt "Password hint"
++msgid "Try to use more numbers."
++msgstr "அதிக எண்களைப் பயன்படுத்த முயற்சிக்கவும்."
++
++#: ../panels/user-accounts/pw-utils.c:102
++msgctxt "Password hint"
++msgid "Try to use more uppercase letters."
++msgstr "அதிக பெரிய எழுத்துகளைப் பயன்படுத்த முயற்சிக்கவும்."
++
++#: ../panels/user-accounts/pw-utils.c:104
++msgctxt "Password hint"
++msgid "Try to use more lowercase letters."
++msgstr "அதிக சிறிய எழுத்துகளைப் பயன்படுத்த முயற்சிக்கவும்."
++
++#: ../panels/user-accounts/pw-utils.c:106
++msgctxt "Password hint"
++msgid "Try to use more special characters, like punctuation."
++msgstr ""
++"நிறுத்தக் குறிகள் போன்ற சிறப்பு எழுத்துகளை அதிகம் பயன்படுத்த முயற்சிக்கவும்."
+ 
+ #: ../panels/user-accounts/pw-utils.c:108
+-#: ../panels/user-accounts/um-password-dialog.c:598
++msgctxt "Password hint"
++msgid "Try to use a mixture of letters, numbers and punctuation."
++msgstr ""
++"எண்கள், எழுத்துகள் மற்றும் நிறுத்தக்குறிகளைக் கலந்து பயன்படுத்த "
++"முயற்சிக்கவும்."
++
++#: ../panels/user-accounts/pw-utils.c:110
++msgctxt "Password hint"
++msgid "Try to avoid repeating the same character."
++msgstr ""
++"ஒரே எழுத்தை மீண்டும் மீண்டும் பயன்படுத்துவதைத் தவிர்க்க முயற்சிக்கவும்."
++
++#: ../panels/user-accounts/pw-utils.c:112
++msgctxt "Password hint"
++msgid ""
++"Try to avoid repeating the same type of character: you need to mix up "
++"letters, numbers and punctuation."
++msgstr ""
++"ஒரே வகை எழுத்தை மீண்டும் மீண்டும் பயன்படுத்துவதைத் தவிர்க்க முயற்சிக்கவும்: "
++"எண்கள், எழுத்துகள் "
++"மற்றும் நிறுத்தக்குறிகளைக் கலந்து பயன்படுத்த வேண்டும்."
++
++#: ../panels/user-accounts/pw-utils.c:114
++msgctxt "Password hint"
++msgid "Try to avoid sequences like 1234 or abcd."
++msgstr ""
++"1234 அல்லது abcd போன்ற வரிசை எழுத்துகளைப் பயன்படுத்துவதைத் தவிர்க்க "
++"முயற்சிக்கவும்."
++
++#: ../panels/user-accounts/pw-utils.c:116
++msgctxt "Password hint"
++msgid "Try to add more letters, numbers and symbols."
++msgstr "அதிக எண்கள், எழுத்துகள், சின்னங்களைச் சேர்க்க முயற்சிக்கவும்."
++
++#: ../panels/user-accounts/pw-utils.c:118
++msgctxt "Password hint"
++msgid "Mix uppercase and lowercase and use a number or two."
++msgstr ""
++"பெரிய எழுத்துகள் மற்றும் சிறிய எழுத்துகளைக் கலந்து பயன்படுத்தி ஓரிரண்டு "
++"எண்களையும் "
++"பயன்படுத்தவும்."
++
++#: ../panels/user-accounts/pw-utils.c:120
++msgctxt "Password hint"
++msgid ""
++"Good password! Adding more letters, numbers and punctuation will make it "
++"stronger."
++msgstr ""
++"நல்ல கடவுச்சொல்! அதிக எண்களையும் எழுத்துகளையும் நிறுத்தக் குறிகளையும் "
++"சேர்த்தால் இன்னும் "
++"வலிமையாகும்."
++
++#: ../panels/user-accounts/pw-utils.c:142
++#: ../panels/user-accounts/pw-utils.c:172
+ msgctxt "Password strength"
+-msgid "Weak"
+-msgstr "பலகீனமானது"
++msgid "Strength: Weak"
++msgstr "வலிமை: வலிமையில்லை"
+ 
+-#: ../panels/user-accounts/pw-utils.c:111
+-#: ../panels/user-accounts/um-password-dialog.c:599
++#: ../panels/user-accounts/pw-utils.c:146
++#: ../panels/user-accounts/pw-utils.c:173
+ msgctxt "Password strength"
+-msgid "Fair"
+-msgstr "மிதமான"
++msgid "Strength: Low"
++msgstr "வலிமை: குறைவு"
+ 
+-#: ../panels/user-accounts/pw-utils.c:114
+-#: ../panels/user-accounts/um-password-dialog.c:600
++#: ../panels/user-accounts/pw-utils.c:149
++#: ../panels/user-accounts/pw-utils.c:174
+ msgctxt "Password strength"
+-msgid "Good"
+-msgstr "நன்று"
++msgid "Strength: Medium"
++msgstr "வலிமை: நடுத்தரம்"
++
++#: ../panels/user-accounts/pw-utils.c:152
++#: ../panels/user-accounts/pw-utils.c:175
++msgctxt "Password strength"
++msgid "Strength: Good"
++msgstr "வலிமை: நன்று"
+ 
+-#: ../panels/user-accounts/pw-utils.c:117
+-#: ../panels/user-accounts/um-password-dialog.c:601
++#: ../panels/user-accounts/pw-utils.c:155
++#: ../panels/user-accounts/pw-utils.c:176
+ msgctxt "Password strength"
+-msgid "Strong"
+-msgstr "பலமானது"
++msgid "Strength: High"
++msgstr "வலிமை: அதிகம்"
+ 
+ #: ../panels/user-accounts/run-passwd.c:424
+ msgid "Authentication failed"
+@@ -6381,27 +6350,70 @@ msgstr "புதிய கடவுச்சொல்லில் தேவை
+ msgid "Unknown error"
+ msgstr "தெரியாத பிழை"
+ 
+-#: ../panels/user-accounts/um-account-dialog.c:186
++#: ../panels/user-accounts/um-account-dialog.c:35
++msgid "Should match the web address of your account provider."
++msgstr "உங்கள் கணக்கு வழங்குநரின் வலை முகவரிக்குப் பொருந்த வேண்டும்."
++
++#: ../panels/user-accounts/um-account-dialog.c:222
+ msgid "Failed to add account"
+ msgstr "கணக்கை சேர்த்தல் தோல்வி"
+ 
+-#: ../panels/user-accounts/um-account-dialog.c:407
+-#: ../panels/user-accounts/um-account-dialog.c:448
++#: ../panels/user-accounts/um-account-dialog.c:316
++msgid "This will be used to name your home folder and can't be changed."
++msgstr ""
++"இது உங்கள் இல்லக் கோப்புறைக்குப் பெயரிடப் பயன்படுத்தப்படும், இதை மாற்ற "
++"முடியாது."
++
++#: ../panels/user-accounts/um-account-dialog.c:449
++msgid "Passwords do not match."
++msgstr "கடவுச்சொற்கள் பொருந்தவில்லை"
++
++#: ../panels/user-accounts/um-account-dialog.c:719
++#: ../panels/user-accounts/um-account-dialog.c:765
+ msgid "Failed to register account"
+ msgstr "கணக்கை பதிவு செய்ய முடியவில்லை"
+ 
+-#: ../panels/user-accounts/um-account-dialog.c:581
++#: ../panels/user-accounts/um-account-dialog.c:903
+ msgid "No supported way to authenticate with this domain"
+ msgstr "இந்த களத்துடன் உறுதிப்படுத்த ஆதரவுள்ள வழி இல்லை"
+ 
+-#: ../panels/user-accounts/um-account-dialog.c:635
++#: ../panels/user-accounts/um-account-dialog.c:962
+ msgid "Failed to join domain"
+ msgstr "களத்தில் சேருதல் தோல்வி"
+ 
+-#: ../panels/user-accounts/um-account-dialog.c:692
++#: ../panels/user-accounts/um-account-dialog.c:1023
++msgid ""
++"That login name didn't work.\n"
++"Please try again."
++msgstr ""
++"புகுபதிவு பெயர் பயனளிக்கவில்லை.\n"
++"மீண்டும் முயற்சிக்கவும்."
++
++#: ../panels/user-accounts/um-account-dialog.c:1030
++msgid ""
++"That login password didn't work.\n"
++"Please try again."
++msgstr ""
++"புகுபதிவு கடவுச்சொல் பயனளிக்கவில்லை.\n"
++"மீண்டும் முயற்சிக்கவும்."
++
++#: ../panels/user-accounts/um-account-dialog.c:1038
+ msgid "Failed to log into domain"
+ msgstr "களத்தில் உள்நுழைதல் தோல்வி"
+ 
++#: ../panels/user-accounts/um-account-dialog.c:1096
++msgid "Unable find the domain. Maybe you misspelled it?"
++msgstr "டொமைனைக் கண்டறிய முடியவில்லை. எழுத்துக்கூட்டு தவறா?"
++
++#: ../panels/user-accounts/um-account-dialog.c:1446
++msgid "Add User"
++msgstr "பயனர் சேர்"
++
++#. Create enterprise toggle button.
++#: ../panels/user-accounts/um-account-dialog.c:1459
++msgid "_Enterprise Login"
++msgstr "_E என்டர்ப்ரைஸ் புகுபதிவு:"
++
+ #: ../panels/user-accounts/um-fingerprint-dialog.c:139
+ msgid ""
+ "You are not allowed to access the device. Contact your system administrator."
+@@ -6428,7 +6440,7 @@ msgstr "பதிவு செய்யப்பட்ட கைரேகைக
+ msgid "_Delete Fingerprints"
+ msgstr "கைரேகைகளை அழி (_D)"
+ 
+-#: ../panels/user-accounts/um-fingerprint-dialog.c:279
++#: ../panels/user-accounts/um-fingerprint-dialog.c:278
+ msgid ""
+ "Do you want to delete your registered fingerprints so fingerprint login is "
+ "disabled?"
+@@ -6436,15 +6448,15 @@ msgstr ""
+ "நீங்கள் பதிவு செய்யப்பட்ட கைரேகைகளை அழிக்க வேண்டுமா எனவே கைரேகை புகுபதிவு "
+ "செயல்நீக்கப்படும்?"
+ 
+-#: ../panels/user-accounts/um-fingerprint-dialog.c:455
++#: ../panels/user-accounts/um-fingerprint-dialog.c:454
+ msgid "Done!"
+ msgstr "முடிந்தது!"
+ 
+ #. translators:
+ #. * The variable is the name of the device, for example:
+ #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
+-#: ../panels/user-accounts/um-fingerprint-dialog.c:516
+-#: ../panels/user-accounts/um-fingerprint-dialog.c:558
++#: ../panels/user-accounts/um-fingerprint-dialog.c:515
++#: ../panels/user-accounts/um-fingerprint-dialog.c:557
+ #, c-format
+ msgid "Could not access '%s' device"
+ msgstr "'%s' சாதனத்தை அணுக முடியவில்லை"
+@@ -6452,16 +6464,16 @@ msgstr "'%s' சாதனத்தை அணுக முடியவில்
+ #. translators:
+ #. * The variable is the name of the device, for example:
+ #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
+-#: ../panels/user-accounts/um-fingerprint-dialog.c:599
++#: ../panels/user-accounts/um-fingerprint-dialog.c:598
+ #, c-format
+ msgid "Could not start finger capture on '%s' device"
+ msgstr "'%s' சாதனத்தில் விரலை பிடிக்க துவக்க முடியவில்லை"
+ 
+-#: ../panels/user-accounts/um-fingerprint-dialog.c:650
++#: ../panels/user-accounts/um-fingerprint-dialog.c:649
+ msgid "Could not access any fingerprint readers"
+ msgstr "கைரேகை வாசிப்பி எதையும் அணுக முடியவில்லை"
+ 
+-#: ../panels/user-accounts/um-fingerprint-dialog.c:651
++#: ../panels/user-accounts/um-fingerprint-dialog.c:650
+ msgid "Please contact your system administrator for help."
+ msgstr "உதவிக்கு உங்கள் கணினி நிர்வாகியை அணுகவும்"
+ 
+@@ -6470,7 +6482,7 @@ msgstr "உதவிக்கு உங்கள் கணினி நிர்
+ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
+ #. * 'Digital Persona U.are.U 4000/4000B' device."
+ #.
+-#: ../panels/user-accounts/um-fingerprint-dialog.c:734
++#: ../panels/user-accounts/um-fingerprint-dialog.c:733
+ #, c-format
+ msgid ""
+ "To enable fingerprint login, you need to save one of your fingerprints, "
+@@ -6480,11 +6492,11 @@ msgstr ""
+ "சேமிக்க "
+ "வேண்டும்."
+ 
+-#: ../panels/user-accounts/um-fingerprint-dialog.c:741
++#: ../panels/user-accounts/um-fingerprint-dialog.c:740
+ msgid "Selecting finger"
+ msgstr "விரலை தேர்ந்தெடு"
+ 
+-#: ../panels/user-accounts/um-fingerprint-dialog.c:742
++#: ../panels/user-accounts/um-fingerprint-dialog.c:741
+ msgid "Enrolling fingerprints"
+ msgstr "விரல்ரேகை பதிவு செய்கிறது"
+ 
+@@ -6496,53 +6508,75 @@ msgstr "இந்த வாரம்"
+ msgid "Last Week"
+ msgstr "கடந்த வாரம்"
+ 
+-#: ../panels/user-accounts/um-password-dialog.c:128
+-msgid "_Generate a password"
+-msgstr "_G ஒரு கடவுச்சொல்லை உருவாக்கு"
+-
+-#: ../panels/user-accounts/um-password-dialog.c:181
+-msgid "Please choose another password."
+-msgstr "தயவு செய்து வேறு கடவுச்சொல்லை தேர்ந்தெடுக்கவும்."
+-
+-#: ../panels/user-accounts/um-password-dialog.c:190
+-msgid "Please type your current password again."
+-msgstr "தயை செய்து நடப்பு கடவுச்சொல்லை மீண்டும் உள்ளிடவும்"
+-
+-#: ../panels/user-accounts/um-password-dialog.c:196
+-msgid "Password could not be changed"
+-msgstr "கடவுச்சொல்லை மாற்ற முடியாது."
+-
+-#: ../panels/user-accounts/um-password-dialog.c:301
+-msgid "You need to enter a new password"
+-msgstr "நீங்கள் புதிய கடவுச்சொல்லை உள்ளிட வேண்டும்"
++#. Translators: This is a date format string in the style of "Feb 18",
++#. shown as the first day of a week on login history dialog.
++#. Translators: This is a date format string in the style of "Feb 24",
++#. shown as the last day of a week on login history dialog.
++#: ../panels/user-accounts/um-history-dialog.c:97
++#: ../panels/user-accounts/um-history-dialog.c:101
++msgctxt "login history week label"
++msgid "%b %e"
++msgstr "%b %e"
++
++#. Translators: This is a date format string in the style of "Feb 24, 2013",
++#. shown as the last day of a week on login history dialog.
++#: ../panels/user-accounts/um-history-dialog.c:106
++msgctxt "login history week label"
++msgid "%b %e, %Y"
++msgstr "%b %e, %Y"
++
++#. Translators: This indicates a week label on a login history.
++#. The first %s is the first day of a week, and the second %s the last day.
++#: ../panels/user-accounts/um-history-dialog.c:111
++#, c-format
++msgctxt "login history week label"
++msgid "%s - %s"
++msgstr "%s - %s"
++
++#. Translators: This is a time format string in the style of "22:58".
++#. It indicates a login time which follows a date.
++#: ../panels/user-accounts/um-history-dialog.c:195
++#: ../panels/user-accounts/um-user-panel.c:626
++msgctxt "login date-time"
++msgid "%k:%M"
++msgstr "%k:%M"
++
++#. Translators: This indicates a login date-time.
++#. The first %s is a date, and the second %s a time.
++#: ../panels/user-accounts/um-history-dialog.c:198
++#: ../panels/user-accounts/um-user-panel.c:630
++#, c-format
++msgctxt "login date-time"
++msgid "%s, %s"
++msgstr "%s, %s"
+ 
+-#: ../panels/user-accounts/um-password-dialog.c:304
+-msgid "The new password is not strong enough"
+-msgstr "புதிய கடவுச்சொல் போதுமான அளவு வலிமையாக இல்லை"
++#: ../panels/user-accounts/um-history-dialog.c:267
++msgid "Session Ended"
++msgstr "அமர்வு முடிந்தது"
+ 
+-#: ../panels/user-accounts/um-password-dialog.c:310
+-msgid "You need to confirm the password"
+-msgstr "கடவுச்சொல் ஐ உறுதி செய்ய வேண்டும்."
++#: ../panels/user-accounts/um-history-dialog.c:273
++msgid "Session Started"
++msgstr "அமர்வு தொடங்கியது"
+ 
+-#: ../panels/user-accounts/um-password-dialog.c:313
+-msgid "The passwords do not match"
+-msgstr "கடவுச்சொற்கள் பொருந்தவில்லை"
++#: ../panels/user-accounts/um-password-dialog.c:146
++msgid "Please choose another password."
++msgstr "தயவு செய்து வேறு கடவுச்சொல்லை தேர்ந்தெடுக்கவும்."
+ 
+-#: ../panels/user-accounts/um-password-dialog.c:319
+-msgid "You need to enter your current password"
+-msgstr "நீங்கள் நடப்பு கடவுச்சொல்லை உள்ளிட வேண்டும் "
++#: ../panels/user-accounts/um-password-dialog.c:155
++msgid "Please type your current password again."
++msgstr "தயை செய்து நடப்பு கடவுச்சொல்லை மீண்டும் உள்ளிடவும்"
+ 
+-#: ../panels/user-accounts/um-password-dialog.c:322
+-msgid "The current password is not correct"
+-msgstr "நடப்பு கடவுச்சொல் தவறானது"
++#: ../panels/user-accounts/um-password-dialog.c:161
++msgid "Password could not be changed"
++msgstr "கடவுச்சொல்லை மாற்ற முடியாது."
+ 
+-#: ../panels/user-accounts/um-password-dialog.c:385
+-msgid "Passwords do not match"
+-msgstr "கடவுச்சொற்கள் பொருந்தவில்லை"
++#: ../panels/user-accounts/um-password-dialog.c:287
++msgid "The passwords do not match."
++msgstr "கடவுச்சொற்கள் பொருந்தவில்லை."
+ 
+-#: ../panels/user-accounts/um-password-dialog.c:439
+-msgid "Wrong password"
+-msgstr "தவறான கடவுச்சொல்"
++#: ../panels/user-accounts/um-photo-dialog.c:218
++msgid "Browse for more pictures"
++msgstr "அதிக படங்களுக்கு உலாவி காண்க"
+ 
+ #: ../panels/user-accounts/um-photo-dialog.c:443
+ msgid "Disable image"
+@@ -6570,34 +6604,39 @@ msgstr "இந்த வகை டொமைனை தானாக சேர்
+ msgid "No such domain or realm found"
+ msgstr "அது போன்ற களம் அல்லது ராஜ்யம் காணவில்லை"
+ 
+-#: ../panels/user-accounts/um-realm-manager.c:817
++#: ../panels/user-accounts/um-realm-manager.c:814
++#: ../panels/user-accounts/um-realm-manager.c:828
+ #, c-format
+ msgid "Cannot log in as %s at the %s domain"
+ msgstr "%s ஆக %s களத்தில் உள்நுழைய இயலாது"
+ 
+-#: ../panels/user-accounts/um-realm-manager.c:823
++#: ../panels/user-accounts/um-realm-manager.c:820
+ msgid "Invalid password, please try again"
+ msgstr "செல்லுபடியாகாத கடவுச்சொல், தயை செய்து மீண்டும் முயற்சி செய்க"
+ 
+-#: ../panels/user-accounts/um-realm-manager.c:827
++#: ../panels/user-accounts/um-realm-manager.c:833
+ #, c-format
+ msgid "Couldn't connect to the %s domain: %s"
+ msgstr "%s களத்துடன் இணைக்க முடியவில்லை: %s"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:376
++#: ../panels/user-accounts/um-user-panel.c:193
++msgid "Other Accounts"
++msgstr "மற்ற கணக்குகள்"
++
++#: ../panels/user-accounts/um-user-panel.c:412
+ msgid "Failed to delete user"
+ msgstr "பயனரை நீக்க முடியவில்லை"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:436
++#: ../panels/user-accounts/um-user-panel.c:477
+ msgid "You cannot delete your own account."
+ msgstr "நீங்கள் உங்கள் கணக்கையே நீக்க முடியாது"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:445
++#: ../panels/user-accounts/um-user-panel.c:486
+ #, c-format
+ msgid "%s is still logged in"
+ msgstr "%s இன்னும் உள் நுழைந்து உள்ளார் "
+ 
+-#: ../panels/user-accounts/um-user-panel.c:449
++#: ../panels/user-accounts/um-user-panel.c:490
+ msgid ""
+ "Deleting a user while they are logged in can leave the system in an "
+ "inconsistent state."
+@@ -6605,12 +6644,12 @@ msgstr ""
+ "ஒரு பயனர் உள் நுழைந்து உள்லபோது அவர் கணக்கை நீக்குவது கணினியை "
+ "நிலையற்றதாக்கும்."
+ 
+-#: ../panels/user-accounts/um-user-panel.c:458
++#: ../panels/user-accounts/um-user-panel.c:499
+ #, c-format
+ msgid "Do you want to keep %s's files?"
+ msgstr "%s இன் கோப்புக்களை வைத்துக்கொள்ள வேண்டுமா?"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:462
++#: ../panels/user-accounts/um-user-panel.c:503
+ msgid ""
+ "It is possible to keep the home directory, mail spool and temporary files "
+ "around when deleting a user account."
+@@ -6619,43 +6658,43 @@ msgstr ""
+ "ஆகியவற்றை "
+ "வைத்துக்கொள்ள முடியும்."
+ 
+-#: ../panels/user-accounts/um-user-panel.c:465
++#: ../panels/user-accounts/um-user-panel.c:506
+ msgid "_Delete Files"
+ msgstr "(_D) கோப்புக்களை நீக்கவும்"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:466
++#: ../panels/user-accounts/um-user-panel.c:507
+ msgid "_Keep Files"
+ msgstr "_K கோப்புக்களை வைத்துக்கொள்ளவும்"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:518
++#: ../panels/user-accounts/um-user-panel.c:559
+ msgctxt "Password mode"
+ msgid "Account disabled"
+ msgstr "கணக்கு முடக்கப்பட்டது"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:526
++#: ../panels/user-accounts/um-user-panel.c:567
+ msgctxt "Password mode"
+ msgid "To be set at next login"
+ msgstr "அடுத்த புகுபதிவில் அமைக்கப்படும்"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:529
++#: ../panels/user-accounts/um-user-panel.c:570
+ msgctxt "Password mode"
+ msgid "None"
+ msgstr "ஏதுமில்லை"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:578
++#: ../panels/user-accounts/um-user-panel.c:619
+ msgid "Logged in"
+ msgstr "புகுபதிவு செய்துள்ளது"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:942
++#: ../panels/user-accounts/um-user-panel.c:999
+ msgid "Failed to contact the accounts service"
+ msgstr "கணக்கு சேவையை தொடர்பு கொள்வதில் தோல்வி"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:944
++#: ../panels/user-accounts/um-user-panel.c:1001
+ msgid "Please make sure that the AccountService is installed and enabled."
+ msgstr ""
+ "கணக்கு சேவை  நிறுவப்பட்டுள்ளதா செயலாக்கப்பட்டுள்ளதா என்பதை சரிபார்க்கவும்"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:985
++#: ../panels/user-accounts/um-user-panel.c:1042
+ msgid ""
+ "To make changes,\n"
+ "click the * icon first"
+@@ -6663,12 +6702,12 @@ msgstr ""
+ "மாற்றங்கள் செய்ய \n"
+ "முதலில் * சின்னத்தை சொடுக்குக"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:1023
++#: ../panels/user-accounts/um-user-panel.c:1080
+ msgid "Create a user account"
+ msgstr "ஒரு பயனர் கணக்கை உருவாக்கு"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:1034
+-#: ../panels/user-accounts/um-user-panel.c:1320
++#: ../panels/user-accounts/um-user-panel.c:1091
++#: ../panels/user-accounts/um-user-panel.c:1380
+ msgid ""
+ "To create a user account,\n"
+ "click the * icon first"
+@@ -6676,12 +6715,12 @@ msgstr ""
+ "புதிய பயனர் கணக்கை உருவாக்க,\n"
+ "முதலில் * சின்னத்தை சொடுக்குக"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:1043
++#: ../panels/user-accounts/um-user-panel.c:1101
+ msgid "Delete the selected user account"
+ msgstr "தேர்ந்தெடுத்த பயனர் கணக்கை நீக்கவும்"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:1055
+-#: ../panels/user-accounts/um-user-panel.c:1325
++#: ../panels/user-accounts/um-user-panel.c:1113
++#: ../panels/user-accounts/um-user-panel.c:1385
+ msgid ""
+ "To delete the selected user account,\n"
+ "click the * icon first"
+@@ -6689,39 +6728,42 @@ msgstr ""
+ "தேர்ந்தெடுத்த பயனர் கணக்கை நீக்க,\n"
+ "முதலில் * சின்னத்தை சொடுக்குக"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:1229
++#: ../panels/user-accounts/um-user-panel.c:1295
+ msgid "My Account"
+ msgstr "என் கணக்கு"
+ 
+-#: ../panels/user-accounts/um-user-panel.c:1238
+-msgid "Other Accounts"
+-msgstr "மற்ற கணக்குகள்"
+-
+-#: ../panels/user-accounts/um-utils.c:516
++#: ../panels/user-accounts/um-utils.c:551
+ #, c-format
+ msgid "A user with the username '%s' already exists"
+ msgstr "'%s' பயனர் பெயரில் ஏற்கெனவே ஒரு பயனர் இருக்கிறார்"
+ 
+-#: ../panels/user-accounts/um-utils.c:520
++#: ../panels/user-accounts/um-utils.c:555
+ #, c-format
+ msgid "The username is too long"
+ msgstr "பயனர்பெயர் மிகவும் பெரியது"
+ 
+-#: ../panels/user-accounts/um-utils.c:523
++#: ../panels/user-accounts/um-utils.c:558
+ msgid "The username cannot start with a '-'"
+ msgstr "பயனர் பெயர் ஒரு '-' உடன் ஆரம்பிக்க முடியாது"
+ 
+-#: ../panels/user-accounts/um-utils.c:526
++#: ../panels/user-accounts/um-utils.c:561
+ msgid ""
+-"The username must only consist of:\n"
+-" ➣ letters from the English alphabet\n"
+-" ➣ digits\n"
+-" ➣ any of the characters '.', '-' and '_'"
++"The username should only consist of lower and upper case letters from a-z, "
++"digits and any of characters '.', '-' and '_'"
+ msgstr ""
+-"பயனர் பெயரில் இவை மட்டும் இருக்கலாம்:\n"
+-"  ➣ ஆங்கில எழுத்துக்களில் சில எழுத்துக்கள்\n"
+-"  ➣ எண்கள்\n"
+-"  ➣ பின் வரும் எழுத்துருக்களில் ஏதேனும் ஒன்று\"'.\", \"-\" மற்றும் \"_'"
++"பயனர் பெயரில் a-z வரையிலான பெரிய மற்றும் சிறிய எழுத்துகள், எண்கள் மற்றும் "
++"'.', '-', "
++"'_' ஆகிய எழுத்துகள் மட்டுமே இருக்கலாம்"
++
++#. Translators: This is a date format string in the style of "Feb 24".
++#: ../panels/user-accounts/um-utils.c:811
++msgid "%b %e"
++msgstr "%b %e"
++
++#. Translators: This is a date format string in the style of "Feb 24, 2013".
++#: ../panels/user-accounts/um-utils.c:815
++msgid "%b %e, %Y"
++msgstr "%b %e, %Y"
+ 
+ #: ../panels/wacom/button-mapping.ui.h:1
+ msgid "Map Buttons"
+@@ -6731,83 +6773,85 @@ msgstr "வரைபட பொத்தான்கள்"
+ msgid "Map buttons to functions"
+ msgstr "வரைபட பொத்தன்களிலிருந்து செயல்களுக்கு"
+ 
+-#: ../panels/wacom/calibrator/gui_gtk.c:79
++#: ../panels/wacom/button-mapping.ui.h:3
++msgid ""
++"To edit a shortcut, choose the \"Send Keystroke\" action, press the keyboard "
++"shortcut button and hold down the new keys or press Backspace to clear."
++msgstr ""
++"ஒரு குறுக்குவழியைத் திருத்த, \"விசை அழுத்தலை அனுப்பு\" செயல்பாட்டைத் தேர்வு "
++"செய்து, "
++"விசைப்பலகை குறுக்குவழி பொத்தானை அழுத்தி, புதிய விசைகளை அழுத்திப் பிடிக்கவும் "
++"அல்லது "
++"அழிக்க பேக்ஸ்பேஸ் ஐ அழுத்தவும்."
++
++#: ../panels/wacom/calibrator/calibrator-gui.c:82
+ msgid ""
+ "Please tap the target markers as they appear on screen to calibrate the "
+ "tablet."
+ msgstr ""
+ "தொடு பல்கையை அளவிட திரையில் இலக்கு குறிகள் தோன்றுகையில் அவற்றை தொடவும்."
+ 
+-#: ../panels/wacom/calibrator/gui_gtk.c:368
++#: ../panels/wacom/calibrator/calibrator-gui.c:86
+ msgid "Mis-click detected, restarting..."
+ msgstr "தவறான சொடுக்கல் கண்டுபிடிக்கப்பட்டது, மீள் துவக்கம்"
+ 
+-#: ../panels/wacom/cc-wacom-mapping-panel.c:275
+-msgid "Output:"
+-msgstr "வெளிப்பாடு:"
+-
+-#. Keep ratio switch
+-#: ../panels/wacom/cc-wacom-mapping-panel.c:287
+-msgid "Keep aspect ratio (letterbox):"
+-msgstr " காட்சி பாங்கு விகிதத்தை வைத்திரு (அஞ்சல்பெட்டி):"
+-
+-#. Whole-desktop checkbox
+-#: ../panels/wacom/cc-wacom-mapping-panel.c:298
+-msgid "Map to single monitor"
+-msgstr "வரை படத்திலிருந்து ஒற்றை திரைக்கு"
++#: ../panels/wacom/cc-wacom-button-row.c:443
++msgctxt "Wacom tablet button"
++msgid "Up"
++msgstr "மேலே"
+ 
+-#: ../panels/wacom/cc-wacom-nav-button.c:89
+-#, c-format
+-msgid "%d of %d"
+-msgstr "%d  %d இல் "
++#: ../panels/wacom/cc-wacom-button-row.c:444
++msgctxt "Wacom tablet button"
++msgid "Down"
++msgstr "கீழே"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:122 ../panels/wacom/cc-wacom-page.c:407
++#: ../panels/wacom/cc-wacom-button-row.h:55
+ msgctxt "Wacom action-type"
+ msgid "None"
+ msgstr "எதுவுமில்லை"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:123
++#: ../panels/wacom/cc-wacom-button-row.h:56
+ msgctxt "Wacom action-type"
+ msgid "Send Keystroke"
+ msgstr "விசைதட்டலை அனுப்பு"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:124
++#: ../panels/wacom/cc-wacom-button-row.h:57
+ msgctxt "Wacom action-type"
+ msgid "Switch Monitor"
+ msgstr "மானிட்டரை மாற்றுக"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:125
++#: ../panels/wacom/cc-wacom-button-row.h:58
+ msgctxt "Wacom action-type"
+ msgid "Show On-Screen Help"
+ msgstr "திரையிலான உதவியைக் காண்பி"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:644
+-msgctxt "Wacom tablet button"
+-msgid "Up"
+-msgstr "மேலே"
+-
+-#: ../panels/wacom/cc-wacom-page.c:644
+-msgctxt "Wacom tablet button"
+-msgid "Down"
+-msgstr "கீழே"
++#: ../panels/wacom/cc-wacom-mapping-panel.c:264
++msgid "Output:"
++msgstr "வெளிப்பாடு:"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:685
+-msgid "Switch Modes"
+-msgstr "மாற்றி பாங்குகள்"
++#. Keep ratio switch
++#: ../panels/wacom/cc-wacom-mapping-panel.c:276
++msgid "Keep aspect ratio (letterbox):"
++msgstr " காட்சி பாங்கு விகிதத்தை வைத்திரு (அஞ்சல்பெட்டி):"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:775
+-#: ../panels/wacom/cc-wacom-stylus-page.c:373
+-msgid "Button"
+-msgstr "பொத்தான்"
++#. Whole-desktop checkbox
++#: ../panels/wacom/cc-wacom-mapping-panel.c:287
++msgid "Map to single monitor"
++msgstr "வரை படத்திலிருந்து ஒற்றை திரைக்கு"
+ 
+-#: ../panels/wacom/cc-wacom-page.c:833
+-msgid "Action"
+-msgstr "செயல்"
++#: ../panels/wacom/cc-wacom-nav-button.c:89
++#, c-format
++msgid "%d of %d"
++msgstr "%d  %d இல் "
+ 
+-#: ../panels/wacom/cc-wacom-page.c:943
++#: ../panels/wacom/cc-wacom-page.c:531
+ msgid "Display Mapping"
+ msgstr "வரைபடத்தை காட்டு"
+ 
++#: ../panels/wacom/cc-wacom-stylus-page.c:373
++msgid "Button"
++msgstr "பொத்தான்"
++
+ #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1
+ #: ../panels/wacom/gnome-wacom-properties.ui.h:7
+ msgid "Wacom Tablet"
+@@ -6861,7 +6905,6 @@ msgid "Adjust display resolution"
+ msgstr "திரைக்காட்சி தெளிதிறனை சரிசெய்யவும்"
+ 
+ #: ../panels/wacom/gnome-wacom-properties.ui.h:12
+-#| msgid "Mouse Settings"
+ msgid "Adjust mouse settings"
+ msgstr "சொடுக்கி அமைப்புகளை சரிசெய்யவும்"
+ 
+@@ -6874,90 +6917,94 @@ msgid "Left-Handed Orientation"
+ msgstr "இடது கைவாகு திசைவி"
+ 
+ #. If no mode is available, we use "left-ring-mode-1" for backward compat
+-#: ../panels/wacom/gsd-wacom-device.c:1076
++#: ../panels/wacom/gsd-wacom-device.c:1063
+ msgid "Left Ring"
+ msgstr "இடது வளையம்"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1086
++#: ../panels/wacom/gsd-wacom-device.c:1074
+ #, c-format
+ msgid "Left Ring Mode #%d"
+ msgstr "இடது வட்ட பாங்கு #%d"
+ 
+ #. If no mode is available, we use "right-ring-mode-1" for backward compat
+-#: ../panels/wacom/gsd-wacom-device.c:1105
++#: ../panels/wacom/gsd-wacom-device.c:1094
+ msgid "Right Ring"
+ msgstr "வலது வளையம்"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1115
++#: ../panels/wacom/gsd-wacom-device.c:1105
+ #, c-format
+ msgid "Right Ring Mode #%d"
+ msgstr "வலது வட்ட பாங்கு #%d"
+ 
+ #. If no mode is available, we use "left-strip-mode-1" for backward compat
+-#: ../panels/wacom/gsd-wacom-device.c:1156
++#: ../panels/wacom/gsd-wacom-device.c:1147
+ msgid "Left Touchstrip"
+ msgstr "இடது தொடுபட்டை"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1166
++#: ../panels/wacom/gsd-wacom-device.c:1158
+ #, c-format
+ msgid "Left Touchstrip Mode #%d"
+ msgstr "இடது தொடுபட்டை பாங்கு #%d"
+ 
+ #. If no mode is available, we use "right-strip-mode-1" for backward compat
+-#: ../panels/wacom/gsd-wacom-device.c:1185
++#: ../panels/wacom/gsd-wacom-device.c:1178
+ msgid "Right Touchstrip"
+ msgstr "வலது தொடுபட்டை"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1195
++#: ../panels/wacom/gsd-wacom-device.c:1189
+ #, c-format
+ msgid "Right Touchstrip Mode #%d"
+ msgstr "வலது தொடு பட்டை பாங்கு #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1220
++#: ../panels/wacom/gsd-wacom-device.c:1215
+ #, c-format
+ msgid "Left Touchring Mode Switch"
+ msgstr "இடது தொடு வட்ட பாங்கு மாற்றி "
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1222
++#: ../panels/wacom/gsd-wacom-device.c:1217
+ #, c-format
+ msgid "Right Touchring Mode Switch"
+ msgstr "வலது தொடு வட்ட பாங்கு மாற்றி "
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1225
++#: ../panels/wacom/gsd-wacom-device.c:1220
+ #, c-format
+ msgid "Left Touchstrip Mode Switch"
+ msgstr "இடது தொடு பட்டை பாங்கு மாற்றி "
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1227
++#: ../panels/wacom/gsd-wacom-device.c:1222
+ #, c-format
+ msgid "Right Touchstrip Mode Switch"
+ msgstr "வலது தொடு பட்டை பாங்கு மாற்றி "
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1232
++#: ../panels/wacom/gsd-wacom-device.c:1227
+ #, c-format
+ msgid "Mode Switch #%d"
+ msgstr "பாங்கு மாற்றி #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1336
++#: ../panels/wacom/gsd-wacom-device.c:1335
+ #, c-format
+ msgid "Left Button #%d"
+ msgstr "இடது பொத்தான் #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1339
++#: ../panels/wacom/gsd-wacom-device.c:1338
+ #, c-format
+ msgid "Right Button #%d"
+ msgstr "வலது பொத்தான் #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1342
++#: ../panels/wacom/gsd-wacom-device.c:1341
+ #, c-format
+ msgid "Top Button #%d"
+ msgstr "மேல் பொத்தான் #%d"
+ 
+-#: ../panels/wacom/gsd-wacom-device.c:1345
++#: ../panels/wacom/gsd-wacom-device.c:1344
+ #, c-format
+ msgid "Bottom Button #%d"
+ msgstr "கீழ் பொத்தான் #%d"
+ 
++#: ../panels/wacom/gsd-wacom-key-shortcut-button.c:264
++msgid "New shortcut…"
++msgstr "புதிய குறுவழி…"
++
+ #: ../panels/wacom/wacom-stylus-page.ui.h:1
+ msgid "No Action"
+ msgstr "செயல் இல்லை"
+@@ -7026,40 +7073,40 @@ msgstr "கீழ் பொத்தான்"
+ msgid "Tip Pressure Feel"
+ msgstr "நுனி அழுத்த உணர்வு"
+ 
+-#: ../shell/cc-application.c:66
++#: ../shell/cc-application.c:69
+ msgid "Enable verbose mode"
+ msgstr "வெர்போஸ் பாங்கை செயல்படுத்து"
+ 
+-#: ../shell/cc-application.c:67
++#: ../shell/cc-application.c:70
+ msgid "Show the overview"
+ msgstr "மேல்காணலை காட்டுக"
+ 
+-#: ../shell/cc-application.c:68
++#: ../shell/cc-application.c:71
+ msgid "Search for the string"
+ msgstr "சரத்தைத் தேடு"
+ 
+-#: ../shell/cc-application.c:69
++#: ../shell/cc-application.c:72
+ msgid "List possible panel names and exit"
+ msgstr "சாத்தியமுள்ள பலக பெயர்களைப் பட்டியலிட்டுவிட்டு வெளியேறு"
+ 
+-#: ../shell/cc-application.c:70 ../shell/cc-application.c:71
+-#: ../shell/cc-application.c:72
++#: ../shell/cc-application.c:73 ../shell/cc-application.c:74
++#: ../shell/cc-application.c:75
+ msgid "Show help options"
+ msgstr "உதவி விருப்பங்களை காட்டு"
+ 
+-#: ../shell/cc-application.c:73
++#: ../shell/cc-application.c:76
+ msgid "Panel to display"
+ msgstr "காட்ட பலகம்"
+ 
+-#: ../shell/cc-application.c:73
++#: ../shell/cc-application.c:76
+ msgid "[PANEL] [ARGUMENT…]"
+ msgstr "[PANEL] [ARGUMENT…]"
+ 
+-#: ../shell/cc-application.c:139
++#: ../shell/cc-application.c:142
+ msgid "- Settings"
+ msgstr "- அமைப்புகள்"
+ 
+-#: ../shell/cc-application.c:148
++#: ../shell/cc-application.c:160
+ #, c-format
+ msgid ""
+ "%s\n"
+@@ -7068,46 +7115,479 @@ msgstr ""
+ "%s\n"
+ "'%s --help´ ஒரு முழு பட்டியலில் இருக்கும் கட்டளை வரி விருப்பங்களை காண.\n"
+ 
+-#: ../shell/cc-application.c:178
++#: ../shell/cc-application.c:190
+ msgid "Available panels:"
+ msgstr "கிடைக்கும் பலகங்கள்:"
+ 
+-#: ../shell/cc-application.c:313
++#: ../shell/cc-application.c:325
+ msgid "Help"
+ msgstr "உதவி"
+ 
+-#: ../shell/cc-application.c:314
++#: ../shell/cc-application.c:326
+ msgid "Quit"
+ msgstr "வெளியேறு"
+ 
+-#: ../shell/cc-window.c:61 ../shell/gnome-control-center.desktop.in.in.h:1
+-msgid "Settings"
+-msgstr "அமைவுகள்"
++#: ../shell/cc-window.c:61 ../shell/cc-window.c:1486
++msgid "All Settings"
++msgstr "எல்லா அமைப்புகளும்"
+ 
+ #. Add categories
+-#: ../shell/cc-window.c:857
++#: ../shell/cc-window.c:868
+ msgctxt "category"
+ msgid "Personal"
+ msgstr "தனிப்பட்டவை"
+ 
+-#: ../shell/cc-window.c:858
++#: ../shell/cc-window.c:869
+ msgctxt "category"
+ msgid "Hardware"
+ msgstr "வன்பொருள்"
+ 
+-#: ../shell/cc-window.c:859
++#: ../shell/cc-window.c:870
+ msgctxt "category"
+ msgid "System"
+ msgstr "கணினி"
+ 
+-#: ../shell/cc-window.c:1421
+-msgid "All Settings"
+-msgstr "எல்லா அமைப்புகளும்"
++#: ../shell/cc-window.c:1597 ../shell/gnome-control-center.desktop.in.in.h:1
++msgid "Settings"
++msgstr "அமைவுகள்"
+ 
+ #: ../shell/gnome-control-center.desktop.in.in.h:2
+ msgid "Preferences;Settings;"
+ msgstr "விருப்பங்கள்;அமைப்புகள்;"
+ 
++#~ msgid "Device type:"
++#~ msgstr "சாதன வகை:"
++
++#~ msgid "Manufacturer:"
++#~ msgstr "உருவாக்கியவர்: "
++
++#~ msgid "Model:"
++#~ msgstr "மாதிரி:"
++
++#~ msgid ""
++#~ "Image files can be dragged on this window to auto-complete the above "
++#~ "fields."
++#~ msgstr ""
++#~ "மேல் காணும் புலங்களை தானியங்கியாக பூர்த்தி செய்ய பிம்ப கோப்புக்களை இந்த சாளரத்தில் "
++#~ "இழுத்துவிடலாம்."
++
++#~ msgid "Left Shift"
++#~ msgstr "இடது Shift"
++
++#~ msgid "Left Alt"
++#~ msgstr "இடது Alt"
++
++#~ msgid "Left Ctrl"
++#~ msgstr "இடது Ctrl"
++
++#~ msgid "Right Shift"
++#~ msgstr "வலது Shift"
++
++#~ msgid "Right Alt"
++#~ msgstr "வலது Alt"
++
++#~ msgid "Right Ctrl"
++#~ msgstr "வலது Ctrl"
++
++#~ msgid "Left Alt+Shift"
++#~ msgstr "இடது Alt+Shift"
++
++#~ msgid "Right Alt+Shift"
++#~ msgstr "வலது Alt+Shift"
++
++#~ msgid "Left Ctrl+Shift"
++#~ msgstr "இடது Ctrl+Shift"
++
++#~ msgid "Right Ctrl+Shift"
++#~ msgstr "வலது Ctrl+Shift"
++
++#~ msgid "Left+Right Shift"
++#~ msgstr "இடது+வலது Shift"
++
++#~ msgid "Left+Right Ctrl"
++#~ msgstr "இடது+வலது Ctrl"
++
++#~ msgid "Alt+Shift"
++#~ msgstr "Alt+Shift"
++
++#~ msgid "Ctrl+Shift"
++#~ msgstr "Ctrl+Shift"
++
++#~ msgid "Alt+Ctrl"
++#~ msgstr "Alt+Ctrl"
++
++#~ msgid "Caps"
++#~ msgstr "Caps"
++
++#~ msgid "Shift+Caps"
++#~ msgstr "Shift+Caps"
++
++#~ msgid "Alt+Caps"
++#~ msgstr "Alt+Caps"
++
++#~ msgid "Ctrl+Caps"
++#~ msgstr "Ctrl+Caps"
++
++#~ msgid "_Region:"
++#~ msgstr "_R வட்டாரம்:"
++
++#~ msgid "_City:"
++#~ msgstr "நகரம் (_C):"
++
++#~ msgid "_Network Time"
++#~ msgstr "_N பிணைய நேரம்"
++
++#~ msgid ":"
++#~ msgstr ":"
++
++#~ msgid "Set the time one hour ahead."
++#~ msgstr "நேரத்தை ஒரு மனி முன்னே அமை."
++
++#~ msgid "Set the time one hour back."
++#~ msgstr "நேரத்தை ஒரு மனி பின்னே அமை."
++
++#~ msgid "Set the time one minute ahead."
++#~ msgstr "நேரத்தை ஒரு நிமிடம்  முன்னே அமை."
++
++#~ msgid "Set the time one minute back."
++#~ msgstr "நேரத்தை ஒரு நிமிடம் பின்னே அமை."
++
++#~ msgid "Switch between AM and PM."
++#~ msgstr "முற்பகல் பிற்பகலுக்குள் மாறு"
++
++#~ msgid "AM/PM"
++#~ msgstr "முப/பிப"
++
++#~ msgctxt "display panel, rotation"
++#~ msgid "Normal"
++#~ msgstr "இயல்பான"
++
++#~ msgctxt "display panel, rotation"
++#~ msgid "Counterclockwise"
++#~ msgstr "இடம்புரியாக "
++
++#~ msgctxt "display panel, rotation"
++#~ msgid "Clockwise"
++#~ msgstr "வலம்புரியாக "
++
++#~ msgctxt "display panel, rotation"
++#~ msgid "180 Degrees"
++#~ msgstr "180 பாகைகள்"
++
++#~ msgid "Monitor"
++#~ msgstr "மானிட்டர்"
++
++#~ msgid "Drag to change primary display."
++#~ msgstr "முதன்மை காட்சியை மாற்ற இழுக்கவும்"
++
++#~ msgid ""
++#~ "Select a monitor to change its properties; drag it to rearrange its "
++#~ "placement."
++#~ msgstr ""
++#~ "பண்புகளை  மாற்ற ஒரு திரையகத்தை   தேர்வு செய்க; அதன் இடத்தை  மாற்ற அதை  இழுக்கவும்."
++
++#~ msgid "%a %R"
++#~ msgstr "%a %R"
++
++#~ msgid "%a %l:%M %p"
++#~ msgstr "%b %d %l:%M %p"
++
++#~ msgid "Failed to apply configuration: %s"
++#~ msgstr "வடிவமைப்பினை செயலாக்குவதில் பிழை: %s"
++
++#~ msgid "Could not save the monitor configuration"
++#~ msgstr "மானிட்டர் கட்டமைப்பை சேமிக்க முடியவில்லை"
++
++#~ msgid "Could not detect displays"
++#~ msgstr "காட்சிகளை கண்டறிய முடியவில்லை"
++
++#~ msgid "_Resolution"
++#~ msgstr "தெளிவுத்திறன் (_R)"
++
++#~ msgid "R_otation"
++#~ msgstr "சுழற்சி (_o):"
++
++#~ msgid "_Mirror displays"
++#~ msgstr "பிரதிபலிக்கும்  திரைகள் (_M)"
++
++#~ msgid "Note: may limit resolution options"
++#~ msgstr "குறிப்பு: தெளிதிறன் தேர்வுகளை கட்டுப்படுத்தலாம்"
++
++#~ msgid "_Detect Displays"
++#~ msgstr "திரைகளை கண்டுபிடி"
++
++#~ msgid "Mouse Preferences"
++#~ msgstr "சொடுக்கி பண்புகள்"
++
++#~ msgid "C_ontent sticks to fingers"
++#~ msgstr "_o உள்ளடக்கம் விரலுக்கு ஒட்டும்"
++
++#~ msgid "Select the interface to use for the new service"
++#~ msgstr "புதிய சேவைக்கு இடைமுகத்தை தேர்ந்தெடு"
++
++#~ msgid "C_reate…"
++#~ msgstr "உருவாக்கு... (_r)"
++
++#~ msgid "_Interface"
++#~ msgstr "_I இடைமுகம்"
++
++#~ msgid "Estimated battery capacity: %s"
++#~ msgstr "கணக்கிடப்பட்ட பேட்டரி திறன்: %s"
++
++#~ msgid "Hidden"
++#~ msgstr "மறைக்கப்பட்டது"
++
++#~ msgid "Visible"
++#~ msgstr "புலப்படும்"
++
++#~ msgid "Name & Visibility"
++#~ msgstr "பெயர் & புலப்படுதன்மை"
++
++#~ msgid "Control how you appear on the screen and the network."
++#~ msgstr ""
++#~ "திரையிலும் பிணையத்திலும் நீங்கள் எப்படி காண்பிக்கப்படுவீர்கள் என்பதைக் கட்டுப்படுத்தவும்."
++
++#~ msgid "Display _full name in top bar"
++#~ msgstr "மேல் பட்டியில் முழுப் பெயரைக் காண்பி (_f)"
++
++#~ msgid "Display full name in _lock screen"
++#~ msgstr "திரைப்பூட்டில் முழுப் பெயரைக் காண்பி (_l)"
++
++#~ msgid "_Stealth Mode"
++#~ msgstr "பதுங்கல் பயன்முறை (_S)"
++
++#~ msgid "Share Public Folder"
++#~ msgstr "பொதுக் கோப்புறையைப் பகிரவும்"
++
++#~ msgid "Only share with Trusted Devices"
++#~ msgstr "நம்பகமான சாதனங்களிடம் மட்டும் பகிரவும்"
++
++#~ msgid "No shortcut set"
++#~ msgstr "சுருக்கு வழி அமைக்கவில்லை"
++
++#~ msgctxt "universal access, contrast"
++#~ msgid "Normal"
++#~ msgstr "இயல்பாக"
++
++#~ msgctxt "universal access, contrast"
++#~ msgid "High/Inverse"
++#~ msgstr "உயர் மாறுபாடு /எதிர்மறை"
++
++#~ msgid "On screen keyboard"
++#~ msgstr "திரை விசைப்பலகை"
++
++#~ msgid "OnBoard"
++#~ msgstr "உள்ளே"
++
++#~ msgid "75%"
++#~ msgstr "75%"
++
++#~ msgid "100%"
++#~ msgstr "100%"
++
++#~ msgctxt "universal access, text size"
++#~ msgid "Normal"
++#~ msgstr "இயல்பான"
++
++#~ msgid "125%"
++#~ msgstr "125%"
++
++#~ msgid "150%"
++#~ msgstr "150%"
++
++#~ msgctxt "universal access, text size"
++#~ msgid "Larger"
++#~ msgstr "இன்னும் பெரிய"
++
++#~ msgid "Beep on Caps and Num Lock"
++#~ msgstr "தலைப்பெழுத்து மற்றும் எண் ஆகியன பூட்டப்படும்போது பீப் ஒலி எழுப்புக."
++
++#~ msgid "Turn on or off:"
++#~ msgstr "இயக்கு அல்லது நிறுத்து:"
++
++#~ msgctxt "universal access, zoom"
++#~ msgid "Zoom"
++#~ msgstr "அணுகிப்பார்"
++
++#~ msgid "Zoom in:"
++#~ msgstr "அணுகிப்பார்:"
++
++#~ msgid "Zoom out:"
++#~ msgstr "விலகிப்பார்:"
++
++#~ msgid "Closed Captioning"
++#~ msgstr "தலைப்பிடுதலை நிறுத்து"
++
++#~ msgid "Display a textual description of speech and sounds"
++#~ msgstr "பேச்சு ஒலி ஆகியவற்றின் உரை விவரணத்தை காட்டுக."
++
++#~ msgid "On Screen Keyboard"
++#~ msgstr "திரை விசைப்பலகை"
++
++#~ msgctxt "universal access, delay"
++#~ msgid "Short"
++#~ msgstr "குறுகிய"
++
++#~ msgctxt "universal access, delay"
++#~ msgid "Long"
++#~ msgstr "நீண்ட"
++
++#~ msgid "Beep when a key is"
++#~ msgstr "எந்த விசையும்  அழுத்தினால் பீப் ஒலி எழுப்புக"
++
++#~ msgid "pressed"
++#~ msgstr "அழுத்தியது"
++
++#~ msgid "accepted"
++#~ msgstr "ஏற்கப்பட்டது"
++
++#~ msgid "rejected"
++#~ msgstr "நிராகரிக்கப்பட்டது "
++
++#~ msgid "Acc_eptance delay:"
++#~ msgstr "_e ஒப்புக்கொள்ளல் தாமதம்:"
++
++#~ msgid "Control the pointer using the keypad"
++#~ msgstr "சுட்டியை விசைபலகத்தால் கட்டுப்படுத்துக."
++
++#~ msgid "Video Mouse"
++#~ msgstr "வீடியோ சொடுக்கி"
++
++#~ msgid "Control the pointer using the video camera."
++#~ msgstr "விடியோ காமிராவை வைத்து சுட்டியை கட்டுப்படுத்துக."
++
++#~ msgctxt "universal access, threshold"
++#~ msgid "Small"
++#~ msgstr "சிறிய"
++
++#~ msgctxt "universal access, threshold"
++#~ msgid "Large"
++#~ msgstr "பெரிய"
++
++#~ msgid "Mouse Settings"
++#~ msgstr "சொடுக்கி அமைப்புகள்"
++
++#~ msgid "Add account"
++#~ msgstr "கணக்கை சேர்"
++
++#~ msgid "_Local Account"
++#~ msgstr "_L உள்ளமை கணக்கு"
++
++#~ msgid "_Login Name"
++#~ msgstr "உள் நுழை பெயர் (_L)"
++
++#~ msgid "Tip: Enterprise domain or realm name"
++#~ msgstr "குறிப்பு: என்டர்ப்ரைஸ் களப்பெயர் அல்லது ஆட்சி பெயர்"
++
++#~ msgid "C_ontinue"
++#~ msgstr "_o தொடர்"
++
++#~ msgid "Previous Week"
++#~ msgstr "முந்தைய வாரம்"
++
++#~ msgid "Next Week"
++#~ msgstr "அடுத்த வாரம்"
++
++#~ msgid "Next week"
++#~ msgstr "அடுத்த வாரம்"
++
++#~ msgid "Log in without a password"
++#~ msgstr "கடவுச்சொல் இன்றி உள்நுழை"
++
++#~ msgid "Disable this account"
++#~ msgstr "இந்த கணக்கை முடக்கு"
++
++#~ msgid "Enable this account"
++#~ msgstr "இந்த கணக்கை செயலாக்கு"
++
++#~ msgid "C_onfirm password"
++#~ msgstr "_o கடவுச் சொல்லை உறுதி செய்க: "
++
++#~ msgid "Generate a password"
++#~ msgstr "ஒரு கடவுச்சொல்லை உருவாக்கு"
++
++#~ msgid "_Action"
++#~ msgstr "செயல் (_A)"
++
++#~ msgid "_Show password"
++#~ msgstr "_S கடவுச்சொல்லை காட்டு"
++
++#~ msgid "How to choose a strong password"
++#~ msgstr "வலிமையான கடவுச்சொல்லை தேர்ந்தெடுப்பது எப்படி"
++
++#~ msgid "Changing photo for:"
++#~ msgstr "இவருக்கு படத்தை மாற்றுகிறது:"
++
++#~ msgid ""
++#~ "Choose a picture that will be shown at the login screen for this account."
++#~ msgstr "இந்த கணக்குக்கு உள்புகுகை திரையில் காட்ட ஒரு படத்தை தேர்ந்தெடு."
++
++#~ msgid "Gallery"
++#~ msgstr "பிம்ப சேகரிப்பு "
++
++#~ msgid "Take a photograph"
++#~ msgstr "ஒரு போட்டோ எடுக்கவும் "
++
++#~ msgid "Browse"
++#~ msgstr "உலாவு"
++
++#~ msgid "Photograph"
++#~ msgstr "புகைப்படம்"
++
++#~ msgid "Account Information"
++#~ msgstr "கணக்கு தகவல்"
++
++#~ msgctxt "Password strength"
++#~ msgid "Too short"
++#~ msgstr "மிகச் சிறியது"
++
++#~ msgctxt "Password strength"
++#~ msgid "Not good enough"
++#~ msgstr "போதிய அளவு நன்றாக இல்லை"
++
++#~ msgctxt "Password strength"
++#~ msgid "Weak"
++#~ msgstr "பலகீனமானது"
++
++#~ msgctxt "Password strength"
++#~ msgid "Fair"
++#~ msgstr "மிதமான"
++
++#~ msgctxt "Password strength"
++#~ msgid "Good"
++#~ msgstr "நன்று"
++
++#~ msgctxt "Password strength"
++#~ msgid "Strong"
++#~ msgstr "பலமானது"
++
++#~ msgid "_Generate a password"
++#~ msgstr "_G ஒரு கடவுச்சொல்லை உருவாக்கு"
++
++#~ msgid "You need to enter a new password"
++#~ msgstr "நீங்கள் புதிய கடவுச்சொல்லை உள்ளிட வேண்டும்"
++
++#~ msgid "The new password is not strong enough"
++#~ msgstr "புதிய கடவுச்சொல் போதுமான அளவு வலிமையாக இல்லை"
++
++#~ msgid "You need to confirm the password"
++#~ msgstr "கடவுச்சொல் ஐ உறுதி செய்ய வேண்டும்."
++
++#~ msgid "You need to enter your current password"
++#~ msgstr "நீங்கள் நடப்பு கடவுச்சொல்லை உள்ளிட வேண்டும் "
++
++#~ msgid "The current password is not correct"
++#~ msgstr "நடப்பு கடவுச்சொல் தவறானது"
++
++#~ msgid "Wrong password"
++#~ msgstr "தவறான கடவுச்சொல்"
++
++#~ msgid "Switch Modes"
++#~ msgstr "மாற்றி பாங்குகள்"
++
++#~ msgid "Action"
++#~ msgstr "செயல்"
++
+ #~ msgid "Export"
+ #~ msgstr "ஏற்றுமதி"
+ 
+@@ -7700,9 +8180,6 @@ msgstr "விருப்பங்கள்;அமைப்புகள்;"
+ #~ msgid "Remove wallpaper"
+ #~ msgstr "சுவர்-காகிதங்கள் நீக்கு"
+ 
+-#~ msgid "Secondary color"
+-#~ msgstr "இரண்டாம் நிலை நிறம்"
+-
+ #~ msgid "Swap colors"
+ #~ msgstr "நிறங்களை இட மாற்றுக"
+ 
+@@ -7757,9 +8234,6 @@ msgstr "விருப்பங்கள்;அமைப்புகள்;"
+ #~ msgid "_Disabled"
+ #~ msgstr "_D முடக்கப்பட்டது"
+ 
+-#~ msgid "_Edge scrolling"
+-#~ msgstr "(_E) விளிம்பு உருளல்"
+-
+ #~ msgid "_Left-handed"
+ #~ msgstr "(_L) இடதுகைவாகு"
+ 
+@@ -7818,9 +8292,6 @@ msgstr "விருப்பங்கள்;அமைப்புகள்;"
+ #~ msgid "affect how much power is used"
+ #~ msgstr "எவ்வளவு மின் சக்தி பயன்படுத்தப்படும் என பாதிக்கிறது"
+ 
+-#~ msgid "Add User"
+-#~ msgstr "பயனர் சேர்"
+-
+ #~ msgid "Allowed users"
+ #~ msgstr "அனுமதிக்கப்பட்ட பயனர்கள்"
+ 
+@@ -7882,15 +8353,9 @@ msgstr "விருப்பங்கள்;அமைப்புகள்;"
+ #~ msgid "Nomon"
+ #~ msgstr "நோமோன் (மானிட்டர் ஏதுமில்லை)"
+ 
+-#~ msgid "Screen keyboard"
+-#~ msgstr "திரை விசைப்பலகை"
+-
+ #~ msgid "Type here to test settings"
+ #~ msgstr "அமைப்புகளை சோதிக்க இங்கு உள்ளிடவும்:"
+ 
+-#~ msgid "Typing Assistant"
+-#~ msgstr "தட்டச்சு உதவியாளர்"
+-
+ #~ msgid "_Text size:"
+ #~ msgstr "_T உரை அளவு:"
+ 
+@@ -7965,9 +8430,6 @@ msgstr "விருப்பங்கள்;அமைப்புகள்;"
+ #~ msgid "Toggle screen reader"
+ #~ msgstr "திரைபடிப்பானை மாற்று"
+ 
+-#~ msgid "New shortcut..."
+-#~ msgstr "புதிய குறுவழி..."
+-
+ #~ msgid "Accelerator key"
+ #~ msgstr "முடுக்கல் விசை"
+ 
+@@ -8479,9 +8941,6 @@ msgstr "விருப்பங்கள்;அமைப்புகள்;"
+ #~ msgid "Upside Down"
+ #~ msgstr "தலை கீழ்"
+ 
+-#~ msgid "Mirror Screens"
+-#~ msgstr "பிரதிபலிக்கும்  திரைகள்"
+-
+ #~ msgid "Desktop"
+ #~ msgstr "மேசைச்சூழல்"
+ 
+@@ -8634,9 +9093,6 @@ msgstr "விருப்பங்கள்;அமைப்புகள்;"
+ #~ msgid "Shift+Ctrl+Alt+="
+ #~ msgstr "ஷிப்ட்+கன்ட்ரோல்+ஆல்ட்+="
+ 
+-#~ msgid "Show Universal Access status"
+-#~ msgstr "உலகளாவிய அணுகல் நிலையை காட்டுக"
+-
+ #~ msgid "Use an alternative form of text input"
+ #~ msgstr "மாற்று உள்ளீடு வகையை பயன்படுத்துக "
+ 
+@@ -8669,9 +9125,6 @@ msgstr "விருப்பங்கள்;அமைப்புகள்;"
+ #~ msgid "E-mail address:"
+ #~ msgstr "மின்னஞ்சல் முகவரி:"
+ 
+-#~ msgid "Open"
+-#~ msgstr "திற"
+-
+ #~ msgid "Restrictions:"
+ #~ msgstr "ஆவண தடைகள்:"
+ 
+@@ -8883,15 +9336,9 @@ msgstr "விருப்பங்கள்;அமைப்புகள்;"
+ #~ msgid "Beep when a _toggle key is pressed"
+ #~ msgstr "(_t) முன் பின் மாற்று விசை  அழுத்தினால் பீப் ஒலி எழுப்புக"
+ 
+-#~ msgid "Beep when a key is pr_essed"
+-#~ msgstr "(_e) எந்த விசையும்  அழுத்தினால் பீப் ஒலி எழுப்புக"
+-
+ #~ msgid "Beep when a key is reje_cted"
+ #~ msgstr "(_c) விசை ஏற்கப்படவில்லையானால் பீப் ஒலி எழுப்புக"
+ 
+-#~ msgid "Beep when key is _accepted"
+-#~ msgstr "(_a) விசை ஏற்கப்பட்டால் பீப் ஒலி எழுப்புக"
+-
+ #~ msgid "Beep when key is _rejected"
+ #~ msgstr "(_r) விசை ஏற்கப்படவில்லையானால் பீப் ஒலி எழுப்புக"
+ 
+@@ -8928,9 +9375,6 @@ msgstr "விருப்பங்கள்;அமைப்புகள்;"
+ #~ msgid "Duration of work before forcing a break"
+ #~ msgstr "இவ்வளவு வேலைக்குப் பிறகு இடைவேளையை கட்டாயமாக்கு"
+ 
+-#~ msgid "Keyboard Preferences"
+-#~ msgstr "விசைப்பலகை விருப்பங்கள்"
+-
+ #~ msgid ""
+ #~ "Lock screen after a certain duration to help prevent repetitive keyboard "
+ #~ "use injuries"
+@@ -9149,9 +9593,6 @@ msgstr "விருப்பங்கள்;அமைப்புகள்;"
+ #~ msgid "Whether to thumbnail Type1 fonts"
+ #~ msgstr "Type1 எழுத்துருக்களை சிறுபடமாக்க வேண்டுமா"
+ 
+-#~ msgid "Size:"
+-#~ msgstr "அளவு:"
+-
+ #~ msgid "Copyright:"
+ #~ msgstr "காப்புரிமை:"
+ 
+@@ -10058,21 +10499,12 @@ msgstr "விருப்பங்கள்;அமைப்புகள்;"
+ #~ msgid "?"
+ #~ msgstr "?"
+ 
+-#~ msgid "%l:%M %p"
+-#~ msgstr "%l:%M %p"
+-
+ #~ msgid "Today %l:%M %p"
+ #~ msgstr "இன்று %l:%M %p"
+ 
+ #~ msgid "Yesterday %l:%M %p"
+ #~ msgstr "நேற்று %b %d %l:%M %p"
+ 
+-#~ msgid "%b %d %l:%M %p"
+-#~ msgstr "%b %d %l:%M %p"
+-
+-#~ msgid "%b %d %Y"
+-#~ msgstr "%b %d %Y"
+-
+ #~ msgid "Find Now"
+ #~ msgstr "இப்போது கண்டறி"
+ 
+diff --git a/po/zh_CN.po b/po/zh_CN.po
+index e163011..5fbd38a 100644
+--- a/po/zh_CN.po
++++ b/po/zh_CN.po
+@@ -15,7 +15,7 @@
+ # zhang ping <zhangping159@gmail.com>, 2010.
+ # 指冷玉笙寒 (dhyang) <dhyang555@gmail.com>, 2011.
+ # Lele Long <schemacs@gmail.com>, 2011.
+-# Wylmer Wang <wantinghard@gmail.com>, 2011, 2012.
++# Wylmer Wang <wantinghard@gmail.com>, 2011, 2012, 2014.
+ # Wind He <lofwind@gmail.com>, 2011.
+ # bsfmig <bigslowfat@gmail.com>, 2012.
+ # Cheng Lu <chenglu1990@gmail.com>, 2012.
+@@ -27,9 +27,9 @@ msgstr ""
+ "Project-Id-Version: gnome-control-center master\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "control-center&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-11-09 10:32+0000\n"
++"POT-Creation-Date: 2014-01-15 16:01+0000\n"
+ "PO-Revision-Date: 2013-08-16 12:12+0800\n"
+-"Last-Translator: Luo Lei <luolei@ubuntukylin.com>\n"
++"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
+ "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+ "Language: zh_CN\n"
+ "MIME-Version: 1.0\n"
+@@ -46,7 +46,7 @@ msgstr "背景"
+ #. This refers to a slideshow background
+ #: ../panels/background/background.ui.h:3
+ msgid "Changes throughout the day"
+-msgstr "该日内所有改变"
++msgstr "在一天内按时切换"
+ 
+ #: ../panels/background/background.ui.h:4
+ msgid "Lock Screen"
+@@ -115,11 +115,11 @@ msgstr "未找到图片"
+ msgid "You can add images to your %s folder and they will show up here"
+ msgstr "您添加到 %s 文件夹的图片将在此显示"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:428
++#: ../panels/background/cc-background-chooser-dialog.c:429
+ #: ../panels/bluetooth/cc-bluetooth-panel.c:640
+ #: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
+-#: ../panels/display/cc-display-panel.c:1509
+-#: ../panels/display/cc-display-panel.c:1924
++#: ../panels/display/cc-display-panel.c:1510
++#: ../panels/display/cc-display-panel.c:1952
+ #: ../panels/network/connection-editor/vpn-helpers.c:245
+ #: ../panels/network/connection-editor/vpn-helpers.c:374
+ #: ../panels/network/net-device-wifi.c:1194
+@@ -129,7 +129,7 @@ msgstr "您添加到 %s 文件夹的图片将在此显示"
+ #: ../panels/printers/new-printer-dialog.ui.h:2
+ #: ../panels/privacy/cc-privacy-panel.c:470
+ #: ../panels/search/cc-search-locations-dialog.c:682
+-#: ../panels/sharing/cc-sharing-panel.c:435
++#: ../panels/sharing/cc-sharing-panel.c:425
+ #: ../panels/user-accounts/um-fingerprint-dialog.c:269
+ #: ../panels/user-accounts/um-photo-dialog.c:96
+ #: ../panels/user-accounts/um-photo-dialog.c:221
+@@ -137,7 +137,7 @@ msgstr "您添加到 %s 文件夹的图片将在此显示"
+ msgid "_Cancel"
+ msgstr "取消(_C)"
+ 
+-#: ../panels/background/cc-background-chooser-dialog.c:429
++#: ../panels/background/cc-background-chooser-dialog.c:430
+ #: ../panels/printers/ppd-selection-dialog.ui.h:3
+ #: ../panels/user-accounts/um-photo-dialog.c:98
+ msgid "Select"
+@@ -619,7 +619,7 @@ msgstr "完成"
+ #. 15000 = 15 sec
+ #. 750 = 0.75 sec
+ #. Text printed on screen
+-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
++#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:83
+ msgid "Screen Calibration"
+ msgstr "屏幕校准"
+ 
+@@ -949,33 +949,29 @@ msgstr "完成(_D)"
+ 
+ #. Translators: This is the full date and time format used in 12-hour mode.
+ #: ../panels/datetime/cc-datetime-panel.c:363
+-#, fuzzy
+-#| msgid "%a %l:%M %p"
+ msgid "%e %B %Y, %l:%M %p"
+-msgstr "%A %H%M"
++msgstr "%Y%B，%p%l%M"
+ 
+ #. Translators: This is the full date and time format used in 24-hour mode.
+ #: ../panels/datetime/cc-datetime-panel.c:368
+ msgid "%e %B %Y, %R"
+-msgstr ""
++msgstr "%Y%B，%R"
+ 
+ #. Translators: UTC here means the Coordinated Universal Time.
+ #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
+ #: ../panels/datetime/cc-datetime-panel.c:584
+ msgid "UTC%:::z"
+-msgstr ""
++msgstr "UTC%:::z"
+ 
+ #. Translators: This is the time format used in 12-hour mode.
+ #: ../panels/datetime/cc-datetime-panel.c:589
+-#, fuzzy
+-#| msgid "%a %l:%M %p"
+ msgid "%l:%M %p"
+-msgstr "%A %H%M"
++msgstr "%p %l:%M"
+ 
+ #. Translators: This is the time format used in 24-hour mode.
+ #: ../panels/datetime/cc-datetime-panel.c:594
+ msgid "%R"
+-msgstr ""
++msgstr "%R"
+ 
+ #: ../panels/datetime/datetime.ui.h:1
+ msgid "January"
+@@ -1057,7 +1053,7 @@ msgstr "年"
+ 
+ #: ../panels/datetime/datetime.ui.h:21
+ msgid "Time Zone"
+-msgstr "时间"
++msgstr "时区"
+ 
+ #: ../panels/datetime/datetime.ui.h:22
+ msgid "Search for a city"
+@@ -1072,10 +1068,8 @@ msgid "Requires internet access"
+ msgstr "需要互联网连接"
+ 
+ #: ../panels/datetime/datetime.ui.h:25
+-#, fuzzy
+-#| msgid "Automatic _Connect"
+ msgid "Automatic Time _Zone"
+-msgstr "自动连接(_C)"
++msgstr "自动时区(_Z)"
+ 
+ #: ../panels/datetime/datetime.ui.h:26
+ msgid "Date & _Time"
+@@ -1114,21 +1108,21 @@ msgstr "更改系统时间和日期设置"
+ msgid "To change time or date settings, you need to authenticate."
+ msgstr "修改时间或日期设置，您需要获得管理员权限。"
+ 
+-#: ../panels/display/cc-display-panel.c:485
++#: ../panels/display/cc-display-panel.c:486
+ msgid "Lid Closed"
+ msgstr "关闭盖子"
+ 
+ #. translators: "Mirrored" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:488
++#: ../panels/display/cc-display-panel.c:489
+ msgid "Mirrored"
+ msgstr "镜像显示"
+ 
+-#: ../panels/display/cc-display-panel.c:490
+-#: ../panels/display/cc-display-panel.c:2057
++#: ../panels/display/cc-display-panel.c:491
++#: ../panels/display/cc-display-panel.c:2101
+ msgid "Primary"
+-msgstr "主按钮"
++msgstr "主"
+ 
+-#: ../panels/display/cc-display-panel.c:492
++#: ../panels/display/cc-display-panel.c:493
+ #: ../panels/notifications/cc-notifications-panel.c:205
+ #: ../panels/power/cc-power-panel.c:1738 ../panels/power/cc-power-panel.c:1749
+ #: ../panels/privacy/cc-privacy-panel.c:80
+@@ -1140,84 +1134,83 @@ msgstr "主按钮"
+ msgid "Off"
+ msgstr "关"
+ 
+-#: ../panels/display/cc-display-panel.c:495
++#: ../panels/display/cc-display-panel.c:496
+ msgid "Secondary"
+-msgstr "次要"
++msgstr "次"
+ 
+-#: ../panels/display/cc-display-panel.c:1505
++#: ../panels/display/cc-display-panel.c:1506
+ msgid "Arrange Combined Displays"
+-msgstr ""
++msgstr "排列组合的显示屏"
+ 
+-#: ../panels/display/cc-display-panel.c:1511
+-#: ../panels/display/cc-display-panel.c:1927
++#: ../panels/display/cc-display-panel.c:1512
++#: ../panels/display/cc-display-panel.c:1955
+ #: ../panels/network/connection-editor/connection-editor.ui.h:1
+ msgid "_Apply"
+ msgstr "应用(_A)"
+ 
+-#: ../panels/display/cc-display-panel.c:1532
++#: ../panels/display/cc-display-panel.c:1533
+ msgid "Drag displays to rearrange them"
+ msgstr "拖动显示屏来重新排列它们"
+ 
+-#. size
+-#: ../panels/display/cc-display-panel.c:1991
++#: ../panels/display/cc-display-panel.c:2037
+ msgid "Size"
+-msgstr "尺寸"
++msgstr "大小"
+ 
+ #. aspect ratio
+-#: ../panels/display/cc-display-panel.c:2006
++#: ../panels/display/cc-display-panel.c:2050
+ msgid "Aspect Ratio"
+ msgstr "宽高比"
+ 
+-#: ../panels/display/cc-display-panel.c:2027
++#: ../panels/display/cc-display-panel.c:2071
+ #: ../panels/printers/pp-options-dialog.c:86
+ msgid "Resolution"
+ msgstr "分辨率"
+ 
+-#: ../panels/display/cc-display-panel.c:2058
++#: ../panels/display/cc-display-panel.c:2102
+ msgid "Show the top bar and Activities Overview on this display"
+-msgstr "在此显示器上显示顶栏和活动概览"
++msgstr "在此显示屏上显示顶栏和活动概览"
+ 
+-#: ../panels/display/cc-display-panel.c:2064
++#: ../panels/display/cc-display-panel.c:2108
+ msgid "Secondary Display"
+-msgstr "第二显示器"
++msgstr "第二显示屏"
+ 
+-#: ../panels/display/cc-display-panel.c:2065
++#: ../panels/display/cc-display-panel.c:2109
+ msgid "Join this display with another to create an extra workspace"
+-msgstr "将该显示器与另一个合并来生成另外的工作空间"
++msgstr "将该显示屏与另一显示屏组合以扩展工作空间"
+ 
+ # 左撇子有歧视色彩。
+-#: ../panels/display/cc-display-panel.c:2072
++#: ../panels/display/cc-display-panel.c:2116
+ msgid "Presentation"
+ msgstr "演示"
+ 
+-#: ../panels/display/cc-display-panel.c:2073
++#: ../panels/display/cc-display-panel.c:2117
+ msgid "Show slideshows and media only"
+ msgstr "只显示幻灯片和多媒体"
+ 
+ #. translators: "Mirror" describes when both displays show the same view
+-#: ../panels/display/cc-display-panel.c:2078
++#: ../panels/display/cc-display-panel.c:2122
+ msgid "Mirror"
+ msgstr "镜像"
+ 
+-#: ../panels/display/cc-display-panel.c:2079
++#: ../panels/display/cc-display-panel.c:2123
+ msgid "Show your existing view on both displays"
+-msgstr "在两块显示器上同时显示当前视图"
++msgstr "在两块显示屏上同时显示当前视图"
+ 
+-#: ../panels/display/cc-display-panel.c:2085
++#: ../panels/display/cc-display-panel.c:2129
+ msgid "Turn Off"
+ msgstr "关闭"
+ 
+-#: ../panels/display/cc-display-panel.c:2086
++#: ../panels/display/cc-display-panel.c:2130
+ msgid "Don't use this display"
+-msgstr "不使用该显示器"
++msgstr "不使用该显示屏"
+ 
+-#: ../panels/display/cc-display-panel.c:2301
++#: ../panels/display/cc-display-panel.c:2345
+ msgid "Could not get screen information"
+ msgstr "无法获得屏幕信息"
+ 
+-#: ../panels/display/cc-display-panel.c:2332
++#: ../panels/display/cc-display-panel.c:2376
+ msgid "_Arrange Combined Displays"
+-msgstr ""
++msgstr "排列组合的显示屏(_A)"
+ 
+ #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
+ msgid "Displays"
+@@ -1235,53 +1228,53 @@ msgstr ""
+ "新;"
+ 
+ #. TRANSLATORS: AP type
+-#: ../panels/info/cc-info-panel.c:451 ../panels/network/panel-common.c:127
++#: ../panels/info/cc-info-panel.c:452 ../panels/network/panel-common.c:127
+ msgid "Unknown"
+ msgstr "未知"
+ 
+-#: ../panels/info/cc-info-panel.c:534
++#: ../panels/info/cc-info-panel.c:539
+ #, c-format
+ msgid "%s %d-bit"
+ msgstr "%s %d 位"
+ 
+-#: ../panels/info/cc-info-panel.c:536
++#: ../panels/info/cc-info-panel.c:541
+ #, c-format
+ msgid "%d-bit"
+ msgstr "%d 位"
+ 
+-#: ../panels/info/cc-info-panel.c:1216
++#: ../panels/info/cc-info-panel.c:1221
+ msgid "Ask what to do"
+ msgstr "询问如何处理"
+ 
+-#: ../panels/info/cc-info-panel.c:1220
++#: ../panels/info/cc-info-panel.c:1225
+ msgid "Do nothing"
+ msgstr "不处理"
+ 
+-#: ../panels/info/cc-info-panel.c:1224
++#: ../panels/info/cc-info-panel.c:1229
+ msgid "Open folder"
+ msgstr "打开文件夹"
+ 
+-#: ../panels/info/cc-info-panel.c:1315
++#: ../panels/info/cc-info-panel.c:1320
+ msgid "Other Media"
+ msgstr "其他媒体"
+ 
+-#: ../panels/info/cc-info-panel.c:1346
++#: ../panels/info/cc-info-panel.c:1351
+ msgid "Select an application for audio CDs"
+ msgstr "选择播放音频 CD 的应用程序"
+ 
+-#: ../panels/info/cc-info-panel.c:1347
++#: ../panels/info/cc-info-panel.c:1352
+ msgid "Select an application for video DVDs"
+ msgstr "选择播放视频 DVD 的应用程序"
+ 
+-#: ../panels/info/cc-info-panel.c:1348
++#: ../panels/info/cc-info-panel.c:1353
+ msgid "Select an application to run when a music player is connected"
+ msgstr "选择要在连接音乐播放器后运行的应用程序"
+ 
+-#: ../panels/info/cc-info-panel.c:1349
++#: ../panels/info/cc-info-panel.c:1354
+ msgid "Select an application to run when a camera is connected"
+ msgstr "选择要在连接相机后运行的应用程序"
+ 
+-#: ../panels/info/cc-info-panel.c:1350
++#: ../panels/info/cc-info-panel.c:1355
+ msgid "Select an application for software CDs"
+ msgstr "选择要在插入软件 CD 时运行的应用程序"
+ 
+@@ -1290,90 +1283,90 @@ msgstr "选择要在插入软件 CD 时运行的应用程序"
+ #. * If the shared-mime-info translation works for your language,
+ #. * simply leave these untranslated.
+ #.
+-#: ../panels/info/cc-info-panel.c:1362
++#: ../panels/info/cc-info-panel.c:1367
+ msgid "audio DVD"
+ msgstr "音频 DVD"
+ 
+-#: ../panels/info/cc-info-panel.c:1363
++#: ../panels/info/cc-info-panel.c:1368
+ msgid "blank Blu-ray disc"
+ msgstr "空白蓝光光盘"
+ 
+-#: ../panels/info/cc-info-panel.c:1364
++#: ../panels/info/cc-info-panel.c:1369
+ msgid "blank CD disc"
+ msgstr "空白 CD 光盘"
+ 
+-#: ../panels/info/cc-info-panel.c:1365
++#: ../panels/info/cc-info-panel.c:1370
+ msgid "blank DVD disc"
+ msgstr "空白 DVD 光盘"
+ 
+ # 空白 HD DVD 光盘
+-#: ../panels/info/cc-info-panel.c:1366
++#: ../panels/info/cc-info-panel.c:1371
+ msgid "blank HD DVD disc"
+ msgstr "空白 HD DVD 光盘"
+ 
+-#: ../panels/info/cc-info-panel.c:1367
++#: ../panels/info/cc-info-panel.c:1372
+ msgid "Blu-ray video disc"
+ msgstr "蓝光视频光盘"
+ 
+-#: ../panels/info/cc-info-panel.c:1368
++#: ../panels/info/cc-info-panel.c:1373
+ msgid "e-book reader"
+ msgstr "电子书阅读器"
+ 
+-#: ../panels/info/cc-info-panel.c:1369
++#: ../panels/info/cc-info-panel.c:1374
+ msgid "HD DVD video disc"
+ msgstr "HD DVD 视频光盘"
+ 
+-#: ../panels/info/cc-info-panel.c:1370
++#: ../panels/info/cc-info-panel.c:1375
+ msgid "Picture CD"
+ msgstr "图片 CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1371
++#: ../panels/info/cc-info-panel.c:1376
+ msgid "Super Video CD"
+ msgstr "超级 VCD"
+ 
+-#: ../panels/info/cc-info-panel.c:1372
++#: ../panels/info/cc-info-panel.c:1377
+ msgid "Video CD"
+ msgstr "视频 CD"
+ 
+-#: ../panels/info/cc-info-panel.c:1373
++#: ../panels/info/cc-info-panel.c:1378
+ msgid "Windows software"
+ msgstr "Windows 软件"
+ 
+-#: ../panels/info/cc-info-panel.c:1374
++#: ../panels/info/cc-info-panel.c:1379
+ msgid "Software"
+ msgstr "软件"
+ 
+-#: ../panels/info/cc-info-panel.c:1497
++#: ../panels/info/cc-info-panel.c:1502
+ #: ../panels/keyboard/keyboard-shortcuts.c:1696
+ msgid "Section"
+ msgstr "节"
+ 
+-#: ../panels/info/cc-info-panel.c:1506 ../panels/info/info.ui.h:13
++#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:13
+ msgid "Overview"
+ msgstr "总览"
+ 
+-#: ../panels/info/cc-info-panel.c:1512 ../panels/info/info.ui.h:20
++#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:20
+ msgid "Default Applications"
+ msgstr "默认应用程序"
+ 
+-#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:28
++#: ../panels/info/cc-info-panel.c:1522 ../panels/info/info.ui.h:28
+ msgid "Removable Media"
+ msgstr "可移动介质"
+ 
+-#: ../panels/info/cc-info-panel.c:1542
++#: ../panels/info/cc-info-panel.c:1547
+ #, c-format
+ msgid "Version %s"
+ msgstr "版本 %s"
+ 
+-#: ../panels/info/cc-info-panel.c:1592
++#: ../panels/info/cc-info-panel.c:1597
+ msgid "Install Updates"
+ msgstr "安装更新"
+ 
+-#: ../panels/info/cc-info-panel.c:1596
++#: ../panels/info/cc-info-panel.c:1601
+ msgid "System Up-To-Date"
+ msgstr "系统已是最新"
+ 
+-#: ../panels/info/cc-info-panel.c:1600
++#: ../panels/info/cc-info-panel.c:1605
+ msgid "Checking for Updates"
+ msgstr "正在检查更新"
+ 
+@@ -2460,23 +2453,23 @@ msgstr "VPN"
+ msgid "Bond"
+ msgstr "绑定"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:597
++#: ../panels/network/connection-editor/net-connection-editor.c:598
+ msgid "Bridge"
+ msgstr "桥接"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:598
++#: ../panels/network/connection-editor/net-connection-editor.c:599
+ msgid "VLAN"
+ msgstr "虚拟局域网"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:749
++#: ../panels/network/connection-editor/net-connection-editor.c:750
+ msgid "Could not load VPN plugins"
+ msgstr "无法装入 VPN 插件"
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:818
++#: ../panels/network/connection-editor/net-connection-editor.c:819
+ msgid "Import from file…"
+ msgstr "从文件导入..."
+ 
+-#: ../panels/network/connection-editor/net-connection-editor.c:889
++#: ../panels/network/connection-editor/net-connection-editor.c:890
+ msgid "Add Network Connection"
+ msgstr "添加网络连接"
+ 
+@@ -2530,7 +2523,7 @@ msgstr "选择要导入的文件"
+ 
+ #: ../panels/network/connection-editor/vpn-helpers.c:246
+ #: ../panels/printers/cc-printers-panel.c:1947
+-#: ../panels/sharing/cc-sharing-panel.c:436
++#: ../panels/sharing/cc-sharing-panel.c:426
+ #: ../panels/user-accounts/um-photo-dialog.c:222
+ msgid "_Open"
+ msgstr "打开(_O)"
+@@ -2674,6 +2667,11 @@ msgstr "配置 %d"
+ msgid "Add new connection"
+ msgstr "添加新连接"
+ 
++#: ../panels/network/net-device-team.c:77
++#| msgid "Bridge slaves"
++msgid "Team slaves"
++msgstr "组队从机"
++
+ #: ../panels/network/net-device-wifi.c:1110
+ msgid ""
+ "If you have a connection to the Internet other than wireless, you can set up "
+@@ -4020,7 +4018,7 @@ msgid "Authenticate"
+ msgstr "认证"
+ 
+ #: ../panels/printers/authentication-dialog.ui.h:5
+-#: ../panels/sharing/sharing.ui.h:23
++#: ../panels/sharing/sharing.ui.h:21
+ #: ../panels/user-accounts/data/account-dialog.ui.h:6
+ msgid "Password"
+ msgstr "密码"
+@@ -4987,11 +4985,11 @@ msgctxt "service is disabled"
+ msgid "Off"
+ msgstr "关"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:432
++#: ../panels/sharing/cc-sharing-panel.c:422
+ msgid "Choose a Folder"
+ msgstr "选择文件夹"
+ 
+-#: ../panels/sharing/cc-sharing-panel.c:739
++#: ../panels/sharing/cc-sharing-panel.c:736
+ msgid "Copy"
+ msgstr "复制"
+ 
+@@ -5032,70 +5030,62 @@ msgid ""
+ msgstr "蓝牙共享允许您使用带有蓝牙的设备共享文件"
+ 
+ #: ../panels/sharing/sharing.ui.h:3
+-msgid "Share Public Folder"
+-msgstr "共享公共(Public)文件夹"
+-
+-#: ../panels/sharing/sharing.ui.h:4
+ msgid "Only Receive From Trusted Devices"
+ msgstr "只从信任的设备接收"
+ 
+-#: ../panels/sharing/sharing.ui.h:5
++#: ../panels/sharing/sharing.ui.h:4
+ msgid "Save Received Files to Downloads Folder"
+ msgstr "将接收的文件保存到下载(Downloads)文件夹"
+ 
+-#: ../panels/sharing/sharing.ui.h:6
+-msgid "Only share with Trusted Devices"
+-msgstr "只共享信任的设备"
+-
+-#: ../panels/sharing/sharing.ui.h:7
++#: ../panels/sharing/sharing.ui.h:5
+ msgid "Computer Name"
+ msgstr "计算机名"
+ 
+-#: ../panels/sharing/sharing.ui.h:8
++#: ../panels/sharing/sharing.ui.h:6
+ msgid "Personal File Sharing"
+ msgstr "个人文件共享"
+ 
+-#: ../panels/sharing/sharing.ui.h:9
++#: ../panels/sharing/sharing.ui.h:7
+ msgid "Screen Sharing"
+ msgstr "屏幕共享"
+ 
+-#: ../panels/sharing/sharing.ui.h:10
++#: ../panels/sharing/sharing.ui.h:8
+ msgid "Media Sharing"
+ msgstr "媒体共享"
+ 
+-#: ../panels/sharing/sharing.ui.h:11
++#: ../panels/sharing/sharing.ui.h:9
+ msgid "Remote Login"
+ msgstr "远程登录"
+ 
+-#: ../panels/sharing/sharing.ui.h:12
++#: ../panels/sharing/sharing.ui.h:10
+ msgid "Some services are disabled because of no network access."
+ msgstr "因为没有网络，一些服务已经禁用。"
+ 
+-#: ../panels/sharing/sharing.ui.h:13
++#: ../panels/sharing/sharing.ui.h:11
+ msgid "Share Music, Photos and Videos with others on the current network."
+ msgstr "在当前网络上共享音乐、照片和视频。"
+ 
+-#: ../panels/sharing/sharing.ui.h:14
++#: ../panels/sharing/sharing.ui.h:12
+ msgid "Share Media On This Network"
+ msgstr "在网络上共享媒体"
+ 
+-#: ../panels/sharing/sharing.ui.h:15
++#: ../panels/sharing/sharing.ui.h:13
+ msgid "Shared Folders"
+ msgstr "共享文件夹"
+ 
+-#: ../panels/sharing/sharing.ui.h:16
++#: ../panels/sharing/sharing.ui.h:14
+ msgid "column"
+ msgstr "列"
+ 
+-#: ../panels/sharing/sharing.ui.h:17
++#: ../panels/sharing/sharing.ui.h:15
+ msgid "Add Folder"
+ msgstr "添加文件夹"
+ 
+-#: ../panels/sharing/sharing.ui.h:18
++#: ../panels/sharing/sharing.ui.h:16
+ msgid "Remove Folder"
+ msgstr "移除文件夹"
+ 
+-#: ../panels/sharing/sharing.ui.h:20
++#: ../panels/sharing/sharing.ui.h:18
+ #, no-c-format
+ msgid ""
+ "Personal File Sharing allows you to share your Public folder with others on "
+@@ -5104,15 +5094,15 @@ msgstr ""
+ "个人网络共享允许您与当前网络中的其他人共享自己的共享文件夹，使用地址：<a "
+ "href=\"dav://%s\">dav://%s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:21
++#: ../panels/sharing/sharing.ui.h:19
+ msgid "Share Public Folder On This Network"
+ msgstr "在网络上共享公共文件夹"
+ 
+-#: ../panels/sharing/sharing.ui.h:22
++#: ../panels/sharing/sharing.ui.h:20
+ msgid "Require Password"
+ msgstr "需要密码"
+ 
+-#: ../panels/sharing/sharing.ui.h:25
++#: ../panels/sharing/sharing.ui.h:23
+ #, no-c-format
+ msgid ""
+ "Allow remote users to connect using the Secure Shell command:\n"
+@@ -5121,26 +5111,26 @@ msgstr ""
+ "允许远程用户使用安全 Shell 命令连接：\n"
+ "<a href=\"ssh %s\">ssh %s</a>"
+ 
+-#: ../panels/sharing/sharing.ui.h:28
++#: ../panels/sharing/sharing.ui.h:26
+ #, no-c-format
+ msgid ""
+ "Allow remote users to view or control your screen by connecting to: <a href="
+ "\"vnc://%s\">vnc://%s</a>"
+ msgstr "允许远程用户通过 VNC 控制屏幕：<a href=\"vnc://%s\">vnc://%s</a> "
+ 
+-#: ../panels/sharing/sharing.ui.h:29
++#: ../panels/sharing/sharing.ui.h:27
+ msgid "Remote View"
+ msgstr "远程查看"
+ 
+-#: ../panels/sharing/sharing.ui.h:30
++#: ../panels/sharing/sharing.ui.h:28
+ msgid "Remote Control"
+ msgstr "远程控制"
+ 
+-#: ../panels/sharing/sharing.ui.h:31
++#: ../panels/sharing/sharing.ui.h:29
+ msgid "Approve All Connections"
+ msgstr "允许所有连接"
+ 
+-#: ../panels/sharing/sharing.ui.h:32
++#: ../panels/sharing/sharing.ui.h:30
+ msgid "Show Password"
+ msgstr "显示密码"
+ 
+@@ -5386,12 +5376,12 @@ msgid ""
+ "AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
+ msgstr ""
+ "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
+-"AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;键盘;鼠标;辅助功能;对比"
+-"度;缩放;屏幕读取器;文本;字体;大小;粘滞键;慢速键;回弹键;鼠标键;"
++"AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;键盘;辅助功能;对比度;缩"
++"放;屏幕读取器;文本;字体;大小;粘滞键;慢速键;回弹键;鼠标键;"
+ 
+ #: ../panels/universal-access/uap.ui.h:1
+ msgid "_Always Show Universal Access Menu"
+-msgstr "总是显示通用辅助功能菜单(_A)"
++msgstr "一直显示通用辅助功能菜单(_A)"
+ 
+ #: ../panels/universal-access/uap.ui.h:2
+ msgid "Seeing"
+@@ -6620,13 +6610,13 @@ msgstr ""
+ "要编辑快捷键，请选择“发送按键”动作，按下键盘快捷键，然后输入新按键组合，或按 "
+ "Backspace 清除。"
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:82
++#: ../panels/wacom/calibrator/calibrator-gui.c:84
+ msgid ""
+ "Please tap the target markers as they appear on screen to calibrate the "
+ "tablet."
+ msgstr "当标记出现在屏幕上时，请触摸它们，以校准您的平板电脑。"
+ 
+-#: ../panels/wacom/calibrator/calibrator-gui.c:86
++#: ../panels/wacom/calibrator/calibrator-gui.c:88
+ msgid "Mis-click detected, restarting..."
+ msgstr "检测到误点击，正在重新开始..."
+ 
+@@ -6938,11 +6928,11 @@ msgstr "显示面板"
+ msgid "[PANEL] [ARGUMENT…]"
+ msgstr "[面板] [参数…]"
+ 
+-#: ../shell/cc-application.c:142
++#: ../shell/cc-application.c:145
+ msgid "- Settings"
+ msgstr "- 设置"
+ 
+-#: ../shell/cc-application.c:160
++#: ../shell/cc-application.c:163
+ #, c-format
+ msgid ""
+ "%s\n"
+@@ -6951,15 +6941,15 @@ msgstr ""
+ "%s\n"
+ "运行 “%s --help” 查看所有可用的命令行选项。\n"
+ 
+-#: ../shell/cc-application.c:190
++#: ../shell/cc-application.c:193
+ msgid "Available panels:"
+ msgstr "可用面板"
+ 
+-#: ../shell/cc-application.c:325
++#: ../shell/cc-application.c:328
+ msgid "Help"
+ msgstr "帮助"
+ 
+-#: ../shell/cc-application.c:326
++#: ../shell/cc-application.c:329
+ msgid "Quit"
+ msgstr "退出"
+ 
+@@ -6991,6 +6981,12 @@ msgstr "设置"
+ msgid "Preferences;Settings;"
+ msgstr "Preferences;Settings;首选项;设置;"
+ 
++#~ msgid "Share Public Folder"
++#~ msgstr "共享公共(Public)文件夹"
++
++#~ msgid "Only share with Trusted Devices"
++#~ msgstr "只共享信任的设备"
++
+ #~ msgid "Device type:"
+ #~ msgstr "设备类型："
+ 
+diff --git a/shell/cc-application.c b/shell/cc-application.c
+index 7a21086..06d9110 100644
+--- a/shell/cc-application.c
++++ b/shell/cc-application.c
+@@ -116,6 +116,9 @@ launch_panel_activated (GSimpleAction *action,
+       g_error_free (error);
+     }
+   g_variant_unref (parameters);
++
++  /* Now present the window */
++  g_application_activate (G_APPLICATION (self));
+ }
+ 
+ static int
+diff --git a/shell/cc-shell-category-view.c b/shell/cc-shell-category-view.c
+index 4b05d8c..d7094ab 100644
+--- a/shell/cc-shell-category-view.c
++++ b/shell/cc-shell-category-view.c
+@@ -138,6 +138,7 @@ cc_shell_category_view_constructed (GObject *object)
+   gtk_icon_view_set_text_column (GTK_ICON_VIEW (iconview), COL_NAME);
+   gtk_icon_view_set_item_width (GTK_ICON_VIEW (iconview), 100);
+   cc_shell_item_view_update_cells (CC_SHELL_ITEM_VIEW (iconview));
++  gtk_icon_view_set_columns (GTK_ICON_VIEW (iconview), 6);
+ 
+   /* create the header if required */
+   if (priv->name)
diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD
index a5a5e90e5..42d12f436 100644
--- a/extra/gnome-desktop/PKGBUILD
+++ b/extra/gnome-desktop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 199786 2013-11-16 12:15:33Z heftig $
+# $Id: PKGBUILD 204013 2014-01-14 08:11:43Z jgc $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-desktop
-pkgver=3.10.1
-pkgrel=2
+pkgver=3.10.2
+pkgrel=1
 epoch=1
 pkgdesc="Library with common API for various GNOME modules"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ url="http://www.gnome.org"
 groups=(gnome)
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         0001-GnomeRR-gnome_rr_output_get_min_backlight_step.patch)
-sha256sums=('10aca72355e8e2854450ce10edfb6da433af62ea0d87b0718ff62e9a40aabb41'
+sha256sums=('d4f5944aea5f2a8c7c5dc0e738bf07f293dfff81ddc55a53d661370bf24e4632'
             '5920cec531b03ebe0ce0941250ce62d92a7b18ae44900f11df90adb381858df2')
 
 prepare() {
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index 4e86de131..ec5a18dd6 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 198012 2013-10-30 12:15:53Z allan $
+#$Id: PKGBUILD 203573 2014-01-13 17:12:03Z andyrtr $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gnome-keyring
 pkgver=3.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
diff --git a/extra/gnome-online-miners/PKGBUILD b/extra/gnome-online-miners/PKGBUILD
index 6db473249..e2ef5a1b6 100644
--- a/extra/gnome-online-miners/PKGBUILD
+++ b/extra/gnome-online-miners/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 200220 2013-11-22 18:17:22Z heftig $
+# $Id: PKGBUILD 204482 2014-01-20 20:34:48Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-online-miners
-pkgver=3.10.2
+pkgver=3.10.3
 pkgrel=1
 pkgdesc="Tracker miners for online accounts"
 arch=(i686 x86_64)
@@ -10,7 +10,7 @@ url="http://www.gnome.org"
 license=(GPL)
 depends=(libgdata gnome-online-accounts grilo libzapojit tracker)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('38c9e60cf56b6d0ec32e972256268d6038d15e32521a91aede1ec168f5e31cd9')
+sha256sums=('129807d398e7744870110e6875629b6858d289021271550569ce5afa10fe9ea8')
  
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-robots/PKGBUILD b/extra/gnome-robots/PKGBUILD
index 8667a9791..cc704006e 100644
--- a/extra/gnome-robots/PKGBUILD
+++ b/extra/gnome-robots/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198027 2013-10-30 12:21:25Z allan $
+# $Id: PKGBUILD 205062 2014-02-04 00:47:45Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-robots
-pkgver=3.10.0
+pkgver=3.10.2
 pkgrel=1
 pkgdesc="Avoid the robots and make them crash into each other"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ install=gnome-robots.install
 url="https://live.gnome.org/Robots"
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('600a5b81bf0b47cbe942cd3902a947df2e9e2a2a72f4b2a7248e60b1621b987e')
+sha256sums=('7d568e2fc21c86ad53e95689b9fb9dc079c2ad260a955bbaf17f2cf740f45713')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index fa503a2a6..17918d2fe 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 199789 2013-11-16 12:18:40Z heftig $
+# $Id: PKGBUILD 203381 2014-01-09 06:32:24Z fyan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-settings-daemon
 pkgver=3.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64' 'mips64el')
 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'
+         'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'libibus' 'librsvg' 'libgweather' 'geocode-glib' 'geoclue2'
          'nss')
 makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl')
 options=('!emptydirs')
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 120ac0dd2..75e33489d 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 202388 2013-12-21 15:05:12Z heftig $
+# $Id: PKGBUILD 204299 2014-01-16 21:00:27Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
-pkgver=3.10.2.1
-pkgrel=4
+pkgver=3.10.3
+pkgrel=1
 pkgdesc="The next generation GNOME Shell"
 arch=(i686 x86_64 mips64el)
 url="http://live.gnome.org/GnomeShell"
@@ -19,20 +19,15 @@ optdepends=('gnome-control-center: System settings'
 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
-        git-fixes.patch)
-sha256sums=('d28cedc4f7dbcbd979ef2a0b80f722ff507989fce193fe59351b1d048d17c44c'
-            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607'
-            '192d95387dff5ac772968680cb77abef135b3ad7218676ad51c997d474642cc5')
+        nm-libexecdir.patch)
+sha256sums=('4b14b9ffde08ccee6d972dea353b5f7ed8bbd12e52cb2252c31bcfe59d8242bc'
+            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
 
 prepare() {
   cd $pkgname-$pkgver
 
   # FS#30747 FS#32730 Problems due to libexecdir different from NM
   patch -Np1 -i ../nm-libexecdir.patch
-
-  # Upstream fixes from 3-10 branch. Includes security bugfix for FS#37930
-  patch -Np1 -i ../git-fixes.patch
 }
 
 build() {
diff --git a/extra/gnome-shell/git-fixes.patch b/extra/gnome-shell/git-fixes.patch
deleted file mode 100644
index 8dbf02d25..000000000
--- a/extra/gnome-shell/git-fixes.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
-index 1880e36..996b363 100644
---- a/js/gdm/authPrompt.js
-+++ b/js/gdm/authPrompt.js
-@@ -263,10 +263,8 @@ const AuthPrompt = new Lang.Class({
-     },
- 
-     _onReset: function() {
--        if (this.verificationStatus != AuthPromptStatus.VERIFICATION_SUCCEEDED) {
--            this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
--            this.reset();
--        }
-+        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
-+        this.reset();
-     },
- 
-     addActorToDefaultButtonWell: function(actor) {
-diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
-index eb94554..fb3cf70 100644
---- a/js/gdm/loginDialog.js
-+++ b/js/gdm/loginDialog.js
-@@ -907,6 +907,10 @@ const LoginDialog = new Lang.Class({
-         Main.ctrlAltTabManager.removeGroup(this.dialogLayout);
-     },
- 
-+    cancel: function() {
-+        this._authPrompt.cancel();
-+    },
-+
-     addCharacter: function(unichar) {
-         this._authPrompt.addCharacter(unichar);
-     },
-diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
-index a929451..dde7b82 100644
---- a/js/ui/extensionSystem.js
-+++ b/js/ui/extensionSystem.js
-@@ -76,7 +76,11 @@ function disableExtension(uuid) {
-         theme.unload_stylesheet(extension.stylesheet.get_path());
-     }
- 
--    extension.stateObj.disable();
-+    try {
-+        extension.stateObj.disable();
-+    } catch(e) {
-+        logExtensionError(uuid, e);
-+    }
- 
-     for (let i = 0; i < order.length; i++) {
-         let uuid = order[i];
-@@ -89,8 +93,10 @@ function disableExtension(uuid) {
- 
-     extensionOrder.splice(orderIdx, 1);
- 
--    extension.state = ExtensionState.DISABLED;
--    _signals.emit('extension-state-changed', extension);
-+    if ( extension.state != ExtensionState.ERROR ) {
-+        extension.state = ExtensionState.DISABLED;
-+        _signals.emit('extension-state-changed', extension);
-+    }
- }
- 
- function enableExtension(uuid) {
-@@ -117,10 +123,15 @@ function enableExtension(uuid) {
-         }
-     }
- 
--    extension.stateObj.enable();
--
--    extension.state = ExtensionState.ENABLED;
--    _signals.emit('extension-state-changed', extension);
-+    try {
-+        extension.stateObj.enable();
-+        extension.state = ExtensionState.ENABLED;
-+        _signals.emit('extension-state-changed', extension);
-+        return;
-+    } catch(e) {
-+        logExtensionError(uuid, e);
-+        return;
-+    }
- }
- 
- function logExtensionError(uuid, error) {
-@@ -150,7 +161,8 @@ function loadExtension(extension) {
-     } else {
-         let enabled = enabledExtensions.indexOf(extension.uuid) != -1;
-         if (enabled) {
--            initExtension(extension.uuid);
-+            if (!initExtension(extension.uuid))
-+                return;
-             if (extension.state == ExtensionState.DISABLED)
-                 enableExtension(extension.uuid);
-         } else {
-@@ -205,7 +217,12 @@ function initExtension(uuid) {
-     extensionModule = extension.imports.extension;
- 
-     if (extensionModule.init) {
--        extensionState = extensionModule.init(extension);
-+        try {
-+            extensionState = extensionModule.init(extension);
-+        } catch(e) {
-+            logExtensionError(uuid, e);
-+            return false;
-+        }
-     }
- 
-     if (!extensionState)
-@@ -214,6 +231,7 @@ function initExtension(uuid) {
- 
-     extension.state = ExtensionState.DISABLED;
-     _signals.emit('extension-loaded', uuid);
-+    return true;
- }
- 
- function getEnabledExtensions() {
-@@ -235,11 +253,7 @@ function onEnabledExtensionsChanged() {
-     newEnabledExtensions.filter(function(uuid) {
-         return enabledExtensions.indexOf(uuid) == -1;
-     }).forEach(function(uuid) {
--        try {
-             enableExtension(uuid);
--        } catch(e) {
--            logExtensionError(uuid, e);
--        }
-     });
- 
-     // Find and disable all the newly disabled extensions: UUIDs found in the
-@@ -247,11 +261,7 @@ function onEnabledExtensionsChanged() {
-     enabledExtensions.filter(function(item) {
-         return newEnabledExtensions.indexOf(item) == -1;
-     }).forEach(function(uuid) {
--        try {
-             disableExtension(uuid);
--        } catch(e) {
--            logExtensionError(uuid, e);
--        }
-     });
- 
-     enabledExtensions = newEnabledExtensions;
-@@ -263,11 +273,7 @@ function _loadExtensions() {
- 
-     let finder = new ExtensionUtils.ExtensionFinder();
-     finder.connect('extension-found', function(signals, extension) {
--        try {
--            loadExtension(extension);
--        } catch(e) {
--            logExtensionError(extension.uuid, e);
--        }
-+        loadExtension(extension);
-     });
-     finder.scanExtensions();
- }
-diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
-index c66c9f6..d290a3d 100644
---- a/js/ui/messageTray.js
-+++ b/js/ui/messageTray.js
-@@ -2392,6 +2392,13 @@ const MessageTray = new Lang.Class({
-     // _updateState() figures out what (if anything) needs to be done
-     // at the present time.
-     _updateState: function() {
-+        // If our state changes caused _updateState to be called,
-+        // just exit now to prevent reentrancy issues.
-+        if (this._updatingState)
-+            return;
-+
-+        this._updatingState = true;
-+
-         // Filter out acknowledged notifications.
-         this._notificationQueue = this._notificationQueue.filter(function(n) {
-             return !n.acknowledged;
-@@ -2474,6 +2481,8 @@ const MessageTray = new Lang.Class({
-         } else if (desktopCloneIsVisible && !desktopCloneShouldBeVisible) {
-             this._hideDesktopClone();
-         }
-+
-+        this._updatingState = false;
-     },
- 
-     _tween: function(actor, statevar, value, params) {
-@@ -2838,13 +2847,13 @@ const MessageTray = new Lang.Class({
-                                                                                   Lang.bind(this, this._onSourceDoneDisplayingContent));
- 
-         this._summaryBoxPointer.bin.child = child;
--        this._grabHelper.grab({ actor: this._summaryBoxPointer.bin.child,
--                                onUngrab: Lang.bind(this, this._onSummaryBoxPointerUngrabbed) });
--
-         this._summaryBoxPointer.actor.opacity = 0;
-         this._summaryBoxPointer.actor.show();
-         this._adjustSummaryBoxPointerPosition();
- 
-+        this._grabHelper.grab({ actor: this._summaryBoxPointer.bin.child,
-+                                onUngrab: Lang.bind(this, this._onSummaryBoxPointerUngrabbed) });
-+
-         this._summaryBoxPointerState = State.SHOWING;
-         this._summaryBoxPointer.show(BoxPointer.PopupAnimation.FULL, Lang.bind(this, function() {
-             this._summaryBoxPointerState = State.SHOWN;
diff --git a/extra/gnome-vfs/PKGBUILD b/extra/gnome-vfs/PKGBUILD
index 1dde8db7e..ffe729e10 100644
--- a/extra/gnome-vfs/PKGBUILD
+++ b/extra/gnome-vfs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198037 2013-10-30 12:25:08Z allan $
+# $Id: PKGBUILD 203574 2014-01-13 17:12:05Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-vfs
 pkgver=2.24.4
-pkgrel=7
+pkgrel=8
 pkgdesc="The GNOME Virtual File System"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD
index 2730148d9..1ccc59f03 100644
--- a/extra/gnucash/PKGBUILD
+++ b/extra/gnucash/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 198654 2013-11-01 13:54:39Z eric $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# $Id: PKGBUILD 203018 2014-01-01 13:31:09Z juergen $
+# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Mark Schneider <queueRAM@gmail.com>
 
 pkgname=gnucash
-pkgver=2.4.13
-pkgrel=2
+pkgver=2.6.0
+pkgrel=1
 pkgdesc="A personal and small-business financial-accounting application"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnucash.org"
 license=("GPL")
-depends=('gtkhtml' 'slib' 'goffice0.8' 'libgnomeui' 'libdbi-drivers' 'aqbanking' 'desktop-file-utils')
+depends=('slib' 'goffice0.8' 'libgnomeui' 'libdbi-drivers' 'aqbanking' 'desktop-file-utils' 'webkitgtk2')
 makedepends=('intltool')
 optdepends=('evince: for print preview'
             'perl-finance-quote: for stock information lookups'
@@ -17,7 +17,7 @@ optdepends=('evince: for print preview'
 options=('!makeflags' '!emptydirs')
 install=gnucash.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('cd28d4e7d84d71ade56173734d634ccadc59ed81')
+sha1sums=('9715468bbe9e4cef6559bfa9825d51ac10d6ff84')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,7 +28,7 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   export GUILE=/usr/bin/guile1.8
   ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc \
-    --libexecdir=/usr/lib --disable-schemas-install --enable-ofx --enable-aqbanking
+    --libexecdir=/usr/lib --disable-schemas-compile --enable-ofx --enable-aqbanking
   make
 }
 
diff --git a/extra/gnucash/gnucash.install b/extra/gnucash/gnucash.install
index d6a48c31b..d9de2f545 100644
--- a/extra/gnucash/gnucash.install
+++ b/extra/gnucash/gnucash.install
@@ -10,6 +10,7 @@ post_install() {
   for f in ${info_files[@]}; do
     usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
   done
+  glib-compile-schemas usr/share/glib-2.0/schemas
 }
 
 pre_upgrade() {
@@ -31,4 +32,5 @@ pre_remove() {
 post_remove() {
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
 }
diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD
index f4568beb9..c374fd9ae 100644
--- a/extra/gnumeric/PKGBUILD
+++ b/extra/gnumeric/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198041 2013-10-30 12:26:38Z allan $
+# $Id: PKGBUILD 206060 2014-02-16 13:36:11Z jgc $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
 pkgname=gnumeric
-pkgver=1.12.8
+pkgver=1.12.10
 pkgrel=1
 pkgdesc="A GNOME Spreadsheet Program"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,9 +17,9 @@ optdepends=('python2-gobject: for python plugin support'
             'psiconv: for Psion 5 file support'
             'yelp: for viewing the help manual')
 install=gnumeric.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz
         revert-warnings.patch)
-sha256sums=('02688fb6c32c28db2eb4e9a8e012cf1386f4f3a18b4c94f5ecdd13342521ec76'
+sha256sums=('4c9ee095af14a24b3cb9ed9051736d41488cacaf2960a00fe1e135ca0f3b1fde'
             'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53')
 
 prepare() {
diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD
index c6e4955e7..eadbc5287 100644
--- a/extra/gnuplot/PKGBUILD
+++ b/extra/gnuplot/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 200325 2013-11-25 21:47:00Z eric $
+# $Id: PKGBUILD 204059 2014-01-15 04:18:35Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=gnuplot
 pkgver=4.6.4
-pkgrel=2
+pkgrel=5
 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" 
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://www.gnuplot.info" 
 license=('custom') 
-depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua' 'qt4') 
+depends=('readline' 'gd' 'wxgtk2.8' 'cairo' 'libjpeg' 'lua' 'qt4' 'gnutls') 
 makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
 options=('!makeflags')
 install=gnuplot.install 
@@ -31,7 +31,7 @@ prepare() {
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr \
+   WX_CONFIG=/usr/bin/wx-config-2.8 ./configure --prefix=/usr \
               --libexecdir=/usr/bin \
               --with-gihdir=/usr/share/gnuplot \
               --with-readline=gnu --enable-qt
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 63514a473..0ad273581 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 202253 2013-12-20 22:16:14Z andyrtr $
+# $Id: PKGBUILD 205977 2014-02-15 11:56:07Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.2.8
+pkgver=3.2.11
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,10 +12,8 @@ url="http://www.gnutls.org/"
 install=gnutls.install
 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=('a961705dbe0cbbc7220b6c2d2d9e0028'
+md5sums=('3fce0742dd7e273235a9d376dd895657'
          'SKIP')
 
 build() {
@@ -23,20 +21,19 @@ build() {
   ./configure --prefix=/usr \
 	--with-zlib \
 	--disable-static \
-	--disable-guile \
-	--disable-valgrind-tests
+	--disable-guile
   make
 }
 
 check() {
   cd ${pkgname}-${pkgver}
-  make -k check || /bin/true
+  make check
 }
 
 package() {
   cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
-  
+
   # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman
   # gzip -9 all files in infodir and manpages manually
   find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD
index c73c95e4b..1b3a8c2a8 100644
--- a/extra/goffice/PKGBUILD
+++ b/extra/goffice/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198044 2013-10-30 12:27:46Z allan $
+# $Id: PKGBUILD 206051 2014-02-16 12:04:40Z jgc $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=goffice
-pkgver=0.10.8
+pkgver=0.10.10
 pkgrel=1
 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL')
 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)
-sha256sums=('11964b907b03dede6d8d8a1a4ae2d5727ffbe8d7bab5c92dec586acb616e807c')
+sha256sums=('03f5305d6d99c3c5afa808ba8e65abb3f7f738ecc06d25911de32945920bd538')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index a88e4c179..667d3dee0 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 201370 2013-12-09 18:57:47Z giovanni $
+# $Id: PKGBUILD 203515 2014-01-12 11:15:34Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gparted
 pkgver=0.17.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gparted.sourceforge.net"
@@ -21,7 +21,7 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions'
             'reiserfsprogs: for reiser partitions'
             'xfsprogs: for xfs partitions'
             'nilfs-utils: for nilfs2 support'
-            'polkit-gnome: to run gparted directly from menu'
+            'polkit: to run gparted directly from menu'
             'gpart: for recovering corrupt partition tables'
             'mtools: utilities to access MS-DOS disks')
 install=gparted.install
@@ -32,10 +32,15 @@ md5sums=('ecd66491bb2061c6aa6077cc24823b9e'
          '122ed3120c846376bead22b25f6a3b19'
          '0b68a4e2bc6bc15440730ebe2d7bf9f6')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i "s:@gksuprog@ @installdir@/gparted %f:@installdir@/gparted_polkit %f:g" gparted.desktop.in.in
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   ./configure --prefix=/usr \
               --sbindir=/usr/bin
   make
diff --git a/extra/gphoto2/PKGBUILD b/extra/gphoto2/PKGBUILD
index b53c67c02..16e4acae6 100644
--- a/extra/gphoto2/PKGBUILD
+++ b/extra/gphoto2/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 188639 2013-06-17 09:41:26Z jgc $
+# $Id: PKGBUILD 204792 2014-01-27 08:53:52Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 pkgname=gphoto2
-pkgver=2.5.2
+pkgver=2.5.3
 pkgrel=1
 pkgdesc="A digital camera download and access program."
 arch=(i686 x86_64 'mips64el')
 url="http://www.gphoto.org"
 license=('GPL' 'LGPL')
 depends=('libgphoto2' 'popt' 'readline')
-source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7e59e7e06a58febd35820978c6e48287')
+source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2{,.asc})
+md5sums=('6d19aeabf196340e1698b3734f090d42'
+         'SKIP')
 
 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/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD
index 2b19aa09f..079db6eb1 100644
--- a/extra/graphicsmagick/PKGBUILD
+++ b/extra/graphicsmagick/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 202659 2013-12-23 18:00:07Z ronald $
+# $Id: PKGBUILD 203337 2014-01-08 07:32:11Z bisson $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Anton Leontiev <bunder@t-25.ru>
 
 pkgname=graphicsmagick
-pkgver=1.3.18
-pkgrel=6
+pkgver=1.3.19
+pkgrel=2
 pkgdesc='Image processing system'
 url='http://www.graphicsmagick.org/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,29 +19,20 @@ optdepends=('jasper: jp2 module'
             'ghostscript: pdf, ps modules')
 makedepends=('perl' 'jasper' 'libpng' 'libwmf' 'libxml2' 'libtiff')
 depends=('freetype2' 'libxext' 'libsm' 'lcms2' 'libltdl' 'bzip2' 'xz')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz"
-        'benign.patch')
-sha1sums=('085c23666adcf88585119cb6aea7efe5c58481d4'
-          '04e16b9fe255e87cf16d4c61e313e8cdf7b2e24e')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz")
+sha1sums=('621c3e9a3b12e38dad225ee3466fd55a24c62066')
 
 options=('!emptydirs' 'libtool')
 
-prepare() {
-	cd "${srcdir}/GraphicsMagick-${pkgver}"
-	patch -p1 -i ../benign.patch
-}
-
 build() {
 	cd "${srcdir}/GraphicsMagick-${pkgver}"
-
 	./configure \
 		--prefix=/usr \
 		--enable-shared \
 		--with-modules \
 		--with-perl \
 		--with-gs-font-dir=/usr/share/fonts/Type1 \
-		--with-quantum-depth=32 \
-		--with-openmp \
+		--with-quantum-depth=16 \
 		--with-threads
 	make
 }
diff --git a/extra/graphicsmagick/benign.patch b/extra/graphicsmagick/benign.patch
deleted file mode 100644
index f9fe6a642..000000000
--- a/extra/graphicsmagick/benign.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naur old/ChangeLog new/ChangeLog
---- old/ChangeLog	2013-03-09 13:19:31.000000000 -1000
-+++ new/ChangeLog	2013-11-22 06:33:59.189976814 -1000
-@@ -1,3 +1,10 @@
-+2013-10-16  Glenn Randers-Pehrson  <glennrp@simple.dallas.tx.us>
-+
-+	* Added calls to png_set_benign_errors() to allow benign errors
-+	to be handled as warnings.  In particular, GM builds with libpng-1.6.x
-+	will not crash while copying a PNG with a "known incorrect ICC
-+	profile".
-+
- 2013-03-09  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
- 
- 	* version.sh, www/index.rst: Prepare for 1.3.18 release.
-diff -Naur old/coders/png.c new/coders/png.c
---- old/coders/png.c	2013-03-09 13:19:31.000000000 -1000
-+++ new/coders/png.c	2013-11-22 06:33:25.423156308 -1000
-@@ -1689,6 +1689,12 @@
-         }
-       return(image);
-     }
-+
-+#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-+  /* Allow benign errors */
-+  png_set_benign_errors(ping, 1);
-+#endif
-+
-   /*
-     Prepare PNG for reading.
-   */
-@@ -6453,6 +6459,12 @@
- #endif
-       return(MagickFail);
-     }
-+
-+#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-+  /* Allow benign errors */
-+  png_set_benign_errors(ping, 1);
-+#endif
-+
-   /*
-     Prepare PNG for writing.
-   */
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index d648d2d5b..89e42554d 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 198050 2013-10-30 12:29:51Z allan $
+# $Id: PKGBUILD 205075 2014-02-04 11:31:25Z heftig $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
-pkgver=2.34.0
+pkgver=2.36.0
 pkgrel=2
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('CPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts')
-makedepends=('swig' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'ruby' 'tk' 'qt4')
+makedepends=('swig' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'tk' 'qt4' 'gtk2')
 optdepends=('guile: guile bindings'
             'lua51: lua bindings'
             'ocaml: ocaml bindings'
@@ -20,29 +20,21 @@ optdepends=('guile: guile bindings'
             'python2: python bindings'
             'ruby: ruby bindings'
             'tcl: tcl bindings'
-            'qt4: gvedit')
+            'qt4: gvedit'
+            'gtk2: gtk output plugin')
 if [ "$CARCH" != "mips64el" ]; then
   makedepends+=('mono' 'r')
   optdepends+=('mono: sharp bindings'
                'r: r bindings')
 fi
-source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
-        'dotty.patch')
-sha1sums=('5a0c00bebe7f4c7a04523db21f40966dc9f0d441'
-          '31bc9f505c8b6470289a0d6ec31c237765cba239')
+source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('a41e9f1cbcc9a24651e14dd15a4cda3d912d7d19')
 
 install=install
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../dotty.patch
-	sed \
-		-e '/LIBPOSTFIX="64"/d' \
-		-i configure
-}
-
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	export LIBPOSTFIX=/
 	export PYTHON=python2
 	export LUA=lua5.1
 
@@ -53,4 +45,10 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
+
+	# Workaround symlink upgrade bug (fixed in pacman trunk)
+	# Also deduplicates the tcl libraries (upstream bug?)
+	# Might have been this commit: https://github.com/ellson/graphviz/commit/f11aead
+	rm -r "${pkgdir}/usr/lib/tcl8.6/graphviz"
+	ln -s ../graphviz/tcl "$pkgdir/usr/lib/tcl8.6/graphviz"
 }
diff --git a/extra/graphviz/dotty.patch b/extra/graphviz/dotty.patch
deleted file mode 100644
index 7c8ca1d7f..000000000
--- a/extra/graphviz/dotty.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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 acf83faf6..9d0008177 100644
--- a/extra/grilo-plugins/PKGBUILD
+++ b/extra/grilo-plugins/PKGBUILD
@@ -1,33 +1,33 @@
-# $Id: PKGBUILD 198052 2013-10-30 12:30:49Z allan $
+# $Id: PKGBUILD 205841 2014-02-11 12:54:03Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=grilo-plugins
-pkgver=0.2.9
-pkgrel=2
+pkgver=0.2.10
+pkgrel=1
 pkgdesc="Plugins for Grilo"
 url="http://www.gnome.org"
 arch=('i686' 'x86_64' 'mips64el')
 license=(LGPL)
 depends=(grilo sqlite libgcrypt)
-makedepends=(gupnp-av libgdata gmime rest libtracker-sparql totem-plparser libdmapsharing
-             json-glib intltool)
+makedepends=(gupnp-av libgdata gmime libtracker-sparql libdmapsharing
+             json-glib intltool avahi itstool)
 optdepends=('gupnp-av: uPnP plugin'
             'libgdata: Youtube plugin'
+            'gnome-online-accounts: Flickr 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')
+            'json-glib: TMDb plugin'
+            'avahi: Freebox plugin')
 options=('!emptydirs')
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('902b839bd1cdc27613d9e44af2afe00d1ef3b7471ae72c66c622560007e1023e')
+sha256sums=('5a7dd406ed58145847553e6dbb5f766e9d58dc5d4cfeb7e290d5b38c88163871')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
-    --enable-shoutcast
+    --enable-shoutcast --disable-pocket
   make
 }
 
diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD
index d5707a9c2..121d60cb8 100644
--- a/extra/grilo/PKGBUILD
+++ b/extra/grilo/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 198051 2013-10-30 12:30:26Z allan $
+# $Id: PKGBUILD 205840 2014-02-11 12:53:50Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=grilo
-pkgver=0.2.7
+pkgver=0.2.8
 pkgrel=1
 pkgdesc="Framework that provides access to various sources of multimedia content"
 url="http://www.gnome.org"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-depends=('gtk3' 'libxml2' 'libsoup' 'liboauth')
+depends=('gtk3' 'libxml2' 'libsoup' 'liboauth' 'totem-plparser')
 makedepends=('gobject-introspection' 'gtk-doc' 'vala' 'intltool')
 optdepends=('grilo-plugins: Plugins for grilo')
 options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('4a854ee6f9a220f05e696813949be94780c12a7fb281253f10a545f30ed596d8')
+sha256sums=('03a50e011b897a46d6ec6fe4cfec4ca0737047f279c99b3d9eb9bef8c472cee8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gsasl/PKGBUILD b/extra/gsasl/PKGBUILD
index d7f0999c6..9aff2bee3 100644
--- a/extra/gsasl/PKGBUILD
+++ b/extra/gsasl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197247 2013-10-24 18:39:54Z eric $
+# $Id: PKGBUILD 203576 2014-01-13 17:12:07Z andyrtr $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gsasl
 pkgver=1.8.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms"
 arch=("i686" "x86_64" "mips64el")
 url="http://josefsson.org/gsasl/"
@@ -13,6 +13,11 @@ install=gsasl.install
 source=(ftp://ftp.gnu.org/gnu/gsasl/${pkgname}-${pkgver}.tar.gz)
 sha1sums=('343fd97ae924dc406986c02fb9b889f4114239ae')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed -i 's|error too old libgcrypt|/*error too old libgcrypt*/|' lib/configure
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --with-gssapi-impl=mit
diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD
index 0f27364d8..da11e96f9 100644
--- a/extra/gssdp/PKGBUILD
+++ b/extra/gssdp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198636 2013-10-31 15:44:36Z heftig $
+# $Id: PKGBUILD 205055 2014-02-03 21:25:19Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gssdp
-pkgver=0.14.6
+pkgver=0.14.7
 pkgrel=1
 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=(libsoup)
 makedepends=(gobject-introspection gtk3 gtk-doc vala)
 optdepends=('gtk3: gssdp-device-sniffer')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('9acfdeb99080b165c34ea7c65fb909ea356b4550937972a73df5b69b419eeacd')
+sha256sums=('02db81cb90a86c08579fc06f55584aea6b30dc6dcc7a5b5a4864a0ecb2f3d8b5')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD
index 61ba2f655..8ffeed5ec 100644
--- a/extra/gst-libav/PKGBUILD
+++ b/extra/gst-libav/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 199372 2013-11-11 17:53:04Z heftig $
+# $Id: PKGBUILD 205819 2014-02-10 13:13:12Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-libav
-pkgver=1.2.1
+pkgver=1.2.3
 pkgrel=1
 pkgdesc="Gstreamer libav Plugin"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://gstreamer.freedesktop.org/"
 depends=('gst-plugins-base-libs' 'bzip2')
-makedepends=('yasm')
+makedepends=('yasm' 'python')
 options=(!emptydirs)
 provides=("gst-ffmpeg=$pkgver-$pkgrel")
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('fd152b7aec56ae76ad58b9759913a8bfe1792bdf64f260d0acaba75b75076676')
+sha256sums=('ebc7fbe10955f40df6ccc4bf689075e7e296205fc7ecd8ff383d43c5cdf5bcd6')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD
index 160761869..daa2f7d6f 100644
--- a/extra/gst-plugins-base/PKGBUILD
+++ b/extra/gst-plugins-base/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 199366 2013-11-11 17:42:32Z heftig $
+# $Id: PKGBUILD 205815 2014-02-10 13:12:18Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gst-plugins-base
 pkgname=('gst-plugins-base-libs' 'gst-plugins-base')
-pkgver=1.2.1
+pkgver=1.2.3
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Base Plugins"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libv
 options=(!emptydirs)
 url="http://gstreamer.freedesktop.org/"
 source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz)
-sha256sums=('de2444a5c150d4e4b680364d7c0414cd8b015d95b305ff65d65a17683379532f')
+sha256sums=('61edec35c270f86928bad434bd059da4efff865d1ef01bcc64ecbd903625dae1')
 
 build() {
   cd $pkgbase-$pkgver
diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD
index 988072d46..d6aa7c7f5 100644
--- a/extra/gst-plugins-good/PKGBUILD
+++ b/extra/gst-plugins-good/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 199367 2013-11-11 17:42:49Z heftig $
+# $Id: PKGBUILD 205816 2014-02-10 13:12:32Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-plugins-good
-pkgver=1.2.1
+pkgver=1.2.3
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Good Plugins"
 arch=('i686' 'x86_64' 'mips64el')
 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')
+makedepends=('gstreamer' 'speex' 'flac' 'libraw1394' 'python' 'gtk-doc')
 options=(!emptydirs)
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('660fa02dbe01086fcf702d87acc0ba5dde2559d6a11ecf438874afe504c50517')
+sha256sums=('bfb33536a515bdcc34482f64b8d9cc3e47c753878b254923b419bc2f7485e470')
 
 build() {
   cd $pkgname-$pkgver
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
+    --disable-static --enable-experimental --enable-gtk-doc \
     --with-package-name="GStreamer Good Plugins (Arch Linux)" \
     --with-package-origin="http://www.archlinux.org/"
 
@@ -28,7 +28,7 @@ build() {
   make
 }
 
-# Disable for now: fails with soup timeout
+# Disabled for now: souphttpsrc times out, and takes a damn long time to do so
 #check() {
 #  cd $pkgname-$pkgver
 #  make check
@@ -36,5 +36,5 @@ build() {
 
 package() {
   cd $pkgname-$pkgver
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD
index d24e638c0..4378fdf54 100644
--- a/extra/gst-plugins-ugly/PKGBUILD
+++ b/extra/gst-plugins-ugly/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 199864 2013-11-17 12:53:56Z bpiotrowski $
+# $Id: PKGBUILD 205818 2014-02-10 13:12:59Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-plugins-ugly
-pkgver=1.2.1
-pkgrel=2
+pkgver=1.2.3
+pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Ugly Plugins"
 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')
-makedepends=('python')
+makedepends=('python' 'gtk-doc')
 options=(!emptydirs)
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('35ae5d45de54827604e24f57f54ab30a5ab2245b4c4120977273eb11d19c2395')
+sha256sums=('537b0a7607eee499026388bb705b5b68985a3fd59fe22ee09accaf8cdf57eb3b')
 
 build() {
   cd $pkgname-$pkgver
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
+    --disable-static --enable-experimental --enable-gtk-doc \
     --with-package-name="GStreamer Ugly Plugins (Arch Linux)" \
     --with-package-origin="http://www.archlinux.org/"
 
diff --git a/extra/gstreamer-vaapi/PKGBUILD b/extra/gstreamer-vaapi/PKGBUILD
index 4d2b02e42..54d7e808e 100644
--- a/extra/gstreamer-vaapi/PKGBUILD
+++ b/extra/gstreamer-vaapi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 200351 2013-11-26 23:08:09Z heftig $
+# $Id: PKGBUILD 204869 2014-01-29 19:22:30Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=gstreamer-vaapi
 pkgname=(gst-vaapi gstreamer0.10-vaapi)
-pkgver=0.5.7
+pkgver=0.5.8
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework VA Plugins"
 arch=(i686 x86_64)
@@ -14,13 +14,18 @@ makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstream
 options=(!emptydirs)
 
 #source=(git://gitorious.org/vaapi/${pkgbase}.git#tag=$pkgver)
-source=($url/$pkgbase-${pkgver}.tar.bz2)
-sha1sums=('6baa794e5f95a22fbb5e0788ec29c8a78f40b5b3')
+source=($url/$pkgbase-${pkgver}.tar.bz2
+        https://gitorious.org/vaapi/gstreamer-videoutils/raw/f56f0ca70eaa39dc8f66f61e991094b385ed71ff:gst-libs/gst/video/gstvideoencoder.c
+        https://gitorious.org/vaapi/gstreamer-videoutils/raw/f56f0ca70eaa39dc8f66f61e991094b385ed71ff:gst-libs/gst/video/gstvideoencoder.h)
+sha1sums=('b0756a5941e3ad2d33a94a550eb9fe3ade0c07e6'
+          'd1edee8caacd6d0868b95fd80c8aab8018105178'
+          'd3f198da32cfe5c305818ca93a941ac5198efa1c')
 
 prepare() {
   mkdir build build-0.10
-  #cd $pkgbase
-  #NO_CONFIGURE=1 ./autogen.sh
+
+  # Fix files not in tarball
+  cp gstvideoencoder.{c,h} $pkgbase-$pkgver/ext/videoutils/gst-libs/gst/video
 }
 
 _build() (
diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD
index fdda4c0ec..6cc0088da 100644
--- a/extra/gstreamer/PKGBUILD
+++ b/extra/gstreamer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 199371 2013-11-11 17:52:47Z heftig $
+# $Id: PKGBUILD 205814 2014-02-10 13:11:48Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gstreamer
-pkgver=1.2.1
+pkgver=1.2.3
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('libxml2' 'glib2')
 optdepends=('sh: feedback script')
 makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
 source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
-sha256sums=('a4523d2471bca6cd0059a32e3b042f50faa4dadc6439852af8b43ca3f17d1fc9')
+sha256sums=('0f9a9817a384b3448c368c23345e5122435caef9c00f1c40d7b1953827b0d8eb')
 
 build() {
   cd "${srcdir}/gstreamer-${pkgver}"
diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD
index 583ca4c8f..914e62cca 100644
--- a/extra/gstreamer0.10-ugly/PKGBUILD
+++ b/extra/gstreamer0.10-ugly/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 201394 2013-12-10 15:34:19Z jgc $
+# $Id: PKGBUILD 204421 2014-01-19 16:28:54Z bpiotrowski $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gstreamer0.10-ugly
 pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
 pkgver=0.10.19
-pkgrel=8
+pkgrel=9
 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' 'gtk-doc' 'git')
diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD
index 1d4db805a..129e725c5 100644
--- a/extra/gthumb/PKGBUILD
+++ b/extra/gthumb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 202999 2013-12-30 22:49:00Z heftig $
+# $Id: PKGBUILD 205024 2014-02-03 10:02:54Z heftig $
 # 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.6
-pkgrel=1
+pkgrel=3
 pkgdesc="Image browser and viewer for the GNOME Desktop"
 arch=(i686 x86_64 mips64el)
 license=(GPL)
diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD
index ed721437a..46cc3b3b7 100644
--- a/extra/gtk-vnc/PKGBUILD
+++ b/extra/gtk-vnc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 200822 2013-12-06 03:01:44Z eric $
+# $Id: PKGBUILD 204613 2014-01-24 10:08:11Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
@@ -6,12 +6,12 @@
 
 pkgname=gtk-vnc
 pkgver=0.5.3
-pkgrel=1
+pkgrel=3
 pkgdesc="A VNC viewer widget for GTK"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://wiki.gnome.org/Projects/gtk-vnc"
 license=('LGPL')
-depends=('libgcrypt' 'gtk3')
+depends=('libgcrypt' 'gtk3' 'gnutls')
 optdepends=('gtk2: GTK2 widget')
 makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2' 'vala' 'gobject-introspection')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index bc7c1f060..e120f1607 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 200800 2013-12-05 17:20:20Z heftig $
+# $Id: PKGBUILD 204833 2014-01-28 08:59:57Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gtk3
-pkgver=3.10.6
+pkgver=3.10.7
 pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
 arch=(i686 x86_64 mips64el)
@@ -17,16 +17,9 @@ optdepends=('gnome-themes-standard: Default widget theme'
 license=(LGPL)
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
         settings.ini)
-sha256sums=('3c24c57fc5cb7a5ea39d3a3ff7b12be63d7f21a52fd6f20f7b983e19b7b0268a'
+sha256sums=('b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427'
             '14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119')
 
-prepare() {
-    cd "gtk+-$pkgver"
-    
-    # protocols too new; made with a wayland from git, not 1.3.0
-    rm gdk/wayland/gtk-shell-{client-protocol.h,protocol.c}
-}
-
 build() {
     cd "gtk+-$pkgver"
 
diff --git a/extra/gtkmathview/PKGBUILD b/extra/gtkmathview/PKGBUILD
index da86e7d9b..420b1c92c 100644
--- a/extra/gtkmathview/PKGBUILD
+++ b/extra/gtkmathview/PKGBUILD
@@ -1,39 +1,48 @@
-# $Id: PKGBUILD 198078 2013-10-30 12:40:13Z allan $
+# $Id: PKGBUILD 205608 2014-02-09 10:29:40Z andyrtr $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gtkmathview
 pkgver=0.8.0
-pkgrel=3
+pkgrel=4
 pkgdesc="C++ rendering engine for MathML documents"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://helm.cs.unibo.it/mml-widget/"
-license=('GPL')
-depends=('popt' 'gtk2' 't1lib' 'gmetadom')
-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'
-        '0005-gcc-4.7-build-fixes.patch'
-	'missingLib.diff')
+license=('LGPL3')
+depends=('popt' 'gtk2' 't1lib' 'gmetadom' 'pangox-compat')
+source=(http://helm.cs.unibo.it/mml-widget/sources/${pkgname}-${pkgver}.tar.gz
+        gtkmathview-0.8.0-gcc43.patch
+        gtkmathview-0.8.0-cond-t1.patch
+        gtkmathview-0.8.0-gcc47.patch
+        gtkmathview-0.8.0-includes.patch)
 md5sums=('b53564e553728d4b69f7d366dfeb5299'
-         '9fd261db865336c89ebf0f3545af9bc4'
+         '92eb2870c1922cbebd5566900cde220b'
          'a79a27e00908e75712bc9453b669fe61'
-         '9505d53cd858759ad8fb297c84395323'
-	 '6b00674713f981a4ffe87f6e812da823')
+         '8c8620aee002b30975e1e175ef9af7a7'
+         '4fc8daefbf27d49067b0c66bba54f428')
 
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc44.patch
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc43.patch
+  patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc47.patch
+  patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-includes.patch
   patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-cond-t1.patch
-  patch -Np1 -i ${srcdir}/0005-gcc-4.7-build-fixes.patch
-  patch -Np1 -i ${srcdir}/missingLib.diff
+  
+  # AM_BINRELOC missing, just ignore
+  echo 'AC_DEFUN([AM_BINRELOC], [])' > acinclude.m4
+  autoreconf -if
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
-              --sysconfdir=/etc
-  make
+    --sysconfdir=/etc \
+    --disable-static
+  make LIBTOOL=/usr/bin/libtool
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   make DESTDIR=${pkgdir}/ install
 }
 
diff --git a/extra/gtkmathview/gtkmathview-0.8.0-gcc43.patch b/extra/gtkmathview/gtkmathview-0.8.0-gcc43.patch
new file mode 100644
index 000000000..437e3e2b1
--- /dev/null
+++ b/extra/gtkmathview/gtkmathview-0.8.0-gcc43.patch
@@ -0,0 +1,56 @@
+diff -up gtkmathview-0.8.0/mathmlps/main.cc.gcc43 gtkmathview-0.8.0/mathmlps/main.cc
+--- gtkmathview-0.8.0/mathmlps/main.cc.gcc43	2008-07-29 16:40:04.000000000 -0400
++++ gtkmathview-0.8.0/mathmlps/main.cc	2008-07-29 16:40:14.000000000 -0400
+@@ -18,6 +18,7 @@
+ 
+ #include <config.h>
+ 
++#include <cstring>
+ #include <cassert>
+ #include <fstream>
+ 
+diff -up gtkmathview-0.8.0/mathmlsvg/main.cc.gcc43 gtkmathview-0.8.0/mathmlsvg/main.cc
+--- gtkmathview-0.8.0/mathmlsvg/main.cc.gcc43	2007-08-17 06:02:46.000000000 -0400
++++ gtkmathview-0.8.0/mathmlsvg/main.cc	2008-07-29 16:33:03.000000000 -0400
+@@ -18,6 +18,7 @@
+ 
+ #include <config.h>
+ 
++#include <cstring>
+ #include <cassert>
+ #include <fstream>
+ 
+diff -up gtkmathview-0.8.0/mathmlsvg/SMS.cc.gcc43 gtkmathview-0.8.0/mathmlsvg/SMS.cc
+--- gtkmathview-0.8.0/mathmlsvg/SMS.cc.gcc43	2008-07-29 16:39:01.000000000 -0400
++++ gtkmathview-0.8.0/mathmlsvg/SMS.cc	2008-07-29 16:39:07.000000000 -0400
+@@ -18,6 +18,7 @@
+ 
+ #include <config.h>
+ 
++#include <cstring>
+ #include <sstream>
+ #include "defs.h"
+ #include "AbstractLogger.hh"
+diff -up gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc.gcc43 gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc
+--- gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc.gcc43	2008-07-29 16:35:24.000000000 -0400
++++ gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc	2008-07-29 16:35:28.000000000 -0400
+@@ -19,7 +19,7 @@
+ #include <t1lib.h>
+ #include <config.h>
+ #include <map>
+-#include <string>
++#include <cstring>
+ #include <stdlib.h>
+ #include <iostream>
+ #include <list>
+diff -up gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc.gcc43 gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc
+--- gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc.gcc43	2007-08-17 06:02:38.000000000 -0400
++++ gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc	2008-07-29 16:33:03.000000000 -0400
+@@ -18,6 +18,7 @@
+ 
+ #include <config.h>
+ 
++#include <cstring>
+ #include <cassert>
+ 
+ #include "mathVariantAux.hh"
diff --git a/extra/gtkmathview/gtkmathview-0.8.0-gcc44.patch b/extra/gtkmathview/gtkmathview-0.8.0-gcc44.patch
deleted file mode 100644
index a9069056b..000000000
--- a/extra/gtkmathview/gtkmathview-0.8.0-gcc44.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -urN gtkmathview-0.8.0-orig/mathmlps/main.cc gtkmathview-0.8.0/mathmlps/main.cc
---- gtkmathview-0.8.0-orig/mathmlps/main.cc	2008-04-03 22:43:06.000000000 +0400
-+++ gtkmathview-0.8.0/mathmlps/main.cc	2008-04-03 23:53:16.000000000 +0400
-@@ -20,6 +20,7 @@
- 
- #include <cassert>
- #include <fstream>
-+#include <cstring>
- 
- #include <popt.h>
- 
-diff -urN gtkmathview-0.8.0-orig/mathmlsvg/main.cc gtkmathview-0.8.0/mathmlsvg/main.cc
---- gtkmathview-0.8.0-orig/mathmlsvg/main.cc	2008-04-03 22:43:05.000000000 +0400
-+++ gtkmathview-0.8.0/mathmlsvg/main.cc	2008-04-03 23:43:31.000000000 +0400
-@@ -20,6 +20,7 @@
- 
- #include <cassert>
- #include <fstream>
-+#include <cstring>
- 
- #include <popt.h>
- 
-diff -urN gtkmathview-0.8.0-orig/mathmlsvg/SMS.cc gtkmathview-0.8.0/mathmlsvg/SMS.cc
---- gtkmathview-0.8.0-orig/mathmlsvg/SMS.cc	2008-04-03 22:43:05.000000000 +0400
-+++ gtkmathview-0.8.0/mathmlsvg/SMS.cc	2008-04-03 23:25:12.000000000 +0400
-@@ -19,6 +19,7 @@
- #include <config.h>
- 
- #include <sstream>
-+#include <cstring>
- #include "defs.h"
- #include "AbstractLogger.hh"
- #include "ValueConversion.hh"
-diff -urN gtkmathview-0.8.0-orig/src/engine/mathml/mathVariantAux.cc gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc
---- gtkmathview-0.8.0-orig/src/engine/mathml/mathVariantAux.cc	2008-04-03 22:43:05.000000000 +0400
-+++ gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc	2008-04-03 23:10:05.000000000 +0400
-@@ -20,6 +20,8 @@
- 
- #include <cassert>
- 
-+#include <cstring>
-+
- #include "mathVariantAux.hh"
- 
- static MathVariantAttributes vattr[] = {
-diff -urN gtkmathview-0.8.0-orig/src/backend/ps/T1_FontDataBase.cc gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc
---- gtkmathview-0.8.0-orig/src/backend/ps/T1_FontDataBase.cc	2007-08-17 12:02:40.000000000 +0200
-+++ gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc		2008-06-07 12:26:01.000000000 +0200
-@@ -23,6 +23,7 @@
- #include <stdlib.h>
- #include <iostream>
- #include <list>
-+#include <cstring>
- 
- #include "String.hh"
- #include "T1_FontDataBase.hh"
---- a/src/common/AbstractLogger.cc	2009-06-12 16:29:57.000000000 -0700
-+++ b/src/common/AbstractLogger.cc	2009-06-12 16:29:57.000000000 -0700
-@@ -18,6 +18,8 @@
- 
- #include <config.h>
- 
-+#include <cstdio>
-+
- #include <stdarg.h>
- 
- #include "AbstractLogger.hh"
diff --git a/extra/gtkmathview/gtkmathview-0.8.0-gcc47.patch b/extra/gtkmathview/gtkmathview-0.8.0-gcc47.patch
new file mode 100644
index 000000000..958617886
--- /dev/null
+++ b/extra/gtkmathview/gtkmathview-0.8.0-gcc47.patch
@@ -0,0 +1,67 @@
+diff -up gtkmathview-0.8.0/mathmlps/main.cc.gcc47 gtkmathview-0.8.0/mathmlps/main.cc
+--- gtkmathview-0.8.0/mathmlps/main.cc.gcc47	2012-02-27 13:12:01.218602317 -0500
++++ gtkmathview-0.8.0/mathmlps/main.cc	2012-02-27 13:12:06.596555579 -0500
+@@ -21,6 +21,13 @@
+ #include <cstring>
+ #include <cassert>
+ #include <fstream>
++#ifdef __linux__
++/* to get getopt on Linux */
++#ifndef __USE_POSIX2
++#define __USE_POSIX2
++#endif
++#endif
++#include <unistd.h>
+ 
+ #include <popt.h>
+ 
+diff -up gtkmathview-0.8.0/mathmlsvg/main.cc.gcc47 gtkmathview-0.8.0/mathmlsvg/main.cc
+--- gtkmathview-0.8.0/mathmlsvg/main.cc.gcc47	2012-02-27 13:10:33.335366105 -0500
++++ gtkmathview-0.8.0/mathmlsvg/main.cc	2012-02-27 13:10:33.374365766 -0500
+@@ -21,6 +21,13 @@
+ #include <cstring>
+ #include <cassert>
+ #include <fstream>
++#ifdef __linux__
++/* to get getopt on Linux */
++#ifndef __USE_POSIX2
++#define __USE_POSIX2
++#endif
++#endif
++#include <unistd.h>
+ 
+ #include <popt.h>
+ 
+diff -up gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh.gcc47 gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh
+--- gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh.gcc47	2007-08-17 06:02:34.000000000 -0400
++++ gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh	2012-02-27 13:10:33.376365750 -0500
+@@ -47,12 +47,13 @@ protected:
+   SmartPtr<typename ElementBuilder::type>
+   getElement(const typename Model::Element& el) const
+   {
+-    if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(linkerAssoc(el)))
++    SmartPtr<typename ElementBuilder::type> elem;
++    if (elem = smart_cast<typename ElementBuilder::type>(this->linkerAssoc(el)))
+       return elem;
+     else
+       {
+-	SmartPtr<typename ElementBuilder::type> elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
+-	linkerAdd(el, elem);
++	elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
++	this->linkerAdd(el, elem);
+ 	return elem;
+       }
+   }
+diff -up gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh.gcc47 gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh
+--- gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh.gcc47	2007-08-17 06:02:34.000000000 -0400
++++ gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh	2012-02-27 13:10:33.377365741 -0500
+@@ -43,7 +43,7 @@ protected:
+   findValidNodeForward(const typename Model::Node& p0) const
+   {
+     for (typename Model::Node p = p0; p; p = Model::getNextSibling(p))
+-      if (valid(p)) return Model::asElement(p);
++      if (this->valid(p)) return Model::asElement(p);
+     return typename Model::Element();
+   }
+     
+
diff --git a/extra/gtkmathview/gtkmathview-0.8.0-includes.patch b/extra/gtkmathview/gtkmathview-0.8.0-includes.patch
new file mode 100644
index 000000000..665c7827e
--- /dev/null
+++ b/extra/gtkmathview/gtkmathview-0.8.0-includes.patch
@@ -0,0 +1,12 @@
+diff -ru gtkmathview-0.8.0.orig/src/common/AbstractLogger.cc gtkmathview-0.8.0/src/common/AbstractLogger.cc
+--- gtkmathview-0.8.0.orig/src/common/AbstractLogger.cc	2009-02-28 13:56:00.000000000 +0000
++++ gtkmathview-0.8.0/src/common/AbstractLogger.cc	2009-02-28 13:56:28.000000000 +0000
+@@ -19,6 +19,7 @@
+ #include <config.h>
+ 
+ #include <stdarg.h>
++#include <stdio.h>
+ 
+ #include "AbstractLogger.hh"
+ 
+
diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD
index e7363ea6c..b3b18d7dd 100644
--- a/extra/gtkmm3/PKGBUILD
+++ b/extra/gtkmm3/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198080 2013-10-30 12:40:57Z allan $
+# $Id: PKGBUILD 204983 2014-02-02 18:51:29Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=gtkmm3
 _pkgbasename=gtkmm
 pkgname=('gtkmm3' 'gtkmm3-docs')
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt')
@@ -12,7 +12,7 @@ license=('LGPL')
 options=('!emptydirs')
 url="http://www.gtkmm.org/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('5e45fed4a7cff1baa72d1ef67e0d9883063d3a575cb53190e7ecf27047d241f8')
+sha256sums=('6fa5cdaa5cf386ea7c77fafed47e913afadd48fe45e28d8cb01075c3ee412538')
 
 build() {
   cd "$_pkgbasename-$pkgver"
diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD
index 0b6a646e6..fd3b1c11d 100644
--- a/extra/gtksourceview3/PKGBUILD
+++ b/extra/gtksourceview3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198083 2013-10-30 12:42:02Z allan $
+# $Id: PKGBUILD 204834 2014-01-28 09:00:12Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceview3
 _pkgbasename=gtksourceview
-pkgver=3.10.1
+pkgver=3.10.2
 pkgrel=1
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('gtk3' 'libxml2')
 makedepends=('intltool' 'gobject-introspection' 'glade')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('38de44f832b4110a3442af2fce58fce0a54f4b22a763c490bcdc1b1db2fb0b01')
+sha256sums=('045d244b1fd6a2d1b91a40712cbbfb18c6e44844c266a0a16ac5ec1800add8f5')
 
 build() {
   cd "$_pkgbasename-$pkgver"
diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD
index 1f59f948c..1033470fd 100644
--- a/extra/gupnp-av/PKGBUILD
+++ b/extra/gupnp-av/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 199920 2013-11-19 00:13:08Z heftig $
+# $Id: PKGBUILD 205057 2014-02-03 21:26:34Z heftig $
 # 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.4
+pkgver=0.12.5
 pkgrel=1
 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=(LGPL)
 depends=(gupnp)
 makedepends=(gobject-introspection gtk-doc vala)
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('548a9cef8ab3007734e20a4ce284c422ae299b7e024a4824299f6ae7e3dd7a5b')
+sha256sums=('8375034ccc4a45e90923c26135517aab57a88f5757ce65a1b23378df4c60bff6')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD
index 3da64d2e7..39d9fe018 100644
--- a/extra/gupnp/PKGBUILD
+++ b/extra/gupnp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 201545 2013-12-14 15:50:45Z heftig $
+# $Id: PKGBUILD 205056 2014-02-03 21:25:57Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gupnp
-pkgver=0.20.9
+pkgver=0.20.10
 pkgrel=1
 pkgdesc="An object-oriented UPNP framework"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=(gssdp util-linux)
 makedepends=(gobject-introspection gtk-doc vala) 
 optdepends=('python2: gupnp-binding-tool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('61650a3be46979973b82c79eab5c3baf16a4ad3a051d8a710e5d1c376cf32c6e')
+sha256sums=('5c7f9278b50ed252606552e2f148be4e1b1616bc93ebc8b09b22fcf5d8aa08e4')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index 2cb265268..9005c3be8 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 199075 2013-11-08 14:49:13Z heftig $
+# $Id: PKGBUILD 204422 2014-01-19 16:28:55Z bpiotrowski $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
 pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-goa' 'gvfs-mtp')
 pkgver=1.18.3
-pkgrel=1
+pkgrel=3
 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')
diff --git a/extra/gvfs/imobiledevice-1.1.5.patch b/extra/gvfs/imobiledevice-1.1.5.patch
deleted file mode 100644
index 00e9358dc..000000000
--- a/extra/gvfs/imobiledevice-1.1.5.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From d71c6108901460842de25012d5ece727a0c70d27 Mon Sep 17 00:00:00 2001
-From: Ondrej Holy <oholy@redhat.com>
-Date: Tue, 11 Jun 2013 11:33:23 +0000
-Subject: afc: Update to libimobiledevice new api
-
-https://bugzilla.redhat.com/show_bug.cgi?id=951731
-https://bugzilla.gnome.org/show_bug.cgi?id=702577
----
-diff --git a/configure.ac b/configure.ac
-index 12dbdcd..2846d82 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -372,14 +372,11 @@ AFC_LIBS=
- AFC_CFLAGS=
- 
- if test "x$enable_afc" != "xno" ; then
--  PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.0 libplist >= 0.15, msg_afc=yes)
-+  PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.5 libplist >= 0.15, msg_afc=yes)
- 
-   if test "x$msg_afc" = "xyes"; then
-     PKG_CHECK_MODULES(AFC, libimobiledevice-1.0 libplist)
-     AC_DEFINE(HAVE_AFC, 1, [Define to 1 if AFC is going to be built])
--    PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.2,
--                     [AC_DEFINE(HAVE_LIBIMOBILEDEVICE_1_1_2, 1,
--                                [Define to 1 if libimobiledevice-1.1.2 found])])
-   fi
- fi
- 
-diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c
-index ab4a9ce..6b0b64f 100644
---- a/daemon/gvfsbackendafc.c
-+++ b/daemon/gvfsbackendafc.c
-@@ -349,12 +349,7 @@ _idevice_event_cb (const idevice_event_t *event, void *user_data)
-   if (event->event != IDEVICE_DEVICE_REMOVE)
-     return;
- 
--#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2
-   event_udid = event->udid;
--#else
--  event_udid = event->uuid;
--#endif
--
-   if (g_str_equal (event_udid, afc_backend->uuid) == FALSE)
-     return;
- 
-@@ -401,7 +396,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
-   const char *str;
-   char *tmp;
-   char *display_name = NULL;
--  guint16 port;
-+  lockdownd_service_descriptor_t lockdown_service = NULL;
-   int virtual_port;
-   GMountSpec *real_spec;
-   GVfsBackendAfc *self;
-@@ -414,6 +409,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
-   char **dcim_afcinfo;
-   plist_t value;
-   lockdownd_error_t lerr;
-+  afc_error_t aerr;
-   const gchar *choices[] = {_("Try again"), _("Cancel"), NULL}; /* keep in sync with the enum above */
-   gboolean aborted = FALSE;
-   gchar *message = NULL;
-@@ -649,41 +645,38 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
- 
-   switch (self->mode) {
-     case ACCESS_MODE_AFC:
--      lerr = lockdownd_start_service (lockdown_cli, self->service, &port);
-+      lerr = lockdownd_start_service (lockdown_cli, self->service, &lockdown_service);
-       if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job))))
-         {
-           goto out_destroy_lockdown;
-         }
--      if (G_UNLIKELY(g_vfs_backend_afc_check (afc_client_new (self->dev,
--                                                              port, &self->afc_cli),
--                                              G_VFS_JOB(job))))
-+      aerr = afc_client_new (self->dev, lockdown_service, &self->afc_cli);
-+      if (G_UNLIKELY(g_vfs_backend_afc_check (aerr, G_VFS_JOB(job))))
-         {
-           goto out_destroy_lockdown;
-         }
-       break;
-     case ACCESS_MODE_HOUSE_ARREST:
--      lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.installation_proxy", &port);
-+      lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.installation_proxy", &lockdown_service);
-       if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job))))
-         {
-           g_warning ("couldn't start inst proxy");
-           goto out_destroy_lockdown;
-         }
--      if (G_UNLIKELY(g_vfs_backend_inst_check (instproxy_client_new (self->dev,
--                                                                     port, &self->inst),
--                                               G_VFS_JOB(job))))
-+      aerr = instproxy_client_new (self->dev, lockdown_service, &self->inst);
-+      if (G_UNLIKELY(g_vfs_backend_inst_check (aerr, G_VFS_JOB(job))))
-         {
-           g_warning ("couldn't create inst proxy instance");
-           goto out_destroy_lockdown;
-         }
--      lerr = lockdownd_start_service (lockdown_cli, "com.apple.springboardservices", &port);
-+      lerr = lockdownd_start_service (lockdown_cli, "com.apple.springboardservices", &lockdown_service);
-       if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job))))
-         {
-           g_warning ("couldn't start SBServices proxy");
-           goto out_destroy_lockdown;
-         }
--      if (G_UNLIKELY(g_vfs_backend_sbs_check (sbservices_client_new (self->dev,
--                                                                     port, &self->sbs),
--                                              G_VFS_JOB(job))))
-+      aerr = sbservices_client_new (self->dev, lockdown_service, &self->sbs);
-+      if (G_UNLIKELY(g_vfs_backend_sbs_check (aerr, G_VFS_JOB(job))))
-         {
-           g_warning ("couldn't create SBServices proxy instance");
-           goto out_destroy_lockdown;
-@@ -705,6 +698,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
- 
-   /* lockdown connection is not needed anymore */
-   lockdownd_client_free (lockdown_cli);
-+  lockdownd_service_descriptor_free (lockdown_service);
- 
-   /* Add camera item if necessary */
-   if (self->mode == ACCESS_MODE_AFC)
-@@ -723,6 +717,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend,
- 
- out_destroy_lockdown:
-   lockdownd_client_free (lockdown_cli);
-+  lockdownd_service_descriptor_free (lockdown_service);
- 
- out_destroy_dev:
-   idevice_free (self->dev);
-@@ -794,10 +789,11 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self,
- {
-   AppInfo *info;
-   lockdownd_client_t lockdown_cli;
--  guint16 port;
-+  lockdownd_service_descriptor_t lockdown_service = NULL;
-   house_arrest_client_t house_arrest;
-   afc_client_t afc;
-   plist_t dict, error;
-+  lockdownd_error_t lerr;
- 
-   info = g_hash_table_lookup (self->apps, id);
- 
-@@ -812,7 +808,8 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self,
-       g_warning ("Failed to get a lockdown to start house arrest for app %s", info->id);
-       return;
-     }
--  if (lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &port) != LOCKDOWN_E_SUCCESS)
-+  lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &lockdown_service);
-+  if (lerr != LOCKDOWN_E_SUCCESS)
-     {
-       lockdownd_client_free (lockdown_cli);
-       g_warning ("Failed to start house arrest for app %s", info->id);
-@@ -820,14 +817,17 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self,
-     }
- 
-   house_arrest = NULL;
--  house_arrest_client_new (self->dev, port, &house_arrest);
-+  house_arrest_client_new (self->dev, lockdown_service, &house_arrest);
-   if (house_arrest == NULL)
-     {
-       g_warning ("Failed to start house arrest for app %s", info->id);
-       lockdownd_client_free (lockdown_cli);
-+      lockdownd_service_descriptor_free (lockdown_service);
-       return;
-     }
- 
-+  lockdownd_service_descriptor_free (lockdown_service);
-+
-   dict = NULL;
-   if (house_arrest_send_command (house_arrest, "VendContainer", info->id) != HOUSE_ARREST_E_SUCCESS ||
-       house_arrest_get_result (house_arrest, &dict) != HOUSE_ARREST_E_SUCCESS)
-diff --git a/monitor/afc/afcvolume.c b/monitor/afc/afcvolume.c
-index 9829077..b7284b0 100644
---- a/monitor/afc/afcvolume.c
-+++ b/monitor/afc/afcvolume.c
-@@ -80,6 +80,8 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
-   guint retries;
-   plist_t value;
-   char *model, *display_name;
-+  lockdownd_service_descriptor_t lockdown_service = NULL;
-+  lockdownd_error_t lerr;
- 
-   retries = 0;
-   do {
-@@ -94,14 +96,14 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
- 
-   if (self->service != NULL)
-     {
--      guint16 port;
--
-       if (lockdownd_client_new_with_handshake (dev, &lockdown_cli, "gvfs-afc-volume-monitor") != LOCKDOWN_E_SUCCESS)
-         {
-           idevice_free (dev);
-           return 0;
-         }
--      if (lockdownd_start_service(lockdown_cli, "com.apple.mobile.house_arrest", &port) != LOCKDOWN_E_SUCCESS)
-+      lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &lockdown_service);
-+      lockdownd_service_descriptor_free (lockdown_service);
-+      if (lerr != LOCKDOWN_E_SUCCESS)
-         {
-           idevice_free (dev);
-           return 0;
-diff --git a/monitor/afc/afcvolumemonitor.c b/monitor/afc/afcvolumemonitor.c
-index 3545bdf..995ef4d 100644
---- a/monitor/afc/afcvolumemonitor.c
-+++ b/monitor/afc/afcvolumemonitor.c
-@@ -89,12 +89,7 @@ g_vfs_afc_monitor_idevice_event (const idevice_event_t *event, void *user_data)
- 
-   self = G_VFS_AFC_VOLUME_MONITOR(user_data);
- 
--#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2
-   event_udid = event->udid;
--#else
--  event_udid = event->uuid;
--#endif
--
-   if (event->event == IDEVICE_DEVICE_ADD)
-     g_vfs_afc_monitor_create_volume (self, event_udid);
-   else
---
-cgit v0.9.2
diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD
index ee811c27e..4b67286ec 100644
--- a/extra/harfbuzz/PKGBUILD
+++ b/extra/harfbuzz/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 200683 2013-12-02 11:18:15Z heftig $
+# $Id: PKGBUILD 206031 2014-02-15 18:26:07Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=(harfbuzz)
 pkgname=(harfbuzz harfbuzz-icu)
-pkgver=0.9.24
+pkgver=0.9.26
 pkgrel=1
 pkgdesc="OpenType text shaping engine"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
 license=(MIT)
 makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection)
 source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('edf25dd8a318acdeacd2aeade2387db23c109fec0da626f2127f43917a372422')
+sha256sums=('5ded7dc3d15fb5c9230d7a224b9256b67b35fde30193b4c3a4c3f6b13110e257')
 
 build() {
   cd $pkgbase-$pkgver
diff --git a/extra/haveged/PKGBUILD b/extra/haveged/PKGBUILD
index 55a8d59b4..dc8ce427e 100644
--- a/extra/haveged/PKGBUILD
+++ b/extra/haveged/PKGBUILD
@@ -1,27 +1,21 @@
-# $Id: PKGBUILD 199016 2013-11-06 11:28:54Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
+# $Id: PKGBUILD 203089 2014-01-04 07:54:11Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: kfgz <kfgz at interia dot pl>
 # Contributor: pootzko <pootzko at gmail dot com>
 
 pkgname=haveged
-pkgver=1.7.c
+pkgver=1.8
 _pkgver=${pkgver/.c/c}
-pkgrel=3
+pkgrel=1
 pkgdesc='Entropy harvesting daemon using CPU timings'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.issihosts.com/haveged'
 license=('GPL')
 depends=('glibc')
 source=($url/$pkgname-$_pkgver.tar.gz
-        service cleanexit.patch)
-sha256sums=('40397eded96fc0d624a6a81c8e888ab023e46f3114f1ee699994e645531bf121'
-            'badf8ceb5484d45888a089fabdfba5f44f6ec2930bca203c50200051a4d83e12'
-            'be896659dd96cb85915ac5a9c2bd8d81d1ff348508362d1b71d64b207f69fa5c')
-
-prepare() {
-  cd $pkgname-$_pkgver
-  patch -Np1 -i ../cleanexit.patch
-}
+        service)
+md5sums=('e0034fd8a645b7499157a31a3e3b224d'
+         '777c7ac7fa145c03fca3ba9dcd4501de')
 
 build() {
   cd $pkgname-$_pkgver
@@ -33,7 +27,6 @@ package() {
   cd $pkgname-$_pkgver
   make DESTDIR="$pkgdir" install
 
-  rm -rf "$pkgdir"/etc/init.d
-  install -D -m644 "$srcdir"/service \
+  install -Dm644 "$srcdir"/service \
     "$pkgdir"/usr/lib/systemd/system/haveged.service
 }
diff --git a/extra/haveged/cleanexit.patch b/extra/haveged/cleanexit.patch
deleted file mode 100644
index 01f8c7f94..000000000
--- a/extra/haveged/cleanexit.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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/extra/hdf5-cpp-fortran/PKGBUILD b/extra/hdf5-cpp-fortran/PKGBUILD
index 118b8c455..28e152c52 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.11
+pkgver=1.8.12
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="General purpose library and file format for storing scientific data"
@@ -17,10 +17,10 @@ makedepends=('time' 'gcc-fortran')
 conflicts=('hdf5')
 provides=('hdf5')
 source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2)
-sha1sums=('87ded0894b104cf23a4b965f4ac0a567f8612e5e')
+sha1sums=('8414ca0e6ff7d08e423955960d641ec5f309a55f')
 
 build() {
-  cd $srcdir/${_pkgname}-${pkgver/_/-}
+  cd "$srcdir/${_pkgname}-${pkgver/_/-}"
   export CFLAGS="${CFLAGS/O2/O0}"
   export CXXFLAGS="${CFLAGS}"
   ./configure --prefix=/usr --disable-static \
@@ -37,12 +37,12 @@ build() {
 }
 
 package() {
-  cd $srcdir/${_pkgname}-${pkgver/_/-}
+  cd "$srcdir/${_pkgname}-${pkgver/_/-}"
 
-  make -j1 DESTDIR=${pkgdir} install
+  make -j1 DESTDIR="${pkgdir}" install
 
-  install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
-  install -m644 $srcdir/${_pkgname}-${pkgver/_/-}/COPYING \
-          $pkgdir/usr/share/licenses/${pkgname}/LICENSE 
+  install -d -m755 "$pkgdir/usr/share/licenses/${pkgname}"
+  install -m644 "$srcdir/${_pkgname}-${pkgver/_/-}/COPYING" \
+          "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" 
 }
 
diff --git a/extra/hdf5-openmpi/PKGBUILD b/extra/hdf5-openmpi/PKGBUILD
index eab5d5b9d..3ce838040 100644
--- a/extra/hdf5-openmpi/PKGBUILD
+++ b/extra/hdf5-openmpi/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=hdf5-openmpi
 _pkgname=hdf5
-pkgver=1.8.11
+pkgver=1.8.12
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="General purpose library and file format for storing scientific data (OpenMPI version)"
@@ -20,14 +20,14 @@ provides=('hdf5')
 conflicts=('hdf5')
 source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2 
 mpi.patch) 
-sha1sums=('87ded0894b104cf23a4b965f4ac0a567f8612e5e'
+sha1sums=('8414ca0e6ff7d08e423955960d641ec5f309a55f'
           '658d4a3e537c9c76da3200effa8f95b656a21936')
 
 build() {
-  cd $srcdir/${_pkgname}-${pkgver/_/-}
+  cd "$srcdir/${_pkgname}-${pkgver/_/-}"
 
   # FS#33343
-  patch -Np1 -i ${srcdir}/mpi.patch
+  patch -Np1 -i "${srcdir}/mpi.patch"
 
   export CFLAGS="${CFLAGS/O2/O0}"
   export CXXFLAGS="${CFLAGS}"
@@ -55,15 +55,15 @@ build() {
 }
 
 package() {
-  cd $srcdir/${_pkgname}-${pkgver/_/-}
+  cd "$srcdir/${_pkgname}-${pkgver/_/-}"
 
-  make -j1 DESTDIR=${pkgdir} install
+  make -j1 DESTDIR="${pkgdir}" install
 
-  install -d -m755 $pkgdir/usr/share/$_pkgname
-  mv $pkgdir/usr/share/{hdf5_examples,$_pkgname/examples}
+  install -d -m755 "$pkgdir/usr/share/$_pkgname"
+  mv "$pkgdir"/usr/share/{hdf5_examples,$_pkgname/examples}
 
-  install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
-  install -m644 $srcdir/${_pkgname}-${pkgver/_/-}/COPYING \
-          $pkgdir/usr/share/licenses/${pkgname}/LICENSE 
+  install -d -m755 "$pkgdir/usr/share/licenses/${pkgname}"
+  install -m644 "$srcdir/${_pkgname}-${pkgver/_/-}/COPYING" \
+          "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" 
 }
 
diff --git a/extra/hdf5/PKGBUILD b/extra/hdf5/PKGBUILD
index 0d02b5511..13b4e6e2d 100644
--- a/extra/hdf5/PKGBUILD
+++ b/extra/hdf5/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198099 2013-10-30 12:47:33Z allan $
+# $Id: PKGBUILD 204867 2014-01-29 19:00:16Z ronald $
 # 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.11
+pkgver=1.8.12
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="General purpose library and file format for storing scientific data"
@@ -14,10 +14,10 @@ license=('custom')
 depends=('zlib' 'sh')
 makedepends=('time')
 source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
-sha1sums=('87ded0894b104cf23a4b965f4ac0a567f8612e5e')
+sha1sums=('8414ca0e6ff7d08e423955960d641ec5f309a55f')
 
 build() {
-  cd $srcdir/${pkgname}-${pkgver/_/-}
+  cd "$srcdir/${pkgname}-${pkgver/_/-}"
 
   export CFLAGS="${CFLAGS/O2/O0}"
   export CXXFLAGS="${CFLAGS}"
@@ -34,12 +34,12 @@ build() {
 }
 
 package() {
-  cd $srcdir/${pkgname}-${pkgver/_/-}
+  cd "$srcdir/${pkgname}-${pkgver/_/-}"
 
-  make -j1 DESTDIR=${pkgdir} install
+  make -j1 DESTDIR="${pkgdir}" install
 
-  install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
-  install -m644 $srcdir/${pkgname}-${pkgver/_/-}/COPYING \
-          $pkgdir/usr/share/licenses/${pkgname}/LICENSE 
+  install -d -m755 "$pkgdir/usr/share/licenses/${pkgname}"
+  install -m644 "$srcdir/${pkgname}-${pkgver/_/-}/COPYING" \
+          "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" 
 }
 
diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index cdf426508..cce4682dc 100644
--- a/extra/help2man/PKGBUILD
+++ b/extra/help2man/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 190025 2013-07-13 02:56:23Z giovanni $
+# $Id: PKGBUILD 206037 2014-02-16 09:13:43Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 
 pkgname=help2man
-pkgver=1.43.3
+pkgver=1.44.1
 pkgrel=1
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,8 +11,8 @@ url="http://www.gnu.org/software/help2man/"
 license=('GPL')
 depends=('perl-locale-gettext')
 install=help2man.install
-source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a84868db7c139238df8add5d86a0b54f')
+source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('a5dc6530340b41f0e492d400670dd7ae')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 528d1f6f3..e9734cf21 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 201259 2013-12-07 10:34:58Z bpiotrowski $
+# $Id: PKGBUILD 204757 2014-01-26 12:16:02Z andyrtr $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -6,26 +6,32 @@
 
 pkgname=hugin
 pkgver=2013.0.0
-pkgrel=3
+pkgrel=6
 pkgdesc='Panorama photo stitcher'
 url='http://hugin.sourceforge.net/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
+optdepends=('python2: bindings and plugins')
+makedepends=('cmake' 'boost' 'tclap' 'mesa' 'python2' 'swig')
 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=('0e0689cf2ca0c4a2730cffe06380eda976b6772d')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" hugin-build.patch)
+sha1sums=('0e0689cf2ca0c4a2730cffe06380eda976b6772d'
+          '45a8d8f5ee9b3c013cbc1ae3cfad14a2705c0dd4')
 
 install=install
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../hugin-build.patch
+}
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	cmake . \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DENABLE_LAPACK=yes \
-		-DBUILD_HSI=no
+		-DENABLE_LAPACK=yes
 	make
 }
 
diff --git a/extra/hugin/hugin-build.patch b/extra/hugin/hugin-build.patch
new file mode 100644
index 000000000..42d765927
--- /dev/null
+++ b/extra/hugin/hugin-build.patch
@@ -0,0 +1,11 @@
+--- a/src/hugin1/ptbatcher/PTBatcherGUI.cpp
++++ b/src/hugin1/ptbatcher/PTBatcherGUI.cpp
+@@ -150,7 +150,7 @@
+         { wxCMD_LINE_SWITCH, "v", "verbose",  "show verbose output when processing projects" },
+         { wxCMD_LINE_SWITCH, "a", "assistant", "run the assistant on the given projects" },
+         {
+-            wxCMD_LINE_PARAM,  NULL, NULL, _("stitch_project.pto [output prefix]|assistant_project.pto"),
++            wxCMD_LINE_PARAM,  NULL, NULL, "stitch_project.pto [output prefix]|assistant_project.pto",
+             wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL + wxCMD_LINE_PARAM_MULTIPLE
+         },
+         { wxCMD_LINE_NONE }
diff --git a/extra/i8kutils/PKGBUILD b/extra/i8kutils/PKGBUILD
index aa7f79889..4c1c49962 100644
--- a/extra/i8kutils/PKGBUILD
+++ b/extra/i8kutils/PKGBUILD
@@ -1,27 +1,25 @@
-# $Id: PKGBUILD 185227 2013-05-12 10:04:52Z eric $
-# Maintainer: Thayer Williams <thayer@archlinux.org>
-# Contributor: Eric Johnson <eric@coding-zone.com>
+# $Id: PKGBUILD 205566 2014-02-07 20:38:36Z eric $
+# Maintainer: 
 
 pkgname=i8kutils
-pkgver=1.33
-pkgrel=3
+pkgver=1.40
+pkgrel=4
 pkgdesc="Dell Inspiron/Latitude kernel driver and utilities"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://people.debian.org/~dz/i8k/"
-license=('GPL2')
-depends=('glibc')
+url="https://launchpad.net/i8kutils"
+license=('GPL')
+depends=('bash' 'acpi')
 optdepends=('tk: for i8kmon deamon')
-conflicts=('i8kmon')
-provides=('i8kmon')
-replaces=('i8kmon')
 backup=('etc/i8kutils/i8kmon.conf')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}_${pkgver}.tar.gz
-        i8kmon.service)
-md5sums=('1ab077b301dbb0f4be8ef52eb3b97628'
-         '32c159616f72ab65969db95b9e824ced')
+source=(http://ftp.de.debian.org/debian/pool/main/i/${pkgname}/${pkgname}_${pkgver}.tar.gz
+        i8kmon.service i8kutils-probe.diff)
+sha1sums=('584edfbd90aa167885520b84848381585d9212fb'
+          '5c20f5241de7e60b46117269f4e867b08734cdc8'
+          'ab9058f92adb3e8b9306568005d5751908fb1765')
 
 prepare() {
   cd $pkgname-$pkgver
+  patch -p0 -i "$srcdir"/i8kutils-probe.diff
 
   # conform to Arch Linux guidelines
   sed -i 's|/etc/i8kmon|/etc/i8kutils/i8kmon.conf|g' i8kmon.1
diff --git a/extra/i8kutils/i8kutils-probe.diff b/extra/i8kutils/i8kutils-probe.diff
new file mode 100644
index 000000000..60485d737
--- /dev/null
+++ b/extra/i8kutils/i8kutils-probe.diff
@@ -0,0 +1,84 @@
+=== modified file 'i8kmon'
+--- i8kmon	2013-11-23 19:41:17 +0000
++++ i8kmon	2013-11-23 20:30:47 +0000
+@@ -27,6 +27,7 @@
+     sysconfig	/etc/i8kmon.conf
+     userconfig	~/.i8kmon
+     i8kfan	/usr/bin/i8kfan
++    acpi    "acpi"
+     geometry	{}
+     use_conf    1
+     auto	1
+@@ -202,22 +202,15 @@
+ 
+     set status(acpi_timer) [expr 60 / $config(timeout)]
+ 
+-    set cmd "acpi -a"; set acpi_ac [eval exec $cmd]
+-    set cmd2 "acpitool -a"; set acpi_ac2 [eval exec $cmd2]
+-    set ret [string first "on-line" $acpi_ac]
+-	set ret2 [string first "online" $acpi_ac2]
+-    if {$ret >= 0 | $ret2 >= 0} {
++    set acpi_ac [exec {*}$config(acpi)]
++    if {[string match *on-line* $acpi_ac] || [string match *online* $acpi_ac]} {
+         set status(ac) 1
+     } else {
+         set status(ac) 0
+     }
+ 
+     if {$config(verbose) > 0} {
+-        if {$ret >= 0} {
+-            puts "[clock seconds] acpi: $acpi_ac"
+-        } elseif {$ret2 >= 0} {
+-            puts "[clock seconds] acpi: $acpi_ac2"
+-        }
++        puts "[clock seconds] acpi: $acpi_ac"
+     }
+ 
+     return 0
+@@ -495,8 +487,8 @@
+     -a|--auto               control automatically the fans
+    -na|--noauto	            don\x27t control automatically the fans
+     -d|--daemon             run in daemon mode without user interface
+-   -nd|--nodaemon           don\x27 run as daemon, open the user interface
+-   -nc|--nouserconfig       don't use \$HOME/.i8kmon
++   -nd|--nodaemon           don\x27t run as daemon, open the user interface
++   -nc|--nouserconfig       don\x27t use \$HOME/.i8kmon
+     -v|--verbose            report status on stdout
+     -g|--geometry <geom>    set applet geometry
+     -t|--timeout <secs>     set poll timeout
+@@ -556,7 +548,7 @@
+     }
+ 
+     if {$config(verbose) > 0} {
+-	set copyright "Copyright (C) 2013 i8kutils <https://launchpad.net/i8kutils>"
++	set copyright "Copyright (C) 2013 Vitor Augusto <vitorafsr@gmail.com>"
+ 	puts "i8kmon $PROG_VERSION - $copyright"
+ 	parray config
+ 	parray status
+@@ -596,8 +588,25 @@
+     set status(rightspeed) "0 $rspeed1 $rspeed2 $rspeed3"
+ }
+ 
++# probe external tools
++proc probe_tools {} {
++
++    # The possibility of choosing 'acpi' or 'acpitool' is for compatibility
++    # between different architectures: amd64, i386, kFreeBSD
++    # This code below is strictly related on package dependency stated at
++    # keyword 'Depends:' on file 'debian/control'
++    if {![catch {exec acpi}]} {
++        set config(acpi) "acpi"
++    } elseif {[catch {exec acpitool}]} {
++        set config(acpi) "acpitool"
++    } else {
++        puts stderr "Package dependency problem: neither 'acpi' nor 'acpitool' package is installed"
++    }
++}
++
+ proc main {} {
+     probe_fan_speed
++    probe_tools
+     read_config
+     parse_options
+     make_ui
+
diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD
index 7b25436ff..5869f8f6f 100644
--- a/extra/ibus/PKGBUILD
+++ b/extra/ibus/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 198107 2013-10-30 12:49:58Z allan $
-# Maintainer:
+# $Id: PKGBUILD 204310 2014-01-17 07:31:32Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
 
-pkgname=ibus
-pkgver=1.5.4
+pkgbase=ibus
+pkgname=(ibus libibus)
+pkgver=1.5.5
 pkgrel=1
 pkgdesc="Next Generation Input Bus for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 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')
-install=ibus.install
-source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('2ce4b4d728a4685fd77360d0097b0e568f920c7b')
+depends=('dconf' 'gtk2' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'pygtk' 'python2-dbus' 'python2-gobject' 'iso-codes')
+makedepends=('gobject-introspection' 'vala' 'gconf' 'intltool')
+options=('!emptydirs')
+source=(http://ibus.googlecode.com/files/${pkgbase}-${pkgver}.tar.gz)
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgbase}-${pkgver}
   export PYTHON=python2
   ./configure \
     --prefix=/usr \
@@ -29,7 +29,25 @@ build() {
   make
 }
 
-package() {
-  cd ${pkgname}-${pkgver}
+package_ibus() {
+  depends+=("libibus=$pkgver")
+  install=ibus.install
+
+  cd ${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install
+  make -C src DESTDIR="${pkgdir}" uninstall
+  make -C bindings DESTDIR="${pkgdir}" uninstall
+  make DESTDIR="${pkgdir}" uninstall-pkgconfigDATA
 }
+
+package_libibus() {
+  pkgdesc="IBus support library"
+  depends=('glib2')
+
+  cd ${pkgbase}-${pkgver}
+  make -C src DESTDIR="${pkgdir}" install
+  make -C bindings DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install-pkgconfigDATA
+}
+
+sha512sums=('8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9')
diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD
index bd5110482..dbd1e5292 100644
--- a/extra/icedtea-web-java7/PKGBUILD
+++ b/extra/icedtea-web-java7/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=icedtea-web-java7
 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
-pkgver=1.4.1
+pkgver=1.4.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
@@ -11,7 +11,7 @@ license=('GPL2')
 makedepends=('jdk7-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany')
 noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot
 source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
-sha256sums=('09100207396a09784e04f2ad40d65212930c1d43839e7fa63b9dffaf8567d77b')
+md5sums=('ad4fd669f482e5f69a124061229df517')
 
 _javaver=7
 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
diff --git a/extra/id3lib/00-add-libz-to-compilation.patch b/extra/id3lib/00-add-libz-to-compilation.patch
new file mode 100644
index 000000000..e93787736
--- /dev/null
+++ b/extra/id3lib/00-add-libz-to-compilation.patch
@@ -0,0 +1,14 @@
+This patch was first introduced in version 3.8.3-3
+
+It fixes http://bugs.debian.org/208672
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -74,6 +74,8 @@
+ 
+ if ID3_NEEDZLIB
+ LDADD        = $(top_builddir)/zlib/src/libz.la
++else
++libid3_la_LIBADD  = -lz
+ endif
+ 
+ libid3_la_LDFLAGS = \
diff --git a/extra/id3lib/05-create-m4-directory.patch b/extra/id3lib/05-create-m4-directory.patch
new file mode 100644
index 000000000..d8111205e
--- /dev/null
+++ b/extra/id3lib/05-create-m4-directory.patch
@@ -0,0 +1,12 @@
+Create a local m4 subdirectory
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -12,6 +12,8 @@
+ # require automake 1.5
+ AUTOMAKE_OPTIONS = 1.5
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ EXTRA_DIST =                    \
+         HISTORY                 \
+         config.h.win32          \
diff --git a/extra/id3lib/10-fix-compilation-with-cpp-headers.patch b/extra/id3lib/10-fix-compilation-with-cpp-headers.patch
new file mode 100644
index 000000000..a9b45ab02
--- /dev/null
+++ b/extra/id3lib/10-fix-compilation-with-cpp-headers.patch
@@ -0,0 +1,22 @@
+This patch imports the proper C++ headers
+--- a/include/id3/id3lib_strings.h
++++ b/include/id3/id3lib_strings.h
+@@ -30,6 +30,7 @@
+ #define _ID3LIB_STRINGS_H_
+ 
+ #include <string>
++#include <cstring>
+ 
+ #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
+ namespace std
+--- a/include/id3/writers.h
++++ b/include/id3/writers.h
+@@ -30,7 +30,7 @@
+ 
+ #include "id3/writer.h"
+ #include "id3/id3lib_streams.h"
+-//#include <string.h>
++#include <cstring>
+ 
+ class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
+ {
diff --git a/extra/id3lib/15-fix-headers-of-main-functions.patch b/extra/id3lib/15-fix-headers-of-main-functions.patch
new file mode 100644
index 000000000..48e01d145
--- /dev/null
+++ b/extra/id3lib/15-fix-headers-of-main-functions.patch
@@ -0,0 +1,45 @@
+This patch fixes some function headers in demo code used during 'make check'
+--- a/examples/demo_info.cpp
++++ b/examples/demo_info.cpp
+@@ -309,7 +309,7 @@
+ 
+ #define DEBUG
+ 
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+   ID3D_INIT_DOUT();
+ 
+--- a/examples/demo_convert.cpp
++++ b/examples/demo_convert.cpp
+@@ -84,7 +84,7 @@
+   }
+ }
+ 
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+   flags_t ulFlag = ID3TT_ALL;
+   gengetopt_args_info args;
+--- a/examples/demo_copy.cpp
++++ b/examples/demo_copy.cpp
+@@ -81,7 +81,7 @@
+   }
+ }
+ 
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+   int ulFlag = ID3TT_ID3;
+   ID3D_INIT_DOUT();
+--- a/examples/demo_tag.cpp
++++ b/examples/demo_tag.cpp
+@@ -46,7 +46,7 @@
+     os << "v2";
+ }
+ 
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+   int ulFlag = ID3TT_ID3;
+   ID3D_INIT_DOUT();
diff --git a/extra/id3lib/20-create-manpages.patch b/extra/id3lib/20-create-manpages.patch
new file mode 100644
index 000000000..cebf3d4d4
--- /dev/null
+++ b/extra/id3lib/20-create-manpages.patch
@@ -0,0 +1,198 @@
+This patch adds debian-made man pages
+--- /dev/null
++++ b/doc/man/id3info.1
+@@ -0,0 +1,31 @@
++.TH ID3INFO 1 "May 2000" local "User Command"
++.SH NAME
++id3info \- Display id3 tag information.
++.SH SYNOPSIS
++.B id3info
++.RB [
++.I OPTION
++.RB ]
++.RB [
++.I FILE
++.RB ]
++.br
++.SH DESCRIPTION
++.B Id3info
++displays both the id3v1 and id3v2 tag information for a file.
++Id3info will not differentiate between the two types of tags.
++.SH OPTIONS
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++.SH SEE ALSO
++id3convert(1), id3tag(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
++
+--- /dev/null
++++ b/doc/man/id3tag.1
+@@ -0,0 +1,69 @@
++.TH ID3TAG 1 "May 2000" local "User Command"
++.SH NAME
++id3tag \- Tags an mp3 file with id3v1 and/or id3v2 tags.
++.SH SYNOPSIS
++.B id3tag
++.RB [
++.I OPTION
++.RB ] ...
++.RB [
++.I FILE
++.RB ] ...
++.br
++.SH DESCRIPTION
++.B Id3tag
++will render both types of tag by default.  Only the last
++tag type indicated in the option list will be used.  Non-
++rendered will remain unchanged in the original file.  Will
++also parse and convert Lyrics3 v2.0 frames, but will not
++render them.
++
++.SH OPTIONS
++.TP
++.B \-1, \-\-v1tag
++Render only the id3v1 tag
++.TP
++.B \-2, \-\-v2tag
++Render only the id3v2 tag
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++.TP
++.B \-a, \-\-artist ARTIST
++Set the artist information
++.TP
++.B \-s, \-\-song SONG
++Set the song title information
++.TP
++.B \-A, \-\-album ALBUM
++Set the album title information
++.TP
++.B \-c, \-\-comment COMMENT
++Set the comment information
++.TP
++.B \-C, \-\-desc DESCRIPTION
++Set the comment description
++.TP
++.B \-g, \-\-genre num
++Set the genre number
++.TP
++.B \-y, \-\-year num
++Set the year
++.TP
++.B \-t, \-\-track num
++Set the track number
++.TP
++.B \-T, \-\-total num
++Set the total number of tracks on the album
++
++.SH SEE ALSO
++id3convert(1), id3info(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
++
+--- /dev/null
++++ b/doc/man/id3convert.1
+@@ -0,0 +1,47 @@
++.TH ID3CONVERT 1 "May 2000" local "User Command"
++.SH NAME
++id3convert \- Converts between id3v1 and id3v2 tags of an mp3 file.
++.SH SYNOPSIS
++.B id3convert
++.RB [
++.I OPTION
++.RB ]
++.RB [
++.I FILE
++.RB ]
++.br
++.SH DESCRIPTION
++.B Id3convert
++converts between id3v1 and id3v2 tags of an mp3 file. Id3convert will render
++both types of tag by default. Only the last tag type indicated in the option
++list will be used. Non-rendered tags will remain unchanged in the original
++file. Id3convert will also parse and convert Lyrics3 v2.0 frames, but will
++not render them.
++
++.SH OPTIONS
++.TP
++.B \-1, \-\-v1tag
++Render only the id3v1 tag
++.TP
++.B \-2, \-\-v2tag
++Render only the id3v2 tag
++.TP
++.B \-s, \-\-strip
++Strip, rather than render, the tags
++.TP
++.B \-p, \-\-padding
++Use padding in the tag
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++
++.SH SEE ALSO
++id3tag(1), id3info(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
+--- /dev/null
++++ b/doc/man/id3cp.1
+@@ -0,0 +1,38 @@
++.TH ID3CP 1 "July 2001" local "User Command"
++.SH NAME
++id3cp \- Copies tags from one file to another.
++.SH SYNOPSIS
++.B id3cp
++.RB [
++.I OPTION
++.RB ] ...
++.RB [
++.I SOURCE
++.RB ]
++.RB [
++.I DEST
++.RB ]
++.br
++.SH DESCRIPTION
++.B Id3cp
++copies tags from SOURCE to DEST.
++.SH OPTIONS
++.TP
++.B \-1, \-\-v1tag
++Render only the id3v1 tag
++.TP
++.B \-2, \-\-v2tag
++Render only the id3v2 tag
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++.SH SEE ALSO
++id3convert(1), id3info(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
diff --git a/extra/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff b/extra/id3lib/30-fix-utf16.patch
index b05d2cf29..3d3f50fed 100644
--- a/extra/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
+++ b/extra/id3lib/30-fix-utf16.patch
@@ -1,6 +1,6 @@
-diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog
---- id3lib-3.8.3.orig/ChangeLog	2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/ChangeLog	2006-02-22 00:33:59.946214472 +0100
+Patch from 'Spoon' to fix issues with writing certain unicode characters
+--- a/ChangeLog
++++ b/ChangeLog
 @@ -1,3 +1,8 @@
 +2006-02-17  Jerome Couderc
 +
@@ -10,9 +10,8 @@ diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog
  2003-03-02 Sunday 17:38   Thijmen Klok <thijmen@id3lib.org>
  
  	* THANKS (1.20): added more people 
-diff -ruN id3lib-3.8.3.orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp
---- id3lib-3.8.3.orig/src/io_helpers.cpp	2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/src/io_helpers.cpp	2006-02-22 00:35:02.926639992 +0100
+--- a/src/io_helpers.cpp
++++ b/src/io_helpers.cpp
 @@ -363,11 +363,22 @@
      // Write the BOM: 0xFEFF
      unicode_t BOM = 0xFEFF;
diff --git a/extra/id3lib/id3lib-3.8.3-CVE-2007-4460.patch b/extra/id3lib/40-deal-with-mkstemp.patch
index daa08667b..36c84179f 100644
--- a/extra/id3lib/id3lib-3.8.3-CVE-2007-4460.patch
+++ b/extra/id3lib/40-deal-with-mkstemp.patch
@@ -1,5 +1,10 @@
---- src/tag_file.cpp
-+++ src/tag_file.cpp
+This patch fixes an issues where temporary files were created in an insecure
+way.
+
+It was first intruduced in version 3.8.3-7 and fixes
+http://bugs.debian.org/438540
+--- a/src/tag_file.cpp
++++ b/src/tag_file.cpp
 @@ -242,8 +242,8 @@
      strcpy(sTempFile, filename.c_str());
      strcat(sTempFile, sTmpSuffix.c_str());
diff --git a/extra/id3lib/50-remove-outdated-check.patch b/extra/id3lib/50-remove-outdated-check.patch
new file mode 100644
index 000000000..386da2771
--- /dev/null
+++ b/extra/id3lib/50-remove-outdated-check.patch
@@ -0,0 +1,11 @@
+We don't actually need iomanip.h
+--- a/configure.in
++++ b/configure.in
+@@ -227,7 +227,6 @@
+ )
+ AC_CHECK_HEADERS(               \
+   string                        \
+-  iomanip.h                     \
+   ,,AC_MSG_ERROR([Missing a vital header file for id3lib])
+ )
+ 
diff --git a/extra/id3lib/60-add-c-wrapper-functions.patch b/extra/id3lib/60-add-c-wrapper-functions.patch
new file mode 100644
index 000000000..d72e81c0e
--- /dev/null
+++ b/extra/id3lib/60-add-c-wrapper-functions.patch
@@ -0,0 +1,58 @@
+This patch adds C wrapper functions for field encoding.
+
+It was first introduced in version 3.8.3-8 and fixes
+http://bugs.debian.org/281292
+--- a/include/id3.h
++++ b/include/id3.h
+@@ -104,6 +104,9 @@
+   ID3_C_EXPORT void                 CCONV ID3Field_GetBINARY          (const ID3Field *field, uchar *buffer, size_t buffLength);
+   ID3_C_EXPORT void                 CCONV ID3Field_FromFile           (ID3Field *field, const char *fileName);
+   ID3_C_EXPORT void                 CCONV ID3Field_ToFile             (const ID3Field *field, const char *fileName);
++  ID3_C_EXPORT bool                 CCONV ID3Field_SetEncoding        (ID3Field *field, ID3_TextEnc enc);
++  ID3_C_EXPORT ID3_TextEnc          CCONV ID3Field_GetEncoding        (const ID3Field *field);
++  ID3_C_EXPORT bool                 CCONV ID3Field_IsEncodable        (const ID3Field *field);
+ 
+   /* field-info wrappers */
+   ID3_C_EXPORT char*                CCONV ID3FrameInfo_ShortName     (ID3_FrameID frameid);
+--- a/src/c_wrapper.cpp
++++ b/src/c_wrapper.cpp
+@@ -681,6 +681,39 @@
+     }
+   }
+ 
++  ID3_C_EXPORT bool CCONV
++  ID3Field_SetEncoding(ID3Field *field, ID3_TextEnc enc)
++  {
++    bool changed = false;
++    if (field)
++    {
++      ID3_CATCH(changed = reinterpret_cast<ID3_Field *>(field)->SetEncoding(enc));
++    }
++    return changed;
++  }
++
++  ID3_C_EXPORT ID3_TextEnc CCONV
++  ID3Field_GetEncoding(const ID3Field *field)
++  {
++    ID3_TextEnc enc = ID3TE_NONE;
++    if (field)
++    {
++      ID3_CATCH(enc = reinterpret_cast<const ID3_Field *>(field)->GetEncoding());
++    }
++    return enc;
++  }
++
++  ID3_C_EXPORT bool CCONV
++  ID3Field_IsEncodable(const ID3Field *field)
++  {
++    bool isEncodable = false;
++    if (field)
++    {
++      ID3_CATCH(isEncodable = reinterpret_cast<const ID3_Field *>(field)->IsEncodable());
++    }
++    return isEncodable;
++  }
++
+ #ifdef __cplusplus
+ }
+ #endif /* __cplusplus */
diff --git a/extra/id3lib/60-fix_make_check.patch b/extra/id3lib/60-fix_make_check.patch
new file mode 100644
index 000000000..e2bb1b051
--- /dev/null
+++ b/extra/id3lib/60-fix_make_check.patch
@@ -0,0 +1,50 @@
+This patch fixes some function headers and imports in order for 'make check'
+to work.
+
+It was first introduced in version 3.8.3-9
+diff -Naur id3lib-3.8.3.orig/examples/findeng.cpp id3lib-3.8.3/examples/findeng.cpp
+--- id3lib-3.8.3.orig/examples/findeng.cpp	2003-03-02 01:23:00.000000000 +0100
++++ id3lib-3.8.3/examples/findeng.cpp	2009-12-10 00:58:12.173795997 +0100
+@@ -9,7 +9,7 @@
+ using std::cout;
+ using std::endl;
+ 
+-int main(unsigned argc, char* argv[])
++int main(int argc, char* argv[])
+ {
+   ID3D_INIT_DOUT();
+   ID3D_INIT_WARNING();
+diff -Naur id3lib-3.8.3.orig/examples/findstr.cpp id3lib-3.8.3/examples/findstr.cpp
+--- id3lib-3.8.3.orig/examples/findstr.cpp	2003-03-02 01:23:00.000000000 +0100
++++ id3lib-3.8.3/examples/findstr.cpp	2009-12-10 00:57:48.036819825 +0100
+@@ -9,7 +9,7 @@
+ using std::cout;
+ using std::endl;
+ 
+-int main(unsigned argc, char* argv[])
++int main(int argc, char* argv[])
+ {
+   ID3D_INIT_DOUT();
+   ID3D_INIT_WARNING();
+diff -Naur id3lib-3.8.3.orig/examples/test_io.cpp id3lib-3.8.3/examples/test_io.cpp
+--- id3lib-3.8.3.orig/examples/test_io.cpp	2003-03-02 01:23:00.000000000 +0100
++++ id3lib-3.8.3/examples/test_io.cpp	2009-12-10 00:57:03.612111640 +0100
+@@ -11,6 +11,9 @@
+ #include <id3/io_strings.h>
+ #include <id3/utils.h>
+ 
++using std::cin;
++using std::hex;
++using std::dec;
+ using std::cout;
+ using std::endl;
+ using std::cerr;
+@@ -18,7 +21,7 @@
+ using namespace dami;
+ 
+ int
+-main(size_t argc, const char** argv)
++main(int argc, const char** argv)
+ {
+   ID3D_INIT_DOUT();
+   ID3D_INIT_WARNING();
diff --git a/extra/id3lib/60-id3lib-missing-nullpointer-check.patch b/extra/id3lib/60-id3lib-missing-nullpointer-check.patch
new file mode 100644
index 000000000..d4ca5d292
--- /dev/null
+++ b/extra/id3lib/60-id3lib-missing-nullpointer-check.patch
@@ -0,0 +1,12 @@
+This patch adds a check for a null pointer
+--- a/src/header_tag.cpp
++++ b/src/header_tag.cpp
+@@ -54,7 +54,7 @@
+ {
+   size_t bytesUsed = ID3_TagHeader::SIZE;
+ 
+-  if (_info->is_extended)
++  if (_info && _info->is_extended)
+   {
+     bytesUsed += _info->extended_bytes;
+   }
diff --git a/extra/id3lib/60-spelling.patch b/extra/id3lib/60-spelling.patch
new file mode 100644
index 000000000..7547aa3d5
--- /dev/null
+++ b/extra/id3lib/60-spelling.patch
@@ -0,0 +1,107 @@
+This patch fixes some minor spelling mistakes
+diff -Naur id3lib-3.8.3.orig//ChangeLog id3lib-3.8.3//ChangeLog
+--- id3lib-3.8.3.orig//ChangeLog	2010-06-08 05:21:47.817061336 +0200
++++ id3lib-3.8.3//ChangeLog	2010-06-08 05:21:05.320811354 +0200
+@@ -2266,7 +2266,7 @@
+ 	* examples/demo_info.cpp (1.19): 
+ 	(PrintInformation): When printing synced lyrics info, now uses a 
+ 	MemoryReader, BinaryNumberReader, and TextReader to extract the 
+-	infromation from the binary field.  This is a cheat, since these 
++	information from the binary field.  This is a cheat, since these 
+ 	classes aren't normally exposed to folks using the library. 
+ 	Hopefully they will be exposed soon enough for the next major
+ 	release.  
+diff -Naur id3lib-3.8.3.orig//doc/id3v2.3.0.html id3lib-3.8.3//doc/id3v2.3.0.html
+--- id3lib-3.8.3.orig//doc/id3v2.3.0.html	2010-06-08 05:21:47.859810543 +0200
++++ id3lib-3.8.3//doc/id3v2.3.0.html	2010-06-08 05:21:05.373811128 +0200
+@@ -2157,7 +2157,7 @@
+  64.Native American

+  65.Cabaret

+  66.New Wave

+- 67.Psychadelic

++ 67.Psychedelic

+  68.Rave

+  69.Showtunes

+  70.Trailer

+@@ -2254,4 +2254,4 @@
+ Email: <a href="mailto:johan@id3.org">johan@id3.org</a>

+ </p>

+ 

+-</body></html>
+\ No newline at end of file
++</body></html>

+diff -Naur id3lib-3.8.3.orig//doc/id3v2.3.0.txt id3lib-3.8.3//doc/id3v2.3.0.txt
+--- id3lib-3.8.3.orig//doc/id3v2.3.0.txt	2010-06-08 05:21:47.860810639 +0200
++++ id3lib-3.8.3//doc/id3v2.3.0.txt	2010-06-08 05:21:05.374811307 +0200
+@@ -1929,7 +1929,7 @@
+      64.Native American

+      65.Cabaret

+      66.New Wave

+-     67.Psychadelic

++     67.Psychedelic

+      68.Rave

+      69.Showtunes

+      70.Trailer

+diff -Naur id3lib-3.8.3.orig//id3com/id3com.idl id3lib-3.8.3//id3com/id3com.idl
+--- id3lib-3.8.3.orig//id3com/id3com.idl	2010-06-08 05:21:47.818060988 +0200
++++ id3lib-3.8.3//id3com/id3com.idl	2010-06-08 05:21:05.355061546 +0200
+@@ -179,7 +179,7 @@
+       /* USER */ ID3_TERMSOFUSE,        /**< Terms of use */

+       /* USLT */ ID3_UNSYNCEDLYRICS,    /**< Unsynchronized lyric/text transcription */

+       /* WCOM */ ID3_WWWCOMMERCIALINFO, /**< Commercial information */

+-      /* WCOP */ ID3_WWWCOPYRIGHT,      /**< Copyright/Legal infromation */

++      /* WCOP */ ID3_WWWCOPYRIGHT,      /**< Copyright/Legal information */

+       /* WOAF */ ID3_WWWAUDIOFILE,      /**< Official audio file webpage */

+       /* WOAR */ ID3_WWWARTIST,         /**< Official artist/performer webpage */

+       /* WOAS */ ID3_WWWAUDIOSOURCE,    /**< Official audio source webpage */

+diff -Naur id3lib-3.8.3.orig//include/id3/globals.h id3lib-3.8.3//include/id3/globals.h
+--- id3lib-3.8.3.orig//include/id3/globals.h	2010-06-08 05:21:47.818060988 +0200
++++ id3lib-3.8.3//include/id3/globals.h	2010-06-08 05:22:27.395811102 +0200
+@@ -313,7 +313,7 @@
+   /* USER */ ID3FID_TERMSOFUSE,        /**< Terms of use */
+   /* USLT */ ID3FID_UNSYNCEDLYRICS,    /**< Unsynchronized lyric/text transcription */
+   /* WCOM */ ID3FID_WWWCOMMERCIALINFO, /**< Commercial information */
+-  /* WCOP */ ID3FID_WWWCOPYRIGHT,      /**< Copyright/Legal infromation */
++  /* WCOP */ ID3FID_WWWCOPYRIGHT,      /**< Copyright/Legal information */
+   /* WOAF */ ID3FID_WWWAUDIOFILE,      /**< Official audio file webpage */
+   /* WOAR */ ID3FID_WWWARTIST,         /**< Official artist/performer webpage */
+   /* WOAS */ ID3FID_WWWAUDIOSOURCE,    /**< Official audio source webpage */
+@@ -608,7 +608,7 @@
+   "Native American",   //64
+   "Cabaret",           //65
+   "New Wave",          //66
+-  "Psychadelic",       //67
++  "Psychedelic",       //67
+   "Rave",              //68
+   "Showtunes",         //69
+   "Trailer",           //70
+@@ -686,7 +686,7 @@
+   "Christian Rock ",       //141
+   "Merengue",              //142
+   "Salsa",                 //143
+-  "Trash Metal",           //144
++  "Thrash Metal",          //144
+   "Anime",                 //145
+   "JPop",                  //146
+   "Synthpop"               //147
+diff -Naur id3lib-3.8.3.orig//src/field.cpp id3lib-3.8.3//src/field.cpp
+--- id3lib-3.8.3.orig//src/field.cpp	2010-06-08 05:21:47.818060988 +0200
++++ id3lib-3.8.3//src/field.cpp	2010-06-08 05:21:05.373811128 +0200
+@@ -719,7 +719,7 @@
+ // USER       ID3FID_TERMSOFUSE        Terms of use
+ // USLT  ULT  ID3FID_UNSYNCEDLYRICS    Unsynchronized lyric/text transcription
+ // WCOM  WCM  ID3FID_WWWCOMMERCIALINFO Commercial information
+-// WCOP  WCM  ID3FID_WWWCOPYRIGHT      Copyright/Legal infromation
++// WCOP  WCM  ID3FID_WWWCOPYRIGHT      Copyright/Legal information
+ // WOAF  WCP  ID3FID_WWWAUDIOFILE      Official audio file webpage
+ // WOAR  WAF  ID3FID_WWWARTIST         Official artist/performer webpage
+ // WOAS  WAR  ID3FID_WWWAUDIOSOURCE    Official audio source webpage
+@@ -813,7 +813,7 @@
+   {ID3FID_TERMSOFUSE,        ""   , "USER", false, false, ID3FD_TermsOfUse,    "Terms of use"},
+   {ID3FID_UNSYNCEDLYRICS,    "ULT", "USLT", false, false, ID3FD_GeneralText,   "Unsynchronized lyric/text transcription"},
+   {ID3FID_WWWCOMMERCIALINFO, "WCM", "WCOM", false, false, ID3FD_URL,           "Commercial information"},
+-  {ID3FID_WWWCOPYRIGHT,      "WCP", "WCOP", false, false, ID3FD_URL,           "Copyright/Legal infromation"},
++  {ID3FID_WWWCOPYRIGHT,      "WCP", "WCOP", false, false, ID3FD_URL,           "Copyright/Legal information"},
+   {ID3FID_WWWAUDIOFILE,      "WAF", "WOAF", false, false, ID3FD_URL,           "Official audio file webpage"},
+   {ID3FID_WWWARTIST,         "WAR", "WOAR", false, false, ID3FD_URL,           "Official artist/performer webpage"},
+   {ID3FID_WWWAUDIOSOURCE,    "WAS", "WOAS", false, false, ID3FD_URL,           "Official audio source webpage"},
diff --git a/extra/id3lib/61-fix_vbr_stack_smash.patch b/extra/id3lib/61-fix_vbr_stack_smash.patch
new file mode 100644
index 000000000..9bf33e978
--- /dev/null
+++ b/extra/id3lib/61-fix_vbr_stack_smash.patch
@@ -0,0 +1,19 @@
+Description: Fix crashes when reading VBR MP3 file.
+Bug-Ubuntu: https://launchpad.net/bugs/444466
+Origin: upstream, http://sourceforge.net/tracker/?func=detail&aid=937707&group_id=979&atid=300979
+Forwarded: yes
+Author: Urs Fleisch
+
+Index: id3lib3.8.3-3.8.3/src/mp3_parse.cpp
+===================================================================
+--- id3lib3.8.3-3.8.3.orig/src/mp3_parse.cpp	2009-10-06 23:12:10.381250132 +0200
++++ id3lib3.8.3-3.8.3/src/mp3_parse.cpp	2009-10-06 23:14:09.545252591 +0200
+@@ -465,7 +465,7 @@
+   // from http://www.xingtech.com/developer/mp3/
+ 
+   const size_t VBR_HEADER_MIN_SIZE = 8;     // "xing" + flags are fixed
+-  const size_t VBR_HEADER_MAX_SIZE = 116;   // frames, bytes, toc and scale are optional
++  const size_t VBR_HEADER_MAX_SIZE = 120;   // frames, bytes, toc and scale are optional
+ 
+   if (mp3size >= vbr_header_offest + VBR_HEADER_MIN_SIZE) 
+   {
diff --git a/extra/id3lib/PKGBUILD b/extra/id3lib/PKGBUILD
index 0bd854311..3efe66402 100644
--- a/extra/id3lib/PKGBUILD
+++ b/extra/id3lib/PKGBUILD
@@ -1,34 +1,84 @@
-# $Id: PKGBUILD 198108 2013-10-30 12:50:19Z allan $
-# Contributor: Jochem Kossen <j.kossen@home.nl>
+# $Id: PKGBUILD 204902 2014-01-30 20:34:39Z guillaume $
+# Maintainer : Guillaume ALAUX <guillaume@archlinux.org>
+# Contributor: Jochem Kossen   <j.kossen@home.nl>
+# Contributor: rtfreedman      <rob.til.freedman@googlemail.com>
 
 pkgname=id3lib
 pkgver=3.8.3
-pkgrel=13
-pkgdesc="An open-source, cross-platform software development library for reading, writing, and manipulating ID3v1 and ID3v2 tags"
+pkgrel=15
+pkgdesc='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')
-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'
-        'id3lib-3.8.3-gcc-4.3.patch')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        00-add-libz-to-compilation.patch
+        05-create-m4-directory.patch
+        10-fix-compilation-with-cpp-headers.patch
+        15-fix-headers-of-main-functions.patch
+        20-create-manpages.patch
+        30-fix-utf16.patch
+        40-deal-with-mkstemp.patch
+        50-remove-outdated-check.patch
+        60-add-c-wrapper-functions.patch
+        60-fix_make_check.patch
+        60-id3lib-missing-nullpointer-check.patch
+        60-spelling.patch
+        61-fix_vbr_stack_smash.patch)
+
 md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7'
-         '196c65adee1ba511ddacef2de0dfd102'
-         '78e90e15ddd1122b66da352b6c3b00ff'
-         'fdbffd2d9d289ed0d730950c78d4ebc4')
+         '9428ef38283d13adb6e349089537a63f'
+         '5a78e0fe586fba334eae2a29e4bf5a28'
+         '88f21f1bf4f697be8030706bbec11705'
+         'b3de841cd2eda0d37c8c8330119e12d4'
+         '0c7c939943bdfcc3a0f6be95fe9b2367'
+         '74ba59c03f91fedbe4dd8045b29c7e15'
+         'd2d06d46df3867d73746f584d1e6fcc5'
+         'd3a61d07a2bfa83f4ac6290794789022'
+         '93ef4b26ad08027e28d3f80ad6e492b4'
+         '5c4b53a3d5543c5c50b23d6d5b9f230b'
+         '964fa0db0da7b1495b34b81bd36539fd'
+         '26c74a90267892bbaca1e162919121d0'
+         '0973e285cdc420130b984a259cdd8ae0')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -p1 -i ../00-add-libz-to-compilation.patch
+  patch -p1 -i ../05-create-m4-directory.patch
+  patch -p1 -i ../10-fix-compilation-with-cpp-headers.patch
+  patch -p1 -i ../15-fix-headers-of-main-functions.patch
+  patch -p1 -i ../20-create-manpages.patch
+  patch -p1 -i ../30-fix-utf16.patch
+  patch -p1 -i ../40-deal-with-mkstemp.patch
+  patch -p1 -i ../60-add-c-wrapper-functions.patch
+  patch -p1 -i ../60-fix_make_check.patch
+  patch -p1 -i ../60-id3lib-missing-nullpointer-check.patch
+  patch -p1 -i ../60-spelling.patch
+  patch -p1 -i ../61-fix_vbr_stack_smash.patch
+  patch -p1 -i ../50-remove-outdated-check.patch
+
+  libtoolize -fc
+  aclocal
+  autoconf
+  automake --add-missing --copy
+}
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/patch_id3lib_3.8.3_UTF16_writing_bug.diff
-  patch -p0 -i "${srcdir}"/id3lib-3.8.3-CVE-2007-4460.patch
-  patch -p1 -i "${srcdir}"/id3lib-3.8.3-gcc-4.3.patch
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
-  sed -i -e 's/^LIBS =/LIBS = -lz -lstdc++/' src/Makefile
   make
 }
 
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
+
+  install -d "${pkgdir}"/usr/share/man/man1
+  cp doc/man/* "${pkgdir}"/usr/share/man/man1
 }
diff --git a/extra/id3lib/id3lib-3.8.3-gcc-4.3.patch b/extra/id3lib/id3lib-3.8.3-gcc-4.3.patch
deleted file mode 100644
index f5ec498b6..000000000
--- a/extra/id3lib/id3lib-3.8.3-gcc-4.3.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -Naur id3lib-3.8.3-orig/configure id3lib-3.8.3/configure
---- id3lib-3.8.3-orig/configure      2008-05-24 23:39:36.000000000 -0400
-+++ id3lib-3.8.3/configure   2008-05-24 23:39:57.000000000 -0400
-@@ -10296,8 +10296,7 @@
- 
- for ac_header in \
-   string                        \
--  iomanip.h                     \
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- 
-diff -Naur id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/id3/id3lib_strings.h
---- id3lib-3.8.3-orig/include/id3/id3lib_strings.h	2008-03-05 18:19:46.000000000 -0600
-+++ id3lib-3.8.3/include/id3/id3lib_strings.h	2008-03-05 18:19:38.000000000 -0600
-@@ -30,6 +30,7 @@
- #define _ID3LIB_STRINGS_H_
- 
- #include <string>
-+#include <cstring>
- 
- #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
- namespace std
-diff -Naur id3lib-3.8.3-orig/include/id3/writers.h id3lib-3.8.3/include/id3/writers.h
---- id3lib-3.8.3-orig/include/id3/writers.h	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/include/id3/writers.h	2008-03-05 18:23:05.000000000 -0600
-@@ -30,7 +30,7 @@
- 
- #include "id3/writer.h"
- #include "id3/id3lib_streams.h"
--//#include <string.h>
-+#include <string.h>
- 
- class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
- {
-diff -Naur id3lib-3.8.3-orig/examples/demo_convert.cpp id3lib-3.8.3/examples/demo_convert.cpp
---- id3lib-3.8.3-orig/examples/demo_convert.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_convert.cpp	2008-03-05 18:26:50.000000000 -0600
-@@ -84,7 +84,7 @@
-   }
- }
- 
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
-   flags_t ulFlag = ID3TT_ALL;
-   gengetopt_args_info args;
-diff -Naur id3lib-3.8.3-orig/examples/demo_info.cpp id3lib-3.8.3/examples/demo_info.cpp
---- id3lib-3.8.3-orig/examples/demo_info.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_info.cpp	2008-03-05 18:27:40.000000000 -0600
-@@ -309,7 +309,7 @@
- 
- #define DEBUG
- 
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
-   ID3D_INIT_DOUT();
- 
-diff -Naur id3lib-3.8.3-orig/examples/demo_tag.cpp id3lib-3.8.3/examples/demo_tag.cpp
---- id3lib-3.8.3-orig/examples/demo_tag.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_tag.cpp	2008-03-05 18:31:20.000000000 -0600
-@@ -46,7 +46,7 @@
-     os << "v2";
- }
- 
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
-   int ulFlag = ID3TT_ID3;
-   ID3D_INIT_DOUT();
-diff -Naur id3lib-3.8.3-orig/examples/demo_copy.cpp id3lib-3.8.3/examples/demo_copy.cpp
---- id3lib-3.8.3-orig/examples/demo_copy.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_copy.cpp	2008-03-05 18:32:44.000000000 -0600
-@@ -81,7 +81,7 @@
-   }
- }
- 
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
-   int ulFlag = ID3TT_ID3;
-   ID3D_INIT_DOUT();
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index df6809ea9..0ffe293fe 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 201665 2013-12-17 20:27:22Z eric $
+# $Id: PKGBUILD 206033 2014-02-16 02:34:53Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.8.7.10
+pkgver=6.8.8.6
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.imagemagick.org/"
 license=('custom')
-makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
-             'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' 'libwebp')
+makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript'
+             'openexr' 'libwmf' 'librsvg' 'libxml2' 'liblqr'
+             'libwebp')
 [ "$CARCH" != "mips64el" ] && makedepends+=('opencl-headers' 'libcl')
-#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} \
+#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=('a74ebac95fb592e98cbe33e25c05978590807c57'
+sha1sums=('02bb3888a7d9218a9c81af1bef8df7e68af846a0'
           'SKIP'
           'e143cf9d530fabf3b58023899b5cc544ba93daec')
 
@@ -32,7 +33,7 @@ build() {
   [ "$CARCH" != "mips64el" ] && EXTRAOPTS="--enable-opencl"
 
   ./configure --prefix=/usr --sysconfdir=/etc --with-modules \
-    --enable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
+    --enable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 \
     --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
     --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
     --enable-opencl --without-gvc --without-djvu --without-autotrace \
@@ -42,7 +43,7 @@ build() {
 
 check() {
   cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make check
+#  make check
 }
 
 package_imagemagick() {
@@ -54,7 +55,6 @@ package_imagemagick() {
               'libwmf: for WMF support' 
               'librsvg: for SVG support' 
               'libxml2: for XML support' 
-              'jasper: for JPEG-2000 support' 
               'libpng: for PNG support' 
 	      'libwebp: for WEBP support')
   backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD
index 10fe35b41..c998561bd 100644
--- a/extra/imlib2/PKGBUILD
+++ b/extra/imlib2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198112 2013-10-30 12:51:45Z allan $
+# $Id: PKGBUILD 204813 2014-01-27 19:49:53Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Arjan Timmerman <arjan.archlinux.org>
 # Contributor: Tom Newsom <Jeepster.gmx.co.uk>
 
 pkgname=imlib2
-pkgver=1.4.5
-pkgrel=6
+pkgver=1.4.6
+pkgrel=1
 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
 url="http://sourceforge.net/projects/enlightenment/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('BSD')
 depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo')
 source=(http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2
         imlib2-giflib5.patch)
-sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0'
+sha1sums=('20e111d822074593e8d657ecf8aafe504e9e2967'
           '29d0778ffbe6e57f08048918a79eb1ad6af87bce')
 
 prepare() {
diff --git a/extra/jack/PKGBUILD b/extra/jack/PKGBUILD
index 15dd2aa33..da6923aed 100644
--- a/extra/jack/PKGBUILD
+++ b/extra/jack/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 198116 2013-10-30 12:53:12Z allan $
+# $Id: PKGBUILD 204709 2014-01-25 13:36:18Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: tobias <tobias@archlinux.net>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
 pkgname=jack
 _longname=jack-audio-connection-kit
-pkgver=0.121.3
-pkgrel=7.1
+pkgver=0.124.1
+pkgrel=1
 pkgdesc="A low-latency audio server"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
@@ -26,21 +26,14 @@ replaces=("$_longname")
 install=$pkgname.install
 source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz"
         '99-audio.conf'
-        '40-hpet-permissions.rules'
-        'ffado_setbuffsize-jack1.patch')
-md5sums=('35f470f7422c37b33eb965033f7a42e8'
+        '40-hpet-permissions.rules')
+md5sums=('d64e90121be8a54860b870a726fb5b5d'
          'ae65b7c9ebe0fff6c918ba9d97ae342d'
-         '471aad533ff56c5d3cbbf65ce32cadef'
-         'c1f78ee7847c6d5e471d90626623ffb4')
+         '471aad533ff56c5d3cbbf65ce32cadef')
 
 build() {
   cd "$srcdir/$_longname-$pkgver"
 
-  # backport firewire stuff
-  #   - needed for setbuffsize feature in latest stable ffado
-  # from https://github.com/jackaudio/jack1/commit/025d3ad
-  patch -Np1 -i "$srcdir/ffado_setbuffsize-jack1.patch"
-
   ./configure --prefix=/usr \
               --libdir=/usr/lib
   make
@@ -61,8 +54,8 @@ package() {
 
   # install a missing header forgotten by upstream
   # see https://bugs.archlinux.org/task/26865
-  install -Dm644 "$srcdir/$_longname-$pkgver/jack/jslist.h" \
-    "$pkgdir/usr/include/jack/jslist.h"
+  #install -Dm644 "$srcdir/$_longname-$pkgver/jack/jslist.h" \
+  #  "$pkgdir/usr/include/jack/jslist.h"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/jack/ffado_setbuffsize-jack1.patch b/extra/jack/ffado_setbuffsize-jack1.patch
deleted file mode 100644
index 7e43962ee..000000000
--- a/extra/jack/ffado_setbuffsize-jack1.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 025d3ad4d5adeff00e97b6fafdf32d6d199d0baa Mon Sep 17 00:00:00 2001
-From: Jonathan Woithe <jwoithe@just42.net>
-Date: Tue, 13 Mar 2012 15:43:03 +1030
-Subject: [PATCH] Support setbufsize in firewire driver
-
----
- drivers/firewire/ffado_driver.c |   69 ++++++++++++++++++++++++++++++++++-----
- 1 file changed, 60 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/firewire/ffado_driver.c b/drivers/firewire/ffado_driver.c
-index a8ad1ea..6035af3 100644
---- a/drivers/firewire/ffado_driver.c
-+++ b/drivers/firewire/ffado_driver.c
-@@ -7,6 +7,7 @@
-  *   http://www.jackaudio.org
-  *
-  *   Copyright (C) 2005-2007 Pieter Palmers
-+ *   Copyright (C) 2012 Jonathan Woithe
-  *
-  *   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
-@@ -50,7 +51,10 @@
- 
- static int ffado_driver_stop (ffado_driver_t *driver);
- 
-+// Basic functionality requires API version 8.  If version 9 or later
-+// is present the buffers can be resized at runtime.
- #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8
-+#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9
- 
- // enable verbose messages
- static int g_verbose=0;
-@@ -675,24 +679,71 @@
- static int
- ffado_driver_bufsize (ffado_driver_t* driver, jack_nframes_t nframes)
- {
--	printError("Buffer size change requested but not supported!!!");
-+	signed int chn;
-+
-+	// The speed of this function isn't critical; we can afford the
-+	// time to check the FFADO API version.
-+	if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE ||
-+            ffado_streaming_set_period_size == NULL) {
-+	        printError("unsupported on current version of FFADO; please upgrade FFADO");
-+	        return -1;
-+	}
- 
--	/*
--	 driver->period_size = nframes;  
-+	driver->period_size = nframes;
- 	driver->period_usecs =
- 		(jack_time_t) floor ((((float) nframes) / driver->sample_rate)
- 				     * 1000000.0f);
--	*/
--	
-+
-+	// Reallocate the null and scratch buffers.
-+	driver->nullbuffer = calloc(driver->period_size, sizeof(ffado_sample_t));
-+	if(driver->nullbuffer == NULL) {
-+		printError("could not allocate memory for null buffer");
-+		return -1;
-+	}
-+	driver->scratchbuffer = calloc(driver->period_size, sizeof(ffado_sample_t));
-+	if(driver->scratchbuffer == NULL) {
-+		printError("could not allocate memory for scratch buffer");
-+		return -1;
-+	}
-+
-+	// MIDI buffers need reallocating
-+	for (chn = 0; chn < driver->capture_nchannels; chn++) {
-+		if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) {
-+			// setup the midi buffer
-+			if (driver->capture_channels[chn].midi_buffer != NULL)
-+			        free(driver->capture_channels[chn].midi_buffer);
-+			driver->capture_channels[chn].midi_buffer = calloc(driver->period_size, sizeof(uint32_t));
-+		}
-+	}
-+	for (chn = 0; chn < driver->playback_nchannels; chn++) {
-+		if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) {
-+		        if (driver->playback_channels[chn].midi_buffer != NULL)
-+		                free(driver->playback_channels[chn].midi_buffer);
-+			driver->playback_channels[chn].midi_buffer = calloc(driver->period_size, sizeof(uint32_t));
-+		}
-+	}
-+
-+	// Notify FFADO of the period size change
-+	if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) {
-+	        printError("could not alter FFADO device period size");
-+	        return -1;
-+	}
-+
-+	// This is needed to give the shadow variables a chance to
-+	// properly update to the changes.
-+	sleep(1);
-+
- 	/* tell the engine to change its buffer size */
--#if 0
- 	if (driver->engine->set_buffer_size (driver->engine, nframes)) {
- 		jack_error ("FFADO: cannot set engine buffer size to %d (check MIDI)", nframes);
- 		return -1;
- 	}
--#endif
- 
--	return -1; // unsupported
-+	// Other drivers (eg: ALSA) don't seem to adjust latencies via
-+	// jack_port_set_latency_range() from the bufsize() callback, so we
-+	// won't either.  Is this right?
-+
-+        return 0;
- }
- 
- typedef void (*JackDriverFinishFunction) (jack_driver_t *);
-@@ -704,7 +755,7 @@
- {
- 	ffado_driver_t *driver;
- 
--	if(ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) {
-+	if(ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) {
- 		printError("Incompatible libffado version! (%s)", ffado_get_version());
- 		return NULL;
- 	}
--- 
-1.7.10
-
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index d241703a7..9cc2085df 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197107 2013-10-21 20:21:18Z guillaume $
+# $Id: PKGBUILD 204857 2014-01-29 14:49:34Z guillaume $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -6,18 +6,19 @@
 pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
 pkgbase=java7-openjdk
 _java_ver=7
-_icedtea_ver=2.4.3
+_icedtea_ver=2.4.5
 
 # check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am
-_JDK_UPDATE_VERSION=45
-_CORBA_CHANGESET=8ed5df839fbc
-_JAXP_CHANGESET=8f220f7b51c7
-_JAXWS_CHANGESET=652eb396f959
-_JDK_CHANGESET=7958751eb9ef
-_LANGTOOLS_CHANGESET=3c8eb52a32ea
-_OPENJDK_CHANGESET=e2f5917da3c1
+_JDK_UPDATE_VERSION=51
 
-_HOTSPOT_CHANGESET=b59e02d9e72b # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
+_CORBA_CHANGESET=3594dbde270d
+_JAXP_CHANGESET=8fe156ad49e2
+_JAXWS_CHANGESET=32ea8b1ed91a
+_JDK_CHANGESET=9db88c18e114
+_LANGTOOLS_CHANGESET=dabd37b7e295
+_OPENJDK_CHANGESET=410eb7fef869
+
+_HOTSPOT_CHANGESET=2cb58882dac3 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
@@ -47,14 +48,15 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
-sha256sums=('15b1acc1fb43b83ca08d531491261c5eeaea4cad3598300074692acea93bdd3d'
-            '75a18abd117e3295c6de4d3450f0094a9abc08f2168e2911bce25d1e153107b9'
-            '7fab9af64ffcdf635a6fed5abf78cffd1f64be1f3827a1aaf3a0e5e1fdbc599c'
-            'cec41aebd42f4c8caba9c24c306ba78e8cf5da3d23da1604b98753340a2719ca'
-            'fb9c22e92c2a056917b7b5dce6905a01ab2e904cbc3c1c6badcc470d22136518'
-            '4df06346d197180bbb9d182e3ebc9ab6386562199d9898d057d0df75566349fe'
-            '462ad61fd34708c90362f9e3d3c432b9246833ea8ff0d8a14955ae386bce4a91'
-            'b7d7e01d7ab9e49b68aa29b55355a019d71f9ae5cabb4ea7378b55855a07df57'
+
+sha256sums=('10c08eeffaa0602b23cb957a2595a2ad3ab474cbe47b12743bbdd79037d5883d'
+            '2de151c7275d91ef082e63fcc0957c5f9290404ec6e20ecfa1e752e16bfab707'
+            'd1f97e143fe94ae3a56b45bb5a90f8ab10ec2be4ff770a788f0a1ac677e27a7d'
+            '0a2a40186cedfbeb8f87b0bc86bea2830943943081d4289fc74f7a783b2e1af3'
+            '08a169b6b02883759ec7a412aa91aa3e37480761cb50b95d092dbcdb2fc9a3d0'
+            '285e5b8ccbb29f3f9f9ea9ea7856d1ed97465c57d091fbcd9b2e55a1ffbb543e'
+            '86cb370ce2084c4b699d8c002ebe6c026e86206ffa82a2f3d7906aadb94ed79f'
+            'd8c1681ae76e660c1888065933cedbbc1309869c7a2fb98f07c424716d5ebaf9'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
             'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD
index e210caafd..4af2167a4 100644
--- a/extra/kactivities/PKGBUILD
+++ b/extra/kactivities/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202457 2013-12-22 12:46:37Z andrea $
+# $Id: PKGBUILD 205640 2014-02-10 10:57:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kactivities
-pkgver=4.12.0
+pkgver=4.12.2
 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=('966fa231942b24b510beafb4d3eb16226bde4ec0')
+sha1sums=('e5a247270947f0a7a7be45b0c231200cff3f8bc6')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD
index 5c190c319..d57cb268d 100644
--- a/extra/kdeaccessibility-jovie/PKGBUILD
+++ b/extra/kdeaccessibility-jovie/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202484 2013-12-22 12:47:07Z andrea $
+# $Id: PKGBUILD 205666 2014-02-10 10:58:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-jovie
-pkgver=4.12.0
+pkgver=4.12.2
 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=('c14c3afbc5f1290adc5d421330fd423b470542fe')
+sha1sums=('b5f78f20298bd728a56a20e94d774b94fdcd5358')
 
 build() {
   mkdir build
diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD
index bdb354243..781731a4f 100644
--- a/extra/kdeaccessibility-kaccessible/PKGBUILD
+++ b/extra/kdeaccessibility-kaccessible/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202485 2013-12-22 12:47:09Z andrea $
+# $Id: PKGBUILD 205667 2014-02-10 10:58:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kaccessible
-pkgver=4.12.0
+pkgver=4.12.2
 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=('a1e850b14bbf08269557c2f1edea4ac5b0e2773f')
+sha1sums=('51b713461cbfffd5064160434f81ed14c612e484')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD
index be5f4624d..257b47d0c 100644
--- a/extra/kdeaccessibility-kmag/PKGBUILD
+++ b/extra/kdeaccessibility-kmag/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202486 2013-12-22 12:47:10Z andrea $
+# $Id: PKGBUILD 205668 2014-02-10 10:58:12Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmag
-pkgver=4.12.0
+pkgver=4.12.2
 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=('b75992bfe53ab7e22e33d5746ed28ab9583be816')
+sha1sums=('db891d41100a2044f47728354885a3143b20293d')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD
index 9fd2e6ab8..0438dede8 100644
--- a/extra/kdeaccessibility-kmousetool/PKGBUILD
+++ b/extra/kdeaccessibility-kmousetool/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202487 2013-12-22 12:47:11Z andrea $
+# $Id: PKGBUILD 205669 2014-02-10 10:58:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmousetool
-pkgver=4.12.0
+pkgver=4.12.2
 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=('3c61d8a183c9e1fedb6eff6b0dd6937135a429f8')
+sha1sums=('fce6e1b05120e2d0c1bc2d37abc78c387744a9ca')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD
index eafc248ab..1a8eeb1ea 100644
--- a/extra/kdeaccessibility-kmouth/PKGBUILD
+++ b/extra/kdeaccessibility-kmouth/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202488 2013-12-22 12:47:12Z andrea $
+# $Id: PKGBUILD 205670 2014-02-10 10:58:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmouth
-pkgver=4.12.0
+pkgver=4.12.2
 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=('a934e8b73a5a71293a63b45f038751318c04a1bf')
+sha1sums=('cc8b2aec4b5d00689404fc1c4a56b615fca512ba')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeadmin-kcron/PKGBUILD b/extra/kdeadmin-kcron/PKGBUILD
index e58c57731..6d939997b 100644
--- a/extra/kdeadmin-kcron/PKGBUILD
+++ b/extra/kdeadmin-kcron/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202489 2013-12-22 12:47:13Z andrea $
+# $Id: PKGBUILD 205671 2014-02-10 10:58:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeadmin-kcron
-pkgver=4.12.0
+pkgver=4.12.2
 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=('7f64eb62048360f5d14ce273e7eff2c48c9d0567')
+sha1sums=('d1c65555679484ba6bd46e24dbbf97d91c5c577f')
 
 build() {
   mkdir build
diff --git a/extra/kdeadmin-ksystemlog/PKGBUILD b/extra/kdeadmin-ksystemlog/PKGBUILD
index ece449f1f..693231fde 100644
--- a/extra/kdeadmin-ksystemlog/PKGBUILD
+++ b/extra/kdeadmin-ksystemlog/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202490 2013-12-22 12:47:14Z andrea $
+# $Id: PKGBUILD 205672 2014-02-10 10:58:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeadmin-ksystemlog
-pkgver=4.12.0
+pkgver=4.12.2
 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=('0e7b62342acf505d384328de2528cb22120ef639'
+sha1sums=('a47dbc4d9ae32225a4a7b08b96cd99dae0288421'
           '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
 
 prepare() {
diff --git a/extra/kdeadmin-kuser/PKGBUILD b/extra/kdeadmin-kuser/PKGBUILD
index 76aa1fd4b..038bf4fd3 100644
--- a/extra/kdeadmin-kuser/PKGBUILD
+++ b/extra/kdeadmin-kuser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202491 2013-12-22 12:47:15Z andrea $
+# $Id: PKGBUILD 205673 2014-02-10 10:58:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeadmin-kuser
-pkgver=4.12.0
+pkgver=4.12.2
 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=('36610297b6f41d075fc638fdab6910f3558cdcc2')
+sha1sums=('4cc2e13b81f5b62295947c92a7879f12d0a2f160')
 
 build() {
   mkdir build
diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD
index 522c8574e..68aeae974 100644
--- a/extra/kdeartwork/PKGBUILD
+++ b/extra/kdeartwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202492 2013-12-22 12:47:17Z andrea $
+# $Id: PKGBUILD 205674 2014-02-10 10:58:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -11,15 +11,15 @@ pkgname=('kdeartwork-colorschemes'
          'kdeartwork-styles'
          'kdeartwork-wallpapers'
          'kdeartwork-weatherwallpapers')
-pkgver=4.12.0
+pkgver=4.12.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeartwork')
-makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2')
+makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen2' 'kdebase-workspace' 'libkexiv2')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('a5042ff6768a4857649a526199c9cda9c6976e6a')
+sha1sums=('c18fbaa746b177c9f71d3115e108a60cf3acd0ae')
 
 build() {
 	cd $srcdir
diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD
index 67397523a..d9e45cd74 100644
--- a/extra/kdebase-konsole/PKGBUILD
+++ b/extra/kdebase-konsole/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202493 2013-12-22 12:47:18Z andrea $
+# $Id: PKGBUILD 205675 2014-02-10 10:58:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebase-konsole
-pkgver=4.12.0
+pkgver=4.12.2
 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=('3e4d16c6837c1ba83e8e8440124bd870eca1ba1c')
+sha1sums=('85548a5982e62f1482d4512921dca293b3ef0b82')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index b6d1cd6a3..195f3dab1 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 202712 2013-12-25 21:25:47Z andyrtr $
+# $Id: PKGBUILD 205802 2014-02-10 11:01:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
-pkgver=4.11.4
+pkgver=4.11.6
+_pkgver=4.12.2
 pkgrel=2
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,16 +20,16 @@ depends=("kdelibs>=${pkgver}" 'kdepim-runtime' 'lm_sensors' 'libraw1394'
          'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
          'xorg-xrdb' 'libxres' 'xorg-xrandr' 'xorg-xmessage' 'libusb-compat'
          'kde-base-artwork' 'xcb-util-renderutil' 'xcb-util-image' 'ttf-font'
-         'xcb-util-keysyms' 'xcb-util-wm' 'pciutils')
+         'xcb-util-keysyms' 'xcb-util-wm' 'pciutils' 'glu')
 makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager')
 optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces'
             'appmenu-qt: menu applications over dbus')
 install="${pkgname}.install"
 backup=('usr/share/config/kdm/kdmrc')
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
+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=('c1e2b669f5a1607bcce7e92d9213af1ee809d79e'
+sha1sums=('f1da23a472064307dcd244605a7004701982e5de'
           '660eae40a707d2711d8d7f32a93214865506b795'
           '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD
index 9a7a50bab..f5302008f 100644
--- a/extra/kdebase/PKGBUILD
+++ b/extra/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202472 2013-12-22 12:46:54Z andrea $
+# $Id: PKGBUILD 205655 2014-02-10 10:57:59Z 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.12.0
+pkgver=4.12.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -19,7 +19,7 @@ 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=('e85b5445380e44894efcaa21f4c95fad1ed4c4f6')
+sha1sums=('7002c8d1a8f4fb1735ad70b8cb1a106876323f94')
 
 prepare() {
   mkdir build
@@ -106,7 +106,7 @@ package_kdebase-lib() {
 
 package_kdebase-plasma() {
 	pkgdesc='Display the contents of folders (User´s home folder as default)'
-	depends=('kdebase-workspace' 'kdebase-lib')
+	depends=('kdebase-lib')
 	cd $srcdir/build/plasma
 	make DESTDIR=$pkgdir install
 }
diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD
index 4b73f21db..2795951d6 100644
--- a/extra/kdebindings-kimono/PKGBUILD
+++ b/extra/kdebindings-kimono/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202494 2013-12-22 12:47:19Z andrea $
+# $Id: PKGBUILD 205676 2014-02-10 10:58:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-kimono
-pkgver=4.12.0
+pkgver=4.12.2
 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=('f943de3f84ddb0ff6beec922ae9f4d890f83bb5c')
+sha1sums=('f9fc6912fe7e69b4c9f40377275ce2e2a5369a14')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD
index 702a28e82..07488a8e0 100644
--- a/extra/kdebindings-korundum/PKGBUILD
+++ b/extra/kdebindings-korundum/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202495 2013-12-22 12:47:20Z andrea $
+# $Id: PKGBUILD 205677 2014-02-10 10:58:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-korundum
-pkgver=4.12.0
+pkgver=4.12.2
 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=('0b2a5f4453116a773ae446268efe697accc0d4c4')
+sha1sums=('19b17e5791a0097469afc1af580f1f4dced9acde')
 
 prepare() {
   mkdir build
diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD
index c4546ad49..6af2d96a3 100644
--- a/extra/kdebindings-kross/PKGBUILD
+++ b/extra/kdebindings-kross/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 202496 2013-12-22 12:47:21Z andrea $
+# $Id: PKGBUILD 205678 2014-02-10 10:58:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-kross
 pkgname=('kdebindings-kross-python'
 #         'kdebindings-kross-ruby'
          'kdebindings-kross-java')
-pkgver=4.12.0
+pkgver=4.12.2
 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=('26663d13d13f001eaf359ac3af0aab133b0ed558')
+sha1sums=('af4af5d3706d91235b2e9614b4c98717a7996e11')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD
index 2201a0e87..83c64cf95 100644
--- a/extra/kdebindings-perlkde/PKGBUILD
+++ b/extra/kdebindings-perlkde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202497 2013-12-22 12:47:22Z andrea $
+# $Id: PKGBUILD 205679 2014-02-10 10:58:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlkde
-pkgver=4.12.0
+pkgver=4.12.2
 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=('a69983100fd2b66f478e7b39b6fe0ce49813db6d')
+sha1sums=('4e2bb44cd0c422d2b0efa2cc55722ca34e26267a')
 
 build() {
   mkdir build
diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD
index 7f1c356a2..cdf1f1f91 100644
--- a/extra/kdebindings-perlqt/PKGBUILD
+++ b/extra/kdebindings-perlqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202467 2013-12-22 12:46:49Z andrea $
+# $Id: PKGBUILD 205650 2014-02-10 10:57:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlqt
-pkgver=4.12.0
+pkgver=4.12.2
 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=('0b66d85af437dba188b9d9381dbd50114ff1c925')
+sha1sums=('74b574e384a7ad6d9a8ec35a7e5e4e1b74b4652c')
 
 build() {
   mkdir build
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index 72676f06a..93428c6db 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 202464 2013-12-22 12:46:46Z andrea $
+# $Id: PKGBUILD 205647 2014-02-10 10:57:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-python
 pkgname=('kdebindings-python'
          'kdebindings-python2'
          'kdebindings-python-common')
-pkgver=4.12.0
+pkgver=4.12.2
 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=('64661b5fcce6b45cddf1f6ddfc17862c939a18af')
+sha1sums=('11d0b3c11d02c3b0cb4006b2e004195697a2f598')
 
 prepare() {
   mkdir build
diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD
index acdc7ccee..afd425200 100644
--- a/extra/kdebindings-qtruby/PKGBUILD
+++ b/extra/kdebindings-qtruby/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202469 2013-12-22 12:46:52Z andrea $
+# $Id: PKGBUILD 205652 2014-02-10 10:57:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qtruby
-pkgver=4.12.0
+pkgver=4.12.2
 pkgrel=1
 pkgdesc="Ruby bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby"
@@ -13,10 +13,13 @@ 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=('a1ab8e5607bb8f2a046c06907592738652daf1dd')
+sha1sums=('540dd007ad44875438a7c2ca7c8b17903bab7b79')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../qtruby-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD
index a87fd0c64..cecc013f2 100644
--- a/extra/kdebindings-qyoto/PKGBUILD
+++ b/extra/kdebindings-qyoto/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202468 2013-12-22 12:46:50Z andrea $
+# $Id: PKGBUILD 205651 2014-02-10 10:57:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qyoto
-pkgver=4.12.0
+pkgver=4.12.2
 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=('581e1bf9eb0d056be21e32851919e9abf60c967e')
+sha1sums=('211cbf27ed51b6cf5ae10798d138bc4001de3c1f')
 
 build() {
   mkdir build
diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD
index 7c9798f44..d1ddd89bc 100644
--- a/extra/kdebindings-smokegen/PKGBUILD
+++ b/extra/kdebindings-smokegen/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202460 2013-12-22 12:46:41Z andrea $
+# $Id: PKGBUILD 205643 2014-02-10 10:57:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokegen
-pkgver=4.12.0
+pkgver=4.12.2
 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=('5385b2851d16d186be4cc4bc4d5af901d8f444bf')
+sha1sums=('94ce0927bab5904a0d66dcace8920deca085b0de')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD
index bc680f29c..3a106292f 100644
--- a/extra/kdebindings-smokekde/PKGBUILD
+++ b/extra/kdebindings-smokekde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202466 2013-12-22 12:46:48Z andrea $
+# $Id: PKGBUILD 205649 2014-02-10 10:57:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokekde
-pkgver=4.12.0
+pkgver=4.12.2
 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=('9f1d249d3fcedefba49dc26afc1a1c5c0ad730d6')
+sha1sums=('d4d2a736a15b5bd52b2a0e01bc77d7b93414f489')
 
 build() {
   mkdir build
diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD
index 48a639632..f47f8327d 100644
--- a/extra/kdebindings-smokeqt/PKGBUILD
+++ b/extra/kdebindings-smokeqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202461 2013-12-22 12:46:43Z andrea $
+# $Id: PKGBUILD 205644 2014-02-10 10:57:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokeqt
-pkgver=4.12.0
+pkgver=4.12.2
 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=('d5b47c8a21f9856a7ea8729c0cb01dad4db2d13e')
+sha1sums=('8c367e022d04bc8ccdf9fcb1309620556826c742')
 
 prepare() {
   mkdir build
diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD
index b55854559..d9fa90ef9 100644
--- a/extra/kdeedu-analitza/PKGBUILD
+++ b/extra/kdeedu-analitza/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202478 2013-12-22 12:47:02Z andrea $
+# $Id: PKGBUILD 205661 2014-02-10 10:58:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-analitza
-pkgver=4.12.0
+pkgver=4.12.2
 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' 'glu')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz")
-sha1sums=('a90c58d24c8cba048fc5303ef35e870536603119')
+sha1sums=('7d06a5bb421ef5a2b5083a9f71bdc985746eee9b')
 
 prepare() {
   mkdir build
diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD
index e984f8b4c..ab1879f8d 100644
--- a/extra/kdeedu-blinken/PKGBUILD
+++ b/extra/kdeedu-blinken/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202498 2013-12-22 12:47:23Z andrea $
+# $Id: PKGBUILD 205680 2014-02-10 10:58:23Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-blinken
-pkgver=4.12.0
+pkgver=4.12.2
 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=('eb081e53375559f67cec380833b1514de635f985')
+sha1sums=('45b1b958192b7b2c5518fcb64266b6998abe1969')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD
index 471e93f99..9022b7480 100644
--- a/extra/kdeedu-cantor/PKGBUILD
+++ b/extra/kdeedu-cantor/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202499 2013-12-22 12:47:24Z andrea $
+# $Id: PKGBUILD 205681 2014-02-10 10:58:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-cantor
-pkgver=4.12.0
+pkgver=4.12.2
 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=('9a7a27a375bfbb3ffacf0b9b762eaa9b3d4310f2')
+sha1sums=('7596afe3a3dcee4829ae23b9a9ef7345ca874130')
 
 prepare() {
   mkdir build
diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD
index 75227703b..621eeb1f5 100644
--- a/extra/kdeedu-kalgebra/PKGBUILD
+++ b/extra/kdeedu-kalgebra/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202500 2013-12-22 12:47:26Z andrea $
+# $Id: PKGBUILD 205682 2014-02-10 10:58:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalgebra
-pkgver=4.12.0
+pkgver=4.12.2
 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=('b4a76e4c06fc68a363727a712b1ca4673d6c816d')
+sha1sums=('d883a5c0388860a10bfa5b8df13797d688f571b5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD
index d0c0d9b1a..0fa973f1b 100644
--- a/extra/kdeedu-kalzium/PKGBUILD
+++ b/extra/kdeedu-kalzium/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202501 2013-12-22 12:47:28Z andrea $
+# $Id: PKGBUILD 205683 2014-02-10 10:58:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalzium
-pkgver=4.12.0
+pkgver=4.12.2
 pkgrel=1
 pkgdesc="Periodic Table of Elements"
 url="http://kde.org/applications/education/kalzium/"
@@ -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=('8b21468f6149395b9fe0e5f38d7f8c359fa7375e')
+sha1sums=('4d472eb820634f6b909b67e931cf77088fc8e96c')
 
 build() {
   mkdir build
diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD
index 8a81b93e8..962d34185 100644
--- a/extra/kdeedu-kanagram/PKGBUILD
+++ b/extra/kdeedu-kanagram/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202502 2013-12-22 12:47:29Z andrea $
+# $Id: PKGBUILD 205684 2014-02-10 10:58:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kanagram
-pkgver=4.12.0
+pkgver=4.12.2
 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=('13a836b56ea16693a56c320d8082e2153d1d0dcd')
+sha1sums=('8b293b3c7c4489ca0cdd1a81c86eee7ac59a903b')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD
index a7731eead..db62fc136 100644
--- a/extra/kdeedu-kbruch/PKGBUILD
+++ b/extra/kdeedu-kbruch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202503 2013-12-22 12:47:30Z andrea $
+# $Id: PKGBUILD 205685 2014-02-10 10:58:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kbruch
-pkgver=4.12.0
+pkgver=4.12.2
 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=('a8611ddfa4b22c8d13128c3e120d2407b9bf3674')
+sha1sums=('3f4786bf4b340a3dbc61bbfdbc1a864a01e5b044')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD
index 2c0cd59be..d080ef44f 100644
--- a/extra/kdeedu-kgeography/PKGBUILD
+++ b/extra/kdeedu-kgeography/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202504 2013-12-22 12:47:32Z andrea $
+# $Id: PKGBUILD 205686 2014-02-10 10:58:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kgeography
-pkgver=4.12.0
+pkgver=4.12.2
 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=('6984a2d88dc488257be8d3471a6241ca0e456788')
+sha1sums=('8354ceabebe3aafca8c3b9a19be9679322730837')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD
index 43a70ae70..41505e342 100644
--- a/extra/kdeedu-khangman/PKGBUILD
+++ b/extra/kdeedu-khangman/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202505 2013-12-22 12:47:33Z andrea $
+# $Id: PKGBUILD 205687 2014-02-10 10:58:30Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-khangman
-pkgver=4.12.0
+pkgver=4.12.2
 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=('a7e3883fd49843bb3e9addff24ebb748dd42b86a')
+sha1sums=('0dfa7b5af359d053f63b7f16867632f16a6561e2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD
index fd3d408e0..8b8c22b1b 100644
--- a/extra/kdeedu-kig/PKGBUILD
+++ b/extra/kdeedu-kig/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202506 2013-12-22 12:47:34Z andrea $
+# $Id: PKGBUILD 205688 2014-02-10 10:58:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kig
-pkgver=4.12.0
+pkgver=4.12.2
 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=('16ed1da7cb7d49a87d009791026590ac9db7b1e2')
+sha1sums=('884147d4edd720edf86633e8b24127ac3dd0eca1')
 
 build() {
   mkdir build
diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD
index 98a1295ce..a22a65b2d 100644
--- a/extra/kdeedu-kiten/PKGBUILD
+++ b/extra/kdeedu-kiten/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202507 2013-12-22 12:47:37Z andrea $
+# $Id: PKGBUILD 205689 2014-02-10 10:58:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kiten
-pkgver=4.12.0
+pkgver=4.12.2
 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=('d5aa061642ff9e32722d4014ad0816d2fb70dbaa')
+sha1sums=('cfebacbd3d09fa52131ceea1bdabdb87fd6cf2ff')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD
index cae25be11..dbe4f203c 100644
--- a/extra/kdeedu-klettres/PKGBUILD
+++ b/extra/kdeedu-klettres/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202508 2013-12-22 12:47:39Z andrea $
+# $Id: PKGBUILD 205690 2014-02-10 10:58:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-klettres
-pkgver=4.12.0
+pkgver=4.12.2
 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=('47a8e13c94111b7cf3fbabf4e84f22e30ac10884')
+sha1sums=('42f0b123c3de42084767a927d36b3c5f6dfbe2be')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD
index e4f4f2bb1..04f4b6031 100644
--- a/extra/kdeedu-kmplot/PKGBUILD
+++ b/extra/kdeedu-kmplot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202509 2013-12-22 12:47:41Z andrea $
+# $Id: PKGBUILD 205691 2014-02-10 10:58:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kmplot
-pkgver=4.12.0
+pkgver=4.12.2
 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=('6f6253c7cf2656777e1599747d36286bd75bf6f5')
+sha1sums=('9af2bcf1072a2c8bd4689bcc23b2ede68000feae')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD
index a8c1dd525..133c912da 100644
--- a/extra/kdeedu-kstars/PKGBUILD
+++ b/extra/kdeedu-kstars/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 202510 2013-12-22 12:47:42Z andrea $
+# $Id: PKGBUILD 205692 2014-02-10 10:58:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kstars
-pkgver=4.12.0
-pkgrel=3
+pkgver=4.12.2
+pkgrel=1
 pkgdesc="Desktop Planetarium"
 url="http://kde.org/applications/education/kstars/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'wcslib' 'libindi')
-makedepends=('cmake' 'automoc4' 'eigen')
+makedepends=('cmake' 'automoc4' 'eigen2')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz")
-sha1sums=('b8e1b95b1b7b1c31ff628fb2b8779293c72a8d8a')
+sha1sums=('df5d740ba21401c9960f80a95bca0b8adb70e896')
 
 build() {
   mkdir build
diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD
index 83672a8bd..45c3f5a2f 100644
--- a/extra/kdeedu-ktouch/PKGBUILD
+++ b/extra/kdeedu-ktouch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202511 2013-12-22 12:47:44Z andrea $
+# $Id: PKGBUILD 205693 2014-02-10 10:58:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-ktouch
-pkgver=4.12.0
+pkgver=4.12.2
 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=('59f37ce92d918d3bce8520bc58c3651213d092e8')
+sha1sums=('72d7087e6d62c0316017b60f7e1c424a6e65616f')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD
index 04255af9a..c5c82532b 100644
--- a/extra/kdeedu-kturtle/PKGBUILD
+++ b/extra/kdeedu-kturtle/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202512 2013-12-22 12:47:45Z andrea $
+# $Id: PKGBUILD 205694 2014-02-10 10:58:36Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kturtle
-pkgver=4.12.0
+pkgver=4.12.2
 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=('2623bf1647cc26706edcd4e0ed4b4fca0dfb3fb2')
+sha1sums=('77e9da2001f9d770fa4cc1312767d3a9bd00ce68')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD
index a0bdf3e7b..c8c4ed3be 100644
--- a/extra/kdeedu-kwordquiz/PKGBUILD
+++ b/extra/kdeedu-kwordquiz/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202513 2013-12-22 12:47:47Z andrea $
+# $Id: PKGBUILD 205695 2014-02-10 10:58:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kwordquiz
-pkgver=4.12.0
+pkgver=4.12.2
 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=('522e3dd60630be1c97e740d3fc80db231859df86')
+sha1sums=('5e21e507c71b8be8abd7dff894f8a0ba2caccea7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD
index 6c21e24b0..6302d3311 100644
--- a/extra/kdeedu-marble/PKGBUILD
+++ b/extra/kdeedu-marble/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202474 2013-12-22 12:46:57Z andrea $
+# $Id: PKGBUILD 205657 2014-02-10 10:58:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-marble
-pkgver=4.12.0
+pkgver=4.12.2
 pkgrel=1
 pkgdesc="Desktop Globe"
 url="http://kde.org/applications/education/marble/"
@@ -15,7 +15,7 @@ optdepends=('gpsd: GPS support'
             'quazip: reading and displaying KMZ files')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz")
-sha1sums=('65f4272a015b36b06d7aacf1a4dd6e757557e2b9')
+sha1sums=('3b9a02ea73a40801476ef67874df60b21512bcd3')
 
 prepare() {
   mkdir build
diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD
index 1e0f6b287..1c9227e39 100644
--- a/extra/kdeedu-pairs/PKGBUILD
+++ b/extra/kdeedu-pairs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202514 2013-12-22 12:47:48Z andrea $
+# $Id: PKGBUILD 205696 2014-02-10 10:58:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-pairs
-pkgver=4.12.0
+pkgver=4.12.2
 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=('a153626127d757105473a1a0b174e4f67f87aa2e')
+sha1sums=('b5d79efe951f5ecaf2344151f19388de2dfa10be')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD
index 3d8d68dcf..2b0d2437f 100644
--- a/extra/kdeedu-parley/PKGBUILD
+++ b/extra/kdeedu-parley/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202515 2013-12-22 12:47:49Z andrea $
+# $Id: PKGBUILD 205697 2014-02-10 10:58:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-parley
-pkgver=4.12.0
+pkgver=4.12.2
 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=('6b5fac34f4f6c9cd9f43a1137574be0396d10768')
+sha1sums=('9919d8b9a2c99c1cdff2f0ba28e3ae48d5e2bd7f')
 
 build() {
   mkdir build
diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD
index b27c52d27..4ca1767b1 100644
--- a/extra/kdeedu-rocs/PKGBUILD
+++ b/extra/kdeedu-rocs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202516 2013-12-22 12:47:51Z andrea $
+# $Id: PKGBUILD 205698 2014-02-10 10:58:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-rocs
-pkgver=4.12.0
+pkgver=4.12.2
 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=('bec5211b4c1c384f515bfaa0a98a5c2684bbdab4')
+sha1sums=('323f74812d5036d66ad76aee0127260211dd5d8c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD
index 948390579..5ca525d9c 100644
--- a/extra/kdeedu-step/PKGBUILD
+++ b/extra/kdeedu-step/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202517 2013-12-22 12:47:52Z andrea $
+# $Id: PKGBUILD 205699 2014-02-10 10:58:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-step
-pkgver=4.12.0
+pkgver=4.12.2
 pkgrel=1
 pkgdesc="Interactive Physical Simulator"
 url="http://kde.org/applications/education/step/"
@@ -10,10 +10,10 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libqalculate' 'gsl')
-makedepends=('cmake' 'automoc4' 'eigen' 'mesa')
+makedepends=('cmake' 'automoc4' 'eigen2' 'mesa')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz")
-sha1sums=('0bc4592f7886abe1815de1290aff2efab230120b')
+sha1sums=('e36bc06ae94d698127a0b2f8d1157f75a9ccfdd4')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegames-bomber/PKGBUILD b/extra/kdegames-bomber/PKGBUILD
index 1c0c1b241..c8412476e 100644
--- a/extra/kdegames-bomber/PKGBUILD
+++ b/extra/kdegames-bomber/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202518 2013-12-22 12:47:53Z andrea $
+# $Id: PKGBUILD 205700 2014-02-10 10:58:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-bomber
-pkgver=4.12.0
+pkgver=4.12.2
 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=('6a52c44a3ac4c80cd5c60e417f13de2103a7c7ed')
+sha1sums=('1518a069b196cc8d2ded3c098e3e2d4872096212')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-bovo/PKGBUILD b/extra/kdegames-bovo/PKGBUILD
index 738f7abcc..bb0b78aea 100644
--- a/extra/kdegames-bovo/PKGBUILD
+++ b/extra/kdegames-bovo/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202519 2013-12-22 12:47:55Z andrea $
+# $Id: PKGBUILD 205701 2014-02-10 10:58:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-bovo
-pkgver=4.12.0
+pkgver=4.12.2
 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=('f805eabb8f2a18ae5371bbdcaffb5fce1ac9c5e0')
+sha1sums=('f3a62326a64ff1dadb81456f41cf270450329658')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-granatier/PKGBUILD b/extra/kdegames-granatier/PKGBUILD
index 031aa41b6..fb63b89ea 100644
--- a/extra/kdegames-granatier/PKGBUILD
+++ b/extra/kdegames-granatier/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202520 2013-12-22 12:47:56Z andrea $
+# $Id: PKGBUILD 205702 2014-02-10 10:58:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-granatier
-pkgver=4.12.0
+pkgver=4.12.2
 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=('73fa16ffbef5915793fef03e25c2a755cb83cead')
+sha1sums=('68503215969dff275885893533768bde08fe2af3')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kapman/PKGBUILD b/extra/kdegames-kapman/PKGBUILD
index 3d4e440e5..90169ff33 100644
--- a/extra/kdegames-kapman/PKGBUILD
+++ b/extra/kdegames-kapman/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202522 2013-12-22 12:47:59Z andrea $
+# $Id: PKGBUILD 205704 2014-02-10 10:58:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kapman
-pkgver=4.12.0
+pkgver=4.12.2
 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=('ff8789b6703c6a1ff6bf3187188ca6399c8ede78')
+sha1sums=('3d70a3c30c3c55cca2bc0b406391685f5f0ae699')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-katomic/PKGBUILD b/extra/kdegames-katomic/PKGBUILD
index b2f27fbc2..989f0ab61 100644
--- a/extra/kdegames-katomic/PKGBUILD
+++ b/extra/kdegames-katomic/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202523 2013-12-22 12:48:00Z andrea $
+# $Id: PKGBUILD 205705 2014-02-10 10:58:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-katomic
-pkgver=4.12.0
+pkgver=4.12.2
 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=('5b0644db827b9cb1fd96c2072677758bf1dd1b87')
+sha1sums=('165ab0263b97f79bdbfaa7c1bd24e2f2227b6f86')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kblackbox/PKGBUILD b/extra/kdegames-kblackbox/PKGBUILD
index 06eba95c5..f94ebd035 100644
--- a/extra/kdegames-kblackbox/PKGBUILD
+++ b/extra/kdegames-kblackbox/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202524 2013-12-22 12:48:02Z andrea $
+# $Id: PKGBUILD 205706 2014-02-10 10:58:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kblackbox
-pkgver=4.12.0
+pkgver=4.12.2
 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=('c70a8460147042abe3dd75109e15e67e960e4e61')
+sha1sums=('a49f6387e8ccc0a84492cea7446993ca63f20880')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kblocks/PKGBUILD b/extra/kdegames-kblocks/PKGBUILD
index c58226d26..fbdc92b92 100644
--- a/extra/kdegames-kblocks/PKGBUILD
+++ b/extra/kdegames-kblocks/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202525 2013-12-22 12:48:04Z andrea $
+# $Id: PKGBUILD 205707 2014-02-10 10:58:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kblocks
-pkgver=4.12.0
+pkgver=4.12.2
 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=('2cf67dce9caac87fe30ad2e8419b0ff15e2f2180')
+sha1sums=('9867c110370d3e8bddc93cb2a5b1b52e6b08bed4')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kbounce/PKGBUILD b/extra/kdegames-kbounce/PKGBUILD
index 54f7b0d09..91bf3a667 100644
--- a/extra/kdegames-kbounce/PKGBUILD
+++ b/extra/kdegames-kbounce/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202526 2013-12-22 12:48:05Z andrea $
+# $Id: PKGBUILD 205708 2014-02-10 10:58:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kbounce
-pkgver=4.12.0
+pkgver=4.12.2
 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=('4386ec1d2c770a8c2225755659245d28b8fc1ff6')
+sha1sums=('2d255b719904fb76c10b3d15de131ddc8c43e681')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kbreakout/PKGBUILD b/extra/kdegames-kbreakout/PKGBUILD
index fbcdda58e..169191c03 100644
--- a/extra/kdegames-kbreakout/PKGBUILD
+++ b/extra/kdegames-kbreakout/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202527 2013-12-22 12:48:07Z andrea $
+# $Id: PKGBUILD 205709 2014-02-10 10:58:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kbreakout
-pkgver=4.12.0
+pkgver=4.12.2
 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=('1752d83d4a8ea74bfc2f8f61bf2b93096dfdd24d')
+sha1sums=('24b2df62dfeb61e8a86a219de0519bce760815f6')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kdiamond/PKGBUILD b/extra/kdegames-kdiamond/PKGBUILD
index a064f9820..544a2c04b 100644
--- a/extra/kdegames-kdiamond/PKGBUILD
+++ b/extra/kdegames-kdiamond/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202528 2013-12-22 12:48:09Z andrea $
+# $Id: PKGBUILD 205710 2014-02-10 10:58:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kdiamond
-pkgver=4.12.0
+pkgver=4.12.2
 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=('82c30d782087c41441f2b24dde2eb2c5c722807a')
+sha1sums=('0ad0c9a40c8e5d1cd0903376d7a66630fc910bf6')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kfourinline/PKGBUILD b/extra/kdegames-kfourinline/PKGBUILD
index c0caf35a3..b0dfab436 100644
--- a/extra/kdegames-kfourinline/PKGBUILD
+++ b/extra/kdegames-kfourinline/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202529 2013-12-22 12:48:10Z andrea $
+# $Id: PKGBUILD 205711 2014-02-10 10:58:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kfourinline
-pkgver=4.12.0
+pkgver=4.12.2
 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=('226f7e8cf6da9517a2beeaa22caf51e35df123d9')
+sha1sums=('61c512739989a277ed7fe51aca9ddfed597112bb')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kgoldrunner/PKGBUILD b/extra/kdegames-kgoldrunner/PKGBUILD
index c9fdf8d26..b49810ab8 100644
--- a/extra/kdegames-kgoldrunner/PKGBUILD
+++ b/extra/kdegames-kgoldrunner/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202530 2013-12-22 12:48:11Z andrea $
+# $Id: PKGBUILD 205712 2014-02-10 10:58:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kgoldrunner
-pkgver=4.12.0
+pkgver=4.12.2
 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=('93b4b717fe92c3de68eea7d20cfc26fd6262e1d8')
+sha1sums=('2918a65f881061db4fabbcbec21fbbae76df1213')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kigo/PKGBUILD b/extra/kdegames-kigo/PKGBUILD
index 224383c34..00e8c3a3d 100644
--- a/extra/kdegames-kigo/PKGBUILD
+++ b/extra/kdegames-kigo/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202531 2013-12-22 12:48:12Z andrea $
+# $Id: PKGBUILD 205713 2014-02-10 10:58:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kigo
-pkgver=4.12.0
+pkgver=4.12.2
 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=('d4a7f9fed23710237f18e1879d9128821e4f3f4a')
+sha1sums=('38157b36fed23352fd7162c8fd2c232344eb0a6e')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-killbots/PKGBUILD b/extra/kdegames-killbots/PKGBUILD
index 11b3e70f5..82c944f19 100644
--- a/extra/kdegames-killbots/PKGBUILD
+++ b/extra/kdegames-killbots/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202532 2013-12-22 12:48:14Z andrea $
+# $Id: PKGBUILD 205714 2014-02-10 10:58:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-killbots
-pkgver=4.12.0
+pkgver=4.12.2
 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=('2cbf37ae730340a9426c663291679969d4bfa336')
+sha1sums=('75a993d29aa1b3c91c65fd1776fdabee7ac459ee')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kiriki/PKGBUILD b/extra/kdegames-kiriki/PKGBUILD
index f785895f4..18937b3cc 100644
--- a/extra/kdegames-kiriki/PKGBUILD
+++ b/extra/kdegames-kiriki/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202533 2013-12-22 12:48:16Z andrea $
+# $Id: PKGBUILD 205715 2014-02-10 10:58:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kiriki
-pkgver=4.12.0
+pkgver=4.12.2
 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=('97cc308eb01ded2e39aff57f736e72d24604d37f')
+sha1sums=('63e9850d555a83817bc2a26ed163e4822f3b1c53')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kjumpingcube/PKGBUILD b/extra/kdegames-kjumpingcube/PKGBUILD
index b36e2f950..dd3913285 100644
--- a/extra/kdegames-kjumpingcube/PKGBUILD
+++ b/extra/kdegames-kjumpingcube/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202534 2013-12-22 12:48:18Z andrea $
+# $Id: PKGBUILD 205716 2014-02-10 10:58:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kjumpingcube
-pkgver=4.12.0
+pkgver=4.12.2
 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=('c54a04bb1bc1769018ca31731190038ba3624ce7')
+sha1sums=('e2b3ecd19ffd6a8cb60813c09535841963f29bdd')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-klickety/PKGBUILD b/extra/kdegames-klickety/PKGBUILD
index 96049c34b..0c902a521 100644
--- a/extra/kdegames-klickety/PKGBUILD
+++ b/extra/kdegames-klickety/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202535 2013-12-22 12:48:21Z andrea $
+# $Id: PKGBUILD 205717 2014-02-10 10:58:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-klickety
-pkgver=4.12.0
+pkgver=4.12.2
 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=('42cd4e8edbbd9bb60551ed7c4b45557ba71e52d2')
+sha1sums=('3c0d1318e436263f43ed0237936fcb6082333783')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-klines/PKGBUILD b/extra/kdegames-klines/PKGBUILD
index f9d588746..7643ee911 100644
--- a/extra/kdegames-klines/PKGBUILD
+++ b/extra/kdegames-klines/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202536 2013-12-22 12:48:22Z andrea $
+# $Id: PKGBUILD 205718 2014-02-10 10:58:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-klines
-pkgver=4.12.0
+pkgver=4.12.2
 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=('a07893d319d8d27cc27a87bf8ab7636ba3fbc416')
+sha1sums=('08900397fce0deb9c12e5e0bb9a1c66467486909')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kmahjongg/PKGBUILD b/extra/kdegames-kmahjongg/PKGBUILD
index ba3104001..3f62a6c92 100644
--- a/extra/kdegames-kmahjongg/PKGBUILD
+++ b/extra/kdegames-kmahjongg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202537 2013-12-22 12:48:24Z andrea $
+# $Id: PKGBUILD 205719 2014-02-10 10:58:58Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kmahjongg
-pkgver=4.12.0
+pkgver=4.12.2
 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=('e6ece3ec2fdcd5d454464f7c8677382a6c79359f')
+sha1sums=('4f16e3e5c65804c4bc443cfa765e4766ed2e8e05')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kmines/PKGBUILD b/extra/kdegames-kmines/PKGBUILD
index 0ac6e1eac..b70f8568b 100644
--- a/extra/kdegames-kmines/PKGBUILD
+++ b/extra/kdegames-kmines/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202538 2013-12-22 12:48:25Z andrea $
+# $Id: PKGBUILD 205720 2014-02-10 10:58:59Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kmines
-pkgver=4.12.0
+pkgver=4.12.2
 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=('05de6c7620247d4b221a0cae5905e9c3a553843f')
+sha1sums=('ce372399ce24ba4294b0af77d523e9afb8d1f4cf')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-knavalbattle/PKGBUILD b/extra/kdegames-knavalbattle/PKGBUILD
index eb9b1d536..f3b991d83 100644
--- a/extra/kdegames-knavalbattle/PKGBUILD
+++ b/extra/kdegames-knavalbattle/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202539 2013-12-22 12:48:27Z andrea $
+# $Id: PKGBUILD 205721 2014-02-10 10:59:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-knavalbattle
-pkgver=4.12.0
+pkgver=4.12.2
 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=('039b6590ae20cecbb24f5f7a17e45e3fef49d98f')
+sha1sums=('7c27a477dafe835d8d783e3e6b96547f1d2aaaae')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-knetwalk/PKGBUILD b/extra/kdegames-knetwalk/PKGBUILD
index 55390e765..80cd4ac47 100644
--- a/extra/kdegames-knetwalk/PKGBUILD
+++ b/extra/kdegames-knetwalk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202540 2013-12-22 12:48:28Z andrea $
+# $Id: PKGBUILD 205722 2014-02-10 10:59:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-knetwalk
-pkgver=4.12.0
+pkgver=4.12.2
 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=('2aa6b90be52f74c97531862ae1688f0433bd0f17')
+sha1sums=('6c01d46291c238e2538ef5bfb0ebf76561efc536')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kolf/PKGBUILD b/extra/kdegames-kolf/PKGBUILD
index ea4269f3e..2caa82787 100644
--- a/extra/kdegames-kolf/PKGBUILD
+++ b/extra/kdegames-kolf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202541 2013-12-22 12:48:29Z andrea $
+# $Id: PKGBUILD 205723 2014-02-10 10:59:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kolf
-pkgver=4.12.0
+pkgver=4.12.2
 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=('e3a03d50676018934affe5a4c1a9b4f82dca79fc')
+sha1sums=('d68309d15df1b7f48c61c0d0ee15e99e08a9d09c')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kollision/PKGBUILD b/extra/kdegames-kollision/PKGBUILD
index 171120580..dc7ded5d5 100644
--- a/extra/kdegames-kollision/PKGBUILD
+++ b/extra/kdegames-kollision/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202542 2013-12-22 12:48:30Z andrea $
+# $Id: PKGBUILD 205724 2014-02-10 10:59:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kollision
-pkgver=4.12.0
+pkgver=4.12.2
 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=('434928e8cf6e37e4afcb91cee78201f3f79a243e')
+sha1sums=('5a81d022704ce5e40d56c6aba577a4a23c336d4f')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-konquest/PKGBUILD b/extra/kdegames-konquest/PKGBUILD
index a911c974f..ccd06d27b 100644
--- a/extra/kdegames-konquest/PKGBUILD
+++ b/extra/kdegames-konquest/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202543 2013-12-22 12:48:32Z andrea $
+# $Id: PKGBUILD 205725 2014-02-10 10:59:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-konquest
-pkgver=4.12.0
+pkgver=4.12.2
 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=('8e4b8f4cd1463c5f10292a945f5d0af2173b0079')
+sha1sums=('efdcec0b46bfcfd8ef33146c297ec03168dd5840')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kpatience/PKGBUILD b/extra/kdegames-kpatience/PKGBUILD
index 1a18814f9..de4a92050 100644
--- a/extra/kdegames-kpatience/PKGBUILD
+++ b/extra/kdegames-kpatience/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202544 2013-12-22 12:48:33Z andrea $
+# $Id: PKGBUILD 205726 2014-02-10 10:59:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kpatience
-pkgver=4.12.0
+pkgver=4.12.2
 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=('698a82df3cd00949ba7049c6a0806320992a651d')
+sha1sums=('b64ac2574e2cddcc487958d10858aa420b16916d')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kreversi/PKGBUILD b/extra/kdegames-kreversi/PKGBUILD
index bd2a06eeb..85220b894 100644
--- a/extra/kdegames-kreversi/PKGBUILD
+++ b/extra/kdegames-kreversi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202545 2013-12-22 12:48:35Z andrea $
+# $Id: PKGBUILD 205727 2014-02-10 10:59:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kreversi
-pkgver=4.12.0
+pkgver=4.12.2
 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=('6a02522dda4d501ba4268acd14b24d9174837fb6')
+sha1sums=('79812c13b6f30aa9c7745aa9062df80ae465ec6f')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kshisen/PKGBUILD b/extra/kdegames-kshisen/PKGBUILD
index da306203f..308293170 100644
--- a/extra/kdegames-kshisen/PKGBUILD
+++ b/extra/kdegames-kshisen/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202546 2013-12-22 12:48:36Z andrea $
+# $Id: PKGBUILD 205728 2014-02-10 10:59:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kshisen
-pkgver=4.12.0
+pkgver=4.12.2
 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=('a027c93ff933ba5928fe539409b09cfcc50c9a6d')
+sha1sums=('4b6a1fcc5ed6cb4191d384c494fae8d1ce856c34')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ksirk/PKGBUILD b/extra/kdegames-ksirk/PKGBUILD
index 5d3babd0b..62882ec31 100644
--- a/extra/kdegames-ksirk/PKGBUILD
+++ b/extra/kdegames-ksirk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202547 2013-12-22 12:48:38Z andrea $
+# $Id: PKGBUILD 205729 2014-02-10 10:59:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ksirk
-pkgver=4.12.0
+pkgver=4.12.2
 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=('39fff63dca23268d83ba006bad733c1046d84beb')
+sha1sums=('2c5c17463f37913e4e47bd0d12d5f038e29c8af0')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ksnakeduel/PKGBUILD b/extra/kdegames-ksnakeduel/PKGBUILD
index 7db9b83d8..2b0a058e3 100644
--- a/extra/kdegames-ksnakeduel/PKGBUILD
+++ b/extra/kdegames-ksnakeduel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202548 2013-12-22 12:48:39Z andrea $
+# $Id: PKGBUILD 205730 2014-02-10 10:59:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ksnakeduel
-pkgver=4.12.0
+pkgver=4.12.2
 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=('dc0113638ea1eff7df3a8562431bcdc630ab896a')
+sha1sums=('543b02657da4eb236692ca698d37fca50681dff3')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kspaceduel/PKGBUILD b/extra/kdegames-kspaceduel/PKGBUILD
index 06f467932..fc92ba08b 100644
--- a/extra/kdegames-kspaceduel/PKGBUILD
+++ b/extra/kdegames-kspaceduel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202549 2013-12-22 12:48:41Z andrea $
+# $Id: PKGBUILD 205731 2014-02-10 10:59:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kspaceduel
-pkgver=4.12.0
+pkgver=4.12.2
 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=('6b633e9e75119385b4aae8527645b6c3579f0af1')
+sha1sums=('31782c9dcaf74fb3f07d8b3eb7a35e798b10118a')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ksquares/PKGBUILD b/extra/kdegames-ksquares/PKGBUILD
index 38645f952..b20e5b850 100644
--- a/extra/kdegames-ksquares/PKGBUILD
+++ b/extra/kdegames-ksquares/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202550 2013-12-22 12:48:43Z andrea $
+# $Id: PKGBUILD 205732 2014-02-10 10:59:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ksquares
-pkgver=4.12.0
+pkgver=4.12.2
 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=('78ae226c767459b36ec69d806b2562e9341b94d4')
+sha1sums=('14cb0df908295da81ab7f1bfb729cc1125a2ba21')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ksudoku/PKGBUILD b/extra/kdegames-ksudoku/PKGBUILD
index 510afff4f..5bb602cf8 100644
--- a/extra/kdegames-ksudoku/PKGBUILD
+++ b/extra/kdegames-ksudoku/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 202551 2013-12-22 12:48:44Z andrea $
+# $Id: PKGBUILD 205733 2014-02-10 10:59:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ksudoku
-pkgver=4.12.0
+pkgver=4.12.2
 pkgrel=1
 pkgdesc="A logic-based symbol placement puzzle"
 url="http://kde.org/applications/games/ksudoku/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
+depends=('kdebase-runtime' 'libkdegames' 'glu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksudoku-${pkgver}.tar.xz")
-sha1sums=('a0e015d8377a450c7e309395c08568d484373fae')
+sha1sums=('6f6b8470c93c4b6aeb7783e71e0d88db3f44ceef')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../ksudoku-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/kdegames-ktuberling/PKGBUILD b/extra/kdegames-ktuberling/PKGBUILD
index d4e124ac5..d4c874e51 100644
--- a/extra/kdegames-ktuberling/PKGBUILD
+++ b/extra/kdegames-ktuberling/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202552 2013-12-22 12:48:46Z andrea $
+# $Id: PKGBUILD 205734 2014-02-10 10:59:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ktuberling
-pkgver=4.12.0
+pkgver=4.12.2
 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=('b3613320dc296bca59caab64d2c92fa1dcbbf589')
+sha1sums=('7bf93196f39c137862c68ff5f7eba217812c7b11')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kubrick/PKGBUILD b/extra/kdegames-kubrick/PKGBUILD
index 1a72eabe6..e7b168975 100644
--- a/extra/kdegames-kubrick/PKGBUILD
+++ b/extra/kdegames-kubrick/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 202553 2013-12-22 12:48:47Z andrea $
+# $Id: PKGBUILD 205735 2014-02-10 10:59:12Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kubrick
-pkgver=4.12.0
+pkgver=4.12.2
 pkgrel=1
 pkgdesc="Based on the famous Rubik's Cube"
 url="http://kde.org/applications/games/kubrick/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
+depends=('kdebase-runtime' 'libkdegames' 'glu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kubrick-${pkgver}.tar.xz")
-sha1sums=('87d888772bfc7f73cdef5a4b1644de9ba7babd38')
+sha1sums=('55aad2067e1944a35646df4d28bb655054e6f278')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../kubrick-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/kdegames-lskat/PKGBUILD b/extra/kdegames-lskat/PKGBUILD
index abd1df5cb..428a8e456 100644
--- a/extra/kdegames-lskat/PKGBUILD
+++ b/extra/kdegames-lskat/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202554 2013-12-22 12:48:48Z andrea $
+# $Id: PKGBUILD 205736 2014-02-10 10:59:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-lskat
-pkgver=4.12.0
+pkgver=4.12.2
 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=('bd66a6506caa9418b653a6d675a28073d31c41d4')
+sha1sums=('06afa12fe92dbc54b2eed8f9d8c966788f5c26f9')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-palapeli/PKGBUILD b/extra/kdegames-palapeli/PKGBUILD
index 2b72ee3a5..926234175 100644
--- a/extra/kdegames-palapeli/PKGBUILD
+++ b/extra/kdegames-palapeli/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202555 2013-12-22 12:48:51Z andrea $
+# $Id: PKGBUILD 205737 2014-02-10 10:59:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-palapeli
-pkgver=4.12.0
+pkgver=4.12.2
 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=('3c8b1eb087116316422a5c95798d1d7ad150254a')
+sha1sums=('76b3cad92e248246799362206a205bce582baecd')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-picmi/PKGBUILD b/extra/kdegames-picmi/PKGBUILD
index 32426f32f..5526c6c44 100644
--- a/extra/kdegames-picmi/PKGBUILD
+++ b/extra/kdegames-picmi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202556 2013-12-22 12:48:52Z andrea $
+# $Id: PKGBUILD 205738 2014-02-10 10:59:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-picmi
-pkgver=4.12.0
+pkgver=4.12.2
 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=('f7b3fa5e44b117ae44d173c14763896692e589d0')
+sha1sums=('02efcee2631d9aea5451ed6364cd5a09e7d28b2d')
 
 build() {
   mkdir build
diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD
index 958c8cd4c..bb842d5df 100644
--- a/extra/kdegraphics-gwenview/PKGBUILD
+++ b/extra/kdegraphics-gwenview/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202557 2013-12-22 12:48:54Z andrea $
+# $Id: PKGBUILD 205739 2014-02-10 10:59:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-gwenview
-pkgver=4.12.0
+pkgver=4.12.2
 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=('f801c71dd94f77caacfc812b7bcadf6023e2a58b')
+sha1sums=('37cbe9c62ca3bdc7dc4cf4558d90055493449012')
 
 build() {
   mkdir build
diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD
index b5753788a..a6bcddd6d 100644
--- a/extra/kdegraphics-kamera/PKGBUILD
+++ b/extra/kdegraphics-kamera/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202558 2013-12-22 12:48:56Z andrea $
+# $Id: PKGBUILD 205740 2014-02-10 10:59:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kamera
-pkgver=4.12.0
+pkgver=4.12.2
 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=('4edc3add701c68a0327dcad772e69f2e23d697cf')
+sha1sums=('e23203a5538310cd0e69e808d2f00d278903bdf7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD
index 1e0e01e30..c9c56ec47 100644
--- a/extra/kdegraphics-kcolorchooser/PKGBUILD
+++ b/extra/kdegraphics-kcolorchooser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202559 2013-12-22 12:48:57Z andrea $
+# $Id: PKGBUILD 205741 2014-02-10 10:59:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kcolorchooser
-pkgver=4.12.0
+pkgver=4.12.2
 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=('46121f527af58b08738ce20623c1b25d00bf20e2')
+sha1sums=('979f2427e7276b368ebab4ce84128bda2452573e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD
index d4f79cc64..3e91df2a8 100644
--- a/extra/kdegraphics-kgamma/PKGBUILD
+++ b/extra/kdegraphics-kgamma/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202560 2013-12-22 12:48:59Z andrea $
+# $Id: PKGBUILD 205742 2014-02-10 10:59:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kgamma
-pkgver=4.12.0
+pkgver=4.12.2
 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=('b0ebd6963b4438069b0a016bf122207c00ac7da9')
+sha1sums=('57914ff7c60a5b3ddffbde40b5d4ff53a9d6f665')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD
index 1efb3bb1b..498abeb03 100644
--- a/extra/kdegraphics-kolourpaint/PKGBUILD
+++ b/extra/kdegraphics-kolourpaint/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202561 2013-12-22 12:49:01Z andrea $
+# $Id: PKGBUILD 205743 2014-02-10 10:59:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kolourpaint
-pkgver=4.12.0
+pkgver=4.12.2
 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=('2bb9eb48b8dffe689c17d95ecb7e51d01ffc6cdc')
+sha1sums=('2632b37ad546952a1d9c355035566be3674ff5f3')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD
index df8db32ea..0309223a3 100644
--- a/extra/kdegraphics-kruler/PKGBUILD
+++ b/extra/kdegraphics-kruler/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202562 2013-12-22 12:49:02Z andrea $
+# $Id: PKGBUILD 205744 2014-02-10 10:59:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kruler
-pkgver=4.12.0
+pkgver=4.12.2
 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=('1c3de59f559c8621f667351a9b66f4de00e7731c')
+sha1sums=('01748d1b9680b28f9e04afb85aadbaf77856d558')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD
index cb5dc127e..2a31394c7 100644
--- a/extra/kdegraphics-ksaneplugin/PKGBUILD
+++ b/extra/kdegraphics-ksaneplugin/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202563 2013-12-22 12:49:04Z andrea $
+# $Id: PKGBUILD 205745 2014-02-10 10:59:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksaneplugin
-pkgver=4.12.0
+pkgver=4.12.2
 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=('e04f67e75a2cd0e98a097674cdc1b93b17f8d77c')
+sha1sums=('7be8f97d1f0acbb5d58af94debd83c362225cf06')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD
index 703d1d2db..43ee158cc 100644
--- a/extra/kdegraphics-ksnapshot/PKGBUILD
+++ b/extra/kdegraphics-ksnapshot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202564 2013-12-22 12:49:05Z andrea $
+# $Id: PKGBUILD 205746 2014-02-10 10:59:23Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksnapshot
-pkgver=4.12.0
+pkgver=4.12.2
 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=('20ced4e4fe02f8af84c61b7ff915e8baadce4639')
+sha1sums=('1f7b511603667b71a463d1e6136ab7a0a7b53e04')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD
index 3edf367e3..60ac46392 100644
--- a/extra/kdegraphics-mobipocket/PKGBUILD
+++ b/extra/kdegraphics-mobipocket/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202453 2013-12-22 12:46:33Z andrea $
+# $Id: PKGBUILD 205636 2014-02-10 10:57:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-mobipocket
-pkgver=4.12.0
+pkgver=4.12.2
 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=('60fc877f9669d50ca77513b1de73b54140f6eddf')
+sha1sums=('3cdcc15fa949cb33cdf5da292d5dad66f5d002bd')
 
 prepare() {
   mkdir build
diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD
index 8fb927e60..3e382b7af 100644
--- a/extra/kdegraphics-okular/PKGBUILD
+++ b/extra/kdegraphics-okular/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202463 2013-12-22 12:46:45Z andrea $
+# $Id: PKGBUILD 205646 2014-02-10 10:57:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-okular
-pkgver=4.12.0
+pkgver=4.12.2
 pkgrel=1
 pkgdesc='Document Viewer'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('kdebase-runtime' 'qimageblitz' 'chmlib' 'djvulibre' 'libspectre'
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz")
-sha1sums=('1fde4dd5e271e541f0f4db525c2597c895f407d5')
+sha1sums=('02f8276f0f7d5d3425d1204fded7ee3cec8637e6')
 
 prepare() {
   mkdir build
diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD
index 75ba60fef..ec62f8323 100644
--- a/extra/kdegraphics-strigi-analyzer/PKGBUILD
+++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202565 2013-12-22 12:49:07Z andrea $
+# $Id: PKGBUILD 205747 2014-02-10 10:59:23Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-strigi-analyzer
-pkgver=4.12.0
+pkgver=4.12.2
 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=('bb7fbcc4e644baee5fa298cd3b0cc11d267da80d')
+sha1sums=('81302d4f26781c76c161903cad1fc29d12d877ac')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD
index 346b0f632..7f7efb5d7 100644
--- a/extra/kdegraphics-svgpart/PKGBUILD
+++ b/extra/kdegraphics-svgpart/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202566 2013-12-22 12:49:08Z andrea $
+# $Id: PKGBUILD 205748 2014-02-10 10:59:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-svgpart
-pkgver=4.12.0
+pkgver=4.12.2
 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=('dd58aade7943c99904e753934986fdd901f960ff')
+sha1sums=('5123c11dcb37e7d5b9102873aab7a4f5c3f665a4')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD
index 516d7d3d3..a13a3cca9 100644
--- a/extra/kdegraphics-thumbnailers/PKGBUILD
+++ b/extra/kdegraphics-thumbnailers/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202567 2013-12-22 12:49:10Z andrea $
+# $Id: PKGBUILD 205749 2014-02-10 10:59:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-thumbnailers
-pkgver=4.12.0
+pkgver=4.12.2
 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=('2a9f551c2271298ee16f8e12f9d18c84bceb9c09')
+sha1sums=('f293b18cf66257a7ad98550037145e412239c595')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD
index 774bf8b3b..b73239227 100644
--- a/extra/kdemultimedia-audiocd-kio/PKGBUILD
+++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202568 2013-12-22 12:49:11Z andrea $
+# $Id: PKGBUILD 205750 2014-02-10 10:59:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-audiocd-kio
-pkgver=4.12.0
+pkgver=4.12.2
 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=('f9218418414099b9ca30adba95f9032aa86dafc6')
+sha1sums=('d468244beaf03afec20d970e83077e1e75d1d80a')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD
index f26673c3c..ce87339eb 100644
--- a/extra/kdemultimedia-dragonplayer/PKGBUILD
+++ b/extra/kdemultimedia-dragonplayer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202569 2013-12-22 12:49:13Z andrea $
+# $Id: PKGBUILD 205751 2014-02-10 10:59:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-dragonplayer
-pkgver=4.12.0
+pkgver=4.12.2
 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=('22370adaedb5d689ccc1e36430936c5c2bad17db')
+sha1sums=('0aa7d4ccd410b7a7dbc9a3b38614907d8612f185')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
index 6958a80e5..8127d5cc2 100644
--- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
+++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202570 2013-12-22 12:49:14Z andrea $
+# $Id: PKGBUILD 205752 2014-02-10 10:59:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-ffmpegthumbs
-pkgver=4.12.0
+pkgver=4.12.2
 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=('6546cf5cbaf3cb38cc79aa6dbc0f8187499cac55')
+sha1sums=('07ea21df05c8b6990c7d47a44f832c4347d646a8')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD
index 747c69849..40f017a56 100644
--- a/extra/kdemultimedia-juk/PKGBUILD
+++ b/extra/kdemultimedia-juk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202571 2013-12-22 12:49:16Z andrea $
+# $Id: PKGBUILD 205753 2014-02-10 10:59:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-juk
-pkgver=4.12.0
+pkgver=4.12.2
 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=('ea658f5e757baf850f7b3690da77d5754fe386ec')
+sha1sums=('caa11832ce56de0f8a4b32d4005623cd24b834ea')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD
index a44cb9ee5..f738d6759 100644
--- a/extra/kdemultimedia-kmix/PKGBUILD
+++ b/extra/kdemultimedia-kmix/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202572 2013-12-22 12:49:21Z andrea $
+# $Id: PKGBUILD 205754 2014-02-10 10:59:29Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-kmix
-pkgver=4.12.0
+pkgver=4.12.2
 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=('839d23f2f76e79eb20bde46472774a8c678221c9')
+sha1sums=('193701b2b1a2ce2119023632989efd8940c056cd')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD
index 5ba5ce2bc..f9123ffc9 100644
--- a/extra/kdemultimedia-kscd/PKGBUILD
+++ b/extra/kdemultimedia-kscd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202573 2013-12-22 12:49:23Z andrea $
+# $Id: PKGBUILD 205755 2014-02-10 10:59:30Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-kscd
-pkgver=4.12.0
+pkgver=4.12.2
 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=('d43ee9e8fb00f368575c2f0e62f5efaa539b876e')
+sha1sums=('cb39129388a278a57681b6b026542aa2c77dac66')
 
 build() {
   mkdir build
diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD
index bf2b6b887..e3c6361c3 100644
--- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD
+++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202574 2013-12-22 12:49:24Z andrea $
+# $Id: PKGBUILD 205756 2014-02-10 10:59:30Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-mplayerthumbs
-pkgver=4.12.0
+pkgver=4.12.2
 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=('1cc91d50e1747a640f951d13c2577d33679efaa2')
+sha1sums=('0c222a4ec73262bf7856f4bbf22d47c5af94cef5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdenetwork-filesharing/PKGBUILD b/extra/kdenetwork-filesharing/PKGBUILD
index dfbad589f..b7ad8815f 100644
--- a/extra/kdenetwork-filesharing/PKGBUILD
+++ b/extra/kdenetwork-filesharing/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202575 2013-12-22 12:49:25Z andrea $
+# $Id: PKGBUILD 205757 2014-02-10 10:59:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-filesharing
-pkgver=4.12.0
+pkgver=4.12.2
 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=('6ef2be648f6b4f64f9ff0542d9dceb79f4a9881f')
+sha1sums=('1156b71407bf019f717dc7e8bcfd149e5dc3ced2')
 
 build() {
   mkdir build
diff --git a/extra/kdenetwork-kdnssd/PKGBUILD b/extra/kdenetwork-kdnssd/PKGBUILD
index bc97ce2c6..637b0e9f7 100644
--- a/extra/kdenetwork-kdnssd/PKGBUILD
+++ b/extra/kdenetwork-kdnssd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202576 2013-12-22 12:49:27Z andrea $
+# $Id: PKGBUILD 205758 2014-02-10 10:59:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-kdnssd
-pkgver=4.12.0
+pkgver=4.12.2
 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=('4ebd5320344b02726652552536f28c468f9049ee')
+sha1sums=('de27886bcbc7b285077b1a2480d675ebe910c82f')
 
 build() {
   mkdir build
diff --git a/extra/kdenetwork-kget/PKGBUILD b/extra/kdenetwork-kget/PKGBUILD
index 5f5038376..465882824 100644
--- a/extra/kdenetwork-kget/PKGBUILD
+++ b/extra/kdenetwork-kget/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202577 2013-12-22 12:49:28Z andrea $
+# $Id: PKGBUILD 205759 2014-02-10 10:59:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-kget
-pkgver=4.12.0
+pkgver=4.12.2
 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=('5d327b26c68f0aaa7a088992de10136b1786aba9')
+sha1sums=('c2259ea7b2bac870564f01b1599080621407918f')
 
 build() {
   mkdir build
diff --git a/extra/kdenetwork-kppp/PKGBUILD b/extra/kdenetwork-kppp/PKGBUILD
index e3b9426a0..1fa1888e0 100644
--- a/extra/kdenetwork-kppp/PKGBUILD
+++ b/extra/kdenetwork-kppp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202579 2013-12-22 12:49:31Z andrea $
+# $Id: PKGBUILD 205761 2014-02-10 10:59:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-kppp
-pkgver=4.12.0
+pkgver=4.12.2
 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=('6c8059159d38517311a532e97e33b7cdf7d714e5')
+sha1sums=('789eab4a389db2c08adce672dc44bee3ad317c30')
 
 build() {
   mkdir build
diff --git a/extra/kdenetwork-krdc/PKGBUILD b/extra/kdenetwork-krdc/PKGBUILD
index 484ee097a..e968e8d53 100644
--- a/extra/kdenetwork-krdc/PKGBUILD
+++ b/extra/kdenetwork-krdc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202580 2013-12-22 12:49:33Z andrea $
+# $Id: PKGBUILD 205762 2014-02-10 10:59:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-krdc
-pkgver=4.12.0
+pkgver=4.12.2
 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=('0f26191ada1fcbc2f785cd6f5d95df05dd1d37dd')
+sha1sums=('663973267ecdd6afcfec55120c45418c1cc44b14')
 
 build() {
   mkdir build
diff --git a/extra/kdenetwork-krfb/PKGBUILD b/extra/kdenetwork-krfb/PKGBUILD
index 807bc44ce..24a968a80 100644
--- a/extra/kdenetwork-krfb/PKGBUILD
+++ b/extra/kdenetwork-krfb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202581 2013-12-22 12:49:34Z andrea $
+# $Id: PKGBUILD 205763 2014-02-10 10:59:36Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-krfb
-pkgver=4.12.0
+pkgver=4.12.2
 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=('b58f92ba9f1b98c5623bb4a0bc14ed9838f8280a')
+sha1sums=('7bb407437d3718d4b9b66611db21861153cdaeb9')
 
 build() {
   mkdir build
diff --git a/extra/kdenetwork-strigi-analyzers/PKGBUILD b/extra/kdenetwork-strigi-analyzers/PKGBUILD
index c604a396f..32d8b19e3 100644
--- a/extra/kdenetwork-strigi-analyzers/PKGBUILD
+++ b/extra/kdenetwork-strigi-analyzers/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202582 2013-12-22 12:49:35Z andrea $
+# $Id: PKGBUILD 205764 2014-02-10 10:59:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-strigi-analyzers
-pkgver=4.12.0
+pkgver=4.12.2
 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=('f3c0b07765236d18a01865986cca134fce68a1d5')
+sha1sums=('79027bc1f15e1050e6e284aa0220ff92680cacc6')
 
 build() {
   mkdir build
diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD
index f18ca1d45..41965278c 100644
--- a/extra/kdepim-runtime/PKGBUILD
+++ b/extra/kdepim-runtime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 202459 2013-12-22 12:46:39Z andrea $
+# $Id: PKGBUILD 205642 2014-02-10 10:57:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepim-runtime
-pkgver=4.12.0
+pkgver=4.12.2
 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=('fe988ea74cf83f1dae99f81bc02eefaa834c664c')
+sha1sums=('9ec15431754f8ea49f764cafa5bb87eda5fef5b6')
 
 prepare() {
   mkdir build
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index a1bfa5849..a9cdd034f 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202583 2013-12-22 12:49:38Z andrea $
+# $Id: PKGBUILD 205765 2014-02-10 10:59:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -20,16 +20,16 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-ktimetracker'
          'kdepim-ktnef'
          'kdepim-libkdepim')
-pkgver=4.12.0
+pkgver=4.12.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdepim')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
-             'kde-agent' 'nepomuk-widgets' 'link-grammar')
+             'nepomuk-widgets' 'link-grammar')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('1ca184dc89f8c8395ffe4ec62a3fdcd0a7397ac4')
+sha1sums=('c1e5f3284ab23233632ae27edb85f80588bb7e86')
 
 build() {
 	mkdir build
@@ -128,7 +128,7 @@ package_kdepim-kleopatra() {
 
 package_kdepim-kmail() {
 	pkgdesc='Mail Client'
-	depends=('kdepim-libkdepim')
+	depends=('kdepim-libkdepim' 'kde-agent')
 	url="http://kde.org/applications/internet/kmail/"
 	install='kdepim-kmail.install'
 	conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
@@ -219,7 +219,7 @@ package_kdepim-ktnef() {
 package_kdepim-libkdepim() {
 	pkgdesc='Library for KDE PIM'
 	groups=()
-	depends=('kde-agent' 'kdepim-runtime' 'link-grammar')
+	depends=('kdepim-runtime' 'link-grammar')
 	url='http://pim.kde.org'
 	conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
 	           'kdepim-akonadi')
diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD
index d89202b7c..106e1e4ed 100644
--- a/extra/kdepimlibs/PKGBUILD
+++ b/extra/kdepimlibs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 202455 2013-12-22 12:46:35Z andrea $
+# $Id: PKGBUILD 205638 2014-02-10 10:57:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepimlibs
-pkgver=4.12.0
+pkgver=4.12.2
 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=('60b7bea192c5914daf0a5258ac61b781aa257a4a')
+sha1sums=('43eba35906e51ec5d75874c184c57cfa994c2eaf')
 
 build() {
   mkdir build
diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD
index fccc1bf4e..92e030af8 100644
--- a/extra/kdeplasma-addons/PKGBUILD
+++ b/extra/kdeplasma-addons/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202584 2013-12-22 12:49:41Z andrea $
+# $Id: PKGBUILD 205766 2014-02-10 10:59:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -77,16 +77,16 @@ pkgname=('kdeplasma-addons-applets-bball'
          'kdeplasma-addons-wallpapers-qmlwallpapers'
          'kdeplasma-addons-wallpapers-virus'
          'kdeplasma-addons-wallpapers-weather')
-pkgver=4.12.0
+pkgver=4.12.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdeplasma-addons'
 license=('GPL' 'LGPL')
 groups=('kde' 'kdeplasma-addons')
-makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen'
-             'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'mesa')
+makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen2'
+             'scim' 'qwt' 'boost' 'libkexiv2' 'libibus' 'qoauth' 'mesa')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('0e0df64b06c77285a0119832cadd548b6b223ff1')
+sha1sums=('54c27e3e693f66d0dd51a96510692fa97cbca3a8')
 
 prepare() {
   mkdir build
diff --git a/extra/kdesdk-cervisia/PKGBUILD b/extra/kdesdk-cervisia/PKGBUILD
index 2f347e69f..fff2cdb0b 100644
--- a/extra/kdesdk-cervisia/PKGBUILD
+++ b/extra/kdesdk-cervisia/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202585 2013-12-22 12:49:43Z andrea $
+# $Id: PKGBUILD 205767 2014-02-10 10:59:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-cervisia
-pkgver=4.12.0
+pkgver=4.12.2
 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=('c4609985634c38d1533a68d3f905c785ff780942')
+sha1sums=('f42b4e032bd469a678a0f9de0be2737df865b798')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-dev-scripts/PKGBUILD b/extra/kdesdk-dev-scripts/PKGBUILD
index b6715b259..25ee72201 100644
--- a/extra/kdesdk-dev-scripts/PKGBUILD
+++ b/extra/kdesdk-dev-scripts/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202587 2013-12-22 12:49:47Z andrea $
+# $Id: PKGBUILD 205769 2014-02-10 10:59:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-dev-scripts
-pkgver=4.12.0
+pkgver=4.12.2
 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=('e5c677542c7cfa206a2723c7c68a8c71c3e9ea5d')
+sha1sums=('1b48cd806bb69054f265f84875d5476d92c26c04')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-dev-utils/PKGBUILD b/extra/kdesdk-dev-utils/PKGBUILD
index 441bb5285..735f6c7cd 100644
--- a/extra/kdesdk-dev-utils/PKGBUILD
+++ b/extra/kdesdk-dev-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202586 2013-12-22 12:49:44Z andrea $
+# $Id: PKGBUILD 205768 2014-02-10 10:59:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-dev-utils
-pkgver=4.12.0
+pkgver=4.12.2
 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=('08a45595bae38d7d1833eb035c0a753421e4604c')
+sha1sums=('fbdf3b46b8789f16669bcb1f02695bfb33121354')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-dolphin-plugins/PKGBUILD b/extra/kdesdk-dolphin-plugins/PKGBUILD
index cfe0f2a6b..b9c9d75c1 100644
--- a/extra/kdesdk-dolphin-plugins/PKGBUILD
+++ b/extra/kdesdk-dolphin-plugins/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202588 2013-12-22 12:49:50Z andrea $
+# $Id: PKGBUILD 205770 2014-02-10 10:59:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-dolphin-plugins
-pkgver=4.12.0
+pkgver=4.12.2
 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=('281fcd97e1abbcd54eca76d83b1ce760ff472c2e')
+sha1sums=('3c5c10fbc6fca74eea10c90e167fee267759c072')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-kapptemplate/PKGBUILD b/extra/kdesdk-kapptemplate/PKGBUILD
index ab8d87515..8b398e6b0 100644
--- a/extra/kdesdk-kapptemplate/PKGBUILD
+++ b/extra/kdesdk-kapptemplate/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202589 2013-12-22 12:49:51Z andrea $
+# $Id: PKGBUILD 205771 2014-02-10 10:59:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-kapptemplate
-pkgver=4.12.0
+pkgver=4.12.2
 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=('4034a10ec3a4f55e1c43a12b1610804d664088e1')
+sha1sums=('f9cc02ac15772ef12b911b71d86872d3cbc7572a')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD
index 3293a046d..4e23493da 100644
--- a/extra/kdesdk-kate/PKGBUILD
+++ b/extra/kdesdk-kate/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 202465 2013-12-22 12:46:47Z andrea $
+# $Id: PKGBUILD 205648 2014-02-10 10:57:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdesdk-kate
 pkgname=('kdebase-katepart'
          'kdebase-kwrite'
          'kdesdk-kate')
-pkgver=4.12.0
+pkgver=4.12.2
 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=('67b4ae3b3bc6959d29b03eeb43b58be772831e95'
+sha1sums=('f849855e41dca9ec9f8a95e0c7be5a79f8853c52'
           '80c324c9db81c07a02374e7a092d75e0bdd6b4ea')
 
 prepare() {
diff --git a/extra/kdesdk-kcachegrind/PKGBUILD b/extra/kdesdk-kcachegrind/PKGBUILD
index 6437f6a48..5d89e3f6d 100644
--- a/extra/kdesdk-kcachegrind/PKGBUILD
+++ b/extra/kdesdk-kcachegrind/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202590 2013-12-22 12:49:53Z andrea $
+# $Id: PKGBUILD 205772 2014-02-10 10:59:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-kcachegrind
-pkgver=4.12.0
+pkgver=4.12.2
 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=('8d1cdbceeca886c1a31af9fc3405b1d86917ed82')
+sha1sums=('d5bd15a5b23085b6fa9f5996dcdbd2844fdb59c1')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-kioslaves/PKGBUILD b/extra/kdesdk-kioslaves/PKGBUILD
index 2aac3df27..71a247cb3 100644
--- a/extra/kdesdk-kioslaves/PKGBUILD
+++ b/extra/kdesdk-kioslaves/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202591 2013-12-22 12:49:54Z andrea $
+# $Id: PKGBUILD 205773 2014-02-10 10:59:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-kioslaves
-pkgver=4.12.0
+pkgver=4.12.2
 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=('a7c04650a37c28a8ccf316500918f0cef8f6164c')
+sha1sums=('25c2a6485ee64c817585a9941794fad369400eeb')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-kompare/PKGBUILD b/extra/kdesdk-kompare/PKGBUILD
index 622c82c16..23583580b 100644
--- a/extra/kdesdk-kompare/PKGBUILD
+++ b/extra/kdesdk-kompare/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202592 2013-12-22 12:49:56Z andrea $
+# $Id: PKGBUILD 205774 2014-02-10 10:59:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-kompare
-pkgver=4.12.0
+pkgver=4.12.2
 pkgrel=1
 pkgdesc='Diff/Patch Frontend'
 url='http://kde.org/applications/development/kompare/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkomparediff2')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kompare-${pkgver}.tar.xz")
-sha1sums=('957723c68c9206d98d0c6dd3f42b4cf8feb88288')
+sha1sums=('cf1169f471849d4a84a1bb48a41766410837f332')
 
 prepare() {
   mkdir build
diff --git a/extra/kdesdk-lokalize/PKGBUILD b/extra/kdesdk-lokalize/PKGBUILD
index a3d36497f..6e5cb1219 100644
--- a/extra/kdesdk-lokalize/PKGBUILD
+++ b/extra/kdesdk-lokalize/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202593 2013-12-22 12:49:58Z andrea $
+# $Id: PKGBUILD 205775 2014-02-10 10:59:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-lokalize
-pkgver=4.12.0
+pkgver=4.12.2
 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=('bfe6363dae420e2b6ce82c201b45a0e337199bc4'
+sha1sums=('c89c92a74edb99e42329a8a4ef28d7dbfa6d4ca1'
           '07db42bbcae402c292eebf002e549b04162621c5')
 
 prepare() {
diff --git a/extra/kdesdk-okteta/PKGBUILD b/extra/kdesdk-okteta/PKGBUILD
index ea5b5e86e..3867a1b8c 100644
--- a/extra/kdesdk-okteta/PKGBUILD
+++ b/extra/kdesdk-okteta/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202594 2013-12-22 12:49:59Z andrea $
+# $Id: PKGBUILD 205776 2014-02-10 10:59:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-okteta
-pkgver=4.12.0
+pkgver=4.12.2
 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=('230e9715de29b16ff3aa542c5557021702cfe6dc')
+sha1sums=('589ed30a4e0bef6eb6fce8f53a0884d5aa762f4e')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-poxml/PKGBUILD b/extra/kdesdk-poxml/PKGBUILD
index 5cb62a12c..084842073 100644
--- a/extra/kdesdk-poxml/PKGBUILD
+++ b/extra/kdesdk-poxml/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202595 2013-12-22 12:50:00Z andrea $
+# $Id: PKGBUILD 205777 2014-02-10 10:59:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-poxml
-pkgver=4.12.0
+pkgver=4.12.2
 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=('30d8d0f06a47965f336fd5428326a1c92fcaa7be')
+sha1sums=('f0ec74385cf1716e9239aeeec6ecf7b17e21e77a')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-strigi-analyzers/PKGBUILD b/extra/kdesdk-strigi-analyzers/PKGBUILD
index 5a8891763..efee7facc 100644
--- a/extra/kdesdk-strigi-analyzers/PKGBUILD
+++ b/extra/kdesdk-strigi-analyzers/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202596 2013-12-22 12:50:05Z andrea $
+# $Id: PKGBUILD 205778 2014-02-10 10:59:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-strigi-analyzers
-pkgver=4.12.0
+pkgver=4.12.2
 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=('efe05955070149c54c65621327196c94d1c82e41')
+sha1sums=('8c952a9004053984c19c83c6c6c139e6167c66da')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-thumbnailers/PKGBUILD b/extra/kdesdk-thumbnailers/PKGBUILD
index 611fa2d8e..5d39f96b9 100644
--- a/extra/kdesdk-thumbnailers/PKGBUILD
+++ b/extra/kdesdk-thumbnailers/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202597 2013-12-22 12:50:07Z andrea $
+# $Id: PKGBUILD 205779 2014-02-10 10:59:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-thumbnailers
-pkgver=4.12.0
+pkgver=4.12.2
 pkgrel=1
 pkgdesc='Plugins for the thumbnailing system'
 url='https://projects.kde.org/projects/kde/kdesdk/kdesdk-thumbnailers'
@@ -12,7 +12,7 @@ groups=('kde' 'kdesdk')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kdesdk-thumbnailers-${pkgver}.tar.xz")
-sha1sums=('094dbd49b3565b9bee38f9d4390740b2b8d8df34')
+sha1sums=('6870981bf5bbfdc35aa1ef8d0bcaace0941838a3')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-umbrello/PKGBUILD b/extra/kdesdk-umbrello/PKGBUILD
index 007e73234..e1b6f3a77 100644
--- a/extra/kdesdk-umbrello/PKGBUILD
+++ b/extra/kdesdk-umbrello/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202598 2013-12-22 12:50:08Z andrea $
+# $Id: PKGBUILD 205780 2014-02-10 10:59:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-umbrello
-pkgver=4.12.0
+pkgver=4.12.2
 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=('307f2da8ea0a69e045c1013c20e0ffeb1690ad56')
+sha1sums=('0a2b39226a3c9388257019e213a57009d8f6e7f8')
 
 build() {
   mkdir build
diff --git a/extra/kdetoys-amor/PKGBUILD b/extra/kdetoys-amor/PKGBUILD
index 19e9e2af0..96fecf3b7 100644
--- a/extra/kdetoys-amor/PKGBUILD
+++ b/extra/kdetoys-amor/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202599 2013-12-22 12:50:09Z andrea $
+# $Id: PKGBUILD 205781 2014-02-10 10:59:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdetoys-amor
-pkgver=4.12.0
+pkgver=4.12.2
 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=('2cf0e4e8cfe069913c39e17aa59b2a6d013d0ad1')
+sha1sums=('a59954fc896fae35e08cf52bb3a3495ff35e44a5')
 
 build() {
   mkdir build
diff --git a/extra/kdetoys-kteatime/PKGBUILD b/extra/kdetoys-kteatime/PKGBUILD
index 22ea04670..21ba81918 100644
--- a/extra/kdetoys-kteatime/PKGBUILD
+++ b/extra/kdetoys-kteatime/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202600 2013-12-22 12:50:11Z andrea $
+# $Id: PKGBUILD 205782 2014-02-10 10:59:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdetoys-kteatime
-pkgver=4.12.0
+pkgver=4.12.2
 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=('fba17a0e97ab31094b714811f74dbccfc3f70841')
+sha1sums=('703caf28cf5d724de18fc576fa406caf1175549b')
 
 build() {
   mkdir build
diff --git a/extra/kdetoys-ktux/PKGBUILD b/extra/kdetoys-ktux/PKGBUILD
index 631148bf1..76ae7a33b 100644
--- a/extra/kdetoys-ktux/PKGBUILD
+++ b/extra/kdetoys-ktux/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202601 2013-12-22 12:50:12Z andrea $
+# $Id: PKGBUILD 205783 2014-02-10 10:59:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdetoys-ktux
-pkgver=4.12.0
+pkgver=4.12.2
 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=('acf49c182581c342abacedccabfe2daceec914e1')
+sha1sums=('2e569ee53f004a925e8119eeea56008ee5cd4474')
 
 build() {
   mkdir build
diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD
index ece96fd37..f51b297d0 100644
--- a/extra/kdeutils-filelight/PKGBUILD
+++ b/extra/kdeutils-filelight/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202603 2013-12-22 12:50:14Z andrea $
+# $Id: PKGBUILD 205785 2014-02-10 10:59:59Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-filelight
-pkgver=4.12.0
+pkgver=4.12.2
 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=('5cec6ddbb501ee39be62b624c74258f6a8c8718a')
+sha1sums=('a42f6f3d3770958061bed16c12e511f4684bfc2c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD
index 644c3e67b..06050b674 100644
--- a/extra/kdeutils-kcalc/PKGBUILD
+++ b/extra/kdeutils-kcalc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202604 2013-12-22 12:50:16Z andrea $
+# $Id: PKGBUILD 205786 2014-02-10 11:00:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kcalc
-pkgver=4.12.0
+pkgver=4.12.2
 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=('a783b12395016d9cdec87e442a7591e7d61c3c6d')
+sha1sums=('8255bbca7168ece19c2277abbb443e7ef501f1fb')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD
index ca02300d6..525f89769 100644
--- a/extra/kdeutils-kcharselect/PKGBUILD
+++ b/extra/kdeutils-kcharselect/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202605 2013-12-22 12:50:18Z andrea $
+# $Id: PKGBUILD 205787 2014-02-10 11:00:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kcharselect
-pkgver=4.12.0
+pkgver=4.12.2
 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=('f862a8d0299355146411f3f79943c6690a62c347')
+sha1sums=('c0ebe5ebe68afbd26d08a46d0afc02d46273f48c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD
index 563b68878..53a5a4ecc 100644
--- a/extra/kdeutils-kdf/PKGBUILD
+++ b/extra/kdeutils-kdf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202606 2013-12-22 12:50:19Z andrea $
+# $Id: PKGBUILD 205788 2014-02-10 11:00:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kdf
-pkgver=4.12.0
+pkgver=4.12.2
 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=('2d56949fb0bc889403e3460d097e056bbce6ffd9')
+sha1sums=('5679c7a26d71224e501ff65c757ccc2941dcb372')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD
index cfe57191f..0b369756a 100644
--- a/extra/kdeutils-kfloppy/PKGBUILD
+++ b/extra/kdeutils-kfloppy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202607 2013-12-22 12:50:20Z andrea $
+# $Id: PKGBUILD 205789 2014-02-10 11:00:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kfloppy
-pkgver=4.12.0
+pkgver=4.12.2
 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=('642aeb278dca7b769d01f37d67e065ff6003d68d')
+sha1sums=('0141933c8a33ff38568dc682390185d59f02a542')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD
index 846f598df..ba6fe8d32 100644
--- a/extra/kdeutils-kgpg/PKGBUILD
+++ b/extra/kdeutils-kgpg/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 202608 2013-12-22 12:50:24Z andrea $
+# $Id: PKGBUILD 205790 2014-02-10 11:00:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kgpg
-pkgver=4.12.0
+pkgver=4.12.2
 pkgrel=1
 pkgdesc='A GnuPG frontend'
 url='http://kde.org/applications/utilities/kgpg/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime' 'kdepimlibs' 'kde-agent')
-makedepends=('cmake' 'automoc4')
+makedepends=('cmake' 'automoc4' 'boost')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz")
-sha1sums=('28d08d701d35ad71eb5772a6aa8580a5205ea618')
+sha1sums=('f2bc3e886972bf9d9d9f6ae2e2c1bb094ba57dc0')
 
-build() {
-  cd "${srcdir}"
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../kgpg-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
@@ -27,6 +29,6 @@ build() {
 }
 
 package() {
-  cd $srcdir/build
+  cd build
   make DESTDIR=$pkgdir install
 }
diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD
index 4e4d16acc..6c1d213a2 100644
--- a/extra/kdeutils-kremotecontrol/PKGBUILD
+++ b/extra/kdeutils-kremotecontrol/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202609 2013-12-22 12:50:25Z andrea $
+# $Id: PKGBUILD 205791 2014-02-10 11:00:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kremotecontrol
-pkgver=4.12.0
+pkgver=4.12.2
 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=('27b8e567591723d29908c9ac85753c9a66d847ca')
+sha1sums=('740f4aafb7dca4fe6bc1ba1139f8e672c035431c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD
index 5ce31b763..08006a8b5 100644
--- a/extra/kdeutils-ktimer/PKGBUILD
+++ b/extra/kdeutils-ktimer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202610 2013-12-22 12:50:26Z andrea $
+# $Id: PKGBUILD 205792 2014-02-10 11:00:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-ktimer
-pkgver=4.12.0
+pkgver=4.12.2
 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=('fb8f46dc90f41e62c0a4f4bdff46894659125938')
+sha1sums=('0ed8cd57f744bc993e50d05096f4923d269cdc1d')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD
index 4756ef6b5..58ced5d23 100644
--- a/extra/kdeutils-kwallet/PKGBUILD
+++ b/extra/kdeutils-kwallet/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202611 2013-12-22 12:50:29Z andrea $
+# $Id: PKGBUILD 205793 2014-02-10 11:00:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kwallet
-pkgver=4.12.0
+pkgver=4.12.2
 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=('44c7e225989b77fd9be7e6804bf3f4702c62efa3')
+sha1sums=('5575f52d0188b60be9e9f9e42fd78701f56cbb68')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-print-manager/PKGBUILD b/extra/kdeutils-print-manager/PKGBUILD
index 7483697e7..769b784c3 100644
--- a/extra/kdeutils-print-manager/PKGBUILD
+++ b/extra/kdeutils-print-manager/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202612 2013-12-22 12:50:30Z andrea $
+# $Id: PKGBUILD 205794 2014-02-10 11:00:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-print-manager
-pkgver=4.12.0
+pkgver=4.12.2
 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=('9d16dabd15278d0fac6ad3b3aabe58c7bc26ac07')
+sha1sums=('befbb909a94931ff40443b03adf48a10bc8016bf')
 
 build() {
   mkdir build
diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD
index b46884b96..894c7b16f 100644
--- a/extra/kdeutils-superkaramba/PKGBUILD
+++ b/extra/kdeutils-superkaramba/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202613 2013-12-22 12:50:31Z andrea $
+# $Id: PKGBUILD 205795 2014-02-10 11:00:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-superkaramba
-pkgver=4.12.0
+pkgver=4.12.2
 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=('d50d682fd1960ab50fdd2ec3c605d0599dc3e6de')
+sha1sums=('3402b4424d3a4e3a722b0b9f039879ac82579139')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD
index 5567ca9f6..ca8c71325 100644
--- a/extra/kdeutils-sweeper/PKGBUILD
+++ b/extra/kdeutils-sweeper/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202614 2013-12-22 12:50:32Z andrea $
+# $Id: PKGBUILD 205796 2014-02-10 11:00:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-sweeper
-pkgver=4.12.0
+pkgver=4.12.2
 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=('2b117aa90b46ea0eeba9a07f8f0aa95744014d57')
+sha1sums=('fa1d4b2f13fefbef533a001bb719deec88cd0bda')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD
index 0a6c6236f..1cadca38a 100644
--- a/extra/kdewebdev/PKGBUILD
+++ b/extra/kdewebdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202615 2013-12-22 12:50:34Z andrea $
+# $Id: PKGBUILD 205797 2014-02-10 11:00:12Z 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.12.0
+pkgver=4.12.2
 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=('3ff61d129f428cffd4ddfed6d6007fe5625ca724')
+sha1sums=('d32fb3493a7b18748056b5fe34ac5e045a2ea94f')
 
 build() {
 	cd $srcdir
diff --git a/extra/konversation/PKGBUILD b/extra/konversation/PKGBUILD
index acc05d9bb..479ccf42d 100644
--- a/extra/konversation/PKGBUILD
+++ b/extra/konversation/PKGBUILD
@@ -1,12 +1,13 @@
-# $Id: PKGBUILD 196549 2013-10-15 07:10:19Z allan $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# $Id: PKGBUILD 204555 2014-01-22 15:33:40Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: James Rayner <iphitus@gmail.com>
 # Contributor: Sergio Jovani Guzman <moret@paretux.org>
 
 pkgname=konversation
-pkgver=1.4
-pkgrel=7
+pkgver=1.5
+pkgrel=1
 pkgdesc="A user friendly IRC client for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://konversation.kde.org"
@@ -19,7 +20,7 @@ license=('GPL2' 'FDL')
 install=${pkgname}.install
 options=('!makeflags')
 source=("http://download.kde.org/download.php?url=stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('90741721f68a02d4345b9006a8ae53bc49ef3777')
+sha1sums=('3955a43758750b63d84299a9d9a5933b73e5492b')
 
 
 build() {
diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD
index f2e52639a..9c937510e 100644
--- a/extra/ktorrent/PKGBUILD
+++ b/extra/ktorrent/PKGBUILD
@@ -1,23 +1,34 @@
-# $Id: PKGBUILD 176930 2013-02-02 18:16:57Z andrea $
+# $Id: PKGBUILD 205598 2014-02-08 16:27:50Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Travis Willard <travisw@wmpub.ca>
 # Contributor: Georg Grabler <ggrabler@gmail.com>
 
 pkgname=ktorrent
 pkgver=4.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A powerful BitTorrent client for KDE"
 arch=('i686' 'x86_64' 'mips64el')
-url='http://ktorrent.org/'
+url='http://ktorrent.pwsp.net/'
 license=('GPL2')
-depends=('libktorrent' 'kdebase-workspace' 'taglib')
-makedepends=('automoc4' 'cmake' 'boost')
-source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+depends=('libktorrent' 'kdebase-runtime' 'taglib')
+makedepends=('automoc4' 'cmake' 'boost' 'kdebase-workspace')
 install=${pkgname}.install
-sha1sums=('6b56bab48dd07805225c3d4d5d5d1c4c1def241e')
+source=("http://ktorrent.pwsp.net/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+        'kde412.patch'
+        'kdebug-315239.patch')
+sha1sums=('6b56bab48dd07805225c3d4d5d5d1c4c1def241e'
+          'f2c0e05913b2f21b593818e2cd3547d09f86be86'
+          'd247aecbbbbbda3eef8dcb51d3db244b1c845f85')
 
-build() {
+prepare() {
 	mkdir build
+
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/kde412.patch
+  patch -p1 -i "${srcdir}"/kdebug-315239.patch
+}
+
+build() {
 	cd build
 	cmake ../${pkgname}-${pkgver} \
 	  -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/ktorrent/kde412.patch b/extra/ktorrent/kde412.patch
new file mode 100644
index 000000000..445a645d2
--- /dev/null
+++ b/extra/ktorrent/kde412.patch
@@ -0,0 +1,18 @@
+From: Christoph Feck <christoph@maxiom.de>
+Date: Fri, 19 Oct 2012 08:56:22 +0000
+Subject: SVN_SILENT link
+X-Git-Url: http://quickgit.kde.org/?p=ktorrent.git&a=commitdiff&h=3ef62c439027acc0a166101419fff4bc0c69013d
+---
+SVN_SILENT link
+---
+
+
+--- a/plugins/ipfilter/tests/CMakeLists.txt
++++ b/plugins/ipfilter/tests/CMakeLists.txt
+@@ -1,4 +1,4 @@
+ set(ipblocklisttest_SRCS ipblocklisttest.cpp ../ipblocklist.cpp)
+ kde4_add_unit_test(ipblocklisttest TESTNAME ipblocklisttest ${ipblocklisttest_SRCS})
+-target_link_libraries(ipblocklisttest ${QT_QTTEST_LIBRARY} ktorrent)
++target_link_libraries(ipblocklisttest ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBKTORRENT_LIBRARIES})
+ 
+
diff --git a/extra/ktorrent/kdebug-315239.patch b/extra/ktorrent/kdebug-315239.patch
new file mode 100644
index 000000000..524a10d88
--- /dev/null
+++ b/extra/ktorrent/kdebug-315239.patch
@@ -0,0 +1,65 @@
+commit 3dfcbeb9765e99f9b99951134b17268eb7a617d2
+Author: Joris Guisson <joris.guisson@gmail.com>
+Date:   Thu Aug 1 13:19:29 2013 +0200
+
+    Backport ipfilter extraction fixes from master branch to 4.3 branch
+    
+    BUG: 315239
+
+diff --git a/ChangeLog b/ChangeLog
+index c5ae9da..42c48ff 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,6 @@
++Changes in 4.3.2:
++- Backport ipfilter extraction fixes from master branch (315239)
++
+ Changes in 4.3.1:
+ - Fix new custom groups not appearing in add to group submenu (307230)
+ - Fix crash when right clicking on some locations in the GroupView due to 0 pointer (307160)
+diff --git a/plugins/ipfilter/downloadandconvertjob.cpp b/plugins/ipfilter/downloadandconvertjob.cpp
+index d3092ac..4080c2a 100644
+--- a/plugins/ipfilter/downloadandconvertjob.cpp
++++ b/plugins/ipfilter/downloadandconvertjob.cpp
+@@ -114,12 +114,13 @@ namespace kt
+ 		
+ 		//now determine if it's ZIP or TXT file
+ 		KMimeType::Ptr ptr = KMimeType::findByPath(temp);
++        Out(SYS_IPF|LOG_NOTICE) << "Mimetype: " << ptr->name() << endl;
+ 		if (ptr->name() == "application/zip")
+ 		{
+ 			active_job = KIO::file_move(temp,QString(kt::DataDir() + QLatin1String("level1.zip")),-1,KIO::HideProgressInfo|KIO::Overwrite);
+ 			connect(active_job,SIGNAL(result(KJob*)),this,SLOT(extract(KJob*)));
+ 		}
+-		else if (ptr->name() == "application/x-gzip" || ptr->name() == "application/x-bzip")
++		else if (ptr->name() == "application/x-gzip" || ptr->name() == "application/x-bzip" || ptr->name() == "application/gzip")
+ 		{
+ 			active_job = new bt::DecompressFileJob(temp,QString(kt::DataDir() + "level1.txt"));
+ 			connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*)));
+@@ -174,23 +175,10 @@ namespace kt
+ 		}
+ 		
+ 		QString destination = kt::DataDir() + "level1.txt";
+-		if (zip->directory()->entries().contains("splist.txt"))
++        QStringList entries = zip->directory()->entries();
++		if (entries.count() >= 1)
+ 		{
+-			active_job = new bt::ExtractFileJob(zip,"splist.txt",destination);
+-			connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*)));
+-			unzip = true;
+-			active_job->start();
+-		}
+-		else if (zip->directory()->entries().contains("level1.txt"))
+-		{
+-			active_job = new bt::ExtractFileJob(zip,"level1.txt",destination);
+-			connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*)));
+-			unzip = true;
+-			active_job->start();
+-		}
+-		else if (zip->directory()->entries().contains("ipfilter.dat"))
+-		{
+-			active_job = new bt::ExtractFileJob(zip,"ipfilter.dat",destination);
++			active_job = new bt::ExtractFileJob(zip,entries.front(),destination);
+ 			connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*)));
+ 			unzip = true;
+ 			active_job->start();
diff --git a/extra/lapack/PKGBUILD b/extra/lapack/PKGBUILD
index b76ee52a4..3d8e7ffe9 100644
--- a/extra/lapack/PKGBUILD
+++ b/extra/lapack/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198759 2013-11-03 11:28:03Z ronald $
+# $Id: PKGBUILD 204819 2014-01-27 20:49:33Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
@@ -6,8 +6,8 @@
 
 pkgbase=lapack
 pkgname=('lapack' 'blas')
-pkgver=3.4.2
-pkgrel=2
+pkgver=3.5.0
+pkgrel=1
 url="http://www.netlib.org/lapack"
 pkgdesc="Linear Algebra PACKage"
 makedepends=('gcc-fortran' 'cmake')
@@ -16,7 +16,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=("custom")
 source=(http://www.netlib.org/${pkgbase}/${pkgbase}-${pkgver}.tgz
         LICENSE.blas)
-sha1sums=('93a6e4e6639aaf00571d53a580ddc415416e868b'
+sha1sums=('5870081889bf5d15fd977993daab29cf3c5ea970'
           '2491a151a37f0162b25fc4e4e9a8ac444b574a76')
 
 build() {
@@ -46,8 +46,8 @@ package_lapack() {
     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 "${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/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD
index c54f661fa..465006a8a 100644
--- a/extra/leveldb/PKGBUILD
+++ b/extra/leveldb/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 196888 2013-10-20 21:56:36Z dreisner $
+# $Id: PKGBUILD 204900 2014-01-30 20:31:43Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: feydaykyn <feydaykyn@yahoo.fr>
 
 pkgname=leveldb
-pkgver=1.14.0
-pkgrel=2
+pkgver=1.15.0
+pkgrel=1
 pkgdesc="A fast and lightweight key/value database library"
 arch=('i686' 'x86_64')
 url="https://code.google.com/p/leveldb/"
 license=('BSD')
 depends=('gperftools' 'snappy')
 source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha1sums=('641d54df4aaf7ee569ae003cfbdb888ebdee0d7f')
+sha1sums=('74b70a1156d91807d8d84bfdd026e0bb5acbbf23')
 
 build() {
   make -C "$pkgname-$pkgver"
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index 089421b33..b82bc415d 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 201537 2013-12-14 08:34:10Z andyrtr $
+# $Id: PKGBUILD 204639 2014-01-24 13:26:47Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=lftp
-pkgver=4.4.14
+pkgver=4.4.15
 pkgrel=1
 pkgdesc="Sophisticated command line based FTP client"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file')
 url="http://lftp.yar.ru/"
 backup=('etc/lftp.conf')
 source=(http://lftp.yar.ru/ftp/${pkgname}-${pkgver}.tar.xz{,.asc})
-md5sums=('809544255f668a6d3af867f643cc321f'
+md5sums=('f19cc0cea1d427aa2a952b27661b91e5'
          'SKIP')
 
 build() {
diff --git a/extra/libaccounts-glib/PKGBUILD b/extra/libaccounts-glib/PKGBUILD
index 800256354..d432c0326 100644
--- a/extra/libaccounts-glib/PKGBUILD
+++ b/extra/libaccounts-glib/PKGBUILD
@@ -1,36 +1,29 @@
-# $Id: PKGBUILD 198122 2013-10-30 12:55:21Z allan $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# $Id: PKGBUILD 203009 2013-12-31 16:18:17Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=libaccounts-glib
-pkgver=1.12
+pkgver=1.15
 pkgrel=1
 pkgdesc="Glib-based client library for accessing the online accounts database"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/accounts-sso/"
 license=('LGPL')
-depends=('dbus-glib' 'libxml2' 'sqlite3')
-makedepends=('python2-gobject')
-source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('165e0b89a0bc47459711b1e7e077fb9e14848503')
+depends=('dbus-glib' 'libxml2' 'sqlite')
+makedepends=('python2-gobject' 'docbook-xsl')
+source=("http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+sha1sums=('0b681e624af0bec3866d8ad662d40df9aa8b3d7a')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static \
-              PYTHON=python2
+  cd $pkgname-$pkgver
+  PYTHON=/usr/bin/python2 HAVE_GCOV_FALSE='#' ./configure \
+    --prefix=/usr \
+    --disable-static \
+    --disable-gtk-doc
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-
-  # Install GI overrides for python 3 as well
-  install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides"
-  ln -s ../../../../python2.7/site-packages/gi/overrides/Accounts.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Accounts.py"
-
-  # We don't have Backup Framework on Arch Linux
-  rm -r "$pkgdir/usr/share/backup-framework"
 }
diff --git a/extra/libaccounts-qt/PKGBUILD b/extra/libaccounts-qt/PKGBUILD
index 231fdbddc..eb0bfb56b 100644
--- a/extra/libaccounts-qt/PKGBUILD
+++ b/extra/libaccounts-qt/PKGBUILD
@@ -1,44 +1,40 @@
-# $Id: PKGBUILD 197627 2013-10-27 14:38:36Z andrea $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# $Id: PKGBUILD 203011 2013-12-31 16:41:54Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgbase=libaccounts-qt
-_pkgbase=accounts-qt
 pkgname=('libaccounts-qt' 'libaccounts-qt-doc')
-pkgver=1.9
+pkgver=1.10
 pkgrel=1
-pkgdesc="Qt-based client library for accessing the online accounts database"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/accounts-sso/"
 license=('LGPL')
-depends=('qt4' 'libaccounts-glib')
-makedepends=('doxygen' 'graphviz' 'ttf-dejavu')
-options=('!emptydirs')
-source=(http://accounts-sso.googlecode.com/files/$_pkgbase-$pkgver.tar.bz2)
-sha1sums=('86d7bbaa7bdd18f80a28c2617653707d763d1984')
+makedepends=('qt4' 'libaccounts-glib' 'doxygen')
+source=("http://accounts-sso.googlecode.com/files/accounts-qt-$pkgver.tar.bz2")
+sha1sums=('a71ee49a3dda9c44a385e8f0215b08240e48512a')
 
-build() {
-  cd "$srcdir/$_pkgbase-$pkgver"
+prepare() {
+  cd accounts-qt-$pkgver
+  sed -i 's|SUBDIRS  += Accounts tests|SUBDIRS += Accounts|' accounts-qt.pro
 
-  # Do not install tests
-  echo 'INSTALLS =' >>tests/accountstest.pro
+  sed -i 's|QHG_LOCATION           = qhelpgenerator|QHG_LOCATION = qhelpgenerator-qt4|' doc/doxy.conf
+}
 
+build() {
+  cd accounts-qt-$pkgver
   qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib
   make
 }
 
 package_libaccounts-qt() {
-  cd "$srcdir/$_pkgbase-$pkgver"
+  pkgdesc="Qt-based client library for accessing the online accounts database"
+  depends=('qt4' 'libaccounts-glib')
 
-  make INSTALL_ROOT="$pkgdir" install
-
-  # Split out documentation
-  mv "$pkgdir/usr/share/doc" "$srcdir"
+  cd accounts-qt-$pkgver
+  make INSTALL_ROOT="$pkgdir" install_subtargets
 }
 
 package_libaccounts-qt-doc() {
-  pkgdesc="Developer documention of signon"
-  depends=()
-
-  mkdir -p "$pkgdir/usr/share"
-  mv "$srcdir/doc" "$pkgdir/usr/share"
+  cd accounts-qt-$pkgver
+  make INSTALL_ROOT="$pkgdir" install_documentation
 }
diff --git a/extra/libao/PKGBUILD b/extra/libao/PKGBUILD
index 76779a511..e32a1f9c0 100644
--- a/extra/libao/PKGBUILD
+++ b/extra/libao/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198123 2013-10-30 12:55:41Z allan $
+# $Id: PKGBUILD 204844 2014-01-29 00:25:51Z bisson $
 # Contributor: dorphell <dorphell@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=libao
-pkgver=1.1.0
-pkgrel=3
+pkgver=1.2.0
+pkgrel=1
 pkgdesc='Cross-platform audio output library and plugins'
 url='http://xiph.org/ao/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('libpulse')
 backup=('etc/libao.conf')
 source=("http://downloads.xiph.org/releases/ao/${pkgname}-${pkgver}.tar.gz"
         'libao.conf')
-sha1sums=('9301bc4886f170c7122ab62677fb71cf001c04fd'
+sha1sums=('6b1d2c6a2e388e3bb6ebea158d51afef18aacc56'
           '603f5e6715e7e50e1c8e8c1935c45a897c46e9af')
 
 conflicts=('libao-pulse')
diff --git a/extra/libass/PKGBUILD b/extra/libass/PKGBUILD
index 7841be2f2..6320d1720 100644
--- a/extra/libass/PKGBUILD
+++ b/extra/libass/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 197391 2013-10-25 11:10:08Z giovanni $
+# $Id: PKGBUILD 203015 2013-12-31 17:37:47Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 
 pkgname=libass
 pkgver=0.10.2
-pkgrel=1
+pkgrel=2
 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')
+depends=('fribidi' 'fontconfig' 'enca' 'harfbuzz')
 makedepends=('pkg-config')
 source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
 md5sums=('ce672ed5629c9708b3401b976f516744')
@@ -17,7 +17,10 @@ md5sums=('ce672ed5629c9708b3401b976f516744')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr \
+              --enable-enca \
+              --enable-harfbuzz \
+              --enable-fontconfig
   make
 }
 
diff --git a/extra/libatomic_ops/PKGBUILD b/extra/libatomic_ops/PKGBUILD
new file mode 100644
index 000000000..58f780beb
--- /dev/null
+++ b/extra/libatomic_ops/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Adam Walters <abwalters@abwalters.us>
+# Contributor: William Rea <sillywilly@gmail.com>
+# Contributor: Rémy Oudompheng <remy@archlinux.org>
+
+pkgname=libatomic_ops
+pkgver=7.2.e
+pkgrel=1
+pkgdesc="Provides semi-portable access to hardware provided atomic memory operations"
+arch=('i686' 'x86_64')
+url="https://github.com/ivmai/libatomic_ops"
+depends=('glibc')
+license=('GPL2' 'MIT')
+source=(http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-7.2e.tar.gz)
+md5sums=('7035692fec4db2659b06485040829e43')
+
+prepare(){
+  cd libatomic_ops-7.2
+
+  sed -i 's#AM_CONFIG_HEADER#AC_CONFIG_HEADERS#' configure.ac
+  sed -i 's#AC_PROG_RANLIB#AC_LIBTOOL_DLOPEN\nAC_PROG_LIBTOOL#' configure.ac
+  sed -i 's#b_L#b_LTL#;s#\.a#.la#g;s#_a_#_la_#' src/Makefile.am
+  sed -i 's#\.a#.so#g;s#\.\./src/#../src/.libs/#g' tests/Makefile.am
+  sed -i 's#pkgdata#doc#' doc/Makefile.am
+}
+
+build() {
+  cd libatomic_ops-7.2
+  autoreconf -fi
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+check() {
+  cd libatomic_ops-7.2
+  LD_LIBRARY_PATH="${srcdir}/libatomic_ops-7.2/src/.libs" make check
+}
+
+package() {
+  cd libatomic_ops-7.2
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 doc/LICENSING.txt "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/extra/libcdio-paranoia/PKGBUILD b/extra/libcdio-paranoia/PKGBUILD
index 03edceb66..8f1e86af8 100644
--- a/extra/libcdio-paranoia/PKGBUILD
+++ b/extra/libcdio-paranoia/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libcdio-paranoia
 pkgver=10.2+0.90+1
-pkgrel=1
+pkgrel=2
 pkgdesc="CD paranoia libraries from libcdio"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
diff --git a/extra/libcdio/PKGBUILD b/extra/libcdio/PKGBUILD
index 21586ea1b..c9158ddbe 100644
--- a/extra/libcdio/PKGBUILD
+++ b/extra/libcdio/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198135 2013-10-30 13:00:01Z allan $
+# $Id: PKGBUILD 204418 2014-01-19 16:28:51Z bpiotrowski $
 # Maintainer:
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=libcdio
-pkgver=0.90
-pkgrel=2
+pkgver=0.92
+pkgrel=1
 pkgdesc="GNU Compact Disc Input and Control Library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
@@ -12,23 +12,24 @@ url="http://www.gnu.org/software/libcdio/"
 depends=('libcddb' 'ncurses' 'gcc-libs')
 install=libcdio.install
 source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig}
-        libcdio-0.83-linking.patch
-        udf-Dont-return-freed-memory-from-udf_fopen.patch)
-md5sums=('1b245b023fb03a58d030fd2800db3247'
-         '45100d90ea49d6f8481eddf709655c0f'
-         '5a7f50209c03d5919d5b932f07871af7'
-         'b7b50c989575e5484d3992b455c9df48')
+        libcdio-0.83-linking.patch)
+md5sums=('86f3f2869c1d34e4c6e52db77992b918'
+         'SKIP'
+         '5a7f50209c03d5919d5b932f07871af7')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i ../libcdio-0.83-linking.patch
-  patch -Np1 -i ../udf-Dont-return-freed-memory-from-udf_fopen.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make -j1 DESTDIR="${pkgdir}" install
   
   sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \
diff --git a/extra/libcdio/udf-Dont-return-freed-memory-from-udf_fopen.patch b/extra/libcdio/udf-Dont-return-freed-memory-from-udf_fopen.patch
deleted file mode 100644
index 191e35341..000000000
--- a/extra/libcdio/udf-Dont-return-freed-memory-from-udf_fopen.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6c0251d145e44b7cdfeb9767c615646fb8f51320 Mon Sep 17 00:00:00 2001
-From: Christophe Fergeau <cfergeau@redhat.com>
-Date: Thu, 22 Nov 2012 13:53:15 +0100
-Subject: [PATCH] udf: Don't return freed memory from udf_fopen
-
-When trying to open a file located in the root directory of the
-UDF filesystem, we call udf_ff_open with the dirent corresponding
-to the root dir and the filename. In this case, udf_ff_open will
-return the same dirent as the one that was passed as argument, so
-we must not free it as we'll be returning it.
-This causes a crash with iso-read when trying to read a file located
-at the root of the image.
----
- lib/udf/udf_fs.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/lib/udf/udf_fs.c b/lib/udf/udf_fs.c
-index 5f5add7..1e0601e 100644
---- a/lib/udf/udf_fs.c
-+++ b/lib/udf/udf_fs.c
-@@ -257,7 +257,8 @@ udf_fopen(udf_dirent_t *p_udf_root, const char *psz_name)
- 		       p_udf_root->psz_name, p_udf_root->b_dir, 
- 		       p_udf_root->b_parent);
-       p_udf_file = udf_ff_traverse(p_udf_dirent, psz_token);
--      udf_dirent_free(p_udf_dirent);
-+      if (p_udf_file != p_udf_dirent)
-+        udf_dirent_free(p_udf_dirent);
-     }
-     else if ( 0 == strncmp("/", psz_name, sizeof("/")) ) {
-       return udf_new_dirent(&p_udf_root->fe, p_udf_root->p_udf,
--- 
-1.7.2.5
-
diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD
index a5c88d06c..ff3960e44 100644
--- a/extra/libchamplain/PKGBUILD
+++ b/extra/libchamplain/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198137 2013-10-30 13:00:52Z allan $
+# $Id: PKGBUILD 205540 2014-02-06 20:50:44Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Michael Kanis <mkanis@gmx.de>
 
 pkgname=libchamplain
-pkgver=0.12.5
-pkgrel=2
+pkgver=0.12.7
+pkgrel=1
 pkgdesc="Gtk3 widget for displaying rasterized maps"
 url="http://projects.gnome.org/libchamplain/"
 license=('LGPL')
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el')
 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)
-sha256sums=('9c937d3775053a7d6b542aad36b16bbb07e02be3adb683ae57d7dcbe89634236')
+sha256sums=('b607fa7e32dd67e5d9541d620abb212a85d076d1def0252c0112a362bddeac5e')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index ef9b363f2..075298538 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 200740 2013-12-03 19:25:26Z lcarlier $
+# $Id: PKGBUILD 204511 2014-01-21 18:58:35Z lcarlier $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.50
+pkgver=2.4.52
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ replaces=('libdrm-new' 'libdrm-nouveau')
 url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
         COPYING)
-sha256sums=('3823d24cda800c2cd36995e01830b890edb8fb1bebf97d5ea4318b8c3933b045'
+sha256sums=('fa693c2f1f61befcefbdcc396673e38481110bac9db610afa4b8afb2be0218c1'
             '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
 
 build() {
diff --git a/extra/libdvdnav/PKGBUILD b/extra/libdvdnav/PKGBUILD
index 04bbb764b..6dbaee48b 100644
--- a/extra/libdvdnav/PKGBUILD
+++ b/extra/libdvdnav/PKGBUILD
@@ -1,28 +1,26 @@
-# $Id: PKGBUILD 198151 2013-10-30 13:06:17Z allan $
+# $Id: PKGBUILD 204779 2014-01-27 07:23:49Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan <arjan@archlinux.org>
 # contributor Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=libdvdnav
-pkgver=4.2.0
-pkgrel=2.1
+pkgver=4.2.1
+pkgrel=1
 pkgdesc="The library for xine-dvdnav plugin."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://dvdnav.mplayerhq.hu/"
 depends=('libdvdread')
-source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8c971b08276c89ddcecd26fc44204460fd250dc57346f03476d3077188c47550')
+source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
+  cd $pkgname-$pkgver
   ./autogen.sh --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libdvdread/PKGBUILD b/extra/libdvdread/PKGBUILD
index 14f8ce163..3eb0fd901 100644
--- a/extra/libdvdread/PKGBUILD
+++ b/extra/libdvdread/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198152 2013-10-30 13:06:40Z allan $
+# $Id: PKGBUILD 204777 2014-01-27 07:05:18Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=libdvdread
-pkgver=4.2.0
-pkgrel=1.1
+pkgver=4.2.1
+pkgrel=1
 pkgdesc="Provides a simple foundation for reading DVD video disks"
 arch=(i686 x86_64 'mips64el')
 url="http://dvdnav.mplayerhq.hu"
@@ -13,19 +13,16 @@ license=('GPL')
 depends=('glibc')
 makedepends=('libdvdcss')
 optdepends=('libdvdcss: for decoding encrypted DVDs')
-source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('0bea15da842a4b04a482b009d72dcc6d9c9524ccc1bf67e5748319ec5ada8097')
+source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('af9b98f049580a6521d56c978b736d3d609562dd12955e11d50e26d97542dcd4')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # http://lists.mplayerhq.hu/pipermail/dvdnav-discuss/2009-February/000986.html (FS#19324)
-
+  cd $pkgname-$pkgver
   ./autogen.sh --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libetonyek/PKGBUILD b/extra/libetonyek/PKGBUILD
new file mode 100644
index 000000000..354d5ebda
--- /dev/null
+++ b/extra/libetonyek/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 204536 2014-01-22 11:40:28Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Yue
+
+pkgname=libetonyek
+pkgver=0.0.3
+pkgrel=1
+pkgdesc='Library and a set of tools for reading and converting Apple Keynote presentations'
+arch=('i686' 'x86_64')
+url='http://www.freedesktop.org/wiki/Software/libetonyek/'
+license=('MPL')
+depends=('libxml2' 'gperf' 'zlib' 'libwpd' 'boost-libs')
+makedepends=('boost' 'cppunit')
+source=(http://dev-www.libreoffice.org/src/$pkgname-$pkgver.tar.xz)
+md5sums=('6deb26eb088acd8938b9bec800cfb59e')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/libetpan/PKGBUILD b/extra/libetpan/PKGBUILD
index f947a2a74..671ad3713 100644
--- a/extra/libetpan/PKGBUILD
+++ b/extra/libetpan/PKGBUILD
@@ -1,19 +1,28 @@
-# $Id: PKGBUILD 198154 2013-10-30 13:07:31Z allan $
+# $Id: PKGBUILD 205522 2014-02-06 16:23:03Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=libetpan
-pkgver=1.1
-pkgrel=4
+pkgver=1.2
+pkgrel=1
 pkgdesc="A portable middleware for email access"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.etpan.org/"
+url="http://www.etpan.org/libetpan.html"
 license=("custom:etpan")
 depends=('libsasl' 'curl' 'expat')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('6fee60d08506e941642b8fa087e60b07')
+source=(https://github.com/dinhviethoa/${pkgname}/archive/${pkgver}.tar.gz)
+md5sums=('c15905ebc2ec620afb8bcca7b9d9c232')
 
 build() {
   cd ${pkgname}-${pkgver}
+  
+  # generate automake files that are not included in the tarball
+  libtoolize --force --copy
+  aclocal -I m4
+  autoheader
+  autoconf
+  automake --add-missing --foreign --force --copy
+  #autoreconf -vfi
+
   ./configure --prefix=/usr \
     --disable-static \
     --disable-db
diff --git a/extra/libevdev/0001-Revert-Drop-deprecated-functions.patch b/extra/libevdev/0001-Revert-Drop-deprecated-functions.patch
new file mode 100644
index 000000000..e4857e7ad
--- /dev/null
+++ b/extra/libevdev/0001-Revert-Drop-deprecated-functions.patch
@@ -0,0 +1,163 @@
+From 51bf0ead89df5c1ddaa22d2f7fc0e04cedbdc590 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Thu, 26 Dec 2013 18:58:23 -0800
+Subject: [PATCH] Revert "Drop deprecated functions"
+
+This reverts commit 7a38f4abc3ed1df368d5bad32a1d72559acdc234. It is incorrect and dangerous to drop functions without an soname bump. This broke GNOME.
+---
+ libevdev/libevdev.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
+ libevdev/libevdev.h | 30 ++++++++++++++++++++++++++++++
+ 2 files changed, 79 insertions(+)
+
+diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c
+index 8a37204..02e4f78 100644
+--- a/libevdev/libevdev.c
++++ b/libevdev/libevdev.c
+@@ -162,6 +162,14 @@ libevdev_free(struct libevdev *dev)
+ 	free(dev);
+ }
+ 
++/* DEPRECATED */
++LIBEVDEV_EXPORT void
++libevdev_set_log_handler(struct libevdev *dev, libevdev_log_func_t logfunc)
++{
++	/* Can't be backwards compatible to this yet, so don't even try */
++	fprintf(stderr, "libevdev: ABI change. Log function will not be honored.\n");
++}
++
+ LIBEVDEV_EXPORT void
+ libevdev_set_log_function(libevdev_log_func_t logfunc, void *data)
+ {
+@@ -1244,6 +1252,12 @@ libevdev_disable_event_code(struct libevdev *dev, unsigned int type, unsigned in
+ }
+ 
+ LIBEVDEV_EXPORT int
++libevdev_kernel_set_abs_value(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs)
++{
++	return libevdev_kernel_set_abs_info(dev, code, abs);
++}
++
++LIBEVDEV_EXPORT int
+ libevdev_kernel_set_abs_info(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs)
+ {
+ 	int rc;
+@@ -1296,12 +1310,22 @@ libevdev_grab(struct libevdev *dev, enum libevdev_grab_mode grab)
+ 	return rc < 0 ? -errno : 0;
+ }
+ 
++/* DEPRECATED */
++LIBEVDEV_EXPORT int
++libevdev_is_event_type(const struct input_event *ev, unsigned int type)
++ALIAS(libevdev_event_is_type);
++
+ LIBEVDEV_EXPORT int
+ libevdev_event_is_type(const struct input_event *ev, unsigned int type)
+ {
+ 	return type < EV_CNT && ev->type == type;
+ }
+ 
++/* DEPRECATED */
++LIBEVDEV_EXPORT int
++libevdev_is_event_code(const struct input_event *ev, unsigned int type, unsigned int code)
++ALIAS(libevdev_event_is_code);
++
+ LIBEVDEV_EXPORT int
+ libevdev_event_is_code(const struct input_event *ev, unsigned int type, unsigned int code)
+ {
+@@ -1314,6 +1338,11 @@ libevdev_event_is_code(const struct input_event *ev, unsigned int type, unsigned
+ 	return (max > -1 && code <= (unsigned int)max && ev->code == code);
+ }
+ 
++/* DEPRECATED */
++LIBEVDEV_EXPORT const char*
++libevdev_get_event_type_name(unsigned int type)
++ALIAS(libevdev_event_type_get_name);
++
+ LIBEVDEV_EXPORT const char*
+ libevdev_event_type_get_name(unsigned int type)
+ {
+@@ -1323,6 +1352,11 @@ libevdev_event_type_get_name(unsigned int type)
+ 	return ev_map[type];
+ }
+ 
++/* DEPRECATED */
++LIBEVDEV_EXPORT const char*
++libevdev_get_event_code_name(unsigned int type, unsigned int code)
++ALIAS(libevdev_event_code_get_name);
++
+ LIBEVDEV_EXPORT const char*
+ libevdev_event_code_get_name(unsigned int type, unsigned int code)
+ {
+@@ -1334,6 +1368,16 @@ libevdev_event_code_get_name(unsigned int type, unsigned int code)
+ 	return event_type_map[type][code];
+ }
+ 
++/* DEPRECATED */
++LIBEVDEV_EXPORT const char*
++libevdev_get_input_prop_name(unsigned int prop)
++ALIAS(libevdev_property_get_name);
++
++/* DEPRECATED */
++LIBEVDEV_EXPORT const char*
++libevdev_get_property_name(unsigned int prop)
++ALIAS(libevdev_property_get_name);
++
+ LIBEVDEV_EXPORT const char*
+ libevdev_property_get_name(unsigned int prop)
+ {
+@@ -1343,6 +1387,11 @@ libevdev_property_get_name(unsigned int prop)
+ 	return input_prop_map[prop];
+ }
+ 
++/* DEPRECATED */
++LIBEVDEV_EXPORT int
++libevdev_get_event_type_max(unsigned int type)
++ALIAS(libevdev_event_type_get_max);
++
+ LIBEVDEV_EXPORT int
+ libevdev_event_type_get_max(unsigned int type)
+ {
+diff --git a/libevdev/libevdev.h b/libevdev/libevdev.h
+index 37ca2f4..c89f4ad 100644
+--- a/libevdev/libevdev.h
++++ b/libevdev/libevdev.h
+@@ -1642,6 +1642,36 @@ int libevdev_get_repeat(const struct libevdev *dev, int *delay, int *period);
+ #define LIBEVDEV_DEPRECATED
+ #endif
+ 
++LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_READ_SYNC;
++LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_READ_NORMAL;
++LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_FORCE_SYNC;
++LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_READ_BLOCKING;
++
++/* replacement: libevdev_kernel_set_abs_info */
++int libevdev_kernel_set_abs_value(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs) LIBEVDEV_DEPRECATED;
++
++
++/* replacement: libevdev_set_log_function */
++void libevdev_set_log_handler(struct libevdev *dev, libevdev_log_func_t logfunc) LIBEVDEV_DEPRECATED;
++
++/** replacement: libevdev_event_type_get_max */
++int libevdev_get_event_type_max(unsigned int type) LIBEVDEV_DEPRECATED;
++
++/** replacement: libevdev_property_get_name */
++const char* libevdev_get_property_name(unsigned int prop) LIBEVDEV_DEPRECATED;
++
++/** replacement: libevdev_event_type_get_name */
++const char * libevdev_get_event_type_name(unsigned int type) LIBEVDEV_DEPRECATED;
++/** replacement: libevdev_event_code_get_name */
++const char * libevdev_get_event_code_name(unsigned int type, unsigned int code) LIBEVDEV_DEPRECATED;
++
++/** replacement: libevdev_event_is_type */
++int libevdev_is_event_type(const struct input_event *ev, unsigned int type) LIBEVDEV_DEPRECATED;
++
++/** replacement: libevdev_event_is_code */
++int libevdev_is_event_code(const struct input_event *ev, unsigned int type, unsigned int code) LIBEVDEV_DEPRECATED;
++/**************************************/
++
+ #ifdef __cplusplus
+ }
+ #endif
+-- 
+1.8.5.2
+
diff --git a/extra/libevdev/0001-Revert-Drop-some-leftover-deprecated-constants.patch b/extra/libevdev/0001-Revert-Drop-some-leftover-deprecated-constants.patch
new file mode 100644
index 000000000..250be8505
--- /dev/null
+++ b/extra/libevdev/0001-Revert-Drop-some-leftover-deprecated-constants.patch
@@ -0,0 +1,30 @@
+From 9ee61912a356bb8c1995cf262428196e5e4f179d Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri, 3 Jan 2014 08:30:04 +1000
+Subject: [PATCH libevdev] Revert "Drop some leftover deprecated constants."
+
+This reverts commit a612ee753e8c40d2d1fff6da516d278064e27d86.
+---
+ libevdev/libevdev.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c
+index 8a37204..432aeff 100644
+--- a/libevdev/libevdev.c
++++ b/libevdev/libevdev.c
+@@ -36,6 +36,12 @@
+ 
+ #define MAXEVENTS 64
+ 
++/* DEPRECATED */
++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_READ_SYNC = LIBEVDEV_READ_FLAG_SYNC;
++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_READ_NORMAL = LIBEVDEV_READ_FLAG_NORMAL;
++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_FORCE_SYNC = LIBEVDEV_READ_FLAG_FORCE_SYNC;
++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_READ_BLOCKING = LIBEVDEV_READ_FLAG_BLOCKING;
++
+ static int sync_mt_state(struct libevdev *dev, int create_events);
+ 
+ static int
+-- 
+1.8.4.2
+
diff --git a/extra/libevdev/PKGBUILD b/extra/libevdev/PKGBUILD
index 4835f8cf0..c3997e6f7 100644
--- a/extra/libevdev/PKGBUILD
+++ b/extra/libevdev/PKGBUILD
@@ -2,19 +2,29 @@
 # Maintainer: Jan de Groot
 
 pkgname=libevdev
-pkgver=0.4
-pkgrel=2
+pkgver=0.6
+pkgrel=1
 pkgdesc="Wrapper library for evdev devices"
 arch=(i686 x86_64 mips64el)
 url="http://www.freedesktop.org/wiki/Software/libevdev/"
 license=(custom:X11)
 depends=('glibc')
 makedepends=('python')
-source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('ba6becd3f41430aa290ddf53694909fb46b9a65d5fe264e5fc2a4f5169484f42')
+source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz
+        0001-Revert-Drop-deprecated-functions.patch
+        0001-Revert-Drop-some-leftover-deprecated-constants.patch)
+sha256sums=('1c562ed32252ef9c14aa61e03b38acb886cb3edbbdafbb5181762ff16e010d93'
+            '783ba5edf7c9525e8cac46c8c4c981c98395ff3c68ed7a162190ef9e8f13b149'
+            '24d52811732b3335eb363416e4862c6152bfe6ebc8c372a298126221f754f041')
 
 build() {
   cd $pkgname-$pkgver
+
+  # Fix libevdev 0.6 missing symbol that breaks clutter, patches from Fedora
+  # https://bugzilla.redhat.com/show_bug.cgi?id=1046426
+  patch -Np1 -i ../0001-Revert-Drop-deprecated-functions.patch
+  patch -Np1 -i ../0001-Revert-Drop-some-leftover-deprecated-constants.patch
+
   ./configure --prefix=/usr --disable-static --disable-gcov
   make
 }
diff --git a/extra/libgadu/PKGBUILD b/extra/libgadu/PKGBUILD
index 4856e5591..d157caa6f 100644
--- a/extra/libgadu/PKGBUILD
+++ b/extra/libgadu/PKGBUILD
@@ -1,33 +1,34 @@
-# $Id: PKGBUILD 198159 2013-10-30 13:09:19Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 205892 2014-02-13 10:02:12Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=libgadu
-pkgver=1.11.2
+pkgver=1.11.3
 pkgrel=1
 pkgdesc="This library implements the client side of the Gadu-Gadu protocol"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://toxygen.net/libgadu/"
+url="http://libgadu.net/"
 license=('LGPL2.1')
-depends=('openssl')
-source=("http://toxygen.net/${pkgname}/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('832432fef251f69f31e68574c17f0c51')
+depends=('openssl' 'zlib')
+source=("http://github.com/wojtekka/libgadu/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('63b0870821bdb7077a952183db31db50')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
- 	 --disable-static \
-	 --enable-shared \
-	 --with-pthread
+    --disable-static \
+    --enable-shared \
+    --with-pthread
   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/libgda/PKGBUILD b/extra/libgda/PKGBUILD
index 678256ec8..699c60f49 100644
--- a/extra/libgda/PKGBUILD
+++ b/extra/libgda/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 199873 2013-11-17 20:47:22Z heftig $
+# $Id: PKGBUILD 203579 2014-01-13 17:12:10Z andyrtr $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=libgda
 pkgver=5.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD
index 520f00c3f..abecc226f 100644
--- a/extra/libgnome-keyring/PKGBUILD
+++ b/extra/libgnome-keyring/PKGBUILD
@@ -1,14 +1,14 @@
-#$Id: PKGBUILD 198171 2013-10-30 13:14:09Z allan $
+#$Id: PKGBUILD 203580 2014-01-13 17:12:11Z andyrtr $
 #Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=libgnome-keyring
 pkgver=3.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME keyring client library"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 depends=('dbus-core' 'glib2' 'libgcrypt')
-makedepends=('intltool' 'gobject-introspection')
+makedepends=('intltool' 'gobject-introspection' 'vala')
 optdepends=('gnome-keyring: key storage service (or use any other service implementing org.freedesktop.secrets)')
 options=('!emptydirs')
 url="http://www.gnome.org"
diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD
index 4247e2d7f..f8117f8f2 100644
--- a/extra/libgphoto2/PKGBUILD
+++ b/extra/libgphoto2/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 189864 2013-07-10 07:26:55Z bpiotrowski $
+# $Id: PKGBUILD 204790 2014-01-27 08:48:48Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Gundersen <teg@jklm.no>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=libgphoto2
-pkgver=2.5.2
-pkgrel=2
+pkgver=2.5.3.1
+pkgrel=1
 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs."
 arch=(i686 x86_64 'mips64el')
 url="http://www.gphoto.org"
@@ -14,8 +14,9 @@ license=(LGPL)
 depends=('libexif' 'libjpeg' 'gd' 'libltdl' 'libusb')
 install=libgphoto2.install
 options=('libtool')
-source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d9f4462957e59bf2b2eb3b1ea8423570')
+source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2{,.asc})
+md5sums=('aad2607a84442769c14f6acce2ca1ddf'
+         'SKIP')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -32,11 +33,11 @@ package() {
   # Remove unused udev helper
   rm -rf "${pkgdir}/usr/lib/udev"
 
-  install -m755 -d "${pkgdir}/usr/lib/udev/rules.d"
+  install -m755 -d "${pkgdir}/usr/lib/udev/hwdb.d"
   LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \
   CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \
-      "${pkgdir}/usr/lib/libgphoto2/print-camera-list" udev-rules version 175 > \
-      "${pkgdir}/usr/lib/udev/rules.d/40-gphoto.rules"
+      "${pkgdir}/usr/lib/libgphoto2/print-camera-list" hwdb > \
+      "${pkgdir}/usr/lib/udev/hwdb.d/20-gphoto.conf"
 
   # Remove recursive symlink
   rm -f "${pkgdir}/usr/include/gphoto2/gphoto2"
diff --git a/extra/libgphoto2/libgphoto2.install b/extra/libgphoto2/libgphoto2.install
index 3eb8301aa..c5a3c1545 100644
--- a/extra/libgphoto2/libgphoto2.install
+++ b/extra/libgphoto2/libgphoto2.install
@@ -1,6 +1,14 @@
+post_install() {
+  udevadm hwdb --update
+}
 post_upgrade() {
-if [ "$(vercmp $2 2.4.13)" -lt 0 ]; then
-  groupdel camera &>/dev/null
-  echo "Users no longer need to be in the 'camera' group to use camera devices"
-fi
+  if [ "$(vercmp $2 2.4.13)" -lt 0 ]; then
+    groupdel camera &>/dev/null
+    echo "Users no longer need to be in the 'camera' group to use camera devices"
+  fi
+  post_install
+}
+
+post_remove() {
+  post_install
 }
diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD
index 6670538a4..1f2d038de 100644
--- a/extra/libgpod/PKGBUILD
+++ b/extra/libgpod/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 200005 2013-11-21 01:32:03Z allan $
+# $Id: PKGBUILD 204781 2014-01-27 07:47:56Z jgc $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=libgpod
-pkgver=0.8.2
-pkgrel=8
+pkgver=0.8.3
+pkgrel=1
 pkgdesc="A shared library to access the contents of an iPod"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
@@ -18,16 +18,16 @@ fi
 url="http://www.gtkpod.org/libgpod/"
 source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2)
 options=('!emptydirs')
-md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab')
+md5sums=('f8a0b7a34e768e33a708e8dd172bd6f8')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --with-udev-dir=/usr/lib/udev \
       --enable-udev --with-python=/usr/bin/python2
   make PREFIX=/usr
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make PREFIX=/usr DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD
index ab8619abc..56cbfe3bb 100644
--- a/extra/libgweather/PKGBUILD
+++ b/extra/libgweather/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198179 2013-10-30 13:17:18Z allan $
+# $Id: PKGBUILD 204981 2014-02-02 18:45:21Z heftig $
 # Maintainer: Jan de Groot  <jgc@archlinux.org>
 
 pkgname=libgweather
-pkgver=3.10.1
+pkgver=3.10.2
 pkgrel=1
 pkgdesc="Provides access to weather information from the net"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ 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=('ae8e785f6798b4fe4cf1461c57faf1c0625716ccb92ea927e091840a1205cfc7')
+sha256sums=('454d8d681114f7f9522df2710b63f33198d0d7ca6f0726eef7fcf72e1b580005')
 
 build() {
     cd "$pkgname-$pkgver"
diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD
index 86a52b06f..70b415f0d 100644
--- a/extra/libkcddb/PKGBUILD
+++ b/extra/libkcddb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202479 2013-12-22 12:47:03Z andrea $
+# $Id: PKGBUILD 205662 2014-02-10 10:58:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkcddb
-pkgver=4.12.0
+pkgver=4.12.2
 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=('e0a195f145719defb1ad52493b41118a3b31c58e')
+sha1sums=('1d17e64a1ec9250da4ea3ffce01b243ce4266999')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD
index cda9af6cf..eb1a99780 100644
--- a/extra/libkcompactdisc/PKGBUILD
+++ b/extra/libkcompactdisc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202480 2013-12-22 12:47:04Z andrea $
+# $Id: PKGBUILD 205663 2014-02-10 10:58:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkcompactdisc
-pkgver=4.12.0
+pkgver=4.12.2
 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=('dc8b0bc7839942eb5e22ea6a3faf1d9960a99b98')
+sha1sums=('7ad552cbd6637ff4bb23ed02c8c4536da5b7185c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD
index f9a7ec339..2744acb61 100644
--- a/extra/libkdcraw/PKGBUILD
+++ b/extra/libkdcraw/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202475 2013-12-22 12:46:58Z andrea $
+# $Id: PKGBUILD 205658 2014-02-10 10:58:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdcraw
-pkgver=4.12.0
+pkgver=4.12.2
 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=('7f2aae2f91edc4de668dee8138305148242ef34b')
+sha1sums=('112643a26a976560d00689a1c1b869b3468c15e5')
 
 prepare() {
   mkdir build
diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD
index 55fd8ebf0..abe502b8c 100644
--- a/extra/libkdeedu/PKGBUILD
+++ b/extra/libkdeedu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202473 2013-12-22 12:46:55Z andrea $
+# $Id: PKGBUILD 205656 2014-02-10 10:58:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdeedu
-pkgver=4.12.0
+pkgver=4.12.2
 pkgrel=1
 pkgdesc="Libraries used by KDE Education applications"
 url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu"
@@ -14,7 +14,7 @@ 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=('b974648cc561d02eb999d2a5d197a93125142b39')
+sha1sums=('c6234a5e6e38ace2e2e34c381e5a3fd296660389')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkdegames/PKGBUILD b/extra/libkdegames/PKGBUILD
index 477da05d3..49cc73010 100644
--- a/extra/libkdegames/PKGBUILD
+++ b/extra/libkdegames/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202481 2013-12-22 12:47:05Z andrea $
+# $Id: PKGBUILD 205664 2014-02-10 10:58:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdegames
-pkgver=4.12.0
+pkgver=4.12.2
 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=('7c67c6ed68adc09937b20a5d46b7dde330e47400')
+sha1sums=('c5704c8bcd711dba58fe894d5fa12d5ca6f9a306')
 
 build() {
   mkdir build
diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD
index 431c00afe..6dcf94ee3 100644
--- a/extra/libkexiv2/PKGBUILD
+++ b/extra/libkexiv2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202462 2013-12-22 12:46:44Z andrea $
+# $Id: PKGBUILD 205645 2014-02-10 10:57:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkexiv2
-pkgver=4.12.0
+pkgver=4.12.2
 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=('554839aa4ea94f2ed55aa48c10c41d65c266da37')
+sha1sums=('6c9221eab4be7b0b16beb7eff78d6187d68ed333')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD
index 87e9a07c8..e3ea3bf12 100644
--- a/extra/libkipi/PKGBUILD
+++ b/extra/libkipi/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkipi
-pkgver=4.12.0
+pkgver=4.12.2
 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=('bb0f8708071a07246e0ac553568102c743c3b13f')
+sha1sums=('f8034b55b0ab85b45451373a3e2e758f5feb884a')
 
 prepare() {
   mkdir build
diff --git a/extra/libkmahjongg/PKGBUILD b/extra/libkmahjongg/PKGBUILD
index 48c9c3862..43bba4551 100644
--- a/extra/libkmahjongg/PKGBUILD
+++ b/extra/libkmahjongg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202482 2013-12-22 12:47:06Z andrea $
+# $Id: PKGBUILD 205665 2014-02-10 10:58:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkmahjongg
-pkgver=4.12.0
+pkgver=4.12.2
 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=('be38eb549b5502181bad65cfeb45b832d711bc7e')
+sha1sums=('af2edbf816042678676044cccf66cbe8177a24e4')
 
 build() {
   mkdir build
diff --git a/extra/libkomparediff2/PKGBUILD b/extra/libkomparediff2/PKGBUILD
index 9ce18d38c..e646274f8 100644
--- a/extra/libkomparediff2/PKGBUILD
+++ b/extra/libkomparediff2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202483 2013-12-22 12:47:06Z andrea $
+# $Id: PKGBUILD 205800 2014-02-10 11:00:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkomparediff2
-pkgver=4.12.0
+pkgver=4.12.2
 pkgrel=1
 pkgdesc="Library to compare files and strings"
 url='https://projects.kde.org/projects/kde/kdesdk/libkomparediff2'
@@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('ba6dcfd8da41d5f441d6f2a8352eb28e3b504e08')
+sha1sums=('5b8b194e25578654a0179b2fd0cbb2b89c4325a6')
 
 prepare() {
   mkdir build
diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD
index cbca8e99c..74b6befc6 100644
--- a/extra/libksane/PKGBUILD
+++ b/extra/libksane/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202477 2013-12-22 12:47:01Z andrea $
+# $Id: PKGBUILD 205660 2014-02-10 10:58:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libksane
-pkgver=4.12.0
+pkgver=4.12.2
 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=('c3473dbe3b5e68d85828fbcd585a957781e73cde')
+sha1sums=('c516f1fc6ec38eb31ab257dd50495977c86ccd15')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD
index 88dfd7e14..92e8c6e41 100644
--- a/extra/libktorrent/PKGBUILD
+++ b/extra/libktorrent/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 176928 2013-02-02 18:12:44Z andrea $
+# $Id: PKGBUILD 204052 2014-01-14 20:33:05Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libktorrent
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A BitTorrent protocol implementation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ktorrent.org/"
 license=('GPL2')
 depends=('kdelibs')
 makedepends=('automoc4' 'cmake' 'boost' 'doxygen')
-source=("http://ktorrent.org/downloads/4.3.1/${pkgname}-${pkgver}.tar.bz2")
+source=("http://ktorrent.pwsp.net/downloads/4.3.1/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('71b377c0cad01dca6061f1fe92f91c4cf05476b3')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/liblo/PKGBUILD b/extra/liblo/PKGBUILD
index 636dfed05..87bed1cfc 100644
--- a/extra/liblo/PKGBUILD
+++ b/extra/liblo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197527 2013-10-26 14:48:03Z schiv $
+# $Id: PKGBUILD 205864 2014-02-12 07:12:08Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Pajaro
 
 pkgname=liblo
-pkgver=0.26
-pkgrel=2
+pkgver=0.28
+pkgrel=1
 epoch=1
 pkgdesc="A lightweight OSC (Open Sound Control) implementation"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ url="http://liblo.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('5351de14262560e15e7f23865293b16f')
+md5sums=('e2a4391a08b49bb316c03e2034e06fa2')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libmbim/PKGBUILD b/extra/libmbim/PKGBUILD
index 5772ef490..148ae9119 100644
--- a/extra/libmbim/PKGBUILD
+++ b/extra/libmbim/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198195 2013-10-30 13:23:07Z allan $
+# $Id: PKGBUILD 205456 2014-02-05 15:22:56Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libmbim
-pkgver=1.4.0
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="MBIM modem protocol helper library"
 arch=(i686 x86_64 mips64el)
@@ -11,12 +11,12 @@ license=(GPL2)
 depends=(glib2 bash systemd)
 makedepends=(gtk-doc python)
 source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('a7fa909df229574eb11baac89075ac1366a2ac1670f586483bdf0173257cf781')
+sha256sums=('e0efbdaf2aeddec033b4c7c5d0f7934c91ce535c5c9f0cadf1e67527d10ab082')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static
+    --disable-static --with-tests --libexecdir=/usr/lib
   make
 }
 
diff --git a/extra/libmikmod/PKGBUILD b/extra/libmikmod/PKGBUILD
index 174fb9d9c..beec448b8 100644
--- a/extra/libmikmod/PKGBUILD
+++ b/extra/libmikmod/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 201341 2013-12-09 07:42:41Z heftig $
+# $Id: PKGBUILD 203444 2014-01-10 21:24:03Z heftig $
 # 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.3.4
+pkgver=3.3.5
 pkgrel=1
 pkgdesc="A portable sound library"
 license=(GPL LGPL)
 url="http://mikmod.sourceforge.net"
 arch=('i686' 'x86_64' 'mips64el')
-depends=(openal sh)
+depends=(libpulse sh)
 makedepends=(alsa-lib)
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/mikmod/$pkgname-$pkgver.tar.gz)
-sha256sums=('2e8ca1d945ff7330741d085548a6d4e8b2f6a9d41edda773607905d8905683ae')
+sha256sums=('b714ee340a04e6867f60246f679e0f40063b92f99269b6b715c8bf19ad469fb6')
 
 prepare() {
   mkdir build
@@ -24,7 +24,6 @@ build() {
   cd build
   ../$pkgname-$pkgver/configure \
     --prefix=/usr \
-    --enable-openal \
     --disable-static
   make
 }
diff --git a/extra/libmm-qt/PKGBUILD b/extra/libmm-qt/PKGBUILD
index 8a92de4fb..720ee8f35 100644
--- a/extra/libmm-qt/PKGBUILD
+++ b/extra/libmm-qt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 200035 2013-11-21 23:29:06Z andrea $
+# $Id: PKGBUILD 205993 2014-02-15 13:37:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libmm-qt
-pkgver=1.0.0
+pkgver=1.0.1
 pkgrel=1
 pkgdesc='Qt-only wrapper for ModemManager DBus API'
 arch=('i686' 'x86_64')
@@ -10,11 +10,16 @@ url='https://projects.kde.org/projects/extragear/libs/libmm-qt'
 license=('LGPL')
 depends=('qt4' 'modemmanager')
 makedepends=('cmake' 'doxygen')
-source=("http://download.kde.org/unstable/modemmanager-qt/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-md5sums=('421dc7ebe8439fabc9d24da46ca0cfa7')
+source=("http://download.kde.org/unstable/modemmanager-qt/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
+        'fix-build.patch')
+md5sums=('73cf04d0e71d75ce343d791968a7c460'
+         '265fd2e32a5e350c1703612d29268748')
 
 prepare() {
   mkdir -p build
+
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/fix-build.patch
 }
 
 build() {
diff --git a/extra/libmm-qt/fix-build.patch b/extra/libmm-qt/fix-build.patch
new file mode 100644
index 000000000..4d7dd5d25
--- /dev/null
+++ b/extra/libmm-qt/fix-build.patch
@@ -0,0 +1,22 @@
+From: David Faure <faure@kde.org>
+Date: Thu, 09 Jan 2014 19:41:48 +0000
+Subject: modem.cpp:169:1: error: no return statement in function returning non-void [-Werror=return-type]
+X-Git-Tag: v1.0.1
+X-Git-Url: http://quickgit.kde.org/?p=libmm-qt.git&a=commitdiff&h=1d7f3e5d5eb4bb4fba741736049c229b48b6815c
+---
+modem.cpp:169:1: error: no return statement in function returning non-void [-Werror=return-type]
+---
+
+
+--- a/modem.cpp
++++ b/modem.cpp
+@@ -165,7 +165,7 @@
+ QString ModemManager::Modem::command(const QString &cmd, uint timeout)
+ {
+     Q_D(Modem);
+-    d->modemIface.Command(cmd, timeout);
++    return d->modemIface.Command(cmd, timeout);
+ }
+ 
+ QString ModemManager::Modem::simPath() const
+
diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD
index b56ae93b0..bc024a290 100644
--- a/extra/libmtp/PKGBUILD
+++ b/extra/libmtp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 202983 2013-12-30 08:41:18Z foutrelis $
+# $Id: PKGBUILD 203582 2014-01-13 17:12:13Z 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=5
+pkgrel=6
 pkgdesc="Library implementation of the Media Transfer Protocol"
 arch=("i686" "x86_64" "mips64el")
 url="http://libmtp.sourceforge.net"
diff --git a/extra/libnm-qt/PKGBUILD b/extra/libnm-qt/PKGBUILD
index d5e9ccd9a..9c4ac31fe 100644
--- a/extra/libnm-qt/PKGBUILD
+++ b/extra/libnm-qt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 200037 2013-11-21 23:30:26Z andrea $
+# $Id: PKGBUILD 205986 2014-02-15 12:57:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libnm-qt
-pkgver=0.9.8.0
+pkgver=0.9.8.1
 pkgrel=1
 pkgdesc='Qt-only wrapper for NetworkManager DBus API'
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 depends=('libmm-qt' 'networkmanager')
 makedepends=('cmake' 'doxygen')
 source=("http://download.kde.org/unstable/networkmanager-qt/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('02242d49958ac88e056f093cff08f9e94ff888d14a6765180ddc991caceb5db8')
+sha256sums=('cde8bed2beb57015cb5f6772c1fe0843aab299b9529578c5406ba7fe614af23d')
 
 prepare() {
   mkdir -p build
diff --git a/extra/libodfgen/PKGBUILD b/extra/libodfgen/PKGBUILD
new file mode 100644
index 000000000..f826f4be8
--- /dev/null
+++ b/extra/libodfgen/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Yue
+
+pkgname=libodfgen
+pkgver=0.0.4
+pkgrel=1
+pkgdesc='Library for generating documents in Open Document Format'
+arch=('i686' 'x86_64')
+url='http://sf.net/p/libwpd/libodfgen/'
+license=('MPL')
+depends=('libwpd' 'zlib')
+makedepends=('boost' 'libwpg' 'libetonyek')
+source=(http://dev-www.libreoffice.org/src/$pkgname-$pkgver.tar.bz2)
+md5sums=('e5483d1f0b71e64c367c1194b54b0f53')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/libotr/PKGBUILD b/extra/libotr/PKGBUILD
index fefd8b62b..9cb8abc54 100644
--- a/extra/libotr/PKGBUILD
+++ b/extra/libotr/PKGBUILD
@@ -1,22 +1,29 @@
-# $Id: PKGBUILD 198216 2013-10-30 13:31:00Z allan $
+# $Id: PKGBUILD 203583 2014-01-13 17:12:14Z andyrtr $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Bug <Bug2000@gmail.com>
 
 pkgname=libotr
 pkgver=4.0.0
-pkgrel=1
+pkgrel=5
 pkgdesc='Off-the-Record Messaging Library and Toolkit'
 url='http://www.cypherpunks.ca/otr/'
 license=('GPL' 'LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libgcrypt')
-source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('8865e9011b8674290837afcf7caf90c492ae09cc')
+source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz"
+        'kopete.patch')
+sha1sums=('8865e9011b8674290837afcf7caf90c492ae09cc'
+          '55988c4f11b6852491a758ea7a5b7071e8959c55')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../kopete.patch # FS#38326
+}
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --mandir=/usr/share/man --disable-static
+	./configure --prefix=/usr --mandir=/usr/share/man
 	make
 }
 
diff --git a/extra/libotr/kopete.patch b/extra/libotr/kopete.patch
new file mode 100644
index 000000000..110e4eec2
--- /dev/null
+++ b/extra/libotr/kopete.patch
@@ -0,0 +1,12 @@
+diff -Naur old/src/message.c new/src/message.c
+--- old/src/message.c	2012-08-31 02:15:35.000000000 -1000
++++ new/src/message.c	2014-01-06 01:22:43.316831758 -1000
+@@ -441,7 +441,7 @@
+ 	/* Fragment and send according to policy */
+ 	if (!err && messagep && *messagep) {
+ 	    if (context) {
+-		err = fragment_and_send(ops, NULL, context, *messagep,
++		err = fragment_and_send(ops, opdata, context, *messagep,
+ 			fragPolicy, messagep);
+ 	    }
+ 	}
diff --git a/extra/libotr3/PKGBUILD b/extra/libotr3/PKGBUILD
index a05a3dd28..84f86e3f2 100644
--- a/extra/libotr3/PKGBUILD
+++ b/extra/libotr3/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198217 2013-10-30 13:31:22Z allan $
+# $Id: PKGBUILD 203584 2014-01-13 17:12:15Z andyrtr $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Bug <Bug2000@gmail.com>
 
 pkgname=libotr3
 pkgver=3.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Off-the-Record Messaging Library and Toolkit (version 3.X)'
 url='http://www.cypherpunks.ca/otr/'
 license=('GPL' 'LGPL')
@@ -18,7 +18,7 @@ sha1sums=('898bf00d019f49ca34cd0116dd2e22685c67c394'
 build() {
 	cd "${srcdir}/libotr-${pkgver}"
 	patch -p1 -i "${srcdir}/libotr3-soname.patch"
- 	./configure --prefix=/usr --mandir=/usr/share/man --disable-static \
+ 	./configure --prefix=/usr --mandir=/usr/share/man \
 	  --program-transform-name='s/otr/otr3/'
 	make 
 }
diff --git a/extra/libpaper/PKGBUILD b/extra/libpaper/PKGBUILD
new file mode 100644
index 000000000..869f06b11
--- /dev/null
+++ b/extra/libpaper/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 204595 2014-01-23 16:54:36Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
+# Contributor: royrocks <royrocks13@gmail.com>
+
+pkgname=libpaper
+pkgver=1.1.24
+pkgrel=7
+pkgdesc='Library for handling paper characteristics'
+arch=('x86_64' 'i686')
+url='http://packages.debian.org/unstable/source/libpaper'
+license=('GPL')
+depends=('sh')
+backup=('etc/papersize')
+source=("http://ftp.de.debian.org/debian/pool/main/libp/$pkgname/${pkgname}_$pkgver+nmu2.tar.gz")
+sha256sums=('c5bdd6d9dff179699160675dbb61651d9b3158f6da27558fdaba00e7c427ba96')
+
+build() {
+  cd "$pkgname-$pkgver+nmu2"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --sbindir=/usr/bin
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver+nmu2"
+  make DESTDIR="$pkgdir" install
+  
+  # add systemwide default papersize read by many office applications
+  install -dm 755 $pkgdir/etc
+  echo '# Simply write the paper name. See papersize(5) for possible values' > $pkgdir/etc/papersize
+
+  # add libpaper.d directory other packages can use to store files
+  install -dm 755 $pkgdir/etc/libpaper.d
+
+  # add localisation
+  pushd debian/po
+  for i in `ls *.po`; do
+	install -dm 755 ${pkgdir}/usr/share/locale/${i%.po}/LC_MESSAGES/;
+	msgfmt $i -o ${pkgdir}/usr/share/locale/${i%.po}/LC_MESSAGES/${pkgname}.mo;
+  done
+  popd
+}
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index 86949c097..dc3ca506e 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 200277 2013-11-24 16:59:45Z bpiotrowski $
+# $Id: PKGBUILD 204723 2014-01-25 21:53:14Z bluewind $
 # 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.7
-_apngver=1.6.7
+pkgver=1.6.8
+_apngver=1.6.8
 pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics files"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,9 +15,9 @@ license=('custom')
 depends=('zlib' 'sh')
 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=('7023a9eacd7b6a3eb95761a2f574d456'
+md5sums=('51ce71a1642cdde1f4485a7ff82193c0'
          'SKIP'
-         'aad92ea0cc3e29415b90c78f1d267799')
+         '6ddeea37e1945d809959a152d4258987')
 
 prepare() {
   cd $pkgname-$pkgver
diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
index 293a198fd..a7cc29abb 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 201261 2013-12-07 10:35:00Z bpiotrowski $
+# $Id: PKGBUILD 204783 2014-01-27 07:57:48Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libpst
 pkgname=('libpst' 'libpst-docs')
-pkgver=0.6.58
-pkgrel=2
+pkgver=0.6.63
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.five-ten-sg.com/libpst/"
 license=('GPL')
 makedepends=('python2' 'boost' 'libgsf')
 source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz)
-sha1sums=('c398d58b8b5106725f1659c900305c6385c0773e')
+sha1sums=('3625c94bc82555d490805d4bbac07d9160195537')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   ./configure --prefix=/usr --mandir=/usr/share/man \
       --disable-static --enable-libpst-shared --disable-dii PYTHON_VERSION=2
   make
@@ -25,7 +25,7 @@ package_libpst() {
   optdepends=('boost-libs: for libpst python interface')
   options=('!docs')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   make DESTDIR="${pkgdir}" install
 }
 
@@ -33,8 +33,8 @@ package_libpst-docs() {
   pkgdesc="Documentation for Outlook .pst file converter"
   options=('docs')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   make DESTDIR="${pkgdir}" install-htmlDATA
-  cd "${srcdir}/${pkgbase}-${pkgver}/html"
+  cd html
   make DESTDIR="${pkgdir}" install-htmldevelDATA
 }
diff --git a/extra/libquvi/PKGBUILD b/extra/libquvi/PKGBUILD
index 7195e4f13..4da89ad8b 100644
--- a/extra/libquvi/PKGBUILD
+++ b/extra/libquvi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 199434 2013-11-12 17:02:09Z heftig $
+# $Id: PKGBUILD 203585 2014-01-13 17:12:16Z andyrtr $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 
 pkgname=libquvi
 pkgver=0.9.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Library for parsing video download links.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://quvi.sourceforge.net/'
diff --git a/extra/libraw/PKGBUILD b/extra/libraw/PKGBUILD
index 99edbbae0..9a16b195d 100644
--- a/extra/libraw/PKGBUILD
+++ b/extra/libraw/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 199050 2013-11-07 23:03:25Z andrea $
+# $Id: PKGBUILD 204577 2014-01-23 13:18:50Z andrea $
 # Maintainer: Andre Scarpino <andrea@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
@@ -6,15 +6,15 @@
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=libraw
-pkgver=0.15.4
-pkgrel=3
+pkgver=0.16.0
+pkgrel=1
 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libraw.org/"
 license=('CDDL' 'LGPL' 'custom')
 depends=('lcms2' 'jasper')
 source=("http://www.libraw.org/data/LibRaw-${pkgver}.tar.gz")
-sha256sums=('b3fcfee33bc34ae5869a9741880e28a62f029f196cb1d1a007ab156f4a110f79')
+sha256sums=('71f43871ec2535345c5c9b748f07813e49915170f9510b721a2be6478426cf96')
 
 build() {
   cd LibRaw-${pkgver}
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 966132226..cb8b33ef7 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202184 2013-12-18 22:51:10Z andyrtr $
+# $Id: PKGBUILD 205850 2014-02-11 18:23:07Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 
-pkgbase="libreoffice"
+pkgbase=libreoffice
 pkgname=('libreoffice-common'
 	'libreoffice-base'
 	'libreoffice-calc'
@@ -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.4.2
-pkgver=4.1.4
+_LOver=4.1.5.3
+pkgver=4.1.5
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
@@ -33,14 +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>=52.1" 
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.4' 
+             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=52.1"
+             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.4'
              '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') 
+# options=('staticlibs')
 
 # http://download.documentfoundation.org/mirrors/all.html
 # http://wiki.documentfoundation.org/Mirrors
@@ -49,7 +49,7 @@ _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
 #_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
 _additional_source_url="http://dev-www.libreoffice.org/src"
 _additional_source_url2="http://dev-www.libreoffice.org/extern"
-source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz
+source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -120,9 +120,12 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	libmspub-0.0.6.tar.bz2
 	libmwaw-0.1.11.tar.bz2
 	libvisio-0.0.31.tar.bz2	)
-md5sums=('2e7880600b26387f342f277c5d198bfa'
-         '1235bb27ff2a060cc666752143dfbf6b'
-         '083f211866fe1f77fd2712b822a56f5c'
+md5sums=('12679026121300396c85b4ca11b176c7'
+         'SKIP'
+         'e0ea06a105071c278e52866f476c0ee6'
+         'SKIP'
+         'c3b03c33ee14628f1c151288f2eb4962'
+         'SKIP'
          'f02578f5218f217a9f20e9c30e119c6a'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
@@ -175,10 +178,10 @@ prepare() {
 	  ln -s ${srcdir}/$source .
 	done
 	popd
-   
+
     # fix not upstreamable pyuno paths - patch taken from Debian
     patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
-    
+
 	#use the CFLAGS but remove the LibO overridden ones
 	for i in $CFLAGS; do
 		case "$i" in
@@ -206,6 +209,8 @@ build() {
 		--with-parallelism=${MAKEFLAGS/-j/} \
 		--with-external-tar="${srcdir}/ext_sources" \
 		--disable-fetch-external \
+		--disable-verbose \
+		--enable-release-build \
 		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
 		--libdir=/usr/lib --mandir=/usr/share/man \
 		--with-lang="" \
@@ -262,7 +267,9 @@ build() {
 		--without-system-hsqldb \
 		--with-alloc=system\
 		--with-system-clucene\
-		--without-system-servlet-api
+		--without-system-servlet-api \
+		--enable-hardlink-deliver \
+		--disable-dependency-tracking
 
 #		--enable-mergelibs \ # https://bugs.archlinux.org/task/34414
 
@@ -328,7 +335,7 @@ package_libreoffice-common() {
    # mv file from fakeinstall to pkgdir
    mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
  done
- 
+
  # put configuration files into place
  install -dm755 ${pkgdir}/etc/libreoffice
  install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
@@ -338,28 +345,37 @@ package_libreoffice-common() {
  ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
  cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
  ln -vsf /etc/libreoffice/psprint.conf .
- 
+
  # allow to preset desired VLC
  install -dm755 ${pkgdir}/etc/profile.d
  install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
- 
+
  # move bash-completion files to its new place
  install -dm755 ${pkgdir}/usr/share/bash-completion/completions
  mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
  rm -rf ${pkgdir}/etc/bash_completion.d
- 
- # some files would conflict
- rm -vf ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar
- rm -vf ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
- rm -vf ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
- 
+
  # make pyuno find its modules
  install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages
  ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.3/site-packages/uno.py
  ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.3/site-packages/unohelper.py
-  
+
  # 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
+
+ # add missing files from Beanshell provider
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file || /bin/true # some double file entries make it fail
+ done
 }
 
 package_libreoffice-base() {
@@ -393,7 +409,7 @@ package_libreoffice-postgresql-connector() {
  # workaround double entries in the file list
  mv ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig
  sort ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt
- 
+
  # create directories from *list.txt file
  for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
@@ -415,7 +431,7 @@ package_libreoffice-calc() {
  #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332
  groups=('libreoffice')
  replaces=('libreoffice')
- 
+
  # create directories from *list.txt file
  for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/calc_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
@@ -436,7 +452,7 @@ package_libreoffice-draw() {
  depends=('libreoffice-common')
  groups=('libreoffice')
  replaces=('libreoffice')
- 
+
  # create directories from *list.txt file
  for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/draw_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
@@ -457,7 +473,7 @@ package_libreoffice-gnome() {
  optdepends=('gtk3: for gtk3 Gnome integration'
              'gtk2: for older gtk2 desktop integration')
  groups=('libreoffice')
- 
+
  # create directories from *list.txt file
  for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/gnome_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
@@ -479,7 +495,7 @@ package_libreoffice-impress() {
  optdepends=('glu:             for the OGLTrans extension')
  groups=('libreoffice')
  replaces=('libreoffice')
- 
+
  # create directories from *list.txt file
  for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/impress_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
@@ -500,7 +516,7 @@ package_libreoffice-kde4() {
  optdepends=()
  backup=()
  groups=('libreoffice')
- 
+
  # create directories from *list.txt file
  for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde4_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
@@ -513,6 +529,20 @@ package_libreoffice-kde4() {
    # mv file from fakeinstall to pkgdir
    mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
  done
+
+ # one file (libkde4be1lo.so) is part of kde_list.txt
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
 }
 
 package_libreoffice-math() {
@@ -520,7 +550,7 @@ package_libreoffice-math() {
  depends=('libreoffice-common')
  groups=('libreoffice')
  replaces=('libreoffice')
- 
+
  # create directories from *list.txt file
  for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/math_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
@@ -539,7 +569,7 @@ package_libreoffice-sdk() {
  pkgdesc="Software Development Kit for LibreOffice."
  depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
  groups=('libreoffice')
- 
+
  # create directories from *list.txt file
  for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
@@ -552,7 +582,7 @@ package_libreoffice-sdk() {
    # mv file from fakeinstall to pkgdir
    mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
  done
- 
+
   # fix environment path to keep compatibility with other java-environments
 #  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
   sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh
@@ -562,7 +592,7 @@ package_libreoffice-sdk-doc() {
  pkgdesc="Software Development Kit documentation for LibreOffice"
  depends=('libreoffice-common' 'libreoffice-sdk')
  groups=('libreoffice')
- 
+
  # create directories from *list.txt file
  for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
@@ -600,7 +630,7 @@ package_libreoffice-writer() {
    # mv file from fakeinstall to pkgdir
    mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
  done
- 
+
  # for workaround this file belongs now to common
  rm ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
 }
diff --git a/extra/libreoffice/PKGBUILD.42 b/extra/libreoffice/PKGBUILD.42
index 22a082ba7..b36102903 100644
--- a/extra/libreoffice/PKGBUILD.42
+++ b/extra/libreoffice/PKGBUILD.42
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198658 2013-11-01 15:08:02Z andyrtr $
+# $Id: PKGBUILD 202438 2013-12-21 21:14:43Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
@@ -18,22 +18,23 @@ pkgname=('libreoffice-common'
 	'libreoffice-postgresql-connector'
 	'libreoffice-extension-wiki-publisher'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.2.0.0.beta1
+_LOver=4.2.0.4
 pkgver=4.2.0
-pkgrel=0.1
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
              'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost'
              'apache-ant' 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit'
-             'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
+             'beanshell2' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
              'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen'
              'clucene' 'bluez-libs' 'harfbuzz-icu' 'gdb'
              # 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>=52.1" 
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0' 
+             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0'
+             'libvisio' 'libetonyek' 'libodfgen'  'telepathy-glib'
              'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
 	         'ttf-liberation' # to satisfy regression tests 
 	         'git')
@@ -45,11 +46,11 @@ makedepends=( # makedepends
 # http://download.documentfoundation.org/mirrors/all.html
 # http://wiki.documentfoundation.org/Mirrors
 
-#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
+_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
+#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
 _additional_source_url="http://dev-www.libreoffice.org/src"
 _additional_source_url2="http://dev-www.libreoffice.org/extern"
-source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz
+source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	${_additional_source_url}/15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -70,7 +71,7 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz
 	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
 	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	${_additional_source_url}/8c853024fbcff39113d9285250dafc66-mdds_0.9.1.tar.bz2
+	${_additional_source_url}/01a380acfec23bf617117ce98e318f3d-mdds_0.10.1.tar.bz2
 	${_additional_source_url}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
 	${_additional_source_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
 	${_additional_source_url}/ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
@@ -81,18 +82,16 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz
 	${_additional_source_url}/libcdr-0.0.14.tar.bz2
 	${_additional_source_url}/libmspub-0.0.6.tar.bz2
 	${_additional_source_url}/libmwaw-0.2.0.tar.bz2
-	${_additional_source_url}/libvisio-0.0.31.tar.bz2
-	${_additional_source_url}/libetonyek-0.0.1.tar.bz2
 	${_additional_source_url}/libfreehand-0.0.0.tar.bz2
-	${_additional_source_url}/libodfgen-0.0.3.tar.bz2
 	${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
 	${_additional_source_url}/libatomic_ops-7_2d.zip
 	${_additional_source_url}/libe-book-0.0.2.tar.bz2
+	${_additional_source_url}/libabw-0.0.1.tar.bz2
 	make-pyuno-work-with-system-wide-module-install.diff
 	libreoffice-common.sh libreoffice-common.csh)
 noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	8c853024fbcff39113d9285250dafc66-mdds_0.9.1.tar.bz2
+	01a380acfec23bf617117ce98e318f3d-mdds_0.10.1.tar.bz2
 	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
@@ -121,16 +120,14 @@ noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
 	libcdr-0.0.14.tar.bz2
 	libmspub-0.0.6.tar.bz2
 	libmwaw-0.2.0.tar.bz2
-	libvisio-0.0.31.tar.bz2
-	libetonyek-0.0.1.tar.bz2
 	libfreehand-0.0.0.tar.bz2
-	libodfgen-0.0.3.tar.bz2
 	Firebird-2.5.2.26540-0.tar.bz2
 	libatomic_ops-7_2d.zip
-	libe-book-0.0.2.tar.bz2)
-md5sums=('dbb8b7f5f64a407b6aef66f98b8163ff'
-         '48481fd38699c598b19d637ead29d34a'
-         'ec4982d81fac7c068095c7877273ca34'
+	libe-book-0.0.2.tar.bz2
+	libabw-0.0.1.tar.bz2)
+md5sums=('98674d57d6dd24baef38f007b5020e8e'
+         '8554bbbdfc72db998a191c71eeafdb55'
+         '4873b18cd8a535814777c8630fe2db9f'
          '15cb8c0803064faef0c4ddf5bc5ca279'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
@@ -151,7 +148,7 @@ md5sums=('dbb8b7f5f64a407b6aef66f98b8163ff'
          'ace6ab49184e329db254e454a010f56d'
          'db60e4fde8dd6d6807523deb71ee34dc'
          'ba2930200c9f019c2d93a8c88c651a0f'
-         '8c853024fbcff39113d9285250dafc66'
+         '01a380acfec23bf617117ce98e318f3d'
          'ae330b9493bd4503ac390106ff6060d7'
          '22f8a85daf4a012180322e1f52a7563b'
          'ea2acaf140ae40a87a952caa75184f4d'
@@ -162,13 +159,11 @@ md5sums=('dbb8b7f5f64a407b6aef66f98b8163ff'
          'd88f9b94df880d2c05be943b000ca112'
          '1120705cd0f0d9bd5506360bf57b6c2e'
          'd794625f156a9fb1c53b3f8a8aa13b5e'
-         '82628333418f101a20cd21f980cf9f40'
-         '040e0d7ce0cc0eb3a016964699d54a6c'
          '496dd00028afcc19f896b01394769043'
-         '9cafe7f50a3b2c5ebd2dc9c6c509d2b4'
          '21154d2004e025c8a3666625b0357bb5'
          'c0b86562d5aa40761a87134f83e6adcf'
          '3a62e10c57270718cabfdfc4b7b4e095'
+         'af3ccc1f1884e68389088d490d596409'
          '07d2bf5ad839a394cca008b3ec6e7bb1'
          '4195735a80876ae812fca5736b50192a'
          'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
@@ -223,10 +218,13 @@ build() {
 		--with-parallelism=${MAKEFLAGS/-j/} \
 		--with-external-tar="${srcdir}/ext_sources" \
 		--disable-fetch-external \
+		--disable-verbose \
+		--enable-release-build \
 		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
 		--libdir=/usr/lib --mandir=/usr/share/man \
 		--with-lang="" \
 		--enable-crashdump \
+		--enable-avahi \
 		--enable-dbus \
 		--enable-evolution2\
 		--enable-gio\
@@ -236,11 +234,15 @@ build() {
 		--enable-gtk3 \
 		--enable-gstreamer \
 		--enable-lockdown\
+		--enable-opencl \
 		--enable-opengl \
+		--enable-openssl \
 		--enable-odk\
+		--enable-orcus \
 		--enable-python=system \
 		--enable-scripting-beanshell \
 		--enable-scripting-javascript \
+		--enable-telepathy \
 		--enable-ext-wiki-publisher \
 		--enable-ext-nlpsolver \
 		--without-fonts\
@@ -249,7 +251,7 @@ build() {
 		--without-system-libcdr \
 		--without-system-mdds\
 		--without-myspell-dicts \
-		--without-system-libvisio \
+		--with-system-libvisio \
 		--without-system-libcmis \
 		--without-system-libmspub \
 		--without-system-libexttextcat \
@@ -257,13 +259,14 @@ build() {
 		--without-system-liblangtag \
 		--without-system-jfreereport \
 		--without-system-apache-commons \
-		--without-system-libodfgen \
+		--with-system-libodfgen \
 		--without-system-libmwaw \
-		--without-system-libetonyek \
+		--with-system-libetonyek \
 		--without-system-libfreehand \
 		--without-system-firebird \
 		--without-system-libatomic-ops \
 		--without-system-libebook \
+		--without-system-libabw \
 		--with-system-dicts \
 		--with-external-dict-dir=/usr/share/hunspell \
 		--with-external-hyph-dir=/usr/share/hyphen \
@@ -284,10 +287,10 @@ build() {
 		--without-system-hsqldb \
 		--with-alloc=system\
 		--with-system-clucene \
-		--disable-dependency-tracking
+		--disable-dependency-tracking \
+		--enable-hardlink-deliver #--help
 		
-#		--enable-mergelibs \ # https://bugs.archlinux.org/task/34414
-
+#		--enable-mergelibs=<all/yes> \ # https://bugs.archlinux.org/task/34414
 #		--without-ppds\ # breaks spadmin permission
 
 #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
@@ -311,19 +314,20 @@ package_libreoffice-common() {
  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>=52.1" 'clucene' 'lcms2' "poppler>=0.24.0"
-          'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
+          'libodfgen'  'libvisio' 'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'
              'pstoedit:         translates PostScript and PDF graphics into other vector formats'
              'libmythes:        for use in thesaurus'
-             'beanshell:        interactive java -- good for prototyping /macros'
+             'beanshell2:       interactive java -- good for prototyping/macros'
              'vigra:            C++ computer vision library, usable in Basebmp'
              'libmspack:        library for Microsoft compression formats for use in FontOOo'
              'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import'
              'sane:             for scanner access'
              'unixodbc:         adds ODBC database support'
              'gst-plugins-base-libs:        + some gstr-plugins to support multimedia content, e.g. in impress'
-             'gtk2:             for browser plugin')
+             'gtk2:             for browser plugin'
+             'libpaper:         takes care of papersize')
  backup=(etc/libreoffice/sofficerc
          etc/libreoffice/bootstraprc
          etc/libreoffice/psprint.conf
@@ -370,11 +374,6 @@ package_libreoffice-common() {
  mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
  rm -rf ${pkgdir}/etc/bash_completion.d
  
- # some files would conflict
- rm -vf ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar
- rm -vf ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
- rm -vf ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
- 
  # make pyuno find its modules
  install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages
  ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.3/site-packages/uno.py
@@ -382,6 +381,20 @@ 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
+ 
+ # add missing files from Beanshell provider
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file || /bin/true # some double file entries make it fail
+ done
 }
 
 package_libreoffice-base() {
@@ -433,7 +446,7 @@ package_libreoffice-postgresql-connector() {
 package_libreoffice-calc() {
  pkgdesc="Spreadsheet application for LibreOffice."
  install=libreoffice-calc.install
- depends=('libreoffice-common' 'lpsolve' )
+ depends=('libreoffice-common' 'lpsolve' 'telepathy-glib')
  #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332
  groups=('libreoffice')
  replaces=('libreoffice')
@@ -497,7 +510,7 @@ package_libreoffice-gnome() {
 package_libreoffice-impress() {
  pkgdesc="Presentation Application for LibreOffice."
  install=libreoffice-impress.install
- depends=('libreoffice-common')
+ depends=('libreoffice-common' 'libetonyek')
  optdepends=('glu:             for the OGLTrans extension')
  groups=('libreoffice')
  replaces=('libreoffice')
@@ -535,6 +548,20 @@ package_libreoffice-kde4() {
    # mv file from fakeinstall to pkgdir
    mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
  done
+ 
+ # one file (libkde4be1lo.so) is part of kde_list.txt
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
 }
 
 package_libreoffice-math() {
@@ -656,8 +683,7 @@ package_libreoffice-extension-wiki-publisher() {
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	#unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-	unzip -q ${srcdir}/libreoffice-$_LOver/workdir/unxlng*/Extension/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
+	unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
 }
 
 package_libreoffice-extension-nlpsolver() {
@@ -668,5 +694,5 @@ package_libreoffice-extension-nlpsolver() {
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-$_LOver/workdir/unxlng*/Extension/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
+	unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
 }
diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD
index be27ac174..54d1c49d3 100644
--- a/extra/librsvg/PKGBUILD
+++ b/extra/librsvg/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 199931 2013-11-19 18:03:47Z heftig $
+# $Id: PKGBUILD 203350 2014-01-08 14:05:06Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=librsvg
 pkgver=2.40.1
-pkgrel=1
+pkgrel=3
 epoch=1
 pkgdesc="A SVG viewing library"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('gdk-pixbuf2' 'pango' 'libcroco')
-makedepends=('intltool' 'gtk3' 'gobject-introspection')
+makedepends=('intltool' 'gtk3' 'gobject-introspection' 'vala')
 optdepends=('gtk3: for rsvg-view-3')
 options=('!emptydirs')
 url="https://live.gnome.org/LibRsvg"
@@ -19,7 +19,7 @@ sha256sums=('8813b4fe776d5e7acbce28bacbaed30ccb0cec3734eb3632c711a16ebe2961d7')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
+  ./configure --prefix=/usr --disable-static --enable-vala
   make
 }
 
diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD
index cd60dea18..f8ce8ab29 100644
--- a/extra/libsecret/PKGBUILD
+++ b/extra/libsecret/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198230 2013-10-30 13:36:21Z allan $
+# $Id: PKGBUILD 203587 2014-01-13 17:12:19Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsecret
 pkgver=0.16
-pkgrel=1
-pkgdesc='library for storing and retrieving passwords and other secrets.'
+pkgrel=2
+pkgdesc='Library for storing and retrieving passwords and other secrets.'
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="https://live.gnome.org/Libsecret"
diff --git a/extra/libsidplayfp/PKGBUILD b/extra/libsidplayfp/PKGBUILD
index 00c22e095..6dcfc5370 100644
--- a/extra/libsidplayfp/PKGBUILD
+++ b/extra/libsidplayfp/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 198234 2013-10-30 13:37:47Z allan $
+# $Id: PKGBUILD 203036 2014-01-02 09:41:35Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Simon Perry <aur [at] sanxion [dot] net>
 # Contributor: Jonas Nyrén <jonas.nyren*mindkiller.com>
 
 pkgname=libsidplayfp
-pkgver=1.1.0
+pkgver=1.2.0
 pkgrel=1
 pkgdesc='Library to play Commodore 64 music derived from libsidplay2'
 url='http://sourceforge.net/projects/sidplay-residfp/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
+depends=('gcc-libs')
 makedepends=('vice')
 optdepends=('vice: better SID support')
 source=("http://downloads.sourceforge.net/project/sidplay-residfp/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('6c3617fcbd94fd364f3305a1c4d88485911110c7')
-
-options=('!staticlibs')
+sha1sums=('ebe114d75e9d9fd1e22dc1db27f48d248b0be628')
 
 build() {
 	cd "${pkgname}-${pkgver}"
diff --git a/extra/libsrtp/7713d5706524f9f1ee94fd6b55125357e63656d5.patch b/extra/libsrtp/7713d5706524f9f1ee94fd6b55125357e63656d5.patch
new file mode 100644
index 000000000..bbfb4388a
--- /dev/null
+++ b/extra/libsrtp/7713d5706524f9f1ee94fd6b55125357e63656d5.patch
@@ -0,0 +1,116 @@
+From 8884f4d8eb4ca7122dfcbd640b933b98ef4bab80 Mon Sep 17 00:00:00 2001
+From: jfigus <jfig_us@yahoo.com>
+Date: Thu, 30 May 2013 12:36:07 -0400
+Subject: [PATCH 1/3] Remove double-invocations to prevent buffer-overflow
+ vulnerability.
+
+---
+ srtp/srtp.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/srtp/srtp.c b/srtp/srtp.c
+index 839c1ee..41e263c 100644
+--- a/srtp/srtp.c
++++ b/srtp/srtp.c
+@@ -2063,23 +2063,18 @@ static inline int base_key_length(const cipher_type_t *cipher, int key_length)
+   switch(profile) {
+   case srtp_profile_aes128_cm_sha1_80:
+     crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
+-    crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
+     break;
+   case srtp_profile_aes128_cm_sha1_32:
+     crypto_policy_set_aes_cm_128_hmac_sha1_32(policy);
+-    crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
+     break;
+   case srtp_profile_null_sha1_80:
+     crypto_policy_set_null_cipher_hmac_sha1_80(policy);
+-    crypto_policy_set_null_cipher_hmac_sha1_80(policy);
+     break;
+   case srtp_profile_aes256_cm_sha1_80:
+     crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
+-    crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
+     break;
+   case srtp_profile_aes256_cm_sha1_32:
+     crypto_policy_set_aes_cm_256_hmac_sha1_32(policy);
+-    crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
+     break;
+     /* the following profiles are not (yet) supported */
+   case srtp_profile_null_sha1_32:
+-- 
+1.8.5.1
+
+
+From 8e47faf0f5b90672c7ebf2f0cf0562ee81a8b621 Mon Sep 17 00:00:00 2001
+From: jfigus <jfig_us@yahoo.com>
+Date: Thu, 30 May 2013 13:36:33 -0400
+Subject: [PATCH 2/3] Fix 32-bit tag policies to use correct profile.
+
+---
+ srtp/srtp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/srtp/srtp.c b/srtp/srtp.c
+index 41e263c..95c1ab4 100644
+--- a/srtp/srtp.c
++++ b/srtp/srtp.c
+@@ -2095,7 +2095,7 @@ static inline int base_key_length(const cipher_type_t *cipher, int key_length)
+     crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
+     break;
+   case srtp_profile_aes128_cm_sha1_32:
+-    crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
++    crypto_policy_set_aes_cm_128_hmac_sha1_32(policy);
+     break;
+   case srtp_profile_null_sha1_80:
+     crypto_policy_set_null_cipher_hmac_sha1_80(policy);
+@@ -2104,7 +2104,7 @@ static inline int base_key_length(const cipher_type_t *cipher, int key_length)
+     crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
+     break;
+   case srtp_profile_aes256_cm_sha1_32:
+-    crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
++    crypto_policy_set_aes_cm_256_hmac_sha1_32(policy);
+     break;
+     /* the following profiles are not (yet) supported */
+   case srtp_profile_null_sha1_32:
+-- 
+1.8.5.1
+
+
+From 0acbb039c12b790621839facf56bfedbd071b74d Mon Sep 17 00:00:00 2001
+From: jfigus <jfig_us@yahoo.com>
+Date: Thu, 30 May 2013 16:47:02 -0400
+Subject: [PATCH 3/3] Undo the changes to the RTCP profile helper function. 
+ The prior commit was not compliant with RFC 3711.
+
+---
+ srtp/srtp.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/srtp/srtp.c b/srtp/srtp.c
+index 95c1ab4..7fd19e6 100644
+--- a/srtp/srtp.c
++++ b/srtp/srtp.c
+@@ -2095,7 +2095,9 @@ static inline int base_key_length(const cipher_type_t *cipher, int key_length)
+     crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
+     break;
+   case srtp_profile_aes128_cm_sha1_32:
+-    crypto_policy_set_aes_cm_128_hmac_sha1_32(policy);
++    /* We do not honor the 32-bit auth tag request since
++     * this is not compliant with RFC 3711 */
++    crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
+     break;
+   case srtp_profile_null_sha1_80:
+     crypto_policy_set_null_cipher_hmac_sha1_80(policy);
+@@ -2104,7 +2106,9 @@ static inline int base_key_length(const cipher_type_t *cipher, int key_length)
+     crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
+     break;
+   case srtp_profile_aes256_cm_sha1_32:
+-    crypto_policy_set_aes_cm_256_hmac_sha1_32(policy);
++    /* We do not honor the 32-bit auth tag request since
++     * this is not compliant with RFC 3711 */
++    crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
+     break;
+     /* the following profiles are not (yet) supported */
+   case srtp_profile_null_sha1_32:
+-- 
+1.8.5.1
+
diff --git a/extra/libsrtp/PKGBUILD b/extra/libsrtp/PKGBUILD
index 31b918850..0e51a3eb8 100644
--- a/extra/libsrtp/PKGBUILD
+++ b/extra/libsrtp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197763 2013-10-29 19:24:02Z eric $
+# $Id: PKGBUILD 205552 2014-02-06 23:19:34Z eric $
 # Maintainer:
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Yejun Yang <yejunx AT gmail DOT com>
@@ -6,21 +6,27 @@
 
 pkgname=libsrtp
 pkgver=15.1c9bd90
-pkgrel=2
+pkgrel=3
 pkgdesc="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
 url="http://srtp.sourceforge.net/srtp.html"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('glibc')
 makedepends=('git')
-source=("git://git.linphone.org/srtp.git#commit=1c9bd90")
-md5sums=('SKIP')
+source=("git://git.linphone.org/srtp.git#commit=1c9bd90" 7713d5706524f9f1ee94fd6b55125357e63656d5.patch)
+md5sums=('SKIP'
+         '33b3ba860560a4d9dee244caf73eceef')
 
 pkgver() {
   cd srtp
   echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
 }
 
+prepare() {
+  cd srtp
+  patch -p1 -i ../7713d5706524f9f1ee94fd6b55125357e63656d5.patch
+}
+
 build() {
   cd srtp
   autoconf
diff --git a/extra/libssh/0004-reset-global-request-status.patch b/extra/libssh/0004-reset-global-request-status.patch
new file mode 100644
index 000000000..760f3497a
--- /dev/null
+++ b/extra/libssh/0004-reset-global-request-status.patch
@@ -0,0 +1,18 @@
+Description: Allow requesting more than one channel per session.
+Author: Andreas Schneider <asn@cryptomilk.org>
+Abstract:
+ In the 0.5.x series of libssh only one channel request per session
+ is possible. This blocks using libssh client sessions which require
+ requesting multiple channels on a single SSH connection.
+Origin: http://git.libssh.org/projects/libssh.git/commit/src/channels.c?id=e30acdb58a86937e8bece57ce47e272f1106ca55
+--- a/src/channels.c
++++ b/src/channels.c
+@@ -1951,7 +1951,7 @@
+       break;
+ 
+   }
+-
++  session->global_req_state = SSH_CHANNEL_REQ_STATE_NONE;
+   leave_function();
+   return rc;
+ error:
diff --git a/extra/libssh/0005-multi-reverse-fwd.patch b/extra/libssh/0005-multi-reverse-fwd.patch
new file mode 100644
index 000000000..0771e8c4d
--- /dev/null
+++ b/extra/libssh/0005-multi-reverse-fwd.patch
@@ -0,0 +1,85 @@
+Description: Allow requesting multiple reverse port forwarding tunnels per connection
+Author: Oleksandr Shneyder <o.schneyder@phoca-gmbh.de>
+Abstract:
+ Channel: Add ssh_channel_accept_forward().
+ .
+ This new function works the same way as ssh_forward_accept()
+ but can return a destination port of the channel (useful if
+ SSH connection is supposed to reverse forward multiple TCP/IP
+ ports).
+Origin: http://git.libssh.org/projects/libssh.git/commit/?id=a1c4fc07d43fb7a7e1e91bfdadbd3dc62b8ce462
+--- a/include/libssh/libssh.h
++++ b/include/libssh/libssh.h
+@@ -371,6 +371,7 @@
+ LIBSSH_API char *ssh_dirname (const char *path);
+ LIBSSH_API int ssh_finalize(void);
+ LIBSSH_API ssh_channel ssh_forward_accept(ssh_session session, int timeout_ms);
++LIBSSH_API ssh_channel ssh_channel_accept_forward(ssh_session session, int timeout_ms, int *destination_port);
+ LIBSSH_API int ssh_forward_cancel(ssh_session session, const char *address, int port);
+ LIBSSH_API int ssh_forward_listen(ssh_session session, const char *address, int port, int *bound_port);
+ LIBSSH_API void ssh_free(ssh_session session);
+--- a/src/channels.c
++++ b/src/channels.c
+@@ -1755,7 +1755,7 @@
+ }
+ 
+ static ssh_channel ssh_channel_accept(ssh_session session, int channeltype,
+-    int timeout_ms) {
++    int timeout_ms, int *destination_port) {
+ #ifndef _WIN32
+   static const struct timespec ts = {
+     .tv_sec = 0,
+@@ -1779,6 +1779,10 @@
+             ssh_message_subtype(msg) == channeltype) {
+           ssh_list_remove(session->ssh_message_list, iterator);
+           channel = ssh_message_channel_request_open_reply_accept(msg);
++          if(destination_port) {
++            *destination_port=msg->channel_request_open.destination_port;
++          }
++
+           ssh_message_free(msg);
+           return channel;
+         }
+@@ -1809,7 +1813,7 @@
+  *                      the server.
+  */
+ ssh_channel ssh_channel_accept_x11(ssh_channel channel, int timeout_ms) {
+-  return ssh_channel_accept(channel->session, SSH_CHANNEL_X11, timeout_ms);
++  return ssh_channel_accept(channel->session, SSH_CHANNEL_X11, timeout_ms, NULL);
+ }
+ 
+ /**
+@@ -1857,7 +1861,7 @@
+   } else {
+     session->global_req_state=SSH_CHANNEL_REQ_STATE_DENIED;
+   }
+-
++  session->global_req_state = SSH_CHANNEL_REQ_STATE_NONE;
+   leave_function();
+   return SSH_PACKET_USED;
+ 
+@@ -2027,7 +2031,23 @@
+  *         the server
+  */
+ ssh_channel ssh_forward_accept(ssh_session session, int timeout_ms) {
+-  return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms);
++  return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms, NULL);
++}
++
++/**
++ * @brief Accept an incoming TCP/IP forwarding channel and get information
++ * about incomming connection
++ * @param[in]  session    The ssh session to use.
++ *
++ * @param[in]  timeout_ms A timeout in milliseconds.
++ *
++ * @param[in]  destination_port A pointer to destination port or NULL.
++ *
++ * @return Newly created channel, or NULL if no incoming channel request from
++ *         the server
++ */
++ssh_channel ssh_channel_accept_forward(ssh_session session, int timeout_ms, int* destination_port) {
++  return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms, destination_port);
+ }
+ 
+ /**
diff --git a/extra/libssh/PKGBUILD b/extra/libssh/PKGBUILD
index b2c484a0c..dd27a8349 100644
--- a/extra/libssh/PKGBUILD
+++ b/extra/libssh/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195938 2013-10-05 20:32:06Z tomegun $
+# $Id: PKGBUILD 204549 2014-01-22 12:35:17Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: ice-man <icemanf@gmail.com>
@@ -6,17 +6,29 @@
 
 pkgname=libssh
 pkgver=0.5.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for accessing ssh client services through C libraries"
 url="http://www.libssh.org/"
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('openssl')
+depends=('zlib' 'openssl')
 makedepends=('cmake' 'doxygen')
-source=("https://red.libssh.org/attachments/download/51/${pkgname}-${pkgver}.tar.gz")
+source=(https://red.libssh.org/attachments/download/51/${pkgname}-${pkgver}.tar.gz
+        0004-reset-global-request-status.patch
+        0005-multi-reverse-fwd.patch)
+md5sums=('bb308196756c7255c0969583d917136b'
+         '0d8c28906b07e31466157b1fda441f4a'
+         '6fa3a1a4f448e85a7eb39360f4a72ce9')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # add multiple channels on a single SSH connection required by X2goclient
+  # see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=736231
+  patch -Np1 -i ${srcdir}/0004-reset-global-request-status.patch
+  patch -Np1 -i ${srcdir}/0005-multi-reverse-fwd.patch
+}
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -26,7 +38,6 @@ build() {
 }
 
 package(){
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('bb308196756c7255c0969583d917136b')
diff --git a/extra/libva-intel-driver/Adjust_the_default_value_for_contrast_saturation.patch b/extra/libva-intel-driver/Adjust_the_default_value_for_contrast_saturation.patch
new file mode 100644
index 000000000..ea3fc7c0a
--- /dev/null
+++ b/extra/libva-intel-driver/Adjust_the_default_value_for_contrast_saturation.patch
@@ -0,0 +1,27 @@
+From 54cb60f3d973ce6a908ea57f5aa7481803fe653a Mon Sep 17 00:00:00 2001
+From: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Mon, 30 Dec 2013 05:15:40 +0000
+Subject: Render: Adjust the default value for contrast/saturation
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73016
+Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+Tested-by: Mark Lee <mark@markelee.com>
+---
+diff --git a/src/i965_drv_video.h b/src/i965_drv_video.h
+index ccf9a59..773c8ca 100644
+--- a/src/i965_drv_video.h
++++ b/src/i965_drv_video.h
+@@ -60,9 +60,9 @@
+ #define I965_SURFACE_FLAG_BOTTOME_FIELD_FIRST   0x00000002
+ 
+ #define DEFAULT_BRIGHTNESS      0
+-#define DEFAULT_CONTRAST        10
++#define DEFAULT_CONTRAST        50
+ #define DEFAULT_HUE             0
+-#define DEFAULT_SATURATION      10
++#define DEFAULT_SATURATION      50
+ 
+ struct i965_surface
+ {
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/libva-intel-driver/PKGBUILD b/extra/libva-intel-driver/PKGBUILD
index e0766f72d..efbef8f37 100644
--- a/extra/libva-intel-driver/PKGBUILD
+++ b/extra/libva-intel-driver/PKGBUILD
@@ -1,17 +1,25 @@
-# $Id: PKGBUILD 202383 2013-12-21 14:15:26Z bpiotrowski $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 203091 2014-01-04 08:08:06Z bpiotrowski $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 
 pkgname=libva-intel-driver
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc='VA-API implementation for Intel G45 and HD Graphics family'
 arch=('i686' 'x86_64')
 url='http://freedesktop.org/wiki/Software/vaapi'
 license=('MIT')
 depends=('libva')
 replaces=('libva-driver-intel')
-source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('ece479b51926764edd2be6599f9c067cae2a3942')
+source=(http://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2
+        Adjust_the_default_value_for_contrast_saturation.patch)
+sha1sums=('ece479b51926764edd2be6599f9c067cae2a3942'
+          'f2c2c40512b8c209dc7aefb8b20ad02bb9471a3f')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../Adjust_the_default_value_for_contrast_saturation.patch
+}
 
 build() {
   cd $pkgname-$pkgver
@@ -22,7 +30,5 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-  install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/libvisio/PKGBUILD b/extra/libvisio/PKGBUILD
new file mode 100644
index 000000000..8e1678d38
--- /dev/null
+++ b/extra/libvisio/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 204534 2014-01-22 11:23:30Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
+# Contributor: philacs
+
+pkgname=libvisio
+pkgver=0.0.31
+pkgrel=2
+pkgdesc='Library providing ability to interpret and import visio diagrams'
+arch=('i686' 'x86_64')
+url='http://www.freedesktop.org/wiki/Software/libvisio'
+license=('LGPL')
+depends=('libwpd' 'libwpg' 'libxml2' 'gperf' 'icu')
+makedepends=('boost')
+source=(http://dev-www.libreoffice.org/src/$pkgname-$pkgver.tar.xz)
+md5sums=('12ceec054cdec55b4dc9fc931507d1cd')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD
index a87787f2e..5b85ac999 100644
--- a/extra/libvncserver/PKGBUILD
+++ b/extra/libvncserver/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 196982 2013-10-21 12:18:29Z andrea $
+# $Id: PKGBUILD 203588 2014-01-13 17:12:20Z andyrtr $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libvncserver
 pkgver=0.9.9
-pkgrel=2
+pkgrel=3
 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')
+depends=('libjpeg' 'gnutls' 'libgcrypt')
 source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz")
 md5sums=('70422169b122765693d2a294d13e3714')
 
diff --git a/extra/libvorbis/PKGBUILD b/extra/libvorbis/PKGBUILD
index 1adb7a786..7ece55f2b 100644
--- a/extra/libvorbis/PKGBUILD
+++ b/extra/libvorbis/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 198262 2013-10-30 13:48:00Z allan $
+# $Id: PKGBUILD 204644 2014-01-24 14:22:14Z tomegun $
 # Maintainer: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=libvorbis
-pkgver=1.3.3
-pkgrel=1.2
+pkgver=1.3.4
+pkgrel=1
 pkgdesc="Vorbis codec library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xiph.org/vorbis/"
 license=('BSD')
 depends=('libogg')
 source=(http://downloads.xiph.org/releases/vorbis/${pkgname}-${pkgver}.tar.gz)
-md5sums=('6b1a36f0d72332fae5130688e65efe1f')
+md5sums=('8851c593a52d1ef9c526d95174873852')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD
index f99975cc0..ab4b5cb01 100644
--- a/extra/libwebp/PKGBUILD
+++ b/extra/libwebp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198264 2013-10-30 13:48:46Z allan $
+# $Id: PKGBUILD 205027 2014-02-03 10:02:57Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jon Nordby <jononor@gmail.com>
 
 pkgname=libwebp
-pkgver=0.3.1
-pkgrel=3
+pkgver=0.4.0
+pkgrel=1
 pkgdesc="WebP library and conversion tools"
 arch=('x86_64' 'i686' 'mips64el')
 url="https://developers.google.com/speed/webp/"
@@ -14,7 +14,7 @@ depends=(libpng libjpeg libtiff giflib)
 makedepends=(freeglut mesa glu)
 optdepends=('freeglut: vwebp viewer')
 source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha256sums=('b37932c625322a69fe4e9b88884b5c7aed2b3eaf9fd5e5b480aee339a92e6ee7')
+sha256sums=('31913577e96386556855b41d210736449445fe96cfbe9289014e9b8afa944d69')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libxfont/PKGBUILD b/extra/libxfont/PKGBUILD
index 2dad72df4..331d525ea 100644
--- a/extra/libxfont/PKGBUILD
+++ b/extra/libxfont/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198282 2013-10-30 13:55:08Z allan $
+# $Id: PKGBUILD 203296 2014-01-07 17:59:08Z lcarlier $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxfont
-pkgver=1.4.6
+pkgver=1.4.7
 pkgrel=1
 pkgdesc="X11 font rasterisation library"
 arch=(i686 x86_64 'mips64el')
@@ -11,7 +11,7 @@ license=('custom')
 depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto')
 makedepends=('xorg-util-macros' 'xtrans')
 source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2)
-sha256sums=('d0cbfe4554dc17ceea413cdad5601d35ed8d05d5b880e60931a8775fd1157e9f')
+sha256sums=('d16ea3541835d296b19cfb05d7e64fc62173d8e7eb93284402ec761b951d1543')
 
 build() {
   cd "${srcdir}/libXfont-${pkgver}"
diff --git a/extra/libxkbcommon/PKGBUILD b/extra/libxkbcommon/PKGBUILD
index 0e90dbb98..9ec2205e2 100644
--- a/extra/libxkbcommon/PKGBUILD
+++ b/extra/libxkbcommon/PKGBUILD
@@ -1,29 +1,48 @@
-# $Id: PKGBUILD 200283 2013-11-24 18:55:11Z heftig $
+# $Id: PKGBUILD 204980 2014-02-02 18:43:24Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Daniel Micay <danielmicay@gmail.com>
 # Contributor: Mladen Pejakovic <pejakm@gmail.com>
 
-pkgname=libxkbcommon
-pkgver=0.3.2
+pkgbase=libxkbcommon
+pkgname=(libxkbcommon libxkbcommon-x11)
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="Keyboard handling library using XKB data"
 arch=(i686 x86_64 mips64el)
 url="http://xkbcommon.org/"
 license=(custom)
 depends=(xkeyboard-config glibc)
-makedepends=(doxygen xorg-util-macros)
+makedepends=(libxcb doxygen xorg-util-macros)
 source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz")
-#source=("$pkgname-$pkgver::git://github.com/xkbcommon/$pkgname.git")
-md5sums=('935cf416354bf05210de2e389484f7e8')
+md5sums=('bb782f1700e45b4f57c84ef513e3cf85')
+
+prepare() {
+  mkdir -p x11/usr/{include/xkbcommon,lib/pkgconfig}
+}
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgbase-$pkgver
   ./configure --prefix=/usr --disable-static
   make
 }
 
-package() {
-  cd $pkgname-$pkgver
+package_libxkbcommon() {
+  cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/libxkbcommon/LICENSE"
+
+### Split libxkbcommon-x11
+
+  mv "$pkgdir"/usr/lib/*x11* "$srcdir/x11/usr/lib"
+  mv "$pkgdir"/usr/lib/pkgconfig/*x11* "$srcdir/x11/usr/lib/pkgconfig"
+  mv "$pkgdir"/usr/include/xkbcommon/*x11* "$srcdir/x11/usr/include/xkbcommon"
+}
+
+package_libxkbcommon-x11() {
+  pkgdesc="Keyboard handling library using XKB data for X11 XCB clients"
+  depends=(libxkbcommon libxcb)
+
+  mv x11/* "$pkgdir"
+
+  install -Dm644 $pkgbase-$pkgver/COPYING "$pkgdir/usr/share/licenses/libxkbcommon-x11/LICENSE"
 }
diff --git a/extra/libxslt/PKGBUILD b/extra/libxslt/PKGBUILD
index 1dc4aff57..55aa3596f 100644
--- a/extra/libxslt/PKGBUILD
+++ b/extra/libxslt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198296 2013-10-30 14:00:12Z allan $
+# $Id: PKGBUILD 203589 2014-01-13 17:12:21Z andyrtr $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=libxslt
 pkgver=1.1.28
-pkgrel=2
+pkgrel=3
 pkgdesc="XML stylesheet transformation library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmlsoft.org/XSLT/"
diff --git a/extra/libzip/PKGBUILD b/extra/libzip/PKGBUILD
index 17451905a..33f43b7dd 100644
--- a/extra/libzip/PKGBUILD
+++ b/extra/libzip/PKGBUILD
@@ -1,34 +1,31 @@
-# $Id: PKGBUILD 199973 2013-11-20 12:11:27Z allan $
+# $Id: PKGBUILD 203557 2014-01-13 16:33:14Z lcarlier $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libzip
-pkgver=0.11.1
-pkgrel=2
+pkgver=0.11.2
+pkgrel=1
 pkgdesc="A C library for reading, creating, and modifying zip archives"
 url="http://www.nih.at/libzip/index.html"
 license=('BSD')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('zlib')
-source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.xz"
-        'fix-headers.patch')
-md5sums=('87d5ec3629f6ad2a4b01ad961e7f0c19'
-         '249395bd3a426c4c4e993e9d4753e1dd')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}/fix-headers.patch"
-}
+source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('44c99b67dca34707b5728e5f8434fe91')
 
 build() {
   cd ${pkgname}-${pkgver}
-  autoreconf -i
+
   ./configure --prefix=/usr
   make
 }
 
 package() {
   cd ${pkgname}-${pkgver}
+
   make DESTDIR="${pkgdir}" install
+
+  # preserve old header path for compatibility
+  ln -s /usr/lib/libzip/include/zipconf.h "${pkgdir}/usr/include/zipconf.h"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index 878bac376..41606ec98 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 199543 2013-11-15 09:39:54Z pierre $
+# $Id: PKGBUILD 204468 2014-01-20 16:04:30Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
-pkgver=1.4.33
-pkgrel=3
+pkgver=1.4.34
+pkgrel=1
 pkgdesc='A secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,37 +19,14 @@ 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"
-        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_setuid.patch"
-        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_setuid.patch.asc"
-        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_fam_use_after_free.patch"
-        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_fam_use_after_free.patch.asc"
-        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_ssl_sni.patch"
-        "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_ssl_sni.patch.asc"
         'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
-sha256sums=('2886aedc23857ca44df91b8fe6f36059ec82a859ae0eb230220e42abc331610c'
-            'SKIP'
-            '87792bcf62a554ac094263b931a8ae369d975b7e6bf83778f8f0a6c0ff31b979'
-            'SKIP'
-            '1772cae2a0678c93dd5fa54f2622a563c3eb0a0047ba2a6648a5680d50d3bfde'
-            'SKIP'
-            'babf177f2e88a1444550825ce8e8ad1a95dbc78cfaa59c2c3f121ccbb37799d2'
+sha256sums=('3e067bd12a6c953862139f0ee4cb03a0cd8cff9b3ffe393ddc7dc3956431cb72'
             'SKIP'
             '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe'
             'fece4581bebf39768571962dedce176b2b5f487c0abb5c1cfb35395de216c01f'
             'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871'
             '503fd8557297f4fb814d74effcb59633135b3c2407a87f5abe97467f0822c147')
 
-prepare() {
-	cd $srcdir/$pkgname-$pkgver
-
-	# http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_02.txt
-	patch -p1 -i $srcdir/lighttpd-1.4.33_fix_setuid.patch
-	# http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_03.txt
-	patch -p1 -i $srcdir/lighttpd-1.4.33_fix_fam_use_after_free.patch
-	# http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_01.txt
-	patch -p1 -i $srcdir/lighttpd-1.4.33_fix_ssl_sni.patch
-}
-
 build() {
 	cd $srcdir/$pkgname-$pkgver
 
diff --git a/extra/lilv/PKGBUILD b/extra/lilv/PKGBUILD
index 9b58dff47..afacf9f9f 100644
--- a/extra/lilv/PKGBUILD
+++ b/extra/lilv/PKGBUILD
@@ -3,27 +3,21 @@
 # Contributor: speps <speps at aur dot archlinux dot org>
 
 pkgname=lilv
-pkgver=0.16.0
+pkgver=0.18.0
 pkgrel=1
-pkgdesc="A library to make the use of LV2 plugins as simple as possible for applications"
+pkgdesc="A C library interface to the LV2 plug-in standard"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://drobilla.net/software/lilv/"
 license=('custom:ISC')
-depends=('python2' 'sratom>=0.4.2' 'jack')
+depends=('python2-numpy' 'sratom>=0.4.4' 'jack')
 makedepends=('swig')
-optdepends=('bash-completion: auto-complete words')
-source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2"
-        'lilvmm.patch')
-md5sums=('12eb71f2b5b8a68e15c1c816896bcb9f'
-         'd34207f8ca3586650ad7c50284ffb3e0')
+optdepends=('bash-completion')
+source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
+md5sums=('1d1232ea73b239551bb4f462b414a819')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # fix UI API error
-  # backport of http://dev.drobilla.net/changeset/5092
-  patch -Np2 -i "$srcdir/lilvmm.patch"
-
   # pick up python2 even when python3 exists
   # (the build system has flaky support for python3)
   export PYTHON="/usr/bin/python2"
diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD
index d3eb47cbf..134debaa0 100644
--- a/extra/link-grammar/PKGBUILD
+++ b/extra/link-grammar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 200788 2013-12-05 08:49:59Z giovanni $
+# $Id: PKGBUILD 206039 2014-02-16 09:24:10Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=link-grammar
-pkgver=4.8.2
+pkgver=4.8.6
 pkgrel=1
 pkgdesc="A Grammar Checking library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('aspell')
 options=('!makeflags')
 source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('57eb0738c57a177e2e76f0b398af811d')
+md5sums=('12058702fb9434254a47d09a9c661acb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index da1130f5e..8d379f34b 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 200849 2013-12-06 11:57:53Z giovanni $
+# $Id: PKGBUILD 206041 2014-02-16 09:28:28Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2013.12.05
+pkgver=2014.02.13
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 options=('staticlibs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('7f3d0e17b6d894a3140c35f9091a8a70')
+md5sums=('4f9078a8d03807b5468e961c999d6c66')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index 46ce04290..1e80a5810 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197048 2013-10-21 14:52:40Z foutrelis $
+# $Id: PKGBUILD 203529 2014-01-12 20:24:07Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -9,8 +9,9 @@
 # Contributor: Roberto Alsina <ralsina@kde.org>
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
-pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'clang' 'clang-analyzer')
-pkgver=3.3
+pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'clang' 'clang-analyzer'
+         'clang-tools-extra')
+pkgver=3.4
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://llvm.org/"
@@ -18,40 +19,41 @@ 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/clang-$pkgver.src.tar.gz
+        http://llvm.org/releases/$pkgver/clang-tools-extra-$pkgver.src.tar.gz
         http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.gz
         clang-3.3-use-gold-linker.patch
         llvm-Config-config.h
         llvm-Config-llvm-config.h)
-sha256sums=('68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578'
-            'b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996'
-            '0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423'
+sha256sums=('25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628'
+            '22a9780db3b85a7f2eb9ea1f7f6e00da0249e3d12851e8dea0f62f1783242b1b'
+            'ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4'
+            'f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c'
             '8240adda155d7961eeb5d07ed50ead10cb7125f70283dff7f1c9fee9df3cea09'
             '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
             '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
 
 prepare() {
-  cd "$srcdir/llvm-$pkgver.src"
+  cd "$srcdir/llvm-$pkgver"
 
   # At the present, clang must reside inside the LLVM source code tree to build
   # See http://llvm.org/bugs/show_bug.cgi?id=4840
-  mv "$srcdir/cfe-$pkgver.src" tools/clang
+  mv "$srcdir/clang-$pkgver" tools/clang
 
-  mv "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt
+  mv "$srcdir/clang-tools-extra-$pkgver" tools/clang/tools/extra
+
+  mv "$srcdir/compiler-rt-$pkgver" projects/compiler-rt
 
   # Fix docs installation directory
   sed -i 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
     Makefile.config.in
 
-  # Fix insecure rpath (http://bugs.archlinux.org/task/14017)
-  sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
-
   # Make -flto work; use ld.gold instead of the default linker
   patch -d tools/clang -Np1 -i "$srcdir/clang-3.3-use-gold-linker.patch"
 }
 
 build() {
-  cd "$srcdir/llvm-$pkgver.src"
+  cd "$srcdir/llvm-$pkgver"
 
   # Apply strip option to configure
   _optimized_switch="enable"
@@ -68,7 +70,6 @@ build() {
     --enable-shared \
     --enable-libffi \
     --enable-targets=all \
-    --enable-experimental-targets=R600 \
     --disable-expensive-checks \
     --disable-debug-runtime \
     --disable-assertions \
@@ -86,7 +87,7 @@ package_llvm() {
   pkgdesc="Low Level Virtual Machine"
   depends=("llvm-libs=$pkgver-$pkgrel" 'perl')
 
-  cd "$srcdir/llvm-$pkgver.src"
+  cd "$srcdir/llvm-$pkgver"
 
   # We move the clang directory out of the tree so it won't get installed and
   # then we bring it back in for the clang package
@@ -140,11 +141,11 @@ package_llvm() {
 
 package_llvm-libs() {
   pkgdesc="Low Level Virtual Machine (runtime library)"
-  depends=('gcc-libs' 'zlib' 'libffi')
+  depends=('gcc-libs' 'zlib' 'libffi' 'ncurses')
 
   install -D "$srcdir/libLLVM-$pkgver.so" "$pkgdir/usr/lib/libLLVM-$pkgver.so"
 
-  install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \
+  install -Dm644 "$srcdir/llvm-$pkgver/LICENSE.TXT" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
@@ -152,7 +153,7 @@ package_llvm-ocaml() {
   pkgdesc="OCaml bindings for LLVM"
   depends=("llvm=$pkgver-$pkgrel" 'ocaml')
 
-  cd "$srcdir/llvm-$pkgver.src"
+  cd "$srcdir/llvm-$pkgver"
 
   install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm}
   cp -r "$srcdir/ocaml" "$pkgdir/usr/lib"
@@ -161,7 +162,7 @@ package_llvm-ocaml() {
   # Remove execute bit from static libraries
   chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a
 
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE"
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 package_clang() {
@@ -171,23 +172,35 @@ package_clang() {
 
   # Fix installation path for clang docs
   sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \
-    "$srcdir/llvm-$pkgver.src/Makefile.config"
+    "$srcdir/llvm-$pkgver/Makefile.config"
+
+  cd "$srcdir/llvm-$pkgver/tools/clang"
+
+  # We move the extra tools directory out of the tree so it won't get
+  # installed and then we bring it back in for the clang-tools-extra package
+  mv tools/extra "$srcdir"
 
-  cd "$srcdir/llvm-$pkgver.src/tools/clang"
   make DESTDIR="$pkgdir" install
+  mv "$srcdir/extra" tools/
 
   # Fix permissions of static libs
   chmod -x "$pkgdir"/usr/lib/*.a
 
   # Revert the path change in case we want to do a repackage later
   sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \
-    "$srcdir/llvm-$pkgver.src/Makefile.config"
+    "$srcdir/llvm-$pkgver/Makefile.config"
 
   # Install html docs
   cp -r docs/_build/html/* "$pkgdir/usr/share/doc/$pkgname/html/"
   rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources"
 
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE"
+  # Install Python bindings
+  install -d "$pkgdir/usr/lib/python2.7/site-packages"
+  cp -r bindings/python/clang "$pkgdir/usr/lib/python2.7/site-packages/"
+  python2 -m compileall "$pkgdir/usr/lib/python2.7/site-packages/clang"
+  python2 -O -m compileall "$pkgdir/usr/lib/python2.7/site-packages/clang"
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 package_clang-analyzer() {
@@ -195,7 +208,7 @@ package_clang-analyzer() {
   url="http://clang-analyzer.llvm.org/"
   depends=("clang=$pkgver-$pkgrel" 'python2')
 
-  cd "$srcdir/llvm-$pkgver.src/tools/clang"
+  cd "$srcdir/llvm-$pkgver/tools/clang"
 
   install -d "$pkgdir"/usr/{bin,lib/clang-analyzer}
   for _tool in scan-{build,view}; do
@@ -222,7 +235,22 @@ package_clang-analyzer() {
   python2 -m compileall "$pkgdir/usr/lib/clang-analyzer"
   python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer"
 
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE"
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_clang-tools-extra() {
+  pkgdesc="Extra tools built using Clang's tooling APIs"
+  url="http://clang.llvm.org/"
+  depends=("clang=$pkgver-$pkgrel")
+
+  cd "$srcdir/llvm-$pkgver/tools/clang/tools/extra"
+
+  make DESTDIR="$pkgdir" install
+
+  # Fix permissions of static libs
+  chmod -x "$pkgdir"/usr/lib/*.a
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD
index a68e230c5..fe6d8eb12 100644
--- a/extra/lm_sensors/PKGBUILD
+++ b/extra/lm_sensors/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 186563 2013-05-29 04:09:51Z eric $
+# $Id: PKGBUILD 204568 2014-01-22 23:53:58Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=lm_sensors
-pkgver=3.3.4
+pkgver=3.3.5
 pkgrel=1
 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,27 +11,22 @@ license=('GPL' 'LGPL')
 depends=('perl' 'sysfsutils')
 makedepends=('rrdtool')
 optdepends=('rrdtool: for logging with sensord')
-backup=('etc/sensors3.conf' 'etc/healthd.conf')
-options=('!emptydirs')
-source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \
-	healthd healthd.conf fancontrol.service sensord.service healthd.service \
-        linux_3.0.patch lm_sensors-fancontrol.patch)
-sha1sums=('4e62538ca99973ff505f2eeb5b841bb402e996d8'
+backup=('etc/sensors3.conf' 'etc/healthd.conf' 'etc/conf.d/sensord')
+source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig}
+	healthd healthd.conf healthd.service sensord.conf
+        lm_sensors-fancontrol.patch)
+sha1sums=('179989a52bae8f01ba8ed77e8a15af6ec653d89e'
           'SKIP'
           '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5'
-          '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'
-          '73cd658f4a418197dc75f65d6d309701c72cfd81'
-          'cea1ff07374a784cc4be1d28dc6c80641fcae99d'
+          '1edd4d72ade22adfc128fb8d670e85c633fd1d18'
           'd72ec328e9303acef86342483b6f8537de6117d9'
-          '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c'
+          'f4b5f21fdb3b2a55aa353afa1603f953b207b73b'
           'b0bc977348610d6a008d75a43f65800251c4c9f7')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/lm_sensors.service}
-  sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect
+  sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/{sensord,lm_sensors}.service}
   sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service
-  patch -p0 -i "${srcdir}/linux_3.0.patch"
   patch -p0 -i "${srcdir}/lm_sensors-fancontrol.patch"
 }
 
@@ -44,10 +39,12 @@ package() {
   cd ${pkgname}-${pkgver}
   make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
     PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
-  install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service"
+
   install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/bin/healthd"
+
   install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf"
-  install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service"
-  install -D -m644 "${srcdir}/sensord.service" "${pkgdir}/usr/lib/systemd/system/sensord.service"
+  install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord"
+ 
   install -D -m644 "${srcdir}/healthd.service" "${pkgdir}/usr/lib/systemd/system/healthd.service"
+  install -D -m644 prog/init/*.service "${pkgdir}/usr/lib/systemd/system/"
 }
diff --git a/extra/lm_sensors/fancontrol.service b/extra/lm_sensors/fancontrol.service
deleted file mode 100644
index 813dbd60d..000000000
--- a/extra/lm_sensors/fancontrol.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Fan control daemon
-
-[Service]
-PIDFile=/var/run/fancontrol.pid
-ExecStart=/usr/bin/fancontrol
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/lm_sensors/healthd.conf b/extra/lm_sensors/healthd.conf
index a8b2c3fa3..8df3e399d 100644
--- a/extra/lm_sensors/healthd.conf
+++ b/extra/lm_sensors/healthd.conf
@@ -1,5 +1,5 @@
 #
-# /etc/conf.d/healthd
+# /etc/healthd.conf
 #
 
 # reset any pending alarms on startup
diff --git a/extra/lm_sensors/linux_3.0.patch b/extra/lm_sensors/linux_3.0.patch
deleted file mode 100644
index da02a3d49..000000000
--- a/extra/lm_sensors/linux_3.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- prog/detect/sensors-detect	2011-08-02 10:23:46.000000000 +0200
-+++ prog/detect/sensors-detect	2011-08-02 10:24:04.000000000 +0200
-@@ -2472,7 +2472,7 @@
- 
- sub initialize_kernel_version
- {
--	`uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
-+	`uname -r` =~ /(\d+)\.(\d+)(.*)/;
- 	@kernel_version = ($1, $2, $3, $4);
- 	chomp($kernel_arch = `uname -m`);
- 
diff --git a/extra/lm_sensors/sensord.conf b/extra/lm_sensors/sensord.conf
new file mode 100644
index 000000000..133783aa8
--- /dev/null
+++ b/extra/lm_sensors/sensord.conf
@@ -0,0 +1,9 @@
+#
+# /etc/conf.d/sensord
+#
+
+#Specify the interval between scanning for sensor alarms
+INTERVAL=60s
+
+#Specify the interval between logging all sensor readings
+LOG_INTERVAL=30m
diff --git a/extra/lm_sensors/sensord.service b/extra/lm_sensors/sensord.service
deleted file mode 100644
index 1d62ab9e8..000000000
--- a/extra/lm_sensors/sensord.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Sensor information logging daemon
-
-[Service]
-PIDFile=/var/run/sensord.pid
-ExecStart=/usr/bin/sensord
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/lv2/PKGBUILD b/extra/lv2/PKGBUILD
index a970b50b5..a6ab5d8bf 100644
--- a/extra/lv2/PKGBUILD
+++ b/extra/lv2/PKGBUILD
@@ -1,35 +1,36 @@
-# $Id: PKGBUILD 192433 2013-08-11 16:50:46Z schiv $
+# $Id: PKGBUILD 204702 2014-01-25 13:01:18Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 
 pkgname=lv2
-pkgver=1.6.0
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="Successor to the LADSPA audio plug-in standard"
 url="http://lv2plug.in/"
 license=('LGPL' 'custom')
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('python2' 'libsndfile' 'gtk2')
-optdepends=('libsndfile: lv2-eg-sampler'
-            'gtk2: lv2-eg-sampler')
+optdepends=('libsndfile: Example sampler'
+            'gtk2: Example sampler'
+            'python2: Scripts')
 provides=('lv2core')
 conflicts=('lv2core')
 replaces=('lv2core')
 source=("http://lv2plug.in/spec/$pkgname-$pkgver.tar.bz2")
-md5sums=('943c3a62ec9b4e62139d83f8dd095fab')
+md5sums=('2bdcf01f24fa567448afbf6b8be17044')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
-	python2 waf configure --prefix=/usr
-	python2 waf build $MAKEFLAGS
+  python2 waf configure --prefix=/usr
+  python2 waf build $MAKEFLAGS
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
-	python2 waf install --destdir="$pkgdir"
+  python2 waf install --destdir="$pkgdir"
 
-	install -Dm644 COPYING \
+  install -Dm644 COPYING \
     "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index 495de1fee..46963064d 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 201264 2013-12-07 10:35:03Z bpiotrowski $
+# $Id: PKGBUILD 204817 2014-01-27 20:22:21Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=lyx
-pkgver=2.0.6
-pkgrel=4
+pkgver=2.0.7
+pkgrel=1
 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lyx.org"
@@ -18,7 +18,7 @@ install=lyx.install
 options=('emptydirs')
 source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz
         lyx.desktop lyxrc.dist)
-sha1sums=('d73ba7a5e796acdf32282207be0b29d66411c5f8'
+sha1sums=('4d54eb0cf98b0a44b5156ec84932e58c9c0efb07'
           'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad'
           '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
 
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
index 92322d3aa..734ac09b7 100644
--- a/extra/mariadb/PKGBUILD
+++ b/extra/mariadb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 200716 2013-12-03 07:22:47Z bpiotrowski $
+# $Id: PKGBUILD 204924 2014-01-31 12:48:39Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
-pkgver=5.5.34
+pkgver=5.5.35
 _pkgver=${pkgver/.a/a}
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://mariadb.org/'
@@ -14,7 +14,7 @@ source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$_pkgver/kvm-tarbake-jaun
         mariadb.service
         mariadb-post.sh
         mariadb-tmpfile.conf)
-sha256sums=('a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89'
+sha256sums=('b47391e5da8ea1a09585411b2a892e2070d097bec6102b0f13640176a1746a4e'
             'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334'
             '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
             '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
@@ -67,11 +67,11 @@ build() {
 
 package_libmariadbclient() {
   pkgdesc='MariaDB client libraries'
-  depends=('openssl' 'libaio')
+  depends=('openssl' 'libaio' 'zlib')
   conflicts=('libmysqlclient')
   provides=("libmysqlclient=$pkgver")
   options=('staticlibs')
-  
+
   cd build
   for dir in include libmysql libmysqld libservices; do
     make -C $dir DESTDIR="$pkgdir" install
@@ -86,10 +86,10 @@ package_libmariadbclient() {
 
 package_mariadb-clients() {
   pkgdesc='MariaDB client tools'
-  depends=('libmariadbclient')
+  depends=('libmariadbclient' 'zlib')
   conflicts=('mysql-clients')
   provides=("mysql-clients=$pkgver")
-  
+
   cd build
   make -C client DESTDIR="$pkgdir" install
 
@@ -135,7 +135,7 @@ package_mariadb() {
   rm usr/lib/libmysql*
   rm -r usr/include/
   rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
-  
+
   # provided by mariadb-clients
   rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
   rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index 1e9de43bf..51a6873d9 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 202771 2013-12-27 14:33:26Z juergen $
+# $Id: PKGBUILD 205937 2014-02-14 10:21:00Z juergen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
-pkgver=5.31.0
+pkgver=5.32.1
 pkgrel=2
 pkgdesc="A sophisticated computer algebra system"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net"
 if [ "${CARCH}" == "mips64el" ] ; then
     depends=('clisp' 'texinfo' 'sh')
 else
-    depends=('sbcl=1.1.14' 'texinfo' 'sh')
+    depends=('sbcl=1.1.15' 'texinfo' 'sh')
 fi
 makedepends=('python2')
 optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
@@ -21,11 +21,11 @@ optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/
 options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima
 install=maxima.install
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop")
-sha1sums=('07623644b2962d68388cfd3f507e3d381e33ce02'                                          
+sha1sums=('8667c9e26fdb2889ceb0641b0abc7372aadd591a'
           '4398ebb1ec85ccfa12f37516a56d60c26f74b18b')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   # set correct python executable to create docs
   sed -i "s|${PYTHONBIN:-python}|python2|" doc/info/extract_categories.sh
@@ -44,15 +44,15 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
   # install some freedesktop.org compatibility
-  install -Dm644 ${srcdir}/${pkgname}.desktop \
-  	${pkgdir}/usr/share/applications/${pkgname}.desktop
+  install -Dm644 "${srcdir}/${pkgname}.desktop" \
+  	"${pkgdir}/usr/share/applications/${pkgname}.desktop"
 
   # make sure, we have a nice icon for the desktop file at the right place ;)
-  install -d ${pkgdir}/usr/share/pixmaps/
+  install -d "${pkgdir}/usr/share/pixmaps/"
   ln -s /usr/share/maxima/${pkgver}/xmaxima/maxima-new.png \
-	${pkgdir}/usr/share/pixmaps/${pkgname}.png
+	"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
 }
diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD
index 451b72649..90408b3ab 100644
--- a/extra/memcached/PKGBUILD
+++ b/extra/memcached/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185263 2013-05-12 16:29:01Z dan $
+# $Id: PKGBUILD 203228 2014-01-05 23:07:05Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Michael Irwin <6d6469@gmail.com>
 
 pkgname=memcached
-pkgver=1.4.15
-pkgrel=2
+pkgver=1.4.17
+pkgrel=1
 pkgdesc="A distributed memory object caching system"
 arch=(i686 x86_64 'mips64el')
 url="http://memcached.org/"
@@ -12,10 +12,10 @@ license=('GPL')
 depends=('libevent')
 optdepends=('perl: for memcached-tool usage')
 install=memcached.install
-source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz
+source=(http://www.memcached.org/files/$pkgname-$pkgver.tar.gz
 		memcached.service)
-sha256sums=('169721ab7a7531add6ae9f6b14b6b5641725fe0b1f0bdf5c3a4327725901e2b4'
-            '453cad82bddb25fac43fd5cedc5702b9b6c6abaf7498e21445facf20f25f53a6')
+sha256sums=('d9173ef6d99ba798c982ea4566cb4f0e64eb23859fdbf9926a89999d8cdc0458'
+            'e768a48192aefa2e2f443c86b3c085043005ffc313da40f3074c060a18c8359d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -23,6 +23,11 @@ build() {
   make
 }
 
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make test
+}
+
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
diff --git a/extra/memcached/memcached.service b/extra/memcached/memcached.service
index c6e15fb7c..8b04b1c35 100644
--- a/extra/memcached/memcached.service
+++ b/extra/memcached/memcached.service
@@ -6,6 +6,7 @@ After=network.target
 User=memcached
 # Remove '-l 127.0.0.1' to listen on all addresses
 ExecStart=/usr/bin/memcached -l 127.0.0.1
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index 75cc48987..1981a47b4 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 200687 2013-12-02 16:02:10Z giovanni $
+# $Id: PKGBUILD 204972 2014-02-02 16:54:39Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.8.1
+pkgver=2.9
 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=('bede5869f9b5d09ab3269bac472495e7'
+md5sums=('de902a5300beb16c778bc88949832e94'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index b7f449906..ac42a2a63 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 201668 2013-12-17 21:04:31Z lcarlier $
+# $Id: PKGBUILD 205069 2014-02-04 11:01:18Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('mesa' 'mesa-libgl')
-pkgver=10.0.1
+pkgver=10.0.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
@@ -17,7 +17,7 @@ url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
         LICENSE)
-md5sums=('0a72ca5b36046a658bf6038326ff32ed'
+md5sums=('5f9f463ef08129f6762106b434910adb'
          '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
@@ -64,8 +64,7 @@ build() {
 
 package_ati-dri() {
   pkgdesc="Mesa drivers for AMD/ATI Radeon"
-  depends=('mesa-libgl' "mesa=${pkgver}")
-  optdepends=('libtxc_dxtn: S3 Texture Compressed support')
+  depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}")
   conflicts=('xf86-video-ati<6.9.0-6')
 
   install -m755 -d ${pkgdir}/usr/lib/vdpau/
@@ -83,8 +82,7 @@ package_ati-dri() {
 
 package_intel-dri() {
   pkgdesc="Mesa drivers for Intel"
-  optdepends=('libtxc_dxtn: S3 Texture Compressed support')
-  depends=('mesa-libgl' "mesa=${pkgver}")
+  depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}")
 
   install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
   mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/
@@ -95,8 +93,7 @@ package_intel-dri() {
 
 package_nouveau-dri() {
   pkgdesc="Mesa drivers for Nouveau"
-  optdepends=('libtxc_dxtn: S3 Texture Compressed support')
-  depends=('mesa-libgl' "mesa=${pkgver}")
+  depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}")
 
   install -m755 -d ${pkgdir}/usr/lib/vdpau/
   mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 50adf382d..211bbb0a6 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 201265 2013-12-07 10:35:05Z bpiotrowski $
+# $Id: PKGBUILD 203527 2014-01-12 13:16:58Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=6.6.0
-pkgrel=3
+pkgver=6.7.0
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 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=('1e952a3196b0c43150801eeaecba68ed')
+md5sums=('27bb6b0a10b3bb2fcf1c3e520c300207')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
   # Disable automagic curl dep used for online update checking
@@ -24,18 +24,25 @@ build() {
   export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
   export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
 
-  autoreconf
+  # Sets number of threads for a parallel build
+  export DRAKETHREADS=4
+
+  autoreconf -vfi
+}
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   ./configure --prefix=/usr \
               --with-boost-libdir=/usr/lib \
               --disable-gui
-  rake
+  ./drake
 
   mv src/mkvinfo{,-cli}
 
   ./configure --prefix=/usr \
               --with-boost-libdir=/usr/lib
-  rake
+  ./drake
 }
 
 package_mkvtoolnix-cli() {
@@ -47,7 +54,7 @@ package_mkvtoolnix-cli() {
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  rake DESTDIR="${pkgdir}" install
+  ./drake DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/usr/bin/mkvinfo
   install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo
 
@@ -70,7 +77,7 @@ package_mkvtoolnix-gtk() {
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  rake DESTDIR="${pkgdir}" install
+  ./drake DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/usr/bin/mkv*
   install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk
   sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop
diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD
index 0ae7bb0a1..8b15eb1a6 100644
--- a/extra/moc/PKGBUILD
+++ b/extra/moc/PKGBUILD
@@ -1,28 +1,26 @@
-# $Id: PKGBUILD 198322 2013-10-30 14:09:45Z allan $
+# $Id: PKGBUILD 205535 2014-02-06 19:58:31Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=moc
-pkgver=2.5beta1
-pkgrel=5
+pkgver=2.5.0beta2
+pkgrel=1
 epoch=1
 pkgdesc="An ncurses console audio player designed to be powerful and easy to use"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://moc.daper.net/"
 license=('GPL')
-depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file' 'popt')
+depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file')
 makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug' 'faad2')
-optdepends=('speex: for using the speex plugin' 
+optdepends=('speex: for using the speex plugin'
 	    'ffmpeg: for using the ffmpeg plugin'
-	    'taglib: for using the musepack plugin' 
-	    'libmpcdec: for using the musepack plugin' 
-            'wavpack: for using the wavpack plugin' 
-            'faad2: for using the aac plugin' 
+	    'taglib: for using the musepack plugin'
+	    'libmpcdec: for using the musepack plugin'
+            'wavpack: for using the wavpack plugin'
+            'faad2: for using the aac plugin'
 	    'libmodplug: for using the modplug plugin')
-source=(ftp://ftp.daper.net/pub/soft/moc/unstable/moc-2.5.0-beta1.tar.bz2{,.sig} \
-        moc-ffmpeg.patch)
-sha1sums=('4030a1fa5c7cfef06909c54d8c7a1fbb93f23caa'
-          '29c232c37e1f3737c3b670372732446e9c0786a8'
-          'f3b8b327dd27d50422b1ad8c9ef89a7366529307')
+source=(http://ftp.daper.net/pub/soft/moc/unstable/moc-${pkgver%b*}-${pkgver#*.*.?}.tar.bz2{,.sig})
+sha1sums=('bf786d719c853c22dec74bc2ee565aae4596fbe7'
+          'SKIP')
 
 # source PKGBUILD && mksource
 mksource() {
@@ -40,13 +38,8 @@ mksource() {
   gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
 }
 
-prepare() {
-  cd ${pkgname}-2.5.0-beta1
-  patch -p0 -i "${srcdir}/moc-ffmpeg.patch"
-}
-
 build() {
-  cd ${pkgname}-2.5.0-beta1
+  cd ${pkgname}-${pkgver%b*}-${pkgver#*.*.?}
   ./configure --prefix=/usr --without-rcc \
     --with-oss --with-alsa --with-jack --with-aac --with-mp3 \
     --with-musepack --with-vorbis --with-flac --with-wavpack \
@@ -56,6 +49,6 @@ build() {
 }
 
 package() {
-  cd ${pkgname}-2.5.0-beta1
+  cd ${pkgname}-${pkgver%b*}-${pkgver#*.*.?}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/moc/moc-ffmpeg.patch b/extra/moc/moc-ffmpeg.patch
deleted file mode 100644
index e268e5427..000000000
--- a/extra/moc/moc-ffmpeg.patch
+++ /dev/null
@@ -1,557 +0,0 @@
-Index: menu.c
-===================================================================
---- menu.c	(revision 2516)
-+++ menu.c	(working copy)
-@@ -90,9 +90,14 @@
- 	getyx (menu->win, y, x);
- 	if (title_width <= title_space || mi->align == MENU_ALIGN_LEFT)
- 		xwaddnstr (menu->win, mi->title, title_space);
--	else
--		xwaddstr (menu->win, mi->title + title_width - title_space);
-+	else {
-+		char *ptr;
- 
-+		ptr = xstrtail (mi->title, title_space);
-+		xwaddstr (menu->win, ptr);
-+		free (ptr);
-+	}
-+
- 	/* Fill the remainder of the title field with spaces. */
- 	if (mi == menu->selected) {
- 		getyx (menu->win, y, ix);
-Index: utf8.c
-===================================================================
---- utf8.c	(revision 2516)
-+++ utf8.c	(working copy)
-@@ -199,47 +199,50 @@
- 
- int xwaddnstr (WINDOW *win, const char *str, const int n)
- {
--	int res;
-+	int res, width, inv_char;
-+	wchar_t *ucs;
-+	char *mstr, *lstr;
-+	size_t size, num_chars;
- 
- 	assert (n > 0);
- 	assert (str != NULL);
- 
--	if (using_utf8) {
-+	mstr = iconv_str (iconv_desc, str);
- 
--		/* This nasty hack is because we need to count n in chars, but
--		 * [w]addnstr() takes arguments in bytes (in UTF-8 a char can be
--		 * longer than 1 byte).  There are also problems with [w]addnwstr()
--		 * (screen garbled).  I have no better idea. */
-+	size = xmbstowcs (NULL, mstr, -1, NULL) + 1;
-+	ucs = (wchar_t *)xmalloc (sizeof(wchar_t) * size);
-+	xmbstowcs (ucs, mstr, size, &inv_char);
-+	width = wcswidth (ucs, WIDTH_MAX);
- 
--		wchar_t *ucs;
--		size_t size;
--		size_t utf_num_chars;
--		int inv_char;
--
--		size = xmbstowcs (NULL, str, -1, NULL) + 1;
--		ucs = (wchar_t *)xmalloc (sizeof(wchar_t) * size);
--		xmbstowcs (ucs, str, size, &inv_char);
--		if ((size_t)n < size - 1)
--			ucs[n] = L'\0';
--		utf_num_chars = wcstombs (NULL, ucs, 0);
--		if (inv_char) {
--			char *utf8 = (char *)xmalloc (utf_num_chars + 1);
--
--			wcstombs (utf8, ucs, utf_num_chars + 1);
--			res = waddstr (win, utf8);
--			free (utf8);
-+	if (width == -1) {
-+		size_t clidx;
-+		for (clidx = 0; clidx < size - 1; clidx++) {
-+			if (wcwidth (ucs[clidx]) == -1)
-+				ucs[clidx] = L'?';
- 		}
--		else
--			res = waddnstr (win, str, utf_num_chars);
--		free (ucs);
-+		width = wcswidth (ucs, WIDTH_MAX);
-+		inv_char = 1;
- 	}
--	else {
--		char *lstr = iconv_str (iconv_desc, str);
- 
--		res = waddnstr (win, lstr, n);
--		free (lstr);
-+	if (width > n) {
-+		while (width > n)
-+			width -= wcwidth (ucs[--size]);
-+		ucs[size] = L'\0';
- 	}
- 
-+	num_chars = wcstombs (NULL, ucs, 0);
-+	lstr = (char *)xmalloc (num_chars + 1);
-+
-+	if (inv_char)
-+		wcstombs (lstr, ucs, num_chars + 1);
-+	else
-+		snprintf (lstr, num_chars + 1, "%s", mstr);
-+
-+	res = waddstr (win, lstr);
-+
-+	free (ucs);
-+	free (lstr);
-+	free (mstr);
- 	return res;
- }
- 
-Index: decoder_plugins/mp3/mp3.c
-===================================================================
---- decoder_plugins/mp3/mp3.c	(revision 2516)
-+++ decoder_plugins/mp3/mp3.c	(working copy)
-@@ -696,17 +696,19 @@
- {
- 	char *ext;
- 
-+	strcpy (buf, "MPx");
-+
- 	ext = ext_pos (file);
--	if (!strcasecmp (ext, "mp3"))
--		strcpy (buf, "MP3");
--	else if (!strcasecmp (ext, "mp2"))
--		strcpy (buf, "MP2");
--	else if (!strcasecmp (ext, "mp1"))
--		strcpy (buf, "MP1");
--	else if (!strcasecmp (ext, "mpga"))
--		strcpy (buf, "MPG");
--	else
--		strcpy (buf, "MPx");
-+	if (ext) {
-+		if (!strcasecmp (ext, "mp3"))
-+			strcpy (buf, "MP3");
-+		else if (!strcasecmp (ext, "mp2"))
-+			strcpy (buf, "MP2");
-+		else if (!strcasecmp (ext, "mp1"))
-+			strcpy (buf, "MP1");
-+		else if (!strcasecmp (ext, "mpga"))
-+			strcpy (buf, "MPG");
-+	}
- }
- 
- static int mp3_our_format_ext (const char *ext)
-Index: decoder_plugins/ffmpeg/ffmpeg.m4
-===================================================================
---- decoder_plugins/ffmpeg/ffmpeg.m4	(revision 2516)
-+++ decoder_plugins/ffmpeg/ffmpeg.m4	(working copy)
-@@ -88,6 +88,25 @@
- 		                 [#include <libavcodec/avcodec.h>])
- 		AC_CHECK_DECLS([AV_CODEC_ID_OPUS], , ,
- 		                 [#include <libavcodec/avcodec.h>])
-+		AC_SEARCH_LIBS(avcodec_free_frame, avcodec,
-+			[AC_DEFINE([HAVE_AVCODEC_FREE_FRAME], 1,
-+				[Define to 1 if you have the `avcodec_free_frame' function.])])
-+		AC_CHECK_DECLS([CODEC_ID_PCM_S8_PLANAR], , ,
-+		                 [#include <libavcodec/avcodec.h>])
-+		AC_CHECK_DECLS([AV_SAMPLE_FMT_U8P], , ,
-+		                 [#include <libavcodec/avcodec.h>])
-+		AC_CHECK_DECLS([AV_SAMPLE_FMT_S16P], , ,
-+		                 [#include <libavcodec/avcodec.h>])
-+		AC_CHECK_DECLS([AV_SAMPLE_FMT_S32P], , ,
-+		                 [#include <libavcodec/avcodec.h>])
-+		AC_CHECK_DECLS([AV_SAMPLE_FMT_FLTP], , ,
-+		                 [#include <libavcodec/avcodec.h>])
-+		AC_SEARCH_LIBS(av_get_sample_fmt_name, avutil,
-+			[AC_DEFINE([HAVE_AV_GET_SAMPLE_FMT_NAME], 1,
-+				[Define to 1 if you have the `av_get_sample_fmt_name' function.])])
-+		AC_SEARCH_LIBS(av_lockmgr_register, avcodec,
-+			[AC_DEFINE([HAVE_LOCKMGR_REGISTER], 1,
-+				[Define to 1 if you have the `av_lockmgr_register' function.])])
- 		CPPFLAGS="$save_CPPFLAGS"
- 		CFLAGS="$save_CFLAGS"
- 		LIBS="$save_LIBS"
-Index: decoder_plugins/ffmpeg/ffmpeg.c
-===================================================================
---- decoder_plugins/ffmpeg/ffmpeg.c	(revision 2516)
-+++ decoder_plugins/ffmpeg/ffmpeg.c	(working copy)
-@@ -99,6 +99,7 @@
- 	bool okay; /* was this stream successfully opened? */
- 	struct decoder_error error;
- 	long fmt;
-+	int sample_width;
- 	int bitrate;            /* in bits per second */
- 	int avg_bitrate;        /* in bits per second */
- #if SEEK_IN_DECODER
-@@ -106,6 +107,7 @@
- 	int seek_sec;           /* second to which to seek */
- #endif
- 	bool seek_broken;       /* FFmpeg seeking is broken */
-+	bool timing_broken;     /* FFmpeg trashes duration and bit_rate */
- #if SEEK_IN_DECODER && defined(DEBUG)
- 	pthread_t thread_id;
- #endif
-@@ -277,8 +279,72 @@
- 	}
- }
- 
-+/* Handle FFmpeg's locking requirements. */
-+#ifdef HAVE_LOCKMGR_REGISTER
-+static int locking_cb (void **mutex, enum AVLockOp op)
-+{
-+	int result;
-+
-+	switch (op) {
-+	case AV_LOCK_CREATE:
-+		*mutex = xmalloc (sizeof (pthread_mutex_t));
-+		result = pthread_mutex_init (*mutex, NULL);
-+		break;
-+	case AV_LOCK_OBTAIN:
-+		result = pthread_mutex_lock (*mutex);
-+		break;
-+	case AV_LOCK_RELEASE:
-+		result = pthread_mutex_unlock (*mutex);
-+		break;
-+	case AV_LOCK_DESTROY:
-+		result = pthread_mutex_destroy (*mutex);
-+		free (*mutex);
-+		*mutex = NULL;
-+		break;
-+	}
-+
-+	return result;
-+}
-+#endif
-+
-+/* Here we attempt to determine if FFmpeg/LibAV has trashed the 'duration'
-+ * and 'bit_rate' fields in AVFormatContext for large files.  Determining
-+ * whether or not they are likely to be valid is imprecise and will vary
-+ * depending (at least) on:
-+ *
-+ * - The file's size,
-+ * - The file's codec,
-+ * - The number and size of tags,
-+ * - The version of FFmpeg/LibAV, and
-+ * - Whether it's FFmpeg or LibAV.
-+ *
-+ * This function represents a best guess.
-+*/
-+static bool is_timing_broken (AVFormatContext *ic)
-+{
-+	int64_t file_size;
-+
-+	if (ic->duration < 0 || ic->bit_rate < 0)
-+		return true;
-+
-+#ifdef HAVE_AVIO_SIZE
-+	file_size = avio_size (ic->pb);
-+#else
-+	file_size = ic->file_size;
-+#endif
-+
-+	if (file_size < UINT32_MAX)
-+		return false;
-+
-+	return true;
-+}
-+
- static void ffmpeg_init ()
- {
-+#ifdef HAVE_LOCKMGR_REGISTER
-+	int rc;
-+#endif
-+
- #ifdef DEBUG
- 	av_log_set_level (AV_LOG_INFO);
- #else
-@@ -291,10 +357,20 @@
- 	supported_extns = lists_strs_new (16);
- 	load_audio_extns (supported_extns);
- 	load_video_extns (supported_extns);
-+
-+#ifdef HAVE_LOCKMGR_REGISTER
-+	rc = av_lockmgr_register (locking_cb);
-+	if (rc < 0)
-+		fatal ("Lock manager initialisation failed");
-+#endif
- }
- 
- static void ffmpeg_destroy ()
- {
-+#ifdef HAVE_LOCKMGR_REGISTER
-+	av_lockmgr_register (NULL);
-+#endif
-+
- 	av_log_set_level (AV_LOG_QUIET);
- 	ffmpeg_log_repeats (NULL);
- 
-@@ -341,9 +417,9 @@
- 	}
- #endif
- 
--	if (tags_sel & TAGS_TIME) {
-+	if (!is_timing_broken (ic) && tags_sel & TAGS_TIME) {
- 		info->time = -1;
--		if (ic->duration >= 0)
-+		if (ic->duration != (int64_t)AV_NOPTS_VALUE && ic->duration >= 0)
- 			info->time = ic->duration / AV_TIME_BASE;
- 	}
- 
-@@ -426,12 +502,6 @@
- 
- #endif
- 
--	if (tags_sel & TAGS_TIME) {
--		info->time = -1;
--		if (ic->duration != (int64_t)AV_NOPTS_VALUE && ic->duration >= 0)
--			info->time = ic->duration / AV_TIME_BASE;
--	}
--
- end:
- #ifdef HAVE_AVFORMAT_CLOSE_INPUT
- 	avformat_close_input (&ic);
-@@ -450,12 +520,16 @@
- 		if (!strcmp (data->ic->iformat->name, "wav")) {
- 			switch (data->enc->codec_id) {
- 			case CODEC_ID_PCM_S8:
-+#if HAVE_DECL_CODEC_ID_PCM_S8_PLANAR
-+			case CODEC_ID_PCM_S8_PLANAR:
-+#endif
- 				result = SFMT_S8;
- 				break;
- 			case CODEC_ID_PCM_U8:
- 				result = SFMT_U8;
- 				break;
- 			case CODEC_ID_PCM_S16LE:
-+			case CODEC_ID_PCM_S16LE_PLANAR:
- 			case CODEC_ID_PCM_S16BE:
- 				result = SFMT_S16;
- 				break;
-@@ -490,15 +564,27 @@
- 
- 	switch (data->enc->sample_fmt) {
- 	case AV_SAMPLE_FMT_U8:
-+#if HAVE_DECL_AV_SAMPLE_FMT_U8P
-+	case AV_SAMPLE_FMT_U8P:
-+#endif
- 		result = SFMT_U8;
- 		break;
- 	case AV_SAMPLE_FMT_S16:
-+#if HAVE_DECL_AV_SAMPLE_FMT_S16P
-+	case AV_SAMPLE_FMT_S16P:
-+#endif
- 		result = SFMT_S16;
- 		break;
- 	case AV_SAMPLE_FMT_S32:
-+#if HAVE_DECL_AV_SAMPLE_FMT_S32P
-+	case AV_SAMPLE_FMT_S32P:
-+#endif
- 		result = SFMT_S32;
- 		break;
- 	case AV_SAMPLE_FMT_FLT:
-+#if HAVE_DECL_AV_SAMPLE_FMT_FLTP
-+	case AV_SAMPLE_FMT_FLTP:
-+#endif
- 		result = SFMT_FLOAT;
- 		break;
- 	default:
-@@ -597,6 +683,7 @@
- 	data->stream = NULL;
- 	data->enc = NULL;
- 	data->codec = NULL;
-+	data->sample_width = 0;
- 	data->bitrate = 0;
- 	data->avg_bitrate = 0;
- 
-@@ -624,6 +711,7 @@
- 	data->seek_sec = 0;
- #endif
- 	data->seek_broken = false;
-+	data->timing_broken = false;
- 
- 	decoder_error_init (&data->error);
- 
-@@ -702,27 +790,38 @@
- 	if (data->fmt == 0)
- 		data->fmt = fmt_from_sample_fmt (data);
- 	if (data->fmt == 0) {
-+#ifdef HAVE_AV_GET_SAMPLE_FMT_NAME
- 		decoder_error (&data->error, ERROR_FATAL, 0,
-+		               "Cannot get sample size from unknown sample format: %s",
-+		               av_get_sample_fmt_name (data->enc->sample_fmt));
-+#else
-+		decoder_error (&data->error, ERROR_FATAL, 0,
- 		               "Unsupported sample size!");
-+#endif
-+		avcodec_close (data->enc);
- 		goto end;
- 	}
-+	data->sample_width = sfmt_Bps (data->fmt);
- 	if (data->codec->capabilities & CODEC_CAP_DELAY)
- 		data->delay = true;
- 	data->seek_broken = is_seek_broken (data);
-+	data->timing_broken = is_timing_broken (data->ic);
- 
- 	data->okay = true;
- 
--	if (data->ic->duration >= AV_TIME_BASE) {
-+	if (!data->timing_broken && data->ic->duration >= AV_TIME_BASE) {
- #ifdef HAVE_AVIO_SIZE
- 		data->avg_bitrate = (int) (avio_size (data->ic->pb) /
--		                          (data->ic->duration / AV_TIME_BASE) * 8);
-+		                           (data->ic->duration / AV_TIME_BASE) * 8);
- #else
- 		data->avg_bitrate = (int) (data->ic->file_size /
--		                          (data->ic->duration / AV_TIME_BASE) * 8);
-+		                           (data->ic->duration / AV_TIME_BASE) * 8);
- #endif
- 	}
--	data->bitrate = data->ic->bit_rate;
- 
-+	if (!data->timing_broken && data->ic->bit_rate > 0)
-+		data->bitrate = data->ic->bit_rate;
-+
- 	return data;
- 
- end:
-@@ -943,12 +1042,14 @@
-                           char *buf, int buf_len)
- {
- 	int filled = 0;
-+	AVFrame *frame;
- 
-+	frame = avcodec_alloc_frame ();
-+
- 	do {
- 		int len, got_frame, is_planar, plane_size, data_size, copied;
--		AVFrame frame;
- 
--		len = avcodec_decode_audio4 (data->enc, &frame, &got_frame, pkt);
-+		len = avcodec_decode_audio4 (data->enc, frame, &got_frame, pkt);
- 
- 		if (len < 0)  {
- 			/* skip frame */
-@@ -968,33 +1069,46 @@
- 
- 		is_planar = av_sample_fmt_is_planar (data->enc->sample_fmt);
- 		data_size = av_samples_get_buffer_size (&plane_size,
--		                                        data->enc->channels,                                                   frame.nb_samples,
-+		                                        data->enc->channels,
-+		                                        frame->nb_samples,
- 		                                        data->enc->sample_fmt, 1);
- 
- 		if (data_size == 0)
- 			continue;
- 
--		copied = copy_or_buffer (data, (char *)frame.extended_data[0],
--		                         plane_size, buf, buf_len);
--		buf += copied;
--		filled += copied;
--		buf_len -= copied;
-+		if (is_planar && data->enc->channels > 1) {
-+			int offset, ch;
- 
--        if (is_planar && data->enc->channels > 1) {
--			int ch;
-+			for (offset = 0; offset < plane_size; offset += data->sample_width) {
-+				for (ch = 0; ch < data->enc->channels; ch += 1) {
-+					copied = copy_or_buffer (data,
-+					                         (char *)frame->extended_data[ch]
-+					                                               + offset,
-+				                             data->sample_width, buf, buf_len);
-+					buf += copied;
-+					filled += copied;
-+					buf_len -= copied;
-+				}
-+			}
-+		}
-+		else {
-+			copied = copy_or_buffer (data, (char *)frame->extended_data[0],
-+		                             plane_size, buf, buf_len);
-+			buf += copied;
-+			filled += copied;
-+			buf_len -= copied;
-+		}
- 
--            for (ch = 1; ch < data->enc->channels; ch += 1) {
--				copied = copy_or_buffer (data, (char *)frame.extended_data[ch],
--				                         plane_size, buf, buf_len);
--				buf += copied;
--				filled += copied;
--				buf_len -= copied;
--            }
--        }
--
- 		debug ("Copying %dB (%dB filled)", data_size, filled);
- 	} while (pkt->size > 0);
- 
-+	avcodec_get_frame_defaults (frame);
-+#ifdef HAVE_AVCODEC_FREE_FRAME
-+	avcodec_free_frame (&frame);
-+#else
-+	av_freep (&frame);
-+#endif
-+
- 	return filled;
- }
- #endif
-@@ -1122,9 +1236,10 @@
- 		free_packet (pkt);
- 	} while (!bytes_produced && !data->eos);
- 
--	data->bitrate = compute_bitrate (sound_params, bytes_used,
--	                                 bytes_produced + data->remain_buf_len,
--	                                 data->bitrate);
-+	if (!data->timing_broken)
-+		data->bitrate = compute_bitrate (sound_params, bytes_used,
-+		                                 bytes_produced + data->remain_buf_len,
-+		                                 data->bitrate);
- 
- 	return bytes_produced;
- }
-@@ -1185,20 +1300,23 @@
- {
- 	struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data;
- 
--	return data->bitrate / 1000;
-+	return data->timing_broken ? -1 : data->bitrate / 1000;
- }
- 
- static int ffmpeg_get_avg_bitrate (void *prv_data)
- {
- 	struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data;
- 
--	return data->avg_bitrate / 1000;
-+	return data->timing_broken ? -1 : data->avg_bitrate / 1000;
- }
- 
- static int ffmpeg_get_duration (void *prv_data)
- {
- 	struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data;
- 
-+	if (data->timing_broken)
-+		return -1;
-+
- 	if (!data->stream)
- 		return -1;
- 
-
-Index: configure.in
-===================================================================
---- configure.in	(revision 2518)
-+++ configure.in	(working copy)
-@@ -293,7 +293,6 @@
- 
- dnl optional functions
- AC_CHECK_FUNCS([strcasestr strerror_r syslog])
--AC_CHECK_FUNCS([getrlimit pthread_attr_getstacksize])
- AX_CHECK_UNAME_SYSCALL
- 
- dnl MIME magic
-@@ -322,6 +321,7 @@
- CC="$PTHREAD_CC"
- CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
- EXTRA_LIBS="$EXTRA_LIBS $PTHREAD_LIBS"
-+AC_CHECK_FUNCS([getrlimit pthread_attr_getstacksize])
- 
- dnl __FUNCTION__
- AC_TRY_COMPILE(,[printf(__FUNCTION__);], [AC_DEFINE([HAVE__FUNCTION__], 1,
-
-
diff --git a/extra/mod_fcgid/PKGBUILD b/extra/mod_fcgid/PKGBUILD
index 8775b91c6..6ed3fbc7b 100644
--- a/extra/mod_fcgid/PKGBUILD
+++ b/extra/mod_fcgid/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 171689 2012-11-21 14:00:30Z dan $
+# $Id: PKGBUILD 204785 2014-01-27 08:09:44Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=mod_fcgid
-pkgver=2.3.7
+pkgver=2.3.9
 pkgrel=1
 pkgdesc="A FastCGI module for Apache HTTP Server."
 license=('APACHE')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://httpd.apache.org/mod_fcgid/"
 depends=('apache')
-source=("http://apache.cs.utah.edu/httpd/mod_fcgid/mod_fcgid-$pkgver.tar.gz")
-sha256sums=('b72810cb34942945156f29ce60946da7dc941bb4cfca8b9d224573535bd8ef6d')
+source=(http://www.apache.org/dist/httpd/mod_fcgid/mod_fcgid-$pkgver.tar.bz2{,.asc})
+sha1sums=('f0b6d87dfcfe18b318905a3f91274051f3f17945'
+          'SKIP')
 
 build() {
-  cd "$srcdir"/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure.apxs 
   make
 }
 
 package() {
-  cd "$srcdir"/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-  rm -rf "$pkgdir"/{usr/share,etc}
+  rm -rf "${pkgdir}/usr/share"
+  rm -rf "${pkgdir}/etc"
 }
diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD
index 9f6d204bd..549f23bb2 100644
--- a/extra/modemmanager/PKGBUILD
+++ b/extra/modemmanager/PKGBUILD
@@ -1,35 +1,48 @@
-# $Id: PKGBUILD 202884 2013-12-28 22:44:05Z bpiotrowski $
+# $Id: PKGBUILD 205463 2014-02-05 16:17:43Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
-pkgname=modemmanager
-_realname=ModemManager
-pkgver=1.0.0
+pkgbase=modemmanager
+pkgname=(modemmanager libmm-glib)
+pkgver=1.2.0
 pkgrel=2
 pkgdesc="Mobile broadband modem management service"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/ModemManager/"
-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')
-install=modemmanager.install
-source=(http://www.freedesktop.org/software/$_realname/$_realname-$pkgver.tar.xz)
-sha256sums=('e0f3bbd9a7353f7d87be2391b8718a81d11f9ff8b1c067d640928322f8808563')
+license=(GPL2 LGPL2.1)
+depends=(systemd polkit ppp libqmi libmbim)
+makedepends=(intltool gtk-doc gobject-introspection vala)
+source=(http://www.freedesktop.org/software/ModemManager/ModemManager-$pkgver.tar.xz)
+sha256sums=('8bd9d8c3b506f34a9f927e95784026d1fe132c9d60fc426a892b690f7d6408bc')
 
 build() {
-  cd $_realname-$pkgver
+  cd ModemManager-$pkgver
   ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
         --sbindir=/usr/bin \
         --with-udev-base-dir=/usr/lib/udev \
-        --disable-static \
-        --with-polkit=permissive
+        --with-polkit=permissive \
+        --enable-gtk-doc \
+        --disable-static
   make
 }
 
-package() {
-  cd $_realname-$pkgver
+package_modemmanager() {
+  depends+=(libmm-glib)
+  optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
+
+  cd ModemManager-$pkgver
   make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -C libmm-glib uninstall
+  make DESTDIR="$pkgdir" -C vapi uninstall
+}
+
+package_libmm-glib() {
+  pkgdesc="ModemManager library"
+  depends=(glib2)
+
+  cd ModemManager-$pkgver
+  make DESTDIR="$pkgdir" -C libmm-glib install
+  make DESTDIR="$pkgdir" -C vapi install
 }
diff --git a/extra/mono-debugger/PKGBUILD b/extra/mono-debugger/PKGBUILD
index 21946154d..7e41d830f 100644
--- a/extra/mono-debugger/PKGBUILD
+++ b/extra/mono-debugger/PKGBUILD
@@ -2,27 +2,31 @@
 
 pkgname=mono-debugger
 pkgver=2.10
-pkgrel=2
+pkgrel=3
 pkgdesc="The Mono Debugger"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.mono-project.com/"
 depends=('mono>=2.10.1')
-makedepends=('pkgconfig')
-source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+options=('!makeflags')
+source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('02ee485f2aae279f2fa3a7051c7d580e')
 
-build() {
+prepare() {
   # get rid of that .wapi errors; thanks to brice
   export MONO_SHARED_DIR=${srcdir}/weird
   mkdir -p "${MONO_SHARED_DIR}"
-  # build mono debugger
-  cd ${srcdir}/${pkgname}-${pkgver}
+  
+  rm -rf build/*.dll
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
-  make || return 1
+  make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }
diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD
index 6e2ba74c1..ab930d5c2 100644
--- a/extra/mono/PKGBUILD
+++ b/extra/mono/PKGBUILD
@@ -1,34 +1,34 @@
-# $Id: PKGBUILD 198325 2013-10-30 14:10:51Z allan $
+# $Id: PKGBUILD 205609 2014-02-09 10:29:41Z andyrtr $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Brice Carpentier <brice@dlfp.org>
 
 pkgname=mono
 pkgver=3.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Free implementation of the .NET platform including runtime and compiler"
 arch=(i686 x86_64)
-license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11')
+license=('GPL' 'LGPL2.1' 'MPL' 'custom:MITX11')
 url="http://www.mono-project.com/"
-depends=('zlib' 'libgdiplus>=2.10' 'sh')
-makedepends=('pkgconfig')
+depends=('zlib' 'libgdiplus>=2.10' 'sh' 'python')
 options=('!makeflags')
 provides=('monodoc')
 conflicts=('monodoc')
-install=mono.install
 source=(http://download.mono-project.com/sources/mono/${pkgname}-${pkgver}.tar.bz2
         mono.binfmt.d
-	mono.install
-	sgen_fix.patch)
+        sgen_fix.patch)
 md5sums=('a66c6309fad071e21f77f4c6b67a0f10'
          'b9ef8a65fea497acf176cca16c1e2402'
-         'ca1108e9638b01c26453ee663592a4e5'
          '8a700b94bff7a913f920e95890d2fb4c')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   patch -p1 < ../sgen_fix.patch
   # build mono
-  ./configure --prefix=/usr --sysconfdir=/etc --bindir=/usr/bin --sbindir=/usr/bin
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --bindir=/usr/bin \
+    --sbindir=/usr/bin \
+    --disable-static
   make
 
   # build jay
@@ -41,9 +41,9 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   # install jay
-  cd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay
+  pushd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay
   make DESTDIR="${pkgdir}" prefix=/usr INSTALL=../../install-sh install
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  popd
 
   # install binfmt conf file and pathes
   install -D -m644 "${srcdir}"/mono.binfmt.d "${pkgdir}"/usr/lib/binfmt.d/mono.conf
diff --git a/extra/mono/mini_amd64.patch b/extra/mono/mini_amd64.patch
deleted file mode 100644
index f8685c337..000000000
--- a/extra/mono/mini_amd64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mono/mini/mini-amd64.c	2009-03-19 21:08:18 UTC (rev 129824)
-+++ mono/mini/mini-amd64.c	2009-03-19 21:09:53 UTC (rev 129825)
-@@ -1009,7 +1009,7 @@
- 		locals_size += mono_type_size (ins->inst_vtype, &ialign);
- 	}
- 
--	if ((cfg->num_varinfo > 10000) || (locals_size >= (1 << 15))) {
-+	if ((cfg->num_varinfo > 5000) || (locals_size >= (1 << 15)) || (header->code_size > 110000)) {
- 		/* Avoid hitting the stack_alloc_size < (1 << 16) assertion in emit_epilog () */
- 		cfg->arch.omit_fp = FALSE;
- 	}
-
- 			
diff --git a/extra/mono/mono.install b/extra/mono/mono.install
deleted file mode 100644
index 6a57c2a70..000000000
--- a/extra/mono/mono.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-ln -sf /bin/mono-sgen /bin/mono
-}
-
-post_upgrade() {
-post_install
-} 
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index d9260882a..09d446c0a 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202687 2013-12-24 18:48:56Z bisson $
+# $Id: PKGBUILD 205558 2014-02-07 00:40:00Z 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.18.6
+pkgver=0.18.8
 pkgrel=1
 pkgdesc='Flexible, powerful, server-side application for playing music'
 url='http://www.musicpd.org/'
@@ -18,7 +18,7 @@ makedepends=('doxygen')
 source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}
         'tmpfiles.d'
         'conf')
-sha1sums=('06951d043a57ce460b728402768a235d8b18ba93' 'SKIP'
+sha1sums=('04e6c657e9b5b7330c2ab4af2fb361d7d1e294d8' 'SKIP'
           'f4d5922abb69abb739542d8e93f4dfd748acdad7'
           '67c145c046cddd885630d72ce8ebe71f8321ff3b')
 
diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD
index a507a7d61..eb6221613 100644
--- a/extra/mpg123/PKGBUILD
+++ b/extra/mpg123/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198329 2013-10-30 14:12:16Z allan $
+# $Id: PKGBUILD 204942 2014-02-01 04:52:42Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=mpg123
-pkgver=1.16.0
+pkgver=1.18.0
 pkgrel=1
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('sdl: for sdl audio support'
             'jack: for jack audio support'
             'libpulse: for pulse audio support')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('73105629f8d4b9426ec9fe93455a8271a96c4ae4'
+sha1sums=('d6e59eeb972a7d11dfcc7505cf1f3e0ae875f439'
           'SKIP')
 
 build() {
diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD
index 7fc242493..073d40f87 100644
--- a/extra/msmtp/PKGBUILD
+++ b/extra/msmtp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192440 2013-08-11 23:21:00Z eric $
+# $Id: PKGBUILD 204688 2014-01-25 00:14:19Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=msmtp
 pkgname=('msmtp' 'msmtp-mta')
 pkgver=1.4.31
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://msmtp.sourceforge.net"
diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD
index fe4153570..f7661bfc7 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 199787 2013-11-16 12:16:33Z heftig $
+# $Id: PKGBUILD 204298 2014-01-16 20:59:19Z heftig $
 # 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.2
-pkgrel=2
+pkgver=3.10.3
+pkgrel=1
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64 mips64el)
 license=('GPL')
@@ -17,7 +17,7 @@ options=('!emptydirs')
 install=mutter.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
         0001-monitor-expose-min-backlight-step.patch)
-sha256sums=('438163bc7fbab88366b589cab895a1df79eeac389e012c6e26ec559316651100'
+sha256sums=('7b19eda620d11e0638e3be33455998d65bdee3ff6556b562df937978efb8830c'
             'f1ef173d96ac27abdcf765972d2ac434f63bf4629b8bd51c177e8963d07f5eb7')
 
 prepare() {
diff --git a/extra/mysql-python/PKGBUILD b/extra/mysql-python/PKGBUILD
index 0824d5c9a..7c4f921b3 100644
--- a/extra/mysql-python/PKGBUILD
+++ b/extra/mysql-python/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180685 2013-03-25 19:15:36Z bpiotrowski $
+# $Id: PKGBUILD 204827 2014-01-28 04:02:31Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=mysql-python
-pkgver=1.2.4
-pkgrel=2
+pkgver=1.2.5
+pkgrel=1
 pkgdesc="MySQL support for Python"
 arch=("i686" "x86_64" 'mips64el')
 url="http://mysql-python.sourceforge.net/"
@@ -12,7 +12,7 @@ license=('GPL2')
 depends=('python2' 'libmariadbclient')
 makedepends=('mariadb' 'python2-distribute')
 source=("http://pypi.python.org/packages/source/M/MySQL-python/MySQL-python-${pkgver}.zip")
-md5sums=('ddf2386daf10a97af115ffad2ed4a9a0')
+md5sums=('654f75b302db6ed8dc5a898c625e030c')
 
 package() {
   cd ${srcdir}/MySQL-python-${pkgver}
diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD
index 1afe04f8e..f9b1b0515 100644
--- a/extra/nasm/PKGBUILD
+++ b/extra/nasm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192097 2013-08-05 20:37:17Z eric $
+# $Id: PKGBUILD 203305 2014-01-07 23:23:24Z eric $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=nasm
-pkgver=2.10.09
+pkgver=2.11
 pkgrel=1
 pkgdesc="An 80x86 assembler designed for portability and modularity"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('glibc')
 install=nasm.install
 source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('062dd7315b307870917e708a96b6862481cefc54')
+sha1sums=('7cc2568ce804fa17d972d159f161adc3f6d25750')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD
index 4e7f7cacb..de7dfaa65 100644
--- a/extra/nepomuk-core/PKGBUILD
+++ b/extra/nepomuk-core/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202454 2013-12-22 12:46:34Z andrea $
+# $Id: PKGBUILD 205637 2014-02-10 10:57:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=nepomuk-core
-pkgver=4.12.0
+pkgver=4.12.2
 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' 'kdegraphics-mobipocket')
 makedepends=('cmake' 'automoc4' 'doxygen')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('2b4ec16c5e664ae7dcd4035229000b8d7712181d')
+sha1sums=('1970ac31b0a73afbebc682cb8310d2b49affc65f')
 
 prepare() {
   mkdir build
diff --git a/extra/nepomuk-widgets/PKGBUILD b/extra/nepomuk-widgets/PKGBUILD
index 1763b3ad5..9c95a4678 100644
--- a/extra/nepomuk-widgets/PKGBUILD
+++ b/extra/nepomuk-widgets/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 202471 2013-12-22 12:46:53Z andrea $
+# $Id: PKGBUILD 205654 2014-02-10 10:57:58Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=nepomuk-widgets
-pkgver=4.12.0
+pkgver=4.12.2
 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=('2edb8e026f35574167026838e9d5b382a5f8148b')
+sha1sums=('2933ad1b0557b82922510e1cf8fade6aa692a125')
 
 build() {
   mkdir build
diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD
index de23ae7f8..b7e608880 100644
--- a/extra/nspr/PKGBUILD
+++ b/extra/nspr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 199496 2013-11-13 14:59:50Z jgc $
+# $Id: PKGBUILD 205067 2014-02-04 10:50:56Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=nspr
-pkgver=4.10.2
+pkgver=4.10.3
 pkgrel=1
 pkgdesc="Netscape Portable Runtime"
 arch=(i686 x86_64 'mips64el')
@@ -13,8 +13,8 @@ depends=('glibc')
 makedepends=('zip')
 options=('!emptydirs')
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('650e4aa35d58624bc1083ed585c81c4af09cf23c')
-md5sums=('f0d254da0b2b870d9a5fa094e879d4b8')
+sha1sums=('afcb28ed2b159cb059141bdf5f2e001374a845cf')
+md5sums=('bf298e874cf454a3c2f8fe7e671c5d2e')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index a803f5101..4429bfa01 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 201408 2013-12-10 17:56:17Z heftig $
+# $Id: PKGBUILD 204787 2014-01-27 08:27:12Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nss
-pkgver=3.15.3.1
+pkgver=3.15.4
 pkgrel=1
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64 'mips64el')
@@ -17,7 +17,7 @@ source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/s
         nss-config.in
         ssl-renegotiate-transitional.patch
         add_spi+cacert_ca_certs.patch)
-sha1sums=('4e0f81a1f770447dc5440201a579151b601463e2'
+sha1sums=('c164fac83fcbaff010786767e2a858ca23a89a5b'
           'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
           'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
           '8a964a744ba098711b80c0d279a2993524e8eb92'
diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD
index 3fc20f5b8..962ee6771 100644
--- a/extra/ntp/PKGBUILD
+++ b/extra/ntp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 191962 2013-08-02 03:24:15Z bisson $
+# $Id: PKGBUILD 203483 2014-01-11 16:49:37Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 
 pkgname=ntp
 pkgver=4.2.6.p5
 _realver=4.2.6p5
-pkgrel=17
+pkgrel=18
 pkgdesc='Network Time Protocol reference implementation'
 url='http://www.ntp.org/'
 license=('custom')
@@ -19,7 +19,7 @@ source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz"
         'ntpdate.service')
 sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192'
           'd3496dbeb7d531dd6ab071dbce3262c3c9618d8b'
-          'ff8370719f003f184563b7d6068c03086678482f'
+          'dd24216e8333e12d5080965696602591c72537b1'
           'e1c48cba549b7d21501aadf513926e463884c090'
 )
 
diff --git a/extra/ntp/ntpd.service b/extra/ntp/ntpd.service
index 45239877f..cfd965a6b 100644
--- a/extra/ntp/ntpd.service
+++ b/extra/ntp/ntpd.service
@@ -5,7 +5,8 @@ After=network.target nss-lookup.target
 [Service]
 Type=forking
 PrivateTmp=true
-ExecStart=/usr/bin/ntpd -g -u ntp:ntp
+PIDFile=/run/ntpd.pid
+ExecStart=/usr/bin/ntpd -g -u ntp:ntp -p /run/ntpd.pid
 Restart=always
 
 [Install]
diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD
index be5daae47..1381da1ca 100644
--- a/extra/nx/PKGBUILD
+++ b/extra/nx/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193809 2013-09-02 08:07:35Z andyrtr $
+# $Id: PKGBUILD 203653 2014-01-13 17:17:43Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers')
-pkgver=3.5.0.21
+pkgver=3.5.0.22
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wiki.x2go.org/"
@@ -15,7 +15,7 @@ makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' 'fontconfig' # run
              )
 source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
         keyboard_rule.diff)
-md5sums=('7143c216cb6eda0408ee8169c50adbe3'
+md5sums=('739c7a28f3bb6d5f957e6cec9168335d'
          'f681bc66827cd7ddff4b81b983c20401')
 
 build() {
@@ -25,6 +25,8 @@ build() {
   # upstream needs to do much more work in that area
   patch -Np1 -i ${srcdir}/keyboard_rule.diff
   
+  sed -i "s/3.5.0.21/3.5.0.22/" VERSION.x2goagent
+  
   # debug flags
 #  export CFLAGS="-march=x86-64 -O1 -g -pipe"
 #  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD
deleted file mode 100644
index 56f7224e8..000000000
--- a/extra/obex-data-server/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 192478 2013-08-12 20:25:45Z eric $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-# Contributor: Keerthi <keerthi.linux@gmail.com>
-
-pkgname=obex-data-server
-pkgver=0.4.6
-pkgrel=8
-pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://wiki.muiline.com/obex-data-server"
-license=('GPL')
-depends=('dbus-glib' 'openobex' 'imagemagick' 'libusb-compat')
-source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz"
-        "obex-data-server-openobex17.patch")
-md5sums=('961ca5db6fe9c97024e133cc6203cc4d'
-         '4199b3f0178d2b58eb36ee36ed1d07d5')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}/obex-data-server-openobex17.patch"
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/obex-data-server/obex-data-server-openobex17.patch b/extra/obex-data-server/obex-data-server-openobex17.patch
deleted file mode 100644
index 047c46c50..000000000
--- a/extra/obex-data-server/obex-data-server-openobex17.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur obex-data-server-0.4.6-orig/src/ods-obex.c obex-data-server-0.4.6/src/ods-obex.c
---- obex-data-server-0.4.6-orig/src/ods-obex.c	2013-05-29 16:01:54.051692334 -0400
-+++ obex-data-server-0.4.6/src/ods-obex.c	2013-05-29 16:03:23.200697099 -0400
-@@ -412,7 +412,7 @@
- 		goto err;
- 	}
- 
--	interfaces_num = OBEX_FindInterfaces(obex_context->obex_handle, &obex_intf);
-+	interfaces_num = OBEX_EnumerateInterfaces(obex_context->obex_handle);
- 	if (intf_num >= interfaces_num) {
- 		g_set_error (error, ODS_ERROR, ODS_ERROR_FAILED, "Invalid interface number");
- 		goto err;
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index 5fc6d0120..95751d3f9 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -1,33 +1,25 @@
-# $Id: PKGBUILD 202666 2013-12-23 21:05:04Z ronald $
+# $Id: PKGBUILD 204926 2014-01-31 13:36:05Z ronald $
 # 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=5
+pkgver=3.8.0
+pkgrel=2
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.octave.org"
 license=('GPL')
 depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 'glu') 
-makedepends=('gcc-fortran' 'texlive-core' 'suitesparse')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 'qscintilla')
 optdepends=('texinfo: for help-support in octave'
-            'gnuplot: alternative plotting')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig}
-        mex-gcc-4.8.patch)
+            'gnuplot: alternative plotting'
+	    'qscintilla: experimental gui')
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig})
 options=('!emptydirs')
 install=octave.install
-sha1sums=('3cc9366b6dbbd336eaf90fe70ad16e63705d82c4'
-          'SKIP'
-          '0608af9b7ccce8455f534d2fc4acf2f4c8f83a60')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # https://savannah.gnu.org/bugs/?38746
-  patch -Np1 -i "${srcdir}/mex-gcc-4.8.patch"
-}
+sha1sums=('ebb03485b72d97fa01f105460f81016f94680f77'
+          'SKIP')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -36,7 +28,7 @@ build() {
 
   ./configure --prefix=/usr --libexecdir=/usr/lib \
   --enable-shared --disable-static \
-  --with-quantum-depth=32 \
+  --with-quantum-depth=16 \
   --with-umfpack="-lumfpack -lsuitesparseconfig" # https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html
 
   LANG=C make
diff --git a/extra/octave/mex-gcc-4.8.patch b/extra/octave/mex-gcc-4.8.patch
deleted file mode 100644
index 99d501879..000000000
--- a/extra/octave/mex-gcc-4.8.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-# HG changeset patch
-# User Clemens Buchacher <drizzd@aon.at>
-# Date 1369937542 14400
-#      Thu May 30 14:12:22 2013 -0400
-# Node ID 122d3f62e179ba044d47e58510905719220d8706
-# Parent  e38a0fa08368d4dd6f3a0dfd20cbe28cf8555f73
-do not include C++ header in extern "C" context (bug #38746)
-
-* mex.h: Include mexproto.h outside of extern "C" block.
-
-diff -r e38a0fa08368 -r 122d3f62e179 src/mex.h
---- a/src/mex.h	Mon May 27 21:41:57 2013 +0200
-+++ b/src/mex.h	Thu May 30 14:12:22 2013 -0400
-@@ -64,6 +64,8 @@
- 
- #define mxMAXNAME 64
- 
-+#include "mexproto.h"
-+
- #if defined (__cplusplus)
- extern "C" {
- #endif
-@@ -74,8 +76,6 @@
- void mexFunction (int nlhs, mxArray* plhs[], int nrhs, const mxArray *prhs[]);
- #endif
- 
--#include "mexproto.h"
--
- /* V4 floating point routines renamed in V5.  */
- #define mexIsNaN mxIsNaN
- #define mexIsFinite mxIsFinite
diff --git a/extra/octave/octave.install b/extra/octave/octave.install
index 8ee77c430..fb77bb100 100644
--- a/extra/octave/octave.install
+++ b/extra/octave/octave.install
@@ -1,5 +1,5 @@
 info_dir=/usr/share/info
-info_files=(octave.info octave.info-1 octave.info-2 octave.info-3 octave.info-4 octave.info-5)
+info_files=(octave.info octave.info-1 octave.info-2 octave.info-3 octave.info-4 octave.info-5 octave.info-6 octave.info-7 octave.info-8)
 
 post_install() {
   for f in ${info_files[@]}; do
diff --git a/extra/openbabel/PKGBUILD b/extra/openbabel/PKGBUILD
index c64c44fc4..639ee3597 100644
--- a/extra/openbabel/PKGBUILD
+++ b/extra/openbabel/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 198351 2013-10-30 14:20:21Z allan $
+# $Id: PKGBUILD 203534 2014-01-13 09:49:43Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=openbabel
 pkgver=2.3.2
-pkgrel=1.1
+pkgrel=3
 pkgdesc="A library designed to interconvert between many file formats used in molecular modeling and computational chemistry"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openbabel.org/wiki/Main_Page"
 license=('GPL')
-depends=('gcc-libs' 'libxml2')
-makedepends=('cmake' 'eigen2' 'wxgtk')
+depends=('gcc-libs' 'libxml2' 'libsm')
+makedepends=('cmake' 'eigen2' 'wxgtk2.8')
 optdepends=('eigen2: to use bindings'
-        'wxgtk: GUI interface')
+            'wxgtk2.8: GUI interface')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('9b0007560d9d838b40ab4ad06daf5610')
 
@@ -22,7 +22,7 @@ build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.8
   make
 }
 
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index 5ffcc6cc4..eacece98d 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 199540 2013-11-15 08:46:07Z schiv $
+# $Id: PKGBUILD 203053 2014-01-02 22:35:26Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.4.7
-pkgrel=2
+pkgver=2.4.8
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
@@ -22,10 +22,10 @@ if [ "$CARCH" != "mips64el" ]; then
   depends+=('intel-tbb' 'libcl')
   makedepends+=('opencl-headers')
 fi
-source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz"
+source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip"
         'pkgconfig.patch'
         'fsh.patch')
-md5sums=('33a12a8bba6e6dc32c97298c99b083b2'
+md5sums=('50cc1433b3654074206f5b3dbfd49848'
          'c7cea48ed7d4f729ebdb9673bac41bd3'
          'c597598d142dd34d0eb4af7d6e9779d8')
 
diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD
deleted file mode 100644
index ef2ca5730..000000000
--- a/extra/opengtl/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 188593 2013-06-16 17:21:06Z foutrelis $
-# Maintainer:
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Andries Radu <admiral0@live.it>
-
-pkgname=opengtl
-pkgver=0.9.18
-pkgrel=3
-pkgdesc="A set of libraries for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications"
-url="http://www.opengtl.org"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('gcc-libs' 'llvm-libs')
-makedepends=('cmake' 'libpng' 'llvm')
-optdepends=('libpng: for using the png extension')
-source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2
-        opengtl-0.9.18-llvm-3.3.patch
-        opengtl-0.9.18-memcpy.patch)
-sha256sums=('f094b3d2a1a60519975bb3badc05e704f2b93c7a3d2cb753041f2ff27cfcd9f8'
-            'c43418bc039660ae86cb86b8b8175342793cb1361c699faa9b6342bc896e3d6c'
-            '357cc2e538bbaaffe7d58956959d8a7fbae09741d4a87488a5a8c51ec645d23a')
-
-prepare() {
-  mkdir build
-
-  # Fix build with LLVM 3.3 (patch from Fedora)
-  patch -d OpenGTL-$pkgver -Np1 -i "$srcdir/opengtl-0.9.18-llvm-3.3.patch"
-
-  # Fix build with libpng 1.6
-  patch -d OpenGTL-$pkgver -Np1 -i "$srcdir/opengtl-0.9.18-memcpy.patch"
-}
-
-build() {
-  cd "$srcdir/build"
-  cmake ../OpenGTL-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON
-  make
-}
-
-package() {
-  cd "$srcdir/build"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/opengtl/opengtl-0.9.18-llvm-3.3.patch b/extra/opengtl/opengtl-0.9.18-llvm-3.3.patch
deleted file mode 100644
index 80280979f..000000000
--- a/extra/opengtl/opengtl-0.9.18-llvm-3.3.patch
+++ /dev/null
@@ -1,732 +0,0 @@
-diff -up OpenGTL-0.9.18/CMakeLists.txt.jx OpenGTL-0.9.18/CMakeLists.txt
---- OpenGTL-0.9.18/CMakeLists.txt.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/CMakeLists.txt	2013-05-08 15:39:25.090057193 -0400
-@@ -78,8 +78,8 @@ else(MSVC)
-   FIND_LLVM_LIBS( ${LLVM_CONFIG_EXECUTABLE} "native bitwriter linker bitreader jit interpreter support ipo" LLVM_LIBS LLVM_NATIVE_OBJECTS )
- endif(MSVC)
- 
--if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.1" OR LLVM_VERSION STREQUAL "3.0" OR LLVM_VERSION STREQUAL "3.2svn"  OR LLVM_VERSION STREQUAL "3.2" ) ) # There is no way with MSVC to know the llvm version
--  message(FATAL_ERROR "LLVM 3.0 or 3.1 or 3.2 is required.")
-+if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.3svn" OR LLVM_VERSION STREQUAL "3.3" ) ) # There is no way with MSVC to know the llvm version
-+  message(FATAL_ERROR "LLVM 3.3 is required.")
- endif()
- 
- if(MSVC)
-diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp
---- OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp	2013-05-08 15:39:25.091057197 -0400
-@@ -27,10 +27,10 @@
- #include <climits>
- 
- // LLVM
--#include <llvm/InstrTypes.h>
-+#include <llvm/IR/InstrTypes.h>
- // #include <llvm/Linker.h>
--#include <llvm/DerivedTypes.h>
--#include <llvm/Module.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/Module.h>
- // #include <llvm/Transforms/Utils/Cloning.h>
- // Library Loader
- #ifdef LLVM_27_OR_28
-@@ -214,7 +214,7 @@ bool Compiler::compile(bool _isStandardL
-   return success;
- }
- 
--#include <llvm/ValueSymbolTable.h>
-+#include <llvm/IR/ValueSymbolTable.h>
- 
- bool Compiler::importModule(const GTLCore::String& name)
- {
-diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp
---- OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp	2013-05-08 15:39:25.091057197 -0400
-@@ -19,9 +19,9 @@
- 
- #include "ParserNG.h"
- 
--#include <llvm/Constants.h>
--#include <llvm/DerivedTypes.h>
--#include <llvm/Type.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/Type.h>
- 
- #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
- #include <GTLCore/CompilationMessage.h>
-diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp
---- OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp	2013-05-08 15:39:25.091057197 -0400
-@@ -38,7 +38,7 @@
- using namespace OpenCTL;
- 
- // LLVM
--#include <llvm/Module.h>
-+#include <llvm/IR/Module.h>
- #include <llvm/Bitcode/ReaderWriter.h>
- #ifdef LLVM_27_OR_28
- #include <llvm/System/Path.h>
-@@ -47,8 +47,7 @@ using namespace OpenCTL;
- #include <llvm/Support/Path.h>
- #include <llvm/Support/DynamicLibrary.h>
- #endif
--#include <llvm/Module.h>
--#include <llvm/LLVMContext.h>
-+#include <llvm/IR/LLVMContext.h>
- 
- struct Module::Private {
-   Private() : moduleData(0), isStandardLibrary(false) {}
-diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp
---- OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp	2013-05-08 15:39:25.091057197 -0400
-@@ -20,16 +20,16 @@
- #include "Program.h"
- 
- // LLVM
--#include <llvm/DerivedTypes.h>
--#include <llvm/Instructions.h>
--#include <llvm/Module.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/Instructions.h>
-+#include <llvm/IR/Module.h>
- #include <llvm/Transforms/Utils/Cloning.h>
- 
- // Passes
- #include <llvm/PassManager.h>
- #include <llvm/Analysis/LoopPass.h>
- #include <llvm/Analysis/Verifier.h>
--#include <llvm/GlobalVariable.h>
-+#include <llvm/IR/GlobalVariable.h>
- 
- // GTLCore
- #include "GTLCore/Buffer.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp	2013-05-08 15:39:25.092057201 -0400
-@@ -20,9 +20,9 @@
- #include "AccessorExpression.h"
- 
- #include <llvm/ADT/ArrayRef.h>
--#include <llvm/Constants.h>
--#include <llvm/Function.h>
--#include <llvm/Instructions.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/Instructions.h>
- 
- #include "../LLVMBackend/CodeGenerator_p.h"
- #include "../LLVMBackend/ExpressionResult_p.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp	2013-05-08 15:39:25.092057201 -0400
-@@ -19,7 +19,7 @@
- 
- #include "BinaryExpression.h"
- 
--#include <llvm/Instructions.h>
-+#include <llvm/IR/Instructions.h>
- 
- #include <GTLCore/Debug.h>
- #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp	2013-05-08 15:39:25.092057201 -0400
-@@ -19,10 +19,10 @@
- 
- #include "CompoundExpression.h"
- 
--#include <llvm/Constants.h>
--#include <llvm/DerivedTypes.h>
--#include <llvm/GlobalVariable.h>
--#include <llvm/Instructions.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/GlobalVariable.h>
-+#include <llvm/IR/Instructions.h>
- 
- #include "../LLVMBackend/CodeGenerator_p.h"
- #include "../Debug.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp	2013-05-08 15:39:25.092057201 -0400
-@@ -19,10 +19,10 @@
- 
- #include "ConstantCompoundExpression.h"
- 
--#include <llvm/Constants.h>
--#include <llvm/DerivedTypes.h>
--#include <llvm/GlobalVariable.h>
--#include <llvm/Instructions.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/GlobalVariable.h>
-+#include <llvm/IR/Instructions.h>
- 
- #include "../LLVMBackend/CodeGenerator_p.h"
- #include "../Debug.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp	2013-05-08 15:39:25.093057205 -0400
-@@ -19,11 +19,11 @@
- 
- #include "Expression.h"
- 
--#include <llvm/Constant.h>
--#include <llvm/Constants.h>
--#include <llvm/Function.h>
--#include <llvm/GlobalVariable.h>
--#include <llvm/Instructions.h>
-+#include <llvm/IR/Constant.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/GlobalVariable.h>
-+#include <llvm/IR/Instructions.h>
- 
- #include "GTLCore/LLVMBackend/CodeGenerator_p.h"
- #include "GTLCore/LLVMBackend/ExpressionResult_p.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp	2013-05-08 15:39:25.093057205 -0400
-@@ -19,10 +19,10 @@
- 
- #include "FunctionDeclaration.h"
- 
--#include <llvm/DerivedTypes.h>
--#include <llvm/Function.h>
--#include <llvm/Instructions.h>
--#include <llvm/Type.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/Instructions.h>
-+#include <llvm/IR/Type.h>
- 
- #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
- #include <GTLCore/LLVMBackend/ExpressionResult_p.h>
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp	2013-05-08 15:39:25.093057205 -0400
-@@ -21,8 +21,8 @@
- 
- #include <stdlib.h>
- 
--#include <llvm/Constant.h>
--#include <llvm/Instructions.h>
-+#include <llvm/IR/Constant.h>
-+#include <llvm/IR/Instructions.h>
- 
- #include "../Type.h"
- #include "../LLVMBackend/CodeGenerator_p.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp	2013-05-08 15:39:25.093057205 -0400
-@@ -21,12 +21,12 @@
- 
- // LLVM
- #include <llvm/ADT/ArrayRef.h>
--#include <llvm/BasicBlock.h>
--#include <llvm/Constants.h>
--#include <llvm/Function.h>
--#include <llvm/GlobalVariable.h>
--#include <llvm/Instructions.h>
--#include <llvm/Module.h>
-+#include <llvm/IR/BasicBlock.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/GlobalVariable.h>
-+#include <llvm/IR/Instructions.h>
-+#include <llvm/IR/Module.h>
- 
- // GTLCore
- #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp	2013-05-08 15:39:25.094057209 -0400
-@@ -19,9 +19,9 @@
- 
- #include "Tree.h"
- 
--#include <llvm/Constant.h>
--#include <llvm/GlobalVariable.h>
--#include <llvm/Type.h>
-+#include <llvm/IR/Constant.h>
-+#include <llvm/IR/GlobalVariable.h>
-+#include <llvm/IR/Type.h>
- 
- #include "FunctionDeclaration.h"
- 
-@@ -37,8 +37,8 @@
- #include "GTLCore/LLVMBackend/Visitor_p.h"
- 
- #include "Expression.h"
--#include <llvm/Module.h>
--#include <llvm/DerivedTypes.h>
-+#include <llvm/IR/Module.h>
-+#include <llvm/IR/DerivedTypes.h>
- 
- using namespace GTLCore::AST;
- 
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp	2013-05-08 15:39:25.094057209 -0400
-@@ -22,9 +22,9 @@
- #include <map>
- #include <fstream>
- 
--#include <llvm/Module.h>
--#include <llvm/Value.h>
--#include <llvm/Type.h>
-+#include <llvm/IR/Module.h>
-+#include <llvm/IR/Value.h>
-+#include <llvm/IR/Type.h>
- #include <llvm/Support/Path.h>
- #include <llvm/Support/raw_ostream.h>
- 
-@@ -418,9 +418,9 @@ namespace GTLCore {
- 
- #ifdef OPENGTL_ENABLE_DEBUG_OUTPUT
- 
--#include <llvm/DerivedTypes.h>
--#include <llvm/Function.h>
--#include <llvm/Type.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/Type.h>
- 
- void compareFunctionParameters( llvm::Value* func, const std::vector<llvm::Value*>& params  )
- {
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp	2013-05-08 15:39:25.094057209 -0400
-@@ -21,9 +21,9 @@
- 
- #include <llvm/ExecutionEngine/GenericValue.h>
- #include <llvm/ExecutionEngine/ExecutionEngine.h>
--#include <llvm/Function.h>
--
--#include <llvm/DerivedTypes.h> // <- I don't understand why I need to include that file to be able to display llvm::Type on the standard output
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/Instructions.h>
-+#include <llvm/IR/DerivedTypes.h> // <- I don't understand why I need to include that file to be able to display llvm::Type on the standard output
- 
- #include "VirtualMachine_p.h"
- 
-@@ -35,7 +35,6 @@
- #include "LLVMBackend/GenerationContext_p.h"
- #include "ModuleData_p.h"
- #include "LLVMBackend/CodeGenerator_p.h"
--#include <llvm/Instructions.h>
- #include "Type_p.h"
- #include <GTLCore/Parameter.h>
- #include "PrimitiveTypesTraits_p.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp	2013-05-08 15:39:25.094057209 -0400
-@@ -21,9 +21,9 @@
- 
- #include <cstdarg>
- 
--#include <llvm/DerivedTypes.h>
--#include <llvm/Module.h>
--#include <llvm/Type.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/Module.h>
-+#include <llvm/IR/Type.h>
- 
- #include "Parameter.h"
- 
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp	2013-05-08 15:39:25.095057213 -0400
-@@ -19,12 +19,12 @@
- 
- #include "CodeGenerator_p.h"
- 
--#include <llvm/CallingConv.h>
--#include <llvm/Constants.h>
--#include <llvm/Function.h>
--#include <llvm/Instructions.h>
--#include <llvm/Module.h>
--#include <llvm/Value.h>
-+#include <llvm/IR/CallingConv.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/Instructions.h>
-+#include <llvm/IR/Module.h>
-+#include <llvm/IR/Value.h>
- 
- #include "GTLCore/Debug.h"
- #include "ExpressionResult_p.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp	2013-05-08 15:39:25.095057213 -0400
-@@ -20,7 +20,7 @@
- #include "ContextManager_p.h"
- 
- #include <llvm/Support/ThreadLocal.h>
--#include <llvm/LLVMContext.h>
-+#include <llvm/IR/LLVMContext.h>
- 
- using namespace LLVMBackend;
- 
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp	2013-05-08 15:39:25.095057213 -0400
-@@ -20,7 +20,7 @@
- #include "ExpressionGenerationContext_p.h"
- 
- #include "GTLCore/Debug.h"
--#include <llvm/BasicBlock.h>
-+#include <llvm/IR/BasicBlock.h>
- 
- #include "GTLCore/Macros_p.h"
- 
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp	2013-05-08 15:39:25.095057213 -0400
-@@ -19,8 +19,8 @@
- 
- #include "ExpressionResult_p.h"
- 
--#include "llvm/Constant.h"
--#include "llvm/DerivedTypes.h"
-+#include "llvm/IR/Constant.h"
-+#include "llvm/IR/DerivedTypes.h"
- 
- #include "../Type.h"
- #include "../Type_p.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp	2013-05-08 15:39:25.096057217 -0400
-@@ -22,8 +22,8 @@
- #include "GTLCore/ModuleData_p.h"
- #include "GTLCore/Debug.h"
- 
--#include "llvm/BasicBlock.h"
--#include "llvm/Function.h"
-+#include "llvm/IR/BasicBlock.h"
-+#include "llvm/IR/Function.h"
- 
- #include "GTLCore/AST/Statement.h"
- 
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp	2013-05-08 15:39:25.096057217 -0400
-@@ -20,12 +20,12 @@
- #include "Visitor_p.h"
- 
- // LLVM
--#include <llvm/BasicBlock.h>
--#include <llvm/Constants.h>
--#include <llvm/Function.h>
--#include <llvm/Instructions.h>
--#include <llvm/Module.h>
--#include <llvm/GlobalVariable.h>
-+#include <llvm/IR/BasicBlock.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/Instructions.h>
-+#include <llvm/IR/Module.h>
-+#include <llvm/IR/GlobalVariable.h>
- 
- // GTLCore
- #include "CodeGenerator_p.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp	2013-05-08 15:41:21.422512114 -0400
-@@ -21,7 +21,7 @@
- 
- #include <sstream>
- 
--#include <llvm/Module.h>
-+#include <llvm/IR/Module.h>
- #include <llvm/PassManager.h>
- #include <llvm/Target/TargetMachine.h>
- #include <llvm/Analysis/Verifier.h>
-@@ -242,7 +242,7 @@ void ModuleData::doLink()
-   GTL_ASSERT( not m_llvmLinkedModule );
-   m_llvmLinkedModule = m_llvmModule;
-   m_llvmModule = llvm::CloneModule( m_llvmModule );
--  llvm::Linker linker("", m_llvmLinkedModule);
-+  llvm::Linker linker(m_llvmLinkedModule);
-   std::string errorMessage;
-   foreach( const llvm::Module* mod, m_linkModuleWith )
-   {
-@@ -270,18 +270,11 @@ void ModuleData::doLink()
-         hide.push_back(name);
-       }
-     }
--    linker.LinkInModule( clone, &errorMessage );
-+    linker.linkInModule( clone, &errorMessage );
-     
-     GTL_DEBUG("Linking error: " << errorMessage );
-     delete clone;
-   }
--  foreach( const GTLCore::String& mod, m_linkModuleWithArchives )
--  {
--    bool v = false;
--    linker.LinkInArchive( llvm::sys::Path( (const std::string&) mod), v);
--  }
--  
--  linker.releaseModule();
-   
-   // Hide symbols
-   foreach(GTLCore::String name, hide)
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp	2013-05-08 15:39:25.096057217 -0400
-@@ -25,7 +25,7 @@
- 
- #include <iostream>
- 
--#include <llvm/DerivedTypes.h>
-+#include <llvm/IR/DerivedTypes.h>
- 
- #include "wrappers/StructWrap.h"
- #include "SharedPointer.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp	2013-05-08 15:39:25.097057221 -0400
-@@ -30,8 +30,8 @@
- 
- using namespace GTLCore;
- 
--#include <llvm/Type.h>
--#include <llvm/DerivedTypes.h>
-+#include <llvm/IR/Type.h>
-+#include <llvm/IR/DerivedTypes.h>
- 
- Type::StructDataMember::Information::~Information()
- {
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp	2013-05-08 15:39:25.097057221 -0400
-@@ -19,8 +19,8 @@
- 
- #include "Value_p.h"
- 
--#include <llvm/DerivedTypes.h>
--#include <llvm/Type.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/Type.h>
- 
- #include "Debug.h"
- #include "Value.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp	2013-05-08 15:39:25.097057221 -0400
-@@ -19,8 +19,8 @@
- 
- #include "VariableNG_p.h"
- 
--#include <llvm/Constants.h>
--#include <llvm/Instructions.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/Instructions.h>
- 
- #include "LLVMBackend/CodeGenerator_p.h"
- #include "Debug.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp	2013-05-08 15:39:25.097057221 -0400
-@@ -21,10 +21,10 @@
- 
- // JIT
- #include <llvm/ExecutionEngine/ExecutionEngine.h>
--#include <llvm/Module.h>
--#include <llvm/DerivedTypes.h>
-+#include <llvm/IR/Module.h>
-+#include <llvm/IR/DerivedTypes.h>
- #include <llvm/Target/TargetOptions.h>
--#include <llvm/LLVMContext.h>
-+#include <llvm/IR/LLVMContext.h>
- #include <llvm/Support/CommandLine.h>
- #include <llvm/Support/Threading.h>
- #include <llvm/Support/ErrorHandling.h>
-@@ -48,7 +48,8 @@ struct VirtualMachine::Private {
- VirtualMachine* VirtualMachine::Private::virtualMachine = 0;
- int VirtualMachine::Private::optimLevel = 2;
- 
--void gtl_llvm_error_handler(void *user_data, const std::string& reason)
-+void gtl_llvm_error_handler(void *user_data, const std::string& reason,
-+			    bool gen_crash_diag)
- {
-   GTL_ABORT(reason);
- }
-@@ -58,11 +59,7 @@ VirtualMachine::VirtualMachine() : d(new
- {
-   d->executionEngine = 0;
-   
--#ifdef LLVM_27
--  llvm::llvm_install_error_handler(&gtl_llvm_error_handler);
--#else
--  llvm::install_fatal_error_handler(&gtl_llvm_error_handler);
--#endif
-+  llvm::install_fatal_error_handler(gtl_llvm_error_handler);
-   
-   llvm::llvm_start_multithreaded();
- 
-diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp	2013-05-08 15:39:25.097057221 -0400
-@@ -19,7 +19,7 @@
- 
- #include "Compiler_p.h"
- 
--#include <llvm/Module.h>
-+#include <llvm/IR/Module.h>
- #include <llvm/PassManager.h>
- 
- #include "GTLCore/AST/Expression.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp	2013-05-08 15:39:25.098057225 -0400
-@@ -22,9 +22,9 @@
- 
- #include <sstream>
- 
--#include <llvm/Module.h>
-+#include <llvm/IR/Module.h>
- #include <llvm/Support/DynamicLibrary.h>
--#include <llvm/LLVMContext.h>
-+#include <llvm/IR/LLVMContext.h>
- 
- #include "GTLCore/CompilationMessage.h"
- #include "GTLCore/Function.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp	2013-05-08 15:39:25.098057225 -0400
-@@ -29,7 +29,7 @@
- 
- #include "Library.h"
- #include <GTLCore/Function_p.h>
--#include <llvm/Module.h>
-+#include <llvm/IR/Module.h>
- #include <GTLCore/Type_p.h>
- 
- using namespace GTLFragment;
-diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp
---- OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp	2013-05-08 15:39:25.098057225 -0400
-@@ -21,14 +21,14 @@
- 
- #include <vector>
- 
--#include <llvm/CallingConv.h>
--#include <llvm/Constants.h>
--#include <llvm/Constant.h>
--#include <llvm/DerivedTypes.h>
--#include <llvm/Function.h>
--#include <llvm/Instructions.h>
--#include <llvm/Module.h>
--#include <llvm/Value.h>
-+#include <llvm/IR/CallingConv.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/Constant.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/Instructions.h>
-+#include <llvm/IR/Module.h>
-+#include <llvm/IR/Value.h>
- 
- #include "GTLCore/LLVMBackend/CodeGenerator_p.h"
- #include "GTLCore/LLVMBackend/ExpressionResult_p.h"
-diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp
---- OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp	2013-05-08 15:39:25.098057225 -0400
-@@ -28,13 +28,13 @@
- #include "CodeGenerator_p.h"
- #include <GTLFragment/wrappers/ColorWrap_p.h>
- #include <GTLCore/Type_p.h>
--#include <llvm/Value.h>
--#include <llvm/DerivedTypes.h>
--#include <llvm/CallingConv.h>
--#include <llvm/Module.h>
-+#include <llvm/IR/Value.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/CallingConv.h>
-+#include <llvm/IR/Module.h>
- #include <GTLCore/LLVMBackend/ExpressionGenerationContext_p.h>
- #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
--#include <llvm/Instructions.h>
-+#include <llvm/IR/Instructions.h>
- #include <GTLCore/TypesManager.h>
- 
- using namespace OpenShiva;
-diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp
---- OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp	2013-05-08 15:39:25.099057228 -0400
-@@ -22,7 +22,7 @@
- #include <sstream>
- #include <fstream>
- 
--#include <llvm/Module.h>
-+#include <llvm/IR/Module.h>
- 
- #include "GTLCore/CompilationMessage.h"
- #include "GTLCore/Function.h"
-@@ -48,7 +48,7 @@
- #include "wrappers/ImageWrap_p.h"
- #include "wrappers/RegionWrap_p.h"
- #include <GTLCore/AST/Tree.h>
--#include <llvm/DerivedTypes.h>
-+#include <llvm/IR/DerivedTypes.h>
- 
- using namespace OpenShiva;
- 
-diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp
---- OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp	2013-05-08 15:39:25.099057228 -0400
-@@ -19,7 +19,8 @@
- 
- #include "PixelConvertExpressionFactory_p.h"
- 
--#include <llvm/Instructions.h>
-+#include <llvm/IR/Instructions.h>
-+#include <llvm/IR/Function.h>
- 
- #include "GTLCore/Type.h"
- #include "GTLCore/AST/ConvertExpression.h"
-@@ -34,7 +35,6 @@
- #include <GTLCore/VariableNG_p.h>
- #include <GTLCore/LLVMBackend/Visitor_p.h>
- #include <GTLFragment/wrappers/ColorWrap_p.h>
--#include <llvm/Function.h>
- #include <GTLCore/Type_p.h>
- 
- using namespace OpenShiva;
-diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp
---- OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp	2013-05-08 15:39:25.099057228 -0400
-@@ -20,11 +20,11 @@
- #include "PixelVisitor_p.h"
- 
- // LLVM
--#include <llvm/Constant.h>
--#include <llvm/Constants.h>
--#include <llvm/BasicBlock.h>
--#include <llvm/Instructions.h>
--#include <llvm/Function.h>
-+#include <llvm/IR/Constant.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/BasicBlock.h>
-+#include <llvm/IR/Instructions.h>
-+#include <llvm/IR/Function.h>
- 
- #include "GTLCore/LLVMBackend/ExpressionResult_p.h"
- #include "GTLCore/LLVMBackend/ExpressionGenerationContext_p.h"
-diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp
---- OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp	2013-05-08 15:39:25.099057228 -0400
-@@ -22,9 +22,9 @@
- #include <map>
- #include <vector>
- 
--#include <llvm/DerivedTypes.h>
--#include <llvm/Function.h>
--#include <llvm/Module.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/Module.h>
- 
- #include "GTLCore/Function_p.h"
- #include "GTLCore/Macros.h"
diff --git a/extra/opengtl/opengtl-0.9.18-memcpy.patch b/extra/opengtl/opengtl-0.9.18-memcpy.patch
deleted file mode 100644
index 3e6ecd557..000000000
--- a/extra/opengtl/opengtl-0.9.18-memcpy.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r 99a2017746c0 Extensions/PngDC/PngDC.cpp
---- a/Extensions/PngDC/PngDC.cpp	Wed Jan 30 05:28:12 2013 +1100
-+++ b/Extensions/PngDC/PngDC.cpp	Tue Apr 16 01:59:10 2013 +1000
-@@ -20,6 +20,7 @@
- #include "PngDC.h"
- 
- #include <png.h>
-+#include <string.h>
- 
- #include <config-endian.h>
- 
diff --git a/extra/openjpeg/PKGBUILD b/extra/openjpeg/PKGBUILD
index b3f6407b3..e3e625c5a 100644
--- a/extra/openjpeg/PKGBUILD
+++ b/extra/openjpeg/PKGBUILD
@@ -1,28 +1,66 @@
-# $Id: PKGBUILD 198355 2013-10-30 14:21:56Z allan $
+# $Id: PKGBUILD 205844 2014-02-11 15:10:57Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=openjpeg
 pkgver=1.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source JPEG 2000 codec"
 arch=(i686 x86_64 'mips64el')
 license=('BSD')
 url="http://www.openjpeg.org"
 depends=('zlib')
-source=(http://openjpeg.googlecode.com/files/openjpeg-${pkgver}.tar.gz)
-sha1sums=('1b0b74d1af4c297fd82806a9325bb544caf9bb8b')
+makedepends=('libtiff' 'lcms2' 'libpng' 'doxygen')
+optdepends=('lcms2: j2k_to_image and image_to_j2k programs'
+            'libpng: j2k_to_image and image_to_j2k programs')
+source=(http://openjpeg.googlecode.com/files/openjpeg-${pkgver}.tar.gz
+        openjpeg-1.5.1-CVE-2013-1447.patch
+        openjpeg-1.5.1-CVE-2013-6045.patch
+        openjpeg-1.5.1-CVE-2013-6052.patch
+        openjpeg-1.5.1-CVE-2013-6053.patch
+        openjpeg-1.5.1-CVE-2013-6887.patch
+        openjpeg-1.5.1-doxygen_timestamp.patch
+        openjpeg-1.5-r2029.patch
+        openjpeg-1.5-r2031.patch
+        openjpeg-1.5-r2032.patch
+        openjpeg-1.5-r2033.patch)
+sha1sums=('1b0b74d1af4c297fd82806a9325bb544caf9bb8b'
+          'f2baf9bde105c96c7016be907cd278f2878be2b9'
+          'f3764e473bd35508e83643a9257979eaa2c89c36'
+          '1d600a13432b977c46a5b74bf87bf1b5a130abfb'
+          '8d2da4b912d7e930abec31a956b678f62566884c'
+          '038e471597decf36de0c7c78915744054704c601'
+          '339677795a567c0f91b62141847b8e5dda53e763'
+          '1cd97c1be5cedad136894db2b16f856a28387aeb'
+          'f68108dd25c7ed278678de11d5713fba87ab6017'
+          '222769c17e69022902d4e49c9dc5294361a00c85'
+          '9ec5c1e0909c8946a174733a598fbe38675a0c9c')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../openjpeg-1.5.1-doxygen_timestamp.patch
+  patch -Np0 -i ../openjpeg-1.5-r2029.patch
+  patch -Np0 -i ../openjpeg-1.5-r2031.patch
+  patch -Np0 -i ../openjpeg-1.5-r2032.patch
+  patch -Np0 -i ../openjpeg-1.5-r2033.patch
+  patch -Np1 -i ../openjpeg-1.5.1-CVE-2013-6052.patch
+  patch -Np1 -i ../openjpeg-1.5.1-CVE-2013-6053.patch
+#  patch -Np1 -i ../openjpeg-1.5.1-CVE-2013-6045.patch
+  patch -Np1 -i ../openjpeg-1.5.1-CVE-2013-1447.patch
+  patch -Np1 -i ../openjpeg-1.5.1-CVE-2013-6887.patch
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
+  autoreconf -fi
   # make sure we use system libs
   rm -rf thirdparty
   ./configure --prefix=/usr \
-	--disable-static --disable-silent-rules
+	--enable-shared --disable-static --disable-silent-rules
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/openjpeg"
   install -m644 LICENSE "${pkgdir}/usr/share/licenses/openjpeg/LICENSE"
diff --git a/extra/openjpeg/openjpeg-1.5-r2029.patch b/extra/openjpeg/openjpeg-1.5-r2029.patch
new file mode 100644
index 000000000..a1a819a8c
--- /dev/null
+++ b/extra/openjpeg/openjpeg-1.5-r2029.patch
@@ -0,0 +1,77 @@
+Index: libopenjpeg/jp2.c
+===================================================================
+--- libopenjpeg/jp2.c	(revision 2028)
++++ libopenjpeg/jp2.c	(revision 2029)
+@@ -173,6 +173,10 @@
+ 	else if (box->length == 0) {
+ 		box->length = cio_numbytesleft(cio) + 8;
+ 	}
++	if (box->length < 0) {
++		opj_event_msg(cinfo, EVT_ERROR, "Integer overflow in box->length\n");
++		return OPJ_FALSE; // TODO: actually check jp2_read_boxhdr's return value
++	}
+ 	
+ 	return OPJ_TRUE;
+ }
+@@ -654,6 +658,7 @@
+         opj_event_msg(cinfo, EVT_ERROR, "Expected JP2H Marker\n");
+         return OPJ_FALSE;
+         }
++	  if (box.length <= 8) return OPJ_FALSE;
+       cio_skip(cio, box.length - 8);
+ 
+       if(cio->bp >= cio->end) return OPJ_FALSE;
+@@ -679,6 +684,7 @@
+       {
+       if( !jp2_read_colr(jp2, cio, &box, color))
+         {
++        if (box.length <= 8) return OPJ_FALSE;
+         cio_seek(cio, box.init_pos + 8);
+         cio_skip(cio, box.length - 8);
+         }
+@@ -689,6 +695,7 @@
+       {
+       if( !jp2_read_cdef(jp2, cio, &box, color))
+         {
++        if (box.length <= 8) return OPJ_FALSE;
+         cio_seek(cio, box.init_pos + 8);
+         cio_skip(cio, box.length - 8);
+         }
+@@ -699,6 +706,7 @@
+       {
+       if( !jp2_read_pclr(jp2, cio, &box, color))
+         {
++        if (box.length <= 8) return OPJ_FALSE;
+         cio_seek(cio, box.init_pos + 8);
+         cio_skip(cio, box.length - 8);
+         }
+@@ -709,12 +717,14 @@
+       {
+       if( !jp2_read_cmap(jp2, cio, &box, color))
+         {
++        if (box.length <= 8) return OPJ_FALSE;
+         cio_seek(cio, box.init_pos + 8);
+         cio_skip(cio, box.length - 8);
+         }
+       if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
+       continue;
+       }
++    if (box.length <= 8) return OPJ_FALSE;
+     cio_seek(cio, box.init_pos + 8);
+     cio_skip(cio, box.length - 8);
+     if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
+@@ -910,12 +920,14 @@
+   }
+ 	do {
+ 		if(JP2_JP2C != box.type) {
++			if (box.length <= 8) return OPJ_FALSE;
+ 			cio_skip(cio, box.length - 8);
+ 			if( jp2_read_boxhdr(cinfo, cio, &box) == OPJ_FALSE ) return OPJ_FALSE;
+ 		}
+ 	} while(JP2_JP2C != box.type);
+ 
+ 	*j2k_codestream_offset = cio_tell(cio);
++	if (box.length <= 8) return OPJ_FALSE;
+ 	*j2k_codestream_length = box.length - 8;
+ 
+ 	return OPJ_TRUE;
diff --git a/extra/openjpeg/openjpeg-1.5-r2031.patch b/extra/openjpeg/openjpeg-1.5-r2031.patch
new file mode 100644
index 000000000..d8249acad
--- /dev/null
+++ b/extra/openjpeg/openjpeg-1.5-r2031.patch
@@ -0,0 +1,24 @@
+Index: libopenjpeg/jpwl/Makefile.am
+===================================================================
+--- libopenjpeg/jpwl/Makefile.am	(revision 2030)
++++ libopenjpeg/jpwl/Makefile.am	(revision 2031)
+@@ -18,7 +18,6 @@
+ ../pi.c \
+ ../raw.c \
+ ../t1.c \
+-../t1_generate_luts.c \
+ ../t2.c \
+ ../tcd.c \
+ ../tgt.c \
+Index: libopenjpeg/Makefile.am
+===================================================================
+--- libopenjpeg/Makefile.am	(revision 2030)
++++ libopenjpeg/Makefile.am	(revision 2031)
+@@ -35,7 +35,6 @@
+ pi.c \
+ raw.c \
+ t1.c \
+-t1_generate_luts.c \
+ t2.c \
+ tcd.c \
+ tgt.c \
diff --git a/extra/openjpeg/openjpeg-1.5-r2032.patch b/extra/openjpeg/openjpeg-1.5-r2032.patch
new file mode 100644
index 000000000..3d7d4fa7c
--- /dev/null
+++ b/extra/openjpeg/openjpeg-1.5-r2032.patch
@@ -0,0 +1,30 @@
+Index: libopenjpeg/j2k.c
+===================================================================
+--- libopenjpeg/j2k.c	(revision 2031)
++++ libopenjpeg/j2k.c	(revision 2032)
+@@ -468,6 +468,12 @@
+ 	}
+ #endif /* USE_JPWL */
+ 
++  /* prevent division by zero */
++  if (!(cp->tdx * cp->tdy)) {
++    opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: invalid tile size (tdx: %d, tdy: %d)\n", cp->tdx, cp->tdy);
++    return;
++  }
++
+ 	image->comps = (opj_image_comp_t*) opj_calloc(image->numcomps, sizeof(opj_image_comp_t));
+ 	for (i = 0; i < image->numcomps; i++) {
+ 		int tmp, w, h;
+@@ -506,6 +512,12 @@
+ 		}
+ #endif /* USE_JPWL */
+ 
++    /* prevent division by zero */
++    if (!(image->comps[i].dx * image->comps[i].dy)) {
++      opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: invalid component size (dx: %d, dy: %d)\n", image->comps[i].dx, image->comps[i].dy);
++      return;
++    }
++
+ 		/* TODO: unused ? */
+ 		w = int_ceildiv(image->x1 - image->x0, image->comps[i].dx);
+ 		h = int_ceildiv(image->y1 - image->y0, image->comps[i].dy);
diff --git a/extra/openjpeg/openjpeg-1.5-r2033.patch b/extra/openjpeg/openjpeg-1.5-r2033.patch
new file mode 100644
index 000000000..a84513913
--- /dev/null
+++ b/extra/openjpeg/openjpeg-1.5-r2033.patch
@@ -0,0 +1,49 @@
+Index: libopenjpeg/j2k.c
+===================================================================
+--- libopenjpeg/j2k.c	(revision 2032)
++++ libopenjpeg/j2k.c	(revision 2033)
+@@ -835,6 +835,12 @@
+ 	
+ 	len = cio_read(cio, 2);		/* Lcoc */
+ 	compno = cio_read(cio, image->numcomps <= 256 ? 1 : 2);	/* Ccoc */
++  if (compno >= image->numcomps) {
++    opj_event_msg(j2k->cinfo, EVT_ERROR,
++      "bad component number in COC (%d out of a maximum of %d)\n",
++      compno, image->numcomps);
++    return;
++  }
+ 	tcp->tccps[compno].csty = cio_read(cio, 1);	/* Scoc */
+ 	j2k_read_cox(j2k, compno);
+ }
+@@ -1016,9 +1022,16 @@
+ 
+ 		/* keep your private count of tiles */
+ 		backup_compno++;
+-	};
++	}
+ #endif /* USE_JPWL */
+ 
++  if ((compno < 0) || (compno >= numcomp)) {
++    opj_event_msg(j2k->cinfo, EVT_ERROR,
++      "bad component number in QCC (%d out of a maximum of %d)\n",
++      compno, j2k->image->numcomps);
++    return;
++  }
++
+ 	j2k_read_qcx(j2k, compno, len - 2 - (numcomp <= 256 ? 1 : 2));
+ }
+ 
+@@ -1602,6 +1615,13 @@
+ 	};
+ #endif /* USE_JPWL */
+ 
++  if (compno >= numcomps) {
++    opj_event_msg(j2k->cinfo, EVT_ERROR,
++      "bad component number in RGN (%d out of a maximum of %d)\n",
++      compno, j2k->image->numcomps);
++    return;
++  }
++
+ 	tcp->tccps[compno].roishift = cio_read(cio, 1);				/* SPrgn */
+ }
+ 
diff --git a/extra/openjpeg/openjpeg-1.5.1-CVE-2013-1447.patch b/extra/openjpeg/openjpeg-1.5.1-CVE-2013-1447.patch
new file mode 100644
index 000000000..a0e372325
--- /dev/null
+++ b/extra/openjpeg/openjpeg-1.5.1-CVE-2013-1447.patch
@@ -0,0 +1,165 @@
+diff -up openjpeg-1.5.1/libopenjpeg/cio.c.CVE-2013-1447 openjpeg-1.5.1/libopenjpeg/cio.c
+--- openjpeg-1.5.1/libopenjpeg/cio.c.CVE-2013-1447	2014-01-07 15:12:20.517748762 -0600
++++ openjpeg-1.5.1/libopenjpeg/cio.c	2014-01-07 15:12:20.533748592 -0600
+@@ -107,6 +107,11 @@ int OPJ_CALLCONV cio_tell(opj_cio_t *cio
+  * pos : position, in number of bytes, from the beginning of the stream
+  */
+ void OPJ_CALLCONV cio_seek(opj_cio_t *cio, int pos) {
++	if ((cio->start + pos) > cio->end) {
++		opj_event_msg(cio->cinfo, EVT_ERROR, "error: trying to seek past the end of the codestream (start = %d, change = %d, end = %d\n", cio->start, pos, cio->end);
++		cio->bp = cio->end;
++		return;
++	}
+ 	cio->bp = cio->start + pos;
+ }
+ 
+@@ -114,6 +119,7 @@ void OPJ_CALLCONV cio_seek(opj_cio_t *ci
+  * Number of bytes left before the end of the stream.
+  */
+ int cio_numbytesleft(opj_cio_t *cio) {
++	assert((cio->end - cio->bp) >= 0);
+ 	return cio->end - cio->bp;
+ }
+ 
+@@ -191,6 +197,11 @@ unsigned int cio_read(opj_cio_t *cio, in
+  */
+ void cio_skip(opj_cio_t *cio, int n) {
+ 	assert((cio->bp + n) >= cio->bp);
++	if (((cio->bp + n) < cio->start) || ((cio->bp + n) > cio->end)) {
++		opj_event_msg(cio->cinfo, EVT_ERROR, "error: trying to skip bytes past the end of the codestream (current = %d, change = %d, end = %d\n", cio->bp, n, cio->end);
++		cio->bp = cio->end;
++		return;
++	}
+ 	cio->bp += n;
+ }
+ 
+diff -up openjpeg-1.5.1/libopenjpeg/j2k.c.CVE-2013-1447 openjpeg-1.5.1/libopenjpeg/j2k.c
+--- openjpeg-1.5.1/libopenjpeg/j2k.c.CVE-2013-1447	2014-01-07 15:12:20.525748677 -0600
++++ openjpeg-1.5.1/libopenjpeg/j2k.c	2014-01-07 15:12:20.534748582 -0600
+@@ -476,7 +476,7 @@ static void j2k_read_siz(opj_j2k_t *j2k)
+ 
+ 	image->comps = (opj_image_comp_t*) opj_calloc(image->numcomps, sizeof(opj_image_comp_t));
+ 	for (i = 0; i < image->numcomps; i++) {
+-		int tmp, w, h;
++		int tmp/*, w, h*/;
+ 		tmp = cio_read(cio, 1);		/* Ssiz_i */
+ 		image->comps[i].prec = (tmp & 0x7f) + 1;
+ 		image->comps[i].sgnd = tmp >> 7;
+@@ -511,6 +511,14 @@ static void j2k_read_siz(opj_j2k_t *j2k)
+ 			
+ 		}
+ #endif /* USE_JPWL */
++		{
++			if (!(image->comps[i].dx * image->comps[i].dy)) {
++				opj_event_msg(j2k->cinfo, EVT_ERROR,
++					"JPWL: bad XRsiz_%d/YRsiz_%d (%d x %d)\n",
++					i, i, image->comps[i].dx, image->comps[i].dy);
++					return;
++			}
++		}
+ 
+     /* prevent division by zero */
+     if (!(image->comps[i].dx * image->comps[i].dy)) {
+@@ -519,8 +527,8 @@ static void j2k_read_siz(opj_j2k_t *j2k)
+     }
+ 
+ 		/* TODO: unused ? */
+-		w = int_ceildiv(image->x1 - image->x0, image->comps[i].dx);
+-		h = int_ceildiv(image->y1 - image->y0, image->comps[i].dy);
++/*		w = int_ceildiv(image->x1 - image->x0, image->comps[i].dx);
++		h = int_ceildiv(image->y1 - image->y0, image->comps[i].dy);*/
+ 
+ 		image->comps[i].resno_decoded = 0;	/* number of resolution decoded */
+ 		image->comps[i].factor = cp->reduce; /* reducing factor per component */
+@@ -2015,6 +2023,11 @@ opj_image_t* j2k_decode(opj_j2k_t *j2k,
+ 	}
+ 	if (j2k->state == J2K_STATE_NEOC) {
+ 		j2k_read_eoc(j2k);
++		/* Check one last time for errors during decoding before returning */
++		if (j2k->state & J2K_STATE_ERR) {
++			opj_image_destroy(image);
++			return NULL;
++		}
+ 	}
+ 
+ 	if (j2k->state != J2K_STATE_MT) {
+diff -up openjpeg-1.5.1/libopenjpeg/jp2.c.CVE-2013-1447 openjpeg-1.5.1/libopenjpeg/jp2.c
+--- openjpeg-1.5.1/libopenjpeg/jp2.c.CVE-2013-1447	2014-01-07 15:12:20.518748752 -0600
++++ openjpeg-1.5.1/libopenjpeg/jp2.c	2014-01-07 15:12:20.535748571 -0600
+@@ -819,6 +819,17 @@ void jp2_write_jp2h(opj_jp2_t *jp2, opj_
+ 
+ 	jp2_write_ihdr(jp2, cio);
+ 
++	{
++		int curpos = cio_tell(cio);
++		cio_seek(cio, box.init_pos);
++		cio_skip(cio, box.length);
++		if ((cio_tell(cio) - box.init_pos) != box.length) {
++			opj_event_msg(jp2->cinfo, EVT_ERROR, "Box size exceeds size of codestream (expected: %d, real: %d)\n", box.length, (cio_tell(cio) - box.init_pos));
++			return OPJ_FALSE;
++		}
++		cio_seek(cio, curpos);
++	}
++
+ 	if (jp2->bpc == 255) {
+ 		jp2_write_bpcc(jp2, cio);
+ 	}
+@@ -871,6 +882,13 @@ static opj_bool jp2_read_ftyp(opj_jp2_t
+ 	jp2->numcl = (box.length - 16) / 4;
+ 	jp2->cl = (unsigned int *) opj_malloc(jp2->numcl * sizeof(unsigned int));
+ 
++	if (cio_numbytesleft(cio) < ((int)jp2->numcl * 4)) {
++		opj_event_msg(cinfo, EVT_ERROR, "Not enough bytes in FTYP Box "
++				"(expected %d, but only %d left)\n",
++				((int)jp2->numcl * 4), cio_numbytesleft(cio));
++		return OPJ_FALSE;
++	}
++
+ 	for (i = 0; i < (int)jp2->numcl; i++) {
+ 		jp2->cl[i] = cio_read(cio, 4);	/* CLi */
+ 	}
+diff -up openjpeg-1.5.1/libopenjpeg/t2.c.CVE-2013-1447 openjpeg-1.5.1/libopenjpeg/t2.c
+--- openjpeg-1.5.1/libopenjpeg/t2.c.CVE-2013-1447	2012-09-13 02:58:39.000000000 -0500
++++ openjpeg-1.5.1/libopenjpeg/t2.c	2014-01-07 15:12:20.535748571 -0600
+@@ -340,6 +340,11 @@ static int t2_decode_packet(opj_t2_t* t2
+ 	int precno = pi->precno;	/* precinct value */
+ 	int layno  = pi->layno;		/* quality layer value */
+ 
++	if (!&(tile->comps[compno])) {
++		opj_event_msg(t2->cinfo, EVT_ERROR, "Trying to decode tile with no components!\n");
++		return -999;
++	}
++
+ 	opj_tcd_resolution_t* res = &tile->comps[compno].resolutions[resno];
+ 
+ 	unsigned char *hd = NULL;
+diff -up openjpeg-1.5.1/libopenjpeg/tcd.c.CVE-2013-1447 openjpeg-1.5.1/libopenjpeg/tcd.c
+--- openjpeg-1.5.1/libopenjpeg/tcd.c.CVE-2013-1447	2014-01-07 15:12:20.526748667 -0600
++++ openjpeg-1.5.1/libopenjpeg/tcd.c	2014-01-07 15:12:20.536748561 -0600
+@@ -667,8 +667,8 @@ void tcd_malloc_decode(opj_tcd_t *tcd, o
+ 			y1 = j == 0 ? tilec->y1 : int_max(y1,	(unsigned int) tilec->y1);
+ 		}
+ 
+-		w = int_ceildivpow2(x1 - x0, image->comps[i].factor);
+-		h = int_ceildivpow2(y1 - y0, image->comps[i].factor);
++		w = int_ceildivpow2((long)(x1) - (long)(x0), image->comps[i].factor);
++		h = int_ceildivpow2((long)(y1) - (long)(y0), image->comps[i].factor);
+ 
+ 		image->comps[i].w = w;
+ 		image->comps[i].h = h;
+@@ -1381,7 +1381,15 @@ opj_bool tcd_decode_tile(opj_tcd_t *tcd,
+ 	if (l == -999) {
+ 		eof = 1;
+ 		opj_event_msg(tcd->cinfo, EVT_ERROR, "tcd_decode: incomplete bistream\n");
++		return OPJ_FALSE;
+ 	}
++
++	/* The code below assumes that numcomps > 0 */
++	if (tile->numcomps <= 0) {
++		opj_event_msg(tcd->cinfo, EVT_ERROR, "tcd_decode: tile has a zero or negative numcomps\n");
++		return OPJ_TRUE;
++	}
++
+ 	
+ 	/*------------------TIER1-----------------*/
+ 	
diff --git a/extra/openjpeg/openjpeg-1.5.1-CVE-2013-6045.patch b/extra/openjpeg/openjpeg-1.5.1-CVE-2013-6045.patch
new file mode 100644
index 000000000..f45566f36
--- /dev/null
+++ b/extra/openjpeg/openjpeg-1.5.1-CVE-2013-6045.patch
@@ -0,0 +1,60 @@
+diff -up openjpeg-1.5.1/libopenjpeg/j2k.c.CVE-2013-6045 openjpeg-1.5.1/libopenjpeg/j2k.c
+--- openjpeg-1.5.1/libopenjpeg/j2k.c.CVE-2013-6045	2014-01-07 15:11:30.622278207 -0600
++++ openjpeg-1.5.1/libopenjpeg/j2k.c	2014-01-07 15:11:30.626278165 -0600
+@@ -1076,6 +1076,17 @@ static void j2k_read_poc(opj_j2k_t *j2k)
+ 	tcp->POC = 1;
+ 	len = cio_read(cio, 2);		/* Lpoc */
+ 	numpchgs = (len - 2) / (5 + 2 * (numcomps <= 256 ? 1 : 2));
++
++	{
++		/* old_poc < 0 "just in case" */
++		int maxpocs = (sizeof(tcp->pocs)/sizeof(tcp->pocs[0]));
++		if ((old_poc < 0) || ((numpchgs + old_poc) >= maxpocs)) {
++			opj_event_msg(j2k->cinfo, EVT_ERROR,
++				"JPWL: bad number of progression order changes (%d out of a maximum of %d)\n",
++				(numpchgs + old_poc), maxpocs);
++			return;
++		}
++	}
+ 	
+ 	for (i = old_poc; i < numpchgs + old_poc; i++) {
+ 		opj_poc_t *poc;
+@@ -1622,6 +1633,14 @@ static void j2k_read_rgn(opj_j2k_t *j2k)
+     return;
+   }
+ 
++	/* totlen is negative or larger than the bytes left!!! */
++	if (compno >= numcomps) {
++		opj_event_msg(j2k->cinfo, EVT_ERROR,
++			"JPWL: bad component number in RGN (%d when there are only %d)\n",
++			compno, numcomps);
++		return;
++	}
++
+ 	tcp->tccps[compno].roishift = cio_read(cio, 1);				/* SPrgn */
+ }
+ 
+diff -up openjpeg-1.5.1/libopenjpeg/tcd.c.CVE-2013-6045 openjpeg-1.5.1/libopenjpeg/tcd.c
+--- openjpeg-1.5.1/libopenjpeg/tcd.c.CVE-2013-6045	2012-09-13 02:58:39.000000000 -0500
++++ openjpeg-1.5.1/libopenjpeg/tcd.c	2014-01-07 15:11:30.626278165 -0600
+@@ -1394,10 +1394,19 @@ opj_bool tcd_decode_tile(opj_tcd_t *tcd,
+         return OPJ_FALSE;
+     }
+ 
++	int comp0size = (tile->comps[0].x1 - tile->comps[0].x0) * (tile->comps[0].y1 - tile->comps[0].y0);
+ 	for (compno = 0; compno < tile->numcomps; ++compno) {
+ 		opj_tcd_tilecomp_t* tilec = &tile->comps[compno];
++		int compcsize = ((tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0));
++		/* Later-on it is assumed that all components are of at least comp0size blocks */
++		if (compcsize < comp0size)
++		{
++			opj_event_msg(tcd->cinfo, EVT_ERROR, "Error decoding tile. Component %d contains only %d blocks "
++				"while component 0 has %d blocks\n", compno, compcsize, comp0size);
++			return OPJ_FALSE;
++		}
+ 		/* The +3 is headroom required by the vectorized DWT */
+-		tilec->data = (int*) opj_aligned_malloc((((tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0))+3) * sizeof(int));
++		tilec->data = (int*) opj_aligned_malloc((comp0size+3) * sizeof(int));
+         if (tilec->data == NULL)
+         {
+             opj_event_msg(tcd->cinfo, EVT_ERROR, "Out of memory\n");
diff --git a/extra/openjpeg/openjpeg-1.5.1-CVE-2013-6052.patch b/extra/openjpeg/openjpeg-1.5.1-CVE-2013-6052.patch
new file mode 100644
index 000000000..a157f39a7
--- /dev/null
+++ b/extra/openjpeg/openjpeg-1.5.1-CVE-2013-6052.patch
@@ -0,0 +1,53 @@
+diff -up openjpeg-1.5.1/libopenjpeg/cio.c.CVE-2013-6052 openjpeg-1.5.1/libopenjpeg/cio.c
+--- openjpeg-1.5.1/libopenjpeg/cio.c.CVE-2013-6052	2012-09-13 02:58:39.000000000 -0500
++++ openjpeg-1.5.1/libopenjpeg/cio.c	2014-01-07 14:43:14.213256439 -0600
+@@ -30,6 +30,7 @@
+  */
+ 
+ #include "opj_includes.h"
++#include <assert.h>
+ 
+ /* ----------------------------------------------------------------------- */
+ 
+@@ -139,6 +140,11 @@ opj_bool cio_byteout(opj_cio_t *cio, uns
+  * Read a byte.
+  */
+ unsigned char cio_bytein(opj_cio_t *cio) {
++	if (cio->bp < cio->start) {
++		opj_event_msg(cio->cinfo, EVT_ERROR, "read error: trying to read from before the start of the codestream (start = %d, current = %d, end = %d\n", cio->start, cio->bp, cio->end);
++		abort();
++		return 0;
++	}
+ 	if (cio->bp >= cio->end) {
+ 		opj_event_msg(cio->cinfo, EVT_ERROR, "read error: passed the end of the codestream (start = %d, current = %d, end = %d\n", cio->start, cio->bp, cio->end);
+ 		return 0;
+@@ -173,7 +179,7 @@ unsigned int cio_read(opj_cio_t *cio, in
+ 	unsigned int v;
+ 	v = 0;
+ 	for (i = n - 1; i >= 0; i--) {
+-		v += cio_bytein(cio) << (i << 3);
++		v += (unsigned int)cio_bytein(cio) << (i << 3);
+ 	}
+ 	return v;
+ }
+@@ -184,6 +190,7 @@ unsigned int cio_read(opj_cio_t *cio, in
+  * n : number of bytes to skip
+  */
+ void cio_skip(opj_cio_t *cio, int n) {
++	assert((cio->bp + n) >= cio->bp);
+ 	cio->bp += n;
+ }
+ 
+diff -up openjpeg-1.5.1/libopenjpeg/jp2.c.CVE-2013-6052 openjpeg-1.5.1/libopenjpeg/jp2.c
+--- openjpeg-1.5.1/libopenjpeg/jp2.c.CVE-2013-6052	2014-01-07 14:43:14.201256566 -0600
++++ openjpeg-1.5.1/libopenjpeg/jp2.c	2014-01-07 14:43:14.214256428 -0600
+@@ -172,6 +172,9 @@ static opj_bool jp2_read_boxhdr(opj_comm
+ 	}
+ 	else if (box->length == 0) {
+ 		box->length = cio_numbytesleft(cio) + 8;
++	} else if (box->length < 0) {
++		opj_event_msg(cinfo, EVT_ERROR, "Invalid, negative, size of box\n");
++		return OPJ_FALSE;
+ 	}
+ 	if (box->length < 0) {
+ 		opj_event_msg(cinfo, EVT_ERROR, "Integer overflow in box->length\n");
diff --git a/extra/openjpeg/openjpeg-1.5.1-CVE-2013-6053.patch b/extra/openjpeg/openjpeg-1.5.1-CVE-2013-6053.patch
new file mode 100644
index 000000000..292084a98
--- /dev/null
+++ b/extra/openjpeg/openjpeg-1.5.1-CVE-2013-6053.patch
@@ -0,0 +1,12 @@
+diff -up openjpeg-1.5.1/libopenjpeg/j2k.c.CVE-2013-6053 openjpeg-1.5.1/libopenjpeg/j2k.c
+--- openjpeg-1.5.1/libopenjpeg/j2k.c.CVE-2013-6053	2014-01-07 14:44:40.086344624 -0600
++++ openjpeg-1.5.1/libopenjpeg/j2k.c	2014-01-07 14:44:40.092344561 -0600
+@@ -422,7 +422,7 @@ static void j2k_read_siz(opj_j2k_t *j2k)
+ 	
+ 	if ((image->x0<0)||(image->x1<0)||(image->y0<0)||(image->y1<0)) {
+ 		opj_event_msg(j2k->cinfo, EVT_ERROR,
+-									"%s: invalid image size (x0:%d, x1:%d, y0:%d, y1:%d)\n",
++									"invalid image size (x0:%d, x1:%d, y0:%d, y1:%d)\n",
+ 									image->x0,image->x1,image->y0,image->y1);
+ 		return;
+ 	}
diff --git a/extra/openjpeg/openjpeg-1.5.1-CVE-2013-6887.patch b/extra/openjpeg/openjpeg-1.5.1-CVE-2013-6887.patch
new file mode 100644
index 000000000..f9d68ef4b
--- /dev/null
+++ b/extra/openjpeg/openjpeg-1.5.1-CVE-2013-6887.patch
@@ -0,0 +1,30 @@
+diff -up openjpeg-1.5.1/libopenjpeg/j2k.c.CVE-2013-6887 openjpeg-1.5.1/libopenjpeg/j2k.c
+--- openjpeg-1.5.1/libopenjpeg/j2k.c.CVE-2013-6887	2014-01-07 15:13:20.297114457 -0600
++++ openjpeg-1.5.1/libopenjpeg/j2k.c	2014-01-07 15:13:20.302114404 -0600
+@@ -1697,8 +1697,11 @@ static void j2k_read_eoc(opj_j2k_t *j2k)
+ 	else {
+ 		for (i = 0; i < j2k->cp->tileno_size; i++) {
+ 			tileno = j2k->cp->tileno[i];
+-			opj_free(j2k->tile_data[tileno]);
+-			j2k->tile_data[tileno] = NULL;
++			/* not sure if this can actually happen */
++			if (tileno != -1) {
++				opj_free(j2k->tile_data[tileno]);
++				j2k->tile_data[tileno] = NULL;
++			}
+ 		}
+ 	}	
+ 	if (j2k->state & J2K_STATE_ERR)
+@@ -1858,8 +1861,10 @@ void j2k_destroy_decompress(opj_j2k_t *j
+         if(j2k->cp != NULL) {
+             for (i = 0; i < j2k->cp->tileno_size; i++) {
+                 int tileno = j2k->cp->tileno[i];
+-                opj_free(j2k->tile_data[tileno]);
+-                j2k->tile_data[tileno] = NULL;
++		if (tileno != -1) {
++			opj_free(j2k->tile_data[tileno]);
++			j2k->tile_data[tileno] = NULL;
++		}
+             }
+         }
+ 
diff --git a/extra/openjpeg/openjpeg-1.5.1-doxygen_timestamp.patch b/extra/openjpeg/openjpeg-1.5.1-doxygen_timestamp.patch
new file mode 100644
index 000000000..2f5999992
--- /dev/null
+++ b/extra/openjpeg/openjpeg-1.5.1-doxygen_timestamp.patch
@@ -0,0 +1,24 @@
+diff -up openjpeg-1.5.1/doc/Doxyfile.dox.cmake.in.doxygen_timestamp openjpeg-1.5.1/doc/Doxyfile.dox.cmake.in
+--- openjpeg-1.5.1/doc/Doxyfile.dox.cmake.in.doxygen_timestamp	2012-09-13 02:58:39.000000000 -0500
++++ openjpeg-1.5.1/doc/Doxyfile.dox.cmake.in	2012-12-06 15:23:35.079838524 -0600
+@@ -148,7 +148,7 @@ HTML_STYLESHEET        =
+ HTML_COLORSTYLE_HUE    = 220
+ HTML_COLORSTYLE_SAT    = 100
+ HTML_COLORSTYLE_GAMMA  = 80
+-HTML_TIMESTAMP         = YES
++HTML_TIMESTAMP         = NO 
+ HTML_ALIGN_MEMBERS     = YES
+ HTML_DYNAMIC_SECTIONS  = NO
+ GENERATE_DOCSET        = NO
+diff -up openjpeg-1.5.1/doc/Doxyfile.dox.doxygen_timestamp openjpeg-1.5.1/doc/Doxyfile.dox
+--- openjpeg-1.5.1/doc/Doxyfile.dox.doxygen_timestamp	2012-09-13 02:58:39.000000000 -0500
++++ openjpeg-1.5.1/doc/Doxyfile.dox	2012-12-06 15:23:37.177813275 -0600
+@@ -147,7 +147,7 @@ HTML_STYLESHEET        =
+ HTML_COLORSTYLE_HUE    = 220
+ HTML_COLORSTYLE_SAT    = 100
+ HTML_COLORSTYLE_GAMMA  = 80
+-HTML_TIMESTAMP         = YES
++HTML_TIMESTAMP         = NO 
+ HTML_ALIGN_MEMBERS     = YES
+ HTML_DYNAMIC_SECTIONS  = NO
+ GENERATE_DOCSET        = NO
diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD
index 731189fda..e43ddb0ba 100644
--- a/extra/oxygen-gtk2/PKGBUILD
+++ b/extra/oxygen-gtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 201423 2013-12-11 13:48:51Z andrea $
+# $Id: PKGBUILD 204679 2014-01-24 21:31:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: birdflesh <antkoul at gmail dot com>
 
 pkgname=oxygen-gtk2
-pkgver=1.4.1
+pkgver=1.4.3
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ conflicts=('oxygen-gtk')
 replaces=('oxygen-gtk')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('27bb5826d936fe2bddab35057739908f')
+md5sums=('822cedb3ae46907fd262487150a195d4')
 
 prepare() {
   mkdir build
diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD
index 1d99341f8..b5f173553 100644
--- a/extra/oxygen-gtk3/PKGBUILD
+++ b/extra/oxygen-gtk3/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 201533 2013-12-14 07:15:21Z andrea $
+# $Id: PKGBUILD 204681 2014-01-24 21:32:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=oxygen-gtk3
-pkgver=1.3.1
+pkgver=1.3.3
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 depends=('gtk3')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('a8ca81ea29a93c5859f179266f07c66e')
+md5sums=('c849ca9ef925b2d967538b1b83b6e72a')
 
 prepare() {
   mkdir build
diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD
index 39159803f..3b3a5cf3b 100644
--- a/extra/p11-kit/PKGBUILD
+++ b/extra/p11-kit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198363 2013-10-30 14:24:52Z allan $
+# $Id: PKGBUILD 205982 2014-02-15 12:47:11Z andyrtr $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=p11-kit
-pkgver=0.20.1
+pkgver=0.20.2
 pkgrel=1
 pkgdesc="Library to work with PKCS#11 modules"
 arch=(i686 x86_64 mips64el)
@@ -10,7 +10,7 @@ url="http://p11-glue.freedesktop.org"
 license=('BSD')
 depends=('glibc' 'libtasn1' 'libffi')
 source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig})
-md5sums=('88c651137f76a167336639371eafd8cc'
+md5sums=('757b97ee4ac0ce598661a90cd784c4f1'
          'SKIP')
 
 build() {
diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD
index dad4b9de6..0eb1779d5 100644
--- a/extra/pango/PKGBUILD
+++ b/extra/pango/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 199375 2013-11-11 18:06:12Z heftig $ 
+# $Id: PKGBUILD 205450 2014-02-05 06:13:22Z heftig $ 
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pango
-pkgver=1.36.1
+pkgver=1.36.2
 pkgrel=1
 pkgdesc="A library for layout and rendering of text"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introsp
 install=pango.install
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
 url="http://www.pango.org/"
-sha256sums=('42e4b51cdc99e6878a9ea2a5ef2b31b79c1033f8518726df738a3c54c90e59f8')
+sha256sums=('f07f9392c9cf20daf5c17a210b2c3f3823d517e1917b72f20bb19353b2bc2c63')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD
index 8528d032d..4bc979f01 100644
--- a/extra/perl-dbd-mysql/PKGBUILD
+++ b/extra/perl-dbd-mysql/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 199869 2013-11-17 12:58:57Z bpiotrowski $
+# $Id: PKGBUILD 206053 2014-02-16 12:10:42Z 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.025
+pkgver=4.026
 pkgrel=1
 pkgdesc='Perl/CPAN DBD::mysql module for interacting with MySQL via DBD'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'PerlArtistic')
-url="http://search.cpan.org/dist/${_realname}/"
+url="http://search.cpan.org/dist/$_realname/"
 depends=('libmariadbclient' 'perl-dbi')
 makedepends=('mariadb')
 options=('!emptydirs')
 source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz)
-md5sums=('093ed74c3bd327d4e0d0bc70d1035ac3')
+md5sums=('b18dc2795ec8628a9b84b6e5f1b58775')
 
 build() {
   cd $_realname-$pkgver
diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD
index 1e53c841e..2ea835e9a 100644
--- a/extra/perl-dbi/PKGBUILD
+++ b/extra/perl-dbi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197736 2013-10-29 01:54:29Z eric $
+# $Id: PKGBUILD 205966 2014-02-15 00:56:26Z eric $
 # Maintainer:
 
 pkgname=perl-dbi
-pkgver=1.630
+pkgver=1.631
 pkgrel=1
 pkgdesc="Database independent interface for Perl"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL' 'PerlArtistic')
 depends=('perl')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/T/TI/TIMB/DBI-${pkgver}.tar.gz)
-md5sums=('306020fe7b54a53773f54ad581af8c54')
+md5sums=('444d3c305e86597e11092b517794a840')
 
 build() {
   cd DBI-${pkgver}
diff --git a/extra/perl-image-exiftool/PKGBUILD b/extra/perl-image-exiftool/PKGBUILD
new file mode 100644
index 000000000..0b249f81b
--- /dev/null
+++ b/extra/perl-image-exiftool/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 144999 2011-12-13 23:07:09Z eric $
+# Maintainer: Florian Pritz <bluewind@xinu.at>
+# Contributor: tobias <tobias@archlinux.org>
+# Contributor: Tobias Kieslich <tobias@justdreams.de>
+# Contributor: Firmicus <francois.archlinux.org>
+
+pkgname=perl-image-exiftool
+_srcname=Image-ExifTool
+pkgver=9.46
+pkgrel=1
+pkgdesc="Reader and rewriter of EXIF informations that supports raw files"
+arch=('any')
+url="http://search.cpan.org/perldoc?exiftool"
+license=('GPL')
+depends=('perl')
+provides=("perl-exiftool=$pkgver")
+replaces=("perl-exiftool")
+options=('!emptydirs')
+source=(http://search.cpan.org/CPAN/authors/id/E/EX/EXIFTOOL/${_srcname}-$pkgver.tar.gz)
+md5sums=('1561118c8fe9a8e8078afcf0d1650423')
+
+build() {
+  cd "${srcdir}/${_srcname}-${pkgver}"
+  # install module in vendor directories.
+  perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+check() {
+  cd "${srcdir}/${_srcname}-${pkgver}"
+  make test
+}
+
+package() {
+  cd "${srcdir}/${_srcname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  # remove *.pod, .packlist, and empty dirs:
+  find "${pkgdir}" -name '.packlist' -delete
+  find "${pkgdir}" -name '*.pod' -delete
+}
+
diff --git a/extra/perl-net-dns/PKGBUILD b/extra/perl-net-dns/PKGBUILD
index b9a5f6540..526b68068 100644
--- a/extra/perl-net-dns/PKGBUILD
+++ b/extra/perl-net-dns/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id: PKGBUILD 201329 2013-12-09 00:20:22Z eric $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor: Manolis Tzanidakis
+# $Id: PKGBUILD 205927 2014-02-14 03:29:23Z eric $
+# Maintainer:
 
 pkgname=perl-net-dns
-pkgver=0.73
+pkgver=0.74
 pkgrel=1
-pkgdesc="Perl Module: Interface to the DNS resolver."
+pkgdesc="Perl Module: Interface to the DNS resolver"
 arch=('i686' 'x86_64' 'mips64el')
 license=('PerlArtistic')
 url="http://search.cpan.org/dist/Net-DNS/"
@@ -13,7 +12,7 @@ depends=('perl-digest-hmac' 'perl-net-ip' 'perl')
 checkdepends=('perl-test-pod')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-$pkgver.tar.gz)
-sha1sums=('03c02d04c4346e4a3f52e28885d870b6be96feda')
+sha1sums=('1b183448d22ea49bca0c4b85c365af527101a2ae')
 
 build() {
   cd Net-DNS-${pkgver}
diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD
index c70128896..d877e3f0a 100644
--- a/extra/perl-net-ssleay/PKGBUILD
+++ b/extra/perl-net-ssleay/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198600 2013-10-30 17:27:07Z giovanni $
+# $Id: PKGBUILD 205947 2014-02-14 13:56:11Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Manolis Tzanidakis
 
 pkgname=perl-net-ssleay
 _cpanname=Net-SSLeay
-pkgver=1.55
-pkgrel=2
+pkgver=1.58
+pkgrel=1
 pkgdesc="Perl extension for using OpenSSL"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:BSD')
@@ -15,7 +15,7 @@ options=(!emptydirs)
 replaces=('net-ssleay')
 provides=('net-ssleay')
 source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz")
-md5sums=('473b8d66ca69d5784bb0e428721f58e0')
+md5sums=('fdd09b065e46aa3482f80d7ed7044e38')
 
 prepare() {
   cd ${srcdir}/${_cpanname}-${pkgver}
diff --git a/extra/perl-netaddr-ip/PKGBUILD b/extra/perl-netaddr-ip/PKGBUILD
index 8b1d46b3a..b3d06f037 100644
--- a/extra/perl-netaddr-ip/PKGBUILD
+++ b/extra/perl-netaddr-ip/PKGBUILD
@@ -1,10 +1,8 @@
-# $Id: PKGBUILD 197740 2013-10-29 02:03:08Z eric $
+# $Id: PKGBUILD 205925 2014-02-14 03:22:35Z eric $
 # Maintainer:
-# Contributor: Dale Blount <dale@archlinux.org>
-# Contributor: Francois Charette <francois.archlinux.org>
 
 pkgname=perl-netaddr-ip
-pkgver=4.071
+pkgver=4.072
 pkgrel=1
 pkgdesc="Perl module to manage IP addresses and subnets"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +11,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=('f0da45422022fdf1ccfa90b8068d782b')
+md5sums=('7764bf54881cd014880c0b77161f16aa')
 
 build() {
   cd NetAddr-IP-${pkgver}
diff --git a/extra/perl-socket6/PKGBUILD b/extra/perl-socket6/PKGBUILD
index a852c7849..9eaef772d 100644
--- a/extra/perl-socket6/PKGBUILD
+++ b/extra/perl-socket6/PKGBUILD
@@ -1,48 +1,30 @@
-# $Id: PKGBUILD 186415 2013-05-26 09:25:40Z bluewind $
+# $Id: PKGBUILD 205929 2014-02-14 03:40:45Z eric $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
-# Generator  : CPANPLUS::Dist::Arch 1.18
 
-pkgname='perl-socket6'
-pkgver='0.23'
-pkgrel='3'
-pkgdesc="getaddrinfo/getnameinfo support module"
-arch=('i686' 'x86_64' 'mips64el')
+pkgname=perl-socket6
+pkgver=0.25
+pkgrel=1
+pkgdesc="A getaddrinfo/getnameinfo support module"
+pkgdesc="A getaddrinfo/getnameinfo support module"
+url='http://search.cpan.org/dist/Socket6'
 license=('PerlArtistic' 'GPL')
-options=('!emptydirs')
 depends=('perl')
-makedepends=()
-url='http://search.cpan.org/dist/Socket6'
-source=('http://search.cpan.org/CPAN/authors/id/U/UM/UMEMOTO/Socket6-0.23.tar.gz')
-md5sums=('2c02adb13c449d48d232bb704ddbd492')
-sha512sums=('39ced223ecdef89e6fa241031019bb5a73e63d2dfdaf3edb55bfea0cb81b91bea09f1cc26b2d15fa28d32227cc13cdb093c70f0ba346c9bdb523359de53d96f9')
+options=('!emptydirs')
+source=(http://search.cpan.org/CPAN/authors/id/U/UM/UMEMOTO/Socket6-$pkgver.tar.gz)
+sha1sums=('4499bd5b5150bd44be79238df348d89ea228f5a6')
 
 build() {
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
-      PERL_AUTOINSTALL=--skipdeps                            \
-      PERL_MM_OPT="INSTALLDIRS=vendor"     \
-      PERL_MB_OPT="--installdirs vendor" \
-      MODULEBUILDRC=/dev/null
-
-    cd "${srcdir}/Socket6-0.23"
-    /usr/bin/perl Makefile.PL
-    make
-  )
+  cd Socket6-$pkgver
+  perl Makefile.PL INSTALLDIRS=vendor
+  make
 }
 
 check() {
-  cd "${srcdir}/Socket6-0.23"
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
-    make test
-  )
+  cd Socket6-$pkgver
+  make test
 }
 
 package() {
-  cd "${srcdir}/Socket6-0.23"
+  cd Socket6-$pkgver
   make DESTDIR="$pkgdir" install
 }
-
-# Local Variables:
-# mode: shell-script
-# sh-basic-offset: 2
-# End:
-# vim:set ts=2 sw=2 et:
diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD
index 32e1d58b6..dbb0ae977 100644
--- a/extra/perl-tk/PKGBUILD
+++ b/extra/perl-tk/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 189257 2013-07-01 18:23:51Z eric $
+# $Id: PKGBUILD 205974 2014-02-15 01:40:48Z eric $
 # Maintainer:
 # Contributor: François Charette <francois ατ archlinux δοτ org>
 # Contributor: Jason Chu <jchu@xentac.net>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=perl-tk
-pkgver=804.031
+pkgver=804.032
 pkgrel=1
 pkgdesc="A graphical user interface toolkit for Perl"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,10 +13,8 @@ url="http://search.cpan.org/dist/Tk"
 license=('PerlArtistic' 'GPL' 'custom')
 depends=('libpng' 'libjpeg' 'tk' 'perl')
 options=('!emptydirs')
-replaces=('perltk')
-provides=('perltk')
 source=(http://www.cpan.org/authors/id/S/SR/SREZIC/Tk-${pkgver}.tar.gz)
-md5sums=('57a8afd0563184c17a6470d1ee957f35')
+md5sums=('47a84c70d1fd254ccece208303e6e9d5')
 
 build() {
   cd Tk-$pkgver
diff --git a/extra/php-apcu/PKGBUILD b/extra/php-apcu/PKGBUILD
index 96e41a005..cd4cb9f08 100644
--- a/extra/php-apcu/PKGBUILD
+++ b/extra/php-apcu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 194370 2013-09-14 20:47:48Z pierre $
+# $Id: PKGBUILD 205511 2014-02-06 14:49:36Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=php-apcu
-pkgver=4.0.2
+pkgver=4.0.3
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='A userland caching module for PHP'
@@ -14,7 +14,7 @@ provides=("php-apc=${pkgver}")
 license=('PHP')
 source=("http://pecl.php.net/get/apcu-$pkgver.tgz")
 backup=('etc/php/conf.d/apcu.ini')
-md5sums=('c8a5c246b787eec81847017823099884')
+md5sums=('4db3d1ed48c447d9adebec13a8846d48')
 
 build() {
 	cd $srcdir/apcu-$pkgver
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index d03b72284..64b0c2977 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 201484 2013-12-12 18:14:36Z pierre $
+# $Id: PKGBUILD 205510 2014-02-06 14:49:36Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.5.7
+pkgver=5.5.9
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('PHP')
@@ -30,10 +30,12 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
              'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
              'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
              'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2' 'systemd')
-source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz"
+source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz"
+        "http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz.asc"
         'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('0c02437f661105221e99a301a5275a41'
+md5sums=('c018461604db38af48d1ca304cb592c6'
+         'SKIP'
          '799cd5f91f5253f4b47ec4fd7fccf4f1'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          '9f8263996836e27f5be1483e86ac2e33'
@@ -46,9 +48,6 @@ prepare() {
 
 	patch -p0 -i ${srcdir}/php.ini.patch
 	patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
-	# freetype2 headers moved
-	# see README at http://sourceforge.net/projects/freetype/files/freetype2/2.5.1/
-	sed 's#/include/freetype2/freetype/freetype.h#/include/freetype2/freetype.h#g' -i configure
 }
 
 build() {
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index aa9ab76ae..38b792dc0 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198368 2013-10-30 14:26:41Z allan $
+# $Id: PKGBUILD 205035 2014-02-03 14:10:17Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,29 +6,27 @@
 # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
 
 pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.7
-pkgrel=4
+pkgver=2.10.9
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pidgin.im/"
 license=('GPL')
 makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
              'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi'
              'tk' 'ca-certificates' 'intltool' 'networkmanager')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-        pidgin-2.10.7-link-libirc-to-libsasl2.patch)
-sha256sums=('eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192'
-            '063723d5dc5726c43137b4b383c9d07c2c008391f6a626faaf6cedd31a2f1e8f')
-
-build() {
+source=(https://downloads.sourceforge.net/project/$pkgname/Pidgin/$pkgver/$pkgname-$pkgver.tar.bz2{,.asc})
+sha256sums=('dc362ed8577f623eea4554a79e917073aa726825074fea402f2e515f0f51f319'
+            'SKIP')
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # https://developer.pidgin.im/ticket/15517
-  patch -Np1 -i "$srcdir/pidgin-2.10.7-link-libirc-to-libsasl2.patch"
-  autoreconf -vi
-
   # Use Python 2
   sed -i 's/env python$/&2/' */plugins/*.py \
     libpurple/purple-{remote,notifications-example,url-handler}
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
 
   ./configure \
     --prefix=/usr \
diff --git a/extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch b/extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch
deleted file mode 100644
index abffa20b8..000000000
--- a/extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am pidgin-2.10.7/libpurple/protocols/irc/Makefile.am
---- pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am	2013-02-14 02:44:47.000000000 +0200
-+++ pidgin-2.10.7/libpurple/protocols/irc/Makefile.am	2013-02-14 02:49:58.000000000 +0200
-@@ -27,7 +27,7 @@ else
- st =
- pkg_LTLIBRARIES   = libirc.la
- libirc_la_SOURCES = $(IRCSOURCES)
--libirc_la_LIBADD  = $(GLIB_LIBS)
-+libirc_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS)
- 
- endif
- 
diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD
index 0a6759911..5707e92f8 100644
--- a/extra/pigeonhole/PKGBUILD
+++ b/extra/pigeonhole/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202250 2013-12-20 22:01:35Z andyrtr $
+# $Id: PKGBUILD 205904 2014-02-13 16:52:19Z 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.10
+_dcpkgver=2.2.11
 # Make sure to bump pkgrel if changing this.
 
 pkgname=pigeonhole
 pkgver=0.4.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Sieve implementation for Dovecot"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pigeonhole.dovecot.org/"
diff --git a/extra/pkgfile/PKGBUILD b/extra/pkgfile/PKGBUILD
index 4b1244e25..439a85d1e 100644
--- a/extra/pkgfile/PKGBUILD
+++ b/extra/pkgfile/PKGBUILD
@@ -1,22 +1,19 @@
-# $Id: PKGBUILD 199801 2013-11-16 17:11:51Z dreisner $
+# $Id: PKGBUILD 204718 2014-01-25 21:17:43Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=pkgfile
-pkgver=11
+pkgver=12
 pkgrel=1
 pkgdesc="a pacman .files metadata explorer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://github.com/falconindy/pkgfile"
 license=('MIT')
 depends=('libarchive' 'curl' 'pcre' 'pacman')
-conflicts=('pkgtools<24-2')
 source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
 install=pkgfile.install
-md5sums=('55402bf0e7c8ad729601b9f20f8326aa'
+md5sums=('3366e5dbf01ebb81197c4fc53c6bb3bf'
          'SKIP')
 
-options=(!strip)
-
 build() {
   cd "$pkgname-$pkgver"
 
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index 94b40802f..c6196b02c 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 200652 2013-12-01 09:50:16Z andyrtr $
+# $Id: PKGBUILD 203081 2014-01-03 20:06:57Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5')
-pkgver=0.24.4
+pkgver=0.24.5
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 license=('GPL')
@@ -12,21 +12,24 @@ 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=('2da22b966cf7a2f8da5bf021e68188ce'
-         '9dc64c254a31e570507bdd4ad4ba629a')
+        http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2
+        poppler-0.24.2-mocversiongrep.patch)
+md5sums=('334f2ac95cc8039f2a57fe63e4a81c69'
+         '9dc64c254a31e570507bdd4ad4ba629a'
+         'd5280e4eb6d02660971bdaa45065933f')
 
 prepare() {
   ln -sf test-${_testtag} test
   cd ${pkgbase}-${pkgver}
-
+  # fix build with recent qt versions, patch taken from FC
+  patch -Np1 -i ${srcdir}/poppler-0.24.2-mocversiongrep.patch
   sed -i -e '/AC_PATH_XTRA/d' configure.ac
   sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac
+  autoreconf -fi
 }
 
 build() {
   cd ${pkgbase}-${pkgver}
-  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --enable-cairo-output \
@@ -62,12 +65,11 @@ package_poppler-glib() {
   pkgdesc="Poppler glib bindings"
   depends=("poppler=${pkgver}" 'glib2')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
-  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  cd "${srcdir}/${pkgbase}-${pkgver}/glib"
-  make DESTDIR="${pkgdir}" install
+  cd "${pkgbase}-${pkgver}"
+  make -C poppler DESTDIR="${pkgdir}" install-libLTLIBRARIES
+  make -C glib DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/"
+  install -m644 poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/"
   rm -f "${pkgdir}"/usr/lib/libpoppler.*
   rm -f "${pkgdir}/usr/bin/poppler-glib-demo"
 }
@@ -79,12 +81,11 @@ package_poppler-qt4() {
   conflicts=('poppler-qt')
   depends=("poppler=${pkgver}" 'qt4')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
-  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  cd "${srcdir}/${pkgbase}-${pkgver}/qt4"
-  make DESTDIR="${pkgdir}" install
+  cd "${pkgbase}-${pkgver}"
+  make -C poppler DESTDIR="${pkgdir}" install-libLTLIBRARIES
+  make -C qt4 DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/"
+  install -m644 poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/"
   rm -f "${pkgdir}"/usr/lib/libpoppler.*
 }
 
@@ -92,11 +93,10 @@ package_poppler-qt5() {
   pkgdesc="Poppler Qt5 bindings"
   depends=("poppler=${pkgver}" 'qt5-base')
 
-#  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
-#  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  cd "${srcdir}/${pkgbase}-${pkgver}/qt5"
-  make DESTDIR="${pkgdir}" install
+  cd "${pkgbase}-${pkgver}"
+  make -C poppler DESTDIR="${pkgdir}" install-libLTLIBRARIES
+  make -C qt5 DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 ../poppler-qt5.pc "${pkgdir}/usr/lib/pkgconfig/"
+  install -m644 poppler-qt5.pc "${pkgdir}/usr/lib/pkgconfig/"
   rm -f "${pkgdir}"/usr/lib/libpoppler.*
 }
diff --git a/extra/poppler/poppler-0.24.2-mocversiongrep.patch b/extra/poppler/poppler-0.24.2-mocversiongrep.patch
new file mode 100644
index 000000000..1343f8f9c
--- /dev/null
+++ b/extra/poppler/poppler-0.24.2-mocversiongrep.patch
@@ -0,0 +1,28 @@
+diff -up poppler-0.24.2/configure.ac.mocversiongrep poppler-0.24.2/configure.ac
+--- poppler-0.24.2/configure.ac.mocversiongrep	2013-10-18 09:51:24.223114884 -0500
++++ poppler-0.24.2/configure.ac	2013-10-18 09:54:33.408681067 -0500
+@@ -661,20 +661,20 @@ if test x$enable_poppler_qt5 = xyes; the
+   AC_CHECK_TOOL(MOCQT5, moc)
+   AC_MSG_CHECKING([for Qt5 moc])
+   mocversion=`$MOCQT5 -v 2>&1`
+-  mocversiongrep=`echo $mocversion | grep "Qt 5"`
++  mocversiongrep=`echo $mocversion | grep " 5\."`
+   if test x"$mocversiongrep" != x"$mocversion"; then
+     AC_MSG_RESULT([no])
+     # moc was not the qt5 one, try with moc-qt5
+     AC_CHECK_TOOL(MOCQT52, moc-qt5)
+     AC_MSG_CHECKING([for Qt5 moc-qt5])
+     mocversion=`$MOCQT52 -v 2>&1`
+-    mocversiongrep=`echo $mocversion | grep "Qt 5"`
++    mocversiongrep=`echo $mocversion | grep " 5\."`
+     if test x"$mocversiongrep" != x"$mocversion"; then
+       AC_CHECK_TOOL(QTCHOOSER, qtchooser)
+       AC_MSG_CHECKING([for qtchooser])
+       qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
+       mocversion=`$qt5tooldir/moc -v 2>&1`
+-      mocversiongrep=`echo $mocversion | grep "Qt 5"`
++      mocversiongrep=`echo $mocversion | grep " 5\."`
+       if test x"$mocversiongrep" != x"$mocversion"; then
+         # no valid moc found
+         enable_poppler_qt5=no;
+
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index fc7f5b92a..4c425891e 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,30 +1,26 @@
-# $Id: PKGBUILD 193923 2013-09-06 07:17:49Z bisson $
+# $Id: PKGBUILD 205882 2014-02-12 17:16:06Z bluewind $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
-pkgname=postfix
-pkgver=2.10.2
-pkgrel=1
-pkgdesc='Fast, easy to administer, secure mail server'
+pkgname=(postfix postfix-tools)
+pkgbase=postfix
+pkgver=2.11.0
+pkgrel=2
 url='http://www.postfix.org/'
 license=('custom')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('pcre' 'libsasl' 'libldap' 'db'
-         'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb')
-backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
+_postfix_depends=('pcre' 'libsasl' 'libldap' 'db'
+		 'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb')
+_postfix_tools_depends=('openssl')
+makedepends=("${_postfix_depends[@]}" "${_postfix_tools_depends[@]}")
 source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig}
         'aliases.patch'
         'service')
-sha1sums=('4721024784d071c3e663d610db17f8bd99821f3d' 'SKIP'
+sha1sums=('bc1fd50412742d9c28232b07c7d2139e37d3de28' 'SKIP'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
           'dd12885d367bebaf0fc9d2e9823a7f82086b6ee9')
 
-provides=('smtp-server' 'smtp-forwarder')
-conflicts=('smtp-server' 'smtp-forwarder')
-
-install=install
-
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
@@ -55,8 +51,14 @@ build() {
 	make
 }
 
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+package_postfix() {
+	pkgdesc='Fast, easy to administer, secure mail server'
+	depends=("${_postfix_depends[@]}")
+	backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
+	provides=('smtp-server' 'smtp-forwarder')
+	conflicts=('smtp-server' 'smtp-forwarder')
+	install=install
+	cd "${srcdir}/postfix-${pkgver}"
 
 	sh postfix-install -non-interactive install_root="${pkgdir}"
 
@@ -67,3 +69,16 @@ package() {
 	patch -p0 -i "${srcdir}"/aliases.patch
 	sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "usr/lib/${pkgname}/postfix-files"
 }
+
+package_postfix-tools() {
+	pkgdesc='SMTP/QMQP tools from the postfix distribution'
+	depends=("${_postfix_tools_depends[@]}")
+	cd "${srcdir}/postfix-${pkgver}"
+
+	for name in posttls-finger {smtp,qmqp}-{sink,source}; do
+		install -Dm644 "man/man1/${name}.1" "$pkgdir/usr/share/man/man1/${name}.1"
+		install -Dm755 "bin/${name}" "$pkgdir/usr/bin/${name}"
+	done
+
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/extra/psiconv/PKGBUILD b/extra/psiconv/PKGBUILD
index d1da89910..55ae6c90f 100644
--- a/extra/psiconv/PKGBUILD
+++ b/extra/psiconv/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 199959 2013-11-20 11:08:50Z allan $
+# $Id: PKGBUILD 204524 2014-01-22 01:48:55Z eric $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=psiconv
 pkgver=0.9.8
-pkgrel=14
+pkgrel=15
 pkgdesc="Converts Psion 5(MX) files to more commonly used file formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://software.frodo.looijaard.name/psiconv/"
diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD
index 80ac28504..dd5d0683e 100644
--- a/extra/pstoedit/PKGBUILD
+++ b/extra/pstoedit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198378 2013-10-30 14:30:32Z allan $
+# $Id: PKGBUILD 204525 2014-01-22 01:48:55Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tobias Powalowski <t.powa@gmx.de>
 
 pkgname=pstoedit
 pkgver=3.62
-pkgrel=3
+pkgrel=4
 pkgdesc="Translates PostScript and PDF graphics into other vector formats"
 arch=("i686" "x86_64" 'mips64el')
 url="http://www.pstoedit.net/"
diff --git a/extra/purple-plugin-pack/PKGBUILD b/extra/purple-plugin-pack/PKGBUILD
index cf562cbfc..06abe93f9 100644
--- a/extra/purple-plugin-pack/PKGBUILD
+++ b/extra/purple-plugin-pack/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198380 2013-10-30 14:31:14Z allan $
+# $Id: PKGBUILD 204570 2014-01-23 02:24:11Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -6,13 +6,13 @@
 
 pkgname=purple-plugin-pack
 pkgver=2.7.0
-pkgrel=1.2
+pkgrel=2
 pkgdesc="Compilation of plugins for the libpurple family of IM clients"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://bitbucket.org/rekkanoryo/purple-plugin-pack"
 license=('GPL')
 depends=('libpurple')
-makedepends=('intltool' 'gettext' 'python2' 'pidgin')
+makedepends=('intltool' 'python2' 'pidgin')
 source=(https://bitbucket.org/rekkanoryo/$pkgname/downloads/$pkgname-$pkgver.tar.bz2)
 sha256sums=('2bbcf5e778a33968ba7f2864d2a6cb526a8984be3e4151642a583eee8eafb03c')
 
diff --git a/extra/pycups/PKGBUILD b/extra/pycups/PKGBUILD
index dc0f58b21..9d66b4f2b 100644
--- a/extra/pycups/PKGBUILD
+++ b/extra/pycups/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 195975 2013-10-06 19:13:24Z eric $
+# $Id: PKGBUILD 205906 2014-02-13 18:15:29Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: nesl247 <nesl247@gmail.com>
 
 pkgname=pycups
-pkgver=1.9.63
+pkgver=1.9.66
 pkgrel=1
 pkgdesc="Python CUPS Bindings"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,15 +11,15 @@ url="http://cyberelk.net/tim/software/pycups/"
 license=('GPL')
 depends=('libcups' 'python2')
 source=(http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.asc})
-md5sums=('cdee3ef87ac68d435c8ea04384563d15'
+md5sums=('a6cc4d40ac908dd9182ed93739b4bb79'
          'SKIP')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   python2 setup.py build
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   python2 setup.py install --root="${pkgdir}" --optimize=1
 }
diff --git a/extra/pycurl/PKGBUILD b/extra/pycurl/PKGBUILD
deleted file mode 100644
index 7b08ada02..000000000
--- a/extra/pycurl/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $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.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=('518be33976dbc6838e42495ada64b43f')
-
-package_python2-pycurl() {
-  pkgdesc="A Python 2.x interface to libcurl"
-  depends=('python2' 'curl')
-  replaces=('pycurl' 'python-pycurl')
-  provides=('pycurl' 'python-pycurl')
-  conflicts=('python-pycurl')
-
-  cd ${pkgbase}-${pkgver}
-  python2 setup.py install --curl-config=/usr/bin/curl-config \
-    --prefix "${pkgdir}"/usr --optimize=1
-
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find "${pkgdir}" -name '*.py')
-}
diff --git a/extra/pyqt5/PKGBUILD b/extra/pyqt5/PKGBUILD
index d0e4eb205..d24c93e1f 100644
--- a/extra/pyqt5/PKGBUILD
+++ b/extra/pyqt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196797 2013-10-19 12:28:10Z andrea $
+# $Id: PKGBUILD 203385 2014-01-09 08:20:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Yichao Yu <yyc1992@gmail.com>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
@@ -7,8 +7,8 @@
 pkgbase=pyqt5
 pkgname=pyqt5
 pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
-pkgver=5.1.1
-pkgrel=3
+pkgver=5.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
@@ -16,7 +16,7 @@ makedepends=('python-sip' 'python2-sip' 'python-opengl' 'python2-opengl'
              'python2-dbus' 'python-dbus' 'qt5-multimedia' 'qt5-tools'
              'qt5-svg' 'qt5-serialport')
 source=("http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${pkgver}/PyQt-gpl-${pkgver}.tar.gz")
-md5sums=('10d41924d5252b75f3f9fe1a7c193e6d')
+md5sums=('567a0a72a4e186e9b373c26a9dcf380d')
 
 build() {
   cp -r PyQt-gpl-${pkgver} Py2Qt-gpl-${pkgver}
diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD
index 19a40a2c8..e0f6721b0 100644
--- a/extra/python-geoip/PKGBUILD
+++ b/extra/python-geoip/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 199014 2013-11-06 11:10:37Z jgc $
+# $Id: PKGBUILD 205071 2014-02-04 11:01:58Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 
 pkgname=('python2-geoip')
 pkgbase=python-geoip
-pkgver=1.2.8
-pkgrel=3
+pkgver=1.2.9
+pkgrel=1
 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://dev.maxmind.com/geoip/legacy/downloadable#Python-10"
+url="https://pypi.python.org/pypi/GeoIP/"
 license=('LGPL')
 depends=('python2' 'geoip')
-source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-$pkgver.tar.gz)
-sha256sums=('8b946307355b60cb0f2b0be8ac90c1231286e0e79917509763267fce01a50e73')
+source=(https://pypi.python.org/packages/source/G/GeoIP/GeoIP-${pkgver}.tar.gz)
+md5sums=('367a083a13c442309eeb47fa061bd262')
 
 build() {
-  cd "GeoIP-Python-$pkgver"
+  cd "GeoIP-$pkgver"
   python2 setup.py build
 }
 
 package_python2-geoip() {
   conflicts=('python-geoip<1.2.8')
 
-  cd "GeoIP-Python-$pkgver"
+  cd "GeoIP-$pkgver"
   python2 setup.py install --root="$pkgdir" -O1
 }
 
diff --git a/extra/python-iwscan/PKGBUILD b/extra/python-iwscan/PKGBUILD
index 0bbb8118b..d609bbd15 100644
--- a/extra/python-iwscan/PKGBUILD
+++ b/extra/python-iwscan/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169016 2012-10-17 10:20:21Z allan $
+# $Id: PKGBUILD 205495 2014-02-06 05:24:02Z bisson $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgbase=python-iwscan
 pkgname=python2-iwscan
 pkgver=20090609
-pkgrel=4
+pkgrel=5
 pkgdesc="A Python interface to iwlist, using the iwlib library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.otaku42.de/browser/python-iwscan"
@@ -15,12 +15,17 @@ replaces=('python-iwscan<=20090609-3')
 source=(ftp://ftp.archlinux.org/other/${pkgbase}/${pkgbase}-20090609.tar.gz)
 md5sums=('30fbe8ad3b07e67c1c35db2de16077d8')
 
+prepare() {
+	cd ${pkgbase}
+	sed -i 's|PROC_NET_WIRELESS|"/proc/net/wireless"|' pyiwscan.c
+}
+
 build() {
-	cd "${srcdir}/${pkgbase}"
+	cd ${pkgbase}
 	python2 setup.py build
 }
 
 package_python2-iwscan() {
-	cd "${srcdir}/${pkgbase}"
+	cd ${pkgbase}
 	python2 setup.py install --root="${pkgdir}"
 }
diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD
index 496e84da1..70aa98137 100644
--- a/extra/python-lxml/PKGBUILD
+++ b/extra/python-lxml/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 200744 2013-12-03 23:01:49Z angvp $
+# $Id: PKGBUILD 205479 2014-02-05 18:47:19Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
-
 pkgbase=python-lxml
 pkgname=('python-lxml' 'python2-lxml' 'python-lxml-docs')
-pkgver=3.2.4
+pkgver=3.3.0
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD' 'custom')
 url="http://lxml.de/"
 makedepends=('python2' 'python' 'libxslt' 'python-cssselect' 'python2-cssselect')
 source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
-md5sums=('cc363499060f615aca1ec8dcc04df331'
+md5sums=('ca2f02fd762f3614a1930c568847052b'
          'SKIP')
 
 # Temporary commented due a conflict with devtools and lxml
diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD
index 6cf982f31..6f097a251 100755
--- a/extra/python-numpy/PKGBUILD
+++ b/extra/python-numpy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 200823 2013-12-06 08:09:29Z jgc $
+# $Id: PKGBUILD 205836 2014-02-11 12:33:14Z 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,17 +6,23 @@
 pkgbase=python-numpy
 pkgname=('python2-numpy' 'python-numpy')
 pkgver=1.8.0
-pkgrel=1
+pkgrel=2
 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' 'python2-nose')
 options=('staticlibs')
-source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz)
-md5sums=('2a4b0423a758706d592abb6721ec8dcd')
+source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz
+        numpy-insecure-mktemp-use.patch)
+md5sums=('2a4b0423a758706d592abb6721ec8dcd'
+         '2caf84740b54dcb5fa1d47e72201f294')
 
 prepare() {
+  cd numpy-$pkgver
+  patch -Np1 -i ../numpy-insecure-mktemp-use.patch
+  cd ..
+
   cp -a numpy-$pkgver numpy-py2-$pkgver
   cd numpy-py2-$pkgver
 
diff --git a/extra/python-numpy/numpy-insecure-mktemp-use.patch b/extra/python-numpy/numpy-insecure-mktemp-use.patch
new file mode 100644
index 000000000..8ecdcedfa
--- /dev/null
+++ b/extra/python-numpy/numpy-insecure-mktemp-use.patch
@@ -0,0 +1,263 @@
+--- a/numpy/lib/tests/test_io.py	2013-10-30 19:32:51.000000000 +0100
++++ b/numpy/lib/tests/test_io.py	2014-02-10 08:30:12.903607138 +0100
+@@ -4,7 +4,9 @@
+ import gzip
+ import os
+ import threading
+-from tempfile import mkstemp, mktemp, NamedTemporaryFile
++import shutil
++import contextlib
++from tempfile import mkstemp, mkdtemp, NamedTemporaryFile
+ import time
+ import warnings
+ import gc
+@@ -21,6 +23,12 @@
+     assert_raises, run_module_suite)
+ from numpy.testing import assert_warns, assert_, build_err_msg
+ 
++@contextlib.contextmanager
++def tempdir(change_dir=False):
++    tmpdir = mkdtemp()
++    yield tmpdir
++    shutil.rmtree(tmpdir)
++
+ 
+ class TextIO(BytesIO):
+     """Helper IO class.
+@@ -145,14 +153,14 @@
+     @np.testing.dec.slow
+     def test_big_arrays(self):
+         L = (1 << 31) + 100000
+-        tmp = mktemp(suffix='.npz')
+         a = np.empty(L, dtype=np.uint8)
+-        np.savez(tmp, a=a)
+-        del a
+-        npfile = np.load(tmp)
+-        a = npfile['a']
+-        npfile.close()
+-        os.remove(tmp)
++        with tempdir() as tmpdir:
++            tmp = open(os.path.join(tmpdir, "file.npz"), "w")
++            np.savez(tmp, a=a)
++            del a
++            npfile = np.load(tmp)
++            a = npfile['a']
++            npfile.close()
+ 
+     def test_multiple_arrays(self):
+         a = np.array([[1, 2], [3, 4]], float)
+commit 0bb46c1448b0d3f5453d5182a17ea7ac5854ee15
+Author: Julian Taylor <jtaylor.debian@googlemail.com>
+Date:   Wed Feb 5 23:01:47 2014 +0100
+
+    ENH: remove insecure mktemp use
+    
+    mktemp only returns a filename, a malicous user could replace it before
+    it gets used.
+
+diff --git a/numpy/core/tests/test_memmap.py b/numpy/core/tests/test_memmap.py
+index 6de6319..10e7a08 100644
+--- a/numpy/core/tests/test_memmap.py
++++ b/numpy/core/tests/test_memmap.py
+@@ -1,7 +1,7 @@
+ from __future__ import division, absolute_import, print_function
+ 
+ import sys
+-from tempfile import NamedTemporaryFile, TemporaryFile, mktemp
++from tempfile import NamedTemporaryFile, TemporaryFile
+ import os
+ 
+ from numpy import memmap
+@@ -33,12 +33,11 @@ class TestMemmap(TestCase):
+         assert_array_equal(self.data, newfp)
+ 
+     def test_open_with_filename(self):
+-        tmpname = mktemp('', 'mmap')
+-        fp = memmap(tmpname, dtype=self.dtype, mode='w+',
+-                       shape=self.shape)
+-        fp[:] = self.data[:]
+-        del fp
+-        os.unlink(tmpname)
++        with NamedTemporaryFile() as tmp:
++            fp = memmap(tmp.name, dtype=self.dtype, mode='w+',
++                        shape=self.shape)
++            fp[:] = self.data[:]
++            del fp
+ 
+     def test_unnamed_file(self):
+         with TemporaryFile() as f:
+@@ -55,17 +54,16 @@ class TestMemmap(TestCase):
+         del fp
+ 
+     def test_filename(self):
+-        tmpname = mktemp('', 'mmap')
+-        fp = memmap(tmpname, dtype=self.dtype, mode='w+',
+-                       shape=self.shape)
+-        abspath = os.path.abspath(tmpname)
+-        fp[:] = self.data[:]
+-        self.assertEqual(abspath, fp.filename)
+-        b = fp[:1]
+-        self.assertEqual(abspath, b.filename)
+-        del b
+-        del fp
+-        os.unlink(tmpname)
++        with NamedTemporaryFile() as tmp:
++            fp = memmap(tmp.name, dtype=self.dtype, mode='w+',
++                        shape=self.shape)
++            abspath = os.path.abspath(tmp.name)
++            fp[:] = self.data[:]
++            self.assertEqual(abspath, fp.filename)
++            b = fp[:1]
++            self.assertEqual(abspath, b.filename)
++            del b
++            del fp
+ 
+     def test_filename_fileobj(self):
+         fp = memmap(self.tmpfp, dtype=self.dtype, mode="w+",
+diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py
+index c2ac009..a6f7b34 100644
+--- a/numpy/core/tests/test_multiarray.py
++++ b/numpy/core/tests/test_multiarray.py
+@@ -2316,12 +2316,11 @@ class TestIO(object):
+         self.x = rand(shape) + rand(shape).astype(np.complex)*1j
+         self.x[0,:, 1] = [nan, inf, -inf, nan]
+         self.dtype = self.x.dtype
+-        self.filename = tempfile.mktemp()
++        self.file = tempfile.NamedTemporaryFile()
++        self.filename = self.file.name
+ 
+     def tearDown(self):
+-        if os.path.isfile(self.filename):
+-            os.unlink(self.filename)
+-            #tmp_file.close()
++        self.file.close()
+ 
+     def test_bool_fromstring(self):
+         v = np.array([True, False, True, False], dtype=np.bool_)
+@@ -2349,7 +2348,6 @@ class TestIO(object):
+         y = np.fromfile(f, dtype=self.dtype)
+         f.close()
+         assert_array_equal(y, self.x.flat)
+-        os.unlink(self.filename)
+ 
+     def test_roundtrip_filename(self):
+         self.x.tofile(self.filename)
+@@ -2535,7 +2529,6 @@ class TestIO(object):
+         s = f.read()
+         f.close()
+         assert_equal(s, '1.51,2.0,3.51,4.0')
+-        os.unlink(self.filename)
+ 
+     def test_tofile_format(self):
+         x = np.array([1.51, 2, 3.51, 4], dtype=float)
+diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py
+index ccdbd4e..fcfd185 100644
+--- a/numpy/f2py/__init__.py
++++ b/numpy/f2py/__init__.py
+@@ -28,20 +28,20 @@ def compile(source,
+     from numpy.distutils.exec_command import exec_command
+     import tempfile
+     if source_fn is None:
+-        fname = os.path.join(tempfile.mktemp()+'.f')
++        f = tempfile.NamedTemporaryFile(suffix='.f')
+     else:
+-        fname = source_fn
+-
+-    f = open(fname, 'w')
+-    f.write(source)
+-    f.close()
+-
+-    args = ' -c -m %s %s %s'%(modulename, fname, extra_args)
+-    c = '%s -c "import numpy.f2py as f2py2e;f2py2e.main()" %s' %(sys.executable, args)
+-    s, o = exec_command(c)
+-    if source_fn is None:
+-        try: os.remove(fname)
+-        except OSError: pass
++        f = open(source_fn, 'w')
++
++    try:
++        f.write(source)
++        f.flush()
++
++        args = ' -c -m %s %s %s'%(modulename, f.name, extra_args)
++        c = '%s -c "import numpy.f2py as f2py2e;f2py2e.main()" %s' % \
++                (sys.executable, args)
++        s, o = exec_command(c)
++    finally:
++        f.close()
+     return s
+ 
+ from numpy.testing import Tester
+diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py
+index ff9d19e..25407d4 100755
+--- a/numpy/f2py/f2py2e.py
++++ b/numpy/f2py/f2py2e.py
+@@ -91,7 +91,7 @@ Options:
+                    --lower is assumed with -h key, and --no-lower without -h key.
+ 
+   --build-dir <dirname>  All f2py generated files are created in <dirname>.
+-                   Default is tempfile.mktemp().
++                   Default is tempfile.mkdtemp().
+ 
+   --overwrite-signature  Overwrite existing signature file.
+ 
+@@ -424,7 +424,7 @@ def run_compile():
+         del sys.argv[i]
+     else:
+         remove_build_dir = 1
+-        build_dir = os.path.join(tempfile.mktemp())
++        build_dir = tempfile.mkdtemp()
+ 
+     _reg1 = re.compile(r'[-][-]link[-]')
+     sysinfo_flags = [_m for _m in sys.argv[1:] if _reg1.match(_m)]
+commit 524b9eaa33ec67e34eb31a208e02bb934f778096
+Author: Julian Taylor <jtaylor.debian@googlemail.com>
+Date:   Sat Feb 8 11:55:36 2014 +0100
+
+    TST: fix test_io.TestSavezLoad
+
+diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py
+index 2ee5c83..8995fad 100644
+--- a/numpy/lib/tests/test_io.py
++++ b/numpy/lib/tests/test_io.py
+@@ -187,7 +187,7 @@ class TestSavezLoad(RoundtripTest, TestCase):
+         L = (1 << 31) + 100000
+         a = np.empty(L, dtype=np.uint8)
+         with tempdir() as tmpdir:
+-            tmp = open(os.path.join(tmpdir, "file.npz"), "w")
++            tmp = os.path.join(tmpdir, "file.npz")
+             np.savez(tmp, a=a)
+             del a
+             npfile = np.load(tmp)
+commit 8296aa0b911c036c984e23665ee0f7ddca579b91
+Author: Julian Taylor <jtaylor.debian@googlemail.com>
+Date:   Sat Feb 8 13:40:26 2014 +0100
+
+    TST: clean up tempfile in test_closing_zipfile_after_load
+
+diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py
+index 2ee5c83..6aae3d2 100644
+--- a/numpy/lib/tests/test_io.py
++++ b/numpy/lib/tests/test_io.py
+@@ -295,13 +295,14 @@ class TestSavezLoad(RoundtripTest, TestCase):
+         # Check that zipfile owns file and can close it.
+         # This needs to pass a file name to load for the
+         # test.
+-        fd, tmp = mkstemp(suffix='.npz')
+-        os.close(fd)
+-        np.savez(tmp, lab='place holder')
+-        data = np.load(tmp)
+-        fp = data.zip.fp
+-        data.close()
+-        assert_(fp.closed)
++        with tempdir() as tmpdir:
++            fd, tmp = mkstemp(suffix='.npz', dir=tmpdir)
++            os.close(fd)
++            np.savez(tmp, lab='place holder')
++            data = np.load(tmp)
++            fp = data.zip.fp
++            data.close()
++            assert_(fp.closed)
+ 
+ 
+ class TestSaveTxt(TestCase):
diff --git a/extra/python-pycurl/PKGBUILD b/extra/python-pycurl/PKGBUILD
new file mode 100644
index 000000000..86bd6201c
--- /dev/null
+++ b/extra/python-pycurl/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 205506 2014-02-06 10:55:43Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
+
+_pypiname=pycurl
+pkgbase=python-$_pypiname
+pkgname=('python-pycurl' 'python2-pycurl')
+pkgver=7.19.3.1
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://pycurl.sourceforge.net/"
+license=('LGPL' 'MIT')
+makedepends=('python' 'python2' 'curl' 'git')
+source=("git+https://github.com/pycurl/pycurl.git#tag=REL_${pkgver//./_}")
+sha1sums=('SKIP')
+
+prepare() {
+  cp -r ${_pypiname} python2-${_pypiname}
+
+  cd "${srcdir}/${_pypiname}"
+  find . -name '*.py' -exec sed -i -e "s|#! /usr/bin/env python|#!/usr/bin/env python3|" {} +
+    sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python-pycurl"/' setup.py
+
+  cd "${srcdir}/python2-${_pypiname}"
+  find . -name '*.py' -exec sed -i -e "s|#! /usr/bin/env python|#!/usr/bin/env python2|" {} +
+    sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python2-pycurl"/' setup.py
+}
+
+build() {
+  cd "${srcdir}/${_pypiname}"
+  python3 setup.py build --with-ssl
+
+  cd "${srcdir}/python2-${_pypiname}"
+  python2 setup.py build --with-ssl
+}
+
+package_python-pycurl() {
+  pkgdesc="A Python 3.x interface to libcurl"
+  depends=('python' 'curl')
+
+  cd ${_pypiname}
+  python setup.py install -O1 --root="${pkgdir}"
+  install -D -m644 COPYING-MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_python2-pycurl() {
+  pkgdesc="A Python 2.x interface to libcurl"
+  depends=('python2' 'curl')
+
+  cd python2-${_pypiname}
+  python2 setup.py install -O1 --root="${pkgdir}"
+  install -D -m644 COPYING-MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index 93ef74a26..268e8f22d 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 200587 2013-11-29 15:17:24Z angvp $
+# $Id: PKGBUILD 205909 2014-02-13 23:29:34Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=python
-pkgver=3.3.3
+pkgver=3.3.4
 pkgrel=1
 _pybasever=3.3
 pkgdesc="Next generation of the python high-level scripting language"
@@ -20,7 +20,7 @@ options=('!makeflags')
 provides=('python3')
 replaces=('python3')
 source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
-sha1sums=('af4e75a34bd538c79b9871227c2e7f56569ac107')
+sha1sums=('2c9586eeb4b6e45e9ebc28372c0856c709d9a522')
 
 prepare() {
   cd "${srcdir}/Python-${pkgver}"
diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index b6bd4cd78..685b37638 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 200588 2013-11-29 15:17:25Z angvp $
+# $Id: PKGBUILD 206008 2014-02-15 15:11:11Z fyan $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributer: Allan McRae <allan@archlinux.org>
 # Contributer: Jason Chu <jason@archlinux.org>
 
 pkgname=python2
 pkgver=2.7.6
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64' 'mips64el')
@@ -40,6 +40,13 @@ prepare() {
   rm -r Modules/expat
   rm -r Modules/zlib
   rm -r Modules/_ctypes/{darwin,libffi}*
+
+  # clean up #!s
+  find . -name '*.py' | \
+    xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
+
+  # Workaround asdl_c.py error
+  touch Include/Python-ast.h Python/Python-ast.c
 }
 
 build() {
@@ -80,13 +87,6 @@ package() {
   mv "${pkgdir}"/usr/bin/pydoc{,2}
   mv "${pkgdir}"/usr/bin/2to3{,-2.7}
 
-  # clean up #!s
-  find . -name '*.py' | \
-    xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
-
-  # Workaround asdl_c.py error
-  touch Include/Python-ast.h Python/Python-ast.c
-
   # clean-up reference to build directory
   sed -i "s#${srcdir}/Python-${pkgver}:##" "${pkgdir}"/usr/lib/python${_pybasever}/config/Makefile
 
diff --git a/extra/qjackctl/PKGBUILD b/extra/qjackctl/PKGBUILD
index ead710a4e..599efecb3 100644
--- a/extra/qjackctl/PKGBUILD
+++ b/extra/qjackctl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 181260 2013-04-02 20:48:27Z schiv $
+# $Id: PKGBUILD 203040 2014-01-02 12:16:31Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 
 pkgname=qjackctl
-pkgver=0.3.10
+pkgver=0.3.11
 pkgrel=1
 pkgdesc="A Qt front-end for the JACK low-latency audio server"
 url="http://qjackctl.sourceforge.net/"
@@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('jack' 'qt4') # qjackctl may soon support qt5
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('cc01522902105ca65e327e657e51ca5e')
+md5sums=('93eabb66334ffb770ab4e270621ab2a4')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/qpdf/PKGBUILD b/extra/qpdf/PKGBUILD
index 9a0664d63..346fa0d6d 100644
--- a/extra/qpdf/PKGBUILD
+++ b/extra/qpdf/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 202244 2013-12-20 19:54:40Z andyrtr $
+# $Id: PKGBUILD 204257 2014-01-15 19:58:13Z andyrtr $
 # 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.1.0
+pkgver=5.1.1
 pkgrel=1
 pkgdesc="QPDF: A Content-Preserving PDF Transformation System"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ license=('custom:Artistic-2.0')
 depends=('pcre' 'perl')
 makedepends=('make')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('7c614bdb5f8610427c5dc0b494cabc0e')
+md5sums=('378bfd1c2ee15d7815f2f4b1a50fa6e0')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -24,7 +24,7 @@ build() {
 
 check() {
   cd $pkgname-$pkgver
-  make -k check
+  make check # passes all
 }
 
 package() {
diff --git a/extra/qsynth/PKGBUILD b/extra/qsynth/PKGBUILD
index 7f3df04c8..465422b4b 100644
--- a/extra/qsynth/PKGBUILD
+++ b/extra/qsynth/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183182 2013-04-18 15:40:20Z schiv $
+# $Id: PKGBUILD 203028 2014-01-02 06:23:00Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=qsynth
-pkgver=0.3.7
+pkgver=0.3.8
 pkgrel=1
 pkgdesc="Qt GUI for FluidSynth"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url="http://qsynth.sourceforge.net/"
 license=('GPL')
 depends=('fluidsynth' 'qt4')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('a101a50a7ecfb7319482a5022df1d58b')
+md5sums=('affdd9ddff4798b1d3dae3c99b57bc5a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
index 0dece960f..46e220147 100644
--- a/extra/qt5/PKGBUILD
+++ b/extra/qt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202711 2013-12-25 21:25:46Z andyrtr $
+# $Id: PKGBUILD 205501 2014-02-06 09:24:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=qt5
@@ -21,8 +21,8 @@ pkgname=('qt5-base'
          'qt5-xmlpatterns')
 [[ "$CARCH" != "mips64el" ]] &&
 pkgname+=('qt5-webkit' 'qt5-connectivity')
-pkgver=5.2.0
-pkgrel=2
+pkgver=5.2.1
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -38,7 +38,7 @@ _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("http://download.qt-project.org/official_releases/qt/5.2/${pkgver}/single/${_pkgfqn}.tar.xz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop'
         'use-python2.patch' 'qatomic-before-mips32.patch')
-md5sums=('8f60b47ca9461831d940f579ee90517e'
+md5sums=('0c8d2aa45f38be9c3f7c9325eb059d9d'
          'b2897dd6a2967bccf8f10e397aafee55'
          '9638a78e502719ef8fe5f8d10d0361a9'
          '188da8f4c87316e730ebf1c6217bf5a0'
diff --git a/extra/qtcreator/PKGBUILD b/extra/qtcreator/PKGBUILD
index 0097a14a0..a334b1380 100644
--- a/extra/qtcreator/PKGBUILD
+++ b/extra/qtcreator/PKGBUILD
@@ -7,9 +7,9 @@
 # Contributor: delor <bartekpiech gmail com>
 
 pkgname=qtcreator
-pkgver=3.0.0
-_pkgver=3.0.0
-pkgrel=2
+pkgver=3.0.1
+_pkgver=3.0.1
+pkgrel=1
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
 url='http://qt-project.org'
@@ -31,7 +31,7 @@ source=("git://gitorious.org/qt-creator/qt-creator.git#tag=v${_pkgver}"
         'qtcreator.desktop')
 md5sums=('SKIP'
          'SKIP'
-         '82888d4be900e7833d768050a135cd37')
+         '50880836fd62ccd87550940feb995f06')
 
 prepare() {
     cd qt-creator
diff --git a/extra/qtcreator/qtcreator.desktop b/extra/qtcreator/qtcreator.desktop
index 0e8f73e64..7db94d4a9 100644
--- a/extra/qtcreator/qtcreator.desktop
+++ b/extra/qtcreator/qtcreator.desktop
@@ -3,7 +3,7 @@ Exec=/usr/bin/qtcreator
 Name=Qt Creator
 GenericName=C++ IDE
 X-KDE-StartupNotify=true
-Icon=/usr/share/icons/hicolor/512x512/apps/QtProject-qtcreator.png
+Icon=QtProject-qtcreator.png
 Terminal=false
 Type=Application
 Categories=Qt;Development;
diff --git a/extra/quazip/PKGBUILD b/extra/quazip/PKGBUILD
index 78e0282a2..0160ebd40 100644
--- a/extra/quazip/PKGBUILD
+++ b/extra/quazip/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 199053 2013-11-07 23:52:10Z andrea $
+# $Id: PKGBUILD 205824 2014-02-10 18:35:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: trya <tryagainprod@gmail.com>
 
 pkgname=quazip
-pkgver=0.5.1
-pkgrel=3
+pkgver=0.6.2
+pkgrel=1
 pkgdesc="C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package"
 url="http://sourceforge.net/projects/quazip/"
 license=('LGPL')
 arch=('i686' 'x86_64')
 depends=('qt4')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('eec6b9b6f19654230dfcd158f29ea9d0')
+md5sums=('c11f8e2f757be94fd79dc49e5a4be0ca')
 
 build() {
   cd ${pkgname}-${pkgver}/${pkgname}
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index 8c6cae34d..fd4adb7ef 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 196711 2013-10-16 19:03:48Z ronald $
+# $Id: PKGBUILD 204929 2014-01-31 14:12:03Z 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.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url=('http://www.r-project.org/')
 depends=('blas' 'lapack' 'bzip2'  'libpng' 'libjpeg' 'libtiff'
          'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs'
-         'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils')
+         'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils' 'zip' 'unzip')
 makedepends=('jdk7-openjdk' 'gcc-fortran' 'tk')
 optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files')
 backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories' 'etc/R/javaconf')
diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD
index 457bbf621..32d3ab2f6 100644
--- a/extra/racket/PKGBUILD
+++ b/extra/racket/PKGBUILD
@@ -1,38 +1,40 @@
-# $Id: PKGBUILD 197435 2013-10-25 22:16:33Z eric $
+# $Id: PKGBUILD 205059 2014-02-03 21:57:41Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=racket
-pkgver=5.3.6
-pkgrel=2
+pkgver=5.93
+pkgrel=1
 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')
+license=('GPL3' 'LGPL3' 'custom')
+depends=('gtk2' 'desktop-file-utils')
 makedepends=('gsfonts' 'sqlite')
-options=('!strip')
+options=('!strip' '!emptydirs')
 install=racket.install
-source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz
-        drracket.desktop)
-sha1sums=('783485416359f4fc22da41c5a1a89103e7cb9d95'
-          'a20808f6b250225704856f82a544681a962a299d')
+source=(http://download.racket-lang.org/installers/${pkgver}/${pkgname}-${pkgver}-src-builtpkgs.tgz)
+sha1sums=('94b7e2708b6eff2083e3e9c6a3ac338011958e13')
+
+prepare() {
+  echo "Icon=drracket" >> ${pkgname}-${pkgver}/share/pkgs/drracket/drracket/drracket.desktop
+}
 
 build() {
   cd ${pkgname}-${pkgver}/src
   [ "$CARCH" == "x86_64" ] && export CFLAGS+=" -fPIC"
-  ./configure --prefix=/usr --enable-shared
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-shared
   make
 }
 
 package() {
   cd ${pkgname}-${pkgver}/src
   make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING-libscheme.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
+  install -D -m644 ../share/pkgs/drracket/drracket/drracket.desktop "${pkgdir}/usr/share/applications/drracket.desktop"
   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"
+  ln -s /usr/share/racket/pkgs/icons/plt-16x16.png "${pkgdir}/usr/share/icons/hicolor/16x16/apps/drracket.png"
+  ln -s /usr/share/racket/pkgs/icons/plt-32x32.png "${pkgdir}/usr/share/icons/hicolor/32x32/apps/drracket.png"
+  ln -s /usr/share/racket/pkgs/icons/plt-48x48.png "${pkgdir}/usr/share/icons/hicolor/48x48/apps/drracket.png"
+  ln -s /usr/share/racket/pkgs/icons/plt-logo-red-diffuse.png "${pkgdir}/usr/share/icons/hicolor/256x256/apps/drracket.png"
 }
diff --git a/extra/racket/drracket.desktop b/extra/racket/drracket.desktop
deleted file mode 100644
index 79876de50..000000000
--- a/extra/racket/drracket.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=DrRacket
-GenericName=IDE for Racket
-Comment=DrRacket is an interactive, integrated, graphical programming environment for the Racket programming languages.
-Exec=drracket
-Terminal=false
-Type=Application
-Categories=Education;Development;
-Icon=drracket
diff --git a/extra/rasqal/PKGBUILD b/extra/rasqal/PKGBUILD
index 1e9f54dec..89b3de4a3 100644
--- a/extra/rasqal/PKGBUILD
+++ b/extra/rasqal/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202985 2013-12-30 08:44:05Z foutrelis $
+# $Id: PKGBUILD 203590 2014-01-13 17:12:22Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Lawrence Lee <valheru@facticius.net>
@@ -6,7 +6,7 @@
 pkgname=rasqal
 epoch=1
 pkgver=0.9.30
-pkgrel=3
+pkgrel=4
 pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings"
 url="http://librdf.org/rasqal"
 license=('GPL' 'LGPL')
diff --git a/extra/redland/PKGBUILD b/extra/redland/PKGBUILD
index cb01bfb84..4e150bc62 100644
--- a/extra/redland/PKGBUILD
+++ b/extra/redland/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 198397 2013-10-30 14:37:22Z allan $
+# $Id: PKGBUILD 205610 2014-02-09 10:29:42Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Francois Charette <francois.archlinux.org> 
 
 pkgbase=redland
 epoch=1
+# maybe rename redland-storage-mysql to redland-storage-mariadb or add a provide tag
 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite')
-pkgver=1.0.16
+pkgver=1.0.17
 pkgrel=2
 url="http://librdf.org/"
 license=("GPL")
 arch=('i686' 'x86_64' 'mips64el')
-makedepends=('rasqal' 'raptor' 'db' 'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite')
+makedepends=('rasqal' 'raptor' 'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite')
 source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc}
         rpath.diff)
-sha256sums=('d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd'
-            '2955af40eb2fbffa6e1ef28f7f1b7f607a3958478a5080896b878da96605246d'
+sha256sums=('de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681'
+            'SKIP'
             '9ddf9f7581f5194d73ad908f3b26354c70d3079a7a87c8add8a0d0e4c6974fec')
 
 build() {
@@ -25,7 +26,8 @@ build() {
 	--disable-static \
 	--with-raptor=system \
 	--with-rasqal=system \
-	--with-sqlite=3
+	--with-sqlite=3 \
+	--with-bdb=no
 
   # nuke rpath
   patch -Np0 -i "${srcdir}/rpath.diff"
@@ -62,7 +64,7 @@ package_redland-storage-postgresql() {
 
 package_redland-storage-virtuoso() {
  pkgdesc="Virtuoso storage support for Redland"
- depends=('redland' 'unixodbc' 'db')
+ depends=('redland' 'unixodbc')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   install -dm755 "${pkgdir}/usr/lib/redland"
@@ -71,7 +73,7 @@ package_redland-storage-virtuoso() {
 
 package_redland-storage-sqlite() {
  pkgdesc="SQLite storage support for Redland"
- depends=('redland' 'sqlite3' 'db')
+ depends=('redland' 'sqlite3')
  
   cd "${srcdir}/${pkgbase}-${pkgver}"
   install -dm755 "${pkgdir}/usr/lib/redland"
diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD
index 1206cb882..3c52f4588 100644
--- a/extra/refind-efi/PKGBUILD
+++ b/extra/refind-efi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 201584 2013-12-16 08:10:23Z tpowa $
+# $Id: PKGBUILD 203414 2014-01-10 13:20:00Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Keshav Padram Amburay <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
@@ -17,7 +17,7 @@ _COMPILER="GCC47"
 #######
 
 pkgname="refind-efi"
-pkgver="0.7.6"
+pkgver="0.7.7"
 pkgrel="1"
 pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs"
 url="http://www.rodsbooks.com/refind/index.html"
@@ -40,13 +40,13 @@ for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModul
 	source+=("${_TIANO_DIR_}_${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}#revision=${_TIANO_SVN_REV_}")
 done
 
-sha1sums=('431423452190c9840335f2dd9af887aded52a787'
-          '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP')
+md5sums=('868b178404446f77729823af3758b409'
+         'a83e45b10d5efbca1c93a63851728712'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP')
 
 [[ "${CARCH}" == "x86_64" ]] && _TIANO_ARCH="X64"
 [[ "${CARCH}" == "i686" ]] && _TIANO_ARCH="IA32"
diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD
index 066f751b0..fd9008353 100644
--- a/extra/rosegarden/PKGBUILD
+++ b/extra/rosegarden/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 199804 2013-11-16 21:20:01Z schiv $
+# $Id: PKGBUILD 205867 2014-02-12 07:12:35Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
@@ -6,17 +6,17 @@
 
 pkgname=rosegarden
 pkgver=13.10
-pkgrel=1
+pkgrel=2
 pkgdesc="MIDI/audio sequencer and notation editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rosegardenmusic.com/"
 license=('GPL')
 depends=('liblrdf' 'dssi' 'fftw' 'lirc-utils'
-         'perl' 'qt4' 'shared-mime-info')
+         'perl' 'qt4' 'shared-mime-info' 'liblo>=0.28')
 makedepends=('imake')
 optdepends=('lilypond: notation display'
             'cups: printing support'
-            'okular: print preview, or any other PDF viewer'
+            'kdegraphics-okular: print preview, or any other PDF viewer'
             'timidity++: MIDI playback, or any other softsynth'
             'flac'
             'wavpack')
diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD
index 2b4805201..20956b778 100644
--- a/extra/rrdtool/PKGBUILD
+++ b/extra/rrdtool/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197422 2013-10-25 19:15:13Z eric $
+# $Id: PKGBUILD 204822 2014-01-28 03:33:05Z td123 $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=rrdtool
 pkgver=1.4.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Data logging and graphing application"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rrdtool.org"
diff --git a/extra/ruby/0001-Fix-installing-gem-from-file-without-dependencies.patch b/extra/ruby/0001-Fix-installing-gem-from-file-without-dependencies.patch
new file mode 100644
index 000000000..8fefb275d
--- /dev/null
+++ b/extra/ruby/0001-Fix-installing-gem-from-file-without-dependencies.patch
@@ -0,0 +1,84 @@
+From f5bbf838c8b13369a61c6756355305388df5824f Mon Sep 17 00:00:00 2001
+From: Tim Moore <tmoore@incrementalism.net>
+Date: Tue, 31 Dec 2013 17:39:45 +1100
+Subject: [PATCH] Fix installing gem from file without dependencies.
+
+Commit 9437ccc fixed the ability to install remote gems that was accidentally
+broken by d97fba1, but in the process accidentally broke installing from local
+files.
+
+This also changes the order to check for local first, to avoid unnecessary
+network requests in the case where the gem is local.
+
+Closes #760.
+---
+ lib/rubygems/commands/install_command.rb           | 20 ++++++++++++--------
+ test/rubygems/test_gem_commands_install_command.rb | 14 ++++++++++++++
+ 2 files changed, 26 insertions(+), 8 deletions(-)
+
+diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb
+index 4485eb1..8219eef 100644
+--- a/lib/rubygems/commands/install_command.rb
++++ b/lib/rubygems/commands/install_command.rb
+@@ -228,7 +228,18 @@ to write the specification by hand.  For example:
+   def install_gem_without_dependencies name, req # :nodoc:
+     gem = nil
+ 
+-    if remote? then
++    if local? then
++      if name =~ /\.gem$/ and File.file? name then
++        source = Gem::Source::SpecificFile.new name
++        spec = source.spec
++      else
++        source = Gem::Source::Local.new
++        spec = source.find_gem name, req
++      end
++      gem = source.download spec if spec
++    end
++
++    if remote? and not gem then
+       dependency = Gem::Dependency.new name, req
+       dependency.prerelease = options[:prerelease]
+ 
+@@ -236,13 +247,6 @@ to write the specification by hand.  For example:
+       gem = fetcher.download_to_cache dependency
+     end
+ 
+-    if local? and not gem then
+-      source = Gem::Source::Local.new
+-      spec = source.find_gem name, req
+-
+-      gem = source.download spec
+-    end
+-
+     inst = Gem::Installer.new gem, options
+     inst.install
+ 
+diff --git a/test/rubygems/test_gem_commands_install_command.rb b/test/rubygems/test_gem_commands_install_command.rb
+index 76ea6b4..a5917c0 100644
+--- a/test/rubygems/test_gem_commands_install_command.rb
++++ b/test/rubygems/test_gem_commands_install_command.rb
+@@ -560,6 +560,20 @@ ERROR:  Possible alternatives: non_existent_with_hint
+     assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name }
+   end
+ 
++  def test_install_gem_ignore_dependencies_specific_file
++    spec = quick_spec 'a', 2
++
++    util_build_gem spec
++
++    FileUtils.mv spec.cache_file, @tempdir
++
++    @cmd.options[:ignore_dependencies] = true
++
++    @cmd.install_gem File.join(@tempdir, spec.file_name), nil
++
++    assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name }
++  end
++
+   def test_parses_requirement_from_gemname
+     spec_fetcher do |fetcher|
+       fetcher.gem 'a', 2
+-- 
+1.8.5.2
+
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 6170e75d9..d816b082f 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -4,20 +4,28 @@
 # Contributor: Jeramy Rutley <jrutley@gmail.com>
 
 pkgname=('ruby' 'ruby-docs')
-pkgver=2.0.0_p353
-pkgrel=1
+pkgver=2.1.0
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ruby-lang.org/en/'
 license=('BSD' 'custom')
-makedepends=('gdbm' 'openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
+# disable ruby tk since 1.9.3 it has caused a segfault on require 'tk'
+# https://bugs.ruby-lang.org/issues/8000
+# wait for upstream to start supporting tk 8.6
+makedepends=('gdbm' 'openssl' 'libffi' 'doxygen' 'graphviz' 'libyaml') # 'tk'
 options=('!emptydirs' '!makeflags' 'staticlibs')
-source=("http://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
-        'gemrc')
-md5sums=('20eb8f067d20f6b76b7e16cce2a85a55'
-         '6fb8e7a09955e0f64be3158fb4a27e7a')
+source=("http://cache.ruby-lang.org/pub/ruby/ruby-${pkgver}.tar.bz2"
+        'gemrc'
+        '0001-Fix-installing-gem-from-file-without-dependencies.patch')
+md5sums=('1546eeb763ac7754365664be763a1e8f'
+         '6fb8e7a09955e0f64be3158fb4a27e7a'
+         '61a1507f260866805fc6451c14733b25')
 
 build() {
-  cd ruby-${pkgver//_/-}
+  cd ruby-${pkgver}
+
+  # fixes https://github.com/rubygems/rubygems/issues/760
+  patch -Np1 -i ${srcdir}/0001-Fix-installing-gem-from-file-without-dependencies.patch
 
   PKG_CONFIG=/usr/bin/pkg-config ./configure \
     --prefix=/usr \
@@ -30,7 +38,7 @@ build() {
 }
 
 check() {
-  cd ruby-${pkgver//_/-}
+  cd ruby-${pkgver}
 
   make test
 }
@@ -38,14 +46,13 @@ check() {
 package_ruby() {
   pkgdesc='An object-oriented language for quick and easy programming'
   depends=('gdbm' 'openssl' 'libffi' 'libyaml')
-  optdepends=('tk: for Ruby/TK'
-              'ruby-docs: Ruby documentation')
+  optdepends=('ruby-docs: Ruby documentation') # 'tk: for Ruby/TK'
   provides=('rubygems' 'rake')
   conflicts=('rake')
   backup=('etc/gemrc')
   install='ruby.install'
 
-  cd ruby-${pkgver//_/-}
+  cd ruby-${pkgver}
 
   make DESTDIR="${pkgdir}" install-nodoc
 
@@ -58,7 +65,7 @@ package_ruby() {
 package_ruby-docs() {
   pkgdesc='Documentation files for ruby'
 
-  cd ruby-${pkgver//_/-}
+  cd ruby-${pkgver}
 
   make DESTDIR="${pkgdir}" install-doc install-capi
 
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index ebada4fbd..4b7fadec1 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -10,11 +10,11 @@
 
 pkgbase=samba
 pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=4.1.3
+pkgver=4.1.4
 # 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.1.3
+_realver=4.1.4
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 url="http://www.samba.org"
@@ -173,7 +173,7 @@ depends=('popt' 'cifs-utils' 'tdb' "libwbclient>=$pkgver" 'ldb'
 package_samba() {
 pkgdesc="SMB Fileserver and AD Domain server"
 depends=('db>=4.7' 'popt' 'libcups' 'libcap>=2.16' 'gamin' 'gnutls>=2.4.1'
-         'talloc' 'ldb' 'libbsd' 'python2' 'tdb' 'iniparser' 'libaio' "smbclient>=$pkgver")
+         'talloc' 'ldb' 'libbsd' 'python2' 'iniparser' 'tdb' 'libaio' "smbclient>=$pkgver")
 backup=(etc/logrotate.d/samba
         etc/pam.d/samba
         etc/samba/smb.conf
@@ -240,7 +240,7 @@ 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=('a5dbfe87f4cb3d9d91e15e5df99a59a1'
+md5sums=('c7871012ac40b8c74afff42bbd873bd7'
          '5697da77590ec092cc8a883bae06093c'
          '96f82c38f3f540b53f3e5144900acf17'
          'ee4763a656cf00d92bfda31b6bb2c5cb'
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index cf0de9ce2..05c8aec19 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 202769 2013-12-27 14:21:30Z juergen $
+# $Id: PKGBUILD 205938 2014-02-14 10:21:14Z juergen $
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Daniel White <daniel@whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Leslie Polzer (skypher)
 
 pkgname=sbcl
-pkgver=1.1.14
+pkgver=1.1.15
 pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 url="http://www.sbcl.org/"
@@ -19,7 +19,7 @@ makedepends=('clisp')
 install=sbcl.install
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
   "arch-fixes.lisp")
-md5sums=('e3f933f7cb0053c3438d86e90f5bd73b'
+md5sums=('54a1527aea0a32df972c0330b45a26dd'
          '7ac0c1936547f4278198b8bf7725204d')
 
 
diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD
index be11d5103..35c91110d 100644
--- a/extra/seahorse/PKGBUILD
+++ b/extra/seahorse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198425 2013-10-30 14:47:52Z allan $
+# $Id: PKGBUILD 203359 2014-01-08 18:28:24Z heftig $
 # 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.1
+pkgver=3.10.2
 pkgrel=1
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64 'mips64el')
@@ -19,7 +19,7 @@ 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=('1df307481988c272d5648a335b2e8bb545b568a00c3f2ca2f3aa732badb46985'
+sha256sums=('89cabf19f77a55f220bc61a3b97e4db845a0980f0f1d9c66147cc9a4ced8cd16'
             '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c')
 
 build() {
diff --git a/extra/sg3_utils/PKGBUILD b/extra/sg3_utils/PKGBUILD
index 3e080c6fa..f73fa2c16 100644
--- a/extra/sg3_utils/PKGBUILD
+++ b/extra/sg3_utils/PKGBUILD
@@ -1,16 +1,16 @@
-#$Id: PKGBUILD 197372 2013-10-25 03:01:52Z allan $
+#$Id: PKGBUILD 205030 2014-02-03 10:47:54Z bpiotrowski $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=sg3_utils
-pkgver=1.36
-pkgrel=2
+pkgver=1.37
+pkgrel=1
 pkgdesc="Generic SCSI utilities"
 arch=(i686 x86_64 'mips64el')
 url="http://sg.danny.cz/sg/sg3_utils.html"
 license=('GPL' 'custom:BSD')
 depends=('glibc')
 source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tar.xz)
-md5sums=('5d1846c8aa03a2e39e1368cf05bf1cfd')
+md5sums=('ade022cf1ece91e94865e2c68d369c79')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/shared-mime-info/PKGBUILD b/extra/shared-mime-info/PKGBUILD
index 31b3f9b3e..2a345813d 100644
--- a/extra/shared-mime-info/PKGBUILD
+++ b/extra/shared-mime-info/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 197506 2013-10-26 08:14:56Z andyrtr $
+# $Id: PKGBUILD 205611 2014-02-09 10:29:43Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=shared-mime-info
 pkgver=1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org Shared MIME Info"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
+license=('GPL2')
 depends=('libxml2' 'glib2')
 makedepends=('intltool' 'pkgconfig')
 install=shared-mime-info.install
@@ -17,6 +17,9 @@ options=(!makeflags)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # https://bugs.archlinux.org/task/38836
+  # https://bugs.freedesktop.org/show_bug.cgi?id=70366
+  export ac_cv_func_fdatasync=no
   ./configure --prefix=/usr --disable-update-mimedb
   make
 }
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 62040c654..6851a4b9c 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 196672 2013-10-16 15:13:03Z andrea $
+# $Id: PKGBUILD 203383 2014-01-09 08:19:52Z 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.3
+pkgver=4.15.4
 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=('f04015ff2482f626f1ae14f0561a9602')
+md5sums=('1d5c9e92bc7fca5ac11e088a4cf6c83d')
 
 build() {
   cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD
index 07e372757..6155f5c2f 100644
--- a/extra/smb4k/PKGBUILD
+++ b/extra/smb4k/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 199073 2013-11-08 10:00:05Z giovanni $
+# $Id: PKGBUILD 203474 2014-01-11 10:30:22Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com>
 
 pkgname=smb4k
-pkgver=1.0.9
+pkgver=1.1.0
 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=('7a27698842663c6197228ff3c282a079')
+md5sums=('2ccd1f4eda732654460ff03b77738a96')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD
index aa68286a9..d057ea480 100644
--- a/extra/snd/PKGBUILD
+++ b/extra/snd/PKGBUILD
@@ -1,32 +1,22 @@
-# $Id: PKGBUILD 199037 2013-11-07 17:11:41Z schiv $
+# $Id: PKGBUILD 204379 2014-01-18 15:41:07Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: see .contrib
 
 pkgname=snd
-pkgver=14.1
-pkgrel=2
+pkgver=14.3
+pkgrel=1
 pkgdesc="An advanced sound editor"
 arch=('i686' 'x86_64')
 url="http://ccrma.stanford.edu/software/snd/"
-license=('custom')
+license=('custom:free')
 depends=('jack' 'gamin' 'gsl' 'fftw' 'gtk2' 'libmpc')
 makedepends=('ladspa' 'wavpack' 'flac' 'speex' 'gmp'
              'timidity++' 'mpg123' 'vorbis-tools')
 optdepends=('wavpack' 'flac' 'speex' 'mpg123'
             'timidity++' 'vorbis-tools')
-source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz"
-        'type_error.patch')
-md5sums=('955ca19ca70ac0e4d03cd710516c0174'
-         '9bfea0dccdfb5da1ba81e721672b11cc')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # fix incomplete type error
-  # see http://www.mail-archive.com/cmdist@ccrma.stanford.edu/msg04241.html
-  patch -Np1 -i "$srcdir/type_error.patch"
-}
+            source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz")
+md5sums=('817e1da8fe471e817b1ac4b1203925cd')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/snd/type_error.patch b/extra/snd/type_error.patch
deleted file mode 100644
index 1232c6e36..000000000
--- a/extra/snd/type_error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -bur snd-14.1.orig/snd-ladspa.c snd-14.1/snd-ladspa.c
---- snd-14.1.orig/snd-ladspa.c	2013-10-28 16:07:53.260612114 +0800
-+++ snd-14.1/snd-ladspa.c	2013-10-28 16:11:18.792831983 +0800
-@@ -1191,7 +1191,7 @@
-   if (descriptor->connect_port) 
-     descriptor->connect_port(XEN_TO_C_Ladspa_Handle(ptr),
- 			     XEN_TO_C_ULONG(port),
--			     double_to_float(samples->data, samples->length)
-+			     double_to_float(mus_vct_data(samples), mus_vct_length(samples))
- 			     );
-   return(XEN_FALSE);
- }
diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD
index fd25d6b87..dcec60021 100644
--- a/extra/socat/PKGBUILD
+++ b/extra/socat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186472 2013-05-27 06:47:24Z bisson $
+# $Id: PKGBUILD 204846 2014-01-29 01:50:38Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=socat
-pkgver=1.7.2.2
+pkgver=1.7.2.3
 pkgrel=1
 pkgdesc='Multipurpose relay'
 url='http://www.dest-unreach.org/socat/'
@@ -12,7 +12,7 @@ license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('readline' 'openssl')
 source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('588294c17373d52a8ac877dcd599ef26f14b110b')
+sha1sums=('580c56b6aadab6b71562e1c5a963c22e8ace6e32')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/spamassassin/PKGBUILD b/extra/spamassassin/PKGBUILD
index 2344af353..6409bde25 100644
--- a/extra/spamassassin/PKGBUILD
+++ b/extra/spamassassin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 187368 2013-06-05 15:55:32Z bluewind $
+# $Id: PKGBUILD 205860 2014-02-11 21:25:20Z bluewind $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
-pkgver=3.3.2
-pkgrel=9
+pkgver=3.4.0
+pkgrel=1
 pkgdesc="A mail filter to identify spam."
 arch=('i686' 'x86_64' 'mips64el')
 license=('APACHE')
@@ -21,18 +21,18 @@ backup=('etc/mail/spamassassin/local.cf'
         'etc/mail/spamassassin/v320.pre'
         'etc/mail/spamassassin/v330.pre')
 install="${pkgname}.install"
-options=('!emptydirs')
-source=("http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"
-        'spamassassin.service'
-        'perl-5.18-fixes.patch')
-md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
-         'b8dcea016fb73b074b941e832cfae5c9'
-         '6cf63928eeeaea25967c2ffd875d106a')
+source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
+        'spamassassin.service')
+md5sums=('5d0b50cee3bfa905cca35c33296c8c2a'
+         'SKIP'
+         'd0ce5f8a02fd74dbc83632f4aaec6185')
 
 prepare() {
   cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
 
-  patch -p0 -d lib -i "$srcdir/perl-5.18-fixes.patch"
+  sed -i t/sa_compile.t \
+	  -e 's#/foo/bin/spamassassin#/foo/bin/site_perl/spamassassin#' \
+	  -e 's#/foo/bin/sa-compile#/foo/bin/site_perl/sa-compile#'
 }
 
 build() {
@@ -47,9 +47,6 @@ build() {
 check() {
   cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
 
-  # SSLv2 is disabled by upstream so this test would fail
-  rm -rf t/spamd_ssl_v2.t
-
   # parallel tests cause lots of failures; disable for now
   #export HARNESS_OPTIONS="j$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/')"
 
@@ -61,4 +58,5 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.service"
+  install -d -o 182 -g 182 -m 755 "$pkgdir/var/lib/spamassassin"
 }
diff --git a/extra/spamassassin/perl-5.18-fixes.patch b/extra/spamassassin/perl-5.18-fixes.patch
deleted file mode 100644
index 74277fc8b..000000000
--- a/extra/spamassassin/perl-5.18-fixes.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- Mail/SpamAssassin/AsyncLoop.pm~	2011-06-07 01:59:17.000000000 +0200
-+++ Mail/SpamAssassin/AsyncLoop.pm	2013-05-29 01:37:58.000000000 +0200
-@@ -361,5 +361,12 @@
-     $now = time;  # capture new timestamp, after possible sleep in 'select'
- 
--    while (my($key,$ent) = each %$pending) {
-+    # A callback routine may generate another DNS query, which may insert
-+    # an entry into the %$pending hash thus invalidating the each() context.
-+    # So, make sure that callbacks are not called while the each() context
-+    # is open, or avoid using each().  [Bug 6937]
-+    #
-+  # while (my($key,$ent) = each %$pending) {
-+    foreach my $key (keys %$pending) {
-+      my $ent = $pending->{$key};
-       my $id = $ent->{id};
-       if (defined $ent->{poll_callback}) {  # call a "poll_callback" if exists
-@@ -449,5 +456,6 @@
-   my $foundcnt = 0;
-   my $now = time;
--  while (my($key,$ent) = each %$pending) {
-+  foreach my $key (keys %$pending) {
-+    my $ent = $pending->{$key};
-     dbg("async: aborting after %.3f s, %s: %s",
-         $now - $ent->{start_time},
---- Mail/SpamAssassin/Conf/Parser.pm~	2011-06-07 01:59:17.000000000 +0200
-+++ Mail/SpamAssassin/Conf/Parser.pm	2013-05-29 01:32:06.000000000 +0200
-@@ -1249,5 +1249,5 @@
-   my $mods = '';
-   local ($1,$2);
--  if ($re =~ s/^m{//) {
-+  if ($re =~ s/^m\{//) {
-     $re =~ s/}([a-z]*)$//; $mods = $1;
-   }
---- Mail/SpamAssassin/DnsResolver.pm~	2011-06-07 01:59:17.000000000 +0200
-+++ Mail/SpamAssassin/DnsResolver.pm	2013-05-29 01:32:06.000000000 +0200
-@@ -441,8 +441,14 @@
-       if (!defined($timeout) || $timeout > 0)
-         { $timer = $self->{main}->time_method("poll_dns_idle") }
-+      $! = 0;
-       ($nfound, $timeleft) = select($rout=$rin, undef, undef, $timeout);
-     }
-     if (!defined $nfound || $nfound < 0) {
--      warn "dns: select failed: $!";
-+      if ($!) { warn "dns: select failed: $!\n" }
-+      else    { info("dns: select interrupted") }
-+      return;
-+    } elsif (!$nfound) {
-+      if (!defined $timeout) { warn("dns: select returned empty-handed\n") }
-+      elsif ($timeout > 0) { dbg("dns: select timed out %.3f s", $timeout) }
-       return;
-     }
---- Mail/SpamAssassin/Message.pm~	2011-06-07 01:59:17.000000000 +0200
-+++ Mail/SpamAssassin/Message.pm	2013-05-29 01:32:06.000000000 +0200
-@@ -567,5 +567,5 @@
-     # bug 5557: windows requires tmp file be closed before it can be rm'd
-     if (ref $part->{'raw'} eq 'GLOB') {
--      close($part->{'raw'})  or die "error closing input file: $!";
-+      close($part->{'raw'})  or warn "error closing input file: $!";
-     }
- 
---- Mail/SpamAssassin/PerMsgStatus.pm~	2011-06-07 01:59:17.000000000 +0200
-+++ Mail/SpamAssassin/PerMsgStatus.pm	2013-05-29 01:32:06.000000000 +0200
-@@ -421,6 +421,6 @@
-     }
- 
--    # ignore tests with 0 score in this scoreset
--    next if ($scores->{$test} == 0);
-+    # ignore tests with 0 score (or undefined) in this scoreset
-+    next if !$scores->{$test};
- 
-     # Go ahead and add points to the proper locations
-@@ -1253,11 +1253,10 @@
-               my $line = '';
-               foreach my $test (sort @{$self->{test_names_hit}}) {
--                if (!$line) {
--                  $line .= $test . "=" . $self->{conf}->{scores}->{$test};
--                } else {
--                  $line .= $arg . $test . "=" . $self->{conf}->{scores}->{$test};
--                }
-+                my $score = $self->{conf}->{scores}->{$test};
-+                $score = '0'  if !defined $score;
-+                $line .= $arg  if $line ne '';
-+                $line .= $test . "=" . $score;
-               }
--              $line ? $line : 'none';
-+              $line ne '' ? $line : 'none';
-             },
- 
---- Mail/SpamAssassin/Util.pm~	2013-05-29 01:29:59.000000000 +0200
-+++ Mail/SpamAssassin/Util.pm	2013-05-29 01:33:16.000000000 +0200
-@@ -1588,5 +1588,5 @@
-     return undef;   # invalid
-   }
--  elsif ($re =~ s/^m{//) {              # m{foo/bar}
-+  elsif ($re =~ s/^m\{//) {             # m{foo/bar}
-     $delim = '}';
-   }
diff --git a/extra/spamassassin/spamassassin.install b/extra/spamassassin/spamassassin.install
index e43453e97..cca20782d 100644
--- a/extra/spamassassin/spamassassin.install
+++ b/extra/spamassassin/spamassassin.install
@@ -1,11 +1,38 @@
+setup_user() {
+	getent group spamd  &>/dev/null || groupadd -g 182 spamd  >/dev/null
+	getent passwd spamd &>/dev/null || useradd -u 182 -d /var/lib/spamassassin -g spamd -s /bin/false spamd >/dev/null
+
+	if [[ -d /var/lib/spamassassin ]]; then
+		chown spamd:spamd /var/lib/spamassassin
+	fi
+
+	true
+}
+
 post_install() {
-  echo "You must run 'sa-update' to install spam rules before use."
+	echo "You must run 'sa-update' to install spam rules before use."
+	setup_user
 }
 
 post_upgrade() {
-  # Compile rules, if rules have previously been compiled, and it's possible
-  if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]]; then
-    echo "Detected compiled rules, running sa-compile..."
-    sa-compile > /dev/null 2>&1
-fi
+	setup_user
+	if  [ "$(vercmp $2 3.4)" -lt 0 ]; then
+		echo '/var/lib/spamassassin is now owned by the spamd user. spamassassin.service'
+		echo 'will also run under that user. You may need to adjust your setup.'
+	fi
+
+	# Compile rules, if rules have previously been compiled, and it's possible
+	if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]]; then
+		echo "Detected compiled rules, running sa-compile..."
+		sa-compile > /dev/null 2>&1
+	fi
+
+	true
+}
+
+pre_remove() {
+	getent passwd spamd &>/dev/null && userdel  spamd  >/dev/null
+	getent group spamd  &>/dev/null && groupdel spamd  >/dev/null
+	true
 }
+
diff --git a/extra/spamassassin/spamassassin.service b/extra/spamassassin/spamassassin.service
index e9c9c07fd..6e6b1f35b 100644
--- a/extra/spamassassin/spamassassin.service
+++ b/extra/spamassassin/spamassassin.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=forking
 PIDFile=/var/run/spamd.pid
-ExecStart=/usr/bin/vendor_perl/spamd -d --pidfile /var/run/spamd.pid -c -c -x --virtual-config-dir=/var/lib/spamassassin -u nobody
+ExecStart=/usr/bin/vendor_perl/spamd -d --pidfile /var/run/spamd.pid -c -c -x --virtual-config-dir=/var/lib/spamassassin -u spamd -g spamd
 StandardOutput=syslog
 StandardError=syslog
 Restart=always
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index 295af16f9..7c405f31b 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -1,11 +1,13 @@
-# $Id: PKGBUILD 201374 2013-12-09 21:50:07Z andyrtr $
+# $Id: PKGBUILD 205898 2014-02-13 16:32:59Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite"
 pkgname=('sqlite' 'sqlite-tcl') 
-_amalgamationver=3080200
-pkgver=3.8.2
+_amalgamationver=3080301
+_docver=${_amalgamationver}
+#_docver=3080001
+pkgver=3.8.3.1
 pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,10 +15,10 @@ license=('custom:Public Domain')
 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/2014/sqlite-autoconf-$_amalgamationver.tar.gz
 	license.txt)
 options=('!emptydirs')
-sha1sums=('6033ef603ce221d367c665477514d972ef1dc90e'
+sha1sums=('a9b0a3d66fb5c2ae51ad2d8a512ca827adc7d59c'
           'f34f6daa4ab3073d74e774aad21d66878cf26853')
 
 build() {
diff --git a/extra/sratom/PKGBUILD b/extra/sratom/PKGBUILD
index 09ae20b22..63302c5fd 100644
--- a/extra/sratom/PKGBUILD
+++ b/extra/sratom/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: speps <speps at aur dot archlinux dot org>
 
 pkgname=sratom
-pkgver=0.4.2
+pkgver=0.4.4
 pkgrel=1
 pkgdesc="An LV2 Atom RDF serialisation library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('custom:ISC')
 depends=('lv2' 'sord>=0.12.0')
 makedepends=('python2')
 source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('5bb7e4bc4198e19f388ac51239007f25')
+md5sums=('07449e40511f5911298ee4c79ad0530a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD
index b78bd338a..ec158ea17 100644
--- a/extra/strigi/PKGBUILD
+++ b/extra/strigi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 190050 2013-07-13 12:42:56Z svenstaro $
+# $Id: PKGBUILD 204762 2014-01-26 12:16:07Z andyrtr $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=strigi
 pkgver=0.7.8
-pkgrel=4
+pkgrel=5
 pkgdesc="Fast crawling desktop search engine with Qt GUI"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://strigi.sourceforge.net/'
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index a0e3cd17e..0249a4e6b 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 200590 2013-11-29 15:17:27Z angvp $
+# $Id: PKGBUILD 206046 2014-02-16 10:53:26Z andyrtr $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=subversion
 pkgver=1.8.5
-pkgrel=1
+pkgrel=3
 pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://subversion.apache.org/"
@@ -51,7 +51,7 @@ build() {
    [ "$CARCH" = "mips64el" ] && extraconf="--disable-javahl"
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
                --with-zlib=/usr --with-serf=/usr --with-apxs \
-               --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \
+               --with-sqlite=/usr \
                --enable-javahl --with-gnome-keyring --with-kwallet \
                --with-apache-libexecdir=/usr/lib/httpd/modules \
                --with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \
diff --git a/extra/suil/PKGBUILD b/extra/suil/PKGBUILD
index b2e94ba4b..b1ca020b0 100644
--- a/extra/suil/PKGBUILD
+++ b/extra/suil/PKGBUILD
@@ -3,18 +3,18 @@
 # Contributor: speps <speps at aur dot archlinux dot org>
 
 pkgname=suil
-pkgver=0.6.16
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://drobilla.net/software/suil/"
 license=('custom:ISC')
-depends=('lv2>=1.6.0')
+depends=('lv2>=1.8.0')
 makedepends=('python2' 'qt4' 'gtk2')
 optdepends=('qt4: Qt 4.x UI wrapping support'
             'gtk2: GTK+ 2.x UI wrapping support')
 source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('644ccd95179f32f01cee0107a1ad88c9')
+md5sums=('8b6039593b2b8d6838b3b29e36874c1c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD
index f145fb1e6..7a97dc8a4 100644
--- a/extra/swig/PKGBUILD
+++ b/extra/swig/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 194495 2013-09-16 20:14:45Z eric $
+# $Id: PKGBUILD 205828 2014-02-10 20:41:26Z eric $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=swig
-pkgver=2.0.11
+pkgver=2.0.12
 pkgrel=1
 pkgdesc="Generate scripting interfaces to C/C++ code"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.swig.org/"
 license=('custom')
-depends=('zlib' 'pcre')
+depends=('pcre' 'gcc-libs')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('d3bf4e78824dba76bfb3269367f1ae0276b49df9')
+sha1sums=('4203c68f79012a2951f542018ff4358d838b5035')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/syslog-ng/PKGBUILD b/extra/syslog-ng/PKGBUILD
index 3bf81bf20..c114cfea2 100644
--- a/extra/syslog-ng/PKGBUILD
+++ b/extra/syslog-ng/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 201450 2013-12-11 20:06:25Z eric $
+# $Id: PKGBUILD 204459 2014-01-20 13:39:40Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=syslog-ng
-pkgver=3.5.2
+pkgver=3.5.3
 pkgrel=1
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ backup=('etc/syslog-ng/scl.conf'
         'etc/logrotate.d/syslog-ng')
 source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz
         syslog-ng.conf syslog-ng.logrotate)
-sha1sums=('f0c91e14ee1f691cf680daf942d84ed87e5469c0'
-          'b5b0d54ec295c6f8a62f68238c36fe62da01ef6e'
+sha1sums=('7a8070f384e0dba1dfd6622c40bc6e402fa6178f'
+          'cf61571ffde34ecf36be76881fce20944fd3efa4'
           '949128fe3d7f77a7aab99048061f885bc758000c')
 
 prepare() {
diff --git a/extra/syslog-ng/syslog-ng.conf b/extra/syslog-ng/syslog-ng.conf
index bb89a82f3..2b9a325fd 100644
--- a/extra/syslog-ng/syslog-ng.conf
+++ b/extra/syslog-ng/syslog-ng.conf
@@ -1,4 +1,5 @@
 @version: 3.5
+@include "scl.conf"
 #
 # /etc/syslog-ng/syslog-ng.conf
 #
@@ -18,9 +19,8 @@ options {
 };
 
 source src {
-  unix-dgram("/run/systemd/journal/syslog");
+  system();
   internal();
-  file("/proc/kmsg");
 };
 
 destination d_authlog { file("/var/log/auth.log"); };
diff --git a/extra/taglib-sharp/PKGBUILD b/extra/taglib-sharp/PKGBUILD
index 6e68a0a67..a45d61ca6 100644
--- a/extra/taglib-sharp/PKGBUILD
+++ b/extra/taglib-sharp/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 188889 2013-06-23 22:30:41Z daniel $
+# $Id: PKGBUILD 203202 2014-01-05 10:51:18Z bpiotrowski $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Carlos Ruiz <cailovirtual@gmail.com>
 
 pkgname=taglib-sharp
 pkgver=2.1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for reading and writing metadata in media files for Mono"
 arch=('i686' 'x86_64')
 url="https://github.com/mono/taglib-sharp"
-license=('LGPL2')
+license=('LGPL2.1')
 depends=('mono')
-source=(http://download.banshee-project.org/taglib-sharp/${pkgver}/${pkgname}-${pkgver}.tar.gz)
+source=(http://download.banshee-project.org/taglib-sharp/$pkgver/$pkgname-$pkgver.tar.gz)
 md5sums=('815f5bdb3cd1b3a4d6bbb34de448ad9d')
 
 build() {
diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD
index 7d6b77f3d..68ef04fe4 100644
--- a/extra/telepathy-kde-accounts-kcm/PKGBUILD
+++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197604 2013-10-27 14:19:14Z andrea $
+# $Id: PKGBUILD 204061 2014-01-15 08:53:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-accounts-kcm
 _pkgname=ktp-accounts-kcm
-pkgver=0.7.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,8 +17,8 @@ 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}/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('8791acef43bb125259d218f2385ddf50a1ec857c')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('483f0013d6d847ad9ee666d65cf971c1565bc6a8')
 
 prepare() {
   mkdir build
diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD
index aa1b49953..dcd0b6e0c 100644
--- a/extra/telepathy-kde-approver/PKGBUILD
+++ b/extra/telepathy-kde-approver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197606 2013-10-27 14:19:28Z andrea $
+# $Id: PKGBUILD 204063 2014-01-15 08:53:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-approver
 _pkgname=ktp-approver
-pkgver=0.7.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="KDE Channel Approver for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ 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}/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('f250514208481a328732d73e1d3807e72f375d27')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('b4ac4cd7c140fb947064af1c5d16a19f0e10d943')
 
 prepare() {
   mkdir build
diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD
index 16362720e..adf6acd2e 100644
--- a/extra/telepathy-kde-auth-handler/PKGBUILD
+++ b/extra/telepathy-kde-auth-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197623 2013-10-27 14:21:06Z andrea $
+# $Id: PKGBUILD 204065 2014-01-15 08:53:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-auth-handler
 _pkgname=ktp-auth-handler
-pkgver=0.7.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('GPL')
 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}/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('0abeef4bc6905f0b975505f9a215bfbafa4b02a3')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('15a202b6423c9fe487c1ed74d32ab06f946bceca')
 
 prepare() {
   mkdir build
diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD
index 1258d21f3..5954e740f 100644
--- a/extra/telepathy-kde-common-internals/PKGBUILD
+++ b/extra/telepathy-kde-common-internals/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197602 2013-10-27 14:18:27Z andrea $
+# $Id: PKGBUILD 204081 2014-01-15 08:57:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-common-internals
 _pkgname=ktp-common-internals
-pkgver=0.7.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="Common components for KDE-Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('GPL')
 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}/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('9610eb4b606166200aacbb8d311b63c30724403e')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('6b55bf5919d922502db8f21a2b1871e411e93699')
 
 prepare() {
   mkdir build
diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD
index 60d53dd55..8babfa20c 100644
--- a/extra/telepathy-kde-contact-list/PKGBUILD
+++ b/extra/telepathy-kde-contact-list/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197610 2013-10-27 14:19:52Z andrea $
+# $Id: PKGBUILD 204067 2014-01-15 08:53:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-contact-list
 _pkgname=ktp-contact-list
-pkgver=0.7.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="Telepathy contact list application"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ 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}/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('493a7c0f5d3e46c1c2011130670f907a295fc4a4')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('a9473dd3ad464e55ecf1448cda4b53160b8cb6fc')
 
 prepare() {
   mkdir build
diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD
index ed999f9a5..4c1041cf8 100644
--- a/extra/telepathy-kde-contact-runner/PKGBUILD
+++ b/extra/telepathy-kde-contact-runner/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197612 2013-10-27 14:20:03Z andrea $
+# $Id: PKGBUILD 204069 2014-01-15 08:53:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-contact-runner
 _pkgname=ktp-contact-runner
-pkgver=0.7.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="KRunner plugin for KDE Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('GPL')
 depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('cbba565c8fbb56857824ff8c18a14bf8094fc4e9')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('e471fab931fa11f915143f502f48af75d031a3e2')
 
 prepare() {
   mkdir build
diff --git a/extra/telepathy-kde-desktop-applets/PKGBUILD b/extra/telepathy-kde-desktop-applets/PKGBUILD
index 50b216a0c..bf3e9c97d 100644
--- a/extra/telepathy-kde-desktop-applets/PKGBUILD
+++ b/extra/telepathy-kde-desktop-applets/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197614 2013-10-27 14:20:13Z andrea $
+# $Id: PKGBUILD 204071 2014-01-15 08:53:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-desktop-applets
 _pkgname=ktp-desktop-applets
-pkgver=0.7.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="The KDE-Telepathy Plasma desktop applets"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ 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}/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('0e968a850bd579ce0557773daf5b4fb33e9ff711')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('184085d35cf9eca0d2bedc3fbef0a07a7240f7c1')
 
 prepare() {
   mkdir build
diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
index 346aa35e1..200aaff08 100644
--- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD
+++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197616 2013-10-27 14:20:23Z andrea $
+# $Id: PKGBUILD 204073 2014-01-15 08:54:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-filetransfer-handler
 _pkgname=ktp-filetransfer-handler
-pkgver=0.7.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="Telepathy file transfer handler"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('GPL')
 depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('5586256d77b2675aa3c1bb036fb3832a7993e415')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('5daf9963d3ebc9371a159aca48e8d125b2247860')
 
 prepare() {
   mkdir build
diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD
index bb212eb14..1c2cfc724 100644
--- a/extra/telepathy-kde-integration-module/PKGBUILD
+++ b/extra/telepathy-kde-integration-module/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197618 2013-10-27 14:20:33Z andrea $
+# $Id: PKGBUILD 204075 2014-01-15 08:54:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-integration-module
 _pkgname=ktp-kded-integration-module
-pkgver=0.7.0
+pkgver=0.7.1
 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,8 +12,8 @@ license=('GPL')
 depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('0ce145e4a9354e40d19806febf5d8ad8097b13de')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('8b6d69ef333140d130d0ade8c36317d8385050e4')
 
 prepare() {
   mkdir build
diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD
index 423d5b2bd..07e64b29a 100644
--- a/extra/telepathy-kde-send-file/PKGBUILD
+++ b/extra/telepathy-kde-send-file/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197620 2013-10-27 14:20:43Z andrea $
+# $Id: PKGBUILD 204077 2014-01-15 08:54:23Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-send-file
 _pkgname=ktp-send-file
-pkgver=0.7.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ 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}/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('16c5fa9437b4952c045957c2344eafec665b7bcb')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('a1b029ea0ce0f43fcbba5e6e395270c073fc668b')
 
 prepare() {
   mkdir build
diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD
index f086be5e9..7cbba2e32 100644
--- a/extra/telepathy-kde-text-ui/PKGBUILD
+++ b/extra/telepathy-kde-text-ui/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 197622 2013-10-27 14:20:52Z andrea $
+# $Id: PKGBUILD 206068 2014-02-16 21:43:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-text-ui
 _pkgname=ktp-text-ui
-pkgver=0.7.0
-pkgrel=1
+pkgver=0.7.1
+pkgrel=2
 pkgdesc="Telepathy handler for Text Chats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
-depends=('telepathy-kde-contact-list' 'telepathy-logger-qt')
+depends=('telepathy-kde-contact-list' 'qjson')
 makedepends=('cmake' 'automoc4' 'boost')
 groups=('kde-telepathy')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('f940e7ae031d5ad897906efad3b8f37e3197bd95')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('716372b35184c6997361ca67d9cea887125b745e')
 
 prepare() {
   mkdir build
diff --git a/extra/terminology/PKGBUILD b/extra/terminology/PKGBUILD
new file mode 100644
index 000000000..b6b67bec5
--- /dev/null
+++ b/extra/terminology/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Doug Newgard <scimmia22 at outlook dot com>
+# Contributor: Paul Ezvan <paul@ezvan.fr>
+
+pkgname=terminology
+pkgver=0.4.0
+pkgrel=2
+pkgdesc="EFL based terminal emulator"
+arch=('i686' 'x86_64')
+url="http://www.enlightenment.org/p.php?p=about/terminology"
+license=('BSD')
+depends=('elementary')
+source=("http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+install=terminology.install
+sha1sums=('6003519484ba2f50487bc1f6b977564f60bcc1fc')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  export CFLAGS="${CFLAGS} -fvisibility=hidden"
+  
+  ./configure \
+    --prefix=/usr
+
+  make
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  # install license files
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/COPYING" \
+        "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
diff --git a/libre/mplayer-libre/mplayer.install b/extra/terminology/terminology.install
index 660593cf5..88ac37896 100644
--- a/libre/mplayer-libre/mplayer.install
+++ b/extra/terminology/terminology.install
@@ -3,9 +3,9 @@ post_install() {
 }
 
 post_upgrade() {
-    post_install
+	post_install
 }
 
 post_remove() {
-    post_install
+	post_install
 }
diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD
index 8ae557e05..48a68671f 100644
--- a/extra/texmacs/PKGBUILD
+++ b/extra/texmacs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 188082 2013-06-08 11:18:26Z bpiotrowski $
+# $Id: PKGBUILD 205031 2014-02-03 10:47:55Z bpiotrowski $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Christopher Reimer <c.reimer1993@gmail.com>
 
 pkgname=texmacs
-pkgver=1.0.7.19
-pkgrel=2
+pkgver=1.0.7.21
+pkgrel=1
 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.texmacs.org/"
@@ -14,11 +14,12 @@ depends=('perl' 'guile1.8' 'texlive-core' 'python2' 'libxext' 'freetype2' 'share
 # do not remove texlive-core dependency, as it is needed!
 optdepends=('transfig: convert images using fig2ps'
             'gawk: conversion of some files')
+makedepends=('ghostscript')
 #source=(ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-${pkgver}-src.tar.gz)
 source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${pkgver}-src.tar.gz)
 install=texmacs.install
 options=('!emptydirs')
-sha1sums=('855b8252f561b69deb45a3b80f4531a9055ea465')
+sha1sums=('e8086acd4b7c1bb3aaccf75b6b0199aa612cb66c')
 
 build() {
   cd ${srcdir}/TeXmacs-${pkgver}-src
@@ -37,7 +38,7 @@ build() {
   sed -i '\/icons\/gnome 2>\/dev\/null/d' Makefile.in
 
   # Unused i386 binary making strip fail.
-  rm plugins/maxima/bin/maxima_filter
+  test "$CARCH" = "mips64el" && rm plugins/maxima/bin/maxima_filter
   
   export QMAKE=qmake-qt4
   export MOC=moc-qt4
diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD
index 0554a7d3f..eabab491e 100644
--- a/extra/totem-plparser/PKGBUILD
+++ b/extra/totem-plparser/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 199437 2013-11-12 18:17:30Z heftig $
+# $Id: PKGBUILD 203592 2014-01-13 17:12:25Z andyrtr $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=totem-plparser
 pkgver=3.10.0
-pkgrel=3
+pkgrel=4
 url="http://www.gnome.org"
 pkgdesc="Totem playlist parser library"
 license=('LGPL')
diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD
index 20d49318e..0ab9b7622 100644
--- a/extra/transcode/PKGBUILD
+++ b/extra/transcode/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198465 2013-10-30 15:02:22Z allan $
+# $Id: PKGBUILD 204526 2014-01-22 01:48:57Z eric $
 # Maintainer:
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: roberto <roberto@archlinux.org>
@@ -6,7 +6,7 @@
 pkgname=transcode
 _sripver=0.3-4
 pkgver=1.1.7
-pkgrel=12
+pkgrel=13
 pkgdesc="A video/DVD ripper and encoder for the terminal/console"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tcforge.berlios.de/"
@@ -46,6 +46,7 @@ prepare() {
   patch -p0 -i "${srcdir}/transcode-1.1.7-libav-9.patch"
   patch -p1 -i "${srcdir}/transcode-1.1.7-preset-force.patch"
   patch -p1 -i "${srcdir}/transcode-1.1.7-ffmpeg2.patch"
+  sed -i 's|freetype/ftglyph.h|freetype2/ftglyph.h|' filter/subtitler/load_font.c
 
   cd ../subtitleripper
   patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch"
diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD
index 253a31df4..aea1db9b6 100644
--- a/extra/udisks2/PKGBUILD
+++ b/extra/udisks2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198468 2013-10-30 15:03:29Z allan $
+# $Id: PKGBUILD 206043 2014-02-16 10:13:00Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=udisks2
-pkgver=2.1.1
-pkgrel=3
+pkgver=2.1.2
+pkgrel=1
 pkgdesc="Disk Management Service, version 2"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/udisks"
@@ -14,11 +14,19 @@ optdepends=('parted: partition management'
             'gptfdisk: GUID partition table support'
             'ntfs-3g: NTFS filesystem management support'
             'dosfstools: VFAT filesystem management support')
-source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2)
-sha256sums=('013b09ff38aa256b89c01525771f4565cb088724d5c8c79b32e9f811e88086fb')
+source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2{,.sign}
+        git-fixes.patch)
+sha256sums=('afe928fe7f44086b835257efc3fcbe503e2da7c988a773c997d0291bbab4a637'
+            'SKIP'
+            '52a9b9f039f9f115414715375f2b5874b79b5b67fbe2bdf3105b46d3a35f673f')
+
+prepare() {
+  cd udisks-$pkgver
+  patch -Np1 -i ../git-fixes.patch
+}
 
 build() {
-  cd "udisks-$pkgver"
+  cd udisks-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
       --sbindir=/usr/bin \
       --with-systemdsystemunitdir=/usr/lib/systemd/system \
@@ -27,7 +35,7 @@ build() {
 }
 
 package() {
-  cd "udisks-$pkgver"
+  cd udisks-$pkgver
   make DESTDIR="$pkgdir" install \
     bash_completiondir=/usr/share/bash-completion/completions
 }
diff --git a/extra/udisks2/git-fixes.patch b/extra/udisks2/git-fixes.patch
new file mode 100644
index 000000000..43cc53b05
--- /dev/null
+++ b/extra/udisks2/git-fixes.patch
@@ -0,0 +1,777 @@
+diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules
+index ed093ee..7112db8 100644
+--- a/data/80-udisks2.rules
++++ b/data/80-udisks2.rules
+@@ -94,6 +94,9 @@ SUBSYSTEMS=="usb", ENV{ID_VENDOR}=="*SanDisk*", ENV{ID_MODEL}=="*Cruzer*", ENV{I
+ SUBSYSTEMS=="usb", ENV{ID_VENDOR}=="HP", ENV{ID_MODEL}=="*v125w*", ENV{ID_DRIVE_THUMB}="1"
+ SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="13fe", ENV{ID_MODEL}=="*Patriot*", ENV{ID_DRIVE_THUMB}="1"
+ 
++# SD-Card reader in Chromebook Pixel
++SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="05e3", ENV{ID_MODEL_ID}=="0727", ENV{ID_DRIVE_FLASH_SD}="1"
++
+ # ------------------------------------------------------------------------
+ # ------------------------------------------------------------------------
+ # ------------------------------------------------------------------------
+diff --git a/doc/man/udisksctl.xml b/doc/man/udisksctl.xml
+index 8f38479..434a8fb 100644
+--- a/doc/man/udisksctl.xml
++++ b/doc/man/udisksctl.xml
+@@ -104,6 +104,16 @@
+ 
+     <cmdsynopsis>
+       <command>udisksctl</command>
++      <arg choice="plain">power-off </arg>
++      <group choice="req">
++        <arg choice="plain">--object-path <replaceable>OBJECT</replaceable></arg>
++        <arg choice="plain">--block-device <replaceable>DEVICE</replaceable></arg>
++      </group>
++      <arg choice="opt">--no-user-interaction</arg>
++    </cmdsynopsis>
++
++    <cmdsynopsis>
++      <command>udisksctl</command>
+       <arg choice="plain">smart-simulate </arg>
+       <arg choice="plain">--file <replaceable>PATH</replaceable></arg>
+       <group choice="req">
+@@ -238,6 +248,31 @@
+       </varlistentry>
+ 
+       <varlistentry>
++        <term><option>power-off</option></term>
++        <listitem>
++          <para>
++            Arranges for the drive to be safely removed and powered
++            off. On the OS side this includes ensuring that no process
++            is using the drive, then requesting that in-flight buffers
++            and caches are committed to stable storage. The exact
++            steps for powering off the drive depends on the drive
++            itself and the interconnect used. For drives connected
++            through USB, the effect is that the USB device will be
++            deconfigured followed by disabling the upstream hub port
++            it is connected to.
++          </para>
++          <para>
++            Note that as some physical devices contain multiple drives
++            (for example 4-in-1 flash card reader USB devices)
++            powering off one drive may affect other drives. As such
++            there are not a lot of guarantees associated with
++            performing this action. Usually the effect is that the
++            drive disappears as if it was unplugged.
++          </para>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry>
+         <term><option>smart-simulate</option></term>
+         <listitem>
+           <para>
+diff --git a/src/udisksdaemonutil.c b/src/udisksdaemonutil.c
+index 574bf2c..a588580 100644
+--- a/src/udisksdaemonutil.c
++++ b/src/udisksdaemonutil.c
+@@ -830,7 +830,7 @@ udisks_daemon_util_get_caller_uid_sync (UDisksDaemon            *daemon,
+     {
+       struct passwd pwstruct;
+       gchar pwbuf[8192];
+-      static struct passwd *pw;
++      struct passwd *pw = NULL;
+       int rc;
+ 
+       rc = getpwuid_r (uid, &pwstruct, pwbuf, sizeof pwbuf, &pw);
+@@ -840,6 +840,7 @@ udisks_daemon_util_get_caller_uid_sync (UDisksDaemon            *daemon,
+                        UDISKS_ERROR,
+                        UDISKS_ERROR_FAILED,
+                        "User with uid %d does not exist", (gint) uid);
++          goto out;
+         }
+       else if (pw == NULL)
+         {
+diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
+index d619850..22bcfd0 100644
+--- a/src/udiskslinuxblock.c
++++ b/src/udiskslinuxblock.c
+@@ -804,12 +804,23 @@ udisks_linux_block_update (UDisksLinuxBlock        *block,
+       gchar *dm_name_dev_file = NULL;
+       const gchar *dm_name_dev_file_as_symlink = NULL;
+ 
++      const gchar *dm_vg_name;
++      const gchar *dm_lv_name;
++      gchar *dm_lvm_dev_file = NULL;
++
+       dm_name = g_udev_device_get_property (device->udev_device, "DM_NAME");
+       if (dm_name != NULL)
+         dm_name_dev_file = g_strdup_printf ("/dev/mapper/%s", dm_name);
++
++      dm_vg_name = g_udev_device_get_property (device->udev_device, "DM_VG_NAME");
++      dm_lv_name = g_udev_device_get_property (device->udev_device, "DM_LV_NAME");
++      if (dm_vg_name != NULL && dm_lv_name != NULL)
++        dm_lvm_dev_file =  g_strdup_printf ("/dev/%s/%s", dm_vg_name, dm_lv_name);
++
+       for (n = 0; symlinks != NULL && symlinks[n] != NULL; n++)
+         {
+-          if (g_str_has_prefix (symlinks[n], "/dev/vg_"))
++          if (g_str_has_prefix (symlinks[n], "/dev/vg_")
++              || g_strcmp0 (symlinks[n], dm_lvm_dev_file) == 0)
+             {
+               /* LVM2 */
+               preferred_device_file = symlinks[n];
+@@ -824,6 +835,7 @@ udisks_linux_block_update (UDisksLinuxBlock        *block,
+       if (preferred_device_file == NULL && dm_name_dev_file_as_symlink != NULL)
+         preferred_device_file = dm_name_dev_file_as_symlink;
+       g_free (dm_name_dev_file);
++      g_free (dm_lvm_dev_file);
+     }
+   else if (g_str_has_prefix (device_file, "/dev/md"))
+     {
+diff --git a/src/udiskslinuxdevice.c b/src/udiskslinuxdevice.c
+index 0b65a69..8c4a3ed 100644
+--- a/src/udiskslinuxdevice.c
++++ b/src/udiskslinuxdevice.c
+@@ -199,6 +199,7 @@ probe_ata (UDisksLinuxDevice  *device,
+     {
+       /* ATA8: 7.16 IDENTIFY DEVICE - ECh, PIO Data-In */
+       input.command = 0xec;
++      input.count = 1;
+       output.buffer = g_new0 (guchar, 512);
+       output.buffer_size = 512;
+       if (!udisks_ata_send_command_sync (fd,
+@@ -221,6 +222,7 @@ probe_ata (UDisksLinuxDevice  *device,
+     {
+       /* ATA8: 7.17 IDENTIFY PACKET DEVICE - A1h, PIO Data-In */
+       input.command = 0xa1;
++      input.count = 1;
+       output.buffer = g_new0 (guchar, 512);
+       output.buffer_size = 512;
+       if (!udisks_ata_send_command_sync (fd,
+diff --git a/src/udiskslinuxdrive.c b/src/udiskslinuxdrive.c
+index 170ba27..ed541ff 100644
+--- a/src/udiskslinuxdrive.c
++++ b/src/udiskslinuxdrive.c
+@@ -25,6 +25,12 @@
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
++#include <inttypes.h>
++#include <errno.h>
++#include <linux/bsg.h>
++#include <scsi/scsi.h>
++#include <scsi/sg.h>
++#include <scsi/scsi_ioctl.h>
+ 
+ #include <pwd.h>
+ #include <grp.h>
+@@ -1192,6 +1198,122 @@ handle_set_configuration (UDisksDrive           *_drive,
+ 
+ /* ---------------------------------------------------------------------------------------------------- */
+ 
++/* TODO: move to udisksscsi.[ch] similar what we do for ATA with udisksata.[ch] */
++
++static gboolean
++send_scsi_command_sync (gint      fd,
++                        guint8   *cdb,
++                        gsize     cdb_len,
++                        GError  **error)
++{
++  struct sg_io_v4 io_v4;
++  uint8_t sense[32];
++  gboolean ret = FALSE;
++  gint rc;
++  gint timeout_msec = 30000; /* 30 seconds */
++
++  g_return_val_if_fail (fd != -1, FALSE);
++  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
++
++  /* See http://sg.danny.cz/sg/sg_io.html and http://www.tldp.org/HOWTO/SCSI-Generic-HOWTO/index.html
++   * for detailed information about how the SG_IO ioctl work
++   */
++
++  memset (sense, 0, sizeof (sense));
++  memset (&io_v4, 0, sizeof (io_v4));
++  io_v4.guard = 'Q';
++  io_v4.protocol = BSG_PROTOCOL_SCSI;
++  io_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_CMD;
++  io_v4.request_len = cdb_len;
++  io_v4.request = (uintptr_t) cdb;
++  io_v4.max_response_len = sizeof (sense);
++  io_v4.response = (uintptr_t) sense;
++  io_v4.timeout = timeout_msec;
++
++  rc = ioctl (fd, SG_IO, &io_v4);
++  if (rc != 0)
++    {
++      /* could be that the driver doesn't do version 4, try version 3 */
++      if (errno == EINVAL)
++        {
++          struct sg_io_hdr io_hdr;
++          memset (&io_hdr, 0, sizeof (struct sg_io_hdr));
++          io_hdr.interface_id = 'S';
++          io_hdr.cmdp = (unsigned char*) cdb;
++          io_hdr.cmd_len = cdb_len;
++          io_hdr.dxfer_direction = SG_DXFER_NONE;
++          io_hdr.sbp = sense;
++          io_hdr.mx_sb_len = sizeof (sense);
++          io_hdr.timeout = timeout_msec;
++
++          rc = ioctl (fd, SG_IO, &io_hdr);
++          if (rc != 0)
++            {
++              g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno),
++                           "SGIO v3 ioctl failed (v4 not supported): %m");
++              goto out;
++            }
++          else
++            {
++              if (!(io_hdr.status == 0 &&
++                    io_hdr.host_status == 0 &&
++                    io_hdr.driver_status == 0))
++                {
++                  g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
++                               "Non-GOOD SCSI status from SGIO v3 ioctl: "
++                               "status=%d host_status=%d driver_status=%d",
++                               io_hdr.status,
++                               io_hdr.host_status,
++                               io_hdr.driver_status);
++                  goto out;
++                }
++            }
++        }
++      else
++        {
++          g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno),
++                       "SGIO v4 ioctl failed: %m");
++          goto out;
++        }
++    }
++  else
++    {
++      if (!(io_v4.device_status == 0 &&
++            io_v4.transport_status == 0 &&
++            io_v4.driver_status == 0))
++        {
++          g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
++                       "Non-GOOD SCSI status from SGIO v4 ioctl: "
++                       "device_status=%d transport_status=%d driver_status=%d",
++                       io_v4.device_status,
++                       io_v4.transport_status,
++                       io_v4.driver_status);
++          goto out;
++        }
++    }
++
++  ret = TRUE;
++
++ out:
++  return ret;
++}
++
++static gboolean
++send_scsi_start_stop_command_sync (gint      fd,
++                                   GError  **error)
++{
++  uint8_t cdb[6];
++
++  /* SBC3 (SCSI Block Commands), 5.20 START STOP UNIT command
++   */
++  memset (cdb, 0, sizeof cdb);
++  cdb[0] = 0x1b;                        /* OPERATION CODE: START STOP UNIT */
++
++  return send_scsi_command_sync (fd, cdb, sizeof cdb, error);
++}
++
++/* ---------------------------------------------------------------------------------------------------- */
++
+ static gboolean
+ handle_power_off (UDisksDrive           *_drive,
+                   GDBusMethodInvocation *invocation,
+@@ -1216,6 +1338,7 @@ handle_power_off (UDisksDrive           *_drive,
+   gid_t caller_gid;
+   pid_t caller_pid;
+   GList *sibling_objects = NULL, *l;
++  gint fd = -1;
+ 
+   object = udisks_daemon_util_dup_object (drive, &error);
+   if (object == NULL)
+@@ -1324,10 +1447,10 @@ handle_power_off (UDisksDrive           *_drive,
+     {
+       UDisksBlock *block_to_sync = UDISKS_BLOCK (l->data);
+       const gchar *device_file;
+-      gint fd;
++      gint device_fd;
+       device_file = udisks_block_get_device (block_to_sync);
+-      fd = open (device_file, O_RDONLY|O_NONBLOCK|O_EXCL);
+-      if (fd == -1)
++      device_fd = open (device_file, O_RDONLY|O_NONBLOCK|O_EXCL);
++      if (device_fd == -1)
+         {
+           g_dbus_method_invocation_return_error (invocation,
+                                                  UDISKS_ERROR,
+@@ -1336,7 +1459,7 @@ handle_power_off (UDisksDrive           *_drive,
+                                                  device_file);
+           goto out;
+         }
+-      if (fsync (fd) != 0)
++      if (fsync (device_fd) != 0)
+         {
+           g_dbus_method_invocation_return_error (invocation,
+                                                  UDISKS_ERROR,
+@@ -1345,7 +1468,7 @@ handle_power_off (UDisksDrive           *_drive,
+                                                  device_file);
+           goto out;
+         }
+-      if (close (fd) != 0)
++      if (close (device_fd) != 0)
+         {
+           g_dbus_method_invocation_return_error (invocation,
+                                                  UDISKS_ERROR,
+@@ -1356,9 +1479,45 @@ handle_power_off (UDisksDrive           *_drive,
+         }
+     }
+ 
+-  escaped_device = udisks_daemon_util_escape_and_quote (udisks_block_get_device (block));
++  /* Send the "SCSI START STOP UNIT" command to request that the unit
++   * be stopped but don't treat failure as fatal. In fact some
++   * USB-attached hard-disks fails with this command, probably due to
++   * the SCSI/SATA translation layer.
++   */
++  fd = open (udisks_block_get_device (block), O_RDONLY|O_NONBLOCK|O_EXCL);
++  if (fd == -1)
++    {
++      g_dbus_method_invocation_return_error (invocation,
++                                             UDISKS_ERROR,
++                                             UDISKS_ERROR_FAILED,
++                                             "Error opening %s: %m",
++                                             udisks_block_get_device (block));
++      goto out;
++    }
++  if (!send_scsi_start_stop_command_sync (fd, &error))
++    {
++      udisks_warning ("Ignoring SCSI command START STOP UNIT failure (%s) on %s",
++                      error->message,
++                      udisks_block_get_device (block));
++      g_clear_error (&error);
++    }
++  else
++    {
++      udisks_notice ("Powering off %s - successfully sent SCSI command START STOP UNIT",
++                     udisks_block_get_device (block));
++    }
++  if (close (fd) != 0)
++    {
++      g_dbus_method_invocation_return_error (invocation,
++                                             UDISKS_ERROR,
++                                             UDISKS_ERROR_FAILED,
++                                             "Error closing %s: %m",
++                                             udisks_block_get_device (block));
++      goto out;
++    }
++  fd = -1;
+ 
+-  /* TODO: Send the eject? Send SCSI START STOP UNIT? */
++  escaped_device = udisks_daemon_util_escape_and_quote (udisks_block_get_device (block));
+   device = udisks_linux_drive_object_get_device (object, TRUE /* get_hw */);
+   if (device == NULL)
+     {
+@@ -1405,10 +1564,20 @@ handle_power_off (UDisksDrive           *_drive,
+         }
+     }
+   fclose (f);
++  udisks_notice ("Powered off %s - successfully wrote to sysfs path %s",
++                 udisks_block_get_device (block),
++                 remove_path);
+ 
+   udisks_drive_complete_power_off (UDISKS_DRIVE (drive), invocation);
+ 
+  out:
++  if (fd != -1)
++    {
++      if (close (fd) != 0)
++        {
++          udisks_warning ("Error closing device: %m");
++        }
++    }
+   g_list_free_full (blocks_to_sync, g_object_unref);
+   g_list_free_full (sibling_objects, g_object_unref);
+   g_free (remove_path);
+diff --git a/src/udiskslinuxdriveata.c b/src/udiskslinuxdriveata.c
+index 48cc6e6..534ef4d 100644
+--- a/src/udiskslinuxdriveata.c
++++ b/src/udiskslinuxdriveata.c
+@@ -1943,7 +1943,7 @@ udisks_linux_drive_ata_secure_erase_sync (UDisksLinuxDriveAta     *drive,
+   /* First get the IDENTIFY data directly from the drive, for sanity checks */
+   {
+     /* ATA8: 7.16 IDENTIFY DEVICE - ECh, PIO Data-In */
+-    UDisksAtaCommandInput input = {.command = 0xec};
++    UDisksAtaCommandInput input = {.command = 0xec, .count = 1};
+     UDisksAtaCommandOutput output = {.buffer = identify.buf, .buffer_size = sizeof (identify.buf)};
+     if (!udisks_ata_send_command_sync (fd,
+                                        -1,
+diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c
+index 4c8d8aa..f243046 100644
+--- a/src/udiskslinuxfilesystem.c
++++ b/src/udiskslinuxfilesystem.c
+@@ -348,13 +348,16 @@ find_mount_options_for_fs (const gchar *fstype)
+ static gid_t
+ find_primary_gid (uid_t uid)
+ {
+-  struct passwd *pw;
++  struct passwd *pw = NULL;
++  struct passwd pwstruct;
++  gchar pwbuf[8192];
++  int rc;
+   gid_t gid;
+ 
+   gid = (gid_t) - 1;
+ 
+-  pw = getpwuid (uid);
+-  if (pw == NULL)
++  rc = getpwuid_r (uid, &pwstruct, pwbuf, sizeof pwbuf, &pw);
++  if (rc != 0 || pw == NULL)
+     {
+       udisks_warning ("Error looking up uid %d: %m", uid);
+       goto out;
+@@ -370,7 +373,10 @@ is_uid_in_gid (uid_t uid,
+                gid_t gid)
+ {
+   gboolean ret;
+-  struct passwd *pw;
++  struct passwd *pw = NULL;
++  struct passwd pwstruct;
++  gchar pwbuf[8192];
++  int rc;
+   static gid_t supplementary_groups[128];
+   int num_supplementary_groups = 128;
+   int n;
+@@ -379,8 +385,8 @@ is_uid_in_gid (uid_t uid,
+ 
+   ret = FALSE;
+ 
+-  pw = getpwuid (uid);
+-  if (pw == NULL)
++  rc = getpwuid_r (uid, &pwstruct, pwbuf, sizeof pwbuf, &pw);
++  if (rc != 0 || pw == NULL)
+     {
+       udisks_warning ("Error looking up uid %d: %m", uid);
+       goto out;
+diff --git a/src/udisksspawnedjob.c b/src/udisksspawnedjob.c
+index 802551f..b181933 100644
+--- a/src/udisksspawnedjob.c
++++ b/src/udisksspawnedjob.c
+@@ -371,22 +371,25 @@ static void
+ child_setup (gpointer user_data)
+ {
+   UDisksSpawnedJob *job = UDISKS_SPAWNED_JOB (user_data);
+-  struct passwd *pw;
++  struct passwd pwstruct;
++  gchar pwbuf[8192];
++  struct passwd *pw = NULL;
++  int rc;
+   gid_t egid;
+ 
+   if (job->run_as_uid == getuid () && job->run_as_euid == geteuid ())
+     goto out;
+ 
+-  pw = getpwuid (job->run_as_euid);
+-  if (pw == NULL)
++  rc = getpwuid_r (job->run_as_euid, &pwstruct, pwbuf, sizeof pwbuf, &pw);
++  if (rc != 0 || pw == NULL)
+    {
+      g_printerr ("No password record for uid %d: %m\n", (gint) job->run_as_euid);
+      abort ();
+    }
+   egid = pw->pw_gid;
+ 
+-  pw = getpwuid (job->run_as_uid);
+-  if (pw == NULL)
++  rc = getpwuid_r (job->run_as_uid, &pwstruct, pwbuf, sizeof pwbuf, &pw);
++  if (rc != 0 || pw == NULL)
+    {
+      g_printerr ("No password record for uid %d: %m\n", (gint) job->run_as_uid);
+      abort ();
+diff --git a/tools/udisksctl.c b/tools/udisksctl.c
+index 97b0f17..c87fe9f 100644
+--- a/tools/udisksctl.c
++++ b/tools/udisksctl.c
+@@ -1691,6 +1691,12 @@ handle_command_loop (gint        *argc,
+           goto out;
+         }
+ 
++      if (udisks_object_peek_loop (object) == NULL)
++        {
++          g_printerr ("Error: specified object is not a loop device\n");
++          goto out;
++        }
++
+     delete_try_again:
+       error = NULL;
+       if (!udisks_loop_call_delete_sync (udisks_object_peek_loop (object),
+@@ -2009,6 +2015,238 @@ handle_command_smart_simulate (gint        *argc,
+ 
+ /* ---------------------------------------------------------------------------------------------------- */
+ 
++static gchar   *opt_power_off_object_path = NULL;
++static gchar   *opt_power_off_device = NULL;
++static gboolean opt_power_off_no_user_interaction = FALSE;
++
++static const GOptionEntry command_power_off_entries[] =
++{
++  {
++    "object-path",
++    'p',
++    0,
++    G_OPTION_ARG_STRING,
++    &opt_power_off_object_path,
++    "Object path for ATA device",
++    NULL
++  },
++  {
++    "block-device",
++    'b',
++    0,
++    G_OPTION_ARG_STRING,
++    &opt_power_off_device,
++    "Device file for ATA device",
++    NULL
++  },
++  {
++    "no-user-interaction",
++    0, /* no short option */
++    0,
++    G_OPTION_ARG_NONE,
++    &opt_power_off_no_user_interaction,
++    "Do not authenticate the user if needed",
++    NULL
++  },
++  {
++    NULL
++  }
++};
++
++static gint
++handle_command_power_off (gint        *argc,
++                          gchar      **argv[],
++                          gboolean     request_completion,
++                          const gchar *completion_cur,
++                          const gchar *completion_prev)
++{
++  gint ret;
++  GOptionContext *o;
++  gchar *s;
++  gboolean complete_objects;
++  gboolean complete_devices;
++  GList *l;
++  GList *objects;
++  UDisksObject *object;
++  UDisksDriveAta *ata;
++  guint n;
++  GVariant *options;
++  GVariantBuilder builder;
++  GError *error;
++
++  ret = 1;
++  opt_power_off_object_path = NULL;
++  opt_power_off_device = NULL;
++  object = NULL;
++  options = NULL;
++
++  modify_argv0_for_command (argc, argv, "power-off");
++
++  o = g_option_context_new (NULL);
++  if (request_completion)
++    g_option_context_set_ignore_unknown_options (o, TRUE);
++  g_option_context_set_help_enabled (o, FALSE);
++  g_option_context_set_summary (o, "Safely power off a drive.");
++  g_option_context_add_main_entries (o,
++                                     command_power_off_entries,
++                                     NULL /* GETTEXT_PACKAGE*/);
++
++  complete_objects = FALSE;
++  if (request_completion && (g_strcmp0 (completion_prev, "--object-path") == 0 || g_strcmp0 (completion_prev, "-p") == 0))
++    {
++      complete_objects = TRUE;
++      remove_arg ((*argc) - 1, argc, argv);
++    }
++
++  complete_devices = FALSE;
++  if (request_completion && (g_strcmp0 (completion_prev, "--block-device") == 0 || g_strcmp0 (completion_prev, "-b") == 0))
++    {
++      complete_devices = TRUE;
++      remove_arg ((*argc) - 1, argc, argv);
++    }
++
++  if (!g_option_context_parse (o, argc, argv, NULL))
++    {
++      if (!request_completion)
++        {
++          s = g_option_context_get_help (o, FALSE, NULL);
++          g_printerr ("%s", s);
++          g_free (s);
++          goto out;
++        }
++    }
++
++  if (request_completion)
++    {
++      if ((opt_power_off_object_path == NULL && !complete_objects) &&
++          (opt_power_off_device == NULL && !complete_devices))
++        {
++          g_print ("--object-path \n"
++                   "--block-device \n");
++        }
++
++      if (complete_objects)
++        {
++          const gchar *object_path;
++          objects = g_dbus_object_manager_get_objects (udisks_client_get_object_manager (client));
++          for (l = objects; l != NULL; l = l->next)
++            {
++              object = UDISKS_OBJECT (l->data);
++              ata = udisks_object_peek_drive_ata (object);
++              if (ata != NULL)
++                {
++                  object_path = g_dbus_object_get_object_path (G_DBUS_OBJECT (object));
++                  g_assert (g_str_has_prefix (object_path, "/org/freedesktop/UDisks2/"));
++                  g_print ("%s \n", object_path + sizeof ("/org/freedesktop/UDisks2/") - 1);
++                }
++            }
++          g_list_foreach (objects, (GFunc) g_object_unref, NULL);
++          g_list_free (objects);
++        }
++
++      if (complete_devices)
++        {
++          objects = g_dbus_object_manager_get_objects (udisks_client_get_object_manager (client));
++          for (l = objects; l != NULL; l = l->next)
++            {
++              object = UDISKS_OBJECT (l->data);
++              ata = udisks_object_peek_drive_ata (object);
++              if (ata != NULL)
++                {
++                  const gchar * const *symlinks;
++                  UDisksBlock *block;
++                  block = udisks_client_get_block_for_drive (client, udisks_object_peek_drive (object), TRUE);
++                  g_print ("%s \n", udisks_block_get_device (block));
++                  symlinks = udisks_block_get_symlinks (block);
++                  for (n = 0; symlinks != NULL && symlinks[n] != NULL; n++)
++                    g_print ("%s \n", symlinks[n]);
++                }
++            }
++          g_list_foreach (objects, (GFunc) g_object_unref, NULL);
++          g_list_free (objects);
++        }
++      goto out;
++    }
++
++  g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
++  if (opt_power_off_no_user_interaction)
++    {
++      g_variant_builder_add (&builder,
++                             "{sv}",
++                             "auth.no_user_interaction", g_variant_new_boolean (TRUE));
++    }
++  options = g_variant_builder_end (&builder);
++  g_variant_ref_sink (options);
++
++  if (opt_power_off_object_path != NULL)
++    {
++      object = lookup_object_by_path (opt_power_off_object_path);
++      if (object == NULL)
++        {
++          g_printerr ("Error looking up object with path %s\n", opt_power_off_object_path);
++          goto out;
++        }
++    }
++  else if (opt_power_off_device != NULL)
++    {
++      UDisksObject *block_object;
++      UDisksDrive *drive;
++      block_object = lookup_object_by_device (opt_power_off_device);
++      if (block_object == NULL)
++        {
++          g_printerr ("Error looking up object for device %s\n", opt_power_off_device);
++          goto out;
++        }
++      drive = udisks_client_get_drive_for_block (client, udisks_object_peek_block (block_object));
++      object = (UDisksObject *) g_dbus_interface_dup_object (G_DBUS_INTERFACE (drive));
++      g_object_unref (block_object);
++    }
++  else
++    {
++      s = g_option_context_get_help (o, FALSE, NULL);
++      g_printerr ("%s", s);
++      g_free (s);
++      goto out;
++    }
++
++ try_again:
++  error = NULL;
++  if (!udisks_drive_call_power_off_sync (udisks_object_peek_drive (object),
++                                         options,
++                                         NULL,                       /* GCancellable */
++                                         &error))
++    {
++      if (error->domain == UDISKS_ERROR &&
++          error->code == UDISKS_ERROR_NOT_AUTHORIZED_CAN_OBTAIN &&
++          setup_local_polkit_agent ())
++        {
++          g_error_free (error);
++          goto try_again;
++        }
++      g_dbus_error_strip_remote_error (error);
++      g_printerr ("Error powering off drive: %s (%s, %d)\n",
++                  error->message, g_quark_to_string (error->domain), error->code);
++      g_clear_error (&error);
++      g_object_unref (object);
++      goto out;
++    }
++
++  g_object_unref (object);
++
++
++  ret = 0;
++
++ out:
++  if (options != NULL)
++    g_variant_unref (options);
++  g_option_context_free (o);
++  g_free (opt_power_off_object_path);
++  g_free (opt_power_off_device);
++  return ret;
++}
++
++/* ---------------------------------------------------------------------------------------------------- */
++
+ static gchar *opt_info_object = NULL;
+ static gchar *opt_info_device = NULL;
+ static gchar *opt_info_drive = NULL;
+@@ -2855,6 +3093,7 @@ usage (gint *argc, gchar **argv[], gboolean use_stdout)
+                        "  lock            Lock an encrypted device\n"
+                        "  loop-setup      Set-up a loop device\n"
+                        "  loop-delete     Delete a loop device\n"
++                       "  power-off       Safely power off a drive\n"
+                        "  smart-simulate  Set SMART data for a drive\n"
+                        "\n"
+                        "Use \"%s COMMAND --help\" to get help on each command.\n",
+@@ -3053,6 +3292,15 @@ main (int argc,
+                                            completion_prev);
+       goto out;
+     }
++  else if (g_strcmp0 (command, "power-off") == 0)
++    {
++      ret = handle_command_power_off (&argc,
++                                      &argv,
++                                      request_completion,
++                                      completion_cur,
++                                      completion_prev);
++      goto out;
++    }
+   else if (g_strcmp0 (command, "dump") == 0)
+     {
+       ret = handle_command_dump (&argc,
+@@ -3156,6 +3404,7 @@ main (int argc,
+                    "unlock \n"
+                    "loop-setup \n"
+                    "loop-delete \n"
++                   "power-off \n"
+                    "smart-simulate \n"
+                    );
+           ret = 0;
diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD
index d7a85848c..3af353bf0 100644
--- a/extra/v4l-utils/PKGBUILD
+++ b/extra/v4l-utils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 196834 2013-10-20 12:03:29Z thomas $
+# $Id: PKGBUILD 204968 2014-02-02 11:52:21Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=v4l-utils
-pkgver=1.0.0
-pkgrel=2
+pkgver=1.0.1
+pkgrel=1
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://freshmeat.net/projects/libv4l"
+url="http://linuxtv.org/"
 provides=("libv4l=$pkgver")
 replaces=('libv4l')
 conflicts=('libv4l')
@@ -16,7 +16,7 @@ optdepends=('qt4')
 depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo')
 source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2
         http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc)
-sha256sums=('1de3882099e04e89e354675ee408b82c8ac8afd3ca6ab27ea321771901285f30'
+sha256sums=('fc0132e82a18dfad9619be3abf50c206e2f449b1c14440cde36f25874fdce7df'
             'SKIP')
 
 build() {
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index 2a0fc272e..59ac68fa4 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -1,20 +1,26 @@
-# $Id: PKGBUILD 199307 2013-11-10 08:38:12Z allan $
+# $Id: PKGBUILD 205617 2014-02-10 03:08:14Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=valgrind
 pkgver=3.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool to help find memory-management problems in programs"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://valgrind.org/"
-depends=('glibc>=2.18' 'glibc<2.19' 'perl')
+depends=('glibc>=2.19' 'glibc<2.20' 'perl')
 makedepends=('gdb')
 options=('staticlibs' '!emptydirs')
-source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('0947de8112f946b9ce64764af7be6df2')
+source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
+        valgrind-3.9.0-glibc-2.19.patch)
+md5sums=('0947de8112f946b9ce64764af7be6df2'
+         '21020338ad5a93e6f9694946183e8835')
 
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p1 -i $srcdir/valgrind-3.9.0-glibc-2.19.patch
+}
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/valgrind/valgrind-3.9.0-glibc-2.19.patch b/extra/valgrind/valgrind-3.9.0-glibc-2.19.patch
new file mode 100644
index 000000000..79a3283c9
--- /dev/null
+++ b/extra/valgrind/valgrind-3.9.0-glibc-2.19.patch
@@ -0,0 +1,37 @@
+diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure
+--- valgrind-3.9.0-orig/configure	2013-11-01 09:33:32.000000000 +1000
++++ valgrind-3.9.0/configure	2014-02-08 09:28:06.063248544 +1000
+@@ -6689,6 +6689,16 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.19)
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5
++$as_echo "2.19 family" >&6; }
++
++$as_echo "#define GLIBC_2_19 1" >>confdefs.h
++
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      darwin)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
+ $as_echo "Darwin" >&6; }
+diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac
+--- valgrind-3.9.0-orig/configure.ac	2013-11-01 09:28:16.000000000 +1000
++++ valgrind-3.9.0/configure.ac	2014-02-08 09:27:38.870385366 +1000
+@@ -918,6 +918,13 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.19)
++	AC_MSG_RESULT(2.19 family)
++	AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x])
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      darwin)
+ 	AC_MSG_RESULT(Darwin)
+ 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
diff --git a/extra/vcdimager/PKGBUILD b/extra/vcdimager/PKGBUILD
index c31bd530a..b406c2834 100644
--- a/extra/vcdimager/PKGBUILD
+++ b/extra/vcdimager/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197455 2013-10-26 06:55:11Z eric $
+# $Id: PKGBUILD 204425 2014-01-19 16:28:58Z bpiotrowski $
 # Maintainer: damir <damir@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=vcdimager
 pkgver=0.7.24
-pkgrel=4
+pkgrel=5
 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/"
diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD
index e4fa0f68c..7e24b4ab6 100644
--- a/extra/vice/PKGBUILD
+++ b/extra/vice/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 191927 2013-08-01 07:00:00Z bpiotrowski $
+# $Id: PKGBUILD 205562 2014-02-07 16:53:54Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=vice
 pkgver=2.4
-pkgrel=4
+pkgrel=5
 pkgdesc="The Versatile Commodore 8-bit Emulator"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-url="http://www.viceteam.org/"
+url="http://vice-emu.sourceforge.net/"
 depends=('alsa-lib' 'giflib' 'libxxf86vm' 'vte' 'libnet' 'libpcap')
 makedepends=('xorg-font-utils')
 options=('!makeflags')
diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD
index b2fb1429e..eacbd4ab4 100644
--- a/extra/vigra/PKGBUILD
+++ b/extra/vigra/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 201267 2013-12-07 10:35:07Z bpiotrowski $
+# $Id: PKGBUILD 203179 2014-01-04 22:17:15Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
-pkgver=1.9.0
-pkgrel=8
+pkgver=1.10.0
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hci.iwr.uni-heidelberg.de/vigra/"
 license=('custom:MIT')
@@ -13,8 +13,8 @@ makedepends=(# runtime deps
              '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')
+source=(https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/${pkgname}-${pkgver}-src-with-docu.tar.gz)
+md5sums=('85e2968e4ee5f9541b5dd8b3fb9cc433')
 
 build() {
   cd "${srcdir}"/${pkgbase}-${pkgver}
@@ -26,10 +26,10 @@ build() {
   make
 }
 
-check() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make -k check || /bin/true # i686 fails
-}
+#check() {
+#  cd "${srcdir}"/${pkgname}-${pkgver}
+#  make -j1 -k check #|| /bin/true # i686 fails
+#}
 
 package_vigra() {
   pkgdesc="Computer vision library"
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
deleted file mode 100644
index 1f59b65e5..000000000
--- a/extra/vim/PKGBUILD
+++ /dev/null
@@ -1,227 +0,0 @@
-# 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>
-
-pkgbase=vim
-pkgname=('vim' 'gvim' 'vim-runtime')
-_topver=7.4
-_patchlevel=86
-__hgrev=f6940759212d
-_versiondir="vim${_topver//./}"
-pkgver=${_topver}.${_patchlevel}
-pkgrel=1
-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'
-        'archlinux.vim'
-        'gvim.desktop')
-md5sums=('436d4d3c6402ce20309bf2cdedce63c0'
-         'SKIP'
-         'b9d4dcb9d3ee2e151dc4be1e94934f6a'
-         '10353a61aadc3f276692d0e17db1478e'
-         'd90413bd21f400313a785bb4010120cd')
-
-# source PKGBUILD && mksource
-mksource() {
-  [[ -x /usr/bin/hg ]] || (echo "hg not found. Install mercurial." && return 1)
-
-  __hgroot='http://vim.googlecode.com/hg/'
-  __hgrepo='vim'
-  __hgbranch='default'
-
-  hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo}
-
-  pushd ${__hgrepo}
-  if (( $(hg id -n) < $(hg id -nr ${__hgbranch}) )); then
-    printf 'You are not building the latest revision!\n'
-    printf "Consider updating __hgrev to $(hg id -r ${__hgbranch}).\n"
-  fi
-  popd
-
-  mv vim ${pkgname}-${pkgver}
-  find ${pkgname}-${pkgver} -depth -type d -name .hg -exec rm -rf {} \;
-  rm ${pkgname}-${pkgver}/{.hgignore,.hgtags}
-  tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
-  rm -r ${pkgname}-${pkgver}
-
-  gpg --detach-sign ${pkgname}-${pkgver}.tar.xz
-
-  scp ${pkgname}-${pkgver}.tar.xz nym:/srv/ftp/other/vim/
-  scp ${pkgname}-${pkgver}.tar.xz.sig nym:/srv/ftp/other/vim/
-}
-
-build() {
-  cp -a ${pkgname}-${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)
-
-  cp -a vim-build gvim-build
-
-  cd "${srcdir}"/vim-build
-
-  ./configure \
-    --prefix=/usr \
-    --localstatedir=/var/lib/vim \
-    --with-features=huge \
-    --with-compiledby=Parabola \
-    --enable-gpm \
-    --enable-acl \
-    --with-x=no \
-    --disable-gui \
-    --enable-multibyte \
-    --enable-cscope \
-    --disable-netbeans \
-    --enable-perlinterp \
-    --disable-pythoninterp \
-    --disable-python3interp \
-    --disable-rubyinterp \
-    --disable-luainterp
-
-  make
-
-  cd "${srcdir}"/gvim-build
-
-  ./configure \
-    --prefix=/usr \
-    --localstatedir=/var/lib/vim \
-    --with-features=huge \
-    --with-compiledby=Parabola \
-    --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
-}
-
-check() {
-  # disable tests because they seem to freeze
-
-  cd "${srcdir}"/vim-build
-
-  #make test
-
-  cd "${srcdir}"/gvim-build
-
-  #make test
-}
-
-package_vim() {
-  pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm')
-  conflicts=('gvim')
-
-  cd "${srcdir}"/vim-build
-  make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
-
-  # provided by (n)vi in core
-  rm "${pkgdir}"/usr/bin/{ex,view}
-
-  # delete some manpages
-  find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
-    while read _mandir; do
-    cd ${_mandir}
-    rm -f ex.1 view.1 # provided by (n)vi
-    rm -f evim.1    # this does not make sense if we have no GUI
-  done
-
-  # Runtime provided by runtime package
-  rm -r "${pkgdir}"/usr/share/vim
-
-  # license
-  install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
-    "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
-}
-
-package_gvim() {
-  pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt'
-           'desktop-file-utils' 'gtk2' 'lua' 'python2')
-  provides=("vim=${pkgver}-${pkgrel}")
-  conflicts=('vim')
-  install=gvim.install
-
-  cd "${srcdir}"/gvim-build
-  make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
-
-  # provided by (n)vi in core
-  rm "${pkgdir}"/usr/bin/{ex,view}
-
-  # delete some manpages
-  find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
-    while read _mandir; do
-    cd ${_mandir}
-    rm -f ex.1 view.1 # provided by (n)vi
-  done
-
-  # Move the runtime for later packaging
-  mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install
-
-  # freedesktop links
-  install -Dm644 "${srcdir}"/gvim.desktop \
-    "${pkgdir}"/usr/share/applications/gvim.desktop
-  install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png
-
-  # license
-   install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
-    "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
-}
-
-package_vim-runtime() {
-  pkgdesc='Runtime for vim and gvim'
-  depends=('perl' 'gawk')
-  backup=('etc/vimrc')
-
-  # Install the runtime split from gvim
-  install -dm755 "${pkgdir}"/usr/share
-  mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim
-
-  # Don't forget logtalk.dict
-  install -Dm644 "${srcdir}"/gvim-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}"/archlinux.vim \
-    "${pkgdir}"/usr/share/vim/vimfiles/archlinux.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/extra/vim/archlinux.vim b/extra/vim/archlinux.vim
deleted file mode 100644
index 148bb930f..000000000
--- a/extra/vim/archlinux.vim
+++ /dev/null
@@ -1,26 +0,0 @@
-" The ArchLinux global vimrc - setting only a few sane defaults
-"
-" Maintainer:      Tobias Kieslich [tobias funnychar archlinux dot org]
-"
-" 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/extra/vim/gvim.desktop b/extra/vim/gvim.desktop
deleted file mode 100644
index 675357da5..000000000
--- a/extra/vim/gvim.desktop
+++ /dev/null
@@ -1,63 +0,0 @@
-[Desktop Entry]
-Name=Vi IMproved
-Name[bg]=Vi Ðåäàêòîð
-Name[ca]=Vi Millorat
-Name[da]=Vi forbedret
-Name[eo]=VIM
-Name[et]=Täiustatud Vi (vim)
-Name[fr]=Vi étendu (VIM)
-Name[he]=רפושמ Vi
-Name[hu]=Vi
-Name[is]=Vi IMproved ritillinn
-Name[it]=Vi iMproved
-Name[no]=Vi IMproved (forbedret VI)
-Name[pl]=Poprawiony VI (vim)
-Name[ro]=VIM
-Name[ru]=Улучшенный VI
-Name[sk]=Vi IMpreved
-Name[sl]=Izboljšani vi (vim)
-Name[sv]=Förbättrad Vi
-Name[zh_CN.GB2312]=改进的 Vi
-Comment=Powerful text editor with scripting functions and macro recorder
-Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè
-Comment[ca]=Editor vi potent
-Comment[cs]=Mocný textový editor vi
-Comment[da]=En kraftig vi tekstbehandler
-Comment[de]=Ein leistungsfähiger vi-Editor
-Comment[el]=Πανίσχυρος διορθωτής vi
-Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn
-Comment[es]=Una versión mejorada del editor vi
-Comment[et]=Võimas tekstiredaktor vi
-Comment[fi]=Tehokas vi-tekstieditori
-Comment[fr]=Éditeur vi puissant
-Comment[gl]=Potente editor vi
-Comment[he]=Vi המצועה בר ךרועה
-Comment[hr]=Napredni vi uređivač
-Comment[hu]=Vi szövegszerkesztő
-Comment[is]=Öflug útgáfa vi ritilsins
-Comment[it]=Un editor vi potenziato
-Comment[ja]=強力なViエディタ
-Comment[lt]=Galingas vi redaktorius
-Comment[mk]=Моќен VI уредувач
-Comment[nl]=Krachtige vi-editor
-Comment[no]=En kraftig vi-redigerer
-Comment[no_NY]=Kraftig vi-tekstredigeringsprogram
-Comment[pl]=Edytor vi
-Comment[pt]=Um poderoso editor de texto
-Comment[ro]=Un editor de texte VI, puternic
-Comment[ru]=Мощный текстовый редактор vi
-Comment[sk]=Silný textový procesor vi
-Comment[sl]=Zmogljivi urejevalnik vi
-Comment[sr]=Moćni vi editor
-Comment[sv]=En kraftfull texteditor
-Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷
-Comment[tr]=Güçlü vi düzenleyicisi
-Comment[uk]=Потужний редактор vi
-Comment[zh_CN.GB2312]=功能强大的 vi 编辑器
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=gvim -f %F
-Icon=gvim
-Type=Application
-Terminal=false
-X-XClassHintResName=VIM
-Categories=Utility;TextEditor;
diff --git a/extra/vim/gvim.install b/extra/vim/gvim.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/extra/vim/gvim.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/extra/vim/vimrc b/extra/vim/vimrc
deleted file mode 100644
index 3642e25c9..000000000
--- a/extra/vim/vimrc
+++ /dev/null
@@ -1,16 +0,0 @@
-" All system-wide defaults are set in $VIMRUNTIME/archlinux.vim (usually just
-" /usr/share/vim/vimfiles/archlinux.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 archlinux.vim will be overwritten
-" everytime an upgrade of the vim packages is performed.  It is recommended to
-" make changes after sourcing archlinux.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! archlinux.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/extra/vino/PKGBUILD b/extra/vino/PKGBUILD
index 28686520c..c2dca6ce6 100644
--- a/extra/vino/PKGBUILD
+++ b/extra/vino/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 196510 2013-10-14 15:43:19Z heftig $
+# $Id: PKGBUILD 203593 2014-01-13 17:12:26Z andyrtr $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=vino
 pkgver=3.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="a VNC server for the GNOME desktop"
 arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
diff --git a/extra/visualvm/PKGBUILD b/extra/visualvm/PKGBUILD
index b75f938f5..3add21de3 100644
--- a/extra/visualvm/PKGBUILD
+++ b/extra/visualvm/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Kristof JOZSA <kristof.jozsa@gmail.com>
 pkgname=visualvm
-pkgver=1.3.6
+pkgver=1.3.7
 _shortver=${pkgver//\./}
-pkgrel=3
+pkgrel=1
 pkgdesc='Visual tool integrating several commandline JDK tools and lightweight profiling capabilities'
 arch=('i686' 'x86_64')
 url='http://visualvm.java.net/'
@@ -12,7 +12,7 @@ depends=('java-environment')
 source=("https://java.net/projects/${pkgname}/downloads/download/release${_shortver}/${pkgname}_${_shortver}.zip"
         'visualvm.desktop'
         'icon.png')
-sha256sums=('317f65b3fed7ea25638b6d35c6f95642b5662453b7841a9d32aac3cf3ff59616'
+sha256sums=('b8ff7762d9f8bb940bab6ec2ec890657682adf85d833e7e89e9cc4feda717b53'
             'e820807e8d78446cf156a3947d97856e24865bb0d8c957e9ce2fed309c737441'
             '452fbd85c968ec7176c5894bc4106b7e25310314d44278d807510675b6a5c864')
 
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 7b00b5e82..36bf19617 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 201400 2013-12-10 17:02:18Z giovanni $
+# $Id: PKGBUILD 205478 2014-02-05 18:23:46Z giovanni $
 # 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.2
+pkgver=2.1.3
 pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64' 'mips64el')
@@ -60,7 +60,7 @@ options=('!emptydirs')
 install=vlc.install
 source=("http://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
         'vlc-2.0.7-vaapi-compat.patch')
-md5sums=('fb6787ad749aadcfaeab3471939b3426'
+md5sums=('56a489d093ffef9aa29809116985adba'
          '6df10774bb7acf20e09d6139e5c7839e')
 
 prepare() {
diff --git a/extra/vpnc/PKGBUILD b/extra/vpnc/PKGBUILD
index b9f449d4a..c3a4aba3c 100644
--- a/extra/vpnc/PKGBUILD
+++ b/extra/vpnc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185907 2013-05-19 18:45:48Z dreisner $
+# $Id: PKGBUILD 203595 2014-01-13 17:12:30Z andyrtr $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
@@ -6,7 +6,7 @@ pkgname=vpnc
 _vpncver=0.5.3
 _git=d2c5a77f3f0ea6ad80fc59158127d63ede81a6cb
 pkgver=$_vpncver.svn527
-pkgrel=1
+pkgrel=2
 pkgdesc="VPN client for cisco3000 VPN Concentrators"
 url="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
 license=('GPL')
diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD
index 2928796cf..2791d52e9 100644
--- a/extra/wayland/PKGBUILD
+++ b/extra/wayland/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198481 2013-10-30 15:07:38Z allan $
+# $Id: PKGBUILD 204641 2014-01-24 14:01:34Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Sébastien Luttringer
 # Contributor: Joel Teichroeb <joel@teichroeb.net>
 
 pkgname=wayland
-pkgver=1.3.0
+pkgver=1.4.0
 pkgrel=1
 pkgdesc='A computer display server protocol'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('MIT')
 depends=('libffi' 'expat')
 makedepends=('doxygen')
 source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz")
-sha1sums=('febbbfc8d76ed0b2157077d50cb6e5ceb1aa47de')
+sha1sums=('bc91befb8386ec5c1ff4f24ad8464c24a7496ae2')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
index 8da5919dd..4d4f15edf 100644
--- a/extra/webkitgtk/PKGBUILD
+++ b/extra/webkitgtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 200757 2013-12-04 18:15:50Z heftig $
+# $Id: PKGBUILD 205028 2014-02-03 10:02:58Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=webkitgtk
-pkgver=2.2.3
-pkgrel=1
+pkgver=2.2.4
+pkgrel=2
 pkgdesc="GTK+ Web content engine library"
 arch=(i686 x86_64 mips64el)
 url="http://webkitgtk.org/"
@@ -17,7 +17,7 @@ conflicts=(webkitgtk3 libwebkit3)
 replaces=(webkitgtk3 libwebkit3)
 options=(!emptydirs)
 source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz)
-sha256sums=('94bcb3303aadce8454b572ab0e5d178eca3b7238f34bd3e7177b0daec04e4605')
+sha256sums=('5e1aee1bfca3602cb02920d6984c584c775c661b30c33955e35ff9a21b4c4d74')
 
 prepare() {
   cd $pkgbase-$pkgver
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index 74a7bede6..421b6de6d 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 200241 2013-11-23 18:13:47Z giovanni $
+# $Id: PKGBUILD 205822 2014-02-10 17:52:42Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: lucke <lucke at o2 dot pl>
 
 pkgname=weechat
-pkgver=0.4.2
-pkgrel=2
+pkgver=0.4.3
+pkgrel=1
 pkgdesc="Fast, light and extensible IRC client (curses UI)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.weechat.org/"
@@ -13,7 +13,7 @@ depends=('gnutls' 'curl' 'libgcrypt')
 makedepends=('asciidoc' 'source-highlight' 'cmake' 'pkg-config' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile')
 optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile')
 source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('fbbb4c319474d4a3b123fea7e8402fa2')
+md5sums=('07500f0d1054691d88f21dd12b7c5871')
 
 prepare() {
   mkdir build
diff --git a/extra/wget/PKGBUILD b/extra/wget/PKGBUILD
index a4518a5fe..4a0476677 100644
--- a/extra/wget/PKGBUILD
+++ b/extra/wget/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 195268 2013-09-29 17:27:18Z eric $
+# $Id: PKGBUILD 204439 2014-01-19 20:56:35Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=wget
-pkgver=1.14
-pkgrel=3
+pkgver=1.15
+pkgrel=1
 pkgdesc="A network utility to retrieve files from the Web"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/wget/wget.html"
@@ -13,15 +13,12 @@ checkdepends=('perl-http-daemon' 'perl-io-socket-ssl')
 optdepends=('ca-certificates: HTTPS downloads')
 backup=('etc/wgetrc')
 install=wget.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
-        wget-pod-fixes.patch)
-sha1sums=('cfa0906e6f72c1c902c29b52d140c22ecdcd617e'
-          'SKIP'
-          'aae4be72657c7a8e9dbedb7109cd2d8562a325d2')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+sha1sums=('e9fb1d25fa04f9c69e74e656a3174dca02700ba1'
+          'SKIP')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/wget-pod-fixes.patch"
   cat >> doc/sample.wgetrc <<EOF
 
 # default root certs location
@@ -30,17 +27,17 @@ EOF
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc --enable-nls
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-nls --with-ssl=openssl
   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/wget/wget-pod-fixes.patch b/extra/wget/wget-pod-fixes.patch
deleted file mode 100644
index 54e985624..000000000
--- a/extra/wget/wget-pod-fixes.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Naur wget-1.14.orig/doc/wget.texi wget-1.14.new/doc/wget.texi
---- wget-1.14.orig/doc/wget.texi	2012-08-04 02:41:52.000000000 -0600
-+++ wget-1.14.new/doc/wget.texi	2013-05-26 11:18:52.986107183 -0600
-@@ -876,7 +876,7 @@
- actions of one.
- 
- @cindex proxy
--@itemx --no-proxy
-+@item --no-proxy
- Don't use proxies, even if the appropriate @code{*_proxy} environment
- variable is defined.
- 
-@@ -977,7 +977,7 @@
- whose encoding does not match the one used locally.
- 
- @cindex IPv6
--@itemx -4
-+@item -4
- @itemx --inet4-only
- @itemx -6
- @itemx --inet6-only
-@@ -2106,32 +2106,32 @@
- 
- 
- @table @asis
--@item 0
-+@item C<0>
- No problems occurred.
- 
--@item 1
-+@item C<1>
- Generic error code.
- 
--@item 2
-+@item C<2>
- Parse error---for instance, when parsing command-line options, the
- @samp{.wgetrc} or @samp{.netrc}...
- 
--@item 3
-+@item C<3>
- File I/O error.
- 
--@item 4
-+@item C<4>
- Network failure.
- 
--@item 5
-+@item C<5>
- SSL verification failure.
- 
--@item 6
-+@item C<6>
- Username/password authentication failure.
- 
--@item 7
-+@item C<7>
- Protocol errors.
- 
--@item 8
-+@item C<8>
- Server issued an error response.
- @end table
- 
-@@ -3094,7 +3094,7 @@
- Change setting of passive @sc{ftp}, equivalent to the
- @samp{--passive-ftp} option.
- 
--@itemx password = @var{string}
-+@item password = @var{string}
- Specify password @var{string} for both @sc{ftp} and @sc{http} file retrieval. 
- This command can be overridden using the @samp{ftp_password} and 
- @samp{http_password} command for @sc{ftp} and @sc{http} respectively.
-@@ -3605,7 +3605,7 @@
- may be specified from within Wget itself.
- 
- @table @samp
--@itemx --no-proxy
-+@item --no-proxy
- @itemx proxy = on/off
- This option and the corresponding command may be used to suppress the
- use of proxy, even if the appropriate environment variables are set.
diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD
index 50e76ef90..8d2b5f25e 100644
--- a/extra/whois/PKGBUILD
+++ b/extra/whois/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 199908 2013-11-18 18:15:18Z giovanni $
+# $Id: PKGBUILD 205600 2014-02-08 18:07:53Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=whois
-pkgver=5.0.26
-pkgrel=2
+pkgver=5.1.1
+pkgrel=1
 pkgdesc="The whois client by Marco d'Itri"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linux.it/~md/software/"
@@ -13,7 +13,7 @@ depends=('libidn')
 makedepends=('perl')
 backup=('etc/whois.conf')
 source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz")
-md5sums=('236829eea77e85df2443a54815a1b41d')
+md5sums=('aa4561134a03e22e2d759748ca676a97')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/wildmidi/PKGBUILD b/extra/wildmidi/PKGBUILD
index bcdb6e326..45347b8f3 100644
--- a/extra/wildmidi/PKGBUILD
+++ b/extra/wildmidi/PKGBUILD
@@ -3,25 +3,28 @@
 # Contributor: Panagiotis Papadopoulos
 
 pkgname=wildmidi
-pkgver=0.2.3.5
-pkgrel=2.1
+pkgver=0.3.2
+pkgrel=1
 pkgdesc='Open Source MIDI Synthesizer'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://wildmidi.sourceforge.net/'
+url="http://www.mindwerks.net/projects/wildmidi/"
 license=('LGPL3')
 depends=('alsa-lib')
-options=(!makeflags)
-source=(http://sourceforge.net/projects/wildmidi/files/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('44583c95fd67761f8cd6275fd1c312f2')
+makedepends=('cmake')
+source=(https://github.com/psi29a/wildmidi/archive/wildmidi-${pkgver}.tar.gz)
+md5sums=('9fda0b9d5290af9516e2da576103fab8')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  mkdir build
+}
 
-  ./configure --prefix=/usr --disable-werror
+build() {
+  cd build
+  cmake -D CMAKE_INSTALL_PREFIX=/usr ../$pkgname-$pkgname-$pkgver
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD
index a8c56ff10..5cad5a884 100644
--- a/extra/windowmaker/PKGBUILD
+++ b/extra/windowmaker/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 199951 2013-11-20 10:48:41Z allan $
+# $Id: PKGBUILD 204765 2014-01-26 14:35:19Z andyrtr $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=windowmaker
 pkgver=0.95.5
-pkgrel=2
+pkgrel=3
 pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.windowmaker.org/"
@@ -21,6 +21,15 @@ prepare() {
   cd WindowMaker-$pkgver
   patch -Np0 -i ../wm-giflib.patch
   autoreconf -fi
+  
+  # fix some paths FS#3080 - ckeck also Gentoo ebuild
+  for file in WindowMaker/*menu* util/wmgenmenu.c; do
+ 	if [[ -r $file ]] ; then
+ 	sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:/usr/lib/GNUstep/Applications/WPrefs.app:g;" "$file"
+ 	sed -i -e "s:/usr/local/share/WindowMaker:/usr/share/WindowMaker:g;" "$file"
+ 	sed -i -e "s:/opt/share/WindowMaker:/usr/share/WindowMaker:g;" "$file"
+ 	fi;
+  done;
 }
 
 build() {
diff --git a/extra/wxgtk/PKGBUILD b/extra/wxgtk/PKGBUILD
index 741d5601c..269510413 100644
--- a/extra/wxgtk/PKGBUILD
+++ b/extra/wxgtk/PKGBUILD
@@ -1,33 +1,32 @@
-# $Id: PKGBUILD 184450 2013-05-06 19:40:13Z foutrelis $
+# $Id: PKGBUILD 203497 2014-01-11 20:07:13Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=wxgtk
-pkgver=2.8.12.1
-pkgrel=5
+pkgver=3.0.0
+pkgrel=2
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wxwidgets.org"
 license=('custom:wxWindows')
-depends=('gtk2' 'gstreamer0.10-base' 'sdl')
-makedepends=('gstreamer0.10-base-plugins' 'gconf')
-#source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
-source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
-sha1sums=('05688dc03d61631750f5904273122bb40a2115f5')
+depends=('gtk2' 'gstreamer0.10-base')
+makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2' 'glu')
+optdepends=('webkitgtk2: for webview support')
+options=('!emptydirs')
+source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2)
+sha1sums=('756a9c54d1f411e262f03bacb78ccef085a9880a')
 
 build() {
-  cd wx*-${pkgver}
+  cd wxWidgets-${pkgver}
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
-    --enable-graphics_ctx  --disable-optimize --enable-mediactrl --with-regex=builtin \
+    --enable-graphics_ctx --enable-mediactrl --enable-webview --enable-stl --with-regex=builtin \
     --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
-    --with-sdl --disable-precomp-headers
+    --disable-precomp-headers
   make
   make -C locale allmo
-  make -C contrib/src
 }
 
 package() {
-  cd wx*-${pkgver}
+  cd wxWidgets-${pkgver}
   make DESTDIR="${pkgdir}" install
-  make -C contrib/src DESTDIR="${pkgdir}" install
   install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/wxgtk2.8/PKGBUILD b/extra/wxgtk2.8/PKGBUILD
new file mode 100644
index 000000000..a10905131
--- /dev/null
+++ b/extra/wxgtk2.8/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 203498 2014-01-11 20:07:14Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=wxgtk2.8
+pkgver=2.8.12.1
+pkgrel=1
+pkgdesc="GTK+ implementation of wxWidgets API for GUI"
+arch=('i686' 'x86_64')
+url="http://wxwidgets.org"
+license=('custom:wxWindows')
+depends=('gtk2' 'gstreamer0.10-base' 'sdl')
+makedepends=('gstreamer0.10-base-plugins' 'gconf' 'glu')
+options=('!emptydirs')
+source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 wxGTK-collision.patch)
+sha1sums=('05688dc03d61631750f5904273122bb40a2115f5'
+          '575fb4688051c246777988332f55703df403d6b9')
+
+prepare() {
+  cd wx*-${pkgver}
+  patch -p1 -i ../wxGTK-collision.patch
+}
+
+build() {
+  cd wx*-${pkgver}
+  ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
+    --enable-graphics_ctx  --disable-optimize --enable-mediactrl --with-regex=builtin \
+    --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
+    --with-sdl --disable-precomp-headers
+  make
+  make -C locale allmo
+  make -C contrib/src
+}
+
+package() {
+  cd wx*-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  make -C contrib/src DESTDIR="${pkgdir}" install
+  install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/extra/wxgtk2.8/wxGTK-collision.patch b/extra/wxgtk2.8/wxGTK-collision.patch
new file mode 100644
index 000000000..f6e02d876
--- /dev/null
+++ b/extra/wxgtk2.8/wxGTK-collision.patch
@@ -0,0 +1,82 @@
+diff -Naur wxPython-src-2.8.12.1.orig/build/bakefiles/wx.bkl wxPython-src-2.8.12.1/build/bakefiles/wx.bkl
+--- wxPython-src-2.8.12.1.orig/build/bakefiles/wx.bkl	2014-01-04 22:28:16.491774907 -0500
++++ wxPython-src-2.8.12.1/build/bakefiles/wx.bkl	2014-01-04 22:37:39.610020870 -0500
+@@ -128,7 +128,7 @@
+         <using module="gettext"/>
+         <gettext-catalogs id="locale">
+             <srcdir>$(SRCDIR)/locale</srcdir>
+-            <catalog-name>wxstd</catalog-name>
++            <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
+             <linguas>
+                 ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
+                 zh zh_CN zh_TW
+diff -Naur wxPython-src-2.8.12.1.orig/Makefile.in wxPython-src-2.8.12.1/Makefile.in
+--- wxPython-src-2.8.12.1.orig/Makefile.in	2014-01-04 22:28:16.545107766 -0500
++++ wxPython-src-2.8.12.1/Makefile.in	2014-01-04 22:40:27.191813403 -0500
+@@ -11695,10 +11695,11 @@
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+ 
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+-	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+-	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
++
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+-	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
++	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
++	for i in wx.bkl wx_unix.bkl wx_win32.bkl ; do \
++	$(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ 	for f in setup.h $(RCDEFS_H); do \
+ 	if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
+@@ -12455,7 +12456,8 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+-	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
++	&& $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+ 
+ locale_install: 
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -12463,7 +12465,8 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ 	if test -f $(srcdir)/locale/$$l.mo ; then \
+-	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo \
++	$(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ 	fi ; \
+ 	done
+ 
+@@ -12480,7 +12483,7 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ 	if test -f $(srcdir)/locale/msw/$$l.mo ; then \
+-	$(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \
++	$(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \
+ 	fi ; \
+ 	done
+ 
+diff -Naur wxPython-src-2.8.12.1.orig/src/common/intl.cpp wxPython-src-2.8.12.1/src/common/intl.cpp
+--- wxPython-src-2.8.12.1.orig/src/common/intl.cpp	2014-01-04 22:28:16.675106608 -0500
++++ wxPython-src-2.8.12.1/src/common/intl.cpp	2014-01-04 22:47:49.523526232 -0500
+@@ -1597,7 +1597,7 @@
+   bool bOk = true;
+   if ( bLoadDefault )
+   {
+-    bOk = AddCatalog(wxT("wxstd"));
++    bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION)));
+ 
+     // there may be a catalog with toolkit specific overrides, it is not
+     // an error if this does not exist
+diff -Naur wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in wxPython-src-2.8.12.1/utils/wxrc/Makefile.in
+--- wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in	2014-01-04 22:28:16.335109635 -0500
++++ wxPython-src-2.8.12.1/utils/wxrc/Makefile.in	2014-01-04 22:37:34.410068493 -0500
+@@ -120,7 +120,6 @@
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
+ 
+ @COND_USE_XRC_1@uninstall_wxrc: 
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD
index 133aedbcb..08bba3dc6 100644
--- a/extra/wxmaxima/PKGBUILD
+++ b/extra/wxmaxima/PKGBUILD
@@ -5,18 +5,19 @@
 
 pkgname=wxmaxima
 pkgver=13.04.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wxmaxima.sourceforge.net/"
 license=('GPL2')
-depends=('maxima' 'libxml2' 'wxgtk' 'shared-mime-info' 'desktop-file-utils')
+depends=('maxima' 'libxml2' 'wxgtk2.8' 'shared-mime-info' 'desktop-file-utils')
 source=(http://downloads.sourceforge.net/$pkgname/wxMaxima-$pkgver.tar.gz)
 install=wxmaxima.install
 sha1sums=('9508d3badb6c339f34e73e01c5065f679329a17c')
 
 build() {
   cd "${srcdir}/wxMaxima-${pkgver}"
+  export WX_CONFIG_PATH=/usr/bin/wx-config-2.8
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD
index 49cbfa7dc..b57bbf4e9 100644
--- a/extra/wxpython/PKGBUILD
+++ b/extra/wxpython/PKGBUILD
@@ -1,32 +1,33 @@
-# $Id: PKGBUILD 168112 2012-10-06 03:24:39Z eric $
+# $Id: PKGBUILD 203510 2014-01-12 02:18:23Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=wxpython
-pkgver=2.8.12.1
-pkgrel=4.1
+pkgver=3.0.0.0
+_editraver=0.7.20
+pkgrel=2
 pkgdesc="A wxWidgets GUI toolkit for Python"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:wxWindows')
 url="http://www.wxpython.org"
 depends=('wxgtk' 'python2')
 makedepends=('mesa' 'glu')
-source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 
-        wxpython-cairo.patch wxpython-fpb_default_style.patch)
-sha1sums=('05688dc03d61631750f5904273122bb40a2115f5'
-          '420700b0a216b853352ffafd054f406a82a30bb3'
-          'b832d628b8ff38ea598f404d133899f40d687a22')
+source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2
+        http://editra.org/uploads/src/Editra-${_editraver}.tar.gz)
+sha1sums=('48451763275cfe4e5bbec49ccd75bc9652cba719'
+          'f439f4aa2cb90b8348cebb1670df9cf47ba341ab')
+
+prepare() {
+  cd "${srcdir}"
+  find . -type f -exec sed -i 's/env python/env python2/' {} \;
+  sed -i 's/sys.exit(1)//' Editra-${_editraver}/setup.py
+}
 
 build() {
   cd "${srcdir}/wxPython-src-${pkgver}"
-  find . -type f -exec sed -i 's/env python/env python2/' {} \;
-  mv wxPython/wx/tools/Editra/editra wxPython/wx/tools/Editra/Editra
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
-    --enable-graphics_ctx --disable-optimize --enable-mediactrl \
-    --with-regex=sys --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
-    --disable-precomp-headers
-  cd "${srcdir}/wxPython-src-${pkgver}/wxPython"
-  patch -p2 -i "${srcdir}/wxpython-cairo.patch"
-  patch -p1 -i "${srcdir}/wxpython-fpb_default_style.patch"
+    --enable-graphics_ctx --enable-mediactrl --disable-precomp-headers \
+    --with-regex=sys --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys
+  cd wxPython
   python2 setup.py WXPORT=gtk2 UNICODE=1 build
 }
 
@@ -34,4 +35,8 @@ package() {
   cd "${srcdir}/wxPython-src-${pkgver}/wxPython"
   python2 setup.py WXPORT=gtk2 UNICODE=1 install --root="${pkgdir}"
   install -D -m644 ../docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+  cd "${srcdir}/Editra-${_editraver}"
+  python2 setup.py install --root="${pkgdir}"
+  rm -r "${pkgdir}/usr/lib/python2.7/site-packages/wx-3.0-gtk2/wx/tools/Editra"
 }
diff --git a/extra/wxpython2.8/PKGBUILD b/extra/wxpython2.8/PKGBUILD
new file mode 100644
index 000000000..f2602d7f4
--- /dev/null
+++ b/extra/wxpython2.8/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 204253 2014-01-15 16:22:15Z lcarlier $
+# Maintainer: Laurent Carlier <lordheavym@gmail.com>
+
+pkgname=wxpython2.8
+pkgver=2.8.12.1
+pkgrel=1
+pkgdesc="A wxWidgets GUI toolkit for Python"
+arch=('i686' 'x86_64')
+license=('custom:wxWindows')
+url="http://www.wxpython.org"
+depends=('wxgtk2.8' 'wxpython' 'python2')
+makedepends=('mesa' 'glu')
+source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 
+        wxpython-cairo.patch wxpython-fpb_default_style.patch wxGTK-collision.patch)
+sha1sums=('05688dc03d61631750f5904273122bb40a2115f5'
+          '922288b5e6c20075730655b79292959819c5fa77'
+          '0385386b5a622e6c623b63c9bf203d9748bd309b'
+          SKIP)
+
+# http://wiki.wxpython.org/MultiVersionInstalls
+# python program must have this snipet code added to force 2.8 usage:
+# import wxversion
+# wxversion.select("2.8")
+
+build() {
+  cd "${srcdir}/wxPython-src-${pkgver}"
+
+  patch -p1 -i ../wxGTK-collision.patch
+
+  find . -type f -exec sed -i 's/env python/env python2/' {} \;
+  #mv wxPython/wx/tools/Editra/editra wxPython/wx/tools/Editra/Editra
+  ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
+    --enable-graphics_ctx --disable-optimize --enable-mediactrl \
+    --with-regex=sys --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
+    --disable-precomp-headers
+
+  cd "${srcdir}/wxPython-src-${pkgver}/wxPython"
+  patch -p2 -i "${srcdir}/wxpython-cairo.patch"
+  patch -p1 -i "${srcdir}/wxpython-fpb_default_style.patch"
+  python2 setup.py WXPORT=gtk2 UNICODE=1 WX_CONFIG=/usr/bin/wx-config-2.8 build
+}
+
+package() {
+  cd "${srcdir}/wxPython-src-${pkgver}/wxPython"
+
+  python2 setup.py WXPORT=gtk2 UNICODE=1 WX_CONFIG=/usr/bin/wx-config-2.8 install --root="${pkgdir}"
+  rm -rf "${pkgdir}/usr/bin"
+  rm "${pkgdir}"/usr/lib/python2.7/site-packages/{wx.pth,wxversion.py*}
+  
+  install -D -m644 ../docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
diff --git a/extra/wxpython2.8/wxGTK-collision.patch b/extra/wxpython2.8/wxGTK-collision.patch
new file mode 100644
index 000000000..f6e02d876
--- /dev/null
+++ b/extra/wxpython2.8/wxGTK-collision.patch
@@ -0,0 +1,82 @@
+diff -Naur wxPython-src-2.8.12.1.orig/build/bakefiles/wx.bkl wxPython-src-2.8.12.1/build/bakefiles/wx.bkl
+--- wxPython-src-2.8.12.1.orig/build/bakefiles/wx.bkl	2014-01-04 22:28:16.491774907 -0500
++++ wxPython-src-2.8.12.1/build/bakefiles/wx.bkl	2014-01-04 22:37:39.610020870 -0500
+@@ -128,7 +128,7 @@
+         <using module="gettext"/>
+         <gettext-catalogs id="locale">
+             <srcdir>$(SRCDIR)/locale</srcdir>
+-            <catalog-name>wxstd</catalog-name>
++            <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
+             <linguas>
+                 ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
+                 zh zh_CN zh_TW
+diff -Naur wxPython-src-2.8.12.1.orig/Makefile.in wxPython-src-2.8.12.1/Makefile.in
+--- wxPython-src-2.8.12.1.orig/Makefile.in	2014-01-04 22:28:16.545107766 -0500
++++ wxPython-src-2.8.12.1/Makefile.in	2014-01-04 22:40:27.191813403 -0500
+@@ -11695,10 +11695,11 @@
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+ 
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+-	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+-	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
++
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+-	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
++	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
++	for i in wx.bkl wx_unix.bkl wx_win32.bkl ; do \
++	$(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ 	for f in setup.h $(RCDEFS_H); do \
+ 	if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
+@@ -12455,7 +12456,8 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+-	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
++	&& $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+ 
+ locale_install: 
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -12463,7 +12465,8 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ 	if test -f $(srcdir)/locale/$$l.mo ; then \
+-	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo \
++	$(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ 	fi ; \
+ 	done
+ 
+@@ -12480,7 +12483,7 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ 	if test -f $(srcdir)/locale/msw/$$l.mo ; then \
+-	$(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \
++	$(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \
+ 	fi ; \
+ 	done
+ 
+diff -Naur wxPython-src-2.8.12.1.orig/src/common/intl.cpp wxPython-src-2.8.12.1/src/common/intl.cpp
+--- wxPython-src-2.8.12.1.orig/src/common/intl.cpp	2014-01-04 22:28:16.675106608 -0500
++++ wxPython-src-2.8.12.1/src/common/intl.cpp	2014-01-04 22:47:49.523526232 -0500
+@@ -1597,7 +1597,7 @@
+   bool bOk = true;
+   if ( bLoadDefault )
+   {
+-    bOk = AddCatalog(wxT("wxstd"));
++    bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION)));
+ 
+     // there may be a catalog with toolkit specific overrides, it is not
+     // an error if this does not exist
+diff -Naur wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in wxPython-src-2.8.12.1/utils/wxrc/Makefile.in
+--- wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in	2014-01-04 22:28:16.335109635 -0500
++++ wxPython-src-2.8.12.1/utils/wxrc/Makefile.in	2014-01-04 22:37:34.410068493 -0500
+@@ -120,7 +120,6 @@
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
+ 
+ @COND_USE_XRC_1@uninstall_wxrc: 
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/extra/wxpython/wxpython-cairo.patch b/extra/wxpython2.8/wxpython-cairo.patch
index f3fc6fba0..b28c231dc 100644
--- a/extra/wxpython/wxpython-cairo.patch
+++ b/extra/wxpython2.8/wxpython-cairo.patch
@@ -49,3 +49,4 @@
  
  def _loadPycairoAPI():
      global pycairoAPI
+
diff --git a/extra/wxpython/wxpython-fpb_default_style.patch b/extra/wxpython2.8/wxpython-fpb_default_style.patch
index 906d3444d..eb0768210 100644
--- a/extra/wxpython/wxpython-fpb_default_style.patch
+++ b/extra/wxpython2.8/wxpython-fpb_default_style.patch
@@ -15,3 +15,4 @@
 +c.addStyles('FPB_SINGLE_FOLD', 'FPB_COLLAPSE_TO_BOTTOM',
              'FPB_EXCLUSIVE_FOLD', 'FPB_HORIZONTAL', 'FPB_VERTICAL')
  component.Manager.register(c)
+
diff --git a/extra/x2goclient/PKGBUILD b/extra/x2goclient/PKGBUILD
index e9c5e1e55..b0e720542 100644
--- a/extra/x2goclient/PKGBUILD
+++ b/extra/x2goclient/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 201675 2013-12-17 22:03:50Z andyrtr $
+# $Id: PKGBUILD 204550 2014-01-22 12:35:18Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
 # Contributor: Richard Murri <admin@richardmurri.com>
 
 pkgname=x2goclient
-pkgver=4.0.1.2
+pkgver=4.0.1.3
 pkgrel=1
 pkgdesc="x2go qt4 client"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
+license=('GPL2')
 url="http://www.x2go.org"
 depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme' 'xdg-utils')
 makedepends=('man2html')
 install=x2goclient.install
-source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('500c94ce4c8a63ecabde347d526f1356')
+source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
+sha1sums=('37b946b5b6d0a072a6d1fee98ae43bef929f2abd'
+          'SKIP')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD
index a3669d2b8..47165a29a 100644
--- a/extra/x2goserver/PKGBUILD
+++ b/extra/x2goserver/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 200258 2013-11-23 21:59:15Z andyrtr $
+# $Id: PKGBUILD 204466 2014-01-20 15:33:19Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
@@ -7,22 +7,61 @@
 # Contributor: Milan Knížek <knizek@volny.cz>
 
 pkgname=x2goserver
-pkgver=4.0.1.8
+pkgver=4.0.1.13
 pkgrel=1
 pkgdesc="Open source terminal server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.x2go.org/"
-license=('GPL')
-depends=('openssh' 'perl-config-simple' 'perl-dbd-sqlite' 'perl-file-basedir' 'python' 'x2go-agent' 'xorg-xauth')
-makedepends=('man2html')
+license=('GPL2')
+# see x2goserver.spec
+depends=(#'python' 'xorg-xauth' 
+
+         # For x2goruncommand - for now
+         'bc'
+         # For netstat in x2goresume-session
+         'net-tools'
+         'openssh'
+         'perl-file-readbackwards'
+         # We need a database
+         'perl-dbd-sqlite' 
+         # For killall in x2gosuspend-session
+         'psmisc'
+         # For x2goshowblocks
+         'lsof'
+         # For x2godbadmin
+		 'pwgen' # in community
+         # For printing, file-sharing
+         'sshfs'
+         # For /etc/sudoers.d
+         'sudo'
+         'x2go-agent'
+         # For /etc/X11/Xresources
+         'xorg-xinit'
+         'xorg-fonts-misc'
+         'shadow'
+         
+         # for post install actions
+         'desktop-file-utils'
+         'shared-mime-info'
+         
+         'perl-capture-tiny'
+         'perl-config-simple'
+         'perl-file-basedir' # FS#38551
+         
+         'xorg-xwininfo' # FS#38558
+         
+         #x2goserver-extensions
+         #x2goserver-xsession
+         #x2goserver-fmbindings
+         #x2goserver-printing
+)
+makedepends=('man2html' 'perl-extutils-makemaker' 'systemd')
 #optdepends=('cups-x2go: printing support')
 options=('emptydirs')
 install=x2goserver.install
 backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql')
-source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        x2goserver.service)
-md5sums=('754ee94f2b4b57fc08973027a174cf81'
-         'f76081c01e40b6206895d194dc949707')
+source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('24181098a9c4d7a5ca2c1416b0cee22d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -38,16 +77,18 @@ build() {
   for Makefile in $(find . -type f -name Makefile); do
     sed -i "s:-o root -g root ::g" $Makefile
   done
-
-  make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir"
+  # Do not ship xsession - Debian specific
+  sed -i -e '/xsession/s/^/#/' Makefile
+  
+  make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" PERL_INSTALLDIRS=vendor
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install
 
-  # systemd service file - only runs x2gocleansessions
-  install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
+  # systemd service file 
+  install -Dm 644 "$srcdir/${pkgname}-${pkgver}/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
   
   # X2go homedir + printing spool dir
   install -dm 770 $pkgdir/var/lib/x2go
diff --git a/extra/x2goserver/x2goserver.install b/extra/x2goserver/x2goserver.install
index 223eaac62..36eada578 100644
--- a/extra/x2goserver/x2goserver.install
+++ b/extra/x2goserver/x2goserver.install
@@ -45,6 +45,9 @@ post_install() {
   
   chown root:x2goprint /usr/bin/x2goprint
   chmod 2755 /usr/bin/x2goprint
+  
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
 }
 
 post_upgrade() {
@@ -59,3 +62,8 @@ pre_remove() {
     rm -rf /var/lib/x2go/* &> /dev/null || /bin/true
     rm -rf /var/spool/x2go/* &> /dev/null || /bin/true
 }
+
+post_remove() {
+    update-desktop-database -q
+    update-mime-database usr/share/mime &> /dev/null
+}
diff --git a/extra/x2goserver/x2goserver.service b/extra/x2goserver/x2goserver.service
deleted file mode 100644
index f06d39499..000000000
--- a/extra/x2goserver/x2goserver.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=x2go - remote desktop server
-After=syslog.target network.target
-
-[Service]
-ExecStart=/usr/bin/x2gocleansessions
-PIDFile=/run/x2goserver.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/xcb-util-wm/PKGBUILD b/extra/xcb-util-wm/PKGBUILD
index c0ea83cff..0044aa4c3 100644
--- a/extra/xcb-util-wm/PKGBUILD
+++ b/extra/xcb-util-wm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198495 2013-10-30 15:12:43Z allan $
+# $Id: PKGBUILD 204850 2014-01-29 10:16:49Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=xcb-util-wm
-pkgver=0.3.9
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="Utility libraries for XC Binding - client and window-manager helpers for ICCCM"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('libxcb>=1.7')
 makedepends=('xorg-util-macros')
 source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2"
         'LICENSE')
-sha256sums=('038f9bdb917b1f6d98a164f57dfb32212a102d771ab6f03de49fef3786746030'
+sha256sums=('66f97c18f7d98d3c873fe5db5842d2fca34519274c31ee668551ab8995a2f51f'
             'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9')
 
 build() {
diff --git a/extra/xf86-input-acecad/PKGBUILD b/extra/xf86-input-acecad/PKGBUILD
index 8ba910b19..c21929af2 100644
--- a/extra/xf86-input-acecad/PKGBUILD
+++ b/extra/xf86-input-acecad/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 198498 2013-10-30 15:13:45Z allan $
+# $Id: PKGBUILD 203600 2014-01-13 17:12:36Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-acecad
 pkgver=1.5.0
-pkgrel=6
+pkgrel=7
 pkgdesc="X.Org acecad tablet input driver"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=20' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.15' 'X-ABI-XINPUT_VERSION<20' 'X-ABI-XINPUT_VERSION>=21')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         assign-local-private-after-allocating.patch)
 sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1'
           '9301020b0ef3c6f2081e957481a88d2e187a7973')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i "${srcdir}/assign-local-private-after-allocating.patch"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
   make DESTDIR="${pkgdir}" install
 
diff --git a/extra/xf86-input-aiptek/PKGBUILD b/extra/xf86-input-aiptek/PKGBUILD
index 093f62d9d..b9404d7a1 100644
--- a/extra/xf86-input-aiptek/PKGBUILD
+++ b/extra/xf86-input-aiptek/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 198499 2013-10-30 15:14:06Z allan $
+# $Id: PKGBUILD 203601 2014-01-13 17:12:37Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-aiptek
 pkgver=1.4.1
-pkgrel=6
+pkgrel=7
 pkgdesc="X.Org Aiptek USB Digital Tablet input driver"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=20' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.15' 'X-ABI-XINPUT_VERSION<20' 'X-ABI-XINPUT_VERSION>=21')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('55ea7d12d3e24fd72eacc966a59262864dce7769')
 
 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/xf86-input-elographics/PKGBUILD b/extra/xf86-input-elographics/PKGBUILD
index 9fab3d0a3..0968e5bdd 100644
--- a/extra/xf86-input-elographics/PKGBUILD
+++ b/extra/xf86-input-elographics/PKGBUILD
@@ -3,25 +3,25 @@
 
 pkgname=xf86-input-elographics
 pkgver=1.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org Elographics TouchScreen input driver"
 arch=(i686 x86_64)
 license=('custom')
 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')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=20' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.15' 'X-ABI-XINPUT_VERSION<20' 'X-ABI-XINPUT_VERSION>=21')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('a21af744d57f158e6dff9d60a68aaac46b8d726d602911940cb61f4d6bb2c6a4')
 
 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}"
diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD
index c15ba2cff..5b7ee2e2b 100644
--- a/extra/xf86-input-evdev/PKGBUILD
+++ b/extra/xf86-input-evdev/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 198501 2013-10-30 15:14:49Z allan $
+# $Id: PKGBUILD 203652 2014-01-13 17:16:20Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <Alexander@archlinux.org
 
 pkgname=xf86-input-evdev
 pkgver=2.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org evdev input driver"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 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')
+conflicts=('xorg-server<1.15.0' 'X-ABI-XINPUT_VERSION<20' 'X-ABI-XINPUT_VERSION>=21')
 options=('!makeflags')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('750461749a83bdee7771592aa5c0db5e267b18d847078a4b8622f55b04797eb3')
 
 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-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD
index 85ad66cfb..e6f2b87de 100644
--- a/extra/xf86-input-joystick/PKGBUILD
+++ b/extra/xf86-input-joystick/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 198502 2013-10-30 15:15:18Z allan $
+# $Id: PKGBUILD 203603 2014-01-13 17:12:39Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-joystick
 pkgver=1.6.2
-pkgrel=2
+pkgrel=3
 pkgdesc="X.Org Joystick input driver"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 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')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=20' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.15.0' 'X-ABI-XINPUT_VERSION<20' 'X-ABI-XINPUT_VERSION>=21')
 backup=('etc/X11/xorg.conf.d/50-joystick.conf')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
@@ -19,13 +19,13 @@ sha1sums=('61658b8d829fdaed6064c7c26232c3884d359187'
           'e1ff3699a0470c6bb78a53f718df9d8521621e11')
 
 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/xf86-input-keyboard/PKGBUILD b/extra/xf86-input-keyboard/PKGBUILD
index bbc192f50..d1cf318d4 100644
--- a/extra/xf86-input-keyboard/PKGBUILD
+++ b/extra/xf86-input-keyboard/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 198711 2013-11-02 08:52:08Z andyrtr $
+# $Id: PKGBUILD 203604 2014-01-13 17:12:40Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-keyboard
 pkgver=1.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org keyboard input driver"
 arch=(i686 x86_64)
 license=('custom')
 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')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=20' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.15.0' 'X-ABI-XINPUT_VERSION<20' 'X-ABI-XINPUT_VERSION>=21')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('41c51c4e0a87aad6a1c4973c68a8de23b61162d0223f4ab36c627c307830cb5b')
diff --git a/extra/xf86-input-mouse/PKGBUILD b/extra/xf86-input-mouse/PKGBUILD
index b4d1b3999..55880ecec 100644
--- a/extra/xf86-input-mouse/PKGBUILD
+++ b/extra/xf86-input-mouse/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 198504 2013-10-30 15:16:22Z allan $
+# $Id: PKGBUILD 203605 2014-01-13 17:12:41Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-mouse
 pkgver=1.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org mouse input driver"
 arch=(i686 x86_64)
 license=('custom')
 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')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=20' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.15.0' 'X-ABI-XINPUT_VERSION<20' 'X-ABI-XINPUT_VERSION>=21')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('5d601e4bae53d5e9ead4ecd700f1beb5aeaf78b79e634c4aa381a9ce00276488')
 
 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 -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD
index aea961639..fba8bfb65 100644
--- a/extra/xf86-input-synaptics/PKGBUILD
+++ b/extra/xf86-input-synaptics/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 201440 2013-12-11 17:08:28Z andyrtr $
+# $Id: PKGBUILD 203606 2014-01-13 17:12:42Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski  <tpowa@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-input-synaptics
-pkgver=1.7.2
+pkgver=1.7.3
 pkgrel=1
 pkgdesc="Synaptics driver for notebook touchpads"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxtst' 'mtdev')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=20' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.15.0' 'X-ABI-XINPUT_VERSION<20' 'X-ABI-XINPUT_VERSION>=21')
 replaces=('synaptics')
 provides=('synaptics')
 conflicts=('synaptics')
@@ -21,11 +21,11 @@ groups=('xorg-drivers' 'xorg')
 backup=('etc/X11/xorg.conf.d/50-synaptics.conf')
 source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         add_tapbuttons.diff)
-sha256sums=('63957fa55f0d8662ef8c57f6325155c9884a854554d33921f0738e097f2a7dcd'
+sha256sums=('8b2a972043961195d056b84346317ec42bfa029095c9ee7aaf6deceba12e32d5'
             '5298d3e871db3768b34cf8516d3f53f9291202e2ea5de3300256e1cd9119a1ec')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   
   # * upstream disabled tapping by default if a physical left button is present - see FS#33282
   # * enable MatchDevicePath directive by default - FS#33291
@@ -36,7 +36,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
   install -m644 conf/50-synaptics.conf "${pkgdir}/etc/X11/xorg.conf.d/"
diff --git a/extra/xf86-input-vmmouse/PKGBUILD b/extra/xf86-input-vmmouse/PKGBUILD
index 7a6f43226..f31359ac8 100644
--- a/extra/xf86-input-vmmouse/PKGBUILD
+++ b/extra/xf86-input-vmmouse/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 198506 2013-10-30 15:17:17Z allan $
+# $Id: PKGBUILD 203607 2014-01-13 17:12:43Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-vmmouse
 pkgver=13.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org VMWare Mouse input driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc' 'sh')
-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')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=20' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.15.0' 'X-ABI-XINPUT_VERSION<20' 'X-ABI-XINPUT_VERSION>=21')
 groups=('xorg-drivers' 'xorg')
 backup=('etc/X11/xorg.conf.d/50-vmmouse.conf')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
     --with-xorg-conf-dir=/etc/X11/xorg.conf.d \
     --with-udev-rules-dir=/usr/lib/udev/rules.d
@@ -25,7 +25,7 @@ build() {
 }
 
 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-void/PKGBUILD b/extra/xf86-input-void/PKGBUILD
index 20f2669c9..c3f876e41 100644
--- a/extra/xf86-input-void/PKGBUILD
+++ b/extra/xf86-input-void/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 198507 2013-10-30 15:17:39Z allan $
+# $Id: PKGBUILD 203608 2014-01-13 17:12:44Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-void
 pkgver=1.4.0
-pkgrel=5
+pkgrel=6
 pkgdesc="X.org void input driver"
 arch=(i686 x86_64 'mips64el')
 license=('custom')
 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')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=20' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.15.0' 'X-ABI-XINPUT_VERSION<20' 'X-ABI-XINPUT_VERSION>=21')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('49b462d3acb16337eaf78202d4074f19d5e20b29')
 
 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/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD
index 290d197b1..d3c65a7a1 100644
--- a/extra/xf86-input-wacom/PKGBUILD
+++ b/extra/xf86-input-wacom/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 198508 2013-10-30 15:17:59Z allan $
+# $Id: PKGBUILD 203609 2014-01-13 17:12:45Z andyrtr $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: M Rawash <mrawash@gmail.com>
 
 pkgname=xf86-input-wacom
 pkgver=0.23.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org Wacom tablet driver"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linuxwacom.sourceforge.net/"
 license=(GPL)
 backup=('etc/X11/xorg.conf.d/50-wacom.conf')
 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')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=20' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.15.0' 'X-ABI-XINPUT_VERSION<20' 'X-ABI-XINPUT_VERSION>=21')
 optdepends=('inputattach: support for serial tablets')
 source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2
         70-wacom.rules)
diff --git a/extra/xf86-video-apm/PKGBUILD b/extra/xf86-video-apm/PKGBUILD
index 3f553fa2a..bea3ae3c3 100644
--- a/extra/xf86-video-apm/PKGBUILD
+++ b/extra/xf86-video-apm/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 198509 2013-10-30 15:18:20Z allan $
+# $Id: PKGBUILD 203610 2014-01-13 17:12:46Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-apm
 pkgver=1.2.5
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org Alliance ProMotion video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
 sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f'
             'be06cce5eb0b8eb070321e293f5cd9b7aa947d920d23cc962f7121191ba4180b')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/git-fix.diff
   ./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-video-ark/PKGBUILD b/extra/xf86-video-ark/PKGBUILD
index 47ae1f445..5f639f7bb 100644
--- a/extra/xf86-video-ark/PKGBUILD
+++ b/extra/xf86-video-ark/PKGBUILD
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD 198510 2013-10-30 15:18:43Z allan $
+# $Id: PKGBUILD 203611 2014-01-13 17:12:47Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-ark
 pkgver=0.7.5
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org ark video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 build-fix.diff)
 sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e'
             '257c3db46ef85863cc2d1b2ba250ef6b1a08df75171f2f3cef83cabd8b22399b')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/build-fix.diff
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/xf86-video-ast/PKGBUILD b/extra/xf86-video-ast/PKGBUILD
index 51e117d75..f82e76bfc 100644
--- a/extra/xf86-video-ast/PKGBUILD
+++ b/extra/xf86-video-ast/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 198511 2013-10-30 15:19:03Z allan $
+# $Id: PKGBUILD 203612 2014-01-13 17:12:49Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-ast
 pkgver=0.97.0
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org ASPEED AST Graphics video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
 sha256sums=('28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76'
             '8f032dd9f1441e2af4e443166f0e3d3a6ce4ef7f351af8789158d2dec18a52fa')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/git-fix.diff
   ./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-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD
index 764ae0ad1..3064db092 100644
--- a/extra/xf86-video-ati/PKGBUILD
+++ b/extra/xf86-video-ati/PKGBUILD
@@ -1,31 +1,33 @@
-# $Id: PKGBUILD 198512 2013-10-30 15:19:24Z allan $
+# $Id: PKGBUILD 204721 2014-01-25 21:21:43Z lcarlier $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-ati
-pkgver=7.2.0
+pkgver=7.3.0
 epoch=1
 pkgrel=1
 pkgdesc="X.org ati video driver"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
-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')
+depends=('libdrm>=2.4.41' 'systemd' 'ati-dri' 'glamor-egl')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f30f5efdc8d7d18d06eda7ef2f91a8b7290f1cfbf6ff26362cd47ab8969daec4')
+sha256sums=('107c072c4919a996e04f47afdb53d5946a3ad574f270b8c560ef8b3a032046fe')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
+
   ./configure --prefix=/usr \
     --enable-glamor
   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-video-chips/PKGBUILD b/extra/xf86-video-chips/PKGBUILD
index 2c328df5e..ef58d7f64 100644
--- a/extra/xf86-video-chips/PKGBUILD
+++ b/extra/xf86-video-chips/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 198513 2013-10-30 15:19:45Z allan $
+# $Id: PKGBUILD 203614 2014-01-13 17:12:51Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-chips
 pkgver=1.2.5
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org Chips and Technologies video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h git-fix.diff)
 sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2'
             'd04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670'
             '36165ebc70926ab5a8fe4331c5ce88c7f5f2e6979170b849ac1c2c99b3d1a804')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   cp ${srcdir}/iopl.h util/
   patch -Np1 -i ${srcdir}/git-fix.diff
   ./configure --prefix=/usr
@@ -26,7 +26,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/xf86-video-cirrus/PKGBUILD b/extra/xf86-video-cirrus/PKGBUILD
index 824faf92c..23d463ff9 100644
--- a/extra/xf86-video-cirrus/PKGBUILD
+++ b/extra/xf86-video-cirrus/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 198514 2013-10-30 15:20:05Z allan $
+# $Id: PKGBUILD 203615 2014-01-13 17:12:52Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-cirrus
 pkgver=1.5.2
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Cirrus Logic video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7')
 
 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-video-dummy/PKGBUILD b/extra/xf86-video-dummy/PKGBUILD
index d06834211..44662fa56 100644
--- a/extra/xf86-video-dummy/PKGBUILD
+++ b/extra/xf86-video-dummy/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 198515 2013-10-30 15:20:26Z allan $
+# $Id: PKGBUILD 203616 2014-01-13 17:12:53Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-dummy
 pkgver=0.3.7
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org dummy video driver"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'xf86dgaproto')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('56f84fcbc515685529ad8e10bca1072731d9c096b97c5d35ddc95cd589b98680')
 
 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-video-fbdev/PKGBUILD b/extra/xf86-video-fbdev/PKGBUILD
index 91400da95..25836e10b 100644
--- a/extra/xf86-video-fbdev/PKGBUILD
+++ b/extra/xf86-video-fbdev/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 198516 2013-10-30 15:20:49Z allan $
+# $Id: PKGBUILD 203617 2014-01-13 17:12:55Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-fbdev
 pkgver=0.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org framebuffer video driver"
 arch=(i686 x86_64 'mips64el')
 license=('custom')
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 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 8ef44fc40..de103e86e 100644
--- a/extra/xf86-video-glint/PKGBUILD
+++ b/extra/xf86-video-glint/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 198517 2013-10-30 15:21:10Z allan $
+# $Id: PKGBUILD 203619 2014-01-13 17:12:57Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-glint
 pkgver=1.2.8
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org GLINT/Permedia video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'xf86dgaproto')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
 sha256sums=('657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221'
             '8bf833751bea92543835c7f0c55b6a6ed7c4df62034372f5f6ae122b3ba8f231')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/git-fix.diff
  ./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-video-i128/PKGBUILD b/extra/xf86-video-i128/PKGBUILD
index cc8528765..d794c207f 100644
--- a/extra/xf86-video-i128/PKGBUILD
+++ b/extra/xf86-video-i128/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 198518 2013-10-30 15:21:31Z allan $
+# $Id: PKGBUILD 203620 2014-01-13 17:12:58Z andyrtr $
 # Maintainer:Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-i128
 pkgver=1.3.6
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org Number 9 I128 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
 sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c'
             '3805461dd71ff6675fd08afd5c21a230e7f36d6cda6830adac38ceee36d96f4b')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/git-fix.diff
   ./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-video-i740/PKGBUILD b/extra/xf86-video-i740/PKGBUILD
index 35161e5ba..bec828624 100644
--- a/extra/xf86-video-i740/PKGBUILD
+++ b/extra/xf86-video-i740/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 198519 2013-10-30 15:21:53Z allan $
+# $Id: PKGBUILD 203621 2014-01-13 17:12:59Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-i740
 pkgver=1.3.4
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org Intel i740 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
 sha256sums=('1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78'
             '2b004773fe8090dea727590a7fc0389c53a16d068537fd1968ae320b0f1e36ca')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/git-fix.diff
   ./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-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index d813d28dc..d558bb760 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,37 +1,45 @@
-# $Id: PKGBUILD 198520 2013-10-30 15:22:14Z allan $
+# $Id: PKGBUILD 205820 2014-02-10 15:26:51Z lcarlier $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.21.15
+pkgver=2.99.910
 pkgrel=1
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 install=$pkgname.install
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-depends=('intel-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto' 'libx11' 'libxrender')
+depends=('intel-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9' 'glamor-egl')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'libx11' 'libxrender'
+             # additional deps for intel-virtual-output
+            'libxrandr' 'libxinerama' 'libxcursor' 'libxtst')
+optdepends=('libxrandr: for intel-virtual-output'
+            'libxinerama: for intel-virtual-output'
+            'libxcursor: for intel-virtual-output'
+            'libxtst: for intel-virtual-output')
 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'
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16'
            'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc')
+sha256sums=('203d46064449da0e23a111418dfb189422ba96ea08707167c8dee463e2d745b1')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
-    --enable-dri \
-    --with-default-accel=sna
-
+    --enable-glamor
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
   make DESTDIR="${pkgdir}" install
 
diff --git a/extra/xf86-video-intel/git_fixes.diff b/extra/xf86-video-intel/git_fixes.diff
new file mode 100644
index 000000000..dfc33928f
--- /dev/null
+++ b/extra/xf86-video-intel/git_fixes.diff
@@ -0,0 +1,327 @@
+From 699b4fd3139d1d6d02911d6c8f193ead3445f613 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat, 01 Feb 2014 20:13:53 +0000
+Subject: sna: Undo region translation before returning
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index aecae51..d654660 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -2433,6 +2433,9 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
+ 					sna_damage_add(&priv->cpu_damage, region);
+ 					discard_gpu = false;
+ 				}
++
++				if (dx | dy)
++					RegionTranslate(region, -dx, -dy);
+ 			} else
+ 				sna_pixmap_free_cpu(sna, priv, false);
+ 		}
+--
+cgit v0.9.0.2-2-gbebe
+From 26613b046012f0ad968a15ab6bdfa8f6a6652e77 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat, 01 Feb 2014 21:37:41 +0000
+Subject: sna: Allow more inplace promotions of CPU to GPU bo
+
+If the CPU bo is wholly damaged, then it makes an ideal candidate for
+simply converting into the GPU bo.
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/kgem.c b/src/sna/kgem.c
+index f7404df..788b710 100644
+--- a/src/sna/kgem.c
++++ b/src/sna/kgem.c
+@@ -6743,14 +6743,19 @@ kgem_replace_bo(struct kgem *kgem,
+ 	return dst;
+ }
+ 
+-bool kgem_bo_convert_to_gpu(struct kgem *kgem, struct kgem_bo *bo)
++bool kgem_bo_convert_to_gpu(struct kgem *kgem,
++			    struct kgem_bo *bo,
++			    unsigned flags)
+ {
+-	DBG(("%s: converting handle=%d from CPU to GPU\n", __FUNCTION__, bo->handle));
++	DBG(("%s: converting handle=%d from CPU to GPU, flags=%x\n", __FUNCTION__, bo->handle));
+ 	assert(bo->tiling == I915_TILING_NONE);
+ 
+ 	if (kgem->has_llc)
+ 		return true;
+ 
++	if (flags & MOVE_ASYNC_HINT && __kgem_bo_is_busy(kgem, bo))
++		return false;
++
+ 	assert(bo->snoop);
+ 
+ 	kgem_bo_submit(kgem, bo);
+diff --git a/src/sna/kgem.h b/src/sna/kgem.h
+index f670b60..4c4996f 100644
+--- a/src/sna/kgem.h
++++ b/src/sna/kgem.h
+@@ -301,7 +301,9 @@ struct kgem_bo *kgem_create_cpu_2d(struct kgem *kgem,
+ 				   int bpp,
+ 				   uint32_t flags);
+ 
+-bool kgem_bo_convert_to_gpu(struct kgem *kgem, struct kgem_bo *bo);
++bool kgem_bo_convert_to_gpu(struct kgem *kgem,
++			    struct kgem_bo *bo,
++			    unsigned flags);
+ 
+ uint32_t kgem_bo_get_binding(struct kgem_bo *bo, uint32_t format);
+ void kgem_bo_set_binding(struct kgem_bo *bo, uint32_t format, uint16_t offset);
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index d654660..9d7dec4 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -3868,7 +3868,7 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
+ 
+ 			if (tiling == I915_TILING_NONE &&
+ 			    priv->cpu_bo && !priv->shm &&
+-			    kgem_bo_convert_to_gpu(&sna->kgem, priv->cpu_bo)) {
++			    kgem_bo_convert_to_gpu(&sna->kgem, priv->cpu_bo, flags)) {
+ 				assert(!priv->mapped);
+ 				assert(!IS_STATIC_PTR(priv->ptr));
+ #ifdef DEBUG_MEMORY
+@@ -3933,6 +3933,28 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
+ 	if (priv->cpu_damage == NULL)
+ 		goto done;
+ 
++	if (DAMAGE_IS_ALL(priv->cpu_damage) &&
++	    priv->gpu_bo->tiling == I915_TILING_NONE &&
++	    priv->cpu_bo && !priv->shm &&
++	    kgem_bo_convert_to_gpu(&sna->kgem, priv->cpu_bo, flags)) {
++		assert(!priv->mapped);
++		assert(!IS_STATIC_PTR(priv->ptr));
++#ifdef DEBUG_MEMORY
++		sna->debug_memory.cpu_bo_allocs--;
++		sna->debug_memory.cpu_bo_bytes -= kgem_bo_size(priv->cpu_bo);
++#endif
++		sna_pixmap_free_gpu(sna, priv);
++		priv->gpu_bo = priv->cpu_bo;
++		priv->cpu_bo = NULL;
++		priv->ptr = NULL;
++		pixmap->devPrivate.ptr = NULL;
++		sna_damage_all(&priv->gpu_damage,
++			       pixmap->drawable.width,
++			       pixmap->drawable.height);
++		sna_damage_destroy(&priv->cpu_damage);
++		goto done;
++	}
++
+ 	if (priv->shm) {
+ 		assert(!priv->flush);
+ 		sna_add_flush_pixmap(sna, priv, priv->cpu_bo);
+--
+cgit v0.9.0.2-2-gbebe
+From ed8d4f0ce3bff662d02063528df64d478ac0dc00 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat, 01 Feb 2014 21:38:47 +0000
+Subject: sna: Skip discarding CPU bo when using as a render target
+
+The issue with unwanted serialisation does not affect the async
+move-to-cpu of a render target.
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index 9d7dec4..4221a55 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -2420,19 +2420,45 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
+ 
+ 		sna_damage_destroy(&priv->gpu_damage);
+ 
+-		if ((flags & MOVE_READ) == 0 &&
++		if ((flags & (MOVE_READ | MOVE_ASYNC_HINT)) == 0 &&
+ 		    priv->cpu_bo && !priv->cpu_bo->flush &&
+ 		    __kgem_bo_is_busy(&sna->kgem, priv->cpu_bo)) {
++			DBG(("%s: active CPU bo replacing\n", __FUNCTION__));
++			assert(!priv->shm);
++			assert(!IS_STATIC_PTR(priv->ptr));
++
+ 			if (!region_subsumes_pixmap(region, pixmap)) {
++				DBG(("%s: partial replacement\n", __FUNCTION__));
+ 				if (get_drawable_deltas(drawable, pixmap, &dx, &dy))
+ 					RegionTranslate(region, dx, dy);
+ 
+-				sna_damage_subtract(&priv->cpu_damage, region);
+-				if (sna_pixmap_move_to_gpu(pixmap, MOVE_READ | MOVE_ASYNC_HINT)) {
+-					sna_pixmap_free_cpu(sna, priv, false);
+-					sna_damage_add(&priv->cpu_damage, region);
+-					discard_gpu = false;
++				if (sna->kgem.has_llc &&
++				    sna_pixmap_choose_tiling(pixmap,
++							     DEFAULT_TILING) == I915_TILING_NONE) {
++#ifdef DEBUG_MEMORY
++					sna->debug_memory.cpu_bo_allocs--;
++					sna->debug_memory.cpu_bo_bytes -= kgem_bo_size(priv->cpu_bo);
++#endif
++					DBG(("%s: promoting CPU bo to GPU bo\n", __FUNCTION__));
++					sna_pixmap_free_gpu(sna, priv);
++					priv->gpu_bo = priv->cpu_bo;
++					priv->cpu_bo = NULL;
++					priv->ptr = NULL;
++					pixmap->devPrivate.ptr = NULL;
++
++					sna_damage_destroy(&priv->cpu_damage);
++				} else {
++					DBG(("%s: pushing surrounding damage to GPU bo\n", __FUNCTION__));
++					sna_damage_subtract(&priv->cpu_damage, region);
++					assert(priv->cpu_damage);
++					if (sna_pixmap_move_to_gpu(pixmap, MOVE_READ | MOVE_ASYNC_HINT)) {
++						sna_pixmap_free_cpu(sna, priv, false);
++						if (priv->flush)
++							sna_add_flush_pixmap(sna, priv, priv->gpu_bo);
++						discard_gpu = false;
++					}
+ 				}
++				sna_damage_add(&priv->cpu_damage, region);
+ 
+ 				if (dx | dy)
+ 					RegionTranslate(region, -dx, -dy);
+--
+cgit v0.9.0.2-2-gbebe
+From 8b0748c57ee4c38ea98c4b6ca18cb2b99f8f9ed4 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat, 01 Feb 2014 21:54:43 +0000
+Subject: sna: Add some more DBG for choosing render targets
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
+index 08c9f78..aadc6f7 100644
+--- a/src/sna/gen6_render.c
++++ b/src/sna/gen6_render.c
+@@ -1831,6 +1831,8 @@ gen6_composite_set_target(struct sna *sna,
+ 	BoxRec box;
+ 	unsigned int hint;
+ 
++	DBG(("%s: (%d, %d)x(%d, %d), partial?=%d\n", __FUNCTION__, x, y, w, h));
++
+ 	op->dst.pixmap = get_drawable_pixmap(dst->pDrawable);
+ 	op->dst.format = dst->format;
+ 	op->dst.width = op->dst.pixmap->drawable.width;
+diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
+index 1574813..a90bd15 100644
+--- a/src/sna/gen7_render.c
++++ b/src/sna/gen7_render.c
+@@ -2111,6 +2111,8 @@ gen7_composite_set_target(struct sna *sna,
+ 	BoxRec box;
+ 	unsigned int hint;
+ 
++	DBG(("%s: (%d, %d)x(%d, %d), partial?=%d\n", __FUNCTION__, x, y, w, h));
++
+ 	op->dst.pixmap = get_drawable_pixmap(dst->pDrawable);
+ 	op->dst.format = dst->format;
+ 	op->dst.width  = op->dst.pixmap->drawable.width;
+diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c
+index 5c718bc..c096db1 100644
+--- a/src/sna/gen8_render.c
++++ b/src/sna/gen8_render.c
+@@ -1862,6 +1862,8 @@ gen8_composite_set_target(struct sna *sna,
+ 	BoxRec box;
+ 	unsigned int hint;
+ 
++	DBG(("%s: (%d, %d)x(%d, %d), partial?=%d\n", __FUNCTION__, x, y, w, h));
++
+ 	op->dst.pixmap = get_drawable_pixmap(dst->pDrawable);
+ 	op->dst.format = dst->format;
+ 	op->dst.width  = op->dst.pixmap->drawable.width;
+--
+cgit v0.9.0.2-2-gbebe
+From 853588ad5be9407d2123f6055458ca84e72b8eb9 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat, 01 Feb 2014 21:55:09 +0000
+Subject: sna: If IGNORE_CPU is not set we must mark the move as MOVE_READ
+
+Logic reversal in discarding CPU damage. An old bug revealed by the more
+aggressive attempts to discard CPU damage.
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index 4221a55..acf4849 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -3689,7 +3689,7 @@ cpu_fail:
+ 		goto cpu_fail;
+ 
+ 	if (!sna_drawable_move_region_to_cpu(&pixmap->drawable, &region,
+-					     (flags & IGNORE_CPU ? MOVE_READ : 0) | MOVE_WRITE | MOVE_ASYNC_HINT)) {
++					     (flags & IGNORE_CPU ? 0 : MOVE_READ) | MOVE_WRITE | MOVE_ASYNC_HINT)) {
+ 		DBG(("%s: failed to move-to-cpu, fallback\n", __FUNCTION__));
+ 		goto cpu_fail;
+ 	}
+--
+cgit v0.9.0.2-2-gbebe
+From 7f08250a8960f90f6bd34de8c4a17870703bfa60 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun, 02 Feb 2014 03:52:11 +0000
+Subject: sna: Reconstruct damage for the partially replaced discarded CPU bo
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index acf4849..d31fa22 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -2432,7 +2432,7 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
+ 				if (get_drawable_deltas(drawable, pixmap, &dx, &dy))
+ 					RegionTranslate(region, dx, dy);
+ 
+-				if (sna->kgem.has_llc &&
++				if (sna->kgem.has_llc && !priv->pinned &&
+ 				    sna_pixmap_choose_tiling(pixmap,
+ 							     DEFAULT_TILING) == I915_TILING_NONE) {
+ #ifdef DEBUG_MEMORY
+@@ -2440,13 +2440,17 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
+ 					sna->debug_memory.cpu_bo_bytes -= kgem_bo_size(priv->cpu_bo);
+ #endif
+ 					DBG(("%s: promoting CPU bo to GPU bo\n", __FUNCTION__));
+-					sna_pixmap_free_gpu(sna, priv);
++					if (priv->gpu_bo)
++						sna_pixmap_free_gpu(sna, priv);
+ 					priv->gpu_bo = priv->cpu_bo;
+ 					priv->cpu_bo = NULL;
+ 					priv->ptr = NULL;
+ 					pixmap->devPrivate.ptr = NULL;
+ 
+-					sna_damage_destroy(&priv->cpu_damage);
++					priv->gpu_damage = priv->cpu_damage;
++					priv->cpu_damage = NULL;
++
++					discard_gpu = false;
+ 				} else {
+ 					DBG(("%s: pushing surrounding damage to GPU bo\n", __FUNCTION__));
+ 					sna_damage_subtract(&priv->cpu_damage, region);
+@@ -2456,6 +2460,12 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
+ 						if (priv->flush)
+ 							sna_add_flush_pixmap(sna, priv, priv->gpu_bo);
+ 						discard_gpu = false;
++
++						assert(priv->cpu_damage == NULL);
++						sna_damage_all(&priv->gpu_damage,
++							       pixmap->drawable.width,
++							       pixmap->drawable.height);
++						sna_damage_subtract(&priv->gpu_damage, region);
+ 					}
+ 				}
+ 				sna_damage_add(&priv->cpu_damage, region);
+@@ -3959,9 +3969,9 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
+ 	if (priv->cpu_damage == NULL)
+ 		goto done;
+ 
+-	if (DAMAGE_IS_ALL(priv->cpu_damage) &&
++	if (DAMAGE_IS_ALL(priv->cpu_damage) && priv->cpu_bo &&
++	    !priv->pinned && !priv->shm &&
+ 	    priv->gpu_bo->tiling == I915_TILING_NONE &&
+-	    priv->cpu_bo && !priv->shm &&
+ 	    kgem_bo_convert_to_gpu(&sna->kgem, priv->cpu_bo, flags)) {
+ 		assert(!priv->mapped);
+ 		assert(!IS_STATIC_PTR(priv->ptr));
+--
+cgit v0.9.0.2-2-gbebe
+
diff --git a/extra/xf86-video-intel/xf86-video-intel.install b/extra/xf86-video-intel/xf86-video-intel.install
index 661387906..326a18610 100644
--- a/extra/xf86-video-intel/xf86-video-intel.install
+++ b/extra/xf86-video-intel/xf86-video-intel.install
@@ -6,13 +6,16 @@ post_upgrade() {
 
 post_install() {
   cat <<MSG
->>> This driver now uses SNA as the default acceleration method. You can
-    still fall back to UXA if you run into trouble. To do so, save a file
-    with the following content as /etc/X11/xorg.conf.d/20-intel.conf :
+>>> This driver uses SNA as the default acceleration method. You can
+    fall back to UXA if you run into trouble or test experimental
+    Glamor acceleration. To do so, save a file with the following 
+    content as /etc/X11/xorg.conf.d/20-intel.conf :
       Section "Device"
         Identifier  "Intel Graphics"
         Driver      "intel"
-        Option      "AccelMethod"  "uxa"
+        Option      "AccelMethod"  "sna"
+        #Option      "AccelMethod"  "uxa"
+        #Option      "AccelMethod"  "glamor"
       EndSection
 MSG
 }
diff --git a/extra/xf86-video-mach64/PKGBUILD b/extra/xf86-video-mach64/PKGBUILD
index cd6fe5e98..603c6bc5f 100644
--- a/extra/xf86-video-mach64/PKGBUILD
+++ b/extra/xf86-video-mach64/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 198521 2013-10-30 15:22:36Z allan $
+# $Id: PKGBUILD 203623 2014-01-13 17:13:01Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-mach64
 pkgver=6.9.4
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org mach64 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 optdepends=('mach64-dri: DRI1 support from community repo')
 groups=('xorg-drivers' 'xorg')
 options=('!emptydirs')
@@ -18,13 +18,13 @@ source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('97f108b8d7c0a8426bef9562683323ab6369956f18b0e220ee0d1a66b740855e')
 
 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-video-mga/PKGBUILD b/extra/xf86-video-mga/PKGBUILD
index cc6389ae9..3c4017e8a 100644
--- a/extra/xf86-video-mga/PKGBUILD
+++ b/extra/xf86-video-mga/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 200806 2013-12-05 19:33:54Z andyrtr $
+# $Id: PKGBUILD 203624 2014-01-13 17:13:03Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-mga
 pkgver=1.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org mga video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 optdepends=('mga-dri: DRI1 support from community repo')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/xf86-video-modesetting/PKGBUILD b/extra/xf86-video-modesetting/PKGBUILD
index 8aafb538c..9448cc13e 100644
--- a/extra/xf86-video-modesetting/PKGBUILD
+++ b/extra/xf86-video-modesetting/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 200763 2013-12-04 19:37:59Z andyrtr $
+# $Id: PKGBUILD 203625 2014-01-13 17:13:05Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 pkgname=xf86-video-modesetting
 pkgver=0.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org generic modesetting video driver"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libdrm>=2.4.37' 'systemd')
-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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/xf86-video-neomagic/PKGBUILD b/extra/xf86-video-neomagic/PKGBUILD
index 44e2a8489..a3cb04aba 100644
--- a/extra/xf86-video-neomagic/PKGBUILD
+++ b/extra/xf86-video-neomagic/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 198526 2013-10-30 15:23:40Z allan $
+# $Id: PKGBUILD 203626 2014-01-13 17:13:07Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.8
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org neomagic video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('50abf6ac02547900edeaa5073c5f6d2f153f12dd47067cc7e4758e1b74d78874')
 
 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 -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD
index 9db8e5154..7f8e45551 100644
--- a/extra/xf86-video-nouveau/PKGBUILD
+++ b/extra/xf86-video-nouveau/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 199041 2013-11-07 17:46:41Z andyrtr $
+# $Id: PKGBUILD 203627 2014-01-13 17:13:09Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: buddabrod <buddabrod@gmail.com>
 
 pkgname=xf86-video-nouveau
 pkgver=1.0.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source 2D acceleration driver for nVidia cards"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/"
 license=('GPL')
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 install=$pkgname.install
 source=(http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2)
diff --git a/extra/xf86-video-nv/PKGBUILD b/extra/xf86-video-nv/PKGBUILD
index b2f2330d7..9ce89d8b2 100644
--- a/extra/xf86-video-nv/PKGBUILD
+++ b/extra/xf86-video-nv/PKGBUILD
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD 198528 2013-10-30 15:24:23Z allan $
+# $Id: PKGBUILD 203628 2014-01-13 17:13:10Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer:Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-nv
 pkgver=2.1.20
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org nv video driver"
 arch=('i686' 'x86_64')
 license=('custom')
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
 sha256sums=('8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf'
             '0ec4234fd9202956d25ca93e9131930e4a3fbba5de2ca870d0cf2302ccb76b46')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD
index c24949122..cb9f5d812 100644
--- a/extra/xf86-video-openchrome/PKGBUILD
+++ b/extra/xf86-video-openchrome/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 198529 2013-10-30 15:24:51Z allan $
+# $Id: PKGBUILD 203629 2014-01-13 17:13:11Z andyrtr $
 # Contributor: Paul Mattal <paul@mattal.com>
 # Maintainer: Juergen Hoetzel <juergen@hoetzel.info>
 
 pkgname=xf86-video-openchrome
 pkgver=0.3.3
-pkgrel=2
+pkgrel=3
 pkgdesc="X.Org Openchrome drivers"
 arch=(i686 x86_64)
 license=('custom')
 url="http://www.openchrome.org"
 depends=('libdrm' 'libxvmc' 'systemd')
 optdepends=('unichrome-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' 'xf86-video-via' 'xf86-video-unichrome' 'openchrome')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16'
+           'xf86-video-via' 'xf86-video-unichrome' 'openchrome')
 replaces=('openchrome' 'xf86-video-via')
 groups=('xorg-drivers' 'xorg')
 options=('!emptydirs' '!makeflags')
@@ -20,13 +21,13 @@ source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgve
 sha1sums=('1f7b23d4ed53417eda5c6730486b36812f469295')
 
 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-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD
index 447554869..428785d82 100644
--- a/extra/xf86-video-r128/PKGBUILD
+++ b/extra/xf86-video-r128/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 198530 2013-10-30 15:25:14Z allan $
+# $Id: PKGBUILD 203630 2014-01-13 17:13:12Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-r128
 pkgver=6.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org ati Rage128 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 optdepends=('r128-dri: DRI1 support from community repo')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/xf86-video-rendition/PKGBUILD b/extra/xf86-video-rendition/PKGBUILD
index b4de759cc..79b812662 100644
--- a/extra/xf86-video-rendition/PKGBUILD
+++ b/extra/xf86-video-rendition/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 198531 2013-10-30 15:25:34Z allan $
+# $Id: PKGBUILD 203631 2014-01-13 17:13:13Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-rendition
 pkgver=4.2.5
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org Rendition video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 options=('!strip')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
 sha256sums=('39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb'
             '93a59e9deed98af201c8bb231fdf3214fcd02dae8ef2f880b044b4fd100cdb4c')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/git-fixes.patch
   ./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-video-s3/PKGBUILD b/extra/xf86-video-s3/PKGBUILD
index 1229b54e0..cba1e9b74 100644
--- a/extra/xf86-video-s3/PKGBUILD
+++ b/extra/xf86-video-s3/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 198532 2013-10-30 15:25:58Z allan $
+# $Id: PKGBUILD 203632 2014-01-13 17:13:15Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-s3
 pkgver=0.6.5
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org S3 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 build-fix.diff)
 sha256sums=('4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39'
             'ad5ce4569c16f28801f4f89d8271fccc5706ef8508a6051ca094854d92a19d1a')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/build-fix.diff
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/xf86-video-s3virge/PKGBUILD b/extra/xf86-video-s3virge/PKGBUILD
index 08dfbc589..a0fba0cda 100644
--- a/extra/xf86-video-s3virge/PKGBUILD
+++ b/extra/xf86-video-s3virge/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 198533 2013-10-30 15:26:27Z allan $
+# $Id: PKGBUILD 203633 2014-01-13 17:13:16Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-s3virge
 pkgver=1.10.6
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org S3 Virge video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e')
 
 
 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}"
diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD
index 5071a89a4..ea5696c6a 100644
--- a/extra/xf86-video-savage/PKGBUILD
+++ b/extra/xf86-video-savage/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 198534 2013-10-30 15:26:51Z allan $
+# $Id: PKGBUILD 203634 2014-01-13 17:13:17Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-savage
 pkgver=2.3.7
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org savage video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 optdepends=('savage-dri: DRI1 support from community repo')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/xf86-video-siliconmotion/0001-Remove-miInitializeBackingStore.patch b/extra/xf86-video-siliconmotion/0001-Remove-miInitializeBackingStore.patch
index 8552d40a4..2b778e44f 100644
--- a/extra/xf86-video-siliconmotion/0001-Remove-miInitializeBackingStore.patch
+++ b/extra/xf86-video-siliconmotion/0001-Remove-miInitializeBackingStore.patch
@@ -22,5 +22,6 @@ index 4794571..134db79 100644
      xf86DiDGAInit(pScreen, (unsigned long)(pSmi->FBBase + pScrn->fbOffset));
  #endif
 -- 
-1.8.2
+1.8.0.2
+
 
diff --git a/extra/xf86-video-siliconmotion/PKGBUILD b/extra/xf86-video-siliconmotion/PKGBUILD
index 48420a138..20411a3f0 100644
--- a/extra/xf86-video-siliconmotion/PKGBUILD
+++ b/extra/xf86-video-siliconmotion/PKGBUILD
@@ -1,35 +1,35 @@
-# $Id: PKGBUILD 198535 2013-10-30 15:27:11Z allan $
+# $Id: PKGBUILD 203635 2014-01-13 17:13:18Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-siliconmotion
 pkgver=1.7.7
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org siliconmotion video driver"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	98_sm712_CRT_enable.diff
-	0001-Remove-miInitializeBackingStore.patch)
+	      98_sm712_CRT_enable.diff
+        0001-Remove-miInitializeBackingStore.patch)
 sha256sums=('87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa'
             'd24016e40ee07a0cc1bedc1b9d3832c692b8a78453ac5a84bafab6ace4ff5da3'
-            'c3d8cec4f301ccd739d9709a962698390f99ce9749388273c22afba739d078c6')
+            '257cc6ccf2ed565daaacaf87cb2f1195b4c2f6bb95fefe5e89766f88393e6647')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/98_sm712_CRT_enable.diff
-  patch -Np1 -i "${srcdir}/0001-Remove-miInitializeBackingStore.patch"
+  patch -Np1 -i ${srcdir}/0001-Remove-miInitializeBackingStore.patch
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/xf86-video-sis/PKGBUILD b/extra/xf86-video-sis/PKGBUILD
index 1339a4111..09e85c862 100644
--- a/extra/xf86-video-sis/PKGBUILD
+++ b/extra/xf86-video-sis/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 198536 2013-10-30 15:27:33Z allan $
+# $Id: PKGBUILD 203636 2014-01-13 17:13:20Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sis
 pkgver=0.10.7
-pkgrel=4
+pkgrel=5
 pkgdesc="X.org SiS video driver"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'xf86dgaproto')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 optdepends=('sis-dri: DRI1 support from community repo')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
@@ -23,7 +23,7 @@ sha256sums=('be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0'
             '7a1a0b784664a0f011bd13395be1854dee407e901d2707ab1a6b8d20caa0a672')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i "${srcdir}/0001-Disable-UploadToScreen-and-DownloadFromScreen.patch"
   patch -Np1 -i ${srcdir}/git-fixes.patch
   patch -Np1 -i ${srcdir}/Xi.patch
@@ -32,7 +32,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/xf86-video-sisimedia/PKGBUILD b/extra/xf86-video-sisimedia/PKGBUILD
index 5522e7faa..083c610c7 100644
--- a/extra/xf86-video-sisimedia/PKGBUILD
+++ b/extra/xf86-video-sisimedia/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 198537 2013-10-30 15:27:58Z allan $
+# $Id: PKGBUILD 203637 2014-01-13 17:13:22Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sisimedia
 pkgver=0.9.1
-pkgrel=7
+pkgrel=8
 pkgdesc="X.org SiS 671 video driver"
 arch=(i686 x86_64)
 url="http://www.linuxconsulting.ro/xorg-drivers/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'xf86dgaproto')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 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 7676aa996..f825b2bd4 100644
--- a/extra/xf86-video-sisusb/PKGBUILD
+++ b/extra/xf86-video-sisusb/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 198538 2013-10-30 15:28:21Z allan $
+# $Id: PKGBUILD 203638 2014-01-13 17:13:23Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sisusb
 pkgver=0.9.6
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org SiS USB video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
 sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046'
             '9b64f4a9160c1055d3e01e1b603840986163a7880dbbb5c12f3a7d4c66739134')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/git-fixes.patch
   ./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-video-tdfx/PKGBUILD b/extra/xf86-video-tdfx/PKGBUILD
index 4c7b0abe1..ec47c5e18 100644
--- a/extra/xf86-video-tdfx/PKGBUILD
+++ b/extra/xf86-video-tdfx/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 198539 2013-10-30 15:28:43Z allan $
+# $Id: PKGBUILD 203639 2014-01-13 17:13:24Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-tdfx
 pkgver=1.4.5
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org tdfx video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 optdepends=('tdfx-dri: DRI1 support from community repo')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
@@ -18,15 +18,14 @@ sha256sums=('70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859'
             'a79d50f619e6976b90a73f1a9842390e1b3fa37e1ce519bfbb178bd3161af9b5')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  #cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/${pkgname}*
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/xf86-video-trident/PKGBUILD b/extra/xf86-video-trident/PKGBUILD
index bc2df6862..a590df57c 100644
--- a/extra/xf86-video-trident/PKGBUILD
+++ b/extra/xf86-video-trident/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 198540 2013-10-30 15:29:05Z allan $
+# $Id: PKGBUILD 203640 2014-01-13 17:13:25Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-trident
 pkgver=1.3.6
-pkgrel=4
+pkgrel=5
 pkgdesc="X.org Trident video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'xf86dgaproto')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff)
 sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104'
             'e51d7a9c5a3d7d2df7f56e482f5fbeac1babc2b30cdf4655052b11c9d4ec2c1c')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/git_fixes.diff
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/xf86-video-tseng/PKGBUILD b/extra/xf86-video-tseng/PKGBUILD
index c9f87a796..86e1b18b1 100644
--- a/extra/xf86-video-tseng/PKGBUILD
+++ b/extra/xf86-video-tseng/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 198541 2013-10-30 15:29:25Z allan $
+# $Id: PKGBUILD 203641 2014-01-13 17:13:26Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-tseng
 pkgver=1.2.5
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org tseng video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
 sha256sums=('c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819'
             '8a337e2bab9a5ee7ba15dde6665abcfa9559d769074873cb2a85cc86716bd5da')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/git-fixes.patch
   ./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-video-v4l/PKGBUILD b/extra/xf86-video-v4l/PKGBUILD
index 39ff92cd1..8b2cb021e 100644
--- a/extra/xf86-video-v4l/PKGBUILD
+++ b/extra/xf86-video-v4l/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 198542 2013-10-30 15:29:50Z allan $
+# $Id: PKGBUILD 203642 2014-01-13 17:13:28Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-v4l
 pkgver=0.2.0
-pkgrel=12
+pkgrel=13
 pkgdesc="X.org v4l video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         git-fixes.patch
@@ -20,7 +20,7 @@ md5sums=('2251ae2a0a905764941cd7b098e85ad1'
          '7d4d018f6bbff7e42672d1aabc75c5cf')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i "${srcdir}/git-fixes.patch"
   autoreconf -fi
   ./configure --prefix=/usr
@@ -28,7 +28,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xf86-video-vesa/PKGBUILD b/extra/xf86-video-vesa/PKGBUILD
index 45a3ddf95..ff8249bfb 100644
--- a/extra/xf86-video-vesa/PKGBUILD
+++ b/extra/xf86-video-vesa/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 198543 2013-10-30 15:30:23Z allan $
+# $Id: PKGBUILD 203643 2014-01-13 17:13:30Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-vesa
 pkgver=2.3.2
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org vesa video driver"
 arch=(i686 x86_64)
 license=('custom')
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         revert-kernelcheck.patch
@@ -20,7 +20,7 @@ sha256sums=('144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3'
             'beba7e8499b1d0b457762e28e7e413b223cbe87a84a39a3566e96c44da8544a1')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch"
   patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr
@@ -28,7 +28,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xf86-video-vmware/PKGBUILD b/extra/xf86-video-vmware/PKGBUILD
index 9b3247d92..8b9cabb55 100644
--- a/extra/xf86-video-vmware/PKGBUILD
+++ b/extra/xf86-video-vmware/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 201669 2013-12-17 21:04:57Z lcarlier $
+# $Id: PKGBUILD 203644 2014-01-13 17:13:31Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-vmware
 pkgver=13.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org vmware video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libdrm' 'svga-dri' 'mesa>=10.0')
-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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 options=('!emptydirs')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
@@ -19,19 +19,19 @@ sha256sums=('802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d'
             '7ab392cbc6258dc36df14ef60072c655d850bcfb6885111b41bcfe25dc1faacc')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   # grab from upstream git repo, needed for mesa>10.0
   patch -Np1 -i ../xatracker-v2-fixes.patch
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --enable-vmwarectrl-client
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/xf86-video-voodoo/PKGBUILD b/extra/xf86-video-voodoo/PKGBUILD
index 2d14fbb51..472e5f75b 100644
--- a/extra/xf86-video-voodoo/PKGBUILD
+++ b/extra/xf86-video-voodoo/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 198545 2013-10-30 15:31:13Z allan $
+# $Id: PKGBUILD 203645 2014-01-13 17:13:32Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-voodoo
 pkgver=1.2.5
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 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')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'xf86dgaproto')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8')
 
 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}/LICENSE"
diff --git a/extra/xfce4-clipman-plugin/PKGBUILD b/extra/xfce4-clipman-plugin/PKGBUILD
index fbebd7d55..e7232ebec 100644
--- a/extra/xfce4-clipman-plugin/PKGBUILD
+++ b/extra/xfce4-clipman-plugin/PKGBUILD
@@ -1,35 +1,32 @@
-# $Id: PKGBUILD 198547 2013-10-30 15:31:55Z allan $
+# $Id: PKGBUILD 205037 2014-02-03 16:37:24Z eric $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-clipman-plugin
-pkgver=1.2.3
-pkgrel=2
+pkgver=1.2.4
+pkgrel=1
 pkgdesc="A clipboard plugin for the Xfce4 panel"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libunique' 'libxtst')
+depends=('xfce4-panel' 'libunique' 'libxtst' 'qrencode')
 makedepends=('intltool')
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('61f3be97efa379cb358980c94e14692a')
+sha1sums=('d787962058f21a4cc2e354764375a6b84eba7e08')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|$(TARGET_DIR)/C/media|$(docdir)/html/C/media|' doc/Makefile.in
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
 	--localstatedir=/var \
-	--disable-static \
-	--enable-unique \
 	--disable-debug
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/xfce4-mailwatch-plugin/PKGBUILD b/extra/xfce4-mailwatch-plugin/PKGBUILD
index 0b3751ac9..5f945bb20 100644
--- a/extra/xfce4-mailwatch-plugin/PKGBUILD
+++ b/extra/xfce4-mailwatch-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197445 2013-10-26 02:49:51Z eric $
+# $Id: PKGBUILD 203597 2014-01-13 17:12:32Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Suzy Williams <suzanne.williams3@verizon.net>
 
 pkgname=xfce4-mailwatch-plugin
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A mailbox watch/check plugin for the Xfce4 panel"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin"
diff --git a/extra/xfce4-taskmanager/PKGBUILD b/extra/xfce4-taskmanager/PKGBUILD
index 8dbc2d150..e469d2ef2 100644
--- a/extra/xfce4-taskmanager/PKGBUILD
+++ b/extra/xfce4-taskmanager/PKGBUILD
@@ -1,27 +1,26 @@
-# $Id: PKGBUILD 198570 2013-10-30 15:40:42Z allan $
+# $Id: PKGBUILD 203398 2014-01-09 20:24:26Z eric $
 # Maintainer: 
 
 pkgname=xfce4-taskmanager
-pkgver=1.0.0
-pkgrel=3.1
+pkgver=1.0.1
+pkgrel=1
 pkgdesc="Easy to use task manager"
-arch=(i686 x86_64 'mips64el')
-license=('GPL2')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/applications/xfce4-taskmanager"
-groups=('xfce4-goodies')
+license=('GPL2')
 depends=('libwnck')
-makedepends=('pkgconfig' 'intltool')
-source=(http://archive.xfce.org/src/apps/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('cd205366ae771d2cbe72b5ca7b1257b0')
+makedepends=('intltool')
+groups=('xfce4-goodies')
+source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('b8a707b25e32c1a296eb50d609aa49b8')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
-    --localstatedir=/var --disable-static
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/xfig/PKGBUILD b/extra/xfig/PKGBUILD
index 548e94fab..c6a91bc2d 100644
--- a/extra/xfig/PKGBUILD
+++ b/extra/xfig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 194017 2013-09-10 00:31:09Z eric $
+# $Id: PKGBUILD 204604 2014-01-24 03:48:01Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xfig
 pkgver=3.2.5c
-pkgrel=1
+pkgrel=2
 pkgdesc="An interactive drawing tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfig.org/userman/"
@@ -13,21 +13,24 @@ makedepends=('imake')
 optdepends=('transfig: to use the frontend to convert fig files')
 options=('!makeflags' '!emptydirs')
 install=xfig.install
-source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz \
-	xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch \
-        xfig-3.2.5-urwfonts.patch \
+source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz
+	xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch
+        xfig-3.2.5-urwfonts.patch xfig-fix_dash_list_for_different_styles.patch
         LICENSE)
 sha1sums=('47d31dd9ad46819732ab74db340e11489db2c646'
           '926ad99c7221baa4aa9e9737722958860b2700fc'
           '45e7fb80193825b088d798089aeade2e1729c9ac'
           'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb'
+          '6aa98ab4497c30d18b4d0599f9d943bf78991246'
           '31edf4cfab708820ea3f114d095dfef5aa88e5aa')
 
 prepare() {
   cd ${pkgname}.${pkgver}
-  patch -p1 < ../xfig-3.2.4-redhat.patch
-  patch -p1 < ../xfig-3.2.5-color-resources.patch
-  patch -p1 < ../xfig-3.2.5-urwfonts.patch
+  patch -p1 -i "${srcdir}/xfig-3.2.4-redhat.patch"
+  patch -p1 -i "${srcdir}/xfig-3.2.5-color-resources.patch"
+  patch -p1 -i "${srcdir}/xfig-3.2.5-urwfonts.patch"
+  patch -p1 -i "${srcdir}/xfig-fix_dash_list_for_different_styles.patch"
+
   sed -i -e 's|X11R6/||' -e 's|image/x-xfig|image/fig;image/x-xfig|' xfig.desktop
   echo -e "Categories=Application;Graphics;\nIcon=xfig" >> xfig.desktop
   sed -i 's/#define XAW3D/XCOMM #define XAW3D/' Imakefile
diff --git a/extra/xfig/xfig-fix_dash_list_for_different_styles.patch b/extra/xfig/xfig-fix_dash_list_for_different_styles.patch
new file mode 100644
index 000000000..7c5aaa94f
--- /dev/null
+++ b/extra/xfig/xfig-fix_dash_list_for_different_styles.patch
@@ -0,0 +1,34 @@
+--- xfig.3.2.5c/w_drawprim.c	2012-10-17 00:14:09.000000000 +0200
++++ xfig.3.2.5c/w_drawprim.c	2013-11-29 02:45:36.950448714 +0100
+@@ -1292,14 +1292,23 @@ void set_fill_gc(int fill_style, int op,
+ }
+ 
+ 
+-static unsigned char dash_list[16][2] = {{255, 255}, {255, 255},
+-					{255, 255}, {255, 255},
+-					{255, 255}, {255, 255},
+-					{255, 255}, {255, 255},
+-					{255, 255}, {255, 255},
+-					{255, 255}, {255, 255},
+-					{255, 255}, {255, 255},
+-					{255, 255}, {255, 255}};
++static unsigned char dash_list[16][8] = {
++		    {255, 255, 255, 255, 255, 255, 255, 255},
++		    {255, 255, 255, 255, 255, 255, 255, 255},
++		    {255, 255, 255, 255, 255, 255, 255, 255},
++		    {255, 255, 255, 255, 255, 255, 255, 255},
++		    {255, 255, 255, 255, 255, 255, 255, 255},
++		    {255, 255, 255, 255, 255, 255, 255, 255},
++		    {255, 255, 255, 255, 255, 255, 255, 255},
++		    {255, 255, 255, 255, 255, 255, 255, 255},
++		    {255, 255, 255, 255, 255, 255, 255, 255},
++		    {255, 255, 255, 255, 255, 255, 255, 255},
++		    {255, 255, 255, 255, 255, 255, 255, 255},
++		    {255, 255, 255, 255, 255, 255, 255, 255},
++		    {255, 255, 255, 255, 255, 255, 255, 255},
++		    {255, 255, 255, 255, 255, 255, 255, 255},
++		    {255, 255, 255, 255, 255, 255, 255, 255},
++		    {255, 255, 255, 255, 255, 255, 255, 255}};
+ 
+ static int join_styles[3] = { JoinMiter, JoinRound, JoinBevel };
+ static int cap_styles[3] = { CapButt, CapRound, CapProjecting };
diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 1d6ddbd3a..da5d6f7af 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198581 2013-10-30 15:44:36Z allan $
+# $Id: PKGBUILD 204527 2014-01-22 01:48:58Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-lib
 pkgver=1.2.4
-pkgrel=1
+pkgrel=3
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xine-project.org"
@@ -11,8 +11,8 @@ license=('LGPL' 'GPL')
 depends=('libxvmc' 'ffmpeg' 'libxinerama')
 makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'libmodplug'
              'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad'
-             'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs')
-[ "$CARCH" = "mips64el" ] || makedepends+=('mesa' 'glu' 'libvdpau')
+             'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'gdk-pixbuf2')
+[ "$CARCH" = "mips64el" ] || makedepends+=('glu' 'libvdpau')
 optdepends=('imagemagick: for using the imagemagick plugin' \
             'jack: for using the jack plugin' \
             'vcdimager: for using the vcd plugin')
@@ -29,7 +29,8 @@ optdepends+=('wavpack: for using the wavpack plugin' \
             'libcaca: for using the caca plugin' \
             'libbluray: for using the bluray plugin' \
             'gnome-vfs: for using the gnome-vfs plugin'
-            'smbclient: for using the samba plugin')
+            'smbclient: for using the samba plugin'
+            'gdk-pixbuf2: for using the gdk-pixbuf plugin')
 [ "$CARCH" = "mips64el" ] || optdepends+=('libvdpau: for using the VDPAU plugin')
 source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
 sha1sums=('32267c5fcaa1439a5fbf7606d27dc4fafba9e504')
diff --git a/extra/xmlsec/PKGBUILD b/extra/xmlsec/PKGBUILD
index 331860bfe..58c6ef22d 100644
--- a/extra/xmlsec/PKGBUILD
+++ b/extra/xmlsec/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198582 2013-10-30 15:44:58Z allan $
+# $Id: PKGBUILD 203598 2014-01-13 17:12:34Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Hussam Al-Tayeb <ht990332@gmail.com>
 
 pkgname=xmlsec
 pkgver=1.2.19
-pkgrel=1
+pkgrel=2
 pkgdesc="XML Security Library is a C library based on LibXML2"
 license=('custom')
 arch=(i686 x86_64 'mips64el')
diff --git a/extra/xorg-server/CVE-2013-6424.diff b/extra/xorg-server/CVE-2013-6424.diff
new file mode 100644
index 000000000..8c664b66e
--- /dev/null
+++ b/extra/xorg-server/CVE-2013-6424.diff
@@ -0,0 +1,49 @@
+From patchwork Wed Oct  2 13:47:54 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: exa: only draw valid trapezoids
+From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+X-Patchwork-Id: 14769
+Message-Id: <524C240A.9010607@canonical.com>
+To: "X.Org Devel List" <xorg-devel@lists.freedesktop.org>
+Date: Wed, 02 Oct 2013 15:47:54 +0200
+
+Fixes freedesktop.org bug https://bugs.freedesktop.org/show_bug.cgi?id=67484
+
+If t->bottom is close to MIN_INT, removing top can wraparound, so do the check properly.
+A similar fix should also be applied to pixman.
+
+Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+
+---
+
+
+diff --git a/exa/exa_render.c b/exa/exa_render.c
+index 172e2b5..807eeba 100644
+--- a/exa/exa_render.c
++++ b/exa/exa_render.c
+@@ -1141,7 +1141,8 @@ exaTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
+ 
+         exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
+         for (; ntrap; ntrap--, traps++)
+-            (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1);
++            if (xTrapezoidValid(traps))
++                (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1);
+         exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
+ 
+         xRel = bounds.x1 + xSrc - xDst;
+diff --git a/render/picture.h b/render/picture.h
+index c85353a..fcd6401 100644
+--- a/render/picture.h
++++ b/render/picture.h
+@@ -211,7 +211,7 @@ typedef pixman_fixed_t xFixed;
+ /* whether 't' is a well defined not obviously empty trapezoid */
+ #define xTrapezoidValid(t)  ((t)->left.p1.y != (t)->left.p2.y && \
+ 			     (t)->right.p1.y != (t)->right.p2.y && \
+-			     (int) ((t)->bottom - (t)->top) > 0)
++			     ((t)->bottom > (t)->top))
+ 
+ /*
+  * Standard NTSC luminance conversions:
+
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index da0871cc8..b7a2318bf 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,40 +1,36 @@
-# $Id: PKGBUILD 201503 2013-12-13 14:16:21Z andyrtr $
+# $Id: PKGBUILD 203648 2014-01-13 17:13:35Z 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.5
-pkgrel=1
+pkgver=1.15.0
+pkgrel=5 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org"
-makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto'
-             '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') 
+makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 
+             'inputproto' 'fontsproto' 'videoproto' 'presentproto' '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'
+             'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto' 'libxshmfence') 
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         autoconfig-nvidia.patch
         autoconfig-sis.patch
-        xserver-1.6.0-less-acpi-brokenness.patch
-        bug59825.patch
-        xephyr-glx.patch
         xvfb-run
         xvfb-run.1
         10-quirks.conf
         loongson.patch
-        fb-rename-wfbDestroyGlyphCache.patch)
-sha256sums=('8d0f06bf1416487a5170318477088826a8d737d4a201e996b2dc1ecff47461d1'
+        CVE-2013-6424.diff)
+sha256sums=('613b2f2e7ee2a06d2f8e862c836dc70d319c52f1537749e027398f40086aabb8'
             '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
-            'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'
-            '26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588'
-            'bb63658d250c21bbfaf94c5417f2920ce5963ee1f7db6cac2b163a54f2e9b619'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
             '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
             'c1081681093cd56003f77e1bf4febc3e6bb84a1bde95292fbe19e8c461a7d207'
-            'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1')
+            '89948993afd4d9aec6a0bdbaf62f494e9956bb77a0386307d497f340a818ff61')
 
 prepare() {
   cd "${pkgbase}-${pkgver}"
@@ -47,17 +43,8 @@ prepare() {
   # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html
   patch -Np1 -i "${srcdir}/loongson.patch"
 
-  # https://bugs.freedesktop.org/show_bug.cgi?id=59825 - fixes crash with vboxvideo
-#  patch -Np1 -i ../bug59825.patch
-
-  # From Fedora. Do not build acpid code, it is buggy and we do not need it
-  patch -Np1 -i ../xserver-1.6.0-less-acpi-brokenness.patch
-
-  # Add GLX support for Xephyr - https://bugs.freedesktop.org/show_bug.cgi?id=62346
-  patch -Np0 -i ../xephyr-glx.patch
-
-  # http://cgit.freedesktop.org/xorg/xserver/commit/fb/wfbrename.h?id=5047810a4c20fab444b8c6eb146c55dcdb0d4219
-  patch -Np1 -i ../fb-rename-wfbDestroyGlyphCache.patch
+  # Fix CVE-2013-6424 (FS#38401)
+  patch -Np1 -i ../CVE-2013-6424.diff
 }
 
 build() {
@@ -90,6 +77,10 @@ build() {
       --with-xkb-path=/usr/share/X11/xkb \
       --with-xkb-output=/var/lib/xkb \
       --with-fontrootdir=/usr/share/fonts
+      
+#             --without-dtrace \
+#	--disable-linux-acpi --disable-linux-apm \
+
   make
 
   # Disable subdirs for make install rule to make splitting easier
@@ -119,12 +110,13 @@ package_xorg-server-common() {
 
 package_xorg-server() {
   pkgdesc="Xorg X server"
-  depends=(libxdmcp libxfont libpciaccess libdrm 'pixman>=0.28.0' libgcrypt libxau xorg-server-common xf86-input-evdev)
+  depends=(libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence)
   backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf')
   # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
-  provides=('X-ABI-VIDEODRV_VERSION=14' 'X-ABI-XINPUT_VERSION=19' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server')
+  # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
+  provides=('X-ABI-VIDEODRV_VERSION=15' 'X-ABI-XINPUT_VERSION=20' 'X-ABI-EXTENSION_VERSION=8.0' 'x-server')
   groups=('xorg')
-  conflicts=('nvidia-utils<=290.10')
+  conflicts=('nvidia-utils<=331.20')
 
   cd "${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install
@@ -154,7 +146,7 @@ package_xorg-server() {
 
 package_xorg-server-xephyr() {
   pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont libgl libgcrypt libxv 'pixman>=0.28.0' xorg-server-common)
+  depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms')
 
   cd "${pkgbase}-${pkgver}/hw/kdrive"
   make DESTDIR="${pkgdir}" install
@@ -165,7 +157,7 @@ package_xorg-server-xephyr() {
 
 package_xorg-server-xvfb() {
   pkgdesc="Virtual framebuffer X server"
-  depends=(libxfont libxdmcp libxau libgcrypt 'pixman>=0.28.0' xorg-server-common xorg-xauth)
+  depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common xorg-xauth)
 
   cd "${pkgbase}-${pkgver}/hw/vfb"
   make DESTDIR="${pkgdir}" install
@@ -179,7 +171,7 @@ package_xorg-server-xvfb() {
 
 package_xorg-server-xnest() {
   pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont libxext libgcrypt 'pixman>=0.28.0' xorg-server-common)
+  depends=(libxfont libxext libgcrypt pixman xorg-server-common)
 
   cd "${pkgbase}-${pkgver}/hw/xnest"
   make DESTDIR="${pkgdir}" install
@@ -190,7 +182,7 @@ package_xorg-server-xnest() {
 
 package_xorg-server-xdmx() {
   pkgdesc="Distributed Multihead X Server and utilities"
-  depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes 'pixman>=0.28.0' xorg-server-common)
+  depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common)
 
   cd "${pkgbase}-${pkgver}/hw/dmx"
   make DESTDIR="${pkgdir}" install
@@ -204,9 +196,8 @@ package_xorg-server-devel() {
   depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc
            xproto randrproto renderproto xextproto inputproto kbproto 
            fontsproto pixman videoproto xf86driproto glproto 
-           mesa dri2proto xineramaproto libpciaccess
-           # see FS#32146
-           resourceproto scrnsaverproto
+           mesa dri2proto dri3proto xineramaproto libpciaccess
+           resourceproto scrnsaverproto presentproto
            # not technically required but almost every Xorg pkg needs it to build
            xorg-util-macros)
 
diff --git a/extra/xorg-server/bug59825.patch b/extra/xorg-server/bug59825.patch
deleted file mode 100644
index b405d136d..000000000
--- a/extra/xorg-server/bug59825.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -U 3 -b -d -p -r -- a/glx/glxdri.c b/glx/glxdri.c

---- a/glx/glxdri.c	2013-01-24 22:14:35.216092949 +0100

-+++ b/glx/glxdri.c	2013-01-24 22:13:48.499427991 +0100

-@@ -971,6 +971,8 @@ __glXDRIscreenProbe(ScreenPtr pScreen)

-     size_t buffer_size;

-     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);

- 

-+    framebuffer.base = NULL;

-+

-     if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||

-         !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) {

-         LogMessage(X_INFO,
\ No newline at end of file
diff --git a/extra/xorg-server/fb-rename-wfbDestroyGlyphCache.patch b/extra/xorg-server/fb-rename-wfbDestroyGlyphCache.patch
deleted file mode 100644
index 177f908ef..000000000
--- a/extra/xorg-server/fb-rename-wfbDestroyGlyphCache.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5047810a4c20fab444b8c6eb146c55dcdb0d4219 Mon Sep 17 00:00:00 2001
-From: Aaron Plattner <aplattner@nvidia.com>
-Date: Wed, 06 Mar 2013 17:40:28 +0000
-Subject: fb: Rename wfbDestroyGlyphCache
-
-Renaming this function was missed in commit
-9cbcb5bd6a5360a128d15b77a02d8d3351f74366, so both libfb.so and libwfb.so define
-functions named fbDestroyGlyphCache.
-
-Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
-Reviewed-by: Søren Sandmann <ssp@redhat.com>
-Signed-off-by: Keith Packard <keithp@keithp.com>
----
-diff --git a/fb/wfbrename.h b/fb/wfbrename.h
-index 588440c..54d00d0 100644
---- a/fb/wfbrename.h
-+++ b/fb/wfbrename.h
-@@ -52,6 +52,7 @@
- #define fbCreatePixmap wfbCreatePixmap
- #define fbCreatePixmapBpp wfbCreatePixmapBpp
- #define fbCreateWindow wfbCreateWindow
-+#define fbDestroyGlyphCache wfbDestroyGlyphCache
- #define fbDestroyPixmap wfbDestroyPixmap
- #define fbDestroyWindow wfbDestroyWindow
- #define fbDoCopy wfbDoCopy
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xorg-server/xephyr-glx.patch b/extra/xorg-server/xephyr-glx.patch
deleted file mode 100644
index 3011e2497..000000000
--- a/extra/xorg-server/xephyr-glx.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- hw/kdrive/ephyr/ephyrinit.c	2013-03-14 19:07:41.904335711 +0100
-+++ hw/kdrive/ephyr/ephyrinit.c.new	2013-03-14 19:07:33.024335444 +0100
-@@ -28,6 +28,7 @@
- #endif
- #include "ephyr.h"
- #include "ephyrlog.h"
-+#include "glx_extinit.h"
- 
- extern Window EphyrPreExistingHostWin;
- extern Bool EphyrWantGrayScale;
-@@ -53,9 +54,28 @@
-     KdCardInfoAdd(&ephyrFuncs, 0);
- }
- 
-+static const ExtensionModule ephyrExtensions[] = {
-+#ifdef GLXEXT
-+ { GlxExtensionInit, "GLX", &noGlxExtension },
-+#endif
-+};
-+
-+static
-+void ephyrExtensionInit(void)
-+{
-+ int i;
-+
-+ for (i = 0; i < ARRAY_SIZE(ephyrExtensions); i++)
-+ LoadExtension(&ephyrExtensions[i], TRUE);
-+}
-+
-+
- void
- InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
- {
-+    if (serverGeneration == 1)
-+        ephyrExtensionInit();
-+
-     KdInitOutput(pScreenInfo, argc, argv);
- }
- 
diff --git a/extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch b/extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch
deleted file mode 100644
index b42c2d7c8..000000000
--- a/extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0002cde5312e785529b2901d7f8a82d5623e4ca7 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 9 Nov 2011 11:52:06 +1000
-Subject: [PATCH 2/7] Don't build the ACPI code.
-
-No good can come of this.
----
- configure.ac |    1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index a12783c..54f4464 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1620,7 +1620,6 @@ if test "x$XORG" = xyes; then
- 		  	linux_alpha=yes
- 			;;
- 		  i*86|amd64*|x86_64*|ia64*)
--			linux_acpi="yes"
- 			;;
- 		  *)
- 			;;
--- 
-1.7.10.1
-
diff --git a/extra/xsane/PKGBUILD b/extra/xsane/PKGBUILD
index dd25f19b9..eee9d0a0e 100644
--- a/extra/xsane/PKGBUILD
+++ b/extra/xsane/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 185793 2013-05-19 08:52:55Z tpowa $
+# $Id: PKGBUILD 203218 2014-01-05 19:22:33Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgbase=xsane
 pkgname=('xsane' 'xsane-gimp')
-pkgver=0.998
-pkgrel=5
+pkgver=0.999
+pkgrel=1
 arch=(i686 x86_64 mips64el)
 url="http://www.xsane.org"
 license=('GPL2')
 makedepends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg' 'gimp')
 source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz
 	xsane-0.995-xdg-open.patch)
-md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa'
+md5sums=('9927f21e1ab6ba96315e7f0e30746deb'
          '15541ff0ddc10acfa2059cf99d5478eb')
 
 prepare() {
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index 0c503436a..ca8e7f32a 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 200773 2013-12-04 20:25:36Z andyrtr $
+# $Id: PKGBUILD 204457 2014-01-20 06:42:42Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=300
+pkgver=301
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
         LICENSE)
-md5sums=('6adc7c7f39ab2a71fd83747049d60358'
+md5sums=('50ba12a4decca06213203bff1b35ef19'
          '10ecc3f8ee91e3189863a172f68282d2')
 
 build() {
diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD
index 80bfe578d..9bb4fe396 100644
--- a/extra/yelp/PKGBUILD
+++ b/extra/yelp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198585 2013-10-30 15:47:13Z allan $
+# $Id: PKGBUILD 203599 2014-01-13 17:12:35Z andyrtr $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=yelp
 pkgver=3.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A help browser for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('webkitgtk' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'xz' 'bzip2'
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index b989acd8c..e4ceb0069 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 194594 2013-09-19 04:27:04Z pierre $
+# $Id: PKGBUILD 203280 2014-01-07 10:02:57Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
-pkgname=zsh
-pkgver=5.0.2
-pkgrel=4
-pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
+pkgbase=zsh
+pkgname=('zsh' 'zsh-doc')
+pkgver=5.0.5
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.zsh.org/'
 license=('custom')
-depends=('pcre' 'libcap' 'gdbm')
-backup=('etc/zsh/zprofile')
-install=zsh.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'zprofile')
-md5sums=('b8f2ad691acf58b3252225746480dcad'
-         '24a9335edf77252a7b5f52e079f7aef7')
+makedepends=('pcre' 'libcap' 'gdbm')
+source=("http://www.zsh.org/pub/zsh-${pkgver}.tar.bz2"
+        "http://www.zsh.org/pub/zsh-${pkgver}-doc.tar.bz2"
+        'zprofile' 'xattr-include.patch')
+md5sums=('6156dc2f19b0a067bdbc0fb7f81e2017'
+         '1eea70e7401a7a2116fa8de6ee5e8d32'
+         '24a9335edf77252a7b5f52e079f7aef7'
+         'd9af40097fcf112beba34919e8a5934f')
 
 prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgbase}-${pkgver}"
 
 	# Set correct keymap path
 	sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys
@@ -29,12 +30,17 @@ prepare() {
 	done
 	rm -f  Completion/Linux/Command/_{pkgtool,rpmbuild,yast}
 	rm -f  Completion/Unix/Command/_{osc,systemd}
+
+	# Workaround for FS#38387
+	patch -p0 -i "${srcdir}/xattr-include.patch"
 }
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgbase}-${pkgver}"
 
 	./configure --prefix=/usr \
+		--docdir=/usr/share/doc/zsh \
+		--htmldir=/usr/share/doc/zsh/html \
 		--enable-etcdir=/etc/zsh \
 		--enable-zshenv=/etc/zsh/zshenv \
 		--enable-zlogin=/etc/zsh/zlogin \
@@ -55,13 +61,28 @@ build() {
 }
 
 check() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgbase}-${pkgver}"
 	HOME="${srcdir}" make check
 }
 
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+package_zsh() {
+	pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
+	depends=('pcre' 'libcap' 'gdbm')
+	backup=('etc/zsh/zprofile')
+	install=zsh.install
+
+	cd "${srcdir}/${pkgbase}-${pkgver}"
 	make DESTDIR="${pkgdir}/" install
 	install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile"
 	install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+
+package_zsh-doc() {
+	pkgdesc='Info, HTML and PDF format of the ZSH documentation'
+	install=zsh-doc.install
+
+	cd "${srcdir}/${pkgbase}-${pkgver}"
+	make DESTDIR="${pkgdir}/" install.info install.html
+	install -D -m644 Doc/zsh.pdf "${pkgdir}/usr/share/doc/zsh/zsh.pdf"
+	install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/extra/zsh/xattr-include.patch b/extra/zsh/xattr-include.patch
new file mode 100644
index 000000000..0c13a95db
--- /dev/null
+++ b/extra/zsh/xattr-include.patch
@@ -0,0 +1,16 @@
+--- Src/Modules/attr.c	2013-11-27 20:00:20.000000000 +0100
++++ Src/Modules/attr.c	2014-01-06 11:55:38.550079342 +0100
+@@ -27,11 +27,12 @@
+  *
+  */
+ 
++#include <sys/xattr.h>
++
+ #include "attr.mdh"
+ #include "attr.pro"
+ 
+ #include <sys/types.h>
+-#include <sys/xattr.h>
+ 
+ static ssize_t
+ xgetxattr(const char *path, const char *name, void *value, size_t size, int symlink)
diff --git a/extra/zsh/zsh-doc.install b/extra/zsh/zsh-doc.install
new file mode 100644
index 000000000..2582eae53
--- /dev/null
+++ b/extra/zsh/zsh-doc.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(zsh.info zsh.info-1 zsh.info-2 zsh.info-3 zsh.info-4 zsh.info-5 zsh.info-6)
+
+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
+}
+
+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/gis/grass/PKGBUILD b/gis/grass/PKGBUILD
deleted file mode 100644
index eaf1dfc5c..000000000
--- a/gis/grass/PKGBUILD
+++ /dev/null
@@ -1,119 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: Emiliano Vavassori <syntaxerrormmm(at)gmail.com>
-
-pkgname=grass
-pkgver=6.4.2
-pkgrel=2
-pkgdesc='Geographic Information System (GIS) used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization.'
-arch=('i686' 'x86_64')
-url='http://grass.fbk.eu/'
-license=('GPL')
-depends=('cfitsio' 'fftw' 'gdal' 'libjpeg' 'libpng' 'libtiff' 'libxmu' 'mesa' 'python2' 'postgresql' 'proj' 'tcl' 'tk' 'wxpython' 'xorg-server')
-makedepends=('freetype2')
-optdepends=('sqlite3: sqlite3 database interface'
-	    'mysql: mysql database interface'
-            'r: R language interface'
-            'blas: required for GMATH library'
-            'lapack: required for GMATH library'
-	    'cairo: cairo support'
-	    'ffmpeg: ffmpeg support'
-	    'lesstif: motif support')
-options=('!libtool' '!makeflags')
-install='grass.install'
-source=("http://grass.fbk.eu/grass64/source/${pkgname}-${pkgver}.tar.gz"
-        "grass.sh"
-        "grass.conf")
-md5sums=('d3398d6b1e3a2ef19cfb6e39a5ae9919'
-         'a0e0ac6275e09a272f8ec38d3c0b4b3a'
-         '6103480c2a1adc19a50b9e925e5e6d4c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # python2 fix
-  sed -i 's_python $< $(GISBASE) > $@_python2 $< $(GISBASE) > $@_' gui/wxpython/Makefile
-  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
-
-  # the following exports are probably not needed
-  export PYTHON=python2
-  export DOXNAME=python2
-  export GRASS_python=python2
-
-  # fix wxpython error
-  sed -i 's/python/&2/' ./include/Make/Platform.make.in
-
-  # see ${srcdir}/grass-6.4.0/REQUIREMENTS.html for options
-  ./configure \
-    --prefix=/opt \
-    --with-fftw \
-    --with-postgres \
-    --with-freetype \
-    --with-freetype-includes=/usr/include/freetype2 \
-    --with-nls \
-    --with-gdal \
-    --with-geos \
-    --with-proj \
-    --with-proj-share=/usr/share/proj \
-    --with-python=/usr/bin/python2-config \
-    --with-wxwidgets=/usr/bin/wx-config
-
-    # sqlite3 support
-    # --with-sqlite \
-
-    # mysql support
-    # --with-mysql \
-    # --with-mysql-includes=/usr/include/mysql \
-
-    # blas support
-    # --with-blas \
-
-    # lapack support
-    # --with-lapack \
-
-  make
-
-  # some more potential problems nvm, works without, but save for future use if problems arrise
-  #cd ${pkgdir}/opt/grass-${pkgver}
-  #sed -i 's/PYTHON = python/PYTHON = python2/' include/Make/Python.make
-  #sed -i 's/GRASS_PYTHON=python/GRASS_PYTHON=python2/' etc/Init.sh
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make \
-    INST_DIR=${pkgdir}/opt/grass-${pkgver} \
-    BINDIR=${pkgdir}/usr/bin \
-    install
-
-  # fix $GISBASE path
-  sed -i "s|GISBASE=${pkgdir}/opt/grass-${pkgver}|GISBASE=/opt/grass-${pkgver}|g" \
-    ${pkgdir}/usr/bin/grass64
-
-  # install profile.d file
-  install -D ${srcdir}/grass.sh \
-    ${pkgdir}/etc/profile.d/grass.sh
-
-  # install some freedesktop.org compatibility
-  install -D -m644 gui/icons/grass.desktop \
-    ${pkgdir}/usr/share/applications/grass.desktop
-
-  sed -i -e 's/grass65/grass64/' -e 's_/usr/share/icons_/usr/share/pixmaps_' \
-    ${pkgdir}/usr/share/applications/grass.desktop
-
-  install -D -m644 gui/icons/grass-48x48.png \
-    ${pkgdir}/usr/share/pixmaps/grass-48x48.png
-
-  install -D -m644 ${srcdir}/grass.conf \
-    ${pkgdir}/etc/ld.so.conf.d/grass.conf
-
-  # install g.html2man which is needed for some extensions
-  # FS#25705 - [grass] g.html2man is not installed into package directory
-  # https://bugs.archlinux.org/task/25705
-  # most likely upstream problem which will be fixed in a version later than 6.4.1
-  cp -r ./tools/g.html2man ${pkgdir}/opt/${pkgname}-${pkgver}/tools
-}
diff --git a/gis/grass/grass.conf b/gis/grass/grass.conf
deleted file mode 100644
index bb4964d93..000000000
--- a/gis/grass/grass.conf
+++ /dev/null
@@ -1 +0,0 @@
-/opt/grass/lib
diff --git a/gis/grass/grass.install b/gis/grass/grass.install
deleted file mode 100644
index 878ea0186..000000000
--- a/gis/grass/grass.install
+++ /dev/null
@@ -1,26 +0,0 @@
-## arg 1:  the new package version
-post_install() {
-  pkgver=${1%-*}
-
-  # Create symlink for version workaround.
-  ln -sf /opt/grass-${pkgver} /opt/grass
-
-  echo 'Please relogin for required variables to be set from /etc/profile.d/grass.sh'
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  pkgver=${1%-*}
-
-  # Updating symlink for new version
-  ln -sf /opt/grass-${pkgver} /opt/grass
-}
-
-## arg 1: the old package version
-pre_remove() {
-  # Removing cruft symlink
-  rm -f /opt/grass
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gis/grass/grass.sh b/gis/grass/grass.sh
deleted file mode 100644
index ccc2fcd7e..000000000
--- a/gis/grass/grass.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export GISBASE=/opt/grass
-export PATH=$PATH:$GISBASE/bin
-export MANPATH=$MANPATH:$GISBASE/man
-export GRASS_PYTHON=python2
diff --git a/gis/libfreexl/PKGBUILD b/gis/libfreexl/PKGBUILD
deleted file mode 100644
index 533071120..000000000
--- a/gis/libfreexl/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Bruno Gola <brunogola at gmail dot com>
-pkgname=libfreexl
-pkgver=1.0.0b
-pkgrel=1
-pkgdesc="Library to extract valid data from within an Excel (.xls) spreadsheet."
-arch=('i686' 'x86_64')
-url="https://www.gaia-gis.it/fossil/freexl/index"
-license=('MPL')
-source=("http://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-1.0.0b.tar.gz")
-md5sums=('e2e1c59eb2883d825782dfe8fe244207')
-
-build() {
-    cd "$srcdir/freexl-$pkgver"
-    ./configure --prefix=/usr
-    make
-}
-
-package() {
-    cd "$srcdir/freexl-$pkgver"
-    make DESTDIR="$pkgdir/" install
-}
diff --git a/gis/libspatialite/PKGBUILD b/gis/libspatialite/PKGBUILD
deleted file mode 100644
index 13e2b8335..000000000
--- a/gis/libspatialite/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Brian Galey <bkgaley at gmail dot com>
-# Contributor: Pietro Zambelli <peter.zamb at gmail dot com>
-pkgname=libspatialite
-pkgver=3.0.1
-pkgrel=2
-pkgdesc="SQLite extension to support spatial data types and operations"
-arch=('i686' 'x86_64')
-url="https://www.gaia-gis.it/fossil/libspatialite/index"
-license=('MPL')
-depends=('geos' 'proj' 'sqlite3' 'libfreexl')
-options=('!libtool')
-source=("http://www.gaia-gis.it/gaia-sins/libspatialite-3.0.1.tar.gz")
-md5sums=('450d1a0d9da1bd9f770b7db3f2509f69')
-
-build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    ./configure --prefix=/usr
-    make
-}
-
-package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make DESTDIR="$pkgdir/" install
-}
diff --git a/gis/merkaartor/PKGBUILD b/gis/merkaartor/PKGBUILD
deleted file mode 100644
index 333bc15fb..000000000
--- a/gis/merkaartor/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Michael Kanis <mkanis gmx de>
-# Contributor: Paulo Freire <paulofreire gmail com>
-# Contributor: Brice Maron <brice bmaron net>
-
-pkgname=merkaartor
-pkgver=0.17.2
-pkgrel=3
-pkgdesc='OpenStreetMap editor'
-url='http://merkaartor.be/'
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('boost')
-depends=('qtwebkit' 'exiv2')
-optdepends=('gpsd' 'desktop-file-utils' 'gtk-update-icon-cache')
-source=("http://www.merkaartor.be/attachments/download/253/merkaartor-${pkgver}.tar.bz2")
-sha1sums=('f789141db427bf25bb3b61801fefc98ab0430012')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	echo 'QMAKE_MOC = $$QMAKE_MOC -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED' >> src/src.pro
-	lrelease src/src.pro
-	qmake Merkaartor.pro \
-		PREFIX="/usr" \
-		GEOIMAGE=1 \
-		NODEBUG=1 \
-		RELEASE=1 \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/gis/merkaartor/install b/gis/merkaartor/install
deleted file mode 100644
index af0c8724a..000000000
--- a/gis/merkaartor/install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	update-desktop-database -q
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/gis/qgis/PKGBUILD b/gis/qgis/PKGBUILD
deleted file mode 100644
index cb06ed0a6..000000000
--- a/gis/qgis/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# Maintainer: Lantald < lantald at gmx.com
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-# Contributor: Eric Forgeot < http://esclinux.tk >
-
-pkgname=qgis
-pkgver=1.8.0
-pkgrel=2
-pkgdesc='Quantum GIS is a Geographic Information System (GIS) that supports vector, raster & database formats'
-url='http://qgis.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-# update to http://www.qgis.org/wiki/Building_QGIS_from_Source#Overview
-depends=('libmysqlclient' 'postgresql-libs' 'sqlite3' 'jasper' 'curl' 'qt' 'python2' 'python2-qt' 'giflib'  'cfitsio' 'qwt' 'gdal' 'flex' 'bison' 'libspatialite' 'spatialindex')
-makedepends=('cmake' 'grass' 'gsl' 'postgis' 'netcdf' 'fcgi' 'python2-sip')
-optdepends=('postgis: postgis support and SPIT plugin'
-            'fcgi: qgis mapserver'
-            'python2-sip: python-support'
-            'grass: grass plugin'
-            'gsl: georeferencer')
-options=('!makeflags')
-source=("http://qgis.org/downloads/qgis-${pkgver}.tar.bz2"
-        'qgis.desktop')
-
-md5sums=('1d60520f81d7763c026d0af887ac9a05'
-         '8ab66039f2aba519b92f52272ec3c13e')
-
-build() {
-  # Fix insecure RPATH is weird, but just works ;)
-  # echo "os.system(\"sed -i '/^LFLAGS/s|-Wl,-rpath,.\+ ||g' gui/Makefile core/Makefile\")" >> python/configure.py.in
-  #cd qgis-${pkgver}
-
-  rm -rf build
-  mkdir build
-  cd build
-
-  cmake ../qgis-${pkgver} \
-    -DENABLE_TESTS=OFF \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DGRASS_PREFIX=/opt/grass \
-    -DQGIS_MANUAL_SUBDIR=share/man \
-    -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-    -DPYTHON_SITE_PACKAGES_DIR=/usr/lib/python2.7/site-packages \
-    -DPYTHON_INCLUDE_PATH=/usr/include/python2.7/
-
-  make
-}
-
-package() {
-  cd build
-
-  make DESTDIR=${pkgdir} install
-  
-  # create a more user-friendly application name link
-  ln -s /usr/bin/qgis $pkgdir/usr/bin/quantum-gis
-  
-  # install some freedesktop.org compatibility
-  install -D -m644 ${srcdir}/qgis.desktop \
-    ${pkgdir}/usr/share/applications/qgis.desktop
-}
diff --git a/gis/qgis/qgis.desktop b/gis/qgis/qgis.desktop
deleted file mode 100644
index c3db5ad08..000000000
--- a/gis/qgis/qgis.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Quantum GIS
-GenericName="GIS"
-Comment="Geographic Information System (GIS) that supports vector, raster & database formats"
-Exec=/usr/bin/qgis
-Icon=/usr/share/qgis/images/icons/qgis-icon.png
-Terminal=false
-MultipleArgs=false
-Type=Application
-Categories=Application;Science
diff --git a/gis/qgis/qgis_1.7.4_gcc4.7.patch b/gis/qgis/qgis_1.7.4_gcc4.7.patch
deleted file mode 100644
index 858a42c94..000000000
--- a/gis/qgis/qgis_1.7.4_gcc4.7.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-+++ qgis-1.7.4/src/core/spatialindex/storagemanager/DiskStorageManager.cc	2012-04-21 13:58:04.107239275 +0300
-@@ -26,6 +26,7 @@
- #include <sys/stat.h>
- #include <stdio.h>
- #include <cstring>
-+#include <unistd.h>
- 
- #ifdef WIN32
- #include <io.h>
-
-+++ qgis-1.7.4/src/core/spatialindex/tools/TemporaryFile.cc	2012-04-21 13:16:42.213690282 +0300
-@@ -20,7 +20,7 @@
- //    mhadji@gmail.com
- 
- #include <stdio.h>
--
-+#include <unistd.h>
- #include <Tools.h>
- 
- #ifdef WIN32
diff --git a/gis/spatialindex/PKGBUILD b/gis/spatialindex/PKGBUILD
deleted file mode 100644
index e0787808e..000000000
--- a/gis/spatialindex/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Lantald  <lantald at Gmx dot com>
-pkgname=spatialindex
-pkgver=1.7.1
-pkgrel=1
-pkgdesc="An extensible framework that supports robust spatial indexing methods and sophisticated spatial queries."
-arch=('i686' 'x86_64')
-url="http://libspatialindex.github.com/"
-license=('(L)GPL')
-depends=(gcc-libs)
-provides=(spatialindex)
-conflicts=(libspatialindex-git)
-source=(http://download.osgeo.org/libspatialindex/$pkgname-src-$pkgver.tar.gz)
-md5sums=('8599243d5d8204f0f8d92cd55ab120f5')
-
-build() {
-  cd "$srcdir/$pkgname-src-$pkgver/"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-src-$pkgver/"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-src-$pkgver/"
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnu/README b/gnu/README
deleted file mode 100644
index 1b506dae2..000000000
--- a/gnu/README
+++ /dev/null
@@ -1 +0,0 @@
-This repo is for GNU software needed for some gnu.org tasks
diff --git a/gnu/gnun/PKGBUILD b/gnu/gnun/PKGBUILD
deleted file mode 100644
index 00b5b8116..000000000
--- a/gnu/gnun/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
-#
-
-pkgname=gnun
-pkgver=0.4
-pkgrel=1
-arch=('any')
-license=('GPL3')
-pkgdesc="Build system for gnu.org translations"
-url="http://www.gnu.org/software/gnun/"
-depends=('guile' 'po4a' 'libxml2')
-makedepends=('heirloom-mailx' 'cvs' 'svn')
-optdepends=('cvs: for CVS support'
-            'subversion: for Subversion support')
-source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('3baf8a16cc017e6335e65975c7223ac8'
-         '9bd1bada0b07154cf3e1c1cf937194e7')
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-
-    ./configure --prefix=/usr --libexecdir=/usr/lib
-
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-
-    make DESTDIR=${pkgdir} install install-info
-}
diff --git a/gnu/recutils/ChangeLog b/gnu/recutils/ChangeLog
deleted file mode 100644
index 02a3a418d..000000000
--- a/gnu/recutils/ChangeLog
+++ /dev/null
@@ -1,36 +0,0 @@
-recutils (1.5-1)
-
-  * New upstream release
-    - Version 1.5 (13 January 2012)
-    - The utilities will now ask interactively for a password
-      if it was not provided with the -s command line option.
-      This avoids security problems related to shell history files.
-    - Support for octal and hexadecimal numbers has been added.
-      They can be used in both the records and selection expressions.
-    - It is now possible to select a given number of random records
-      in many of the utilities using the -m command line option.
-    - The -n option now accepts a list of indexes, supporting ranges.
-    - The new -U (uniq) option for recsel removes duplicated fields
-      in the output records.
-    - The new -q option allows to quickly search for the desired record
-      without having to provide a complete selection expression.
-    - Auto generated fields are now considered integers by default.
-      This avoids repetitive patterns involving %auto and %type.
-    - Tab characters are now allowed in blank lines betwwen records.
-    - The API in rec.h is now better documented with comments, and improved.
-    - recfix now exits with an error status
-      if there is a parse error in some input file.
-    - The usage of the internal data structures has been _vastly_ improved,
-      resulting in a much faster operation.
-    - Internal cleanup and code factorization.
-    - Many, many, many bug fixes :D 
-  * PKGBUILD
-    - commenting out "makedepends=(mdbtools)" for now
-      because the current "mdbtools" package from the AUR
-      is missing 'MDB_NOFLAGS' in the "mdbtools.h" file.
-    - all other dependencies to compile and run recutils
-      are already satisfied through the 'base' group.
-  * Added some examples
-
- -- Sven Wick <sven.wick@gmx.de>  Fri, 20 Jan 2012 16:04:02 +0100
-
diff --git a/gnu/recutils/PKGBUILD b/gnu/recutils/PKGBUILD
deleted file mode 100644
index 519c0fa6f..000000000
--- a/gnu/recutils/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Max Meyer <dev@fedux.org>
-# Contributor: Sven Wick <sven.wick@gmx.de>
-#
-# Please fork and send me a pull request for changes to package build file(s)
-# Url: https://github.com/maxmeyer/archlinux-recutils
-#
-
-pkgname=recutils
-pkgver=1.5
-pkgrel=1
-pkgdesc="GNU tools and libraries to access human-editable, text-based databases."
-arch=(i686 x86_64 mips64el)
-url="http://www.gnu.org/software/recutils/"
-license=('GPL3')
-depends=(libgcrypt curl)
-optdepends=("mdbtools: for processing M$ Access databases")
-#options=()
-install=recutils.install
-changelog=ChangeLog
-source=("http://ftp.gnu.org/gnu/recutils/$pkgname-$pkgver.tar.gz")
-sha256sums=('7ed67e74468084f52ad9341e4b11c44e5fd9d5325b93b7eb2cb230c839ff5dec')
-options=(!libtool)
-
-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
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnu/recutils/recutils.install b/gnu/recutils/recutils.install
deleted file mode 100644
index 245c7ae01..000000000
--- a/gnu/recutils/recutils.install
+++ /dev/null
@@ -1,36 +0,0 @@
-_infodir=/usr/share/info
-_infofiles=( recutils.info.gz )
-
-_mandir=/usr/share/man/man1
-_manfiles=( csv2rec.1.gz rec2csv.1.gz recdel.1.gz recfix.1.gz recfmt.1.gz recinf.1.gz recins.1.gz recsel.1.gz recset.1.gz)
-
-## arg 1:  the new package version
-post_install() {
-  [ -x /usr/bin/mandb ] || return 0
-  for _file in ${_manfiles[@]}; do
-    mandb -f $_mandir/$_file
-  done
-
-  [ -x /usr/bin/install-info ] || return 0
-  for _file in ${_infofiles[@]}; do
-    install-info $_infodir/$_file $_infodir/dir #2> /dev/null
-  done
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-  [ -x /usr/bin/mandb ] || return 0
-  mandb
-
-  [ -x /usr/bin/install-info ] || return 0
-  for _file in ${_infofiles[@]}; do
-    install-info --delete $_infodir/$_file $_infodir/dir #2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/java-ugly/not-working/java-bnd/PKGBUILD b/java-ugly/not-working/java-bnd/PKGBUILD
deleted file mode 100644
index 86820469a..000000000
--- a/java-ugly/not-working/java-bnd/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=bnd
-pkgname=java-bnd
-pkgver=1.50.0
-pkgdesc="A swiss army knife for OSGi"
-url="http://www.aqute.biz/Bnd/"
-license=('Apache2')
-
-pkgrel=1
-arch=(any)
-makedepends=('apache-ant' 'junit')
-source=("git://github.com/bndtools/bnd.git")
-
-build() {
-  cd "$srcdir/$_pkgname"  
-  ant dist
-}
-
-package() {
-  :
-}
-
-md5sums=('SKIP')
diff --git a/java/antlr2/PKGBUILD b/java/antlr2/PKGBUILD
deleted file mode 100644
index de5262698..000000000
--- a/java/antlr2/PKGBUILD
+++ /dev/null
@@ -1,99 +0,0 @@
-# Maintainer: luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
-# Contributor: George Giorgidze <giorgidze (at) gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgbase=antlr2
-pkgname=(antlr2 antlr2-{java,python2,cxx,sharp})
-pkgver=2.7.7
-pkgdesc="ANother Tool for Language Recognition"
-url="http://www.antlr2.org/"
-license=('custom:Public Domain')
-
-pkgrel=4.1
-arch=('i686' 'x86_64')
-makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh')
-source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz"
-	"http://repo.maven.apache.org/maven2/antlr/antlr/$pkgver/antlr-$pkgver.pom"
-	'runantlr2.sh' 'gcc4.4.patch' 'mono.patch')
-
-build() {
-  cd "${srcdir}/antlr-${pkgver}"
-
-  patch -Np1 -i "${srcdir}"/gcc4.4.patch
-  patch -Np1 -i "${srcdir}"/mono.patch
-
-  ./configure --prefix=/usr --disable-examples
-  make -j1
-
-  cd lib/csharp
-  nant release
-}
-
-_install_license() {
-  install -Dm644 "$srcdir"/antlr-${pkgver}/LICENSE.txt \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_antlr2() {
-  depends=('sh' 'antlr2-java')
-
-  install -Dm755 "$srcdir"/runantlr2.sh "$pkgdir"/usr/bin/runantlr2
-  _install_license
-}
-
-package_antlr2-java() {
-  pkgdesc+=" (Java version)"
-  depends=('java-runtime')
-
-  provides=("java-antlr2=$pkgver")
-  conflicts=("java-antlr2")
-  replaces=("java-antlr2")
-
-  DESTDIR="$pkgdir" jh mvn-install antlr antlr $pkgver \
-    "$srcdir"/antlr-${pkgver}.pom \
-    "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \
-    antlr2.jar
-
-  _install_license
-}
-
-package_antlr2-python2() {
-  pkgdesc+=" (Python version)"
-  depends=('python2')
-
-  provides=("python2-antlr2=$pkgver")
-  conflicts=("python2-antlr2")
-  replaces=("python2-antlr2")
-
-  cd "$srcdir"/antlr-${pkgver}/lib/python
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-
-  _install_license
-}
-
-package_antlr2-cxx() {
-  pkgdesc+=" (C++ version)"
-
-  cd "$srcdir"/antlr-${pkgver}/lib/cpp
-  make -j1 prefix="${pkgdir}/usr" install
-
-  _install_license
-}
-
-package_antlr2-sharp() {
-  pkgdesc+=" (C Sharp version)"
-  depends=('mono')
-
-  cd "$srcdir"/antlr-${pkgver}/lib/csharp
-  install -d "$pkgdir"/usr/share
-  make -j1 prefix="${pkgdir}/usr" install
-
-  _install_license
-}
-
-md5sums=('01cc9a2a454dd33dcd8c856ec89af090'
-         '78af3de823003f6d8dded39c70bc30ae'
-         '78e9bf86bd44722f232f80bc7b04dcfe'
-         '158677e4c0f357afbb56656231a54815'
-         '0d1960d27ff81f2fea0dd35a8290216f')
diff --git a/java/antlr2/gcc4.4.patch b/java/antlr2/gcc4.4.patch
deleted file mode 100644
index 15e25fb00..000000000
--- a/java/antlr2/gcc4.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp
---- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp
-+++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp
-@@ -10,6 +10,8 @@
- 
- #include <antlr/config.hpp>
- 
-+#include <cstdio>
-+#include <cstring>
- #include <map>
- 
- #ifdef HAS_NOT_CCTYPE_H
diff --git a/java/antlr2/mono.patch b/java/antlr2/mono.patch
deleted file mode 100644
index 59c78d811..000000000
--- a/java/antlr2/mono.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ruN antlr-2.7.7.orig/lib/csharp/antlr.runtime.build antlr-2.7.7/lib/csharp/antlr.runtime.build
---- antlr-2.7.7.orig/lib/csharp/antlr.runtime.build	2006-11-01 16:37:17.000000000 -0500
-+++ antlr-2.7.7/lib/csharp/antlr.runtime.build	2013-05-14 20:07:32.000000000 -0400
-@@ -25,6 +25,9 @@
-     	
- 		<!-- Use script task to get this from AssemblyInfo.cs using a regular expression -->
- 		<script language="C#">
-+			<imports>
-+				<import namespace="System.Text.RegularExpressions" />
-+			</imports>
- 			<code><![CDATA[
- 				public static void ScriptMain(Project project) {
- 					string assemblyInfoFileName = Path.Combine(project.BaseDirectory, "antlr.runtime/AssemblyInfo.cs");
-@@ -122,7 +125,7 @@
-         </csc>
- 
-         <!-- copy the antlr.runtime assembly to the astframe build folder -->
--        <copy file="${compile.dir}\${project.FileName}.dll" tofile="${astframe.compile.dir}\${project.FileName}.dll" />
-+        <copy file="${compile.dir}/${project.FileName}.dll" tofile="${astframe.compile.dir}/${project.FileName}.dll" />
- 
-         <!-- compile antlr.astframe.dll -->
-         <csc target="library" output="${astframe.compile.dir}/${astframe.FileName}.dll" debug="${debug}" doc="${astframe.build.dir}/${astframe.FileName}.xml">
-@@ -134,7 +137,7 @@
- 	            	<include name="System.dll" />
- 					<include name="System.Drawing.dll" />
- 					<include name="System.Windows.Forms.dll" />
--					<include name="${astframe.compile.dir}\${project.FileName}.dll" />
-+					<include name="${astframe.compile.dir}/${project.FileName}.dll" />
- 				</references>              					
- 				<arg value="/nowarn:1591"/>
-         </csc>
diff --git a/java/antlr2/runantlr2.sh b/java/antlr2/runantlr2.sh
deleted file mode 100644
index aebc9dfa7..000000000
--- a/java/antlr2/runantlr2.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-echo Running 'java antlr.Tool $*' with /usr/share/java/antlr2.jar appended to the CLASSPATH variable
-export CLASSPATH
-CLASSPATH=$CLASSPATH:/usr/share/java/antlr2.jar
-java antlr.Tool "$@"
diff --git a/java/apache-ant/PKGBUILD b/java/apache-ant/PKGBUILD
deleted file mode 100755
index ae8967a2f..000000000
--- a/java/apache-ant/PKGBUILD
+++ /dev/null
@@ -1,142 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Arch): Paul Mattal <paul@archlinux.org>
-# Contributor: Andrew Wright <andreww@photism.org>
-
-pkgname=apache-ant
-pkgver=1.9.2
-pkgdesc="A Java-based build tool"
-license=('Apache' 'custom:BSD3')
-url="http://ant.apache.org/"
-
-provides=("apache-ant-libre=$pkgver")
-replaces=("apache-ant-libre")
-conflicts=("apache-ant-libre")
-
-pkgrel=3.2 # newer than Arch's 1.9.2-3
-arch=('any')
-depends=('java-environment')
-makedepends=('jh')
-
-_mirror=http://archive.apache.org/dist
-source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2
-        ${pkgname}.sh ${pkgname}.csh)
-
-# This list is adapted from https://ant.apache.org/manual/install.html#librarydependencies
-# The format is:
-#   jarname:description:pkgname:jarpath
-_library_dependencies=(
-  #jakarta-regexp-1.3.jar:Disregard
-  jakarta-oro-2.0.8.jar:'<ftp task>':jakarta-oro:/usr/share/java/jakarta-oro.jar
-  junit.jar:'<junit> task':junit:/usr/share/java/junit.jar
-  xalan.jar:'<junitreport> task':xalan-java:/usr/share/java/xalan.jar
-  antlr.jar:'<antlr> task':java-antlr2:/usr/share/java/antlr2.jar
-  bsf.jar:'<script> task':java-commons-bsf2:/usr/share/java/bsf2.jar
-  groovy-all.jar:'Groovy with <script> and <scriptdef> tasks':groovy:/usr/share/groovy/embeddable/groovy-all.jar
-  #netrexx.jar:'<netrexx> task, Rexx with <script> task':???????:???????
-  js.jar:'Javascript with <script> task':java-rhino:/usr/share/java/js.jar
-  jython.jar:'Python with <script> task':jython:/opt/jython/jython.jar
-  #jpython.jar:Disregard
-  #jacl.jar:'TCL with <script> task':???????:???????
-  #tcljava.jar:'TCL with <script> task':???????:???????
-  beanshell.jar:'BeanShell with <script> task':'beanshell>=1.3':/usr/share/java/bsh.jar
-  jruby.jar:'Ruby with <script> task':jruby:/opt/jruby/lib/jruby.jar
-  #judo.jar:Judoscript with <script> task:???????:??????
-  commons-logging.jar:'CommonsLoggingListener':java-commons-logging:/usr/share/java/commons-logging/commons-logging.jar
-  #log4j.jar:'Log4jListener':???????:???????
-  commons-net.jar:'<ftp>, <rexec> and <telnet> tasks':'java-commons-net1>=1.4.0':/usr/share/java/commons-net.jar
-  bcel.jar:"'classfileset' data type, JavaClassHelper for ClassConstants filter reader":java-bcel:/usr/share/java/bcel.jar
-  mail.jar:'<mimemail> task, mime encoding with <mail>':java-gnumail:/usr/share/java/gnumail.jar
-  activation.jar:'<mimemail> task, mime encoding with <mail>':java-activation-gnu:/usr/share/java/activation.jar
-  jdepend.jar:'<jdepend> task':java-jdepend:/usr/share/java/jdepend.jar
-# FIXME: When FS#38243 is fixed, 'xerces2-java' should be changed to 'java-resolver'.
-# We use xerces in the mean time because xalan depends on it.
-  resolver.jar:"external files for 'xmlcatalog' datatype":xerces2-java:/usr/share/java/resolver.jar
-  jsch.jar:'<sshexec> and <scp> tasks':'java-jsch>=0.1.42':/usr/share/java/jsch.jar
-  #jai.jar:'<image> task':???????:???????
-)
-
-for _dep in "${_library_dependencies[@]}"; do
-  IFS=: read _jarname _desc _pkgname _jarpath <<<"$_dep"
-  optdepends+=("${_pkgname}: ${_desc}")
-  makedepends+=("${_pkgname}")
-done
-unset _dep _jarname _desc _pkgname _jarpath
-
-build() {
-  # This directory is what becomes
-  # http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2
-  # which is what Arch uses
-  rm -rf "${srcdir}"/${pkgname}-${pkgver}-bin
-  mkdir -p "${srcdir}"/${pkgname}-${pkgver}-bin
-
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  # Symlink to external optional libraries/
-  local _dep _jarname _desc _pkgname _jarpath
-  for _dep in "${_library_dependencies[@]}"; do
-    IFS=: read _jarname _desc _pkgname _jarpath <<<"$_dep"
-    ln -sfv "${_jarpath}" lib/optional/${_jarname}
-  done
-  # Build
-  source "/etc/profile.d/jdk.sh"   # Get the JAVA_HOME env var
-  sh build.sh -Ddist.dir="${srcdir}"/${pkgname}-${pkgver}-bin dist
-}
-
-# Create a relative symlink
-_rellink() {
-  local src=$1
-  local dst=$2
-  mkdir -p "${pkgdir}/${dst%/*}"
-  ln -sfv "$(realpath -m "$src" --relative-to="${dst%/*}")" "${pkgdir}/${dst}"
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}-bin
-  source "${srcdir}"/${pkgname}.sh # Get the ANT_HOME env var
-  source "/etc/profile.d/jdk.sh"   # Get the JAVA_HOME env var
-
-  ## Install profile.d script
-  install -d "${pkgdir}"/etc/profile.d
-  install -m755 "${srcdir}"/${pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/
-
-  ## Install the main distribution
-  install -d "${pkgdir}"/${ANT_HOME}
-  cp -Rp * "${pkgdir}"/${ANT_HOME}
-
-  ## Fix the distribution
-  # Remove Windows .bat/.cmd files
-  rm -f "${pkgdir}"/${ANT_HOME}/bin/*.{bat,cmd}
-  # Fix python2 path
-  sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/${ANT_HOME}/bin/runant.py
-  # Symlink to external optional libraries
-  local _dep _jarname _desc _pkgname _jarpath
-  for _dep in "${_library_dependencies[@]}"; do
-    IFS=: read _jarname _desc _pkgname _jarpath <<<"$_dep"
-    _rellink "${_jarpath}" "${ANT_HOME}/lib/${_jarname}"
-  done
-
-  ## Symlink the /opt distribution to the normal places
-
-  cd "${pkgdir}"/${ANT_HOME}/lib
-  local pom a
-  for pom in *.pom; do
-    a=${pom%.pom}
-    base=$(jh mvn-basename org.apache.ant $a $pkgver)
-    _rellink "${ANT_HOME}/lib/$a.pom" "${base}.pom"
-    _rellink "${ANT_HOME}/lib/$a.jar" "${base}.jar"
-  done
-
-  cd "${pkgdir}"/${ANT_HOME}/bin
-  local prog
-  for prog in *; do
-    _rellink "${ANT_HOME}/bin/$prog" "/usr/bin/$prog"
-  done
-  _rellink "${ANT_HOME}/README"   "/usr/share/doc/${pkgname}/README"
-  _rellink "${ANT_HOME}/WHATSNEW" "/usr/share/doc/${pkgname}/WHATSNEW"
-  _rellink "${ANT_HOME}/docs"     "/usr/share/doc/${pkgname}/html"
-  _rellink "${ANT_HOME}/LICENSE"  "/usr/share/licenses/${pkgname}/LICENSE"
-  _rellink "${ANT_HOME}/NOTICE"   "/usr/share/licenses/${pkgname}/NOTICE"
-}
-
-md5sums=('8f610c1a0183507c2beebbf230f456af'
-         'bd63c881be406f515fc4d22635e8326a'
-         'aaa615512cbe1ed7f3b62c1ff46802f8')
diff --git a/java/apache-ant/apache-ant.csh b/java/apache-ant/apache-ant.csh
deleted file mode 100755
index fdc04b2f8..000000000
--- a/java/apache-ant/apache-ant.csh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/csh
-setenv ANT_HOME /opt/apache-ant
diff --git a/java/apache-ant/apache-ant.sh b/java/apache-ant/apache-ant.sh
deleted file mode 100755
index 6e4809da5..000000000
--- a/java/apache-ant/apache-ant.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-export ANT_HOME=/opt/apache-ant
diff --git a/java/arduino/PKGBUILD b/java/arduino/PKGBUILD
deleted file mode 100644
index aeb46feee..000000000
--- a/java/arduino/PKGBUILD
+++ /dev/null
@@ -1,106 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): PyroPeter <googlemail.com@abi1789>
-
-pkgname=arduino
-pkgver=1.0.2
-pkgrel=1
-pkgdesc="Arduino SDK and IDE"
-arch=('i686' 'x86_64')
-url="http://arduino.cc/en/Main/Software"
-options=(!strip)
-license=('GPL')
-
-depends=('avr-gcc' 'avr-libc' 'libusb-compat' 'java-runtime' 'avrdude'
-    'java-rxtx' 'antlr2' 'eclipse-ecj' 'jna')
-makedepends=(java-environment apache-ant makepkg-git)
-install="arduino.install"
-source=("http://arduino.googlecode.com/files/arduino-$pkgver-src.tar.gz"
-	'avrlibc-signals.patch'
-	'external-avrtools.patch'
-	'arduino.png'
-	'arduino.desktop')
-
-unset _JAVA_OPTIONS
-. /etc/profile.d/jdk.sh
-
-prepare() {
-  cd "$srcdir/arduino-$pkgver"
-  find . -name '*.hex' -delete
-  find . -name '*.jar' -delete
-  find . -name '*.so'  -delete
-  find . -name '*.swp' -delete
-  rm -f build/linux/dist/tools/avrdude*
-  rm -rf hardware/arduino/firmwares/wifishield
-}
-
-_link_jars() {
-  for jar in RXTXcomm.jar antlr2.jar ecj.jar jna.jar; do
-    ln -sf /usr/share/java/$jar .
-  done
-}
-
-_patch() {
-  cd "$srcdir/arduino-$pkgver"
-
-  # Fix issue 955 to be compatible with newer versions of avr-libc
-  # https://code.google.com/p/arduino/issues/detail?id=955
-  # Note: this patch is not the patch given in the comments
-  patch -Np1 -i "$srcdir/avrlibc-signals.patch"
-  grep -rl 'SIGNAL\s*(' . | xargs sed -ri 's/SIGNAL\s*\(([^)]*_vect)\)/ISR(\1)/g'
-
-  # Don't look for pre-compiled avr-tools
-  patch -Np1 -i "$srcdir/external-avrtools.patch"
-
-  rm -rf app/src/processing/app/macosx
-
-  cd app/lib
-  _link_jars
-}
-
-build() {
-  _patch
-
-  # build submodules
-  for submodule in core/methods core/preproc; do
-    cd "$srcdir/arduino-$pkgver/$submodule"
-    ant
-  done
-
-  # build the main package
-  cd "$srcdir/arduino-$pkgver/build"
-  log=`mktemp`
-  ant 2>&1|tee "$log"
-  if egrep -q 'Error|FAILED' "$log"; then
-    rm "$log"
-    false
-  else
-    rm "$log"
-  fi
-
-  # symlink jar files to the system locations
-  cd "linux/work/lib"
-  _link_jars
-}
-
-package() {
-  cd "$srcdir/arduino-$pkgver/build/linux/work"
-
-  install -d "$pkgdir"/usr/{bin,share/{doc,applications,pixmaps}}
-
-  # copy the whole SDK to /usr/share/arduino/
-  cp -r . "$pkgdir/usr/share/arduino"
-
-  # at least support the FHS a little bit:
-  ln -s ../share/arduino/arduino "$pkgdir/usr/bin/arduino"
-  ln -s ../arduino/reference     "$pkgdir/usr/share/doc/arduino"
-
-  # desktop icon
-  install -m644 "$srcdir/arduino.desktop" "$pkgdir/usr/share/applications/"
-  install -m644 "$srcdir/arduino.png" "$pkgdir/usr/share/pixmaps/"
-}
-
-md5sums=('dfb64e2a7de4a4a8b872732fe90e3249'
-         'e44975d31aa1770e4f5ac6e6867b0864'
-         '9c696c2361d57027be41ae64436182aa'
-         '9e36d33891d5e68d38ec55d1494499a5'
-         'eebc4d6495864bea99ad057af801afb9')
diff --git a/java/arduino/arduino.desktop b/java/arduino/arduino.desktop
deleted file mode 100644
index 8469724ea..000000000
--- a/java/arduino/arduino.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Arduino
-GenericName=Arduino IDE
-Comment=The open-source Arduino environment
-Exec=arduino
-Icon=arduino
-Type=Application
-Terminal=false
-Categories=Development;IDE;Qt;KDE;;Application;
diff --git a/java/arduino/arduino.install b/java/arduino/arduino.install
deleted file mode 100644
index c222e1b6d..000000000
--- a/java/arduino/arduino.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
-  xdg-icon-resource install --size 256 --novendor /usr/share/pixmaps/arduino.png
-}
-
-pre_remove() {
-  xdg-icon-resource uninstall --size 256 arduino
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/java/arduino/arduino.png b/java/arduino/arduino.png
deleted file mode 100644
index ea3ac81b4..000000000
--- a/java/arduino/arduino.png
+++ /dev/null
diff --git a/java/arduino/avrlibc-signals.patch b/java/arduino/avrlibc-signals.patch
deleted file mode 100644
index d9c743cc6..000000000
--- a/java/arduino/avrlibc-signals.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -ruN arduino-1.0.2.orig/hardware/arduino/cores/arduino/HardwareSerial.cpp arduino-1.0.2/hardware/arduino/cores/arduino/HardwareSerial.cpp
---- arduino-1.0.2.orig/hardware/arduino/cores/arduino/HardwareSerial.cpp	2012-11-04 16:29:10.000000000 -0500
-+++ arduino-1.0.2/hardware/arduino/cores/arduino/HardwareSerial.cpp	2012-12-03 15:35:06.000000000 -0500
-@@ -89,9 +89,7 @@
- #if !defined(USART0_RX_vect) && defined(USART1_RX_vect)
- // do nothing - on the 32u4 the first USART is USART1
- #else
--#if !defined(USART_RX_vect) && !defined(SIG_USART0_RECV) && \
--    !defined(SIG_UART0_RECV) && !defined(USART0_RX_vect) && \
--	!defined(SIG_UART_RECV)
-+#if !defined(USART_RX_vect) && !defined(USART0_RX_vect)
-   #error "Don't know what the Data Received vector is called for the first UART"
- #else
-   void serialEvent() __attribute__((weak));
-@@ -99,14 +97,8 @@
-   #define serialEvent_implemented
- #if defined(USART_RX_vect)
-   SIGNAL(USART_RX_vect)
--#elif defined(SIG_USART0_RECV)
--  SIGNAL(SIG_USART0_RECV)
--#elif defined(SIG_UART0_RECV)
--  SIGNAL(SIG_UART0_RECV)
- #elif defined(USART0_RX_vect)
-   SIGNAL(USART0_RX_vect)
--#elif defined(SIG_UART_RECV)
--  SIGNAL(SIG_UART_RECV)
- #endif
-   {
-   #if defined(UDR0)
-@@ -143,8 +135,6 @@
-       unsigned char c = UDR1;
-     };
-   }
--#elif defined(SIG_USART1_RECV)
--  #error SIG_USART1_RECV
- #endif
- 
- #if defined(USART2_RX_vect) && defined(UDR2)
-@@ -160,8 +150,6 @@
-       unsigned char c = UDR2;
-     };
-   }
--#elif defined(SIG_USART2_RECV)
--  #error SIG_USART2_RECV
- #endif
- 
- #if defined(USART3_RX_vect) && defined(UDR3)
-@@ -177,8 +165,6 @@
-       unsigned char c = UDR3;
-     };
-   }
--#elif defined(SIG_USART3_RECV)
--  #error SIG_USART3_RECV
- #endif
- 
- void serialEventRun(void)
-diff -ruN arduino-1.0.2.orig/hardware/arduino/cores/arduino/HardwareSerial.h arduino-1.0.2/hardware/arduino/cores/arduino/HardwareSerial.h
---- arduino-1.0.2.orig/hardware/arduino/cores/arduino/HardwareSerial.h	2012-11-04 16:29:10.000000000 -0500
-+++ arduino-1.0.2/hardware/arduino/cores/arduino/HardwareSerial.h	2012-12-03 15:35:06.000000000 -0500
-@@ -126,6 +126,15 @@
- #endif
- #endif
- 
-+/*
-+ * on ATmega8, the uart and its bits are not numbered, so there is no "TXC0"
-+ * definition.  It is slightly cleaner to define this here instead of having
-+ * conditional code in the cpp module.
-+ */
-+#if !defined(TXC0)
-+#define TXC0 TXC
-+#endif
-+
- extern void serialEventRun(void) __attribute__((weak));
- 
- #endif
-diff -ruN arduino-1.0.2.orig/hardware/arduino/cores/arduino/WInterrupts.c arduino-1.0.2/hardware/arduino/cores/arduino/WInterrupts.c
---- arduino-1.0.2.orig/hardware/arduino/cores/arduino/WInterrupts.c	2012-11-04 16:29:11.000000000 -0500
-+++ arduino-1.0.2/hardware/arduino/cores/arduino/WInterrupts.c	2012-12-03 15:37:08.000000000 -0500
-@@ -314,7 +314,7 @@
- #endif
- 
- /*
--SIGNAL(SIG_2WIRE_SERIAL) {
-+ISR(TWI_vect) {
-   if(twiIntFunc)
-     twiIntFunc();
- }
diff --git a/java/arduino/external-avrtools.patch b/java/arduino/external-avrtools.patch
deleted file mode 100644
index a47575b53..000000000
--- a/java/arduino/external-avrtools.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru arduino-1.0.2.orig/build/build.xml arduino-1.0.2/build/build.xml
---- arduino-1.0.2.orig/build/build.xml	2012-11-04 16:29:09.000000000 -0500
-+++ arduino-1.0.2/build/build.xml	2012-12-03 15:22:39.000000000 -0500
-@@ -353,24 +353,9 @@
-   </target>
- 
-   <target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
--    <!-- Unzip AVR tools -->
--    <exec executable="tar" dir="linux/work/hardware">
--      <arg value="-xjf"/>
--      <arg value="../../avr_tools_linux32.tar.bz2"/>
--    </exec>
-   </target>
- 
-   <target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
--    <copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" />
--    <copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" />
--
--    <chmod perm="755" file="linux/work/hardware/tools/avrdude" />
--
--    <!-- Unzip AVR tools -->
--    <exec executable="tar" dir="linux/work/hardware">
--      <arg value="-xjf"/>
--      <arg value="../../avr_tools_linux64.tar.bz2"/>
--    </exec>
-   </target>
-   
-   <target name="linux32-run" depends="linux32-build" 
diff --git a/java/beanshell/PKGBUILD b/java/beanshell/PKGBUILD
deleted file mode 100644
index 95b14d379..000000000
--- a/java/beanshell/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Arch): AndyRTR <andyrtr at archlinux.org>
-
-pkgname=beanshell
-pkgver=2.0b4
-pkgrel=2.1
-pkgdesc="Lightweight scripting for Java"
-url="http://www.beanshell.org/"
-license=('LGPL')
-
-provides=('bsh')
-
-arch=('any')
-depends=('java-runtime')
-makedepends=('apache-ant' 'java-commons-bsf2' 'javacc' 'java-servlet3.0-tomcat')
-source=("http://www.beanshell.org/bsh-${pkgver}-src.jar")
-
-prepare() {
-  cd "$srcdir"/BeanShell-$pkgver
-
-  rm lib/*.jar
-  ln -s /usr/share/java/bsf2.jar lib/
-  ln -s /usr/share/java/javacc.jar lib/
-  ln -s /usr/share/java/servlet-api.jar lib/servlet.jar
-}
-
-build() {
-  cd "$srcdir"/BeanShell-$pkgver
-  ant dist
-}
-
-check() {
-  cd "$srcdir"/BeanShell-$pkgver
-  ant test
-}
-
-package() {
-  cd "$srcdir"/BeanShell-$pkgver/dist
-  install -d "${pkgdir}"/usr/share/java/
-  for artifact in $(printf '%s\n' *.jar|sed 's/-[0-9b.]*\.jar$//'); do
-    install -m644 $artifact-$pkgver.jar "${pkgdir}"/usr/share/java/$artifact.jar
-  done
-}
-
-sha1sums=('69b36df249654a04e777ab899046c50b8cc844ac')
diff --git a/java/closure-compiler/PKGBUILD b/java/closure-compiler/PKGBUILD
deleted file mode 100644
index 8c9ea0c34..000000000
--- a/java/closure-compiler/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=closure-compiler
-pkgver=20131118
-pkgdesc="A JavaScript optimizing compiler."
-url="https://code.google.com/closure/compiler/"
-license=('Apache')
-
-pkgrel=1
-arch=('any')
-depends=('java-runtime' 'sh')
-makedepends=(
-  'apache-ant'
-  #'java-args4j' # does not exist
-  #'google-caja' # does not exist
-  #'java-guava' # does not build
-  'java-jarjar'
-  'java-json'
-  #'java-jsr305' # does not exist
-  'junit'
-  #'java-protobuf' # does not build
-  #'maven-ant-tasks' # does not exist
-  'jh'
-)
-
-source=("libre://$pkgname-$pkgver.tar.gz" 'closure-compiler.sh')
-md5sums=('0fceda3f4d43a6d266f9888e7683bdc9'
-         'd4ead4585fcc7039d3c32eb5c4491bb9')
-
-mksource=("$pkgname-$pkgver::git+https://code.google.com/p/closure-compiler/#tag=v${pkgver}")
-mkmd5sums=('SKIP')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ln -sf /opt/apache-ant/lib/ant.jar          lib/ant.jar
-  ln -sf /opt/apache-ant/lib/ant-launcher.jar lib/ant-launcher.jar
-  #ln -sf /usr/share/java/args4.jar            lib/args4j.jar
-  #ln -sf /usr/share/java/caja-r4314.jar       lib/caja-r4314.jar
-  #ln -sf /usr/share/java/guava.jar            lib/guava.jar
-  ln -sf /usr/share/java/jarjar.jar           lib/jarjar.jar
-  ln -sf /usr/share/java/json.jar             lib/json.jar
-  #ln -sf /usr/share/java/jsr305.jar           lib/jsr305.jar
-  ln -sf /usr/share/java/junit.jar            lib/junit.jar
-  #ln -sf /usr/share/java/protobuf.jar         lib/protobuf-java.jar
-  #ln -sf /...                                 tools/maven-ant-tasks-2.1.3.jar
-
-  sed -i "
-/<target name=\"relversion\">/,/<\/target>/ {
-  s/executable=\"git\"/executable=\"echo\"/
-  /<arg/d
-  /<\/exec>/i<arg value=\"v${pkgver}\" />
-}" build.xml
-
-  ant jar pom
-}
-
-package() {
-  cd "$srcdir"
-  install -Dm755 closure-compiler.sh  "$pkgdir"/usr/bin/closure-compiler
-
-  cd "$srcdir/$pkgname-$pkgver"
-  DESTDIR="$pkgdir" jh mvn-install \
-    com.google.javascript closure-compiler v${pkgver} \
-    build/pom.xml build/compiler.jar \
-    closure-compiler.jar
-}
diff --git a/java/closure-compiler/closure-compiler.sh b/java/closure-compiler/closure-compiler.sh
deleted file mode 100644
index e06590db2..000000000
--- a/java/closure-compiler/closure-compiler.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-java -jar /usr/share/java/closure-compiler.jar "$@"
diff --git a/java/jakarta-oro/PKGBUILD b/java/jakarta-oro/PKGBUILD
deleted file mode 100644
index 24f7a2772..000000000
--- a/java/jakarta-oro/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): Xiao-Long Chen <chenxiaolong@cxl.epac.to>
-
-pkgname=jakarta-oro
-pkgver=2.0.8
-pkgrel=1.1
-pkgdesc="Java regular expression and text-processing library"
-arch=('any')
-url="https://jakarta.apache.org/oro"
-license=('Apache')
-makedepends=('apache-ant')
-source=("http://archive.apache.org/dist/jakarta/oro/${pkgname}-${pkgver}.tar.gz")
-sha512sums=('a7f6eb6a088765f273df18ccc823f918737f18ec8772275054839a87f8370f1848e795d481f226c712651104d7598ab86c7d90a991fb039df6581f42f1447920')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  find . \( -name '*.jar' -o -name '*.class' \) -delete
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ant jar
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  install -Dm644 ${pkgname}-${pkgver}.jar \
-    "${pkgdir}/usr/share/java/${pkgname}.jar"
-}
diff --git a/java/java-asm2/PKGBUILD b/java/java-asm2/PKGBUILD
deleted file mode 100644
index 8860ef86f..000000000
--- a/java/java-asm2/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgver=2.2.3
-. PKGBUILD.common.sh
-
-####
-
-pkgrel=7
-
-mksource() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  rm test/conform/org/objectweb/asm/attrs/StackMapTableSample.data
-  rm test/conform/cases/*.class
-  mkdir -p test/lib
-}
-
-mkmd5sums=('7a92c87bf067925685cf68dcc0dd8998')
-md5sums=('c2119ab39618cb49ca4e4ad74344b488')
diff --git a/java/java-asm2/PKGBUILD-bootstrap b/java/java-asm2/PKGBUILD-bootstrap
deleted file mode 100644
index cbe29bb34..000000000
--- a/java/java-asm2/PKGBUILD-bootstrap
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-# "java-asm2" is required to build "java-ow-util-ant-tasks", which is in turn
-# required to build "java-asm2".
-
-. PKGBUILD
-
-makedepends=(jh)
-source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver-bin.zip")
-unset mksource
-_distdir="$_pkgname-$pkgver"
-
-provides+=("$pkgname=$pkgver")
-pkgname+='-bootstrap'
-pkgdesc+=" (prebuilt binary release for bootstrapping purposes)"
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  echo "3-clause BSD license; install the non-bootstrap version for full text" > LICENSE.txt
-  cd "$srcdir/$_distdir/lib"
-  ln -s all/* .
-}
-
-md5sums=('9bedaa1d00c5b5f1c7fec10a2d2f7142')
diff --git a/java/java-asm2/PKGBUILD.common.sh b/java/java-asm2/PKGBUILD.common.sh
deleted file mode 100644
index ef4547696..000000000
--- a/java/java-asm2/PKGBUILD.common.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=asm
-pkgname=java-asm${pkgver%%.*}
-pkgdesc="An all purpose Java bytecode manipulation and analysis framework."
-url="http://asm.ow2.org/"
-license=('custom:BSD3')
-
-arch=('any')
-depends=('java-runtime')
-makedepends=(
-  apache-ant
-  java-ow-util-ant-tasks
-  jh
-)
-source=("libre://$pkgname-$pkgver.tar.gz")
-mksource=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
-
-_distdir="$_pkgname-$pkgver/output/dist"
-_ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar'
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties
-  ant dist
-
-  # This will make package() easier:
-  cd "$srcdir/$_distdir/lib"
-  ln -sf all/* .
-}
-
-package() {
-  # Install license file
-  cd "$srcdir/$_pkgname-$pkgver"
-  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  # Install documentation
-  cd "$srcdir/$_distdir"
-  install -d "$pkgdir/usr/share/doc/$pkgname"
-  cp -r doc/javadoc/user "$pkgdir/usr/share/doc/$pkgname/javadoc"
-  cp -r examples         "$pkgdir/usr/share/doc/$pkgname/examples"
-
-  # Install the README about the -all files
-  cd "$srcdir/$_distdir/lib"
-  install -Dm644 README.txt \
-      "$pkgdir"/usr/share/java/$_pkgname/README-$pkgver.txt
-
-  # Install Maven artifacts
-  export DESTDIR=$pkgdir
-  for artifact in $(printf '%s\n' *.pom|sed 's/-[0-9.]*\.pom$//'); do
-    if [[ -f $artifact-$pkgver.jar ]]; then
-      # This artifact has a jar file
-      jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.{pom,jar}
-      # Symlink them to /usr/share/java
-      ln -s "$(jh mvn-basename asm $artifact $pkgver).jar" \
-	"$pkgdir"/usr/share/java/$_pkgname/
-      ln -s $_pkgname/$artifact-$pkgver.jar \
-	"$pkgdir"/usr/share/java/$artifact-${pkgver%%.*}.jar
-    else
-      # This artifact is just a pom
-      jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.pom
-    fi
-  done
-}
diff --git a/java/java-asm3/PKGBUILD b/java/java-asm3/PKGBUILD
deleted file mode 100644
index 9c9928766..000000000
--- a/java/java-asm3/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgver=3.3.1
-. PKGBUILD.common.sh
-
-####
-
-pkgrel=7
-
-mksource() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  rm cobertura.ser # We regenerate this
-  rm examples/jasmin/test/jasmin.jar
-}
-
-mkmd5sums=('433024df8176f09922646316e415631c')
-md5sums=('c49fb45629cf8670b7f46b95013141cd')
diff --git a/java/java-commons-bsf2/PKGBUILD b/java/java-commons-bsf2/PKGBUILD
deleted file mode 100644
index 57a9dfc1a..000000000
--- a/java/java-commons-bsf2/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=java-commons-bsf2
-pkgver=2.4.0
-url="https://commons.apache.org/proper/commons-bsf/"
-license=('Apache')
-pkgdesc="Bean Scripting Framework"
-
-pkgrel=1
-arch=('any')
-depends=('java-commons-logging')
-makedepends=('apache-ant')
-
-_mirror=http://archive.apache.org/dist
-source=($_mirror/commons/bsf/source/bsf-src-$pkgver.tar.gz
-  build-properties.xml::"https://svn.apache.org/viewvc/commons/proper/bsf/tags/bsf-2.4.0/build-properties.xml?view=co&content-type=text%2Fplain"
-)
-
-declare -A _opts
-#_opts[jacl]="/usr/share/java/jacl.jar"
-_opts[jython]="/opt/jython/jython.jar"
-#_opts[nexrexx]="/usr/share/java/nexrexx.jar"
-_opts[java-rhino]="/usr/share/java/js.jar"
-_opts[xalan-java]="/usr/share/java/xalan.jar"
-_opts[junit]="/usr/share/java/junit.jar"
-
-for pkg in "${!_opts[@]}"; do
-  optdepends+=("$pkg")
-  makedepends+=("$pkg")
-  _jars+="${_opts[$pkg]} "
-done
-
-prepare() {
-  cd "${srcdir}/bsf-${pkgver}"
-  rm lib/*.jar
-}
-
-build() {
-  cd "${srcdir}/bsf-${pkgver}"
-
-  for jar in $_jars; do
-	  ln -s "$jar" lib/
-  done
-
-  # Adjust it to work with jython 2.5+
-  sed -i 's/PyJavaInstance/PyJavaType/g' src/org/apache/bsf/engines/jython/*
-
-  ln -sf ../build-properties.xml ./
-  ant jar
-}
-
-package() {
-  cd "${srcdir}/bsf-${pkgver}"
-  install -Dm644 build/lib/bsf.jar "$pkgdir"/usr/share/java/bsf-$pkgver.jar
-  ln -s bsf-$pkgver.jar "$pkgdir"/usr/share/java/bsf2.jar
-}
-
-md5sums=('7e58b2a009c0f70ab36bbef420b25c07'
-         'd7180c2b95f1a5424f785a2482260eaa')
diff --git a/java/java-jarjar/PKGBUILD b/java/java-jarjar/PKGBUILD
deleted file mode 100644
index c78d5539e..000000000
--- a/java/java-jarjar/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-# jarjar 1.2 is old, but is the last version that used java-asm3
-# java-asm4 is not packaged
-
-_pkgname=jarjar
-pkgname=java-jarjar
-pkgver=1.2
-_pkgrev=132 # v1.2 wasn't tagged, but this is clearly it
-pkgdesc="Java static linker (instead of the normal dynamic linking)"
-url="https://code.google.com/p/jarjar/"
-license=('Apache')
-
-pkgrel=2
-arch=('any')
-depends=('java-runtime')
-makedepends=('apache-ant' 'java-asm3' 'junit' 'maven')
-
-source=("libre://${_pkgname}-${pkgver}.tar.gz")
-mksource=("${_pkgname}-${pkgver}::svn+http://jarjar.googlecode.com/svn/trunk/jarjar#revision=$_pkgrev")
-mksource() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  rm -f lib/*.jar
-}
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  ln -sf /usr/share/java/asm-3.jar             lib/asm-3.3.1.jar
-  ln -sf /usr/share/java/asm-commons-3.jar     lib/asm-commons-3.3.1.jar
-  ln -sf /usr/share/java/junit.jar             lib/junit-4.8.1.jar
-  ln -sf /opt/maven/lib/maven-plugin-api-*.jar lib/maven-plugin-api.jar
-  ln -sf /opt/apache-ant/lib/ant.jar           lib/ant.jar
-
-  export CLASSPATH=/usr/share/java/asm-3.jar
-  echo 'includeantruntime false' > build.properties
-  ant jar
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  install -d "$pkgdir/usr/share/java/$_pkgname"
-  install -D "dist/$_pkgname-$pkgver.jar" "$pkgdir/usr/share/java/$_pkgname"
-  ln -s "$_pkgname/$_pkgname-$pkgver.jar" "$pkgdir/usr/share/java/$_pkgname.jar"
-}
-
-mkmd5sums=('SKIP')
-md5sums=('cc2698a58f93cdb22c51f039a1b8a56e')
diff --git a/java/java-jarjar/PKGBUILD-1.4 b/java/java-jarjar/PKGBUILD-1.4
deleted file mode 100644
index f0ebe9270..000000000
--- a/java/java-jarjar/PKGBUILD-1.4
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=jarjar
-pkgname=java-jarjar
-pkgver=1.4
-pkgdesc="Java static linker (instead of the normal dynamic linking)"
-url="https://code.google.com/p/jarjar/"
-license=('Apache2')
-
-pkgrel=1
-arch=('any')
-depends=('java-runtime')
-makedepends=('apache-ant' 'java-asm4' 'junit' 'maven' 'jh')
-source=("https://${_pkgname}.googlecode.com/files/${_pkgname}-src-${pkgver}.zip")
-
-mksource() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  rm -f src/test/*.{class,jar}
-  rm -f lib/*.jar
-}
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  eval `jh mksource`
-
-  ln -s /usr/share/java/asm-4.jar             lib/asm-4.0.jar
-  ln -s /usr/share/java/asm-commons-4.jar     lib/asm-commons-4.0.jar
-  ln -s /usr/share/java/junit.jar             lib/junit-4.8.1.jar
-  ln -s /opt/maven/lib/maven-plugin-api-*.jar lib/maven-plugin-api.jar
-
-  ant jar
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  install -d "$pkgdir/usr/share/java/$_pkgname"
-  install -D "dist/$_pkgname-$pkgver.jar" "$pkgdir/usr/share/java/$_pkgname"
-  ln -s "$_pkgname/$_pkgname-$pkgver.jar" "$pkgdir/usr/share/java/$_pkgname.jar"
-}
-
-sha1sums=('803ad79cf429faeb4d767b2fb45d84bbc904ea04')
diff --git a/java/java-json-android/PKGBUILD b/java/java-json-android/PKGBUILD
deleted file mode 100644
index 7a9113529..000000000
--- a/java/java-json-android/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=java-json-android
-_pkgver=4.2.2_r1
-pkgdesc="Java org.json implementation developed as part of Android's libcore"
-url="https://android.googlesource.com/platform/libcore/"
-license=(Apache2)
-
-pkgver=${_pkgver//_/.}
-provides=(java-json)
-conflicts=(java-json)
-
-pkgrel=3
-arch=(any)
-
-depends=(java-runtime)
-makedepends=(java-environment junit)
-
-source=("libre://android-libcore-$_pkgver.tar.gz")
-md5sums=('546a4614552615a12f45b62db27acddf')
-
-mkdepends=(git)
-mksource=("android-libcore-$_pkgver::git+https://android.googlesource.com/platform/libcore/#tag=android-${_pkgver}")
-mkmd5sums=('SKIP')
-
-build() {
-  cd "$srcdir"/android-libcore-$_pkgver
-  sed 11q < NOTICE > json/NOTICE
-  cd json/src/main/java
-  javac org/json/*.java
-  jar cf json.jar org/json/*.class
-}
-
-check() {
-  cd "$srcdir"/android-libcore-$_pkgver/json/src/test/java
-
-  # disable test for known bug:
-  sed -i 's/test64BitHexValues()/x&/' org/json/ParsingTest.java
-
-  local cp="/usr/share/java/junit.jar:../../main/java/json.jar"
-  javac -cp "$cp" org/json/*.java
-  printf '%s\n' org/json/*.java | sed 's|/|.|g;s|\.java$||' > tests.txt
-  java -cp "$cp:." org.junit.runner.JUnitCore $(cat tests.txt)
-}
-
-package() {
-  cd "$srcdir"/android-libcore-$_pkgver/json
-  install -Dm644 NOTICE "$pkgdir"/usr/share/licenses/$pkgname/NOTICE
-  install -Dm644 src/main/java/json.jar "$pkgdir"/usr/share/java/json.jar
-}
diff --git a/java/java-ow-util-ant-tasks/PKGBUILD b/java/java-ow-util-ant-tasks/PKGBUILD
deleted file mode 100644
index 71c5fae94..000000000
--- a/java/java-ow-util-ant-tasks/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=java-ow-util-ant-tasks
-pkgver=1.3.2
-pkgdesc="ObjectWeb utility Ant tasks library"
-url="http://forge.ow2.org/projects/monolog"
-license=('LGPL')
-
-pkgrel=3
-arch=('any')
-depends=('java-environment')
-makedepends=('apache-ant' 'xalan-java' 'java-asm2')
-
-source=("libre://$pkgname-$pkgver.tar.gz")
-md5sums=('f64b2aeac98508ac322a6509ba754425')
-
-mksource=("http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_$pkgver.zip")
-mknoextract=("ow_util_ant_tasks_$pkgver.zip")
-mkmd5sums=('cd602bf75a0feab480fa97739955b84e')
-mksource() {
-  cd "$srcdir"
-  mkdir $pkgname-$pkgver
-  cd $pkgname-$pkgver
-  bsdtar xf ../ow_util_ant_tasks_$pkgver.zip
-  rm -rf output
-  rm externals/*
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ln -s /usr/share/java/asm-2.jar externals/
-  ln -s /usr/share/java/xalan.jar externals/
-  ant jar
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  install -d "$pkgdir"/usr/share/java
-  install -m644 "output/lib/ow_util_ant_tasks.jar" "$pkgdir"/usr/share/java
-}
-
diff --git a/java/java-rxtx/0000-configure-java-version.patch b/java/java-rxtx/0000-configure-java-version.patch
deleted file mode 100644
index c9e37258a..000000000
--- a/java/java-rxtx/0000-configure-java-version.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-Make the JAVA_VERSION checks future-proof (for Java 6 and 7)
-
-At this point Java is mature enough that support for older versions isn't
-going to be dropped, so instead of having a growing list of new versions that
-work by default, have a short list of old versions that need special measures.
---- RXTX.orig/configure.in	2012-10-29 01:13:58.000000000 -0400
-+++ RXTX/configure.in	2012-10-29 10:56:18.000000000 -0400
-@@ -463,12 +463,6 @@
- 	CFLAGS=$CFLAGS" -D__need_timespec"
- 	case $JAVA_VERSION in
- 
--	1.2*|1.3*|1.4*|1.5*) 
--		#fix_parameters $JPATH/jre/lib/javax.comm.properties
--		CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
--		JHOME=$JPATH"/jre/lib/ext"
--		RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
--	;;
- 	1.1*) 
- 		CLASSPATH=".:\$(TOP):\$(TOP)/src:"` \
- 			if [ -d $JPATH/share/kaffe/ ]; then
-@@ -498,6 +492,12 @@
- 			JHOME=$JPATH/"lib"
- 		fi
- 	;;
-+	*) 
-+		#fix_parameters $JPATH/jre/lib/javax.comm.properties
-+		CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
-+		JHOME=$JPATH"/jre/lib/ext"
-+		RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
-+	;;
- 	esac 
- 
- 	# Cross Compilers
-@@ -533,12 +533,6 @@
- 	TARGETLIB="\$(target_triplet)/librxtxSerial.la \
- 			\$(target_triplet)/librxtxParallel.la"
- 	case $JAVA_VERSION in
--	1.2*|1.3*|1.4*|1.5*) 
--		#fix_parameters $JPATH/jre/lib/javax.comm.properties
--		CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
--		RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
--		JHOME=$JPATH/"jre/lib/ext"
--	;;
- 	1.1*) 
- 		check_prefix
- 		#fix_parameters $JPATH/lib/javax.comm.properties
-@@ -570,6 +564,10 @@
- 		JHOME=$JPATH/"lib"
- 	;;
- 	*)
-+		#fix_parameters $JPATH/jre/lib/javax.comm.properties
-+		CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
-+		RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
-+		JHOME=$JPATH/"jre/lib/ext"
- 	;;
- 	esac
- ;;
-@@ -669,15 +667,15 @@
- 
- WIN32)
- 	case $JAVA_VERSION in
--	1.2*|1.3*|1.4*|1.5*)
--		CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH"
--		JHOME=$JPATH"/jre/lib/ext"
--	;;
- 	1.1*)
- 		CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH"
- 		RXTX_PATH="\$(prefix)/lib/"
- 		JHOME=$JPATH/"lib"
- 	;;
-+	*)
-+		CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH"
-+		JHOME=$JPATH"/jre/lib/ext"
-+	;;
- 	esac
- 	if test x$WIN32INCLUDE = x; then
- 	echo "We need to know what directory the windows java include files"
-@@ -721,12 +719,12 @@
- 	CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH"
- 
- 	case $JAVA_VERSION in
--	1.2*|1.3*|1.4*|1.5*)
--		RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
--	;;
- 	1.1*)
- 		RXTX_PATH="\$(JPATH)/lib/"
- 	;;
-+	*)
-+		RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
-+	;;
- 	esac
- ;;
- 
diff --git a/java/java-rxtx/0001-makefile-destdir.patch b/java/java-rxtx/0001-makefile-destdir.patch
deleted file mode 100644
index 944654ab6..000000000
--- a/java/java-rxtx/0001-makefile-destdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Add DESTDIR support to Makefile
---- RXTX.orig/Makefile.am
-+++ RXTX/Makefile.am
-@@ -81,13 +81,15 @@
- #  install librxtxSerial.so into the proper directory and copy $(JARTARGET) to its
- #  proper location
- install: all
-+	$(mkinstalldirs) $(DESTDIR)$(RXTX_PATH)
-+	$(mkinstalldirs) $(DESTDIR)$(JHOME)
- 	@$(LIBTOOL_INST) \
- 	`for i in $(TARGETLIB);do \
- 		if [ -f $$i ];then \
- 			echo $$i; \
- 		fi; \
--	done` $(RXTX_PATH)
--	$(INSTALL_PROGRAM) $(JARTARGET) $(JHOME)/
-+	done` $(DESTDIR)$(RXTX_PATH)
-+	$(INSTALL_PROGRAM) $(JARTARGET) $(DESTDIR)$(JHOME)/
- 
- clean-generic:
- 	rm -rf $(DEST) $(TOP)/$(CLASSTOP)
diff --git a/java/java-rxtx/0002-makefile-javadoc-dir.patch b/java/java-rxtx/0002-makefile-javadoc-dir.patch
deleted file mode 100644
index 9b4eb0692..000000000
--- a/java/java-rxtx/0002-makefile-javadoc-dir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Place the Javadoc output in its own directory
---- RXTX.orig/Makefile.am
-+++ RXTX/Makefile.am
-@@ -99,7 +99,8 @@
- 
- #  create the javadoc files.
- docs: $(CLASSES)
--	$(JAVADOC) $(javafiles)
-+	mkdir javadoc
-+	cd javadoc && $(JAVADOC) $(javafiles)
- 
- ################  WIN32 CrossCompiling from here down #######################
- 
diff --git a/java/java-rxtx/0003-lockdir-location.patch b/java/java-rxtx/0003-lockdir-location.patch
deleted file mode 100644
index 78a757f81..000000000
--- a/java/java-rxtx/0003-lockdir-location.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix the location of device lock files.
-
-Use the new semi-standard device lock file directory on GNU/Linux.  This is
-nescessary on (at least) Arch Linux and Parabola GNU/Linux.
-
-http://lists.freedesktop.org/archives/systemd-devel/2011-March/001823.html
-
---- RXTX.orig/src/SerialImp.h
-+++ RXTX/src/SerialImp.h
-@@ -109,7 +109,7 @@
- /*  Ports known on the OS */
- #if defined(__linux__)
- #	define DEVICEDIR "/dev/"
--#	define LOCKDIR "/var/lock"
-+#	define LOCKDIR "/var/lock/lockdev"
- #	define LOCKFILEPREFIX "LCK.."
- #	define FHS
- #endif /* __linux__ */
diff --git a/java/java-rxtx/GroupMembership.txt b/java/java-rxtx/GroupMembership.txt
deleted file mode 100644
index dd5c47076..000000000
--- a/java/java-rxtx/GroupMembership.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-In order to use a program that makes use of rxtx, you must be a member
-of the groups:
- * uucp: for access to hardware devices in /dev
- * lock: for access to hardware lockfiles in /var/lock/lockdev
-
-Most documentation indicates that you must be in one or the other,
-depending on your distro; you must actually be in both.
diff --git a/java/java-rxtx/PKGBUILD b/java/java-rxtx/PKGBUILD
deleted file mode 100644
index ceb0d9bab..000000000
--- a/java/java-rxtx/PKGBUILD
+++ /dev/null
@@ -1,95 +0,0 @@
-# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgver=2.1-7r2-arduino4
-_gitver='commit=a8cd90f8505d7c472b57550b1192fe67885dd638'
-
-####
-
-pkgname=java-rxtx
-pkgver=${_pkgver//-/.}
-pkgdesc="A native library providing serial and parallel communication for Java"
-license=(LGPL2.1)
-
-pkgrel=4
-arch=('i686' 'x86_64')
-depends=('java-runtime')
-makedepends=('java-environment')
-
-case "$_pkgver" in
-    *arduino*)
-	url="https://github.com/arduino/RXTX"
-	source=("libre://RXTX-$pkgver.tar.gz")
-	md5sums=('a71156587dc8d28d1ff4ece376bc0140')
-	mksource=("git://github.com/arduino/RXTX.git#${_gitver}")
-	mkmd5sums=('SKIP')
-	_dirname=RXTX
-	;;
-    *)
-	url="http://rxtx.qbang.org/"
-	source=("http://rxtx.qbang.org/pub/rxtx/rxtx-${_pkgver}.zip")
-	md5sums=('9290b4832d46199f8d798a531209640b')
-	_dirname=rxtx-{$_pkgver}
-	;;
-esac
-
-source+=(
-  0000-configure-java-version.patch
-  0001-makefile-destdir.patch
-  0002-makefile-javadoc-dir.patch
-  0003-lockdir-location.patch
-  GroupMembership.txt)
-
-md5sums+=('a36caaca717018341d69605f962d1c2a'
-          '39c88043032de742c6b51d90a26eee2c'
-          'a910e0c75a9c687d2b2f782e3d9982e3'
-          '19b19c2514bce563be2a812888e1d9b4'
-          '9dc461eab358e3b78c4b688977997116')
-
-_MAKEFLAGS=('JHOME=/usr/share/java' 'RXTX_PATH=/usr/lib')
-
-_changelog() {
-  t="`echo -e '\t'`"
-  
-  # Parabola changes
-  ls "$srcdir"/*.patch | sort -r | while read file; do
-    echo "${file##*/}"
-    sed "1s/./$t$t&/;1q" "$file"
-  done
-
-  # Arduino changes
-  if [[ -d "$srcdir/$_dirname/.git" ]]; then
-    pushd "$srcdir/$_dirname" > /dev/null
-    git log --pretty=format:"%h %ad%n$t$t%s" --date=short|head -n-2
-    popd > /dev/null
-  fi
-
-  # RXTX ChangeLog
-  grep "^[0-9 $t]" "$srcdir/$_dirname/ChangeLog"
-}
-
-build() {
-  _changelog > "$srcdir/ChangeLog.txt"
-  cd "$srcdir/$_dirname"
-  . /etc/profile.d/jdk.sh
-
-  patch -Np1 -i "$srcdir/0000-configure-java-version.patch" # requires autogen
-  patch -Np1 -i "$srcdir/0001-makefile-destdir.patch" # requires autogen
-  patch -Np1 -i "$srcdir/0002-makefile-javadoc-dir.patch" # requires autogen
-  patch -Np1 -i "$srcdir/0003-lockdir-location.patch"
-  rm *.m4 && ./autogen.sh
-
-  ./configure --prefix=/usr
-  make "${_MAKEFLAGS[@]}" all docs
-}
-
-package() {
-  cd "$srcdir/$_dirname"
-  . /etc/profile.d/jdk.sh
-
-  make "${_MAKEFLAGS[@]}" DESTDIR="$pkgdir" install
-
-  install -d "$pkgdir/usr/share/doc/$pkgname/"
-  install -m644 "$srcdir/ChangeLog.txt" "$pkgdir/usr/share/doc/$pkgname/"
-  install -m644 "$srcdir/GroupMembership.txt" "$pkgdir/usr/share/doc/$pkgname/"
-  cp -r javadoc "$pkgdir/usr/share/doc/$pkgname/"
-}
diff --git a/java/java-sonatype-oss-parent/PKGBUILD b/java/java-sonatype-oss-parent/PKGBUILD
deleted file mode 100644
index b62c971ac..000000000
--- a/java/java-sonatype-oss-parent/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=java-sonatype-oss-parent
-pkgver=7
-pkgdesc="Metadata file for Maven-based build systems to inherit from"
-license='Apache2'
-
-_groupId=org.sonatype.oss
-_artifactId=oss-parent
-
-pkgrel=1
-arch=('any')
-makedepends=('jh')
-source=("http://search.maven.org/remotecontent?filepath=$_groupId/$_artifactId/$pkgver/$_artifactId-$pkgver.pom")
-
-package() {
-  cd "$srcdir"
-  DESTDIR=$pkgdir jh mvn-install $_groupId $_artifactId $pkgver $_artifactId-$pkgver.pom
-}
-
-md5sums=('3e418cf7f2607bf359e6c514a992cb38')
diff --git a/java/javacc/PKGBUILD b/java/javacc/PKGBUILD
deleted file mode 100644
index 032fd7b25..000000000
--- a/java/javacc/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=javacc
-pkgver=5.0
-pkgdesc="Java Compiler Compiler; a parser generator"
-url="http://javacc.java.net/"
-license=('BSD3')
-
-arch=('any')
-pkgrel=2.1
-depends=('java-runtime')
-makedepends=('apache-ant' 'junit' 'jh')
-source=("http://java.net/projects/${pkgname}/downloads/download/${pkgname}-${pkgver}src.tar.gz")
-
-prepare() {
-  cd "$srcdir/$pkgname"
-  rm lib/junit3.8.1/junit.jar
-  ln -s /usr/share/java/junit.jar lib/junit3.8.1
-  #rm bootstrap/javacc.jar
-}
-
-build() {
-  cd "$srcdir/$pkgname"
-
-  sed -i \
-	  -e 's|<modelVersion>.*</modelVersion>|<modelVersion>4.0.0</modelVersion>|' \
-	  -e "s|<version>.*</version>|<version>$pkgver</version>|" \
-	  pom.xml
-
-  for prog in javacc jjdoc jjtree; do
-	  sed -i 's|JAR=.*|JAR=/usr/share/java/javacc.jar|' bin/$prog
-  done
-
-  CLASSPATH=/usr/share/java/junit.jar ant
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-
-  for prog in javacc jjdoc jjrun jjtree; do
-	  install -Dm755 bin/$prog "$pkgdir"/usr/bin/$prog
-  done
-  install -Dm644 bin/lib/javacc.jar "$pkgdir"/usr/share/java/javacc.jar
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-md5sums=('871d78a2a5859c2eebc712c1f8135be5')
diff --git a/java/jh/PKGBUILD b/java/jh/PKGBUILD
deleted file mode 100644
index 5638adbce..000000000
--- a/java/jh/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=jh
-pkgver=0.5.1
-pkgdesc="Java helpers for PKGBUILDs"
-url="https://projects.parabolagnulinux.org/packages/jh.git/"
-license=('custom:WTFPL')
-
-pkgrel=1
-arch=(any)
-optdepends=("maven: for configurable maven local repository location")
-source=("https://projects.parabolagnulinux.org/packages/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2")
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make
-}
-
-package() {
-  depends=(xmlstarlet)
-
-  cd "$srcdir/$pkgname-$pkgver"
-  make install DESTDIR="$pkgdir"
-  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-md5sums=('051d39c5dac14e86b755bab9ec1d0d5d')
diff --git a/java/jna/PKGBUILD b/java/jna/PKGBUILD
deleted file mode 100644
index f7248a637..000000000
--- a/java/jna/PKGBUILD
+++ /dev/null
@@ -1,115 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=jna
-pkgver=3.4.2
-
-pkgdesc="Provides Java programs easy access to native shared libraries"
-url="https://github.com/twall/jna"
-license=('LGPL')
-source=("git://github.com/twall/jna.git#tag=${pkgver}"
-  'libre-without-clover.patch'
-  'bugfix-type-inference.patch'
-  'webstart-test.keystore')
-
-####
-
-pkgrel=2
-arch=('i686' 'x86_64')
-depends=('java-environment' 'libffi')
-makedepends=('apache-ant' 'zip' 'makepkg-git' 'git')
-checkdepends=('icedtea-web-java7' 'junit' 'libxtst')
-options=('!makeflags')
-
-unset _JAVA_OPTIONS
-_M2_LOCALREPO='/usr/share/maven/repository'
-
-_ant_options=(
-  '-Ddynlink.native=true' # use the system install of libffi
-)
-
-####
-
-prepare() {
-  cd "$srcdir/jna"
-  find . -name '*.jar' -delete
-  rm -rf dist
-  rm -rf native/libffi # make sure it doesn't cheat
-  rm lib/clover.license
-  rm w32ce-test.lnk
-
-  ln -s /usr/share/java/junit.jar lib/
-
-  # Create an emtpy zip (jar) file
-  cd "$srcdir"
-  touch file
-  zip empty.zip file
-  zip -d empty.zip file
-  rm file
-}
-
-####
-
-build() {
-  cd "$srcdir/jna"
-
-  # Because JNA's release process is ridiculous, it wants a jar file for every
-  # architecture to be present.  So let's just dump in an empty jar file!
-  sed -n 's|\s*<zipfileset src="${lib\.native}/\(.*\)"|\1|p' build.xml \
-    | while read jarfile; do
-    cp "$srcdir/empty.zip" lib/native/$jarfile
-  done
-
-  patch -p1 -i "$srcdir/libre-without-clover.patch"
-  patch -p1 -i "$srcdir/bugfix-type-inference.patch"
-
-  # Disable tests that intermittently fail
-  # crashes vm (segfault)
-  sed -i -e 's|testRegisterMethods|no&|' test/com/sun/jna/DirectTest.java
-  # crashes vm, java 7 only (icedtea-7, oracle-jdk-bin-1.7)
-  sed -i -e 's|testGCCallbackOnFinalize|no&|' test/com/sun/jna/CallbacksTest.java
-
-  # Actually build
-  ant "${_ant_options[@]}" dist
-}
-
-check() {
-  cd "$srcdir/jna"
-
-  # Create a foke home directory to trash
-  mkdir "$srcdir/user.home"
-  export _JAVA_OPTIONS="-Duser.home=$srcdir/user.home -Djava.awt.headless=true"
-
-  # The webstart test looks for this config file
-  mkdir -p "$srcdir/user.home/.java/deployment"
-  touch "$srcdir/user.home/.java/deployment/deployment.properties"
-
-  # Trust the cert used for the webstart test
-  mkdir -p "$srcdir/user.home/.icedtea/security"
-  cp "$srcdir/webstart-test.keystore" "$srcdir/user.home/.icedtea/security/trusted.certs"
-
-  _ant_options+=('-Dtests.exclude-patterns=**/DirectTest.java')
-
-  # Run the tests
-  ant "${_ant_options[@]}" test
-}
-
-package() {
-  cd "$srcdir/jna"
-
-  install -d "$pkgdir/usr/share/java/jna"
-
-  for pkg in jna platform; do
-   dir="$_M2_LOCALREPO"/net/java/dev/jna/$pkg/$pkgver
-   install -d "$pkgdir$dir"
-   cp dist/$pkg.jar "$pkgdir$dir/$pkg-$pkgver.jar"
-   cp pom-$pkg.xml  "$pkgdir$dir/$pkg-$pkgver.pom"
-   ln -s "$dir/$pkg-$pkgver.jar" "$pkgdir/usr/share/java/jna/$pkg.jar"
-  done
-
-  ln -s jna/jna.jar "$pkgdir/usr/share/java/jna.jar"
-}
-
-md5sums=('SKIP'
-         '3a2f96b868f49ca125b677779e846484'
-         '932d9cb2da1531a2315ae132480683fa'
-         'b704c7d2cb1fe7a93f8cad8d321d16f8')
diff --git a/java/jna/bugfix-type-inference.patch b/java/jna/bugfix-type-inference.patch
deleted file mode 100644
index 2322b13fc..000000000
--- a/java/jna/bugfix-type-inference.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru jna-3.4.2.orig/test/com/sun/jna/NativeTest.java jna-3.4.2/test/com/sun/jna/NativeTest.java
---- jna-3.4.2.orig/test/com/sun/jna/NativeTest.java	2012-09-03 08:30:42.000000000 -0400
-+++ jna-3.4.2/test/com/sun/jna/NativeTest.java	2012-09-24 15:29:48.000000000 -0400
-@@ -374,7 +374,8 @@
-             for (int i=0;i < args.length;i++) {
-                 System.out.println("Running tests on class " + args[i]);
-                 try {
--                    junit.textui.TestRunner.run(Class.forName(args[i]));
-+                    Class<?> klass = Class.forName(args[i]);
-+                    junit.textui.TestRunner.run((Class<? extends TestCase>)klass);
-                 }
-                 catch(Throwable e) {
-                     e.printStackTrace();
diff --git a/java/jna/libre-without-clover.patch b/java/jna/libre-without-clover.patch
deleted file mode 100644
index b4947e8b2..000000000
--- a/java/jna/libre-without-clover.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -ru jna-3.4.2.orig/build.xml jna-3.4.2/build.xml
---- jna-3.4.2.orig/build.xml	2012-09-06 06:55:52.000000000 -0400
-+++ jna-3.4.2/build.xml	2012-09-24 15:49:59.000000000 -0400
-@@ -230,7 +230,6 @@
-     <path id="test.runpath">
-       <pathelement path="${build}/${jar}"/>
-       <pathelement path="${test.classes}"/>
--      <pathelement path="lib/clover.jar"/>
-       <path refid="test.libs"/>
-     </path>
-   </target>
-@@ -536,12 +535,11 @@
-     <copy todir="${build}/jws" file="${build}/${jar}"/>
-     <copy todir="${build}/jws" file="${build}/${testjar}"/>
-     <copy todir="${build}/jws" file="lib/junit.jar"/>
--    <copy todir="${build}/jws" file="lib/clover.jar"/>
-     <jar jarfile="${build}/jws/jnidispatch.jar">
-       <fileset dir="${build.native}" includes="*jnidispatch.*"/>
-     </jar>
-     <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true">
--      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
-+      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar"/>
-     </signjar>
-   </target>
- 
-@@ -626,7 +624,7 @@
-       <report todir="${reports.junit}"/>
-     </junitreport>
-     <echo>View test report in file://${reports.junit}/index.html</echo>
--    <fail if="testfailure" unless="clover">One or more tests failed</fail>
-+    <fail if="testfailure">One or more tests failed</fail>
-   </target>
- 
-   <target name="contrib-test" depends="contrib-jars,compile-tests">
-@@ -640,27 +638,6 @@
-     </subant>
-   </target>
- 
--  <target name="with.clover" description="Enable code coverage for tests">
--    <taskdef resource="cloverlib.xml" classpath="lib/clover.jar"/>
--    <property name="clover" value="true"/>
--    <property name="build" value="build.clover"/>
--    <clover-setup/>
--  </target>
--
--  <target name="clover" depends="with.clover,test"
--          description="Generate test code coverage reports">
--    <property name="reports.clover" value="${reports}/clover"/>
--    <mkdir dir="${reports.clover}"/>
--    <clover-report>
--      <current outfile="${reports.clover}" title="clover">
--        <fileset dir="." includes="**/*.java" />
--        <testresults dir="${results.junit}" includes="TEST-*.xml"/>
--        <format type="html"/>
--      </current>
--    </clover-report>
--    <echo>Reports generated in ${reports.clover}</echo>
--  </target>
--
-   <target name="javadoc" depends="-setup">
-     <path id="javadoc.src.path">
-       <path refid="src.path"/>
-@@ -881,7 +858,7 @@
-     <!-- Full sources required to build and test everything -->
-     <zip zipfile="${dist}/src-full.zip">
-       <zipfileset src="${dist}/src.zip"/>
--      <zipfileset dir="lib" includes="junit.jar,clover.jar" prefix="lib"/>
-+      <zipfileset dir="lib" includes="junit.jar" prefix="lib"/>
-       <zipfileset dir="." includes=".classpath,.project"/>
-       <zipfileset dir="${native}" includes="libffi,libffi/**/*" prefix="native"/>
-     </zip>
diff --git a/java/jna/webstart-test.keystore b/java/jna/webstart-test.keystore
deleted file mode 100644
index 1bbe8c829..000000000
--- a/java/jna/webstart-test.keystore
+++ /dev/null
diff --git a/java/junit/PKGBUILD b/java/junit/PKGBUILD
deleted file mode 100644
index 04dbcb2ac..000000000
--- a/java/junit/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Arch): Guillaume ALAUX <Guillaume at Arch Linux dot org>
-
-pkgname=junit
-pkgver=4.11
-pkgdesc="Automated testing framework for Java"
-url="http://www.junit.org/"
-license=('CPL')
-
-pkgrel=3.2
-arch=('any')
-depends=('java-runtime' 'java-hamcrest')
-makedepends=('apache-ant' 'jakarta-oro' 'jh')
-
-source=("libre://$pkgname-$pkgver.tar.gz")
-md5sums=('cdaa9856761201de81a61aecb8cfcc9c')
-
-mksource=("$pkgname-$pkgver::git://github.com/junit-team/junit.git#tag=r$pkgver")
-mkmd5sums=('SKIP')
-mksource() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  find . -name '*.jar' -delete
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ln -sf /usr/share/java/jakarta-oro.jar build/lib/
-  ln -sf /usr/share/java/hamcrest-core.jar lib/hamcrest-core-1.3.jar
-
-  ant -Dversion-status='' jars
-  for artifact in junit junit-dep; do
-    sed \
-      -e "s|@artifactID@|$artifact|" \
-      -e "s|@version@|$pkgver|" \
-      < build/maven/$artifact-pom-template.xml > $pkgname$pkgver/$artifact-$pkgver.pom
-  done
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}${pkgver}"
-
-  export DESTDIR="$pkgdir"
-  jh mvn-install $pkgname junit     $pkgver junit-$pkgver.{pom,jar} junit-$pkgver.jar
-  jh mvn-install $pkgname junit-dep $pkgver junit-dep-$pkgver.pom
-  ln -s ${pkgname}-${pkgver}.jar ${pkgdir}/usr/share/java/${pkgname}.jar
-}
diff --git a/java/maven/PKGBUILD b/java/maven/PKGBUILD
deleted file mode 100644
index 3f8e5071d..000000000
--- a/java/maven/PKGBUILD
+++ /dev/null
@@ -1,107 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=maven
-pkgver=3.0.5
-pkgdesc="A Java project management and project comprehension tool"
-url="http://maven.apache.org"
-license=('Apache')
-
-replaces=('maven-libre')
-conflicts=('maven-libre')
-
-pkgrel=1
-arch=('any')
-options=(!emptydirs)
-conflicts=('maven')
-depends=('java-environment' 'sh')
-makedepends=('apache-ant' 'jh' 'imake'
-	java-antlr2
-	java-asm3
-)
-backup=('etc/maven/settings.xml')
-
-_mirror=http://archive.apache.org/dist
-source=($_mirror/maven/maven-${pkgver%%.*}/$pkgver/source/apache-maven-$pkgver-src.tar.gz
-	maven.sh maven.csh)
-
-_setup_env() {
-  unset _JAVA_OPTIONS
-  . /etc/profile.d/jre.sh
-  . /etc/profile.d/jdk.sh
-  export MAVEN_OPTS=-Xmx512m
-  export M2_HOME="$pkgdir"/opt/maven
-  export PATH="$PATH:$M2_HOME/bin"
-  _M2_LOCALREPO=$(jh mvn-localrepo)
-  ant_args=(
-    -Dmaven.repo.local="$srcdir"/maven.repo.local
-  )
-}
-
-prepare() {
-  if type mvn &>/dev/null; then
-    error "maven cannot be built while an existing version is installed"
-    return 1
-  fi
-}
-
-build() (
-  _setup_env
-  install -d "$srcdir"/maven.repo.local
-  lndir "$_M2_LOCALREPO" "$srcdir"/maven.repo.local
-
-  cd "$srcdir"/apache-maven-$pkgver
-
-  # FIXME: downloads makedepends from the Internet. Add them to makedepends=()
-  ant "${ant_args[@]}" maven-assembly 2>&1|tee "$srcdir"/ant-log.txt
-
-  < "$srcdir"/ant-log.txt \
-    sed -nr 's/.*Download(ed|ing):\s*//p' | \
-    sed 's/ .*//' | \
-    sed -r -e 's|^http://repo.maven.apache.org/maven2/||' -e 's/\.(jar|pom)$//' | \
-    sort -u > "$srcdir"/downloaded-artifacts.txt
-)
-
-package() (
-  _setup_env
-  cd "$srcdir"/apache-maven-$pkgver
-  ant "${ant_args[@]}" extract-assembly
-  #rm "$pkgdir"/opt/maven/*.txt
-
-  # Install config file in /etc
-  #  Unlike the other directories, we symlink from the system to /opt/maven
-  #  because that way all conf files stay in /etc
-  install -d "$pkgdir"/etc/maven
-  sed "55i<localRepository>$_M2_LOCALREPO</localRepository>" \
-    < "$pkgdir"/opt/maven/conf/settings.xml \
-    > "$pkgdir"/etc/maven/settings.xml
-  rm -rf "$pkgdir"/opt/maven/conf
-  ln -s /etc/maven "$pkgdir"/opt/maven/conf
-
-  # Install profile.d settings
-  install -d "$pkgdir"/etc/profile.d
-  install -m 755 "$srcdir"/maven.{csh,sh} "$pkgdir"/etc/profile.d
-
-  # Link executables to /usr/bin
-  install -d "$pkgdir"/usr/bin
-  ln -s /opt/maven/bin/{mvn,mvnDebug,mvnyjp} "$pkgdir"/usr/bin
-
-  # Link jar files to appropriate place in /usr/share
-  install -d "$pkgdir"/usr/share/java
-  ln -s /opt/maven/lib "$pkgdir"/usr/share/java/maven
-
-  # Install the local repo
-  mkdir -p "$pkgdir"${_M2_LOCALREPO%/*}
-  cp -a "$srcdir"/maven.repo.local "$pkgdir"$_M2_LOCALREPO
-  # Remove extra artifacts
-  find "$pkgdir"$_M2_LOCALREPO -type l -delete
-  find "$pkgdir"$_M2_LOCALREPO -name _maven.repositories -delete
-  cat "$srcdir"/downloaded-artifacts.txt | while read artifact; do
-    rm -f "$pkgdir"$_M2_LOCALREPO/$artifact*
-  done
-)
-
-md5sums=('b88becd8fe5a9665191e05945942db64'
-         '58820067a4d7384477daa134023d9b57'
-         'e2bbdeffed100cd51d05b2ba8ebd6321')
diff --git a/java/maven/maven.csh b/java/maven/maven.csh
deleted file mode 100644
index f5750cfc8..000000000
--- a/java/maven/maven.csh
+++ /dev/null
@@ -1,2 +0,0 @@
-setenv MAVEN_OPTS -Xmx512m
-setenv M2_HOME=/opt/maven
diff --git a/java/maven/maven.sh b/java/maven/maven.sh
deleted file mode 100644
index b6655cc22..000000000
--- a/java/maven/maven.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-export MAVEN_OPTS=-Xmx512m
-export M2_HOME=/opt/maven
diff --git a/java/nant/PKGBUILD b/java/nant/PKGBUILD
deleted file mode 100644
index f57c8519f..000000000
--- a/java/nant/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=nant
-pkgver=0.92
-pkgrel=2
-pkgdesc="A free .NET build tool"
-arch=('i686' 'x86_64')
-url="http://nant.sourceforge.net"
-license=("GPL2")
-depends=('mono-basic')
-makedepends=('pkgconfig')
-source=("http://downloads.sourceforge.net/nant/$pkgname-$pkgver-src.tar.gz" 'mono3.patch')
-
-prepare() {
-  cd "$srcdir"/$pkgname-$pkgver
-  patch -p1 -i ../mono3.patch
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make -j1 install prefix=/usr DESTDIR="$pkgdir"
-}
-
-md5sums=('d680b47f9b2ce197cec0fac7d7d60950'
-         '06fcf641b6f232c5890ad25c73b2459f')
diff --git a/java/nant/mono3.patch b/java/nant/mono3.patch
deleted file mode 100644
index 94518d6cd..000000000
--- a/java/nant/mono3.patch
+++ /dev/null
@@ -1,2645 +0,0 @@
-diff -ruN nant-0.92.orig/src/NAnt.Console/App.config nant-0.92/src/NAnt.Console/App.config
---- nant-0.92.orig/src/NAnt.Console/App.config	2012-06-09 08:05:53.000000000 -0600
-+++ nant-0.92/src/NAnt.Console/App.config	2013-08-04 22:41:24.000000000 -0600
-@@ -18,2329 +18,6 @@
-     <!-- nant config settings -->
-     <nant>
-         <frameworks>
--            <platform name="win32" default="auto">
--                <task-assemblies>
--                        <!-- include NAnt task assemblies -->
--                        <include name="*Tasks.dll" />
--                        <!-- include NAnt test assemblies -->
--                        <include name="*Tests.dll" />
--                        <!-- include framework-neutral assemblies -->
--                        <include name="extensions/common/neutral/**/*.dll" />
--                        <!-- exclude Microsoft.NET specific task assembly -->
--                        <exclude name="NAnt.MSNetTasks.dll" />
--                        <!-- exclude Microsoft.NET specific test assembly -->
--                        <exclude name="NAnt.MSNet.Tests.dll" />
--                </task-assemblies>
--                <framework 
--                    name="net-1.0"
--                    family="net"
--                    version="1.0"
--                    description="Microsoft .NET Framework 1.0"
--                    sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}"
--                    frameworkdirectory="${path::combine(installRoot, 'v1.0.3705')}"
--                    frameworkassemblydirectory="${path::combine(installRoot, 'v1.0.3705')}"
--                    clrversion="1.0.3705"
--                    clrtype="Desktop"
--                    vendor="Microsoft"
--                    >
--                    <runtime>
--                        <probing-paths>
--                            <directory name="lib/net/1.0" />
--                            <directory name="lib/net/neutral" />
--                            <directory name="lib/common/1.0" />
--                            <directory name="lib/common/neutral" />
--                        </probing-paths>
--                        <modes>
--                            <strict>
--                                <environment>
--                                    <variable name="COMPLUS_VERSION" value="v1.0.3705" />
--                                </environment>
--                            </strict>
--                        </modes>
--                    </runtime>
--                    <reference-assemblies basedir="${path::combine(installRoot, 'v1.0.3705')}">
--                        <include name="Accessibility.dll" />
--                        <include name="cscompmgd.dll" />
--                        <include name="mscorlib.dll" />
--                        <include name="Microsoft.Vsa.dll" />
--                        <include name="Microsoft.VisualBasic.dll" />
--                        <include name="System.Configuration.Install.dll" />
--                        <include name="System.Data.dll" />
--                        <include name="System.Design.dll" />
--                        <include name="System.DirectoryServices.dll" />
--                        <include name="System.dll" />
--                        <include name="System.Drawing.Design.dll" />
--                        <include name="System.Drawing.dll" />
--                        <include name="System.EnterpriseServices.dll" />
--                        <include name="System.Management.dll" />
--                        <include name="System.Messaging.dll" />
--                        <include name="System.Runtime.Remoting.dll" />
--                        <include name="System.Runtime.Serialization.Formatters.Soap.dll" />
--                        <include name="System.Security.dll" />
--                        <include name="System.ServiceProcess.dll" />
--                        <include name="System.Web.dll" />
--                        <include name="System.Web.RegularExpressions.dll" />
--                        <include name="System.Web.Services.dll" />
--                        <include name="System.Windows.Forms.dll" />
--                        <include name="System.XML.dll" />
--                    </reference-assemblies>
--                    <task-assemblies>
--                        <!-- include MS.NET version-neutral assemblies -->
--                        <include name="extensions/net/neutral/**/*.dll" />
--                        <!-- include MS.NET 1.0 specific assemblies -->
--                        <include name="extensions/net/1.0/**/*.dll" />
--                        <!-- include Microsoft.NET specific task assembly -->
--                        <include name="NAnt.MSNetTasks.dll" />
--                        <!-- include Microsoft.NET specific test assembly -->
--                        <include name="NAnt.MSNet.Tests.dll" />
--                        <!-- include .NET 1.0 specific assemblies -->
--                        <include name="extensions/common/1.0/**/*.dll" />
--                    </task-assemblies>
--                    <tool-paths>
--                        <directory name="${path::combine(sdkInstallRoot, 'bin')}"
--                            if="${property::exists('sdkInstallRoot')}" />
--                        <directory name="${path::combine(installRoot, 'v1.0.3705')}" />
--                    </tool-paths>
--                    <project>
--                        <readregistry
--                            property="installRoot"
--                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
--                            hive="LocalMachine" />
--                        <readregistry
--                            property="sdkInstallRoot"
--                            key="SOFTWARE\Microsoft\.NETFramework\sdkInstallRoot"
--                            hive="LocalMachine"
--                            failonerror="false" />
--                    </project>
--                    <tasks>
--                        <task name="csc">
--                            <attribute name="supportsnowarnlist">true</attribute>
--                        </task>
--                        <task name="vjc">
--                            <attribute name="supportsnowarnlist">true</attribute>
--                        </task>
--                        <task name="delay-sign">
--                            <attribute name="exename">sn</attribute>
--                        </task>
--                        <task name="license">
--                            <attribute name="exename">lc</attribute>
--                        </task>
--                        <task name="aximp">
--                            <attribute name="supportsrcw">false</attribute>
--                        </task>
--                        <task name="tlbimp">
--                            <attribute name="supportstransform">false</attribute>
--                        </task>
--                    </tasks>
--                </framework>
--                <framework 
--                    name="net-1.1"
--                    family="net"
--                    version="1.1"
--                    description="Microsoft .NET Framework 1.1"
--                    sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}"
--                    frameworkdirectory="${path::combine(installRoot, 'v1.1.4322')}"
--                    frameworkassemblydirectory="${path::combine(installRoot, 'v1.1.4322')}"
--                    clrversion="1.1.4322"
--                    clrtype="Desktop"
--                    vendor="Microsoft"
--                    >
--                    <runtime>
--                        <probing-paths>
--                            <directory name="lib/net/1.1" />
--                            <directory name="lib/net/neutral" />
--                            <directory name="lib/common/1.1" />
--                            <directory name="lib/common/neutral" />
--                        </probing-paths>
--                        <modes>
--                            <strict>
--                                <environment>
--                                    <variable name="COMPLUS_VERSION" value="v1.1.4322" />
--                                </environment>
--                            </strict>
--                        </modes>
--                    </runtime>
--                    <reference-assemblies basedir="${path::combine(installRoot, 'v1.1.4322')}">
--                        <include name="Accessibility.dll" />
--                        <include name="cscompmgd.dll" />
--                        <include name="mscorlib.dll" />
--                        <include name="Microsoft.Vsa.dll" />
--                        <include name="Microsoft.VisualBasic.dll" />
--                        <include name="Microsoft.VisualBasic.Compatibility.dll" />
--                        <include name="Microsoft.VisualBasic.Compatibility.Data.dll" />
--                        <include name="System.Configuration.Install.dll" />
--                        <include name="System.Data.dll" />
--                        <include name="System.Data.OracleClient.dll" />
--                        <include name="System.Design.dll" />
--                        <include name="System.DirectoryServices.dll" />
--                        <include name="System.dll" />
--                        <include name="System.Drawing.Design.dll" />
--                        <include name="System.Drawing.dll" />
--                        <include name="System.EnterpriseServices.dll" />
--                        <include name="System.Management.dll" />
--                        <include name="System.Messaging.dll" />
--                        <include name="System.Runtime.Remoting.dll" />
--                        <include name="System.Runtime.Serialization.Formatters.Soap.dll" />
--                        <include name="System.Security.dll" />
--                        <include name="System.ServiceProcess.dll" />
--                        <include name="System.Web.dll" />
--                        <include name="System.Web.Mobile.dll" />
--                        <include name="System.Web.RegularExpressions.dll" />
--                        <include name="System.Web.Services.dll" />
--                        <include name="System.Windows.Forms.dll" />
--                        <include name="System.XML.dll" />
--                    </reference-assemblies>
--                    <task-assemblies>
--                        <!-- include MS.NET version-neutral assemblies -->
--                        <include name="extensions/net/neutral/**/*.dll" />
--                        <!-- include MS.NET 1.1 specific assemblies -->
--                        <include name="extensions/net/1.1/**/*.dll" />
--                        <!-- include MS.NET specific task assembly -->
--                        <include name="NAnt.MSNetTasks.dll" />
--                        <!-- include MS.NET specific test assembly -->
--                        <include name="NAnt.MSNet.Tests.dll" />
--                        <!-- include .NET 1.1 specific assemblies -->
--                        <include name="extensions/common/1.1/**/*.dll" />
--                    </task-assemblies>
--                    <tool-paths>
--                        <directory name="${path::combine(sdkInstallRoot, 'bin')}"
--                            if="${property::exists('sdkInstallRoot')}" />
--                        <directory name="${path::combine(installRoot, 'v1.1.4322')}" />
--                    </tool-paths>
--                    <project>
--                        <readregistry 
--                            property="installRoot"
--                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
--                            hive="LocalMachine" />
--                        <readregistry 
--                            property="sdkInstallRoot"
--                            key="SOFTWARE\Microsoft\.NETFramework\sdkInstallRootv1.1"
--                            hive="LocalMachine"
--                            failonerror="false" />
--                    </project>
--                    <tasks>
--                        <task name="csc">
--                            <attribute name="supportsnowarnlist">true</attribute>
--                        </task>
--                        <task name="vjc">
--                            <attribute name="supportsnowarnlist">true</attribute>
--                        </task>
--                        <task name="delay-sign">
--                            <attribute name="exename">sn</attribute>
--                        </task>
--                        <task name="license">
--                            <attribute name="exename">lc</attribute>
--                        </task>
--                    </tasks>
--                </framework>
--                <framework 
--                    name="net-2.0"
--                    family="net"
--                    version="2.0"
--                    description="Microsoft .NET Framework 2.0"
--                    sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}"
--                    frameworkdirectory="${path::combine(installRoot, 'v2.0.50727')}"
--                    frameworkassemblydirectory="${path::combine(installRoot, 'v2.0.50727')}"
--                    clrversion="2.0.50727"
--                    clrtype="Desktop"
--                    vendor="Microsoft"
--                    >
--                    <runtime>
--                        <probing-paths>
--                            <directory name="lib/net/2.0" />
--                            <directory name="lib/net/neutral" />
--                            <directory name="lib/common/2.0" />
--                            <directory name="lib/common/neutral" />
--                        </probing-paths>
--                        <modes>
--                            <strict>
--                                <environment>
--                                    <variable name="COMPLUS_VERSION" value="v2.0.50727" />
--                                </environment>
--                            </strict>
--                        </modes>
--                    </runtime>
--                    <reference-assemblies basedir="${path::combine(installRoot, 'v2.0.50727')}">
--                        <include name="Accessibility.dll" />
--                        <include name="cscompmgd.dll" />
--                        <include name="mscorlib.dll" />
--                        <include name="Microsoft.Build.Engine.dll" />
--                        <include name="Microsoft.Build.Framework.dll" />
--                        <include name="Microsoft.Build.Utilities.dll" />
--                        <include name="Microsoft.Vsa.dll" />
--                        <include name="Microsoft.VisualBasic.dll" />
--                        <include name="Microsoft.VisualBasic.Compatibility.dll" />
--                        <include name="Microsoft.VisualBasic.Compatibility.Data.dll" />
--                        <include name="System.Configuration.dll" />
--                        <include name="System.Configuration.Install.dll" />
--                        <include name="System.Data.dll" />
--                        <include name="System.Data.OracleClient.dll" />
--                        <include name="System.Data.SqlXml.dll" />
--                        <include name="System.Deployment.dll" />
--                        <include name="System.Design.dll" />
--                        <include name="System.DirectoryServices.dll" />
--                        <include name="System.dll" />
--                        <include name="System.Drawing.Design.dll" />
--                        <include name="System.Drawing.dll" />
--                        <include name="System.EnterpriseServices.dll" />
--                        <include name="System.Management.dll" />
--                        <include name="System.Messaging.dll" />
--                        <include name="System.Runtime.Remoting.dll" />
--                        <include name="System.Runtime.Serialization.Formatters.Soap.dll" />
--                        <include name="System.Security.dll" />
--                        <include name="System.ServiceProcess.dll" />
--                        <include name="System.Transactions.dll" />
--                        <include name="System.Web.dll" />
--                        <include name="System.Web.Mobile.dll" />
--                        <include name="System.Web.RegularExpressions.dll" />
--                        <include name="System.Web.Services.dll" />
--                        <include name="System.Windows.Forms.dll" />
--                        <include name="System.XML.dll" />
--                    </reference-assemblies>
--                    <task-assemblies>
--                        <!-- include MS.NET version-neutral assemblies -->
--                        <include name="extensions/net/neutral/**/*.dll" />
--                        <!-- include MS.NET 2.0 specific assemblies -->
--                        <include name="extensions/net/2.0/**/*.dll" />
--                        <!-- include MS.NET specific task assembly -->
--                        <include name="NAnt.MSNetTasks.dll" />
--                        <!-- include MS.NET specific test assembly -->
--                        <include name="NAnt.MSNet.Tests.dll" />
--                        <!-- include .NET 2.0 specific assemblies -->
--                        <include name="extensions/common/2.0/**/*.dll" />
--                    </task-assemblies>
--                    <tool-paths>
--                        <directory name="${path::combine(sdkInstallRoot, 'bin')}"
--                            if="${property::exists('sdkInstallRoot')}" />
--                        <directory name="${path::combine(installRoot, 'v2.0.50727')}" />
--                    </tool-paths>
--                    <project>
--                        <readregistry
--                            property="installRoot"
--                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
--                            hive="LocalMachine" />
--                        <readregistry
--                            property="sdkInstallRoot"
--                            key="SOFTWARE\Microsoft\.NETFramework\sdkInstallRootv2.0"
--                            hive="LocalMachine"
--                            failonerror="false" />
--                    </project>
--                    <tasks>
--                        <task name="csc">
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportswarnaserrorlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportsplatform">true</attribute>
--                            <attribute name="supportslangversion">true</attribute>
--                        </task>
--                        <task name="vbc">
--                            <attribute name="supportsdocgeneration">true</attribute>
--                            <attribute name="supportsnostdlib">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportsplatform">true</attribute>
--                            <attribute name="supportswarnaserrorlist">true</attribute>
--                        </task>
--                        <task name="jsc">
--                            <attribute name="supportsplatform">true</attribute>
--                        </task>
--                        <task name="vjc">
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                        </task>
--                        <task name="resgen">
--                            <attribute name="supportsassemblyreferences">true</attribute>
--                            <attribute name="supportsexternalfilereferences">true</attribute>
--                        </task>
--                        <task name="delay-sign">
--                            <attribute name="exename">sn</attribute>
--                        </task>
--                        <task name="license">
--                            <attribute name="exename">lc</attribute>
--                            <attribute name="supportsassemblyreferences">true</attribute>
--                        </task>
--                    </tasks>
--                </framework>
--                <framework 
--                    name="net-3.5"
--                    family="net"
--                    version="3.5"
--                    description="Microsoft .NET Framework 3.5"
--                    sdkdirectory="${sdkInstallRoot}"
--                    frameworkdirectory="${path::combine(installRoot, 'v3.5')}"
--                    frameworkassemblydirectory="${path::combine(installRoot, 'v2.0.50727')}"
--                    clrversion="2.0.50727"
--                    clrtype="Desktop"
--                    vendor="Microsoft"
--                    >
--                    <runtime>
--                        <probing-paths>
--                            <directory name="lib/net/2.0" />
--                            <directory name="lib/net/neutral" />
--                            <directory name="lib/common/2.0" />
--                            <directory name="lib/common/neutral" />
--                        </probing-paths>
--                        <modes>
--                            <strict>
--                                <environment>
--                                    <variable name="COMPLUS_VERSION" value="v2.0.50727" />
--                                </environment>
--                            </strict>
--                        </modes>
--                    </runtime>
--                    <reference-assemblies basedir="${path::combine(installRoot, 'v2.0.50727')}">
--                        <include name="Accessibility.dll" />
--                        <include name="cscompmgd.dll" />
--                        <include name="mscorlib.dll" />
--                        <include name="Microsoft.Build.Utilities.dll" />
--                        <include name="Microsoft.Vsa.dll" />
--                        <include name="Microsoft.VisualBasic.dll" />
--                        <include name="Microsoft.VisualBasic.Compatibility.dll" />
--                        <include name="Microsoft.VisualBasic.Compatibility.Data.dll" />
--                        <include name="System.Configuration.dll" />
--                        <include name="System.Configuration.Install.dll" />
--                        <include name="System.Data.dll" />
--                        <include name="System.Data.OracleClient.dll" />
--                        <include name="System.Data.SqlXml.dll" />
--                        <include name="System.Deployment.dll" />
--                        <include name="System.Design.dll" />
--                        <include name="System.DirectoryServices.dll" />
--                        <include name="System.dll" />
--                        <include name="System.Drawing.Design.dll" />
--                        <include name="System.Drawing.dll" />
--                        <include name="System.EnterpriseServices.dll" />
--                        <include name="System.Management.dll" />
--                        <include name="System.Messaging.dll" />
--                        <include name="System.Runtime.Remoting.dll" />
--                        <include name="System.Runtime.Serialization.Formatters.Soap.dll" />
--                        <include name="System.Security.dll" />
--                        <include name="System.ServiceProcess.dll" />
--                        <include name="System.Transactions.dll" />
--                        <include name="System.Web.dll" />
--                        <include name="System.Web.Mobile.dll" />
--                        <include name="System.Web.RegularExpressions.dll" />
--                        <include name="System.Web.Services.dll" />
--                        <include name="System.Windows.Forms.dll" />
--                        <include name="System.XML.dll" />
--                    </reference-assemblies>
--                    <reference-assemblies basedir="${environment::get-folder-path('ProgramFiles')}/Reference Assemblies/Microsoft/Framework/v3.5">
--                        <include name="Microsoft.Build.Engine.dll" />
--                        <include name="Microsoft.Build.Framework.dll" />
--                        <include name="System.AddIn.Contract.dll" />
--                        <include name="System.AddIn.dll" />
--                        <include name="System.ComponentModel.DataAnnotations.dll" />
--                        <include name="System.Core.dll" />
--                        <include name="System.Data.DataSetExtensions.dll" />
--                        <include name="System.Data.Entity.Design.dll" />
--                        <include name="System.Data.Entity.dll" />
--                        <include name="System.Data.Linq.dll" />
--                        <include name="System.Data.Services.Client.dll" />
--                        <include name="System.Data.Services.Design.dll" />
--                        <include name="System.Data.Services.dll" />
--                        <include name="System.DirectoryServices.AccountManagement.dll" />
--                        <include name="System.Management.Instrumentation.dll" />
--                        <include name="System.Net.dll" />
--                        <include name="System.ServiceModel.Web.dll" />
--                        <include name="System.Web.Abstractions.dll" />
--                        <include name="System.Web.DynamicData.Design.dll" />
--                        <include name="System.Web.DynamicData.dll" />
--                        <include name="System.Web.Entitly.Design.dll" />
--                        <include name="System.Web.Entitly.dll" />
--                        <include name="System.Web.Extensions.Design.dll" />
--                        <include name="System.Web.Extensions.dll" />
--                        <include name="System.Web.Routing.dll" />
--                        <include name="System.Windows.Presentation.dll" />
--                        <include name="System.WorkflowServices.dll" />
--                        <include name="System.Xml.Linq.dll" />
--                    </reference-assemblies>
--                    <reference-assemblies basedir="${environment::get-folder-path('ProgramFiles')}/Reference Assemblies/Microsoft/Framework/v3.0">
--                        <include name="PresentationBuildTasks.dll" />
--                        <include name="PresentationCore.dll" />
--                        <include name="PresentationFramework.Aero.dll" />
--                        <include name="PresentationFramework.Classic.dll" />
--                        <include name="PresentationFramework.dll" />
--                        <include name="PresentationFramework.Luna.dll" />
--                        <include name="PresentationFramework.Royale.dll" />
--                        <include name="ReachFramework.dll" />
--                        <include name="System.IdentityModel.dll" />
--                        <include name="System.IdentityModel.Selectors.dll" />
--                        <include name="System.IO.Log.dll" />
--                        <include name="System.Printing.dll" />
--                        <include name="System.Runtime.Serialization.dll" />
--                        <include name="System.ServiceModel.dll" />
--                        <include name="System.Speech.dll" />
--                        <include name="System.Workflow.Activities.dll" />
--                        <include name="System.Workflow.ComponentModel.dll" />
--                        <include name="System.Workflow.Runtime.dll" />
--                        <include name="UIAutomationClient.dll" />
--                        <include name="UIAutomationClientsideProviders.dll" />
--                        <include name="UIAutomationProvider.dll" />
--                        <include name="UIAutomationTypes.dll" />
--                        <include name="WindowsBase.dll" />
--                        <include name="WindowsFormsIntegration.dll" />
--                    </reference-assemblies>
--                    <task-assemblies>
--                        <!-- include MS.NET version-neutral assemblies -->
--                        <include name="extensions/net/neutral/**/*.dll" />
--                        <!-- include MS.NET 2.0 specific assemblies -->
--                        <include name="extensions/net/2.0/**/*.dll" />
--                        <!-- include MS.NET specific task assembly -->
--                        <include name="NAnt.MSNetTasks.dll" />
--                        <!-- include MS.NET specific test assembly -->
--                        <include name="NAnt.MSNet.Tests.dll" />
--                        <!-- include .NET 2.0 specific assemblies -->
--                        <include name="extensions/common/2.0/**/*.dll" />
--                    </task-assemblies>
--                    <tool-paths>
--                        <directory name="${sdkInstallRoot}"
--                            if="${property::exists('sdkInstallRoot')}" />
--                        <directory name="${path::combine(installRoot, 'v3.5')}" />
--                        <directory name="${path::combine(installRoot, 'v2.0.50727')}" />
--                    </tool-paths>
--                    <project>
--                        <readregistry
--                            property="installRoot"
--                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
--                            hive="LocalMachine" />
--                        <locatesdk property="sdkInstallRoot" minwinsdkver="v6.0A" maxnetfxver="3.5" failonerror="false" />
--                    </project>
--                    <tasks>
--                        <task name="csc">
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportswarnaserrorlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportsplatform">true</attribute>
--                            <attribute name="supportslangversion">true</attribute>
--                        </task>
--                        <task name="vbc">
--                            <attribute name="supportsdocgeneration">true</attribute>
--                            <attribute name="supportsnostdlib">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportsplatform">true</attribute>
--                            <attribute name="supportswarnaserrorlist">true</attribute>
--                        </task>
--                        <task name="jsc">
--                            <attribute name="supportsplatform">true</attribute>
--                        </task>
--                        <task name="vjc">
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                        </task>
--                        <task name="resgen">
--                            <attribute name="supportsassemblyreferences">true</attribute>
--                            <attribute name="supportsexternalfilereferences">true</attribute>
--                        </task>
--                        <task name="delay-sign">
--                            <attribute name="exename">sn</attribute>
--                        </task>
--                        <task name="license">
--                            <attribute name="exename">lc</attribute>
--                            <attribute name="supportsassemblyreferences">true</attribute>
--                        </task>
--                    </tasks>
--                </framework>
--                <framework 
--                    name="net-4.0"
--                    family="net"
--                    version="4.0"
--                    description="Microsoft .NET Framework 4.0"
--                    sdkdirectory="${sdkInstallRoot}"
--                    frameworkdirectory="${path::combine(installRoot, 'v4.0.30319')}"
--                    frameworkassemblydirectory="${path::combine(installRoot, 'v4.0.30319')}"
--                    clrversion="4.0.30319"
--                    clrtype="Desktop"
--                    vendor="Microsoft"
--                    >
--                    <runtime>
--                        <probing-paths>
--                            <directory name="lib/common/2.0" />
--                            <directory name="lib/common/neutral" />
--                        </probing-paths>
--                        <modes>
--                            <strict>
--                                <environment>
--                                    <variable name="COMPLUS_VERSION" value="v4.0.30319" />
--                                </environment>
--                            </strict>
--                        </modes>
--                    </runtime>
--                    <reference-assemblies basedir="${path::combine(installRoot, 'v4.0.30319')}">
--                        <include name="Accessibility.dll" />
--                        <include name="Microsoft.Build.Conversion.v4.0.dll" />
--                        <include name="Microsoft.Build.dll" />
--                        <include name="Microsoft.Build.Engine.dll" />
--                        <include name="Microsoft.Build.Framework.dll" />
--                        <include name="Microsoft.Build.Tasks.v4.0.dll" />
--                        <include name="Microsoft.Build.Utilities.v4.0.dll" />
--                        <include name="Microsoft.CSharp.dll" />
--                        <include name="Microsoft.Data.Entity.Build.Tasks.dll" />
--                        <include name="Microsoft.JScript.dll" />
--                        <include name="Microsoft.Transactions.Bridge.dll" />
--                        <include name="Microsoft.Transactions.Bridge.Dtc.dll" />
--                        <include name="Microsoft.VisualBasic.Activities.Compiler.dll" />
--                        <include name="Microsoft.VisualBasic.Compatibility.Data.dll" />
--                        <include name="Microsoft.VisualBasic.Compatibility.dll" />
--                        <include name="Microsoft.VisualBasic.dll" />
--                        <include name="Microsoft.VisualC.dll" />
--                        <include name="Microsoft.VisualC.STLCLR.dll" />
--                        <include name="mscorlib.dll" />
--                        <include name="System.Activities.Core.Presentation.dll" />
--                        <include name="System.Activities.dll" />
--                        <include name="System.Activities.DurableInstancing.dll" />
--                        <include name="System.Activities.Presentation.dll" />
--                        <include name="System.AddIn.Contract" />
--                        <include name="System.AddIn.dll" />
--                        <include name="System.ComponentModel.Composition.dll" />
--                        <include name="System.ComponentModel.DataAnnotations.dll" />
--                        <include name="System.Configuration.dll" />
--                        <include name="System.Configuration.Install.dll" />
--                        <include name="System.Core.dll" />
--                        <include name="System.Data.DataSetExtensions.dll" />
--                        <include name="System.Data.dll" />
--                        <include name="System.Data.Entity.Design.dll" />
--                        <include name="System.Data.Entity.dll" />
--                        <include name="System.Data.Linq.dll" />
--                        <include name="System.Data.OracleClient.dll" />
--                        <include name="System.Data.Services.Client.dll" />
--                        <include name="System.Data.Services.Design.dll" />
--                        <include name="System.Data.Services.dll" />
--                        <include name="System.Data.SqlXml.dll" />
--                        <include name="System.Deployment.dll" />
--                        <include name="System.Design.dll" />
--                        <include name="System.Device.dll" />
--                        <include name="System.DirectoryServices.dll" />
--                        <include name="System.DirectoryServices.Protocols.dll" />
--                        <include name="System.dll" />
--                        <include name="System.Drawing.Design.dll" />
--                        <include name="System.Drawing.dll" />
--                        <include name="System.Dynamic.dll" />
--                        <include name="System.EnterpriseServices.dll" />
--                        <include name="System.EnterpriseServices.Thunk.dll" />
--                        <include name="System.EnterpriseServices.Wrapper.dll" />
--                        <include name="System.IdentityModel.dll" />
--                        <include name="System.IdentityModel.Selectors.dll" />
--                        <include name="System.IO.Log.dll" />
--                        <include name="System.Management.dll" />
--                        <include name="System.Management.Instrumentation.dll" />
--                        <include name="System.Messaging.dll" />
--                        <include name="System.Net.dll" />
--                        <include name="System.Numerics.dll" />
--                        <include name="System.Runtime.Caching.dll" />
--                        <include name="System.Runtime.DurableInstancing.dll" />
--                        <include name="System.Runtime.Remoting.dll" />
--                        <include name="System.Runtime.Serialization.dll" />
--                        <include name="System.Runtime.Serialization.Formatters.Soap.dll" />
--                        <include name="System.Security.dll" />
--                        <include name="System.ServiceModel.Activation.dll" />
--                        <include name="System.ServiceModel.Activities.dll" />
--                        <include name="System.ServiceModel.Channels.dll" />
--                        <include name="System.ServiceModel.Discovery.dll" />
--                        <include name="System.ServiceModel.dll" />
--                        <include name="System.ServiceModel.Routing.dll" />
--                        <include name="System.ServiceModel.ServiceMoniker40.dll" />
--                        <include name="System.ServiceModel.WasHosting.dll" />
--                        <include name="System.ServiceModel.Web.dll" />
--                        <include name="System.ServiceProcess.dll" />
--                        <include name="System.Transactions.dll" />
--                        <include name="System.Web.Abstractions.dll" />
--                        <include name="System.Web.ApplicationServices.dll" />
--                        <include name="System.Web.DataVisualization.Design.dll" />
--                        <include name="System.Web.DataVisualization.dll" />
--                        <include name="System.Web.dll" />
--                        <include name="System.Web.DynamicData.Design.dll" />
--                        <include name="System.Web.DynamicData.dll" />
--                        <include name="System.Web.Entity.Design.dll" />
--                        <include name="System.Web.Entity.dll" />
--                        <include name="System.Web.Extensions.Design.dll" />
--                        <include name="System.Web.Extensions.dll" />
--                        <include name="System.Web.Mobile.dll" />
--                        <include name="System.Web.RegularExpressions.dll" />
--                        <include name="System.Web.Routing.dll" />
--                        <include name="System.Web.Services.dll" />
--                        <include name="System.Windows.Forms.DataVisualization.Design.dll" />
--                        <include name="System.Windows.Forms.DataVisualization.dll" />
--                        <include name="System.Windows.Forms.dll" />
--                        <include name="System.Workflow.Activities.dll" />
--                        <include name="System.Workflow.ComponentModel.dll" />
--                        <include name="System.Workflow.Runtime.dll" />
--                        <include name="System.WorkflowServices.dll" />
--                        <include name="System.Xaml.dll" />
--                        <include name="System.Xaml.Hosting.dll" />
--                        <include name="System.Xml.dll" />
--                        <include name="System.Xml.Linq.dll" />
--                    </reference-assemblies>
--                    <!-- WPF Assemblies -->
--                    <reference-assemblies basedir="${path::combine(installRoot, 'v4.0.30319')}/WPF">
--                        <include name="NaturalLanguage6.dll" />
--                        <include name="NlsData0009.dll" />
--                        <include name="NlsLexicons0009.dll" />
--                        <include name="PenIMC.dll" />
--                        <include name="PresentationCore.dll" />
--                        <include name="PresentationFramework.Aero.dll" />
--                        <include name="PresentationFramework.Classic.dll" />
--                        <include name="PresentationFramework.dll" />
--                        <include name="PresentationFramework.Luna.dll" />
--                        <include name="PresentationFramework.Royale.dll" />
--                        <include name="PresentationHost_v0400.dll" />
--                        <include name="PresentationNative_v0400.dll" />
--                        <include name="PresentationUI.dll" />
--                        <include name="ReachFramework.dll" />
--                        <include name="System.Printing.dll" />
--                        <include name="System.Speech.dll" />
--                        <include name="System.Windows.Input.Manipulations.dll" />
--                        <include name="System.Windows.Presentation.dll" />
--                        <include name="UIAutomationClient.dll" />
--                        <include name="UIAutomationClientsideProviders.dll" />
--                        <include name="UIAutomationProvider.dll" />
--                        <include name="UIAutomationTypes.dll" />
--                        <include name="WindowsBase.dll" />
--                        <include name="WindowsFormsIntegration.dll" />
--                        <include name="wpfgfx_v0400.dll" />
--                        <include name="wpftxt_v0400.dll" />
--                    </reference-assemblies>
--                    <reference-assemblies basedir="${environment::get-folder-path('ProgramFiles')}/Reference Assemblies/Microsoft/Framework/.NETFramework/v4.0">
--                        <include name="Microsoft.Build.Conversion.v4.0.dll" />
--                        <include name="Microsoft.Build.dll" />
--                        <include name="Microsoft.Build.Engine.dll" />
--                        <include name="Microsoft.Build.Framework.dll" />
--                        <include name="Microsoft.Build.Tasks.v4.0.dll" />
--                        <include name="Microsoft.Build.Utilities.v4.0.dll" />
--                        <include name="Microsoft.CSharp.dll" />
--                        <include name="Microsoft.JScript.dll" />
--                        <include name="Microsoft.VisualBasic.Compatibility.Data.dll" />
--                        <include name="Microsoft.VisualBasic.Comptatibility.dll" />
--                        <include name="Microsoft.VisualBasic.dll" />
--                        <include name="Microsoft.VisualC.dll" />
--                        <include name="Microsoft.VisualC.STLCLR.dll" />
--                        <include name="mscorlib.dll" />
--                        <include name="PresentationBuildTasks.dll" />
--                        <include name="PresentationCore.dll" />
--                        <include name="WindowsBase.dll" />
--                        <include name="PresentationFramework.dll" />
--                        <include name="PresentationFramework.Aero.dll" />
--                        <include name="PresentationFramework.Classic.dll" />
--                        <include name="PresentationFramework.Luna.dll" />
--                        <include name="PresentationFramework.Royale.dll" />
--                        <include name="ReachFramework.dll" />
--                        <include name="System.Activities.Core.Presentation.dll" />
--                        <include name="System.Activities.dll" />
--                        <include name="System.Activities.DurableInstancing.dll" />
--                        <include name="System.Activities.Presentation.dll" />
--                        <include name="System.AddIn.Contract.dll" />
--                        <include name="System.AddIn.dll" />
--                        <include name="System.ComponentModel.Composition.dll" />
--                        <include name="System.ComponentModel.DataAnnotations.dll" />
--                        <include name="System.Configuration.dll" />
--                        <include name="System.Core.dll" />
--                        <include name="System.Data.DataSetExtension.dll" />
--                        <include name="System.Data.dll" />
--                        <include name="System.Data.Entity.Design.dll" />
--                        <include name="System.Data.Entity.dll" />
--                        <include name="System.Data.Linq.dll" />
--                        <include name="System.Data.OracleClient.dll" />
--                        <include name="System.Data.Services.Client.dll" />
--                        <include name="System.Data.Services.Design.dll" />
--                        <include name="System.Data.Services.dll" />
--                        <include name="System.Data.SqlXml.dll" />
--                        <include name="System.Deployment.dll" />
--                        <include name="System.Design.dll" />
--                        <include name="System.Device.dll" />
--                        <include name="System.DirectoryServices.AccountManagement.dll" />
--                        <include name="System.DirectoryServices.dll" />
--                        <include name="System.DirectoryServices.Protocols.dll" />
--                        <include name="System.dll" />
--                        <include name="System.Drawing.Design.dll" />
--                        <include name="System.Drawing.dll" />
--                        <include name="System.EnterpriseServices.dll" />
--                        <include name="System.EnterpriseServices.Thunk.dll" />
--                        <include name="System.EnterpriseServices.Wrapper.dll" />
--                        <include name="System.IdentityModel.dll" />
--                        <include name="System.IdentityModel.Selectors.dll" />
--                        <include name="System.IO.Log.dll" />
--                        <include name="System.Management.dll" />
--                        <include name="System.Management.Instrumentation.dll" />
--                        <include name="System.Messaging.dll" />
--                        <include name="System.Net.dll" />
--                        <include name="System.Numerics.dll" />
--                        <include name="System.Printing.dll" />
--                        <include name="System.Runtime.Caching.dll" />
--                        <include name="System.Runtime.DurableInstancing.dll" />
--                        <include name="System.Runtime.Remoting.dll" />
--                        <include name="System.Runtime.Serialization.dll" />
--                        <include name="System.Runtime.Serialization.Formatters.Soap.dll" />
--                        <include name="System.Security.dll" />
--                        <include name="System.ServiceModel.Activation.dll" />
--                        <include name="System.ServiceModel.Activities.dll" />
--                        <include name="System.ServiceModel.Channels.dll" />
--                        <include name="System.ServiceModel.Discovery.dll" />
--                        <include name="System.ServiceModel.dll" />
--                        <include name="System.ServiceModel.Routing.dll" />
--                        <include name="System.ServiceModel.Web.dll" />
--                        <include name="System.ServiceProcess.dll" />
--                        <include name="System.Speech.dll" />
--                        <include name="System.Transactions.dll" />
--                        <include name="System.Web.Abstractions.dll" />
--                        <include name="System.Web.ApplicationServices.dll" />
--                        <include name="System.Web.DataVisualization.Design.dll" />
--                        <include name="System.Web.DataVisualization.dll" />
--                        <include name="System.Web.dll" />
--                        <include name="System.Web.DynamicData.Design.dll" />
--                        <include name="System.Web.DynamicData.dll" />
--                        <include name="System.Web.Entity.Design.dll" />
--                        <include name="System.Web.Entity.dll" />
--                        <include name="System.Web.Extensions.Design.dll" />
--                        <include name="System.Web.Extensions.dll" />
--                        <include name="System.Web.Mobile.dll" />
--                        <include name="System.Web.RegularExpressions.dll" />
--                        <include name="System.Web.Routing.dll" />
--                        <include name="System.Web.Services.dll" />
--                        <include name="System.Windows.Forms.DataVisualization.Design.dll" />
--                        <include name="System.Windows.Forms.DataVisualization.dll" />
--                        <include name="System.Windows.Forms.dll" />
--                        <include name="System.Windows.Input.Manipulations.dll" />
--                        <include name="System.Windows.Presentation.dll" />
--                        <include name="System.Workflow.Activities.dll" />
--                        <include name="System.Workflow.ComponentModel.dll" />
--                        <include name="System.Workflow.Runtime.dll" />
--                        <include name="System.WorkflowServices.dll" />
--                        <include name="System.Xaml.dll" />
--                        <include name="System.Xml.dll" />
--                        <include name="System.Xml.Linq.dll" />
--                    </reference-assemblies>
--                    <task-assemblies>
--                        <!-- include MS.NET version-neutral assemblies -->
--                        <include name="extensions/net/neutral/**/*.dll" />
--                        <!-- include MS.NET 4.0 specific assemblies -->
--                        <include name="extensions/net/4.0/**/*.dll" />
--                        <!-- include MS.NET specific task assembly -->
--                        <include name="NAnt.MSNetTasks.dll" />
--                        <!-- include MS.NET specific test assembly -->
--                        <include name="NAnt.MSNet.Tests.dll" />
--                        <!-- include .NET 4.0 specific assemblies -->
--                        <include name="extensions/common/4.0/**/*.dll" />
--                    </task-assemblies>
--                    <tool-paths>
--                        <directory name="${sdkInstallRoot}"
--                            if="${property::exists('sdkInstallRoot')}" />
--                        <directory name="${path::combine(installRoot, 'v4.0.30319')}" />
--                    </tool-paths>
--                    <project>
--                        <readregistry
--                            property="installRoot"
--                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
--                            hive="LocalMachine" />
--                        <locatesdk property="sdkInstallRoot" minwinsdkver="v7.0A" minnetfxver="4.0" maxnetfxver="4.0.99999" failonerror="false" />
--                    </project>
--                    <tasks>
--                        <task name="csc">
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportswarnaserrorlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportsplatform">true</attribute>
--                            <attribute name="supportslangversion">true</attribute>
--                        </task>
--                        <task name="vbc">
--                            <attribute name="supportsdocgeneration">true</attribute>
--                            <attribute name="supportsnostdlib">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportsplatform">true</attribute>
--                            <attribute name="supportswarnaserrorlist">true</attribute>
--                        </task>
--                        <task name="jsc">
--                            <attribute name="supportsplatform">true</attribute>
--                        </task>
--                        <task name="vjc">
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                        </task>
--                        <task name="resgen">
--                            <attribute name="supportsassemblyreferences">true</attribute>
--                            <attribute name="supportsexternalfilereferences">true</attribute>
--                        </task>
--                        <task name="delay-sign">
--                            <attribute name="exename">sn</attribute>
--                        </task>
--                        <task name="license">
--                            <attribute name="exename">lc</attribute>
--                            <attribute name="supportsassemblyreferences">true</attribute>
--                        </task>
--                    </tasks>
--                </framework>
--                <framework 
--                    name="netcf-1.0"
--                    family="netcf"
--                    version="1.0"
--                    description="Microsoft .NET Compact Framework 1.0"
--                    sdkdirectory="${path::combine(sdkInstallRoot, 'v1.0.5000\bin')}"
--                    frameworkdirectory="${path::combine(installRoot, 'v1.1.4322')}"
--                    frameworkassemblydirectory="${path::combine(sdkInstallRoot, 'v1.0.5000\Windows CE')}"
--                    clrversion="1.1.4322"
--                    clrtype="Compact"
--                    vendor="Microsoft"
--                    >
--                    <runtime>
--                        <modes>
--                            <strict>
--                                <environment>
--                                    <variable name="COMPLUS_VERSION" value="v1.1.4322" />
--                                </environment>
--                            </strict>
--                        </modes>
--                    </runtime>
--                    <reference-assemblies basedir="${path::combine(sdkInstallRoot, 'v1.0.5000\Windows CE')}">
--                        <include name="*.dll" />
--                    </reference-assemblies>
--                    <task-assemblies>
--                        <!-- this is not a supported runtime framework -->
--                    </task-assemblies>
--                    <tool-paths>
--                        <directory name="${path::combine(sdkInstallRoot, 'v1.0.5000\bin')}" />
--                        <directory name="${path::combine(installRoot, 'v1.1.4322')}" />
--                        <directory name="${path::combine(sdkInstallRoot.DesktopFramework, 'bin')}" />
--                    </tool-paths>
--                    <project>
--                        <readregistry
--                            property="installRoot"
--                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
--                            hive="LocalMachine" />
--                        <readregistry
--                            property="sdkInstallRoot"
--                            key="SOFTWARE\Microsoft\.NETCompactFramework\sdkInstallRoot"
--                            hive="LocalMachine" />
--                        <readregistry
--                            property="sdkInstallRoot.DesktopFramework"
--                            key="SOFTWARE\Microsoft\.NETFramework\sdkInstallRootv1.1"
--                            hive="LocalMachine" />
--                        <fail if="${not directory::exists(sdkInstallRoot.DesktopFramework)}">The .NET Framework 1.1 SDK is not installed.</fail>
--                    </project>
--                    <tasks>
--                        <task name="csc">
--                            <attribute name="noconfig">true</attribute>
--                            <attribute name="nostdlib">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                        </task>
--                        <task name="resgen">
--                            <attribute name="exename">cfresgen</attribute>
--                        </task>
--                        <task name="delay-sign">
--                            <attribute name="exename">sn</attribute>
--                        </task>
--                        <task name="license">
--                            <attribute name="exename">lc</attribute>
--                        </task>
--                    </tasks>
--                </framework>
--                <framework 
--                    name="netcf-2.0"
--                    family="netcf"
--                    version="2.0"
--                    description="Microsoft .NET Compact Framework 2.0"
--                    sdkdirectory="${path::combine(sdkInstallRoot.DesktopFramework, 'bin')}"
--                    frameworkdirectory="${path::combine(installRoot, 'v2.0.50727')}"
--                    frameworkassemblydirectory="${path::combine(sdkInstallRoot, 'WindowsCE')}"
--                    clrversion="2.0.0"
--                    clrtype="Compact"
--                    vendor="Microsoft"
--                    >
--                    <runtime>
--                        <modes>
--                            <strict>
--                                <environment>
--                                    <variable name="COMPLUS_VERSION" value="v2.0.50727" />
--                                </environment>
--                            </strict>
--                        </modes>
--                    </runtime>
--                    <reference-assemblies basedir="${path::combine(sdkInstallRoot, 'WindowsCE')}">
--                        <include name="*.dll" />
--                    </reference-assemblies>
--                    <task-assemblies>
--                        <!-- this is not a supported runtime framework -->
--                    </task-assemblies>
--                    <tool-paths>
--                        <directory name="${path::combine(sdkInstallRoot.DesktopFramework, 'bin')}" />
--                    </tool-paths>
--                    <project>
--                        <readregistry
--                            property="installRoot"
--                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
--                            hive="LocalMachine" />
--                        <readregistry
--                            property="sdkInstallRoot"
--                            key="SOFTWARE\Microsoft\.NETCompactFramework\v2.0.0.0\InstallRoot\"
--                            hive="LocalMachine" />
--                        <readregistry
--                            property="sdkInstallRoot.DesktopFramework"
--                            key="SOFTWARE\Microsoft\.NETFramework\sdkInstallRootv2.0"
--                            hive="LocalMachine" />
--                        <fail if="${not directory::exists(sdkInstallRoot.DesktopFramework)}">The .NET Framework 2.0 SDK is not installed.</fail>
--                    </project>
--                    <tasks>
--                        <task name="csc">
--                            <attribute name="noconfig">true</attribute>
--                            <attribute name="nostdlib">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportswarnaserrorlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportsplatform">true</attribute>
--                            <attribute name="supportslangversion">true</attribute>
--                        </task>
--                        <task name="vbc">
--                            <attribute name="nostdlib">true</attribute>
--                            <attribute name="supportsdocgeneration">true</attribute>
--                            <attribute name="supportsnostdlib">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportsplatform">true</attribute>
--                            <attribute name="supportswarnaserrorlist">true</attribute>
--                        </task>
--                        <task name="resgen">
--                            <attribute name="supportsassemblyreferences">true</attribute>
--                            <attribute name="supportsexternalfilereferences">true</attribute>
--                        </task>
--                        <task name="delay-sign">
--                            <attribute name="exename">sn</attribute>
--                        </task>
--                        <task name="license">
--                            <attribute name="exename">lc</attribute>
--                            <attribute name="supportsassemblyreferences">true</attribute>
--                        </task>
--                    </tasks>
--                </framework>
--                <framework 
--                    name="silverlight-2.0"
--                    family="silverlight"
--                    version="2.0"
--                    description="Microsoft Silverlight 2.0"
--                    sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}"
--                    frameworkdirectory="${path::combine(installRoot, 'v3.5')}"
--                    frameworkassemblydirectory="${SL2RefAssemblyBaseDir}"
--                    clrversion="2.0.50727"
--                    clrtype="Browser"
--                    vendor="Microsoft"
--                    >
--                    <runtime>
--                        <modes>
--                            <strict>
--                                <environment>
--                                    <variable name="COMPLUS_VERSION" value="v2.0.50727" />
--                                </environment>
--                            </strict>
--                        </modes>
--                    </runtime>
--                    <reference-assemblies basedir="${SL2RefAssemblyBaseDir}">
--                        <include name="Microsoft.VisualBasic.dll" />
--                        <include name="mscorlib.dll" />
--                        <include name="System.Core.dll" />
--                        <include name="System.dll" />
--                        <include name="System.Net.dll" />
--                        <include name="System.Runtime.Serialization.dll" />
--                        <include name="System.ServiceModel.dll" />
--                        <include name="System.ServiceModel.Web.dll" />
--                        <include name="System.Windows.Browser.dll" />
--                        <include name="System.Windows.dll" />
--                        <include name="System.Xml.dll" />
--                    </reference-assemblies>
--                    <task-assemblies>
--                        <!-- include MS.NET version-neutral assemblies -->
--                        <include name="extensions/net/neutral/**/*.dll" />
--                        <!-- include MS.NET 2.0 specific assemblies -->
--                        <include name="extensions/net/2.0/**/*.dll" />
--                        <!-- include MS.NET specific task assembly -->
--                        <include name="NAnt.MSNetTasks.dll" />
--                        <!-- include MS.NET specific test assembly -->
--                        <include name="NAnt.MSNet.Tests.dll" />
--                        <!-- include .NET 2.0 specific assemblies -->
--                        <include name="extensions/common/2.0/**/*.dll" />
--                    </task-assemblies>
--                    <tool-paths>
--                        <directory name="${SL2RefAssemblyBaseDir}" />
--                        <directory name="${path::combine(sdkInstallRoot, 'bin')}"
--                            if="${property::exists('sdkInstallRoot')}" />
--                        <directory name="${path::combine(installRoot, 'v3.5')}" />
--                        <directory name="${path::combine(installRoot, 'v2.0.50727')}" />
--                    </tool-paths>
--                    <project>
--                        <readregistry property="SL2RefAssemblyBaseDir" 
--                            key="SOFTWARE\Microsoft\Microsoft SDKs\Silverlight\v2.0\ReferenceAssemblies\SLRuntimeInstallPath" 
--                            hive="LocalMachine" />
--                        <readregistry
--                            property="installRoot"
--                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
--                            hive="LocalMachine" />
--                        <locatesdk property="sdkInstallRoot" minwinsdkver="v6.0A" maxnetfxver="3.5" failonerror="false" />
--                    </project>
--                    <tasks>
--                        <task name="csc">
--                            <attribute name="noconfig">true</attribute>
--                            <attribute name="nostdlib">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportswarnaserrorlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportsplatform">true</attribute>
--                            <attribute name="supportslangversion">true</attribute>
--                        </task>
--                        <task name="vbc">
--                            <attribute name="nostdlib">true</attribute>
--                            <attribute name="supportsdocgeneration">true</attribute>
--                            <attribute name="supportsnostdlib">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportsplatform">true</attribute>
--                            <attribute name="supportswarnaserrorlist">true</attribute>
--                        </task>
--                        <task name="jsc">
--                            <attribute name="supportsplatform">true</attribute>
--                        </task>
--                        <task name="vjc">
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                        </task>
--                        <task name="resgen">
--                            <attribute name="supportsassemblyreferences">true</attribute>
--                            <attribute name="supportsexternalfilereferences">true</attribute>
--                        </task>
--                        <task name="delay-sign">
--                            <attribute name="exename">sn</attribute>
--                        </task>
--                        <task name="license">
--                            <attribute name="exename">lc</attribute>
--                            <attribute name="supportsassemblyreferences">true</attribute>
--                        </task>
--                    </tasks>
--                </framework>
--                <framework
--                    name="silverlight-3.0"
--                    family="silverlight"
--                    version="3.0"
--                    description="Microsoft Silverlight 3.0"
--                    sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}"
--                    frameworkdirectory="${path::combine(installRoot, 'v3.5')}"
--                    frameworkassemblydirectory="${SL3RefAssemblyBaseDir}"
--                    clrversion="2.0.50727"
--                    clrtype="Browser"
--                    vendor="Microsoft"
--                    >
--                    <runtime>
--                        <modes>
--                            <strict>
--                                <environment>
--                                    <variable name="COMPLUS_VERSION" value="v2.0.50727" />
--                                </environment>
--                            </strict>
--                        </modes>
--                    </runtime>
--                    <reference-assemblies basedir="${SL3RefAssemblyBaseDir}">
--                        <include name="Microsoft.VisualBasic.dll" />
--                        <include name="mscorlib.dll" />
--                        <include name="System.Core.dll" />
--                        <include name="System.dll" />
--                        <include name="System.Xml.dll" />
--                        <include name="System.Windows.dll" />
--                        <include name="System.Windows.Browser.dll" />
--                        <!-- Remaining libraries found in the Reference Assembly directory -->
--                        <include name="agcore.debug.dll" />
--                        <include name="agcore.dll" />
--                        <include name="coreclr.dll" />
--                        <include name="mscorrc.debug.dll" />
--                        <include name="mscorrc.dll" />
--                        <include name="npctrl.dll" />
--                        <include name="npctrlui.dll" />
--                        <include name="Silverlight.ConfigurationUI.dll" />
--                        <include name="System.Net.dll" />
--                        <include name="System.Runtime.Serialization.dll" />
--                        <include name="System.ServiceModel.dll" />
--                        <include name="System.ServiceModel.Web.dll" />
--                    </reference-assemblies>
--                    <task-assemblies>
--                        <!-- include MS.NET version-neutral assemblies -->
--                        <include name="extensions/net/neutral/**/*.dll" />
--                        <!-- include MS.NET 2.0 specific assemblies -->
--                        <include name="extensions/net/2.0/**/*.dll" />
--                        <!-- include MS.NET specific task assembly -->
--                        <include name="NAnt.MSNetTasks.dll" />
--                        <!-- include MS.NET specific test assembly -->
--                        <include name="NAnt.MSNet.Tests.dll" />
--                        <!-- include .NET 2.0 specific assemblies -->
--                        <include name="extensions/common/2.0/**/*.dll" />
--                    </task-assemblies>
--                    <tool-paths>
--                        <directory name="${SL3RefAssemblyBaseDir}" />
--                        <directory name="${path::combine(sdkInstallRoot, 'bin')}"
--                            if="${property::exists('sdkInstallRoot')}" />
--                        <directory name="${path::combine(installRoot, 'v3.5')}" />
--                    </tool-paths>
--                    <project>
--                        <readregistry property="SL3RefAssemblyBaseDir" 
--                            key="SOFTWARE\Microsoft\Microsoft SDKs\Silverlight\v3.0\ReferenceAssemblies\SLRuntimeInstallPath" 
--                            hive="LocalMachine" />
--                        <readregistry
--                            property="installRoot"
--                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
--                            hive="LocalMachine" />
--                        <locatesdk property="sdkInstallRoot" minwinsdkver="v6.0A" maxnetfxver="3.5" failonerror="false" />
--                    </project>
--                    <tasks>
--                        <task name="csc">
--                            <attribute name="noconfig">true</attribute>
--                            <attribute name="nostdlib">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportswarnaserrorlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportsplatform">true</attribute>
--                            <attribute name="supportslangversion">true</attribute>
--                        </task>
--                        <task name="vbc">
--                            <attribute name="nostdlib">true</attribute>
--                            <attribute name="supportsdocgeneration">true</attribute>
--                            <attribute name="supportsnostdlib">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportsplatform">true</attribute>
--                            <attribute name="supportswarnaserrorlist">true</attribute>
--                        </task>
--                        <task name="jsc">
--                            <attribute name="supportsplatform">true</attribute>
--                        </task>
--                        <task name="vjc">
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                        </task>
--                        <task name="resgen">
--                            <attribute name="supportsassemblyreferences">true</attribute>
--                            <attribute name="supportsexternalfilereferences">true</attribute>
--                        </task>
--                        <task name="delay-sign">
--                            <attribute name="exename">sn</attribute>
--                        </task>
--                        <task name="license">
--                            <attribute name="exename">lc</attribute>
--                            <attribute name="supportsassemblyreferences">true</attribute>
--                        </task>
--                    </tasks>
--                </framework>
--                <framework
--                    name="silverlight-4.0"
--                    family="silverlight"
--                    version="4.0"
--                    description="Microsoft Silverlight 4.0"
--                    sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}"
--                    frameworkdirectory="${path::combine(installRoot, 'v4.0.30319')}"
--                    frameworkassemblydirectory="${SL4RefAssemblyBaseDir}"
--                    clrversion="4.0.30319"
--                    clrtype="Browser"
--                    vendor="Microsoft"
--                    >
--                    <runtime>
--                        <modes>
--                            <strict>
--                                <environment>
--                                    <variable name="COMPLUS_VERSION" value="v4.0.30319" />
--                                </environment>
--                            </strict>
--                        </modes>
--                    </runtime>
--                    <reference-assemblies basedir="${SL4RefAssemblyBaseDir}">
--                        <include name="Microsoft.VisualBasic.dll" />
--                        <include name="mscorlib.dll" />
--                        <include name="System.Core.dll" />
--                        <include name="system.dll" />
--                        <include name="System.Xml.dll" />
--                        <include name="System.Windows.dll" />
--                        <include name="System.Windows.Browser.dll" />
--                        <!-- Remaining libraries found in the Reference Assembly directory -->
--                        <include name="agcore.debug.dll" />
--                        <include name="agcore.dll" />
--                        <include name="coreclr.dll" />
--                        <include name="mscorrc.debug.dll" />
--                        <include name="mscorrc.dll" />
--                        <include name="npctrl.dll" />
--                        <include name="npctrlui.dll" />
--                        <include name="System.Net.dll" />
--                        <include name="System.Runtime.Serialization.dll" />
--                        <include name="System.ServiceModel.dll" />
--                        <include name="System.ServiceModel.Web.dll" />
--                    </reference-assemblies>
--                    <task-assemblies>
--                        <!-- include MS.NET version-neutral assemblies -->
--                        <include name="extensions/net/neutral/**/*.dll" />
--                        <!-- include MS.NET 4.0 specific assemblies -->
--                        <include name="extensions/net/4.0/**/*.dll" />
--                        <!-- include MS.NET specific task assembly -->
--                        <include name="NAnt.MSNetTasks.dll" />
--                        <!-- include MS.NET specific test assembly -->
--                        <include name="NAnt.MSNet.Tests.dll" />
--                        <!-- include .NET 4.0 specific assemblies -->
--                        <include name="extensions/common/4.0/**/*.dll" />
--                    </task-assemblies>
--                    <tool-paths>
--                        <directory name="${SL4RefAssemblyBaseDir}" />
--                        <directory name="${path::combine(sdkInstallRoot, 'bin')}"
--                            if="${property::exists('sdkInstallRoot')}" />
--                        <directory name="${path::combine(installRoot, 'v4.0.30319')}" />
--                    </tool-paths>
--                    <project>
--                        <readregistry property="SL4RefAssemblyBaseDir" 
--                            key="SOFTWARE\Microsoft\Microsoft SDKs\Silverlight\v4.0\ReferenceAssemblies\SLRuntimeInstallPath"
--                            hive="LocalMachine" />
--                        <readregistry
--                            property="installRoot"
--                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
--                            hive="LocalMachine" />
--                        <locatesdk property="sdkInstallRoot" minwinsdkver="v7.0A" minnetfxver="4.0" maxnetfxver="4.0.99999" failonerror="false" />
--                    </project>
--                    <tasks>
--                        <task name="csc">
--                            <attribute name="noconfig">true</attribute>
--                            <attribute name="nostdlib">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportswarnaserrorlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportsplatform">true</attribute>
--                            <attribute name="supportslangversion">true</attribute>
--                        </task>
--                        <task name="vbc">
--                            <attribute name="nostdlib">true</attribute>
--                            <attribute name="supportsdocgeneration">true</attribute>
--                            <attribute name="supportsnostdlib">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportsplatform">true</attribute>
--                            <attribute name="supportswarnaserrorlist">true</attribute>
--                        </task>
--                        <task name="jsc">
--                            <attribute name="supportsplatform">true</attribute>
--                        </task>
--                        <task name="vjc">
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                        </task>
--                        <task name="resgen">
--                            <attribute name="supportsassemblyreferences">true</attribute>
--                            <attribute name="supportsexternalfilereferences">true</attribute>
--                        </task>
--                        <task name="delay-sign">
--                            <attribute name="exename">sn</attribute>
--                        </task>
--                        <task name="license">
--                            <attribute name="exename">lc</attribute>
--                            <attribute name="supportsassemblyreferences">true</attribute>
--                        </task>
--                    </tasks>
--                </framework>
--                <framework
--                    name="silverlight-5.0"
--                    family="silverlight"
--                    version="5.0"
--                    description="Microsoft Silverlight 5.0"
--                    sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}"
--                    frameworkdirectory="${path::combine(installRoot, 'v4.0.30319')}"
--                    frameworkassemblydirectory="${SL5RefAssemblyBaseDir}"
--                    clrversion="4.0.30319"
--                    clrtype="Browser"
--                    vendor="Microsoft"
--                    >
--                    <runtime>
--                        <modes>
--                            <strict>
--                                <environment>
--                                    <variable name="COMPLUS_VERSION" value="v4.0.30319" />
--                                </environment>
--                            </strict>
--                        </modes>
--                    </runtime>
--                    <reference-assemblies basedir="${SL5RefAssemblyBaseDir}">
--                        <include name="Microsoft.VisualBasic.dll" />
--                        <include name="mscorlib.dll" />
--                        <include name="System.Core.dll" />
--                        <include name="system.dll" />
--                        <include name="System.Xml.dll" />
--                        <include name="System.Windows.dll" />
--                        <include name="System.Windows.Browser.dll" />
--                        <!-- Remaining libraries found in the Reference Assembly directory -->
--                        <include name="agcore.debug.dll" />
--                        <include name="agcore.dll" />
--                        <include name="coreclr.dll" />
--                        <include name="mscorrc.debug.dll" />
--                        <include name="mscorrc.dll" />
--                        <include name="npctrl.dll" />
--                        <include name="npctrlui.dll" />
--                        <include name="System.Net.dll" />
--                        <include name="System.Runtime.Serialization.dll" />
--                        <include name="System.ServiceModel.dll" />
--                        <include name="System.ServiceModel.Web.dll" />
--                        <!-- Remaining libraries are specific to XNA programming -->
--                        <include name="Microsoft.Xna.Framework.dll" />
--                        <include name="Microsoft.Xna.Framework.Graphics.dll" />
--                        <include name="Microsoft.Xna.Framework.Graphics.Shaders.dll" />
--                        <include name="System.Windows.Xna.dll" />
--                    </reference-assemblies>
--                    <task-assemblies>
--                        <!-- include MS.NET version-neutral assemblies -->
--                        <include name="extensions/net/neutral/**/*.dll" />
--                        <!-- include MS.NET 4.0 specific assemblies -->
--                        <include name="extensions/net/4.0/**/*.dll" />
--                        <!-- include MS.NET specific task assembly -->
--                        <include name="NAnt.MSNetTasks.dll" />
--                        <!-- include MS.NET specific test assembly -->
--                        <include name="NAnt.MSNet.Tests.dll" />
--                        <!-- include .NET 4.0 specific assemblies -->
--                        <include name="extensions/common/4.0/**/*.dll" />
--                    </task-assemblies>
--                    <tool-paths>
--                        <directory name="${SL5RefAssemblyBaseDir}" />
--                        <directory name="${path::combine(sdkInstallRoot, 'bin')}"
--                            if="${property::exists('sdkInstallRoot')}" />
--                        <directory name="${path::combine(installRoot, 'v4.0.30319')}" />
--                    </tool-paths>
--                    <project>
--                        <readregistry property="SL5RefAssemblyBaseDir"
--                            key="SOFTWARE\Microsoft\Microsoft SDKs\Silverlight\v5.0\ReferenceAssemblies\SLRuntimeInstallPath"
--                            hive="LocalMachine" />
--                        <readregistry
--                            property="installRoot"
--                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
--                            hive="LocalMachine" />
--                        <locatesdk property="sdkInstallRoot" minwinsdkver="v7.0A" minnetfxver="4.0" maxnetfxver="4.0.99999" failonerror="false" />
--                    </project>
--                    <tasks>
--                        <task name="csc">
--                            <attribute name="noconfig">true</attribute>
--                            <attribute name="nostdlib">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportswarnaserrorlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportsplatform">true</attribute>
--                            <attribute name="supportslangversion">true</attribute>
--                        </task>
--                        <task name="vbc">
--                            <attribute name="nostdlib">true</attribute>
--                            <attribute name="supportsdocgeneration">true</attribute>
--                            <attribute name="supportsnostdlib">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportsplatform">true</attribute>
--                            <attribute name="supportswarnaserrorlist">true</attribute>
--                        </task>
--                        <task name="jsc">
--                            <attribute name="supportsplatform">true</attribute>
--                        </task>
--                        <task name="vjc">
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                        </task>
--                        <task name="resgen">
--                            <attribute name="supportsassemblyreferences">true</attribute>
--                            <attribute name="supportsexternalfilereferences">true</attribute>
--                        </task>
--                        <task name="delay-sign">
--                            <attribute name="exename">sn</attribute>
--                        </task>
--                        <task name="license">
--                            <attribute name="exename">lc</attribute>
--                            <attribute name="supportsassemblyreferences">true</attribute>
--                        </task>
--                    </tasks>
--                </framework>
--                <framework
--                    name="mono-1.0"
--                    family="mono"
--                    version="1.0"
--                    description="Mono 1.0 Profile"
--                    sdkdirectory="${toolDirectory}"
--                    frameworkdirectory="${toolDirectory}"
--                    frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}"
--                    clrversion="1.1.4322"
--                    clrtype="Desktop"
--                    vendor="Mono"
--                    >
--                    <runtime>
--                        <probing-paths>
--                            <directory name="lib/mono/1.0" />
--                            <directory name="lib/mono/neutral" />
--                            <directory name="lib/common/1.1" />
--                            <directory name="lib/common/neutral" />
--                        </probing-paths>
--                        <modes>
--                            <auto>
--                                <engine program="${runtimeEngine}" />
--                                <environment>
--                                    <variable name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" />
--                                    <variable name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" />
--                                </environment>
--                            </auto>
--                            <strict>
--                                <engine program="${runtimeEngine}">
--                                    <arg value="--runtime=v1.1.4322" />
--                                </engine>
--                                <environment>
--                                    <variable name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" />
--                                    <variable name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" />
--                                </environment>
--                            </strict>
--                        </modes>
--                    </runtime>
--                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}">
--                        <include name="*.dll" />
--                    </reference-assemblies>
--                    <task-assemblies>
--                        <!-- include Mono version-neutral assemblies -->
--                        <include name="extensions/mono/neutral/**/*.dll" />
--                        <!-- include Mono 1.0 specific assemblies -->
--                        <include name="extensions/mono/1.0/**/*.dll" />
--                        <!-- include .NET 1.1 specific assemblies -->
--                        <include name="extensions/common/1.1/**/*.dll" />
--                    </task-assemblies>
--                    <tool-paths>
--                        <directory name="${toolDirectory}" />
--                        <!-- unmanaged tools -->
--                        <directory name="${sdkInstallRoot}/bin" />
--                    </tool-paths>
--                    <project>
--                        <!-- quick and dirty check to see if pkg-config is available (and configured) -->
--                        <property name="pkgconfig.available" value="${environment::variable-exists('PKG_CONFIG_PATH')}" />
--                        <if test="${pkgconfig.available}">
--                            <if test="${pkg-config::exists('mono')}">
--                                <call target="configure-from-pkg-config" />
--                            </if>
--                            <if test="${not pkg-config::exists('mono')}">
--                                <call target="configure-from-registry" />
--                            </if>
--                        </if>
--                        <if test="${not pkgconfig.available}">
--                            <call target="configure-from-registry" />
--                        </if>
--
--                        <!-- determine if we're dealing with a Mono 1.0.x release -->
--                        <if test="${version::parse(mono.version) &lt; version::parse('1.1')}">
--                            <!-- 
--                                in Mono 1.0.x, the framework tools are located 
--                                in the <install root>\lib directory
--                            -->
--                            <property name="toolDirectory" value="${frameworkAssemblyDirectory}" />
--                            <property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
--                            <property name="resgen.tool" value="monoresgen" />
--                            <!-- in Mono 1.0.x, only mcs and mbas are located in <install root>\lib\mono\<profile> -->
--                            <property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mcs.exe')}" />
--                            <property name="mbas.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}" />
--                            <!-- /doc is not supported in Mono 1.0.x -->
--                            <property name="csc.supportsdocgeneration" value="false" />
--
--                            <!-- 
--                                Mono 1.0.1 installer incorrectly adds '\mono' to 
--                                "MonoConfigDir" registry value
--                            -->
--                            <if test="${string::ends-with(configDir, 'etc\mono')}">
--                                <property name="configDir" value="${string::replace(configDir, 'etc\mono', 'etc')}" />
--                            </if>
--                        </if>
--
--                        <!-- determine if we're dealing with a Mono 1.1.x release or higher -->
--                        <if test="${version::parse(mono.version) >= version::parse('1.1')}">
--                            <!-- 
--                                in Mono 1.1.x (and higher ?), the framework tools 
--                                are located in the <install root>\lib\mono\<profile>
--                                directory
--                            -->
--                            <property name="toolDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
--                            <property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
--                            <!-- starting from Mono 1.1.9.2, mono.exe is located in the bin directory -->
--                            <if test="${not file::exists(runtimeEngine)}">
--                                <property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
--                            </if>
--                            <property name="resgen.tool" value="resgen" />
--                            <property name="csc.tool" value="mcs" />
--                            <property name="csc.supportsdocgeneration" value="true" />
--                            <property name="mbas.tool" value="mbas" />
--                        </if>
--
--                        <target name="configure-from-pkg-config">
--                            <property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
--                            <property name="sdkInstallRoot" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'prefix'))}" />
--                            <property name="frameworkAssemblyDirectory" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'libdir'))}" />
--                            <property name="configDir" value="${path::combine(sdkInstallRoot, 'etc')}/" />
--                        </target>
--
--                        <target name="configure-from-registry">
--                            <monoregistry property="mono.reg" failonerror="false" />
--                            <readregistry
--                                property="mono.version"
--                                key="${mono.reg}\DefaultCLR"
--                                hive="LocalMachine"
--                            />
--                            <property name="monokey" value="${mono.reg}\${mono.version}" />
--
--                            <readregistry
--                                property="sdkInstallRoot"
--                                key="${monokey}\SdkInstallRoot"
--                                hive="LocalMachine" />
--                            <readregistry
--                                property="frameworkAssemblyDirectory"
--                                key="${monokey}\FrameworkAssemblyDirectory"
--                                hive="LocalMachine" />
--                            <readregistry
--                                property="configDir"
--                                key="${monokey}\MonoConfigDir"
--                                hive="LocalMachine" />
--                        </target>
--                    </project>
--                    <properties>
--                    </properties>
--                    <tasks>
--                        <task name="al">
--                            <attribute name="managed">true</attribute>
--                        </task>
--                        <task name="csc">
--                            <attribute name="exename">${csc.tool}</attribute>
--                            <attribute name="managed">true</attribute>
--                            <attribute name="supportspackagereferences">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportsdocgeneration">${csc.supportsdocgeneration}</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportslangversion">true</attribute>
--                        </task>
--                        <task name="jsc">
--                            <attribute name="exename">mjs</attribute>
--                            <attribute name="managed">true</attribute>
--                        </task>
--                        <task name="vbc">
--                            <attribute name="exename">${mbas.tool}</attribute>
--                            <attribute name="managed">true</attribute>
--                        </task>
--                        <task name="resgen">
--                            <attribute name="exename">${resgen.tool}</attribute>
--                            <attribute name="managed">true</attribute>
--                        </task>
--                        <task name="delay-sign">
--                            <attribute name="exename">sn</attribute>
--                            <attribute name="managed">true</attribute>
--                        </task>
--                        <task name="license">
--                            <attribute name="hascommandlinecompiler">false</attribute>
--                        </task>
--                        <task name="ilasm">
--                            <attribute name="managed">true</attribute>
--                        </task>
--                    </tasks>
--                </framework>
--                <framework 
--                    name="mono-2.0"
--                    family="mono"
--                    version="2.0"
--                    description="Mono 2.0 Profile"
--                    sdkdirectory="${toolDirectory}"
--                    frameworkdirectory="${toolDirectory}"
--                    frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}"
--                    clrversion="2.0.50727"
--                    clrtype="Desktop"
--                    vendor="Mono"
--                    >
--                    <runtime>
--                        <probing-paths>
--                            <directory name="lib/mono/2.0" />
--                            <directory name="lib/mono/neutral" />
--                            <directory name="lib/common/2.0" />
--                            <directory name="lib/common/neutral" />
--                        </probing-paths>
--                        <modes>
--                            <auto>
--                                <engine program="${runtimeEngine}" />
--                                <environment>
--                                    <variable name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" />
--                                    <variable name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" />
--                                </environment>
--                            </auto>
--                            <strict>
--                                <engine program="${runtimeEngine}">
--                                    <arg value="--runtime=v2.0.50727" />
--                                </engine>
--                                <environment>
--                                    <variable name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" />
--                                    <variable name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" />
--                                </environment>
--                            </strict>
--                        </modes>
--                    </runtime>
--                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}">
--                        <include name="*.dll" />
--                    </reference-assemblies>
--                    <task-assemblies>
--                        <!-- include Mono version-neutral assemblies -->
--                        <include name="extensions/mono/neutral/**/*.dll" />
--                        <!-- include Mono 2.0 specific assemblies -->
--                        <include name="extensions/mono/2.0/**/*.dll" />
--                        <!-- include .NET 2.0 specific assemblies -->
--                        <include name="extensions/common/2.0/**/*.dll" />
--                    </task-assemblies>
--                    <tool-paths>
--                        <directory name="${toolDirectory}" />
--                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
--                        <!-- for compatibility with Mono 1.0.x -->
--                        <directory name="${frameworkAssemblyDirectory}" />
--                        <!-- unmanaged tools -->
--                        <directory name="${sdkInstallRoot}/bin" />
--                    </tool-paths>
--                    <project>
--                        <!-- quick and dirty check to see if pkg-config is available (and configured) -->
--                        <property name="pkgconfig.available" value="${environment::variable-exists('PKG_CONFIG_PATH')}" />
--                        <if test="${pkgconfig.available}">
--                            <if test="${pkg-config::exists('mono')}">
--                                <call target="configure-from-pkg-config" />
--                            </if>
--                            <if test="${not pkg-config::exists('mono')}">
--                                <call target="configure-from-registry" />
--                            </if>
--                        </if>
--                        <if test="${not pkgconfig.available}">
--                            <call target="configure-from-registry" />
--                        </if>
--
--                        <property name="resgen.supportsexternalfilereferences" value="false" />
--
--                        <!-- determine if we're dealing with a Mono 1.0.x release -->
--                        <if test="${version::parse(mono.version) &lt; version::parse('1.1')}">
--                            <!-- 
--                                in Mono 1.0.x, the framework tools are located 
--                                in the <install root>\lib directory, except for
--                                mbas and mcs
--                            -->
--                            <property name="toolDirectory" value="${frameworkAssemblyDirectory}" />
--                            <property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
--                            <property name="resgen.tool" value="monoresgen" />
--                            <property name="csc.supportsdocgeneration" value="false" />
--
--                            <!-- 
--                                Mono 1.0.1 installer incorrectly adds '\mono' to 
--                                "MonoConfigDir" registry value
--                            -->
--                            <if test="${string::ends-with(configDir, 'etc\mono')}">
--                                <property name="configDir" value="${string::replace(configDir, 'etc\mono', 'etc')}" />
--                            </if>
--                        </if>
--
--                        <!-- determine if we're dealing with a Mono 1.1.x release or higher -->
--                        <if test="${version::parse(mono.version) >= version::parse('1.1')}">
--                            <property name="toolDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
--                            <property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
--                            <!-- starting from Mono 1.1.9.2, mono.exe is located in the bin directory -->
--                            <if test="${not file::exists(runtimeEngine)}">
--                                <property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
--                            </if>
--                            <property name="csc.supportsdocgeneration" value="true" />
--                        </if>
--                        <!-- as from Mono 1.2.3.50, resgen supports the /usesourcepath option -->
--                        <if test="${version::parse(mono.version) >= version::parse('1.2.3.50')}">
--                            <property name="resgen.supportsexternalfilereferences" value="true" />
--                        </if>
--
--                        <target name="configure-from-pkg-config">
--                            <property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
--                            <property name="sdkInstallRoot" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'prefix'))}" />
--                            <property name="frameworkAssemblyDirectory" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'libdir'))}" />
--                            <property name="configDir" value="${path::combine(sdkInstallRoot, 'etc')}/" />
--                        </target>
--
--                        <target name="configure-from-registry">
--                            <monoregistry property="mono.reg" failonerror="false" />
--                            <readregistry
--                                property="mono.version"
--                                key="${mono.reg}\DefaultCLR"
--                                hive="LocalMachine"
--                            />
--                            <property name="monokey" value="${mono.reg}\${mono.version}" />
--
--                            <readregistry
--                                property="sdkInstallRoot"
--                                key="${monokey}\SdkInstallRoot"
--                                hive="LocalMachine" />
--                            <readregistry
--                                property="frameworkAssemblyDirectory"
--                                key="${monokey}\FrameworkAssemblyDirectory"
--                                hive="LocalMachine" />
--                            <readregistry
--                                property="configDir"
--                                key="${monokey}\MonoConfigDir"
--                                hive="LocalMachine" />
--                        </target>
--                    </project>
--                    <properties>
--                    </properties>
--                    <tasks>
--                        <task name="al">
--                            <attribute name="managed">true</attribute>
--                        </task>
--                        <task name="csc">
--                            <attribute name="exename">gmcs</attribute>
--                            <attribute name="managed">true</attribute>
--                            <attribute name="supportspackagereferences">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportsdocgeneration">${csc.supportsdocgeneration}</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportslangversion">true</attribute>
--                        </task>
--                        <task name="jsc">
--                            <attribute name="exename">mjs</attribute>
--                            <attribute name="managed">strict</attribute>
--                        </task>
--                        <task name="vbc">
--                            <attribute name="exename">vbnc</attribute>
--                            <attribute name="managed">true</attribute>
--                        </task>
--                        <task name="resgen">
--                            <attribute name="exename">${resgen.tool}</attribute>
--                            <attribute name="managed">true</attribute>
--                            <attribute name="supportsexternalfilereferences">${resgen.supportsexternalfilereferences}</attribute>
--                        </task>
--                        <task name="delay-sign">
--                            <attribute name="exename">sn</attribute>
--                            <attribute name="managed">true</attribute>
--                        </task>
--                        <task name="license">
--                            <attribute name="hascommandlinecompiler">false</attribute>
--                        </task>
--                        <task name="ilasm">
--                            <attribute name="managed">true</attribute>
--                        </task>
--                    </tasks>
--                </framework>
--                <framework
--                    name="mono-3.5"
--                    family="mono"
--                    version="3.5"
--                    description="Mono 3.5 Profile"
--                    sdkdirectory="${toolDirectory}"
--                    frameworkdirectory="${toolDirectory}"
--                    frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}"
--                    clrversion="2.0.50727"
--                    clrtype="Desktop"
--                    vendor="Mono"
--                    >
--                    <runtime>
--                        <probing-paths>
--                            <directory name="lib/mono/2.0" />
--                            <directory name="lib/mono/neutral" />
--                            <directory name="lib/common/2.0" />
--                            <directory name="lib/common/neutral" />
--                        </probing-paths>
--                        <modes>
--                            <auto>
--                                <engine program="${runtimeEngine}" />
--                                <environment>
--                                    <variable name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" />
--                                    <variable name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" />
--                                </environment>
--                            </auto>
--                            <strict>
--                                <engine program="${runtimeEngine}">
--                                    <arg value="--runtime=v2.0.50727" />
--                                </engine>
--                                <environment>
--                                    <variable name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" />
--                                    <variable name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" />
--                                </environment>
--                            </strict>
--                        </modes>
--                    </runtime>
--                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/3.5')}">
--                        <include name="*.dll" />
--                    </reference-assemblies>
--                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/3.0')}">
--                        <include name="*.dll" />
--                    </reference-assemblies>
--                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}">
--                        <include name="*.dll" />
--                    </reference-assemblies>
--                    <task-assemblies>
--                        <!-- include Mono version-neutral assemblies -->
--                        <include name="extensions/mono/neutral/**/*.dll" />
--                        <!-- include Mono 2.0 specific assemblies -->
--                        <include name="extensions/mono/2.0/**/*.dll" />
--                        <!-- include .NET 2.0 specific assemblies -->
--                        <include name="extensions/common/2.0/**/*.dll" />
--                    </task-assemblies>
--                    <tool-paths>
--                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/3.5')}" />
--                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
--                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
--                        <!-- unmanaged tools -->
--                        <directory name="${sdkInstallRoot}/bin" />
--                    </tool-paths>
--                    <project>
--                        <!-- quick and dirty check to see if pkg-config is available (and configured) -->
--                        <property name="pkgconfig.available" value="${environment::variable-exists('PKG_CONFIG_PATH')}" />
--                        <if test="${pkgconfig.available}">
--                            <if test="${pkg-config::exists('mono')}">
--                                <call target="configure-from-pkg-config" />
--                            </if>
--                            <if test="${not pkg-config::exists('mono')}">
--                                <call target="configure-from-registry" />
--                            </if>
--                        </if>
--                        <if test="${not pkgconfig.available}">
--                            <call target="configure-from-registry" />
--                        </if>
--
--                        <property name="toolDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/3.5')}" />
--                        <property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
--
--                        <target name="configure-from-pkg-config">
--                            <property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
--                            <property name="sdkInstallRoot" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'prefix'))}" />
--                            <property name="frameworkAssemblyDirectory" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'libdir'))}" />
--                            <property name="configDir" value="${path::combine(sdkInstallRoot, 'etc')}/" />
--                        </target>
--
--                        <target name="configure-from-registry">
--                            <monoregistry property="mono.reg" failonerror="false" />
--                            <readregistry
--                                property="mono.version"
--                                key="${mono.reg}\DefaultCLR"
--                                hive="LocalMachine"
--                            />
--                            <property name="monokey" value="${mono.reg}\${mono.version}" />
--                           
--                            <readregistry
--                                property="sdkInstallRoot"
--                                key="${monokey}\SdkInstallRoot"
--                                hive="LocalMachine" />
--                            <readregistry
--                                property="frameworkAssemblyDirectory"
--                                key="${monokey}\FrameworkAssemblyDirectory"
--                                hive="LocalMachine" />
--                            <readregistry
--                                property="configDir"
--                                key="${monokey}\MonoConfigDir"
--                                hive="LocalMachine" />
--                        </target>
--                    </project>
--                    <properties>
--                    </properties>
--                    <tasks>
--                        <task name="al">
--                            <attribute name="managed">true</attribute>
--                        </task>
--                        <task name="csc">
--                            <attribute name="exename">gmcs</attribute>
--                            <attribute name="managed">true</attribute>
--                            <attribute name="langversion">linq</attribute>
--                            <attribute name="supportspackagereferences">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportsdocgeneration">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportslangversion">true</attribute>
--                        </task>
--                        <task name="jsc">
--                            <attribute name="exename">mjs</attribute>
--                            <attribute name="managed">strict</attribute>
--                        </task>
--                        <task name="vbc">
--                            <attribute name="exename">vbnc</attribute>
--                            <attribute name="managed">true</attribute>
--                        </task>
--                        <task name="resgen">
--                            <attribute name="managed">true</attribute>
--                            <attribute name="supportsexternalfilereferences">true</attribute>
--                        </task>
--                        <task name="delay-sign">
--                            <attribute name="exename">sn</attribute>
--                            <attribute name="managed">true</attribute>
--                        </task>
--                        <task name="license">
--                            <attribute name="hascommandlinecompiler">false</attribute>
--                        </task>
--                        <task name="ilasm">
--                            <attribute name="managed">true</attribute>
--                        </task>
--                    </tasks>
--                </framework>
--                <framework
--                    name="mono-4.0"
--                    family="mono"
--                    version="4.0"
--                    description="Mono 4.0 Profile"
--                    sdkdirectory="${toolDirectory}"
--                    frameworkdirectory="${toolDirectory}"
--                    frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/4.0')}"
--                    clrversion="4.0.30319"
--                    clrtype="Desktop"
--                    vendor="Mono"
--                    >
--                    <runtime>
--                        <probing-paths>
--                            <directory name="lib/mono/2.0" />
--                            <directory name="lib/mono/neutral" />
--                            <directory name="lib/common/2.0" />
--                            <directory name="lib/common/neutral" />
--                        </probing-paths>
--                        <modes>
--                            <auto>
--                                <engine program="${runtimeEngine}" />
--                                <environment>
--                                    <variable name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" />
--                                    <variable name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" />
--                                </environment>
--                            </auto>
--                            <strict>
--                                <engine program="${runtimeEngine}">
--                                    <arg value="--runtime=v4.0.30319" />
--                                </engine>
--                                <environment>
--                                    <variable name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" />
--                                    <variable name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" />
--                                </environment>
--                            </strict>
--                        </modes>
--                    </runtime>
--                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/4.0')}">
--                        <include name="*.dll" />
--                    </reference-assemblies>
--                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/3.5')}">
--                        <include name="*.dll" />
--                    </reference-assemblies>
--                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/3.0')}">
--                        <include name="*.dll" />
--                    </reference-assemblies>
--                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}">
--                        <include name="*.dll" />
--                    </reference-assemblies>
--                    <task-assemblies>
--                        <!-- include Mono version-neutral assemblies -->
--                        <include name="extensions/mono/neutral/**/*.dll" />
--                        <!-- include Mono 2.0 specific assemblies -->
--                        <include name="extensions/mono/2.0/**/*.dll" />
--                        <!-- include .NET 2.0 specific assemblies -->
--                        <include name="extensions/common/2.0/**/*.dll" />
--                    </task-assemblies>
--                    <tool-paths>
--                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/4.0')}" />
--                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/3.5')}" />
--                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
--                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
--                        <!-- unmanaged tools -->
--                        <directory name="${sdkInstallRoot}/bin" />
--                    </tool-paths>
--                    <project>
--                        <!-- quick and dirty check to see if pkg-config is available (and configured) -->
--                        <property name="pkgconfig.available" value="${environment::variable-exists('PKG_CONFIG_PATH')}" />
--                        <if test="${pkgconfig.available}">
--                            <if test="${pkg-config::exists('mono')}">
--                                <call target="configure-from-pkg-config" />
--                            </if>
--                            <if test="${not pkg-config::exists('mono')}">
--                                <call target="configure-from-registry" />
--                            </if>
--                        </if>
--                        <if test="${not pkgconfig.available}">
--                            <call target="configure-from-registry" />
--                        </if>
--
--                        <property name="toolDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/4.0')}" />
--                        <property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
--
--                        <target name="configure-from-pkg-config">
--                            <property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
--                            <property name="sdkInstallRoot" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'prefix'))}" />
--                            <property name="frameworkAssemblyDirectory" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'libdir'))}" />
--                            <property name="configDir" value="${path::combine(sdkInstallRoot, 'etc')}/" />
--                        </target>
--
--                        <target name="configure-from-registry">
--                            <monoregistry property="mono.reg" failonerror="false" />
--                            <readregistry
--                                property="mono.version"
--                                key="${mono.reg}\DefaultCLR"
--                                hive="LocalMachine"
--                            />
--                            <property name="monokey" value="${mono.reg}\${mono.version}" />
--
--                            <readregistry
--                                property="sdkInstallRoot"
--                                key="${monokey}\SdkInstallRoot"
--                                hive="LocalMachine" />
--                            <readregistry
--                                property="frameworkAssemblyDirectory"
--                                key="${monokey}\FrameworkAssemblyDirectory"
--                                hive="LocalMachine" />
--                            <readregistry
--                                property="configDir"
--                                key="${monokey}\MonoConfigDir"
--                                hive="LocalMachine" />
--                        </target>
--                    </project>
--                    <properties>
--                    </properties>
--                    <tasks>
--                        <task name="al">
--                            <attribute name="managed">true</attribute>
--                        </task>
--                        <task name="csc">
--                            <attribute name="exename">dmcs</attribute>
--                            <attribute name="managed">true</attribute>
--                            <attribute name="langversion">linq</attribute>
--                            <attribute name="supportspackagereferences">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportsdocgeneration">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportslangversion">true</attribute>
--                        </task>
--                        <task name="jsc">
--                            <attribute name="exename">mjs</attribute>
--                            <attribute name="managed">strict</attribute>
--                        </task>
--                        <task name="vbc">
--                            <attribute name="exename">vbnc</attribute>
--                            <attribute name="managed">true</attribute>
--                        </task>
--                        <task name="resgen">
--                            <attribute name="managed">true</attribute>
--                            <attribute name="supportsexternalfilereferences">true</attribute>
--                        </task>
--                        <task name="delay-sign">
--                            <attribute name="exename">sn</attribute>
--                            <attribute name="managed">true</attribute>
--                        </task>
--                        <task name="license">
--                            <attribute name="hascommandlinecompiler">false</attribute>
--                        </task>
--                        <task name="ilasm">
--                            <attribute name="managed">true</attribute>
--                        </task>
--                    </tasks>
--                </framework>
--                <framework
--                    name="moonlight-2.0" 
--                    family="moonlight"
--                    version="2.0"
--                    description="Moonlight 2.0"
--                    sdkdirectory="${toolDirectory}"
--                    frameworkdirectory="${toolDirectory}"
--                    frameworkassemblydirectory="${toolDirectory}"
--                    clrversion="2.0.50727"
--                    clrtype="Browser"
--                    vendor="Mono"
--                    >
--                    <runtime>
--                        <modes>
--                            <auto>
--                                <engine program="${runtimeEngine}">
--                                    <arg value="--runtime=moonlight" />
--                                    <arg value="--security=temporary-smcs-hack" />
--                                </engine>
--                            </auto>
--                        </modes>
--                    </runtime>
--                    <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'lib/mono/2.1')}">
--                        <include name="Microsoft.VisualBasic.dll" />
--                        <include name="mscorlib.dll" />
--                        <include name="System.Core.dll" />
--                        <include name="System.dll" />
--                        <include name="System.Net.dll" />
--                        <include name="System.Runtime.Serialization.dll" />
--                        <include name="System.ServiceModel.dll" />
--                        <include name="System.ServiceModel.Web.dll" />
--                        <include name="System.Windows.Browser.dll" />
--                        <include name="System.Windows.dll" />
--                        <include name="System.Xml.dll" />
--                    </reference-assemblies>
--                    <task-assemblies>
--                        <!-- include MS.NET version-neutral assemblies -->
--                        <include name="extensions/net/neutral/**/*.dll" />
--                        <!-- include MS.NET 2.0 specific assemblies -->
--                        <include name="extensions/net/2.0/**/*.dll" />
--                        <!-- include MS.NET specific task assembly -->
--                        <include name="NAnt.MSNetTasks.dll" />
--                        <!-- include MS.NET specific test assembly -->
--                        <include name="NAnt.MSNet.Tests.dll" />
--                        <!-- include .NET 2.0 specific assemblies -->
--                        <include name="extensions/common/2.0/**/*.dll" />
--                    </task-assemblies>
--                    <tool-paths>
--                        <directory name="${toolDirectory}" />
--                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
--                        <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
--                        <!-- unmanaged tools -->
--                        <directory name="${sdkInstallRoot}/bin" />
--                    </tool-paths>
--                    <project>
--                        <!-- quick and dirty check to see if pkg-config is available (and configured) -->
--                        <property name="pkgconfig.available" value="${environment::variable-exists('PKG_CONFIG_PATH')}" />
--                        <if test="${pkgconfig.available}">
--                            <if test="${pkg-config::exists('mono')}">
--                                <call target="configure-from-pkg-config" />
--                            </if>
--                            <if test="${not pkg-config::exists('mono')}">
--                                <call target="configure-from-registry" />
--                            </if>
--                        </if>
--                        <if test="${not pkgconfig.available}">
--                            <call target="configure-from-registry" />
--                        </if>
--
--                        <property name="toolDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.1')}" />
--                        <property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
--
--                        <target name="configure-from-pkg-config">
--                            <property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
--                            <property name="sdkInstallRoot" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'prefix'))}" />
--                            <property name="frameworkAssemblyDirectory" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'libdir'))}" />
--                            <property name="configDir" value="${path::combine(sdkInstallRoot, 'etc')}/" />
--                        </target>
--
--                        <target name="configure-from-registry">
--                            <monoregistry property="mono.reg" failonerror="false" />
--                            <readregistry
--                                property="mono.version"
--                                key="${mono.reg}\DefaultCLR"
--                                hive="LocalMachine"
--                            />
--                            <property name="monokey" value="${mono.reg}\${mono.version}" />
--
--                            <readregistry
--                                property="sdkInstallRoot"
--                                key="${monokey}\SdkInstallRoot"
--                                hive="LocalMachine" />
--                            <readregistry
--                                property="frameworkAssemblyDirectory"
--                                key="${monokey}\FrameworkAssemblyDirectory"
--                                hive="LocalMachine" />
--                            <readregistry
--                                property="configDir"
--                                key="${monokey}\MonoConfigDir"
--                                hive="LocalMachine" />
--                        </target>
--                    </project>
--                    <tasks>
--                        <task name="csc">
--                            <attribute name="exename">smcs</attribute>
--                            <attribute name="managed">true</attribute>
--                            <attribute name="supportspackagereferences">true</attribute>
--                            <attribute name="supportsnowarnlist">true</attribute>
--                            <attribute name="supportsdocgeneration">true</attribute>
--                            <attribute name="supportskeycontainer">true</attribute>
--                            <attribute name="supportskeyfile">true</attribute>
--                            <attribute name="supportsdelaysign">true</attribute>
--                            <attribute name="supportslangversion">true</attribute>
--                        </task>
--                        <task name="resgen">
--                            <attribute name="supportsassemblyreferences">true</attribute>
--                            <attribute name="supportsexternalfilereferences">true</attribute>
--                        </task>
--                        <task name="delay-sign">
--                            <attribute name="exename">sn</attribute>
--                        </task>
--                        <task name="license">
--                            <attribute name="hascommandlinecompiler">false</attribute>
--                        </task>
--                    </tasks>
--                </framework>
--                <framework 
--                    name="sscli-1.0"
--                    family="sscli"
--                    version="1.0"
--                    description="Microsoft Shared Source CLI 1.0"
--                    sdkdirectory="C:\sscli\build\v1.x86fstchk.rotor\sdk\bin"
--                    frameworkdirectory="C:\sscli\build\v1.x86fstchk.rotor"
--                    frameworkassemblydirectory="C:\sscli\build\v1.x86fstchk.rotor"
--                    clrversion="1.0.3"
--                    clrtype="Desktop"
--                    vendor="Microsoft"
--                    >
--                    <runtime>
--                        <modes>
--                            <auto>
--                                <engine program="C:\sscli\build\v1.x86fstchk.rotor\clix.exe" />
--                            </auto>
--                        </modes>
--                    </runtime>
--                    <reference-assemblies basedir="C:\sscli\build\v1.x86fstchk.rotor">
--                        <include name="*.dll" />
--                    </reference-assemblies>
--                    <task-assemblies>
--                        <!-- this is not a supported runtime framework -->
--                    </task-assemblies>
--                    <tool-paths>
--                        <directory name="C:\sscli\build\v1.x86fstchk.rotor\sdk\bin" />
--                        <directory name="C:\sscli\build\v1.x86fstchk.rotor" />
--                    </tool-paths>
--                    <project />
--                    <tasks>
--                        <task name="csc">
--                            <attribute name="supportsnowarnlist">true</attribute>
--                        </task>
--                        <task name="jsc">
--                            <attribute name="managed">true</attribute>
--                        </task>
--                        <task name="delay-sign">
--                            <attribute name="exename">sn</attribute>
--                        </task>
--                        <task name="license">
--                            <attribute name="hascommandlinecompiler">false</attribute>
--                        </task>
--                        <task name="ilasm">
--                            <attribute name="managed">true</attribute>
--                        </task>
--                        <task name="ildasm">
--                            <attribute name="managed">true</attribute>
--                        </task>
--                    </tasks>
--                </framework>
--            </platform>
-             <platform name="unix" default="auto">
-                 <task-assemblies>
-                         <!-- include NAnt task assemblies -->
-@@ -2415,18 +92,18 @@
-                             <property name="csc.supportsdocgeneration" value="false" />
-                         </if>
-                         <if test="${pkg-config::is-atleast-version('mono', '1.1')}">
--                            <property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
-+                            <property name="toolDirectory" value="${path::combine(prefix, 'bin')}" />
-                             <property name="resgen.tool" value="resgen" />
-                             <property name="csc.supportsdocgeneration" value="true" />
-                         </if>
-                     </project>
-                     <tasks>
-                         <task name="al">
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                         <task name="csc">
--                            <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mcs.exe')}</attribute>
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="exename">${path::combine(prefix, 'bin/mcs')}</attribute>
-+                            <attribute name="managed">false</attribute>
-                             <attribute name="supportspackagereferences">true</attribute>
-                             <attribute name="supportsnowarnlist">true</attribute>
-                             <attribute name="supportsdocgeneration">${csc.supportsdocgeneration}</attribute>
-@@ -2437,25 +114,25 @@
-                         </task>
-                         <task name="jsc">
-                             <attribute name="exename">mjs</attribute>
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                         <task name="vbc">
--                            <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="exename">${path::combine(prefix, 'bin/vbnc')}</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                         <task name="resgen">
-                             <attribute name="exename">${resgen.tool}</attribute>
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                         <task name="delay-sign">
-                             <attribute name="exename">sn</attribute>
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                         <task name="license">
-                             <attribute name="hascommandlinecompiler">false</attribute>
-                         </task>
-                         <task name="ilasm">
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                     </tasks>
-                 </framework>
-@@ -2502,9 +179,10 @@
-                     </task-assemblies>
-                     <tool-paths>
-                         <directory name="${toolDirectory}" />
--                        <directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
--                        <!-- unmanaged tools -->
-+			<!-- unmanaged tools -->
-                         <directory name="${prefix}/bin" />
-+			<!-- managed tools -->
-+                        <directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
-                     </tool-paths>
-                     <project>
-                         <if test="${not pkg-config::exists('mono')}">
-@@ -2518,7 +196,7 @@
-                             <property name="csc.supportsdocgeneration" value="false" />
-                         </if>
-                         <if test="${pkg-config::is-atleast-version('mono', '1.1')}">
--                            <property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/2.0')}" />
-+                            <property name="toolDirectory" value="${path::combine(prefix, 'bin')}" />
-                             <property name="resgen.tool" value="resgen" />
-                             <property name="csc.supportsdocgeneration" value="true" />
-                         </if>
-@@ -2529,11 +207,11 @@
-                     </project>
-                     <tasks>
-                         <task name="al">
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                         <task name="csc">
-                             <attribute name="exename">gmcs</attribute>
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                             <attribute name="supportspackagereferences">true</attribute>
-                             <attribute name="supportsnowarnlist">true</attribute>
-                             <attribute name="supportsdocgeneration">${csc.supportsdocgeneration}</attribute>
-@@ -2544,26 +222,26 @@
-                         </task>
-                         <task name="jsc">
-                             <attribute name="exename">mjs</attribute>
--                            <attribute name="managed">strict</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                         <task name="vbc">
-                             <attribute name="exename">vbnc</attribute>
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                         <task name="resgen">
-                             <attribute name="exename">${resgen.tool}</attribute>
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                             <attribute name="supportsexternalfilereferences">${resgen.supportsexternalfilereferences}</attribute>
-                         </task>
-                         <task name="delay-sign">
-                             <attribute name="exename">sn</attribute>
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                         <task name="license">
-                             <attribute name="hascommandlinecompiler">false</attribute>
-                         </task>
-                         <task name="ilasm">
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                     </tasks>
-                 </framework>
-@@ -2616,10 +294,11 @@
-                     </task-assemblies>
-                     <tool-paths>
-                         <directory name="${toolDirectory}" />
-+			<!-- unmanaged tools -->
-+                        <directory name="${prefix}/bin" />
-+			<!-- managed tools -->
-                         <directory name="${path::combine(prefix, 'lib/mono/2.0')}" />
-                         <directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
--                        <!-- unmanaged tools -->
--                        <directory name="${prefix}/bin" />
-                     </tool-paths>
-                     <project>
-                         <if test="${not pkg-config::exists('mono')}">
-@@ -2627,15 +306,15 @@
-                         </if>
-                         <property name="resgen.supportsexternalfilereferences" value="false" />
-                         <property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}" />
--                        <property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/3.5')}" />
-+                        <property name="toolDirectory" value="${path::combine(prefix, 'bin')}" />
-                     </project>
-                     <tasks>
-                         <task name="al">
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                         <task name="csc">
-                             <attribute name="exename">gmcs</attribute>
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                             <attribute name="langversion">linq</attribute>
-                             <attribute name="supportspackagereferences">true</attribute>
-                             <attribute name="supportsnowarnlist">true</attribute>
-@@ -2647,25 +326,25 @@
-                         </task>
-                         <task name="jsc">
-                             <attribute name="exename">mjs</attribute>
--                            <attribute name="managed">strict</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                         <task name="vbc">
-                             <attribute name="exename">vbnc</attribute>
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                         <task name="resgen">
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                             <attribute name="supportsexternalfilereferences">true</attribute>
-                         </task>
-                         <task name="delay-sign">
-                             <attribute name="exename">sn</attribute>
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                         <task name="license">
-                             <attribute name="hascommandlinecompiler">false</attribute>
-                         </task>
-                         <task name="ilasm">
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                     </tasks>
-                 </framework>
-@@ -2721,11 +400,12 @@
-                     </task-assemblies>
-                     <tool-paths>
-                         <directory name="${toolDirectory}" />
-+			<!-- unmanaged tools -->
-+                        <directory name="${prefix}/bin" />
-+			<!-- managed tools -->
-                         <directory name="${path::combine(prefix, 'lib/mono/3.5')}" />
-                         <directory name="${path::combine(prefix, 'lib/mono/2.0')}" />
-                         <directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
--                        <!-- unmanaged tools -->
--                        <directory name="${prefix}/bin" />
-                     </tool-paths>
-                     <project>
-                         <if test="${not pkg-config::exists('mono')}">
-@@ -2733,15 +413,15 @@
-                         </if>
-                         <property name="resgen.supportsexternalfilereferences" value="false" />
-                         <property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}" />
--                        <property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/4.0')}" />
-+                        <property name="toolDirectory" value="${path::combine(prefix, 'bin')}" />
-                     </project>
-                     <tasks>
-                         <task name="al">
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                         <task name="csc">
-                             <attribute name="exename">dmcs</attribute>
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                             <attribute name="langversion">linq</attribute>
-                             <attribute name="supportspackagereferences">true</attribute>
-                             <attribute name="supportsnowarnlist">true</attribute>
-@@ -2753,25 +433,25 @@
-                         </task>
-                         <task name="jsc">
-                             <attribute name="exename">mjs</attribute>
--                            <attribute name="managed">strict</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                         <task name="vbc">
-                             <attribute name="exename">vbnc</attribute>
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                         <task name="resgen">
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                             <attribute name="supportsexternalfilereferences">true</attribute>
-                         </task>
-                         <task name="delay-sign">
-                             <attribute name="exename">sn</attribute>
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                         <task name="license">
-                             <attribute name="hascommandlinecompiler">false</attribute>
-                         </task>
-                         <task name="ilasm">
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                         </task>
-                     </tasks>
-                 </framework>
-@@ -2824,22 +504,23 @@
-                     </task-assemblies>
-                     <tool-paths>
-                         <directory name="${toolDirectory}" />
--                        <directory name="${path::combine(prefix, 'lib/mono/2.0')}" />
--                        <directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
-                         <!-- unmanaged tools -->
-                         <directory name="${prefix}/bin" />
-+			<!-- managed tools -->
-+                        <directory name="${path::combine(prefix, 'lib/mono/2.0')}" />
-+                        <directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
-                     </tool-paths>
-                     <project>
-                         <if test="${not pkg-config::exists('mono')}">
-                             <fail>Unable to locate 'mono' module using pkg-config. Download the Mono development packages from http://www.mono-project.com/downloads/.</fail>
-                         </if>
-                         <property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}" />
--                        <property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/2.1')}" />
-+                        <property name="toolDirectory" value="${path::combine(prefix, 'bin')}" />
-                     </project>
-                     <tasks>
-                         <task name="csc">
-                             <attribute name="exename">smcs</attribute>
--                            <attribute name="managed">true</attribute>
-+                            <attribute name="managed">false</attribute>
-                             <attribute name="supportspackagereferences">true</attribute>
-                             <attribute name="supportsnowarnlist">true</attribute>
-                             <attribute name="supportsdocgeneration">true</attribute>
-diff -ruN nant-0.92.orig/src/NAnt.Core/Tasks/ExternalProgramBase.cs nant-0.92/src/NAnt.Core/Tasks/ExternalProgramBase.cs
---- nant-0.92.orig/src/NAnt.Core/Tasks/ExternalProgramBase.cs	2012-06-09 08:05:53.000000000 -0600
-+++ nant-0.92/src/NAnt.Core/Tasks/ExternalProgramBase.cs	2013-08-04 22:41:24.000000000 -0600
-@@ -633,6 +633,8 @@
-                         if (Project.TargetFramework.FrameworkDirectory != null) {
-                             string frameworkDir = Project.TargetFramework.FrameworkDirectory.FullName;
-                             fullPath = Path.Combine(frameworkDir, ExeName + ".exe");
-+                            if (!File.Exists(fullPath))
-+                                fullPath = Path.Combine(frameworkDir, ExeName);    
-                         } else {
-                             throw new BuildException(
-                                 string.Format(CultureInfo.InvariantCulture, 
-@@ -644,6 +646,8 @@
-                         if (Project.TargetFramework.SdkDirectory != null) {
-                             string sdkDirectory = Project.TargetFramework.SdkDirectory.FullName;
-                             fullPath = Path.Combine(sdkDirectory, ExeName + ".exe");
-+                            if (!File.Exists(fullPath))
-+                                fullPath = Path.Combine(sdkDirectory, ExeName);    
-                         } else {
-                             throw new BuildException(
-                                 string.Format(CultureInfo.InvariantCulture, 
-@@ -656,6 +660,10 @@
-                 if (!File.Exists (fullPath)) {
-                     string toolPath = Project.TargetFramework.GetToolPath (
-                         ExeName + ".exe");
-+                    if (toolPath == null) {
-+                        toolPath = Project.TargetFramework.GetToolPath (
-+                        ExeName);
-+                    }
-                     if (toolPath != null) {
-                         fullPath = toolPath;
-                     }
diff --git a/java/not-working/java-asm4/PKGBUILD b/java/not-working/java-asm4/PKGBUILD
deleted file mode 100644
index 3db06dddc..000000000
--- a/java/not-working/java-asm4/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgver=4.1
-. ../java-asm2/common.sh
-depends+=('java-bnd')
-
-####
-
-pkgrel=5
-_checksource_ignore=(src/org/objectweb/asm/optimizer/jdk{1.2.2_017,1.3.1_19}.txt.gz)
-
-mksource() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  rm examples/jasmin/test/jasmin.jar
-}
-
-md5sums=('cbfd7445edc517e0867ad410e48cb106')
diff --git a/java/not-working/java-asm4/TODO b/java/not-working/java-asm4/TODO
deleted file mode 100644
index 563c88bc9..000000000
--- a/java/not-working/java-asm4/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Depends on java-bnd, which is not packaged
\ No newline at end of file
diff --git a/java/not-working/java-bnd/PKGBUILD b/java/not-working/java-bnd/PKGBUILD
deleted file mode 100644
index 86820469a..000000000
--- a/java/not-working/java-bnd/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=bnd
-pkgname=java-bnd
-pkgver=1.50.0
-pkgdesc="A swiss army knife for OSGi"
-url="http://www.aqute.biz/Bnd/"
-license=('Apache2')
-
-pkgrel=1
-arch=(any)
-makedepends=('apache-ant' 'junit')
-source=("git://github.com/bndtools/bnd.git")
-
-build() {
-  cd "$srcdir/$_pkgname"  
-  ant dist
-}
-
-package() {
-  :
-}
-
-md5sums=('SKIP')
diff --git a/java/not-working/java-guava/PKGBUILD b/java/not-working/java-guava/PKGBUILD
deleted file mode 100644
index 0250e7183..000000000
--- a/java/not-working/java-guava/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=guava
-pkgname=java-guava
-pkgver=13.0.1
-pkgdesc="Google Core Libraries for Java."
-url="https://code.google.com/p/guava-libraries/"
-license=('Apache2')
-
-pkgrel=1
-arch=('any')
-depends=('java-runtime>=5')
-makedepends=('java-runtime>=6' 'maven' 'junit-truth' 'jh')
-conflicts=('openjdk6') # OpenJDK bug 100167 conflicts
-source=("$pkgname::git+https://code.google.com/p/guava-libraries/#tag=v$pkgver")
-
-mksource() {
-  cd "$srcdir/$pkgname"
-  rm guava/lib/*.jar
-  rm guava-test/lib/*.jar
-}
-
-build() {
-  cd "$srcdir/$pkgname"
-  eval `jh mksource`
-
-  ln -s /usr/share/java/junit-truth.jar guava-tests/lib/libtruth.java
-
-  mvn package
-}
-
-package() {
-    :
-}
diff --git a/java/not-working/java-guava/TODO b/java/not-working/java-guava/TODO
deleted file mode 100644
index ee0a18042..000000000
--- a/java/not-working/java-guava/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* depends on junit-truth, which does not build yet
-* package() hasn't been written
diff --git a/java/not-working/junit-truth/PKGBUILD b/java/not-working/junit-truth/PKGBUILD
deleted file mode 100644
index 61a0ee469..000000000
--- a/java/not-working/junit-truth/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=junit-truth
-pkgdesc="Assertion/Proposition framework for Java unit tests."
-url="https://github.com/truth0/truth"
-license=('Apache2')
-
-#_pkgver=0.5.0-beta1
-#pkgver=${_pkgver//-/.}
-#_tag=v${_pkgver}
-
-#pkgver=0.7.0
-#_tag=truth-rel-${pkgver//./-}
-
-#pkgver=0.8
-#_tag=truth-${pkgver}
-
-#pkgver=0.9
-#_tag=release_${pkgver//./_}
-
-pkgver=0.10
-_tag=release_${pkgver//./_}
-
-pkgrel=1
-arch=('any')
-depends=('junit')
-makedepends=('maven' 'jh')
-conflicts=('openjdk6') # OpenJDK bug 100167 conflicts
-source=("$pkgname::git://github.com/truth0/truth.git#tag=$tag")
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  jh checksource
-  mvn package
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  install -d "${pkgdir}"/usr/share/java/${pkgname}
-  JAR=${pkgname}-${pkgver}.jar
-  install -Dm 644 target/${JAR} "${pkgdir}"/usr/share/java/${pkgname}
-  ln -s       ${pkgname}/${JAR} "${pkgdir}"/usr/share/java/${pkgname}.jar
-}
-
-md5sums=('SKIP')
diff --git a/java/not-working/junit-truth/TODO b/java/not-working/junit-truth/TODO
deleted file mode 100644
index d21b3e472..000000000
--- a/java/not-working/junit-truth/TODO
+++ /dev/null
@@ -1 +0,0 @@
-has unpackaged dependencies
diff --git a/java/not-working/protobuf/PKGBUILD b/java/not-working/protobuf/PKGBUILD
deleted file mode 100644
index 699bde0cf..000000000
--- a/java/not-working/protobuf/PKGBUILD
+++ /dev/null
@@ -1,99 +0,0 @@
-# Maintainer: Thomas S Hatch <thatch45@gmail.com>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgbase=protobuf
-pkgname=('protobuf' 'python2-protobuf' 'java-protobuf')
-pkgver=2.4.1
-pkgrel=2.1
-pkgdesc="A way of encoding structured data in an efficient yet extensible format"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/protobuf/"
-license=('APACHE')
-depends=('gcc-libs' 'zlib')
-makedepends=('python2' 'python2-distribute' 'java-environment')
-options=(!libtool)
-source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('ed436802019c9e1f40cc750eaf78f318')
-
-####
-
-build() {
-  build_protobuf
-  build_python2-protobuf
-  build_java-protobuf
-}
-
-check() {
-  check_protobuf
-  check_python2-protobuf
-  check_java-protobuf
-}
-
-package() {
-  package_protobuf
-  package_python2-protobuf
-  package_java-protobuf
-}
-
-####
-
-build_protobuf() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check_protobuf() {
-  cd $srcdir/$pkgname-$pkgver
-  make check
-}
-
-package_protobuf() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
-
-####
-
-build_python2-protobuf() {
-  cd $srcdir/$pkgname-$pkgver/python
-  python2 setup.py build
-}
-
-check_python2-protobuf() {
-  cd $srcdir/$pkgname-$pkgver/python
-  python2 setup.py test
-}
-
-package_python2-protobuf() {
-  pkgdesc="protobuf python2 API"
-  replaces=('protobuf-python')
-  provides=("protobuf-python=${pkgver}")
-  depends=("python2" "protobuf=${pkgver}")
-
-  cd $srcdir/protobuf-$pkgver/python
-  python2 setup.py install --prefix=/usr --root $pkgdir
-}
-
-####
-
-build_java-protobuf() {
-  cd $srcdir/$pkgname-$pkgver/java
-  mvn compile
-}
-
-check_java-protobuf() {
-  cd $srcdir/$pkgname-$pkgver/java
-  mvn test
-}
-
-package_java-protobuf() {
-  pkgdesc="protobuf Java API"
-  replaces=('protobuf-java')
-  provides=("protobuf-java=${pkgver}")
-  depends=("java-runtime" "protobuf=${pkgver}")
-
-  cd $srcdir/$pkgname-$pkgver/java
-  :
-}
diff --git a/java/not-working/protobuf/TODO b/java/not-working/protobuf/TODO
deleted file mode 100644
index 6a126b757..000000000
--- a/java/not-working/protobuf/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-* Missing dependencies:
- * junit:junit:4.4 (4.10 is packaged, patch to use 4.10?)
- * org.easymock:easymock:2.2
- * org.easymock:easymockclassextension:2.2.1
-* package_java-protobuf() has not been written
diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD
new file mode 100644
index 000000000..90fd4009a
--- /dev/null
+++ b/kernels/linux-libre-grsec/PKGBUILD
@@ -0,0 +1,468 @@
+# $Id: PKGBUILD 204288 2014-01-16 11:41:25Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer: Thomas Baechler <thomas@archlinux.org>
+# 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>
+# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+
+pkgbase=linux-libre-grsec   # Build stock -LIBRE-GRSEC kernel
+#pkgbase=linux-libre-custom # Build kernel with a different name
+_basekernel=3.12
+_sublevel=8
+_grsecver=3.0
+_timestamp=201401191015
+pkgver=${_basekernel}.${_sublevel}
+pkgrel=1
+_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver
+arch=('i686' 'x86_64' 'mips64el')
+url="http://linux-libre.fsfla.org/"
+license=('GPL2')
+makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
+options=('!strip')
+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"
+        "http://grsecurity.net/test/grsecurity-${_grsecver}-${pkgver}-${_timestamp}.patch"
+        # the main kernel config files
+        'config.i686' 'config.x86_64'
+        # standard config files for mkinitcpio ramdisk
+        "${pkgbase}.preset"
+        'Kbuild'
+        'Kbuild.platforms'
+        'boot-logo.patch'
+        'change-default-console-loglevel.patch'
+        'criu-no-expert.patch'
+        'sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch'
+        'sunrpc-replace-gssd_running-with-more-reliable-check.patch'
+        'nfs-check-gssd-running-before-krb5i-auth.patch'
+        'rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch'
+        'sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch'
+        'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch'
+        'module-blacklist.conf'
+        'sysctl.conf'
+        'known-exploit-detection.patch'
+        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
+md5sums=('254f59707b6676b59ce5ca5c3c698319'
+         '392f920129940c4f83c7d204468213f3'
+         'a7dd09d05b98cca3b7c00098698bdd38'
+         'ce2f5067862192ce2dcb897e362b24f6'
+         '93ff5264c547d894cc68e0c30a0dbdd8'
+         '5f66bed97a5c37e48eb2f71b2d354b9a'
+         '2967cecc3af9f954ccc822fd63dca6ff'
+         '8267264d9a8966e57fdacd1fa1fc65c4'
+         '14bb375a8a1d86d2875f72fcbaa03f3e'
+         '0892ce6045478bea4a005a6d82c0819e'
+         'b5509f6c3889a1b32f2e1f90ee2508f1'
+         'd4a75f77e6bd5d700dcd534cd5f0dfce'
+         'dc86fdc37615c97f03c1e0c31b7b833a'
+         '88eef9d3b5012ef7e82af1af8cc4e517'
+         'cec0bb8981936eab2943b2009b7a6fff'
+         '88d9cddf9e0050a76ec4674f264fb2a1'
+         'cb9016630212ef07b168892fbcfd4e5d'
+         'f93ef6157fbb23820bd5ae08fd3f451e'
+         '0db7629711f4ed76bd1f9da9f97bc4ea'
+         '34f7e421a25ebc3c1406e04db56accfa'
+         '0569e96c071703cc244f1ea7ee87d40a')
+if [ "$CARCH" != "mips64el" ]; then
+    # don't use the Loongson-specific patches on non-mips64el arches.
+    unset source[${#source[@]}-1]
+    unset md5sums[${#md5sums[@]}-1]
+fi
+
+_kernelname=${pkgbase#linux-libre}
+_localversionname=-LIBRE-GRSEC
+
+prepare() {
+  cd "${srcdir}/linux-${_basekernel}"
+
+  if [ "${_basekernel}" != "${pkgver}" ]; then
+    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+  fi
+
+  # add grsecurity patches
+  patch -Np1 -i "${srcdir}/grsecurity-${_grsecver}-${pkgver}-${_timestamp}.patch"
+  rm localversion-grsec
+
+  # add freedo as boot logo
+  patch -Np1 -i "${srcdir}/boot-logo.patch"
+
+  # fix issue on Hal8188EFWImg_CE.c deblobbed file
+  sed -i "\|DEBLOBBED| s|,||" drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c
+
+  # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
+  # remove this when a Kconfig knob is made available by upstream
+  # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
+  patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
+
+  # allow criu without expert option set
+  # patch from fedora
+  patch -Np1 -i "${srcdir}/criu-no-expert.patch"
+
+  # fix 15 seocnds nfs delay
+  patch -Np1 -i "${srcdir}/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch"
+  patch -Np1 -i "${srcdir}/sunrpc-replace-gssd_running-with-more-reliable-check.patch"
+  patch -Np1 -i "${srcdir}/nfs-check-gssd-running-before-krb5i-auth.patch"
+  # fix nfs kernel oops
+  # #37866
+  patch -Np1 -i "${srcdir}/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch"
+  patch -Np1 -i "${srcdir}/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch"
+
+  patch -Np1 -i "${srcdir}/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch"
+
+  # add known exploit detection patch
+  # http://lkml.org/lkml/2013/12/12/358
+  patch -Np1 -i "${srcdir}/known-exploit-detection.patch"
+
+  if [ "$CARCH" == "mips64el" ]; then
+    sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-grsec|" Makefile
+    sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
+        < "${srcdir}/lxo-config.patch" > lxo-config.patch
+    msg2 "Adding loongson-community patches"
+    patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch
+    patch -Np0 -i lxo-config.patch
+
+  # ensure N32, add localversion, remove uevent helper as per
+  # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
+  # and make USB storage support builtin (e.g. for booting from USB
+  # disks without slowly loading an initramfs)
+    sed -ri \
+        -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+        -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
+        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" \
+        -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \
+        ./.config
+  else
+    cat "${srcdir}/config.${CARCH}" > ./.config # simpler
+  fi
+
+  if [ "${_kernelname}" != "" ]; then
+    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" ./.config
+    sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
+  fi
+
+  # set extraversion to pkgrel
+  sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
+
+  # don't run depmod on 'make install'. We'll do this ourselves in packaging
+  sed -i '2iexit 0' scripts/depmod.sh
+}
+
+build() {
+  cd "${srcdir}/linux-${_basekernel}"
+
+  # get kernel version
+  make prepare
+
+  # load configuration
+  # Configure the kernel. Replace the line below with one of your choice.
+  #make menuconfig # CLI menu for configuration
+  #make nconfig # new CLI menu for configuration
+  #make xconfig # X-based configuration
+  #make oldconfig # using old config from previous kernel version
+  # ... or manually edit .config
+
+  # rewrite configuration
+  yes "" | make config >/dev/null
+
+  # save configuration for later reuse
+  if [ "${CARCH}" = "x86_64" ]; then
+    cat .config > "${startdir}/config.x86_64.last"
+  else
+    cat .config > "${startdir}/config.i686.last"
+  fi
+
+  ####################
+  # stop here
+  # this is useful to configure the kernel
+  #msg "Stopping build"; return 1
+  ####################
+
+  # build!
+  if [ "$CARCH" == "mips64el" ]; then
+    # The build system passes it directly to linker, disable to avoid
+    # having unknown -Wl,... options.
+    export LDFLAGS=""
+    # bzImage is arch-specific and not supported on mips; vmlinux is
+    # useful for oprofile.
+    make ${MAKEFLAGS} LOCALVERSION= vmlinux vmlinuz modules
+  else
+    make ${MAKEFLAGS} LOCALVERSION= bzImage modules
+  fi
+}
+
+_package() {
+  pkgdesc="The ${pkgbase^} kernel and modules with grsecurity/PaX support"
+  [ "${pkgbase}" = "linux-libre" ] && groups=('base')
+  depends=('coreutils' 'linux-libre-firmware' 'kmod' 'gradm' 'pax-flags-libre')
+  optdepends=('crda: to set the correct wireless channels of your country')
+  provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}")
+  conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
+  replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
+  backup=("etc/mkinitcpio.d/${pkgbase}.preset"
+          "etc/modprobe.d/dma.conf"
+          "etc/sysctl.d/05-grsecurity.conf")
+  install=${pkgbase}.install
+  if [ "$CARCH" = "mips64el" ]; then
+      optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)')
+      conflicts+=('mkinitcpio<0.7')
+  else
+      depends+=('mkinitcpio>=0.7')
+  fi
+
+  cd "${srcdir}/linux-${_basekernel}"
+
+  KARCH=x86
+  [ $CARCH = "mips64el" ] && KARCH=mips
+
+  # get kernel version
+  _kernver="$(make LOCALVERSION= kernelrelease)"
+  _basekernel=${_kernver%%-*}
+  _basekernel=${_basekernel%.*}
+
+  mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
+  make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
+
+  if [ "$CARCH" == "mips64el" ]; then
+    cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgbase}"
+    cp vmlinux "${pkgdir}/boot/vmlinux-${pkgbase}"
+  else
+    cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgbase}"
+  fi
+
+  # add vmlinux
+  install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
+
+  # set correct depmod command for install
+  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
+  true && install=${install}.pkg
+  sed \
+    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
+    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
+    -i "${startdir}/${install}"
+
+  # install mkinitcpio preset file for kernel
+  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+  sed \
+    -e "1s|'linux*.*'|'${pkgbase}'|" \
+    -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
+    -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \
+    -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \
+    -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+
+  # mkinitcpio 0.7 relies on bzImage to find the kernel version
+  if [ "$CARCH" == "mips64el" ]; then
+    sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \
+        -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+  fi
+
+  # remove build and source links
+  rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
+  # remove the firmware
+  rm -rf "${pkgdir}/lib/firmware"
+  # gzip -9 all modules to save 100MB of space
+  find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+  # make room for external modules
+  ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-GRSEC}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  # add real version for building modules and running depmod from post_install/upgrade
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-GRSEC}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-GRSEC}/version"
+
+  # Now we call depmod...
+  depmod -b "$pkgdir" -F System.map "$_kernver"
+
+  # move module tree /lib -> /usr/lib
+  mv "$pkgdir/lib" "$pkgdir/usr"
+
+  # copy sysctl configuration
+  install -Dm600 "$srcdir/sysctl.conf" "$pkgdir/etc/sysctl.d/05-grsecurity.conf"
+
+  # copy kernel module blacklist
+  install -Dm600 "$srcdir/module-blacklist.conf" "$pkgdir/etc/modprobe.d/dma.conf"
+}
+
+_package-headers() {
+  pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
+  provides=("kernel26${_kernelname}-headers=${pkgver}" "linux${_kernelname}-headers=${pkgver}")
+  conflicts=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
+  replaces=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
+
+  KARCH=x86
+  [ $CARCH = "mips64el" ] && KARCH=mips
+
+  # in case of repackaging this is empty
+  if [ -z "${_kernver}" ]; then
+    cd "${srcdir}/linux-${_basekernel}"
+    _kernver="$(make LOCALVERSION= kernelrelease)"
+  fi
+
+  install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
+
+  cd "${pkgdir}/usr/lib/modules/${_kernver}"
+  ln -sf ../../../src/linux-${_kernver} build
+
+  cd "${srcdir}/linux-${_basekernel}"
+  install -D -m644 Makefile \
+    "${pkgdir}/usr/src/linux-${_kernver}/Makefile"
+  install -D -m644 kernel/Makefile \
+    "${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile"
+  install -D -m644 .config \
+    "${pkgdir}/usr/src/linux-${_kernver}/.config"
+
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
+
+  for i in acpi asm-generic config crypto drm generated keys linux math-emu \
+    media net pcmcia scsi sound trace uapi video xen; do
+    cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
+  done
+
+  # copy arch includes for external modules
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}"
+  cp -a "arch/${KARCH}/include" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+
+  # copy files necessary for later builds
+  cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
+  cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
+
+  if [ "$CARCH" = "mips64el" ]; then
+    cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+    cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+    cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/"
+  fi
+
+  # fix permissions on scripts dir
+  chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
+
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel"
+
+  cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+
+  if [ "${CARCH}" = "i686" ]; then
+    cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+  fi
+
+  cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
+
+  # add headers for lirc package
+  # pci
+  for i in bt8xx cx88 saa7134; do
+    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
+    cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
+  done
+  # usb
+  for i in cpia2 em28xx pwc sn9c102; do
+    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
+    cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
+  done
+  # i2c
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c"
+  cp drivers/media/i2c/*.h  "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
+  for i in cx25840; do
+    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
+    cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
+  done
+
+  # add docbook makefile
+  install -D -m644 Documentation/DocBook/Makefile \
+    "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
+
+  # add dm headers
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
+  cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
+
+  # add inotify.h
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux"
+  cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/"
+
+  # add wireless headers
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
+  cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
+
+  # add dvb headers for external modules
+  # in reference to:
+  # http://bugs.archlinux.org/task/9912
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core"
+  cp drivers/media/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core/"
+  # and...
+  # http://bugs.archlinux.org/task/11194
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
+  cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
+
+  # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+  # in reference to:
+  # http://bugs.archlinux.org/task/13146
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
+  cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
+  cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
+
+  # add dvb headers
+  # in reference to:
+  # http://bugs.archlinux.org/task/20402
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb"
+  cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb/"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends"
+  cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners"
+  cp drivers/media/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners/"
+
+  # add xfs and shmem for aufs building
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm"
+  cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h"
+
+  # copy in Kconfig files
+  for i in `find . -name "Kconfig*"`; do
+    mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'`
+    cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}"
+  done
+
+  chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}"
+  find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \;
+
+  # strip scripts directory
+  find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
+    case "$(file -bi "${binary}")" in
+      *application/x-sharedlib*) # Libraries (.so)
+        /usr/bin/strip ${STRIP_SHARED} "${binary}";;
+      *application/x-archive*) # Libraries (.a)
+        /usr/bin/strip ${STRIP_STATIC} "${binary}";;
+      *application/x-executable*) # Binaries
+        /usr/bin/strip ${STRIP_BINARIES} "${binary}";;
+    esac
+  done
+
+  # remove unneeded architectures
+  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,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
+  if [ "$CARCH" = "mips64el" ]; then
+    rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86
+  else
+    rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/mips
+  fi
+}
+
+_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}}
+  }"
+done
+
+# vim:set ts=8 sts=2 sw=2 et:
diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD
index a59d29bdc..7e97bbf88 100644
--- a/kernels/linux-libre-knock/PKGBUILD
+++ b/kernels/linux-libre-knock/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202239 2013-12-20 19:15:03Z tpowa $
+# $Id: PKGBUILD 204729 2014-01-26 08:54:46Z thomas $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -10,11 +10,11 @@
 pkgbase=linux-libre-knock   # Build stock -LIBRE-KNOCK kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.12
-_sublevel=6
+_sublevel=9
 _knockpatchver=${_basekernel}.4
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -32,19 +32,31 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'criu-no-expert.patch'
+        'sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch'
+        'sunrpc-replace-gssd_running-with-more-reliable-check.patch'
+        'nfs-check-gssd-running-before-krb5i-auth.patch'
+        'rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch'
+        'sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch'
+        'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('254f59707b6676b59ce5ca5c3c698319'
-         '4b18ce60daff87504e6740670edf6b50'
+         '348975e36e4dd27f5d8fc50e92de8922'
          '387673a6510de1e1bce8188fc7a72bd1'
-         'a903586ecfeaca65fe2abfa9e74f0816'
-         '58ab468b3f407f1471725f939638c8bd'
+         '6eac169d20fd27b55815b0b2db4a473b'
+         'f341bc4685a40dc409b144b0f44bb137'
          '18d660832d681a27084774222fc74c1d'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '44260d2cb1a8b51c119d2ce1f83e457a'
          '98beb36f9b8cf16e58de2483ea9985e3'
          'd50c1ac47394e9aec637002ef3392bd1'
-         '71bbddd5f9799aa045660d92baa05845')
+         'd4a75f77e6bd5d700dcd534cd5f0dfce'
+         'dc86fdc37615c97f03c1e0c31b7b833a'
+         '88eef9d3b5012ef7e82af1af8cc4e517'
+         'cec0bb8981936eab2943b2009b7a6fff'
+         '88d9cddf9e0050a76ec4674f264fb2a1'
+         'cb9016630212ef07b168892fbcfd4e5d'
+         '0569e96c071703cc244f1ea7ee87d40a')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -70,6 +82,9 @@ prepare() {
   # fix issue on Hal8188EFWImg_CE.c deblobbed file
   sed -i "\|DEBLOBBED| s|,||" drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c
 
+  # add latest fixes from stable queue, if needed
+  # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
+
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
@@ -79,6 +94,17 @@ prepare() {
   # patch from fedora
   patch -Np1 -i "${srcdir}/criu-no-expert.patch"
 
+  # fix 15 seconds nfs delay
+  patch -Np1 -i "${srcdir}/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch"
+  patch -Np1 -i "${srcdir}/sunrpc-replace-gssd_running-with-more-reliable-check.patch"
+  patch -Np1 -i "${srcdir}/nfs-check-gssd-running-before-krb5i-auth.patch"
+  # fix nfs kernel oops
+  # #37866
+  patch -Np1 -i "${srcdir}/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch"
+  patch -Np1 -i "${srcdir}/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch"
+
+  patch -Np1 -i "${srcdir}/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch"
+
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-knock|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/kernels/linux-libre-knock/config.i686 b/kernels/linux-libre-knock/config.i686
deleted file mode 100644
index f3ec493fa..000000000
--- a/kernels/linux-libre-knock/config.i686
+++ /dev/null
@@ -1,6469 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.0-1 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-KNOCK"
-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_TCP_STEALTH=y
-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=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-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 is not set
-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_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
-# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
-CONFIG_LUSTRE_LLITE_LLOOP=y
-CONFIG_LNET=m
-CONFIG_LNET_MAX_PAYLOAD=1048576
-CONFIG_LNET_SELFTEST=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_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/kernels/linux-libre-knock/config.x86_64 b/kernels/linux-libre-knock/config.x86_64
deleted file mode 100644
index 666c9005a..000000000
--- a/kernels/linux-libre-knock/config.x86_64
+++ /dev/null
@@ -1,6270 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.1-3 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-KNOCK"
-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=y
-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_MEM_SOFT_DIRTY=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_TCP_STEALTH=y
-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=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-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 is not set
-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_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
-# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
-CONFIG_LUSTRE_LLITE_LLOOP=y
-CONFIG_LNET=m
-CONFIG_LNET_MAX_PAYLOAD=1048576
-CONFIG_LNET_SELFTEST=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_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/kernels/linux-libre-knock/criu-no-expert.patch b/kernels/linux-libre-knock/criu-no-expert.patch
deleted file mode 100644
index 2124427e9..000000000
--- a/kernels/linux-libre-knock/criu-no-expert.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/init/Kconfig b/init/Kconfig
-index be8b7f5..7461760 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP
- endif # CGROUPS
- 
- config CHECKPOINT_RESTORE
--	bool "Checkpoint/restore support" if EXPERT
-+	bool "Checkpoint/restore support"
- 	default n
- 	help
- 	  Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1000,7 +1000,7 @@ config CHECKPOINT_RESTORE
- 	  If unsure, say N here.
- 
- menuconfig NAMESPACES
--	bool "Namespaces support" if EXPERT
-+	bool "Namespaces support"
- 	default !EXPERT
- 	help
- 	  Provides the way to make tasks work with different objects using
diff --git a/kernels/linux-libre-knock/linux-libre-knock.install b/kernels/linux-libre-knock/linux-libre-knock.install
deleted file mode 100644
index bc0352203..000000000
--- a/kernels/linux-libre-knock/linux-libre-knock.install
+++ /dev/null
@@ -1,35 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-KERNEL_NAME=-knock
-KERNEL_VERSION=
-
-post_install () {
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  if command -v mkinitcpio 2>&1 > /dev/null; then
-    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-    mkinitcpio -p linux-libre${KERNEL_NAME}
-  fi
-}
-
-post_upgrade() {
-  if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
-    echo "WARNING: /boot appears to be a separate partition but is not mounted."
-  fi
-
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  if command -v mkinitcpio 2>&1 > /dev/null; then
-    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-    mkinitcpio -p linux-libre${KERNEL_NAME}
-  fi
-}
-
-post_remove() {
-  # also remove the compat symlinks
-  rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img
-  rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img
-}
diff --git a/kernels/linux-libre-knock/linux-libre-knock.preset b/kernels/linux-libre-knock/linux-libre-knock.preset
deleted file mode 100644
index 59fef2111..000000000
--- a/kernels/linux-libre-knock/linux-libre-knock.preset
+++ /dev/null
@@ -1,14 +0,0 @@
-# mkinitcpio preset file for the 'linux-libre-knock' package
-
-ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="/boot/vmlinuz-linux-libre-knock"
-
-PRESETS=('default' 'fallback')
-
-#default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-linux-libre-knock.img"
-#default_options=""
-
-#fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/initramfs-linux-libre-knock-fallback.img" 
-fallback_options="-S autodetect"
diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD
new file mode 100644
index 000000000..8d853e1a2
--- /dev/null
+++ b/kernels/linux-libre-lts-knock/PKGBUILD
@@ -0,0 +1,422 @@
+# $Id: PKGBUILD 204271 2014-01-16 08:13:43Z bpiotrowski $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer: Thomas Baechler <thomas@archlinux.org>
+# 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>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgbase=linux-libre-lts-knock # Build stock -LIBRE-LTS-KNOCK kernel
+#pkgbase=linux-libre-custom # Build kernel with a different name
+_basekernel=3.10
+_sublevel=27
+_knockpatchver=${_basekernel}
+pkgver=${_basekernel}.${_sublevel}
+pkgrel=1
+_lxopkgver=${_basekernel}.27 # nearly always the same as pkgver
+arch=('i686' 'x86_64' 'mips64el')
+url="http://linux-libre.fsfla.org/"
+license=('GPL2')
+makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
+options=('!strip')
+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"
+        "http://gnunet.org/sites/default/files/tcp_stealth_${_knockpatchver}.diff"
+        # the main kernel config files
+        'config.i686' 'config.x86_64'
+        # standard config files for mkinitcpio ramdisk
+        "${pkgbase}.preset"
+        'Kbuild'
+        'Kbuild.platforms'
+        'boot-logo.patch'
+        'change-default-console-loglevel.patch'
+        'criu-no-expert.patch'
+        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
+md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
+         '20d0ea2ae02745d7a525126a3b8a5ce7'
+         '26380d6f05471ef8e065a77d87588009'
+         'f22e0a6a7634902f5a00eb25ad677c65'
+         '6550ba0e23b7729cd9db2475bde8fac2'
+         '02023949955a138c44bb0c46227a6d18'
+         '2967cecc3af9f954ccc822fd63dca6ff'
+         '8267264d9a8966e57fdacd1fa1fc65c4'
+         '04b21c79df0a952c22d681dd4f4562df'
+         'f3def2cefdcbb954c21d8505d23cc83c'
+         'd50c1ac47394e9aec637002ef3392bd1'
+         '7e5b9d817f296a7e305f2262a00b9fb3')
+if [ "$CARCH" != "mips64el" ]; then
+    # don't use the Loongson-specific patches on non-mips64el arches.
+    unset source[${#source[@]}-1]
+    unset md5sums[${#md5sums[@]}-1]
+fi
+
+_kernelname=${pkgbase#linux-libre}
+_localversionname=-LIBRE-LTS-KNOCK
+
+prepare() {
+  cd "${srcdir}/linux-${_basekernel}"
+
+  if [ "${_basekernel}" != "${pkgver}" ]; then
+    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+  fi
+
+  # add knock patch
+  patch -p1 -i "${srcdir}/tcp_stealth_${_knockpatchver}.diff"
+
+  # add freedo as boot logo
+  patch -Np1 -i "${srcdir}/boot-logo.patch"
+
+  # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
+  # remove this when a Kconfig knob is made available by upstream
+  # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
+  patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
+
+  # allow criu without expert option set
+  # patch from fedora
+  patch -Np1 -i "${srcdir}/criu-no-expert.patch"
+ 
+  if [ "$CARCH" == "mips64el" ]; then
+    sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-lts-knock|" Makefile
+    sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
+        < "${srcdir}/lxo-config.patch" > lxo-config.patch
+    msg2 "Adding loongson-community patches"
+    patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch
+    patch -Np0 -i lxo-config.patch
+
+  # ensure N32, add localversion, remove uevent helper as per
+  # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
+  # and make USB storage support builtin (e.g. for booting from USB
+  # disks without slowly loading an initramfs)
+    sed -ri \
+        -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+        -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
+        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" \
+        -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \
+        ./.config
+  else
+    cat "${srcdir}/config.${CARCH}" > ./.config # simpler
+  fi
+
+  if [ "${_kernelname}" != "" ]; then
+    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" ./.config
+    sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
+  fi
+
+  # set extraversion to pkgrel
+  sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
+
+  # don't run depmod on 'make install'. We'll do this ourselves in packaging
+  sed -i '2iexit 0' scripts/depmod.sh
+}
+
+build() {
+  cd "${srcdir}/linux-${_basekernel}"
+
+  # get kernel version
+  make prepare
+
+  # load configuration
+  # Configure the kernel. Replace the line below with one of your choice.
+  #make menuconfig # CLI menu for configuration
+  #make nconfig # new CLI menu for configuration
+  #make xconfig # X-based configuration
+  #make oldconfig # using old config from previous kernel version
+  # ... or manually edit .config
+
+  # rewrite configuration
+  yes "" | make config >/dev/null
+
+  # save configuration for later reuse
+  if [ "${CARCH}" = "x86_64" ]; then
+    cat .config > "${startdir}/config.x86_64.last"
+  else
+    cat .config > "${startdir}/config.i686.last"
+  fi
+
+  ####################
+  # stop here
+  # this is useful to configure the kernel
+  #msg "Stopping build"; return 1
+  ####################
+
+  # build!
+  if [ "$CARCH" == "mips64el" ]; then
+    # The build system passes it directly to linker, disable to avoid
+    # having unknown -Wl,... options.
+    export LDFLAGS=""
+    # bzImage is arch-specific and not supported on mips; vmlinux is
+    # useful for oprofile.
+    make ${MAKEFLAGS} LOCALVERSION= vmlinux vmlinuz modules
+  else
+    make ${MAKEFLAGS} LOCALVERSION= bzImage modules
+  fi
+}
+
+_package() {
+  pkgdesc="The ${pkgbase^} kernel and modules - stable longtime supported kernel package suitable for servers with support for stealth TCP sockets"
+  [ "${pkgbase}" = "linux-libre" ] && groups=('base')
+  depends=('coreutils' 'linux-libre-firmware' 'kmod')
+  optdepends=('crda: to set the correct wireless channels of your country')
+  provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}")
+  conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
+  replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
+  backup=("etc/mkinitcpio.d/${pkgbase}.preset")
+  install=${pkgbase}.install
+  if [ "$CARCH" = "mips64el" ]; then
+      optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)')
+      conflicts+=('mkinitcpio<0.7')
+  else
+      depends+=('mkinitcpio>=0.7')
+  fi
+
+  cd "${srcdir}/linux-${_basekernel}"
+
+  KARCH=x86
+  [ $CARCH = "mips64el" ] && KARCH=mips
+
+  # get kernel version
+  _kernver="$(make LOCALVERSION= kernelrelease)"
+  _basekernel=${_kernver%%-*}
+  _basekernel=${_basekernel%.*}
+
+  mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
+  make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
+
+  if [ "$CARCH" == "mips64el" ]; then
+    cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgbase}"
+    cp vmlinux "${pkgdir}/boot/vmlinux-${pkgbase}"
+  else
+    cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgbase}"
+  fi
+
+  # add vmlinux
+  install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
+
+  # set correct depmod command for install
+  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
+  true && install=${install}.pkg
+  sed \
+    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
+    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
+    -i "${startdir}/${install}"
+
+  # install mkinitcpio preset file for kernel
+  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+  sed \
+    -e "1s|'linux*.*'|'${pkgbase}'|" \
+    -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
+    -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \
+    -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \
+    -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+
+  # mkinitcpio 0.7 relies on bzImage to find the kernel version
+  if [ "$CARCH" == "mips64el" ]; then
+    sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \
+        -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+  fi
+
+  # remove build and source links
+  rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
+  # remove the firmware
+  rm -rf "${pkgdir}/lib/firmware"
+  # gzip -9 all modules to save 100MB of space
+  find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+  # make room for external modules
+  ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-KNOCK}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  # add real version for building modules and running depmod from post_install/upgrade
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-KNOCK}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-KNOCK}/version"
+
+  # Now we call depmod...
+  depmod -b "$pkgdir" -F System.map "$_kernver"
+
+  # move module tree /lib -> /usr/lib
+  mv "$pkgdir/lib" "$pkgdir/usr"
+}
+
+_package-headers() {
+  pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
+  provides=("kernel26${_kernelname}-headers=${pkgver}" "linux${_kernelname}-headers=${pkgver}")
+  conflicts=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
+  replaces=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
+
+  KARCH=x86
+  [ $CARCH = "mips64el" ] && KARCH=mips
+
+  # in case of repackaging this is empty
+  if [ -z "${_kernver}" ]; then
+    cd "${srcdir}/linux-${_basekernel}"
+    _kernver="$(make LOCALVERSION= kernelrelease)"
+  fi
+
+  install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
+
+  cd "${pkgdir}/usr/lib/modules/${_kernver}"
+  ln -sf ../../../src/linux-${_kernver} build
+
+  cd "${srcdir}/linux-${_basekernel}"
+  install -D -m644 Makefile \
+    "${pkgdir}/usr/src/linux-${_kernver}/Makefile"
+  install -D -m644 kernel/Makefile \
+    "${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile"
+  install -D -m644 .config \
+    "${pkgdir}/usr/src/linux-${_kernver}/.config"
+
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
+
+  for i in acpi asm-generic config crypto drm generated keys linux math-emu \
+    media net pcmcia scsi sound trace uapi video xen; do
+    cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
+  done
+
+  # copy arch includes for external modules
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}"
+  cp -a "arch/${KARCH}/include" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+
+  # copy files necessary for later builds
+  cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
+  cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
+
+  if [ "$CARCH" = "mips64el" ]; then
+    cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+    cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+    cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/"
+  fi
+
+  # fix permissions on scripts dir
+  chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
+
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel"
+
+  cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+
+  if [ "${CARCH}" = "i686" ]; then
+    cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+  fi
+
+  cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
+
+  # add headers for lirc package
+  # pci
+  for i in bt8xx cx88 saa7134; do
+    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
+    cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
+  done
+  # usb
+  for i in cpia2 em28xx pwc sn9c102; do
+    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
+    cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
+  done
+  # i2c
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c"
+  cp drivers/media/i2c/*.h  "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
+  for i in cx25840; do
+    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
+    cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
+  done
+
+  # add docbook makefile
+  install -D -m644 Documentation/DocBook/Makefile \
+    "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
+
+  # add dm headers
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
+  cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
+
+  # add inotify.h
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux"
+  cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/"
+
+  # add wireless headers
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
+  cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
+
+  # add dvb headers for external modules
+  # in reference to:
+  # http://bugs.archlinux.org/task/9912
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core"
+  cp drivers/media/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core/"
+  # and...
+  # http://bugs.archlinux.org/task/11194
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
+  cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
+
+  # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+  # in reference to:
+  # http://bugs.archlinux.org/task/13146
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
+  cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
+  cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
+
+  # add dvb headers
+  # in reference to:
+  # http://bugs.archlinux.org/task/20402
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb"
+  cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb/"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends"
+  cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners"
+  cp drivers/media/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners/"
+
+  # add xfs and shmem for aufs building
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm"
+  cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h"
+
+  # copy in Kconfig files
+  for i in `find . -name "Kconfig*"`; do
+    mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'`
+    cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}"
+  done
+
+  chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}"
+  find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \;
+
+  # strip scripts directory
+  find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
+    case "$(file -bi "${binary}")" in
+      *application/x-sharedlib*) # Libraries (.so)
+        /usr/bin/strip ${STRIP_SHARED} "${binary}";;
+      *application/x-archive*) # Libraries (.a)
+        /usr/bin/strip ${STRIP_STATIC} "${binary}";;
+      *application/x-executable*) # Binaries
+        /usr/bin/strip ${STRIP_BINARIES} "${binary}";;
+    esac
+  done
+
+  # remove unneeded architectures
+  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,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
+  if [ "$CARCH" = "mips64el" ]; then
+    rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86
+  else
+    rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/mips
+  fi
+}
+
+_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}}
+  }"
+done
+
+# vim:set ts=8 sts=2 sw=2 et:
diff --git a/kernels/linux-libre-pae/3.12-btrfs-relocate-csums.patch b/kernels/linux-libre-pae/3.12-btrfs-relocate-csums.patch
deleted file mode 100644
index 7209276ef..000000000
--- a/kernels/linux-libre-pae/3.12-btrfs-relocate-csums.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 4577b014d1bc3db386da3246f625888fc48083a9 Mon Sep 17 00:00:00 2001
-From: Josef Bacik <jbacik@fusionio.com>
-Date: Fri, 27 Sep 2013 13:33:09 +0000
-Subject: Btrfs: relocate csums properly with prealloc extents
-
-A user reported a problem where they were getting csum errors when running a
-balance and running systemd's journal.  This is because systemd is awesome and
-fallocate()'s its log space and writes into it.  Unfortunately we assume that
-when we read in all the csums for an extent that they are sequential starting at
-the bytenr we care about.  This obviously isn't the case for prealloc extents,
-where we could have written to the middle of the prealloc extent only, which
-means the csum would be for the bytenr in the middle of our range and not the
-front of our range.  Fix this by offsetting the new bytenr we are logging to
-based on the original bytenr the csum was for.  With this patch I no longer see
-the csum errors I was seeing.  Thanks,
-
-Cc: stable@vger.kernel.org
-Reported-by: Chris Murphy <lists@colorremedies.com>
-Signed-off-by: Josef Bacik <jbacik@fusionio.com>
-Signed-off-by: Chris Mason <chris.mason@fusionio.com>
----
-diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
-index dec4f5a..0359eec 100644
---- a/fs/btrfs/relocation.c
-+++ b/fs/btrfs/relocation.c
-@@ -4472,6 +4472,7 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len)
- 	struct btrfs_root *root = BTRFS_I(inode)->root;
- 	int ret;
- 	u64 disk_bytenr;
-+	u64 new_bytenr;
- 	LIST_HEAD(list);
- 
- 	ordered = btrfs_lookup_ordered_extent(inode, file_pos);
-@@ -4483,13 +4484,24 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len)
- 	if (ret)
- 		goto out;
- 
--	disk_bytenr = ordered->start;
- 	while (!list_empty(&list)) {
- 		sums = list_entry(list.next, struct btrfs_ordered_sum, list);
- 		list_del_init(&sums->list);
- 
--		sums->bytenr = disk_bytenr;
--		disk_bytenr += sums->len;
-+		/*
-+		 * We need to offset the new_bytenr based on where the csum is.
-+		 * We need to do this because we will read in entire prealloc
-+		 * extents but we may have written to say the middle of the
-+		 * prealloc extent, so we need to make sure the csum goes with
-+		 * the right disk offset.
-+		 *
-+		 * We can do this because the data reloc inode refers strictly
-+		 * to the on disk bytes, so we don't have to worry about
-+		 * disk_len vs real len like with real inodes since it's all
-+		 * disk length.
-+		 */
-+		new_bytenr = ordered->start + (sums->bytenr - disk_bytenr);
-+		sums->bytenr = new_bytenr;
- 
- 		btrfs_add_ordered_sum(inode, ordered, sums);
- 	}
---
-cgit v0.9.2
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index 530f6d6dd..858b40cc1 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202239 2013-12-20 19:15:03Z tpowa $
+# $Id: PKGBUILD 204729 2014-01-26 08:54:46Z thomas $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -6,7 +6,7 @@
 pkgbase=linux-libre-pae     # Build stock -LIBRE-PAE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.12
-pkgver=${_basekernel}.6
+pkgver=${_basekernel}.9
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -21,14 +21,26 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         "${pkgbase}.preset"
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
-        'criu-no-expert.patch')
+        'criu-no-expert.patch'
+        'sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch'
+        'sunrpc-replace-gssd_running-with-more-reliable-check.patch'
+        'nfs-check-gssd-running-before-krb5i-auth.patch'
+        'rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch'
+        'sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch'
+        'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch')
 md5sums=('254f59707b6676b59ce5ca5c3c698319'
-         '4b18ce60daff87504e6740670edf6b50'
-         '0a663d07acafb493399e8a5706a4cb84'
+         '348975e36e4dd27f5d8fc50e92de8922'
+         '2c07956936879d8729ad68d997a79bbf'
          'f302c931bd85309da9d9792b4cc96467'
          '44260d2cb1a8b51c119d2ce1f83e457a'
          '98beb36f9b8cf16e58de2483ea9985e3'
-         'd50c1ac47394e9aec637002ef3392bd1')
+         'd50c1ac47394e9aec637002ef3392bd1'
+         'd4a75f77e6bd5d700dcd534cd5f0dfce'
+         'dc86fdc37615c97f03c1e0c31b7b833a'
+         '88eef9d3b5012ef7e82af1af8cc4e517'
+         'cec0bb8981936eab2943b2009b7a6fff'
+         '88d9cddf9e0050a76ec4674f264fb2a1'
+         'cb9016630212ef07b168892fbcfd4e5d')
 
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-PAE
@@ -46,6 +58,9 @@ prepare() {
   # fix issue on Hal8188EFWImg_CE.c deblobbed file
   sed -i "\|DEBLOBBED| s|,||" drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c
 
+  # add latest fixes from stable queue, if needed
+  # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
+
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
@@ -55,6 +70,17 @@ prepare() {
   # patch from fedora
   patch -Np1 -i "${srcdir}/criu-no-expert.patch"
 
+  # fix 15 seconds nfs delay
+  patch -Np1 -i "${srcdir}/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch"
+  patch -Np1 -i "${srcdir}/sunrpc-replace-gssd_running-with-more-reliable-check.patch"
+  patch -Np1 -i "${srcdir}/nfs-check-gssd-running-before-krb5i-auth.patch"
+  # fix nfs kernel oops
+  # #37866
+  patch -Np1 -i "${srcdir}/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch"
+  patch -Np1 -i "${srcdir}/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch"
+
+  patch -Np1 -i "${srcdir}/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch"
+
   cat "${srcdir}/config" > ./.config # simpler
 
   if [ "${_kernelname}" != "" ]; then
diff --git a/kernels/linux-libre-pae/boot-logo.patch b/kernels/linux-libre-pae/boot-logo.patch
deleted file mode 100644
index 3f4e0dea4..000000000
--- a/kernels/linux-libre-pae/boot-logo.patch
+++ /dev/null
@@ -1,23167 +0,0 @@
-diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
-index 3c14e43..c9d8373 100644
---- a/drivers/video/logo/logo_linux_clut224.ppm
-+++ b/drivers/video/logo/logo_linux_clut224.ppm
-@@ -1,1604 +1,861 @@
- P3
--# Standard 224-color Linux logo
--80 80
-+80 78
- 255
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  10  10  10  10  10  10
-- 10  10  10   6   6   6   6   6   6   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 22  22  22  26  26  26  30  30  30  34  34  34
-- 30  30  30  30  30  30  26  26  26  18  18  18
-- 14  14  14  10  10  10   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  26  26  26  42  42  42
-- 54  54  54  66  66  66  78  78  78  78  78  78
-- 78  78  78  74  74  74  66  66  66  54  54  54
-- 42  42  42  26  26  26  18  18  18  10  10  10
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 22  22  22  42  42  42  66  66  66  86  86  86
-- 66  66  66  38  38  38  38  38  38  22  22  22
-- 26  26  26  34  34  34  54  54  54  66  66  66
-- 86  86  86  70  70  70  46  46  46  26  26  26
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 50  50  50  82  82  82  58  58  58   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  54  54  54  86  86  86  66  66  66
-- 38  38  38  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 78  78  78  34  34  34   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6  70  70  70
-- 78  78  78  46  46  46  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  42  42  42  82  82  82
-- 26  26  26   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 46  46  46  34  34  34   6   6   6   2   2   6
-- 42  42  42  78  78  78  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  30  30  30  66  66  66  58  58  58
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 86  86  86 101 101 101  46  46  46  10  10  10
--  2   2   6  58  58  58  70  70  70  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  86  86  86  10  10  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  30  30  30
-- 94  94  94  94  94  94  58  58  58  26  26  26
--  2   2   6   6   6   6  78  78  78  54  54  54
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  62  62  62  62  62  62   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 54  54  54  38  38  38  18  18  18  10  10  10
--  2   2   6   2   2   6  34  34  34  82  82  82
-- 38  38  38  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 10  10  10   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  54  54  54
-- 66  66  66  26  26  26   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  82  82  82   2   2   6   2   2   6
--  2   2   6   6   6   6  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 14  14  14  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  18  18  18
-- 82  82  82  34  34  34  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
--  6   6   6   6   6   6  22  22  22  34  34  34
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  34  34  34
-- 10  10  10  50  50  50  22  22  22   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 86  86  86  42  42  42  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
-- 38  38  38 116 116 116  94  94  94  22  22  22
-- 22  22  22   2   2   6   2   2   6   2   2   6
-- 14  14  14  86  86  86 138 138 138 162 162 162
--154 154 154  38  38  38  26  26  26   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  14  14  14
--134 134 134 198 198 198 195 195 195 116 116 116
-- 10  10  10   2   2   6   2   2   6   6   6   6
--101  98  89 187 187 187 210 210 210 218 218 218
--214 214 214 134 134 134  14  14  14   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  50  50  50  18  18  18   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  54  54  54
--218 218 218 195 195 195 226 226 226 246 246 246
-- 58  58  58   2   2   6   2   2   6  30  30  30
--210 210 210 253 253 253 174 174 174 123 123 123
--221 221 221 234 234 234  74  74  74   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  82  82  82   2   2   6 106 106 106
--170 170 170  26  26  26  86  86  86 226 226 226
--123 123 123  10  10  10  14  14  14  46  46  46
--231 231 231 190 190 190   6   6   6  70  70  70
-- 90  90  90 238 238 238 158 158 158   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  86  86  86   6   6   6 116 116 116
--106 106 106   6   6   6  70  70  70 149 149 149
--128 128 128  18  18  18  38  38  38  54  54  54
--221 221 221 106 106 106   2   2   6  14  14  14
-- 46  46  46 190 190 190 198 198 198   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  94  94  94  14  14  14 101 101 101
--128 128 128   2   2   6  18  18  18 116 116 116
--118  98  46 121  92   8 121  92   8  98  78  10
--162 162 162 106 106 106   2   2   6   2   2   6
--  2   2   6 195 195 195 195 195 195   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   1
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  90  90  90  14  14  14  58  58  58
--210 210 210  26  26  26  54  38   6 154 114  10
--226 170  11 236 186  11 225 175  15 184 144  12
--215 174  15 175 146  61  37  26   9   2   2   6
-- 70  70  70 246 246 246 138 138 138   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  66  66  66  26  26  26   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14  10  10  10
--195 195 195 188 164 115 192 133   9 225 175  15
--239 182  13 234 190  10 232 195  16 232 200  30
--245 207  45 241 208  19 232 195  16 184 144  12
--218 194 134 211 206 186  42  42  42   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  74  74  74  30  30  30   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  86  86  86  14  14  14   2   2   6
--121  87  25 192 133   9 219 162  10 239 182  13
--236 186  11 232 195  16 241 208  19 244 214  54
--246 218  60 246 218  38 246 215  20 241 208  19
--241 208  19 226 184  13 121  87  25   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  82  82  82  34  34  34  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  82  82  82  30  30  30  61  42   6
--180 123   7 206 145  10 230 174  11 239 182  13
--234 190  10 238 202  15 241 208  19 246 218  74
--246 218  38 246 215  20 246 215  20 246 215  20
--226 184  13 215 174  15 184 144  12   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 26  26  26  94  94  94  42  42  42  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  50  50  50 104  69   6
--192 133   9 216 158  10 236 178  12 236 186  11
--232 195  16 241 208  19 244 214  54 245 215  43
--246 215  20 246 215  20 241 208  19 198 155  10
--200 144  11 216 158  10 156 118  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  90  90  90  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  46  46  46  22  22  22
--137  92   6 210 162  10 239 182  13 238 190  10
--238 202  15 241 208  19 246 215  20 246 215  20
--241 208  19 203 166  17 185 133  11 210 150  10
--216 158  10 210 150  10 102  78  10   2   2   6
--  6   6   6  54  54  54  14  14  14   2   2   6
--  2   2   6  62  62  62  74  74  74  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  78  78  78  50  50  50   6   6   6
-- 94  70  30 139 102  15 190 146  13 226 184  13
--232 200  30 232 195  16 215 174  15 190 146  13
--168 122  10 192 133   9 210 150  10 213 154  11
--202 150  34 182 157 106 101  98  89   2   2   6
--  2   2   6  78  78  78 116 116 116  58  58  58
--  2   2   6  22  22  22  90  90  90  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  50  50  50   6   6   6
--128 128 128 174 154 114 156 107  11 168 122  10
--198 155  10 184 144  12 197 138  11 200 144  11
--206 145  10 206 145  10 197 138  11 188 164 115
--195 195 195 198 198 198 174 174 174  14  14  14
--  2   2   6  22  22  22 116 116 116 116 116 116
-- 22  22  22   2   2   6  74  74  74  70  70  70
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 101 101 101  26  26  26  10  10  10
--138 138 138 190 190 190 174 154 114 156 107  11
--197 138  11 200 144  11 197 138  11 192 133   9
--180 123   7 190 142  34 190 178 144 187 187 187
--202 202 202 221 221 221 214 214 214  66  66  66
--  2   2   6   2   2   6  50  50  50  62  62  62
--  6   6   6   2   2   6  10  10  10  90  90  90
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  34  34  34
-- 74  74  74  74  74  74   2   2   6   6   6   6
--144 144 144 198 198 198 190 190 190 178 166 146
--154 121  60 156 107  11 156 107  11 168 124  44
--174 154 114 187 187 187 190 190 190 210 210 210
--246 246 246 253 253 253 253 253 253 182 182 182
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  62  62  62
-- 74  74  74  34  34  34  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  22  22  22  54  54  54
-- 94  94  94  18  18  18   2   2   6  46  46  46
--234 234 234 221 221 221 190 190 190 190 190 190
--190 190 190 187 187 187 187 187 187 190 190 190
--190 190 190 195 195 195 214 214 214 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
-- 82  82  82   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 86  86  86  54  54  54  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  46  46  46  90  90  90
-- 46  46  46  18  18  18   6   6   6 182 182 182
--253 253 253 246 246 246 206 206 206 190 190 190
--190 190 190 190 190 190 190 190 190 190 190 190
--206 206 206 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--202 202 202  14  14  14   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  86  86  86  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  38  38  38  74  74  74  66  66  66
--  2   2   6   6   6   6  90  90  90 250 250 250
--253 253 253 253 253 253 238 238 238 198 198 198
--190 190 190 190 190 190 195 195 195 221 221 221
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253  82  82  82   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  78  78  78  70  70  70  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  66  66  66  78  78  78   6   6   6
--  2   2   6  18  18  18 218 218 218 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--226 226 226 231 231 231 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 178 178 178   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  18  18  18  90  90  90  62  62  62
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 58  58  58  90  90  90  18  18  18   2   2   6
--  2   2   6 110 110 110 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231  18  18  18   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  94  94  94
-- 54  54  54  26  26  26  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 90  90  90  26  26  26   2   2   6   2   2   6
-- 14  14  14 195 195 195 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 242 242 242  54  54  54   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
-- 86  86  86  50  50  50  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  38  38  38  82  82  82
-- 34  34  34   2   2   6   2   2   6   2   2   6
-- 42  42  42 195 195 195 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 242 242 242 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 246 246 246 238 238 238
--226 226 226 231 231 231 101 101 101   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 38  38  38  82  82  82  42  42  42  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  62  62  62  66  66  66
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 70  70  70 170 170 170 206 206 206 234 234 234
--246 246 246 250 250 250 250 250 250 238 238 238
--226 226 226 231 231 231 238 238 238 250 250 250
--250 250 250 250 250 250 246 246 246 231 231 231
--214 214 214 206 206 206 202 202 202 202 202 202
--198 198 198 202 202 202 182 182 182  18  18  18
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  62  62  62  66  66  66  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  82  82  82  18  18  18
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 94  94  94 182 182 182 218 218 218 242 242 242
--250 250 250 253 253 253 253 253 253 250 250 250
--234 234 234 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--238 238 238 226 226 226 210 210 210 202 202 202
--195 195 195 195 195 195 210 210 210 158 158 158
--  6   6   6  14  14  14  50  50  50  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  86  86  86  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54  70  70  70   2   2   6
--  2   2   6  10  10  10   2   2   6  22  22  22
--166 166 166 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--231 231 231 206 206 206 198 198 198 226 226 226
-- 94  94  94   2   2   6   6   6   6  38  38  38
-- 30  30  30   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  62  62  62  66  66  66
-- 26  26  26  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74  50  50  50   2   2   6
-- 26  26  26  26  26  26   2   2   6 106 106 106
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246 218 218 218 202 202 202
--210 210 210  14  14  14   2   2   6   2   2   6
-- 30  30  30  22  22  22   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  86  86  86
-- 42  42  42  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  90  90  90  22  22  22   2   2   6
-- 42  42  42   2   2   6  18  18  18 218 218 218
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 221 221 221
--218 218 218 101 101 101   2   2   6  14  14  14
-- 18  18  18  38  38  38  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 58  58  58  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  82  82  82   2   2   6  26  26  26
-- 22  22  22   2   2   6 123 123 123 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--238 238 238 198 198 198   6   6   6  38  38  38
-- 58  58  58  26  26  26  38  38  38   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
-- 78  78  78  30  30  30  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  30  30  30
-- 74  74  74  58  58  58   2   2   6  42  42  42
--  2   2   6  22  22  22 231 231 231 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246  46  46  46  38  38  38
-- 42  42  42  14  14  14  38  38  38  14  14  14
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  42  42  42
-- 90  90  90  18  18  18  18  18  18  26  26  26
--  2   2   6 116 116 116 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253  94  94  94   6   6   6
--  2   2   6   2   2   6  10  10  10  34  34  34
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  26  26  26  66  66  66
-- 82  82  82   2   2   6  38  38  38   6   6   6
-- 14  14  14 210 210 210 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 246 246 246 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 144 144 144   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  74  74  74  30  30  30  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  42  42  42  90  90  90
-- 26  26  26   6   6   6  42  42  42   2   2   6
-- 74  74  74 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 242 242 242 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 182 182 182   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 10  10  10  86  86  86  38  38  38  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  66  66  66  82  82  82
--  2   2   6  22  22  22  18  18  18   2   2   6
--149 149 149 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  86  86  86  46  46  46  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  46  46  46  86  86  86  18  18  18
--  2   2   6  34  34  34  10  10  10   6   6   6
--210 210 210 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 221 221 221   6   6   6
--  2   2   6   2   2   6   6   6   6  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 26  26  26  66  66  66  62  62  62   2   2   6
--  2   2   6  38  38  38  10  10  10  26  26  26
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231   6   6   6
--  2   2   6   2   2   6  10  10  10  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  78  78  78   6   6   6   2   2   6
--  2   2   6  46  46  46  14  14  14  42  42  42
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  10  10  10
--  2   2   6   2   2   6  22  22  22  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50  74  74  74   2   2   6   2   2   6
-- 14  14  14  70  70  70  34  34  34  62  62  62
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  14  14  14
--  2   2   6   2   2   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  62  62  62   2   2   6   2   2   6
--  2   2   6  30  30  30  46  46  46  70  70  70
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 226 226 226  10  10  10
--  2   2   6   6   6   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58  62  62  62   2   2   6   2   2   6
--  2   2   6   2   2   6  30  30  30  78  78  78
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
-- 22  22  22  34  34  34  18  14   6  22  22  22
-- 26  26  26  18  18  18   6   6   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  26  26  26
-- 62  62  62 106 106 106  74  54  14 185 133  11
--210 162  10 121  92   8   6   6   6  62  62  62
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 158 158 158  18  18  18
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  6   6   6  18  18  18  66  66  66  38  38  38
--  6   6   6  94  94  94  50  50  50  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 10  10  10  10  10  10  18  18  18  38  38  38
-- 78  78  78 142 134 106 216 158  10 242 186  14
--246 190  14 246 190  14 156 118  10  10  10  10
-- 90  90  90 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 230 190
--238 204  91 238 204  91 181 142  44  37  26   9
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  38  38  38  46  46  46
-- 26  26  26 106 106 106  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  22  22  22
-- 30  30  30  38  38  38  50  50  50  70  70  70
--106 106 106 190 142  34 226 170  11 242 186  14
--246 190  14 246 190  14 246 190  14 154 114  10
--  6   6   6  74  74  74 226 226 226 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 228 184  62
--241 196  14 241 208  19 232 195  16  38  30  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  30  30  30  26  26  26
--203 166  17 154 142  90  66  66  66  26  26  26
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  38  38  38  58  58  58
-- 78  78  78  86  86  86 101 101 101 123 123 123
--175 146  61 210 150  10 234 174  13 246 186  14
--246 190  14 246 190  14 246 190  14 238 190  10
--102  78  10   2   2   6  46  46  46 198 198 198
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 224 178  62
--242 186  14 241 196  14 210 166  10  22  18   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6 121  92   8
--238 202  15 232 195  16  82  82  82  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  38  38  38  70  70  70 154 122  46
--190 142  34 200 144  11 197 138  11 197 138  11
--213 154  11 226 170  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--225 175  15  46  32   6   2   2   6  22  22  22
--158 158 158 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 242 242 242 224 178  62
--239 182  13 236 186  11 213 154  11  46  32   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 225 175  15
--238 190  10 236 186  11 112 100  78  42  42  42
-- 14  14  14   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54 154 122  46 213 154  11
--226 170  11 230 174  11 226 170  11 226 170  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 184 144  12  10  10  10   2   2   6
--  6   6   6 116 116 116 242 242 242 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231 198 198 198 214 170  54
--236 178  12 236 178  12 210 150  10 137  92   6
-- 18  14   6   2   2   6   2   2   6   2   2   6
--  6   6   6  70  47   6 200 144  11 236 178  12
--239 182  13 239 182  13 124 112  88  58  58  58
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  70  70  70 180 133  36 226 170  11
--239 182  13 242 186  14 242 186  14 246 186  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16  98  70   6   2   2   6
--  2   2   6   2   2   6  66  66  66 221 221 221
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 206 206 206 198 198 198 214 166  58
--230 174  11 230 174  11 216 158  10 192 133   9
--163 110   8 116  81   8 102  78  10 116  81   8
--167 114   7 197 138  11 226 170  11 239 182  13
--242 186  14 242 186  14 162 146  94  78  78  78
-- 34  34  34  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78 190 142  34 226 170  11
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 241 196  14 203 166  17  22  18   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--218 218 218 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 206 206 206 198 198 198 202 162  69
--226 170  11 236 178  12 224 166  10 210 150  10
--200 144  11 197 138  11 192 133   9 197 138  11
--210 150  10 226 170  11 242 186  14 246 190  14
--246 190  14 246 186  14 225 175  15 124 112  88
-- 62  62  62  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 174 135  50 224 166  10
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 139 102  15
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 78  78  78 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 214 214 214 198 198 198 190 150  46
--219 162  10 236 178  12 234 174  13 224 166  10
--216 158  10 213 154  11 213 154  11 216 158  10
--226 170  11 239 182  13 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 206 162  42
--101 101 101  58  58  58  30  30  30  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74 174 135  50 216 158  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 226 184  13
-- 61  42   6   2   2   6   2   2   6   2   2   6
-- 22  22  22 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 226 226 226 187 187 187 180 133  36
--216 158  10 236 178  12 239 182  13 236 178  12
--230 174  11 226 170  11 226 170  11 230 174  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 186  14 239 182  13
--206 162  42 106 106 106  66  66  66  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 213 154  11
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 241 196  14
--190 146  13  18  14   6   2   2   6   2   2   6
-- 46  46  46 246 246 246 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 221 221 221  86  86  86 156 107  11
--216 158  10 236 178  12 242 186  14 246 186  14
--242 186  14 239 182  13 239 182  13 242 186  14
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 225 175  15 142 122  72  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 210 150  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--232 195  16 121  92   8  34  34  34 106 106 106
--221 221 221 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--242 242 242  82  82  82  18  14   6 163 110   8
--216 158  10 236 178  12 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 163 133  67
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 163 133  67 210 150  10
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 215 174  15 190 178 144 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 218 218 218
-- 58  58  58   2   2   6  22  18   6 167 114   7
--216 158  10 236 178  12 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 186  14 242 186  14 190 150  46
-- 54  54  54  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 38  38  38  86  86  86 180 133  36 213 154  11
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16 190 146  13 214 214 214
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 170 170 170  26  26  26
--  2   2   6   2   2   6  37  26   9 163 110   8
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 224 166  10 142 122  72
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 109 106  95 192 133   9 224 166  10
--242 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 226 184  13 210 162  10 142 110  46
--226 226 226 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--198 198 198  66  66  66   2   2   6   2   2   6
--  2   2   6   2   2   6  50  34   6 156 107  11
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 242 186  14
--234 174  13 213 154  11 154 122  46  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58 154 121  60 206 145  10 234 174  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 210 162  10 163 110   8
-- 61  42   6 138 138 138 218 218 218 250 250 250
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 210 210 210 144 144 144  66  66  66
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 163 110   8
--216 158  10 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 239 182  13 230 174  11 216 158  10
--190 142  34 124 112  88  70  70  70  38  38  38
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 62  62  62 168 124  44 206 145  10 224 166  10
--236 178  12 239 182  13 242 186  14 242 186  14
--246 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 236 178  12 216 158  10 175 118   6
-- 80  54   7   2   2   6   6   6   6  30  30  30
-- 54  54  54  62  62  62  50  50  50  38  38  38
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 167 114   7
--213 154  11 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 242 186  14 239 182  13 239 182  13
--230 174  11 210 150  10 174 135  50 124 112  88
-- 82  82  82  54  54  54  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 158 118  36 192 133   9 200 144  11
--216 158  10 219 162  10 224 166  10 226 170  11
--230 174  11 236 178  12 239 182  13 239 182  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 230 174  11 210 150  10 163 110   8
--104  69   6  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  91  60   6 167 114   7
--206 145  10 230 174  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 186  14 242 186  14
--239 182  13 230 174  11 224 166  10 213 154  11
--180 133  36 124 112  88  86  86  86  58  58  58
-- 38  38  38  22  22  22  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  70  70  70 138 110  50 158 118  36
--167 114   7 180 123   7 192 133   9 197 138  11
--200 144  11 206 145  10 213 154  11 219 162  10
--224 166  10 230 174  11 239 182  13 242 186  14
--246 186  14 246 186  14 246 186  14 246 186  14
--239 182  13 216 158  10 185 133  11 152  99   6
--104  69   6  18  14   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 152  99   6
--192 133   9 219 162  10 236 178  12 239 182  13
--246 186  14 242 186  14 239 182  13 236 178  12
--224 166  10 206 145  10 192 133   9 154 121  60
-- 94  94  94  62  62  62  42  42  42  22  22  22
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  34  34  34  58  58  58  78  78  78
--101  98  89 124 112  88 142 110  46 156 107  11
--163 110   8 167 114   7 175 118   6 180 123   7
--185 133  11 197 138  11 210 150  10 219 162  10
--226 170  11 236 178  12 236 178  12 234 174  13
--219 162  10 197 138  11 163 110   8 130  83   6
-- 91  60   6  10  10  10   2   2   6   2   2   6
-- 18  18  18  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  26  26  26   2   2   6
--  2   2   6   6   6   6  70  47   6 137  92   6
--175 118   6 200 144  11 219 162  10 230 174  11
--234 174  13 230 174  11 219 162  10 210 150  10
--192 133   9 163 110   8 124 112  88  82  82  82
-- 50  50  50  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  22  22  22  34  34  34
-- 42  42  42  58  58  58  74  74  74  86  86  86
--101  98  89 122 102  70 130  98  46 121  87  25
--137  92   6 152  99   6 163 110   8 180 123   7
--185 133  11 197 138  11 206 145  10 200 144  11
--180 123   7 156 107  11 130  83   6 104  69   6
-- 50  34   6  54  54  54 110 110 110 101  98  89
-- 86  86  86  82  82  82  78  78  78  78  78  78
-- 78  78  78  78  78  78  78  78  78  78  78  78
-- 78  78  78  82  82  82  86  86  86  94  94  94
--106 106 106 101 101 101  86  66  34 124  80   6
--156 107  11 180 123   7 192 133   9 200 144  11
--206 145  10 200 144  11 192 133   9 175 118   6
--139 102  15 109 106  95  70  70  70  42  42  42
-- 22  22  22  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  10  10  10
-- 14  14  14  22  22  22  30  30  30  38  38  38
-- 50  50  50  62  62  62  74  74  74  90  90  90
--101  98  89 112 100  78 121  87  25 124  80   6
--137  92   6 152  99   6 152  99   6 152  99   6
--138  86   6 124  80   6  98  70   6  86  66  30
--101  98  89  82  82  82  58  58  58  46  46  46
-- 38  38  38  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  38  38  38  42  42  42
-- 54  54  54  82  82  82  94  86  76  91  60   6
--134  86   6 156 107  11 167 114   7 175 118   6
--175 118   6 167 114   7 152  99   6 121  87  25
--101  98  89  62  62  62  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6   6   6   6  10  10  10
-- 18  18  18  22  22  22  30  30  30  42  42  42
-- 50  50  50  66  66  66  86  86  86 101  98  89
--106  86  58  98  70   6 104  69   6 104  69   6
--104  69   6  91  60   6  82  62  34  90  90  90
-- 62  62  62  38  38  38  22  22  22  14  14  14
-- 10  10  10  10  10  10  10  10  10  10  10  10
-- 10  10  10  10  10  10   6   6   6  10  10  10
-- 10  10  10  10  10  10  10  10  10  14  14  14
-- 22  22  22  42  42  42  70  70  70  89  81  66
-- 80  54   7 104  69   6 124  80   6 137  92   6
--134  86   6 116  81   8 100  82  52  86  86  86
-- 58  58  58  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 18  18  18  26  26  26  38  38  38  54  54  54
-- 70  70  70  86  86  86  94  86  76  89  81  66
-- 89  81  66  86  86  86  74  74  74  50  50  50
-- 30  30  30  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  34  34  34  58  58  58
-- 82  82  82  89  81  66  89  81  66  89  81  66
-- 94  86  66  94  86  76  74  74  74  50  50  50
-- 26  26  26  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  14  14  14  18  18  18
-- 30  30  30  38  38  38  46  46  46  54  54  54
-- 50  50  50  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  26  26  26
-- 38  38  38  50  50  50  58  58  58  58  58  58
-- 54  54  54  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
--  6   6   6  10  10  10  14  14  14  18  18  18
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  18  18  18  22  22  22  22  22  22
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 23 30 36 44 54 65 57 72 88 44 54 65 6 12 15 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 31 41 52 
-+103 134 161 163 205 246 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 143 185 225 
-+82 108 129 8 14 16 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 17 24 30 126 162 196 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 161 203 243 92 119 140 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 44 54 65 154 195 235 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 138 174 208 21 27 33 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 70 96 117 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 157 198 239 49 59 70 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 3 6 52 62 74 170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 
-+82 108 129 149 191 231 170 212 252 170 212 252 170 212 252 129 165 199 82 108 129 149 191 231 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 37 48 59 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 21 13 4 31 23 12 0 2 0 0 2 0 105 75 32 155 111 43 23 15 7 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 6 9 3 10 13 146 188 228 170 212 252 170 212 252 170 212 252 157 198 239 0 6 9 
-+0 2 0 52 62 74 170 212 252 170 212 252 154 195 235 0 6 9 0 2 0 55 66 77 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 151 193 233 17 24 30 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+10 12 8 23 15 7 139 99 44 206 148 61 67 49 21 0 2 0 125 92 35 206 148 61 
-+15 9 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 96 127 154 170 212 252 170 212 252 170 212 252 170 212 252 92 119 140 21 22 20 
-+10 12 8 53 68 84 170 212 252 170 212 252 92 119 140 10 12 8 7 10 5 53 68 84 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 134 170 204 
-+0 6 9 0 3 6 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 21 22 20 
-+62 64 61 38 40 37 0 2 0 34 26 8 212 153 66 64 46 18 0 2 0 170 124 49 
-+180 132 57 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+18 22 24 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 65 87 102 115 117 114 
-+43 44 42 88 115 136 170 212 252 170 212 252 68 83 99 108 110 107 60 62 59 88 115 136 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+80 98 121 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 10 12 8 56 58 55 95 96 94 178 180 177 215 217 214 198 200 197 
-+158 160 156 138 140 137 82 83 81 0 2 0 64 46 18 228 167 73 23 15 7 41 31 10 
-+250 179 73 55 39 17 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+75 94 116 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 63 78 94 0 2 0 
-+0 2 0 126 162 196 170 212 252 170 212 252 57 72 88 0 2 0 0 2 0 126 162 196 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+157 198 239 8 14 16 0 6 9 0 2 0 45 47 44 195 197 194 192 194 191 38 40 37 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 192 194 191 234 236 233 176 178 175 118 120 117 143 145 142 176 178 175 
-+215 217 214 234 236 233 234 236 233 104 106 103 0 2 0 142 101 40 134 100 43 0 2 0 
-+164 119 51 170 124 49 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 115 152 185 8 14 16 
-+49 59 70 166 207 248 170 212 252 170 212 252 119 150 178 8 14 16 55 66 77 166 207 248 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 92 119 140 0 2 0 0 2 0 200 202 199 254 255 252 254 255 252 244 246 243 
-+40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 38 40 37 234 236 233 234 236 233 234 236 233 135 137 134 215 217 214 171 173 170 
-+141 142 139 138 140 137 138 140 137 135 137 134 31 32 30 3 6 2 212 153 66 15 9 7 
-+78 58 25 248 178 79 41 31 10 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 3 6 21 27 33 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 163 205 246 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 154 195 235 0 6 9 82 83 81 254 255 252 254 255 252 254 255 252 254 255 252 
-+188 190 187 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 62 64 61 234 236 233 234 236 233 234 236 233 198 200 197 131 133 130 198 200 197 
-+232 234 231 234 236 233 234 236 233 234 236 233 152 154 151 0 2 0 147 105 44 67 49 21 
-+23 15 7 250 179 73 158 114 46 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 61 76 92 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 154 195 235 103 134 161 80 98 121 
-+52 62 74 18 22 24 0 2 0 3 10 13 38 45 51 80 98 121 151 193 233 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 109 141 168 0 2 0 169 171 168 254 255 252 254 255 252 254 255 252 254 255 252 
-+226 228 225 65 66 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 43 44 42 234 236 233 234 236 233 234 236 233 234 236 233 131 133 130 192 194 191 
-+152 154 151 141 142 139 141 142 139 141 142 139 158 160 156 3 6 2 82 62 28 129 95 39 
-+0 2 0 206 148 61 248 178 79 21 13 4 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 96 115 138 
-+170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 18 22 24 0 2 0 0 2 0 
-+34 26 8 75 55 22 114 83 33 95 68 30 55 39 17 7 0 0 0 6 9 84 103 125 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 84 103 125 0 2 0 229 231 228 254 255 252 254 255 252 254 255 252 171 173 170 
-+0 2 0 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 18 20 17 234 236 233 234 236 233 234 236 233 234 236 233 138 140 137 178 180 177 
-+226 228 225 234 236 233 234 236 233 234 236 233 231 233 230 45 47 44 23 15 7 190 136 56 
-+0 2 0 147 105 44 250 179 73 64 46 18 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 126 162 196 0 2 0 26 20 13 190 136 56 245 175 76 
-+250 179 73 161 117 49 164 119 51 245 175 76 250 179 73 206 148 61 75 55 22 0 2 0 
-+126 162 196 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 68 83 99 0 2 0 252 254 250 254 255 252 254 255 252 254 255 252 71 73 70 
-+8 14 16 88 115 136 17 24 30 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 232 234 231 234 236 233 234 236 233 234 236 233 215 217 214 148 150 147 
-+183 185 181 141 142 139 135 137 134 135 137 134 141 142 139 87 89 86 0 2 0 202 145 58 
-+3 6 2 88 66 26 250 179 73 109 79 35 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 157 198 239 
-+170 212 252 170 212 252 166 207 248 26 33 39 26 20 13 224 163 69 250 179 73 250 179 73 
-+250 179 73 197 142 62 202 145 58 250 179 73 250 179 73 250 179 73 234 172 70 21 13 4 
-+38 45 51 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 52 62 74 21 22 20 254 255 252 254 255 252 254 255 252 254 255 252 21 22 20 
-+49 59 70 170 212 252 166 207 248 91 123 149 8 14 16 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 215 217 214 234 236 233 234 236 233 234 236 233 234 236 233 123 125 122 
-+188 190 187 229 231 228 234 236 233 234 236 233 222 224 221 118 120 117 0 2 0 168 123 54 
-+34 26 8 67 49 21 250 179 73 134 100 43 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 34 41 47 170 212 252 
-+170 212 252 170 212 252 85 112 133 0 2 0 164 119 51 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 129 95 39 
-+0 2 0 138 174 208 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 34 44 55 45 47 44 254 255 252 254 255 252 254 255 252 254 255 252 24 22 25 
-+52 62 74 170 212 252 170 212 252 170 212 252 138 174 208 10 16 18 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 178 180 177 234 236 233 234 236 233 234 236 233 234 236 233 141 142 139 
-+198 200 197 148 150 147 135 137 134 135 137 134 148 150 147 123 125 122 0 2 0 190 136 56 
-+21 13 4 78 58 25 250 179 73 129 95 39 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 82 108 129 170 212 252 
-+170 212 252 170 212 252 23 30 36 58 42 19 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 147 105 44 
-+0 2 0 139 181 221 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 34 41 47 45 47 44 254 255 252 254 255 252 254 255 252 254 255 252 56 58 55 
-+25 32 38 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 10 16 18 0 6 9 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 91 93 90 234 236 233 234 236 233 234 236 233 234 236 233 126 127 125 
-+169 171 168 222 224 221 234 236 233 229 231 228 178 180 177 71 73 70 0 2 0 212 153 66 
-+0 2 0 95 68 30 250 179 73 119 87 37 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 138 174 208 170 212 252 
-+170 212 252 154 195 235 0 2 0 125 92 35 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 119 87 37 
-+0 2 0 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 57 72 88 7 10 5 252 254 250 254 255 252 254 255 252 254 255 252 95 96 94 
-+0 6 9 166 207 248 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 8 14 16 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 7 10 5 222 224 221 234 236 233 234 236 233 234 236 233 141 142 139 
-+183 185 181 138 140 137 131 133 130 141 142 139 192 194 191 102 104 101 0 2 0 224 163 69 
-+0 2 0 105 75 32 250 179 73 55 39 17 7 0 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 21 27 33 170 212 252 170 212 252 
-+170 212 252 115 152 185 0 2 0 180 132 57 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 228 167 73 10 12 8 
-+38 45 51 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 82 108 129 0 2 0 222 224 221 254 255 252 254 255 252 254 255 252 158 160 156 
-+0 2 0 92 119 140 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 122 159 192 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 141 142 139 234 236 233 234 236 233 234 236 233 131 133 130 
-+185 187 183 231 233 230 222 224 221 158 160 156 138 140 137 48 50 48 3 6 2 250 179 73 
-+134 100 43 206 148 61 218 158 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 75 94 116 170 212 252 170 212 252 
-+170 212 252 92 119 140 0 2 0 224 163 69 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 87 61 23 7 0 0 
-+134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 109 141 168 0 2 0 178 180 177 254 255 252 254 255 252 254 255 252 252 254 250 
-+39 43 45 10 16 18 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+88 115 136 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 45 47 44 234 236 233 234 236 233 234 236 233 131 133 130 
-+148 150 147 138 140 137 148 150 147 210 212 209 152 154 151 26 27 25 29 21 8 250 179 73 
-+250 179 73 234 172 70 55 39 17 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 126 162 196 170 212 252 170 212 252 
-+170 212 252 103 134 161 0 2 0 202 145 58 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 238 175 73 75 55 22 0 2 0 75 102 123 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 140 177 211 0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 
-+183 185 181 0 2 0 75 94 116 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 57 72 88 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 162 164 161 234 236 233 234 236 233 135 137 134 
-+226 228 225 198 200 197 104 106 103 15 17 14 0 2 0 15 9 7 147 105 44 250 179 73 
-+248 178 79 55 39 17 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 21 27 33 170 212 252 170 212 252 170 212 252 
-+170 212 252 122 159 192 0 2 0 175 129 54 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 202 145 58 55 39 17 0 2 0 82 108 129 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 12 17 20 60 62 59 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 69 71 68 0 6 9 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 159 201 241 26 33 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 7 10 5 162 164 161 215 217 214 95 96 94 
-+56 58 55 0 2 0 0 2 0 0 2 0 61 44 16 238 175 73 250 179 73 250 179 73 
-+218 158 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 88 115 136 170 212 252 170 212 252 170 212 252 
-+170 212 252 143 185 225 0 2 0 147 105 44 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 212 153 66 95 68 30 0 2 0 8 14 16 103 134 161 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 68 83 99 0 2 0 231 233 230 254 255 252 254 255 252 254 255 252 
-+254 255 252 210 212 209 0 6 9 53 68 84 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 126 162 196 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 23 15 7 250 179 73 250 179 73 250 179 73 
-+250 179 73 29 21 8 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 166 207 248 0 2 0 52 36 13 158 114 46 180 132 57 161 117 49 119 87 37 
-+41 31 10 0 2 0 0 2 0 72 87 103 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 115 152 185 0 2 0 152 154 151 254 255 252 238 241 237 85 87 84 
-+229 231 228 254 255 252 99 101 98 0 2 0 126 162 196 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 63 78 94 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 202 145 58 250 179 73 250 179 73 
-+250 179 73 105 75 32 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 32 39 45 0 2 0 57 72 88 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 85 112 133 12 17 20 0 2 0 0 2 0 0 2 0 0 2 0 
-+34 41 47 92 110 133 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 166 207 248 6 12 15 71 73 70 254 255 252 229 231 228 0 2 0 
-+141 142 139 254 255 252 231 233 230 10 12 8 34 44 55 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 154 195 235 6 12 15 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 125 92 35 250 179 73 250 179 73 
-+250 179 73 180 132 57 0 2 0 0 2 0 0 2 0 0 2 0 3 10 13 68 83 99 
-+129 165 199 85 112 133 0 2 0 122 159 192 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 126 162 196 119 156 189 134 170 204 149 191 231 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 57 72 88 3 6 2 242 244 240 254 255 252 35 37 34 
-+78 80 77 254 255 252 254 255 252 128 130 127 0 2 0 105 137 164 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 91 123 149 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 55 39 17 250 179 73 250 179 73 
-+250 179 73 245 175 76 7 10 5 0 2 0 44 54 65 103 134 161 161 203 243 170 212 252 
-+170 212 252 21 27 33 25 32 38 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 61 76 92 0 2 0 242 244 240 254 255 252 102 104 101 
-+10 12 8 231 233 230 254 255 252 244 246 243 26 27 25 21 27 33 159 201 241 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 32 39 45 0 6 9 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 218 158 64 250 179 73 
-+250 179 73 250 179 73 75 55 22 0 2 0 161 203 243 170 212 252 170 212 252 170 212 252 
-+115 147 174 0 2 0 91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 159 201 241 146 188 228 
-+140 177 211 134 170 204 146 188 228 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 17 24 30 62 64 61 254 255 252 254 255 252 215 217 214 
-+0 2 0 102 104 101 254 255 252 254 255 252 166 168 165 0 2 0 72 87 103 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 75 32 250 179 73 
-+250 179 73 250 179 73 150 108 46 0 2 0 113 145 172 170 212 252 170 212 252 170 212 252 
-+49 59 70 3 10 13 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 166 207 248 109 141 168 65 87 102 28 35 41 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 28 35 41 70 96 117 138 174 208 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 0 2 0 102 104 101 254 255 252 254 255 252 254 255 252 
-+102 104 101 0 2 0 192 194 191 254 255 252 254 255 252 78 80 77 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 34 44 55 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 61 76 92 154 195 235 0 6 9 29 21 8 250 179 73 
-+250 179 73 250 179 73 224 163 69 0 2 0 68 83 99 170 212 252 170 212 252 143 179 213 
-+0 2 0 72 87 103 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+161 203 243 96 115 138 17 24 30 0 2 0 0 2 0 45 47 44 102 104 101 123 125 122 
-+138 140 137 143 145 142 115 117 114 82 83 81 43 44 42 0 2 0 0 2 0 32 39 45 
-+126 162 196 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 0 2 0 85 87 84 254 255 252 254 255 252 254 255 252 
-+242 244 240 27 29 27 35 37 34 254 255 252 254 255 252 231 233 230 10 12 8 21 27 33 
-+159 201 241 170 212 252 170 212 252 170 212 252 170 212 252 163 205 246 0 6 9 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 44 54 65 170 212 252 170 212 252 34 44 55 0 2 0 82 62 28 
-+109 79 35 224 163 69 250 179 73 52 36 13 15 20 22 170 212 252 170 212 252 75 89 106 
-+0 2 0 143 179 213 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 134 170 204 
-+25 32 38 0 2 0 40 41 39 155 157 153 238 241 237 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 210 212 209 115 117 114 18 20 17 
-+0 2 0 68 83 99 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 52 62 74 7 10 5 234 236 233 254 255 252 254 255 252 
-+254 255 252 195 197 194 102 104 101 254 255 252 254 255 252 254 255 252 162 164 161 0 2 0 
-+72 87 103 170 212 252 170 212 252 170 212 252 170 212 252 119 156 189 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 115 147 174 170 212 252 91 123 149 0 2 0 0 2 0 6 12 15 
-+0 2 0 15 9 7 197 142 62 125 92 35 0 2 0 115 152 185 113 145 172 3 6 2 
-+41 51 62 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 113 145 172 0 6 9 
-+10 12 8 155 157 153 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 232 234 231 
-+87 89 86 0 2 0 32 39 45 154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 115 152 185 0 2 0 138 140 137 254 255 252 254 255 252 
-+254 255 252 254 255 252 249 251 248 254 255 252 254 255 252 254 255 252 254 255 252 65 66 64 
-+0 2 0 122 159 192 170 212 252 170 212 252 170 212 252 66 80 97 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 154 195 235 170 212 252 143 179 213 88 115 136 149 191 231 170 212 252 
-+126 162 196 3 6 2 64 46 18 202 145 58 0 2 0 0 2 0 0 2 0 0 2 0 
-+92 119 140 170 212 252 170 212 252 170 212 252 170 212 252 143 179 213 3 10 13 27 29 27 
-+215 217 214 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 155 157 153 0 2 0 32 39 45 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 23 30 36 27 29 27 249 251 248 254 255 252 
-+254 255 252 188 190 187 7 10 5 226 228 225 254 255 252 254 255 252 254 255 252 231 233 230 
-+7 10 5 21 27 33 159 201 241 170 212 252 103 134 161 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 119 156 189 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 55 66 77 11 4 3 250 179 73 24 17 10 0 2 0 0 2 0 0 2 0 
-+143 185 225 170 212 252 170 212 252 170 212 252 159 201 241 28 35 41 7 10 5 200 202 199 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 155 157 153 0 2 0 55 66 77 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 96 127 154 0 2 0 158 160 156 254 255 252 
-+254 255 252 192 194 191 0 2 0 176 178 175 254 255 252 254 255 252 254 255 252 254 255 252 
-+141 142 139 0 2 0 72 87 103 129 165 199 0 6 9 0 6 9 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 12 17 20 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 
-+138 174 208 17 24 30 29 21 8 250 179 73 101 72 28 0 2 0 0 2 0 32 39 45 
-+170 212 252 170 212 252 170 212 252 170 212 252 57 72 88 0 2 0 152 154 151 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 108 110 107 0 2 0 115 152 185 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 18 22 24 40 41 39 254 255 252 
-+254 255 252 232 234 231 0 2 0 148 150 147 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 10 12 8 0 2 0 8 14 16 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 41 51 62 61 76 92 34 44 55 3 10 13 
-+0 2 0 11 4 3 164 119 51 250 179 73 175 129 54 0 2 0 0 2 0 82 108 129 
-+170 212 252 170 212 252 170 212 252 98 129 156 0 2 0 95 96 94 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 238 241 237 18 20 17 25 32 38 166 207 248 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 85 112 133 0 2 0 188 190 187 
-+254 255 252 254 255 252 198 200 197 242 244 240 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 120 122 119 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 0 2 0 0 6 9 7 0 0 
-+31 23 12 202 145 58 250 179 73 250 179 73 238 175 73 0 2 0 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 28 35 41 31 32 30 244 246 243 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 152 154 151 0 2 0 85 112 133 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 0 2 0 148 150 147 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 222 224 221 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+7 0 0 234 172 70 250 179 73 250 179 73 250 179 73 34 26 8 0 2 0 149 191 231 
-+170 212 252 170 212 252 129 165 199 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 252 254 250 48 50 48 3 10 13 146 188 228 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 157 198 239 0 2 0 118 120 117 
-+254 255 252 254 255 252 254 255 252 169 171 168 231 233 230 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 170 124 49 250 179 73 250 179 73 250 179 73 48 33 15 6 12 15 170 212 252 
-+170 212 252 170 212 252 65 87 102 0 2 0 222 224 221 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 195 197 194 0 2 0 84 103 125 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 3 10 13 85 87 84 
-+254 255 252 254 255 252 234 236 233 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 99 101 98 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 95 68 30 250 179 73 250 179 73 250 179 73 34 26 8 34 44 55 170 212 252 
-+170 212 252 163 205 246 8 14 16 62 64 61 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 35 37 34 34 44 55 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 26 33 39 60 62 59 
-+254 255 252 254 255 252 238 241 237 0 2 0 108 110 107 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 158 160 156 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 23 15 7 248 178 79 250 179 73 245 175 76 0 2 0 63 78 94 170 212 252 
-+170 212 252 109 141 168 0 2 0 158 160 156 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 104 106 103 0 2 0 
-+154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 21 27 33 69 71 68 
-+254 255 252 254 255 252 244 246 243 0 2 0 91 93 90 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 215 217 214 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 197 142 62 250 179 73 212 153 66 0 2 0 92 110 133 170 212 252 
-+170 212 252 80 98 121 0 2 0 231 233 230 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 176 178 175 0 2 0 
-+105 137 164 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 8 14 16 87 89 86 
-+254 255 252 254 255 252 254 255 252 40 41 39 21 22 20 252 254 250 254 255 252 254 255 252 
-+254 255 252 254 255 252 252 254 250 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 125 92 35 250 179 73 170 124 49 0 2 0 113 145 172 170 212 252 
-+170 212 252 53 68 84 15 17 14 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 242 244 240 0 2 0 
-+63 78 94 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 0 2 0 104 106 103 
-+254 255 252 254 255 252 254 255 252 123 125 122 0 2 0 166 168 165 254 255 252 254 255 252 
-+254 255 252 254 255 252 234 236 233 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 7 0 0 52 36 13 250 179 73 129 95 39 0 2 0 143 179 213 170 212 252 
-+170 212 252 32 39 45 48 50 48 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 60 62 59 
-+18 22 24 170 212 252 170 212 252 170 212 252 170 212 252 163 205 246 0 2 0 102 104 101 
-+254 255 252 254 255 252 254 255 252 226 228 225 15 17 14 10 12 8 215 217 214 254 255 252 
-+254 255 252 254 255 252 210 212 209 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 88 66 26 29 21 8 0 2 0 166 207 248 170 212 252 
-+170 212 252 3 10 13 85 87 84 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 123 125 122 
-+0 2 0 149 191 231 170 212 252 170 212 252 170 212 252 170 212 252 21 27 33 56 58 55 
-+254 255 252 254 255 252 254 255 252 254 255 252 178 180 177 0 2 0 38 40 37 238 241 237 
-+254 255 252 254 255 252 210 212 209 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 7 0 0 0 2 0 161 203 243 170 212 252 
-+149 191 231 0 2 0 123 125 122 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 141 142 139 
-+0 2 0 143 179 213 170 212 252 170 212 252 170 212 252 170 212 252 66 80 97 0 2 0 
-+210 212 209 254 255 252 254 255 252 254 255 252 254 255 252 120 122 119 0 2 0 21 22 20 
-+143 145 142 244 246 243 219 221 218 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 149 191 231 170 212 252 
-+129 165 199 0 2 0 158 160 156 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 155 157 153 
-+0 2 0 134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 143 185 225 0 6 9 
-+69 71 68 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 71 73 70 0 2 0 
-+0 2 0 0 2 0 40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 139 181 221 170 212 252 
-+129 165 199 0 2 0 162 164 161 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 169 171 168 
-+0 2 0 119 156 189 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 75 94 116 
-+0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 69 71 68 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 134 170 204 170 212 252 
-+134 170 204 0 2 0 152 154 151 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 183 185 181 
-+0 2 0 113 145 172 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 
-+44 54 65 0 2 0 162 164 161 254 255 252 254 255 252 254 255 252 35 37 34 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 126 162 196 170 212 252 
-+138 174 208 0 2 0 143 145 142 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 198 200 197 
-+0 2 0 103 134 161 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+157 198 239 28 35 41 0 2 0 188 190 187 254 255 252 252 254 250 3 6 2 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 115 152 185 170 212 252 
-+143 179 213 0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 210 212 209 
-+0 2 0 91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 146 188 228 0 6 9 26 27 25 242 244 240 176 178 175 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 137 164 170 212 252 
-+143 185 225 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 185 187 183 
-+0 2 0 105 137 164 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 163 205 246 0 2 0 0 2 0 102 104 101 60 62 59 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 80 98 121 170 212 252 
-+149 191 231 0 2 0 118 120 117 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 143 145 142 
-+0 2 0 134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 143 179 213 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 44 54 65 170 212 252 
-+170 212 252 3 10 13 85 87 84 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 108 110 107 
-+0 2 0 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 115 152 185 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 3 10 13 170 212 252 
-+170 212 252 34 44 55 43 44 42 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 69 71 68 
-+15 20 22 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 75 94 116 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 139 181 221 
-+170 212 252 63 78 94 3 6 2 249 251 248 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 31 32 30 
-+41 51 62 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+161 203 243 6 12 15 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 137 164 
-+170 212 252 88 115 136 0 2 0 210 212 209 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 249 251 248 0 2 0 
-+68 83 99 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+96 127 154 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 61 76 92 
-+170 212 252 119 150 178 0 2 0 169 171 168 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 183 185 181 0 2 0 
-+91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+28 35 41 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 
-+146 188 228 143 185 225 0 2 0 126 127 125 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 85 87 84 0 6 9 
-+154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 98 129 156 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+72 90 112 170 212 252 18 22 24 56 58 55 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 238 241 237 7 10 5 55 66 77 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 122 159 192 0 6 9 
-+0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 122 159 192 72 87 103 0 2 0 229 231 228 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 152 154 151 0 2 0 113 145 172 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 139 181 221 8 14 16 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 18 22 24 109 141 168 0 2 0 148 150 147 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 56 58 55 12 17 20 166 207 248 
-+170 212 252 170 212 252 170 212 252 170 212 252 146 188 228 23 30 36 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 101 72 28 202 145 58 
-+180 132 57 0 2 0 38 45 51 3 10 13 69 71 68 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 200 202 199 0 2 0 75 89 106 170 212 252 
-+170 212 252 170 212 252 170 212 252 109 141 168 8 14 16 0 2 0 21 13 4 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 7 0 0 0 2 0 101 72 28 218 158 64 250 179 73 250 179 73 
-+250 179 73 139 99 44 0 2 0 8 14 16 0 2 0 238 241 237 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 244 246 243 38 40 37 3 10 13 139 181 221 170 212 252 
-+170 212 252 161 203 243 66 80 97 0 2 0 31 23 12 191 142 60 248 183 74 180 132 57 
-+44 34 15 0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 23 15 7 190 136 56 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 150 108 46 0 2 0 0 2 0 82 83 81 222 224 221 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 102 104 101 0 2 0 98 129 156 170 212 252 163 205 246 
-+98 129 156 23 30 36 0 2 0 82 62 28 234 172 70 248 183 74 248 183 74 248 183 74 
-+248 183 74 158 114 46 29 21 8 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 64 46 18 109 79 35 150 108 46 224 163 69 250 179 73 
-+250 179 73 250 179 73 250 179 73 158 114 46 0 2 0 0 2 0 3 6 2 115 117 114 
-+234 236 233 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 176 178 175 0 2 0 57 72 88 146 188 228 80 98 121 8 14 16 
-+0 2 0 24 17 10 158 114 46 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 242 178 77 58 42 19 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 0 2 0 67 49 21 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 228 167 73 95 68 30 0 2 0 0 2 0 
-+0 2 0 52 54 51 108 110 107 162 164 161 219 221 218 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 252 254 250 
-+219 221 218 178 180 177 18 20 17 6 12 15 26 33 39 0 2 0 0 2 0 52 36 13 
-+164 119 51 242 178 77 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 242 178 77 
-+187 138 56 175 129 54 158 114 46 82 62 28 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 78 58 25 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 234 172 70 142 101 40 
-+44 34 15 10 12 8 0 2 0 0 2 0 0 2 0 18 20 17 60 62 59 71 73 70 
-+82 83 81 95 96 94 104 106 103 118 120 117 115 117 114 78 80 77 40 41 39 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 44 34 15 105 75 32 191 142 60 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 105 75 32 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 187 138 56 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 142 101 40 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 206 148 61 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 161 117 49 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 228 167 73 250 179 73 
-+238 175 73 190 136 56 158 114 46 234 172 70 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 147 105 44 0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 67 49 21 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 
-+31 23 12 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 10 5 21 13 4 
-+0 2 0 0 2 0 0 2 0 147 105 44 250 179 73 250 179 73 250 179 73 250 179 73 
-+134 100 43 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 155 111 43 248 183 74 248 183 74 
-+248 183 74 248 183 74 224 163 69 55 39 17 64 46 18 164 119 51 242 178 77 248 183 74 
-+75 55 22 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 202 145 58 250 179 73 250 179 73 228 167 73 88 66 26 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 168 123 54 248 183 74 
-+248 183 74 248 183 74 158 114 46 0 2 0 7 0 0 0 2 0 10 12 8 44 34 15 
-+15 9 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 29 21 8 250 179 73 250 179 73 158 114 46 15 14 3 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 175 129 54 
-+248 183 74 248 183 74 114 83 33 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 29 21 8 147 105 44 58 42 19 0 2 0 7 0 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+105 75 32 218 158 64 23 15 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-diff --git a/drivers/video/logo/logo_linux_mono.pbm b/drivers/video/logo/logo_linux_mono.pbm
-index 2f14d9f..3d3c358 100644
---- a/drivers/video/logo/logo_linux_mono.pbm
-+++ b/drivers/video/logo/logo_linux_mono.pbm
-@@ -1,203 +1,159 @@
--P1
--# Standard black and white Linux logo
--80 80
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 0 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1
--1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 0 0 1 1 1 1 1 1 0 0 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 0 0 0 1 1 1 1 0 0 0 0 0 0 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 1 1 0 0 1 1 1 0 0 1 1 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 1 1 1 0 1 1 1 1 0 0 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 0 1 1 1 0 1 1 1 1 0 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 1 1 0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 0 0 1 0 0 0 0 0 1 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 0 0 0 0 0 0 0 0 0 1 1 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 0 0 0 0 0 1 1 0 0 0 0 1 1
--1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 0 0 0 0 1 1 0 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 1 0 0 0 0 0 0 0 0 1 1 0 0 0 1
--1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1
--0 0 1 0 0 0 0 0 1 1 0 0 0 0 0 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0
--1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 0 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1
--0 0 0 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 0 1 1 1 1 1 1 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 0
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1
--1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 0 1 1 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 0 0 0 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 1 0 0 0 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 1 1 1 1 1 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 1 1 1 1 1 1 1 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 1 1 1 1 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
--1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1
--1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1
--1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--1 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0
--1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
--1 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 0 0 0 0 0 0 0 0 0 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-+P2
-+80  78
-+255 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 255 255 255 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 255 255 255 255 255 0 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 
-+255 0 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 
-+255 255 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 
-+255 255 0 0 0 0 0 0 0 0 
-+0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 
-+255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 255 255 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 0 255 255 0 0 255 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 255 255 255 0 0 255 
-+255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 0 255 255 255 0 255 
-+255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 0 255 255 255 0 0 
-+255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 
-+0 255 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 
-+0 255 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 
-+0 0 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 255 255 0 0 255 255 0 0 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 255 255 255 
-+255 0 0 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 255 0 0 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 
-+255 0 0 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 0 0 255 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 255 255 255 
-+255 255 0 0 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 255 255 255 255 0 255 255 255 
-+255 255 255 0 0 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 0 255 255 255 
-+255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 0 0 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 255 0 
-+0 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 255 255 
-+0 0 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 0 0 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-diff --git a/drivers/video/logo/logo_linux_vga16.ppm b/drivers/video/logo/logo_linux_vga16.ppm
-index 1850c15..f279f97 100644
---- a/drivers/video/logo/logo_linux_vga16.ppm
-+++ b/drivers/video/logo/logo_linux_vga16.ppm
-@@ -1,1604 +1,18724 @@
- P3
--# Standard 16-color Linux logo
--80 80
--255
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 170 170 170  85  85  85   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170 170 170 170 170 170
--170 170 170   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170 170 170 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170 170 170 170 255 255 255 255 255 255
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 255 255 255 170 170 170 170 170 170
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170   0   0   0   0   0   0 255 255 255
-- 85  85  85   0   0   0   0   0   0   0   0   0
--255 255 255 170 170 170   0   0   0  85  85  85
--170 170 170 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0 170 170 170
-- 85  85  85   0   0   0   0   0   0   0   0   0
--255 255 255  85  85  85   0   0   0   0   0   0
-- 85  85  85 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170   0   0   0   0   0   0 170 170 170
-- 85  85  85  85  85  85  85  85  85  85  85  85
--255 255 255  85  85  85   0   0   0   0   0   0
-- 85  85  85 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
-- 85  85  85 255 255 255   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--170 170 170 170 170 170 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170 170 170 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0 170  85   0  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
-- 85  85  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0  85  85  85   0   0   0
--  0   0   0  85  85  85 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
-- 85  85  85 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170 170 170 170 170 170 170 170 170   0   0   0
--  0   0   0   0   0   0 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170 170 170 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 170 170 170
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0 170 170 170
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0  85  85  85 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 170 170 170
--170 170 170 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 170 170 170 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170 170 170
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0 170 170 170
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0  85  85  85
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--  0   0   0  85  85  85 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0  85  85  85
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--  0   0   0 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0  85  85  85   0   0   0   0   0   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170  85  85  85 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85  85  85  85  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 170 170 170
-- 85  85  85   0   0   0   0   0   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170  85  85  85
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 170  85   0 170  85   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85  85  85  85  85  85  85 170  85   0
--170  85   0 170  85   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-+# CREATOR: GIMP PNM Filter Version 1.1
-+80 78
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
diff --git a/kernels/linux-libre-pae/change-default-console-loglevel.patch b/kernels/linux-libre-pae/change-default-console-loglevel.patch
deleted file mode 100644
index 22cd69a09..000000000
--- a/kernels/linux-libre-pae/change-default-console-loglevel.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
---- linux-3.0.orig/kernel/printk/printk.c	2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0/kernel/printk/printk.c	2011-07-27 14:43:07.000000000 +0300
-@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea
- 
- /* We show everything that is MORE important than this.. */
- #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
--#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
-+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */
- 
- DECLARE_WAIT_QUEUE_HEAD(log_wait);
- 
diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config
deleted file mode 100644
index 3f24889c6..000000000
--- a/kernels/linux-libre-pae/config
+++ /dev/null
@@ -1,6471 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.0-1 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-PAE"
-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 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 is not set
-CONFIG_HIGHMEM64G=y
-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=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-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 is not set
-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_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_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_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_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_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
-# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
-CONFIG_LUSTRE_LLITE_LLOOP=y
-CONFIG_LNET=m
-CONFIG_LNET_MAX_PAYLOAD=1048576
-CONFIG_LNET_SELFTEST=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_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/kernels/linux-libre-pae/criu-no-expert.patch b/kernels/linux-libre-pae/criu-no-expert.patch
deleted file mode 100644
index 2124427e9..000000000
--- a/kernels/linux-libre-pae/criu-no-expert.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/init/Kconfig b/init/Kconfig
-index be8b7f5..7461760 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP
- endif # CGROUPS
- 
- config CHECKPOINT_RESTORE
--	bool "Checkpoint/restore support" if EXPERT
-+	bool "Checkpoint/restore support"
- 	default n
- 	help
- 	  Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1000,7 +1000,7 @@ config CHECKPOINT_RESTORE
- 	  If unsure, say N here.
- 
- menuconfig NAMESPACES
--	bool "Namespaces support" if EXPERT
-+	bool "Namespaces support"
- 	default !EXPERT
- 	help
- 	  Provides the way to make tasks work with different objects using
diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install
deleted file mode 100644
index 079d1b7ab..000000000
--- a/kernels/linux-libre-pae/linux-libre-pae.install
+++ /dev/null
@@ -1,35 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-KERNEL_NAME=-pae
-KERNEL_VERSION=
-
-post_install () {
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  if command -v mkinitcpio 2>&1 > /dev/null; then
-    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-    mkinitcpio -p linux-libre${KERNEL_NAME}
-  fi
-}
-
-post_upgrade() {
-  if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
-    echo "WARNING: /boot appears to be a separate partition but is not mounted."
-  fi
-
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  if command -v mkinitcpio 2>&1 > /dev/null; then
-    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-    mkinitcpio -p linux-libre${KERNEL_NAME}
-  fi
-}
-
-post_remove() {
-  # also remove the compat symlinks
-  rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img
-  rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img
-}
diff --git a/kernels/linux-libre-pae/linux-libre-pae.preset b/kernels/linux-libre-pae/linux-libre-pae.preset
deleted file mode 100644
index 73f06b89c..000000000
--- a/kernels/linux-libre-pae/linux-libre-pae.preset
+++ /dev/null
@@ -1,14 +0,0 @@
-# mkinitcpio preset file for the 'linux-libre-pae' package
-
-ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="/boot/vmlinuz-linux-libre-pae"
-
-PRESETS=('default' 'fallback')
-
-#default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-linux-libre-pae.img"
-#default_options=""
-
-#fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/initramfs-linux-libre-pae-fallback.img" 
-fallback_options="-S autodetect"
diff --git a/kernels/linux-libre-rt/Kbuild b/kernels/linux-libre-rt/Kbuild
deleted file mode 100644
index 8a9d7dceb..000000000
--- a/kernels/linux-libre-rt/Kbuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Fail on warnings - also for files referenced in subdirs
-# -Werror can be disabled for specific files using:
-# CFLAGS_<file.o> := -Wno-error
-subdir-ccflags-y := -Wno-error
-
-# platform specific definitions
-include arch/mips/Kbuild.platforms
-obj-y := $(platform-y)
-
-# make clean traverses $(obj-) without having included .config, so
-# everything ends up here
-obj- := $(platform-)
-
-# mips object files
-# The object files are linked as core-y files would be linked
-
-obj-y += kernel/
-obj-y += mm/
-obj-y += math-emu/
diff --git a/kernels/linux-libre-rt/Kbuild.platforms b/kernels/linux-libre-rt/Kbuild.platforms
deleted file mode 100644
index 90a226888..000000000
--- a/kernels/linux-libre-rt/Kbuild.platforms
+++ /dev/null
@@ -1,6 +0,0 @@
-# All platforms listed in alphabetic order
-
-platforms += loongson
-
-# include the platform specific files
-include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms))
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index de65bc557..1e0b6dd5c 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -9,12 +9,12 @@
 pkgbase=linux-libre-rt      # Build stock -LIBRE-RT kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.12
-_releasever=6
-_rtpatchver=rt9
+_releasever=8
+_rtpatchver=rt11
 _pkgver=${_basekernel}.${_releasever}
 pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
 pkgrel=1
-_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -32,19 +32,31 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'criu-no-expert.patch'
+        'sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch'
+        'sunrpc-replace-gssd_running-with-more-reliable-check.patch'
+        'nfs-check-gssd-running-before-krb5i-auth.patch'
+        'rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch'
+        'sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch'
+        'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('254f59707b6676b59ce5ca5c3c698319'
-         '4b18ce60daff87504e6740670edf6b50'
-         'b6b66c250459a63664e23235153f587c'
-         '1f8c7bda0a089cfc717535c404342be1'
-         '0c3c36bfbdffff9262cb3aedff8f65be'
+         '392f920129940c4f83c7d204468213f3'
+         '4fcc03762fbc78465951b57ccd0b5a9b'
+         'e40789b1e59136235827a3b3bf40c121'
+         'bf542c4038d3e7d0da4c92bac0466198'
          '82496e68851d1960543a07ba51cdb44a'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '44260d2cb1a8b51c119d2ce1f83e457a'
          '98beb36f9b8cf16e58de2483ea9985e3'
          'd50c1ac47394e9aec637002ef3392bd1'
-         '71bbddd5f9799aa045660d92baa05845')
+         'd4a75f77e6bd5d700dcd534cd5f0dfce'
+         'dc86fdc37615c97f03c1e0c31b7b833a'
+         '88eef9d3b5012ef7e82af1af8cc4e517'
+         'cec0bb8981936eab2943b2009b7a6fff'
+         '88d9cddf9e0050a76ec4674f264fb2a1'
+         'cb9016630212ef07b168892fbcfd4e5d'
+         '0569e96c071703cc244f1ea7ee87d40a')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -70,6 +82,9 @@ prepare() {
   # fix issue on Hal8188EFWImg_CE.c deblobbed file
   sed -i "\|DEBLOBBED| s|,||" drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c
 
+  # add latest fixes from stable queue, if needed
+  # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
+
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
@@ -79,6 +94,17 @@ prepare() {
   # patch from fedora
   patch -Np1 -i "${srcdir}/criu-no-expert.patch"
 
+  # fix 15 seconds nfs delay
+  patch -Np1 -i "${srcdir}/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch"
+  patch -Np1 -i "${srcdir}/sunrpc-replace-gssd_running-with-more-reliable-check.patch"
+  patch -Np1 -i "${srcdir}/nfs-check-gssd-running-before-krb5i-auth.patch"
+  # fix nfs kernel oops
+  # #37866
+  patch -Np1 -i "${srcdir}/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch"
+  patch -Np1 -i "${srcdir}/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch"
+
+  patch -Np1 -i "${srcdir}/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch"
+
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-rt|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/kernels/linux-libre-rt/boot-logo.patch b/kernels/linux-libre-rt/boot-logo.patch
deleted file mode 100644
index 3f4e0dea4..000000000
--- a/kernels/linux-libre-rt/boot-logo.patch
+++ /dev/null
@@ -1,23167 +0,0 @@
-diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
-index 3c14e43..c9d8373 100644
---- a/drivers/video/logo/logo_linux_clut224.ppm
-+++ b/drivers/video/logo/logo_linux_clut224.ppm
-@@ -1,1604 +1,861 @@
- P3
--# Standard 224-color Linux logo
--80 80
-+80 78
- 255
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  10  10  10  10  10  10
-- 10  10  10   6   6   6   6   6   6   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 22  22  22  26  26  26  30  30  30  34  34  34
-- 30  30  30  30  30  30  26  26  26  18  18  18
-- 14  14  14  10  10  10   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  26  26  26  42  42  42
-- 54  54  54  66  66  66  78  78  78  78  78  78
-- 78  78  78  74  74  74  66  66  66  54  54  54
-- 42  42  42  26  26  26  18  18  18  10  10  10
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 22  22  22  42  42  42  66  66  66  86  86  86
-- 66  66  66  38  38  38  38  38  38  22  22  22
-- 26  26  26  34  34  34  54  54  54  66  66  66
-- 86  86  86  70  70  70  46  46  46  26  26  26
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 50  50  50  82  82  82  58  58  58   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  54  54  54  86  86  86  66  66  66
-- 38  38  38  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 78  78  78  34  34  34   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6  70  70  70
-- 78  78  78  46  46  46  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  42  42  42  82  82  82
-- 26  26  26   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 46  46  46  34  34  34   6   6   6   2   2   6
-- 42  42  42  78  78  78  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  30  30  30  66  66  66  58  58  58
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 86  86  86 101 101 101  46  46  46  10  10  10
--  2   2   6  58  58  58  70  70  70  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  86  86  86  10  10  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  30  30  30
-- 94  94  94  94  94  94  58  58  58  26  26  26
--  2   2   6   6   6   6  78  78  78  54  54  54
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  62  62  62  62  62  62   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 54  54  54  38  38  38  18  18  18  10  10  10
--  2   2   6   2   2   6  34  34  34  82  82  82
-- 38  38  38  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 10  10  10   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  54  54  54
-- 66  66  66  26  26  26   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  82  82  82   2   2   6   2   2   6
--  2   2   6   6   6   6  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 14  14  14  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  18  18  18
-- 82  82  82  34  34  34  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
--  6   6   6   6   6   6  22  22  22  34  34  34
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  34  34  34
-- 10  10  10  50  50  50  22  22  22   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 86  86  86  42  42  42  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
-- 38  38  38 116 116 116  94  94  94  22  22  22
-- 22  22  22   2   2   6   2   2   6   2   2   6
-- 14  14  14  86  86  86 138 138 138 162 162 162
--154 154 154  38  38  38  26  26  26   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  14  14  14
--134 134 134 198 198 198 195 195 195 116 116 116
-- 10  10  10   2   2   6   2   2   6   6   6   6
--101  98  89 187 187 187 210 210 210 218 218 218
--214 214 214 134 134 134  14  14  14   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  50  50  50  18  18  18   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  54  54  54
--218 218 218 195 195 195 226 226 226 246 246 246
-- 58  58  58   2   2   6   2   2   6  30  30  30
--210 210 210 253 253 253 174 174 174 123 123 123
--221 221 221 234 234 234  74  74  74   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  82  82  82   2   2   6 106 106 106
--170 170 170  26  26  26  86  86  86 226 226 226
--123 123 123  10  10  10  14  14  14  46  46  46
--231 231 231 190 190 190   6   6   6  70  70  70
-- 90  90  90 238 238 238 158 158 158   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  86  86  86   6   6   6 116 116 116
--106 106 106   6   6   6  70  70  70 149 149 149
--128 128 128  18  18  18  38  38  38  54  54  54
--221 221 221 106 106 106   2   2   6  14  14  14
-- 46  46  46 190 190 190 198 198 198   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  94  94  94  14  14  14 101 101 101
--128 128 128   2   2   6  18  18  18 116 116 116
--118  98  46 121  92   8 121  92   8  98  78  10
--162 162 162 106 106 106   2   2   6   2   2   6
--  2   2   6 195 195 195 195 195 195   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   1
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  90  90  90  14  14  14  58  58  58
--210 210 210  26  26  26  54  38   6 154 114  10
--226 170  11 236 186  11 225 175  15 184 144  12
--215 174  15 175 146  61  37  26   9   2   2   6
-- 70  70  70 246 246 246 138 138 138   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  66  66  66  26  26  26   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14  10  10  10
--195 195 195 188 164 115 192 133   9 225 175  15
--239 182  13 234 190  10 232 195  16 232 200  30
--245 207  45 241 208  19 232 195  16 184 144  12
--218 194 134 211 206 186  42  42  42   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  74  74  74  30  30  30   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  86  86  86  14  14  14   2   2   6
--121  87  25 192 133   9 219 162  10 239 182  13
--236 186  11 232 195  16 241 208  19 244 214  54
--246 218  60 246 218  38 246 215  20 241 208  19
--241 208  19 226 184  13 121  87  25   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  82  82  82  34  34  34  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  82  82  82  30  30  30  61  42   6
--180 123   7 206 145  10 230 174  11 239 182  13
--234 190  10 238 202  15 241 208  19 246 218  74
--246 218  38 246 215  20 246 215  20 246 215  20
--226 184  13 215 174  15 184 144  12   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 26  26  26  94  94  94  42  42  42  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  50  50  50 104  69   6
--192 133   9 216 158  10 236 178  12 236 186  11
--232 195  16 241 208  19 244 214  54 245 215  43
--246 215  20 246 215  20 241 208  19 198 155  10
--200 144  11 216 158  10 156 118  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  90  90  90  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  46  46  46  22  22  22
--137  92   6 210 162  10 239 182  13 238 190  10
--238 202  15 241 208  19 246 215  20 246 215  20
--241 208  19 203 166  17 185 133  11 210 150  10
--216 158  10 210 150  10 102  78  10   2   2   6
--  6   6   6  54  54  54  14  14  14   2   2   6
--  2   2   6  62  62  62  74  74  74  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  78  78  78  50  50  50   6   6   6
-- 94  70  30 139 102  15 190 146  13 226 184  13
--232 200  30 232 195  16 215 174  15 190 146  13
--168 122  10 192 133   9 210 150  10 213 154  11
--202 150  34 182 157 106 101  98  89   2   2   6
--  2   2   6  78  78  78 116 116 116  58  58  58
--  2   2   6  22  22  22  90  90  90  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  50  50  50   6   6   6
--128 128 128 174 154 114 156 107  11 168 122  10
--198 155  10 184 144  12 197 138  11 200 144  11
--206 145  10 206 145  10 197 138  11 188 164 115
--195 195 195 198 198 198 174 174 174  14  14  14
--  2   2   6  22  22  22 116 116 116 116 116 116
-- 22  22  22   2   2   6  74  74  74  70  70  70
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 101 101 101  26  26  26  10  10  10
--138 138 138 190 190 190 174 154 114 156 107  11
--197 138  11 200 144  11 197 138  11 192 133   9
--180 123   7 190 142  34 190 178 144 187 187 187
--202 202 202 221 221 221 214 214 214  66  66  66
--  2   2   6   2   2   6  50  50  50  62  62  62
--  6   6   6   2   2   6  10  10  10  90  90  90
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  34  34  34
-- 74  74  74  74  74  74   2   2   6   6   6   6
--144 144 144 198 198 198 190 190 190 178 166 146
--154 121  60 156 107  11 156 107  11 168 124  44
--174 154 114 187 187 187 190 190 190 210 210 210
--246 246 246 253 253 253 253 253 253 182 182 182
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  62  62  62
-- 74  74  74  34  34  34  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  22  22  22  54  54  54
-- 94  94  94  18  18  18   2   2   6  46  46  46
--234 234 234 221 221 221 190 190 190 190 190 190
--190 190 190 187 187 187 187 187 187 190 190 190
--190 190 190 195 195 195 214 214 214 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
-- 82  82  82   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 86  86  86  54  54  54  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  46  46  46  90  90  90
-- 46  46  46  18  18  18   6   6   6 182 182 182
--253 253 253 246 246 246 206 206 206 190 190 190
--190 190 190 190 190 190 190 190 190 190 190 190
--206 206 206 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--202 202 202  14  14  14   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  86  86  86  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  38  38  38  74  74  74  66  66  66
--  2   2   6   6   6   6  90  90  90 250 250 250
--253 253 253 253 253 253 238 238 238 198 198 198
--190 190 190 190 190 190 195 195 195 221 221 221
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253  82  82  82   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  78  78  78  70  70  70  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  66  66  66  78  78  78   6   6   6
--  2   2   6  18  18  18 218 218 218 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--226 226 226 231 231 231 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 178 178 178   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  18  18  18  90  90  90  62  62  62
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 58  58  58  90  90  90  18  18  18   2   2   6
--  2   2   6 110 110 110 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231  18  18  18   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  94  94  94
-- 54  54  54  26  26  26  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 90  90  90  26  26  26   2   2   6   2   2   6
-- 14  14  14 195 195 195 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 242 242 242  54  54  54   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
-- 86  86  86  50  50  50  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  38  38  38  82  82  82
-- 34  34  34   2   2   6   2   2   6   2   2   6
-- 42  42  42 195 195 195 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 242 242 242 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 246 246 246 238 238 238
--226 226 226 231 231 231 101 101 101   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 38  38  38  82  82  82  42  42  42  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  62  62  62  66  66  66
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 70  70  70 170 170 170 206 206 206 234 234 234
--246 246 246 250 250 250 250 250 250 238 238 238
--226 226 226 231 231 231 238 238 238 250 250 250
--250 250 250 250 250 250 246 246 246 231 231 231
--214 214 214 206 206 206 202 202 202 202 202 202
--198 198 198 202 202 202 182 182 182  18  18  18
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  62  62  62  66  66  66  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  82  82  82  18  18  18
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 94  94  94 182 182 182 218 218 218 242 242 242
--250 250 250 253 253 253 253 253 253 250 250 250
--234 234 234 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--238 238 238 226 226 226 210 210 210 202 202 202
--195 195 195 195 195 195 210 210 210 158 158 158
--  6   6   6  14  14  14  50  50  50  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  86  86  86  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54  70  70  70   2   2   6
--  2   2   6  10  10  10   2   2   6  22  22  22
--166 166 166 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--231 231 231 206 206 206 198 198 198 226 226 226
-- 94  94  94   2   2   6   6   6   6  38  38  38
-- 30  30  30   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  62  62  62  66  66  66
-- 26  26  26  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74  50  50  50   2   2   6
-- 26  26  26  26  26  26   2   2   6 106 106 106
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246 218 218 218 202 202 202
--210 210 210  14  14  14   2   2   6   2   2   6
-- 30  30  30  22  22  22   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  86  86  86
-- 42  42  42  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  90  90  90  22  22  22   2   2   6
-- 42  42  42   2   2   6  18  18  18 218 218 218
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 221 221 221
--218 218 218 101 101 101   2   2   6  14  14  14
-- 18  18  18  38  38  38  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 58  58  58  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  82  82  82   2   2   6  26  26  26
-- 22  22  22   2   2   6 123 123 123 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--238 238 238 198 198 198   6   6   6  38  38  38
-- 58  58  58  26  26  26  38  38  38   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
-- 78  78  78  30  30  30  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  30  30  30
-- 74  74  74  58  58  58   2   2   6  42  42  42
--  2   2   6  22  22  22 231 231 231 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246  46  46  46  38  38  38
-- 42  42  42  14  14  14  38  38  38  14  14  14
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  42  42  42
-- 90  90  90  18  18  18  18  18  18  26  26  26
--  2   2   6 116 116 116 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253  94  94  94   6   6   6
--  2   2   6   2   2   6  10  10  10  34  34  34
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  26  26  26  66  66  66
-- 82  82  82   2   2   6  38  38  38   6   6   6
-- 14  14  14 210 210 210 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 246 246 246 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 144 144 144   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  74  74  74  30  30  30  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  42  42  42  90  90  90
-- 26  26  26   6   6   6  42  42  42   2   2   6
-- 74  74  74 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 242 242 242 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 182 182 182   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 10  10  10  86  86  86  38  38  38  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  66  66  66  82  82  82
--  2   2   6  22  22  22  18  18  18   2   2   6
--149 149 149 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  86  86  86  46  46  46  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  46  46  46  86  86  86  18  18  18
--  2   2   6  34  34  34  10  10  10   6   6   6
--210 210 210 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 221 221 221   6   6   6
--  2   2   6   2   2   6   6   6   6  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 26  26  26  66  66  66  62  62  62   2   2   6
--  2   2   6  38  38  38  10  10  10  26  26  26
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231   6   6   6
--  2   2   6   2   2   6  10  10  10  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  78  78  78   6   6   6   2   2   6
--  2   2   6  46  46  46  14  14  14  42  42  42
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  10  10  10
--  2   2   6   2   2   6  22  22  22  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50  74  74  74   2   2   6   2   2   6
-- 14  14  14  70  70  70  34  34  34  62  62  62
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  14  14  14
--  2   2   6   2   2   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  62  62  62   2   2   6   2   2   6
--  2   2   6  30  30  30  46  46  46  70  70  70
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 226 226 226  10  10  10
--  2   2   6   6   6   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58  62  62  62   2   2   6   2   2   6
--  2   2   6   2   2   6  30  30  30  78  78  78
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
-- 22  22  22  34  34  34  18  14   6  22  22  22
-- 26  26  26  18  18  18   6   6   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  26  26  26
-- 62  62  62 106 106 106  74  54  14 185 133  11
--210 162  10 121  92   8   6   6   6  62  62  62
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 158 158 158  18  18  18
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  6   6   6  18  18  18  66  66  66  38  38  38
--  6   6   6  94  94  94  50  50  50  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 10  10  10  10  10  10  18  18  18  38  38  38
-- 78  78  78 142 134 106 216 158  10 242 186  14
--246 190  14 246 190  14 156 118  10  10  10  10
-- 90  90  90 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 230 190
--238 204  91 238 204  91 181 142  44  37  26   9
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  38  38  38  46  46  46
-- 26  26  26 106 106 106  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  22  22  22
-- 30  30  30  38  38  38  50  50  50  70  70  70
--106 106 106 190 142  34 226 170  11 242 186  14
--246 190  14 246 190  14 246 190  14 154 114  10
--  6   6   6  74  74  74 226 226 226 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 228 184  62
--241 196  14 241 208  19 232 195  16  38  30  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  30  30  30  26  26  26
--203 166  17 154 142  90  66  66  66  26  26  26
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  38  38  38  58  58  58
-- 78  78  78  86  86  86 101 101 101 123 123 123
--175 146  61 210 150  10 234 174  13 246 186  14
--246 190  14 246 190  14 246 190  14 238 190  10
--102  78  10   2   2   6  46  46  46 198 198 198
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 224 178  62
--242 186  14 241 196  14 210 166  10  22  18   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6 121  92   8
--238 202  15 232 195  16  82  82  82  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  38  38  38  70  70  70 154 122  46
--190 142  34 200 144  11 197 138  11 197 138  11
--213 154  11 226 170  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--225 175  15  46  32   6   2   2   6  22  22  22
--158 158 158 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 242 242 242 224 178  62
--239 182  13 236 186  11 213 154  11  46  32   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 225 175  15
--238 190  10 236 186  11 112 100  78  42  42  42
-- 14  14  14   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54 154 122  46 213 154  11
--226 170  11 230 174  11 226 170  11 226 170  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 184 144  12  10  10  10   2   2   6
--  6   6   6 116 116 116 242 242 242 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231 198 198 198 214 170  54
--236 178  12 236 178  12 210 150  10 137  92   6
-- 18  14   6   2   2   6   2   2   6   2   2   6
--  6   6   6  70  47   6 200 144  11 236 178  12
--239 182  13 239 182  13 124 112  88  58  58  58
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  70  70  70 180 133  36 226 170  11
--239 182  13 242 186  14 242 186  14 246 186  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16  98  70   6   2   2   6
--  2   2   6   2   2   6  66  66  66 221 221 221
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 206 206 206 198 198 198 214 166  58
--230 174  11 230 174  11 216 158  10 192 133   9
--163 110   8 116  81   8 102  78  10 116  81   8
--167 114   7 197 138  11 226 170  11 239 182  13
--242 186  14 242 186  14 162 146  94  78  78  78
-- 34  34  34  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78 190 142  34 226 170  11
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 241 196  14 203 166  17  22  18   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--218 218 218 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 206 206 206 198 198 198 202 162  69
--226 170  11 236 178  12 224 166  10 210 150  10
--200 144  11 197 138  11 192 133   9 197 138  11
--210 150  10 226 170  11 242 186  14 246 190  14
--246 190  14 246 186  14 225 175  15 124 112  88
-- 62  62  62  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 174 135  50 224 166  10
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 139 102  15
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 78  78  78 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 214 214 214 198 198 198 190 150  46
--219 162  10 236 178  12 234 174  13 224 166  10
--216 158  10 213 154  11 213 154  11 216 158  10
--226 170  11 239 182  13 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 206 162  42
--101 101 101  58  58  58  30  30  30  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74 174 135  50 216 158  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 226 184  13
-- 61  42   6   2   2   6   2   2   6   2   2   6
-- 22  22  22 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 226 226 226 187 187 187 180 133  36
--216 158  10 236 178  12 239 182  13 236 178  12
--230 174  11 226 170  11 226 170  11 230 174  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 186  14 239 182  13
--206 162  42 106 106 106  66  66  66  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 213 154  11
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 241 196  14
--190 146  13  18  14   6   2   2   6   2   2   6
-- 46  46  46 246 246 246 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 221 221 221  86  86  86 156 107  11
--216 158  10 236 178  12 242 186  14 246 186  14
--242 186  14 239 182  13 239 182  13 242 186  14
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 225 175  15 142 122  72  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 210 150  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--232 195  16 121  92   8  34  34  34 106 106 106
--221 221 221 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--242 242 242  82  82  82  18  14   6 163 110   8
--216 158  10 236 178  12 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 163 133  67
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 163 133  67 210 150  10
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 215 174  15 190 178 144 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 218 218 218
-- 58  58  58   2   2   6  22  18   6 167 114   7
--216 158  10 236 178  12 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 186  14 242 186  14 190 150  46
-- 54  54  54  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 38  38  38  86  86  86 180 133  36 213 154  11
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16 190 146  13 214 214 214
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 170 170 170  26  26  26
--  2   2   6   2   2   6  37  26   9 163 110   8
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 224 166  10 142 122  72
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 109 106  95 192 133   9 224 166  10
--242 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 226 184  13 210 162  10 142 110  46
--226 226 226 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--198 198 198  66  66  66   2   2   6   2   2   6
--  2   2   6   2   2   6  50  34   6 156 107  11
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 242 186  14
--234 174  13 213 154  11 154 122  46  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58 154 121  60 206 145  10 234 174  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 210 162  10 163 110   8
-- 61  42   6 138 138 138 218 218 218 250 250 250
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 210 210 210 144 144 144  66  66  66
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 163 110   8
--216 158  10 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 239 182  13 230 174  11 216 158  10
--190 142  34 124 112  88  70  70  70  38  38  38
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 62  62  62 168 124  44 206 145  10 224 166  10
--236 178  12 239 182  13 242 186  14 242 186  14
--246 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 236 178  12 216 158  10 175 118   6
-- 80  54   7   2   2   6   6   6   6  30  30  30
-- 54  54  54  62  62  62  50  50  50  38  38  38
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 167 114   7
--213 154  11 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 242 186  14 239 182  13 239 182  13
--230 174  11 210 150  10 174 135  50 124 112  88
-- 82  82  82  54  54  54  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 158 118  36 192 133   9 200 144  11
--216 158  10 219 162  10 224 166  10 226 170  11
--230 174  11 236 178  12 239 182  13 239 182  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 230 174  11 210 150  10 163 110   8
--104  69   6  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  91  60   6 167 114   7
--206 145  10 230 174  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 186  14 242 186  14
--239 182  13 230 174  11 224 166  10 213 154  11
--180 133  36 124 112  88  86  86  86  58  58  58
-- 38  38  38  22  22  22  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  70  70  70 138 110  50 158 118  36
--167 114   7 180 123   7 192 133   9 197 138  11
--200 144  11 206 145  10 213 154  11 219 162  10
--224 166  10 230 174  11 239 182  13 242 186  14
--246 186  14 246 186  14 246 186  14 246 186  14
--239 182  13 216 158  10 185 133  11 152  99   6
--104  69   6  18  14   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 152  99   6
--192 133   9 219 162  10 236 178  12 239 182  13
--246 186  14 242 186  14 239 182  13 236 178  12
--224 166  10 206 145  10 192 133   9 154 121  60
-- 94  94  94  62  62  62  42  42  42  22  22  22
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  34  34  34  58  58  58  78  78  78
--101  98  89 124 112  88 142 110  46 156 107  11
--163 110   8 167 114   7 175 118   6 180 123   7
--185 133  11 197 138  11 210 150  10 219 162  10
--226 170  11 236 178  12 236 178  12 234 174  13
--219 162  10 197 138  11 163 110   8 130  83   6
-- 91  60   6  10  10  10   2   2   6   2   2   6
-- 18  18  18  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  26  26  26   2   2   6
--  2   2   6   6   6   6  70  47   6 137  92   6
--175 118   6 200 144  11 219 162  10 230 174  11
--234 174  13 230 174  11 219 162  10 210 150  10
--192 133   9 163 110   8 124 112  88  82  82  82
-- 50  50  50  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  22  22  22  34  34  34
-- 42  42  42  58  58  58  74  74  74  86  86  86
--101  98  89 122 102  70 130  98  46 121  87  25
--137  92   6 152  99   6 163 110   8 180 123   7
--185 133  11 197 138  11 206 145  10 200 144  11
--180 123   7 156 107  11 130  83   6 104  69   6
-- 50  34   6  54  54  54 110 110 110 101  98  89
-- 86  86  86  82  82  82  78  78  78  78  78  78
-- 78  78  78  78  78  78  78  78  78  78  78  78
-- 78  78  78  82  82  82  86  86  86  94  94  94
--106 106 106 101 101 101  86  66  34 124  80   6
--156 107  11 180 123   7 192 133   9 200 144  11
--206 145  10 200 144  11 192 133   9 175 118   6
--139 102  15 109 106  95  70  70  70  42  42  42
-- 22  22  22  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  10  10  10
-- 14  14  14  22  22  22  30  30  30  38  38  38
-- 50  50  50  62  62  62  74  74  74  90  90  90
--101  98  89 112 100  78 121  87  25 124  80   6
--137  92   6 152  99   6 152  99   6 152  99   6
--138  86   6 124  80   6  98  70   6  86  66  30
--101  98  89  82  82  82  58  58  58  46  46  46
-- 38  38  38  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  38  38  38  42  42  42
-- 54  54  54  82  82  82  94  86  76  91  60   6
--134  86   6 156 107  11 167 114   7 175 118   6
--175 118   6 167 114   7 152  99   6 121  87  25
--101  98  89  62  62  62  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6   6   6   6  10  10  10
-- 18  18  18  22  22  22  30  30  30  42  42  42
-- 50  50  50  66  66  66  86  86  86 101  98  89
--106  86  58  98  70   6 104  69   6 104  69   6
--104  69   6  91  60   6  82  62  34  90  90  90
-- 62  62  62  38  38  38  22  22  22  14  14  14
-- 10  10  10  10  10  10  10  10  10  10  10  10
-- 10  10  10  10  10  10   6   6   6  10  10  10
-- 10  10  10  10  10  10  10  10  10  14  14  14
-- 22  22  22  42  42  42  70  70  70  89  81  66
-- 80  54   7 104  69   6 124  80   6 137  92   6
--134  86   6 116  81   8 100  82  52  86  86  86
-- 58  58  58  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 18  18  18  26  26  26  38  38  38  54  54  54
-- 70  70  70  86  86  86  94  86  76  89  81  66
-- 89  81  66  86  86  86  74  74  74  50  50  50
-- 30  30  30  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  34  34  34  58  58  58
-- 82  82  82  89  81  66  89  81  66  89  81  66
-- 94  86  66  94  86  76  74  74  74  50  50  50
-- 26  26  26  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  14  14  14  18  18  18
-- 30  30  30  38  38  38  46  46  46  54  54  54
-- 50  50  50  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  26  26  26
-- 38  38  38  50  50  50  58  58  58  58  58  58
-- 54  54  54  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
--  6   6   6  10  10  10  14  14  14  18  18  18
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  18  18  18  22  22  22  22  22  22
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 23 30 36 44 54 65 57 72 88 44 54 65 6 12 15 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 31 41 52 
-+103 134 161 163 205 246 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 143 185 225 
-+82 108 129 8 14 16 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 17 24 30 126 162 196 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 161 203 243 92 119 140 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 44 54 65 154 195 235 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 138 174 208 21 27 33 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 70 96 117 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 157 198 239 49 59 70 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 3 6 52 62 74 170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 
-+82 108 129 149 191 231 170 212 252 170 212 252 170 212 252 129 165 199 82 108 129 149 191 231 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 37 48 59 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 21 13 4 31 23 12 0 2 0 0 2 0 105 75 32 155 111 43 23 15 7 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 6 9 3 10 13 146 188 228 170 212 252 170 212 252 170 212 252 157 198 239 0 6 9 
-+0 2 0 52 62 74 170 212 252 170 212 252 154 195 235 0 6 9 0 2 0 55 66 77 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 151 193 233 17 24 30 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+10 12 8 23 15 7 139 99 44 206 148 61 67 49 21 0 2 0 125 92 35 206 148 61 
-+15 9 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 96 127 154 170 212 252 170 212 252 170 212 252 170 212 252 92 119 140 21 22 20 
-+10 12 8 53 68 84 170 212 252 170 212 252 92 119 140 10 12 8 7 10 5 53 68 84 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 134 170 204 
-+0 6 9 0 3 6 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 21 22 20 
-+62 64 61 38 40 37 0 2 0 34 26 8 212 153 66 64 46 18 0 2 0 170 124 49 
-+180 132 57 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+18 22 24 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 65 87 102 115 117 114 
-+43 44 42 88 115 136 170 212 252 170 212 252 68 83 99 108 110 107 60 62 59 88 115 136 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+80 98 121 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 10 12 8 56 58 55 95 96 94 178 180 177 215 217 214 198 200 197 
-+158 160 156 138 140 137 82 83 81 0 2 0 64 46 18 228 167 73 23 15 7 41 31 10 
-+250 179 73 55 39 17 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+75 94 116 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 63 78 94 0 2 0 
-+0 2 0 126 162 196 170 212 252 170 212 252 57 72 88 0 2 0 0 2 0 126 162 196 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+157 198 239 8 14 16 0 6 9 0 2 0 45 47 44 195 197 194 192 194 191 38 40 37 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 192 194 191 234 236 233 176 178 175 118 120 117 143 145 142 176 178 175 
-+215 217 214 234 236 233 234 236 233 104 106 103 0 2 0 142 101 40 134 100 43 0 2 0 
-+164 119 51 170 124 49 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 115 152 185 8 14 16 
-+49 59 70 166 207 248 170 212 252 170 212 252 119 150 178 8 14 16 55 66 77 166 207 248 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 92 119 140 0 2 0 0 2 0 200 202 199 254 255 252 254 255 252 244 246 243 
-+40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 38 40 37 234 236 233 234 236 233 234 236 233 135 137 134 215 217 214 171 173 170 
-+141 142 139 138 140 137 138 140 137 135 137 134 31 32 30 3 6 2 212 153 66 15 9 7 
-+78 58 25 248 178 79 41 31 10 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 3 6 21 27 33 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 163 205 246 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 154 195 235 0 6 9 82 83 81 254 255 252 254 255 252 254 255 252 254 255 252 
-+188 190 187 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 62 64 61 234 236 233 234 236 233 234 236 233 198 200 197 131 133 130 198 200 197 
-+232 234 231 234 236 233 234 236 233 234 236 233 152 154 151 0 2 0 147 105 44 67 49 21 
-+23 15 7 250 179 73 158 114 46 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 61 76 92 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 154 195 235 103 134 161 80 98 121 
-+52 62 74 18 22 24 0 2 0 3 10 13 38 45 51 80 98 121 151 193 233 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 109 141 168 0 2 0 169 171 168 254 255 252 254 255 252 254 255 252 254 255 252 
-+226 228 225 65 66 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 43 44 42 234 236 233 234 236 233 234 236 233 234 236 233 131 133 130 192 194 191 
-+152 154 151 141 142 139 141 142 139 141 142 139 158 160 156 3 6 2 82 62 28 129 95 39 
-+0 2 0 206 148 61 248 178 79 21 13 4 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 96 115 138 
-+170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 18 22 24 0 2 0 0 2 0 
-+34 26 8 75 55 22 114 83 33 95 68 30 55 39 17 7 0 0 0 6 9 84 103 125 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 84 103 125 0 2 0 229 231 228 254 255 252 254 255 252 254 255 252 171 173 170 
-+0 2 0 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 18 20 17 234 236 233 234 236 233 234 236 233 234 236 233 138 140 137 178 180 177 
-+226 228 225 234 236 233 234 236 233 234 236 233 231 233 230 45 47 44 23 15 7 190 136 56 
-+0 2 0 147 105 44 250 179 73 64 46 18 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 126 162 196 0 2 0 26 20 13 190 136 56 245 175 76 
-+250 179 73 161 117 49 164 119 51 245 175 76 250 179 73 206 148 61 75 55 22 0 2 0 
-+126 162 196 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 68 83 99 0 2 0 252 254 250 254 255 252 254 255 252 254 255 252 71 73 70 
-+8 14 16 88 115 136 17 24 30 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 232 234 231 234 236 233 234 236 233 234 236 233 215 217 214 148 150 147 
-+183 185 181 141 142 139 135 137 134 135 137 134 141 142 139 87 89 86 0 2 0 202 145 58 
-+3 6 2 88 66 26 250 179 73 109 79 35 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 157 198 239 
-+170 212 252 170 212 252 166 207 248 26 33 39 26 20 13 224 163 69 250 179 73 250 179 73 
-+250 179 73 197 142 62 202 145 58 250 179 73 250 179 73 250 179 73 234 172 70 21 13 4 
-+38 45 51 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 52 62 74 21 22 20 254 255 252 254 255 252 254 255 252 254 255 252 21 22 20 
-+49 59 70 170 212 252 166 207 248 91 123 149 8 14 16 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 215 217 214 234 236 233 234 236 233 234 236 233 234 236 233 123 125 122 
-+188 190 187 229 231 228 234 236 233 234 236 233 222 224 221 118 120 117 0 2 0 168 123 54 
-+34 26 8 67 49 21 250 179 73 134 100 43 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 34 41 47 170 212 252 
-+170 212 252 170 212 252 85 112 133 0 2 0 164 119 51 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 129 95 39 
-+0 2 0 138 174 208 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 34 44 55 45 47 44 254 255 252 254 255 252 254 255 252 254 255 252 24 22 25 
-+52 62 74 170 212 252 170 212 252 170 212 252 138 174 208 10 16 18 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 178 180 177 234 236 233 234 236 233 234 236 233 234 236 233 141 142 139 
-+198 200 197 148 150 147 135 137 134 135 137 134 148 150 147 123 125 122 0 2 0 190 136 56 
-+21 13 4 78 58 25 250 179 73 129 95 39 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 82 108 129 170 212 252 
-+170 212 252 170 212 252 23 30 36 58 42 19 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 147 105 44 
-+0 2 0 139 181 221 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 34 41 47 45 47 44 254 255 252 254 255 252 254 255 252 254 255 252 56 58 55 
-+25 32 38 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 10 16 18 0 6 9 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 91 93 90 234 236 233 234 236 233 234 236 233 234 236 233 126 127 125 
-+169 171 168 222 224 221 234 236 233 229 231 228 178 180 177 71 73 70 0 2 0 212 153 66 
-+0 2 0 95 68 30 250 179 73 119 87 37 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 138 174 208 170 212 252 
-+170 212 252 154 195 235 0 2 0 125 92 35 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 119 87 37 
-+0 2 0 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 57 72 88 7 10 5 252 254 250 254 255 252 254 255 252 254 255 252 95 96 94 
-+0 6 9 166 207 248 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 8 14 16 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 7 10 5 222 224 221 234 236 233 234 236 233 234 236 233 141 142 139 
-+183 185 181 138 140 137 131 133 130 141 142 139 192 194 191 102 104 101 0 2 0 224 163 69 
-+0 2 0 105 75 32 250 179 73 55 39 17 7 0 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 21 27 33 170 212 252 170 212 252 
-+170 212 252 115 152 185 0 2 0 180 132 57 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 228 167 73 10 12 8 
-+38 45 51 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 82 108 129 0 2 0 222 224 221 254 255 252 254 255 252 254 255 252 158 160 156 
-+0 2 0 92 119 140 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 122 159 192 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 141 142 139 234 236 233 234 236 233 234 236 233 131 133 130 
-+185 187 183 231 233 230 222 224 221 158 160 156 138 140 137 48 50 48 3 6 2 250 179 73 
-+134 100 43 206 148 61 218 158 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 75 94 116 170 212 252 170 212 252 
-+170 212 252 92 119 140 0 2 0 224 163 69 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 87 61 23 7 0 0 
-+134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 109 141 168 0 2 0 178 180 177 254 255 252 254 255 252 254 255 252 252 254 250 
-+39 43 45 10 16 18 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+88 115 136 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 45 47 44 234 236 233 234 236 233 234 236 233 131 133 130 
-+148 150 147 138 140 137 148 150 147 210 212 209 152 154 151 26 27 25 29 21 8 250 179 73 
-+250 179 73 234 172 70 55 39 17 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 126 162 196 170 212 252 170 212 252 
-+170 212 252 103 134 161 0 2 0 202 145 58 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 238 175 73 75 55 22 0 2 0 75 102 123 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 140 177 211 0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 
-+183 185 181 0 2 0 75 94 116 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 57 72 88 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 162 164 161 234 236 233 234 236 233 135 137 134 
-+226 228 225 198 200 197 104 106 103 15 17 14 0 2 0 15 9 7 147 105 44 250 179 73 
-+248 178 79 55 39 17 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 21 27 33 170 212 252 170 212 252 170 212 252 
-+170 212 252 122 159 192 0 2 0 175 129 54 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 202 145 58 55 39 17 0 2 0 82 108 129 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 12 17 20 60 62 59 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 69 71 68 0 6 9 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 159 201 241 26 33 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 7 10 5 162 164 161 215 217 214 95 96 94 
-+56 58 55 0 2 0 0 2 0 0 2 0 61 44 16 238 175 73 250 179 73 250 179 73 
-+218 158 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 88 115 136 170 212 252 170 212 252 170 212 252 
-+170 212 252 143 185 225 0 2 0 147 105 44 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 212 153 66 95 68 30 0 2 0 8 14 16 103 134 161 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 68 83 99 0 2 0 231 233 230 254 255 252 254 255 252 254 255 252 
-+254 255 252 210 212 209 0 6 9 53 68 84 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 126 162 196 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 23 15 7 250 179 73 250 179 73 250 179 73 
-+250 179 73 29 21 8 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 166 207 248 0 2 0 52 36 13 158 114 46 180 132 57 161 117 49 119 87 37 
-+41 31 10 0 2 0 0 2 0 72 87 103 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 115 152 185 0 2 0 152 154 151 254 255 252 238 241 237 85 87 84 
-+229 231 228 254 255 252 99 101 98 0 2 0 126 162 196 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 63 78 94 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 202 145 58 250 179 73 250 179 73 
-+250 179 73 105 75 32 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 32 39 45 0 2 0 57 72 88 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 85 112 133 12 17 20 0 2 0 0 2 0 0 2 0 0 2 0 
-+34 41 47 92 110 133 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 166 207 248 6 12 15 71 73 70 254 255 252 229 231 228 0 2 0 
-+141 142 139 254 255 252 231 233 230 10 12 8 34 44 55 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 154 195 235 6 12 15 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 125 92 35 250 179 73 250 179 73 
-+250 179 73 180 132 57 0 2 0 0 2 0 0 2 0 0 2 0 3 10 13 68 83 99 
-+129 165 199 85 112 133 0 2 0 122 159 192 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 126 162 196 119 156 189 134 170 204 149 191 231 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 57 72 88 3 6 2 242 244 240 254 255 252 35 37 34 
-+78 80 77 254 255 252 254 255 252 128 130 127 0 2 0 105 137 164 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 91 123 149 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 55 39 17 250 179 73 250 179 73 
-+250 179 73 245 175 76 7 10 5 0 2 0 44 54 65 103 134 161 161 203 243 170 212 252 
-+170 212 252 21 27 33 25 32 38 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 61 76 92 0 2 0 242 244 240 254 255 252 102 104 101 
-+10 12 8 231 233 230 254 255 252 244 246 243 26 27 25 21 27 33 159 201 241 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 32 39 45 0 6 9 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 218 158 64 250 179 73 
-+250 179 73 250 179 73 75 55 22 0 2 0 161 203 243 170 212 252 170 212 252 170 212 252 
-+115 147 174 0 2 0 91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 159 201 241 146 188 228 
-+140 177 211 134 170 204 146 188 228 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 17 24 30 62 64 61 254 255 252 254 255 252 215 217 214 
-+0 2 0 102 104 101 254 255 252 254 255 252 166 168 165 0 2 0 72 87 103 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 75 32 250 179 73 
-+250 179 73 250 179 73 150 108 46 0 2 0 113 145 172 170 212 252 170 212 252 170 212 252 
-+49 59 70 3 10 13 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 166 207 248 109 141 168 65 87 102 28 35 41 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 28 35 41 70 96 117 138 174 208 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 0 2 0 102 104 101 254 255 252 254 255 252 254 255 252 
-+102 104 101 0 2 0 192 194 191 254 255 252 254 255 252 78 80 77 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 34 44 55 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 61 76 92 154 195 235 0 6 9 29 21 8 250 179 73 
-+250 179 73 250 179 73 224 163 69 0 2 0 68 83 99 170 212 252 170 212 252 143 179 213 
-+0 2 0 72 87 103 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+161 203 243 96 115 138 17 24 30 0 2 0 0 2 0 45 47 44 102 104 101 123 125 122 
-+138 140 137 143 145 142 115 117 114 82 83 81 43 44 42 0 2 0 0 2 0 32 39 45 
-+126 162 196 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 0 2 0 85 87 84 254 255 252 254 255 252 254 255 252 
-+242 244 240 27 29 27 35 37 34 254 255 252 254 255 252 231 233 230 10 12 8 21 27 33 
-+159 201 241 170 212 252 170 212 252 170 212 252 170 212 252 163 205 246 0 6 9 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 44 54 65 170 212 252 170 212 252 34 44 55 0 2 0 82 62 28 
-+109 79 35 224 163 69 250 179 73 52 36 13 15 20 22 170 212 252 170 212 252 75 89 106 
-+0 2 0 143 179 213 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 134 170 204 
-+25 32 38 0 2 0 40 41 39 155 157 153 238 241 237 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 210 212 209 115 117 114 18 20 17 
-+0 2 0 68 83 99 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 52 62 74 7 10 5 234 236 233 254 255 252 254 255 252 
-+254 255 252 195 197 194 102 104 101 254 255 252 254 255 252 254 255 252 162 164 161 0 2 0 
-+72 87 103 170 212 252 170 212 252 170 212 252 170 212 252 119 156 189 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 115 147 174 170 212 252 91 123 149 0 2 0 0 2 0 6 12 15 
-+0 2 0 15 9 7 197 142 62 125 92 35 0 2 0 115 152 185 113 145 172 3 6 2 
-+41 51 62 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 113 145 172 0 6 9 
-+10 12 8 155 157 153 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 232 234 231 
-+87 89 86 0 2 0 32 39 45 154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 115 152 185 0 2 0 138 140 137 254 255 252 254 255 252 
-+254 255 252 254 255 252 249 251 248 254 255 252 254 255 252 254 255 252 254 255 252 65 66 64 
-+0 2 0 122 159 192 170 212 252 170 212 252 170 212 252 66 80 97 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 154 195 235 170 212 252 143 179 213 88 115 136 149 191 231 170 212 252 
-+126 162 196 3 6 2 64 46 18 202 145 58 0 2 0 0 2 0 0 2 0 0 2 0 
-+92 119 140 170 212 252 170 212 252 170 212 252 170 212 252 143 179 213 3 10 13 27 29 27 
-+215 217 214 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 155 157 153 0 2 0 32 39 45 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 23 30 36 27 29 27 249 251 248 254 255 252 
-+254 255 252 188 190 187 7 10 5 226 228 225 254 255 252 254 255 252 254 255 252 231 233 230 
-+7 10 5 21 27 33 159 201 241 170 212 252 103 134 161 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 119 156 189 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 55 66 77 11 4 3 250 179 73 24 17 10 0 2 0 0 2 0 0 2 0 
-+143 185 225 170 212 252 170 212 252 170 212 252 159 201 241 28 35 41 7 10 5 200 202 199 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 155 157 153 0 2 0 55 66 77 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 96 127 154 0 2 0 158 160 156 254 255 252 
-+254 255 252 192 194 191 0 2 0 176 178 175 254 255 252 254 255 252 254 255 252 254 255 252 
-+141 142 139 0 2 0 72 87 103 129 165 199 0 6 9 0 6 9 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 12 17 20 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 
-+138 174 208 17 24 30 29 21 8 250 179 73 101 72 28 0 2 0 0 2 0 32 39 45 
-+170 212 252 170 212 252 170 212 252 170 212 252 57 72 88 0 2 0 152 154 151 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 108 110 107 0 2 0 115 152 185 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 18 22 24 40 41 39 254 255 252 
-+254 255 252 232 234 231 0 2 0 148 150 147 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 10 12 8 0 2 0 8 14 16 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 41 51 62 61 76 92 34 44 55 3 10 13 
-+0 2 0 11 4 3 164 119 51 250 179 73 175 129 54 0 2 0 0 2 0 82 108 129 
-+170 212 252 170 212 252 170 212 252 98 129 156 0 2 0 95 96 94 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 238 241 237 18 20 17 25 32 38 166 207 248 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 85 112 133 0 2 0 188 190 187 
-+254 255 252 254 255 252 198 200 197 242 244 240 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 120 122 119 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 0 2 0 0 6 9 7 0 0 
-+31 23 12 202 145 58 250 179 73 250 179 73 238 175 73 0 2 0 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 28 35 41 31 32 30 244 246 243 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 152 154 151 0 2 0 85 112 133 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 0 2 0 148 150 147 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 222 224 221 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+7 0 0 234 172 70 250 179 73 250 179 73 250 179 73 34 26 8 0 2 0 149 191 231 
-+170 212 252 170 212 252 129 165 199 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 252 254 250 48 50 48 3 10 13 146 188 228 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 157 198 239 0 2 0 118 120 117 
-+254 255 252 254 255 252 254 255 252 169 171 168 231 233 230 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 170 124 49 250 179 73 250 179 73 250 179 73 48 33 15 6 12 15 170 212 252 
-+170 212 252 170 212 252 65 87 102 0 2 0 222 224 221 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 195 197 194 0 2 0 84 103 125 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 3 10 13 85 87 84 
-+254 255 252 254 255 252 234 236 233 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 99 101 98 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 95 68 30 250 179 73 250 179 73 250 179 73 34 26 8 34 44 55 170 212 252 
-+170 212 252 163 205 246 8 14 16 62 64 61 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 35 37 34 34 44 55 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 26 33 39 60 62 59 
-+254 255 252 254 255 252 238 241 237 0 2 0 108 110 107 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 158 160 156 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 23 15 7 248 178 79 250 179 73 245 175 76 0 2 0 63 78 94 170 212 252 
-+170 212 252 109 141 168 0 2 0 158 160 156 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 104 106 103 0 2 0 
-+154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 21 27 33 69 71 68 
-+254 255 252 254 255 252 244 246 243 0 2 0 91 93 90 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 215 217 214 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 197 142 62 250 179 73 212 153 66 0 2 0 92 110 133 170 212 252 
-+170 212 252 80 98 121 0 2 0 231 233 230 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 176 178 175 0 2 0 
-+105 137 164 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 8 14 16 87 89 86 
-+254 255 252 254 255 252 254 255 252 40 41 39 21 22 20 252 254 250 254 255 252 254 255 252 
-+254 255 252 254 255 252 252 254 250 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 125 92 35 250 179 73 170 124 49 0 2 0 113 145 172 170 212 252 
-+170 212 252 53 68 84 15 17 14 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 242 244 240 0 2 0 
-+63 78 94 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 0 2 0 104 106 103 
-+254 255 252 254 255 252 254 255 252 123 125 122 0 2 0 166 168 165 254 255 252 254 255 252 
-+254 255 252 254 255 252 234 236 233 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 7 0 0 52 36 13 250 179 73 129 95 39 0 2 0 143 179 213 170 212 252 
-+170 212 252 32 39 45 48 50 48 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 60 62 59 
-+18 22 24 170 212 252 170 212 252 170 212 252 170 212 252 163 205 246 0 2 0 102 104 101 
-+254 255 252 254 255 252 254 255 252 226 228 225 15 17 14 10 12 8 215 217 214 254 255 252 
-+254 255 252 254 255 252 210 212 209 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 88 66 26 29 21 8 0 2 0 166 207 248 170 212 252 
-+170 212 252 3 10 13 85 87 84 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 123 125 122 
-+0 2 0 149 191 231 170 212 252 170 212 252 170 212 252 170 212 252 21 27 33 56 58 55 
-+254 255 252 254 255 252 254 255 252 254 255 252 178 180 177 0 2 0 38 40 37 238 241 237 
-+254 255 252 254 255 252 210 212 209 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 7 0 0 0 2 0 161 203 243 170 212 252 
-+149 191 231 0 2 0 123 125 122 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 141 142 139 
-+0 2 0 143 179 213 170 212 252 170 212 252 170 212 252 170 212 252 66 80 97 0 2 0 
-+210 212 209 254 255 252 254 255 252 254 255 252 254 255 252 120 122 119 0 2 0 21 22 20 
-+143 145 142 244 246 243 219 221 218 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 149 191 231 170 212 252 
-+129 165 199 0 2 0 158 160 156 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 155 157 153 
-+0 2 0 134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 143 185 225 0 6 9 
-+69 71 68 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 71 73 70 0 2 0 
-+0 2 0 0 2 0 40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 139 181 221 170 212 252 
-+129 165 199 0 2 0 162 164 161 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 169 171 168 
-+0 2 0 119 156 189 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 75 94 116 
-+0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 69 71 68 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 134 170 204 170 212 252 
-+134 170 204 0 2 0 152 154 151 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 183 185 181 
-+0 2 0 113 145 172 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 
-+44 54 65 0 2 0 162 164 161 254 255 252 254 255 252 254 255 252 35 37 34 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 126 162 196 170 212 252 
-+138 174 208 0 2 0 143 145 142 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 198 200 197 
-+0 2 0 103 134 161 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+157 198 239 28 35 41 0 2 0 188 190 187 254 255 252 252 254 250 3 6 2 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 115 152 185 170 212 252 
-+143 179 213 0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 210 212 209 
-+0 2 0 91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 146 188 228 0 6 9 26 27 25 242 244 240 176 178 175 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 137 164 170 212 252 
-+143 185 225 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 185 187 183 
-+0 2 0 105 137 164 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 163 205 246 0 2 0 0 2 0 102 104 101 60 62 59 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 80 98 121 170 212 252 
-+149 191 231 0 2 0 118 120 117 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 143 145 142 
-+0 2 0 134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 143 179 213 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 44 54 65 170 212 252 
-+170 212 252 3 10 13 85 87 84 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 108 110 107 
-+0 2 0 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 115 152 185 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 3 10 13 170 212 252 
-+170 212 252 34 44 55 43 44 42 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 69 71 68 
-+15 20 22 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 75 94 116 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 139 181 221 
-+170 212 252 63 78 94 3 6 2 249 251 248 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 31 32 30 
-+41 51 62 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+161 203 243 6 12 15 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 137 164 
-+170 212 252 88 115 136 0 2 0 210 212 209 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 249 251 248 0 2 0 
-+68 83 99 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+96 127 154 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 61 76 92 
-+170 212 252 119 150 178 0 2 0 169 171 168 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 183 185 181 0 2 0 
-+91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+28 35 41 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 
-+146 188 228 143 185 225 0 2 0 126 127 125 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 85 87 84 0 6 9 
-+154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 98 129 156 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+72 90 112 170 212 252 18 22 24 56 58 55 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 238 241 237 7 10 5 55 66 77 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 122 159 192 0 6 9 
-+0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 122 159 192 72 87 103 0 2 0 229 231 228 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 152 154 151 0 2 0 113 145 172 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 139 181 221 8 14 16 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 18 22 24 109 141 168 0 2 0 148 150 147 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 56 58 55 12 17 20 166 207 248 
-+170 212 252 170 212 252 170 212 252 170 212 252 146 188 228 23 30 36 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 101 72 28 202 145 58 
-+180 132 57 0 2 0 38 45 51 3 10 13 69 71 68 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 200 202 199 0 2 0 75 89 106 170 212 252 
-+170 212 252 170 212 252 170 212 252 109 141 168 8 14 16 0 2 0 21 13 4 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 7 0 0 0 2 0 101 72 28 218 158 64 250 179 73 250 179 73 
-+250 179 73 139 99 44 0 2 0 8 14 16 0 2 0 238 241 237 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 244 246 243 38 40 37 3 10 13 139 181 221 170 212 252 
-+170 212 252 161 203 243 66 80 97 0 2 0 31 23 12 191 142 60 248 183 74 180 132 57 
-+44 34 15 0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 23 15 7 190 136 56 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 150 108 46 0 2 0 0 2 0 82 83 81 222 224 221 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 102 104 101 0 2 0 98 129 156 170 212 252 163 205 246 
-+98 129 156 23 30 36 0 2 0 82 62 28 234 172 70 248 183 74 248 183 74 248 183 74 
-+248 183 74 158 114 46 29 21 8 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 64 46 18 109 79 35 150 108 46 224 163 69 250 179 73 
-+250 179 73 250 179 73 250 179 73 158 114 46 0 2 0 0 2 0 3 6 2 115 117 114 
-+234 236 233 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 176 178 175 0 2 0 57 72 88 146 188 228 80 98 121 8 14 16 
-+0 2 0 24 17 10 158 114 46 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 242 178 77 58 42 19 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 0 2 0 67 49 21 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 228 167 73 95 68 30 0 2 0 0 2 0 
-+0 2 0 52 54 51 108 110 107 162 164 161 219 221 218 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 252 254 250 
-+219 221 218 178 180 177 18 20 17 6 12 15 26 33 39 0 2 0 0 2 0 52 36 13 
-+164 119 51 242 178 77 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 242 178 77 
-+187 138 56 175 129 54 158 114 46 82 62 28 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 78 58 25 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 234 172 70 142 101 40 
-+44 34 15 10 12 8 0 2 0 0 2 0 0 2 0 18 20 17 60 62 59 71 73 70 
-+82 83 81 95 96 94 104 106 103 118 120 117 115 117 114 78 80 77 40 41 39 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 44 34 15 105 75 32 191 142 60 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 105 75 32 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 187 138 56 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 142 101 40 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 206 148 61 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 161 117 49 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 228 167 73 250 179 73 
-+238 175 73 190 136 56 158 114 46 234 172 70 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 147 105 44 0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 67 49 21 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 
-+31 23 12 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 10 5 21 13 4 
-+0 2 0 0 2 0 0 2 0 147 105 44 250 179 73 250 179 73 250 179 73 250 179 73 
-+134 100 43 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 155 111 43 248 183 74 248 183 74 
-+248 183 74 248 183 74 224 163 69 55 39 17 64 46 18 164 119 51 242 178 77 248 183 74 
-+75 55 22 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 202 145 58 250 179 73 250 179 73 228 167 73 88 66 26 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 168 123 54 248 183 74 
-+248 183 74 248 183 74 158 114 46 0 2 0 7 0 0 0 2 0 10 12 8 44 34 15 
-+15 9 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 29 21 8 250 179 73 250 179 73 158 114 46 15 14 3 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 175 129 54 
-+248 183 74 248 183 74 114 83 33 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 29 21 8 147 105 44 58 42 19 0 2 0 7 0 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+105 75 32 218 158 64 23 15 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-diff --git a/drivers/video/logo/logo_linux_mono.pbm b/drivers/video/logo/logo_linux_mono.pbm
-index 2f14d9f..3d3c358 100644
---- a/drivers/video/logo/logo_linux_mono.pbm
-+++ b/drivers/video/logo/logo_linux_mono.pbm
-@@ -1,203 +1,159 @@
--P1
--# Standard black and white Linux logo
--80 80
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 0 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1
--1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 0 0 1 1 1 1 1 1 0 0 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 0 0 0 1 1 1 1 0 0 0 0 0 0 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 1 1 0 0 1 1 1 0 0 1 1 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 1 1 1 0 1 1 1 1 0 0 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 0 1 1 1 0 1 1 1 1 0 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 1 1 0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 0 0 1 0 0 0 0 0 1 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 0 0 0 0 0 0 0 0 0 1 1 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 0 0 0 0 0 1 1 0 0 0 0 1 1
--1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 0 0 0 0 1 1 0 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 1 0 0 0 0 0 0 0 0 1 1 0 0 0 1
--1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1
--0 0 1 0 0 0 0 0 1 1 0 0 0 0 0 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0
--1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 0 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1
--0 0 0 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 0 1 1 1 1 1 1 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 0
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1
--1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 0 1 1 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 0 0 0 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 1 0 0 0 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 1 1 1 1 1 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 1 1 1 1 1 1 1 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 1 1 1 1 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
--1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1
--1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1
--1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--1 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0
--1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
--1 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 0 0 0 0 0 0 0 0 0 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-+P2
-+80  78
-+255 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 255 255 255 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 255 255 255 255 255 0 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 
-+255 0 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 
-+255 255 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 
-+255 255 0 0 0 0 0 0 0 0 
-+0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 
-+255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 255 255 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 0 255 255 0 0 255 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 255 255 255 0 0 255 
-+255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 0 255 255 255 0 255 
-+255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 0 255 255 255 0 0 
-+255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 
-+0 255 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 
-+0 255 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 
-+0 0 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 255 255 0 0 255 255 0 0 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 255 255 255 
-+255 0 0 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 255 0 0 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 
-+255 0 0 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 0 0 255 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 255 255 255 
-+255 255 0 0 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 255 255 255 255 0 255 255 255 
-+255 255 255 0 0 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 0 255 255 255 
-+255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 0 0 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 255 0 
-+0 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 255 255 
-+0 0 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 0 0 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-diff --git a/drivers/video/logo/logo_linux_vga16.ppm b/drivers/video/logo/logo_linux_vga16.ppm
-index 1850c15..f279f97 100644
---- a/drivers/video/logo/logo_linux_vga16.ppm
-+++ b/drivers/video/logo/logo_linux_vga16.ppm
-@@ -1,1604 +1,18724 @@
- P3
--# Standard 16-color Linux logo
--80 80
--255
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 170 170 170  85  85  85   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170 170 170 170 170 170
--170 170 170   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170 170 170 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170 170 170 170 255 255 255 255 255 255
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 255 255 255 170 170 170 170 170 170
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170   0   0   0   0   0   0 255 255 255
-- 85  85  85   0   0   0   0   0   0   0   0   0
--255 255 255 170 170 170   0   0   0  85  85  85
--170 170 170 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0 170 170 170
-- 85  85  85   0   0   0   0   0   0   0   0   0
--255 255 255  85  85  85   0   0   0   0   0   0
-- 85  85  85 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170   0   0   0   0   0   0 170 170 170
-- 85  85  85  85  85  85  85  85  85  85  85  85
--255 255 255  85  85  85   0   0   0   0   0   0
-- 85  85  85 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
-- 85  85  85 255 255 255   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--170 170 170 170 170 170 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170 170 170 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0 170  85   0  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
-- 85  85  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0  85  85  85   0   0   0
--  0   0   0  85  85  85 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
-- 85  85  85 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170 170 170 170 170 170 170 170 170   0   0   0
--  0   0   0   0   0   0 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170 170 170 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 170 170 170
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0 170 170 170
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0  85  85  85 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 170 170 170
--170 170 170 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 170 170 170 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170 170 170
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0 170 170 170
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0  85  85  85
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--  0   0   0  85  85  85 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0  85  85  85
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--  0   0   0 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0  85  85  85   0   0   0   0   0   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170  85  85  85 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85  85  85  85  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 170 170 170
-- 85  85  85   0   0   0   0   0   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170  85  85  85
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 170  85   0 170  85   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85  85  85  85  85  85  85 170  85   0
--170  85   0 170  85   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-+# CREATOR: GIMP PNM Filter Version 1.1
-+80 78
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
diff --git a/kernels/linux-libre-rt/change-default-console-loglevel.patch b/kernels/linux-libre-rt/change-default-console-loglevel.patch
deleted file mode 100644
index 22cd69a09..000000000
--- a/kernels/linux-libre-rt/change-default-console-loglevel.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
---- linux-3.0.orig/kernel/printk/printk.c	2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0/kernel/printk/printk.c	2011-07-27 14:43:07.000000000 +0300
-@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea
- 
- /* We show everything that is MORE important than this.. */
- #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
--#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
-+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */
- 
- DECLARE_WAIT_QUEUE_HEAD(log_wait);
- 
diff --git a/kernels/linux-libre-rt/config.i686 b/kernels/linux-libre-rt/config.i686
index 82b46d523..ee41c3682 100644
--- a/kernels/linux-libre-rt/config.i686
+++ b/kernels/linux-libre-rt/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.1 Kernel Configuration
+# Linux/x86 3.12.8 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -460,7 +460,7 @@ CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
-# CONFIG_HWPOISON_INJECT is not set
+CONFIG_HWPOISON_INJECT=m
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
@@ -1114,7 +1114,7 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
-# CONFIG_NET_DCCPPROBE is not set
+CONFIG_NET_DCCPPROBE=m
 CONFIG_IP_SCTP=m
 CONFIG_NET_SCTPPROBE=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
@@ -3149,7 +3149,15 @@ CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
-# CONFIG_I2C_MUX is not set
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -4875,18 +4883,6 @@ 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
@@ -5257,7 +5253,6 @@ CONFIG_DMA_OF=y
 #
 # DMA Clients
 #
-CONFIG_NET_DMA=y
 CONFIG_ASYNC_TX_DMA=y
 # CONFIG_DMATEST is not set
 CONFIG_DCA=m
@@ -6028,14 +6023,22 @@ CONFIG_HAVE_ARCH_KMEMCHECK=y
 #
 # Debug Lockups and Hangs
 #
-# CONFIG_LOCKUP_DETECTOR is not set
-# CONFIG_DETECT_HUNG_TASK is not set
+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 is not set
-CONFIG_DEBUG_PREEMPT=y
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_PREEMPT is not set
 
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
@@ -6043,7 +6046,7 @@ CONFIG_DEBUG_PREEMPT=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES 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
@@ -6100,8 +6103,8 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_PREEMPT_TRACER is not set
 CONFIG_SCHED_TRACER=y
-# CONFIG_WAKEUP_LATENCY_HIST is not set
-# CONFIG_MISSED_TIMER_OFFSETS_HIST is not set
+CONFIG_WAKEUP_LATENCY_HIST=y
+CONFIG_MISSED_TIMER_OFFSETS_HIST=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_TRACER_SNAPSHOT=y
 # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
@@ -6148,7 +6151,7 @@ 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=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
diff --git a/kernels/linux-libre-rt/config.x86_64 b/kernels/linux-libre-rt/config.x86_64
index 9f641e359..16c173cd0 100644
--- a/kernels/linux-libre-rt/config.x86_64
+++ b/kernels/linux-libre-rt/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.1 Kernel Configuration
+# Linux/x86 3.12.8 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -464,7 +464,7 @@ CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
-# CONFIG_HWPOISON_INJECT is not set
+CONFIG_HWPOISON_INJECT=m
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
@@ -1095,7 +1095,7 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
-# CONFIG_NET_DCCPPROBE is not set
+CONFIG_NET_DCCPPROBE=m
 CONFIG_IP_SCTP=m
 CONFIG_NET_SCTPPROBE=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
@@ -3041,7 +3041,14 @@ CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
-# CONFIG_I2C_MUX is not set
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -4698,18 +4705,6 @@ 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
@@ -5075,7 +5070,6 @@ CONFIG_DMA_ACPI=y
 #
 # DMA Clients
 #
-CONFIG_NET_DMA=y
 CONFIG_ASYNC_TX_DMA=y
 # CONFIG_DMATEST is not set
 CONFIG_DCA=m
@@ -5816,14 +5810,22 @@ CONFIG_HAVE_ARCH_KMEMCHECK=y
 #
 # Debug Lockups and Hangs
 #
-# CONFIG_LOCKUP_DETECTOR is not set
-# CONFIG_DETECT_HUNG_TASK is not set
+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 is not set
-CONFIG_DEBUG_PREEMPT=y
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_PREEMPT is not set
 
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
@@ -5831,7 +5833,7 @@ CONFIG_DEBUG_PREEMPT=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES 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
@@ -5937,7 +5939,7 @@ 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=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
diff --git a/kernels/linux-libre-rt/criu-no-expert.patch b/kernels/linux-libre-rt/criu-no-expert.patch
deleted file mode 100644
index 2124427e9..000000000
--- a/kernels/linux-libre-rt/criu-no-expert.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/init/Kconfig b/init/Kconfig
-index be8b7f5..7461760 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP
- endif # CGROUPS
- 
- config CHECKPOINT_RESTORE
--	bool "Checkpoint/restore support" if EXPERT
-+	bool "Checkpoint/restore support"
- 	default n
- 	help
- 	  Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1000,7 +1000,7 @@ config CHECKPOINT_RESTORE
- 	  If unsure, say N here.
- 
- menuconfig NAMESPACES
--	bool "Namespaces support" if EXPERT
-+	bool "Namespaces support"
- 	default !EXPERT
- 	help
- 	  Provides the way to make tasks work with different objects using
diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install
deleted file mode 100644
index 434a0207c..000000000
--- a/kernels/linux-libre-rt/linux-libre-rt.install
+++ /dev/null
@@ -1,35 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-KERNEL_NAME=-rt
-KERNEL_VERSION=
-
-post_install () {
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  if command -v mkinitcpio 2>&1 > /dev/null; then
-    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-    mkinitcpio -p linux-libre${KERNEL_NAME}
-  fi
-}
-
-post_upgrade() {
-  if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
-    echo "WARNING: /boot appears to be a separate partition but is not mounted."
-  fi
-
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  if command -v mkinitcpio 2>&1 > /dev/null; then
-    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-    mkinitcpio -p linux-libre${KERNEL_NAME}
-  fi
-}
-
-post_remove() {
-  # also remove the compat symlinks
-  rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img
-  rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img
-}
diff --git a/kernels/linux-libre-rt/linux-libre-rt.preset b/kernels/linux-libre-rt/linux-libre-rt.preset
deleted file mode 100644
index cd522e792..000000000
--- a/kernels/linux-libre-rt/linux-libre-rt.preset
+++ /dev/null
@@ -1,14 +0,0 @@
-# mkinitcpio preset file for the 'linux-libre-rt' package
-
-ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="/boot/vmlinuz-linux-libre-rt"
-
-PRESETS=('default' 'fallback')
-
-#default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-linux-libre-rt.img"
-#default_options=""
-
-#fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/initramfs-linux-libre-rt-fallback.img" 
-fallback_options="-S autodetect"
diff --git a/kernels/linux-libre-rt/nfs-check-gssd-running-before-krb5i-auth.patch b/kernels/linux-libre-rt/nfs-check-gssd-running-before-krb5i-auth.patch
new file mode 100644
index 000000000..be81fec76
--- /dev/null
+++ b/kernels/linux-libre-rt/nfs-check-gssd-running-before-krb5i-auth.patch
@@ -0,0 +1,48 @@
+Bugzilla: N/A
+Upstream-status: queued in NFS git tree (for 3.13/3.14?)
+
+Currently, the client will attempt to use krb5i in the SETCLIENTID call
+even if rpc.gssd isn't running. When that fails, it'll then fall back to
+RPC_AUTH_UNIX. This introduced a delay when mounting if rpc.gssd isn't
+running, and causes warning messages to pop up in the ring buffer.
+
+Check to see if rpc.gssd is running before even attempting to use krb5i
+auth, and just silently skip trying to do so if it isn't. In the event
+that the admin is actually trying to mount with krb5*, it will still
+fail at a later stage of the mount attempt.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+---
+ fs/nfs/nfs4client.c |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff -up linux-3.11.9-200.fc19.x86_64/fs/nfs/nfs4client.c.orig linux-3.11.9-200.fc19.x86_64/fs/nfs/nfs4client.c
+--- linux-3.11.9-200.fc19.x86_64/fs/nfs/nfs4client.c.orig	2013-09-02 16:46:10.000000000 -0400
++++ linux-3.11.9-200.fc19.x86_64/fs/nfs/nfs4client.c	2013-11-21 10:20:27.288286000 -0500
+@@ -10,6 +10,7 @@
+ #include <linux/sunrpc/auth.h>
+ #include <linux/sunrpc/xprt.h>
+ #include <linux/sunrpc/bc_xprt.h>
++#include <linux/sunrpc/rpc_pipe_fs.h>
+ #include "internal.h"
+ #include "callback.h"
+ #include "delegation.h"
+@@ -206,7 +207,11 @@ struct nfs_client *nfs4_init_client(stru
+ 	if (clp->cl_minorversion != 0)
+ 		__set_bit(NFS_CS_INFINITE_SLOTS, &clp->cl_flags);
+ 	__set_bit(NFS_CS_DISCRTRY, &clp->cl_flags);
+-	error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_GSS_KRB5I);
++
++	error = -EINVAL;
++	if (gssd_running(clp->cl_net))
++		error = nfs_create_rpc_client(clp, timeparms,
++					      RPC_AUTH_GSS_KRB5I);
+ 	if (error == -EINVAL)
+ 		error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_UNIX);
+ 	if (error < 0)
+
+_______________________________________________
+kernel mailing list
+kernel@lists.fedoraproject.org
+https://admin.fedoraproject.org/mailman/listinfo/kernel
diff --git a/kernels/linux-libre-rt/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch b/kernels/linux-libre-rt/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch
new file mode 100644
index 000000000..ed03f34dd
--- /dev/null
+++ b/kernels/linux-libre-rt/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch
@@ -0,0 +1,50 @@
+Bugzilla: 1037793
+Upstream-status: submitted for 3.14
+
+Currently, it could leak dentry references in some cases. Make sure
+we clean up properly.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+---
+ net/sunrpc/rpc_pipe.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index 5d973b2..b185548 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
+@@ -1369,6 +1369,18 @@ out:
+ 	return pipe_dentry;
+ }
+ 
++static void
++rpc_gssd_dummy_depopulate(struct dentry *pipe_dentry)
++{
++	struct dentry *clnt_dir = pipe_dentry->d_parent;
++	struct dentry *gssd_dir = clnt_dir->d_parent;
++
++	__rpc_rmpipe(clnt_dir->d_inode, pipe_dentry);
++	__rpc_depopulate(clnt_dir, gssd_dummy_info_file, 0, 1);
++	__rpc_depopulate(gssd_dir, gssd_dummy_clnt_dir, 0, 1);
++	dput(pipe_dentry);
++}
++
+ static int
+ rpc_fill_super(struct super_block *sb, void *data, int silent)
+ {
+@@ -1412,7 +1424,7 @@ rpc_fill_super(struct super_block *sb, void *data, int silent)
+ 	return 0;
+ 
+ err_depopulate:
+-	dput(gssd_dentry);
++	rpc_gssd_dummy_depopulate(gssd_dentry);
+ 	blocking_notifier_call_chain(&rpc_pipefs_notifier_list,
+ 					   RPC_PIPEFS_UMOUNT,
+ 					   sb);
+-- 
+1.8.4.2
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/kernels/linux-libre-rt/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch b/kernels/linux-libre-rt/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch
new file mode 100644
index 000000000..e4b1a255f
--- /dev/null
+++ b/kernels/linux-libre-rt/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch
@@ -0,0 +1,32 @@
+Bugzilla: 1037793
+Upstream-status: submitted for 3.14
+
+In the event that we create the gssd/clntXX dir, but the pipe creation
+subsequently fails, then we should remove the clntXX dir before
+returning.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+---
+ net/sunrpc/rpc_pipe.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index 5cd7ad1..0b74c61 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
+@@ -1313,6 +1313,8 @@ rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data)
+ 	}
+ 
+ 	pipe_dentry = rpc_mkpipe_dentry(clnt_dentry, "gssd", NULL, pipe_data);
++	if (IS_ERR(pipe_dentry))
++		__rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1);
+ out:
+ 	dput(clnt_dentry);
+ 	dput(gssd_dentry);
+-- 
+1.8.4.2
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/kernels/linux-libre-rt/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch b/kernels/linux-libre-rt/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch
new file mode 100644
index 000000000..dd3b5ba2f
--- /dev/null
+++ b/kernels/linux-libre-rt/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch
@@ -0,0 +1,96 @@
+Bugzilla: 1037793
+Upstream-status: submitted for 3.14
+
+rpc.gssd expects to see an "info" file in each clntXX dir. Since adding
+the dummy gssd pipe, users that run rpc.gssd see a lot of these messages
+spamming the logs:
+
+    rpc.gssd[508]: ERROR: can't open /var/lib/nfs/rpc_pipefs/gssd/clntXX/info: No such file or directory
+    rpc.gssd[508]: ERROR: failed to read service info
+
+Add a dummy gssd/clntXX/info file to help silence these messages.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+---
+ net/sunrpc/rpc_pipe.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 49 insertions(+), 1 deletion(-)
+
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index 0b74c61..5d973b2 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
+@@ -17,6 +17,7 @@
+ #include <linux/fsnotify.h>
+ #include <linux/kernel.h>
+ #include <linux/rcupdate.h>
++#include <linux/utsname.h>
+ 
+ #include <asm/ioctls.h>
+ #include <linux/poll.h>
+@@ -1275,6 +1276,44 @@ static const struct rpc_pipe_ops gssd_dummy_pipe_ops = {
+ 	.downcall	= dummy_downcall,
+ };
+ 
++/*
++ * Here we present a bogus "info" file to keep rpc.gssd happy. We don't expect
++ * that it will ever use this info to handle an upcall, but rpc.gssd expects
++ * that this file will be there and have a certain format.
++ */
++static int
++rpc_show_dummy_info(struct seq_file *m, void *v)
++{
++	seq_printf(m, "RPC server: %s\n", utsname()->nodename);
++	seq_printf(m, "service: foo (1) version 0\n");
++	seq_printf(m, "address: 127.0.0.1\n");
++	seq_printf(m, "protocol: tcp\n");
++	seq_printf(m, "port: 0\n");
++	return 0;
++}
++
++static int
++rpc_dummy_info_open(struct inode *inode, struct file *file)
++{
++	return single_open(file, rpc_show_dummy_info, NULL);
++}
++
++static const struct file_operations rpc_dummy_info_operations = {
++	.owner		= THIS_MODULE,
++	.open		= rpc_dummy_info_open,
++	.read		= seq_read,
++	.llseek		= seq_lseek,
++	.release	= single_release,
++};
++
++static const struct rpc_filelist gssd_dummy_info_file[] = {
++	[0] = {
++		.name = "info",
++		.i_fop = &rpc_dummy_info_operations,
++		.mode = S_IFREG | S_IRUSR,
++	},
++};
++
+ /**
+  * rpc_gssd_dummy_populate - create a dummy gssd pipe
+  * @root:	root of the rpc_pipefs filesystem
+@@ -1312,9 +1351,18 @@ rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data)
+ 		goto out;
+ 	}
+ 
++	ret = rpc_populate(clnt_dentry, gssd_dummy_info_file, 0, 1, NULL);
++	if (ret) {
++		__rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1);
++		pipe_dentry = ERR_PTR(ret);
++		goto out;
++	}
++
+ 	pipe_dentry = rpc_mkpipe_dentry(clnt_dentry, "gssd", NULL, pipe_data);
+-	if (IS_ERR(pipe_dentry))
++	if (IS_ERR(pipe_dentry)) {
++		__rpc_depopulate(clnt_dentry, gssd_dummy_info_file, 0, 1);
+ 		__rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1);
++	}
+ out:
+ 	dput(clnt_dentry);
+ 	dput(gssd_dentry);
+-- 
+1.8.4.2
diff --git a/kernels/linux-libre-rt/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch b/kernels/linux-libre-rt/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch
new file mode 100644
index 000000000..805498a70
--- /dev/null
+++ b/kernels/linux-libre-rt/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch
@@ -0,0 +1,233 @@
+Bugzilla: N/A
+Upstream-status: queued in NFS git tree (for 3.13/3.14?)
+
+rpc.gssd will naturally hold open any pipe named */clnt*/gssd that shows
+up under rpc_pipefs. That behavior gives us a reliable mechanism to tell
+whether it's actually running or not.
+
+Create a new toplevel "gssd" directory in rpc_pipefs when it's mounted.
+Under that directory create another directory called "clntXX", and then
+within that a pipe called "gssd".
+
+We'll never send an upcall along that pipe, and any downcall written to
+it will just return -EINVAL.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+---
+ include/linux/sunrpc/rpc_pipe_fs.h |    3 +-
+ net/sunrpc/netns.h                 |    1 +
+ net/sunrpc/rpc_pipe.c              |   93 ++++++++++++++++++++++++++++++++++-
+ net/sunrpc/sunrpc_syms.c           |    8 +++-
+ 4 files changed, 100 insertions(+), 5 deletions(-)
+
+diff -up linux-3.11.9-200.fc19.x86_64/include/linux/sunrpc/rpc_pipe_fs.h.orig linux-3.11.9-200.fc19.x86_64/include/linux/sunrpc/rpc_pipe_fs.h
+--- linux-3.11.9-200.fc19.x86_64/include/linux/sunrpc/rpc_pipe_fs.h.orig	2013-09-02 16:46:10.000000000 -0400
++++ linux-3.11.9-200.fc19.x86_64/include/linux/sunrpc/rpc_pipe_fs.h	2013-11-21 10:11:17.893026000 -0500
+@@ -64,7 +64,8 @@ enum {
+ 
+ extern struct dentry *rpc_d_lookup_sb(const struct super_block *sb,
+ 				      const unsigned char *dir_name);
+-extern void rpc_pipefs_init_net(struct net *net);
++extern int rpc_pipefs_init_net(struct net *net);
++extern void rpc_pipefs_exit_net(struct net *net);
+ extern struct super_block *rpc_get_sb_net(const struct net *net);
+ extern void rpc_put_sb_net(const struct net *net);
+ 
+diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/netns.h.orig linux-3.11.9-200.fc19.x86_64/net/sunrpc/netns.h
+--- linux-3.11.9-200.fc19.x86_64/net/sunrpc/netns.h.orig	2013-09-02 16:46:10.000000000 -0400
++++ linux-3.11.9-200.fc19.x86_64/net/sunrpc/netns.h	2013-11-21 10:11:17.897029000 -0500
+@@ -14,6 +14,7 @@ struct sunrpc_net {
+ 	struct cache_detail *rsi_cache;
+ 
+ 	struct super_block *pipefs_sb;
++	struct rpc_pipe *gssd_dummy;
+ 	struct mutex pipefs_sb_lock;
+ 
+ 	struct list_head all_clients;
+diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c.orig linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c
+--- linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c.orig	2013-09-02 16:46:10.000000000 -0400
++++ linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c	2013-11-21 10:11:17.903026000 -0500
+@@ -38,7 +38,7 @@
+ #define NET_NAME(net)	((net == &init_net) ? " (init_net)" : "")
+ 
+ static struct file_system_type rpc_pipe_fs_type;
+-
++static const struct rpc_pipe_ops gssd_dummy_pipe_ops;
+ 
+ static struct kmem_cache *rpc_inode_cachep __read_mostly;
+ 
+@@ -1019,6 +1019,7 @@ enum {
+ 	RPCAUTH_nfsd4_cb,
+ 	RPCAUTH_cache,
+ 	RPCAUTH_nfsd,
++	RPCAUTH_gssd,
+ 	RPCAUTH_RootEOF
+ };
+ 
+@@ -1055,6 +1056,10 @@ static const struct rpc_filelist files[]
+ 		.name = "nfsd",
+ 		.mode = S_IFDIR | S_IRUGO | S_IXUGO,
+ 	},
++	[RPCAUTH_gssd] = {
++		.name = "gssd",
++		.mode = S_IFDIR | S_IRUGO | S_IXUGO,
++	},
+ };
+ 
+ /*
+@@ -1068,13 +1073,25 @@ struct dentry *rpc_d_lookup_sb(const str
+ }
+ EXPORT_SYMBOL_GPL(rpc_d_lookup_sb);
+ 
+-void rpc_pipefs_init_net(struct net *net)
++int rpc_pipefs_init_net(struct net *net)
+ {
+ 	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+ 
++	sn->gssd_dummy = rpc_mkpipe_data(&gssd_dummy_pipe_ops, 0);
++	if (IS_ERR(sn->gssd_dummy))
++		return PTR_ERR(sn->gssd_dummy);
++
+ 	mutex_init(&sn->pipefs_sb_lock);
+ 	sn->gssd_running = 1;
+ 	sn->pipe_version = -1;
++	return 0;
++}
++
++void rpc_pipefs_exit_net(struct net *net)
++{
++	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
++
++	rpc_destroy_pipe_data(sn->gssd_dummy);
+ }
+ 
+ /*
+@@ -1104,11 +1121,73 @@ void rpc_put_sb_net(const struct net *ne
+ }
+ EXPORT_SYMBOL_GPL(rpc_put_sb_net);
+ 
++static const struct rpc_filelist gssd_dummy_clnt_dir[] = {
++	[0] = {
++		.name = "clntXX",
++		.mode = S_IFDIR | S_IRUGO | S_IXUGO,
++	},
++};
++
++static ssize_t
++dummy_downcall(struct file *filp, const char __user *src, size_t len)
++{
++	return -EINVAL;
++}
++
++static const struct rpc_pipe_ops gssd_dummy_pipe_ops = {
++	.upcall		= rpc_pipe_generic_upcall,
++	.downcall	= dummy_downcall,
++};
++
++/**
++ * rpc_gssd_dummy_populate - create a dummy gssd pipe
++ * @root:	root of the rpc_pipefs filesystem
++ * @pipe_data:	pipe data created when netns is initialized
++ *
++ * Create a dummy set of directories and a pipe that gssd can hold open to
++ * indicate that it is up and running.
++ */
++static struct dentry *
++rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data)
++{
++	int ret = 0;
++	struct dentry *gssd_dentry;
++	struct dentry *clnt_dentry = NULL;
++	struct dentry *pipe_dentry = NULL;
++	struct qstr q = QSTR_INIT(files[RPCAUTH_gssd].name,
++				  strlen(files[RPCAUTH_gssd].name));
++
++	/* We should never get this far if "gssd" doesn't exist */
++	gssd_dentry = d_hash_and_lookup(root, &q);
++	if (!gssd_dentry)
++		return ERR_PTR(-ENOENT);
++
++	ret = rpc_populate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1, NULL);
++	if (ret) {
++		pipe_dentry = ERR_PTR(ret);
++		goto out;
++	}
++
++	q.name = gssd_dummy_clnt_dir[0].name;
++	q.len = strlen(gssd_dummy_clnt_dir[0].name);
++	clnt_dentry = d_hash_and_lookup(gssd_dentry, &q);
++	if (!clnt_dentry) {
++		pipe_dentry = ERR_PTR(-ENOENT);
++		goto out;
++	}
++
++	pipe_dentry = rpc_mkpipe_dentry(clnt_dentry, "gssd", NULL, pipe_data);
++out:
++	dput(clnt_dentry);
++	dput(gssd_dentry);
++	return pipe_dentry;
++}
++
+ static int
+ rpc_fill_super(struct super_block *sb, void *data, int silent)
+ {
+ 	struct inode *inode;
+-	struct dentry *root;
++	struct dentry *root, *gssd_dentry;
+ 	struct net *net = data;
+ 	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+ 	int err;
+@@ -1126,6 +1205,13 @@ rpc_fill_super(struct super_block *sb, v
+ 		return -ENOMEM;
+ 	if (rpc_populate(root, files, RPCAUTH_lockd, RPCAUTH_RootEOF, NULL))
+ 		return -ENOMEM;
++
++	gssd_dentry = rpc_gssd_dummy_populate(root, sn->gssd_dummy);
++	if (IS_ERR(gssd_dentry)) {
++		__rpc_depopulate(root, files, RPCAUTH_lockd, RPCAUTH_RootEOF);
++		return PTR_ERR(gssd_dentry);
++	}
++
+ 	dprintk("RPC:       sending pipefs MOUNT notification for net %p%s\n",
+ 		net, NET_NAME(net));
+ 	mutex_lock(&sn->pipefs_sb_lock);
+@@ -1140,6 +1226,7 @@ rpc_fill_super(struct super_block *sb, v
+ 	return 0;
+ 
+ err_depopulate:
++	dput(gssd_dentry);
+ 	blocking_notifier_call_chain(&rpc_pipefs_notifier_list,
+ 					   RPC_PIPEFS_UMOUNT,
+ 					   sb);
+diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/sunrpc_syms.c.orig linux-3.11.9-200.fc19.x86_64/net/sunrpc/sunrpc_syms.c
+--- linux-3.11.9-200.fc19.x86_64/net/sunrpc/sunrpc_syms.c.orig	2013-09-02 16:46:10.000000000 -0400
++++ linux-3.11.9-200.fc19.x86_64/net/sunrpc/sunrpc_syms.c	2013-11-21 10:11:17.908026000 -0500
+@@ -44,12 +44,17 @@ static __net_init int sunrpc_init_net(st
+ 	if (err)
+ 		goto err_unixgid;
+ 
+-	rpc_pipefs_init_net(net);
++	err = rpc_pipefs_init_net(net);
++	if (err)
++		goto err_pipefs;
++
+ 	INIT_LIST_HEAD(&sn->all_clients);
+ 	spin_lock_init(&sn->rpc_client_lock);
+ 	spin_lock_init(&sn->rpcb_clnt_lock);
+ 	return 0;
+ 
++err_pipefs:
++	unix_gid_cache_destroy(net);
+ err_unixgid:
+ 	ip_map_cache_destroy(net);
+ err_ipmap:
+@@ -60,6 +65,7 @@ err_proc:
+ 
+ static __net_exit void sunrpc_exit_net(struct net *net)
+ {
++	rpc_pipefs_exit_net(net);
+ 	unix_gid_cache_destroy(net);
+ 	ip_map_cache_destroy(net);
+ 	rpc_proc_exit(net);
+
diff --git a/kernels/linux-libre-rt/sunrpc-replace-gssd_running-with-more-reliable-check.patch b/kernels/linux-libre-rt/sunrpc-replace-gssd_running-with-more-reliable-check.patch
new file mode 100644
index 000000000..8cd5c0090
--- /dev/null
+++ b/kernels/linux-libre-rt/sunrpc-replace-gssd_running-with-more-reliable-check.patch
@@ -0,0 +1,139 @@
+Bugzilla: N/A
+Upstream-status: queued in NFS git tree (for 3.13/3.14?)
+
+Now that we have a more reliable method to tell if gssd is running, we
+can replace the sn->gssd_running flag with a function that will query to
+see if it's up and running.
+
+There's also no need to attempt an upcall that we know will fail, so
+just return -EACCES if gssd isn't running. Finally, fix the warn_gss()
+message not to claim that that the upcall timed out since we don't
+necesarily perform one now when gssd isn't running, and remove the
+extraneous newline from the message.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+---
+ Fixed up to apply to 3.12.1 by Josh Boyer <jwboyer@fedoraproject.org>
+
+ include/linux/sunrpc/rpc_pipe_fs.h |    2 ++
+ net/sunrpc/auth_gss/auth_gss.c     |   17 +++++++----------
+ net/sunrpc/netns.h                 |    2 --
+ net/sunrpc/rpc_pipe.c              |   14 ++++++++++----
+ 4 files changed, 19 insertions(+), 16 deletions(-)
+
+diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h
+index 85f1342..7f490be 100644
+--- a/include/linux/sunrpc/rpc_pipe_fs.h
++++ b/include/linux/sunrpc/rpc_pipe_fs.h
+@@ -131,5 +131,7 @@ extern int rpc_unlink(struct dentry *);
+ extern int register_rpc_pipefs(void);
+ extern void unregister_rpc_pipefs(void);
+ 
++extern bool gssd_running(struct net *net);
++
+ #endif
+ #endif
+diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
+index 0846566..1ada878 100644
+--- a/net/sunrpc/auth_gss/auth_gss.c
++++ b/net/sunrpc/auth_gss/auth_gss.c
+@@ -517,8 +517,7 @@ static void warn_gssd(void)
+ 	unsigned long now = jiffies;
+ 
+ 	if (time_after(now, ratelimit)) {
+-		printk(KERN_WARNING "RPC: AUTH_GSS upcall timed out.\n"
+-				"Please check user daemon is running.\n");
++		pr_warn("RPC: AUTH_GSS upcall failed. Please check user daemon is running.\n");
+ 		ratelimit = now + 15*HZ;
+ 	}
+ }
+@@ -581,7 +580,6 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred)
+ 	struct rpc_pipe *pipe;
+ 	struct rpc_cred *cred = &gss_cred->gc_base;
+ 	struct gss_upcall_msg *gss_msg;
+-	unsigned long timeout;
+ 	DEFINE_WAIT(wait);
+ 	int err;
+ 
+@@ -589,17 +587,16 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred)
+ 		__func__, from_kuid(&init_user_ns, cred->cr_uid));
+ retry:
+ 	err = 0;
+-	/* Default timeout is 15s unless we know that gssd is not running */
+-	timeout = 15 * HZ;
+-	if (!sn->gssd_running)
+-		timeout = HZ >> 2;
++	/* if gssd is down, just skip upcalling altogether */
++	if (!gssd_running(net)) {
++		warn_gssd();
++		return -EACCES;
++	}
+ 	gss_msg = gss_setup_upcall(gss_auth, cred);
+ 	if (PTR_ERR(gss_msg) == -EAGAIN) {
+ 		err = wait_event_interruptible_timeout(pipe_version_waitqueue,
+-				sn->pipe_version >= 0, timeout);
++				sn->pipe_version >= 0, 15 * HZ);
+ 		if (sn->pipe_version < 0) {
+-			if (err == 0)
+-				sn->gssd_running = 0;
+ 			warn_gssd();
+ 			err = -EACCES;
+ 		}
+diff --git a/net/sunrpc/netns.h b/net/sunrpc/netns.h
+index 8a8e841..94e506f 100644
+--- a/net/sunrpc/netns.h
++++ b/net/sunrpc/netns.h
+@@ -33,8 +33,6 @@ struct sunrpc_net {
+ 	int pipe_version;
+ 	atomic_t pipe_users;
+ 	struct proc_dir_entry *use_gssp_proc;
+-
+-	unsigned int gssd_running;
+ };
+ 
+ extern int sunrpc_net_id;
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index 40aef18..ad444f3 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
+@@ -216,14 +216,11 @@ rpc_destroy_inode(struct inode *inode)
+ static int
+ rpc_pipe_open(struct inode *inode, struct file *filp)
+ {
+-	struct net *net = inode->i_sb->s_fs_info;
+-	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+ 	struct rpc_pipe *pipe;
+ 	int first_open;
+ 	int res = -ENXIO;
+ 
+ 	mutex_lock(&inode->i_mutex);
+-	sn->gssd_running = 1;
+ 	pipe = RPC_I(inode)->pipe;
+ 	if (pipe == NULL)
+ 		goto out;
+@@ -1231,7 +1228,6 @@ int rpc_pipefs_init_net(struct net *net)
+ 		return PTR_ERR(sn->gssd_dummy);
+ 
+ 	mutex_init(&sn->pipefs_sb_lock);
+-	sn->gssd_running = 1;
+ 	sn->pipe_version = -1;
+ 	return 0;
+ }
+@@ -1385,6 +1381,16 @@ err_depopulate:
+ 	return err;
+ }
+ 
++bool
++gssd_running(struct net *net)
++{
++	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
++	struct rpc_pipe *pipe = sn->gssd_dummy;
++
++	return pipe->nreaders || pipe->nwriters;
++}
++EXPORT_SYMBOL_GPL(gssd_running);
++
+ static struct dentry *
+ rpc_mount(struct file_system_type *fs_type,
+ 		int flags, const char *dev_name, void *data)
diff --git a/kernels/linux-libre-xen/3.12-btrfs-relocate-csums.patch b/kernels/linux-libre-xen/3.12-btrfs-relocate-csums.patch
deleted file mode 100644
index 7209276ef..000000000
--- a/kernels/linux-libre-xen/3.12-btrfs-relocate-csums.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 4577b014d1bc3db386da3246f625888fc48083a9 Mon Sep 17 00:00:00 2001
-From: Josef Bacik <jbacik@fusionio.com>
-Date: Fri, 27 Sep 2013 13:33:09 +0000
-Subject: Btrfs: relocate csums properly with prealloc extents
-
-A user reported a problem where they were getting csum errors when running a
-balance and running systemd's journal.  This is because systemd is awesome and
-fallocate()'s its log space and writes into it.  Unfortunately we assume that
-when we read in all the csums for an extent that they are sequential starting at
-the bytenr we care about.  This obviously isn't the case for prealloc extents,
-where we could have written to the middle of the prealloc extent only, which
-means the csum would be for the bytenr in the middle of our range and not the
-front of our range.  Fix this by offsetting the new bytenr we are logging to
-based on the original bytenr the csum was for.  With this patch I no longer see
-the csum errors I was seeing.  Thanks,
-
-Cc: stable@vger.kernel.org
-Reported-by: Chris Murphy <lists@colorremedies.com>
-Signed-off-by: Josef Bacik <jbacik@fusionio.com>
-Signed-off-by: Chris Mason <chris.mason@fusionio.com>
----
-diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
-index dec4f5a..0359eec 100644
---- a/fs/btrfs/relocation.c
-+++ b/fs/btrfs/relocation.c
-@@ -4472,6 +4472,7 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len)
- 	struct btrfs_root *root = BTRFS_I(inode)->root;
- 	int ret;
- 	u64 disk_bytenr;
-+	u64 new_bytenr;
- 	LIST_HEAD(list);
- 
- 	ordered = btrfs_lookup_ordered_extent(inode, file_pos);
-@@ -4483,13 +4484,24 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len)
- 	if (ret)
- 		goto out;
- 
--	disk_bytenr = ordered->start;
- 	while (!list_empty(&list)) {
- 		sums = list_entry(list.next, struct btrfs_ordered_sum, list);
- 		list_del_init(&sums->list);
- 
--		sums->bytenr = disk_bytenr;
--		disk_bytenr += sums->len;
-+		/*
-+		 * We need to offset the new_bytenr based on where the csum is.
-+		 * We need to do this because we will read in entire prealloc
-+		 * extents but we may have written to say the middle of the
-+		 * prealloc extent, so we need to make sure the csum goes with
-+		 * the right disk offset.
-+		 *
-+		 * We can do this because the data reloc inode refers strictly
-+		 * to the on disk bytes, so we don't have to worry about
-+		 * disk_len vs real len like with real inodes since it's all
-+		 * disk length.
-+		 */
-+		new_bytenr = ordered->start + (sums->bytenr - disk_bytenr);
-+		sums->bytenr = new_bytenr;
- 
- 		btrfs_add_ordered_sum(inode, ordered, sums);
- 	}
---
-cgit v0.9.2
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index e97f554c3..63df6e96a 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202239 2013-12-20 19:15:03Z tpowa $
+# $Id: PKGBUILD 204729 2014-01-26 08:54:46Z thomas $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -6,7 +6,7 @@
 pkgbase=linux-libre-xen     # Build stock -LIBRE-XEN kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.12
-pkgver=${_basekernel}.6
+pkgver=${_basekernel}.9
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -21,14 +21,26 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         "${pkgbase}.preset"
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
-        'criu-no-expert.patch')
+        'criu-no-expert.patch'
+        'sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch'
+        'sunrpc-replace-gssd_running-with-more-reliable-check.patch'
+        'nfs-check-gssd-running-before-krb5i-auth.patch'
+        'rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch'
+        'sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch'
+        'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch')
 md5sums=('254f59707b6676b59ce5ca5c3c698319'
-         '4b18ce60daff87504e6740670edf6b50'
-         '7fce4cb7fd646d3efe0fc151ae6aca21'
+         '348975e36e4dd27f5d8fc50e92de8922'
+         '670682e633d1b785c73581307da7eb9c'
          'b7c2805bb287a644c0a303bf7721e534'
          '44260d2cb1a8b51c119d2ce1f83e457a'
          '98beb36f9b8cf16e58de2483ea9985e3'
-         'd50c1ac47394e9aec637002ef3392bd1')
+         'd50c1ac47394e9aec637002ef3392bd1'
+         'd4a75f77e6bd5d700dcd534cd5f0dfce'
+         'dc86fdc37615c97f03c1e0c31b7b833a'
+         '88eef9d3b5012ef7e82af1af8cc4e517'
+         'cec0bb8981936eab2943b2009b7a6fff'
+         '88d9cddf9e0050a76ec4674f264fb2a1'
+         'cb9016630212ef07b168892fbcfd4e5d')
 
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-XEN
@@ -46,6 +58,9 @@ prepare() {
   # fix issue on Hal8188EFWImg_CE.c deblobbed file
   sed -i "\|DEBLOBBED| s|,||" drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c
 
+  # add latest fixes from stable queue, if needed
+  # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
+
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
@@ -55,6 +70,17 @@ prepare() {
   # patch from fedora
   patch -Np1 -i "${srcdir}/criu-no-expert.patch"
 
+  # fix 15 seconds nfs delay
+  patch -Np1 -i "${srcdir}/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch"
+  patch -Np1 -i "${srcdir}/sunrpc-replace-gssd_running-with-more-reliable-check.patch"
+  patch -Np1 -i "${srcdir}/nfs-check-gssd-running-before-krb5i-auth.patch"
+  # fix nfs kernel oops
+  # #37866
+  patch -Np1 -i "${srcdir}/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch"
+  patch -Np1 -i "${srcdir}/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch"
+
+  patch -Np1 -i "${srcdir}/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch"
+
   cat "${srcdir}/config" > ./.config # simpler
 
   if [ "${_kernelname}" != "" ]; then
diff --git a/kernels/linux-libre-xen/boot-logo.patch b/kernels/linux-libre-xen/boot-logo.patch
deleted file mode 100644
index 3f4e0dea4..000000000
--- a/kernels/linux-libre-xen/boot-logo.patch
+++ /dev/null
@@ -1,23167 +0,0 @@
-diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
-index 3c14e43..c9d8373 100644
---- a/drivers/video/logo/logo_linux_clut224.ppm
-+++ b/drivers/video/logo/logo_linux_clut224.ppm
-@@ -1,1604 +1,861 @@
- P3
--# Standard 224-color Linux logo
--80 80
-+80 78
- 255
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  10  10  10  10  10  10
-- 10  10  10   6   6   6   6   6   6   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 22  22  22  26  26  26  30  30  30  34  34  34
-- 30  30  30  30  30  30  26  26  26  18  18  18
-- 14  14  14  10  10  10   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  26  26  26  42  42  42
-- 54  54  54  66  66  66  78  78  78  78  78  78
-- 78  78  78  74  74  74  66  66  66  54  54  54
-- 42  42  42  26  26  26  18  18  18  10  10  10
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 22  22  22  42  42  42  66  66  66  86  86  86
-- 66  66  66  38  38  38  38  38  38  22  22  22
-- 26  26  26  34  34  34  54  54  54  66  66  66
-- 86  86  86  70  70  70  46  46  46  26  26  26
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 50  50  50  82  82  82  58  58  58   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  54  54  54  86  86  86  66  66  66
-- 38  38  38  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 78  78  78  34  34  34   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6  70  70  70
-- 78  78  78  46  46  46  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  42  42  42  82  82  82
-- 26  26  26   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 46  46  46  34  34  34   6   6   6   2   2   6
-- 42  42  42  78  78  78  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  30  30  30  66  66  66  58  58  58
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 86  86  86 101 101 101  46  46  46  10  10  10
--  2   2   6  58  58  58  70  70  70  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  86  86  86  10  10  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  30  30  30
-- 94  94  94  94  94  94  58  58  58  26  26  26
--  2   2   6   6   6   6  78  78  78  54  54  54
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  62  62  62  62  62  62   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 54  54  54  38  38  38  18  18  18  10  10  10
--  2   2   6   2   2   6  34  34  34  82  82  82
-- 38  38  38  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 10  10  10   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  54  54  54
-- 66  66  66  26  26  26   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  82  82  82   2   2   6   2   2   6
--  2   2   6   6   6   6  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 14  14  14  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  18  18  18
-- 82  82  82  34  34  34  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
--  6   6   6   6   6   6  22  22  22  34  34  34
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  34  34  34
-- 10  10  10  50  50  50  22  22  22   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 86  86  86  42  42  42  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
-- 38  38  38 116 116 116  94  94  94  22  22  22
-- 22  22  22   2   2   6   2   2   6   2   2   6
-- 14  14  14  86  86  86 138 138 138 162 162 162
--154 154 154  38  38  38  26  26  26   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  14  14  14
--134 134 134 198 198 198 195 195 195 116 116 116
-- 10  10  10   2   2   6   2   2   6   6   6   6
--101  98  89 187 187 187 210 210 210 218 218 218
--214 214 214 134 134 134  14  14  14   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  50  50  50  18  18  18   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  54  54  54
--218 218 218 195 195 195 226 226 226 246 246 246
-- 58  58  58   2   2   6   2   2   6  30  30  30
--210 210 210 253 253 253 174 174 174 123 123 123
--221 221 221 234 234 234  74  74  74   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  82  82  82   2   2   6 106 106 106
--170 170 170  26  26  26  86  86  86 226 226 226
--123 123 123  10  10  10  14  14  14  46  46  46
--231 231 231 190 190 190   6   6   6  70  70  70
-- 90  90  90 238 238 238 158 158 158   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  86  86  86   6   6   6 116 116 116
--106 106 106   6   6   6  70  70  70 149 149 149
--128 128 128  18  18  18  38  38  38  54  54  54
--221 221 221 106 106 106   2   2   6  14  14  14
-- 46  46  46 190 190 190 198 198 198   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  94  94  94  14  14  14 101 101 101
--128 128 128   2   2   6  18  18  18 116 116 116
--118  98  46 121  92   8 121  92   8  98  78  10
--162 162 162 106 106 106   2   2   6   2   2   6
--  2   2   6 195 195 195 195 195 195   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   1
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  90  90  90  14  14  14  58  58  58
--210 210 210  26  26  26  54  38   6 154 114  10
--226 170  11 236 186  11 225 175  15 184 144  12
--215 174  15 175 146  61  37  26   9   2   2   6
-- 70  70  70 246 246 246 138 138 138   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  66  66  66  26  26  26   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14  10  10  10
--195 195 195 188 164 115 192 133   9 225 175  15
--239 182  13 234 190  10 232 195  16 232 200  30
--245 207  45 241 208  19 232 195  16 184 144  12
--218 194 134 211 206 186  42  42  42   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  74  74  74  30  30  30   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  86  86  86  14  14  14   2   2   6
--121  87  25 192 133   9 219 162  10 239 182  13
--236 186  11 232 195  16 241 208  19 244 214  54
--246 218  60 246 218  38 246 215  20 241 208  19
--241 208  19 226 184  13 121  87  25   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  82  82  82  34  34  34  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  82  82  82  30  30  30  61  42   6
--180 123   7 206 145  10 230 174  11 239 182  13
--234 190  10 238 202  15 241 208  19 246 218  74
--246 218  38 246 215  20 246 215  20 246 215  20
--226 184  13 215 174  15 184 144  12   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 26  26  26  94  94  94  42  42  42  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  50  50  50 104  69   6
--192 133   9 216 158  10 236 178  12 236 186  11
--232 195  16 241 208  19 244 214  54 245 215  43
--246 215  20 246 215  20 241 208  19 198 155  10
--200 144  11 216 158  10 156 118  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  90  90  90  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  46  46  46  22  22  22
--137  92   6 210 162  10 239 182  13 238 190  10
--238 202  15 241 208  19 246 215  20 246 215  20
--241 208  19 203 166  17 185 133  11 210 150  10
--216 158  10 210 150  10 102  78  10   2   2   6
--  6   6   6  54  54  54  14  14  14   2   2   6
--  2   2   6  62  62  62  74  74  74  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  78  78  78  50  50  50   6   6   6
-- 94  70  30 139 102  15 190 146  13 226 184  13
--232 200  30 232 195  16 215 174  15 190 146  13
--168 122  10 192 133   9 210 150  10 213 154  11
--202 150  34 182 157 106 101  98  89   2   2   6
--  2   2   6  78  78  78 116 116 116  58  58  58
--  2   2   6  22  22  22  90  90  90  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  50  50  50   6   6   6
--128 128 128 174 154 114 156 107  11 168 122  10
--198 155  10 184 144  12 197 138  11 200 144  11
--206 145  10 206 145  10 197 138  11 188 164 115
--195 195 195 198 198 198 174 174 174  14  14  14
--  2   2   6  22  22  22 116 116 116 116 116 116
-- 22  22  22   2   2   6  74  74  74  70  70  70
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 101 101 101  26  26  26  10  10  10
--138 138 138 190 190 190 174 154 114 156 107  11
--197 138  11 200 144  11 197 138  11 192 133   9
--180 123   7 190 142  34 190 178 144 187 187 187
--202 202 202 221 221 221 214 214 214  66  66  66
--  2   2   6   2   2   6  50  50  50  62  62  62
--  6   6   6   2   2   6  10  10  10  90  90  90
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  34  34  34
-- 74  74  74  74  74  74   2   2   6   6   6   6
--144 144 144 198 198 198 190 190 190 178 166 146
--154 121  60 156 107  11 156 107  11 168 124  44
--174 154 114 187 187 187 190 190 190 210 210 210
--246 246 246 253 253 253 253 253 253 182 182 182
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  62  62  62
-- 74  74  74  34  34  34  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  22  22  22  54  54  54
-- 94  94  94  18  18  18   2   2   6  46  46  46
--234 234 234 221 221 221 190 190 190 190 190 190
--190 190 190 187 187 187 187 187 187 190 190 190
--190 190 190 195 195 195 214 214 214 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
-- 82  82  82   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 86  86  86  54  54  54  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  46  46  46  90  90  90
-- 46  46  46  18  18  18   6   6   6 182 182 182
--253 253 253 246 246 246 206 206 206 190 190 190
--190 190 190 190 190 190 190 190 190 190 190 190
--206 206 206 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--202 202 202  14  14  14   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  86  86  86  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  38  38  38  74  74  74  66  66  66
--  2   2   6   6   6   6  90  90  90 250 250 250
--253 253 253 253 253 253 238 238 238 198 198 198
--190 190 190 190 190 190 195 195 195 221 221 221
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253  82  82  82   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  78  78  78  70  70  70  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  66  66  66  78  78  78   6   6   6
--  2   2   6  18  18  18 218 218 218 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--226 226 226 231 231 231 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 178 178 178   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  18  18  18  90  90  90  62  62  62
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 58  58  58  90  90  90  18  18  18   2   2   6
--  2   2   6 110 110 110 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231  18  18  18   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  94  94  94
-- 54  54  54  26  26  26  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 90  90  90  26  26  26   2   2   6   2   2   6
-- 14  14  14 195 195 195 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 242 242 242  54  54  54   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
-- 86  86  86  50  50  50  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  38  38  38  82  82  82
-- 34  34  34   2   2   6   2   2   6   2   2   6
-- 42  42  42 195 195 195 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 242 242 242 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 246 246 246 238 238 238
--226 226 226 231 231 231 101 101 101   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 38  38  38  82  82  82  42  42  42  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  62  62  62  66  66  66
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 70  70  70 170 170 170 206 206 206 234 234 234
--246 246 246 250 250 250 250 250 250 238 238 238
--226 226 226 231 231 231 238 238 238 250 250 250
--250 250 250 250 250 250 246 246 246 231 231 231
--214 214 214 206 206 206 202 202 202 202 202 202
--198 198 198 202 202 202 182 182 182  18  18  18
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  62  62  62  66  66  66  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  82  82  82  18  18  18
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 94  94  94 182 182 182 218 218 218 242 242 242
--250 250 250 253 253 253 253 253 253 250 250 250
--234 234 234 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--238 238 238 226 226 226 210 210 210 202 202 202
--195 195 195 195 195 195 210 210 210 158 158 158
--  6   6   6  14  14  14  50  50  50  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  86  86  86  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54  70  70  70   2   2   6
--  2   2   6  10  10  10   2   2   6  22  22  22
--166 166 166 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--231 231 231 206 206 206 198 198 198 226 226 226
-- 94  94  94   2   2   6   6   6   6  38  38  38
-- 30  30  30   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  62  62  62  66  66  66
-- 26  26  26  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74  50  50  50   2   2   6
-- 26  26  26  26  26  26   2   2   6 106 106 106
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246 218 218 218 202 202 202
--210 210 210  14  14  14   2   2   6   2   2   6
-- 30  30  30  22  22  22   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  86  86  86
-- 42  42  42  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  90  90  90  22  22  22   2   2   6
-- 42  42  42   2   2   6  18  18  18 218 218 218
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 221 221 221
--218 218 218 101 101 101   2   2   6  14  14  14
-- 18  18  18  38  38  38  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 58  58  58  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  82  82  82   2   2   6  26  26  26
-- 22  22  22   2   2   6 123 123 123 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--238 238 238 198 198 198   6   6   6  38  38  38
-- 58  58  58  26  26  26  38  38  38   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
-- 78  78  78  30  30  30  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  30  30  30
-- 74  74  74  58  58  58   2   2   6  42  42  42
--  2   2   6  22  22  22 231 231 231 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246  46  46  46  38  38  38
-- 42  42  42  14  14  14  38  38  38  14  14  14
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  42  42  42
-- 90  90  90  18  18  18  18  18  18  26  26  26
--  2   2   6 116 116 116 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253  94  94  94   6   6   6
--  2   2   6   2   2   6  10  10  10  34  34  34
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  26  26  26  66  66  66
-- 82  82  82   2   2   6  38  38  38   6   6   6
-- 14  14  14 210 210 210 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 246 246 246 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 144 144 144   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  74  74  74  30  30  30  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  42  42  42  90  90  90
-- 26  26  26   6   6   6  42  42  42   2   2   6
-- 74  74  74 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 242 242 242 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 182 182 182   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 10  10  10  86  86  86  38  38  38  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  66  66  66  82  82  82
--  2   2   6  22  22  22  18  18  18   2   2   6
--149 149 149 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  86  86  86  46  46  46  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  46  46  46  86  86  86  18  18  18
--  2   2   6  34  34  34  10  10  10   6   6   6
--210 210 210 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 221 221 221   6   6   6
--  2   2   6   2   2   6   6   6   6  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 26  26  26  66  66  66  62  62  62   2   2   6
--  2   2   6  38  38  38  10  10  10  26  26  26
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231   6   6   6
--  2   2   6   2   2   6  10  10  10  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  78  78  78   6   6   6   2   2   6
--  2   2   6  46  46  46  14  14  14  42  42  42
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  10  10  10
--  2   2   6   2   2   6  22  22  22  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50  74  74  74   2   2   6   2   2   6
-- 14  14  14  70  70  70  34  34  34  62  62  62
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  14  14  14
--  2   2   6   2   2   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  62  62  62   2   2   6   2   2   6
--  2   2   6  30  30  30  46  46  46  70  70  70
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 226 226 226  10  10  10
--  2   2   6   6   6   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58  62  62  62   2   2   6   2   2   6
--  2   2   6   2   2   6  30  30  30  78  78  78
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
-- 22  22  22  34  34  34  18  14   6  22  22  22
-- 26  26  26  18  18  18   6   6   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  26  26  26
-- 62  62  62 106 106 106  74  54  14 185 133  11
--210 162  10 121  92   8   6   6   6  62  62  62
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 158 158 158  18  18  18
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  6   6   6  18  18  18  66  66  66  38  38  38
--  6   6   6  94  94  94  50  50  50  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 10  10  10  10  10  10  18  18  18  38  38  38
-- 78  78  78 142 134 106 216 158  10 242 186  14
--246 190  14 246 190  14 156 118  10  10  10  10
-- 90  90  90 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 230 190
--238 204  91 238 204  91 181 142  44  37  26   9
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  38  38  38  46  46  46
-- 26  26  26 106 106 106  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  22  22  22
-- 30  30  30  38  38  38  50  50  50  70  70  70
--106 106 106 190 142  34 226 170  11 242 186  14
--246 190  14 246 190  14 246 190  14 154 114  10
--  6   6   6  74  74  74 226 226 226 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 228 184  62
--241 196  14 241 208  19 232 195  16  38  30  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  30  30  30  26  26  26
--203 166  17 154 142  90  66  66  66  26  26  26
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  38  38  38  58  58  58
-- 78  78  78  86  86  86 101 101 101 123 123 123
--175 146  61 210 150  10 234 174  13 246 186  14
--246 190  14 246 190  14 246 190  14 238 190  10
--102  78  10   2   2   6  46  46  46 198 198 198
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 224 178  62
--242 186  14 241 196  14 210 166  10  22  18   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6 121  92   8
--238 202  15 232 195  16  82  82  82  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  38  38  38  70  70  70 154 122  46
--190 142  34 200 144  11 197 138  11 197 138  11
--213 154  11 226 170  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--225 175  15  46  32   6   2   2   6  22  22  22
--158 158 158 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 242 242 242 224 178  62
--239 182  13 236 186  11 213 154  11  46  32   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 225 175  15
--238 190  10 236 186  11 112 100  78  42  42  42
-- 14  14  14   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54 154 122  46 213 154  11
--226 170  11 230 174  11 226 170  11 226 170  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 184 144  12  10  10  10   2   2   6
--  6   6   6 116 116 116 242 242 242 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231 198 198 198 214 170  54
--236 178  12 236 178  12 210 150  10 137  92   6
-- 18  14   6   2   2   6   2   2   6   2   2   6
--  6   6   6  70  47   6 200 144  11 236 178  12
--239 182  13 239 182  13 124 112  88  58  58  58
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  70  70  70 180 133  36 226 170  11
--239 182  13 242 186  14 242 186  14 246 186  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16  98  70   6   2   2   6
--  2   2   6   2   2   6  66  66  66 221 221 221
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 206 206 206 198 198 198 214 166  58
--230 174  11 230 174  11 216 158  10 192 133   9
--163 110   8 116  81   8 102  78  10 116  81   8
--167 114   7 197 138  11 226 170  11 239 182  13
--242 186  14 242 186  14 162 146  94  78  78  78
-- 34  34  34  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78 190 142  34 226 170  11
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 241 196  14 203 166  17  22  18   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--218 218 218 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 206 206 206 198 198 198 202 162  69
--226 170  11 236 178  12 224 166  10 210 150  10
--200 144  11 197 138  11 192 133   9 197 138  11
--210 150  10 226 170  11 242 186  14 246 190  14
--246 190  14 246 186  14 225 175  15 124 112  88
-- 62  62  62  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 174 135  50 224 166  10
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 139 102  15
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 78  78  78 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 214 214 214 198 198 198 190 150  46
--219 162  10 236 178  12 234 174  13 224 166  10
--216 158  10 213 154  11 213 154  11 216 158  10
--226 170  11 239 182  13 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 206 162  42
--101 101 101  58  58  58  30  30  30  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74 174 135  50 216 158  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 226 184  13
-- 61  42   6   2   2   6   2   2   6   2   2   6
-- 22  22  22 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 226 226 226 187 187 187 180 133  36
--216 158  10 236 178  12 239 182  13 236 178  12
--230 174  11 226 170  11 226 170  11 230 174  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 186  14 239 182  13
--206 162  42 106 106 106  66  66  66  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 213 154  11
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 241 196  14
--190 146  13  18  14   6   2   2   6   2   2   6
-- 46  46  46 246 246 246 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 221 221 221  86  86  86 156 107  11
--216 158  10 236 178  12 242 186  14 246 186  14
--242 186  14 239 182  13 239 182  13 242 186  14
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 225 175  15 142 122  72  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 210 150  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--232 195  16 121  92   8  34  34  34 106 106 106
--221 221 221 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--242 242 242  82  82  82  18  14   6 163 110   8
--216 158  10 236 178  12 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 163 133  67
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 163 133  67 210 150  10
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 215 174  15 190 178 144 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 218 218 218
-- 58  58  58   2   2   6  22  18   6 167 114   7
--216 158  10 236 178  12 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 186  14 242 186  14 190 150  46
-- 54  54  54  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 38  38  38  86  86  86 180 133  36 213 154  11
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16 190 146  13 214 214 214
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 170 170 170  26  26  26
--  2   2   6   2   2   6  37  26   9 163 110   8
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 224 166  10 142 122  72
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 109 106  95 192 133   9 224 166  10
--242 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 226 184  13 210 162  10 142 110  46
--226 226 226 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--198 198 198  66  66  66   2   2   6   2   2   6
--  2   2   6   2   2   6  50  34   6 156 107  11
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 242 186  14
--234 174  13 213 154  11 154 122  46  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58 154 121  60 206 145  10 234 174  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 210 162  10 163 110   8
-- 61  42   6 138 138 138 218 218 218 250 250 250
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 210 210 210 144 144 144  66  66  66
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 163 110   8
--216 158  10 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 239 182  13 230 174  11 216 158  10
--190 142  34 124 112  88  70  70  70  38  38  38
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 62  62  62 168 124  44 206 145  10 224 166  10
--236 178  12 239 182  13 242 186  14 242 186  14
--246 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 236 178  12 216 158  10 175 118   6
-- 80  54   7   2   2   6   6   6   6  30  30  30
-- 54  54  54  62  62  62  50  50  50  38  38  38
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 167 114   7
--213 154  11 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 242 186  14 239 182  13 239 182  13
--230 174  11 210 150  10 174 135  50 124 112  88
-- 82  82  82  54  54  54  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 158 118  36 192 133   9 200 144  11
--216 158  10 219 162  10 224 166  10 226 170  11
--230 174  11 236 178  12 239 182  13 239 182  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 230 174  11 210 150  10 163 110   8
--104  69   6  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  91  60   6 167 114   7
--206 145  10 230 174  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 186  14 242 186  14
--239 182  13 230 174  11 224 166  10 213 154  11
--180 133  36 124 112  88  86  86  86  58  58  58
-- 38  38  38  22  22  22  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  70  70  70 138 110  50 158 118  36
--167 114   7 180 123   7 192 133   9 197 138  11
--200 144  11 206 145  10 213 154  11 219 162  10
--224 166  10 230 174  11 239 182  13 242 186  14
--246 186  14 246 186  14 246 186  14 246 186  14
--239 182  13 216 158  10 185 133  11 152  99   6
--104  69   6  18  14   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 152  99   6
--192 133   9 219 162  10 236 178  12 239 182  13
--246 186  14 242 186  14 239 182  13 236 178  12
--224 166  10 206 145  10 192 133   9 154 121  60
-- 94  94  94  62  62  62  42  42  42  22  22  22
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  34  34  34  58  58  58  78  78  78
--101  98  89 124 112  88 142 110  46 156 107  11
--163 110   8 167 114   7 175 118   6 180 123   7
--185 133  11 197 138  11 210 150  10 219 162  10
--226 170  11 236 178  12 236 178  12 234 174  13
--219 162  10 197 138  11 163 110   8 130  83   6
-- 91  60   6  10  10  10   2   2   6   2   2   6
-- 18  18  18  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  26  26  26   2   2   6
--  2   2   6   6   6   6  70  47   6 137  92   6
--175 118   6 200 144  11 219 162  10 230 174  11
--234 174  13 230 174  11 219 162  10 210 150  10
--192 133   9 163 110   8 124 112  88  82  82  82
-- 50  50  50  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  22  22  22  34  34  34
-- 42  42  42  58  58  58  74  74  74  86  86  86
--101  98  89 122 102  70 130  98  46 121  87  25
--137  92   6 152  99   6 163 110   8 180 123   7
--185 133  11 197 138  11 206 145  10 200 144  11
--180 123   7 156 107  11 130  83   6 104  69   6
-- 50  34   6  54  54  54 110 110 110 101  98  89
-- 86  86  86  82  82  82  78  78  78  78  78  78
-- 78  78  78  78  78  78  78  78  78  78  78  78
-- 78  78  78  82  82  82  86  86  86  94  94  94
--106 106 106 101 101 101  86  66  34 124  80   6
--156 107  11 180 123   7 192 133   9 200 144  11
--206 145  10 200 144  11 192 133   9 175 118   6
--139 102  15 109 106  95  70  70  70  42  42  42
-- 22  22  22  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  10  10  10
-- 14  14  14  22  22  22  30  30  30  38  38  38
-- 50  50  50  62  62  62  74  74  74  90  90  90
--101  98  89 112 100  78 121  87  25 124  80   6
--137  92   6 152  99   6 152  99   6 152  99   6
--138  86   6 124  80   6  98  70   6  86  66  30
--101  98  89  82  82  82  58  58  58  46  46  46
-- 38  38  38  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  38  38  38  42  42  42
-- 54  54  54  82  82  82  94  86  76  91  60   6
--134  86   6 156 107  11 167 114   7 175 118   6
--175 118   6 167 114   7 152  99   6 121  87  25
--101  98  89  62  62  62  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6   6   6   6  10  10  10
-- 18  18  18  22  22  22  30  30  30  42  42  42
-- 50  50  50  66  66  66  86  86  86 101  98  89
--106  86  58  98  70   6 104  69   6 104  69   6
--104  69   6  91  60   6  82  62  34  90  90  90
-- 62  62  62  38  38  38  22  22  22  14  14  14
-- 10  10  10  10  10  10  10  10  10  10  10  10
-- 10  10  10  10  10  10   6   6   6  10  10  10
-- 10  10  10  10  10  10  10  10  10  14  14  14
-- 22  22  22  42  42  42  70  70  70  89  81  66
-- 80  54   7 104  69   6 124  80   6 137  92   6
--134  86   6 116  81   8 100  82  52  86  86  86
-- 58  58  58  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 18  18  18  26  26  26  38  38  38  54  54  54
-- 70  70  70  86  86  86  94  86  76  89  81  66
-- 89  81  66  86  86  86  74  74  74  50  50  50
-- 30  30  30  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  34  34  34  58  58  58
-- 82  82  82  89  81  66  89  81  66  89  81  66
-- 94  86  66  94  86  76  74  74  74  50  50  50
-- 26  26  26  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  14  14  14  18  18  18
-- 30  30  30  38  38  38  46  46  46  54  54  54
-- 50  50  50  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  26  26  26
-- 38  38  38  50  50  50  58  58  58  58  58  58
-- 54  54  54  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
--  6   6   6  10  10  10  14  14  14  18  18  18
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  18  18  18  22  22  22  22  22  22
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 23 30 36 44 54 65 57 72 88 44 54 65 6 12 15 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 31 41 52 
-+103 134 161 163 205 246 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 143 185 225 
-+82 108 129 8 14 16 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 17 24 30 126 162 196 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 161 203 243 92 119 140 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 44 54 65 154 195 235 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 138 174 208 21 27 33 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 70 96 117 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 157 198 239 49 59 70 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 3 6 52 62 74 170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 
-+82 108 129 149 191 231 170 212 252 170 212 252 170 212 252 129 165 199 82 108 129 149 191 231 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 37 48 59 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 21 13 4 31 23 12 0 2 0 0 2 0 105 75 32 155 111 43 23 15 7 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 6 9 3 10 13 146 188 228 170 212 252 170 212 252 170 212 252 157 198 239 0 6 9 
-+0 2 0 52 62 74 170 212 252 170 212 252 154 195 235 0 6 9 0 2 0 55 66 77 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 151 193 233 17 24 30 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+10 12 8 23 15 7 139 99 44 206 148 61 67 49 21 0 2 0 125 92 35 206 148 61 
-+15 9 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 96 127 154 170 212 252 170 212 252 170 212 252 170 212 252 92 119 140 21 22 20 
-+10 12 8 53 68 84 170 212 252 170 212 252 92 119 140 10 12 8 7 10 5 53 68 84 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 134 170 204 
-+0 6 9 0 3 6 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 21 22 20 
-+62 64 61 38 40 37 0 2 0 34 26 8 212 153 66 64 46 18 0 2 0 170 124 49 
-+180 132 57 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+18 22 24 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 65 87 102 115 117 114 
-+43 44 42 88 115 136 170 212 252 170 212 252 68 83 99 108 110 107 60 62 59 88 115 136 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+80 98 121 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 10 12 8 56 58 55 95 96 94 178 180 177 215 217 214 198 200 197 
-+158 160 156 138 140 137 82 83 81 0 2 0 64 46 18 228 167 73 23 15 7 41 31 10 
-+250 179 73 55 39 17 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+75 94 116 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 63 78 94 0 2 0 
-+0 2 0 126 162 196 170 212 252 170 212 252 57 72 88 0 2 0 0 2 0 126 162 196 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+157 198 239 8 14 16 0 6 9 0 2 0 45 47 44 195 197 194 192 194 191 38 40 37 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 192 194 191 234 236 233 176 178 175 118 120 117 143 145 142 176 178 175 
-+215 217 214 234 236 233 234 236 233 104 106 103 0 2 0 142 101 40 134 100 43 0 2 0 
-+164 119 51 170 124 49 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 115 152 185 8 14 16 
-+49 59 70 166 207 248 170 212 252 170 212 252 119 150 178 8 14 16 55 66 77 166 207 248 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 92 119 140 0 2 0 0 2 0 200 202 199 254 255 252 254 255 252 244 246 243 
-+40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 38 40 37 234 236 233 234 236 233 234 236 233 135 137 134 215 217 214 171 173 170 
-+141 142 139 138 140 137 138 140 137 135 137 134 31 32 30 3 6 2 212 153 66 15 9 7 
-+78 58 25 248 178 79 41 31 10 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 3 6 21 27 33 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 163 205 246 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 154 195 235 0 6 9 82 83 81 254 255 252 254 255 252 254 255 252 254 255 252 
-+188 190 187 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 62 64 61 234 236 233 234 236 233 234 236 233 198 200 197 131 133 130 198 200 197 
-+232 234 231 234 236 233 234 236 233 234 236 233 152 154 151 0 2 0 147 105 44 67 49 21 
-+23 15 7 250 179 73 158 114 46 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 61 76 92 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 154 195 235 103 134 161 80 98 121 
-+52 62 74 18 22 24 0 2 0 3 10 13 38 45 51 80 98 121 151 193 233 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 109 141 168 0 2 0 169 171 168 254 255 252 254 255 252 254 255 252 254 255 252 
-+226 228 225 65 66 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 43 44 42 234 236 233 234 236 233 234 236 233 234 236 233 131 133 130 192 194 191 
-+152 154 151 141 142 139 141 142 139 141 142 139 158 160 156 3 6 2 82 62 28 129 95 39 
-+0 2 0 206 148 61 248 178 79 21 13 4 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 96 115 138 
-+170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 18 22 24 0 2 0 0 2 0 
-+34 26 8 75 55 22 114 83 33 95 68 30 55 39 17 7 0 0 0 6 9 84 103 125 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 84 103 125 0 2 0 229 231 228 254 255 252 254 255 252 254 255 252 171 173 170 
-+0 2 0 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 18 20 17 234 236 233 234 236 233 234 236 233 234 236 233 138 140 137 178 180 177 
-+226 228 225 234 236 233 234 236 233 234 236 233 231 233 230 45 47 44 23 15 7 190 136 56 
-+0 2 0 147 105 44 250 179 73 64 46 18 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 126 162 196 0 2 0 26 20 13 190 136 56 245 175 76 
-+250 179 73 161 117 49 164 119 51 245 175 76 250 179 73 206 148 61 75 55 22 0 2 0 
-+126 162 196 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 68 83 99 0 2 0 252 254 250 254 255 252 254 255 252 254 255 252 71 73 70 
-+8 14 16 88 115 136 17 24 30 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 232 234 231 234 236 233 234 236 233 234 236 233 215 217 214 148 150 147 
-+183 185 181 141 142 139 135 137 134 135 137 134 141 142 139 87 89 86 0 2 0 202 145 58 
-+3 6 2 88 66 26 250 179 73 109 79 35 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 157 198 239 
-+170 212 252 170 212 252 166 207 248 26 33 39 26 20 13 224 163 69 250 179 73 250 179 73 
-+250 179 73 197 142 62 202 145 58 250 179 73 250 179 73 250 179 73 234 172 70 21 13 4 
-+38 45 51 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 52 62 74 21 22 20 254 255 252 254 255 252 254 255 252 254 255 252 21 22 20 
-+49 59 70 170 212 252 166 207 248 91 123 149 8 14 16 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 215 217 214 234 236 233 234 236 233 234 236 233 234 236 233 123 125 122 
-+188 190 187 229 231 228 234 236 233 234 236 233 222 224 221 118 120 117 0 2 0 168 123 54 
-+34 26 8 67 49 21 250 179 73 134 100 43 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 34 41 47 170 212 252 
-+170 212 252 170 212 252 85 112 133 0 2 0 164 119 51 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 129 95 39 
-+0 2 0 138 174 208 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 34 44 55 45 47 44 254 255 252 254 255 252 254 255 252 254 255 252 24 22 25 
-+52 62 74 170 212 252 170 212 252 170 212 252 138 174 208 10 16 18 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 178 180 177 234 236 233 234 236 233 234 236 233 234 236 233 141 142 139 
-+198 200 197 148 150 147 135 137 134 135 137 134 148 150 147 123 125 122 0 2 0 190 136 56 
-+21 13 4 78 58 25 250 179 73 129 95 39 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 82 108 129 170 212 252 
-+170 212 252 170 212 252 23 30 36 58 42 19 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 147 105 44 
-+0 2 0 139 181 221 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 34 41 47 45 47 44 254 255 252 254 255 252 254 255 252 254 255 252 56 58 55 
-+25 32 38 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 10 16 18 0 6 9 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 91 93 90 234 236 233 234 236 233 234 236 233 234 236 233 126 127 125 
-+169 171 168 222 224 221 234 236 233 229 231 228 178 180 177 71 73 70 0 2 0 212 153 66 
-+0 2 0 95 68 30 250 179 73 119 87 37 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 138 174 208 170 212 252 
-+170 212 252 154 195 235 0 2 0 125 92 35 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 119 87 37 
-+0 2 0 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 57 72 88 7 10 5 252 254 250 254 255 252 254 255 252 254 255 252 95 96 94 
-+0 6 9 166 207 248 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 8 14 16 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 7 10 5 222 224 221 234 236 233 234 236 233 234 236 233 141 142 139 
-+183 185 181 138 140 137 131 133 130 141 142 139 192 194 191 102 104 101 0 2 0 224 163 69 
-+0 2 0 105 75 32 250 179 73 55 39 17 7 0 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 21 27 33 170 212 252 170 212 252 
-+170 212 252 115 152 185 0 2 0 180 132 57 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 228 167 73 10 12 8 
-+38 45 51 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 82 108 129 0 2 0 222 224 221 254 255 252 254 255 252 254 255 252 158 160 156 
-+0 2 0 92 119 140 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 122 159 192 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 141 142 139 234 236 233 234 236 233 234 236 233 131 133 130 
-+185 187 183 231 233 230 222 224 221 158 160 156 138 140 137 48 50 48 3 6 2 250 179 73 
-+134 100 43 206 148 61 218 158 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 75 94 116 170 212 252 170 212 252 
-+170 212 252 92 119 140 0 2 0 224 163 69 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 87 61 23 7 0 0 
-+134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 109 141 168 0 2 0 178 180 177 254 255 252 254 255 252 254 255 252 252 254 250 
-+39 43 45 10 16 18 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+88 115 136 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 45 47 44 234 236 233 234 236 233 234 236 233 131 133 130 
-+148 150 147 138 140 137 148 150 147 210 212 209 152 154 151 26 27 25 29 21 8 250 179 73 
-+250 179 73 234 172 70 55 39 17 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 126 162 196 170 212 252 170 212 252 
-+170 212 252 103 134 161 0 2 0 202 145 58 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 238 175 73 75 55 22 0 2 0 75 102 123 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 140 177 211 0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 
-+183 185 181 0 2 0 75 94 116 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 57 72 88 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 162 164 161 234 236 233 234 236 233 135 137 134 
-+226 228 225 198 200 197 104 106 103 15 17 14 0 2 0 15 9 7 147 105 44 250 179 73 
-+248 178 79 55 39 17 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 21 27 33 170 212 252 170 212 252 170 212 252 
-+170 212 252 122 159 192 0 2 0 175 129 54 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 202 145 58 55 39 17 0 2 0 82 108 129 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 12 17 20 60 62 59 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 69 71 68 0 6 9 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 159 201 241 26 33 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 7 10 5 162 164 161 215 217 214 95 96 94 
-+56 58 55 0 2 0 0 2 0 0 2 0 61 44 16 238 175 73 250 179 73 250 179 73 
-+218 158 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 88 115 136 170 212 252 170 212 252 170 212 252 
-+170 212 252 143 185 225 0 2 0 147 105 44 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 212 153 66 95 68 30 0 2 0 8 14 16 103 134 161 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 68 83 99 0 2 0 231 233 230 254 255 252 254 255 252 254 255 252 
-+254 255 252 210 212 209 0 6 9 53 68 84 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 126 162 196 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 23 15 7 250 179 73 250 179 73 250 179 73 
-+250 179 73 29 21 8 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 166 207 248 0 2 0 52 36 13 158 114 46 180 132 57 161 117 49 119 87 37 
-+41 31 10 0 2 0 0 2 0 72 87 103 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 115 152 185 0 2 0 152 154 151 254 255 252 238 241 237 85 87 84 
-+229 231 228 254 255 252 99 101 98 0 2 0 126 162 196 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 63 78 94 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 202 145 58 250 179 73 250 179 73 
-+250 179 73 105 75 32 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 32 39 45 0 2 0 57 72 88 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 85 112 133 12 17 20 0 2 0 0 2 0 0 2 0 0 2 0 
-+34 41 47 92 110 133 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 166 207 248 6 12 15 71 73 70 254 255 252 229 231 228 0 2 0 
-+141 142 139 254 255 252 231 233 230 10 12 8 34 44 55 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 154 195 235 6 12 15 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 125 92 35 250 179 73 250 179 73 
-+250 179 73 180 132 57 0 2 0 0 2 0 0 2 0 0 2 0 3 10 13 68 83 99 
-+129 165 199 85 112 133 0 2 0 122 159 192 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 126 162 196 119 156 189 134 170 204 149 191 231 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 57 72 88 3 6 2 242 244 240 254 255 252 35 37 34 
-+78 80 77 254 255 252 254 255 252 128 130 127 0 2 0 105 137 164 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 91 123 149 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 55 39 17 250 179 73 250 179 73 
-+250 179 73 245 175 76 7 10 5 0 2 0 44 54 65 103 134 161 161 203 243 170 212 252 
-+170 212 252 21 27 33 25 32 38 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 61 76 92 0 2 0 242 244 240 254 255 252 102 104 101 
-+10 12 8 231 233 230 254 255 252 244 246 243 26 27 25 21 27 33 159 201 241 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 32 39 45 0 6 9 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 218 158 64 250 179 73 
-+250 179 73 250 179 73 75 55 22 0 2 0 161 203 243 170 212 252 170 212 252 170 212 252 
-+115 147 174 0 2 0 91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 159 201 241 146 188 228 
-+140 177 211 134 170 204 146 188 228 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 17 24 30 62 64 61 254 255 252 254 255 252 215 217 214 
-+0 2 0 102 104 101 254 255 252 254 255 252 166 168 165 0 2 0 72 87 103 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 75 32 250 179 73 
-+250 179 73 250 179 73 150 108 46 0 2 0 113 145 172 170 212 252 170 212 252 170 212 252 
-+49 59 70 3 10 13 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 166 207 248 109 141 168 65 87 102 28 35 41 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 28 35 41 70 96 117 138 174 208 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 0 2 0 102 104 101 254 255 252 254 255 252 254 255 252 
-+102 104 101 0 2 0 192 194 191 254 255 252 254 255 252 78 80 77 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 34 44 55 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 61 76 92 154 195 235 0 6 9 29 21 8 250 179 73 
-+250 179 73 250 179 73 224 163 69 0 2 0 68 83 99 170 212 252 170 212 252 143 179 213 
-+0 2 0 72 87 103 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+161 203 243 96 115 138 17 24 30 0 2 0 0 2 0 45 47 44 102 104 101 123 125 122 
-+138 140 137 143 145 142 115 117 114 82 83 81 43 44 42 0 2 0 0 2 0 32 39 45 
-+126 162 196 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 0 2 0 85 87 84 254 255 252 254 255 252 254 255 252 
-+242 244 240 27 29 27 35 37 34 254 255 252 254 255 252 231 233 230 10 12 8 21 27 33 
-+159 201 241 170 212 252 170 212 252 170 212 252 170 212 252 163 205 246 0 6 9 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 44 54 65 170 212 252 170 212 252 34 44 55 0 2 0 82 62 28 
-+109 79 35 224 163 69 250 179 73 52 36 13 15 20 22 170 212 252 170 212 252 75 89 106 
-+0 2 0 143 179 213 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 134 170 204 
-+25 32 38 0 2 0 40 41 39 155 157 153 238 241 237 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 210 212 209 115 117 114 18 20 17 
-+0 2 0 68 83 99 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 52 62 74 7 10 5 234 236 233 254 255 252 254 255 252 
-+254 255 252 195 197 194 102 104 101 254 255 252 254 255 252 254 255 252 162 164 161 0 2 0 
-+72 87 103 170 212 252 170 212 252 170 212 252 170 212 252 119 156 189 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 115 147 174 170 212 252 91 123 149 0 2 0 0 2 0 6 12 15 
-+0 2 0 15 9 7 197 142 62 125 92 35 0 2 0 115 152 185 113 145 172 3 6 2 
-+41 51 62 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 113 145 172 0 6 9 
-+10 12 8 155 157 153 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 232 234 231 
-+87 89 86 0 2 0 32 39 45 154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 115 152 185 0 2 0 138 140 137 254 255 252 254 255 252 
-+254 255 252 254 255 252 249 251 248 254 255 252 254 255 252 254 255 252 254 255 252 65 66 64 
-+0 2 0 122 159 192 170 212 252 170 212 252 170 212 252 66 80 97 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 154 195 235 170 212 252 143 179 213 88 115 136 149 191 231 170 212 252 
-+126 162 196 3 6 2 64 46 18 202 145 58 0 2 0 0 2 0 0 2 0 0 2 0 
-+92 119 140 170 212 252 170 212 252 170 212 252 170 212 252 143 179 213 3 10 13 27 29 27 
-+215 217 214 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 155 157 153 0 2 0 32 39 45 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 23 30 36 27 29 27 249 251 248 254 255 252 
-+254 255 252 188 190 187 7 10 5 226 228 225 254 255 252 254 255 252 254 255 252 231 233 230 
-+7 10 5 21 27 33 159 201 241 170 212 252 103 134 161 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 119 156 189 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 55 66 77 11 4 3 250 179 73 24 17 10 0 2 0 0 2 0 0 2 0 
-+143 185 225 170 212 252 170 212 252 170 212 252 159 201 241 28 35 41 7 10 5 200 202 199 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 155 157 153 0 2 0 55 66 77 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 96 127 154 0 2 0 158 160 156 254 255 252 
-+254 255 252 192 194 191 0 2 0 176 178 175 254 255 252 254 255 252 254 255 252 254 255 252 
-+141 142 139 0 2 0 72 87 103 129 165 199 0 6 9 0 6 9 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 12 17 20 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 
-+138 174 208 17 24 30 29 21 8 250 179 73 101 72 28 0 2 0 0 2 0 32 39 45 
-+170 212 252 170 212 252 170 212 252 170 212 252 57 72 88 0 2 0 152 154 151 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 108 110 107 0 2 0 115 152 185 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 18 22 24 40 41 39 254 255 252 
-+254 255 252 232 234 231 0 2 0 148 150 147 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 10 12 8 0 2 0 8 14 16 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 41 51 62 61 76 92 34 44 55 3 10 13 
-+0 2 0 11 4 3 164 119 51 250 179 73 175 129 54 0 2 0 0 2 0 82 108 129 
-+170 212 252 170 212 252 170 212 252 98 129 156 0 2 0 95 96 94 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 238 241 237 18 20 17 25 32 38 166 207 248 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 85 112 133 0 2 0 188 190 187 
-+254 255 252 254 255 252 198 200 197 242 244 240 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 120 122 119 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 0 2 0 0 6 9 7 0 0 
-+31 23 12 202 145 58 250 179 73 250 179 73 238 175 73 0 2 0 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 28 35 41 31 32 30 244 246 243 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 152 154 151 0 2 0 85 112 133 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 0 2 0 148 150 147 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 222 224 221 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+7 0 0 234 172 70 250 179 73 250 179 73 250 179 73 34 26 8 0 2 0 149 191 231 
-+170 212 252 170 212 252 129 165 199 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 252 254 250 48 50 48 3 10 13 146 188 228 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 157 198 239 0 2 0 118 120 117 
-+254 255 252 254 255 252 254 255 252 169 171 168 231 233 230 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 170 124 49 250 179 73 250 179 73 250 179 73 48 33 15 6 12 15 170 212 252 
-+170 212 252 170 212 252 65 87 102 0 2 0 222 224 221 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 195 197 194 0 2 0 84 103 125 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 3 10 13 85 87 84 
-+254 255 252 254 255 252 234 236 233 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 99 101 98 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 95 68 30 250 179 73 250 179 73 250 179 73 34 26 8 34 44 55 170 212 252 
-+170 212 252 163 205 246 8 14 16 62 64 61 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 35 37 34 34 44 55 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 26 33 39 60 62 59 
-+254 255 252 254 255 252 238 241 237 0 2 0 108 110 107 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 158 160 156 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 23 15 7 248 178 79 250 179 73 245 175 76 0 2 0 63 78 94 170 212 252 
-+170 212 252 109 141 168 0 2 0 158 160 156 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 104 106 103 0 2 0 
-+154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 21 27 33 69 71 68 
-+254 255 252 254 255 252 244 246 243 0 2 0 91 93 90 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 215 217 214 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 197 142 62 250 179 73 212 153 66 0 2 0 92 110 133 170 212 252 
-+170 212 252 80 98 121 0 2 0 231 233 230 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 176 178 175 0 2 0 
-+105 137 164 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 8 14 16 87 89 86 
-+254 255 252 254 255 252 254 255 252 40 41 39 21 22 20 252 254 250 254 255 252 254 255 252 
-+254 255 252 254 255 252 252 254 250 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 125 92 35 250 179 73 170 124 49 0 2 0 113 145 172 170 212 252 
-+170 212 252 53 68 84 15 17 14 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 242 244 240 0 2 0 
-+63 78 94 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 0 2 0 104 106 103 
-+254 255 252 254 255 252 254 255 252 123 125 122 0 2 0 166 168 165 254 255 252 254 255 252 
-+254 255 252 254 255 252 234 236 233 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 7 0 0 52 36 13 250 179 73 129 95 39 0 2 0 143 179 213 170 212 252 
-+170 212 252 32 39 45 48 50 48 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 60 62 59 
-+18 22 24 170 212 252 170 212 252 170 212 252 170 212 252 163 205 246 0 2 0 102 104 101 
-+254 255 252 254 255 252 254 255 252 226 228 225 15 17 14 10 12 8 215 217 214 254 255 252 
-+254 255 252 254 255 252 210 212 209 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 88 66 26 29 21 8 0 2 0 166 207 248 170 212 252 
-+170 212 252 3 10 13 85 87 84 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 123 125 122 
-+0 2 0 149 191 231 170 212 252 170 212 252 170 212 252 170 212 252 21 27 33 56 58 55 
-+254 255 252 254 255 252 254 255 252 254 255 252 178 180 177 0 2 0 38 40 37 238 241 237 
-+254 255 252 254 255 252 210 212 209 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 7 0 0 0 2 0 161 203 243 170 212 252 
-+149 191 231 0 2 0 123 125 122 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 141 142 139 
-+0 2 0 143 179 213 170 212 252 170 212 252 170 212 252 170 212 252 66 80 97 0 2 0 
-+210 212 209 254 255 252 254 255 252 254 255 252 254 255 252 120 122 119 0 2 0 21 22 20 
-+143 145 142 244 246 243 219 221 218 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 149 191 231 170 212 252 
-+129 165 199 0 2 0 158 160 156 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 155 157 153 
-+0 2 0 134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 143 185 225 0 6 9 
-+69 71 68 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 71 73 70 0 2 0 
-+0 2 0 0 2 0 40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 139 181 221 170 212 252 
-+129 165 199 0 2 0 162 164 161 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 169 171 168 
-+0 2 0 119 156 189 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 75 94 116 
-+0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 69 71 68 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 134 170 204 170 212 252 
-+134 170 204 0 2 0 152 154 151 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 183 185 181 
-+0 2 0 113 145 172 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 
-+44 54 65 0 2 0 162 164 161 254 255 252 254 255 252 254 255 252 35 37 34 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 126 162 196 170 212 252 
-+138 174 208 0 2 0 143 145 142 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 198 200 197 
-+0 2 0 103 134 161 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+157 198 239 28 35 41 0 2 0 188 190 187 254 255 252 252 254 250 3 6 2 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 115 152 185 170 212 252 
-+143 179 213 0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 210 212 209 
-+0 2 0 91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 146 188 228 0 6 9 26 27 25 242 244 240 176 178 175 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 137 164 170 212 252 
-+143 185 225 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 185 187 183 
-+0 2 0 105 137 164 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 163 205 246 0 2 0 0 2 0 102 104 101 60 62 59 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 80 98 121 170 212 252 
-+149 191 231 0 2 0 118 120 117 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 143 145 142 
-+0 2 0 134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 143 179 213 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 44 54 65 170 212 252 
-+170 212 252 3 10 13 85 87 84 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 108 110 107 
-+0 2 0 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 115 152 185 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 3 10 13 170 212 252 
-+170 212 252 34 44 55 43 44 42 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 69 71 68 
-+15 20 22 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 75 94 116 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 139 181 221 
-+170 212 252 63 78 94 3 6 2 249 251 248 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 31 32 30 
-+41 51 62 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+161 203 243 6 12 15 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 137 164 
-+170 212 252 88 115 136 0 2 0 210 212 209 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 249 251 248 0 2 0 
-+68 83 99 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+96 127 154 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 61 76 92 
-+170 212 252 119 150 178 0 2 0 169 171 168 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 183 185 181 0 2 0 
-+91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+28 35 41 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 
-+146 188 228 143 185 225 0 2 0 126 127 125 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 85 87 84 0 6 9 
-+154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 98 129 156 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+72 90 112 170 212 252 18 22 24 56 58 55 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 238 241 237 7 10 5 55 66 77 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 122 159 192 0 6 9 
-+0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 122 159 192 72 87 103 0 2 0 229 231 228 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 152 154 151 0 2 0 113 145 172 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 139 181 221 8 14 16 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 18 22 24 109 141 168 0 2 0 148 150 147 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 56 58 55 12 17 20 166 207 248 
-+170 212 252 170 212 252 170 212 252 170 212 252 146 188 228 23 30 36 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 101 72 28 202 145 58 
-+180 132 57 0 2 0 38 45 51 3 10 13 69 71 68 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 200 202 199 0 2 0 75 89 106 170 212 252 
-+170 212 252 170 212 252 170 212 252 109 141 168 8 14 16 0 2 0 21 13 4 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 7 0 0 0 2 0 101 72 28 218 158 64 250 179 73 250 179 73 
-+250 179 73 139 99 44 0 2 0 8 14 16 0 2 0 238 241 237 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 244 246 243 38 40 37 3 10 13 139 181 221 170 212 252 
-+170 212 252 161 203 243 66 80 97 0 2 0 31 23 12 191 142 60 248 183 74 180 132 57 
-+44 34 15 0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 23 15 7 190 136 56 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 150 108 46 0 2 0 0 2 0 82 83 81 222 224 221 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 102 104 101 0 2 0 98 129 156 170 212 252 163 205 246 
-+98 129 156 23 30 36 0 2 0 82 62 28 234 172 70 248 183 74 248 183 74 248 183 74 
-+248 183 74 158 114 46 29 21 8 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 64 46 18 109 79 35 150 108 46 224 163 69 250 179 73 
-+250 179 73 250 179 73 250 179 73 158 114 46 0 2 0 0 2 0 3 6 2 115 117 114 
-+234 236 233 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 176 178 175 0 2 0 57 72 88 146 188 228 80 98 121 8 14 16 
-+0 2 0 24 17 10 158 114 46 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 242 178 77 58 42 19 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 0 2 0 67 49 21 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 228 167 73 95 68 30 0 2 0 0 2 0 
-+0 2 0 52 54 51 108 110 107 162 164 161 219 221 218 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 252 254 250 
-+219 221 218 178 180 177 18 20 17 6 12 15 26 33 39 0 2 0 0 2 0 52 36 13 
-+164 119 51 242 178 77 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 242 178 77 
-+187 138 56 175 129 54 158 114 46 82 62 28 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 78 58 25 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 234 172 70 142 101 40 
-+44 34 15 10 12 8 0 2 0 0 2 0 0 2 0 18 20 17 60 62 59 71 73 70 
-+82 83 81 95 96 94 104 106 103 118 120 117 115 117 114 78 80 77 40 41 39 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 44 34 15 105 75 32 191 142 60 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 105 75 32 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 187 138 56 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 142 101 40 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 206 148 61 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 161 117 49 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 228 167 73 250 179 73 
-+238 175 73 190 136 56 158 114 46 234 172 70 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 147 105 44 0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 67 49 21 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 
-+31 23 12 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 10 5 21 13 4 
-+0 2 0 0 2 0 0 2 0 147 105 44 250 179 73 250 179 73 250 179 73 250 179 73 
-+134 100 43 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 155 111 43 248 183 74 248 183 74 
-+248 183 74 248 183 74 224 163 69 55 39 17 64 46 18 164 119 51 242 178 77 248 183 74 
-+75 55 22 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 202 145 58 250 179 73 250 179 73 228 167 73 88 66 26 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 168 123 54 248 183 74 
-+248 183 74 248 183 74 158 114 46 0 2 0 7 0 0 0 2 0 10 12 8 44 34 15 
-+15 9 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 29 21 8 250 179 73 250 179 73 158 114 46 15 14 3 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 175 129 54 
-+248 183 74 248 183 74 114 83 33 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 29 21 8 147 105 44 58 42 19 0 2 0 7 0 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+105 75 32 218 158 64 23 15 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-diff --git a/drivers/video/logo/logo_linux_mono.pbm b/drivers/video/logo/logo_linux_mono.pbm
-index 2f14d9f..3d3c358 100644
---- a/drivers/video/logo/logo_linux_mono.pbm
-+++ b/drivers/video/logo/logo_linux_mono.pbm
-@@ -1,203 +1,159 @@
--P1
--# Standard black and white Linux logo
--80 80
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 0 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1
--1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 0 0 1 1 1 1 1 1 0 0 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 0 0 0 1 1 1 1 0 0 0 0 0 0 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 1 1 0 0 1 1 1 0 0 1 1 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 1 1 1 0 1 1 1 1 0 0 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 0 1 1 1 0 1 1 1 1 0 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 1 1 0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 0 0 1 0 0 0 0 0 1 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 0 0 0 0 0 0 0 0 0 1 1 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 0 0 0 0 0 1 1 0 0 0 0 1 1
--1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 0 0 0 0 1 1 0 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 1 0 0 0 0 0 0 0 0 1 1 0 0 0 1
--1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1
--0 0 1 0 0 0 0 0 1 1 0 0 0 0 0 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0
--1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 0 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1
--0 0 0 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 0 1 1 1 1 1 1 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 0
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1
--1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 0 1 1 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 0 0 0 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 1 0 0 0 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 1 1 1 1 1 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 1 1 1 1 1 1 1 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 1 1 1 1 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
--1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1
--1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1
--1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--1 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0
--1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
--1 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 0 0 0 0 0 0 0 0 0 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-+P2
-+80  78
-+255 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 255 255 255 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 255 255 255 255 255 0 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 
-+255 0 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 
-+255 255 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 
-+255 255 0 0 0 0 0 0 0 0 
-+0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 
-+255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 255 255 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 0 255 255 0 0 255 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 255 255 255 0 0 255 
-+255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 0 255 255 255 0 255 
-+255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 0 255 255 255 0 0 
-+255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 
-+0 255 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 
-+0 255 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 
-+0 0 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 255 255 0 0 255 255 0 0 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 255 255 255 
-+255 0 0 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 255 0 0 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 
-+255 0 0 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 0 0 255 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 255 255 255 
-+255 255 0 0 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 255 255 255 255 0 255 255 255 
-+255 255 255 0 0 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 0 255 255 255 
-+255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 0 0 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 255 0 
-+0 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 255 255 
-+0 0 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 0 0 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-diff --git a/drivers/video/logo/logo_linux_vga16.ppm b/drivers/video/logo/logo_linux_vga16.ppm
-index 1850c15..f279f97 100644
---- a/drivers/video/logo/logo_linux_vga16.ppm
-+++ b/drivers/video/logo/logo_linux_vga16.ppm
-@@ -1,1604 +1,18724 @@
- P3
--# Standard 16-color Linux logo
--80 80
--255
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 170 170 170  85  85  85   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170 170 170 170 170 170
--170 170 170   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170 170 170 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170 170 170 170 255 255 255 255 255 255
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 255 255 255 170 170 170 170 170 170
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170   0   0   0   0   0   0 255 255 255
-- 85  85  85   0   0   0   0   0   0   0   0   0
--255 255 255 170 170 170   0   0   0  85  85  85
--170 170 170 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0 170 170 170
-- 85  85  85   0   0   0   0   0   0   0   0   0
--255 255 255  85  85  85   0   0   0   0   0   0
-- 85  85  85 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170   0   0   0   0   0   0 170 170 170
-- 85  85  85  85  85  85  85  85  85  85  85  85
--255 255 255  85  85  85   0   0   0   0   0   0
-- 85  85  85 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
-- 85  85  85 255 255 255   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--170 170 170 170 170 170 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170 170 170 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0 170  85   0  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
-- 85  85  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0  85  85  85   0   0   0
--  0   0   0  85  85  85 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
-- 85  85  85 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170 170 170 170 170 170 170 170 170   0   0   0
--  0   0   0   0   0   0 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170 170 170 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 170 170 170
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0 170 170 170
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0  85  85  85 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 170 170 170
--170 170 170 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 170 170 170 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170 170 170
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0 170 170 170
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0  85  85  85
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--  0   0   0  85  85  85 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0  85  85  85
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--  0   0   0 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0  85  85  85   0   0   0   0   0   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170  85  85  85 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85  85  85  85  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 170 170 170
-- 85  85  85   0   0   0   0   0   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170  85  85  85
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 170  85   0 170  85   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85  85  85  85  85  85  85 170  85   0
--170  85   0 170  85   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-+# CREATOR: GIMP PNM Filter Version 1.1
-+80 78
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
diff --git a/kernels/linux-libre-xen/change-default-console-loglevel.patch b/kernels/linux-libre-xen/change-default-console-loglevel.patch
deleted file mode 100644
index 22cd69a09..000000000
--- a/kernels/linux-libre-xen/change-default-console-loglevel.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
---- linux-3.0.orig/kernel/printk/printk.c	2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0/kernel/printk/printk.c	2011-07-27 14:43:07.000000000 +0300
-@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea
- 
- /* We show everything that is MORE important than this.. */
- #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
--#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
-+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */
- 
- DECLARE_WAIT_QUEUE_HEAD(log_wait);
- 
diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config
deleted file mode 100644
index 56e58eb2d..000000000
--- a/kernels/linux-libre-xen/config
+++ /dev/null
@@ -1,6508 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.0-1 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-XEN"
-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=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_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_XEN=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_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_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=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-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 is not set
-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_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_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 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_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_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
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=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_HVC_XEN=y
-CONFIG_HVC_XEN_FRONTEND=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
-CONFIG_XEN_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_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_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
-
-#
-# 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_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_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
-# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
-CONFIG_LUSTRE_LLITE_LLOOP=y
-CONFIG_LNET=m
-CONFIG_LNET_MAX_PAYLOAD=1048576
-CONFIG_LNET_SELFTEST=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_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/kernels/linux-libre-xen/criu-no-expert.patch b/kernels/linux-libre-xen/criu-no-expert.patch
deleted file mode 100644
index 2124427e9..000000000
--- a/kernels/linux-libre-xen/criu-no-expert.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/init/Kconfig b/init/Kconfig
-index be8b7f5..7461760 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP
- endif # CGROUPS
- 
- config CHECKPOINT_RESTORE
--	bool "Checkpoint/restore support" if EXPERT
-+	bool "Checkpoint/restore support"
- 	default n
- 	help
- 	  Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1000,7 +1000,7 @@ config CHECKPOINT_RESTORE
- 	  If unsure, say N here.
- 
- menuconfig NAMESPACES
--	bool "Namespaces support" if EXPERT
-+	bool "Namespaces support"
- 	default !EXPERT
- 	help
- 	  Provides the way to make tasks work with different objects using
diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install
deleted file mode 100644
index 0683dce3d..000000000
--- a/kernels/linux-libre-xen/linux-libre-xen.install
+++ /dev/null
@@ -1,35 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-KERNEL_NAME=-xen
-KERNEL_VERSION=
-
-post_install () {
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  if command -v mkinitcpio 2>&1 > /dev/null; then
-    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-    mkinitcpio -p linux-libre${KERNEL_NAME}
-  fi
-}
-
-post_upgrade() {
-  if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
-    echo "WARNING: /boot appears to be a separate partition but is not mounted."
-  fi
-
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  if command -v mkinitcpio 2>&1 > /dev/null; then
-    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-    mkinitcpio -p linux-libre${KERNEL_NAME}
-  fi
-}
-
-post_remove() {
-  # also remove the compat symlinks
-  rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img
-  rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img
-}
diff --git a/kernels/linux-libre-xen/linux-libre-xen.preset b/kernels/linux-libre-xen/linux-libre-xen.preset
deleted file mode 100644
index 6d5019d92..000000000
--- a/kernels/linux-libre-xen/linux-libre-xen.preset
+++ /dev/null
@@ -1,14 +0,0 @@
-# mkinitcpio preset file for the 'linux-libre-xen' package
-
-ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="/boot/vmlinuz-linux-libre-xen"
-
-PRESETS=('default' 'fallback')
-
-#default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-linux-libre-xen.img"
-#default_options=""
-
-#fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/initramfs-linux-libre-xen-fallback.img" 
-fallback_options="-S autodetect"
diff --git a/kernels/xen-docs/PKGBUILD b/kernels/xen-docs/PKGBUILD
deleted file mode 100644
index 5fd22b1f7..000000000
--- a/kernels/xen-docs/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=xen-docs
-pkgver=4.2.1
-pkgrel=1
-pkgdesc="Xen 4 (docs)"
-arch=(i686 x86_64)
-url="http://www.xen.org/"
-license="GPL"
-depends=('markdown')
-conflicts=('xen4' 'xen3' 'xen-hv-tools' 'libxen4')
-
-
-source=(http://bits.xensource.com/oss-xen/release/${pkgver}/xen-${pkgver}.tar.gz)
-
-build() {
-  cd $srcdir/xen-${pkgver}
-  unset CFLAGS LDFLAGS
-  make PYTHON=python2 DESTDIR=$pkgdir  install-docs
- }
-
-md5sums=('0d48cbe1767b82aba12517898d4e0408')
diff --git a/kernels/xen/09_xen b/kernels/xen/09_xen
deleted file mode 100755
index 43d050904..000000000
--- a/kernels/xen/09_xen
+++ /dev/null
@@ -1,127 +0,0 @@
-#! /bin/sh -e
-
-if [ -f /usr/share/grub/grub-mkconfig_lib ]; then
-    . /usr/share/grub/grub-mkconfig_lib
-else
-  # no grub file, so we notify and exit gracefully
-    echo "Cannot find grub config file, exiting." >&2
-    exit 0
-fi
-
-XEN_HYPERVISOR_CMDLINE="xsave=1"
-XEN_LINUX_CMDLINE="console=tty0"
-[ -r /etc/xen/grub.conf ] && . /etc/xen/grub.conf
-
-CLASS="--class gnu-linux --class gnu --class os"
-
-if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
-    OS=GNU/Linux
-else
-  if [ "${GRUB_DISTRIBUTOR}" = "Parabola" ] ; then
-      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
-  elif [ "${GRUB_DISTRIBUTOR}" = "parabola" ] ; then
-      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
-  else
-      OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-  fi
-    CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
-fi
-
-# loop-AES arranges things so that /dev/loop/X can be our root device, but
-# the initrds that Linux uses don't like that.
-case ${GRUB_DEVICE} in
-    /dev/loop/*|/dev/loop[0-9])
-            GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"`
-            ;;
-esac
-
-if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
-    || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
-    || [ "`grub-probe -t abstraction --device ${GRUB_DEVICE} | sed -e 's,.*\(lvm\).*,\1,'`" = "lvm"  ] ; then
-    LINUX_ROOT_DEVICE=${GRUB_DEVICE}
-else
-    LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
-fi
-
-xen_entry ()
-{
-    os="$1"
-    xen_version="$2"
-    version="$3"
-    xen_args="$4"
-    args="$5"
-    printf "menuentry 'Xen %s / %s, with Linux %s' --class xen ${CLASS} {\n" "${xen_version}" "${os}" "${version}"
-    save_default_entry | sed -e "s/^/\t/"
-
-    if [ -z "${prepare_boot_cache}" ]; then
-        prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
-    fi
-    printf '%s\n' "${prepare_boot_cache}"
-    cat << EOF
-       echo    '$(printf "Loading Xen %s ..." ${xen_version})'
-       multiboot       ${rel_dirname}/${xen_basename} ${rel_dirname}/${xen_basename} ${xen_args}
-       echo    $(printf "$(gettext "Loading Linux %s ...")" ${version})
-       module  ${rel_dirname}/${basename} ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-EOF
-    if test -n "${initrd}" ; then
-        cat << EOF
-       echo    "Loading initial ramdisk ..."
-       module  ${rel_dirname}/${initrd}
-EOF
-    fi
-    cat << EOF
-}
-EOF
-}
-
-xen_list=`for i in /boot/xen-*.gz /xen-*.gz ; do
-       if grub_file_is_not_garbage "$i" ; then echo -n "$i "; fi
-done`
-prepare_boot_cache=
-
-while [ "x$xen_list" != "x" ] ; do
-    xen=`version_find_latest $xen_list`
-    echo "Found Xen hypervisor image: $xen" >&2
-    xen_basename=`basename $xen`
-    xen_dirname=`dirname $xen`
-    rel_xen_dirname=`make_system_path_relative_to_its_root $xen_dirname`
-    xen_version=`echo $xen_basename | sed -e "s,^[^0-9]*-,,g" | sed -e "s,.gz,,g"`
-    alt_xen_version=`echo $xen_version | sed -e "s,\.old$,,g"`
-
-    list="/boot/vmlinuz-linux";
-
-    while [ "x$list" != "x" ] ; do
-        linux=`version_find_latest $list`
-        echo -e "\tFound linux image: $linux" >&2
-        basename=`basename $linux`
-        dirname=`dirname $linux`
-        rel_dirname=`make_system_path_relative_to_its_root $dirname`
-        version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
-        base_init=`echo $basename | sed -e "s,vmlinuz,initramfs,g"`
-        alt_version="${base_init}-fallback"
-        linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
-        initrd=
-
-        for i in "${base_init}.img"; do
-            if test -e "${dirname}/${i}" ; then
-                initrd="$i"
-                break
-            fi
-        done
-        if test -n "${initrd}" ; then
-            echo -e "\tFound initrd image: ${dirname}/${initrd}" >&2
-        else
-      # "UUID=" magic is parsed by initrds.  Since there's no initrd, it can't work here.
-            linux_root_device_thisversion=${GRUB_DEVICE}
-        fi
-
-        xen_entry "${OS}" "${xen_version}" "${version}" \
-            "${XEN_HYPERVISOR_CMDLINE}" \
-            "${XEN_LINUX_CMDLINE}"
-
-        list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
-    done
-
-    xen_list=`echo $xen_list | tr ' ' '\n' | grep -vx $xen | tr '\n' ' '`
-done
-
diff --git a/kernels/xen/PKGBUILD b/kernels/xen/PKGBUILD
deleted file mode 100644
index a6718a6ae..000000000
--- a/kernels/xen/PKGBUILD
+++ /dev/null
@@ -1,145 +0,0 @@
-# Contributor: Shanmu Thiagaraja <sthiagaraja+AUR@prshanmu.com>
-# Contributor: Limao Luo
-# Contributor: Luceo
-# Contributor: Revellion
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgname=xen
-pkgver=4.2.1
-pkgrel=6
-pkgdesc="Xen Hypervisor & Tools (Parabola rebranded)"
-arch=(i686 x86_64)
-url=http://www.xen.org/
-license=(GPL2)
-depends=(bin86 bluez bridge-utils glib2 gnutls libaio libjpeg-turbo libpng lzo2 sdl wget vde2 yajl)
-[[ "$CARCH" == "x86_64" ]] && depends+=(lib32-glibc)
-makedepends=(dev86 git iasl markdown ocaml-findlib)
-optdepends=('xen-docs: Official Xen Documentation')
-conflicts=(xen-4.2{,-testing-hg} xen-{gdbsx,hg-unstable,rc})
-backup=(etc/$pkgname/xend-{config,pci-{permissive,quirks}}.sxp etc/modules-load.d/$pkgname.conf etc/$pkgname/xl.conf)
-options=(!buildflags !strip)
-install=$pkgname.install
-source=(http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz
-    09_xen
-    gcc-4.8-typedefs.patch
-    gdbsx-glibc-2.17.patch
-    texi2html.patch
-    timer-add-lrt-lm.patch
-    qemu-makefile.patch
-    proc-xen.mount
-    var-lib-xenstored.mount
-    xenconsoled.service
-    xendomains.service
-    xendomU@.service
-    xenstored.service
-    tmpfiles.d-$pkgname.conf
-    $pkgname.conf)
-
-prepare() {
-    cd $pkgname-$pkgver/
-    patch -Np1 -i ../gcc-4.8-typedefs.patch
-    patch -Np1 -i ../gdbsx-glibc-2.17.patch
-    patch -Np1 -i ../texi2html.patch
-    patch -Np1 -i ../timer-add-lrt-lm.patch
-    patch -Np1 -i ../qemu-makefile.patch
-    sed -i '203i\\t\t--disable-docs \\' tools/Makefile # disable qemu doc generation b/c of an error
-}
-
-build() {
-    export CFLAGS+='-Wall -Wstrict-prototypes -Wno-unused-local-typedefs -Wno-sizeof-pointer-memaccess'
-    cd $pkgname-$pkgver/
-    ./autogen.sh
-    ./configure PYTHON=/usr/bin/python2
-    unset CFLAGS
-}
-
-package() {
-    cd $pkgname-$pkgver/
-
-    make DESTDIR="$pkgdir" LANG=C PYTHON=python2 install-{xen,tools,stubdom}
-
-    cd ../
-    for f in ${source[@]}; do
-        [[ $f =~ .mount || $f =~ .service ]] && install -Dm644 $f "$pkgdir"/usr/lib/systemd/system/$f
-    done
-    install -Dm644 tmpfiles.d-$pkgname.conf "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf
-    install -Dm644 $pkgname.conf "$pkgdir"/etc/modules-load.d/$pkgname.conf
-    install -Dm755 09_xen "$pkgdir"/etc/grub.d/09_xen
-
-    cd "$pkgdir"
-    sed -i ':XENDOM_CONFIG=/etc/:s:sysconfig/xendomains:conf.d/xendomains:' etc/init.d/xendomains
-    sed -i 's:touch /var/lock/subsys/xend:mkdir -p /var/lock/subsys\n       &:' etc/init.d/xend
-
-    if [[ -d usr/lib64 ]]; then
-        cd usr/
-        cp -r lib64/* lib/
-        rm -rf lib64
-    fi
-
-    mv etc/{init,rc}.d
-
-    mv usr/local/etc/qemu/ etc/
-    rm -rf usr/local/share/
-    mv etc/rc.d/xendomains etc/xen/scripts/xendomains
-
-    ##### Kill unwanted stuff #####
-    # stubdom: newlib
-    rm -rf usr/*-xen-elf
-
-    # hypervisor symlinks
-    rm -f boot/xen{,-4,-4.2}.gz
-
-    # silly doc dir fun
-    rm -rf usr/share/doc/xen
-    rm -rf usr/share/doc/qemu
-
-    # Pointless helper
-    rm -f usr/sbin/xen-python-path
-
-    # qemu stuff (unused or available from upstream)
-    rm -rf usr/share/xen/man
-    rm -rf usr/bin/qemu-*-xen
-    for file in bamboo.dtb bios.bin openbios-ppc openbios-sparc32 openbios-sparc64 \
-        ppc_rom.bin pxe-e1000.bin pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin \
-        vgabios-cirrus.bin vgabios.bin video.x; do
-        rm -f usr/share/xen/qemu/$file
-    done
-
-    # adhere to Static Library Packaging Guidelines
-    rm -rf usr/lib/*.a
-
-    # Fix errors from deprecated xend
-    rm etc/udev/rules.d/xend.rules
-
-    rmdir usr/local/etc etc/xen/auto var/xen/dump var/lock/subsys usr/share/doc var/lib/xen/xenpaging var/run/xend/boot var/log/xen
-}
-sha256sums=('fb8df5827ce3e2d2d3b078d9e5afde502beb5e7ab9442e51a94087061bd450c6'
-            'cee994b4c788808c0148caeb5f798cc98b9268bb9f04448ff7c3ed479bfb7821'
-            'e7c77f5fe5b6f4bd5cb3e077d44a2219252592e09e3350316ba4505575f04039'
-            'f78593f1b3b4d6201644ecce77c6dd5bb7378dc53eff7cc940a80e3cd1bf72f4'
-            '08e5bf65c833a608470ad118ce369e32f9c267e1787f2900c06708af321225e6'
-            '4d55132a8e47fbfe415bf3c88824b6dcf48e4da1fff86d2b07e0c2c9e42c0a63'
-            '247fbfacf3212c26b673e1d7c3cc29eb0d1e903c217f16ef9dab5ed667ee139d'
-            '139eed988bfaf8edc8ccdfd0b668382bd63db48ce17be91776182a7e28e9d88c'
-            'c19146931c6ab8e53092bd9b2ebbfda5c76fd22ad3b1d42dcda3dd1b61f123ff'
-            'ba8f1c10b3f3df1f9fda0782a691fed67661e36f49be74471c86850639fee3ba'
-            '0bd45d9de6456c4f9adf32e726f2db3a3cd0423c1d161b442e8a1666d2e68e3f'
-            '1862a14607582d14247b74435dfb16411fd68904aa19e2a93c5e6ac301169d3c'
-            'a0ad5a7d9262c2d22a8875a47cff2c821885ddb65c0c9eb7518befb0f42fcce7'
-            '6bddcea43922f72a1c8ab556c3f20067d7f817220bcd9c1c61d18f3a58dfaa9d'
-            '50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c')
-sha512sums=('fe27a965e2b34035bd025482eda9fc4d4e82523c929323fd30813367d5ffbe2fa1ed3d7d4479f2632e8b5625972448b7bd6a7768e8dc1dcd1b6747d281cc1a9e'
-            '9f8f53ffbf19dbd56fcc56e994385b99fff537a3e295756c1e9d886f7a5f454577ec20bbd7c26516e4f80f1cf24e6d5af7dae251e32470872128eb52f6e1866f'
-            '88fa8b499aabd1baee5537cbdc6b8f150badb81e40b77f8e19e5b38c70803a953a2a72725065b74bb228ee242ccbcda57428af349cf17272613f7deb1afcb75c'
-            'fb7dbd3d9ca610c0b476cf7202e4bd051d85de2de8e92c0c3ac59dc327bc47820eddfa67a8dc01fde21d1a3209f83b6f8533bdc7ecd0634ff503f2fac61fee6d'
-            '562f12e723116c705fc9d0fd4a2afd382a93465be7f616d1e20e87daf39c11029fbc57ec46e38d3ff61c482fdc9ac4df9e07600a77515867d9da6f0faf3da7f9'
-            'a0baec71e9240fa9a72aa67e0783fe1200afb2ff61c625f5e96e536a8839213ada9908e776ed243a866065084f61a06d286ae2488c158730c1dd2d424cf4b0dc'
-            '738bfe72ab6c03d6b84c8f594fb8a63adc148edc4f9eb7beb279aa06002171fd957dbcee3b850bfbb5672f3d740047f41f59b5fdea0970a2de1a24b178fd5972'
-            '6afdf16e32bb837faf6333334f86855a746f1f46fee9673a4fddc62eecf41f9856bc34397807203c6f5071f0b1ce74532214084042154585c0d39514450db25c'
-            '00e340f4d3635e3850ca24baea1da08467523c17815feb74161e18397b607fef904db2165fd9bf4632a6e8a6e37aeddad4e56965e1c99b5213c98b3f9afc6aad'
-            '27d7289a8bf6e15bddcb360287001429205b57ee4d791b0337328879ffd76b8e375e3c1dd0de0ab57dd4bd1e2a2bc1748c44cc05b2528632a3e6af60f626de9d'
-            'f00034f8b826b828659a0177f0a6454113c625e69a817dfe32e461767f6643e0288bfc2a22d23358504240df627af6e3b8f5ffa0077e241e590b33d3f252e74c'
-            '31fefc739f0f0e568df03dcf9aa02e0265ff4fbf77e7ae62d6a318fcc34e87a0ffd3fc4b84ff8c9cc95511e2e74b7b61e6b5471cd0b3cd47ee0da86b1ea90268'
-            'd93509c53a3f80ab266f75a54633bba070a7ef48f629168f074c7c37d36ee9c98d2d30703bed41b1c163d960f2a3ac9f435b335db6e7b8a6e9c97044ede8b76e'
-            '97fb10771fad1c59c1168ede6e4a37710937821c0a053e77df7907b0a33137a190731b0130fb1d373c196a04450360a9cd3202617a77b1726613c523613cd194'
-            'ccaa2ff82e4203b11e5dec9aeccac2e165721d8067e0094603ecaa7a70b78c9eb9e2287a32687883d26b6ceae6f8d2ad7636ddf949eb658637b3ceaa6999711b')
diff --git a/kernels/xen/gcc-4.8-typedefs.patch b/kernels/xen/gcc-4.8-typedefs.patch
deleted file mode 100644
index 6cda7cb80..000000000
--- a/kernels/xen/gcc-4.8-typedefs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Config.mk	2012-12-17 09:59:58.000000000 -0500
-+++ b/Config.mk	2013-04-12 17:32:44.673277553 -0400
-@@ -166,6 +166,9 @@
- $(call cc-option-add,HOSTCFLAGS,HOSTCC,-Wdeclaration-after-statement)
- $(call cc-option-add,CFLAGS,CC,-Wdeclaration-after-statement)
- $(call cc-option-add,CFLAGS,CC,-Wno-unused-but-set-variable)
-+$(call cc-option-add,CFLAGS,CC,-Wno-unused-local-typedefs)
-+$(call cc-option-add,CFLAGS,CC,-Wno-sizeof-pointer-memaccess)
-+$(call cc-option-add,CFLAGS,CC,-Wformat)
- 
- LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i)) 
- CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i))
diff --git a/kernels/xen/gdbsx-glibc-2.17.patch b/kernels/xen/gdbsx-glibc-2.17.patch
deleted file mode 100644
index 310010180..000000000
--- a/kernels/xen/gdbsx-glibc-2.17.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tools/debugger/gdbsx/xg/xg_main.c
-+++ b/tools/debugger/gdbsx/xg/xg_main.c
-@@ -34,6 +34,7 @@
-  *  XGTRC(): generic trace utility
-  */
-
-+#include <sys/types.h>
- #include <stdio.h>
- #include <stddef.h>
- #include <stdarg.h>
diff --git a/kernels/xen/proc-xen.mount b/kernels/xen/proc-xen.mount
deleted file mode 100644
index 0eaa59c5f..000000000
--- a/kernels/xen/proc-xen.mount
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Mount /proc/xen files
-ConditionPathExists=/proc/xen
-RefuseManualStop=true
-
-[Mount]
-What=xenfs
-Where=/proc/xen
-Type=xenfs
diff --git a/kernels/xen/qemu-makefile.patch b/kernels/xen/qemu-makefile.patch
deleted file mode 100644
index d66cf043f..000000000
--- a/kernels/xen/qemu-makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tools/qemu-xen/Makefile.target	2013-04-05 23:39:54.000000000 +0000
-+++ b/tools/qemu-xen/Makefile.target	2013-04-25 13:54:59.360000000 +0000
-@@ -206,6 +206,7 @@
- obj-$(CONFIG_NO_KVM) += kvm-stub.o
- obj-y += memory.o
- LIBS+=-lz
-+LIBS+=-lrt
-
- QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
- QEMU_CFLAGS += $(VNC_SASL_CFLAGS)
diff --git a/kernels/xen/texi2html.patch b/kernels/xen/texi2html.patch
deleted file mode 100644
index 8f22773c9..000000000
--- a/kernels/xen/texi2html.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tools/Makefile	2012-09-17 22:25:54.683349679 -0500
-+++ b/tools/Makefile	2012-09-17 22:49:08.923331802 -0500
-@@ -164,6 +164,7 @@
- 		$(QEMU_ROOT)/xen-setup \
- 		--extra-cflags="$(EXTRA_CFLAGS_QEMU_TRADITIONAL)" \
- 		$(IOEMU_CONFIGURE_CROSS); \
-+		sed -i 's/number[ ]/number-sections /' Makefile; \
- 		$(MAKE) install
- 
- subdir-clean-qemu-xen-traditional-dir:
diff --git a/kernels/xen/timer-add-lrt-lm.patch b/kernels/xen/timer-add-lrt-lm.patch
deleted file mode 100644
index 4a170f9fe..000000000
--- a/kernels/xen/timer-add-lrt-lm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/qemu-xen-traditional/Makefile.target
-+++ b/tools/qemu-xen-traditional/Makefile.target
-@@ -520,7 +520,7 @@
- OBJS+=block-raw-posix.o
- endif
- 
--LIBS+=-lz
-+LIBS+=-lz -lm -lrt
- ifdef CONFIG_ALSA
- LIBS += -lasound
- endif
diff --git a/kernels/xen/tmpfiles.d-xen.conf b/kernels/xen/tmpfiles.d-xen.conf
deleted file mode 100644
index 504101772..000000000
--- a/kernels/xen/tmpfiles.d-xen.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/xen 0755 root root -
diff --git a/kernels/xen/var-lib-xenstored.mount b/kernels/xen/var-lib-xenstored.mount
deleted file mode 100644
index 1c2015ca2..000000000
--- a/kernels/xen/var-lib-xenstored.mount
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=mount xenstore file system
-ConditionPathExists=/proc/xen
-RefuseManualStop=true
-
-[Mount]
-What=xenstore
-Where=/var/lib/xenstored
-Type=tmpfs
-Options=mode=755
diff --git a/kernels/xen/xen.conf b/kernels/xen/xen.conf
deleted file mode 100644
index 37a5b59f7..000000000
--- a/kernels/xen/xen.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-xen-evtchn
-xen-gntdev
-xen-gntalloc
-xen-blkback
-xen-netback
-xen-pciback
-xen-acpi-processor
-## xen-acpi-processor: This module may not work on all machines; try removing this first if it causes issues.
-
-## The following were included in xencommons, but were not inserted by systemd:
-# evtchn
-# gntdev
-# netbk
-# blkbk
-# xen-scsibk
-# usbbk
-# pciback
-# blktap2
-# blktap
diff --git a/kernels/xen/xen.install b/kernels/xen/xen.install
deleted file mode 100644
index 6a109ac63..000000000
--- a/kernels/xen/xen.install
+++ /dev/null
@@ -1,31 +0,0 @@
-install_msg() {
-    cat << __EOF__
-===> IMPORTANT NOTICE:
-
-In order to complete the installation, and enable Xen,
-at the very least you must:
-1. Edit your GRUB2 config files as specified at
-    https://wiki.parabolagnulinux.org/index.php/Xen#Bootloader_Configuration
-2. Issue the following commands to allow you to create and start VMs:
-    systemctl enable xenstored.service
-    systemctl enable xenconsoled.service
-    systemctl enable xendomains.service
-For more information refer to the Wiki:
-    https://wiki.parabolagnulinux.org/index.php/Xen
-__EOF__
-
-}
-
-post_upgrade() {
-    install_msg
-}
-
-post_remove() {
-    cat << __EOF__
-===> IMPORTANT NOTICE:
-
-In order to finish removing Xen, you will need to modify
-your bootloader configuration files to load your Linux
-kernel instead of Xen kernel.
-__EOF__
-}
diff --git a/kernels/xen/xenconsoled.service b/kernels/xen/xenconsoled.service
deleted file mode 100644
index edcc8e69f..000000000
--- a/kernels/xen/xenconsoled.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Xenconsoled - handles logging from guest consoles and hypervisor
-Requires=proc-xen.mount
-After=proc-xen.mount xenstored.service
-ConditionPathExists=/proc/xen
-
-[Service]
-Type=simple
-Environment=XENCONSOLED_ARGS=
-Environment=XENCONSOLED_LOG=none
-Environment=XENCONSOLED_LOG_DIR=/var/log/xen/console
-EnvironmentFile=-/etc/conf.d/xenconsoled
-PIDFile=/var/run/xenconsoled.pid
-ExecStartPre=/usr/bin/grep -q control_d /proc/xen/capabilities
-ExecStart=/usr/sbin/xenconsoled --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/kernels/xen/xendomU@.service b/kernels/xen/xendomU@.service
deleted file mode 100644
index 57d6e520d..000000000
--- a/kernels/xen/xendomU@.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=xen domU service for domain %i
-Requires=xenstored.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/sbin/xl create /etc/xen/conf/%i.cfg
-ExecStop=/usr/sbin/xl shutdown %i
-
-[Install]
-WantedBy=multi-user.target
diff --git a/kernels/xen/xendomains.service b/kernels/xen/xendomains.service
deleted file mode 100644
index d49bd5593..000000000
--- a/kernels/xen/xendomains.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Xendomains - start and stop guests on boot and shutdown
-Requires=proc-xen.mount xenstored.service
-After=proc-xen.mount xenstored.service xenconsoled.service
-ConditionPathExists=/proc/xen
-
-[Service]
-Type=oneshot
-RemainAfterExit=true
-ExecStartPre=/usr/bin/grep -q control_d /proc/xen/capabilities
-ExecStart=/etc/xen/scripts/xendomains start
-ExecStop=/etc/xen/scripts/xendomains stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/kernels/xen/xenstored.service b/kernels/xen/xenstored.service
deleted file mode 100644
index c898fd24b..000000000
--- a/kernels/xen/xenstored.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Xenstored - daemon managing xenstore file system
-Requires=proc-xen.mount var-lib-xenstored.mount systemd-tmpfiles-setup.service
-After=proc-xen.mount var-lib-xenstored.mount systemd-tmpfiles-setup.service
-Before=libvirtd.service libvirt-guests.service
-RefuseManualStop=true
-ConditionPathExists=/proc/xen
-
-[Service]
-Type=forking
-Environment=XENSTORED_ARGS=
-EnvironmentFile=-/etc/conf.d/xenstored
-PIDFile=/var/run/xenstored.pid
-ExecStartPre=/usr/bin/grep -q control_d /proc/xen/capabilities
-ExecStart=/usr/sbin/xenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS
-ExecStartPost=/usr/bin/xenstore-write "/local/domain/0/name" "Domain-0"
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre-testing/ath9k-htc-firmware-git/LICENSE b/libre-testing/ath9k-htc-firmware-git/LICENSE
deleted file mode 100644
index 7668bcb97..000000000
--- a/libre-testing/ath9k-htc-firmware-git/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-Copyright (c) 2013 Qualcomm Atheros, Inc.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted (subject to the limitations in the
-disclaimer below) provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the
-   distribution.
-
- * Neither the name of Qualcomm Atheros nor the names of its
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
-
-NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
-GRANTED BY THIS LICENSE.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
-HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libre-testing/ath9k-htc-firmware-git/PKGBUILD b/libre-testing/ath9k-htc-firmware-git/PKGBUILD
deleted file mode 100644
index ceee17e13..000000000
--- a/libre-testing/ath9k-htc-firmware-git/PKGBUILD
+++ /dev/null
@@ -1,81 +0,0 @@
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=ath9k-htc-firmware-git
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
-pkgrel=1
-pkgdesc='Free firmware files for the Qualcomm Atheros AR7010 and AR9271 USB 802.11n NICs'
-arch=('any')
-url=('http://wireless.kernel.org/en/users/Drivers/ath9k_htc')
-license=('BSD')
-makedepends=('git' 'cmake' 'xtensa-unknown-elf-binutils' 'xtensa-unknown-elf-gcc')
-conflicts=('ath9k-htc-firmware')
-provides=('ath9k-htc-firmware')
-source=("git://github.com/olerem/open-ath9k-htc-firmware"
-        #"git://github.com/qca/open-ath9k-htc-firmware"
-        'LICENSE')
-md5sums=('SKIP'
-         '5163b2711bc481c77045850610b7dd31')
-
-prepare() {
-
-  cd $srcdir/open-ath9k-htc-firmware/target_firmware
-  mkdir -p build/{k2,magpie}
-
-}
-
-build() {
-
-  cd $srcdir/open-ath9k-htc-firmware
-
-  # use suspend_fix branch to fix "ath9k_htc: Target is unresponsive"
-  git checkout suspend_fix
-
-  export CTARGET="xtensa-unknown-elf"
-  export CFLAGS="-mtext-section-literals -O2 -pipe --param=ssp-buffer-size=4"
-  export CXXFLAGS="${CFLAGS}"
-
-  cat > target_firmware/build/toolchain.cmake <<EOF
-INCLUDE(CMakeForceCompiler)
-
-SET(CMAKE_SYSTEM_PROCESSOR xtensa)
-SET(COMPILER_PREFIX "xtensa-unknown-elf")
-SET(CMAKE_FIND_ROOT_PATH /usr/xtensa-unknown-elf)
-
-CMAKE_FORCE_C_COMPILER(/usr/bin/xtensa-unknown-elf-gcc GNU)
-EOF
-
-  cd $srcdir/open-ath9k-htc-firmware/target_firmware/build/k2
-
-  cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware/target_firmware/build/toolchain.cmake "$@" -DTARGET_K2=ON ../..
-  cd -
-
-  cd $srcdir/open-ath9k-htc-firmware/target_firmware/build/magpie
-
-  cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware/target_firmware/build/toolchain.cmake "$@" -DTARGET_MAGPIE=ON ../..
-  cd -
-
-  cd $srcdir/open-ath9k-htc-firmware/target_firmware
-
-  make -C build/k2
-  make -C build/magpie
-
-}
-
-package() {
-
-  # create firmware folder to put the free firmware files there
-  install -d -m755 $pkgdir/usr/lib/firmware
-
-  cd $srcdir/open-ath9k-htc-firmware/target_firmware
-
-  # move firmware files to firmware folder
-  cp build/{k2,magpie}/htc_*.fw $pkgdir/usr/lib/firmware
-
-  # create license folder to put the license file there
-  install -d -m755 $pkgdir/usr/share/licenses/$pkgname
-
-  # put LICENSE to license folder
-  install -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname
-  
-}
diff --git a/libre-testing/icecat/PKGBUILD b/libre-testing/icecat/PKGBUILD
deleted file mode 100644
index b153ad518..000000000
--- a/libre-testing/icecat/PKGBUILD
+++ /dev/null
@@ -1,180 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-# 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@parabola.nu>
-
-# Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
-
-# Maintainer (Arch) : Ionut Biru <ibiru@archlinux.org>
-# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
-
-# Contributor: Figue <ffigue at gmail>
-# Thank you very much to the older contributors:
-# Contributor: evr <evanroman at gmail>
-# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
-
-# Version Configuration ##############################################
-
-_pgo=false
-
-pkgname=icecat
-pkgver=17.0.1
-pkgrel=2
-
-######################################################################
-
-if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
-if $_pgo; then pkgname+='-pgo'; fi
-if [ "$pkgbase" != "$pkgname" ]; then
-  provides+=("$pkgbase=$pkgver")
-  conflicts+=("$pkgbase")
-fi
-
-pkgdesc="The GNUzilla web browser, based on Mozilla Firefox."
-arch=(
-  'i686'
-  'mips64el'
-  'x86_64'
-)
-license=(
-  'GPL2'
-  'LGPL'
-  'MPL'
-)
-depends=(
-  'alsa-lib'
-  'dbus-glib'
-  'desktop-file-utils'
-  'gtk2'
-  'hicolor-icon-theme'
-  'hunspell'
-  'libevent'
-  'libnotify'
-  'libvpx'
-  'libxt'
-  'mime-types'
-  'mozilla-common'
-  'mozilla-searchplugins'
-  'nss>=3.13.3'
-  'sqlite'
-  'startup-notification'
-)
-makedepends=(
-  'autoconf2.13'
-  'diffutils'
-  'imagemagick'
-  'imake'
-  'libidl2'
-  'librsvg'
-  'libxslt'
-  'mesa'
-  'python2'
-  'unzip'
-  'wireless_tools'
-  'zip'
-)
-[[ $CARCH != mips64el ]] && makedepends+=('yasm')
-if $_pgo; then
-  makedepends+=('xorg-server-xvfb')
-  options+=(!ccache)
-fi
-optdepends=('wireless_tools: Location detection via available WiFi networks')
-url=http://www.gnu.org/software/gnuzilla/
-install=firefox.install
-options=(!emptydirs)
-source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz
-	mozilla-bug-756390.patch::https://bugzilla.mozilla.org/attachment.cgi?id=629706
-        bug-xulrunner-copy-stub.patch libre.patch mozconfig.pgo
-        mozconfig $pkgbase.desktop firefox-install-dir.patch vendor.js shared-libs.patch)
-md5sums=('c88a29aa92fc41a07e777a0e63ac5f7e'
-         '78bbfc17be8ef2104699875300a22316'
-         '3009b176cc5f9b1e416b1bf7c45b064b'
-         '6e9f9c6e8c63333e708d7d9e4f4ca161'
-         'e4cd438a0b2a42dfb14bc7716e901e5f'
-         'd71509923cfede3e634756fee899e492'
-         'daa249d183fcf09942ff30db1b279f1e'
-         '150ac0fb3ac7b2114c8e8851a9e0516c'
-         '09428128596f92b46caaba5852738f8e'
-         '52e52f840a49eb1d14be1c0065b03a93')
-
-build() {
-  mv $pkgname-$pkgver mozilla-release
-  cd mozilla-release
-
-  cp ../mozconfig .mozconfig
-  if $_pgo; then cat ../mozconfig.pgo >> .mozconfig; fi
-  patch -Np1 -i ../firefox-install-dir.patch
-  patch -Np1 -i ../shared-libs.patch
-  patch -Np1 -i ../libre.patch
-  patch -Np1 -i ../bug-xulrunner-copy-stub.patch
-  patch -Np1 -i ../mozilla-bug-756390.patch
-
-  # Fix PRE_RELEASE_SUFFIX
-  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
-    browser/base/Makefile.in
-
-  # This is a bug, we should fix it.
-  if [[ $CARCH == mips64el ]]; then
-      # Fix MIPS N32 support.
-      sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
-          js/src/assembler/wtf/Platform.h
-      # Disable JIT.
-      sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
-          js/src/assembler/wtf/Platform.h
-      sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in
-      echo 'ac_add_options --disable-methodjit' >> .mozconfig
-      echo 'ac_add_options --disable-tracejit' >> .mozconfig
-      echo 'ac_add_options --disable-jemalloc' >> .mozconfig
-  fi
-
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase"
-  export PYTHON="/usr/bin/python2"
-  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
-  unset MAKEFLAGS
-
-  if $_pgo; then
-    export MOZ_PGO=1
-    export DISPLAY=:99
-    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-  fi
-
-  _fail=0
-  make -f client.mk build || _fail=1
-
-  if $_pgo; then
-    kill $! || true
-  fi
-  return $_fail
-}
-
-package() {
-  cd mozilla-release
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
-
-  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js"
-
-  brandingdir=browser/branding/unofficial
-  for i in 16 32 48; do
-      install -Dm644 $brandingdir/default$i.png \
-        "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgbase.png"
-  done
-
-  install -Dm644 ../$pkgbase.desktop \
-    "$pkgdir/usr/share/applications/$pkgbase.desktop"
-
-  # Use system-provided dictionaries
-  rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation}
-  ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries"
-  ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation"
-  # use mozilla-searchplugins
-  rm -rf "$pkgdir"/usr/lib/$pkgbase/searchplugins
-  ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins"
-
-  # We don't want the development stuff
-  rm -r "$pkgdir"/usr/{include,lib/$pkgbase-devel,share/idl}
-
-  #workaround for now
-  #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin"
-}
diff --git a/libre-testing/icecat/bug-xulrunner-copy-stub.patch b/libre-testing/icecat/bug-xulrunner-copy-stub.patch
deleted file mode 100644
index 8ccf127df..000000000
--- a/libre-testing/icecat/bug-xulrunner-copy-stub.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/browser/app/Makefile.in
-+++ b/browser/app/Makefile.in
-@@ -233,7 +233,7 @@
- else
- ifdef LIBXUL_SDK
- libs::
--	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
-+	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX)
- endif
- endif
- 
diff --git a/libre-testing/icecat/firefox-install-dir.patch b/libre-testing/icecat/firefox-install-dir.patch
deleted file mode 100644
index 9c115f0eb..000000000
--- a/libre-testing/icecat/firefox-install-dir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk
---- mozilla-release.orig/config/baseconfig.mk	2012-10-09 07:34:41.762092280 +0000
-+++ mozilla-release/config/baseconfig.mk	2012-10-09 07:40:53.052771576 +0000
-@@ -1,9 +1,9 @@
- INCLUDED_AUTOCONF_MK = 1
- 
--includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+includedir := $(includedir)/$(MOZ_APP_NAME)
-+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- DIST = $(DEPTH)/dist
- 
- # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk
---- mozilla-release.orig/js/src/config/baseconfig.mk	2012-10-09 07:34:58.411973276 +0000
-+++ mozilla-release/js/src/config/baseconfig.mk	2012-10-09 07:39:55.143186168 +0000
-@@ -1,7 +1,7 @@
- INCLUDED_AUTOCONF_MK = 1
- 
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- 
- ifneq (,$(filter /%,$(TOP_DIST)))
- DIST = $(TOP_DIST)
diff --git a/libre-testing/icecat/firefox.install b/libre-testing/icecat/firefox.install
deleted file mode 100644
index c1fe8284a..000000000
--- a/libre-testing/icecat/firefox.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
diff --git a/libre-testing/icecat/icecat.desktop b/libre-testing/icecat/icecat.desktop
deleted file mode 100644
index 668d5104f..000000000
--- a/libre-testing/icecat/icecat.desktop
+++ /dev/null
@@ -1,116 +0,0 @@
-[Desktop Entry]
-Name=IceCat
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Прелистувач на Интернет 
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb 
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
-Comment=Browse the World Wide Web
-Comment[ar]=تصفح الشبكة العنكبوتية العالمية
-Comment[ast]=Restola pela Rede
-Comment[bn]=ইন্টারনেট ব্রাউজ করুন
-Comment[ca]=Navegueu per la web
-Comment[cs]=Prohlížení stránek World Wide Webu
-Comment[da]=Surf på internettet
-Comment[de]=Im Internet surfen
-Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web)
-Comment[es]=Navegue por la web
-Comment[et]=Lehitse veebi
-Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
-Comment[fi]=Selaa Internetin WWW-sivuja
-Comment[fr]=Naviguer sur le Web
-Comment[gl]=Navegar pola rede
-Comment[he]=גלישה ברחבי האינטרנט
-Comment[hr]=Pretražite web
-Comment[hu]=A világháló böngészése
-Comment[it]=Esplora il web
-Comment[ja]=ウェブを閲覧します
-Comment[ko]=웹을 돌아 다닙니다
-Comment[ku]=Li torê bigere
-Comment[lt]=Naršykite internete
-Comment[nb]=Surf på nettet
-Comment[nl]=Verken het internet
-Comment[nn]=Surf på nettet
-Comment[no]=Surf på nettet
-Comment[pl]=Przeglądanie stron WWW
-Comment[pt]=Navegue na Internet
-Comment[pt_BR]=Navegue na Internet
-Comment[ro]=Navigați pe Internet
-Comment[ru]=Доступ в Интернет
-Comment[sk]=Prehliadanie internetu
-Comment[sl]=Brskajte po spletu
-Comment[sv]=Surfa på webben
-Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ
-Comment[uk]=Перегляд сторінок Інтернету
-Comment[vi]=Để duyệt các trang web
-Comment[zh_CN]=浏览互联网
-Comment[zh_TW]=瀏覽網際網路
-Exec=/usr/lib/icecat/icecat %u
-Icon=icecat
-Terminal=false
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-StartupNotify=true
-Categories=Network;WebBrowser;
diff --git a/libre-testing/icecat/libre.patch b/libre-testing/icecat/libre.patch
deleted file mode 100644
index 497b8cd10..000000000
--- a/libre-testing/icecat/libre.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-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
---- a/browser/locales/en-US/chrome/browser-region/region.properties
-+++ b/browser/locales/en-US/chrome/browser-region/region.properties
-@@ -10,23 +10,11 @@
- browser.search.order.2=Google
- browser.search.order.3=Yahoo
- 
--# 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=
--
- # 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 
- # don't make any spelling errors here.
- gecko.handlerService.defaultHandlersVersion=3
-+
-+# The default set of protocol handlers for irc:
-+gecko.handlerService.schemes.irc.0.name=Freenode
-+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
-+
-+# The default set of protocol handlers for ircs:
-+gecko.handlerService.schemes.ircs.0.name=Freenode
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
-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
---- a/browser/locales/generic/profile/bookmarks.html.in
-+++ b/browser/locales/generic/profile/bookmarks.html.in
-@@ -11,13 +11,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://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D" ID="rdf:#$GvPhC3">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://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre</A>
-+        <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Packages</A>
-+        <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Wiki</A>
-+        <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Labs</A>
-+    </DL><p>
-+    <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3>
-+    <DL><p>
-+        <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A>
-+        <DT><A HREF="http://libreplanet.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC/v78AAAAAAPLy9ABsbakA/f3+APn5+QC6ur0A6urqAEpLbQACBLQApKW3AAULuQDMzMwAGBiDAL29vQCgocsAgnzJALu82QA+PpsAAQOvAOjo6ADZ2dkAysrKALS0zwD5+foAAgKRAAYGdQD19fUADhOjAAQJyACrnqIAxMTLAOnp7gDm5uYAzczNACgobwDg2dEAQkaeAA0RkAAUFnEA0MvQAIBzgAANDYsAk5OyAOTk5ADy8vYA1dXVAD8/cADGxsYA+fn7AAMHvgBzZnQApqauAAEGuQDExMQAAAGmAAoLmgADCMQAxMTdAAwPlwD+/v4ABg7MAF5ehADg4OAA0dHRAAAAoQAYEXAAwsLCALCxwQBnadkAAQGWAPz8/ACgoLgAbm6RANvb5wDr6+sA0dHSALe3uQADB8AAzc3NAGFhbAABAZcAOTtlALi4xwAAAJoA/Pz9AAQHnwADBJcACQl4AFVa3AChl6EAAgW2ABscdAABAq4A2NjYAAAAmwDAwMoAAQKmAAcMswDR0eQAAQSxANvX2wB4aXcAAQGpAAAAkwDW1tYAAgSpACIZZAAAAaEA+vr8AKuirAACBbcA8vLyALOztgADBZYAAACcAAACpwAEA6QAAQKnAPT09QD///8AvL3UADIpigDw8PAABwWOAK6dogBub4kAiozDANLS0gAFC8gAAgW4AP39/QAAAJ0A0NDQAMHBwQDp6ewACg2RAAIFqAAKCokA+/v7AAkOnwAAAaMA7OzsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4eHh4eHh4eHh4eHh4AXh4eHhlbikzZlooeHh4eAF4eHh4hX1JVFweInh4eHgBeHh4XmlAGXNGSB8VeHh4AXg8LhaGcV9zKg0wQF54eAF4K0NNOGthjXNCUwAMS3gBPC82iW+CCRN2Iz4wTwx4AW0GgCc5OU41VnSKTBoOiwEFTz8hHIF5RANdQVRfNIMBeBUhe0o9jB0Pcjdzc1E8AXgsB3AbUlkQRVtnhHNoeAF4i45wJCAlYjJbdYRfY3gBeDwmEn4XMToKZDd6WDx4AXh4VTsIfwt3FGpsfAR4eAF4eHgEEYhQAodXYDx4eHgBeHh4eHg8GC1HPHh4eHh4AQABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAA%3D">LibrePlanet</A>
-+        <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</A>
-+        <DT><A HREF="http://www.h-node.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC7zrYAWYhNANjj1QA9fEcAEEwBAHTQkwAeVRkAPXMvALvOtwASVQEAHFcUAH/bpgB60p8AKnQmAGO1fgAjaRwALmA1AA5EAQDM2sgAN3ApAG7EjgC5zbQAVJxrAChwIgC0ya8ALmczAHXJmQBNf0EAgd6oADhwKgC8z7cA7vPtANTg0QANPwAARIhSADtyLQBzzpQAus21AEeKVQDC070AieyzALzPuAB93qEALGYvAO/z7gBEiVAAasWFAFuJTwBKil4AXotSAEuKXgAORQEAD0gBABlDFwBWpmoALGYwAGCNVQAbYBAAHGAQABBOAQCI6rIAjPG3AB1bDgAaXg4A////AGaRWwB/2qYAUYJEAEx+PwAZXAwAm7eUAD51MADN28oAJmwhACRiFAAzeTYAasaFAB9eDwBkt34Aus62AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPT09PT09PT09PT09PT09PT09PT0OIjALPRQmMkI9PT09PT09OkcHNQU+Q0oQPT09PT09PToVGDQtI0ABKz09PT09PT06JRg0Nh1ALxk9PT09PT09OiUYIS4TQC83PT09PT09PTpPSDsGG0BEAz09PT09PT06T0BGMRIsTRY9PT09PT09OgACJx8gQwooPT09PT09PToICAkJCUkkPT09PT09PT05HggETio9PT09PT09PT09Px4IERw9PT09PT09PT09PUUpCDMMPT09PT09PT09PT0NOEEEGj09PT09PT09PT09TBcPSzw9PT09PT09PT09PT09PT09PT09PT09PQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%3D">h-node</A>
-     </DL><p>
- </DL><p>
diff --git a/libre-testing/icecat/mozconfig b/libre-testing/icecat/mozconfig
deleted file mode 100644
index c5cea7185..000000000
--- a/libre-testing/icecat/mozconfig
+++ /dev/null
@@ -1,51 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-# System libraries
-ac_add_options --disable-system-cairo
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-pixman
-ac_add_options --enable-system-sqlite
-ac_add_options --with-pthreads
-ac_add_options --with-system-bz2
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-png
-ac_add_options --with-system-zlib
-
-# Features
-ac_add_options --disable-crashreporter
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-installer
-ac_add_options --disable-safe-browsing
-ac_add_options --disable-tests
-ac_add_options --disable-updater
-ac_add_options --enable-gio
-#ac_add_options --enable-gstreamer
-ac_add_options --enable-startup-notification
-
-# Vendor settings
-ac_add_options --enable-optimize="-pipe -O3"
-ac_add_options --libdir=/usr/lib
-ac_add_options --prefix=/usr
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Application settings
-ac_add_options --disable-official-branding
-# since with-user-appdir with .gnuzilla doesn't do the trick,
-# use app-basename instead
-ac_add_options --with-app-basename=icecat
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.mozilla
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
-
-# Other
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
-
-# Build-generated
diff --git a/libre-testing/icecat/mozconfig.pgo b/libre-testing/icecat/mozconfig.pgo
deleted file mode 100644
index 57d11eed0..000000000
--- a/libre-testing/icecat/mozconfig.pgo
+++ /dev/null
@@ -1,2 +0,0 @@
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10'
diff --git a/libre-testing/icecat/shared-libs.patch b/libre-testing/icecat/shared-libs.patch
deleted file mode 100644
index 1f22b2b0d..000000000
--- a/libre-testing/icecat/shared-libs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in
---- mozilla-release.orig/browser/installer/Makefile.in	2012-07-17 16:19:29.480356991 +0000
-+++ mozilla-release/browser/installer/Makefile.in	2012-07-17 17:32:41.250937293 +0000
-@@ -50,7 +50,7 @@
- MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
- # Some files have been already bundled with xulrunner
- ifndef SYSTEM_LIBXUL
--MOZ_PKG_FATAL_WARNINGS = 1
-+MOZ_PKG_FATAL_WARNINGS = 0
- endif
- 
- MOZ_NONLOCALIZED_PKG_LIST = \
diff --git a/libre-testing/icecat/vendor.js b/libre-testing/icecat/vendor.js
deleted file mode 100644
index 3218a8dbb..000000000
--- a/libre-testing/icecat/vendor.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default browser checking.
-pref("browser.shell.checkDefaultBrowser", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);
-
-// Default search engine
-pref("browser.search.defaultenginename", "DuckDuckGo HTML");
-
-// Search engine order (order displayed in the search bar dropdown)
-pref("browser.search.order.1", "DuckDuckGo HTML");
-pref("browser.search.order.2", "DuckDuckGo Lite");
-pref("browser.search.order.3", "Seeks Search");
-
-// Make sure that safebrowsing is disabled
-pref("browser.safebrowsing.enabled", false);
-pref("browser.safebrowsing.malware.enabled", false);
diff --git a/libre-testing/icewm-themes-libre/PKGBUILD b/libre-testing/icewm-themes-libre/PKGBUILD
deleted file mode 100644
index a6cb0a6ba..000000000
--- a/libre-testing/icewm-themes-libre/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 65600 2012-02-21 09:25:34Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-# Maintainer (Parabola): Ben Peterson <mulenmar@yahoo.com>
-
-pkgname=icewm-themes-libre
-_pkgname=icewm-themes
-pkgver=1.2.26
-pkgrel=4
-pkgdesc="Themes for Ice Window Manager. (no trademarked themes)"
-arch=('any')
-license=("GPLv2")
-url=http://www.debian.org
-depends=(icewm)
-source=(http://ftp.debian.org/debian/pool/main/i/icewm-themes/icewm-themes_$pkgver.orig.tar.gz)
-md5sums=('c0fd0de59e6f74c9c86c0bc334eb6b9e')
-replaces=('icewm-themes')
-
-
-build() {
-  cd $srcdir/$_pkgname-$pkgver
-  mkdir -p $pkgdir/usr/share/icewm/themes
-  cp -r $srcdir/$_pkgname-$pkgver/* $pkgdir/usr/share/icewm/themes/
-
-  # Remove themes with Microsoft® Windows® trademarks
-  rm $pkgdir/usr/share/icewm/themes/fake95 -rf
-  rm $pkgdir/usr/share/icewm/themes/GlamICE -rf
-
-  # Remove themes with Apple® trademarks (changing capitalizations doesn't make
-  # it free)
-  rm $pkgdir/usr/share/icewm/themes/liQuid -rf
-  rm $pkgdir/usr/share/icewm/themes/sortofaqua -rf
-  rm $pkgdir/usr/share/icewm/themes/aquablue -rf
-  rm $pkgdir/usr/share/icewm/themes/jim-mac -rf
-
-  # Remove themes with other trademarks
-  rm $pkgdir/usr/share/icewm/themes/slashdot -rf
-  rm $pkgdir/usr/share/icewm/themes/Slashdot -rf
-  rm $pkgdir/usr/share/icewm/themes/yamm -rf
- 
-  # Remove themes with copyright violations
-  rm $pkgdir/usr/share/icewm/themes/Urbicande -rf
-
-
-  find $pkgdir -type d -exec chmod 755 {} \;
-  find $pkgdir -type f -exec chmod 644 {} \;
-}
diff --git a/libre-testing/linux-libre/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch b/libre-testing/linux-libre/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch
new file mode 100644
index 000000000..2d398315e
--- /dev/null
+++ b/libre-testing/linux-libre/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch
@@ -0,0 +1,241 @@
+From 4b9a445e3eeb8bd9278b1ae51c1b3a651e370cd6 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Thu, 14 Nov 2013 07:25:17 -0500
+Subject: [PATCH 1/6] sunrpc: create a new dummy pipe for gssd to hold open
+
+rpc.gssd will naturally hold open any pipe named */clnt*/gssd that shows
+up under rpc_pipefs. That behavior gives us a reliable mechanism to tell
+whether it's actually running or not.
+
+Create a new toplevel "gssd" directory in rpc_pipefs when it's mounted.
+Under that directory create another directory called "clntXX", and then
+within that a pipe called "gssd".
+
+We'll never send an upcall along that pipe, and any downcall written to
+it will just return -EINVAL.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+---
+ include/linux/sunrpc/rpc_pipe_fs.h |  3 +-
+ net/sunrpc/netns.h                 |  1 +
+ net/sunrpc/rpc_pipe.c              | 93 ++++++++++++++++++++++++++++++++++++--
+ net/sunrpc/sunrpc_syms.c           |  8 +++-
+ 4 files changed, 100 insertions(+), 5 deletions(-)
+
+diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h
+index a353e03..85f1342 100644
+--- a/include/linux/sunrpc/rpc_pipe_fs.h
++++ b/include/linux/sunrpc/rpc_pipe_fs.h
+@@ -84,7 +84,8 @@ enum {
+ 
+ extern struct dentry *rpc_d_lookup_sb(const struct super_block *sb,
+ 				      const unsigned char *dir_name);
+-extern void rpc_pipefs_init_net(struct net *net);
++extern int rpc_pipefs_init_net(struct net *net);
++extern void rpc_pipefs_exit_net(struct net *net);
+ extern struct super_block *rpc_get_sb_net(const struct net *net);
+ extern void rpc_put_sb_net(const struct net *net);
+ 
+diff --git a/net/sunrpc/netns.h b/net/sunrpc/netns.h
+index 779742c..8a8e841 100644
+--- a/net/sunrpc/netns.h
++++ b/net/sunrpc/netns.h
+@@ -14,6 +14,7 @@ struct sunrpc_net {
+ 	struct cache_detail *rsi_cache;
+ 
+ 	struct super_block *pipefs_sb;
++	struct rpc_pipe *gssd_dummy;
+ 	struct mutex pipefs_sb_lock;
+ 
+ 	struct list_head all_clients;
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index bf04b30..c23458b 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
+@@ -38,7 +38,7 @@
+ #define NET_NAME(net)	((net == &init_net) ? " (init_net)" : "")
+ 
+ static struct file_system_type rpc_pipe_fs_type;
+-
++static const struct rpc_pipe_ops gssd_dummy_pipe_ops;
+ 
+ static struct kmem_cache *rpc_inode_cachep __read_mostly;
+ 
+@@ -1159,6 +1159,7 @@ enum {
+ 	RPCAUTH_nfsd4_cb,
+ 	RPCAUTH_cache,
+ 	RPCAUTH_nfsd,
++	RPCAUTH_gssd,
+ 	RPCAUTH_RootEOF
+ };
+ 
+@@ -1195,6 +1196,10 @@ static const struct rpc_filelist files[] = {
+ 		.name = "nfsd",
+ 		.mode = S_IFDIR | S_IRUGO | S_IXUGO,
+ 	},
++	[RPCAUTH_gssd] = {
++		.name = "gssd",
++		.mode = S_IFDIR | S_IRUGO | S_IXUGO,
++	},
+ };
+ 
+ /*
+@@ -1208,13 +1213,25 @@ struct dentry *rpc_d_lookup_sb(const struct super_block *sb,
+ }
+ EXPORT_SYMBOL_GPL(rpc_d_lookup_sb);
+ 
+-void rpc_pipefs_init_net(struct net *net)
++int rpc_pipefs_init_net(struct net *net)
+ {
+ 	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+ 
++	sn->gssd_dummy = rpc_mkpipe_data(&gssd_dummy_pipe_ops, 0);
++	if (IS_ERR(sn->gssd_dummy))
++		return PTR_ERR(sn->gssd_dummy);
++
+ 	mutex_init(&sn->pipefs_sb_lock);
+ 	sn->gssd_running = 1;
+ 	sn->pipe_version = -1;
++	return 0;
++}
++
++void rpc_pipefs_exit_net(struct net *net)
++{
++	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
++
++	rpc_destroy_pipe_data(sn->gssd_dummy);
+ }
+ 
+ /*
+@@ -1244,11 +1261,73 @@ void rpc_put_sb_net(const struct net *net)
+ }
+ EXPORT_SYMBOL_GPL(rpc_put_sb_net);
+ 
++static const struct rpc_filelist gssd_dummy_clnt_dir[] = {
++	[0] = {
++		.name = "clntXX",
++		.mode = S_IFDIR | S_IRUGO | S_IXUGO,
++	},
++};
++
++static ssize_t
++dummy_downcall(struct file *filp, const char __user *src, size_t len)
++{
++	return -EINVAL;
++}
++
++static const struct rpc_pipe_ops gssd_dummy_pipe_ops = {
++	.upcall		= rpc_pipe_generic_upcall,
++	.downcall	= dummy_downcall,
++};
++
++/**
++ * rpc_gssd_dummy_populate - create a dummy gssd pipe
++ * @root:	root of the rpc_pipefs filesystem
++ * @pipe_data:	pipe data created when netns is initialized
++ *
++ * Create a dummy set of directories and a pipe that gssd can hold open to
++ * indicate that it is up and running.
++ */
++static struct dentry *
++rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data)
++{
++	int ret = 0;
++	struct dentry *gssd_dentry;
++	struct dentry *clnt_dentry = NULL;
++	struct dentry *pipe_dentry = NULL;
++	struct qstr q = QSTR_INIT(files[RPCAUTH_gssd].name,
++				  strlen(files[RPCAUTH_gssd].name));
++
++	/* We should never get this far if "gssd" doesn't exist */
++	gssd_dentry = d_hash_and_lookup(root, &q);
++	if (!gssd_dentry)
++		return ERR_PTR(-ENOENT);
++
++	ret = rpc_populate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1, NULL);
++	if (ret) {
++		pipe_dentry = ERR_PTR(ret);
++		goto out;
++	}
++
++	q.name = gssd_dummy_clnt_dir[0].name;
++	q.len = strlen(gssd_dummy_clnt_dir[0].name);
++	clnt_dentry = d_hash_and_lookup(gssd_dentry, &q);
++	if (!clnt_dentry) {
++		pipe_dentry = ERR_PTR(-ENOENT);
++		goto out;
++	}
++
++	pipe_dentry = rpc_mkpipe_dentry(clnt_dentry, "gssd", NULL, pipe_data);
++out:
++	dput(clnt_dentry);
++	dput(gssd_dentry);
++	return pipe_dentry;
++}
++
+ static int
+ rpc_fill_super(struct super_block *sb, void *data, int silent)
+ {
+ 	struct inode *inode;
+-	struct dentry *root;
++	struct dentry *root, *gssd_dentry;
+ 	struct net *net = data;
+ 	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+ 	int err;
+@@ -1266,6 +1345,13 @@ rpc_fill_super(struct super_block *sb, void *data, int silent)
+ 		return -ENOMEM;
+ 	if (rpc_populate(root, files, RPCAUTH_lockd, RPCAUTH_RootEOF, NULL))
+ 		return -ENOMEM;
++
++	gssd_dentry = rpc_gssd_dummy_populate(root, sn->gssd_dummy);
++	if (IS_ERR(gssd_dentry)) {
++		__rpc_depopulate(root, files, RPCAUTH_lockd, RPCAUTH_RootEOF);
++		return PTR_ERR(gssd_dentry);
++	}
++
+ 	dprintk("RPC:       sending pipefs MOUNT notification for net %p%s\n",
+ 		net, NET_NAME(net));
+ 	mutex_lock(&sn->pipefs_sb_lock);
+@@ -1280,6 +1366,7 @@ rpc_fill_super(struct super_block *sb, void *data, int silent)
+ 	return 0;
+ 
+ err_depopulate:
++	dput(gssd_dentry);
+ 	blocking_notifier_call_chain(&rpc_pipefs_notifier_list,
+ 					   RPC_PIPEFS_UMOUNT,
+ 					   sb);
+diff --git a/net/sunrpc/sunrpc_syms.c b/net/sunrpc/sunrpc_syms.c
+index 3d6498a..cd30120 100644
+--- a/net/sunrpc/sunrpc_syms.c
++++ b/net/sunrpc/sunrpc_syms.c
+@@ -44,12 +44,17 @@ static __net_init int sunrpc_init_net(struct net *net)
+ 	if (err)
+ 		goto err_unixgid;
+ 
+-	rpc_pipefs_init_net(net);
++	err = rpc_pipefs_init_net(net);
++	if (err)
++		goto err_pipefs;
++
+ 	INIT_LIST_HEAD(&sn->all_clients);
+ 	spin_lock_init(&sn->rpc_client_lock);
+ 	spin_lock_init(&sn->rpcb_clnt_lock);
+ 	return 0;
+ 
++err_pipefs:
++	unix_gid_cache_destroy(net);
+ err_unixgid:
+ 	ip_map_cache_destroy(net);
+ err_ipmap:
+@@ -60,6 +65,7 @@ err_proc:
+ 
+ static __net_exit void sunrpc_exit_net(struct net *net)
+ {
++	rpc_pipefs_exit_net(net);
+ 	unix_gid_cache_destroy(net);
+ 	ip_map_cache_destroy(net);
+ 	rpc_proc_exit(net);
+-- 
+1.8.5.3
+
diff --git a/libre-testing/linux-libre/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch b/libre-testing/linux-libre/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch
new file mode 100644
index 000000000..c4242e0ae
--- /dev/null
+++ b/libre-testing/linux-libre/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch
@@ -0,0 +1,68 @@
+From 83460ec8dcac14142e7860a01fa59c267ac4657c Mon Sep 17 00:00:00 2001
+From: Andi Kleen <ak@linux.intel.com>
+Date: Tue, 12 Nov 2013 15:08:36 -0800
+Subject: [PATCH] syscalls.h: use gcc alias instead of assembler aliases for
+ syscalls
+
+Use standard gcc __attribute__((alias(foo))) to define the syscall aliases
+instead of custom assembler macros.
+
+This is far cleaner, and also fixes my LTO kernel build.
+
+Signed-off-by: Andi Kleen <ak@linux.intel.com>
+Cc: Al Viro <viro@ZenIV.linux.org.uk>
+Cc: Geert Uytterhoeven <geert@linux-m68k.org>
+Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ include/linux/compat.h   | 4 ++--
+ include/linux/syscalls.h | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/linux/compat.h b/include/linux/compat.h
+index 345da00..ada34c9 100644
+--- a/include/linux/compat.h
++++ b/include/linux/compat.h
+@@ -41,14 +41,14 @@
+ 	COMPAT_SYSCALL_DEFINEx(6, _##name, __VA_ARGS__)
+ 
+ #define COMPAT_SYSCALL_DEFINEx(x, name, ...)				\
+-	asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
++	asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))\
++		__attribute__((alias(__stringify(compat_SyS##name))));  \
+ 	static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
+ 	asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__));\
+ 	asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))\
+ 	{								\
+ 		return C_SYSC##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__));	\
+ 	}								\
+-	SYSCALL_ALIAS(compat_sys##name, compat_SyS##name);		\
+ 	static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
+ 
+ #ifndef compat_user_stack_pointer
+diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
+index 7fac04e..c27f846 100644
+--- a/include/linux/syscalls.h
++++ b/include/linux/syscalls.h
+@@ -184,7 +184,8 @@ extern struct trace_event_functions exit_syscall_print_funcs;
+ 
+ #define __PROTECT(...) asmlinkage_protect(__VA_ARGS__)
+ #define __SYSCALL_DEFINEx(x, name, ...)					\
+-	asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));	\
++	asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))	\
++		__attribute__((alias(__stringify(SyS##name))));		\
+ 	static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));	\
+ 	asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__));	\
+ 	asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))	\
+@@ -194,7 +195,6 @@ extern struct trace_event_functions exit_syscall_print_funcs;
+ 		__PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__));	\
+ 		return ret;						\
+ 	}								\
+-	SYSCALL_ALIAS(sys##name, SyS##name);				\
+ 	static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
+ 
+ asmlinkage long sys_time(time_t __user *tloc);
+-- 
+1.8.5.3
+
diff --git a/libre-testing/linux-libre/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch b/libre-testing/linux-libre/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch
new file mode 100644
index 000000000..19e04da5d
--- /dev/null
+++ b/libre-testing/linux-libre/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch
@@ -0,0 +1,143 @@
+From 89f842435c630f8426f414e6030bc2ffea0d6f81 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Thu, 14 Nov 2013 07:25:18 -0500
+Subject: [PATCH 2/6] sunrpc: replace sunrpc_net->gssd_running flag with a more
+ reliable check
+
+Now that we have a more reliable method to tell if gssd is running, we
+can replace the sn->gssd_running flag with a function that will query to
+see if it's up and running.
+
+There's also no need to attempt an upcall that we know will fail, so
+just return -EACCES if gssd isn't running. Finally, fix the warn_gss()
+message not to claim that that the upcall timed out since we don't
+necesarily perform one now when gssd isn't running, and remove the
+extraneous newline from the message.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+---
+ include/linux/sunrpc/rpc_pipe_fs.h |  2 ++
+ net/sunrpc/auth_gss/auth_gss.c     | 17 +++++++----------
+ net/sunrpc/netns.h                 |  2 --
+ net/sunrpc/rpc_pipe.c              | 14 ++++++++++----
+ 4 files changed, 19 insertions(+), 16 deletions(-)
+
+diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h
+index 85f1342..7f490be 100644
+--- a/include/linux/sunrpc/rpc_pipe_fs.h
++++ b/include/linux/sunrpc/rpc_pipe_fs.h
+@@ -131,5 +131,7 @@ extern int rpc_unlink(struct dentry *);
+ extern int register_rpc_pipefs(void);
+ extern void unregister_rpc_pipefs(void);
+ 
++extern bool gssd_running(struct net *net);
++
+ #endif
+ #endif
+diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
+index 42fdfc6..0a2aee0 100644
+--- a/net/sunrpc/auth_gss/auth_gss.c
++++ b/net/sunrpc/auth_gss/auth_gss.c
+@@ -536,8 +536,7 @@ static void warn_gssd(void)
+ 	unsigned long now = jiffies;
+ 
+ 	if (time_after(now, ratelimit)) {
+-		printk(KERN_WARNING "RPC: AUTH_GSS upcall timed out.\n"
+-				"Please check user daemon is running.\n");
++		pr_warn("RPC: AUTH_GSS upcall failed. Please check user daemon is running.\n");
+ 		ratelimit = now + 15*HZ;
+ 	}
+ }
+@@ -600,7 +599,6 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred)
+ 	struct rpc_pipe *pipe;
+ 	struct rpc_cred *cred = &gss_cred->gc_base;
+ 	struct gss_upcall_msg *gss_msg;
+-	unsigned long timeout;
+ 	DEFINE_WAIT(wait);
+ 	int err;
+ 
+@@ -608,17 +606,16 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred)
+ 		__func__, from_kuid(&init_user_ns, cred->cr_uid));
+ retry:
+ 	err = 0;
+-	/* Default timeout is 15s unless we know that gssd is not running */
+-	timeout = 15 * HZ;
+-	if (!sn->gssd_running)
+-		timeout = HZ >> 2;
++	/* if gssd is down, just skip upcalling altogether */
++	if (!gssd_running(net)) {
++		warn_gssd();
++		return -EACCES;
++	}
+ 	gss_msg = gss_setup_upcall(gss_auth, cred);
+ 	if (PTR_ERR(gss_msg) == -EAGAIN) {
+ 		err = wait_event_interruptible_timeout(pipe_version_waitqueue,
+-				sn->pipe_version >= 0, timeout);
++				sn->pipe_version >= 0, 15 * HZ);
+ 		if (sn->pipe_version < 0) {
+-			if (err == 0)
+-				sn->gssd_running = 0;
+ 			warn_gssd();
+ 			err = -EACCES;
+ 		}
+diff --git a/net/sunrpc/netns.h b/net/sunrpc/netns.h
+index 8a8e841..94e506f 100644
+--- a/net/sunrpc/netns.h
++++ b/net/sunrpc/netns.h
+@@ -33,8 +33,6 @@ struct sunrpc_net {
+ 	int pipe_version;
+ 	atomic_t pipe_users;
+ 	struct proc_dir_entry *use_gssp_proc;
+-
+-	unsigned int gssd_running;
+ };
+ 
+ extern int sunrpc_net_id;
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index c23458b..5cd7ad1 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
+@@ -216,14 +216,11 @@ rpc_destroy_inode(struct inode *inode)
+ static int
+ rpc_pipe_open(struct inode *inode, struct file *filp)
+ {
+-	struct net *net = inode->i_sb->s_fs_info;
+-	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+ 	struct rpc_pipe *pipe;
+ 	int first_open;
+ 	int res = -ENXIO;
+ 
+ 	mutex_lock(&inode->i_mutex);
+-	sn->gssd_running = 1;
+ 	pipe = RPC_I(inode)->pipe;
+ 	if (pipe == NULL)
+ 		goto out;
+@@ -1222,7 +1219,6 @@ int rpc_pipefs_init_net(struct net *net)
+ 		return PTR_ERR(sn->gssd_dummy);
+ 
+ 	mutex_init(&sn->pipefs_sb_lock);
+-	sn->gssd_running = 1;
+ 	sn->pipe_version = -1;
+ 	return 0;
+ }
+@@ -1376,6 +1372,16 @@ err_depopulate:
+ 	return err;
+ }
+ 
++bool
++gssd_running(struct net *net)
++{
++	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
++	struct rpc_pipe *pipe = sn->gssd_dummy;
++
++	return pipe->nreaders || pipe->nwriters;
++}
++EXPORT_SYMBOL_GPL(gssd_running);
++
+ static struct dentry *
+ rpc_mount(struct file_system_type *fs_type,
+ 		int flags, const char *dev_name, void *data)
+-- 
+1.8.5.3
+
diff --git a/libre-testing/linux-libre/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch b/libre-testing/linux-libre/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch
new file mode 100644
index 000000000..87b54fc3e
--- /dev/null
+++ b/libre-testing/linux-libre/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch
@@ -0,0 +1,50 @@
+From 6aa23d76a7b549521a03b63b6d5b7880ea87eab7 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Thu, 14 Nov 2013 07:25:19 -0500
+Subject: [PATCH 3/6] nfs: check if gssd is running before attempting to use
+ krb5i auth in SETCLIENTID call
+
+Currently, the client will attempt to use krb5i in the SETCLIENTID call
+even if rpc.gssd isn't running. When that fails, it'll then fall back to
+RPC_AUTH_UNIX. This introduced a delay when mounting if rpc.gssd isn't
+running, and causes warning messages to pop up in the ring buffer.
+
+Check to see if rpc.gssd is running before even attempting to use krb5i
+auth, and just silently skip trying to do so if it isn't. In the event
+that the admin is actually trying to mount with krb5*, it will still
+fail at a later stage of the mount attempt.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+---
+ fs/nfs/nfs4client.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
+index b4a160a..c1b7a80 100644
+--- a/fs/nfs/nfs4client.c
++++ b/fs/nfs/nfs4client.c
+@@ -10,6 +10,7 @@
+ #include <linux/sunrpc/auth.h>
+ #include <linux/sunrpc/xprt.h>
+ #include <linux/sunrpc/bc_xprt.h>
++#include <linux/sunrpc/rpc_pipe_fs.h>
+ #include "internal.h"
+ #include "callback.h"
+ #include "delegation.h"
+@@ -370,7 +371,11 @@ struct nfs_client *nfs4_init_client(struct nfs_client *clp,
+ 		__set_bit(NFS_CS_INFINITE_SLOTS, &clp->cl_flags);
+ 	__set_bit(NFS_CS_DISCRTRY, &clp->cl_flags);
+ 	__set_bit(NFS_CS_NO_RETRANS_TIMEOUT, &clp->cl_flags);
+-	error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_GSS_KRB5I);
++
++	error = -EINVAL;
++	if (gssd_running(clp->cl_net))
++		error = nfs_create_rpc_client(clp, timeparms,
++					      RPC_AUTH_GSS_KRB5I);
+ 	if (error == -EINVAL)
+ 		error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_UNIX);
+ 	if (error < 0)
+-- 
+1.8.5.3
+
diff --git a/libre-testing/linux-libre/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch b/libre-testing/linux-libre/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch
new file mode 100644
index 000000000..5f2c3dae8
--- /dev/null
+++ b/libre-testing/linux-libre/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch
@@ -0,0 +1,32 @@
+From 3396f92f8be606ea485b0a82d4e7749a448b013b Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Thu, 5 Dec 2013 07:33:49 -0500
+Subject: [PATCH 4/6] rpc_pipe: remove the clntXX dir if creating the pipe
+ fails
+
+In the event that we create the gssd/clntXX dir, but the pipe creation
+subsequently fails, then we should remove the clntXX dir before
+returning.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+---
+ net/sunrpc/rpc_pipe.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index 5cd7ad1..0b74c61 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
+@@ -1313,6 +1313,8 @@ rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data)
+ 	}
+ 
+ 	pipe_dentry = rpc_mkpipe_dentry(clnt_dentry, "gssd", NULL, pipe_data);
++	if (IS_ERR(pipe_dentry))
++		__rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1);
+ out:
+ 	dput(clnt_dentry);
+ 	dput(gssd_dentry);
+-- 
+1.8.5.3
+
diff --git a/libre-testing/linux-libre/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch b/libre-testing/linux-libre/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch
new file mode 100644
index 000000000..8ef6fe25c
--- /dev/null
+++ b/libre-testing/linux-libre/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch
@@ -0,0 +1,100 @@
+From e2f0c83a9de331d9352185ca3642616c13127539 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Thu, 5 Dec 2013 07:34:44 -0500
+Subject: [PATCH 5/6] sunrpc: add an "info" file for the dummy gssd pipe
+
+rpc.gssd expects to see an "info" file in each clntXX dir. Since adding
+the dummy gssd pipe, users that run rpc.gssd see a lot of these messages
+spamming the logs:
+
+    rpc.gssd[508]: ERROR: can't open /var/lib/nfs/rpc_pipefs/gssd/clntXX/info: No such file or directory
+    rpc.gssd[508]: ERROR: failed to read service info
+
+Add a dummy gssd/clntXX/info file to help silence these messages.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+---
+ net/sunrpc/rpc_pipe.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 49 insertions(+), 1 deletion(-)
+
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index 0b74c61..5d973b2 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
+@@ -17,6 +17,7 @@
+ #include <linux/fsnotify.h>
+ #include <linux/kernel.h>
+ #include <linux/rcupdate.h>
++#include <linux/utsname.h>
+ 
+ #include <asm/ioctls.h>
+ #include <linux/poll.h>
+@@ -1275,6 +1276,44 @@ static const struct rpc_pipe_ops gssd_dummy_pipe_ops = {
+ 	.downcall	= dummy_downcall,
+ };
+ 
++/*
++ * Here we present a bogus "info" file to keep rpc.gssd happy. We don't expect
++ * that it will ever use this info to handle an upcall, but rpc.gssd expects
++ * that this file will be there and have a certain format.
++ */
++static int
++rpc_show_dummy_info(struct seq_file *m, void *v)
++{
++	seq_printf(m, "RPC server: %s\n", utsname()->nodename);
++	seq_printf(m, "service: foo (1) version 0\n");
++	seq_printf(m, "address: 127.0.0.1\n");
++	seq_printf(m, "protocol: tcp\n");
++	seq_printf(m, "port: 0\n");
++	return 0;
++}
++
++static int
++rpc_dummy_info_open(struct inode *inode, struct file *file)
++{
++	return single_open(file, rpc_show_dummy_info, NULL);
++}
++
++static const struct file_operations rpc_dummy_info_operations = {
++	.owner		= THIS_MODULE,
++	.open		= rpc_dummy_info_open,
++	.read		= seq_read,
++	.llseek		= seq_lseek,
++	.release	= single_release,
++};
++
++static const struct rpc_filelist gssd_dummy_info_file[] = {
++	[0] = {
++		.name = "info",
++		.i_fop = &rpc_dummy_info_operations,
++		.mode = S_IFREG | S_IRUSR,
++	},
++};
++
+ /**
+  * rpc_gssd_dummy_populate - create a dummy gssd pipe
+  * @root:	root of the rpc_pipefs filesystem
+@@ -1312,9 +1351,18 @@ rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data)
+ 		goto out;
+ 	}
+ 
++	ret = rpc_populate(clnt_dentry, gssd_dummy_info_file, 0, 1, NULL);
++	if (ret) {
++		__rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1);
++		pipe_dentry = ERR_PTR(ret);
++		goto out;
++	}
++
+ 	pipe_dentry = rpc_mkpipe_dentry(clnt_dentry, "gssd", NULL, pipe_data);
+-	if (IS_ERR(pipe_dentry))
++	if (IS_ERR(pipe_dentry)) {
++		__rpc_depopulate(clnt_dentry, gssd_dummy_info_file, 0, 1);
+ 		__rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1);
++	}
+ out:
+ 	dput(clnt_dentry);
+ 	dput(gssd_dentry);
+-- 
+1.8.5.3
+
diff --git a/libre-testing/linux-libre/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch b/libre-testing/linux-libre/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch
new file mode 100644
index 000000000..75505c30d
--- /dev/null
+++ b/libre-testing/linux-libre/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch
@@ -0,0 +1,50 @@
+From 23e66ba97127ff3b064d4c6c5138aa34eafc492f Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Mon, 9 Dec 2013 09:38:00 -0500
+Subject: [PATCH 6/6] rpc_pipe: fix cleanup of dummy gssd directory when
+ notification fails
+
+Currently, it could leak dentry references in some cases. Make sure
+we clean up properly.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+---
+ net/sunrpc/rpc_pipe.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index 5d973b2..b185548 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
+@@ -1369,6 +1369,18 @@ out:
+ 	return pipe_dentry;
+ }
+ 
++static void
++rpc_gssd_dummy_depopulate(struct dentry *pipe_dentry)
++{
++	struct dentry *clnt_dir = pipe_dentry->d_parent;
++	struct dentry *gssd_dir = clnt_dir->d_parent;
++
++	__rpc_rmpipe(clnt_dir->d_inode, pipe_dentry);
++	__rpc_depopulate(clnt_dir, gssd_dummy_info_file, 0, 1);
++	__rpc_depopulate(gssd_dir, gssd_dummy_clnt_dir, 0, 1);
++	dput(pipe_dentry);
++}
++
+ static int
+ rpc_fill_super(struct super_block *sb, void *data, int silent)
+ {
+@@ -1412,7 +1424,7 @@ rpc_fill_super(struct super_block *sb, void *data, int silent)
+ 	return 0;
+ 
+ err_depopulate:
+-	dput(gssd_dentry);
++	rpc_gssd_dummy_depopulate(gssd_dentry);
+ 	blocking_notifier_call_chain(&rpc_pipefs_notifier_list,
+ 					   RPC_PIPEFS_UMOUNT,
+ 					   sb);
+-- 
+1.8.5.3
+
diff --git a/libre/linux-libre/ChangeLog b/libre-testing/linux-libre/ChangeLog
index 9020464ef..9020464ef 100644
--- a/libre/linux-libre/ChangeLog
+++ b/libre-testing/linux-libre/ChangeLog
diff --git a/kernels/linux-libre-knock/Kbuild b/libre-testing/linux-libre/Kbuild
index 8a9d7dceb..8a9d7dceb 100644
--- a/kernels/linux-libre-knock/Kbuild
+++ b/libre-testing/linux-libre/Kbuild
diff --git a/kernels/linux-libre-knock/Kbuild.platforms b/libre-testing/linux-libre/Kbuild.platforms
index 90a226888..90a226888 100644
--- a/kernels/linux-libre-knock/Kbuild.platforms
+++ b/libre-testing/linux-libre/Kbuild.platforms
diff --git a/libre-testing/linux-libre/PKGBUILD b/libre-testing/linux-libre/PKGBUILD
new file mode 100644
index 000000000..78acfe3e1
--- /dev/null
+++ b/libre-testing/linux-libre/PKGBUILD
@@ -0,0 +1,441 @@
+# $Id: PKGBUILD 204729 2014-01-26 08:54:46Z thomas $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer: Thomas Baechler <thomas@archlinux.org>
+# 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>
+# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+
+pkgbase=linux-libre         # Build stock -LIBRE kernel
+#pkgbase=linux-libre-custom # Build kernel with a different name
+_basekernel=3.13
+#_sublevel=8
+#pkgver=${_basekernel}.${_sublevel}
+pkgver=${_basekernel}
+pkgrel=1
+_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
+arch=('i686' 'x86_64' 'mips64el')
+url="http://linux-libre.fsfla.org/"
+license=('GPL2')
+makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
+options=('!strip')
+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"
+        # the main kernel config files
+        'config.i686' 'config.x86_64'
+        # standard config files for mkinitcpio ramdisk
+        "${pkgbase}.preset"
+        'Kbuild'
+        'Kbuild.platforms'
+        'boot-logo.patch'
+        'change-default-console-loglevel.patch'
+        'criu-no-expert.patch'
+        '0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch'
+        '0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch'
+        '0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch'
+        '0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch'
+        '0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch'
+        '0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch'
+        '0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch'
+        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
+md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1'
+         #'392f920129940c4f83c7d204468213f3'
+         '568ce15a9df133072489cbac8c4fefb3'
+         '772873c548059c57c8ec7898f35c0e2b'
+         'e49ac236dfeef709f91a3d993ea7b62c'
+         '2967cecc3af9f954ccc822fd63dca6ff'
+         '8267264d9a8966e57fdacd1fa1fc65c4'
+         '44260d2cb1a8b51c119d2ce1f83e457a'
+         '98beb36f9b8cf16e58de2483ea9985e3'
+         '989dc54ff8b179b0f80333cc97c0d43f'
+         'dd2adb99cd3feed6f11022562901965c'
+         'b00cc399d3797cb0793e18b5bf387a50'
+         '7cbd2349cdf046acc37b652c06ba36be'
+         '10dbaf863e22b2437e68f9190d65c861'
+         'd5907a721b97299f0685c583499f7820'
+         'a724515b350b29c53f20e631c6cf9a14'
+         'e6fa278c092ad83780e2dd0568e24ca6'
+         '7e16faa84d4cd04e43bca12bdf9d9e4b')
+if [ "$CARCH" != "mips64el" ]; then
+    # don't use the Loongson-specific patches on non-mips64el arches.
+    unset source[${#source[@]}-1]
+    unset md5sums[${#md5sums[@]}-1]
+fi
+
+_kernelname=${pkgbase#linux-libre}
+_localversionname=-LIBRE
+
+prepare() {
+  cd "${srcdir}/linux-${_basekernel}"
+
+  if [ "${_basekernel}" != "${pkgver}" ]; then
+    patch -p1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+  fi
+
+  # add freedo as boot logo
+  patch -p1 -i "${srcdir}/boot-logo.patch"
+
+  # add latest fixes from stable queue, if needed
+  # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
+
+  # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
+  # remove this when a Kconfig knob is made available by upstream
+  # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
+  patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
+
+  # allow Checkpoint/restore (for criu) without EXPERT=y
+  patch -p1 -i "${srcdir}/criu-no-expert.patch"
+
+  # fix 15 seconds nfs delay
+  # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=4b9a445e3eeb8bd9278b1ae51c1b3a651e370cd6
+  patch -p1 -i "${srcdir}/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch"
+  # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=89f842435c630f8426f414e6030bc2ffea0d6f81
+  patch -p1 -i "${srcdir}/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch"
+  # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=6aa23d76a7b549521a03b63b6d5b7880ea87eab7
+  patch -p1 -i "${srcdir}/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch"
+
+  # fix nfs kernel oops
+  # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=3396f92f8be606ea485b0a82d4e7749a448b013b
+  patch -p1 -i "${srcdir}/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch"
+  # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=e2f0c83a9de331d9352185ca3642616c13127539
+  patch -p1 -i "${srcdir}/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch"
+  # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=23e66ba97127ff3b064d4c6c5138aa34eafc492f
+  patch -p1 -i "${srcdir}/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch"
+
+  # Fix symbols: Revert http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=83460ec8dcac14142e7860a01fa59c267ac4657c
+  patch -Rp1 -i "${srcdir}/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch"
+
+  if [ "$CARCH" == "mips64el" ]; then
+    sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
+    sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
+        < "${srcdir}/lxo-config.patch" > lxo-config.patch
+    msg2 "Adding loongson-community patches"
+    patch -p1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch
+    patch -p0 -i lxo-config.patch
+
+  # ensure N32, add localversion, remove uevent helper as per
+  # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
+  # and make USB storage support builtin (e.g. for booting from USB
+  # disks without slowly loading an initramfs)
+    sed -ri \
+        -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+        -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
+        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" \
+        -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \
+        ./.config
+  else
+    cat "${srcdir}/config.${CARCH}" > ./.config # simpler
+  fi
+
+  if [ "${_kernelname}" != "" ]; then
+    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" ./.config
+    sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
+  fi
+
+  # set extraversion to pkgrel
+  sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
+
+  # don't run depmod on 'make install'. We'll do this ourselves in packaging
+  sed -i '2iexit 0' scripts/depmod.sh
+
+  # get kernel version
+  make prepare
+
+  # load configuration
+  # Configure the kernel. Replace the line below with one of your choice.
+  #make menuconfig # CLI menu for configuration
+  #make nconfig # new CLI menu for configuration
+  #make xconfig # X-based configuration
+  #make oldconfig # using old config from previous kernel version
+  # ... or manually edit .config
+
+  # rewrite configuration
+  yes "" | make config >/dev/null
+}
+
+build() {
+  cd "${srcdir}/linux-${_basekernel}"
+
+  if [ "$CARCH" == "mips64el" ]; then
+    # The build system passes it directly to linker, disable to avoid
+    # having unknown -Wl,... options.
+    export LDFLAGS=""
+    # bzImage is arch-specific and not supported on mips; vmlinux is
+    # useful for oprofile.
+    make ${MAKEFLAGS} LOCALVERSION= vmlinux vmlinuz modules
+  else
+    make ${MAKEFLAGS} LOCALVERSION= bzImage modules
+  fi
+}
+
+_package() {
+  pkgdesc="The ${pkgbase^} kernel and modules"
+  [ "${pkgbase}" = "linux-libre" ] && groups=('base')
+  depends=('coreutils' 'linux-libre-firmware' 'kmod')
+  optdepends=('crda: to set the correct wireless channels of your country')
+  provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}")
+  conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
+  replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
+  backup=("etc/mkinitcpio.d/${pkgbase}.preset")
+  install=${pkgbase}.install
+  if [ "$CARCH" != "mips64el" ]; then
+     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)')
+      conflicts+=('mkinitcpio<0.7')
+  else
+      depends+=('mkinitcpio>=0.7')
+  fi
+
+  cd "${srcdir}/linux-${_basekernel}"
+
+  KARCH=x86
+  [ $CARCH = "mips64el" ] && KARCH=mips
+
+  # get kernel version
+  _kernver="$(make LOCALVERSION= kernelrelease)"
+  _basekernel=${_kernver%%-*}
+  _basekernel=${_basekernel%.*}
+
+  mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
+  make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
+
+  if [ "$CARCH" == "mips64el" ]; then
+    cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgbase}"
+    cp vmlinux "${pkgdir}/boot/vmlinux-${pkgbase}"
+  else
+    cp arch/${KARCH}/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
+  fi
+
+  # set correct depmod command for install
+  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
+  true && install=${install}.pkg
+  sed \
+    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
+    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
+    -i "${startdir}/${install}"
+
+  # install mkinitcpio preset file for kernel
+  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+  sed \
+    -e "1s|'linux*.*'|'${pkgbase}'|" \
+    -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
+    -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \
+    -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \
+    -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+
+  # mkinitcpio 0.7 relies on bzImage to find the kernel version
+  if [ "$CARCH" == "mips64el" ]; then
+    sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \
+        -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+  fi
+
+  # remove build and source links
+  rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
+  # remove the firmware
+  rm -rf "${pkgdir}/lib/firmware"
+  # gzip -9 all modules to save 100MB of space
+  find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+  # make room for external modules
+  ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  # add real version for building modules and running depmod from post_install/upgrade
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}/version"
+
+  # Now we call depmod...
+  depmod -b "${pkgdir}" -F System.map "${_kernver}"
+
+  # move module tree /lib -> /usr/lib
+  mkdir -p "${pkgdir}/usr"
+  mv "${pkgdir}/lib" "${pkgdir}/usr/"
+
+  # add vmlinux
+  install -D -m644 vmlinux "${pkgdir}/usr/lib/modules/${_kernver}/build/vmlinux" 
+}
+
+_package-headers() {
+  pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
+  provides=("kernel26${_kernelname}-headers=${pkgver}" "linux${_kernelname}-headers=${pkgver}")
+  conflicts=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
+  replaces=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
+
+  KARCH=x86
+  [ $CARCH = "mips64el" ] && KARCH=mips
+
+  # in case of repackaging this is empty
+  if [ -z "${_kernver}" ]; then
+    cd "${srcdir}/linux-${_basekernel}"
+    _kernver="$(make LOCALVERSION= kernelrelease)"
+  fi
+
+  install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
+
+  cd "${srcdir}/linux-${_basekernel}"
+  install -D -m644 Makefile \
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/Makefile"
+  install -D -m644 kernel/Makefile \
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/kernel/Makefile"
+  install -D -m644 .config \
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/.config"
+
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include"
+
+  for i in acpi asm-generic config crypto drm generated keys linux math-emu \
+    media net pcmcia scsi sound trace uapi video xen; do
+    cp -a include/${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/include/"
+  done
+
+  # copy arch includes for external modules
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}"
+  cp -a arch/${KARCH}/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
+
+  # copy files necessary for later builds
+  cp Module.symvers "${pkgdir}/usr/lib/modules/${_kernver}/build"
+  cp -a scripts "${pkgdir}/usr/lib/modules/${_kernver}/build"
+
+  if [ "$CARCH" = "mips64el" ]; then
+    cp arch/${KARCH}/Kbuild "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
+    cp -a arch/${KARCH}/loongson "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
+    cp ${srcdir}/Kbuild.platforms "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
+  fi
+
+  # fix permissions on scripts dir
+  chmod og-w -R "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/.tmp_versions"
+
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel"
+
+  cp arch/${KARCH}/Makefile "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
+
+  if [ "${CARCH}" = "i686" ]; then
+    cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
+  fi
+
+  cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel/"
+
+  # add headers for lirc package
+  # pci
+  for i in bt8xx cx88 saa7134; do
+    mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/pci/${i}"
+    cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/pci/${i}"
+  done
+  # usb
+  for i in cpia2 em28xx pwc sn9c102; do
+    mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/${i}"
+    cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/${i}"
+  done
+  # i2c
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c"
+  cp drivers/media/i2c/*.h  "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/"
+  for i in cx25840; do
+    mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/${i}"
+    cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/${i}"
+  done
+
+  # add docbook makefile
+  install -D -m644 Documentation/DocBook/Makefile \
+    "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile"
+
+  # add dm headers
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/md"
+  cp drivers/md/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/md"
+
+  # add inotify.h
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include/linux"
+  cp include/linux/inotify.h "${pkgdir}/usr/lib/modules/${_kernver}/build/include/linux/"
+
+  # add wireless headers
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/net/mac80211/"
+  cp net/mac80211/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/net/mac80211/"
+
+  # add dvb headers for external modules
+  # in reference to:
+  # http://bugs.archlinux.org/task/9912
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core"
+  cp drivers/media/dvb-core/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core/"
+  # and...
+  # http://bugs.archlinux.org/task/11194
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/"
+  cp include/config/dvb/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/"
+
+  # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+  # in reference to:
+  # http://bugs.archlinux.org/task/13146
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
+  cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
+  cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/"
+
+  # add dvb headers
+  # in reference to:
+  # http://bugs.archlinux.org/task/20402
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb"
+  cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends"
+  cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners"
+  cp drivers/media/tuners/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners/"
+
+  # add xfs and shmem for aufs building
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs"
+  mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/mm"
+  cp fs/xfs/xfs_sb.h "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs/xfs_sb.h"
+
+  # copy in Kconfig files
+  for i in $(find . -name "Kconfig*"); do
+    mkdir -p "${pkgdir}"/usr/lib/modules/${_kernver}/build/`echo ${i} | sed 's|/Kconfig.*||'`
+    cp ${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/${i}"
+  done
+
+  chown -R root.root "${pkgdir}/usr/lib/modules/${_kernver}/build"
+  find "${pkgdir}/usr/lib/modules/${_kernver}/build" -type d -exec chmod 755 {} \;
+
+  # strip scripts directory
+  find "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
+    case "$(file -bi "${binary}")" in
+      *application/x-sharedlib*) # Libraries (.so)
+        /usr/bin/strip ${STRIP_SHARED} "${binary}";;
+      *application/x-archive*) # Libraries (.a)
+        /usr/bin/strip ${STRIP_STATIC} "${binary}";;
+      *application/x-executable*) # Binaries
+        /usr/bin/strip ${STRIP_BINARIES} "${binary}";;
+    esac
+  done
+
+  # remove unneeded architectures
+  rm -rf "${pkgdir}"/usr/lib/modules/${_kernver}/build/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
+  if [ "$CARCH" = "mips64el" ]; then
+    rm -rf ${pkgdir}/usr/lib/modules/${_kernver}/build/arch/x86
+  else
+    rm -rf ${pkgdir}/usr/lib/modules/${_kernver}/build/arch/mips
+  fi
+}
+
+_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/lib/modules/${_kernver}/build"
+  cp -al Documentation "${pkgdir}/usr/lib/modules/${_kernver}/build"
+  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/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile"
+}
+
+pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs")
+for _p in ${pkgname[@]}; do
+  eval "package_${_p}() {
+    _package${_p#${pkgbase}}
+  }"
+done
+
+# vim:set ts=8 sts=2 sw=2 et:
diff --git a/kernels/linux-libre-knock/boot-logo.patch b/libre-testing/linux-libre/boot-logo.patch
index 3f4e0dea4..3f4e0dea4 100644
--- a/kernels/linux-libre-knock/boot-logo.patch
+++ b/libre-testing/linux-libre/boot-logo.patch
diff --git a/kernels/linux-libre-knock/change-default-console-loglevel.patch b/libre-testing/linux-libre/change-default-console-loglevel.patch
index 22cd69a09..22cd69a09 100644
--- a/kernels/linux-libre-knock/change-default-console-loglevel.patch
+++ b/libre-testing/linux-libre/change-default-console-loglevel.patch
diff --git a/libre/linux-libre/config.i686 b/libre-testing/linux-libre/config.i686
index db2b3fdb7..af1c19109 100644
--- a/libre/linux-libre/config.i686
+++ b/libre-testing/linux-libre/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.0-1 Kernel Configuration
+# Linux/x86 3.13.0 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -38,7 +38,6 @@ 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
@@ -75,7 +74,6 @@ CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_AUDIT_WATCH=y
 CONFIG_AUDIT_TREE=y
-CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
 
 #
 # IRQ subsystem
@@ -159,7 +157,7 @@ CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set
-# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
@@ -240,7 +238,6 @@ 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
@@ -274,6 +271,7 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
@@ -469,6 +467,7 @@ CONFIG_FRONTSWAP=y
 # CONFIG_CMA is not set
 CONFIG_ZBUD=y
 CONFIG_ZSWAP=y
+CONFIG_MEM_SOFT_DIRTY=y
 # CONFIG_HIGHPTE is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -526,13 +525,13 @@ CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_DPM_WATCHDOG is not set
 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
@@ -547,7 +546,6 @@ 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
@@ -562,6 +560,7 @@ CONFIG_ACPI_APEI_PCIEAER=y
 CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_EINJ=m
 CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_ACPI_EXTLOG=m
 CONFIG_SFI=y
 CONFIG_X86_APM_BOOT=y
 CONFIG_APM=y
@@ -575,7 +574,6 @@ CONFIG_APM_DO_ENABLE=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
@@ -676,7 +674,7 @@ 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_ALIX=y
 # CONFIG_NET5501 is not set
 # CONFIG_GEOS is not set
 CONFIG_AMD_NB=y
@@ -807,7 +805,6 @@ CONFIG_DEFAULT_CUBIC=y
 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
@@ -821,6 +818,7 @@ 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_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_NDISC_NODETYPE=y
@@ -883,6 +881,17 @@ CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_TFTP=m
 CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NFT_EXTHDR=m
+CONFIG_NFT_META=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_RBTREE=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_COMPAT=m
 CONFIG_NETFILTER_XTABLES=m
 
 #
@@ -976,7 +985,9 @@ 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_NETPORTNET=m
 CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
 CONFIG_IP_SET_HASH_NETPORT=m
 CONFIG_IP_SET_HASH_NETIFACE=m
 CONFIG_IP_SET_LIST_SET=m
@@ -1027,6 +1038,11 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
 # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+CONFIG_NF_TABLES_IPV4=m
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NF_TABLES_ARP=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -1059,6 +1075,9 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_TABLES_IPV6=m
+CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1079,6 +1098,7 @@ CONFIG_IP6_NF_SECURITY=m
 CONFIG_NF_NAT_IPV6=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1215,6 +1235,7 @@ CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_CLS_BPF=m
 # CONFIG_NET_EMATCH is not set
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=m
@@ -1244,6 +1265,7 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_NETLINK_MMAP=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
+CONFIG_HSR=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
@@ -1411,6 +1433,7 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=m
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
 CONFIG_NET_9P=m
 CONFIG_NET_9P_VIRTIO=m
 # CONFIG_NET_9P_DEBUG is not set
@@ -1422,6 +1445,7 @@ 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_DIGITAL=m
 CONFIG_NFC_NCI=m
 # CONFIG_NFC_NCI_SPI is not set
 CONFIG_NFC_HCI=m
@@ -1434,6 +1458,7 @@ CONFIG_NFC_PN533=m
 CONFIG_NFC_WILINK=m
 CONFIG_NFC_MEI_PHY=m
 CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
 CONFIG_NFC_PN544=m
 CONFIG_NFC_PN544_MEI=m
 CONFIG_NFC_MICROREAD=m
@@ -1596,6 +1621,7 @@ CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
 CONFIG_OF_MTD=y
 CONFIG_PARPORT=m
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
 # CONFIG_PARPORT_PC_FIFO is not set
@@ -1615,10 +1641,10 @@ CONFIG_ISAPNP=y
 # CONFIG_PNPBIOS is not set
 CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_NULL_BLK is not set
 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
@@ -1713,6 +1739,14 @@ CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
 CONFIG_INTEL_MEI_ME=m
 CONFIG_VMWARE_VMCI=m
+
+#
+# Intel MIC Host Driver
+#
+
+#
+# Intel MIC Card Driver
+#
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -2004,7 +2038,6 @@ 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
@@ -2019,8 +2052,8 @@ 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_RAID=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
@@ -2415,6 +2448,7 @@ 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_HUAWEI_CDC_NCM=m
 CONFIG_USB_NET_CDC_MBIM=m
 CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_SR9700=m
@@ -2499,6 +2533,8 @@ CONFIG_ATH10K_PCI=m
 # CONFIG_ATH10K_DEBUG is not set
 CONFIG_ATH10K_DEBUGFS=y
 # CONFIG_ATH10K_TRACING is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
 CONFIG_B43=m
 CONFIG_B43_BCMA=y
 CONFIG_B43_SSB=y
@@ -2599,6 +2635,7 @@ CONFIG_RT2800USB_RT53XX=y
 CONFIG_RT2800USB_RT55XX=y
 CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
 CONFIG_RT2X00_LIB_MMIO=m
 CONFIG_RT2X00_LIB_PCI=m
 CONFIG_RT2X00_LIB_USB=m
@@ -2812,7 +2849,7 @@ CONFIG_INPUT_MATRIXKMAP=m
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV=m
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
@@ -2826,7 +2863,7 @@ CONFIG_INPUT_EVDEV=m
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_ATKBD=m
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_LKKBD is not set
@@ -2857,7 +2894,7 @@ 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_SERIAL=m
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
 CONFIG_MOUSE_CYAPA=m
@@ -2976,7 +3013,9 @@ CONFIG_TOUCHSCREEN_TSC_SERIO=m
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_SUR40=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
@@ -3002,7 +3041,6 @@ 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
@@ -3015,19 +3053,20 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 #
 # Hardware I/O ports
 #
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
+CONFIG_SERIO=m
+CONFIG_SERIO_I8042=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SERIO_CT82C710=m
 CONFIG_SERIO_PARKBD=m
 CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_LIBPS2=m
 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_HYPERV_KEYBOARD=m
 CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
@@ -3104,7 +3143,6 @@ 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
@@ -3143,10 +3181,13 @@ CONFIG_NSC_GPIO=m
 # CONFIG_RAW_DRIVER is not set
 CONFIG_HPET=y
 CONFIG_HPET_MMAP=y
+CONFIG_HPET_MMAP_DEFAULT=y
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_TCG_TPM=m
 CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
 CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
 CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
@@ -3157,7 +3198,15 @@ CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
-# CONFIG_I2C_MUX is not set
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -3240,7 +3289,6 @@ CONFIG_SPI_MASTER=y
 # 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
@@ -3282,8 +3330,8 @@ 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_DEVRES=y
 CONFIG_OF_GPIO=y
 CONFIG_GPIO_ACPI=y
 # CONFIG_DEBUG_GPIO is not set
@@ -3318,7 +3366,7 @@ CONFIG_GPIO_ARIZONA=m
 #
 CONFIG_GPIO_CS5535=y
 CONFIG_GPIO_AMD8111=m
-# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_INTEL_MID is not set
 # CONFIG_GPIO_PCH is not set
 # CONFIG_GPIO_ML_IOH is not set
 # CONFIG_GPIO_SODAVILLE is not set
@@ -3335,7 +3383,7 @@ CONFIG_GPIO_AMD8111=m
 #
 # AC97 GPIO expanders:
 #
-CONFIG_GPIO_UCB1400=y
+CONFIG_GPIO_UCB1400=m
 
 #
 # LPC GPIO expanders:
@@ -3344,6 +3392,7 @@ CONFIG_GPIO_UCB1400=y
 #
 # MODULbus GPIO expanders:
 #
+# CONFIG_GPIO_BCM_KONA is not set
 
 #
 # USB GPIO expanders:
@@ -3369,6 +3418,7 @@ CONFIG_BATTERY_OLPC=m
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
+CONFIG_CHARGER_BQ24735=m
 # CONFIG_CHARGER_SMB347 is not set
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
@@ -4100,7 +4150,7 @@ CONFIG_VIDEO_UPD64031A=m
 CONFIG_VIDEO_UPD64083=m
 
 #
-# Miscelaneous helper chips
+# Miscellaneous helper chips
 #
 CONFIG_VIDEO_M52790=m
 
@@ -4176,6 +4226,7 @@ CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
@@ -4287,6 +4338,7 @@ CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=m
 CONFIG_DRM_USB=m
 CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_TTM=m
 
@@ -4306,6 +4358,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_I915_FBDEV=y
 # CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
@@ -4424,7 +4477,7 @@ CONFIG_BACKLIGHT_APPLE=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_PCF50633=m
-# CONFIG_BACKLIGHT_LM3630 is not set
+CONFIG_BACKLIGHT_LM3630A=m
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
 # CONFIG_BACKLIGHT_OT200 is not set
@@ -4643,6 +4696,7 @@ CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_HIFACE=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
 CONFIG_SND_FIREWIRE_SPEAKERS=m
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_SCS1X=m
@@ -4720,6 +4774,7 @@ CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
 CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_STEELSERIES=m
 CONFIG_HID_SUNPLUS=m
@@ -4883,18 +4938,6 @@ 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
@@ -4964,7 +5007,6 @@ CONFIG_USB_XUSBATM=m
 #
 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
@@ -5007,6 +5049,7 @@ CONFIG_USB_F_NCM=m
 CONFIG_USB_F_ECM=m
 CONFIG_USB_F_SUBSET=m
 CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
 # CONFIG_USB_CONFIGFS is not set
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_AUDIO=m
@@ -5106,6 +5149,7 @@ CONFIG_LEDS_LP5562=m
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_PCA955X=m
 # CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_PCA9685=m
 # CONFIG_LEDS_DAC124S085 is not set
 # CONFIG_LEDS_PWM is not set
 CONFIG_LEDS_BD2802=m
@@ -5265,9 +5309,9 @@ CONFIG_DMA_OF=y
 #
 # DMA Clients
 #
-CONFIG_NET_DMA=y
 CONFIG_ASYNC_TX_DMA=y
 # CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
 CONFIG_DCA=m
 CONFIG_AUXDISPLAY=y
 CONFIG_KS0108=m
@@ -5568,7 +5612,6 @@ 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
@@ -5616,6 +5659,8 @@ CONFIG_APPLE_GMUX=m
 CONFIG_INTEL_RST=y
 CONFIG_INTEL_SMARTCONNECT=y
 CONFIG_PVPANIC=m
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_LAPTOP=m
 
 #
 # Hardware Spinlock drivers
@@ -5669,6 +5714,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 CONFIG_FMC_CHARDEV=m
 
 #
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=m
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
+CONFIG_PHY_EXYNOS_DP_VIDEO=m
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL=m
+
+#
 # Firmware Drivers
 #
 CONFIG_EDD=m
@@ -5686,6 +5740,7 @@ CONFIG_ISCSI_IBFT=m
 # EFI (Extensible Firmware Interface) Support
 #
 # CONFIG_EFI_VARS is not set
+CONFIG_UEFI_CPER=y
 
 #
 # File systems
@@ -5831,6 +5886,11 @@ CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_LOGFS=m
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZO=y
@@ -5860,6 +5920,7 @@ CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
+CONFIG_F2FS_CHECK_FS=y
 CONFIG_EFIVAR_FS=y
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -5875,6 +5936,7 @@ 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_1_MIGRATION=y
 CONFIG_NFS_V4_SECURITY_LABEL=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -6012,6 +6074,7 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
 CONFIG_DEBUG_KERNEL=y
 
 #
@@ -6148,6 +6211,7 @@ CONFIG_LKDTM=m
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
+CONFIG_PERCPU_TEST=m
 # CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_STRING_HELPERS is not set
@@ -6162,6 +6226,7 @@ CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK_EFI=y
 # CONFIG_X86_PTDUMP is not set
 CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
@@ -6191,6 +6256,8 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # Security options
 #
 CONFIG_KEYS=y
+CONFIG_PERSISTENT_KEYRINGS=y
+CONFIG_BIG_KEYS=y
 CONFIG_TRUSTED_KEYS=m
 CONFIG_ENCRYPTED_KEYS=m
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
@@ -6201,8 +6268,16 @@ 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_LSM_MMAP_MIN_ADDR=65536
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
+CONFIG_SECURITY_SMACK=y
 CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
@@ -6215,6 +6290,8 @@ CONFIG_SECURITY_APPARMOR_HASH=y
 CONFIG_SECURITY_YAMA=y
 CONFIG_SECURITY_YAMA_STACKED=y
 # CONFIG_IMA is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 # CONFIG_DEFAULT_SECURITY_YAMA is not set
@@ -6254,7 +6331,7 @@ CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_ABLK_HELPER=m
 CONFIG_CRYPTO_GLUE_HELPER_X86=m
 
 #
@@ -6348,6 +6425,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_USER_API=m
 CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -6368,6 +6446,7 @@ CONFIG_KVM_MMIO=y
 CONFIG_KVM_ASYNC_PF=y
 CONFIG_HAVE_KVM_MSI=y
 CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
@@ -6404,6 +6483,7 @@ CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
 CONFIG_CRC8=m
 CONFIG_AUDIT_GENERIC=y
+# CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
@@ -6437,6 +6517,7 @@ CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
 CONFIG_BTREE=y
+CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
diff --git a/libre/linux-libre/config.x86_64 b/libre-testing/linux-libre/config.x86_64
index e092582a4..a51c15a56 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre-testing/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.1-3 Kernel Configuration
+# Linux/x86 3.13.0 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -39,7 +39,6 @@ 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
@@ -76,7 +75,6 @@ CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_AUDIT_WATCH=y
 CONFIG_AUDIT_TREE=y
-CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
 
 #
 # IRQ subsystem
@@ -143,6 +141,7 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
 CONFIG_ARCH_USES_NUMA_PROT_NONE=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -247,7 +246,6 @@ 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
@@ -267,10 +265,12 @@ CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=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_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
 
@@ -282,6 +282,7 @@ CONFIG_COMPAT_OLD_SIGACTION=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
@@ -450,6 +451,7 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
@@ -530,13 +532,13 @@ CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_DPM_WATCHDOG is not set
 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
@@ -552,7 +554,6 @@ 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
@@ -568,13 +569,13 @@ CONFIG_ACPI_APEI_PCIEAER=y
 CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_EINJ=m
 CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_ACPI_EXTLOG=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
@@ -787,7 +788,6 @@ CONFIG_DEFAULT_CUBIC=y
 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
@@ -801,6 +801,7 @@ 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_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_NDISC_NODETYPE=y
@@ -863,6 +864,17 @@ CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_TFTP=m
 CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NFT_EXTHDR=m
+CONFIG_NFT_META=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_RBTREE=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_COMPAT=m
 CONFIG_NETFILTER_XTABLES=m
 
 #
@@ -956,7 +968,9 @@ 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_NETPORTNET=m
 CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
 CONFIG_IP_SET_HASH_NETPORT=m
 CONFIG_IP_SET_HASH_NETIFACE=m
 CONFIG_IP_SET_LIST_SET=m
@@ -1007,6 +1021,11 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
 # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+CONFIG_NF_TABLES_IPV4=m
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NF_TABLES_ARP=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -1039,6 +1058,9 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_TABLES_IPV6=m
+CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1059,6 +1081,7 @@ CONFIG_IP6_NF_SECURITY=m
 CONFIG_NF_NAT_IPV6=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1191,6 +1214,7 @@ CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_CLS_BPF=m
 # CONFIG_NET_EMATCH is not set
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=m
@@ -1220,6 +1244,7 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_NETLINK_MMAP=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
+CONFIG_HSR=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
@@ -1383,6 +1408,7 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=m
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
 CONFIG_NET_9P=m
 CONFIG_NET_9P_VIRTIO=m
 # CONFIG_NET_9P_DEBUG is not set
@@ -1394,6 +1420,7 @@ 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_DIGITAL=m
 CONFIG_NFC_NCI=m
 # CONFIG_NFC_NCI_SPI is not set
 CONFIG_NFC_HCI=m
@@ -1406,6 +1433,7 @@ CONFIG_NFC_PN533=m
 CONFIG_NFC_WILINK=m
 CONFIG_NFC_MEI_PHY=m
 CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
 CONFIG_NFC_PN544=m
 CONFIG_NFC_PN544_MEI=m
 CONFIG_NFC_MICROREAD=m
@@ -1552,6 +1580,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_PARPORT=m
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
 # CONFIG_PARPORT_PC_FIFO is not set
@@ -1569,10 +1598,10 @@ CONFIG_PNP=y
 #
 CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_NULL_BLK is not set
 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
@@ -1585,6 +1614,7 @@ 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_SKD=m
 CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM=m
@@ -1669,6 +1699,16 @@ CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
 CONFIG_INTEL_MEI_ME=m
 CONFIG_VMWARE_VMCI=m
+
+#
+# Intel MIC Host Driver
+#
+CONFIG_INTEL_MIC_HOST=m
+
+#
+# Intel MIC Card Driver
+#
+CONFIG_INTEL_MIC_CARD=m
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1936,7 +1976,6 @@ 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
@@ -1951,8 +1990,8 @@ 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_RAID=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
@@ -2333,6 +2372,7 @@ 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_HUAWEI_CDC_NCM=m
 CONFIG_USB_NET_CDC_MBIM=m
 CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_SR9700=m
@@ -2417,6 +2457,8 @@ CONFIG_ATH10K_PCI=m
 # CONFIG_ATH10K_DEBUG is not set
 CONFIG_ATH10K_DEBUGFS=y
 # CONFIG_ATH10K_TRACING is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
 CONFIG_B43=m
 CONFIG_B43_BCMA=y
 CONFIG_B43_SSB=y
@@ -2517,6 +2559,7 @@ CONFIG_RT2800USB_RT53XX=y
 CONFIG_RT2800USB_RT55XX=y
 CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
 CONFIG_RT2X00_LIB_MMIO=m
 CONFIG_RT2X00_LIB_PCI=m
 CONFIG_RT2X00_LIB_USB=m
@@ -2716,7 +2759,7 @@ CONFIG_INPUT_MATRIXKMAP=m
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV=m
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
@@ -2730,7 +2773,7 @@ CONFIG_INPUT_EVDEV=m
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_ATKBD=m
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_LKKBD is not set
@@ -2759,8 +2802,8 @@ 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_PS2_TOUCHKIT=y
+CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
 CONFIG_MOUSE_CYAPA=m
@@ -2873,7 +2916,9 @@ CONFIG_TOUCHSCREEN_TSC_SERIO=m
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_SUR40=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
@@ -2911,17 +2956,18 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 #
 # Hardware I/O ports
 #
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
+CONFIG_SERIO=m
+CONFIG_SERIO_I8042=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SERIO_CT82C710=m
 CONFIG_SERIO_PARKBD=m
 CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_LIBPS2=m
 CONFIG_SERIO_RAW=m
 CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
+CONFIG_HYPERV_KEYBOARD=m
 CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
@@ -2996,7 +3042,6 @@ 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
@@ -3033,10 +3078,13 @@ CONFIG_MWAVE=m
 # CONFIG_RAW_DRIVER is not set
 CONFIG_HPET=y
 CONFIG_HPET_MMAP=y
+CONFIG_HPET_MMAP_DEFAULT=y
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_TCG_TPM=m
 CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
 CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
 CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
@@ -3048,7 +3096,14 @@ CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
-# CONFIG_I2C_MUX is not set
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -3127,7 +3182,6 @@ CONFIG_SPI_MASTER=y
 # 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
@@ -3170,8 +3224,8 @@ 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_DEVRES=y
 CONFIG_GPIO_ACPI=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
@@ -3203,7 +3257,7 @@ CONFIG_GPIO_ARIZONA=m
 #
 CONFIG_GPIO_CS5535=m
 CONFIG_GPIO_AMD8111=m
-CONFIG_GPIO_LANGWELL=y
+# CONFIG_GPIO_INTEL_MID is not set
 # CONFIG_GPIO_PCH is not set
 # CONFIG_GPIO_ML_IOH is not set
 # CONFIG_GPIO_RDC321X is not set
@@ -3219,7 +3273,7 @@ CONFIG_GPIO_LANGWELL=y
 #
 # AC97 GPIO expanders:
 #
-CONFIG_GPIO_UCB1400=y
+CONFIG_GPIO_UCB1400=m
 
 #
 # LPC GPIO expanders:
@@ -3252,6 +3306,7 @@ CONFIG_TEST_POWER=m
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
+CONFIG_CHARGER_BQ24735=m
 # CONFIG_CHARGER_SMB347 is not set
 CONFIG_POWER_RESET=y
 CONFIG_POWER_AVS=y
@@ -3974,7 +4029,7 @@ CONFIG_VIDEO_UPD64031A=m
 CONFIG_VIDEO_UPD64083=m
 
 #
-# Miscelaneous helper chips
+# Miscellaneous helper chips
 #
 CONFIG_VIDEO_M52790=m
 
@@ -4050,6 +4105,7 @@ CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
@@ -4155,6 +4211,7 @@ CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=m
 CONFIG_DRM_USB=m
 CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_TTM=m
 
@@ -4174,6 +4231,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_I915_FBDEV=y
 # CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
@@ -4288,7 +4346,7 @@ CONFIG_BACKLIGHT_APPLE=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_PCF50633=m
-# CONFIG_BACKLIGHT_LM3630 is not set
+CONFIG_BACKLIGHT_LM3630A=m
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
 # CONFIG_BACKLIGHT_OT200 is not set
@@ -4467,6 +4525,7 @@ CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_HIFACE=m
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
 CONFIG_SND_FIREWIRE_SPEAKERS=m
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_SCS1X=m
@@ -4544,6 +4603,7 @@ CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
 CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_STEELSERIES=m
 CONFIG_HID_SUNPLUS=m
@@ -4705,18 +4765,6 @@ 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
@@ -4786,7 +4834,6 @@ CONFIG_USB_XUSBATM=m
 #
 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
@@ -4828,6 +4875,7 @@ CONFIG_USB_F_NCM=m
 CONFIG_USB_F_ECM=m
 CONFIG_USB_F_SUBSET=m
 CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
 # CONFIG_USB_CONFIGFS is not set
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_AUDIO=m
@@ -4928,6 +4976,7 @@ CONFIG_LEDS_LP5562=m
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_PCA955X=m
 # CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_PCA9685=m
 # CONFIG_LEDS_DAC124S085 is not set
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
@@ -5082,9 +5131,9 @@ CONFIG_DMA_ACPI=y
 #
 # DMA Clients
 #
-CONFIG_NET_DMA=y
 CONFIG_ASYNC_TX_DMA=y
 # CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
 CONFIG_DCA=m
 CONFIG_AUXDISPLAY=y
 CONFIG_KS0108=m
@@ -5285,15 +5334,11 @@ CONFIG_FT1000_PCMCIA=m
 #
 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
@@ -5359,7 +5404,6 @@ 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
@@ -5405,6 +5449,8 @@ CONFIG_APPLE_GMUX=m
 CONFIG_INTEL_RST=m
 CONFIG_INTEL_SMARTCONNECT=y
 CONFIG_PVPANIC=m
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_LAPTOP=m
 
 #
 # Hardware Spinlock drivers
@@ -5456,6 +5502,14 @@ CONFIG_FMC_WRITE_EEPROM=m
 CONFIG_FMC_CHARDEV=m
 
 #
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=m
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL=m
+
+#
 # Firmware Drivers
 #
 CONFIG_EDD=m
@@ -5473,6 +5527,7 @@ CONFIG_ISCSI_IBFT=m
 # EFI (Extensible Firmware Interface) Support
 #
 # CONFIG_EFI_VARS is not set
+CONFIG_UEFI_CPER=y
 
 #
 # File systems
@@ -5619,6 +5674,11 @@ CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_LOGFS=m
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZO=y
@@ -5648,6 +5708,7 @@ CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
+CONFIG_F2FS_CHECK_FS=y
 CONFIG_EFIVAR_FS=y
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -5663,6 +5724,7 @@ 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_1_MIGRATION=y
 CONFIG_NFS_V4_SECURITY_LABEL=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -5800,6 +5862,7 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
 CONFIG_DEBUG_KERNEL=y
 
 #
@@ -5936,6 +5999,7 @@ CONFIG_LKDTM=m
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
+CONFIG_PERCPU_TEST=m
 # CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_STRING_HELPERS is not set
@@ -5950,6 +6014,7 @@ CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK_EFI=y
 # CONFIG_X86_PTDUMP is not set
 CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
@@ -5980,6 +6045,8 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # Security options
 #
 CONFIG_KEYS=y
+CONFIG_PERSISTENT_KEYRINGS=y
+CONFIG_BIG_KEYS=y
 CONFIG_TRUSTED_KEYS=m
 CONFIG_ENCRYPTED_KEYS=m
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
@@ -5990,8 +6057,16 @@ 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_LSM_MMAP_MIN_ADDR=65536
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
+CONFIG_SECURITY_SMACK=y
 CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
@@ -6004,6 +6079,8 @@ CONFIG_SECURITY_APPARMOR_HASH=y
 CONFIG_SECURITY_YAMA=y
 CONFIG_SECURITY_YAMA_STACKED=y
 # CONFIG_IMA is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 # CONFIG_DEFAULT_SECURITY_YAMA is not set
@@ -6043,7 +6120,7 @@ CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_ABLK_HELPER=m
 CONFIG_CRYPTO_GLUE_HELPER_X86=m
 
 #
@@ -6152,6 +6229,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_USER_API=m
 CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -6169,6 +6247,7 @@ CONFIG_KVM_MMIO=y
 CONFIG_KVM_ASYNC_PF=y
 CONFIG_HAVE_KVM_MSI=y
 CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
@@ -6191,7 +6270,6 @@ 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
@@ -6205,6 +6283,7 @@ CONFIG_CRC32_SLICEBY8=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
 CONFIG_CRC8=m
+# CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
@@ -6238,6 +6317,7 @@ CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
 CONFIG_BTREE=y
+CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
diff --git a/libre-testing/linux-libre/criu-no-expert.patch b/libre-testing/linux-libre/criu-no-expert.patch
new file mode 100644
index 000000000..9bbc02812
--- /dev/null
+++ b/libre-testing/linux-libre/criu-no-expert.patch
@@ -0,0 +1,13 @@
+diff --git a/init/Kconfig b/init/Kconfig
+index 4e5d96a..4b94ffe 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1078,7 +1078,7 @@ config DEBUG_BLK_CGROUP
+ endif # CGROUPS
+ 
+ config CHECKPOINT_RESTORE
+-	bool "Checkpoint/restore support" if EXPERT
++	bool "Checkpoint/restore support"
+ 	default n
+ 	help
+ 	  Enables additional kernel features in a sake of checkpoint/restore.
diff --git a/libre/linux-libre/linux-libre.install b/libre-testing/linux-libre/linux-libre.install
index 8d5658aab..34be5215e 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre-testing/linux-libre/linux-libre.install
@@ -26,6 +26,12 @@ post_upgrade() {
     echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
     mkinitcpio -p linux-libre${KERNEL_NAME}
   fi
+
+  if [ $(vercmp $2 3.13) -lt 0 ]; then
+    echo ">>> WARNING: AT keyboard support is no longer built into the kernel."
+    echo ">>>          In order to use your keyboard during early init, you MUST"
+    echo ">>>          include the 'keyboard' hook in your mkinitcpio.conf."
+  fi
 }
 
 post_remove() {
diff --git a/libre/linux-libre/linux-libre.preset b/libre-testing/linux-libre/linux-libre.preset
index 0ac59eb14..0ac59eb14 100644
--- a/libre/linux-libre/linux-libre.preset
+++ b/libre-testing/linux-libre/linux-libre.preset
diff --git a/libre/linux-libre/logo_linux_clut224.ppm b/libre-testing/linux-libre/logo_linux_clut224.ppm
index c9d837347..c9d837347 100644
--- a/libre/linux-libre/logo_linux_clut224.ppm
+++ b/libre-testing/linux-libre/logo_linux_clut224.ppm
diff --git a/libre/linux-libre/logo_linux_mono.pbm b/libre-testing/linux-libre/logo_linux_mono.pbm
index 3d3c35807..3d3c35807 100644
--- a/libre/linux-libre/logo_linux_mono.pbm
+++ b/libre-testing/linux-libre/logo_linux_mono.pbm
diff --git a/libre/linux-libre/logo_linux_vga16.ppm b/libre-testing/linux-libre/logo_linux_vga16.ppm
index f279f972c..f279f972c 100644
--- a/libre/linux-libre/logo_linux_vga16.ppm
+++ b/libre-testing/linux-libre/logo_linux_vga16.ppm
diff --git a/libre-testing/openfwwf/PKGBUILD b/libre-testing/openfwwf/PKGBUILD
deleted file mode 100644
index 30168b159..000000000
--- a/libre-testing/openfwwf/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor: Jussi Timperi <jussi.timperi at gmail dot com>
-
-pkgname=openfwwf
-pkgver=5.2
-pkgrel=1
-pkgdesc="Open firmware for some Broadcom 43xx series WLAN chips."
-arch=('any')
-url="http://www.ing.unibs.it/openfwwf/"
-license=('GPL2')
-makedepends=('b43-tools')
-source=(http://www.ing.unibs.it/openfwwf/firmware/$pkgname-$pkgver.tar.gz)
-md5sums=('e045a135453274e439ae183f8498b0fa')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make || return 1
-  make PREFIX="$pkgdir/lib/firmware/b43" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre-testing/systemd/0001-Reinstate-TIMEOUT-handling.patch b/libre-testing/systemd/0001-Reinstate-TIMEOUT-handling.patch
deleted file mode 100644
index 2092fef90..000000000
--- a/libre-testing/systemd/0001-Reinstate-TIMEOUT-handling.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Fri, 25 May 2012 19:43:24 -0400
-Subject: [PATCH] Reinstate TIMEOUT= handling
-
-This is mostly to deal with ipw2?00 drivers which have yet to be fixed
-in the kernel.
----
- src/libudev/libudev-device.c  |   19 +++++++++++++++++++
- src/libudev/libudev-private.h |    1 +
- src/udev/udevd.c              |   13 ++++++++++---
- 3 files changed, 30 insertions(+), 3 deletions(-)
-
-diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
-index a8277d1..5966189 100644
---- a/src/libudev/libudev-device.c
-+++ b/src/libudev/libudev-device.c
-@@ -68,6 +68,7 @@ struct udev_device {
-         struct udev_list tags_list;
-         unsigned long long int seqnum;
-         unsigned long long int usec_initialized;
-+        int timeout;
-         int devlink_priority;
-         int refcount;
-         dev_t devnum;
-@@ -89,6 +90,21 @@ struct udev_device {
-         bool db_persist;
- };
-
-+int udev_device_get_timeout(struct udev_device *udev_device)
-+{
-+        return udev_device->timeout;
-+}
-+
-+static int udev_device_set_timeout(struct udev_device *udev_device, int timeout)
-+{
-+        char num[32];
-+
-+        udev_device->timeout = timeout;
-+        snprintf(num, sizeof(num), "%u", timeout);
-+        udev_device_add_property(udev_device, "TIMEOUT", num);
-+        return 0;
-+}
-+
- /**
-  * udev_device_get_seqnum:
-  * @udev_device: udev device
-@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device,
-
-                 util_strscpyl(path, sizeof(path), TEST_PREFIX "/sys", &property[8], NULL);
-                 udev_device_set_syspath(udev_device, path);
-+        } else if (strncmp(property, "TIMEOUT=", 8) == 0) {
-+                udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10));
-         } else if (startswith(property, "SUBSYSTEM=")) {
-                 udev_device_set_subsystem(udev_device, &property[10]);
-         } else if (startswith(property, "DEVTYPE=")) {
-@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev)
-         udev_list_init(udev, &udev_device->sysattr_value_list, true);
-         udev_list_init(udev, &udev_device->sysattr_list, false);
-         udev_list_init(udev, &udev_device->tags_list, true);
-+        udev_device->timeout = -1;
-         udev_device->watch_handle = -1;
-         /* copy global properties */
-         udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
-diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
-index 4eb4a59..99aefeb 100644
---- a/src/libudev/libudev-private.h
-+++ b/src/libudev/libudev-private.h
-@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device);
- void udev_device_set_is_initialized(struct udev_device *udev_device);
- int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
- void udev_device_cleanup_tags_list(struct udev_device *udev_device);
-+int udev_device_get_timeout(struct udev_device *udev_device);
- unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device);
- void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized);
- int udev_device_get_devlink_priority(struct udev_device *udev_device);
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 0d85960..cd24462 100644
---- a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -384,7 +384,7 @@ out:
-         }
- }
-
--static void event_run(struct event *event)
-+static void event_run(struct event *event, bool force)
- {
-         struct udev_list_node *loop;
-
-@@ -410,7 +410,7 @@ static void event_run(struct event *event)
-                 return;
-         }
-
--        if (children >= children_max) {
-+        if (!force && children >= children_max) {
-                 if (children_max > 1)
-                         log_debug("maximum number (%i) of children reached\n", children);
-                 return;
-@@ -444,6 +444,13 @@ static int event_queue_insert(struct udev_device *dev)
-
-         event->state = EVENT_QUEUED;
-         udev_list_node_append(&event->node, &event_list);
-+
-+        /* run all events with a timeout set immediately */
-+        if (udev_device_get_timeout(dev) > 0) {
-+                event_run(event, true);
-+                return 0;
-+        }
-+
-         return 0;
- }
-
-@@ -549,7 +556,7 @@ static void event_queue_start(struct udev *udev)
-                 if (is_devpath_busy(event))
-                         continue;
-
--                event_run(event);
-+                event_run(event, false);
-         }
- }
-
---
-1.7.10.2
diff --git a/libre-testing/systemd/PKGBUILD b/libre-testing/systemd/PKGBUILD
deleted file mode 100644
index 3d7649c01..000000000
--- a/libre-testing/systemd/PKGBUILD
+++ /dev/null
@@ -1,152 +0,0 @@
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Tom Gundersen <teg@jklm.no>
-
-pkgbase=systemd
-pkgname=('systemd')
-pkgver=184
-pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2' 'LGPL2.1' 'MIT')
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
-             'gtk-doc' 'intltool' 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'xz')
-options=('!libtool')
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
-        'initcpio-hook-udev'
-        'initcpio-install-udev'
-        'initcpio-install-timestamp'
-        '0001-Reinstate-TIMEOUT-handling.patch'
-        'os-release'
-        'locale.sh')
-md5sums=('6be0a2519fd42b988a1a2a56e5bd40c1'
-         'e99e9189aa2f6084ac28b8ddf605aeb8'
-         '59e91c4d7a69b7bf12c86a9982e37ced'
-         'df69615503ad293c9ddf9d8b7755282d'
-         '5543be25f205f853a21fa5ee68e03f0d'
-         '752636def0db3c03f121f8b4f44a63cd'
-         'f15956945052bb911e5df81cf5e7e5dc')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # still waiting on ipw2x00 to get fixed...
-  patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch"
-
-  ./configure \
-      --libexecdir=/usr/lib \
-      --localstatedir=/var \
-      --sysconfdir=/etc \
-      --enable-split-usr \
-      --enable-introspection \
-      --enable-gtk-doc \
-      --disable-audit \
-      --disable-ima \
-      --with-pamlibdir=/usr/lib/security \
-      --with-distro=arch \
-      --with-usb-ids-path=/usr/share/hwdata/usb.ids \
-      --with-pci-ids-path=/usr/share/hwdata/pci.ids \
-      --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware
-
-  make
-}
-
-package_systemd() {
-  pkgdesc="system and service manager"
-  depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam'
-           "systemd-tools=$pkgver" 'util-linux' 'xz')
-  optdepends=('dbus-python: systemd-analyze'
-              'initscripts: legacy support for hostname and vconsole setup'
-              'initscripts-systemd: native boot and initialization scripts'
-              'python2-cairo: systemd-analyze'
-              'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
-              'systemd-sysvcompat: symlink package to provide sysvinit binaries')
-  backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-          etc/dbus-1/system.d/org.freedesktop.hostname1.conf
-          etc/dbus-1/system.d/org.freedesktop.login1.conf
-          etc/dbus-1/system.d/org.freedesktop.locale1.conf
-          etc/dbus-1/system.d/org.freedesktop.timedate1.conf
-          etc/systemd/system.conf
-          etc/systemd/user.conf
-          etc/systemd/logind.conf
-          etc/systemd/journald.conf)
-  install="systemd.install"
-
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
-  printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
-  install -dm755 "$pkgdir/bin"
-  ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
-
-  # fix systemd-analyze for python2
-  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
-  # move bash-completion and symlink for loginctl
-  install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
-    "$pkgdir/usr/share/bash-completion/completions/systemctl"
-  ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl"
-  rm -rf "$pkgdir/etc/bash_completion.d"
-
-  # don't write units to /etc by default -- we'll enable this on post_install
-  # as a sane default
-  rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service"
-  rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
-
-  ### split off libsystemd (libs, includes, pkgconfig, man3)
-  rm -rf "$srcdir/_libsystemd"
-  install -dm755 "$srcdir"/_libsystemd/usr/{include,lib/pkgconfig}
-  cd "$srcdir"/_libsystemd
-  mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib
-  mv "$pkgdir/usr/include/systemd" usr/include
-  mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig
-
-  ### split out manpages for sysvcompat
-  rm -rf "$srcdir/_sysvcompat"
-  install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
-  mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
-     "$srcdir"/_sysvcompat/usr/share/man/man8
-
-  ### split out systemd-tools/udev
-  rm -rf "$srcdir/_tools"
-  install -dm755 \
-      "$srcdir"/_tools/etc/udev \
-      "$srcdir"/_tools/usr/bin \
-      "$srcdir"/_tools/usr/include \
-      "$srcdir"/_tools/usr/lib/{systemd/system,udev} \
-      "$srcdir"/_tools/usr/lib/systemd/system/{sysinit,sockets}.target.wants \
-      "$srcdir"/_tools/usr/lib/girepository-1.0 \
-      "$srcdir"/_tools/usr/share/pkgconfig \
-      "$srcdir"/_tools/usr/share/gir-1.0 \
-      "$srcdir"/_tools/usr/share/gtk-doc/html/{g,lib}udev \
-      "$srcdir"/_tools/usr/share/man/man{1,5,7,8}
-
-  cd "$srcdir/_tools"
-  mv "$pkgdir"/etc/udev etc
-  mv "$pkgdir"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d etc
-  mv "$pkgdir"/usr/bin/udevadm usr/bin
-  mv "$pkgdir"/usr/lib/pkgconfig usr/lib
-  mv "$pkgdir"/usr/lib/systemd/systemd-udevd usr/lib/systemd
-  mv "$pkgdir"/usr/lib/systemd/system/systemd-udev* usr/lib/systemd/system
-  mv "$pkgdir"/usr/lib/systemd/system/sysinit.target.wants/systemd-udev* usr/lib/systemd/system/sysinit.target.wants
-  mv "$pkgdir"/usr/lib/systemd/system/sockets.target.wants/systemd-udev* usr/lib/systemd/system/sockets.target.wants
-  mv "$pkgdir"/usr/lib/lib{,g}udev* usr/lib
-  mv "$pkgdir"/usr/lib/{binfmt,sysctl,modules-load,tmpfiles}.d usr/lib
-  mv "$pkgdir"/usr/lib/udev usr/lib
-  mv "$pkgdir"/usr/include/{libudev.h,gudev-1.0} usr/include
-  mv "$pkgdir"/usr/lib/girepository-1.0 usr/lib
-  mv "$pkgdir"/usr/share/pkgconfig/udev.pc usr/share/pkgconfig
-  mv "$pkgdir"/usr/share/gir-1.0 usr/share
-  mv "$pkgdir"/usr/share/gtk-doc/html/{g,lib}udev usr/share/gtk-doc/html
-  mv "$pkgdir"/usr/share/man/man7/udev.7 usr/share/man/man7
-  mv "$pkgdir"/usr/share/man/man8/{systemd-udevd,udevadm}.8 usr/share/man/man8
-  mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt}.1 usr/share/man/man1
-  mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5
-  mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf}.5 usr/share/man/man5
-  mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin
-  mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd
-}
-
-# vim: ft=sh syn=sh et
diff --git a/libre-testing/systemd/initcpio-hook-udev b/libre-testing/systemd/initcpio-hook-udev
deleted file mode 100644
index 75da7e4a8..000000000
--- a/libre-testing/systemd/initcpio-hook-udev
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/ash
-
-run_earlyhook() {
-    udevd --daemon --resolve-names=never
-    udevd_running=1
-}
-
-run_hook() {
-    msg ":: Triggering uevents..."
-    udevadm trigger --action=add --type=subsystems
-    udevadm trigger --action=add --type=devices
-    udevadm settle
-}
-
-run_cleanuphook() {
-    udevadm control --exit
-    udevadm info --cleanup-db
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/libre-testing/systemd/initcpio-install-timestamp b/libre-testing/systemd/initcpio-install-timestamp
deleted file mode 100644
index 259cc705b..000000000
--- a/libre-testing/systemd/initcpio-install-timestamp
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp
-}
-
-help() {
-    cat <<HELPEOF
-Provides support for RD_TIMESTAMP in early userspace, which can be read by a
-program such as systemd-analyze to determine boot time.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/libre-testing/systemd/initcpio-install-udev b/libre-testing/systemd/initcpio-install-udev
deleted file mode 100644
index 762429983..000000000
--- a/libre-testing/systemd/initcpio-install-udev
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-build() {
-    local rules tool
-
-    add_file "/etc/udev/udev.conf"
-    add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd
-    add_binary /usr/bin/udevadm
-
-    for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do
-        add_file "/usr/lib/udev/rules.d/$rules"
-    done
-    for tool in ata_id scsi_id; do
-        add_file "/usr/lib/udev/$tool"
-    done
-
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook will use udev to create your root device node and detect the needed
-modules for your root device. It is also required for firmware loading in
-initramfs. It is recommended to use this hook.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/libre-testing/systemd/locale.sh b/libre-testing/systemd/locale.sh
deleted file mode 100644
index 11f1bbbee..000000000
--- a/libre-testing/systemd/locale.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-if [ ! -r /etc/locale.conf ]; then
-  return
-fi
-
-. /etc/locale.conf
-
-if [ "${LANG+x}" = 'x' ]; then
-  export LANG
-fi
-
-if [ "${LC_CTYPE+x}" = 'x' ]; then
-  export LC_CTYPE
-fi
-
-if [ "${LC_NUMERIC+x}" = 'x' ]; then
-  export LC_NUMERIC
-fi
-
-if [ "${LC_TIME+x}" = 'x' ]; then
-  export LC_TIME
-fi
-
-if [ "${LC_COLLATE+x}" = 'x' ]; then
-  export LC_COLLATE
-fi
-
-if [ "${LC_MONETARY+x}" = 'x' ]; then
-  export LC_MONETARY
-fi
-
-if [ "${LC_MESSAGES+x}" = 'x' ]; then
-  export LC_MESSAGES
-fi
-
-if [ "${LC_PAPER+x}" = 'x' ]; then
-  export LC_PAPER
-fi
-
-if [ "${LC_NAME+x}" = 'x' ]; then
-  export LC_NAME
-fi
-
-if [ "${LC_ADDRESS+x}" = 'x' ]; then
-  export LC_ADDRESS
-fi
-
-if [ "${LC_TELEPHONE+x}" = 'x' ]; then
-  export LC_TELEPHONE
-fi
-
-if [ "${LC_MEASUREMENT+x}" = 'x' ]; then
-  export LC_MEASUREMENT
-fi
-
-if [ "${LC_IDENTIFICATION+x}" = 'x' ]; then
-  export LC_IDENTIFICATION
-fi
diff --git a/libre-testing/systemd/os-release b/libre-testing/systemd/os-release
deleted file mode 100644
index 65253e9c3..000000000
--- a/libre-testing/systemd/os-release
+++ /dev/null
@@ -1,7 +0,0 @@
-NAME=Parabola
-ID=parabola
-ID_LIKE=arch
-PRETTY_NAME="Parabola GNU/Linux-libre"
-ANSI_COLOR="1;35"
-HOME_URL="https://parabolagnulinux.org/"
-BUG_REPORT_URL="https://labs.parabola.nu/"
diff --git a/libre-testing/systemd/rePKGBUILD b/libre-testing/systemd/rePKGBUILD
deleted file mode 100644
index bd7d396db..000000000
--- a/libre-testing/systemd/rePKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# This is an example rePKGBUILD file. Use this as a start to creating your own,
-# and remove these comments. For more information, see 'man PKGBUILD'.
-# NOTE: Please fill out the license field for your package! If it is unknown,
-# then please put 'unknown'.
-
-# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-source PKGBUILD
-unset build package md5sums source check
-_repo=testing
-pkgname='systemd'
-options=(!strip)
-source=(PKGBUILD
-	http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgbase}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
-	# files for pkg modifications
-	os-release)
-
-build() {
-  cd "${srcdir}/"
-  rm -v .{INSTALL,PKGINFO} $pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT || true
-  # put actions for package modifications below this line
-
-  rm -v etc/os-release
-}
-
-package_systemd() {
-  pkgdesc="system and service manager (Parabola rebranded)"
-  depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam'
-           "systemd-tools=$pkgver" 'util-linux' 'xz')
-  optdepends=('dbus-python: systemd-analyze'
-              'initscripts: legacy support for hostname and vconsole setup'
-              'initscripts-systemd: native boot and initialization scripts'
-              'python2-cairo: systemd-analyze'
-              'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
-              'systemd-sysvcompat: symlink package to provide sysvinit binaries')
-  backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-          etc/dbus-1/system.d/org.freedesktop.hostname1.conf
-          etc/dbus-1/system.d/org.freedesktop.login1.conf
-          etc/dbus-1/system.d/org.freedesktop.locale1.conf
-          etc/dbus-1/system.d/org.freedesktop.timedate1.conf
-          etc/systemd/system.conf
-          etc/systemd/user.conf
-          etc/systemd/logind.conf
-          etc/systemd/journald.conf)
-  install="systemd.install"
-
-  # Install Parabola os-release
-  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
-
-  find ${srcdir} -maxdepth 1 -type l -delete
-  cp -a ${srcdir}/* ${pkgdir}
-}
diff --git a/libre-testing/systemd/systemd-tools.install b/libre-testing/systemd/systemd-tools.install
deleted file mode 100644
index c1c19d15d..000000000
--- a/libre-testing/systemd/systemd-tools.install
+++ /dev/null
@@ -1,29 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-post_upgrade() {
-  if [ "$(vercmp $2 174)" -lt 0 ]; then
-    echo " * We now use upstream rules for assigning devices to the 'disk', 'optical',"
-    echo "   'scanner' and 'video' groups. Beware of any changes."
-    echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
-    echo " * For security reasons, we no longer add devices to the 'storage' group. Use"
-    echo "   udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
-    echo "   this functionality back."
-    echo " * We no longer create the static nodes on install needed for an initrd-less"
-    echo "   boot where devtmpfs is not mounted by the kernel, this only affects fresh"
-    echo "   installs."
-  fi
-  if [ "$(vercmp $2 175)" -lt 0 ]; then
-    echo " * devtmpfs support is now a hard requirement. Users of the official Arch"
-    echo "   kernels have this enabled."
-  fi
-  if [ "$(vercmp $2 181)" -lt 0 ]; then
-    echo " * udev-compat has been removed, and should be uninstalled."
-    echo " * Framebuffers are no longer blacklisted by default."
-    echo " * binaries moved from /sbin to /usr/bin"
-  fi
-  if [ "$(vercmp $2 181-3)" -lt 0 ]; then
-    echo " * if your kernel does not provide /dev/loop-control, you need to manually"
-    echo "   load the 'loop' module before using losetup"
-  fi
-}
diff --git a/libre-testing/systemd/systemd.install b/libre-testing/systemd/systemd.install
deleted file mode 100644
index 0b10f9537..000000000
--- a/libre-testing/systemd/systemd.install
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-sd_booted() {
-  [ -e sys/fs/cgroup/systemd ]
-}
-
-post_install() {
-  if [ ! -f etc/machine-id ]; then
-    systemd-machine-id-setup
-  fi
-
-  # enable getty@tty1 by default, but don't track the file
-  systemctl enable getty@.service
-
-  echo ":: Append 'init=/bin/systemd' to your kernel command line in your"
-  echo "   bootloader to replace sysvinit with systemd"
-}
-
-post_upgrade() {
-  if [ ! -f etc/machine-id ]; then
-    systemd-machine-id-setup
-  fi
-
-  if sd_booted; then
-    # we moved the binary in 44-2 to /usr, so a reexec leads to a
-    # coredump. refuse this reexec and warn the user that they should
-    # reboot instead.
-    if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then
-      echo "warning: refusing to reexec systemd. the system should be rebooted."
-    else
-      systemctl daemon-reload
-      systemctl daemon-reexec
-    fi
-  fi
-
-  # getty@tty1.service is no longer enabled by default, but we don't want to break
-  # existing setups.
-  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
-  fi
-}
-
-post_remove() {
-  if getent group lock >/dev/null; then
-    groupdel lock
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre-testing/unace-libre/PKGBUILD b/libre-testing/unace-libre/PKGBUILD
deleted file mode 100644
index fe5bac90f..000000000
--- a/libre-testing/unace-libre/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Borgo
-pkgname=unace-libre
-_pkgname=unace
-pkgver=1.2b
-pkgrel=2
-pkgdesc="Extract, view and test ACE 1.x archives"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.emerge.de/"
-license=('GPL')
-depends=()
-provides=('unace')
-conflicts=('unace')
-replaces=('unace')
-source=(ftp://ftp.debian.org/debian/pool/main/u/unace/$_pkgname\_$pkgver.orig.tar.gz
-        ftp://ftp.debian.org/debian/pool/main/u/unace/$_pkgname\_$pkgver-7.diff.gz)
-md5sums=('51360df61997db28787b60ea7321d83f'
-         '9cd1e411ed0e77d024ff78585079a5a5') #generate with 'makepkg -g'
-
-build() {
-  cd "$srcdir/$_pkgname$pkgver"
-  patch -p1 -i ../$_pkgname\_$pkgver-7.diff
-  for p in $(<debian/patches/series)
-  do
-    patch -p1 -i debian/patches/$p
-  done
-  cp unix/makefile unix/gccmaked .
-# assume little-endian, debian/test-endian.c is not used
-  make dep
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname$pkgver"
-  install -Dm755 unace "$pkgdir/usr/bin/unace"
-  install -Dm644 debian/unace.1 "$pkgdir/usr/share/man/man1/unace.1"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre-testing/unar/PKGBUILD b/libre-testing/unar/PKGBUILD
deleted file mode 100644
index 4bb523a89..000000000
--- a/libre-testing/unar/PKGBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# Contributor: Cedric Girard <girard.cedric@gmail.com>
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=(
-  'unar'
-  'libuniversaldetector'
-  'libxadmaster'
-  'libxadmaster-libxad')
-pkgver=0.99
-pkgrel=1
-arch=('x86_64' 'i686')
-url="http://wakaba.c3.cx/s/apps/unarchiver.html"
-license=('LGPL2.1')
-depends=('gnustep-base-libre>=1.23.0' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
-conflicts=('gnustep-base>=1.24')
-makedepends=('gcc-objc')
-source=("https://theunarchiver.googlecode.com/files/unar${pkgver}_src.zip")
-
-build() {
-  cd "$srcdir/XADMaster"
-
-  # remove some OS X object files that were accidentally included in the dist
-  # (we've all done it)
-  find "$srcdir" -name '*.o' -delete
-
-  # build everything
-  . /usr/share/GNUstep/Makefiles/GNUstep.sh
-  make -f Makefile.linux
-
-  # make libxad into a lib file
-  cd libxad
-  rm -f libxad.a
-  ar rcs libxad.a all.o clients.o unix/emulation.o unix/init.o
-
-  # compress man pages
-  cd "$srcdir/Extra"
-  gzip -c unar.1 > unar.1.gz
-  gzip -c lsar.1 > lsar.1.gz
-}
-
-package_unar() {
-  pkgdesc="The unar/lsar command line wrappers around libXADMaster"
-
-  cd "$srcdir/XADMaster"
-  install -d "$pkgdir/usr/bin"
-  install -m755 unar lsar "$pkgdir/usr/bin"
-
-  cd "$srcdir/Extra"
-  install -d "$pkgdir/usr/share/man/man1"
-  install unar.1.gz lsar.1.gz "$pkgdir/usr/share/man/man1"
-}
-
-package_libuniversaldetector() {
-  pkgdesc="Some fancy-schmancy Objective-C library that detects things?"
-
-  cd "$srcdir/UniversalDetector"
-  install -d "$pkgdir/usr/lib/"
-  install libUniversalDetector.a "$pkgdir/usr/lib/"
-  install -d "$pkgdir/usr/include/"
-  install UniversalDetector.h "$pkgdir/usr/include/"
-}
-
-package_libxadmaster() {
-  pkgdesc="An Objective-C library built around libxad adding support for other formats"
-  depends+=('libuniversaldetector')
-
-  header_files='
-    CommandLineCommon.h
-    NSStringPrinting.h
-    XADArchive.h
-    XADRegex.h
-    XADSimpleUnarchiver.h
-    XADUnarchiver.h
-    '
-
-  cd "$srcdir/XADMaster"
-  install -d "$pkgdir/usr/lib"
-  install libXADMaster.a "$pkgdir/usr/lib"
-  install -d "$pkgdir/usr/include/XADMaster"
-  install $header_files "$pkgdir/usr/include/XADMaster"
-}
-
-package_libxadmaster-libxad() {
-  pkgdesc="A fork of libxad, the port of the Amiga 'xadmaster.library' to *NIX"
-  depends=('glibc')
-  provides=('libxad')
-  conflicts=('libxad')
-
-  cd "$srcdir/XADMaster/libxad"
-  install -d "$pkgdir/usr/lib"
-  install libxad.a "$pkgdir/usr/lib"
-  install -d "$pkgdir/usr/include/libxad"
-  install include/* "$pkgdir/usr/include/libxad"
-}
-
-md5sums=('2169b920cf62956e495cfd5e0780a41e')
diff --git a/libre-testing/unarchiver/PKGBUILD b/libre-testing/unarchiver/PKGBUILD
deleted file mode 100644
index 0df133a6c..000000000
--- a/libre-testing/unarchiver/PKGBUILD
+++ /dev/null
@@ -1,93 +0,0 @@
-# Contributor: Cedric Girard <girard.cedric@gmail.com>
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=(
-  'unarchiver'
-  'unar'
-  'libuniversaldetector'
-  'libxadmaster'
-  'libxadmaster-libxad')
-pkgver=2.7.1
-pkgrel=4
-arch=('x86_64' 'i686')
-url="http://wakaba.c3.cx/s/apps/unarchiver.html"
-license=('LGPL2.1')
-depends=('gnustep-base-libre>=1.23.0' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
-conflicts=('gnustep-base>=1.24')
-makedepends=('gcc-objc')
-source=("http://theunarchiver.googlecode.com/files/TheUnarchiver${pkgver}_src.zip")
-
-build() {
-  cd "$srcdir/The Unarchiver/XADMaster"
-
-  # build everything
-  . /usr/share/GNUstep/Makefiles/GNUstep.sh
-  make -f Makefile.linux
-
-  # make libxad into a lib file
-  cd libxad
-  rm -f libxad.a
-  ar rcs libxad.a all.o clients.o unix/emulation.o unix/init.o
-}
-
-package_unarchiver() {
-  pkgdesc="An Objective-C application for uncompressing archive files"
-  arch=('any')
-  depends=(${depends[@]} 'unar>=0.4')
-}
-
-package_unar() {
-  pkgver=0.4
-  pkgdesc="The unar/lsar command line wrappers around libXADMaster"
-
-  cd "$srcdir/The Unarchiver/XADMaster"
-  install -d "$pkgdir/usr/bin"
-  install -m755 unar lsar "$pkgdir/usr/bin"
-}
-
-package_libuniversaldetector() {
-  pkgver=0.4
-  pkgdesc="Some fancy-schmancy Objective-C library that detects things?"
-
-  cd "$srcdir/The Unarchiver/UniversalDetector"
-  install -d "$pkgdir/usr/lib"
-  install libUniversalDetector.a "$pkgdir/usr/lib"
-  install -d "$pkgdir/usr/include"
-  install UniversalDetector.h "$pkgdir/usr/include"
-}
-
-package_libxadmaster() {
-  pkgver=0.4
-  pkgdesc="An Objective-C library built around libxad adding support for other formats"
-  depends+=('libuniversaldetector')
-
-  header_files='
-    CommandLineCommon.h
-    NSStringPrinting.h
-    XADArchive.h
-    XADRegex.h
-    XADUnarchiver.h
-    '
-
-  cd "$srcdir/The Unarchiver/XADMaster"
-  install -d "$pkgdir/usr/lib"
-  install libXADMaster.a "$pkgdir/usr/lib"
-  install -d "$pkgdir/usr/include/XADMaster"
-  install $header_files "$pkgdir/usr/include/XADMaster"
-}
-
-package_libxadmaster-libxad() {
-  pkgver=0.4 # forked from 13.0.2005.06.23 (commit 1.24)
-  pkgdesc="A fork of libxad, the port of the Amiga 'xadmaster.library' to *NIX"
-  depends=('glibc')
-  provides=('libxad')
-  conflicts=('libxad')
-
-  cd "$srcdir/The Unarchiver/XADMaster/libxad"
-  install -d "$pkgdir/usr/lib"
-  install libxad.a "$pkgdir/usr/lib"
-  install -d "$pkgdir/usr/include/libxad"
-  install include/* "$pkgdir/usr/include/libxad"
-}
-
-md5sums=('498ea1c984d5783322e070a71922b422')
diff --git a/libre-testing/xadmaster/PKGBUILD b/libre-testing/xadmaster/PKGBUILD
deleted file mode 100644
index 8f358aae6..000000000
--- a/libre-testing/xadmaster/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# NOTE: This currently does not build.
-
-pkgname=xadmaster
-pkgver=13.0.2006.06.21
-pkgrel=1
-pkgdesc="The port of the Amiga 'xadmaster.library' to *NIX"
-arch=('i686' 'x86_64')
-url="http://www.dstoecker.eu/xadmaster.html"
-license=('LGPL2.1')
-groups=()
-depends=('glibc')
-makedepends=('cvs')
-provides=('libxad')
-conflicts=('libxad')
-replaces=()
-backup=()
-options=()
-install=
-source=()
-noextract=()
-md5sums=()
-
-_cvsroot=:pserver:anonymous@libxad.cvs.sourceforge.net:/cvsroot/libxad
-_cvsmod=libxad
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to $_cvsmod.sourceforge.net CVS server...."
-
-  if [[ -d "$_cvsmod/CVS" ]]; then
-    cd "$_cvsmod"
-    cvs -z3 update -d
-  else
-    cvs -z3 -d "$_cvsroot" co -D "$pkgver" -f "$_cvsmod"
-    cd "$_cvsmod"
-  fi
-
-  msg "CVS checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_cvsmod-build"
-  cp -r "$srcdir/$_cvsmod" "$srcdir/$_cvsmod-build"
-  cd "$srcdir/$_cvsmod-build"
-
-  # BUILD
-  cd portable
-  autoconf # FIXME: On my system this fails, I don't know what to do
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$_cvsmod-build"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD
deleted file mode 100644
index e8f1e00d8..000000000
--- a/libre/abiword-libre/PKGBUILD
+++ /dev/null
@@ -1,98 +0,0 @@
-# $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@parabola.nu>
-
-_pkgbase=abiword
-pkgbase=abiword-libre
-pkgname=('abiword-libre' 'abiword-libre-plugins')
-pkgver=2.8.6
-pkgrel=9.1
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.abisource.com"
-makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice0.8' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' 
-             'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'psiconv' 'ttf-liberation')
-options=('!makeflags' '!libtool')
-source=(http://www.abisource.com/downloads/${_pkgbase}/${pkgver}/source/${_pkgbase}-${pkgver}.tar.gz
-        compat_libwpg_0_9.patch
-	abiword-2.8.6-no-undefined.patch
-        abiword-2.8.6-libpng15.patch
-        abiword-2.8.6-glib-2.31.patch
-        liberation-fonts.patch)
-md5sums=('f883b0a7f26229a9c66fd6a1a94381aa'
-         '09446a2ebba8288fc611e88f7cf17298'
-         '42e2614b6e0aad457d91f6ce20b6f225'
-         '40e370e7e88c5437140ef18037abfbd3'
-         '6ec338a27a6fb590c348724ddb545849'
-         '880b17db6f249d977d2a7cd012d9ce02')
-
-build() {
-  cd "${srcdir}/${_pkgbase}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch"
-  # fix a gcc 4.6.x build issue, patch from Fedora
-  patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch"
-  patch -Np0 -i "${srcdir}/abiword-2.8.6-libpng15.patch"
-
-  # Fix build with recent glib, patch from Gentoo
-  patch -Np0 -i "${srcdir}/abiword-2.8.6-glib-2.31.patch"
-
-  # Replace non-free fonts support to liberation fonts
-  patch -Np1 -i "${srcdir}/liberation-fonts.patch"
-
-  libtoolize --force
-  autoreconf
-
-  ./configure --prefix=/usr \
-              --enable-clipart \
-              --enable-templates \
-              --enable-collab-backend-xmpp \
-              --enable-collab-backend-tcp \
-              --enable-collab-backend-service \
-              --disable-collab-backend-sugar \
-              --enable-plugins --without-gnomevfs \
-              --with-gio \
-              --with-goffice \
-              --disable-static \
-              --with-psiconv-config=/nothere
-  make
-}
-
-package_abiword-libre() {
-  pkgdesc="A fully-featured word processor that doesn't recommend nonfree fonts"
-  depends=('fribidi' 'wv' 'goffice0.8' 'librsvg' 'enchant' 'desktop-file-utils')
-  install=$pkgname.install
-  optdepends=('abiword-libre-plugins')
-  conflicts=("abiword-libre-plugins<${pkgver}-${pkgrel}" 'abiword')
-  replaces=('abiword')
-  provides=("abiword=$pkgver")
-
-  cd "${srcdir}/${_pkgbase}-${pkgver}"
-  sed -i plugins/Makefile \
-      -e 's/ collab / /' \
-      -e 's/ wpg / /' \
-      -e 's/ wmf / /' \
-      -e 's/ grammar / /' \
-      -e 's/ mathview / /' \
-      -e 's/ aiksaurus / /' \
-      -e 's/ latex / /' \
-      -e 's/ ots / /' \
-      -e 's/ wordperfect / /'
-  make DESTDIR="${pkgdir}" install
-}
-
-package_abiword-libre-plugins() {
-  pkgdesc="Additional plugins for Abiword"
-  depends=("abiword-libre=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 
-           'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf')
-  conflicts=('abiword-plugins')
-  replaces=('abiword-plugins')
-  provides=("abiword-plugins=$pkgver")
-  
-  cd "${srcdir}/${_pkgbase}-${pkgver}/plugins"
-  
-  for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do
-    make -C ${dir} DESTDIR="${pkgdir}" install
-  done
-}
diff --git a/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch b/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch
deleted file mode 100644
index 8b938cc25..000000000
--- a/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-------------------------------------------------------------------------
-r30479 | hub | 2011-11-29 00:39:09 -0500 (Tue, 29 Nov 2011) | 2 lines
-Changed paths:
-   M /abiword/trunk/src/af/util/xp/ut_go_file.h
-
-Bug 13197: only import glib.h
-Patch by Dominique Leuenberger.
-------------------------------------------------------------------------
-r30602 | hub | 2012-01-30 02:00:38 -0500 (Mon, 30 Jan 2012) | 2 lines
-Changed paths:
-   M /abiword/trunk/goffice-bits/goffice/app/goffice-app.h
-
-Bug 13247 - Fix glib headers. Patch by Funda Wang
-(safe to backport)
-------------------------------------------------------------------------
-Index: src/af/util/xp/ut_go_file.h
-===================================================================
---- src/af/util/xp/ut_go_file.h	(revision 30478)
-+++ src/af/util/xp/ut_go_file.h	(revision 30479)
-@@ -31,7 +31,6 @@
- 
- #include <glib.h>
- #include <gsf/gsf.h>
--#include <glib/gerror.h>
- #include <time.h>
- 
- G_BEGIN_DECLS
-Index: goffice-bits/goffice/app/goffice-app.h
-===================================================================
---- goffice-bits/goffice/app/goffice-app.h	(revision 30601)
-+++ goffice-bits/goffice/app/goffice-app.h	(revision 30602)
-@@ -22,7 +22,7 @@
- #ifndef GOFFICE_APP_H
- #define GOFFICE_APP_H
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
- 
diff --git a/libre/abiword-libre/abiword-2.8.6-libpng15.patch b/libre/abiword-libre/abiword-2.8.6-libpng15.patch
deleted file mode 100644
index 7eded4c83..000000000
--- a/libre/abiword-libre/abiword-2.8.6-libpng15.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD: patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
-
-Fix build with png-1.5.
-
---- plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig	2009-06-25 04:02:06.000000000 +0000
-+++ plugins/bmp/xp/ie_impGraphic_BMP.cpp
-@@ -191,7 +191,10 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap
- 
- 	/* Clean Up Memory Used */
- 		
--	FREEP(m_pPNGInfo->palette);
-+	png_colorp palette;
-+	int num_palette;
-+	png_get_PLTE( m_pPNG, m_pPNGInfo, &palette, &num_palette );
-+	FREEP(palette);
- 	DELETEP(pBB);
- 	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-    
-@@ -313,7 +316,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -332,7 +335,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- 	UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
- 	{
- 		/* Reset error handling for libpng */
--		if (setjmp(m_pPNG->jmpbuf))
-+		if (setjmp(png_jmpbuf(m_pPNG)))
- 		{
- 			png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
- 			return UT_ERROR;
-@@ -372,7 +375,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
- {
- 	/* Reset error handling for libpng */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
- 		return UT_ERROR;
-
-$NetBSD: patch-plugins_garble_xp_abiword-garble-png.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
-
-Fix build with png-1.5.
-
---- plugins/garble/xp/abiword-garble-png.cpp.orig	2009-09-05 15:34:44.000000000 +0000
-+++ plugins/garble/xp/abiword-garble-png.cpp
-@@ -79,7 +79,7 @@ bool abiword_document::garble_png( void*
- 		png_set_strip_alpha( png_ptr );
- 		png_set_interlace_handling( png_ptr );
- 		png_set_bgr( png_ptr );
--		rowbytes = info_ptr->rowbytes;
-+		rowbytes = png_get_rowbytes( png_ptr, info_ptr );
- 		png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
- 	}
- 
-$NetBSD: patch-af,v 1.12 2011/01/15 15:07:11 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig	2009-07-01 04:02:04.000000000 +0000
-+++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
-@@ -185,7 +185,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import
- /** needed for the stejmp context */
- UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
- {
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		DELETEP(m_pPngBB);
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -446,7 +446,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-$NetBSD: patch-ae,v 1.21 2011/01/15 15:07:11 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/af/util/xp/ut_png.cpp.orig	2008-02-24 03:33:07.000000000 +0000
-+++ src/af/util/xp/ut_png.cpp
-@@ -71,7 +71,7 @@ bool UT_PNG_getDimensions(const UT_ByteB
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
diff --git a/libre/abiword-libre/abiword-2.8.6-no-undefined.patch b/libre/abiword-libre/abiword-2.8.6-no-undefined.patch
deleted file mode 100644
index c07000edb..000000000
--- a/libre/abiword-libre/abiword-2.8.6-no-undefined.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am
---- abiword-2.8.6.orig/src/Makefile.am	2009-09-09 15:11:01.000000000 +0200
-+++ abiword-2.8.6/src/Makefile.am	2011-08-02 23:35:51.904761961 +0200
-@@ -107,7 +107,7 @@
- 
- AbiWord_LDFLAGS = \
- 	$(DEPS_LIBS) \
--	--no-undefined \
-+	-Wl,--no-undefined \
- 	-avoid-version \
- 	-export-dynamic \
- 	-headerpad_max_install_names 
-@@ -129,7 +129,7 @@
- 
- abiword_LDFLAGS = \
- 	$(platform_ldflags) \
--	--no-undefined      \
-+	-Wl,--no-undefined      \
- 	-avoid-version      \
- 	-export-dynamic
- 
diff --git a/libre/abiword-libre/abiword-libre.install b/libre/abiword-libre/abiword-libre.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/libre/abiword-libre/abiword-libre.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/libre/abiword-libre/compat_libwpg_0_9.patch b/libre/abiword-libre/compat_libwpg_0_9.patch
deleted file mode 100644
index cf36e188e..000000000
--- a/libre/abiword-libre/compat_libwpg_0_9.patch
+++ /dev/null
@@ -1,371 +0,0 @@
-diff -Nur abiword-2.8.6.orig//plugin-configure.m4 abiword-2.8.6/plugin-configure.m4
---- abiword-2.8.6.orig//plugin-configure.m4	2010-06-13 14:17:27.000000000 -0700
-+++ abiword-2.8.6/plugin-configure.m4	2010-12-06 13:59:43.083048588 -0800
-@@ -794,7 +794,7 @@
- AC_SUBST([OPENXML_LIBS])
- 
- 
--wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0"
-+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
- wpg_deps="no"
- 
- if test "$enable_wpg" != ""; then
-@@ -1497,8 +1497,8 @@
- AC_SUBST([EML_LIBS])
- 
- 
--wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0'
-+wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
-diff -Nur abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 abiword-2.8.6/plugins/wordperfect/plugin.m4
---- abiword-2.8.6.orig//plugins/wordperfect/plugin.m4	2010-05-30 07:50:46.000000000 -0700
-+++ abiword-2.8.6/plugins/wordperfect/plugin.m4	2010-12-06 13:59:53.929715254 -0800
-@@ -1,6 +1,6 @@
- 
--wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0'
-+wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
-diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
---- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp	2010-02-06 13:06:11.000000000 -0800
-+++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp	2010-12-06 13:59:53.926381921 -0800
-@@ -60,7 +60,7 @@
- 
- // Stream class
- 
--#include <libwpd/WPXStream.h>
-+#include <libwpd-stream/libwpd-stream.h>
- 
- #include <gsf/gsf-input.h>
- #include <gsf/gsf-infile.h>
-@@ -70,12 +70,7 @@
- #include <libwps/libwps.h>
- #endif
- 
--class AbiWordperfectInputStream :
--#ifdef HAVE_LIBWPS
--	public WPSInputStream
--#else
--    public WPXInputStream
--#endif
-+class AbiWordperfectInputStream : public WPXInputStream
- {
- public:
- 	AbiWordperfectInputStream(GsfInput *input);
-@@ -86,7 +81,7 @@
- 
- 	virtual WPXInputStream * getDocumentOLEStream(const char * name);
- 
--	virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
-+	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
- 	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
- 	virtual long tell();
- 	virtual bool atEOS();
-@@ -98,11 +93,7 @@
- };
- 
- AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) :
--#ifdef HAVE_LIBWPS
--	WPSInputStream(),
--#else
--	WPXInputStream(true),
--#endif
-+	WPXInputStream(),
- 	m_input(input),
- 	m_ole(NULL)
- {
-@@ -117,9 +108,9 @@
- 	g_object_unref(G_OBJECT(m_input));
- }
- 
--const uint8_t * AbiWordperfectInputStream::read(size_t numBytes, size_t &numBytesRead)
-+const unsigned char * AbiWordperfectInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
- {
--	const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL);
-+	const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL);
- 
- 	if (buf == NULL)
- 		numBytesRead = 0;
-@@ -256,19 +247,12 @@
- {
- 	AbiWordperfectInputStream gsfInput(input);
- 
--	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput, true);
-+	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput);
- 
- 	switch (confidence)
- 	{
- 		case WPD_CONFIDENCE_NONE:
--		// libwpd > 0.7.1 reports POOR if the text file is plain text (that _could_ be a WP4x document)
--		// however, we'll let the text importer handle such cases
--		case WPD_CONFIDENCE_POOR: 
- 			return UT_CONFIDENCE_ZILCH;
--		case WPD_CONFIDENCE_LIKELY:
--			return UT_CONFIDENCE_SOSO;
--		case WPD_CONFIDENCE_GOOD:
--			return UT_CONFIDENCE_GOOD;
- 		case WPD_CONFIDENCE_EXCELLENT:
- 			return UT_CONFIDENCE_PERFECT;
- 		default:
-@@ -328,7 +312,7 @@
- UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input)
- {
- 	AbiWordperfectInputStream gsfInput(input);
--	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this));
-+	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL);
- 
- 	if (error != WPD_OK)
- 	{
-@@ -381,9 +365,9 @@
- 	float marginLeft = 1.0f, marginRight = 1.0f;
- 
- 	if (propList["fo:margin-left"])
--		marginLeft = propList["fo:margin-left"]->getFloat();
-+		marginLeft = propList["fo:margin-left"]->getDouble();
- 	if (propList["fo:margin-right"])
--		marginRight = propList["fo:margin-right"]->getFloat();
-+		marginRight = propList["fo:margin-right"]->getDouble();
- 
- 	if (marginLeft != m_leftPageMargin || marginRight != m_rightPageMargin /* || */
- 		/* marginTop != m_marginBottom || marginBottom != m_marginBottom */ )
-@@ -456,15 +440,15 @@
- 	float marginTop = 0.0f, marginBottom = 0.0f;
- 	float marginLeft = 0.0f, marginRight = 0.0f, textIndent = 0.0f;
- 	if (propList["fo:margin-top"])
--	    marginTop = propList["fo:margin-top"]->getFloat();
-+	    marginTop = propList["fo:margin-top"]->getDouble();
- 	if (propList["fo:margin-bottom"])
--	    marginBottom = propList["fo:margin-bottom"]->getFloat();
-+	    marginBottom = propList["fo:margin-bottom"]->getDouble();
- 	if (propList["fo:margin-left"])
--	    marginLeft = propList["fo:margin-left"]->getFloat();
-+	    marginLeft = propList["fo:margin-left"]->getDouble();
- 	if (propList["fo:margin-right"])
--	    marginRight = propList["fo:margin-right"]->getFloat();
-+	    marginRight = propList["fo:margin-right"]->getDouble();
- 	if (propList["fo:text-indent"])
--	    textIndent = propList["fo:text-indent"]->getFloat();
-+	    textIndent = propList["fo:text-indent"]->getDouble();
- 
- 	m_topMargin = marginTop;
- 	m_bottomMargin = marginBottom;
-@@ -487,7 +471,7 @@
- 
- 	float lineSpacing = 1.0f;
- 	if (propList["fo:line-height"])
--		lineSpacing = propList["fo:line-height"]->getFloat();
-+		lineSpacing = propList["fo:line-height"]->getDouble();
- 	
- 	UT_String tmpBuffer;
- 	UT_String_sprintf(tmpBuffer, "; margin-top:%.4fin; margin-bottom:%.4fin; margin-left:%.4fin; margin-right:%.4fin; text-indent:%.4fin; line-height:%.4f",
-@@ -504,7 +488,7 @@
- 			propBuffer += tmpBuffer;
- 			if (i()["style:position"])
- 			{
--				UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getFloat());
-+				UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getDouble());
- 				propBuffer += tmpBuffer;
- 			}
- 
-@@ -640,9 +624,9 @@
- 
- 	// TODO: support spaceAfter
- 	if (propList["fo:margin-left"])
--		marginLeft = propList["fo:margin-left"]->getFloat();
-+		marginLeft = propList["fo:margin-left"]->getDouble();
- 	if (propList["fo:margin-right"])
--		marginRight = propList["fo:margin-right"]->getFloat();
-+		marginRight = propList["fo:margin-right"]->getDouble();
- 
- 	if (marginLeft != m_leftSectionMargin || marginRight != m_rightSectionMargin || m_sectionColumnsCount != columnsCount)
- 		m_bSectionChanged = true;
-@@ -709,9 +693,9 @@
- 	if (propList["style:num-format"])
- 		listType = propList["style:num-format"]->getStr().cstr()[0];
- 	if (propList["text:space-before"])
--		listLeftOffset = propList["text:space-before"]->getFloat();
-+		listLeftOffset = propList["text:space-before"]->getDouble();
- 	if (propList["text:min-label-width"])
--		listMinLabelWidth = propList["text:min-label-width"]->getFloat();
-+		listMinLabelWidth = propList["text:min-label-width"]->getDouble();
- 
- 	if (!m_pCurrentListDefinition || 
- 		m_pCurrentListDefinition->getOutlineHash() != listID ||
-@@ -749,9 +733,9 @@
- 	if (propList["libwpd:level"])
- 		level = propList["libwpd:level"]->getInt();
- 	if (propList["text:space-before"])
--		listLeftOffset = propList["text:space-before"]->getFloat();
-+		listLeftOffset = propList["text:space-before"]->getDouble();
- 	if (propList["text:min-label-width"])
--		listMinLabelWidth = propList["text:min-label-width"]->getFloat();
-+		listMinLabelWidth = propList["text:min-label-width"]->getDouble();
- 
- 	if (!m_pCurrentListDefinition || m_pCurrentListDefinition->getOutlineHash() != listID)
- 	{
-@@ -871,10 +855,10 @@
- 
- 	UT_String_sprintf(tempBuffer, "margin-left:%.4fin; ", m_pCurrentListDefinition->getListLeftOffset(m_iCurrentListLevel)
- 					+ m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel)
--					- (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f));
-+					- (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f));
- 	propBuffer += tempBuffer;
- 	UT_String_sprintf(tempBuffer, "text-indent:%.4fin", - m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel)
--					+ (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f));
-+					+ (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f));
- 	propBuffer += tempBuffer;
- 
- 	listAttribs[attribsCount++] = PT_PROPS_ATTRIBUTE_NAME;
-@@ -1263,7 +1247,7 @@
-     virtual UT_Error _loadFile(GsfInput * input)
- 	{
- 		AbiWordperfectInputStream gsfInput(input);
--		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this));
-+		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this));
- 
- 		if (error != WPS_OK)
- 			{
-@@ -1302,18 +1286,12 @@
- {
- 	AbiWordperfectInputStream gsfInput(input);
- 
--	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput, true);
-+	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput);
- 
- 	switch (confidence)
- 	{
- 		case WPS_CONFIDENCE_NONE:
- 			return UT_CONFIDENCE_ZILCH;
--		case WPS_CONFIDENCE_POOR: 
--			return UT_CONFIDENCE_POOR;
--		case WPS_CONFIDENCE_LIKELY:
--			return UT_CONFIDENCE_SOSO;
--		case WPS_CONFIDENCE_GOOD:
--			return UT_CONFIDENCE_GOOD;
- 		case WPS_CONFIDENCE_EXCELLENT:
- 			return UT_CONFIDENCE_PERFECT;
- 		default:
-diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h
---- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h	2009-06-19 01:55:49.000000000 -0700
-+++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h	2010-12-06 13:59:53.929715254 -0800
-@@ -30,13 +30,7 @@
- #define IE_IMP_WP_H
- 
- #include <stdio.h>
--#ifdef _WIN32
--#define POINT WPX_POINT
--#endif
- #include <libwpd/libwpd.h>
--#ifdef _WIN32
--#undef POINT
--#endif
- #include "ie_imp.h"
- #include "ut_string.h"
- #include "ut_string_class.h"
-@@ -98,7 +92,7 @@
- 					IE_Imp ** ppie);
- };
- 
--class IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl
-+class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface
- {
- public:
-     IE_Imp_WordPerfect(PD_Document * pDocument);
-@@ -154,6 +148,21 @@
-     virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {}
-     virtual void closeTable();
- 
-+    virtual void definePageStyle(const WPXPropertyList&) {}
-+    virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
-+    virtual void defineCharacterStyle(const WPXPropertyList&) {}
-+    virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
-+    virtual void insertSpace() {}
-+    virtual void insertField(const WPXString&, const WPXPropertyList&) {}
-+    virtual void openComment(const WPXPropertyList&) {}
-+    virtual void closeComment() {}
-+    virtual void openTextBox(const WPXPropertyList&) {}
-+    virtual void closeTextBox() {}
-+    virtual void openFrame(const WPXPropertyList&) {}
-+    virtual void closeFrame() {}
-+    virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {}
-+    virtual void insertEquation(const WPXPropertyList&, const WPXString&) {}
-+
-     
- protected:
- 	virtual UT_Error _loadFile(GsfInput * input);
-diff -Nur abiword-2.8.6.orig//plugins/wpg/plugin.m4 abiword-2.8.6/plugins/wpg/plugin.m4
---- abiword-2.8.6.orig//plugins/wpg/plugin.m4	2010-05-30 07:50:46.000000000 -0700
-+++ abiword-2.8.6/plugins/wpg/plugin.m4	2010-12-06 13:59:53.929715254 -0800
-@@ -1,5 +1,5 @@
- 
--wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0"
-+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
- wpg_deps="no"
- 
- if test "$enable_wpg" != ""; then
-diff -Nur abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp
---- abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp	2008-08-15 14:52:32.000000000 -0700
-+++ abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp	2010-12-06 13:59:53.923048588 -0800
-@@ -31,11 +31,10 @@
- #include <gsf/gsf-input-memory.h>
- #include <gsf/gsf-input-stdio.h>
- #include <gsf/gsf-infile-msole.h>
--#include <libwpd/WPXStream.h>
-+#include <libwpd-stream/libwpd-stream.h>
- #include "xap_Module.h"
- 
- using libwpg::WPGraphics;
--using libwpg::WPGString;
- 
- ABI_PLUGIN_DECLARE("WPG")
- 
-@@ -48,7 +47,7 @@
- 	virtual bool isOLEStream();
- 	virtual WPXInputStream * getDocumentOLEStream();
- 	virtual WPXInputStream * getDocumentOLEStream(const char * name);
--	virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
-+	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
- 	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
- 	virtual long tell();
- 	virtual bool atEOS();
-@@ -60,7 +59,7 @@
- };
- 
- AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) :
--	WPXInputStream(true),
-+	WPXInputStream(),
- 	m_input(input),
- 	m_ole(NULL)
- {
-@@ -75,9 +74,9 @@
- 	g_object_unref(G_OBJECT(m_input));
- }
- 
--const uint8_t * AbiWordPerfectGraphicsInputStream::read(size_t numBytes, size_t &numBytesRead)
-+const unsigned char * AbiWordPerfectGraphicsInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
- {
--	const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL);
-+	const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL);
- 
- 	if (buf == NULL)
- 		numBytesRead = 0;
-@@ -245,10 +244,10 @@
- UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg)
- {
- 	AbiWordPerfectGraphicsInputStream gsfInput(input);
--	WPGString svgOutput;
-+	WPXString svgOutput;
- 	if (WPGraphics::generateSVG(&gsfInput, svgOutput))
- 	{
--		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.length(), false);
-+		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
- 		UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
- 		g_object_unref(svgInput);
- 		return result;
diff --git a/libre/abiword-libre/liberation-fonts.patch b/libre/abiword-libre/liberation-fonts.patch
deleted file mode 100644
index a009b18f5..000000000
--- a/libre/abiword-libre/liberation-fonts.patch
+++ /dev/null
@@ -1,1606 +0,0 @@
-diff -auNpr abiword-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp abiword-libre-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp
---- abiword-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp	2009-07-20 16:22:04.000000000 -0300
-+++ abiword-libre-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp	2011-07-02 15:37:16.397564815 -0300
-@@ -1062,7 +1062,7 @@ void s_LaTeX_Listener::_openSpan(PT_Attr
- 				m_pie->write("\\texttt{");
- 				m_NumCloseBrackets++;
- 			}
--			if (!strcmp("Arial", szValue) ||
-+			if (!strcmp("Liberation Sans", szValue) ||
- 				!strcmp("Helvetic", szValue) ||
- 				!strcmp("Luxi Sans",szValue)) {
- 				m_pie->write("\\textsf{");
-diff -auNpr abiword-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp abiword-libre-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp
---- abiword-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp	2008-04-20 11:44:51.000000000 -0300
-+++ abiword-libre-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp	2011-07-02 15:37:12.791762814 -0300
-@@ -59,7 +59,7 @@ void ODi_FontFaceDecls::startElement (co
-         fontFamily = pFontFamily;
- 
-         if (pFontFamily && (pFontFamily[0] == '\'') && (pFontFamily[strlen(pFontFamily)-1] == '\'')) {
--            // e.g.:  Turns a "'Times New Roman'" into a "Times New Roman".
-+            // e.g.:  Turns a "'Liberation Serif'" into a "Liberation Serif".
-             // OpenOffice.org sometimes adds those extra "'" surrounding the
-             // font family name if it's composed by more than one word.
-             m_fontFamilies[pStyleName] =
-diff -auNpr abiword-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp abiword-libre-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp
---- abiword-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp	2009-06-25 18:29:32.000000000 -0300
-+++ abiword-libre-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp	2011-07-02 15:37:16.561646815 -0300
-@@ -899,12 +899,12 @@ bool OO_StylesWriter::writeStyles(PD_Doc
-     {	   
-       "<office:styles>\n",
-       "<style:default-style style:family=\"graphics\">\n",
--      "<style:properties draw:start-line-spacing-horizontal=\"0.283cm\" draw:start-line-spacing-vertical=\"0.283cm\" draw:end-line-spacing-horizontal=\"0.283cm\" draw:end-line-spacing-vertical=\"0.283cm\" fo:color=\"#000000\" style:font-name=\"Nimbus Roman No9 L\" fo:font-size=\"12pt\" fo:language=\"en\" fo:country=\"US\" style:font-name-asian=\"HG Mincho Light J\" style:font-size-asian=\"12pt\" style:language-asian=\"none\" style:country-asian=\"none\" style:font-name-complex=\"Arial Unicode MS\" style:font-size-complex=\"12pt\" style:language-complex=\"none\" style:country-complex=\"none\" style:text-autospace=\"ideograph-alpha\" style:punctuation-wrap=\"simple\" style:line-break=\"strict\">\n",
-+      "<style:properties draw:start-line-spacing-horizontal=\"0.283cm\" draw:start-line-spacing-vertical=\"0.283cm\" draw:end-line-spacing-horizontal=\"0.283cm\" draw:end-line-spacing-vertical=\"0.283cm\" fo:color=\"#000000\" style:font-name=\"Nimbus Roman No9 L\" fo:font-size=\"12pt\" fo:language=\"en\" fo:country=\"US\" style:font-name-asian=\"HG Mincho Light J\" style:font-size-asian=\"12pt\" style:language-asian=\"none\" style:country-asian=\"none\" style:font-name-complex=\"Liberation Sans\" style:font-size-complex=\"12pt\" style:language-complex=\"none\" style:country-complex=\"none\" style:text-autospace=\"ideograph-alpha\" style:punctuation-wrap=\"simple\" style:line-break=\"strict\">\n",
-       "<style:tab-stops/>\n",
-       "</style:properties>\n",
-       "</style:default-style>\n",
-       "<style:default-style style:family=\"paragraph\">\n",
--      "<style:properties fo:color=\"#000000\" style:font-name=\"Nimbus Roman No9 L\" fo:font-size=\"12pt\" fo:language=\"en\" fo:country=\"US\" style:font-name-asian=\"HG Mincho Light J\" style:font-size-asian=\"12pt\" style:language-asian=\"none\" style:country-asian=\"none\" style:font-name-complex=\"Arial Unicode MS\" style:font-size-complex=\"12pt\" style:language-complex=\"none\" style:country-complex=\"none\" fo:hyphenate=\"false\" fo:hyphenation-remain-char-count=\"2\" fo:hyphenation-push-char-count=\"2\" fo:hyphenation-ladder-count=\"no-limit\" style:text-autospace=\"ideograph-alpha\" style:punctuation-wrap=\"hanging\" style:line-break=\"strict\" style:tab-stop-distance=\"2.205cm\"/>\n",
-+      "<style:properties fo:color=\"#000000\" style:font-name=\"Nimbus Roman No9 L\" fo:font-size=\"12pt\" fo:language=\"en\" fo:country=\"US\" style:font-name-asian=\"HG Mincho Light J\" style:font-size-asian=\"12pt\" style:language-asian=\"none\" style:country-asian=\"none\" style:font-name-complex=\"Liberation Sans\" style:font-size-complex=\"12pt\" style:language-complex=\"none\" style:country-complex=\"none\" fo:hyphenate=\"false\" fo:hyphenation-remain-char-count=\"2\" fo:hyphenation-push-char-count=\"2\" fo:hyphenation-ladder-count=\"no-limit\" style:text-autospace=\"ideograph-alpha\" style:punctuation-wrap=\"hanging\" style:line-break=\"strict\" style:tab-stop-distance=\"2.205cm\"/>\n",
-       "</style:default-style>\n"
-     };
-   
-diff -auNpr abiword-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp
---- abiword-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp	2008-01-16 15:02:48.000000000 -0200
-+++ abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp	2011-07-02 15:37:13.944338815 -0300
-@@ -34,7 +34,7 @@
- #include <string>
- 
- OXML_FontManager::OXML_FontManager() : 
--	m_defaultFont("Times New Roman")
-+	m_defaultFont("Liberation Serif")
- {
- 	m_major_rts.clear();
- 	m_minor_rts.clear();
-diff -auNpr abiword-2.8.6/plugins/openxml/common/xp/OXML_List.cpp abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_List.cpp
---- abiword-2.8.6/plugins/openxml/common/xp/OXML_List.cpp	2009-07-02 12:20:55.000000000 -0300
-+++ abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_List.cpp	2011-07-02 15:37:13.960346815 -0300
-@@ -258,7 +258,7 @@ UT_Error OXML_List::serialize(IE_Exp_Ope
- 			txt = txt.replace(index+1, 1, 1, '1'+i);
- 		}
- 	
--		std::string fontFamily("Times New Roman");
-+		std::string fontFamily("Liberation Serif");
- 		const gchar* listType = "bullet";
- 		switch(type)
- 		{
-diff -auNpr abiword-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp abiword-libre-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp
---- abiword-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp	2009-05-07 18:45:16.000000000 -0300
-+++ abiword-libre-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp	2011-07-02 15:37:14.172452815 -0300
-@@ -318,7 +318,7 @@ void Passepartout_Listener::_openBlock(P
-                  }
- 		else
-                  {
--                   TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Times New Roman" );
-+                   TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Liberation Serif" );
-                    m_pie->write(TempStr.utf8_str());
-                  }
- 
-@@ -426,7 +426,7 @@ void Passepartout_Listener::_openFont(PT
-                  }
- 		else
-                  {
--                   TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Times New Roman" );
-+                   TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Liberation Serif" );
-                    m_pie->write(TempStr.utf8_str());
-                  }
- 
-diff -auNpr abiword-2.8.6/plugins/t602/xp/ie_imp_T602.cpp abiword-libre-2.8.6/plugins/t602/xp/ie_imp_T602.cpp
---- abiword-2.8.6/plugins/t602/xp/ie_imp_T602.cpp	2009-01-04 18:34:28.000000000 -0200
-+++ abiword-libre-2.8.6/plugins/t602/xp/ie_imp_T602.cpp	2011-07-02 15:37:14.676704815 -0300
-@@ -620,7 +620,7 @@ switch (c)
-      case 0x01:
- 	m_sfont ^=1;
- 	if (m_sfont & 1)
--	  { m_size=static_cast<int>(0.8*m_basesize); m_family="Arial"; 
-+	  { m_size=static_cast<int>(0.8*m_basesize); m_family="Liberation Sans"; 
- 		  /* FIXME? -> .profile?*/ }
- 	else
- 	  { m_size=m_basesize; m_family=m_basefamily; }
-diff -auNpr abiword-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp abiword-libre-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
---- abiword-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp	2009-09-04 09:40:10.000000000 -0300
-+++ abiword-libre-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp	2011-07-02 15:36:53.578160816 -0300
-@@ -182,7 +182,7 @@ GR_Font * GR_UnixCairoGraphics::getGUIFo
- 		GtkStyle *tempStyle = gtk_style_new();
- 		const char *guiFontName = pango_font_description_get_family(tempStyle->font_desc);
- 		if (!guiFontName)
--			guiFontName = "'Times New Roman'";
-+			guiFontName = "'Liberation Serif'";
- 
- 		UT_UTF8String s = XAP_EncodingManager::get_instance()->getLanguageISOName();
- 
-diff -auNpr abiword-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp abiword-libre-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp
---- abiword-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp	2010-04-14 18:13:41.000000000 -0300
-+++ abiword-libre-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp	2011-07-02 15:36:53.918330816 -0300
-@@ -756,8 +756,8 @@ bool GR_CairoGraphics::shape(GR_ShapingI
- 
- 	/*
- 	 * Pango does a royally bad job of the font substitution in
--	 * pango_itemize(): it will happily return 'Times New Roman' as
--	 * font when we have requested 'Arial', even though the latter is
-+	 * pango_itemize(): it will happily return 'Liberation Serif' as
-+	 * font when we have requested 'Liberation Sans', even though the latter is
- 	 * present and has the necessary coverage. Consequently we have to
- 	 * do the font substitution manually even on the first shapping.
- 	 *
-@@ -2931,7 +2931,7 @@ GR_Font * GR_CairoGraphics::getDefaultFo
- 
- 		case GR_Font::FF_Technical:
- 		case GR_Font::FF_BiDi:
--			pszFontFamily = "Arial";
-+			pszFontFamily = "Liberation Sans";
- 			break;
- 			
- 		default:
-diff -auNpr abiword-2.8.6/src/af/util/xp/ut_misc.cpp abiword-libre-2.8.6/src/af/util/xp/ut_misc.cpp
---- abiword-2.8.6/src/af/util/xp/ut_misc.cpp	2009-06-28 19:09:08.000000000 -0300
-+++ abiword-libre-2.8.6/src/af/util/xp/ut_misc.cpp	2011-07-02 15:36:54.746744816 -0300
-@@ -606,7 +606,7 @@ const gchar ** UT_setPropsToValue(const
- }
- 
- /*!
--   splits the xml property string (font-size:24pt;font-face:Arial') into names and values
-+   splits the xml property string (font-size:24pt;font-face:Liberation Sans') into names and values
-    and stores them in an array
- 
-    the caller has to delete[] the array; the process is destructive to props
-diff -auNpr abiword-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib abiword-libre-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib
---- abiword-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib	2005-08-02 02:31:06.000000000 -0300
-+++ abiword-libre-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib	2011-07-02 15:36:51.257000816 -0300
-@@ -10910,7 +10910,7 @@
- 				<integer>624</integer>
- 			</dict>
- 		</dict>
--		<string>Times New Roman</string>
-+		<string>Liberation Serif</string>
- 		<string>_popUpItemAction:</string>
- 		<dict>
- 			<key>$class</key>
-diff -auNpr abiword-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp abiword-libre-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp
---- abiword-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp	2009-09-01 11:49:33.000000000 -0300
-+++ abiword-libre-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp	2011-07-02 15:36:50.404574816 -0300
-@@ -878,7 +878,7 @@ gint XAP_UnixDialog_FileOpenSaveAs::prev
- 
- 	const gchar * file_name = gtk_file_chooser_get_uri (m_FC);
- 	
--	GR_Font * fnt = pGr->findFont("Times New Roman",
-+	GR_Font * fnt = pGr->findFont("Liberation Serif",
- 								  "normal", "", "normal",
- 								  "", "12pt",
- 								  pSS->getLanguageName());
-diff -auNpr abiword-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp abiword-libre-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp
---- abiword-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp	2009-07-08 05:17:51.000000000 -0300
-+++ abiword-libre-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp	2011-07-02 15:36:50.788766816 -0300
-@@ -258,7 +258,7 @@ void XAP_Win32Dialog_About::runModal(XAP
- 	lf.lfWeight = 0;
- 	HFONT hfontSmall = CreateFontIndirect(&lf);
- 
--	strcpy(lf.lfFaceName, "Arial");
-+	strcpy(lf.lfFaceName, "Liberation Sans");
- 	lf.lfHeight = 36;
- 	lf.lfWeight = FW_BOLD; 
- 	HFONT hfontHeading = CreateFontIndirect(&lf);
-diff -auNpr abiword-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp
---- abiword-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp	2009-05-30 11:03:24.000000000 -0300
-+++ abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp	2011-07-02 15:36:52.893818816 -0300
-@@ -569,7 +569,7 @@ void XAP_Preview_FontPreview::draw(void)
- 	std::string sWeight = getVal("font-weight");
- 
- 	if(sFamily.empty())
--		sFamily = "Times New Roman";
-+		sFamily = "Liberation Serif";
- 
- 	if(sStyle.empty())
- 		sStyle = "normal";
-diff -auNpr abiword-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp
---- abiword-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp	2007-01-16 20:17:27.000000000 -0300
-+++ abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp	2011-07-02 15:36:52.681712816 -0300
-@@ -124,7 +124,7 @@ void XAP_Dialog_Zoom::_createPreviewFrom
- 	UT_ASSERT(m_zoomPreview);
- 	
- 	m_zoomPreview->setWindowSize(width, height);
--	m_zoomPreview->setString("10-pt Times New Roman");
-+	m_zoomPreview->setString("10-pt Liberation Serif");
- 	m_zoomPreview->setFont(XAP_Preview_Zoom::font_NORMAL);
- 	m_zoomPreview->setZoomPercent(m_zoomPercent);
- 
-diff -auNpr abiword-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp abiword-libre-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp
---- abiword-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp	2009-10-29 14:47:05.000000000 -0300
-+++ abiword-libre-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp	2011-07-02 15:36:52.753748816 -0300
-@@ -63,7 +63,7 @@ void XAP_Preview_Zoom::setFont(XAP_Previ
- 	{
- 	case XAP_Preview_Zoom::font_NORMAL:
- 		sprintf (fontString, "%dpt", (10 * m_zoomPercent / 100));
--		found = m_gc->findFont("Times New Roman",
-+		found = m_gc->findFont("Liberation Serif",
- 							   "normal", "", "normal",
- 							   "", fontString,
- 							   NULL);
-diff -auNpr abiword-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp abiword-libre-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp
---- abiword-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp	2010-06-13 11:02:39.000000000 -0300
-+++ abiword-libre-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp	2011-07-02 15:37:06.980858815 -0300
-@@ -9733,7 +9733,7 @@ void	fl_BlockLayout::StartList( const gc
- 		{
- 			FL_ListType lType = getListTypeFromStyle(szListStyle);
- 			if(IS_NUMBERED_LIST_TYPE(lType))
--				szFont = "Times New Roman";
-+				szFont = "Liberation Serif";
- 			else
- 				szFont = "symbol";
- 			UT_ASSERT(0);
-diff -auNpr abiword-2.8.6/src/text/fmt/xp/fp_Line.cpp abiword-libre-2.8.6/src/text/fmt/xp/fp_Line.cpp
---- abiword-2.8.6/src/text/fmt/xp/fp_Line.cpp	2009-09-09 03:20:32.000000000 -0300
-+++ abiword-libre-2.8.6/src/text/fmt/xp/fp_Line.cpp	2011-07-02 15:37:07.265000815 -0300
-@@ -1273,7 +1273,7 @@ void fp_Line::_doClearScreenFromRunToEnd
- 		pRun = m_vecRuns.getNthItem(_getRunLogIndx(runIndex));
- 
- 		// Handle case where character extends behind the left side
--		// like italic Times New Roman f. Clear a litle bit before if
-+		// like italic Liberation Serif f. Clear a litle bit before if
- 		// there is clear screen there
- 		UT_sint32 j = runIndex - 1;
- 
-diff -auNpr abiword-2.8.6/src/text/fmt/xp/fp_TextRun.cpp abiword-libre-2.8.6/src/text/fmt/xp/fp_TextRun.cpp
---- abiword-2.8.6/src/text/fmt/xp/fp_TextRun.cpp	2010-04-14 18:49:37.000000000 -0300
-+++ abiword-libre-2.8.6/src/text/fmt/xp/fp_TextRun.cpp	2011-07-02 15:37:08.021378815 -0300
-@@ -1434,7 +1434,7 @@ void fp_TextRun::_clearScreen(bool /* bF
- 	
- 	//
- 	// Handle case where character extend behind the left side
--	// like italic Times New Roman f
-+	// like italic Liberation Serif f
- 	//
- 	fp_Line * thisLine = getLine();
- 	fp_Run * pPrev = getPrevRun();
-diff -auNpr abiword-2.8.6/src/text/fmt/xp/fv_View.cpp abiword-libre-2.8.6/src/text/fmt/xp/fv_View.cpp
---- abiword-2.8.6/src/text/fmt/xp/fv_View.cpp	2010-06-13 11:02:39.000000000 -0300
-+++ abiword-libre-2.8.6/src/text/fmt/xp/fv_View.cpp	2011-07-02 15:37:08.353544815 -0300
-@@ -519,9 +519,9 @@ FV_View::FV_View(XAP_App * pApp, void* p
- 		s += pCountry;
- 	}
- 		
--	// do a fuzzy match for Times New Roman
-+	// do a fuzzy match for Liberation Serif
- 	const char * pszFamily =
--		GR_Graphics::findNearestFont ("Times New Roman",
-+		GR_Graphics::findNearestFont ("Liberation Serif",
- 									  "normal", "normal",
- 									  "normal", "normal",
- 									  "12pt", s.utf8_str());
-diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pp_Property.cpp abiword-libre-2.8.6/src/text/ptbl/xp/pp_Property.cpp
---- abiword-2.8.6/src/text/ptbl/xp/pp_Property.cpp	2009-05-18 23:33:18.000000000 -0300
-+++ abiword-libre-2.8.6/src/text/ptbl/xp/pp_Property.cpp	2011-07-02 15:37:09.053894814 -0300
-@@ -99,7 +99,7 @@ static PP_Property _props[] =
- 
- 	{ "field-color",           "dcdcdc",          true,  NULL, PP_LEVEL_FIELD},
- 	{ "field-font",	           "NULL",	          true,  NULL, PP_LEVEL_FIELD},
--	{ "font-family",           "Times New Roman", true,  NULL, PP_LEVEL_CHAR},
-+	{ "font-family",           "Liberation Serif", true,  NULL, PP_LEVEL_CHAR},
- 	{ "font-size",	           "12pt",	          true,  NULL, PP_LEVEL_CHAR},	// MS word defaults to 10pt, but it just seems too small
- 	{ "font-stretch",          "normal",          true,  NULL, PP_LEVEL_CHAR},
- 	{ "font-style",	           "normal",          true,  NULL, PP_LEVEL_CHAR},
-diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pp_Revision.cpp abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.cpp
---- abiword-2.8.6/src/text/ptbl/xp/pp_Revision.cpp	2009-05-07 23:35:14.000000000 -0300
-+++ abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.cpp	2011-07-02 15:37:08.881808814 -0300
-@@ -350,7 +350,7 @@ void PP_RevisionAttr::_init(const gchar
- 		return;
- 
- 	// the string we are parsing looks like
--	// "+1,-2,!3{font-family: Times New Roman}"
-+	// "+1,-2,!3{font-family: Liberation Serif}"
- 
- 	// first duplicate the string so we can play with it ...
- 	char * s = (char*) g_strdup(r);
-diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pp_Revision.h abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.h
---- abiword-2.8.6/src/text/ptbl/xp/pp_Revision.h	2009-01-04 20:32:46.000000000 -0200
-+++ abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.h	2011-07-02 15:37:09.530132814 -0300
-@@ -101,7 +101,7 @@ class ABI_EXPORT PP_Revision: public PP_
-       where n is a numerical id of the revision and props is regular
-       property string, for instance
- 
--          font-family:Times New Roman
-+          font-family:Liberation Serif
- 
-       revoval of property/attribute is indicated by setting to -/-, e.g.,
- 
-diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp abiword-libre-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp
---- abiword-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp	2009-01-04 18:34:28.000000000 -0200
-+++ abiword-libre-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp	2011-07-02 15:37:09.101918814 -0300
-@@ -155,7 +155,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v
- 		s += pCountry;
- 	}
- 	
--	const char* pszFamily = XAP_App::findNearestFont("Times New Roman",
-+	const char* pszFamily = XAP_App::findNearestFont("Liberation Serif",
- 													 "normal", "",
- 													 "normal", "", "12pt",
- 													 s.utf8_str());
-@@ -167,7 +167,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v
- 					  "text-indent:0in; text-position:normal; line-height:1.0; "
- 					  "color:000000; bgcolor:transparent; widows:2", pszFamily);
- 
--	pszFamily = XAP_App::findNearestFont("Arial", "normal", "",
-+	pszFamily = XAP_App::findNearestFont("Liberation Sans", "normal", "",
- 										 "normal", "", "12pt", s.utf8_str());
- 
- 	// used to set the dom-dir of the style here, but we do not want to do that. The
-@@ -239,7 +239,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v
- 	UT_String_sprintf(stTmp, list_fmt, "Heart List","0", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "Dingbats", "NULL");
- 	_s("Heart List",false, "P", "", "Current Settings", stTmp.c_str());
- 
--	// pszFamily is the nearest font to Arial found in the system
-+	// pszFamily is the nearest font to Liberation Sans found in the system
- 	UT_String_sprintf(stTmp, "tabstops:0.3in/L0; list-style:Numbered List; "
- 					  "start-value:1; margin-left:0.0in; text-indent:0.0in; "
- 					  "field-color:transparent; list-delim:%%L.; field-font:%s; "
-@@ -250,7 +250,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v
-     _s("Numbered Heading 2",true,"P","Heading 2","Normal", stTmp.c_str());
-     _s("Numbered Heading 3",true,"P","Heading 3","Normal", stTmp.c_str());
- 
--	// pszFamily is the nearest font to Arial found in the system
-+	// pszFamily is the nearest font to Liberation Sans found in the system
- 
- 	UT_String_sprintf(stTmp, list_fmt, "Numbered List", "1",LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L.", "NULL", ".");
- 
-diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp
---- abiword-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp	2009-05-20 18:22:35.000000000 -0300
-+++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp	2011-07-02 15:37:01.798268815 -0300
-@@ -1170,7 +1170,7 @@ void AP_Lists_preview::setData(const gch
- 	//
- 	if(!pszFont || strcmp(pszFont,"NULL")== 0)
- 	{
--		m_pFont = m_gc->findFont("Times New Roman",
-+		m_pFont = m_gc->findFont("Liberation Serif",
- 								 "normal", "", "normal",
- 								 "", "16pt", NULL);
- 	}
-diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp
---- abiword-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp	2007-05-08 14:16:33.000000000 -0300
-+++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp	2011-07-02 15:37:02.462600815 -0300
-@@ -88,7 +88,7 @@ AP_Preview_PageNumbers::AP_Preview_PageN
- 	char fontString [10];
- 	sprintf(fontString, "%dpt", 8);
- 	
--	GR_Font * found =  m_gc->findFont("Times New Roman", "normal",
-+	GR_Font * found =  m_gc->findFont("Liberation Serif", "normal",
- 									  "", "normal", "", fontString,
- 									  NULL);
- 	
-diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp
---- abiword-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp	2009-09-29 10:58:11.000000000 -0300
-+++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp	2011-07-02 15:37:03.311024815 -0300
-@@ -94,7 +94,7 @@ void AP_Preview_Annotation::setSizeFromA
- 	pG = pView->getGraphics();
- 
- 	UT_return_if_fail(pG);
--	GR_Font * pFont = pG->findFont("Times New Roman", "normal",
-+	GR_Font * pFont = pG->findFont("Liberation Serif", "normal",
- 				       "normal", "normal",
- 				       "normal", "12pt",
- 				       NULL);
-@@ -122,7 +122,7 @@ void AP_Preview_Annotation::draw(void)
- 	UT_RGBColor FGcolor(0,0,0);
- 	UT_RGBColor BGcolor(m_clrBackground);
- 	
--	m_pFont = m_gc->findFont("Times New Roman", "normal",
-+	m_pFont = m_gc->findFont("Liberation Serif", "normal",
- 							 "normal", "normal",
- 							 "normal", "12pt",
- 							 NULL);
-diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp
---- abiword-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp	2009-03-09 17:01:46.000000000 -0200
-+++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp	2011-07-02 15:37:03.527132815 -0300
-@@ -539,7 +539,7 @@ void AP_Preview_Paragraph::draw(void)
- bool AP_Preview_Paragraph::_loadDrawFont(void)
- {
- 	// we draw at 7 points in this preview
--	GR_Font * font = m_gc->findFont("Times New Roman",
-+	GR_Font * font = m_gc->findFont("Liberation Serif",
- 									"normal", "", "normal",
- 									"", "7pt",
- 									NULL); // might need to get the real lang
-diff -auNpr abiword-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp abiword-libre-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp
---- abiword-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp	2009-09-29 17:00:48.000000000 -0300
-+++ abiword-libre-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp	2011-07-02 15:37:03.939338815 -0300
-@@ -2829,7 +2829,7 @@ void IE_Exp_RTF::_output_ListRTF(fl_Auto
- 	case DASHED_LIST:
- 		Param = 23;
- 		bulletsym = '-';
--		fontName = "Times New Roman";
-+		fontName = "Liberation Serif";
- 		break;
- 	case SQUARE_LIST:
- 		Param = 23;
-diff -auNpr abiword-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp
---- abiword-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp	2009-09-23 02:22:43.000000000 -0300
-+++ abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp	2011-07-02 15:37:03.883310815 -0300
-@@ -621,10 +621,10 @@ s_fieldFontForListStyle (MSWordListIdTyp
- 	  return "NULL";
- 
- 	case WLNF_UPPER_LETTER: // upper letter
--	  return "Times New Roman";
-+	  return "Liberation Serif";
- 
- 	case WLNF_LOWER_LETTER: // lower letter
--	  return "Times New Roman";
-+	  return "Liberation Serif";
- 
- 	case WLNF_BULLETS: // bullet list
- 		UT_DEBUGMSG(("Fieldfont set to symbol \n"));
-@@ -632,11 +632,11 @@ s_fieldFontForListStyle (MSWordListIdTyp
- 
- 	case WLNF_EUROPEAN_ARABIC:
- 	case WLNF_ORDINAL: // ordinal
--		return "Times New Roman";
-+		return "Liberation Serif";
- 		
- 	default:
--		UT_DEBUGMSG(("unknown list type %d field-font set to Times New Roman \n",id));
--	  return "Times New Roman";
-+		UT_DEBUGMSG(("unknown list type %d field-font set to Liberation Serif \n",id));
-+	  return "Liberation Serif";
- 	}
- }
- 
-@@ -5243,7 +5243,7 @@ void IE_Imp_MsWord_97::_generateCharProp
- 	if(fname)
- 		s += fname;
- 	else
--		s += "Times New Roman";
-+		s += "Liberation Serif";
- 	FREEP(fname);
- }
- 
-diff -auNpr abiword-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp
---- abiword-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp	2009-07-27 02:26:14.000000000 -0300
-+++ abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp	2011-07-02 15:37:04.239488815 -0300
-@@ -5958,11 +5958,11 @@ bool IE_Imp_RTF::buildCharacterProps(UT_
- 		// {\f83\fnil\fcharset0\fprq0{\*\panose 00000000000000000000} ;}
- 		// note the empty slot after the panose entry
- 		// later it gets referenced: {\b\f83\fs24\cf1\cgrid0 Malte Cornils
--		// this turns those into "Times New Roman" for now, as a hack to keep from crashing
-+		// this turns those into "Liberation Serif" for now, as a hack to keep from crashing
- 		if ( pFont->m_pFontName != NULL )
- 			propBuffer += pFont->m_pFontName;
- 		else
--			propBuffer += "Times New Roman";
-+			propBuffer += "Liberation Serif";
- 	}
- 	if (m_currentRTFState.m_charProps.m_hasColour)
- 	{
-@@ -8612,7 +8612,7 @@ bool IE_Imp_RTF::ReadFontTable()
- 	{
- 		// NB: Ignores whitespace until we've seen non-whitespace data.
- 		//     This means we pick up the spaces in font names like
--		//     "Times New Roman", but it also means that any font names
-+		//     "Liberation Serif", but it also means that any font names
- 		//     that genuinely start with spaces will have them discarded.
- 		//     This is hopefully not a problem.
- 		tokenType = NextToken(keyword, &parameter,& paramUsed,
-@@ -8680,11 +8680,11 @@ bool IE_Imp_RTF::ReadFontTable()
- 				// It's possible that the font name will be empty. This might happend 
- 				// because the font table didn't specify a name, or because the \ansicpgN
- 				// command was invalid, in which case the mbtowc convertion might fail.
--				// In these cases, substitute "Times New Roman".
-+				// In these cases, substitute "Liberation Serif".
- 				if (!sFontNamesAndPanose[SFontTableState::MainFontName].length())
- 				{
--					UT_DEBUGMSG(("RTF: Font Index %d: Substituting \"Times New Roman\" for missing font name.\n", fontIndex));
--					sFontNamesAndPanose[SFontTableState::MainFontName] = "Times New Roman";
-+					UT_DEBUGMSG(("RTF: Font Index %d: Substituting \"Liberation Serif\" for missing font name.\n", fontIndex));
-+					sFontNamesAndPanose[SFontTableState::MainFontName] = "Liberation Serif";
- 				}
- 				// Validate and post-process the Panose string.
- 				if (!PostProcessAndValidatePanose(sFontNamesAndPanose[SFontTableState::Panose])) 
-diff -auNpr abiword-2.8.6/user/wp/readme.abw abiword-libre-2.8.6/user/wp/readme.abw
---- abiword-2.8.6/user/wp/readme.abw	2009-07-23 16:50:13.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/readme.abw	2011-07-02 15:37:19.891310814 -0300
-@@ -16,9 +16,9 @@
- <version id="9" started="1131226323" uid="e94517c8-4e44-11da-9bf9-8faddbe5f409" auto="0" top-xid="120"/>
- </history>
- <styles>
--<s type="P" name="Heading 1" basedon="Normal" followedby="Normal" props="keep-with-next:1; margin-top:22pt; font-weight:bold; margin-bottom:3pt; font-family:Arial; font-size:17pt; lang:-none-"/>
--<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:0pt; font-style:normal; margin-left:0pt; lang:-none-; dom-dir:ltr; font-variant:normal; text-indent:0in; margin-bottom:12pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s type="P" name="Heading 2" basedon="Normal" followedby="Normal" props="keep-with-next:1; margin-top:22pt; font-weight:bold; margin-bottom:3pt; font-family:Arial; font-size:14pt; lang:-none-"/>
-+<s type="P" name="Heading 1" basedon="Normal" followedby="Normal" props="keep-with-next:1; margin-top:22pt; font-weight:bold; margin-bottom:3pt; font-family:Liberation Sans; font-size:17pt; lang:-none-"/>
-+<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:0pt; font-style:normal; margin-left:0pt; lang:-none-; dom-dir:ltr; font-variant:normal; text-indent:0in; margin-bottom:12pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s type="P" name="Heading 2" basedon="Normal" followedby="Normal" props="keep-with-next:1; margin-top:22pt; font-weight:bold; margin-bottom:3pt; font-family:Liberation Sans; font-size:14pt; lang:-none-"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section xid="1">
-diff -auNpr abiword-2.8.6/user/wp/templates/Business-Letter.awt abiword-libre-2.8.6/user/wp/templates/Business-Letter.awt
---- abiword-2.8.6/user/wp/templates/Business-Letter.awt	2009-05-22 07:15:16.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/Business-Letter.awt	2011-07-02 15:37:19.995362813 -0300
-@@ -19,14 +19,14 @@
- <version id="4" started="1097285263" uid="6ad98dfc-1992-11d9-90cf-d572573794e2" auto="0"/>
- </history>
- <styles>
--<s followedby="Return Address Section" name="Return Address Section" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:0pt; font-style:normal; margin-left:0.0000in; bgcolor:transparent; text-decoration:none; text-indent:0in; font-variant:normal; color:000000; lang:en-US; margin-right:0.0000in; margin-bottom:0pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s type="P" name="Normal" followedby="Current Settings" props="text-indent:0in; margin-top:0pt; margin-left:0pt; font-stretch:normal; line-height:1.0; text-align:left; bgcolor:transparent; lang:en-US; margin-bottom:0pt; font-weight:normal; text-decoration:none; font-variant:normal; color:000000; text-position:normal; font-size:12pt; margin-right:0pt; font-style:normal; widows:2; font-family:Times New Roman"/>
--<s followedby="Letter Body" name="Inside Address" basedon="Block Text" type="P" props="text-indent:0in; orphans:2; margin-top:0pt; margin-left:0.0000in; list-decimal:.; line-height:1.0; keep-with-next:no; text-align:left; list-style:None; bgcolor:transparent; lang:en-US; margin-bottom:0pt; font-weight:normal; text-decoration:none; start-value:1; font-variant:normal; color:000000; font-stretch:normal; keep-together:no; font-size:12pt; margin-right:0.0000in; font-style:normal; widows:2; list-delim:%L; font-family:Times New Roman"/>
-+<s followedby="Return Address Section" name="Return Address Section" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:0pt; font-style:normal; margin-left:0.0000in; bgcolor:transparent; text-decoration:none; text-indent:0in; font-variant:normal; color:000000; lang:en-US; margin-right:0.0000in; margin-bottom:0pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s type="P" name="Normal" followedby="Current Settings" props="text-indent:0in; margin-top:0pt; margin-left:0pt; font-stretch:normal; line-height:1.0; text-align:left; bgcolor:transparent; lang:en-US; margin-bottom:0pt; font-weight:normal; text-decoration:none; font-variant:normal; color:000000; text-position:normal; font-size:12pt; margin-right:0pt; font-style:normal; widows:2; font-family:Liberation Serif"/>
-+<s followedby="Letter Body" name="Inside Address" basedon="Block Text" type="P" props="text-indent:0in; orphans:2; margin-top:0pt; margin-left:0.0000in; list-decimal:.; line-height:1.0; keep-with-next:no; text-align:left; list-style:None; bgcolor:transparent; lang:en-US; margin-bottom:0pt; font-weight:normal; text-decoration:none; start-value:1; font-variant:normal; color:000000; font-stretch:normal; keep-together:no; font-size:12pt; margin-right:0.0000in; font-style:normal; widows:2; list-delim:%L; font-family:Liberation Serif"/>
- <s type="P" name="Block Text" basedon="Normal" followedby="Current Settings" props="margin-bottom:6pt; margin-right:1in; margin-left:1in"/>
--<s followedby="Letter Body" name="Letter Body" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:12pt; font-style:normal; margin-left:0pt; bgcolor:transparent; text-decoration:none; text-indent:0.0000in; font-variant:normal; color:000000; lang:en-US; margin-right:0pt; margin-bottom:0pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s followedby="Letter Body" name="Greeting" basedon="Normal" type="P" props="font-family:Times New Roman; margin-top:12pt; font-variant:normal; margin-left:0pt; text-align:left; font-style:normal; text-indent:0in; color:000000; line-height:1.0; widows:2; bgcolor:transparent; margin-right:0pt; text-decoration:none; font-size:12pt; font-weight:normal; margin-bottom:0pt; lang:en-US; font-stretch:normal"/>
--<s followedby="Signature Line" name="Closing" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:12pt; font-style:normal; margin-left:0.0000in; bgcolor:transparent; text-decoration:none; text-indent:0in; font-variant:normal; color:000000; lang:en-US; margin-right:0pt; margin-bottom:48pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s followedby="Block Text" name="Signature Line" basedon="Return Address Section" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:0pt; font-style:normal; margin-left:0.0000in; bgcolor:transparent; text-decoration:none; text-indent:0in; font-variant:normal; color:000000; lang:en-US; margin-right:0.0000in; margin-bottom:0pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Letter Body" name="Letter Body" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:12pt; font-style:normal; margin-left:0pt; bgcolor:transparent; text-decoration:none; text-indent:0.0000in; font-variant:normal; color:000000; lang:en-US; margin-right:0pt; margin-bottom:0pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Letter Body" name="Greeting" basedon="Normal" type="P" props="font-family:Liberation Serif; margin-top:12pt; font-variant:normal; margin-left:0pt; text-align:left; font-style:normal; text-indent:0in; color:000000; line-height:1.0; widows:2; bgcolor:transparent; margin-right:0pt; text-decoration:none; font-size:12pt; font-weight:normal; margin-bottom:0pt; lang:en-US; font-stretch:normal"/>
-+<s followedby="Signature Line" name="Closing" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:12pt; font-style:normal; margin-left:0.0000in; bgcolor:transparent; text-decoration:none; text-indent:0in; font-variant:normal; color:000000; lang:en-US; margin-right:0pt; margin-bottom:48pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Block Text" name="Signature Line" basedon="Return Address Section" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:0pt; font-style:normal; margin-left:0.0000in; bgcolor:transparent; text-decoration:none; text-indent:0in; font-variant:normal; color:000000; lang:en-US; margin-right:0.0000in; margin-bottom:0pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
- <section props="page-margin-footer:0.5in; page-margin-header:0.5in">
-diff -auNpr abiword-2.8.6/user/wp/templates/Business-Report.awt abiword-libre-2.8.6/user/wp/templates/Business-Report.awt
---- abiword-2.8.6/user/wp/templates/Business-Report.awt	2009-05-22 07:15:18.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/Business-Report.awt	2011-07-02 15:37:20.011370813 -0300
-@@ -21,7 +21,7 @@
- <p style="Normal" props="text-align:right"><c props="lang:en-US; font-size:12 pt"></c></p>
- <p style="Normal" props="text-align:right"><c props="lang:en-US; font-size:12 pt"></c></p>
- <p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:48 pt; font-weight:bold">Title</c><c props="lang:en-US; font-size:48 pt; font-weight:bold"></c></p>
--<p style="Normal" props="text-align:left"><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:en-US; text-position:normal; font-weight:bold; font-style:normal; font-size:48pt">Subtitle</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:en-US; text-position:normal; font-weight:bold; font-style:normal; font-size:48pt"></c></p>
-+<p style="Normal" props="text-align:left"><c props="font-family:Liberation Serif; text-decoration:none; color:000000; lang:en-US; text-position:normal; font-weight:bold; font-style:normal; font-size:48pt">Subtitle</c><c props="font-family:Liberation Serif; text-decoration:none; color:000000; lang:en-US; text-position:normal; font-weight:bold; font-style:normal; font-size:48pt"></c></p>
- <p style="Normal" props="text-align:right; margin-top:0pt; line-height:1.0"><c props="lang:en-US; font-size:8 pt"></c><image dataid="/home/dickk/images/balk.png_0" props="lang:en-US; height:0.090551in; width:6.295276in"/></p>
- <p style="Normal" props="text-align:right; margin-top:0pt; line-height:1.0"><c props="lang:en-US; font-size:18 pt; font-weight:bold">Release 1.0</c></p>
- <p style="Normal"><c props="lang:en-US"></c></p>
-@@ -99,11 +99,11 @@
- <section footer="1961180032" header="671410933">
- <p style="Normal"></p>
- <p style="Normal"></p>
--<p level="1" listid="1908846824" parentid="0" style="Numbered Heading 1" props="start-value:1; text-indent:0.0000in; list-style:Numbered List; field-font:Arial; margin-left:0.0000in"><c props="list-tag:254800672"><pbr/></c><c props="list-tag:254800672"></c><field type="list_label" props="width:0in; font-family:Arial; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:17pt"></field><c type="list_label" props="width:0in; font-family:Arial; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:17pt">	Heading 1</c></p>
-+<p level="1" listid="1908846824" parentid="0" style="Numbered Heading 1" props="start-value:1; text-indent:0.0000in; list-style:Numbered List; field-font:Liberation Sans; margin-left:0.0000in"><c props="list-tag:254800672"><pbr/></c><c props="list-tag:254800672"></c><field type="list_label" props="width:0in; font-family:Liberation Sans; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:17pt"></field><c type="list_label" props="width:0in; font-family:Liberation Sans; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:17pt">	Heading 1</c></p>
- <p style="Normal"><c type="list_label" props="lang:en-US; height:0in; width:0in">text</c><c type="list_label" props="lang:en-US; height:0in; width:0in"></c></p>
--<p level="2" listid="686698307" parentid="1908846824" style="Numbered Heading 2" props="start-value:1; text-indent:0.0000in; list-style:Numbered List; field-font:Arial; margin-left:0.0000in"><c type="list_label" props="lang:en-US; height:0in; width:0in; list-tag:1877104478"></c><field type="list_label" props="width:0in; font-family:Arial; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:14pt"></field><c type="list_label" props="width:0in; font-family:Arial; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:14pt">	Heading 2</c></p>
-+<p level="2" listid="686698307" parentid="1908846824" style="Numbered Heading 2" props="start-value:1; text-indent:0.0000in; list-style:Numbered List; field-font:Liberation Sans; margin-left:0.0000in"><c type="list_label" props="lang:en-US; height:0in; width:0in; list-tag:1877104478"></c><field type="list_label" props="width:0in; font-family:Liberation Sans; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:14pt"></field><c type="list_label" props="width:0in; font-family:Liberation Sans; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:14pt">	Heading 2</c></p>
- <p style="Normal"><c type="list_label" props="lang:en-US; height:0in; width:0in">text</c><c type="list_label" props="lang:en-US; height:0in; width:0in"></c></p>
--<p level="3" listid="1990149216" parentid="686698307" style="Numbered Heading 3" props="start-value:1; text-indent:0.0000in; list-style:Numbered List; field-font:Arial; margin-left:0.0000in"><c type="list_label" props="lang:en-US; height:0in; width:0in; list-tag:1324672020"></c><field type="list_label" props="width:0in; font-family:Arial; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:12pt"></field><c type="list_label" props="width:0in; font-family:Arial; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:12pt">	Heading 3</c></p>
-+<p level="3" listid="1990149216" parentid="686698307" style="Numbered Heading 3" props="start-value:1; text-indent:0.0000in; list-style:Numbered List; field-font:Liberation Sans; margin-left:0.0000in"><c type="list_label" props="lang:en-US; height:0in; width:0in; list-tag:1324672020"></c><field type="list_label" props="width:0in; font-family:Liberation Sans; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:12pt"></field><c type="list_label" props="width:0in; font-family:Liberation Sans; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:12pt">	Heading 3</c></p>
- <p style="Normal"><c type="list_label" props="lang:en-US; height:0in; width:0in"></c></p>
- </section>
- <section id="1961180032" listid="0" parentid="0" type="footer">
-diff -auNpr abiword-2.8.6/user/wp/templates/Employee-Directory.awt abiword-libre-2.8.6/user/wp/templates/Employee-Directory.awt
---- abiword-2.8.6/user/wp/templates/Employee-Directory.awt	2009-05-22 07:15:21.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/Employee-Directory.awt	2011-07-02 15:37:20.047388813 -0300
-@@ -10,9 +10,9 @@
- 
- <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
- <section props="page-margin-footer:0.5in; page-margin-header:0.5in">
--<p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:20pt; font-family:Times New Roman">Company Name</c></p>
--<p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:26pt; font-family:Times New Roman">Directory of Employees</c></p>
--<p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:12pt; font-family:Times New Roman"></c><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_0" props="height:0.15in; font-size:12pt; width:8.23in"/></p>
-+<p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:20pt; font-family:Liberation Serif">Company Name</c></p>
-+<p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:26pt; font-family:Liberation Serif">Directory of Employees</c></p>
-+<p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:12pt; font-family:Liberation Serif"></c><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_0" props="height:0.15in; font-size:12pt; width:8.23in"/></p>
- <p style="Normal" props="text-align:center"><c props="lang:en-US; font-size:12pt"></c></p>
- <p style="Normal" props="text-align:center"><c props="lang:en-US; font-size:12pt"></c></p>
- <p style="Normal" props="text-align:center"><c props="lang:en-US"></c></p>
-@@ -36,59 +36,59 @@
- <p style="Normal" props="tabstops:2.0000in/L0"><c type="date">Normal Style	(123) 555-1212</c></p>
- <p style="Normal" props="text-align:left; tabstops:2.0000in/L0"><c type="date" props="font-weight:normal; font-size:11pt; font-style:normal"></c></p>
- <p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-weight:normal; font-size:11pt; font-style:normal"></c></p>
--<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Arial; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; lang:en-US; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none"></c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
--<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Arial; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
--<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Arial; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
--<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Arial; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
--<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Arial; font-size:12pt; color:000000; lang:en-US; text-position:normal; font-weight:bold; font-style:normal; text-decoration:underline ">General Numbers</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Front Desk	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Security	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Building Management	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; lang:en-US; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none">Other General Numbers	(123) 555-1212</c></p>
-+<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Liberation Sans; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; lang:en-US; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none"></c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
-+<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Liberation Sans; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
-+<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Liberation Sans; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
-+<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Liberation Sans; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
-+<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Liberation Sans; font-size:12pt; color:000000; lang:en-US; text-position:normal; font-weight:bold; font-style:normal; text-decoration:underline ">General Numbers</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Front Desk	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Security	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Building Management	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; lang:en-US; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none">Other General Numbers	(123) 555-1212</c></p>
- </section>
- <data>
- <d name="C:\Documents and Settings\jgz\Desktop\bookopen.bmp_0" mime-type="image/png" base64="yes">
-diff -auNpr abiword-2.8.6/user/wp/templates/Fax-Coversheet.awt abiword-libre-2.8.6/user/wp/templates/Fax-Coversheet.awt
---- abiword-2.8.6/user/wp/templates/Fax-Coversheet.awt	2009-05-22 07:15:24.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/Fax-Coversheet.awt	2011-07-02 15:37:20.027378813 -0300
-@@ -10,26 +10,26 @@
- 
- <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
- <section props="page-margin-footer:0.5in; page-margin-header:0.5in">
--<p style="Normal" props="tabstops:6.2500in/R0,2.7500in/L0,4.5000in/C0"><c props="lang:en-US">	</c><c props="bgcolor:000000; lang:en-US; font-size:24pt; font-family:Arial Black; color:ffffff">	Company Name	</c><c props="bgcolor:000000; lang:en-US; font-size:12pt; font-family:Arial Black; color:ffffff"></c></p>
--<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000">Company Address Line 1</c></p>
--<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000">Company Address Line 2</c></p>
--<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000">Company Address Line 3</c></p>
--<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000"></c></p>
--<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:72pt; font-family:Arial Black; color:000000">FAX</c></p>
--<p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0"><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">TO:	</c><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000">	</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">From:	</c></p>
--<p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0"><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_0" props="height:0.15in; width:8.23in"/><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">Fax:	</c><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000">	</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">Pages:	</c></p>
--<p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0"><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_1" props="height:0.15in; width:8.23in"/><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">Phone:	</c><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000">	</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">Date:	</c><field type="date_mdy" param=""></field></p>
-+<p style="Normal" props="tabstops:6.2500in/R0,2.7500in/L0,4.5000in/C0"><c props="lang:en-US">	</c><c props="bgcolor:000000; lang:en-US; font-size:24pt; font-family:Liberation Sans Bold; color:ffffff">	Company Name	</c><c props="bgcolor:000000; lang:en-US; font-size:12pt; font-family:Liberation Sans Bold; color:ffffff"></c></p>
-+<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000">Company Address Line 1</c></p>
-+<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000">Company Address Line 2</c></p>
-+<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000">Company Address Line 3</c></p>
-+<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000"></c></p>
-+<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:72pt; font-family:Liberation Sans Bold; color:000000">FAX</c></p>
-+<p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0"><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">TO:	</c><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000">	</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">From:	</c></p>
-+<p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0"><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_0" props="height:0.15in; width:8.23in"/><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">Fax:	</c><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000">	</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">Pages:	</c></p>
-+<p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0"><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_1" props="height:0.15in; width:8.23in"/><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">Phone:	</c><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000">	</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">Date:	</c><field type="date_mdy" param=""></field></p>
- <p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0; margin-left:0.0000in"><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_2" props="height:0.15in; width:8.23in"/></p>
- <p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0; margin-left:0.0000in"><c type="date_mdy" param="" props="font-weight:bold">Re:	</c><c type="date_mdy" param="">	</c><c type="date_mdy" param="" props="font-weight:bold">CC:		</c></p>
- <p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0; margin-left:0.0000in"><c type="date_mdy" param="" props="font-weight:bold"></c><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_4" props="height:0.15in; width:8.23in"/></p>
- <p style="Normal" props="tabstops:2.2500in/L0,1.0000in/L0,3.7500in/L0,5.0000in/L0; margin-left:0.0000in"></p>
--<p style="Normal" props="tabstops:2.2500in/L0,1.0000in/L0,3.7500in/L0,5.0000in/L0; margin-left:0.0000in"><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Times New Roman; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Urgent	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">For Review	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Times New Roman; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Please Comment	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Times New Roman; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Please Reply	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Times New Roman; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Please Recycle</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">	</c></p>
--<p style="Normal" props="tabstops:2.2500in/L0,1.0000in/L0,3.7500in/L0,5.0000in/L0; margin-left:0.0000in"><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt"></c><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_5" props="height:0.15in; width:8.23in"/></p>
-+<p style="Normal" props="tabstops:2.2500in/L0,1.0000in/L0,3.7500in/L0,5.0000in/L0; margin-left:0.0000in"><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Liberation Serif; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Urgent	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">For Review	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Liberation Serif; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Please Comment	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Liberation Serif; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Please Reply	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Liberation Serif; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Please Recycle</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">	</c></p>
-+<p style="Normal" props="tabstops:2.2500in/L0,1.0000in/L0,3.7500in/L0,5.0000in/L0; margin-left:0.0000in"><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt"></c><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_5" props="height:0.15in; width:8.23in"/></p>
- <p style="Normal"></p>
- <p style="Normal"></p>
--<p style="Normal" props="text-align:center"><c props="font-family:Arial; text-decoration:underline; color:000000; lang:en-US; bgcolor:ffffff; font-weight:bold; font-size:16pt">Comments</c></p>
-+<p style="Normal" props="text-align:center"><c props="font-family:Liberation Sans; text-decoration:underline; color:000000; lang:en-US; bgcolor:ffffff; font-weight:bold; font-size:16pt">Comments</c></p>
- <p style="Normal" props="margin-left:0.0000in"></p>
--<p style="Normal" props="margin-left:0.0000in"><c props="font-family:Arial; color:000000; font-size:10pt; text-position:normal; lang:en-US; bgcolor:ffffff; font-weight:normal; font-style:normal; text-decoration:none">This text should the replaced with your comments about the fax and any </c><c props="font-family:Arial; bgcolor:ffffff; font-size:10pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">additional</c><c props="font-family:Arial; color:000000; font-size:10pt; text-position:normal; lang:en-US; bgcolor:ffffff; font-weight:normal; font-style:normal; text-decoration:none"> comment to the receiver. </c></p>
-+<p style="Normal" props="margin-left:0.0000in"><c props="font-family:Liberation Sans; color:000000; font-size:10pt; text-position:normal; lang:en-US; bgcolor:ffffff; font-weight:normal; font-style:normal; text-decoration:none">This text should the replaced with your comments about the fax and any </c><c props="font-family:Liberation Sans; bgcolor:ffffff; font-size:10pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">additional</c><c props="font-family:Liberation Sans; color:000000; font-size:10pt; text-position:normal; lang:en-US; bgcolor:ffffff; font-weight:normal; font-style:normal; text-decoration:none"> comment to the receiver. </c></p>
- </section>
- <data>
- <d name="C:\Documents and Settings\jgz\Desktop\bar.bmp_0" mime-type="image/png" base64="yes">
-diff -auNpr abiword-2.8.6/user/wp/templates/Friendly-Letter.awt abiword-libre-2.8.6/user/wp/templates/Friendly-Letter.awt
---- abiword-2.8.6/user/wp/templates/Friendly-Letter.awt	2009-05-22 07:15:27.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/Friendly-Letter.awt	2011-07-02 15:37:20.023376813 -0300
-@@ -16,12 +16,12 @@
- <version id="1" started="1096736888" uid="a22a447e-1495-11d9-9525-9e1170ef822d" auto="0"/>
- </history>
- <styles>
--<s followedby="Return Address Section" name="Return Address Section" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:0pt; font-style:normal; margin-left:4.5000in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.0000in; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s type="P" name="Normal" followedby="Current Settings" props="text-indent:0in; margin-top:0pt; margin-left:0pt; font-stretch:normal; line-height:1.0; text-align:left; bgcolor:transparent; lang:en-US; margin-bottom:0pt; text-decoration:none; font-weight:normal; font-variant:normal; color:000000; text-position:normal; font-size:12pt; margin-right:0pt; font-style:normal; widows:2; font-family:Times New Roman"/>
--<s followedby="Letter Body" name="Greeting" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:12pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s followedby="Letter Body" name="Letter Body" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:12pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0.5000in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s followedby="Signature Line" name="Closing" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:12pt; font-style:normal; margin-left:4.5000in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:48pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s type="P" name="Signature Line" basedon="Return Address Section" followedby="Block Text" props="font-weight:normal; font-family:Times New Roman; margin-top:0pt; font-style:normal; margin-left:4.5000in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.0000in; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Return Address Section" name="Return Address Section" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:0pt; font-style:normal; margin-left:4.5000in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.0000in; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s type="P" name="Normal" followedby="Current Settings" props="text-indent:0in; margin-top:0pt; margin-left:0pt; font-stretch:normal; line-height:1.0; text-align:left; bgcolor:transparent; lang:en-US; margin-bottom:0pt; text-decoration:none; font-weight:normal; font-variant:normal; color:000000; text-position:normal; font-size:12pt; margin-right:0pt; font-style:normal; widows:2; font-family:Liberation Serif"/>
-+<s followedby="Letter Body" name="Greeting" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:12pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Letter Body" name="Letter Body" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:12pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0.5000in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Signature Line" name="Closing" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:12pt; font-style:normal; margin-left:4.5000in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:48pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s type="P" name="Signature Line" basedon="Return Address Section" followedby="Block Text" props="font-weight:normal; font-family:Liberation Serif; margin-top:0pt; font-style:normal; margin-left:4.5000in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.0000in; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
- <section props="page-margin-footer:0.5in; page-margin-header:0.5in">
-diff -auNpr abiword-2.8.6/user/wp/templates/Memo.awt abiword-libre-2.8.6/user/wp/templates/Memo.awt
---- abiword-2.8.6/user/wp/templates/Memo.awt	2009-05-22 07:15:31.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/Memo.awt	2011-07-02 15:37:19.915322814 -0300
-@@ -14,10 +14,10 @@
- <m key="abiword.date_last_changed">Fri Mar 12 21:07:56 2004</m>
- </metadata>
- <styles>
--<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:0pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:10pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:10pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s followedby="Normal" name="Heading 3" basedon="Normal" type="P" props="font-weight:normal; margin-top:22pt; keep-with-next:1; margin-bottom:3pt; font-family:Arial; font-size:10pt"/>
--<s followedby="Normal" name="Heading 2" basedon="Normal" type="P" props="margin-top:22pt; font-size:10pt; margin-bottom:3pt; text-align:right; font-style:italic; font-weight:normal; font-family:Arial; keep-with-next:1"/>
--<s type="P" name="Heading 1" basedon="Normal" followedby="Normal" props="keep-with-next:1; margin-top:22pt; font-weight:bold; margin-bottom:3pt; font-family:Arial; font-size:17pt"/>
-+<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:0pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:10pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:10pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Normal" name="Heading 3" basedon="Normal" type="P" props="font-weight:normal; margin-top:22pt; keep-with-next:1; margin-bottom:3pt; font-family:Liberation Sans; font-size:10pt"/>
-+<s followedby="Normal" name="Heading 2" basedon="Normal" type="P" props="margin-top:22pt; font-size:10pt; margin-bottom:3pt; text-align:right; font-style:italic; font-weight:normal; font-family:Liberation Sans; keep-with-next:1"/>
-+<s type="P" name="Heading 1" basedon="Normal" followedby="Normal" props="keep-with-next:1; margin-top:22pt; font-weight:bold; margin-bottom:3pt; font-family:Liberation Sans; font-size:17pt"/>
- </styles>
- <lists>
- <l id="1002" parentid="0" type="5" start-value="0" list-delim="%L" list-decimal="NULL"/>
-@@ -59,10 +59,10 @@
- <p style="Normal">The box that this text is in uses AbiWord's table support to draw the border.  You can either allow the border to fit to the size of the text as it is now, or press &lt;ENTER&gt; repeatedly at the end of your memo to expand the border to fill the rest of the page.</p>
- <p style="Normal">Don't forget to change the header and footer before printing!  If you wish to save this memo for later and ensure that the date above is saved as today's (not automatically updating), select it and type the desired date text over it.</p>
- <p style="Normal">The styles used in this document for correct conversion, import, export, and HTML are:</p>
--<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="list-tag:1003"></c><field type="list_label" props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Heading 1 for Company Name</c></p>
--<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="width:0in; list-tag:1004; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; lang:en-US; font-variant:normal; color:000000; list-style:Bullet List; bgcolor:transparent; font-size:10pt; homogeneous:1; text-decoration:none; height:0in; text-position:normal; font-stretch:normal"></c><field type="list_label" props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Heading 2 for Slogan</c></p>
--<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="width:0in; list-tag:1005; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; lang:en-US; font-variant:normal; color:000000; list-style:Bullet List; bgcolor:transparent; font-size:10pt; homogeneous:1; text-decoration:none; height:0in; text-position:normal; font-stretch:normal"></c><field type="list_label" props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Heading 3 for "Date:", "To:", etc.</c></p>
--<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="width:0in; list-tag:1006; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; lang:en-US; font-variant:normal; color:000000; list-style:Bullet List; bgcolor:transparent; font-size:10pt; homogeneous:1; text-decoration:none; height:0in; text-position:normal; font-stretch:normal"></c><field type="list_label" props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Normal for body text</c></p>
-+<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="list-tag:1003"></c><field type="list_label" props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Heading 1 for Company Name</c></p>
-+<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="width:0in; list-tag:1004; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; lang:en-US; font-variant:normal; color:000000; list-style:Bullet List; bgcolor:transparent; font-size:10pt; homogeneous:1; text-decoration:none; height:0in; text-position:normal; font-stretch:normal"></c><field type="list_label" props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Heading 2 for Slogan</c></p>
-+<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="width:0in; list-tag:1005; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; lang:en-US; font-variant:normal; color:000000; list-style:Bullet List; bgcolor:transparent; font-size:10pt; homogeneous:1; text-decoration:none; height:0in; text-position:normal; font-stretch:normal"></c><field type="list_label" props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Heading 3 for "Date:", "To:", etc.</c></p>
-+<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="width:0in; list-tag:1006; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; lang:en-US; font-variant:normal; color:000000; list-style:Bullet List; bgcolor:transparent; font-size:10pt; homogeneous:1; text-decoration:none; height:0in; text-position:normal; font-stretch:normal"></c><field type="list_label" props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Normal for body text</c></p>
- </cell>
- </table>
- <p style="Normal"></p>
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt abiword-libre-2.8.6/user/wp/templates/normal.awt
---- abiword-2.8.6/user/wp/templates/normal.awt	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt	2011-07-02 15:37:20.019374813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- 
- <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-am_ET abiword-libre-2.8.6/user/wp/templates/normal.awt-am_ET
---- abiword-2.8.6/user/wp/templates/normal.awt-am_ET	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-am_ET	2011-07-02 15:37:20.015372813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ar abiword-libre-2.8.6/user/wp/templates/normal.awt-ar
---- abiword-2.8.6/user/wp/templates/normal.awt-ar	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ar	2011-07-02 15:37:20.019374813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ar_EG abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_EG
---- abiword-2.8.6/user/wp/templates/normal.awt-ar_EG	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_EG	2011-07-02 15:37:19.979354813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ar_SA abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_SA
---- abiword-2.8.6/user/wp/templates/normal.awt-ar_SA	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_SA	2011-07-02 15:37:19.999364813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-bg_BG abiword-libre-2.8.6/user/wp/templates/normal.awt-bg_BG
---- abiword-2.8.6/user/wp/templates/normal.awt-bg_BG	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-bg_BG	2011-07-02 15:37:19.975352813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ca_ES abiword-libre-2.8.6/user/wp/templates/normal.awt-ca_ES
---- abiword-2.8.6/user/wp/templates/normal.awt-ca_ES	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ca_ES	2011-07-02 15:37:19.923326814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-cs_CZ abiword-libre-2.8.6/user/wp/templates/normal.awt-cs_CZ
---- abiword-2.8.6/user/wp/templates/normal.awt-cs_CZ	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-cs_CZ	2011-07-02 15:37:20.003366813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-da_DK abiword-libre-2.8.6/user/wp/templates/normal.awt-da_DK
---- abiword-2.8.6/user/wp/templates/normal.awt-da_DK	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-da_DK	2011-07-02 15:37:19.995362813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de abiword-libre-2.8.6/user/wp/templates/normal.awt-de
---- abiword-2.8.6/user/wp/templates/normal.awt-de	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de	2011-07-02 15:37:20.007368813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de_AT abiword-libre-2.8.6/user/wp/templates/normal.awt-de_AT
---- abiword-2.8.6/user/wp/templates/normal.awt-de_AT	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de_AT	2011-07-02 15:37:19.975352813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de_CH abiword-libre-2.8.6/user/wp/templates/normal.awt-de_CH
---- abiword-2.8.6/user/wp/templates/normal.awt-de_CH	2008-04-09 21:48:42.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de_CH	2011-07-02 15:37:19.979354813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de_DE abiword-libre-2.8.6/user/wp/templates/normal.awt-de_DE
---- abiword-2.8.6/user/wp/templates/normal.awt-de_DE	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de_DE	2011-07-02 15:37:20.035382813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-div_MV abiword-libre-2.8.6/user/wp/templates/normal.awt-div_MV
---- abiword-2.8.6/user/wp/templates/normal.awt-div_MV	2007-01-14 12:52:46.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-div_MV	2011-07-02 15:37:20.071400813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:div-MV; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:div-MV; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-el_GR abiword-libre-2.8.6/user/wp/templates/normal.awt-el_GR
---- abiword-2.8.6/user/wp/templates/normal.awt-el_GR	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-el_GR	2011-07-02 15:37:20.063396813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_AU abiword-libre-2.8.6/user/wp/templates/normal.awt-en_AU
---- abiword-2.8.6/user/wp/templates/normal.awt-en_AU	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_AU	2011-07-02 15:37:19.903316814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_CA abiword-libre-2.8.6/user/wp/templates/normal.awt-en_CA
---- abiword-2.8.6/user/wp/templates/normal.awt-en_CA	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_CA	2011-07-02 15:37:20.079404813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="Letter" orientation="portrait" width="216.000000" height="279.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_GB abiword-libre-2.8.6/user/wp/templates/normal.awt-en_GB
---- abiword-2.8.6/user/wp/templates/normal.awt-en_GB	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_GB	2011-07-02 15:37:19.911320814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_IE abiword-libre-2.8.6/user/wp/templates/normal.awt-en_IE
---- abiword-2.8.6/user/wp/templates/normal.awt-en_IE	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_IE	2011-07-02 15:37:20.075402813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_NZ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_NZ
---- abiword-2.8.6/user/wp/templates/normal.awt-en_NZ	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_NZ	2011-07-02 15:37:20.067398813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_ZA abiword-libre-2.8.6/user/wp/templates/normal.awt-en_ZA
---- abiword-2.8.6/user/wp/templates/normal.awt-en_ZA	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_ZA	2011-07-02 15:37:20.079404813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es abiword-libre-2.8.6/user/wp/templates/normal.awt-es
---- abiword-2.8.6/user/wp/templates/normal.awt-es	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es	2011-07-02 15:37:19.903316814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_AR abiword-libre-2.8.6/user/wp/templates/normal.awt-es_AR
---- abiword-2.8.6/user/wp/templates/normal.awt-es_AR	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_AR	2011-07-02 15:37:20.039384813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_ES abiword-libre-2.8.6/user/wp/templates/normal.awt-es_ES
---- abiword-2.8.6/user/wp/templates/normal.awt-es_ES	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_ES	2011-07-02 15:37:20.063396813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_IR abiword-libre-2.8.6/user/wp/templates/normal.awt-es_IR
---- abiword-2.8.6/user/wp/templates/normal.awt-es_IR	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_IR	2011-07-02 15:37:20.011370813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_MX abiword-libre-2.8.6/user/wp/templates/normal.awt-es_MX
---- abiword-2.8.6/user/wp/templates/normal.awt-es_MX	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_MX	2011-07-02 15:37:19.919324814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fa_IR abiword-libre-2.8.6/user/wp/templates/normal.awt-fa_IR
---- abiword-2.8.6/user/wp/templates/normal.awt-fa_IR	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fa_IR	2011-07-02 15:37:20.003366813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fi_FI abiword-libre-2.8.6/user/wp/templates/normal.awt-fi_FI
---- abiword-2.8.6/user/wp/templates/normal.awt-fi_FI	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fi_FI	2011-07-02 15:37:19.999364813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr abiword-libre-2.8.6/user/wp/templates/normal.awt-fr
---- abiword-2.8.6/user/wp/templates/normal.awt-fr	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr	2011-07-02 15:37:20.019374813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_BE abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_BE
---- abiword-2.8.6/user/wp/templates/normal.awt-fr_BE	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_BE	2011-07-02 15:37:20.075402813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_CA abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CA
---- abiword-2.8.6/user/wp/templates/normal.awt-fr_CA	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CA	2011-07-02 15:37:19.907318814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="Letter" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_CH abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CH
---- abiword-2.8.6/user/wp/templates/normal.awt-fr_CH	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CH	2011-07-02 15:37:19.899314814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_FR abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_FR
---- abiword-2.8.6/user/wp/templates/normal.awt-fr_FR	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_FR	2011-07-02 15:37:19.983356813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-gl_ES abiword-libre-2.8.6/user/wp/templates/normal.awt-gl_ES
---- abiword-2.8.6/user/wp/templates/normal.awt-gl_ES	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-gl_ES	2011-07-02 15:37:20.023376813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-he abiword-libre-2.8.6/user/wp/templates/normal.awt-he
---- abiword-2.8.6/user/wp/templates/normal.awt-he	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-he	2011-07-02 15:37:19.995362813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-he_IL abiword-libre-2.8.6/user/wp/templates/normal.awt-he_IL
---- abiword-2.8.6/user/wp/templates/normal.awt-he_IL	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-he_IL	2011-07-02 15:37:19.979354813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-hu_HU abiword-libre-2.8.6/user/wp/templates/normal.awt-hu_HU
---- abiword-2.8.6/user/wp/templates/normal.awt-hu_HU	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-hu_HU	2011-07-02 15:37:19.979354813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-it_IT abiword-libre-2.8.6/user/wp/templates/normal.awt-it_IT
---- abiword-2.8.6/user/wp/templates/normal.awt-it_IT	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-it_IT	2011-07-02 15:37:19.911320814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ja_JP abiword-libre-2.8.6/user/wp/templates/normal.awt-ja_JP
---- abiword-2.8.6/user/wp/templates/normal.awt-ja_JP	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ja_JP	2011-07-02 15:37:20.027378813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-lt_LT abiword-libre-2.8.6/user/wp/templates/normal.awt-lt_LT
---- abiword-2.8.6/user/wp/templates/normal.awt-lt_LT	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-lt_LT	2011-07-02 15:37:19.899314814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-nb_NO abiword-libre-2.8.6/user/wp/templates/normal.awt-nb_NO
---- abiword-2.8.6/user/wp/templates/normal.awt-nb_NO	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-nb_NO	2011-07-02 15:37:19.999364813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-nl_NL abiword-libre-2.8.6/user/wp/templates/normal.awt-nl_NL
---- abiword-2.8.6/user/wp/templates/normal.awt-nl_NL	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-nl_NL	2011-07-02 15:37:19.911320814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-nn_NO abiword-libre-2.8.6/user/wp/templates/normal.awt-nn_NO
---- abiword-2.8.6/user/wp/templates/normal.awt-nn_NO	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-nn_NO	2011-07-02 15:37:20.031380813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-pl_PL abiword-libre-2.8.6/user/wp/templates/normal.awt-pl_PL
---- abiword-2.8.6/user/wp/templates/normal.awt-pl_PL	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-pl_PL	2011-07-02 15:37:20.011370813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ps abiword-libre-2.8.6/user/wp/templates/normal.awt-ps
---- abiword-2.8.6/user/wp/templates/normal.awt-ps	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ps	2011-07-02 15:37:20.035382813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-pt_BR abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_BR
---- abiword-2.8.6/user/wp/templates/normal.awt-pt_BR	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_BR	2011-07-02 15:37:19.915322814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-pt_PT abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_PT
---- abiword-2.8.6/user/wp/templates/normal.awt-pt_PT	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_PT	2011-07-02 15:37:20.035382813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ru abiword-libre-2.8.6/user/wp/templates/normal.awt-ru
---- abiword-2.8.6/user/wp/templates/normal.awt-ru	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ru	2011-07-02 15:37:19.907318814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ru_RU abiword-libre-2.8.6/user/wp/templates/normal.awt-ru_RU
---- abiword-2.8.6/user/wp/templates/normal.awt-ru_RU	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ru_RU	2011-07-02 15:37:19.919324814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sk_SK abiword-libre-2.8.6/user/wp/templates/normal.awt-sk_SK
---- abiword-2.8.6/user/wp/templates/normal.awt-sk_SK	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sk_SK	2011-07-02 15:37:20.075402813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sl abiword-libre-2.8.6/user/wp/templates/normal.awt-sl
---- abiword-2.8.6/user/wp/templates/normal.awt-sl	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sl	2011-07-02 15:37:20.031380813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sv abiword-libre-2.8.6/user/wp/templates/normal.awt-sv
---- abiword-2.8.6/user/wp/templates/normal.awt-sv	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sv	2011-07-02 15:37:20.015372813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sv_SE abiword-libre-2.8.6/user/wp/templates/normal.awt-sv_SE
---- abiword-2.8.6/user/wp/templates/normal.awt-sv_SE	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sv_SE	2011-07-02 15:37:20.067398813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-syr abiword-libre-2.8.6/user/wp/templates/normal.awt-syr
---- abiword-2.8.6/user/wp/templates/normal.awt-syr	2007-01-14 12:52:46.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-syr	2011-07-02 15:37:20.079404813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:syr; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:syr; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-tr abiword-libre-2.8.6/user/wp/templates/normal.awt-tr
---- abiword-2.8.6/user/wp/templates/normal.awt-tr	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-tr	2011-07-02 15:37:19.903316814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-tr_TR abiword-libre-2.8.6/user/wp/templates/normal.awt-tr_TR
---- abiword-2.8.6/user/wp/templates/normal.awt-tr_TR	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-tr_TR	2011-07-02 15:37:19.911320814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-uk_UA abiword-libre-2.8.6/user/wp/templates/normal.awt-uk_UA
---- abiword-2.8.6/user/wp/templates/normal.awt-uk_UA	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-uk_UA	2011-07-02 15:37:20.003366813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ur_PK abiword-libre-2.8.6/user/wp/templates/normal.awt-ur_PK
---- abiword-2.8.6/user/wp/templates/normal.awt-ur_PK	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ur_PK	2011-07-02 15:37:20.067398813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-yi abiword-libre-2.8.6/user/wp/templates/normal.awt-yi
---- abiword-2.8.6/user/wp/templates/normal.awt-yi	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-yi	2011-07-02 15:37:19.919324814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-zh_CN abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_CN
---- abiword-2.8.6/user/wp/templates/normal.awt-zh_CN	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_CN	2011-07-02 15:37:20.015372813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-zh_TW abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_TW
---- abiword-2.8.6/user/wp/templates/normal.awt-zh_TW	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_TW	2011-07-02 15:37:19.907318814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/Press-Release.awt abiword-libre-2.8.6/user/wp/templates/Press-Release.awt
---- abiword-2.8.6/user/wp/templates/Press-Release.awt	2009-05-22 07:15:33.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/Press-Release.awt	2011-07-02 15:37:20.071400813 -0300
-@@ -16,19 +16,19 @@
- <version id="3" started="1080258930" uid="0c5a8b0e-7ec0-11d8-92e5-d7901b3e7f1a" auto="0"/>
- </history>
- <styles>
--<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Arial; margin-top:0pt; font-style:normal; margin-left:0.5000in; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.5000in; color:000000; font-size:12pt; line-height:1.000000; text-align:left; widows:2; font-stretch:normal"/>
--<s followedby="Normal" name="Heading 1" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:17pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Arial"/>
--<s followedby="Press Release" name="Press Release" basedon="Normal" type="P" props="font-weight:normal; font-family:Arial; margin-top:0.1667in; font-style:normal; margin-left:0.5000in; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.5000in; color:000000; font-size:12pt; line-height:1.000000; text-align:left; widows:2; font-stretch:normal"/>
--<s followedby="About Companies" name="About Companies" basedon="Press Release" type="P" props="font-weight:normal; font-family:Arial; margin-top:0.1111in; font-style:normal; margin-left:0.7500in; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.7500in; color:000000; font-size:10pt; line-height:1.000000; text-align:justify; widows:2; font-stretch:normal"/>
-+<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Liberation Sans; margin-top:0pt; font-style:normal; margin-left:0.5000in; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.5000in; color:000000; font-size:12pt; line-height:1.000000; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Normal" name="Heading 1" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:17pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Liberation Sans"/>
-+<s followedby="Press Release" name="Press Release" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Sans; margin-top:0.1667in; font-style:normal; margin-left:0.5000in; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.5000in; color:000000; font-size:12pt; line-height:1.000000; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="About Companies" name="About Companies" basedon="Press Release" type="P" props="font-weight:normal; font-family:Liberation Sans; margin-top:0.1111in; font-style:normal; margin-left:0.7500in; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.7500in; color:000000; font-size:10pt; line-height:1.000000; text-align:justify; widows:2; font-stretch:normal"/>
- <s type="P" name="Block Text" basedon="Normal" followedby="Current Settings" props="line-height:1.000000; margin-bottom:0.0833in; margin-right:1.0000in; margin-left:1.0000in"/>
- <s type="P" name="Box List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Box List; line-height:1.000000; text-indent:-0.300000in"/>
- <s type="P" name="Bullet List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Symbol; list-style:Bullet List; line-height:1.000000; text-indent:-0.300000in"/>
--<s followedby="Normal" name="Chapter Heading" basedon="Numbered Heading 1" type="P" props="list-delim:Chapter %L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Arial; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:1.100000in/L0"/>
-+<s followedby="Normal" name="Chapter Heading" basedon="Numbered Heading 1" type="P" props="list-delim:Chapter %L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Liberation Sans; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:1.100000in/L0"/>
- <s followedby="Normal" name="Contents 1" basedon="Normal" type="P" props="list-delim:%L.; list-decimal:.; field-color:transparent; start-value:1; margin-left:0.5000in; field-font:NULL; list-style:Numbered List; line-height:1.000000; text-indent:-0.300000in"/>
- <s followedby="Normal" name="Contents 2" basedon="Normal" type="P" props="list-delim:%L.; list-decimal:.; field-color:transparent; start-value:1; margin-left:1.0000in; field-font:NULL; list-style:Numbered List; line-height:1.000000; text-indent:-0.300000in"/>
- <s followedby="Normal" name="Contents 3" basedon="Normal" type="P" props="list-delim:%L.; list-decimal:.; field-color:transparent; start-value:1; margin-left:1.5000in; field-font:NULL; list-style:Numbered List; line-height:1.000000; text-indent:-0.300000in"/>
- <s followedby="Normal" name="Contents 4" basedon="Normal" type="P" props="list-delim:%L.; list-decimal:.; field-color:transparent; start-value:1; margin-left:2.0000in; field-font:NULL; list-style:Numbered List; line-height:1.000000; text-indent:-0.300000in"/>
--<s followedby="Normal" name="Contents Header" basedon="Normal" type="P" props="margin-top:0.1667in; font-size:16pt; margin-bottom:0.0833in; text-align:center; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Arial"/>
-+<s followedby="Normal" name="Contents Header" basedon="Normal" type="P" props="margin-top:0.1667in; font-size:16pt; margin-bottom:0.0833in; text-align:center; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Liberation Sans"/>
- <s type="P" name="Dashed List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:NULL; list-style:Dashed List; line-height:1.000000; text-indent:-0.300000in"/>
- <s type="P" name="Diamond List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Diamond List; line-height:1.000000; text-indent:-0.300000in"/>
- <s type="C" name="Endnote Reference" basedon="None" followedby="Current Settings" props="text-position:superscript; line-height:1.000000; font-size:10pt"/>
-@@ -36,19 +36,19 @@
- <s type="C" name="Footnote Reference" basedon="None" followedby="Current Settings" props="text-position:superscript; line-height:1.000000; font-size:10pt"/>
- <s type="C" name="Footnote Text" basedon="Normal" followedby="Current Settings" props="text-position:normal; line-height:1.000000; font-size:10pt"/>
- <s type="P" name="Hand List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Hand List; line-height:1.000000; text-indent:-0.300000in"/>
--<s followedby="Normal" name="Heading 2" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:14pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Arial"/>
--<s followedby="Normal" name="Heading 3" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:12pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Arial"/>
--<s followedby="Normal" name="Heading 4" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:12pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Arial"/>
-+<s followedby="Normal" name="Heading 2" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:14pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Liberation Sans"/>
-+<s followedby="Normal" name="Heading 3" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:12pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Liberation Sans"/>
-+<s followedby="Normal" name="Heading 4" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:12pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Liberation Sans"/>
- <s type="P" name="Heart List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Heart List; line-height:1.000000; text-indent:-0.300000in"/>
- <s type="P" name="Implies List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Symbol; list-style:Implies List; line-height:1.000000; text-indent:-0.300000in"/>
- <s type="P" name="Lower Case List" basedon="Numbered List" followedby="Current Settings" props="list-delim:%L); list-decimal:.; field-color:transparent; start-value:1; margin-left:0.5000in; field-font:NULL; list-style:Lower Case List; line-height:1.000000; text-indent:-0.300000in"/>
- <s type="P" name="Lower Roman List" basedon="Normal" followedby="Current Settings" props="list-delim:%L; list-decimal:.; field-color:transparent; start-value:1; margin-left:0.5000in; field-font:NULL; list-style:Lower Roman List; line-height:1.000000; text-indent:-0.300000in"/>
--<s followedby="Normal" name="Numbered Heading 1" basedon="Heading 1" type="P" props="list-delim:%L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Arial; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:0.299306in/L0"/>
--<s followedby="Normal" name="Numbered Heading 2" basedon="Heading 2" type="P" props="list-delim:%L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Arial; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:0.299306in/L0"/>
--<s followedby="Normal" name="Numbered Heading 3" basedon="Heading 3" type="P" props="list-delim:%L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Arial; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:0.299306in/L0"/>
-+<s followedby="Normal" name="Numbered Heading 1" basedon="Heading 1" type="P" props="list-delim:%L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Liberation Sans; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:0.299306in/L0"/>
-+<s followedby="Normal" name="Numbered Heading 2" basedon="Heading 2" type="P" props="list-delim:%L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Liberation Sans; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:0.299306in/L0"/>
-+<s followedby="Normal" name="Numbered Heading 3" basedon="Heading 3" type="P" props="list-delim:%L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Liberation Sans; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:0.299306in/L0"/>
- <s type="P" name="Numbered List" followedby="Current Settings" props="list-delim:%L.; list-decimal:.; field-color:transparent; start-value:1; margin-left:0.5000in; field-font:NULL; list-style:Numbered List; line-height:1.000000; text-indent:-0.300000in"/>
- <s type="P" name="Plain Text" basedon="Normal" followedby="Current Settings" props="font-family:Courier New; line-height:1.000000"/>
--<s followedby="Normal" name="Section Heading" basedon="Numbered Heading 1" type="P" props="list-delim:Section %L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Arial; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:1.100000in/L0"/>
-+<s followedby="Normal" name="Section Heading" basedon="Numbered Heading 1" type="P" props="list-delim:Section %L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Liberation Sans; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:1.100000in/L0"/>
- <s type="P" name="Square List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Square List; line-height:1.000000; text-indent:-0.300000in"/>
- <s type="P" name="Star List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Star List; line-height:1.000000; text-indent:-0.300000in"/>
- <s type="P" name="Tick List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Tick List; line-height:1.000000; text-indent:-0.300000in"/>
-@@ -77,7 +77,7 @@
- <p style="Normal"><c props="lang:en-US"></c></p>
- </cell>
- <cell props="bot-attach:3; left-attach:0; right-attach:1; top-attach:2">
--<p style="Normal" props="text-align:center"><c props="font-family:Arial; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">FOR IMMEDIATE RELEASE</c></p>
-+<p style="Normal" props="text-align:center"><c props="font-family:Liberation Sans; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">FOR IMMEDIATE RELEASE</c></p>
- </cell>
- </table>
- <p></p>
-diff -auNpr abiword-2.8.6/user/wp/templates/Resume.awt abiword-libre-2.8.6/user/wp/templates/Resume.awt
---- abiword-2.8.6/user/wp/templates/Resume.awt	2009-05-22 07:15:36.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/Resume.awt	2011-07-02 15:37:20.031380813 -0300
-@@ -14,11 +14,11 @@
- <m key="abiword.date_last_changed">Fri Mar 12 22:08:25 2004</m>
- </metadata>
- <styles>
--<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Arial; margin-top:0pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:9pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s followedby="Normal" name="Heading 1" basedon="Normal" type="P" props="font-weight:bold; margin-top:22pt; keep-with-next:1; margin-bottom:3pt; font-family:Arial; font-size:20pt"/>
--<s followedby="Normal" name="Heading 2" basedon="Normal" type="P" props="margin-top:22pt; font-size:11pt; margin-bottom:3pt; font-weight:normal; text-align:right; font-family:Arial; keep-with-next:1"/>
--<s followedby="Normal" name="Heading 3" basedon="Normal" type="P" props="font-weight:bold; margin-top:22pt; keep-with-next:1; margin-bottom:3pt; font-family:Arial; font-size:9pt"/>
--<s followedby="Heading 3" name="Brief" basedon="Normal" type="P" props="font-weight:normal; font-family:Arial; margin-top:0pt; font-style:normal; margin-left:0.2500in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:9pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:9pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Liberation Sans; margin-top:0pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:9pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Normal" name="Heading 1" basedon="Normal" type="P" props="font-weight:bold; margin-top:22pt; keep-with-next:1; margin-bottom:3pt; font-family:Liberation Sans; font-size:20pt"/>
-+<s followedby="Normal" name="Heading 2" basedon="Normal" type="P" props="margin-top:22pt; font-size:11pt; margin-bottom:3pt; font-weight:normal; text-align:right; font-family:Liberation Sans; keep-with-next:1"/>
-+<s followedby="Normal" name="Heading 3" basedon="Normal" type="P" props="font-weight:bold; margin-top:22pt; keep-with-next:1; margin-bottom:3pt; font-family:Liberation Sans; font-size:9pt"/>
-+<s followedby="Heading 3" name="Brief" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Sans; margin-top:0pt; font-style:normal; margin-left:0.2500in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:9pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:9pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
- <section header="0" props="page-margin-footer:0.5in; page-margin-header:0.4375in; page-margin-top:1.1250in">
diff --git a/libre/abs/PKGBUILD b/libre/abs/PKGBUILD
deleted file mode 100644
index f7e85d0ef..000000000
--- a/libre/abs/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-replaces=('abs-libre')
-conflicts=('abs-libre')
-
-pkgname=abs
-pkgver=2.4.4
-pkgrel=1.1
-pkgdesc="Utilities to download and work with the Arch Build System (ABS)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://projects.archlinux.org/abs.git/"
-license=('GPL')
-depends=('bash' 'rsync')
-backup=(etc/abs.conf)
-source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('7258c739a93e02a4f31f114e9fc3b0ba'
-         'a628f7d5b1cd1e838366b88709690c24')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="${pkgdir}" install
-
-  # Add readme file, and make base /var/abs path
-  install -dm755 "${pkgdir}"/var/abs/local/
-  install -Dm644 README "${pkgdir}"/var/abs/README
-
-  # make adjustments to abs.conf
-  sed -i -e 's|rsync.archlinux.org|parabolagnulinux.org|' "${pkgdir}"/etc/abs.conf
-  sed -i -e 's|(core|(libre !libre-testing core|' "${pkgdir}"/etc/abs.conf
-  if [[ $CARCH != "x86_64" ]]; then
-    sed -i -e 's| multilib||' -e 's| !multilib-testing||' "${pkgdir}"/etc/abs.conf
-  fi
-  sed -i "s/ARCH=.*/ARCH=$CARCH/" "${pkgdir}"/etc/abs.conf
-}
diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD
deleted file mode 100644
index e1b44b7f9..000000000
--- a/libre/abuse-libre/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: jlvsimoes <jlvsimoes@oninet.pt>
-# Contributor: kevin <kevin@archlinux.org>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=abuse
-pkgname=abuse-libre
-pkgver=0.8
-pkgrel=3.2
-pkgdesc='A side-scroller action game that pits you against ruthless alien killers, without nonfree claudio support'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://abuse.zoy.org/'
-license=('GPL' 'custom')
-depends=('gcc-libs' 'glu' 'sdl' 'sdl_mixer')
-provides=('$_pkgname=$pkgver')
-replaces=('$_pkgname')
-conflicts=('$_pkgname')
-install='abuse.install'
-source=("http://abuse.zoy.org/raw-attachment/wiki/download/${_pkgname}-${pkgver}.tar.gz"
-        non-claudio.patch)
-md5sums=('ec678b8dc8d00e0382d8c805c6438489'
-         '4808c8be42f551bb3c611629a7833f09')
-
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-# Remove the nonfree claudio addon
-  rm -rvf ./data/addon/claudio
-  patch -Np1 -i "$srcdir/non-claudio.patch"
-
-  ./configure --prefix=/usr --with-assetdir=/usr/share/abuse/orig --with-x
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -d "${pkgdir}/usr/share/licenses/abuse"
-  sed -n '1,/^$/p' src/view.cpp > "${pkgdir}/usr/share/licenses/abuse/orig.code.license"
-}
diff --git a/libre/abuse-libre/abuse.install b/libre/abuse-libre/abuse.install
deleted file mode 100644
index 4d28ebacd..000000000
--- a/libre/abuse-libre/abuse.install
+++ /dev/null
@@ -1,13 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-#  echo "If you get a BOSS_ANT error trying to run abuse, copy /usr/share/games/abuse/gamma.lsp to ~/.abuse"
-   echo "Abuse uses the original game levels by default.  To use the frabs levels"
-   echo "use '-datadir' or set 'datadir' in the abuserc to /usr/share/abuse/frabs"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	post_install
-}
-
diff --git a/libre/abuse-libre/non-claudio.patch b/libre/abuse-libre/non-claudio.patch
deleted file mode 100644
index 2a29e53f0..000000000
--- a/libre/abuse-libre/non-claudio.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- abuse-0.8/data/Makefile.in	2011-05-09 08:06:35.000000000 -0300
-+++ abuse-0.8/data/Makefile.in	2012-04-11 15:03:02.854839102 -0300
-@@ -184,7 +184,6 @@
- 	addon/aliens/objects.lsp addon/aliens/powerold.lsp \
- 	addon/aliens/powerups.lsp addon/aliens/sfx.lsp \
- 	addon/aliens/tiles.lsp addon/bong/bong.lsp \
--	addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \
- 	addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \
- 	addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \
- 	addon/deathmat/large.lsp addon/deathmat/levelset.lsp \
-@@ -245,23 +244,6 @@
- 	art/tints/guns/orange.spe art/tints/guns/redish.spe \
- 	addon/aliens/aliens.spe addon/aliens/bactiles.spe \
- 	addon/aliens/fortiles.spe addon/bong/bong.spe \
--	addon/claudio/antship.spe addon/claudio/bigexp.spe \
--	addon/claudio/deepw1.spe addon/claudio/deepw2.spe \
--	addon/claudio/droid.spe addon/claudio/extiles.spe \
--	addon/claudio/fire.spe addon/claudio/lamp.spe \
--	addon/claudio/lava2.spe addon/claudio/mypanels.spe \
--	addon/claudio/nplatfor.spe addon/claudio/pal21.spe \
--	addon/claudio/pal2.spe addon/claudio/pal5.spe \
--	addon/claudio/pal81f.spe addon/claudio/pal81.spe \
--	addon/claudio/pal82f.spe addon/claudio/pal82.spe \
--	addon/claudio/pal90.spe addon/claudio/rob2.spe \
--	addon/claudio/skull.spe addon/claudio/spaced.spe \
--	addon/claudio/spaceh.spe addon/claudio/spacymed.spe \
--	addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \
--	addon/claudio/t_lamp.spe addon/claudio/trex1.spe \
--	addon/claudio/t_skull.spe addon/claudio/t_space.spe \
--	addon/claudio/t_trex.spe addon/claudio/t_water.spe \
--	addon/claudio/umbrel3.spe addon/claudio/watem.spe \
- 	addon/example/example.spe addon/leon/gray.spe \
- 	addon/leon/level00.spe addon/leon/level01.spe \
- 	addon/leon/level02.spe addon/leon/lmisc.spe \
-@@ -333,7 +315,6 @@
- doc = \
-     addon/aliens/aliens.txt \
-     addon/aliens/readme.txt \
--    addon/claudio/palettes.txt \
-     addon/leon/leon.txt \
-     addon/newart/tiledoc.txt \
-     addon/pong/pong.txt \
-@@ -414,17 +395,6 @@
- @HAVE_NONFREE_TRUE@	addon/aliens/aslash01.wav \
- @HAVE_NONFREE_TRUE@	addon/aliens/egghatch.wav \
- @HAVE_NONFREE_TRUE@	addon/aliens/jarbreak.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/aship.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/drill.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/fire.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/glass1.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/sewers.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/skull.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/spaceo.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/trex1.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/trex2.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/unhealth.wav \
--@HAVE_NONFREE_TRUE@	addon/claudio/wfall.wav \
- @HAVE_NONFREE_TRUE@	addon/leon/sfx/ambship1.wav \
- @HAVE_NONFREE_TRUE@	addon/leon/sfx/ambship2.wav \
- @HAVE_NONFREE_TRUE@	addon/leon/sfx/gren5.wav \
---- abuse-0.8/data/Makefile.am	2011-05-09 04:58:04.000000000 -0300
-+++ abuse-0.8/data/Makefile.am	2012-04-11 15:03:50.282407491 -0300
-@@ -35,7 +35,6 @@
-     \
-     addon/bong/bong.lsp \
-     \
--    addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \
-     addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \
-     addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \
-     addon/deathmat/large.lsp addon/deathmat/levelset.lsp \
-@@ -113,21 +112,6 @@
-     \
-     addon/bong/bong.spe \
-     \
--    addon/claudio/antship.spe addon/claudio/bigexp.spe \
--    addon/claudio/deepw1.spe addon/claudio/deepw2.spe addon/claudio/droid.spe \
--    addon/claudio/extiles.spe addon/claudio/fire.spe addon/claudio/lamp.spe \
--    addon/claudio/lava2.spe addon/claudio/mypanels.spe \
--    addon/claudio/nplatfor.spe addon/claudio/pal21.spe addon/claudio/pal2.spe \
--    addon/claudio/pal5.spe addon/claudio/pal81f.spe addon/claudio/pal81.spe \
--    addon/claudio/pal82f.spe addon/claudio/pal82.spe addon/claudio/pal90.spe \
--    addon/claudio/rob2.spe addon/claudio/skull.spe addon/claudio/spaced.spe \
--    addon/claudio/spaceh.spe addon/claudio/spacymed.spe \
--    addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \
--    addon/claudio/t_lamp.spe addon/claudio/trex1.spe \
--    addon/claudio/t_skull.spe addon/claudio/t_space.spe \
--    addon/claudio/t_trex.spe addon/claudio/t_water.spe \
--    addon/claudio/umbrel3.spe addon/claudio/watem.spe \
--    \
-     addon/example/example.spe \
-     \
-     addon/leon/gray.spe addon/leon/level00.spe addon/leon/level01.spe \
-@@ -214,7 +198,6 @@
- doc = \
-     addon/aliens/aliens.txt \
-     addon/aliens/readme.txt \
--    addon/claudio/palettes.txt \
-     addon/leon/leon.txt \
-     addon/newart/tiledoc.txt \
-     addon/pong/pong.txt \
-@@ -267,11 +250,6 @@
-     addon/aliens/altaunt.wav addon/aliens/aslash01.wav \
-     addon/aliens/egghatch.wav addon/aliens/jarbreak.wav \
-     \
--    addon/claudio/aship.wav addon/claudio/drill.wav addon/claudio/fire.wav \
--    addon/claudio/glass1.wav addon/claudio/sewers.wav addon/claudio/skull.wav \
--    addon/claudio/spaceo.wav addon/claudio/trex1.wav addon/claudio/trex2.wav \
--    addon/claudio/unhealth.wav addon/claudio/wfall.wav \
--    \
-     addon/leon/sfx/ambship1.wav addon/leon/sfx/ambship2.wav \
-     addon/leon/sfx/gren5.wav addon/leon/sfx/gren6.wav \
-     addon/leon/sfx/rain2.wav addon/leon/sfx/rain3.wav \
---- abuse-0.8/data/abuse.lsp	2011-05-09 04:58:04.000000000 -0300
-+++ abuse-0.8/data/abuse.lsp	2012-04-11 15:04:15.637788215 -0300
-@@ -42,7 +42,6 @@
- (load "addon/twist/f2chars.lsp")
- (load "addon/twist/f2ai.lsp")
- (load "addon/aliens/astartup.lsp")
--(load "addon/claudio/claudio.lsp")
- (load "addon/twist/lisp/dray.lsp")
- (load "addon/twist/lisp/mario.lsp")
- (load "addon/leon/4frabs.lsp")
diff --git a/libre/abuse-libre/rePKGBUILD b/libre/abuse-libre/rePKGBUILD
deleted file mode 100644
index 3c9a0082d..000000000
--- a/libre/abuse-libre/rePKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# This is an example rePKGBUILD file. Use this as a start to creating your own,
-# and remove these comments. For more information, see 'man PKGBUILD'.
-# NOTE: Please fill out the license field for your package! If it is unknown,
-# then please put 'unknown'.
-
-# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-source PKGBUILD
-CARCH=x86_64
-unset build package md5sums source
-_repo=community
-options=(!strip)
-source=(PKGBUILD
-	http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
-	# files for pkg modifications
-        )
-
-build() {
-  cd "${srcdir}/"
-  rm -v .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH.pkg.tar.xz
-  # actions for package modifications
-  # be sure to remove source files
-
-  msg "Removing unfree 'Claudio' addon"
-  rm -rvf usr/share/abuse/orig/addon/claudio/
-}
-
-package() {
-  cd ${srcdir}
-  cp -a ./* ${pkgdir}
-}
-
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/aif-libre/PKGBUILD b/libre/aif-libre/PKGBUILD
deleted file mode 100644
index 7decd9531..000000000
--- a/libre/aif-libre/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Dieter Plaetinck <dieter@plaetinck.be>
-
-pkgname=aif-libre
-pkgver=2011.08.31
-pkgrel=1
-pkgdesc="The ArchLinux Installation Framework (Parabola Rebranded)"
-arch=('any')
-url="https://projects.parabolagnulinux.org/aif.git"
-license=('GPL3')
-depends=('util-linux-ng' 'bash' 'pacman' 'coreutils' 'grub' 'grep' 'mkinitcpio' 'awk' 'sed' 'libui-sh')
-optdepends=('markdown: to generate the html installation guide'
-            'cryptsetup: for encryption support'
-            'lvm2: for LVM support'
-            'dhcpd: for dhcp networking support'
-            'e2fsprogs: Ext support'
-            'jfsutils: JFS support'
-            'reiserfsprogs: ReiserFS support'
-            'xfsprogs: XFS support'
-            'ntp: setting date with NTP'
-            'dialog: for ncurses support'
-            'curl: for the aif-report-issues.sh script'
-            )
-replaces=('aif')
-conflicts=('aif')
-provides=('aif')
-source=($url/snapshot/aif-${pkgver}.tar.bz2)
-md5sums=('02428484aaf6ce35f2abcccd921c8330')
-
-build() {
-
-  cd $srcdir/aif-$pkgver/
-  
-  make DESTDIR="$pkgdir/" install
-
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/angband-libre/PKGBUILD b/libre/angband-libre/PKGBUILD
deleted file mode 100644
index e463637a8..000000000
--- a/libre/angband-libre/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# Maintainer: schuay <jakob.gruber@gmail.com>
-# Contributor: Mike Sampson <mike at sambodata dot com>
-# Contributor: Adrian Stratulat <adrian.stratulat at inboxcom>
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: KillaB <xGenoBlast@gmail.com>
-# Contributor: Callan Barrett <wizzomafizzo@gmail.com>
-# Contributor: Christian Schmidt <xmucknertx@googlemail.com>
-# Contributor: Sebastian Sareyko <public@nooms.de>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=angband
-pkgname=angband-libre
-pkgver=3.5.0
-pkgrel=2
-pkgdesc="A roguelike dungeon exploration game based on the writings of JRR Tolkien, without nonfree artwork and sound effects"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://rephial.org/"
-license=('GPL2' 'custom')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses')
-source=("http://rephial.org/downloads/${pkgver:0:3}/${_pkgname}-v${pkgver}.tar.gz" 'libre.patch')
-
-prepare() {
-  cd "${srcdir}/${_pkgname}-v${pkgver}"
-
-  # remove nonfree parts from source code
-  patch -Np1 -i ../libre.patch  
-  rm -v lib/xtra/sound/*.mp3
-  rm -v lib/xtra/graf/64x64.png
-}
-
-build() {
-  cd "${srcdir}/${_pkgname}-v${pkgver}"
-
-  ./configure \
-    --prefix=/usr \
-    --bindir=/usr/bin \
-    --sysconfdir=/usr/share/angband \
-    --with-configpath=/usr/share/angband \
-    --with-libpath=/usr/share/angband \
-    --enable-gtk \
-    --enable-sdl \
-    --enable-sdl-mixer
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}-v${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}/usr/share/angband/*/delete.me"
-  install -Dm644 copying.txt "${pkgdir}/usr/share/licenses/${_pkgname}/COPYING"
-}
-
-md5sums=('4f6ee37abdb411285deb1685ddecba6a'
-         '3ac39f377bea2e208308d01f4213310f')
diff --git a/libre/angband-libre/libre.patch b/libre/angband-libre/libre.patch
deleted file mode 100644
index a044bc6fe..000000000
--- a/libre/angband-libre/libre.patch
+++ /dev/null
@@ -1,814 +0,0 @@
-diff --git a/copying.txt b/copying.txt
-index fe1f289..82263b1 100644
---- a/copying.txt
-+++ b/copying.txt
-@@ -23,14 +23,6 @@ exceptions:
-    only under the terms of the Creative Commons Attribution 3.0 licence:
-    http://creativecommons.org/licenses/by/3.0/
- 
-- * Shockbolt's (64x64) graphics are distributed under the licence at the end
--   of this file.  Currently some of the tiles in the 64x64.png tilesheet were
--   resized from tiles made by David Gervais for the 32x32 set.
--
-- * The sounds are licenced under the Creative Commons Attribution-NonCommercial-
--   Sharealike licence.  They were created by Dubtrain <angband@dubtrain.com>.
--   You can find them in Wave format at http://www.dubtrain.com/angband/.
--
-  * The font files are all by Leon Marrick and/or Sheldon Simms III and/or Nick
-    McConnell, all of whom have agreed to their Angband work being released
-    under the GPL.
-@@ -393,25 +385,3 @@ proprietary programs.  If your program is a subroutine library, you may
- consider it more useful to permit linking proprietary applications with the
- library.  If this is what you want to do, use the GNU Lesser General
- Public License instead of this License.
--
--------------------------------------------------------------------------------
--
--The Shockbolt Angband 64x64/128x64 tileset is copyright (C) Raymond Gaustadnes
--2012.  It can be found in the file lib/xtra/graf/128x128.png.
--
--Permission is granted to:
--* use the tileset with in-development and released versions of Angband
--* distribute and make copies of the tileset with in-development and released
--  versions of Angband, as long as no fee is charged for it
--* incorporate tiles designed by the author for variants of Angband and use and
--  distribute them with Angband under the terms above
--
--Permission is not granted to:
--* modify the tileset without the author's permission.
--* incorporate tiles designed for ToME that do not appear in the Angband tileset.
--* use or distribute the tileset with other games or projects.  If you want to
--  use and distribute the tileset with other games or projects, you must obtain
--  explicit permission from the author.  Non-commercial games or projects may
--  be granted permission to use them, and if so, use will be allowed as long
--  as the game or project remains non-commercial.  To use them in commercial
--  games, a non-exclusive licence must be acquired from the author.
-diff --git a/lib/xtra/graf/Makefile b/lib/xtra/graf/Makefile
-index e1e9111..ec54051 100644
---- a/lib/xtra/graf/Makefile
-+++ b/lib/xtra/graf/Makefile
-@@ -1,6 +1,6 @@
- MKPATH=../../../mk/
- include $(MKPATH)buildsys.mk
- 
--DATA = 8x8.png 8x16.png 16x16.png 32x32.png 64x64.png mr_att.png graphics.txt
-+DATA = 8x8.png 8x16.png 16x16.png 32x32.png mr_att.png graphics.txt
- PACKAGE = xtra/graf
- 
-diff --git a/lib/xtra/graf/graphics.txt b/lib/xtra/graf/graphics.txt
-index 28078fc..02f32ab 100644
---- a/lib/xtra/graf/graphics.txt
-+++ b/lib/xtra/graf/graphics.txt
-@@ -47,8 +47,3 @@ N:4:Nomad's tiles
- I:16:16:8x16.png
- P:nomad
- X:0:0:0
--
--N:5:Shockbolt's tiles
--I:64:64:64x64.png
--P:shock
--X:1:29:31
-diff --git a/lib/xtra/sound/Makefile b/lib/xtra/sound/Makefile
-index 0fb522b..a4337fd 100644
---- a/lib/xtra/sound/Makefile
-+++ b/lib/xtra/sound/Makefile
-@@ -1,78 +1,7 @@
- MKPATH=../../../mk/
- include $(MKPATH)buildsys.mk
- 
--DATA = sound.cfg \
--	amb_bell_metal1.mp3		mco_scurry_dry.mp3		plm_drop_boot.mp3 \
--	amb_bell_metal2.mp3		mco_shake_roll.mp3		plm_eat_bite.mp3 \
--	amb_bell_tibet1.mp3		mco_snarl_short.mp3		plm_floor_creak.mp3 \
--	amb_bell_tibet2.mp3		mco_spray_long.mp3		plm_floor_creak2.mp3 \
--	amb_bell_tibet3.mp3		mco_squish_hit.mp3		plm_glass_break.mp3 \
--	amb_door_doom.mp3		mco_squish_snap.mp3		plm_glass_breaking.mp3 \
--	amb_door_iron.mp3		mco_strange_music.mp3		plm_glass_smashing.mp3 \
--	amb_dungeon_echo.mp3		mco_strange_thwoink.mp3		plm_jar_ding.mp3 \
--	amb_dungeon_echowet.mp3		mco_thoing_backwards.mp3	plm_levelup.mp3 \
--	amb_gong_chinese.mp3		mco_thoing_deep.mp3		plm_lock_case.mp3 \
--	amb_gong_low.mp3		mco_thud_crash.mp3		plm_lock_distant.mp3 \
--	amb_gong_strike.mp3		mco_tube_hit.mp3		plm_metal_clank.mp3 \
--	amb_gong_undertone.mp3		plc_bell_warn.mp3		plm_metal_sharpen.mp3 \
--	amb_guitar_chord.mp3		plc_die_laugh.mp3		plm_open_case.mp3 \
--	amb_pulse_low.mp3		plc_hit_anvil.mp3		plm_spell1.mp3 \
--	amb_thunder_rain.mp3		plc_hit_anvil2.mp3		plm_spell2.mp3 \
--	amb_thunder_roll.mp3		plc_hit_arrow.mp3		plm_spell3.mp3 \
--	id_bad_aww.mp3			plc_hit_body.mp3		plm_use_staff.mp3 \
--	id_bad_dang.mp3			plc_hit_groan.mp3		plm_wood_thud.mp3 \
--	id_bad_hmm.mp3			plc_hit_grunt.mp3		plm_zap_rod.mp3 \
--	id_bad_hmph.mp3			plc_hit_grunt2.mp3		pls_bell_bowl.mp3 \
--	id_bad_ohh.mp3			plc_hit_hay.mp3			pls_bell_chime_new.mp3 \
--	id_ego_whoa.mp3			plc_miss_arrow.mp3		pls_bell_glass.mp3 \
--	id_ego_woohoo.mp3		plc_miss_arrow2.mp3		pls_bell_hibell_soft.mp3 \
--	id_ego_yeah.mp3			plc_miss_swish.mp3		pls_bell_mute.mp3 \
--	id_ego_yeah2.mp3		plm_aim_wand.mp3		pls_bell_sustain.mp3 \
--	id_ego_yes.mp3			plm_bang_ceramic.mp3		pls_breathe_in.mp3 \
--	id_good_hey.mp3			plm_bang_dumpster.mp3		pls_man_argoh.mp3 \
--	id_good_hey2.mp3		plm_bang_metal.mp3		pls_man_gulp_new.mp3 \
--	id_good_hmm.mp3			plm_book_pageturn.mp3		pls_man_oooh.mp3 \
--	id_good_huh.mp3			plm_bottle_clinks.mp3		pls_man_scream2.mp3 \
--	id_good_ooh.mp3			plm_break_canister.mp3		pls_man_sigh.mp3 \
--	id_good_ooo.mp3			plm_break_glass.mp3		pls_man_sniff.mp3 \
--	id_good_wow.mp3			plm_break_glass2.mp3		pls_man_sob.mp3 \
--	mco_attack_breath.mp3		plm_break_plates.mp3		pls_man_spit.mp3 \
--	mco_attack_spray.mp3		plm_break_shatter.mp3		pls_man_ugh.mp3 \
--	mco_bite_chew.mp3		plm_break_smash.mp3		pls_man_yell.mp3 \
--	mco_bite_chomp.mp3		plm_break_wood.mp3		pls_tone_blurk.mp3 \
--	mco_bite_dainty.mp3		plm_cabinet_open.mp3		pls_tone_clave6.mp3 \
--	mco_bite_gnash.mp3		plm_cabinet_shut.mp3		pls_tone_clavelo8.mp3 \
--	mco_bite_hard.mp3		plm_chain_light.mp3		pls_tone_conk.mp3 \
--	mco_bite_long.mp3		plm_chest_latch.mp3		pls_tone_elec.mp3 \
--	mco_bite_munch.mp3		plm_chest_unlatch.mp3		pls_tone_goblet.mp3 \
--	mco_bite_regular.mp3		plm_chimes_jangle.mp3		pls_tone_guiro.mp3 \
--	mco_bite_short.mp3		plm_click_dry.mp3		pls_tone_headstock.mp3 \
--	mco_bite_small.mp3		plm_click_switch.mp3			pls_tone_scrape.mp3 \
--	mco_bite_soft.mp3		plm_click_switch2.mp3		pls_tone_stick.mp3 \
--	mco_card_shuffle.mp3		plm_click_switch3.mp3		sto_bell_desk.mp3 \
--	mco_castanet_trill.mp3		plm_click_wood.mp3		sto_bell_ding.mp3 \
--	mco_ceramic_trill.mp3		plm_close_hatch.mp3		sto_bell_dingaling.mp3 \
--	mco_click_vibra.mp3		plm_coins_dump.mp3		sto_bell_jingles.mp3 \
--	mco_creature_choking.mp3	plm_coins_light.mp3		sto_bell_register1.mp3 \
--	mco_creature_groan.mp3		plm_coins_pour.mp3		sto_bell_register2.mp3 \
--	mco_creature_yelp.mp3		plm_coins_shake.mp3		sto_bell_ringing.mp3 \
--	mco_cuica_rubbing.mp3		plm_cork_pop.mp3		sto_bell_shop.mp3 \
--	mco_dino_low.mp3		plm_cork_squeak.mp3		sto_coins_countertop.mp3 \
--	mco_dino_slur.mp3		plm_door_bolt.mp3		sto_man_haha.mp3 \
--	mco_dino_talk.mp3		plm_door_creak.mp3		sto_man_hey.mp3 \
--	mco_dino_yawn.mp3		plm_door_creakshut.mp3		sto_man_whoohaha.mp3 \
--	mco_dub_wobble.mp3		plm_door_dungeon.mp3		sum_angel_song.mp3 \
--	mco_frog_trill.mp3		plm_door_echolock.mp3		sum_bell_crystal.mp3 \
--	mco_hit_whip.mp3		plm_door_entrance.mp3		sum_bell_hand.mp3 \
--	mco_howl_croak.mp3		plm_door_knob.mp3		sum_bell_tone.mp3 \
--	mco_howl_deep.mp3		plm_door_latch.mp3		sum_chime_jangle.mp3 \
--	mco_howl_distressed.mp3		plm_door_open.mp3		sum_ghost_moan.mp3 \
--	mco_howl_high.mp3		plm_door_opening.mp3		sum_ghost_oooo.mp3 \
--	mco_howl_long.mp3		plm_door_rusty.mp3		sum_ghost_wail.mp3 \
--	mco_liquid_squirt.mp3		plm_door_shut.mp3		sum_gong_temple.mp3 \
--	mco_man_mumble.mp3		plm_door_slam.mp3		sum_laugh_evil2.mp3 \
--	mco_mouse_squeaks.mp3		plm_door_squeaky.mp3		sum_lion_growl.mp3  \
--	mco_rubber_thud.mp3		plm_door_wooden.mp3		sum_piano_scrape.mp3
-+DATA = sound.cfg
- 
- PACKAGE = xtra/sound
- 
-diff --git a/lib/xtra/sound/sound.cfg b/lib/xtra/sound/sound.cfg
-index a3f483f..41de805 100644
---- a/lib/xtra/sound/sound.cfg
-+++ b/lib/xtra/sound/sound.cfg
-@@ -9,21 +9,6 @@
- # hit = hit.mp3 hit1.mp3
- #
- 
--#
--# This is the Dubtrain Angband Sound config list, v.3.1.0 - February 24th, 2009
--#
--# Licensed under a Creative Commons non-commercial agreement
--#
--# Inspired by the original Craig's Angband Sound Patch.
--#
--# But with all new sounds.
--#
--# contact angband@dubtrain.com
--#
--# download zipped archive at www.dubtrain.com/angband
--#
--#
--
- [Sound]
- 
- #
-@@ -31,484 +16,484 @@
- #
- 
- # Town during the day.
--ambient_day = amb_thunder_rain.mp3
-+ambient_day =
- 
- # Town during the night.
--ambient_nite = amb_guitar_chord.mp3 amb_thunder_roll.mp3
-+ambient_nite =
- 
- # Dungeon levels 1-20 (50'-1000')
--ambient_dng1 = amb_door_iron.mp3 amb_bell_metal1.mp3
-+ambient_dng1 =
- 
- # Dungeon levels 21-40 (1050'-2000')
--ambient_dng2 = amb_bell_tibet1.mp3 amb_bell_metal2.mp3 amb_gong_strike.mp3
-+ambient_dng2 =
- 
- # Dungeon levels 41-60 (2050'-3000')
--ambient_dng3 = amb_bell_tibet2.mp3 amb_dungeon_echo.mp3 amb_pulse_low.mp3
-+ambient_dng3 =
- 
- # Dungeon levels 61-80 (3050'-4000')
--ambient_dng4 = amb_bell_tibet3.mp3 amb_dungeon_echowet.mp3 amb_gong_undertone.mp3
-+ambient_dng4 =
- 
- # Dungeon levels 81 and beyond (4050'-)
--ambient_dng5 = amb_door_doom.mp3 amb_gong_chinese.mp3 amb_gong_low.mp3
-+ambient_dng5 =
- 
- #
- # Store sounds
- #
- 
- # The shopkeep bought a worthless item.
--store1 = sto_man_hey.mp3
-+store1 =
- 
- # The shopkeep paid too much for an item.
--store2 = id_bad_dang.mp3
-+store2 =
- 
- # The shopkeep got away with a good bargain.
--store3 = sto_man_haha.mp3
-+store3 =
- 
- # The shopkeep got away with a great bargain.
--store4 = sto_man_whoohaha.mp3
-+store4 =
- 
- # You make a normal transaction (buying or selling).
--store5 = sto_coins_countertop.mp3 sto_bell_register1.mp3 sto_bell_register2.mp3
-+store5 =
- 
- # You enter a store.
--store_enter = sto_bell_desk.mp3 sto_bell_ding.mp3 sto_bell_dingaling.mp3 sto_bell_jingles.mp3 sto_bell_ringing.mp3 sto_bell_shop.mp3
-+store_enter =
- 
- # You enter your home.
--store_home = plm_door_entrance.mp3
-+store_home =
- 
- # You leave a store.
--store_leave = plm_door_bolt.mp3
-+store_leave =
- 
- #
- # Player sounds - combat
- #
- 
- # You succeed in a melee attack against a monster.
--hit = plc_hit_hay.mp3 plc_hit_body.mp3
-+hit =
- 
- # It was a good hit!
--hit_good = plc_hit_anvil.mp3
-+hit_good =
- 
- # It was a great hit!
--hit_great = plc_hit_groan.mp3
-+hit_great =
- 
- # It was a superb hit!
--hit_superb = plc_hit_grunt.mp3
-+hit_superb =
- 
- # It was a *GREAT* hit!
--hit_hi_great = plc_hit_grunt2.mp3
-+hit_hi_great =
- 
- # It was a *SUPERB* hit!
--hit_hi_superb = plc_hit_anvil2.mp3
-+hit_hi_superb =
- 
- # You miss a melee attack against a monster.
--miss = plc_miss_arrow2.mp3
-+miss =
- 
- # You fire a missile.
--shoot = plc_miss_swish.mp3 plc_miss_arrow.mp3
-+shoot =
- 
- # You hit something with a missile.
--shoot_hit = plc_hit_arrow.mp3
-+shoot_hit =
- 
- # You receive a hitpoint warning.
--hitpoint_warn = plc_bell_warn.mp3
-+hitpoint_warn =
- 
- # You die.
--death = plc_die_laugh.mp3
-+death =
- 
- #
- # Player sounds - status changes
- #
- 
- # You become blind.
--blind = pls_tone_conk.mp3
-+blind =
- 
- # You become confused.
--confused = pls_man_ugh.mp3
-+confused =
- 
- # You become poisoned.
--poisoned = pls_tone_guiro.mp3
-+poisoned =
- 
- # You become afraid.
--afraid = pls_man_yell.mp3
-+afraid =
- 
- # You become paralyzed.
--paralyzed = pls_man_gulp_new.mp3
-+paralyzed =
- 
- # You feel drugged (chaos effects).
--drugged = pls_breathe_in.mp3
-+drugged =
- 
- # You become slower.
--slow = pls_man_sigh.mp3
-+slow =
- 
- # You become stunned.
--stun = pls_bell_mute.mp3
-+stun =
- 
- # You suffer a cut.
--cut = pls_man_argoh.mp3
-+cut =
- 
- # A stat is drained
--drain_stat = pls_tone_headstock.mp3
-+drain_stat =
- 
- # You recover from a condition (blind, confused, etc.)
--recover = pls_bell_chime_new.mp3
-+recover =
- 
- # You become faster.
--speed = pls_bell_sustain.mp3
-+speed =
- 
- # You attain a mystic shield.
--shield = pls_bell_bowl.mp3
-+shield =
- 
- # You become blessed.
--blessed = sum_angel_song.mp3
-+blessed =
- 
- # You feel heroic.
--hero = pls_tone_goblet.mp3
-+hero =
- 
- # You are bold.
--bold = pls_bell_hibell_soft.mp3
-+bold =
- 
- # You become berserk.
--berserk = pls_man_scream2.mp3
-+berserk =
- 
- # You feel protected from evil.
--prot_evil = pls_bell_glass.mp3
-+prot_evil =
- 
- # You feel invulnerable. (does any item/spell do this anymore?)
--invuln = pls_tone_blurk.mp3
-+invuln =
- 
- # You can see invisible things.
--see_invis = pls_tone_clave6.mp3
-+see_invis =
- 
- # You can see the infrared spectrum
--infrared = pls_tone_clavelo8.mp3
-+infrared =
- 
- # You become resistant to acid.
--res_acid = pls_man_sniff.mp3
-+res_acid =
- 
- # You become resistant to electricity.
--res_elec = pls_tone_elec.mp3
-+res_elec =
- 
- # You become resistant to fire.
--res_fire = pls_tone_scrape.mp3
-+res_fire =
- 
- # You become resistant to cold.
--res_cold = pls_tone_stick.mp3
-+res_cold =
- 
- # You become resistant to poison.
--res_pois = pls_man_spit.mp3
-+res_pois =
- 
- # You become hungry.
--hungry = pls_man_sob.mp3
-+hungry =
- 
- #
- # Player sounds - misc.
- #
- 
- # You pick up money worth less than 200 au.
--money1 = plm_coins_light.mp3 plm_coins_shake.mp3
-+money1 =
- 
- # You pick up money worth between 200 and 600 au.
--money2 = plm_chain_light.mp3 plm_coins_pour.mp3
-+money2 =
- 
- # You pick up money worth 600 au or more.
--money3 = plm_coins_dump.mp3
-+money3 =
- 
- # You (or a monster) drop something on the ground.
--drop = plm_drop_boot.mp3
-+drop =
- 
- # You gain (or regain) a level.
--level = plm_levelup.mp3
-+level =
- 
- # You successfully study a spell or prayer.
--study = plm_book_pageturn.mp3
-+study =
- 
- # You teleport or phase door.
--teleport = plm_chimes_jangle.mp3
-+teleport =
- 
- # You quaff a potion.
--quaff = plm_bottle_clinks.mp3 plm_cork_pop.mp3 plm_cork_squeak.mp3
-+quaff =
- 
- # You zap a rod.
--zap_rod = plm_zap_rod.mp3
-+zap_rod =
- 
- # You take a step.  (unimplemented)
- walk =
- 
- # You teleport someone else away.
--tpother = plm_chimes_jangle.mp3
-+tpother =
- 
- # You bump into a wall or door.
--hitwall = plm_wood_thud.mp3
-+hitwall =
- 
- # You eat something.
--eat = plm_eat_bite.mp3
-+eat =
- 
- # You successfully dig through something.
--dig = plm_metal_clank.mp3
-+dig =
- 
- # You open a door.
--opendoor = plm_door_bolt.mp3 plm_door_creak.mp3 plm_door_dungeon.mp3 plm_door_entrance.mp3 plm_door_open.mp3 plm_door_opening.mp3 plm_door_rusty.mp3 plm_door_squeaky.mp3
-+opendoor =
- 
- # You shut a door.
--shutdoor = plm_bang_dumpster.mp3 plm_cabinet_shut.mp3 plm_close_hatch.mp3 plm_door_creakshut.mp3 plm_door_latch.mp3 plm_door_shut.mp3 plm_door_slam.mp3
-+shutdoor =
- 
- # You teleport from a level (including via recall).
--tplevel = sum_bell_crystal.mp3
-+tplevel =
- 
- # Default "bell" sound for system messages.
--bell = plm_jar_ding.mp3
-+bell =
- 
- # You try to open something that's not a door.
--nothing_to_open = plm_click_switch2.mp3 plm_door_knob.mp3
-+nothing_to_open =
- 
- # You fail to pick a lock.
--lockpick_fail = plm_click_dry.mp3 plm_click_switch.mp3 plm_click_wood.mp3 plm_door_echolock.mp3 plm_door_wooden.mp3
-+lockpick_fail =
- 
- # You pick a lock.
--lockpick = plm_break_wood.mp3 plm_cabinet_open.mp3 plm_chest_unlatch.mp3 plm_lock_case.mp3 plm_lock_distant.mp3 plm_open_case.mp3
-+lockpick =
- 
- # You disarm a trap.
--disarm = plm_bang_ceramic.mp3 plm_chest_latch.mp3 plm_click_switch3.mp3
-+disarm =
- 
- # You go up stairs.
--stairs_up = plm_floor_creak2.mp3
-+stairs_up =
- 
- # You go down stairs.
--stairs_down = plm_floor_creak.mp3
-+stairs_down =
- 
- # You activate an artifact.
--act_artifact = plm_aim_wand.mp3
-+act_artifact =
- 
- # You use a staff.
--use_staff = plm_use_staff.mp3
-+use_staff =
- 
- # An object is destroyed.
--destroy = plm_bang_metal.mp3 plm_break_canister.mp3 plm_break_glass.mp3 plm_break_glass2.mp3 plm_break_plates.mp3 plm_break_shatter.mp3 plm_break_smash.mp3 plm_glass_breaking.mp3 plm_glass_break.mp3 plm_glass_smashing.mp3
-+destroy =
- 
- # You wield or take off something.
--wield = plm_metal_sharpen.mp3
-+wield =
- 
- # You wield a cursed item.
--cursed = pls_man_oooh.mp3
-+cursed =
- 
- # You notice something (generic notice)
--notice = id_bad_hmm.mp3 
-+notice =
- 
- # You notice something about your equipment or inventory.
--pseudo_id = id_good_hmm.mp3 
-+pseudo_id =
- 
- # You successfully cast a spell.
--cast_spell = plm_spell1.mp3 plm_spell2.mp3 plm_spell3.mp3
-+cast_spell =
- 
- # You successfully pray a prayer.
--pray_prayer = sum_angel_song.mp3
-+pray_prayer =
- 
- #
- # Monster Sounds - combat
- #
- 
- # A monster flees in terror.
--flee = mco_creature_yelp.mp3
-+flee =
- 
- # A monster is killed.
--kill = mco_howl_croak.mp3 mco_howl_deep.mp3 mco_howl_distressed.mp3 mco_howl_high.mp3 mco_howl_long.mp3
-+kill =
- 
- # A unique is killed.
--kill_unique = sum_ghost_wail.mp3
-+kill_unique =
- 
- # Morgoth, Lord of Darkness is killed.
--kill_king = amb_guitar_chord.mp3
-+kill_king =
- 
- # Attack - hit
--mon_hit = mco_hit_whip.mp3
-+mon_hit =
- 
- # Attack - touch
--mon_touch = mco_click_vibra.mp3
-+mon_touch =
- 
- # Attack - punch
--mon_punch = mco_squish_snap.mp3
-+mon_punch =
- 
- # Attack - kick
--mon_kick = mco_rubber_thud.mp3
-+mon_kick =
- 
- # Attack - claw
--mon_claw = mco_ceramic_trill.mp3 mco_scurry_dry.mp3
-+mon_claw =
- 
- # Attack - bite
--mon_bite = mco_snarl_short.mp3 mco_bite_soft.mp3  mco_bite_munch.mp3  mco_bite_long.mp3  mco_bite_short.mp3  mco_bite_gnash.mp3  mco_bite_chomp.mp3  mco_bite_regular.mp3  mco_bite_small.mp3  mco_bite_dainty.mp3  mco_bite_hard.mp3  mco_bite_chew.mp3
-+mon_bite =
- 
- # Attack - sting
--mon_sting = mco_castanet_trill.mp3 mco_tube_hit.mp3
-+mon_sting =
- 
- # Attack - butt
--mon_butt = mco_cuica_rubbing.mp3 mco_thud_crash.mp3
-+mon_butt =
- 
- # Attack - crush
--mon_crush = mco_dino_low.mp3 mco_squish_hit.mp3
-+mon_crush =
- 
- # Attack - engulf
--mon_engulf = mco_dino_talk.mp3 mco_dino_yawn.mp3
-+mon_engulf =
- 
- # Attack - crawl
--mon_crawl = mco_card_shuffle.mp3 mco_shake_roll.mp3
-+mon_crawl =
- 
- # Attack - drool
--mon_drool = mco_creature_choking.mp3 mco_liquid_squirt.mp3
-+mon_drool =
- 
- # Attack - spit
--mon_spit = mco_attack_spray.mp3
-+mon_spit =
- 
- # Attack - gaze
--mon_gaze = mco_thoing_backwards.mp3
-+mon_gaze =
- 
- # Attack - wail
--mon_wail = mco_dino_low.mp3
-+mon_wail =
- 
- # Attack - release spores
--mon_spore = mco_dub_wobble.mp3 mco_spray_long.mp3
-+mon_spore =
- 
- # Attack - beg for money
--mon_beg = mco_man_mumble.mp3
-+mon_beg =
- 
- # Attack - insult
--mon_insult = mco_strange_thwoink.mp3
-+mon_insult =
- 
- # Attack - moan
--mon_moan = mco_strange_music.mp3
-+mon_moan =
- 
- # Attack - shriek
--mon_shriek = mco_mouse_squeaks.mp3
-+mon_shriek =
- 
- # Spell - create traps
--mon_create_trap = mco_thoing_deep.mp3
-+mon_create_trap =
- 
- # Spell - cause fear
--mon_cast_fear = mco_creature_groan.mp3 mco_dino_slur.mp3
-+mon_cast_fear =
- 
- # Multiply (breed explosively)
--multiply = mco_frog_trill.mp3
-+multiply =
- 
- #
- # Summons
- #
- 
- # Summon one or more monsters.
--summon_monster = sum_chime_jangle.mp3
-+summon_monster =
- 
- # Summon angels.
--summon_ainu = sum_angel_song.mp3
-+summon_ainu =
- 
- # Summon undead.
--summon_undead = sum_ghost_oooo.mp3
-+summon_undead =
- 
- # Summon animals.
--summon_animal = sum_lion_growl.mp3
-+summon_animal =
- 
- # Summon spiders.
--summon_spider = sum_piano_scrape.mp3
-+summon_spider =
- 
- # Summon hounds.
--summon_hound = sum_lion_growl.mp3
-+summon_hound =
- 
- # Summon hydras.
--summon_hydra = sum_piano_scrape.mp3
-+summon_hydra =
- 
- # Summon demons.
--summon_demon = sum_ghost_wail.mp3 sum_laugh_evil2.mp3
-+summon_demon =
- 
- # Summon dragon.
--summon_dragon = sum_piano_scrape.mp3
-+summon_dragon =
- 
- # Summon greater undead.
--summon_gr_undead = sum_ghost_moan.mp3
-+summon_gr_undead =
- 
- # Summon greater dragons.
--summon_gr_dragon = sum_gong_temple.mp3
-+summon_gr_dragon =
- 
- # Summon greater demons.
--summon_gr_demon = sum_ghost_moan.mp3
-+summon_gr_demon =
- 
- # Summon Ringwraiths.
--summon_ringwraith = sum_bell_hand.mp3
-+summon_ringwraith =
- 
- # Summon uniques.
--summon_unique = sum_bell_tone.mp3
-+summon_unique =
- 
- #
- # Breath weapons
- #
- 
- # Breathe frost.
--breathe_frost = mco_attack_breath.mp3
-+breathe_frost =
- 
- # Breathe electricity.
--breathe_elec = mco_attack_breath.mp3 
-+breathe_elec =
- 
- # Breathe acid.
--breathe_acid = mco_attack_breath.mp3  
-+breathe_acid =
- 
- # Breathe gas.
--breathe_gas = mco_attack_breath.mp3  
-+breathe_gas =
- 
- # Breathe fire.
--breathe_fire = mco_attack_breath.mp3  
-+breathe_fire =
- 
- # Breathe confusion.
--breathe_confusion = mco_attack_breath.mp3  
-+breathe_confusion =
- 
- # Breathe disenchantment.
--breathe_disenchant = mco_attack_breath.mp3  
-+breathe_disenchant =
- 
- # Breathe chaos.
--breathe_chaos = mco_attack_breath.mp3  
-+breathe_chaos =
- 
- # Breathe shards.
--breathe_shards = mco_attack_breath.mp3  
-+breathe_shards =
- 
- # Breathe sound.
--breathe_sound = mco_attack_breath.mp3  
-+breathe_sound =
- 
- # Breathe light.
--breathe_light = mco_attack_breath.mp3  
-+breathe_light =
- 
- # Breathe darkness.
--breathe_dark = mco_attack_breath.mp3  
-+breathe_dark =
- 
- # Breathe nether.
--breathe_nether = mco_attack_breath.mp3  
-+breathe_nether =
- 
- # Breathe nexus.
--breathe_nexus = mco_attack_breath.mp3  
-+breathe_nexus =
- 
- # Breathe time.
--breathe_time = mco_attack_breath.mp3  
-+breathe_time =
- 
- # Breathe inertia.
--breathe_inertia = mco_attack_breath.mp3  
-+breathe_inertia =
- 
- # Breathe gravity.
--breathe_gravity = mco_attack_breath.mp3  
-+breathe_gravity =
- 
- # Breathe plasma.
--breathe_plasma = mco_attack_breath.mp3  
-+breathe_plasma =
- 
- # Breathe force.
--breathe_force = mco_attack_breath.mp3  
-+breathe_force =
- 
- # Breathe the elements (power dragon scale mail).
--breathe_elements = mco_attack_breath.mp3  
-+breathe_elements =
- 
- #
- # Identifying Items
- #
- 
- # Identify a bad item (including bad ego items and artifacts).
--identify_bad = id_bad_aww.mp3 id_bad_dang.mp3 id_bad_hmm.mp3 id_bad_hmph.mp3 id_bad_ohh.mp3
-+identify_bad =
- 
- # Identify a good ego item.
--identify_ego = id_ego_whoa.mp3 id_ego_woohoo.mp3 id_ego_yeah.mp3 id_ego_yeah2.mp3 id_ego_yes.mp3
-+identify_ego =
- 
- # Identify a good artifact.
--identify_art = id_good_hey.mp3 id_good_hey2.mp3 id_good_hmm.mp3 id_good_huh.mp3 id_good_ooh.mp3 id_good_ooo.mp3 id_good_wow.mp3
-+identify_art =
- 
diff --git a/libre/arora-libre/PKGBUILD b/libre/arora-libre/PKGBUILD
deleted file mode 100644
index 0b9aa4f4c..000000000
--- a/libre/arora-libre/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 188496 2013-06-15 04:38:11Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=arora
-pkgname=arora-libre
-pkgver=0.11.0
-pkgrel=4
-pkgdesc='Lightweight cross-platform Web browser, without nonfree flash recommendation and non-privacy search providers'
-url='http://code.google.com/p/arora/'
-license=('GPL')
-arch=('i686' 'x86_64' 'mips64el')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-depends=('qtwebkit' 'desktop-file-utils')
-source=("http://${_pkgname}.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz"
-        'searchengines.qrc'
-        'libre.patch'
-        'duckduckgo-html.xml'
-        'seeks-search.xml'
-        'wikipedia-en.xml'
-        'yacy.xml')
-sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31'
-          'd64bdfe9022f8b4b0745a0d9cc1094ee80bbc897'
-          '3982032d669077644d485f4d04d4ae4891bdb0e3'
-          'e96f2d92b24daad0cfa28d02a003b92042651de0'
-          '07bc208fbc3bf3d08192b2c07e550525953fc0b2'
-          '3eea200350f7436bb2d744f8b6af1b5bbb758e51'
-          '2d515947a8cbeea831490727e88c89ebee17c313')
-
-install=install
-
-prepare() {
-        cd "${srcdir}/${_pkgname}-${pkgver}"
-        # remove non-privacy search providers
-        rm -r src/data/searchengines/*
-        install -m644 $srcdir/searchengines.qrc src/data/searchengines
-        install -m644 "$srcdir/"{duckduckgo-html,seeks-search,wikipedia-en,yacy}.xml src/data/searchengines    
-        # remove nonfree flash recommendation
-        patch -Np1 -i $srcdir/libre.patch
-        sed -i '\|Flash|d' src/settings.cpp
-}
-
-build() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
-	qmake-qt4 PREFIX='/usr' 'CONFIG-=debug' -r
-	make
-}
-
-package() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
-	make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/libre/arora-libre/duckduckgo-html.xml b/libre/arora-libre/duckduckgo-html.xml
deleted file mode 100644
index 9b979fa31..000000000
--- a/libre/arora-libre/duckduckgo-html.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-    <ShortName>DuckDuckGo HTML</ShortName>
-    <Description>Search DuckDuckGo HTML</Description>
-    <InputEncoding>UTF-8</InputEncoding>
-    <Image width="16" height="16">http://duckduckgo.com/favicon.ico</Image>
-    <Url type="text/html" template="https://duckduckgo.com/html/?q={searchTerms}"/>
-</OpenSearchDescription>
diff --git a/libre/arora-libre/install b/libre/arora-libre/install
deleted file mode 100644
index b0409600c..000000000
--- a/libre/arora-libre/install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null || true
-	update-desktop-database -q || true
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/libre/arora-libre/libre.patch b/libre/arora-libre/libre.patch
deleted file mode 100644
index 6bb6c6b43..000000000
--- a/libre/arora-libre/libre.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/settings.ui b/src/settings.ui
-index 7d4f66e..758beb3 100644
---- a/src/settings.ui
-+++ b/src/settings.ui
-@@ -413,25 +413,6 @@
-             </property>
-            </spacer>
-           </item>
--          <item row="2" column="1">
--           <widget class="QCheckBox" name="clickToFlash">
--            <property name="sizePolicy">
--             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
--              <horstretch>0</horstretch>
--              <verstretch>0</verstretch>
--             </sizepolicy>
--            </property>
--            <property name="toolTip">
--             <string>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </string>
--            </property>
--            <property name="text">
--             <string>Use ClickToFlash on flash plugins</string>
--            </property>
--            <property name="checked">
--             <bool>true</bool>
--            </property>
--           </widget>
--          </item>
-           <item row="3" column="0" colspan="2">
-            <widget class="QCheckBox" name="enableJavascript">
-             <property name="text">
diff --git a/libre/arora-libre/searchengines.qrc b/libre/arora-libre/searchengines.qrc
deleted file mode 100644
index 93cd9b80d..000000000
--- a/libre/arora-libre/searchengines.qrc
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/searchengines">
-    <file>duckduckgo-html.xml</file>
-    <file>seeks-search.xml</file>
-    <file>wikipedia-en.xml</file>
-    <file>yacy.xml</file>
-</qresource>
-</RCC>
diff --git a/libre/arora-libre/seeks-search.xml b/libre/arora-libre/seeks-search.xml
deleted file mode 100644
index f79d87047..000000000
--- a/libre/arora-libre/seeks-search.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-    <ShortName>Seeks Search</ShortName>
-    <Tags>Seeks</Tags>
-    <Description>Real-time p2p pattern matching network for social websearch.</Description>
-    <Contact>ebenazer@seeks-project.info</Contact>
-    <InputEncoding>UTF-8</InputEncoding>
-    <SyndicationRight>open</SyndicationRight>
-    <Image width="16" height="16" type="image/png">http://www.seeks.fr/public/images/seek_icon_16x16_transparent.png</Image>
-    <Url type="text/html" template="http://www.seeks.fr/search/txt/{searchTerms}"/>
-</OpenSearchDescription>
diff --git a/libre/arora-libre/wikipedia-en.xml b/libre/arora-libre/wikipedia-en.xml
deleted file mode 100644
index ea590759f..000000000
--- a/libre/arora-libre/wikipedia-en.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0"?><OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/"><ShortName>Wikipedia (en)</ShortName><Description>Wikipedia (en)</Description><Image height="16" width="16" type="image/x-icon">http://bits.wikimedia.org/favicon/wikipedia.ico</Image><Url type="text/html" method="get" template="http://en.wikipedia.org/w/index.php?title=Special:Search&amp;search={searchTerms}" /><Url type="application/x-suggestions+json" method="get" template="http://en.wikipedia.org/w/api.php?action=opensearch&amp;search={searchTerms}&amp;namespace=0" /><Url type="application/x-suggestions+xml" method="get" template="http://en.wikipedia.org/w/api.php?action=opensearch&amp;format=xml&amp;search={searchTerms}&amp;namespace=0" /><moz:SearchForm>http://en.wikipedia.org/wiki/Special:Search</moz:SearchForm></OpenSearchDescription>
\ No newline at end of file
diff --git a/libre/arora-libre/yacy.xml b/libre/arora-libre/yacy.xml
deleted file mode 100644
index 9c97f16cc..000000000
--- a/libre/arora-libre/yacy.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OpenSearchDescription
-    xmlns="http://a9.com/-/spec/opensearch/1.1/"
-    xmlns:suggestions="http://www.opensearch.org/specifications/opensearch/extensions/suggestions/1.1">
-  <ShortName>YaCy</ShortName>
-  <LongName>YaCy.net - P2P Web Search</LongName>
-  <Image type="image/gif">http://search.ipredator.se/env/grafics/yacy.png</Image>
-  <Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAAAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////Chiu+fBm+fRq+fRq+fRq+fRq+fRq8ehXMmk////////////////////////////++exjUqGfZsnjYsXbYsXbYsXbZsnjTp2W+fBr///////////////////////////+9exfs2r/69/L58+z58+z58+z59e/z59bChSn///////////////////////////+9fBnnz638+fX69O369e748un38Ob59O3Ll0fVrGz////////////////////////Jk0HJlUjXuYrWt4jVtYPr28T58+r59OzPn1fPnlX////////////////////////Rolu8eRXCiTPEjTvCijbNnlj169359e7Zs3vLlkf////////////////////////UqmrAgSLt3MP27eH1693169327+T59Ozo0rG/gB////////////////////////////+/gCDv4Mn48+v38Of59Oz58+v48+vr2b2+fRv///////////////////////////+9ehXr17n58+z48ejo0bDp07T48+zx49DBhCj///////////////////////////+/fhzjyJ/59Oz59OzQoVvNmU759Oz58+vKlUbXrnH////////////////////////LlkfUqmn59Oz48+vZtHzNm1D48+v59OzPoFjOnlX////////////////////////OnVPOnFL59e348+vq1rnEiC7u38j69vDXsHTIkT3////////////////////////UqWjIkD327+T58+3s2bzAgSLp07T79/Pmzqq+fBn///////////////////////////+/fx7v4Mr7+PTx5NDHkD3kyqP8+vjs2r+9exf///////////////////////////++fBjQoFnVq2zTp2bGjTjJk0LWrW7SpWC+exf////////////////////////////Nm1C6dQy7eBG8eBK9exe8ehS7dxC6dQzLlkj////////////AH///wB8x+sAf///AD/+PwA///8AP///AD///4A9PU+APoz/gB///4AdxvOAHoz/gB3368AfjU/AHT1PwB/+P
-</Image>
-  <Language>en-us</Language>
-  <OutputEncoding>UTF-8</OutputEncoding>
-  <InputEncoding>UTF-8</InputEncoding>
-  <AdultContent>true</AdultContent>
-  <Description>YaCy is an open-source GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer '_anonufe-29422893-0'.</Description>
-  
-  <Url type="text/html" method="GET" template="http://search.ipredator.se/yacysearch.html?query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;nav=all" />
-  <Url type="application/rss+xml" method="GET" template="http://search.ipredator.se/yacysearch.rss?nav=&amp;query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;verify=false" />
-  
-  <Url type="application/x-suggestions+json" template="http://search.ipredator.se/suggest.json?query={searchTerms}"/>
-  <Url type="application/x-suggestions+xml" template="http://search.ipredator.se/suggest.xml?query={searchTerms}"/>
-  <!-- syntax according to http://www.loc.gov/standards/sru/. Set verify=true to get snippets in the search results -->
-  <Developer>See https://gitorious.org/+yacy-developers</Developer>
-  <Query role="example" searchTerms="yacy+open+source" />
-  <Tags>YaCy Open Source P2P Web Search</Tags>
-  <Contact>See http://search.ipredator.se/ViewProfile.html?hash=localhash</Contact>
-  <Attribution>YaCy Software &amp;copy; 2004-2012 by Michael Christen et al., YaCy.net; Content: ask peer owner</Attribution>
-  <SyndicationRight>open</SyndicationRight>
-</OpenSearchDescription>
diff --git a/libre/ath9k-htc-firmware/LICENSE b/libre/ath9k-htc-firmware/LICENSE
deleted file mode 100644
index 7668bcb97..000000000
--- a/libre/ath9k-htc-firmware/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-Copyright (c) 2013 Qualcomm Atheros, Inc.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted (subject to the limitations in the
-disclaimer below) provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the
-   distribution.
-
- * Neither the name of Qualcomm Atheros nor the names of its
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
-
-NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
-GRANTED BY THIS LICENSE.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
-HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libre/ath9k-htc-firmware/PKGBUILD b/libre/ath9k-htc-firmware/PKGBUILD
deleted file mode 100644
index 172cb97b3..000000000
--- a/libre/ath9k-htc-firmware/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=ath9k-htc-firmware
-pkgver=1.3.2
-pkgrel=3
-pkgdesc='Free firmware files for the Qualcomm Atheros AR7010 and AR9271 USB 802.11n NICs'
-arch=('any')
-url=('http://wireless.kernel.org/en/users/Drivers/ath9k_htc')
-license=('BSD')
-makedepends=('cmake' 'xtensa-unknown-elf-binutils' 'xtensa-unknown-elf-gcc')
-source=("https://github.com/qca/open-ath9k-htc-firmware/archive/$pkgver.tar.gz"
-        'LICENSE')
-md5sums=('73c66751151dd47535cb4142477da480'
-         '5163b2711bc481c77045850610b7dd31')
-
-prepare() {
-
-  cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware
-  mkdir -p build/{k2,magpie}
-
-}
-
-build() {
-
-  cd $srcdir/open-ath9k-htc-firmware-$pkgver
-
-  export CTARGET="xtensa-unknown-elf"
-  export CFLAGS="-mtext-section-literals -O2 -pipe --param=ssp-buffer-size=4"
-  export CXXFLAGS="${CFLAGS}"
-
-  cat > target_firmware/build/toolchain.cmake <<EOF
-INCLUDE(CMakeForceCompiler)
-
-SET(CMAKE_SYSTEM_PROCESSOR xtensa)
-SET(COMPILER_PREFIX "xtensa-unknown-elf")
-SET(CMAKE_FIND_ROOT_PATH /usr/xtensa-unknown-elf)
-
-CMAKE_FORCE_C_COMPILER(/usr/bin/xtensa-unknown-elf-gcc GNU)
-EOF
-
-  cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/k2
-
-  cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/toolchain.cmake "$@" -DTARGET_K2=ON ../..
-  cd -
-
-  cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/magpie
-
-  cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/toolchain.cmake "$@" -DTARGET_MAGPIE=ON ../..
-  cd -
-
-  cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware
-
-  make -C build/k2
-  make -C build/magpie
-
-}
-
-package() {
-
-  # create firmware folder to put the free firmware files there
-  install -d -m755 $pkgdir/usr/lib/firmware
-
-  cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware
-
-  # move firmware files to firmware folder
-  cp build/{k2,magpie}/htc_*.fw $pkgdir/usr/lib/firmware
-
-  # create license folder to put the license file there
-  install -d -m755 $pkgdir/usr/share/licenses/$pkgname
-
-  # put LICENSE to license folder
-  install -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname
-  
-}
diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD
deleted file mode 100644
index 4ac426440..000000000
--- a/libre/atool-libre/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: leif_thande <leif.thande@gmail.com>
-# 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@parabola.nu>
-
-_pkgname=atool
-pkgname=atool-libre
-pkgver=0.39.0
-pkgrel=1.2
-pkgdesc="A script for managing file archives of various types, with unar support included and nonfree unace recommendation removed"
-arch=('any')
-url="http://www.nongnu.org/atool/"
-license=('GPL3')
-depends=('file' 'perl')
-provides=("$_pkgname=$pkgver")
-replaces=("$_pkgname")
-conflicts=("$_pkgname")
-optdepends=('bzip2: for using atool with bzip2 compressed archives'
-            'cpio: for using atool with cpio archives'
-            'gzip: for using atool with gzip compressed archives'
-            'lha: for using atool with lha, lharc and similar archives'
-            'xz: for using atool with lzma compressed archives'
-            'lzop: for using atool with lzop compressed archives'
-            'p7zip: for using atool with 7z archives'
-            'tar: for using atool with tar archives'
-            'unar: for using atool for unpacking rar archives'
-            'zip: for using atool for creating zip archives'
-            'unzip: for using atool for unpacking zip archives')
-
-source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz)
-sha256sums=('aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b')
-
-prepare() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-
-  # replace nonfree unrar to unar
-  sed -i 's|unrar|unar|g' $(grep -rlI 'unrar')
-}
-
-build() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-
-  ./configure --prefix=/usr
-}
-
-package() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-
-  make prefix=${pkgdir}/usr install
-}
diff --git a/libre/atool-libre/atool.changelog b/libre/atool-libre/atool.changelog
deleted file mode 100644
index ce0b12c2b..000000000
--- a/libre/atool-libre/atool.changelog
+++ /dev/null
@@ -1,18 +0,0 @@
-2012-04-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* atool 0.39.0-1
-
-2012-02-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* atool 0.38.0-2
-	* signing package
-
-2011-08-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Updated to major version 0.38.0
-
-2009-08-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Updated to major version 0.37.0
-
-2008-10-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Updated to major version 0.36.0
-
-2008-10-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Moved to [community] repo
diff --git a/libre/atool-libre/rePKGBUILD b/libre/atool-libre/rePKGBUILD
deleted file mode 100644
index e684320d0..000000000
--- a/libre/atool-libre/rePKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
-source PKGBUILD
-unset build package md5sums source
-CARCH=any
-PKGEXT=.pkg.tar.gz
-_repo=community       # Put the repo here
-_mirror=http://mirrors.kernel.org/archlinux  # Put mirror here
-source=(PKGBUILD
-        "${_mirror}/${_repo}/os/i686/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT"
-        # files for pkg modifications below this line
-        )
-options=(!strip)
-
-build() {
-  cd "${srcdir}/"
-  rm .{INSTALL,PKGINFO} || true
-  # put actions for package modifications below this line
-
-}
-
-package() {
-  find ${srcdir} -maxdepth 1 -type l -delete
-  cp -a ${srcdir}/* ${pkgdir}
-}
-
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index d1fb5b9a4..cdab5fc4c 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198672 2013-11-01 21:09:24Z bisson $
+# $Id: PKGBUILD 204037 2014-01-14 11:53:55Z jgc $
 # 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.2
-pkgrel=1
+pkgver=3.4.3
+pkgrel=2
 pkgdesc='Plugins for Audacious, without nonfree plugins'
 url='http://audacious-media-player.org/'
 license=('GPL' 'GPL3' 'LGPL' 'custom:BSD')
@@ -19,8 +19,8 @@ arch=('i686' 'x86_64' 'mips64el')
 # The plugins 'scrobbler', stereoplugin', 'wavepack' and 'plugin_echo' have no license notice
 # but I've been informed by an upstream dev, nenolod, that they are all GPL. I don't know what version
 #
-# The plugin 'psf' is currently (Nov 2011) BSD+noncommercial, but is apparently being changed to GPL.
-# However, 'psf' is apparently an emulator for running non-free code, so I'm not rushing to fix it.
+# The plugin 'psf' is under BSD license, mostly, but it uses code from PeOPS, so it's probably GPL.
+# However, 'psf' is apparently an emulator for running nonfree code, so I'm not rushing to fix it.
 #
 # All the other custom licensed plugins I think are mostly modified BSD or ISC.
 
@@ -62,14 +62,15 @@ optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
             'libcue: CUE playlist format')
 
 source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a9e831f4fd4d4c4a1dab11b819fa5ac96ce9fad0')
+sha1sums=('bcccd4304692a62d1b7963322f64059a0fb9532a')
 
 prepare() {
-	# Retrieve upstream & remove plugin 'psf' due to issues mentioned above.
-	sed -i s/enable_psf=yes/enable_psf=no/ ${_pkgname}-$pkgver/configure
-
 	cd "${srcdir}/${_pkgname}-${pkgver}"
 
+        # Retrieve upstream & remove plugin 'psf' due to issues mentioned above.
+        rm -rv src/psf
+        sed -i s/enable_psf=yes/enable_psf=no/ configure
+
 	# Get license notices out of custom-licensed packages
 	cd src
 	tmpdir=$(mktemp -d /tmp/${_pkgname}-${pkgver}-XXXX)
diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD
deleted file mode 100644
index 9fd861764..000000000
--- a/libre/audacity-libre/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 153455 2012-03-14 17:15:15Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=audacity
-pkgname=audacity-libre
-pkgver=2.0.0
-pkgrel=1
-pkgdesc="A program that lets you manipulate digital audio waveforms, libre"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://audacity.sourceforge.net/"
-license=('GPL')
-depends=('libmad' 'libid3tag' 'wxgtk' 'lame-libre' 'hicolor-icon-theme'
-	 'desktop-file-utils' 'jack' 'soundtouch' 'ffmpeg')
-options=('!makeflags')
-install=audacity-libre.install
-source=(http://audacity.googlecode.com/files/${_pkgname}-minsrc-${pkgver}.tar.bz2
-	remove-unfree-nyquist.patch
-	audacity-libre.install)
-sha1sums=('0175474e63c51aaa97df9b45574f7f307f1d3bc8'
-          'cda4587458aecf15c41102f86c3b466f80acd0f3'
-          '59e511af919f62b07dd62bab251c56bef6344d70')
-provides=("audacity=$pkgver")
-replaces=('audacity')
-conflicts=('audacity')
-
-build() {
-  cd "${srcdir}/${_pkgname}-src-${pkgver}"
-
-# Removing nyquist
-        rm -rfv {,lib-src/lib}nyquist
-        find -iname '*nyquist*' -print0 | xargs -0 \
-            rm -rfv 
-        patch -Np0 -i ../remove-unfree-nyquist.patch || return 1
-
-  WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \
-    --with-portaudio --with-libsamplerate \
-    --without-libresample --with-libmad \
-    --with-ffmpeg --with-id3tag --with-libflac \
-    --with-vorbis --with-libexpat \
-    --with-libsndfile --with-soundtouch \
-    --enable-unicode --without-taglib \
-    --disable-nyquist #unfree
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}-src-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/libre/audacity-libre/audacity-libre.install b/libre/audacity-libre/audacity-libre.install
deleted file mode 100644
index 028c9f62a..000000000
--- a/libre/audacity-libre/audacity-libre.install
+++ /dev/null
@@ -1,13 +0,0 @@
-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/libre/audacity-libre/remove-unfree-nyquist.patch b/libre/audacity-libre/remove-unfree-nyquist.patch
deleted file mode 100644
index b2f9f31e3..000000000
--- a/libre/audacity-libre/remove-unfree-nyquist.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.in.orig	2011-07-01 13:27:11.000000000 -0300
-+++ Makefile.in	2011-07-01 13:27:39.000000000 -0300
-@@ -41,12 +41,6 @@ install: audacity $(EXTRAINSTALLTARGETS)
- 		$(INSTALL) -m 644 help/audacity.1.gz \
- 		$(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1.gz
- 
--	# install nyquist
--	$(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist
--	$(INSTALL) -m 644 nyquist/*.lsp nyquist/nyquist-plot.txt $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist
--	$(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist/rawwaves
--	$(INSTALL) -m 644 nyquist/rawwaves/*.raw $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist/rawwaves
--
- 	# install plug-ins
- 	$(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/plug-ins
- 	$(INSTALL) -m 644 plug-ins/*.ny $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/plug-ins
-@@ -103,8 +97,6 @@ uninstall: $(EXTRAUNINSTALLTARGETS)
- 	rm -rf $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)
- 	# remove man page
- 	rm -rf $(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1.gz
--	# remove nyquist
--	rm -rf $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist
- 	# remove plug-ins
- 	rm -rf $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/plug-ins
- 	# remove locales
diff --git a/libre/audex-libre/PKGBUILD b/libre/audex-libre/PKGBUILD
deleted file mode 100644
index 06b130f2a..000000000
--- a/libre/audex-libre/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: mightyjaym <jmambrosino@gmail.com>
-# Contributor: moostik <mooostik_at_gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=audex
-pkgname=audex-libre
-pkgver=0.77b1
-pkgrel=1
-pkgdesc="A CDDA extraction tool with a ftp upload function for KDE (without nonfree faac recommendation)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://kde-apps.org/content/show.php?content=77125"
-license=('GPL')
-depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'cdparanoia')
-makedepends=('cmake' 'automoc4')
-optdepends=('vorbis-tools: OGG encoder'
-	'flac: FLAC encoder'
-	'lame: MP3 encoder')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-install=${_pkgname}.install
-#source=("ftp://ftp.archlinux.org/other/community/${_pkgname}/${_pkgname}-${pkgver}.tar.xz"
-source=("http://kde.maniatek.com/${_pkgname}/files/${_pkgname}-${pkgver}.tar.xz"
-        'gcc47.patch')
-md5sums=('1f3df64b60b15315e958e3e3b151fe92'
-         '64107bcf90e22910e57804be774822dd')
-
-build() {
-  cd ${_pkgname}-${pkgver}
-
-  patch -p1 -i "${srcdir}"/gcc47.patch
-  cd ..
-
-  mkdir build
-  cd build
-
-  cmake ../${_pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
-}
diff --git a/libre/audex-libre/audex.install b/libre/audex-libre/audex.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/libre/audex-libre/audex.install
+++ /dev/null
@@ -1,12 +0,0 @@
-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/libre/audex-libre/gcc47.patch b/libre/audex-libre/gcc47.patch
deleted file mode 100644
index 3d0ccf024..000000000
--- a/libre/audex-libre/gcc47.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- audex-0.74b1.orig/utils/hashlist.cpp
-+++ audex-0.74b1/utils/hashlist.cpp
-@@ -15,7 +15,8 @@
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-- 
-+
-+#include <unistd.h>
- #include "hashlist.h"
- 
- Hashlist::Hashlist() {
-
diff --git a/libre/audex-libre/google_regex.patch b/libre/audex-libre/google_regex.patch
deleted file mode 100644
index 86917e66f..000000000
--- a/libre/audex-libre/google_regex.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- audex-0.74b1/utils/coverfetcher.cpp	2011-01-15 12:06:25.000000000 +0100
-+++ audex-0.74b1/utils/coverfetcher_new.cpp	2011-07-20 18:43:37.554588883 +0200
-@@ -162,7 +162,10 @@
-   cover_tbnids.clear();
-   cover_thumbnails.clear();
- 
--  QRegExp rx("<a\\shref=(\\/imgres\\?imgurl=[a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+)>[\\s\\n]*<img\\ssrc=([a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+).*>[\\s\\n]*</a>");
-+  QRegExp rx("<a\\shref=\"(\\/imgres\\?imgurl=[^\"]+)\">[\\s\\n]*<img[^>]+src=\"([^>]+)\"></a>");
-+  QString html = xml;
-+  html.replace( QLatin1String("&amp;"), QLatin1String("&") );
-+
-   rx.setMinimal(TRUE);
-   
-   int pos = 0; int i = 0;
diff --git a/libre/audio-convert-libre/ChangeLog b/libre/audio-convert-libre/ChangeLog
deleted file mode 100644
index 0d8720f38..000000000
--- a/libre/audio-convert-libre/ChangeLog
+++ /dev/null
@@ -1,5 +0,0 @@
-2013-03-13 André Silva <emulatorman@parabola.nu>
-	* Remove nonfree faac recommendation
-
-2009-10-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* PKGBUILD syntax corrections
diff --git a/libre/audio-convert-libre/PKGBUILD b/libre/audio-convert-libre/PKGBUILD
deleted file mode 100644
index 0824a036c..000000000
--- a/libre/audio-convert-libre/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $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@parabola.nu>
-
-_pkgname=audio-convert
-pkgname=audio-convert-libre
-pkgver=0.3.1.1
-pkgrel=7
-pkgdesc="A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma, without nonfree faac recommendation"
-arch=('any')
-url="http://freshmeat.net/projects/audio-convert"
-license=('GPL')
-depends=('bash' 'zenity')
-optdepends=('faad2: for aac support'
-            'flac: for flac support'
-            'id3lib: for mp3 support'
-            'lame: for mp3 support'
-            'mplayer: for wma support'
-            'musepack-tools: for mpc support'
-            'vorbis-tools: for ogg support')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.bz2)
-sha256sums=('7b37d5fc2a4dd62885910b6424f5ff6870c329ed4f4f51feeeb952152c7d9d2b')
-
-package() {
-  install -D -m755 "$srcdir/$_pkgname-$pkgver/$_pkgname" "$pkgdir/usr/bin/$_pkgname"
-
-#FS#29260 fix
-  sed -i '46 s/^/#/' "$pkgdir/usr/bin/$_pkgname"
-}
diff --git a/libre/avidemux-libre/PKGBUILD b/libre/avidemux-libre/PKGBUILD
deleted file mode 100644
index 81585ce70..000000000
--- a/libre/avidemux-libre/PKGBUILD
+++ /dev/null
@@ -1,125 +0,0 @@
-# $Id: PKGBUILD 198769 2013-11-03 19:15:23Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgbase=avidemux
-pkgbase=avidemux-libre
-pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt')
-pkgver=2.5.6
-pkgrel=8
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://fixounet.free.fr/avidemux/"
-makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \
-             'alsa-lib' 'lame' 'xvidcore' 'faad2' 'x264' 'libsamplerate' \
-             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva')
-options=('!makeflags' '!emptydirs')
-source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
-sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5')
-
-build() {
-  cd ${_pkgbase}_${pkgver}
-  mkdir build
-  cd build
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release \
-    -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 \
-    -D LRELEASE_EXECUTABLE=/usr/lib/qt4/bin/lrelease ..
-  make
-
-# plugin build expects libraries to be already installed; we fake a prefix
-# in build/ by symlinking all libraries to build/lib/
-  cd lib
-  find ../avidemux -name '*.so*' | xargs ln -sft .
-  cd ../../plugins
-  mkdir build
-  cd build
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \
-    -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \
-    -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \
-    -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON ..
-  make
-}
-
-package_avidemux-libre-cli() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support"
-  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva')
-  optdepends=('lame: for the corresponding audio encoder plugin'
-              'faad2: for the corresponding audio decoder plugin'
-              'opencore-amr: for the corresponding audio decoder plugin'
-              'jack: for the corresponding audio device plugin'
-              'libpulse: for the corresponding audio device plugin'
-              'sdl: for the corresponding audio device plugin'
-              'x264: for the corresponding video encoder plugin'
-              'xvidcore: for the corresponding video encoder plugin')
-  provides=('avidemux' 'avidemux-cli')
-  conflicts=('avidemux' 'avidemux-cli')
-  replaces=('avidemux' "avidemux-cli=$pkgver")
-
-  cd ${_pkgbase}_${pkgver}/build
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/${_pkgbase}_${pkgver}/plugins/build"
-  make DESTDIR="${pkgdir}" install
-  rm -r "${pkgdir}"/usr/share/avidemux
-  rm "${pkgdir}"/usr/share/ADM_addons/avsfilter/{avsload.exe,pipe_source.dll}
-  rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4}
-  rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so
-
-  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so"
-  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so"
-
-  install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
-  install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
-}
-
-package_avidemux-libre-gtk() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI, without nonfree faac support"
-  depends=("avidemux-libre-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils')
-  replaces=('avidemux-gtk')
-  conflicts=('avidemux-gtk')
-  provides=("avidemux-gtk=$pkgver")
-  install=avidemux.install
-
-  cd ${_pkgbase}_${pkgver}
-  install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk"
-
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
-
-  install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
-  install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
-
-  install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-  sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-}
-
-package_avidemux-libre-qt() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - Qt GUI, without nonfree faac support"
-  depends=("avidemux-libre-cli=${pkgver}" 'qt4')
-  replaces=('avidemux-qt')
-  conflicts=('avidemux-qt')
-  provides=("avidemux-qt=$pkgver")
-  install=avidemux.install
-
-  cd ${_pkgbase}_${pkgver}
-  install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4"
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
-
-  install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
-  install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
-
-  install -d "${pkgdir}/usr/share/avidemux/i18n"
-  install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n"
-
-  install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-  sed -i 's/Name=avidemux2/Name=avidemux (Qt)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-  sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-}
diff --git a/libre/avidemux-libre/PKGBUILD.WIP b/libre/avidemux-libre/PKGBUILD.WIP
deleted file mode 100644
index 5496ecffb..000000000
--- a/libre/avidemux-libre/PKGBUILD.WIP
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgbase=avidemux
-pkgbase=avidemux-libre
-pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt')
-pkgver=2.6.6
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://fixounet.free.fr/avidemux/"
-makedepends=('cmake' 'libxslt' 'gtk3' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \
-             'alsa-lib' 'lame' 'xvidcore' 'faad2' 'x264' 'libsamplerate' \
-             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva' \
-             'libvdpau' 'libdca' 'fribidi' 'glu')
-options=('!makeflags' '!emptydirs')
-source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
-sha1sums=('83ebf551746aac251d6e69feac5858cd0a307743')
-#source=(http://www.avidemux.org/nightly/snapshot/source_r8810.tar.gz)
-#sha1sums=('8c27d54e2b0655a8b8a3adfde1c0308ffedfec0c')
-
-prepare() {
-#  mv 2.6_snapshot ${_pkgbase}_${pkgver}
-  cd ${_pkgbase}_${pkgver}
-  sed -i 's|avidemux2|avidemux3|' avidemux2.desktop
-  sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt4|' bootStrap.bash
-  sed -i 's|#include "ADM_files.h"|#include "ADM_files.h"\n#include "ADM_toolkitGtk.h"|' avidemux/gtk/ADM_userInterfaces/ui_support.cpp
-}
-
-build() {
-  cd ${_pkgbase}_${pkgver}
-  bash bootStrap.bash --with-core --with-cli --with-gtk --with-qt4 --with-plugins
-}
-
-package_avidemux-libre-cli() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support"
-  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva')
-  optdepends=('lame: for the corresponding audio encoder plugin'
-              'faad2: for the corresponding audio decoder plugin'
-              'opencore-amr: for the corresponding audio decoder plugin'
-              'jack: for the corresponding audio device plugin'
-              'libpulse: for the corresponding audio device plugin'
-              'sdl: for the corresponding audio device plugin'
-              'x264: for the corresponding video encoder plugin'
-              'xvidcore: for the corresponding video encoder plugin'
-              'qt4: for the QtScript scripting support'
-              'libdca: for the corresponding audio decoder plugin'
-              'fribidi: for the corresponding video filter plugin')
-  provides=('avidemux' 'avidemux-cli')
-  conflicts=('avidemux' 'avidemux-cli')
-  replaces=('avidemux' "avidemux-cli=$pkgver")
-
-  cd ${_pkgbase}_${pkgver}
-  (cd buildCli; make DESTDIR="${pkgdir}" install)
-  (cd buildCore; make DESTDIR="${pkgdir}" install)
-  (cd buildPluginsCLI; make DESTDIR="${pkgdir}" install)
-  (cd buildPluginsCommon; make DESTDIR="${pkgdir}" install)
-
-  install -D -m644 avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
-  install -D -m644 man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
-}
-
-package_avidemux-libre-gtk() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI, without nonfree faac support"
-  depends=("avidemux-libre-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils')
-  replaces=('avidemux-gtk')
-  conflicts=('avidemux-gtk')
-  provides=("avidemux-gtk=$pkgver")
-  install=avidemux.install
-
-  cd ${_pkgbase}_${pkgver}
-  (cd buildGtk; make DESTDIR="${pkgdir}" install)
-  (cd buildPluginsGtk; make DESTDIR="${pkgdir}" install)
-  install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-
-  rm "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so"
-}
-
-package_avidemux-libre-qt() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - Qt GUI, without nonfree faac support"
-  depends=("avidemux-libre-cli=${pkgver}" 'qt4' 'x264' 'glu')
-  replaces=('avidemux-qt')
-  conflicts=('avidemux-qt')
-  provides=("avidemux-qt=$pkgver")
-  install=avidemux.install
-
-  cd ${_pkgbase}_${pkgver}
-  (cd buildQt4; make DESTDIR="${pkgdir}" install)
-  (cd buildPluginsQt4; make DESTDIR="${pkgdir}" install)
-
-  install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-  sed -i 's|gtk|qt4|' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-}
diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index f4342a06d..745c3fce3 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102833 2013-12-21 18:31:51Z tpowa $
+# $Id: PKGBUILD 104385 2014-01-19 20:27:05Z tpowa $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: M0Rf30
 # Contributor: Samsagax <samsagax@gmail.com>
@@ -8,7 +8,7 @@ _pkgname=bbswitch
 pkgname=bbswitch-libre
 pkgver=0.8
 _extramodules=extramodules-3.12-LIBRE # Don't forget to update bbswitch.install
-pkgrel=3
+pkgrel=5
 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/bbswitch-libre/bbswitch.install b/libre/bbswitch-libre/bbswitch.install
deleted file mode 100644
index 02ea911ab..000000000
--- a/libre/bbswitch-libre/bbswitch.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-3.12-LIBRE'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD
deleted file mode 100644
index eb98f4aa9..000000000
--- a/libre/bfgminer-libre/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 103233 2013-12-30 17:04:09Z tredaelli $
-# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
-# Contributor: Andy Weidenbaum <archbaum@gmail.com>
-
-_pkgname=bfgminer
-pkgname=bfgminer-libre
-pkgver=3.9.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' 'libevent' 'libmicrohttpd' 'libusbx' 'lm_sensors')
-makedepends=('uthash' 'yasm')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-url='https://bitcointalk.org/index.php?topic=168174.0'
-license=('GPL3')
-source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2
-        remove-dangerous-rpath.patch)
-sha256sums=('4250ec5ccb0fd9bd8c6d35608b13b3e2f07857e46abc09b94514a2fd2af80f40'
-            'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c')
-
-prepare() {
-  cd "$srcdir"/$_pkgname-$pkgver
-
-  patch -p0 < "${srcdir}"/remove-dangerous-rpath.patch
-  NOSUBMODULES=1 ./autogen.sh
-}
-
-build() {
-  cd "$srcdir"/$_pkgname-$pkgver
-
-  ./configure	--prefix=/usr \
-	  	--enable-cpumining \
-		--enable-bfsb \
-		--enable-metabank \
-  		--enable-scrypt \
-		--enable-opencl \
-		--with-udevrulesdir=/usr/lib/udev/rules.d
-  # --enable-knc (FS#33640)
-  make
-}
-
-package() {
-  cd "$srcdir"/$_pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/libre/bfgminer-libre/change-kernel-path.patch b/libre/bfgminer-libre/change-kernel-path.patch
deleted file mode 100644
index 9dd124ab4..000000000
--- a/libre/bfgminer-libre/change-kernel-path.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- /dev/null
-+++ m4/as-ac-expand.m4
-@@ -0,0 +1,49 @@
-+dnl as-ac-expand.m4 0.2.1
-+dnl autostars m4 macro for expanding directories using configure's prefix
-+dnl thomas@apestaart.org
-+
-+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
-+dnl example
-+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-+dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
-+dnl Note: when using $prefix or $exec_prefix, avoid it expanding to NONE
-+dnl by calling it like this:
-+dnl AS_AC_EXPAND(PYTHONLIBDIR, "\${exec_prefix}/lib/python$PYVER/site-packages")
-+
-+AC_DEFUN([AS_AC_EXPAND],
-+[
-+  EXP_VAR=[$1]
-+  FROM_VAR=[$2]
-+
-+  dnl echo DEBUG: expand FROM_VAR $FROM_VAR
-+
-+  dnl first expand prefix and exec_prefix if necessary
-+  prefix_save=$prefix
-+  exec_prefix_save=$exec_prefix
-+
-+  dnl if no prefix given, then use /usr/local, the default prefix
-+  if test "x$prefix" = "xNONE"; then
-+    prefix="$ac_default_prefix"
-+  fi
-+  dnl if no exec_prefix given, then use prefix
-+  if test "x$exec_prefix" = "xNONE"; then
-+    exec_prefix=$prefix
-+  fi
-+
-+  full_var="$FROM_VAR"
-+  dnl loop until it doesn't change anymore
-+  while true; do
-+    dnl echo DEBUG: full_var: $full_var
-+    new_full_var="`eval echo $full_var`"
-+    if test "x$new_full_var" = "x$full_var"; then break; fi
-+    full_var=$new_full_var
-+  done
-+
-+  dnl clean up
-+  full_var=$new_full_var
-+  AC_SUBST([$1], "$full_var")
-+
-+  dnl restore prefix and exec_prefix
-+  prefix=$prefix_save
-+  exec_prefix=$exec_prefix_save
-+])
---- configure.ac.orig
-+++ configure.ac
-@@ -655,7 +655,8 @@
- 	prefix=/usr/local
- fi
- 
--AC_DEFINE_UNQUOTED([CGMINER_PREFIX], ["$prefix/bin"], [Path to bfgminer install])
-+AS_AC_EXPAND(DATAROOTDIR, $datarootdir)
-+AC_DEFINE_UNQUOTED([CGMINER_PREFIX], ["$DATAROOTDIR/bfgminer"], [Path to bfgminer install])
- 
- AC_DEFINE_UNQUOTED([PHATK_KERNNAME], ["phatk121016"], [Filename for phatk kernel])
- AC_DEFINE_UNQUOTED([POCLBM_KERNNAME], ["poclbm121016"], [Filename for poclbm kernel])
---- Makefile.am.orig
-+++ Makefile.am
-@@ -13,7 +13,7 @@
- 
- bin_PROGRAMS	= bfgminer
- 
--bin_SCRIPTS	= *.cl
-+pkgdata_SCRIPTS	= *.cl
- 
- bfgminer_LDFLAGS	= $(PTHREAD_FLAGS)
- bfgminer_LDADD	= $(DLOPEN_FLAGS) @LIBCURL_LIBS@ @JANSSON_LIBS@ @PTHREAD_LIBS@ \
-@@ -117,19 +117,19 @@
- 
- if HAS_MODMINER
- bfgminer_SOURCES += driver-modminer.c
--bitstreamsdir = $(bindir)/bitstreams
-+bitstreamsdir = $(pkgdatadir)/bitstreams
- dist_bitstreams_DATA = bitstreams/*
- endif
- 
- if HAS_X6500
- bfgminer_SOURCES += driver-x6500.c ft232r.c ft232r.h jtag.c jtag.h
--bitstreamsdir = $(bindir)/bitstreams
-+bitstreamsdir = $(pkgdatadir)/bitstreams
- dist_bitstreams_DATA = bitstreams/*
- endif
- 
- if HAS_ZTEX
- bfgminer_SOURCES += driver-ztex.c libztex.c libztex.h
--bitstreamsdir = $(bindir)/bitstreams
-+bitstreamsdir = $(pkgdatadir)/bitstreams
- dist_bitstreams_DATA = bitstreams/*
- endif
- 
diff --git a/libre/bfgminer-libre/remove-dangerous-rpath.patch b/libre/bfgminer-libre/remove-dangerous-rpath.patch
deleted file mode 100644
index abd815141..000000000
--- a/libre/bfgminer-libre/remove-dangerous-rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig
-+++ configure.ac
-@@ -514,7 +514,7 @@
- 	])
- else
- 	libblkmaker_CFLAGS='-Ilibblkmaker'
--	libblkmaker_LDFLAGS='-Llibblkmaker/.libs -Wl,-rpath,\$$ORIGIN/libblkmaker/.libs'"$origin_LDFLAGS"
-+	libblkmaker_LDFLAGS='-Llibblkmaker/.libs'
- 	libblkmaker_LIBS='-lblkmaker_jansson-0.1 -lblkmaker-0.1'
- 	AC_CONFIG_SUBDIRS([libblkmaker])
- fi
diff --git a/libre/bitlbee-libre/PKGBUILD b/libre/bitlbee-libre/PKGBUILD
deleted file mode 100644
index 74e81a52c..000000000
--- a/libre/bitlbee-libre/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 200603 2013-11-29 19:17:58Z dreisner $
-
-# Contributor: FUBAR <mrfubar@gmail.com>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-_pkgname=bitlbee
-pkgname=bitlbee-libre
-pkgver=3.2.1
-pkgrel=1
-pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without Skype support'
-url='http://www.bitlbee.org/'
-license=('GPL')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('gnutls' 'glib2')
-makedepends=('asciidoc' 'libotr3')
-optdepends=('libotr3: for OTR encryption support'
-            'xinetd: to run bitlbee through xinetd')
-provides=$_pkgname=$pkgver
-conflicts=$_pkgname
-replaces=$_pkgname
-source=("http://get.bitlbee.org/src/${_pkgname}-${pkgver}.tar.gz"
-        'xinetd'
-        'bitlbee.tmpfiles')
-sha1sums=('954471ab87206826c072f31b3def40a1be5a78f5'
-          '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
-          '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
-backup=('etc/bitlbee/bitlbee.conf'
-        'etc/bitlbee/motd.txt'
-        'etc/xinetd.d/bitlbee')
-install=bitlbee.install
-
-build() {
-  cd "$_pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --etcdir=/etc/bitlbee \
-    --sbindir=/usr/bin \
-    --pidfile=/run/bitlbee/bitlbee.pid \
-    --ipcsocket=/run/bitlbee/bitlbee.sock \
-    --systemdsystemunitdir=/usr/lib/systemd/system \
-    --ssl=gnutls \
-    --strip=0 \
-    --otr=plugin \
-    --skype=0
-
-  # hacky: build against libotr3
-  sed -i 's,^OTRFLAGS=.*,OTRFLAGS=-lotr3,' Makefile.settings
-  sed -i 's,#include.*libotr,&3,' otr.h
-
-  make
-}
-
-package() {
-  make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev}
-
-  install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
-  install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
-  install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
-}
diff --git a/libre/bitlbee-libre/bitlbee.install b/libre/bitlbee-libre/bitlbee.install
deleted file mode 100644
index c8a8f93a1..000000000
--- a/libre/bitlbee-libre/bitlbee.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  if ! getent group bitlbee &>/dev/null; then
-    groupadd -r -g 65 bitlbee >/dev/null
-  fi
-  if ! getent passwd bitlbee &>/dev/null; then
-    useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
-  fi
-  systemd-tmpfiles --create bitlbee.conf
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  if getent passwd bitlbee &>/dev/null; then
-    userdel bitlbee >/dev/null
-  fi
-  if getent group bitlbee &>/dev/null; then
-    groupdel bitlbee >/dev/null
-  fi
-}
diff --git a/libre/bitlbee-libre/bitlbee.tmpfiles b/libre/bitlbee-libre/bitlbee.tmpfiles
deleted file mode 100644
index da72a0a79..000000000
--- a/libre/bitlbee-libre/bitlbee.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/bitlbee 0755 bitlbee bitlbee - -
diff --git a/libre/bitlbee-libre/xinetd b/libre/bitlbee-libre/xinetd
deleted file mode 100644
index d671a8cfc..000000000
--- a/libre/bitlbee-libre/xinetd
+++ /dev/null
@@ -1,12 +0,0 @@
-service bitlbee
-{
-        type = UNLISTED
-        socket_type = stream
-        protocol = tcp
-        wait = no
-        user = bitlbee
-	group = bitlbee
-        server = /usr/sbin/bitlbee
-        port = 6667
-        disable = yes
-}
diff --git a/libre/blackbox-libre/PKGBUILD b/libre/blackbox-libre/PKGBUILD
deleted file mode 100644
index e00e55501..000000000
--- a/libre/blackbox-libre/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $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>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-_pkgname=blackbox
-pkgname=${_pkgname}-libre
-pkgver=0.70.1
-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
-license=('MIT')
-source=(http://downloads.sourceforge.net/blackboxwm/$_pkgname-$pkgver.tar.gz
-	gcc4.3.patch
-	bbdock.patch
-	bsetbg-feh.patch
-	textpropertytostring-unconditional.patch
-        menu)
-md5sums=('2d173b95ca5e64ef478c6a5d2deee9df'
-         'bc7a1335d77cdeb6f85cba4d01e68e63'
-         '69c5a5e981b087b2d8267cab996b48dd'
-         'e7fb0d5bfd95820c0194ec73df66dadc'
-         '3b92ad246f07126dd55ae9634d6e875e'
-         'f4fefa5f25c65c5d9a601e9c14646757')
-
-build() {
-  cd $srcdir/$_pkgname-$pkgver
-
-  patch -Np1 -i ../gcc4.3.patch
-  patch -Np0 -i ../bbdock.patch
-  patch -Np0 -i ../bsetbg-feh.patch
-  patch -Np1 -i ../textpropertytostring-unconditional.patch
-
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-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/blackbox-libre/bbdock.patch b/libre/blackbox-libre/bbdock.patch
deleted file mode 100644
index 709b6cfe1..000000000
--- a/libre/blackbox-libre/bbdock.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/Slit.cc	2005-01-04 05:58:33.000000000 -0700
-+++ /root/tmp/Slit.cc	2007-12-29 11:13:09.000000000 -0700
-@@ -248,6 +248,13 @@
-     bt::PixmapCache::find(screen->screenNumber(), texture,
-                           frame.rect.width(), frame.rect.height(),
-                           frame.pixmap);
-+/*** START: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative **************/
-+  if ((texture.texture() & bt::Texture::Gradient) && frame.pixmap)
-+    XSetWindowBackgroundPixmap(display, frame.window, frame.pixmap);
-+  else if ((texture.texture() & bt::Texture::Solid))
-+    XSetWindowBackground(display, frame.window, 
-+      texture.color1().pixel(screen->screenNumber()));
-+/*** STOP: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative ***************/
-   XClearArea(display, frame.window, 0, 0,
-              frame.rect.width(), frame.rect.height(), True);
- 
diff --git a/libre/blackbox-libre/bsetbg-feh.patch b/libre/blackbox-libre/bsetbg-feh.patch
deleted file mode 100644
index 17a612ff0..000000000
--- a/libre/blackbox-libre/bsetbg-feh.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- util/bsetbg.orig	2008-03-26 21:17:04.000000000 -0700
-+++ util/bsetbg	2008-03-26 21:21:57.000000000 -0700
-@@ -22,7 +22,7 @@
- 
- PATH=$PATH:/usr/bin:/usr/local/bin:/usr/X11R6/bin
- 
--img_apps="display xli xsetbg Esetroot qiv wmsetbg xv"
-+img_apps="display xli xsetbg Esetroot qiv wmsetbg xv feh"
- 
- display_full_cmd="display -geometry 800x600 -window root"
- display_tile_cmd="display -window root"
-@@ -59,6 +59,11 @@
- xsetbg_center_cmd="xsetbg -center"
- xsetbg_default_cmd="$xsetbg_center_cmd"
- 
-+feh_full_cmd="feh --bg-scale"
-+feh_tile_cmd="feh --bg-tile"
-+feh_center_cmd="feh --bg-center"
-+feh_default_cmd="$feh_center_cmd"
-+
- ##################################
- 
- me=`basename $0`
diff --git a/libre/blackbox-libre/gcc4.3.patch b/libre/blackbox-libre/gcc4.3.patch
deleted file mode 100644
index 40a9dcdef..000000000
--- a/libre/blackbox-libre/gcc4.3.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -Nur blackbox-0.70.1/lib/Image.cc blackbox-0.70.1-new/lib/Image.cc
---- blackbox-0.70.1/lib/Image.cc	2005-04-08 08:41:09.000000000 -0700
-+++ blackbox-0.70.1-new/lib/Image.cc	2008-05-21 20:52:44.000000000 -0700
-@@ -45,6 +45,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
-+#include <cstring>
-+
- // #define COLORTABLE_DEBUG
- // #define MITSHM_DEBUG
- 
-diff -Nur blackbox-0.70.1/lib/Resource.cc blackbox-0.70.1-new/lib/Resource.cc
---- blackbox-0.70.1/lib/Resource.cc	2005-04-06 14:16:50.000000000 -0700
-+++ blackbox-0.70.1-new/lib/Resource.cc	2008-05-21 20:52:44.000000000 -0700
-@@ -30,6 +30,8 @@
- 
- #include <stdio.h>
- 
-+#include <cstring>
-+
- 
- bt::Resource::Resource(void)
-   : db(NULL)
-diff -Nur blackbox-0.70.1/lib/XDG.cc blackbox-0.70.1-new/lib/XDG.cc
---- blackbox-0.70.1/lib/XDG.cc	2005-04-06 07:04:38.000000000 -0700
-+++ blackbox-0.70.1-new/lib/XDG.cc	2008-05-21 20:52:44.000000000 -0700
-@@ -26,7 +26,7 @@
- #include "XDG.hh"
- 
- #include <stdlib.h>
--
-+#include <algorithm>
- 
- // make sure directory names end with a slash
- static std::string terminateDir(const std::string &string)
-diff -Nur blackbox-0.70.1/src/BlackboxResource.cc blackbox-0.70.1-new/src/BlackboxResource.cc
---- blackbox-0.70.1/src/BlackboxResource.cc	2005-10-18 00:34:46.000000000 -0700
-+++ blackbox-0.70.1-new/src/BlackboxResource.cc	2008-05-21 20:52:44.000000000 -0700
-@@ -33,6 +33,8 @@
- #include <X11/Xutil.h>
- #include <X11/cursorfont.h>
- 
-+#include <cstring>
-+
- 
- BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) {
-   screen_resources = 0;
-diff -Nur blackbox-0.70.1/src/Screen.cc blackbox-0.70.1-new/src/Screen.cc
---- blackbox-0.70.1/src/Screen.cc	2005-10-18 01:07:22.000000000 -0700
-+++ blackbox-0.70.1-new/src/Screen.cc	2008-05-21 20:52:44.000000000 -0700
-@@ -48,6 +48,8 @@
- #include <ctype.h>
- #include <dirent.h>
- 
-+#include <cstring>
-+
- 
- static bool running = true;
- static int anotherWMRunning(Display *, XErrorEvent *) {
-diff -Nur blackbox-0.70.1/src/ScreenResource.cc blackbox-0.70.1-new/src/ScreenResource.cc
---- blackbox-0.70.1/src/ScreenResource.cc	2005-04-12 22:54:08.000000000 -0700
-+++ blackbox-0.70.1-new/src/ScreenResource.cc	2008-05-21 20:52:44.000000000 -0700
-@@ -33,6 +33,8 @@
- 
- #include <assert.h>
- 
-+#include <cstring>
-+
- 
- static const int iconify_width  = 9;
- static const int iconify_height = 9;
-diff -Nur blackbox-0.70.1/src/main.cc blackbox-0.70.1-new/src/main.cc
---- blackbox-0.70.1/src/main.cc	2005-01-03 02:42:57.000000000 -0700
-+++ blackbox-0.70.1-new/src/main.cc	2008-05-21 20:52:44.000000000 -0700
-@@ -36,6 +36,8 @@
- 
- #include <stdio.h>
- 
-+#include <cstring>
-+
- 
- static void showHelp(int exitval) {
-   // print version - this should not be localized!
-diff -Nur blackbox-0.70.1/util/bsetbg blackbox-0.70.1-new/util/bsetbg
---- blackbox-0.70.1/util/bsetbg	2004-12-22 02:40:18.000000000 -0700
-+++ blackbox-0.70.1-new/util/bsetbg	2008-05-21 20:52:44.000000000 -0700
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- # Copyright (c) 2000-2002 Timothy M. King (tmk@lordzork.com)
- #
-diff -Nur blackbox-0.70.1/util/bsetroot.cc blackbox-0.70.1-new/util/bsetroot.cc
---- blackbox-0.70.1/util/bsetroot.cc	2005-03-15 00:01:37.000000000 -0700
-+++ blackbox-0.70.1-new/util/bsetroot.cc	2008-05-21 20:52:44.000000000 -0700
-@@ -27,11 +27,14 @@
- #include <Pen.hh>
- #include <Texture.hh>
- 
-+#include <cstdlib>
- #include <cctype>
- 
- #include <X11/Xatom.h>
- #include <stdio.h>
- 
-+#include <cstring>
-+
- 
- // ignore all X errors
- static int x11_error(::Display *, XErrorEvent *)
diff --git a/libre/blackbox-libre/menu b/libre/blackbox-libre/menu
deleted file mode 100644
index 9cba27d16..000000000
--- a/libre/blackbox-libre/menu
+++ /dev/null
@@ -1,112 +0,0 @@
-# This is the default menu file for Blackbox 0.33.0 and up
-# 
-# Lines beginning with the '#' character are ignored.
-#
-# The new syntax is simpler than the old X resource format...
-# Each menu item consists of 2 or 3 fields:
-#
-#	[command]  (label)  {data}
-#
-# where [command] is one of:
-#
-#   [begin] [end] [exec] [exit] [reconfig] [restart] [submenu] 
-#   [style] [stylesdir] [include] [workspaces] [config]
-#
-# [begin] is used for the top level menu
-# [submenu] is used for submenus
-# [end] must be used with BOTH [begin] and [submenu] to tell the parser to stop
-#   reading from the file.
-#
-# [exec] (label) {string}
-# This will insert an item that runs a program.
-#
-# [exit] (label)
-# This will insert an item that exits the window manager.
-#
-# [reconfig] (label) {string}
-# This will insert an item that tells blackbox to re-read it's configuration
-#  files.  {string} is optional, and if supplied, will execute the string with
-#  /bin/sh -c before the reconfiguration is performed.  (this is helpful for
-#  writing multiple config files and switching between them)
-#
-# [restart] (label) {string}
-# This will insert an item to restart the window manager.  {string} is
-# optional, and if omitted, blackbox will restart itself.  If {string} is
-# specified, then a different window manager will be started.
-#
-# [style] (filename)
-# This will insert an item to reconfigure blackbox with the new style. This
-# change is saved when blackbox exits or restarts.
-#
-# [include] (filename)
-# This will read more menu items from the file "filename".  The file cannot
-# contain a [begin] or [end], except for the [end] needed for submenus.
-#
-# [workspaces] (label)
-# This tells Blackbox to insert a "link" to the workspaces menu directly
-# into your menu.
-#
-# [config] (label)
-# This tells Blackbox to insert the ConfigMenu into your menu.  The ConfigMenu
-# allows you to change several options found in your ~/.blackboxrc file on the
-# fly.
-#
-# example:
-
-[begin] (Blackbox)
-  [exec] (xterm)    {xterm -ls}
-  [exec] (rxvt)     {rxvt}
-
-  [exec] (LibreOffice) {soffice}
-  [exec] (XEmacs)      {xemacs}
-  [exec] (XPDF)        {xpdf}
-
-  [submenu] (Graphics)
-    [exec] (The GIMP)     {gimp}
-    [exec] (Image Magick) {display}
-  [end]
-
-  [submenu] (Internet)
-    [exec] (Icecat)                   {icecat}
-    [exec] (Iceweasel libre)          {iceweasel}
-    [submenu] (Icedove libre)
-      [exec] (Icedove libre Mail)     {icedove -mail}
-      [exec] (Icedove libre News)     {icedove -news}
-    [end]
-    [submenu] (Iceape libre)
-      [exec] (Iceape libre Mail)     {icedove -mail}
-      [exec] (Iceape libre News)     {icedove -news}
-      [exec] (Iceape libre Composer) {icedove -edit}
-    [end]
-  [end]
-
-  [submenu] (X Utilities)
-    [exec] (Xfontsel) {xfontsel}
-    [exec] (Xman)     {xman}
-    [exec] (Xcalc)    {xcalc}
-    [exec] (Xload)    {xload}
-  [end]
- 
-  [submenu] (Styles) {Choose a style...}
-    [stylesdir] (/usr/share/blackbox/styles)
-  [end]
-
-  [workspaces] (Workspace List)
-  [config] (Configuration)
-
-  [reconfig] (Reconfigure)
-  [restart] (Restart)
-  [submenu] (Others)                {Other Window Managers}
-    [restart] (Start FVWM)          {fvwm}
-    [restart] (Start WindowMaker)   {wmaker}
-    [restart] (Start Afterstep)     {afterstep}
-    [restart] (Start Enlightenment) {enlightenment}
-    [restart] (Start TWM)           {twm}
-    [restart] (Start KWIM)          {kwim}
-  [end]
-
-  [exit] (Exit)
-[end]
-
-# End of example menu.
-
diff --git a/libre/blackbox-libre/textpropertytostring-unconditional.patch b/libre/blackbox-libre/textpropertytostring-unconditional.patch
deleted file mode 100644
index ed320388a..000000000
--- a/libre/blackbox-libre/textpropertytostring-unconditional.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Declare bt::textPropertyToString unconditionally.
-Author: Jakub Wilk <jwilk@debian.org>
-Forwarded: no
-Bug-Debian: http://bugs.debian.org/614468
-Last-Update: 2011-03-12
-
---- a/lib/Util.hh
-+++ b/lib/Util.hh
-@@ -25,6 +25,8 @@
- #ifndef __Util_hh
- #define __Util_hh
- 
-+#include <X11/Xutil.h>
-+
- #include <limits.h>
- #include <string>
- 
-@@ -94,10 +96,8 @@
- 
-   std::string tolower(const std::string &string);
- 
--#ifdef _XUTIL_H_
-   std::string textPropertyToString(::Display *display,
-                                    ::XTextProperty& text_prop);
--#endif
- 
- } // namespace bt
- 
diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD
deleted file mode 100644
index 9638a6135..000000000
--- a/libre/blender-addon-luxrender/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-_srcname=luxrender
-_pkgver=1.3.1
-_bldname=blender
-_bldver=2.69
-_bldep=10
-_pkgname=${_srcname::3}${_bldname::5}25
-_srcver=ad6536b0dda8
-
-pkgname=$_bldname-addon-$_srcname
-pkgver=$_pkgver.v$_bldver
-pkgrel=2
-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/
-license=GPL
-depends=(
-  $_srcname=$_pkgver
-  "$_bldname-libre>=$_bldep:$_bldver"
-  "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))"
-)
-provides=($_pkgname=$_pkgver)
-conflicts=$_pkgname
-replaces=$_pkgname
-source=http://src.$_srcname.net/$_pkgname/archive/$_srcver.tar.bz2
-sha512sums=7bfd64abde07d9ad90d5e80a95f6fe5478ff65a8ff6965bd3a6c9671907a9a940affa5fb1a593884dc9eb6a5c967eaa1386a3225edc9cbbbb4c20c5d26198aa1
-
-prepare() {
-  sed -i "\|def find_luxrender_path[(][)]|,+9 d
-          s|find_luxrender_path[(][)]|'/usr/bin'|
-         " $srcdir/$_pkgname-$_srcver/src/$_srcname/__init__.py
-}
-
-package() {
-  a=$srcdir/$_pkgname-$_srcver/src/$_srcname
-  b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
-  install -d -m755 $b && cp -a $a $b
-  # change the search path in exporter so it finds pylux in its new location
-  sed -i 's|from.*import pylux|import pylux|' $b/$_srcname/outputs/pure_api.py
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
deleted file mode 100644
index fffb0926b..000000000
--- a/libre/blender-libre/PKGBUILD
+++ /dev/null
@@ -1,146 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-_pkgname=blender
-epoch=10
-_pkgver=2.69
-pkgrel=3
-_jpgver=1.5
-_pyver=3.3
-
-_spn=false
-[[ $_spn == true ]] && {
-  _spnname=-spacenav
-  _spndesc=' (with spacenav support)'
-}
-
-pkgname=$_pkgname$_spnname-libre
-pkgver=$_pkgver
-pkgdesc='Fully integrated 3D graphics creation suite, without nonfree cuda support'$_spndesc
-arch=(
-  mips64el
-  x86_64
-  i686
-)
-license=GPL
-url=http://www.$_pkgname.org
-depends=(
-  desktop-file-utils
-  ffmpeg
-  fftw
-  freetype2
-  hicolor-icon-theme
-  jack
-  #jemalloc
-  libpng
-  libtiff
-  openal
-  openexr-libre
-  openimageio
-  'opencollada=20131031'
-  opencolorio
-  openshadinglanguage
-  shared-mime-info
-  xdg-utils
-)
-[[ $_spn == true ]] && depends+=(libspnav)
-optdepends=(
-  'bullet: for Rigid Bodies and Physics Simulation'
-  'xcftools: for import GIMP images to scene (pcr repo)'
-  'povray-libre: for optional renderer with POV-Ray'
-  'blender-addon-luxrender: for optional renderer and exporter with LuxRender'
-  'blender-addon-mitsuba: for optional renderer and exporter with Mitsuba (pcr repo)'
-  'blender-addon-ogre: for export to Ogre3D formats (pcr repo)'
-  'blender-addon-yafaray: for optional renderer with YafaRay (pcr repo)'
-)
-makedepends=(
-  boost
-  cmake
-  mesa
-)
-provides=($_pkgname)
-[[ $_spn == true ]] && provides+=("$_pkgname-libre=$epoch:$pkgver")
-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=f4de1f5a0a7868ee509b57ef65962a6c2af4c2bc7328db6ebe7b8e05f771c06efea92977f7a64433e8383382a33dbd73cb42b2bf872e63410e55c19ddd133142
-
-prepare() {
-  cd $srcdir/$_pkgname-$pkgver
-
-  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";|' 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|
-         ' release/scripts/{addons/game_engine_save_as_runtime,modules/bl_i18n_utils/utils_rtl}.py
-  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'
-  sed -i 's|free, open source|free|
-          s|free and open-source|free|
-          s|open-source and free|free|
-         ' release/text/readme.html
-
-  msg 'fixing povray-libre path and desc'
-  sed -i "s|FILE_PATH',|FILE_PATH',\n                default='/usr/bin/povray',|
-          s|both POV-Ray 3[.]7 and this script are beta|this script is beta|
-         " release/scripts/addons/render_povray/__init__.py  
-
-  mkdir -v build
-}
-
-build() {
-  cd $srcdir/$_pkgname-$pkgver/build
-
-  [[ $CARCH == x86_64 || $CARCH == i686 ]] && _SSE=ON _SSE2=ON || _SSE=OFF _SSE2=OFF
-  [[ $_spn == true ]] && _NDOF=ON || _NDOF=OFF
-  cmake ..\
-    -DCMAKE_BUILD_TYPE=Release\
-    -DCMAKE_INSTALL_PREFIX=/usr\
-    -DOPENIMAGEIO_ROOT_DIR=/usr\
-    -DOPENJPEG_INCLUDE_DIR=/usr/include/openjpeg-$_jpgver\
-    -DPYTHON_INCLUDE_DIRS=/usr/include/python${_pyver}m\
-    -DPYTHON_LIBPATH=/usr/lib\
-    -DPYTHON_LIBRARY=python${_pyver}m\
-    -DPYTHON_VERSION=$_pyver\
-    -DSUPPORT_SSE_BUILD=$_SSE\
-    -DSUPPORT_SSE2_BUILD=$_SSE2\
-    -DWITH_BULLET=ON\
-    -DWITH_CODEC_FFMPEG=ON\
-    -DWITH_CODEC_SNDFILE=ON\
-    -DWITH_CYCLES=ON\
-    -DWITH_CYCLES_CUDA_BINARIES=OFF\
-    -DWITH_CYCLES_OSL=ON\
-    -DWITH_FFTW3=ON\
-    -DWITH_GAMEENGINE=ON\
-    -DWITH_IMAGE_REDCODE=ON\
-    -DWITH_INPUT_NDOF=$_NDOF\
-    -DWITH_INSTALL_PORTABLE=OFF\
-    -DWITH_JACK=ON\
-    -DWITH_JACK_DYNLOAD=OFF\
-    -DWITH_MEM_JEMALLOC=OFF\
-    -DWITH_MOD_OCEANSIM=ON\
-    -DWITH_OPENCOLLADA=ON\
-    -DWITH_PLAYER=ON\
-    -DWITH_PYTHON_INSTALL=OFF\
-    -DWITH_SYSTEM_GLEW=ON
-  make $MAKEFLAGS
-  make
-}
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver/build
-  make DESTDIR=$pkgdir install
-  python -m compileall $pkgdir/usr/share/$_pkgname
-}
diff --git a/libre/blender-libre/blender-libre.install b/libre/blender-libre/blender-libre.install
deleted file mode 100755
index 724bfce00..000000000
--- a/libre/blender-libre/blender-libre.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/libre/bogofilter-libre/PKGBUILD b/libre/bogofilter-libre/PKGBUILD
deleted file mode 100644
index ff674ed58..000000000
--- a/libre/bogofilter-libre/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $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.4
-pkgrel=1
-pkgdesc="A fast Bayesian spam filtering tool, without noncommercial files"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL3')
-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=('d0a5eebb3274b23ceabe766a6443a1c5')
-provides=("${_pkgname}=${pkgver}")
-replaces=("${_pkgname}")
-conflicts=("${_pkgname}")
-
-build() {
-  cd ${_pkgname}-${pkgver}
-
-  # Remove noncommercial files.
-  rm doc/bogofilter-SA-{2005-0{1,2},2010-01}
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc/bogofilter  \
-              --localstatedir=/var \
-              --enable-transactions
-  make
-}
-
-package() {
-  cd ${_pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  mv "${pkgdir}/etc/bogofilter/bogofilter.cf.example" "${pkgdir}/etc/bogofilter/bogofilter.cf"
-
-  install -dm755 "${pkgdir}/usr/share/${_pkgname}/contrib"
-  install -m644 contrib/* "${pkgdir}/usr/share/${_pkgname}/contrib/"
-}
diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD
deleted file mode 100644
index c01ed93b6..000000000
--- a/libre/bumblebee-libre/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=bumblebee
-pkgname=bumblebee-libre
-pkgver=3.2.1
-pkgrel=3
-pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support"
-arch=('i686' 'x86_64' 'mips64el')
-depends=('virtualgl' 'glib2' 'mesa-libgl')
-makedepends=('help2man')
-optdepends=('xf86-video-nouveau: nouveau driver'
-            'nouveau-dri: 3D acceleration features of nouveau'
-            'bbswitch: switch on/off discrete card'
-            'primus: faster back-end for optirun')
-if [ "$CARCH" = "x86_64" ]; then
-     optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun'
-     optdepends[${#optdepends[@]}]='lib32-primus: faster back-end for optirun'
-fi
-replaces=('bumblebee' 'nvidia-libgl')
-conflicts=('bumblebee' 'nvidia-libgl')
-provides=("bumblebee=$pkgver" 'nvidia-libgl')
-url="http://www.bumblebee-project.org"
-license=("GPL3")
-install='bumblebee.install'
-backup=('etc/bumblebee/bumblebee.conf' 
-        'etc/bumblebee/xorg.conf.nouveau')
-source=("http://www.bumblebee-project.org/${_pkgname}-${pkgver}.tar.gz"
-        'libre.patch')
-md5sums=('30974e677bb13e8a3825fd6f3e7d3b24'
-         '1daed1e00f74538add6c435dfa0569d1')
-
-prepare() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-
-    # Remove nonfree references to nonfree nvidia driver and unnecessaries files
-    rm -rv "README.markdown"
-    rm -rv "conf/"{99-bumblebee-nvidia-dev.rules,xorg.conf.nvidia}
-    rm -rv "doc"
-    rm -rv "scripts/bumblebee-bugreport.in"
-    patch -Np1 -i "${srcdir}/libre.patch"
-}
-
-build() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-
-    ./configure \
-        CONF_DRIVER=nouveau \
-        --prefix=/usr \
-        --sbindir=/usr/bin \
-        --sysconfdir=/etc \
-        --without-pidfile
-
-    make
-}
-
-package() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-
-    make install DESTDIR="$pkgdir"
-
-    # Install systemd unit
-    install -D -m644 "scripts/systemd/bumblebeed.service" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service"    
-    sed -i "s/sbin/bin/" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service"
-
-    # Make bash_completion work
-    mv -v "${pkgdir}/etc/bash_completion.d/bumblebee" "${pkgdir}/etc/bash_completion.d/optirun"
-}
diff --git a/libre/bumblebee-libre/bumblebee.install b/libre/bumblebee-libre/bumblebee.install
deleted file mode 100644
index 57aed6cc5..000000000
--- a/libre/bumblebee-libre/bumblebee.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_notice() {
-    echo "Don't forget to add yourself to the 'bumblebee' group to use Bumblebee"
-}
-
-post_upgrade() {
-    getent group "bumblebee" &>/dev/null || groupadd -r bumblebee
-}
-
-post_remove() {
-    getent group "bumblebee" &>/dev/null && groupdel bumblebee 1>/dev/null
-}
-
-post_install() {
-    post_upgrade
-    _notice
-}
diff --git a/libre/bumblebee-libre/libre.patch b/libre/bumblebee-libre/libre.patch
deleted file mode 100644
index 81d49ca33..000000000
--- a/libre/bumblebee-libre/libre.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-diff -Nur bumblebee-3.2.1.orig/Makefile.am bumblebee-3.2.1/Makefile.am
---- bumblebee-3.2.1.orig/Makefile.am	2013-04-26 12:49:03.022174178 -0300
-+++ bumblebee-3.2.1/Makefile.am	2013-04-28 17:08:11.719589284 -0300
-@@ -1,7 +1,6 @@
- # -*- Makefile -*-
- 
- GITVERSION = $(shell "$(top_srcdir)/version.sh" "$(top_srcdir)")
--relnotes = doc/RELEASE_NOTES_3_2_1
- 
- bumblebeedconfdir=$(sysconfdir)/bumblebee
- 
-@@ -20,23 +19,16 @@
- noinst_SCRIPTS += scripts/sysvinit/bumblebeed
- endif
- 
--bin_SCRIPTS = scripts/bumblebee-bugreport
--
- xconfddir = $(bumblebeedconfdir)/xorg.conf.d
- xconfd_DATA = conf/xorg.conf.d/10-dummy.conf
- 
- CLEANFILES = $(noinst_SCRIPTS) conf/bumblebee.conf $(bin_SCRIPTS)
- EXTRA_DIST = scripts/systemd/bumblebeed.service.in \
- 	scripts/upstart/bumblebeed.conf.in \
--	conf/99-bumblebee-nvidia-dev.rules \
- 	conf/bumblebee.conf.in \
--	conf/xorg.conf.nvidia \
- 	conf/xorg.conf.nouveau \
- 	$(xconfd_DATA) \
--	README.markdown \
- 	scripts/bash_completion/bumblebee \
--	scripts/bumblebee-bugreport.in \
--	$(relnotes) \
- 	version.sh
- # for laziness include all headers found
- EXTRA_DIST += src/*.h src/*/switching.h
-@@ -57,17 +49,11 @@
- 	src/driver.c src/bumblebeed.c
- bin_bumblebeed_LDADD = ${x11_LIBS} ${libbsd_LIBS} ${glib_LIBS} -lrt
- 
--dist_doc_DATA = $(relnotes) README.markdown
--bumblebeedconf_DATA = conf/bumblebee.conf conf/xorg.conf.nouveau conf/xorg.conf.nvidia
-+bumblebeedconf_DATA = conf/bumblebee.conf conf/xorg.conf.nouveau
- 
- completiondir = $(sysconfdir)/bash_completion.d
- completion_DATA = scripts/bash_completion/bumblebee
- 
--if WITH_UDEV_RULES
--udevrulesdir = $(UDEV_RULES_DIR)
--udevrules_DATA = conf/99-bumblebee-nvidia-dev.rules
--endif
--
- do_subst = sed -e 's|[@]GITVERSION[@]|$(GITVERSION)|g' \
- 	-e 's|[@]CONF_XDISP[@]|$(CONF_XDISP)|g' \
- 	-e 's|[@]CONF_SOCKPATH[@]|$(CONF_SOCKPATH)|g' \
-@@ -97,10 +83,6 @@
- 	mkdir -p scripts/systemd
- 	$(do_subst) < $< > $@
- 
--scripts/bumblebee-bugreport: $(srcdir)/scripts/bumblebee-bugreport.in
--	mkdir -p scripts
--	$(do_subst) < $< > $@
--
- if WITH_PIDFILE
- scripts/sysvinit/bumblebeed: $(srcdir)/scripts/sysvinit/bumblebeed.in
- 	mkdir -p scripts/sysvinit
-diff -Nur bumblebee-3.2.1.orig/Makefile.in bumblebee-3.2.1/Makefile.in
---- bumblebee-3.2.1.orig/Makefile.in	2013-04-26 12:49:11.306174579 -0300
-+++ bumblebee-3.2.1/Makefile.in	2013-04-28 17:21:38.698898621 -0300
-@@ -220,7 +220,6 @@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
--UDEV_RULES_DIR = @UDEV_RULES_DIR@
- VERSION = @VERSION@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -273,7 +272,6 @@
- x11_CFLAGS = @x11_CFLAGS@
- x11_LIBS = @x11_LIBS@
- GITVERSION = $(shell "$(top_srcdir)/version.sh" "$(top_srcdir)")
--relnotes = doc/RELEASE_NOTES_3_2_1
- bumblebeedconfdir = $(sysconfdir)/bumblebee
- AM_CPPFLAGS = ${regular_CPPFLAGS} \
- 		-DCONFIG_FILE='"$(bumblebeedconfdir)/bumblebee.conf"' \
-@@ -286,7 +284,6 @@
- 
- noinst_SCRIPTS = scripts/systemd/bumblebeed.service \
- 	scripts/upstart/bumblebeed.conf $(am__append_1)
--bin_SCRIPTS = scripts/bumblebee-bugreport
- xconfddir = $(bumblebeedconfdir)/xorg.conf.d
- xconfd_DATA = conf/xorg.conf.d/10-dummy.conf
- CLEANFILES = $(noinst_SCRIPTS) conf/bumblebee.conf $(bin_SCRIPTS) \
-@@ -294,10 +291,10 @@
- # for laziness include all headers found
- EXTRA_DIST = scripts/systemd/bumblebeed.service.in \
- 	scripts/upstart/bumblebeed.conf.in \
--	conf/99-bumblebee-nvidia-dev.rules conf/bumblebee.conf.in \
--	conf/xorg.conf.nvidia conf/xorg.conf.nouveau $(xconfd_DATA) \
--	README.markdown scripts/bash_completion/bumblebee \
--	scripts/bumblebee-bugreport.in $(relnotes) version.sh src/*.h \
-+	conf/bumblebee.conf.in \
-+	conf/xorg.conf.nouveau $(xconfd_DATA) \
-+	scripts/bash_completion/bumblebee \
-+	version.sh src/*.h \
- 	src/*/switching.h $(am__append_2)
- bin_optirun_SOURCES = src/module.c src/bbconfig.c src/bblogger.c src/bbrun.c \
- 	src/bbsocket.c src/driver.c src/optirun.c src/bbsocketclient.c
-@@ -309,12 +306,9 @@
- 	src/driver.c src/bumblebeed.c
- 
- bin_bumblebeed_LDADD = ${x11_LIBS} ${libbsd_LIBS} ${glib_LIBS} -lrt
--dist_doc_DATA = $(relnotes) README.markdown
--bumblebeedconf_DATA = conf/bumblebee.conf conf/xorg.conf.nouveau conf/xorg.conf.nvidia
-+bumblebeedconf_DATA = conf/bumblebee.conf conf/xorg.conf.nouveau
- completiondir = $(sysconfdir)/bash_completion.d
- completion_DATA = scripts/bash_completion/bumblebee
--@WITH_UDEV_RULES_TRUE@udevrulesdir = $(UDEV_RULES_DIR)
--@WITH_UDEV_RULES_TRUE@udevrules_DATA = conf/99-bumblebee-nvidia-dev.rules
- do_subst = sed -e 's|[@]GITVERSION[@]|$(GITVERSION)|g' \
- 	-e 's|[@]CONF_XDISP[@]|$(CONF_XDISP)|g' \
- 	-e 's|[@]CONF_SOCKPATH[@]|$(CONF_SOCKPATH)|g' \
-diff -Nur bumblebee-3.1.orig/conf/bumblebee.conf.in bumblebee-3.1/conf/bumblebee.conf.in
---- bumblebee-3.1.orig/conf/bumblebee.conf.in	2013-02-21 17:03:35.526542613 -0200
-+++ bumblebee-3.1/conf/bumblebee.conf.in	2013-04-06 06:28:48.124159386 -0300
-@@ -17,8 +17,8 @@
- # be ignored.
- NoEcoModeOverride=false
- # The Driver used by Bumblebee server. If this value is not set (or empty),
--# auto-detection is performed. The available drivers are nvidia and nouveau
--# (See also the driver-specific sections below)
-+# auto-detection is performed. The available driver is nouveau
-+# (See also the driver-specific section below)
- Driver=@CONF_DRIVER@
- 
- ## Client options. Will take effect on the next optirun executed.
-@@ -44,18 +44,6 @@
- #             none - disable PM completely
- # https://github.com/Bumblebee-Project/Bumblebee/wiki/Comparison-of-PM-methods
- 
--## Section with nvidia driver specific options, only parsed if Driver=nvidia
--[driver-nvidia]
--# Module name to load, defaults to Driver if empty or unset
--KernelDriver=@CONF_DRIVER_MODULE_NVIDIA@
--PMMethod=@CONF_PM_METHOD@
--# colon-separated path to the nvidia libraries
--LibraryPath=@CONF_LDPATH_NVIDIA@
--# comma-separated path of the directory containing nvidia_drv.so and the
--# default Xorg modules path
--XorgModulePath=@CONF_MODPATH_NVIDIA@
--XorgConfFile=@BBCONFDIR@/xorg.conf.nvidia
--
- ## Section with nouveau driver specific options, only parsed if Driver=nouveau
- [driver-nouveau]
- KernelDriver=nouveau
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 7c4e50950..6c4cf6beb 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103187 2013-12-29 13:15:31Z jelle $
+# $Id: PKGBUILD 104707 2014-01-24 17:26:20Z jelle $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=1.17.0
+pkgver=1.21.0
 pkgrel=1
 pkgdesc="Ebook management application, with unar support"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -30,7 +30,7 @@ install=calibre.install
 source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('f154d941683e45c93c3f3b15570c0b30'
+md5sums=('f8588ca195354692d172d9fa3fd67dea'
          '95ca4eb3afa7c737c8371708a23bdad9'
          '675cd87d41342119827ef706055491e7')
 
diff --git a/libre/calibre-libre/calibre-mount-helper b/libre/calibre-libre/calibre-mount-helper
deleted file mode 100644
index 00cac4270..000000000
--- a/libre/calibre-libre/calibre-mount-helper
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh -e
-# Replacement for upstream mount helper using udisks/eject
-# (C) 2010 Martin Pitt <mpitt@debian.org>
-
-ACTION="$1"
-DEV="$2"
-
-case "$ACTION" in
-    mount)
-	udisks --mount "$DEV"
-    
-	# check if mount worked. If not, fail
-	# udisks does return 0 even if mount failed
-	mount | grep -q "$DEV" || exit 0
-	;;
-
-    eject)
-	eject "$DEV"
-	;;
-
-    cleanup)
-	;;
-
-    *)
-	echo "unknown action" >&2
-	exit 1
-esac
-
diff --git a/libre/calibre-libre/calibre.install b/libre/calibre-libre/calibre.install
deleted file mode 100644
index 6210bd0ab..000000000
--- a/libre/calibre-libre/calibre.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch
deleted file mode 100644
index 9b20820e6..000000000
--- a/libre/calibre-libre/desktop_integration.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py
---- calibre/src/calibre/linux.py	2013-12-13 03:47:23.000000000 +0100
-+++ calibre.new/src/calibre/linux.py	2013-12-17 20:11:58.319040313 +0100
-@@ -451,18 +451,6 @@
-             self.setup_completion()
-         if islinux or isbsd:
-             self.setup_desktop_integration()
--        self.create_uninstaller()
--
--        from calibre.utils.config import config_dir
--        if os.path.exists(config_dir):
--            os.chdir(config_dir)
--            if islinux or isbsd:
--                for f in os.listdir('.'):
--                    if os.stat(f).st_uid == 0:
--                        import shutil
--                        shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f)
--                if os.stat(config_dir).st_uid == 0:
--                    os.rmdir(config_dir)
- 
-         if warn is None and self.warnings:
-             self.info('There were %d warnings'%len(self.warnings))
-@@ -513,7 +501,7 @@
-                 if isnetbsd:
-                     f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
-                 else:
--                    f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre')
-+                    f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre')
-             if not os.path.exists(os.path.dirname(f)):
-                 os.makedirs(os.path.dirname(f))
-             if zsh.dest:
-@@ -657,71 +645,45 @@
- 
-             with TemporaryDirectory() as tdir, CurrentDir(tdir), \
-                                 PreserveMIMEDefaults():
--                render_img('mimetypes/lrf.png', 'calibre-lrf.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-lrs',
--                '128'))
--                render_img('mimetypes/mobi.png', 'calibre-mobi.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128'))
--                render_img('mimetypes/tpz.png', 'calibre-tpz.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-tpz.png application-x-topaz-ebook', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-x-topaz-ebook', '128'))
--                render_img('mimetypes/azw2.png', 'calibre-azw2.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw2.png application-x-kindle-application', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-x-kindle-application', '128'))
--                render_img('mimetypes/azw3.png', 'calibre-azw3.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw3.png application-x-mobi8-ebook', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128'))
--                render_img('lt.png', 'calibre-gui.png', width=256, height=256)
--                cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True)
--                self.icon_resources.append(('apps', 'calibre-gui', '128'))
--                render_img('viewer.png', 'calibre-viewer.png')
--                cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
--                self.icon_resources.append(('apps', 'calibre-viewer', '128'))
--                render_img('tweak.png', 'calibre-ebook-edit.png')
--                cc('xdg-icon-resource install --size 128 calibre-ebook-edit.png calibre-ebook-edit', shell=True)
--                self.icon_resources.append(('apps', 'calibre-ebook-edit', '128'))
-+                dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
-+                os.mkdir(dir)
-+                render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
-+                render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
-+                render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
-+                render_img('tweak.png', os.path.join(dir, 'calibre-ebook-edit.png'))
- 
-                 mimetypes = set([])
-                 for x in all_input_formats():
-                     mt = guess_type('dummy.'+x)[0]
--                    if mt and 'chemical' not in mt and 'ctc-posml' not in mt:
-+                    if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt:
-                         mimetypes.add(mt)
- 
-                 def write_mimetypes(f):
-                     f.write('MimeType=%s;\n'%';'.join(mimetypes))
- 
-                 from calibre.ebooks.oeb.polish.main import SUPPORTED
--                f = open('calibre-lrfviewer.desktop', 'wb')
-+                dir = os.path.join(self.opts.staging_sharedir,'../applications')
-+                os.mkdir(dir)
-+                f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
-                 f.write(VIEWER)
-                 f.close()
--                f = open('calibre-ebook-viewer.desktop', 'wb')
-+                f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
-                 f.write(EVIEWER)
-                 write_mimetypes(f)
--                f = open('calibre-ebook-edit.desktop', 'wb')
-+                f = open(os.path.join(dir, 'calibre-ebook-edit.desktop'), 'wb')
-                 f.write(ETWEAK)
-                 mt = [guess_type('a.' + x.lower())[0] for x in SUPPORTED]
-                 f.write('MimeType=%s;\n'%';'.join(mt))
-                 f.close()
--                f = open('calibre-gui.desktop', 'wb')
-+                f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
-                 f.write(GUI)
-                 write_mimetypes(f)
-                 f.close()
--                des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
--                        'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop')
--                for x in des:
--                    cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
--                    cc(' '.join(cmd), shell=True)
--                    self.menu_resources.append(x)
--                cc(['xdg-desktop-menu', 'forceupdate'])
--                f = open('calibre-mimetypes.xml', 'wb')
-+                dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
-+                os.makedirs(dir)
-+                f = open(os.path.join(dir, 'calibre.xml'), 'wb')
-                 f.write(MIME)
-                 f.close()
--                self.mime_resources.append('calibre-mimetypes.xml')
--                cc('xdg-mime install ./calibre-mimetypes.xml', shell=True)
-         except Exception:
-             if self.opts.fatal_errors:
-                 raise
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
deleted file mode 100644
index 1d1fdac79..000000000
--- a/libre/cdfs-libre/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $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@parabola.nu>
-
-_pkgname=cdfs
-pkgname=cdfs-libre
-pkgver=2.6.27
-_extramodules=extramodules-3.9-LIBRE # Don't forget to update cdfs.install
-pkgrel=48
-pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)"
-arch=(i686 x86_64 mips64el)
-url="http://www.elis.UGent.be/~ronsse/cdfs/"
-license=('GPL')
-depends=('linux-libre>=3.9' 'linux-libre<3.10')
-makedepends=('linux-libre-headers')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-install=cdfs.install
-source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$_pkgname-$pkgver.tar.bz2"
-	"cdfs-3.0.patch"
-	"cdfs-3.2.patch"
-	"cdfs-3.4.patch"
-	"cdfs-3.8.patch")
-md5sums=('ac64c014a90e3c488394832ea29605b3'
-         'aba7da94a9dcbb8a93ea423cb6958fef'
-         'e934407b3460257a301822ffc4ab3933'
-         '9215e7bdac728bd2f889fb525e543454'
-         'b036fd72b033294605bec2b60a73e3bd')
-
-build() {
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
-  cd $srcdir/$_pkgname-$pkgver
-  patch -p1 <$srcdir/cdfs-3.0.patch
-  patch -p1 <$srcdir/cdfs-3.2.patch
-  patch -p1 <$srcdir/cdfs-3.4.patch
-  patch -p1 <$srcdir/cdfs-3.8.patch
-  make KDIR=/usr/lib/modules/${_kernver}/build
-  sed -i "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" $startdir/cdfs.install
-}
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-  install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/$_extramodules/cdfs.ko
-}
diff --git a/libre/cdfs-libre/cdfs-3.0.patch b/libre/cdfs-libre/cdfs-3.0.patch
deleted file mode 100644
index 20194b848..000000000
--- a/libre/cdfs-libre/cdfs-3.0.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-diff -wbBur cdfs-2.6.27/cddata.c cdfs-2.6.27.my/cddata.c
---- cdfs-2.6.27/cddata.c	2009-12-21 17:04:03.000000000 +0300
-+++ cdfs-2.6.27.my/cddata.c	2011-07-24 21:18:44.000000000 +0400
-@@ -83,7 +83,7 @@
- #else
-   .mmap             = generic_file_readonly_mmap,
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
--  .sendfile         = generic_file_sendfile
-+//  .sendfile         = generic_file_sendfile
- #else
-   .splice_read      = generic_file_splice_read
- #endif
-diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
---- cdfs-2.6.27/root.c	2009-12-21 16:38:31.000000000 +0300
-+++ cdfs-2.6.27.my/root.c	2011-07-25 13:16:59.000000000 +0400
-@@ -32,19 +30,14 @@
-  *	Added code to transform /proc/cdfs into a sequential synthetic file.  *
-  *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
- 
--
- #include <linux/seq_file.h>
--
--#ifndef OLD_KERNEL
- #include <linux/statfs.h>
--#endif
-+#include <linux/sched.h>
- 
- extern struct seq_operations cdfs_operations;
- extern struct _track_info *dummy_track_p;
- 
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) 
- struct inode *cdfs_iget(struct super_block *sp, unsigned long ino); 
--#endif
- /*============================================================================*
-  *  cdfs_open()                                                               *
-  *	Description:                                                          *
-@@ -115,15 +108,8 @@
- 
- /********************************************************************/
- 
--#ifdef OLD_KERNEL
--static struct super_block * cdfs_mount(struct super_block *sb, void *data, int silent){
--  kdev_t dev = sb->s_dev;
--  int i, j, t;
--  struct cdrom_tochdr  hdr;
--#else
- static int cdfs_fill_super(struct super_block *sb, void *data, int silent){
-   int i, t;
--#endif
-   struct cdrom_tocentry   entry;   
-   int no_audio=0, no_data=0;
-   cd * this_cd;
-@@ -131,24 +117,13 @@
- 
-   PRINT("cdfs_mount\n");
- 
--#ifdef OLD_KERNEL
--  MOD_INC_USE_COUNT;
--
--  set_blocksize(dev, CD_FRAMESIZE);  // voor bread met ide-cd
--#else
-   sb_set_blocksize(sb, CD_FRAMESIZE);  // voor bread met ide-cd
--#endif
- 
-   sb->s_blocksize = CD_FRAMESIZE;
-   sb->s_blocksize_bits = 11;
- 
-   if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){
--#ifdef OLD_KERNEL
--    MOD_DEC_USE_COUNT;     
--    return NULL;
--#else
-     return -ENOMEM;
--#endif
-   }
- 
-   this_cd->mode           = MODE;
-@@ -160,13 +135,8 @@
- 
-   // Initialize cache for maximum sector size
-   if (!(this_cd->cache = kmalloc(CD_FRAMESIZE_RAWER*CACHE_SIZE, GFP_KERNEL))) {
--#ifdef OLD_KERNEL
--    MOD_DEC_USE_COUNT;
--    return NULL;
--#else
-     kfree(cdfs_info(sb));
-     return -ENOMEM;
--#endif
-   }
- 
-   // Cache is still invalid
-@@ -183,23 +153,13 @@
-   if (this_cd->toc_scsi){
-     if (cdfs_toc_read_full(sb)){
-       printk("TOC read failed\n");
--#ifdef OLD_KERNEL
--      MOD_DEC_USE_COUNT;
--      return NULL;
--#else
-       goto invalid;
--#endif
-     }
-   } else {
-     //if (cdfs_ioctl(sb, CDROMREADTOCHDR, (unsigned long)&hdr)){
-     if (cdfs_toc_read(sb)){
-       printk("cdfs_toc_read failed\n");
--#ifdef OLD_KERNEL
--      MOD_DEC_USE_COUNT;
--      return NULL;
--#else
-       goto invalid;
--#endif
-     }
-   }
- 
-@@ -365,11 +325,7 @@
-   sb->s_flags |= MS_RDONLY;
-   sb->s_op     = &cdfs_ops;
-   /* always get inode status */
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
-   retinode=cdfs_iget(sb, 0);
--#else
--  retinode=iget(sb, 0);
--#endif
-   if ( IS_ERR(retinode) )
-     return PTR_ERR(retinode);
- 
-@@ -379,16 +335,12 @@
- 
-   cdfs_proc_cd = this_cd;
- 
--#ifdef OLD_KERNEL
--  return sb;
--#else
-   return 0;
- 
- invalid:
-   kfree(this_cd->cache);
-   kfree(cdfs_info(sb));
-   return -EINVAL;
--#endif
- }
- 
- /************************************************************************/
-@@ -410,27 +362,12 @@
-   // Remove /proc entry
-   cdfs_proc_cd = NULL; 
-   kfree(cdfs_info(sb));
--
--#ifdef OLD_KERNEL
--  MOD_DEC_USE_COUNT;
--#endif
--
- }
- 
- /************************************************************************/
- 
--#ifdef OLD_KERNEL
--static int cdfs_statfs(struct super_block *sb, struct statfs *buf) {
--  cd * this_cd = cdfs_info(sb);
--#else
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
- static int cdfs_statfs(struct dentry *d, struct kstatfs *buf) {
-   cd * this_cd = cdfs_info(d->d_sb);
--#else
--static int cdfs_statfs(struct super_block *sb, struct kstatfs *buf) {
--  cd * this_cd = cdfs_info(sb);
--#endif
--#endif
-   PRINT("rmfs_statfs\n");
- 
-   buf->f_type    = CDFS_MAGIC;
-@@ -460,11 +397,7 @@
- 
- /************************************************************************/
- 
--#ifdef OLD_KERNEL
--static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry){
--#else
- static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){
--#endif
-   struct inode * inode;
-   int i;
-   cd * this_cd = cdfs_info(dir->i_sb);
-@@ -480,15 +413,9 @@
- /* Use goto and read inode with iget()/cdfs_iget() */
- /* Thanks to David Howells for patch and Master class in his mail */
- found:
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
- inode = cdfs_iget(dir->i_sb, i);
- if (IS_ERR(inode))
-   return ERR_CAST(inode);
--#else
--  inode = iget(dir->i_sb, i);
--  if (!inode)
--    return ERR_PTR(-ENOMEM);
--#endif
- d_add(dentry, inode);
- return NULL;
- }
-@@ -529,12 +456,8 @@
-     i->i_fop   = &cdfs_dir_operations;
-   } else {                                          /* file */
-     i->i_size  = this_cd->track[i->i_ino].size;
--#ifdef OLD_KERNEL
--    i->i_mtime = i->i_atime = i->i_ctime = this_cd->track[i->i_ino].time;
--#else
-     i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = this_cd->track[i->i_ino].time;
-     i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0;
--#endif
-     i->i_mode  = this_cd->mode;
-     if ((this_cd->track[i->i_ino].type==DATA) && this_cd->track[i->i_ino].iso_size) {
-       i->i_fop          = &cdfs_cddata_file_operations; 
-@@ -587,33 +510,21 @@
- /******************************************************************/
- 
- static struct super_operations cdfs_ops = {
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
--  .read_inode = cdfs_read_inode,
--#endif
-   .put_super  = cdfs_umount,
-   .statfs     = cdfs_statfs
- };
- 
--#ifdef OLD_KERNEL
--static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount);
--#else
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
--static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
--  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
--#else
--static struct super_block *cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) {
--  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super);
--#endif
--}
-+//static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
-+//  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
-+//}
- 
- static struct file_system_type cdfs_fs_type = {
-   .owner    = THIS_MODULE,
-   .name     = "cdfs",
--  .get_sb   = cdfs_get_sb,
-+//  .get_sb   = cdfs_get_sb,
-   .kill_sb  = kill_block_super,
-   .fs_flags = FS_REQUIRES_DEV
- };
--#endif
- 
- /******************************************************/
- 
-@@ -621,10 +532,6 @@
- MODULE_DESCRIPTION("CDfs: a CD filesystem");
- MODULE_LICENSE("GPL"); 
- 
--#ifdef OLD_KERNEL
--EXPORT_NO_SYMBOLS;
--#endif
--
- /******************************************************************/
- 
- static int __init cdfs_init(void) {
-@@ -676,11 +583,7 @@
-   
-   if (!options) return;
-   
--#ifdef OLD_KERNEL
--  for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) {
--#else
-   while ((this_char = strsep(&options,",")) != NULL) {
--#endif
-     
-     if (!strcmp(this_char,"single")) 
-       this_cd->single=TRUE;
diff --git a/libre/cdfs-libre/cdfs-3.2.patch b/libre/cdfs-libre/cdfs-3.2.patch
deleted file mode 100644
index d3300bdbc..000000000
--- a/libre/cdfs-libre/cdfs-3.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
---- cdfs-2.6.27/root.c	2009-12-21 16:38:31.000000000 +0300
-+++ cdfs-2.6.27.my/root.c	2012-01-18 11:23:03.000000000 +0400
-@@ -517,7 +517,7 @@
-   
-   i->i_uid        = this_cd->uid;
-   i->i_gid        = this_cd->gid;
--  i->i_nlink      = 1;
-+  i->__i_nlink      = 1;
-   i->i_op         = &cdfs_inode_operations;
-   i->i_fop        = NULL;
-   i->i_data.a_ops = NULL;
diff --git a/libre/cdfs-libre/cdfs-3.4.patch b/libre/cdfs-libre/cdfs-3.4.patch
deleted file mode 100644
index 5c2cb9b24..000000000
--- a/libre/cdfs-libre/cdfs-3.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
---- cdfs-2.6.27/root.c	2009-12-21 16:38:31.000000000 +0300
-+++ cdfs-2.6.27.my/root.c	2012-06-15 17:09:27.000000000 +0400
-@@ -375,7 +375,7 @@
- 
-   PRINT("retinode = %ld\n", retinode->i_ino);
- 
--  sb->s_root   = d_alloc_root(retinode);
-+  sb->s_root   = d_make_root(retinode);
- 
-   cdfs_proc_cd = this_cd;
- 
diff --git a/libre/cdfs-libre/cdfs-3.8.patch b/libre/cdfs-libre/cdfs-3.8.patch
deleted file mode 100644
index 10d9c8b47..000000000
--- a/libre/cdfs-libre/cdfs-3.8.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -upr cdfs-2.6.27.orig/daemon.c cdfs-2.6.27/daemon.c
---- cdfs-2.6.27.orig/daemon.c	2009-12-21 16:02:50.000000000 +0200
-+++ cdfs-2.6.27/daemon.c	2013-02-21 06:14:45.000000000 +0200
-@@ -158,7 +158,6 @@ int kcdfsd_thread(void *unused){
-   exit_files(current);  /* daemonize doesn't do exit_files */
-   daemonize();
- #else
--  daemonize("k"FSNAME"d");
- 
-   /* Allow SIGTERM to quit properly when removing module */
-   /* By default with daemonize all signals are dropped */
-diff -upr cdfs-2.6.27.orig/root.c cdfs-2.6.27/root.c
---- cdfs-2.6.27.orig/root.c	2009-12-21 15:38:31.000000000 +0200
-+++ cdfs-2.6.27/root.c	2013-02-21 06:15:20.000000000 +0200
-@@ -25,6 +25,7 @@
- #include "cdfs.h"
- 
- #include <linux/module.h>
-+#include <linux/kthread.h>
- 
- 
- /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*
-@@ -643,14 +644,15 @@ static int __init cdfs_init(void) {
-   cdfs_proc_cd=NULL;
- 
-   // start kernel thread
--  if ((kcdfsd_pid = kernel_thread(kcdfsd_thread, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND)) >0 ) {
--    return 0;
--  } else {
--    printk(FSNAME" kernel_thread failed.\n");
-+  kcdfsd_pid = kthread_run(kcdfsd_thread, NULL, "kcdfsd_thread");
-+  if (IS_ERR(kcdfsd_pid)) {
-+    printk(FSNAME" kthread_run failed.\n");
-     if (cdfs_proc_entry) remove_proc_entry(FSNAME, NULL);
-     unregister_filesystem(&cdfs_fs_type);
-     return -1;
-   }
-+
-+  return 0;
- }
- 
- /******************************************************************/
diff --git a/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install
deleted file mode 100644
index 14b056a11..000000000
--- a/libre/cdfs-libre/cdfs.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  EXTRAMODULES='extramodules-3.9-LIBRE'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-  EXTRAMODULES='extramodules-3.9-LIBRE'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-  EXTRAMODULES='extramodules-3.9-LIBRE'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD
deleted file mode 100644
index 1f8992289..000000000
--- a/libre/cdrkit-libre/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 157442 2012-04-28 11:27:45Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-
-_pkgname=cdrkit
-pkgname=cdrkit-libre
-pkgver=1.1.11
-pkgrel=3.2
-pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction, without nonfree apple_driver utility"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://cdrkit.org/"
-license=('GPL2')
-depends=('file' 'bzip2')
-optdepends=('perl: for dirsplit')
-makedepends=('cmake')
-provides=("cdrkit=${pkgver}" 'cdrtools')
-conflicts=('cdrkit' 'cdrtools')
-replaces=('cdrkit' 'cdrtools')
-source=(http://cdrkit.org/releases/$_pkgname-$pkgver.tar.gz)
-md5sums=('efe08e2f3ca478486037b053acd512e9')
-
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  sed -i "s#sbin#bin#" netscsid/CMakeLists.txt
-
-  # Remove nonfree apple_driver utility
-  rm -rvf {doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{8,c}}
-}
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make PREFIX="$pkgdir/usr" install
-
-  # Make symlinks for cdrtools compatibility
-  cd "$pkgdir/usr/bin"
-  ln -s wodim cdrecord
-  ln -s readom readcd
-  ln -s genisoimage mkisofs
-  ln -s genisoimage mkhybrid
-  ln -s icedax cdda2wav
-
-  cd "$pkgdir/usr/share/man/man1"
-  ln -s wodim.1 cdrecord.1
-  ln -s readom.1 readcd.1
-  ln -s genisoimage.1 mkisofs.1
-  ln -s genisoimage.1 mkhybrid.1
-  ln -s icedax.1 cdda2wav.1
-}
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
deleted file mode 100644
index 09608d1fa..000000000
--- a/libre/cgminer-libre/PKGBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# $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 >
-# Contributor: David Manouchehri <david@davidmanouchehri.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-_pkgname=cgminer
-pkgname=cgminer-libre
-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
-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')
-
-prepare() {
-  cd $_pkgname
-  # We have latest jansson and libusb - just use them
-
-  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 \
-
-  ./autogen.sh \
-    --prefix=/usr \
-    --enable-scrypt \
-    --enable-opencl \
-    --enable-bflsc \
-    --enable-bitforce \
-    --enable-icarus \
-    --enable-modminer \
-    --enable-avalon \
-    --enable-klondike \
-    --enable-bitfury \
-    --enable-hashfast \
-    --enable-knc \
-    --with-system-libusb \
-    --disable-adl # For license issues
-  
-  make
-}
-
-package() {
-  cd $_pkgname
-
-  make DESTDIR="$pkgdir" install
-
-  install -d "$pkgdir/usr/share/$_pkgname"
-  install -m755 miner.php api-example.* "$pkgdir/usr/share/$_pkgname"
-
-  install -Dm644 "$srcdir"/$_pkgname.service "$pkgdir"/usr/lib/systemd/system/$_pkgname.service
-  install -Dm644 "$srcdir"/$_pkgname.conf.d "$pkgdir"/etc/conf.d/$_pkgname
-  sed 's#/usr/local/bin#/usr/bin#g' example.conf > $_pkgname.conf
-  install -Dm644 $_pkgname.conf "$pkgdir"/etc/$_pkgname.conf
-}
-
-sha512sums=('SKIP'
-            '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41'
-            '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f')
diff --git a/libre/cgminer-libre/cgminer.conf.d b/libre/cgminer-libre/cgminer.conf.d
deleted file mode 100644
index 88ec535d6..000000000
--- a/libre/cgminer-libre/cgminer.conf.d
+++ /dev/null
@@ -1,11 +0,0 @@
-# Use JSON-format configuration. (recommended)
-CGMINER_CONF="/etc/cgminer.conf"
-
-# Uncommend this if you prefer simple command-line arguments.
-#CGMINER_CONF=""
-#CGMINER_PROTOCOL="http"
-#CGMINER_IP="127.0.0.1"
-#CGMINER_PORT="8332"
-#CGMINER_USER="username"
-#CGMINER_PASS="password"
-CGMINER_ARGS="--syslog"
diff --git a/libre/cgminer-libre/cgminer.service b/libre/cgminer-libre/cgminer.service
deleted file mode 100644
index 84461879f..000000000
--- a/libre/cgminer-libre/cgminer.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Multi-threaded multi-pool CPU and GPU miner for bitcoin
-
-[Service]
-ExecStart=/usr/bin/cgminer -T --config /etc/cgminer.conf --syslog
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD
deleted file mode 100644
index 723f4c5d2..000000000
--- a/libre/claws-mail-libre/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-_pkgname=claws-mail
-pkgname=$_pkgname-libre
-pkgver=3.9.2
-pkgrel=3
-pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices 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')
-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=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins")
-conflicts=("$_pkgname" "$_pkgname-extra-plugins")
-provides=("$_pkgname=$pkgver" 'claws')
-options=(!libtool)
-install=$_pkgname.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$_pkgname-$pkgver.tar.bz2{,.asc})
-md5sums=('90de2a265e65fbd9dffdbf428bb0ee28'
-         'SKIP')
-
-build() {
-  cd $srcdir/$_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
-
-  setarch $CARCH ./configure --prefix=/usr --disable-static \
-    --enable-enchant \
-    --enable-gnutls \
-    --enable-ldap \
-    --enable-crash-dialog \
-    --enable-pgpmime-plugin \
-    --enable-spamassassin-plugin \
-    --enable-bogofilter-plugin \
-    --disable-jpilot \
-    #--help
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  # build and install extra tools
-  cd tools
-  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
-  done
-}
diff --git a/libre/claws-mail-libre/claws-mail.install b/libre/claws-mail-libre/claws-mail.install
deleted file mode 100644
index 4d2f155d4..000000000
--- a/libre/claws-mail-libre/claws-mail.install
+++ /dev/null
@@ -1,16 +0,0 @@
-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/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 82baa8f5d..5bebf2bb6 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 101521 2013-11-26 23:05:03Z alucryd $
+# $Id: PKGBUILD 103980 2014-01-14 12:52:23Z jgc $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: BlackEagle <ike.devolder@gmail.com>
@@ -10,7 +10,7 @@
 _pkgname=clementine
 pkgname=clementine-libre
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A music player and library organizer, without nonfree artwork and spotify support"
 url="http://www.clementine-player.org/"
 license=('GPL')
@@ -26,14 +26,16 @@ replaces=('clementine')
 conflicts=('clementine')
 provides=("clementine=$pkgver")
 install=clementine.install
-source=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz"
-        'remove-nonfree-artwork-and-spotify.patch'
-        'moognu.png')
-sha256sums=('db556e8bf230e2535636f5736a62ffe24ce154481fb05123e8395ab4aa64654e'
-            '13c12cb47a9bb4585014512ebf2c9e81f8ab35afee255f35360acb0f388e21db'
-            'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4')
+mksource=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz"
+          'remove-nonfree-artwork-and-spotify.patch'
+          'moognu.png')
+source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+mksha256sums=('db556e8bf230e2535636f5736a62ffe24ce154481fb05123e8395ab4aa64654e'
+              '13c12cb47a9bb4585014512ebf2c9e81f8ab35afee255f35360acb0f388e21db'
+              'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4')
+sha256sums=('c376dd2cc346ad1f9828d3731e2bfb03cd0b4d06ea2b23d4b2caaf9351812ec2')
 
-prepare() {
+mksource() {
   cd ${_pkgname}-${pkgver}
 
   # remove nonfree nonfree artwork and spotify references on files
diff --git a/libre/clementine-libre/moognu.png b/libre/clementine-libre/moognu.png
deleted file mode 100644
index 177041886..000000000
--- a/libre/clementine-libre/moognu.png
+++ /dev/null
diff --git a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
deleted file mode 100644
index 38bac21bf..000000000
--- a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
+++ /dev/null
@@ -1,701 +0,0 @@
-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
--		@"com.spotify.client",
- 		@"com.apple.iTunes",
- 		@"com.apple.QuickTimePlayerX",
- 		@"com.apple.quicktimeplayer",
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 47f1693..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)
--include(cmake/SpotifyVersion.cmake)
- include(cmake/OptionalSource.cmake)
- set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
- 
-@@ -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(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)
- 
--  find_library(SPOTIFY libspotify)
--  if (SPOTIFY)
--    set (SPOTIFY_FOUND ON)
--    set (SPOTIFY_INCLUDE_DIRS ${SPOTIFY})
--    set (SPOTIFY_LIBRARIES ${SPOTIFY})
--  endif (SPOTIFY)
--
-   add_subdirectory(3rdparty/SPMediaKeyTap)
-   set(SPMEDIAKEYTAP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/SPMediaKeyTap)
-   set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap)
-@@ -254,7 +245,7 @@ optional_component(DEVICEKIT ON "Devices: DeviceKit backend"
-   DEPENDS "D-Bus support" HAVE_DBUS
- )
- 
--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
- )
-@@ -270,13 +261,6 @@ optional_component(SPARKLE ON "Sparkle integration"
- 
- 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")
--elseif(QCA_FOUND)
--  set(HAVE_SPOTIFY_DOWNLOADER ON)
--endif()
--
- # 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_BLOB)
--  add_subdirectory(ext/clementine-spotifyblob)
--endif(HAVE_SPOTIFY_BLOB)
--
- if(HAVE_MOODBAR)
-   add_subdirectory(gst/moodbar)
- endif()
-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>
-@@ -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>
--        <file>icons/22x22/spotify.png</file>
-         <file>icons/22x22/user-away.png</file>
-         <file>icons/22x22/view-choose.png</file>
-         <file>icons/22x22/view-fullscreen.png</file>
-@@ -154,7 +152,6 @@
-         <file>icons/32x32/phone-palm-pre.png</file>
-         <file>icons/32x32/phone.png</file>
-         <file>icons/32x32/search.png</file>
--        <file>icons/32x32/spotify.png</file>
-         <file>icons/32x32/tools-wizard.png</file>
-         <file>icons/32x32/view-choose.png</file>
-         <file>icons/32x32/view-fullscreen.png</file>
-@@ -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>
--        <file>icons/48x48/spotify.png</file>
-         <file>icons/48x48/view-choose.png</file>
-         <file>icons/48x48/view-fullscreen.png</file>
-         <file>icons/48x48/view-media-equalizer.png</file>
-@@ -262,10 +258,10 @@
-         <file>lumberjacksong.txt</file>
-         <file>lyrics/ultimate_providers.xml</file>
-         <file>mainwindow.css</file>
-+        <file>moognu.png</file>
-         <file>nocover.png</file>
-         <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>
-@@ -391,7 +387,6 @@
-         <file>smartplaylistsearchterm.css</file>
-         <file>songinfo.css</file>
-         <file>spinner.gif</file>
--        <file>spotify-attribution.png</file>
-         <file>star-off.png</file>
-         <file>star-on.png</file>
-         <file>tiny-pause.png</file>
-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 038a60b..1d29a9e 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"
- 
--  ; 1.0 prerelease
--  Delete "$INSTDIR\spotify.dll"
--
-   ; 1.0
-   Delete "$INSTDIR\libofa.dll"
-   Delete "$INSTDIR\gstreamer-plugins\libgstofa.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"
-@@ -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"
-@@ -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-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"
-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"
- 
--  ; 1.0 prerelease
--  Delete "$INSTDIR\spotify.dll"
--
-   ; 1.0
-   Delete "$INSTDIR\libofa.dll"
-   Delete "$INSTDIR\gstreamer-plugins\libgstofa.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"
-@@ -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"
-@@ -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-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"
-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
-@@ -836,15 +825,6 @@ optional_source(HAVE_LIBLASTFM
- )
- 
- 
--optional_source(HAVE_SPOTIFY_DOWNLOADER
--  SOURCES
--    internet/spotifyblobdownloader.cpp
--  HEADERS
--    internet/spotifyblobdownloader.h
--  INCLUDE_DIRECTORIES
--    ${QCA_INCLUDE_DIRS}
--)
--
- # Platform specific - OS X
- optional_source(APPLE
-   INCLUDE_DIRECTORIES
-@@ -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_DOWNLOADER)
--  target_link_libraries(clementine_lib
--    ${QCA_LIBRARIES}
--  )
--  link_directories(${QCA_LIBRARY_DIRS})
--endif(HAVE_SPOTIFY_DOWNLOADER)
--
- if (APPLE)
-   target_link_libraries(clementine_lib
-     ${GROWL}
-@@ -1328,16 +1300,6 @@ target_link_libraries(clementine
-   clementine_lib
- )
- 
--# macdeploy.py relies on the blob being built first.
--if(HAVE_SPOTIFY_BLOB)
--  add_dependencies(clementine clementine-spotifyblob)
--endif(HAVE_SPOTIFY_BLOB)
--add_dependencies(clementine clementine-tagreader)
--
--set_target_properties(clementine PROPERTIES
--  MACOSX_BUNDLE_INFO_PLIST "../dist/Info.plist"
--)
--
- if (APPLE)
-   install(FILES ../dist/clementine.icns
-     DESTINATION "${CMAKE_BINARY_DIR}/clementine.app/Contents/Resources")
-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_SKYDRIVE
- #cmakedefine HAVE_SPARKLE
--#cmakedefine HAVE_SPOTIFY_DOWNLOADER
- #cmakedefine HAVE_STATIC_SQLITE
- #cmakedefine HAVE_UBUNTU_ONE
- #cmakedefine HAVE_WIIMOTEDEV
-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
- 
--    case Path_LocalSpotifyBlob:
--      return GetConfigPath(Path_Root) + "/spotifyblob";
--
-     default:
-       qFatal("%s", Q_FUNC_INFO);
-       return QString::null;
-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,
-   };
-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"
- 
- 
- 
-@@ -38,8 +37,7 @@ AlbumCoverLoader::AlbumCoverLoader(QObject* parent)
-   : QObject(parent),
-     stop_requested_(false),
-     next_id_(1),
--    network_(new NetworkAccessManager(this)),
--    connected_spotify_(false)
-+    network_(new NetworkAccessManager(this))
- {
- }
- 
-@@ -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
--    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);
-@@ -196,16 +174,6 @@ AlbumCoverLoader::TryLoadResult AlbumCoverLoader::TryLoadImage(
-                        image.isNull() ? task.options.default_output_image_: image);
- }
- 
--void AlbumCoverLoader::SpotifyImageLoaded(const QString& id, const QImage& image) {
--  if (!remote_spotify_tasks_.contains(id))
--    return;
--
--  Task task = remote_spotify_tasks_.take(id);
--  QImage scaled = ScaleAndPad(task.options, image);
--  emit ImageLoaded(task.id, scaled);
--  emit ImageLoaded(task.id, scaled, image);
--}
--
- 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(QNetworkReply* reply);
--  void SpotifyImageLoaded(const QString& url, const QImage& image);
- 
-  protected:
-   enum State {
-@@ -102,13 +101,10 @@ class AlbumCoverLoader : public QObject {
-   QMutex mutex_;
-   QQueue<Task> tasks_;
-   QMap<QNetworkReply*, Task> remote_tasks_;
--  QMap<QString, Task> remote_spotify_tasks_;
-   quint64 next_id_;
- 
-   NetworkAccessManager* network_;
- 
--  bool connected_spotify_;
--
-   static const int kMaxRedirects = 3;
- };
- 
-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"
- 
- 
- 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") {
--    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;
--
--    // 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);
--
--    // 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 {
-     new_bin = engine_->CreateElement("uridecodebin");
-     g_object_set(G_OBJECT(new_bin), "uri", url.toEncoded().constData(), NULL);
-     CHECKED_GCONNECT(G_OBJECT(new_bin), "drained", &SourceDrainedCallback, this);
-     CHECKED_GCONNECT(G_OBJECT(new_bin), "pad-added", &NewPadCallback, this);
-     CHECKED_GCONNECT(G_OBJECT(new_bin), "notify::source", &SourceSetupCallback, this);
--  }
- 
-   return ReplaceDecodeBin(new_bin);
- }
-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));
--  AddService(new SpotifyService(app, this));
-   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:"));
--  ret += QString("<br /><a href=\"http://rainymood.com\">Rainy Mood</a>");
-   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>");
- 
--  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 --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
- 
--  AddPage(Page_Spotify, new SpotifySettingsPage(this), providers);
-   AddPage(Page_Magnatune, new MagnatuneSettingsPage(this), providers);
-   AddPage(Page_DigitallyImported, new DigitallyImportedSettingsPage(this), providers);
-   AddPage(Page_BackgroundStreams, new BackgroundStreamsSettingsPage(this), providers);
-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,
--    Page_Spotify,
-     Page_Magnatune,
-     Page_DigitallyImported,
-     Page_BackgroundStreams,
diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD
deleted file mode 100644
index 0ed15649b..000000000
--- a/libre/crosstool-ng/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: jwwolf <jwwolf+arch@gmail.com>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=crosstool-ng
-pkgver=1.19.0
-pkgrel=1
-pkgdesc="A versatile cross toolchain generator (eglibc addons patch)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://crosstool-ng.org/"
-license=(GPL2)
-depends=('cvs' 'curl' 'gperf' 'wget')
-makedepends=('libtool')
-optdepends=('subversion: for retrieving eglibc sources')
-source=(http://crosstool-ng.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-        #libc_ports_short_name.patch)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  #patch -Np1 -i $srcdir/libc_ports_short_name.patch
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  install -Dm644 ct-ng.comp ${pkgdir}/usr/share/bash-completion/completions/ct-ng
-}
-sha1sums=('b7ae3e90756b499ff5362064b7d80f8a45d09bfb')
-sha256sums=('cd54f20bb8190533b21c9cf7f93c9073c22d59541f52774c3f3053264ba53a93')
diff --git a/libre/crosstool-ng/libc_ports_short_name.patch b/libre/crosstool-ng/libc_ports_short_name.patch
deleted file mode 100644
index b511fa183..000000000
--- a/libre/crosstool-ng/libc_ports_short_name.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-comparing with http://ymorin.is-a-geek.org/hg/crosstool-ng
-real URL is http://crosstool-ng.org/hg/crosstool-ng
-searching for changes
-changeset:   2482:a15a7b4ba12a
-tag:         libc_ports_short_name
-tag:         qbase
-tag:         qtip
-tag:         tip
-user:        "Nicolás Reynolds" <fauno@kiwwwi.com.ar>
-date:        Fri May 27 22:02:30 2011 -0300
-files:       scripts/build/libc/eglibc.sh scripts/build/libc/glibc.sh
-description:
-Fixes the issue with {e,}libc addons having short and long names (such as
-eglibc-ports-2_13 and ports), which caused configure scripts to run
-through them twice and thus configuring incorrectly.
-
-For instance, the mips64el-n32-linux-gnu toolchain would be recognized
-correctly first, but then the second pass would change it to mips32,
-building a mixed MIPS-III N32 and MIPS-I libc.
-
-
-diff -r 30644208c955 -r a15a7b4ba12a scripts/build/libc/eglibc.sh
---- a/scripts/build/libc/eglibc.sh	Thu May 26 22:51:03 2011 +0200
-+++ b/scripts/build/libc/eglibc.sh	Fri May 27 22:02:30 2011 -0300
-@@ -103,25 +103,36 @@
-     CT_Extract "eglibc-${CT_LIBC_VERSION}"
-     CT_Patch "eglibc" "${CT_LIBC_VERSION}"
- 
--    # C library addons
-+    # C library addons 
-     for addon in $(do_libc_add_ons_list " "); do
-         # NPTL addon is not to be extracted, in any case
-         [ "${addon}" = "nptl" ] && continue || true
-         CT_Pushd "${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}"
-         CT_Extract nochdir "eglibc-${addon}-${CT_LIBC_VERSION}"
-+
-+        CT_TestAndAbort "Error in add-on '${addon}': both short and long names in tarball" \ 
-+            -d "${addon}" -a -d "eglibc-${addon}-${CT_LIBC_VERSION}"
-+
-         # Some addons have the 'long' name, while others have the
-         # 'short' name, but patches are non-uniformly built with
-         # either the 'long' or 'short' name, whatever the addons name
--        # so we have to make symlinks from the existing to the missing
--        # Fortunately for us, [ -d foo ], when foo is a symlink to a
--        # directory, returns true!
--        [ -d "${addon}" ] || ln -s "eglibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
--        [ -d "eglibc-${addon}-${CT_LIBC_VERSION}" ] || ln -s "${addon}" "eglibc-${addon}-${CT_LIBC_VERSION}"
-+        # but we prefer the 'short' name and avoid duplicates.
-+        if [ -d "eglibc-${addon}-${CT_LIBC_VERSION}" ]; then
-+            mv "eglibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
-+        fi
-+
-+        ln -s "${addon}" "eglibc-${addon}-${CT_LIBC_VERSION}"
-+
-         CT_Patch nochdir "eglibc" "${addon}-${CT_LIBC_VERSION}"
-+
-+        # Remove the long name since it can confuse configure scripts to run
-+        # the same source twice.
-+        rm "eglibc-${addon}-${CT_LIBC_VERSION}"
-+
-         CT_Popd
-     done
- 
--    # The configure files may be older than the configure.in files
-+    # The configure files may be older than the configure.in files 
-     # if using a snapshot (or even some tarballs). Fake them being
-     # up to date.
-     find "${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}" -type f -name configure -exec touch {} \; 2>&1 |CT_DoLog ALL
-diff -r 30644208c955 -r a15a7b4ba12a scripts/build/libc/glibc.sh
---- a/scripts/build/libc/glibc.sh	Thu May 26 22:51:03 2011 +0200
-+++ b/scripts/build/libc/glibc.sh	Fri May 27 22:02:30 2011 -0300
-@@ -54,15 +54,24 @@
-         [ "${addon}" = "nptl" ] && continue || true
-         CT_Extract nochdir "glibc-${addon}-${CT_LIBC_VERSION}"
- 
-+        CT_TestAndAbort "Error in add-on '${addon}': both short and long names in tarball" \ 
-+            -d "${addon}" -a -d "glibc-${addon}-${CT_LIBC_VERSION}"
-+
-         # Some addons have the 'long' name, while others have the
-         # 'short' name, but patches are non-uniformly built with
-         # either the 'long' or 'short' name, whatever the addons name
--        # so we have to make symlinks from the existing to the missing
--        # Fortunately for us, [ -d foo ], when foo is a symlink to a
--        # directory, returns true!
--        [ -d "${addon}" ] || CT_DoExecLog ALL ln -s "glibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
--        [ -d "glibc-${addon}-${CT_LIBC_VERSION}" ] || CT_DoExecLog ALL ln -s "${addon}" "glibc-${addon}-${CT_LIBC_VERSION}"
-+        # but we prefer the 'short' name and avoid duplicates.
-+        if [ -d "glibc-${addon}-${CT_LIBC_VERSION}" ]; then
-+            mv "glibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
-+        fi
-+
-+        ln -s "${addon}" "glibc-${addon}-${CT_LIBC_VERSION}"
-+
-         CT_Patch nochdir "glibc" "${addon}-${CT_LIBC_VERSION}"
-+
-+        # Remove the long name since it can confuse configure scripts to run
-+        # the same source twice.
-+        rm "glibc-${addon}-${CT_LIBC_VERSION}"
-     done
- 
-     # The configure files may be older than the configure.in files
-
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index 22835bff0..68307b873 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 202372 2013-12-21 13:31:03Z andyrtr $
+# $Id: PKGBUILD 204369 2014-01-18 10:14:32Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=cups-filters-libre
 _pkgname=cups-filters
-pkgver=1.0.43
-pkgrel=1
+pkgver=1.0.44
+pkgrel=2
 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
@@ -20,13 +20,14 @@ source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.
 provides=("${_pkgname}=${pkgver}" 'foomatic-filters')
 replaces=("${_pkgname}" 'foomatic-filters')
 conflicts=("${_pkgname}" 'foomatic-filters')
-md5sums=('d1dbd200845db729bf18817f3a49c2c1')
+md5sums=('41d853788cf8e176f952136549488d34')
 
 build() {
   cd $_pkgname-$pkgver
   ./configure --prefix=/usr  \
     --sysconfdir=/etc \
     --sbindir=/usr/bin \
+    --localstatedir=/var \
     --with-rcdir=no \
     --enable-avahi \
     --with-browseremoteprotocols=DNSSD,CUPS \
diff --git a/libre/cups-filters-libre/cups-browsed.service b/libre/cups-filters-libre/cups-browsed.service
deleted file mode 100644
index 07b342d62..000000000
--- a/libre/cups-filters-libre/cups-browsed.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Make remote CUPS printers available locally
-After=cups.service avahi-daemon.service
-Wants=cups.service avahi-daemon.service
-
-[Service]
-ExecStart=/usr/bin/cups-browsed
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/cups-filters-libre/poppler_buildfix.diff b/libre/cups-filters-libre/poppler_buildfix.diff
deleted file mode 100644
index 18fc643f9..000000000
--- a/libre/cups-filters-libre/poppler_buildfix.diff
+++ /dev/null
@@ -1,276 +0,0 @@
-=== modified file 'filter/pdf.cxx'
---- filter/pdf.cxx	2012-08-19 22:31:27 +0000
-+++ filter/pdf.cxx	2013-08-01 15:48:06 +0000
-@@ -17,6 +17,10 @@
- #include "pdf.h"
- 
- #include <PDFDoc.h>
-+#include <config.h>
-+#ifdef HAVE_CPP_POPPLER_VERSION_H
-+#include "cpp/poppler-version.h"
-+#endif
- 
- 
- extern "C" pdf_t * pdf_load_template(const char *filename)
-@@ -343,7 +347,11 @@
-     {
-     }
- 
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+    Goffset getPos()
-+#else
-     int getPos()
-+#endif
-     {
-         return this->pos;
-     }
-
-=== modified file 'filter/pdftoijs.cxx'
---- filter/pdftoijs.cxx	2012-09-20 22:53:10 +0000
-+++ filter/pdftoijs.cxx	2013-08-01 15:48:06 +0000
-@@ -70,8 +70,13 @@
- }
- 
- #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+void CDECL myErrorFun(void *data, ErrorCategory category,
-+    Goffset pos, char *msg)
-+#else
- void CDECL myErrorFun(void *data, ErrorCategory category,
-     int pos, char *msg)
-+#endif
- {
-   if (pos >= 0) {
-     fprintf(stderr, "ERROR (%d): ", pos);
-@@ -297,19 +302,15 @@
-   if (argc == 6) {
-     /* stdin */
-     int fd;
--    Object obj;
--    BaseStream *str;
--    FILE *fp;
-+    char name[BUFSIZ];
-     char buf[BUFSIZ];
-     int n;
- 
--    fd = cupsTempFd(buf,sizeof(buf));
-+    fd = cupsTempFd(name,sizeof(name));
-     if (fd < 0) {
-       pdfError(-1,"Can't create temporary file");
-       exit(1);
-     }
--    /* remove name */
--    unlink(buf);
- 
-     /* copy stdin to the tmp file */
-     while ((n = read(0,buf,BUFSIZ)) > 0) {
-@@ -319,23 +320,10 @@
- 	exit(1);
-       }
-     }
--    if (lseek(fd,0,SEEK_SET) < 0) {
--        pdfError(-1,"Can't rewind temporary file");
--        close(fd);
--	exit(1);
--    }
--
--    if ((fp = fdopen(fd,"rb")) == 0) {
--        pdfError(-1,"Can't fdopen temporary file");
--        close(fd);
--	exit(1);
--    }
--
--    obj.initNull();
--//    parsePDFTOPDFComment(fp); // TODO?
--    rewind(fp);
--    str = new FileStream(fp,0,gFalse,0,&obj);
--    doc = new PDFDoc(str);
-+    close(fd);
-+    doc = new PDFDoc(new GooString(name));
-+    /* remove name */
-+    unlink(name);
-   } else {
-     GooString *fileName = new GooString(argv[6]);
-     /* argc == 7 filenmae is specified */
-
-=== modified file 'filter/pdftoopvp/pdftoopvp.cxx'
---- filter/pdftoopvp/pdftoopvp.cxx	2012-07-20 08:32:55 +0000
-+++ filter/pdftoopvp/pdftoopvp.cxx	2013-08-01 15:48:06 +0000
-@@ -112,8 +112,13 @@
- #define MAX_OPVP_OPTIONS 20
- 
- #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+void CDECL myErrorFun(void *data, ErrorCategory category,
-+    Goffset pos, char *msg)
-+#else
- void CDECL myErrorFun(void *data, ErrorCategory category,
-     int pos, char *msg)
-+#endif
- {
-   if (pos >= 0) {
-     fprintf(stderr, "ERROR (%d): ", pos);
-@@ -619,9 +624,6 @@
-     char *s;
-     GooString name;
-     int fd;
--    Object obj;
--    BaseStream *str;
--    FILE *fp;
-     char buf[4096];
-     int n;
- 
-@@ -633,8 +635,6 @@
-     }
-     name.append("/XXXXXX");
-     fd = mkstemp(name.getCString());
--    /* remove name */
--    unlink(name.getCString());
-     if (fd < 0) {
-       opvpError(-1,"Can't create temporary file");
-       exitCode = 2;
-@@ -675,23 +675,10 @@
- 	goto err0;
-       }
-     }
--    if (lseek(fd,0,SEEK_SET) < 0) {
--	opvpError(-1,"Can't rewind temporary file");
--	close(fd);
--	exitCode = 2;
--	goto err0;
--    }
--
--    if ((fp = fdopen(fd,"rb")) == 0) {
--	opvpError(-1,"Can't fdopen temporary file");
--	close(fd);
--	exitCode = 2;
--	goto err0;
--    }
--
--    obj.initNull();
--    str = new FileStream(fp,0,gFalse,0,&obj);
--    doc = new PDFDoc(str);
-+    close(fd);
-+    doc = new PDFDoc(&name);
-+    /* remove name */
-+    unlink(name.getCString());
-   } else {
-     /* no jcl check */
-     doc = new PDFDoc(fileName.copy());
-
-=== modified file 'filter/pdftoraster.cxx'
---- filter/pdftoraster.cxx	2013-07-30 17:00:43 +0000
-+++ filter/pdftoraster.cxx	2013-08-01 15:48:06 +0000
-@@ -186,8 +186,13 @@
- }
- 
- #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+void CDECL myErrorFun(void *data, ErrorCategory category,
-+    Goffset pos, char *msg)
-+#else
- void CDECL myErrorFun(void *data, ErrorCategory category,
-     int pos, char *msg)
-+#endif
- {
-   if (pos >= 0) {
-     fprintf(stderr, "ERROR (%d): ", pos);
-@@ -1776,19 +1781,15 @@
-   if (argc == 6) {
-     /* stdin */
-     int fd;
--    Object obj;
--    BaseStream *str;
--    FILE *fp;
-+    char name[BUFSIZ];
-     char buf[BUFSIZ];
-     int n;
- 
--    fd = cupsTempFd(buf,sizeof(buf));
-+    fd = cupsTempFd(name,sizeof(name));
-     if (fd < 0) {
-       pdfError(-1,const_cast<char *>("Can't create temporary file"));
-       exit(1);
-     }
--    /* remove name */
--    unlink(buf);
- 
-     /* copy stdin to the tmp file */
-     while ((n = read(0,buf,BUFSIZ)) > 0) {
-@@ -1798,23 +1799,10 @@
- 	exit(1);
-       }
-     }
--    if (lseek(fd,0,SEEK_SET) < 0) {
--        pdfError(-1,const_cast<char *>("Can't rewind temporary file"));
--        close(fd);
--	exit(1);
--    }
--
--    if ((fp = fdopen(fd,"rb")) == 0) {
--        pdfError(-1,const_cast<char *>("Can't fdopen temporary file"));
--        close(fd);
--	exit(1);
--    }
--
--    obj.initNull();
--    parsePDFTOPDFComment(fp);
--    rewind(fp);
--    str = new FileStream(fp,0,gFalse,0,&obj);
--    doc = new PDFDoc(str);
-+    close(fd);
-+    doc = new PDFDoc(new GooString(name));
-+    /* remove name */
-+    unlink(name);
-   } else {
-     GooString *fileName = new GooString(argv[6]);
-     /* argc == 7 filenmae is specified */
-
-=== modified file 'filter/pdftoijs.cxx'
---- filter/pdftoijs.cxx	2013-08-01 15:48:06 +0000
-+++ filter/pdftoijs.cxx	2013-08-02 13:52:04 +0000
-@@ -79,7 +79,11 @@
- #endif
- {
-   if (pos >= 0) {
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+    fprintf(stderr, "ERROR (%lld): ", pos);
-+#else
-     fprintf(stderr, "ERROR (%d): ", pos);
-+#endif
-   } else {
-     fprintf(stderr, "ERROR: ");
-   }
-
-=== modified file 'filter/pdftoraster.cxx'
---- filter/pdftoraster.cxx	2013-08-02 11:13:38 +0000
-+++ filter/pdftoraster.cxx	2013-08-02 13:52:04 +0000
-@@ -199,7 +199,11 @@
- #endif
- {
-   if (pos >= 0) {
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+    fprintf(stderr, "ERROR (%lld): ", pos);
-+#else
-     fprintf(stderr, "ERROR (%d): ", pos);
-+#endif
-   } else {
-     fprintf(stderr, "ERROR: ");
-   }
-
-=== modified file 'filter/pdftoopvp/pdftoopvp.cxx'
---- filter/pdftoopvp/pdftoopvp.cxx	2013-08-01 15:48:06 +0000
-+++ filter/pdftoopvp/pdftoopvp.cxx	2013-08-02 14:46:20 +0000
-@@ -121,7 +121,11 @@
- #endif
- {
-   if (pos >= 0) {
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+    fprintf(stderr, "ERROR (%lld): ", pos);
-+#else
-     fprintf(stderr, "ERROR (%d): ", pos);
-+#endif
-   } else {
-     fprintf(stderr, "ERROR: ");
-   }
-
diff --git a/libre/distcc-nozeroconf/PKGBUILD b/libre/distcc-nozeroconf/PKGBUILD
deleted file mode 100644
index 2537b2f87..000000000
--- a/libre/distcc-nozeroconf/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 90657 2013-05-13 14:21:37Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-_pkgname=distcc
-pkgname=distcc-nozeroconf
-pkgver=3.1
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-pkgrel=11
-pkgdesc="A distributed C, C++, Obj C compiler (without zeroconf support)"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/distcc/"
-license=('GPL')
-depends=('gcc' 'popt')
-makedepends=('gtk2' 'pkgconfig' 'python2')
-optdepends=('gtk2: for distccmon-gnome'
-	    'python2')
-backup=('etc/conf.d/distccd'
-	'etc/distcc/hosts')
-source=(http://distcc.googlecode.com/files/${_pkgname}-${pkgver}.tar.bz2
-	distccd.conf.d
-	distccd.service)
-md5sums=('a1a9d3853df7133669fffec2a9aab9f3'
-         '239aae53250e3e35288cba566bc0bbf1'
-         '09f0688da9c1840e518d2593bd5c3830')
-
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  [ -f Makefile ] || PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-	--with-gtk \
-	--sysconfdir=/etc \
-	--mandir=/usr/share/man \
-	--without-avahi
-
-  make WERROR_CFLAGS= INCLUDESERVER_PYTHON=/usr/bin/python2
-}
-
-check() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-#  make TEST_PYTHON=/usr/bin/python2 check
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}/" INCLUDESERVER_PYTHON=/usr/bin/python2 install
-  install -D -m644 ${srcdir}/distccd.conf.d ${pkgdir}/etc/conf.d/distccd
-
-  install -d ${pkgdir}/usr/lib/${_pkgname}/bin
-  ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/cc
-  ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/gcc
-  ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/g++
-  ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/c++
-  ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/cpp
-
-  install -Dm0644 $srcdir/distccd.service $pkgdir/usr/lib/systemd/system/distccd.service
-}
diff --git a/libre/distcc-nozeroconf/distccd.conf.d b/libre/distcc-nozeroconf/distccd.conf.d
deleted file mode 100644
index 2fe7a4cc6..000000000
--- a/libre/distcc-nozeroconf/distccd.conf.d
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Parameters to be passed to distccd
-#
-# You must explicitly add IPs (or subnets) that are allowed to connect,
-# using the --allow switch.  See the distccd manpage for more info.
-#
-DISTCC_ARGS="--allow 127.0.0.1"
diff --git a/libre/distcc-nozeroconf/distccd.service b/libre/distcc-nozeroconf/distccd.service
deleted file mode 100644
index 0b72fecc3..000000000
--- a/libre/distcc-nozeroconf/distccd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=A distributed C/C++ compiler
-Documentation=man:distccd(1)
-After=network.target
-
-[Service]
-User=nobody
-EnvironmentFile=/etc/conf.d/distccd
-ExecStart=/usr/bin/distccd --no-detach --daemon $DISTCC_ARGS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/dkms-libre/01-broken-uninstall.patch b/libre/dkms-libre/01-broken-uninstall.patch
deleted file mode 100644
index a859efabe..000000000
--- a/libre/dkms-libre/01-broken-uninstall.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/dkms b/dkms
-index abb01a4..265b69a 100644
---- a/dkms
-+++ b/dkms
-@@ -162,11 +162,14 @@ set_kernel_source_dir()
- 
- # A little test function for DKMS commands that only work on one kernel.
- have_one_kernel() {
--    (( ${#kernelver[@]} > 1 )) && \
--	die 4 $"The action $1 does not support multiple kernel version" \
--	$"parameters on the command line."
--    [[ $all ]] && die 5 $"The action $1 does not support the --all" \
--	$"parameter."
-+       if (( ${#kernelver[@]} != 1 )); then
-+	  die 4 $"The action $1 does not support multiple kernel version" \
-+	  $"parameters on the command line."
-+       fi
-+       if [[ $all ]]; then  
-+           die 5 $"The action $1 does not support the --all" \
-+	   $"parameter."
-+       fi 
- }
diff --git a/libre/dkms-libre/02-no-kernel-hook.patch b/libre/dkms-libre/02-no-kernel-hook.patch
deleted file mode 100644
index f01f22002..000000000
--- a/libre/dkms-libre/02-no-kernel-hook.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Author: Sébastien Luttringer <seblu@seblu.net>
---- a/Makefile	2011-12-07 19:23:51.000000000 +0100
-+++ b/Makefile	2013-05-13 00:48:19.620000000 +0200
-@@ -46,9 +46,6 @@
- 	gzip -c -9 dkms.8 > $(MAN)/dkms.8.gz
- 	chmod 0644 $(MAN)/dkms.8.gz
- 	touch --reference=dkms.8 $(MAN)/dkms.8.gz
--	mkdir   -p -m 0755 $(KCONF)/prerm.d $(KCONF)/postinst.d
--	install -p -m 0755 kernel_prerm.d_dkms  $(KCONF)/prerm.d/dkms
--	install -p -m 0755 kernel_postinst.d_dkms $(KCONF)/postinst.d/dkms
- 
- DOCFILES=sample.spec sample.conf AUTHORS COPYING README.dkms sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec
- 
diff --git a/libre/dkms-libre/PKGBUILD b/libre/dkms-libre/PKGBUILD
deleted file mode 100644
index 0f3f66c38..000000000
--- a/libre/dkms-libre/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $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@parabola.nu>
-
-_pkgname=dkms
-pkgname=dkms-libre
-pkgver=2.2.0.3
-pkgrel=14
-pkgdesc='Dynamic Kernel Modules System, with linux-libre-headers and linux-libre-lts-headers recommendation'
-arch=('any')
-url='http://linux.dell.com/dkms/'
-license=('GPL2')
-depends=('bash' 'kmod' 'gcc' 'make' 'patch')
-optdepends=('linux-libre-headers: build modules against linux-libre kernel'
-            'linux-libre-lts-headers: build modules against linux-libre-lts kernel')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-backup=('etc/dkms/framework.conf' 'etc/default/dkms')
-install=$_pkgname.install
-source=("http://linux.dell.com/$_pkgname/permalink/$_pkgname-$pkgver.tar.gz"
-        "$_pkgname.default"
-        "$_pkgname.service"
-        "$_pkgname.systemd"
-        '01-broken-uninstall.patch'
-        '02-no-kernel-hook.patch')
-md5sums=('11a8aaade2ebec2803653837c7593030'
-         '33be2fbf1bcc1b3fb2f38d9e7eaa809d'
-         '02e9744e3fdc3d2f68e46966fb32e260'
-         '267632312aa52a190ec0db0758920dd3'
-         '2dfd8656dc79afd229c1481a90fb645b'
-         '82d520c39c99c34977e48b313a189c6c')
-
-prepare() {
-  # patch
-  patches=("$srcdir"/*.patch)
-  cd $_pkgname-$pkgver
-  for p in "${patches[@]}"; do
-    msg2 "Apply patch: ${p##*/}"
-    patch -p1 -i "$p"
-  done
-  # /usr move
-  msg2 '/usr move patching'
-  for i in dkms{,_framework.conf,.bash-completion,.8,_common.postinst}; do
-    sed -ri 's,/lib/modules,/usr/lib/modules,g' "$i"
-  done
-  # fix hardcoded paths
-  sed -i "s|/sbin/depmod|depmod|" dkms
-}
-
-package() {
-  # systemd
-  install -D -m 644 $_pkgname.service "$pkgdir/usr/lib/systemd/system/$_pkgname.service"
-  install -D -m 755 $_pkgname.systemd "$pkgdir/usr/lib/systemd/scripts/$_pkgname"
-  install -D -m 644 $_pkgname.default "$pkgdir/etc/default/$_pkgname"
-  # upstream installer
-  cd $_pkgname-$pkgver
-  make \
-    DESTDIR="$pkgdir" \
-    SBIN="$pkgdir/usr/bin" \
-    BASHDIR="$pkgdir/usr/share/bash-completion/completions" \
-    install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/dkms-libre/dkms.default b/libre/dkms-libre/dkms.default
deleted file mode 100644
index d430855bb..000000000
--- a/libre/dkms-libre/dkms.default
+++ /dev/null
@@ -1,9 +0,0 @@
-# vim:set ts=2 sw=2 ft=sh noet:
-
-# With LOAD set to yes, modules listed as installed will be loaded with
-# systemctl start dkms.service. Default is yes.
-LOAD=yes
-
-# With UNLOAD set to yes, modules listed as installed will be unloaded with
-# systemctl stop dkms.service. Default is no.
-UNLOAD=no
diff --git a/libre/dkms-libre/dkms.hook b/libre/dkms-libre/dkms.hook
deleted file mode 100644
index 3d656e32d..000000000
--- a/libre/dkms-libre/dkms.hook
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-dkms_autoinstall() {
-  export TMPDIR=/dev/shm
-  status 'Starting DKMS autoinstall' dkms autoinstall
-  unset TMPDIR
-}
-
-add_hook single_udevlaunched dkms_autoinstall
-add_hook sysinit_udevlaunched dkms_autoinstall
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/dkms-libre/dkms.install b/libre/dkms-libre/dkms.install
deleted file mode 100644
index 4dd18dd19..000000000
--- a/libre/dkms-libre/dkms.install
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  if [ "$(vercmp $2 2.2.0.3-12)" -le 0 ]; then
-    cat << EOF
-===> dkms startup config file moved to /etc/default/dkms
-EOF
-    fi
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/dkms-libre/dkms.service b/libre/dkms-libre/dkms.service
deleted file mode 100644
index 0e679a949..000000000
--- a/libre/dkms-libre/dkms.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Dynamic Kernel Modules System
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/lib/systemd/scripts/dkms start
-ExecStop=/usr/lib/systemd/scripts/dkms stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/dkms-libre/dkms.systemd b/libre/dkms-libre/dkms.systemd
deleted file mode 100644
index 03e6bfe97..000000000
--- a/libre/dkms-libre/dkms.systemd
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-. /etc/default/dkms
-
-# list dkms modules for the current running kernel
-list_dkms_modules() {
-  shopt -s nullglob
-  declare -a DKMS_MOULES
-  # dkms status needs uname -r to list correctly intalled version for current kernel
-  local modules_path=($(dkms status -k "$(uname -r)"|sed -rn 's#(.*), (.*), (.*), (.*): installed#\1/\2/\3/\4#p'))
-  for p in "${modules_path[@]}"; do
-    for m in /var/lib/dkms/"$p"/module/*.ko{,gz}; do
-      m=${m##*/}
-      m=${m%.gz}
-      m=${m%.ko}
-      DKMS_MODULES+=("$m")
-    done
-  done
-}
-
-# load installed kernel modules for the current kernel version
-load_dkms_modules() {
-  local ret=0
-  list_dkms_modules
-  for m in "${DKMS_MODULES[@]}"; do
-    modprobe "$m"
-    ret+=$?
-  done
-  return $ret
-}
-
-# unload installed kernel modules for the current kernel version
-unload_dkms_modules() {
-  list_dkms_modules
-  # ask for removal
-  for m in "${DKMS_MODULES[@]}"; do
-    modprobe --remove --quiet "$m"
-  done
-  # check modules are unloaded
-  # sometimes modprobe -r fail but modules are removed
-  for m in "${DKMS_MODULES[@]}"; do
-    [[ -e /sys/modules/$m ]] && return 1
-  done
-  return 0
-}
-
-case "$1" in
-  start)
-    dkms autoinstall -k "$(uname -r)"
-    [[ $LOAD =~ [Yy][Ee][Ss] ]] && load_dkms_modules
-  ;;
-  stop)
-    [[ $UNLOAD =~ [Yy][Ee][Ss] ]] && unload_dkms_modules
-  ;;
-  *)
-    echo "usage: $0 {start|stop}" >&2
-  ;;
-esac
-
-:
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD
deleted file mode 100644
index c08273344..000000000
--- a/libre/doublecmd-libre/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# vim:set ft=sh:
-# $Id: PKGBUILD 103163 2013-12-28 11:01:37Z idevolder $
-# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
-# Contributor: (sirocco AT ngs.ru)
-
-_pkgbase=doublecmd
-pkgbase=doublecmd-libre
-pkgname=('doublecmd-libre-gtk2' 'doublecmd-libre-qt')
-pkgver=0.5.8
-_helpver=0.5.5
-pkgrel=1
-url="http://doublecmd.sourceforge.net/"
-arch=('i686' 'x86_64')
-license=('GPL')
-install="$_pkgbase.install"
-provides=("$_pkgbase")
-makedepends=('lazarus' 'qt4pas' 'gtk2')
-optdepends=(
-	'lua51: scripting'
-	'p7zip: support for 7zip archives'
-	'unar: support for rar archives'
-)
-source=(
-	"http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-$pkgver-src.tar.gz"
-	"http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-help-$_helpver-src.tar.gz"
-)
-
-build() {
-	cp -a $_pkgbase-$pkgver $_pkgbase-gtk
-	cp -a $_pkgbase-$pkgver $_pkgbase-qt
-
-	cd "$srcdir/$_pkgbase-gtk"
-	if [ "$CARCH" = "i686" ]; then
-		sed -e '/fPIC/d' -i "$srcdir/$_pkgbase-gtk/components/doublecmd/doublecmd_common.lpk"
-	fi
-	sed -e 's/\(export\ lazbuild=\).*/\1"$(which\ lazbuild) --lazarusdir=\/usr\/lib\/lazarus"/' -i build.sh
-	./build.sh beta gtk2
-
-	cd "$srcdir/$_pkgbase-qt"
-	# dont use fPIC on i686
-	if [ "$CARCH" = "i686" ]; then
-		sed -e '/fPIC/d' -i "$srcdir/$_pkgbase-qt/components/doublecmd/doublecmd_common.lpk"
-	fi
-	sed -e 's/\(export\ lazbuild=\).*/\1"$(which\ lazbuild) --lazarusdir=\/usr\/lib\/lazarus"/' -i build.sh
-	./build.sh beta qt
-}
-
-package_doublecmd-libre-gtk2() {
-	pkgdesc="twin-panel (commander-style) file manager (GTK), with unar recommendation"
-	depends=('gtk2')
-	conflicts=('doublecmd-qt' 'doublecmd-gtk2' 'doublecmd-gtk2-libre')
-	replaces=('doublecmd-gtk2' 'doublecmd-gtk2-libre')
-	provides=("doublecmd-gtk2=${pkgver}")
-	cd "$srcdir/$_pkgbase-gtk"
-	sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh
-	./install/linux/install.sh --install-prefix="$pkgdir"
-
-	# install doc
-	cd "$srcdir/$_pkgbase-help-$_helpver"
-	cp -a * "$pkgdir/usr/share/$_pkgbase/doc/"
-}
-
-package_doublecmd-libre-qt() {
-	pkgdesc="twin-panel (commander-style) file manager (QT), with unar recommendation"
-	depends=('qt4pas')
-	conflicts=('doublecmd-gtk2' 'doublecmd-qt' 'doublecmd-qt-libre')
-	replaces=('doublecmd-qt' 'doublecmd-qt-libre')
-	provides=("doublecmd-qt=${pkgver}")
-	cd "$srcdir/$_pkgbase-qt"
-	sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh
-	./install/linux/install.sh --install-prefix="$pkgdir"
-
-	# install doc
-	cd "$srcdir/$_pkgbase-help-$_helpver"
-	cp -a * "$pkgdir/usr/share/$_pkgbase/doc/"
-}
-
-sha256sums=('bfa85693b6cc06b7fd28ec8bd443ad9fb9d79d27a541e4f4d54bb9da2fb052ea'
-            '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf')
diff --git a/libre/doublecmd-libre/doublecmd.install b/libre/doublecmd-libre/doublecmd.install
deleted file mode 100644
index c27b5bb23..000000000
--- a/libre/doublecmd-libre/doublecmd.install
+++ /dev/null
@@ -1,34 +0,0 @@
-update_icons() {
-
-	# Setup Menus
-	if which update-desktop-database
-	then
-		update-desktop-database -q /usr/share/applications > /dev/null 2>&1
-	fi
-
-	# Setup MIME types
-	if which update-mime-database
-	then
-		update-mime-database /usr/share/mime > /dev/null 2>&1
-	fi
-
-	# Setup Icons
-	touch -c /usr/share/icons/hicolor
-	if which gtk-update-icon-cache
-	then
-		gtk-update-icon-cache -tq /usr/share/icons/hicolor > /dev/null 2>&1
-	fi
-
-}
-
-post_install() {
-	update_icons
-}
-
-post_upgrade() {
-	update_icons
-}
-
-post_remove() {
-	update_icons
-}
diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD
index 806194577..99681df3e 100644
--- a/libre/dpkg/PKGBUILD
+++ b/libre/dpkg/PKGBUILD
@@ -12,20 +12,38 @@ pkgname=(dpkg-devtools perl-dpkg)
 pkgdesc="Debian Package manager and utilities"
 license=('GPL2')
 
-pkgver=1.16.10
+pkgver=1.17.6
 url="http://packages.debian.org/source/sid/dpkg"
-_debrepo=http://ftp.debian.org/debian/pool/main
-
-pkgrel=1.3
 
-arch=('i686' 'x86_64' 'mips64el')
-depends=('bzip2' 'xz' 'zlib' 'ncurses')
-checkdepends=('perl-test-pod')
-makedepends=('perl-io-string' 'perl-timedate')
+pkgrel=1
+options=('staticlibs')
+
+if ! type in_array &>/dev/null; then
+	in_array() {
+		local i
+		for i in "${@:2}"; do [[ $i = "$1" ]] && return 0; done
+		return 1
+	}
+fi
+
+# The architecture dependent bits aren't packaged with the reduced pkgname
+arch=('any')
+for _pkg in dpkg dselect libdpkg; do
+	if in_array "$_pkg" "${pkgname[@]}"; then
+		arch=('i686' 'x86_64' 'mips64el')
+	fi
+done
+unset _pkg
+
+makedepends=('bzip2' 'xz' 'zlib' 'ncurses')
+checkdepends=('gzip' 'perl-test-pod' 'perl-io-string' 'perl-timedate')
 
-_debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; }
-source=("$(_debfile ${pkgbase} ${pkgver}).tar.xz"
+_debrepo=http://ftp.debian.org/debian/pool/main
+_debfile() { echo "${_debrepo}/${1:0:1}/${1%_*}/${1}"; }
+source=("$(_debfile ${pkgbase}_${pkgver}).tar.xz"
         dpkg-gzip-rsyncable.patch)
+md5sums=('c87f2ae291d460015353e01d121bea85'
+         '9c77a553e3219dcd29b7ff44b89d718d')
 
 ######################################################################
 
@@ -34,97 +52,104 @@ source=("$(_debfile ${pkgbase} ${pkgver}).tar.xz"
 # Shame on the dpkg developers for not putting that logic into the build system.
 _destdir="$pkgbase-$pkgver/debian/pkg-makepkg"
 _debhelper_install() {
-  local debname=$1
-  cd "$srcdir/$_destdir"
-
-  # main files
-  sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install \
-    | while read pattern dest; do
-    if [[ -z $dest ]]; then
-      for file in $pattern; do
-        install -d "$pkgdir/${file%/*}"
-        cp -a "$file" "$pkgdir/$file" || true
-      done
-    else
-      install -d "$pkgdir/$dest/"
-      cp -a "$pattern" "$pkgdir/$dest/" || true
-    fi
-  done
-
-  # manpages
-  sed -e 's|^debian/tmp/||' -e '/^\s*$/d' ../$debname.manpages 2>/dev/null \
-    | while read pattern; do
-    for file in $pattern; do
-      install -d "$pkgdir/${file%/*}"
-      cp -a "$file" "$pkgdir/$file" || true
-    done
-  done
-
-  # other documentation
-  install -d "$pkgdir/usr/share/doc/$pkgname/"
-  sed '/^\s*$/d' ../$debname.docs  2>/dev/null \
-    | while read file; do
-    gzip \
-      < "$srcdir/$pkgbase-$pkgver/$file" \
-      > "$pkgdir/usr/share/doc/$pkgname/${file##*/}.gz"
-  done
-
-  # symlinks
-  sed '/^\s*$/d' ../$debname.links  2>/dev/null \
-    | while read file link; do
-    ln -s "/$file" "$pkgdir/$link"
-  done
+	local debname=$1
+	cd "$srcdir/$_destdir"
+
+	# main files
+	sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install |
+	while read pattern dest; do
+		if [[ -z $dest ]]; then
+			for file in $pattern; do
+				install -d "$pkgdir/${file%/*}"
+				cp -a "$file" "$pkgdir/$file" || true
+			done
+		else
+			install -d "$pkgdir/$dest/"
+			cp -a "$pattern" "$pkgdir/$dest/" || true
+		fi
+	done
+
+	# manpages
+	sed -e 's|^debian/tmp/||' -e '/^\s*$/d' ../$debname.manpages 2>/dev/null |
+	while read pattern; do
+		for file in $pattern; do
+			install -d "$pkgdir/${file%/*}"
+			cp -a "$file" "$pkgdir/$file" || true
+		done
+	done
+
+	# other documentation
+	sed '/^\s*$/d' ../$debname.docs 2>/dev/null |
+	while read file; do
+		install -d "$pkgdir/usr/share/doc/$pkgname/"
+		gzip \
+			< "$srcdir/$pkgbase-$pkgver/$file" \
+			> "$pkgdir/usr/share/doc/$pkgname/${file##*/}.gz"
+	done
+
+	# symlinks
+	sed '/^\s*$/d' ../$debname.links 2>/dev/null |
+	while read file link; do
+		ln -s "/$file" "$pkgdir/$link"
+	done
 }
 
 ######################################################################
 
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  patch -Np0 -i "${srcdir}/dpkg-gzip-rsyncable.patch"
+prepare() {
+	cd "${srcdir}/${pkgbase}-${pkgver}"
+	# {Arch Linux,Parabola}'s gzip doesn't support --rsyncable
+	patch -Np1 -i "${srcdir}/dpkg-gzip-rsyncable.patch"
+}
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-zlib --with-bz2 --with-liblzma
-  make
-  make DESTDIR="$srcdir/$_destdir" install
+build() {
+	cd "${srcdir}/${pkgbase}-${pkgver}"
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--sysconfdir=/etc \
+		--sbindir=/sbin \
+		--localstatedir=/var \
+		--with-zlib \
+		--with-liblzma \
+		--with-bz2
+	make
+	make DESTDIR="$srcdir/$_destdir" install
 }
 
 check() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make check
+	cd "${srcdir}/${pkgbase}-${pkgver}"
+	make check
 }
 
 package_dpkg() {
-  pkgdesc="Debian Package manager"
-  provides+=(start-stop-daemon)
-  conflicts+=(start-stop-daemon)
-  _debhelper_install dpkg
+	pkgdesc="Debian Package manager"
+	depends=('zlib' 'xz' 'bzip2')
+	_debhelper_install dpkg
 }
 
 package_dpkg-devtools() {
-  pkgdesc="Debian Package development tools"
-  arch=(any)
-  depends+=(perl-dpkg)
-  _debhelper_install dpkg-dev
+	pkgdesc="Debian Package development tools"
+	arch=('any')
+	depends=('perl-dpkg')
+	_debhelper_install dpkg-dev
 }
 
 package_dselect() {
-  pkgdesc="Debian Package manager high-level interface"
-  _debhelper_install dselect
+	pkgdesc="Debian Package manager high-level interface"
+	depends=('dpkg' 'perl' 'ncurses')
+	_debhelper_install dselect
 }
 
 package_libdpkg() {
-  pkgdesc="Debian Package manager library (static)"
-  _debhelper_install libdpkg-dev
+	pkgdesc="Debian Package manager library (static)"
+	_debhelper_install libdpkg-dev
 }
 
 package_perl-dpkg() {
-  pkgdesc="Debian Package perl modules"
-  arch=(any)
-  _debhelper_install libdpkg-perl
+	pkgdesc="Debian Package Perl modules"
+	arch=('any')
+	depends=('perl-timedate' 'gzip' 'bzip2' 'xz')
+	_debhelper_install libdpkg-perl
 }
-
-md5sums=('4df9319b2d17e19cdb6fe94dacee44da'
-         '5ab63758999e9bb10f84bce79a0307b2'
-         '74b7ce3045690a8fc290104f10cf8d42')
-md5sums=('a20a06a5272717274a8b009368f237da'
-         '5ab63758999e9bb10f84bce79a0307b2')
diff --git a/libre/dpkg/compare b/libre/dpkg/compare
deleted file mode 100755
index 4556440a5..000000000
--- a/libre/dpkg/compare
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-# compare the packages extracted in pkg/ to the packages from debian
-
-_check() {
-	local pacpkg=$1
-	local debpkg=$2
-
-	libremessages msg "dpkg:$debpkg -> pacman:$pacpkg"
-
-	make -f compare.mk tmp/$pacpkg.pacman.filelist tmp/$debpkg.debian.filelist &>/dev/null
-
-	echo -e 'pacman\tdpkg'
-	comm -3 \
-		<(sed -e 's|\.gz$||' tmp/$pacpkg.pacman.filelist|sort) \
-		<(sed -e 's|\.gz$||' -e '/^usr\/share\/man\/..\/man.\//d' -e 's|usr/share/perl5/|&vendor_perl/|' -e "s|$debpkg|$pacpkg|g" tmp/$debpkg.debian.filelist|sort)
-}
-
-mkdir -p tmp
-
-_check dpkg dpkg
-_check dpkg-devtools dpkg-dev
-_check dselect dselect
-_check libdpkg libdpkg-dev
-_check perl-dpkg libdpkg-perl
-
-rm -rf tmp
diff --git a/libre/dpkg/compare.mk b/libre/dpkg/compare.mk
deleted file mode 100644
index 88219f283..000000000
--- a/libre/dpkg/compare.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/make -f
-# Assist file for ./compare
-
-tmp/%.debian.filelist:
-	curl http://packages.debian.org/sid/all/$*/filelist|sed -n "/<pre>/,/<\/pre>/{ s|.*<pre>||; s|</pre>.*||; /./p }"|sed 's|/||'|sort > $@
-
-tmp/%.pacman.filelist:
-	( cd pkg/$* && find * -not -type d; ) | sort > $@
diff --git a/libre/dpkg/dpkg-gzip-rsyncable.patch b/libre/dpkg/dpkg-gzip-rsyncable.patch
index 3daf6d76e..187633874 100644
--- a/libre/dpkg/dpkg-gzip-rsyncable.patch
+++ b/libre/dpkg/dpkg-gzip-rsyncable.patch
@@ -1,11 +1,12 @@
---- ./scripts/Dpkg/Compression.pm.orig	2012-04-27 04:49:02.000000000 +0200
-+++ ./scripts/Dpkg/Compression.pm	2012-05-27 22:23:18.530628795 +0200
-@@ -52,7 +52,7 @@
+diff -ruN dpkg-1.17.6.orig/scripts/Dpkg/Compression.pm dpkg-1.17.6/scripts/Dpkg/Compression.pm
+--- dpkg-1.17.6.orig/scripts/Dpkg/Compression.pm	2014-01-15 09:02:16.000000000 -0500
++++ dpkg-1.17.6/scripts/Dpkg/Compression.pm	2014-01-19 23:22:39.771215424 -0500
+@@ -50,7 +50,7 @@
  my $COMP = {
-     "gzip" => {
- 	"file_ext" => "gz",
--	"comp_prog" => [ "gzip", "--no-name", "--rsyncable" ],
-+	"comp_prog" => [ "gzip", "--no-name" ],
- 	"decomp_prog" => [ "gunzip" ],
- 	"default_level" => 9,
+     gzip => {
+ 	file_ext => 'gz',
+-	comp_prog => [ 'gzip', '--no-name', '--rsyncable' ],
++	comp_prog => [ 'gzip', '--no-name' ],
+ 	decomp_prog => [ 'gunzip' ],
+ 	default_level => 9,
      },
diff --git a/libre/dvdrip-libre/PKGBUILD b/libre/dvdrip-libre/PKGBUILD
deleted file mode 100644
index 2f706868a..000000000
--- a/libre/dvdrip-libre/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Fredrik Hammar <Horney_C86@Hotmail.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-_pkgname=dvdrip
-pkgname=dvdrip-libre
-pkgver=0.98.11
-pkgrel=10.1
-pkgdesc="A Gtk frontend for transcode writen in Perl, without opcional hal and unfree rar dependencies"
-arch=('i686' 'x86_64' 'mips64el')
-license=('custom')
-url="http://www.exit1.org/${_pkgname}/"
-install=${_pkgname}.install
-depends=('perl-gtk2-ex-formfactory' 'transcode' 'imagemagick'
-         'perl-libintl-perl' 'desktop-file-utils' 'perl-event-execflow')
-optdepends=('xvid4conf: xvid4 configuration tool'
-            'lsdvd: Needed for faster DVD TOC reading'
-            'mplayer-libre: Needed for subtitle vobsub viewing'
-            'mplayer-vaapi-libre: Needed for subtitle vobsub viewing'
-            'mplayer2: Needed for subtitle vobsub viewing'
-            'ogmtools: Needed for OGG/Vorbis and for chapter progress bar'
-            'xine-ui: Can be used to view DVD'\''s/files'
-            'fping: Only for cluster mode master')
-source=("http://www.exit1.org/${_pkgname}/dist/${_pkgname}-${pkgver}.tar.gz"
-        "${_pkgname}.desktop" "libre.patch")
-options=('!emptydirs' '!makeflags')
-replaces=("${_pkgname}")
-conflicts=("${_pkgname}")
-provides=("${_pkgname}=${pkgver}")
-md5sums=('6dfa4199d451757a37eea233a07da4c0'
-         'e91cf411928fd0500d07a0022b4ef546'
-         'bc006d3b3447f8b62ae6ba29773a064b')
-
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  patch -Np1 -i "$srcdir/libre.patch"
-
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  make install DESTDIR="${pkgdir}"
-
-  # remove perllocal.pod and .packlist
-  find ${pkgdir} -name perllocal.pod -delete
-  find ${pkgdir} -name .packlist -delete
-
-  install -Dm644 ${srcdir}/${_pkgname}.desktop "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-  install -Dm 644 COPYRIGHT "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
-}
diff --git a/libre/dvdrip-libre/dvdrip.desktop b/libre/dvdrip-libre/dvdrip.desktop
deleted file mode 100644
index dd19b4aae..000000000
--- a/libre/dvdrip-libre/dvdrip.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=dvd::rip
-Comment=DVD Ripper and Encoder - Backup and compression utility for DVDs
-Exec=/usr/bin/vendor_perl/dvdrip
-Icon=/usr/share/perl5/vendor_perl/Video/DVDRip/icon.xpm
-Terminal=false
-Type=Application
-Categories=Application;AudioVideo;Video;
diff --git a/libre/dvdrip-libre/dvdrip.install b/libre/dvdrip-libre/dvdrip.install
deleted file mode 100644
index e111ef946..000000000
--- a/libre/dvdrip-libre/dvdrip.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/libre/dvdrip-libre/libre.patch b/libre/dvdrip-libre/libre.patch
deleted file mode 100644
index cc24ef467..000000000
--- a/libre/dvdrip-libre/libre.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Naur dvdrip-0.98.11.orig/lib/Video/DVDRip/Config.pm dvdrip-0.98.11/lib/Video/DVDRip/Config.pm
---- dvdrip-0.98.11.orig/lib/Video/DVDRip/Config.pm	2009-02-28 16:28:00.000000000 -0200
-+++ dvdrip-0.98.11/lib/Video/DVDRip/Config.pm	2012-05-15 15:41:34.554118050 -0300
-@@ -233,13 +233,6 @@
-         ],
-         rules => "executable-command",
-     },
--    rar_command => {
--        label   => __ "rar command (for vobsub compression)",
--        type    => 'string',
--        value   => 'rar',
--        presets => [ 'rar', ],
--        rules   => "executable-command",
--    },
-     base_project_dir => {
-         label => __ "Default data base directory",
-         type  => 'dir',
-@@ -355,7 +348,6 @@
-     __ "Commands" => [
-         qw(
-             play_dvd_command   play_file_command
--            play_stdin_command rar_command
-             )
-     ],
-     __ "Cluster options" => [
-@@ -907,7 +899,6 @@
- sub test_play_dvd_command     { _executable(@_) }
- sub test_play_file_command    { _executable(@_) }
- sub test_play_stdin_command   { _executable(@_) }
--sub test_rar_command          { _executable(@_) }
- sub test_dvd_device           { _exists(@_) }
- sub test_writer_device        { _exists(@_) }
- sub test_base_project_dir     { _abs_and_writable(@_) }
-diff -Naur dvdrip-0.98.11.orig/lib/Video/DVDRip/Depend.pm dvdrip-0.98.11/lib/Video/DVDRip/Depend.pm
---- dvdrip-0.98.11.orig/lib/Video/DVDRip/Depend.pm	2009-02-28 16:28:00.000000000 -0200
-+++ dvdrip-0.98.11/lib/Video/DVDRip/Depend.pm	2012-05-15 15:30:13.506056523 -0300
-@@ -171,22 +171,6 @@
-         min       => "0.15",
-         suggested => "0.15",
-     },
--    rar => {
--        order       => ++$ORDER,
--        command     => Video::DVDRip::Depend->config('rar_command'),
--        comment     => __ "Needed for compressed vobsub subtitles",
--        optional    => 1,
--        version_cmd => "",
--        get_version => sub {
--            my $cmd = Video::DVDRip::Depend->config('rar_command')." '-?'";
--            qx[$cmd 2>&1] =~ /rar\s+(\d+\.\d+(\.\d+)?)/i;
--            return $1;
--        },
--        convert   => 'default',
--        min       => "2.71",
--        max       => "2.99",
--        suggested => "2.71",
--    },
-     mplayer => {
-         order       => ++$ORDER,
-         command     => "mplayer",
-@@ -284,21 +268,6 @@
-         min       => "2.2",
-         suggested => "2.4",
-     },
--    hal => {
--        order       => ++$ORDER,
--        command     => "lshal",
--        comment     => __"Used for DVD device scanning",
--        optional    => 1,
--        version_cmd => "lshal -v",
--        get_version => sub {
--            my ($cmd) = @_;
--            qx[$cmd 2>&1] =~ /version\s+(\d+\.\d+(\.\d+)?)/i;
--            return $1;
--        },
--        convert   => 'default',
--        min       => "0.5",
--        suggested => "0.5.7",
--    },
- );
- 
- sub convert_default {
diff --git a/libre/dvdrtools-libre/PKGBUILD b/libre/dvdrtools-libre/PKGBUILD
deleted file mode 100644
index cf5ce1f4d..000000000
--- a/libre/dvdrtools-libre/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=dvdrtools
-pkgname=dvdrtools-libre
-pkgver=0.3.1
-pkgrel=3.2
-pkgdesc="A fork of cdrtools, with the primary goal of supporting writable DVD drives, without nonfree apple_driver utility"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://savannah.nongnu.org/projects/dvdrtools/"
-license=('GPL2')
-depends=('file' 'bash')
-makedepends=('transcode')
-optdepends=('transcode: video/DVD ripper and encoder for the terminal/console')
-provides=("$_pkgname=$pkgver" 'cdrkit')
-conflicts=("$_pkgname" 'cdrkit')
-replaces=("$_pkgname")
-source=(ftp://ftp.archlinux.org/other/dvdrtools/$_pkgname-$pkgver.tar.gz)
-md5sums=('5707b7e877b853e258cd738938833006')
-
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  # Remove nonfree apple_driver utility
-  rm -rvf {mkisofs/README.hfs_boot,apple_driver{.8,.c,.mk,_man.mk}}
-}
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # Make symlinks for cdrtools compatibility
-  ln -s dvdrecord $pkgdir/usr/bin/cdrecord
-  ln -s dvdrecord $pkgdir/usr/bin/wodim
-  ln -s mkisofs   $pkgdir/usr/bin/genisoimage
-  ln -s mkisofs   $pkgdir/usr/bin/mkhybrid
-  ln -s readcd    $pkgdir/usr/bin/readom
-
-  ln -s dvdrecord.1.gz $pkgdir/usr/share/man/man1/cdrecord.1.gz
-  ln -s dvdrecord.1.gz $pkgdir/usr/share/man/man1/wodim.1.gz
-  ln -s mkisofs.8.gz   $pkgdir/usr/share/man/man8/genisoimage.8.gz
-  ln -s mkisofs.8.gz   $pkgdir/usr/share/man/man8/mkhybrid.8.gz
-  ln -s readcd.1.gz    $pkgdir/usr/share/man/man1/readom.1.gz
-}
diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD
index e16fda010..6bb2845b3 100644
--- a/libre/ecasound-libre/PKGBUILD
+++ b/libre/ecasound-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 199462 2013-11-13 08:34:51Z schiv $
+# $Id: PKGBUILD 204375 2014-01-18 15:02:17Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -6,9 +6,9 @@
 
 _pkgname=ecasound
 pkgname=ecasound-libre
-pkgver=2.9.0
-pkgrel=4
-pkgdesc="A software package designed for multitrack audio processing, without nonfree faac recommendation"
+pkgver=2.9.1
+pkgrel=1
+pkgdesc="Command-line multitrack audio processor, without nonfree faac recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.eca.cx/ecasound/"
 license=('GPL' 'LGPL')
@@ -27,7 +27,7 @@ conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 source=("http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz"
         'ruby2.patch')
-md5sums=('05e7d4664cdf4c7a138c098e9506a551'
+md5sums=('13c7be1e4eddc0bbf3792dc17777e465'
          '6909dbd4f67f76d3bd31ce7c7fe16212')
 
 build() {
diff --git a/libre/ecasound-libre/ruby2.patch b/libre/ecasound-libre/ruby2.patch
deleted file mode 100644
index d55f12140..000000000
--- a/libre/ecasound-libre/ruby2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur ecasound-2.9.0.orig/configure ecasound-2.9.0/configure
---- ecasound-2.9.0.orig/configure	2013-03-26 17:14:51.759045636 +0800
-+++ ecasound-2.9.0/configure	2013-03-26 17:15:50.502060731 +0800
-@@ -6535,7 +6535,7 @@
-   rubyecasound_support=no
-   ECA_S_RUBY_SITEDIR=""
- else
--  ECA_S_RUBY_SITEDIR="`ruby -e 'require "rbconfig"; include Config; print CONFIG["sitedir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`"
-+  ECA_S_RUBY_SITEDIR="`ruby -e 'include RbConfig; print CONFIG["vendordir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`"
- fi
- 
- 
diff --git a/libre/enscript/PKGBUILD b/libre/enscript/PKGBUILD
deleted file mode 100644
index 80d5ebbd8..000000000
--- a/libre/enscript/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 150464 2012-02-18 00:24:06Z allan $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=enscript
-pkgver=1.6.6
-pkgrel=1.1
-pkgdesc="Convert ASCII files to PostScript suitable for printing"
-arch=('i686' 'x86_64' 'mips64el')
-backup=('etc/enscript/enscript.cfg')
-depends=('glibc')
-license=('GPL2' 'custom')
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('3acc242b829adacabcaf28533f049afd')
-url="http://git.savannah.gnu.org/cgit/enscript.git"
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc/enscript --mandir=/usr/share/man \
-    --infodir=/usr/share/info
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr \
-    sysconfdir=$pkgdir/etc/enscript mandir=$pkgdir/usr/share/man \
-    infodir=$pkgdir/usr/share/info install
-  install -D -m644 afm/MustRead.html "${pkgdir}/usr/share/licenses/${pkgname}/MustRead.html"
-}
-
-# vim: ts=2 sw=2 et ft=sh
diff --git a/libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch b/libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
deleted file mode 100644
index e077a15cf..000000000
--- a/libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From d30496f52b85f82947bd07b9bd60f8482843ece8 Mon Sep 17 00:00:00 2001
-From: jordi <jordi@cb4bfb15-1111-0410-82e2-95233c8f1c7e>
-Date: Tue, 5 Jul 2011 09:23:38 +0000
-Subject: [PATCH 1/2] When using Poppler 0.17.0, I needed to swap the blue and
- red channels, otherwise the colors (other than black
- and white) looked wierd.
-
-git-svn-id: svn://svn.emma-soft.com/epdfview/trunk@367 cb4bfb15-1111-0410-82e2-95233c8f1c7e
----
- src/PDFDocument.cxx |   20 ++++++++++++++++++++
- 1 files changed, 20 insertions(+), 0 deletions(-)
-
-diff --git a/src/PDFDocument.cxx b/src/PDFDocument.cxx
-index df5d75f..63b3513 100644
---- a/src/PDFDocument.cxx
-+++ b/src/PDFDocument.cxx
-@@ -20,6 +20,7 @@
- #include <time.h>
- #include <poppler.h>
- #include <unistd.h>
-+#include <algorithm>
- #include "epdfview.h"
- 
- using namespace ePDFView;
-@@ -33,6 +34,24 @@ static PageLayout convertPageLayout (gint pageLayout);
- static PageMode convertPageMode (gint pageMode);
- static gchar *getAbsoluteFileName (const gchar *fileName);
- 
-+namespace
-+{
-+    void
-+    convert_bgra_to_rgba (guint8 *data, int width, int height)
-+    {
-+        using std::swap;
-+
-+        for (int y = 0; y < height; y++)
-+        {
-+            for (int x = 0; x < width; x++)
-+            {
-+                swap(data[0], data[2]);
-+                data += 4;
-+            }
-+        }
-+    }
-+}
-+
- ///
- /// @brief Constructs a new PDFDocument object.
- ///
-@@ -650,6 +669,7 @@ PDFDocument::renderPage (gint pageNum)
-         poppler_page_render (page, context);
-         cairo_destroy(context);
-         cairo_surface_destroy (surface);
-+        convert_bgra_to_rgba(renderedPage->getData (), width, height);
- #else // !HAVE_POPPLER_0_17_0
-         // Create the pixbuf from the data and render to it.
-         GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data (renderedPage->getData (),
--- 
-1.7.7
-
diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD
deleted file mode 100644
index 3a7f2c3bf..000000000
--- a/libre/epdfview-libre/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
-# $Id: PKGBUILD 57042 2011-10-19 06:13:49Z schuay $
-# Maintainer: schuay <jakob.gruber@gmail.com>
-# Contributor: Tom K <tomk@runbox.com>
-# Contributor: Thayer Williams <thayer@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=epdfview-libre
-_pkgname=epdfview
-pkgver=0.1.8
-pkgrel=4
-pkgdesc="A free lightweight PDF document viewer."
-url="http://www.emma-soft.com/projects/epdfview/"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('poppler-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'gtk2' 'xdg-utils')
-makedepends=('pkgconfig')
-provides=('epdfview')
-conflicts=('epdfview')
-replaces=('epdfview')
-install='epdfview.install'
-source=("http://www.emma-soft.com/projects/${_pkgname}/chrome/site/releases/${_pkgname}-${pkgver}.tar.bz2"
-        "${_pkgname}.desktop.patch"
-        "glib2_headers.patch"
-        "0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch"
-	"epdfview-0.1.8-cups-1.6.1.patch")
-md5sums=('e50285b01612169b2594fea375f53ae4'
-         'fbf22bbabdbb7544db615ac5775d57e2'
-         '41b30f53f20472cbc2fcd4eae161125e'
-         '7f9ea101a41f5b4e999fd024f423d41f'
-	 'c4f3c8ee5fa3a00c8e34515b285e1266')
-
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  patch -Np0 -i "${srcdir}/${_pkgname}.desktop.patch"
-  patch -Np1 -i "${srcdir}/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch"
-  patch -Np1 -i "${srcdir}/glib2_headers.patch" # FS#30116
-  patch -Np1 -i "${srcdir}/epdfview-0.1.8-cups-1.6.1.patch"
-  # Use xdg-open as default browser.
-  sed -r '/DEFAULT_EXTERNAL_BROWSER_COMMAND_LINE/s/firefox[^ ]*/xdg-open/' -i src/Config.cxx
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  for size in 24 32 48; do
-      install -Dm644 data/icon_${_pkgname}-${size}.png \
-          "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${_pkgname}.png"
-  done
-}
diff --git a/libre/epdfview-libre/epdfview.desktop.patch b/libre/epdfview-libre/epdfview.desktop.patch
deleted file mode 100644
index d86fc3088..000000000
--- a/libre/epdfview-libre/epdfview.desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/epdfview.desktop.bak	2009-04-05 16:55:56.000000000 -0700
-+++ data/epdfview.desktop	2009-04-05 16:56:33.000000000 -0700
-@@ -7,7 +7,7 @@
- GenericName=PDF Viewer
- GenericName[ca]=Visor PDF
- GenericName[es]=Visor PDF
--Icon=icon_epdfview-48
-+Icon=epdfview
- Name=ePDFViewer
- Name[ca]=ePDFViewer
- Name[es]=ePDFViewer
diff --git a/libre/epdfview-libre/epdfview.install b/libre/epdfview-libre/epdfview.install
deleted file mode 100644
index c317fbaca..000000000
--- a/libre/epdfview-libre/epdfview.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/libre/epdfview-libre/glib2_headers.patch b/libre/epdfview-libre/glib2_headers.patch
deleted file mode 100644
index b5bc5c211..000000000
--- a/libre/epdfview-libre/glib2_headers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/gtk/StockIcons.h b/src/gtk/StockIcons.h
-index c142a7a..58fcf2e 100644
---- a/src/gtk/StockIcons.h
-+++ b/src/gtk/StockIcons.h
-@@ -18,7 +18,7 @@
- #if !defined (__STOCK_ICONS_H__)
- #define __STOCK_ICONS_H__
-
--#include <glib/gmacros.h>
-+#include <glib.h>
-
- G_BEGIN_DECLS
diff --git a/libre/epiphany-libre/PKGBUILD b/libre/epiphany-libre/PKGBUILD
deleted file mode 100644
index 8f1c2a8b6..000000000
--- a/libre/epiphany-libre/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 201443 2013-12-11 19:00:11Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
-
-_pkgname=epiphany
-pkgname=epiphany-libre
-pkgver=3.10.3
-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')
-license=('GPL')
-depends=('libsoup' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk' 'nss' 'iso-codes' 'dconf' 'desktop-file-utils' 'gnome-icon-theme-symbolic' 'gcr' 'gnome-desktop' 'libwnck3' 'gnome-themes-standard')
-makedepends=('intltool' 'itstool' 'docbook-xml' 'startup-notification' 'gobject-introspection')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-options=('!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=('c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7')
-
-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')
-  sed -i 's|http://www[.]google[.]com/search?q=%s[&]amp;ie=UTF-8[&]amp;oe=UTF-8|https://duckduckgo.com/html/?q=%s|g' $(grep -rlI 'http://www[.]google[.]com/search')
-  sed -i 's|http://www[.]google[.]com|https://duckduckgo.com/html|g' $(grep -rlI 'google[.]com')
-  sed -i 's|http://google[.]com|https://duckduckgo.com/html|g' $(grep -rlI 'google[.]com')
-  sed -i 's|mail[.]google[.]com|mail.com|g' $(grep -rlI 'mail[.]google[.]com')
-  sed -i 's|google[.]com|duckduckgo.com/html|g' $(grep -rlI 'google[.]com')
-}
-
-build() {
-  cd $_pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
deleted file mode 100644
index ba9f537a6..000000000
--- a/libre/file-roller-libre/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 199384 2013-11-11 21:55:12Z 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.2.1
-pkgrel=1
-pkgdesc="Create and modify archives, with unar support included and nonfree unace recommendation removed"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify' 'p7zip' 'unar')
-makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'libnautilus-extension' 'itstool' 'docbook-xsl')
-optdepends=('lrzip: lrzip archive support')
-groups=('gnome-extra')
-provides=("$_pkgname=$pkgver")
-replaces=("$_pkgname")
-conflicts=("$_pkgname")
-options=('!emptydirs')
-install=file-roller.install
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('fde1104103df71c126e759089f12dc7fa25ec642308649e87d542ee7c3276790')
-
-prepare() {
-  cd $_pkgname-$pkgver
-}
-
-build() {
-  cd $_pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/file-roller \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/libre/file-roller-libre/bug708854.patch b/libre/file-roller-libre/bug708854.patch
deleted file mode 100644
index 6a5591a59..000000000
--- a/libre/file-roller-libre/bug708854.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From d3ce6fe6964857c89212ab1a5a7aaa052d93c584 Mon Sep 17 00:00:00 2001
-From: Aleksander Morgado <aleksander@lanedo.com>
-Date: Thu, 26 Sep 2013 16:06:21 +0000
-Subject: 7z: allow extracting/opening/adding files prefixed with '@'
-
-7z uses '@' to specify a listfile; i.e. a file with a list of files to add or
-extract. Therefore, if working with single files (e.g. open, add or extract a
-single file from the archive), the filenames need to be escaped with '!' and
-specified with '-i'. It is ok to mix files specified with '-i' and the ones
-given after the archive filename.
-
-E.g. instead of:
-  7z x -bd -y -o/tmp/.fr-2z9FXz -- HS04603.ZIP @HS04603.PDF
-
-it should be:
-  7z x -bd -y -o/tmp/.fr-2z9FXz -i!@HS04603.PDF -- HS04603.ZIP
-
-https://bugzilla.gnome.org/show_bug.cgi?id=708854
----
-diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
-index f2e70a6..a9d15fd 100644
---- a/src/fr-command-7z.c
-+++ b/src/fr-command-7z.c
-@@ -375,11 +375,20 @@ fr_command_7z_add (FrCommand  *command,
- 	if (from_file != NULL)
- 		fr_process_add_arg_concat (command->process, "-i@", from_file, NULL);
- 
-+	if (from_file == NULL)
-+		for (scan = file_list; scan; scan = scan->next)
-+			/* Files prefixed with '@' need to be handled specially */
-+			if (g_str_has_prefix (scan->data, "@"))
-+				fr_process_add_arg_concat (command->process, "-i!", scan->data, NULL);
-+
- 	fr_process_add_arg (command->process, "--");
- 	fr_process_add_arg (command->process, command->filename);
-+
- 	if (from_file == NULL)
- 		for (scan = file_list; scan; scan = scan->next)
--			fr_process_add_arg (command->process, scan->data);
-+			/* Skip files prefixed with '@', already added */
-+			if (!g_str_has_prefix (scan->data, "@"))
-+				fr_process_add_arg (command->process, scan->data);
- 
- 	fr_process_end_command (command->process);
- }
-@@ -409,11 +418,20 @@ fr_command_7z_delete (FrCommand  *command,
- 	if (from_file != NULL)
- 		fr_process_add_arg_concat (command->process, "-i@", from_file, NULL);
- 
-+	if (from_file == NULL)
-+		for (scan = file_list; scan; scan = scan->next)
-+			/* Files prefixed with '@' need to be handled specially */
-+			if (g_str_has_prefix (scan->data, "@"))
-+				fr_process_add_arg_concat (command->process, "-i!", scan->data, NULL);
-+
- 	fr_process_add_arg (command->process, "--");
- 	fr_process_add_arg (command->process, command->filename);
-+
- 	if (from_file == NULL)
- 		for (scan = file_list; scan; scan = scan->next)
--			fr_process_add_arg (command->process, scan->data);
-+			/* Skip files prefixed with '@', already added */
-+			if (!g_str_has_prefix (scan->data, "@"))
-+				fr_process_add_arg (command->process, scan->data);
- 
- 	fr_process_end_command (command->process);
- }
-@@ -463,11 +481,21 @@ fr_command_7z_extract (FrCommand  *command,
- 	if (from_file != NULL)
- 		fr_process_add_arg_concat (command->process, "-i@", from_file, NULL);
- 
-+	if (from_file == NULL)
-+		for (scan = file_list; scan; scan = scan->next)
-+			/* Files prefixed with '@' need to be handled specially */
-+			if (g_str_has_prefix (scan->data, "@"))
-+				fr_process_add_arg_concat (command->process, "-i!", scan->data, NULL);
-+
-+
- 	fr_process_add_arg (command->process, "--");
- 	fr_process_add_arg (command->process, command->filename);
-+
- 	if (from_file == NULL)
- 		for (scan = file_list; scan; scan = scan->next)
--			fr_process_add_arg (command->process, scan->data);
-+			/* Skip files prefixed with '@', already added */
-+			if (!g_str_has_prefix (scan->data, "@"))
-+				fr_process_add_arg (command->process, scan->data);
- 
- 	fr_process_end_command (command->process);
- }
---
-cgit v0.9.2
diff --git a/libre/file-roller-libre/bug709035.patch b/libre/file-roller-libre/bug709035.patch
deleted file mode 100644
index f82e33f30..000000000
--- a/libre/file-roller-libre/bug709035.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From d05bdc3b60d928f1f40338208419f0ffa41195f6 Mon Sep 17 00:00:00 2001
-From: Paolo Bacchilega <paobac@src.gnome.org>
-Date: Sun, 29 Sep 2013 16:30:29 +0000
-Subject: libarchive: fixed failure when extracting some tar archives
-
-do not try to restore the creation time;
-do not set the G_FILE_ATTRIBUTE_TIME_CREATED_USEC attribute
-
-[bug #709035]
----
-diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c
-index 42673df..44aaad2 100644
---- a/src/fr-archive-libarchive.c
-+++ b/src/fr-archive-libarchive.c
-@@ -428,15 +428,8 @@ _g_file_info_create_from_entry (struct archive_entry *entry,
- 
- 	/* times */
- 
--	if (archive_entry_ctime_is_set (entry)) {
--		g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_CREATED, archive_entry_ctime (entry));
--		g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_CREATED_USEC, archive_entry_ctime_nsec (entry));
--	}
--
--	if (archive_entry_mtime_is_set (entry)) {
-+	if (archive_entry_mtime_is_set (entry))
- 		g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, archive_entry_mtime (entry));
--		g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, archive_entry_mtime_nsec (entry));
--	}
- 
- 	/* username */
- 
-@@ -529,7 +522,8 @@ restore_modification_time (GHashTable    *created_folders,
- 
- 		info = g_file_info_new ();
- 		g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, g_file_info_get_attribute_uint64 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED));
--		g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC));
-+		if (g_file_info_get_attribute_status (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC) == G_FILE_ATTRIBUTE_STATUS_SET)
-+			g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC));
- 		result = _g_file_set_attributes_from_info (file, info, cancellable, error);
- 
- 		g_object_unref (info);
---
-cgit v0.9.2
diff --git a/libre/file-roller-libre/rePKGBUILD b/libre/file-roller-libre/rePKGBUILD
deleted file mode 100644
index a83d218f1..000000000
--- a/libre/file-roller-libre/rePKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
-source PKGBUILD
-#CARCH=x86_64
-unset build package md5sums source
-_repo=extra       # Put the repo here
-_mirror=http://mirrors.kernel.org/archlinux # Put mirror here
-source=(PKGBUILD
-        "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT"
-        # files for pkg modifications below this line
-        )
-options=(!strip)
-
-build() {
-  cd "${srcdir}/"
-  rm .{INSTALL,PKGINFO}
-  # put actions for package modifications below this line
-
-}
-
-package() {
-  find ${srcdir} -maxdepth 1 -type l -delete
-  cp -a ${srcdir}/* ${pkgdir}
-}
-
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
deleted file mode 100644
index 00be19b0a..000000000
--- a/libre/filesystem/PKGBUILD
+++ /dev/null
@@ -1,133 +0,0 @@
-# $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@parabola.nu>
-
-pkgname=filesystem
-pkgver=2013.05
-pkgrel=2
-pkgdesc='Base filesystem (Parabola rebranded)'
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url='https://parabolagnulinux.org'
-groups=('base')
-install='filesystem.install'
-makedepends=('asciidoc')
-depends=('iana-etc')
-backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd'
-        'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
-        'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue')
-source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
-        'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf'
-        'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt'
-        'locale.sh')
-
-build() {
-	cd ${srcdir}
-	a2x -d manpage -f manpage parabola.7.txt
-}
-
-package() {
-	cd ${pkgdir}
-
-	#
-	# setup root filesystem
-	#
-	for d in boot dev etc home mnt usr var opt srv/http run; do
-		install -d -m755 ${d}
-	done
-	install -d -m555 proc
-	install -d -m555 sys
-	install -d -m0750 root
-	install -d -m1777 tmp
-	# vsftpd won't run with write perms on /srv/ftp
-	install -d -m555 -g ftp srv/ftp
-
-	# setup /etc
-	install -d etc/{ld.so.conf.d,skel,profile.d}
-	for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf os-release passwd resolv.conf securetty shells profile; do
-		install -m644 ${srcdir}/${f} etc/
-	done
-	ln -s /proc/self/mounts etc/mtab
-	for f in gshadow shadow crypttab; do
-		install -m600 ${srcdir}/${f} etc/
-	done
-	touch etc/arch-release
-	install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf
-	install -m755 ${srcdir}/locale.sh etc/profile.d/locale.sh
-
-	# setup /var
-	for d in cache/man local opt log/old lib/misc empty; do
-		install -d -m755 var/${d}
-	done
-	install -d -m1777 var/{tmp,spool/mail}
-	# allow setgid games to write scores
-	install -d -m775 -g games var/games
-	ln -s spool/mail var/mail
-	ln -s ../run var/run
-	ln -s ../run/lock var/lock
-
-	#
-	# setup /usr hierarchy
-	#
-	for d in bin include lib share/misc src; do
-		install -d -m755 usr/${d}
-	done
-	for d in $(seq 8); do
-		install -d -m755 usr/share/man/man${d}
-	done
-
-	#
-	# add lib symlinks
-	#
-	ln -s usr/lib ${pkgdir}/lib
-	[[ ${CARCH} = "x86_64" ]] && (
-		ln -s usr/lib ${pkgdir}/lib64
-		ln -s lib ${pkgdir}/usr/lib64
-	)
-	[[ ${CARCH} = "mips64el" ]] && (
-		# For the N32 ABI.
-		ln -s usr/lib ${pkgdir}/lib32
-		ln -s lib ${pkgdir}/usr/lib32
-	)
-
-	#
-	# add bin symlinks
-	#
-	ln -s usr/bin ${pkgdir}/bin
-	ln -s usr/bin ${pkgdir}/sbin
-	ln -s bin ${pkgdir}/usr/sbin
-
-	#
-	# install parabola(7) manpage
-	#
-	install -D -m644 ${srcdir}/parabola.7 usr/share/man/man7/parabola.7
-
-	#
-	# setup /usr/local hierarchy
-	#
-	for d in bin etc games include lib man sbin share src; do
-		install -d -m755 usr/local/${d}
-	done
-	ln -s ../man usr/local/share/man
-}
-md5sums=('7b8e40f8f793e60f471511641bb1c9f2'
-         '6be47d893fd49b2e4a8c0e811b350861'
-         '9e4533df61f0c82d6b2e2371f7376282'
-         '4c4540eeb748bf1f71d631b8c1dcf0b3'
-         'f28150d4c0b22a017be51b9f7f9977ed'
-         '6e488ffecc8ba142c0cf7e2d7aeb832e'
-         '1cfd310dff0804a7d21958487c32a3b1'
-         '2ef2429c2c98d0883906aa6f5363be80'
-         '693c97f2c9a519bb97a17008e92c2b74'
-         '1745349eb24ed21b4cfaa6f423bddb76'
-         '7bc65f234dfb6abf24e7c3b03e86f4ff'
-         'd41d8cd98f00b204e9800998ecf8427e'
-         '0e145e18fea8fd190b30d45764f5707c'
-         '6f48288b6fcaf0065fcb7b0e525413e0'
-         '22518e922891f9359f971f4f5b4e793c'
-         'f45389e116ab0b9e9968287617d27c7d'
-         '0b6f835598c7640184e476057b3c7722'
-         'a8a962370cd0128465d514e6a1f74130'
-         'd5732ffdb3488e1383d4ea199343e767'
-         '3807d07215d9116331fe1cf8feeaa0f8')
diff --git a/libre/filesystem/crypttab b/libre/filesystem/crypttab
deleted file mode 100644
index 195945a74..000000000
--- a/libre/filesystem/crypttab
+++ /dev/null
@@ -1,17 +0,0 @@
-# crypttab: mappings for encrypted partitions
-#
-# Each mapped device will be created in /dev/mapper, so your /etc/fstab
-# should use the /dev/mapper/<name> paths for encrypted devices.
-#
-# The Arch specific syntax has been deprecated, see crypttab(5) for the
-# new supported syntax.
-#
-# NOTE: Do not list your root (/) partition here, it must be set up
-#       beforehand by the initramfs (/etc/mkinitcpio.conf).
-
-# <name>       <device>         <password>              <options>
-# home         /dev/hda4        /etc/mypassword1
-# data1        /dev/hda3        /etc/mypassword2
-# data2        /dev/hda5        /etc/cryptfs.key
-# swap         /dev/hdx4        /dev/urandom            swap,cipher=aes-cbc-essiv:sha256,size=256
-# vol          /dev/hdb7        none
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
deleted file mode 100644
index c04374422..000000000
--- a/libre/filesystem/filesystem.install
+++ /dev/null
@@ -1,53 +0,0 @@
-# args: <group> [options]
-_addgroup() {
-	if ! getent group "$1" >/dev/null; then
-		groupadd "$@" >/dev/null
-	fi
-}
-
-# args: <group> [options]
-_adduser() {
-	if ! getent passwd "$1" >/dev/null; then
-		useradd "$@" >/dev/null
-	fi
-}
-
-post_upgrade() {
-	_addgroup optical -g 93
-	_addgroup audio   -g 92
-	_addgroup video   -g 91
-	_addgroup floppy  -g 94
-	_addgroup storage -g 95
-	_addgroup log     -g 19
-	_addgroup utmp    -g 20
-	_addgroup power   -g 98
-	_addgroup network -g 90
-	_addgroup games   -g 50
-	_addgroup uucp    -g 14
-	_addgroup http    -g 33
-	_adduser  http    -u 33 -d /srv/http -g http -s /bin/false
-	_addgroup scanner -g 96
-	_addgroup rfkill  -g 24
-	_addgroup lock    -g 54
-	_addgroup uuidd   -g 68
-	_adduser uuidd    -u 68 -d / -g uuidd -s /sbin/nologin
-	_addgroup dbus    -g 81
-	_adduser dbus     -u 81 -d / -g dbus -s /sbin/nologin
-	_addgroup systemd-journal -g 190
-
-	# sync gshadow to group (fixes FS#19869)
-	if ! grep -q '^lock:' etc/gshadow; then
-		grpconv >/dev/null
-	fi
-
-	if ! grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf; then
-		echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf
-	fi
-
-	# set "Last password change" > 0; otherwise su $user wont work
-	for user in bin daemon mail ftp http nobody; do
-		if LANG=C chage -l ${user} | grep -q 'password must be changed'; then
-			chage -d 14871 ${user}
-		fi
-	done
-}
diff --git a/libre/filesystem/fstab b/libre/filesystem/fstab
deleted file mode 100644
index b6716c14a..000000000
--- a/libre/filesystem/fstab
+++ /dev/null
@@ -1,4 +0,0 @@
-# 
-# /etc/fstab: static file system information
-#
-# <file system>	<dir>	<type>	<options>	<dump>	<pass>
diff --git a/libre/filesystem/group b/libre/filesystem/group
deleted file mode 100644
index 6c91b292f..000000000
--- a/libre/filesystem/group
+++ /dev/null
@@ -1,35 +0,0 @@
-root:x:0:root
-bin:x:1:root,bin,daemon
-daemon:x:2:root,bin,daemon
-sys:x:3:root,bin
-adm:x:4:root,daemon
-tty:x:5:
-disk:x:6:root
-lp:x:7:daemon
-mem:x:8:
-kmem:x:9:
-wheel:x:10:root
-ftp:x:11:
-mail:x:12:
-uucp:x:14:
-log:x:19:root
-utmp:x:20:
-locate:x:21:
-rfkill:x:24:
-smmsp:x:25:
-http:x:33:
-games:x:50:
-lock:x:54:
-uuidd:x:68:
-dbus:x:81:
-network:x:90:
-video:x:91:
-audio:x:92:
-optical:x:93:
-floppy:x:94:
-storage:x:95:
-scanner:x:96:
-power:x:98:
-nobody:x:99:
-users:x:100:
-systemd-journal:x:190:
diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow
deleted file mode 100644
index fb475bfd2..000000000
--- a/libre/filesystem/gshadow
+++ /dev/null
@@ -1,35 +0,0 @@
-root:::root
-bin:::root,bin,daemon
-daemon:::root,bin,daemon
-sys:::root,bin
-adm:::root,daemon
-tty:::
-disk:::root
-lp:::daemon
-mem:::
-kmem:::
-wheel:::root
-ftp:::
-mail:::
-uucp:::
-log:::root
-utmp:x::
-locate:::
-rfkill:x::
-smmsp:::
-http:::
-games:::
-lock:::
-uuidd:x::
-dbus:x::
-network:x::
-video:x::
-audio:::
-optical:::
-floppy:x::
-storage:x::
-scanner:x::
-power:x::
-nobody:::
-users:::
-systemd-journal:x::
diff --git a/libre/filesystem/host.conf b/libre/filesystem/host.conf
deleted file mode 100644
index cf52fe561..000000000
--- a/libre/filesystem/host.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# /etc/host.conf
-#
-
-order hosts,bind
-multi on
-
-# End of file
diff --git a/libre/filesystem/hosts b/libre/filesystem/hosts
deleted file mode 100644
index 1747f9196..000000000
--- a/libre/filesystem/hosts
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# /etc/hosts: static lookup table for host names
-#
-
-#<ip-address>	<hostname.domain.org>	<hostname>
-127.0.0.1	localhost.localdomain	localhost
-::1		localhost.localdomain	localhost
-
-# End of file
diff --git a/libre/filesystem/issue b/libre/filesystem/issue
deleted file mode 100644
index b001c55dd..000000000
--- a/libre/filesystem/issue
+++ /dev/null
@@ -1,2 +0,0 @@
-Parabola GNU/Linux-libre \r  (\n) (\l)
-
diff --git a/libre/filesystem/ld.so.conf b/libre/filesystem/ld.so.conf
deleted file mode 100644
index dfac45683..000000000
--- a/libre/filesystem/ld.so.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# /etc/ld.so.conf
-#
-
-include /etc/ld.so.conf.d/*.conf
-
-# End of file
diff --git a/libre/filesystem/locale.sh b/libre/filesystem/locale.sh
deleted file mode 100644
index 5fd4174d5..000000000
--- a/libre/filesystem/locale.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \
-      LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION
-
-if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then
-  . "$XDG_CONFIG_HOME/locale.conf"
-elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then
-  . "$HOME/.config/locale.conf"
-elif [ -r /etc/locale.conf ]; then
-  . /etc/locale.conf
-elif [ -r /etc/rc.conf ]; then
-  LANG=$(. /etc/rc.conf 2>/dev/null; echo "$LOCALE")
-fi
-
-export LANG="${LANG:-C}"
-[ -n "$LC_CTYPE" ]          && export LC_CTYPE
-[ -n "$LC_NUMERIC" ]        && export LC_NUMERIC
-[ -n "$LC_TIME" ]           && export LC_TIME
-[ -n "$LC_COLLATE" ]        && export LC_COLLATE
-[ -n "$LC_MONETARY" ]       && export LC_MONETARY
-[ -n "$LC_MESSAGES" ]       && export LC_MESSAGES
-[ -n "$LC_PAPER" ]          && export LC_PAPER
-[ -n "$LC_NAME" ]           && export LC_NAME
-[ -n "$LC_ADDRESS" ]        && export LC_ADDRESS
-[ -n "$LC_TELEPHONE" ]      && export LC_TELEPHONE
-[ -n "$LC_MEASUREMENT" ]    && export LC_MEASUREMENT
-[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION
diff --git a/libre/filesystem/modprobe.d.usb-load-ehci-first b/libre/filesystem/modprobe.d.usb-load-ehci-first
deleted file mode 100644
index 947379411..000000000
--- a/libre/filesystem/modprobe.d.usb-load-ehci-first
+++ /dev/null
@@ -1,2 +0,0 @@
-softdep ohci_hcd pre: ehci_hcd
-softdep uhci_hcd pre: ehci_hcd
diff --git a/libre/filesystem/motd b/libre/filesystem/motd
deleted file mode 100644
index e69de29bb..000000000
--- a/libre/filesystem/motd
+++ /dev/null
diff --git a/libre/filesystem/nsswitch.conf b/libre/filesystem/nsswitch.conf
deleted file mode 100644
index 4a4f5770d..000000000
--- a/libre/filesystem/nsswitch.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# Begin /etc/nsswitch.conf
-
-passwd: files
-group: files
-shadow: files
-
-publickey: files
-
-hosts: files dns myhostname
-networks: files
-
-protocols: files
-services: files
-ethers: files
-rpc: files
-
-netgroup: files
-
-# End /etc/nsswitch.conf
diff --git a/libre/filesystem/os-release b/libre/filesystem/os-release
deleted file mode 100644
index fe5f20b4f..000000000
--- a/libre/filesystem/os-release
+++ /dev/null
@@ -1,8 +0,0 @@
-NAME="Parabola"
-ID=parabola
-ID_LIKE=arch
-PRETTY_NAME="Parabola GNU/Linux-libre"
-ANSI_COLOR="1;35"
-HOME_URL="https://parabolagnulinux.org/"
-BUG_REPORT_URL="https://labs.parabola.nu/"
-
diff --git a/libre/filesystem/parabola.7.txt b/libre/filesystem/parabola.7.txt
deleted file mode 100644
index 60e1121e0..000000000
--- a/libre/filesystem/parabola.7.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-/////
-vim:set ts=4 sw=4 syntax=asciidoc noet:
-/////
-parabola(7)
-============
-
-NAME
-----
-parabola - basic configuration
-
-SYNOPSIS
---------
-Overview of the basic configuration of Parabola GNU/Linux-libre.
-
-DESCRIPTION
------------
-Parabola exposes the user to the system without hiding any details.
-This man page gives a brief overview of the configuration files that should be set up on a fresh install.
-
-SYSTEM SERVICES[[S]]
---------------------
-System services to be started at boot can be enabled using 'systemctl enable <name>'.
-To view available services, use 'systemctl list-unit-files'.
-
-HOSTNAME[[H]]
--------------
-The hostname of the machine can be set using 'hostnamectl set-hostname <hostname>'.
-It will then be written to /etc/hostname.
-
-LOCALIZATION[[L]]
------------------
-Various locales may be enabled in /etc/locale.gen and are generated by 'locale-gen'.
-The system-wide locale to be used can be configured in /etc/locale.conf.
-These settings can be overridden on a per-user basis by keeping a user-specific locale.conf in $HOME/.config/locale.conf.
-The user-specific file will take precedence if it exists.
-
-VIRTUAL CONSOLE[[V]]
---------------------
-The virtual console is configured in /etc/vconsole.conf.
-It allows you to set a font and a keyboard layout, among other things.
-Note that these settings only apply to the console and do not apply if you use X.
-
-TIME[[T]]
----------
-The local time zone is configured by calling 'timedatectl set-timezone <Region/City>'.
-A relative *symlink* is then created from /etc/localtime to the correct zoneinfo file under /usr/share/zoneinfo/. For example,
-
-    /etc/localtime -> ../usr/share/zoneinfo/Europe/Paris
-
-The real-time clock, which keeps track of time when the computer is off, can be configured to either
-be in UTC or in local time by calling 'timedatectl set-local-rtc <false|true>'.
-The default is UTC.
-
-FILE SYSTEMS[[F]]
------------------
-File systems are configured in /etc/fstab, and encryption mappings are configured in /etc/crypttab.
-
-INITRAMFS[[R]]
---------------
-The initramfs is generated by 'mkinitcpio -p <preset>'.
-The default preset is "linux-libre".
-The initramfs can be configured in /etc/mkinitcpio.conf and must be regenerated after making configuration changes.
-
-PACKAGE MANAGER[[P]]
---------------------
-The package manager, pacman, is configured in /etc/pacman.conf.
-
-BOOT LOADER[[B]]
-----------------
-GRUB's configuration is generated from /etc/default/grub by 'grub-mkconfig -o /boot/grub/grub.cfg'.
-Syslinux is configured in /boot/syslinux/syslinux.cfg.
-
-MODULES[[M]]
-------------
-Most modules should be loaded on-demand.
-Modules to be unconditionally loaded at boot can be specified in /etc/modules-load.d/,
-and modules to be blacklisted from automatically loading can be configured in /etc/modprobe.d/.
-
-SEE ALSO
---------
-
-*systemctl*(1), *hostnamectl*(1), *hostname*(5), *locale.conf*(5),
-*vconsole.conf*(5), *timedatectl*(1), *timezone*(3), *hwclock*(8),
-*fstab*(5), *crypttab*(5), *mkinitcpio*(8), *pacman*(8), *pacman.conf*(5),
-*grub-mkconfig*(8), *syslinux*(1), *modules-load.d*(5), *modprobe.d*(5),
-*systemd*(1)
-
-AUTHORS
--------
-Written by Tom Gundersen.
-Rebranded for Parabola by Nicolás Reynolds and André Silva.
diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd
deleted file mode 100644
index 671fc486e..000000000
--- a/libre/filesystem/passwd
+++ /dev/null
@@ -1,9 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/bin:/bin/false
-daemon:x:2:2:daemon:/sbin:/bin/false
-mail:x:8:12:mail:/var/spool/mail:/bin/false
-ftp:x:14:11:ftp:/srv/ftp:/bin/false
-http:x:33:33:http:/srv/http:/bin/false
-uuidd:x:68:68:uuidd:/:/sbin/nologin
-dbus:x:81:81:dbus:/:/sbin/nologin
-nobody:x:99:99:nobody:/:/bin/false
diff --git a/libre/filesystem/profile b/libre/filesystem/profile
deleted file mode 100644
index 59d0abc83..000000000
--- a/libre/filesystem/profile
+++ /dev/null
@@ -1,27 +0,0 @@
-# /etc/profile
-
-#Set our umask
-umask 022
-
-# Set our default path
-PATH="/usr/local/sbin:/usr/local/bin:/usr/bin"
-export PATH
-
-# Load profiles from /etc/profile.d
-if test -d /etc/profile.d/; then
-	for profile in /etc/profile.d/*.sh; do
-		test -r "$profile" && . "$profile"
-	done
-	unset profile
-fi
-
-# Source global bash config
-if test "$PS1" && test "$BASH" && test -r /etc/bash.bashrc; then
-	. /etc/bash.bashrc
-fi
-
-# Termcap is outdated, old, and crusty, kill it.
-unset TERMCAP
-
-# Man is much better than us at figuring this out
-unset MANPATH
diff --git a/libre/filesystem/resolv.conf b/libre/filesystem/resolv.conf
deleted file mode 100644
index cecafba03..000000000
--- a/libre/filesystem/resolv.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# /etc/resolv.conf
-#
-
-#search <yourdomain.tld>
-#nameserver <ip>
-
-# End of file
diff --git a/libre/filesystem/securetty b/libre/filesystem/securetty
deleted file mode 100644
index 5a2235ce7..000000000
--- a/libre/filesystem/securetty
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# /etc/securetty
-#
-
-console
-tty1
-tty2
-tty3
-tty4
-tty5
-tty6
-ttyS0
-hvc0
-
-# End of file
diff --git a/libre/filesystem/shadow b/libre/filesystem/shadow
deleted file mode 100644
index 39ebb13c7..000000000
--- a/libre/filesystem/shadow
+++ /dev/null
@@ -1,9 +0,0 @@
-root::14871::::::
-bin:x:14871::::::
-daemon:x:14871::::::
-mail:x:14871::::::
-ftp:x:14871::::::
-http:x:14871::::::
-uuidd:x:14871::::::
-dbus:x:14871::::::
-nobody:x:14871::::::
diff --git a/libre/filesystem/shells b/libre/filesystem/shells
deleted file mode 100644
index 18c1aeffa..000000000
--- a/libre/filesystem/shells
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# /etc/shells
-#
-
-/bin/sh
-/bin/bash
-
-# End of file
diff --git a/libre/foomatic-filters-libre/PKGBUILD b/libre/foomatic-filters-libre/PKGBUILD
deleted file mode 100644
index c05a01e86..000000000
--- a/libre/foomatic-filters-libre/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 185778 2013-05-18 16:33:20Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
- 
-pkgbase="foomatic"
-pkgname=('foomatic-filters-libre')
-arch=('i686' 'x86_64' 'mips64el') # needs to be changed  in the subpackages when makepkg will support it
-_snapdate=20130518
-_filtersver=4.0.17
-pkgver=${_filtersver}_${_snapdate}
-pkgrel=1
-epoch=1
-makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash')
-source=(http://www.openprinting.org/download/foomatic/$pkgbase-filters-${_filtersver}.tar.gz)
-url="http://www.linuxprinting.org/foomatic.html"
-options=('!emptydirs')
-md5sums=('b05f5dcbfe359f198eef3df5b283d896')
-
-package_foomatic-filters-libre() {
-
- pkgdesc="Foomatic - Filter scripts used by the printer spoolers to convert the incoming PostScript data into the printer's native format, without nonfree scripts"
-# arch=('i686' 'x86_64')
- license=('GPL')
- backup=(etc/foomatic/filter.conf)
- depends=('glibc' 'dbus-core')
- provides=("foomatic-filters=${pkgver}")
- replaces=('foomatic-filters')
- conflicts=('foomatic-filters')
- optdepends=('perl:      for the "beh" Backend End Handler used by cups'
-            'net-snmp:  certain (mostly HP) printers need it to work')
-
-   cd ${srcdir}/foomatic-filters-${_filtersver}
-   # remove nonfree scripts
-   rm -rfv test/{lsbfuncs,shfuncs,tcm,tetapi}.sh
-   ./configure --prefix=/usr --sysconfdir=/etc
-   make
-   make DESTDIR=${pkgdir} install
-}
diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD
index 4db0709fc..b16f322f2 100644
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript-libre/PKGBUILD
@@ -1,39 +1,47 @@
-# $Id: PKGBUILD 193812 2013-09-02 09:41:54Z andyrtr $
+# $Id: PKGBUILD 204553 2014-01-22 13:37:42Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Maintainer (Parabola): Joshua Haase <hahj87@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Contributor (Parabola): Joshua Haase <hahj87@gmail.com>
 
 ### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ###
 
 _pkgname=ghostscript
 pkgname=ghostscript-libre
 pkgver=9.10
-pkgrel=1
+pkgrel=3
 pkgdesc="An interpreter for the PostScript language, without nonfree files"
 arch=('i686' 'x86_64' 'mips64el')
 license=('AGPL') #non free files removed
 depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg'
-         'libtiff>=4.0.0' 'lcms2' 'dbus')
-makedepends=('gtk2' 'gnutls' 'openjpeg')
+         'libtiff>=4.0.0' 'lcms2' 'dbus' 'libpaper')
+makedepends=('gtk3' 'gnutls')
 optdepends=('texlive-core:      needed for dvipdf'
-            'gtk2:              needed for gsx')
+            'gtk3:              needed for gsx')
 conflicts=('ghostscript')
 replaces=('ghostscript')
 provides=("ghostscript=$pkgver")
 url="http://www.ghostscript.com/"
-source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
-options=('!libtool' '!makeflags')
-md5sums=('7179bb1ed4f6f453147e6f7e1f210ce8')
+mksource=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
+source=(https://repo.parabolagnulinux.org/other/ghostscript-libre/ghostscript-libre-${pkgver}.tar.bz2)
+options=('!makeflags')
+mkmd5sums=('7179bb1ed4f6f453147e6f7e1f210ce8')
+md5sums=('c9f6ffec6a07e06caba394d7ebdbbe9a')
 
-build() {
+mksource() {
   cd ghostscript-${pkgver}
-  
+
   # delete nonfree files
   grep -l "are not altered" Resource/CMap/* | xargs rm -fv
   grep -l "not be copied" Resource/CMap/* | xargs rm -fv
+}
+
+build() {
+  cd ghostscript-${pkgver}
 
   # force it to use system-libs
-  rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype openjpeg cups/libs # jbig2dec is in community
+  # keep heavily patched included openjpeg, leads to segfault with system openjpeg
+  # https://bugs.archlinux.org/task/38226
+  rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype cups/libs # jbig2dec is in community
 
   ./configure --prefix=/usr \
 	--enable-dynamic \
@@ -43,12 +51,13 @@ build() {
 	--with-x \
 	--with-drivers=ALL\
 	--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
-	--with-install-cups \
 	--enable-fontconfig \
 	--enable-freetype \
+	--enable-openjpeg \
 	--without-luratech \
 	--without-omni \
 	--with-system-libtiff \
+	--with-libpaper \
 	--disable-compile-inits #--help # needed for linking with system-zlib
   make
 
diff --git a/libre/gloobus-preview-libre/PKGBUILD b/libre/gloobus-preview-libre/PKGBUILD
index 5881a4c2e..0a7cf95d5 100644
--- a/libre/gloobus-preview-libre/PKGBUILD
+++ b/libre/gloobus-preview-libre/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 91026 2013-05-18 11:44:23Z bgyorgy $
+# $Id: PKGBUILD 104564 2014-01-22 21:49:14Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 _pkgname=gloobus-preview
 pkgname=gloobus-preview-libre
 pkgver=0.4.5.290
 _pkgver=0.4.5-ubuntu11~ppa290
-pkgrel=1.1
+pkgrel=2
 pkgdesc="Gnome application designed to enable a full screen preview of any kind of file, with libarchive support"
 arch=('i686' 'x86_64')
 url="http://gloobus.net/"
 license=('GPL')
-depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gconf' 'taglib' 'xdg-utils')
+depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gobject' 'gconf' 'taglib' 'xdg-utils')
 makedepends=('boost' 'bzr' 'djvulibre' 'libspectre')
 replaces=$_pkgname
 conflicts=$_pkgname
@@ -25,19 +25,22 @@ optdepends=('djvulibre: Preview DjVu documents'
             'unoconv: Preview LibreOffice compatible documents'
             'libarchive: View content of RAR archives'
             'unzip: View content of .ZIP archives')
-options=('!libtool')
 install=$_pkgname.install
 source=(https://launchpad.net/~gloobus-dev/+archive/$_pkgname/+files/${_pkgname}_$_pkgver.orig.tar.xz
         gloobus-sushi::bzr+http://bazaar.launchpad.net/~gloobus-dev/gloobus-sushi/gloobus-sushi
         fix-gtksource-include.patch
         fix-unoconv.patch
         use-xdg-open.patch
+        gloobus-preview-configuration-pygobject3-port.patch
+        gloobus-sushi-pygobject3-port.patch
 	gloobus-preview-usr-bsdtar-for-rar.patch)
 md5sums=('27b3db2043ecaf47fa928940bbb4f32a'
          'SKIP'
          'ca15a3e31cec01d3d4fc5a4e1720f692'
          '03379c173e67ad1b6804bc609336451d'
          'd6d9e2b3e001f0ea8440cccdf90480af'
+         '16e7a7d892dfde5fd40332fc41de97b0'
+         '7536f8fbbb2c6bbc0132a2fa25b296b7'
          'eeab61846c861540bb16ca00fa14cdb6')
 
 prepare() {
@@ -56,6 +59,9 @@ prepare() {
   # Use xdg-open
   patch -Np1 -i "$srcdir/use-xdg-open.patch"
 
+  # Port gloobus-preview-configuration to pygobject3
+  patch -Np1 -i "$srcdir/gloobus-preview-configuration-pygobject3-port.patch"
+
   # Use bsdtar (libarchive) if unrar is not found.
   patch -Np0 -i "$srcdir/gloobus-preview-usr-bsdtar-for-rar.patch"
 
@@ -64,6 +70,9 @@ prepare() {
 
   # Python2 fix
   sed -i 's/python /python2 /' src/gloobus-sushi.in
+
+  # Port gloobus-sushi to pygobject3
+  patch -Np1 -i "$srcdir/gloobus-sushi-pygobject3-port.patch"
 }
 
 
diff --git a/libre/gloobus-preview-libre/fix-gtksource-include.patch b/libre/gloobus-preview-libre/fix-gtksource-include.patch
deleted file mode 100644
index 053169a43..000000000
--- a/libre/gloobus-preview-libre/fix-gtksource-include.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-interface-text.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-interface-text.h
---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-interface-text.h	2012-04-06 15:07:29.000000000 +0200
-+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-interface-text.h	2013-05-17 06:27:37.833360264 +0200
-@@ -1,8 +1,7 @@
- #ifndef _ITEXT_
- #define _ITEXT_
- 
--#include <gtksourceview/gtksourceview.h>
--#include <gtksourceview/gtksourcelanguagemanager.h>
-+#include <gtksourceview/gtksource.h>
- //sudo ln -s /usr/include/gtksourceview-2.0/gtksourceview/ /usr/include/gtksourceview
- 
- #include "gloobus-preview-interface-main.h"
-diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-plugin-manager.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-plugin-manager.cpp
---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-plugin-manager.cpp	2012-04-06 15:07:29.000000000 +0200
-+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-plugin-manager.cpp	2013-05-17 06:28:19.300984059 +0200
-@@ -1,6 +1,6 @@
- #include "gloobus-preview-plugin-manager.h"
- #include <dlfcn.h>
--#include <gtksourceview/gtksourcelanguagemanager.h>
-+#include <gtksourceview/gtksource.h>
- 
- vector<gp_plugin_container*> PluginManager::plugins;
- map<string, int> PluginManager::filetypes;
-diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-text/plugin-text.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-text/plugin-text.h
---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-text/plugin-text.h	2012-04-06 15:07:29.000000000 +0200
-+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-text/plugin-text.h	2013-05-17 06:26:26.788384315 +0200
-@@ -3,10 +3,7 @@
- 
- #ifndef PLUGIN_LOADER
- 
--#include <gtksourceview/gtksourceview.h>
--#include <gtksourceview/gtksourcelanguagemanager.h>
--#include <gtksourceview/gtksourcestylescheme.h>
--#include <gtksourceview/gtksourcestyleschememanager.h>
-+#include <gtksourceview/gtksource.h>
- #include <gio/gio.h>
- 
- #include "../gloobus-preview-config.h"
diff --git a/libre/gloobus-preview-libre/fix-unoconv.patch b/libre/gloobus-preview-libre/fix-unoconv.patch
deleted file mode 100644
index f918f3019..000000000
--- a/libre/gloobus-preview-libre/fix-unoconv.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-loader.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-loader.cpp
---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-loader.cpp	2012-04-06 15:07:29.000000000 +0200
-+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-loader.cpp	2013-05-18 10:24:33.558221788 +0200
-@@ -87,7 +87,7 @@
- 
-     if( NULL == uri && Utils::isProgramAvailable("unoconv") ) {
-         gchar *path = g_file_get_path(file);
--        gchar *cmd = g_strdup_printf("unoconv --stdout \"%s\" > \"%s\"", path, tmp);
-+        gchar *cmd = g_strdup_printf("unoconv -f pdf -o \"%s\" \"%s\"", tmp, path);
- 
-         if( system(cmd) == 0) {
-             uri = pathToUri(tmp);
-@@ -123,4 +123,4 @@
- {
-     path = "file://" + path;
-     return g_uri_escape_string(path.c_str(), G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, false);
--}
-\ No newline at end of file
-+}
-diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-plugin.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-plugin.h
---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-plugin.h	2012-04-06 15:07:29.000000000 +0200
-+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-plugin.h	2013-05-18 10:33:02.352806550 +0200
-@@ -6,15 +6,21 @@
- PluginManager::register_plugin("office");
- 
- PluginManager::register_filetype("application/vnd.oasis.opendocument.text", 1);
-+PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.wordprocessingml.document", 1);
- PluginManager::register_filetype("application/msword", 1);
- PluginManager::register_filetype("application/rtf", 1);
- PluginManager::register_filetype("application/vnd.ms-excel", 1);
- PluginManager::register_filetype("application/vnd.oasis.opendocument.spreadsheet", 1);
-+PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", 1);
- PluginManager::register_filetype("application/vnd.ms-powerpoint", 1);
-+PluginManager::register_filetype("application/vnd.oasis.opendocument.presentation", 1);
-+PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.presentationml.presentation", 1);
- PluginManager::register_filetype("application/vnd.sun.xml.calc", 1);
-+PluginManager::register_filetype("application/vnd.oasis.opendocument.graphics", 1);
-+
- 
- // TODO: add more filetypes supported by abiword and/or OpenOffice
- 
- #endif
- 
--#endif /* OFFICE_PLUGIN_H */
-\ No newline at end of file
-+#endif /* OFFICE_PLUGIN_H */
diff --git a/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch b/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch
new file mode 100644
index 000000000..2c2540753
--- /dev/null
+++ b/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch
@@ -0,0 +1,124 @@
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-configuration gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-configuration
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-configuration	2014-01-22 21:54:41.555697168 +0100
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-configuration	2014-01-22 21:34:36.867164953 +0100
+@@ -6,10 +6,9 @@
+ import os
+ import sys
+ import glob
+-import gtk
++from gi.repository import Gtk, GConf
+ import signal
+ import gettext
+-import gconf
+ #import config
+ 
+ #=========================== CLASS COLORS =======================================================#
+@@ -69,54 +68,54 @@
+ 	def __init__(self):
+ 		self.config = config_load()
+ 		
+-		self.client = gconf.client_get_default()
++		self.client = GConf.Client.get_default()
+ 		self.gconf_win_layout = self.client.get_string('/apps/metacity/general/button_layout')
+ 
+ 		#================= Show In Taskbar ================= #
+-		self.entry1 = gtk.CheckButton(label=_("Show in TaskBar"), use_underline=False)  
++		self.entry1 = Gtk.CheckButton(label=_("Show in TaskBar"), use_underline=False)  
+ 		self.entry1.set_tooltip_markup(_("When enabled gloobus-preview will be\nshown in the <b>taskbar</b>"))
+ 		self.entry1.set_active(self.config.getboolean("Main","taskbar"))
+ 
+ 		#================= Allways on top ================= #
+-		self.entry2 = gtk.CheckButton(label=_("Always on top"), use_underline=False)  
++		self.entry2 = Gtk.CheckButton(label=_("Always on top"), use_underline=False)  
+ 		self.entry2.set_tooltip_markup(_("When enabled gloobus-preview will be\n<b>always on top</b> of the other windows"))
+ 		self.entry2.set_active(self.config.getboolean("Main","ontop"))
+ 		win.set_keep_above(self.config.getboolean("Main","ontop"))
+ 
+ 
+ 		#================= Quit on lose focus ================= #
+-		self.entry3 = gtk.CheckButton(label=_("Quit on lose focus"), use_underline=False)  
++		self.entry3 = Gtk.CheckButton(label=_("Quit on lose focus"), use_underline=False)  
+ 		self.entry3.set_tooltip_markup(_("When enabled, gloobus-preview will <b>exit</b>\nwhen it loses focus"))
+ 		self.entry3.set_active(self.config.getboolean("Main","focus"))
+ 
+ 		#================= Win bar layout ================= #
+-		self.entry4 = gtk.CheckButton(label=_("Window Bar Layout inverted"), use_underline=False)  
++		self.entry4 = Gtk.CheckButton(label=_("Window Bar Layout inverted"), use_underline=False)  
+ 		self.entry4.set_tooltip_markup(_("Layout of the buttons\nclose button on the right/left?"))
+ 		self.entry4.set_active(self.config.getboolean("Main","winbar_layout"))
+ 
+ 		#================= Use gtk theme ================= #
+-		self.theme_gtk_entry = gtk.CheckButton(label=_("Use gtk theme"), use_underline=False)  
++		self.theme_gtk_entry = Gtk.CheckButton(label=_("Use gtk theme"), use_underline=False)  
+ 		self.theme_gtk_entry.set_tooltip_markup(_("When enabled, gloobus-preview will use system GTK theme"))
+ 		self.theme_gtk_entry.set_active(self.config.getboolean("Theme","gtk"))
+ 	
+ 		#=================== BUTTONS  ===================== #
+-		container0 = gtk.HBox(True,1)  #Save and close buttons
++		container0 = Gtk.HBox(True,1)  #Save and close buttons
+ 
+-		ok_button = gtk.Button(_("Save"))
+-		cancel_button = gtk.Button(_("Cancel"))
++		ok_button = Gtk.Button(_("Save"))
++		cancel_button = Gtk.Button(_("Cancel"))
+ 
+ 		container0.add(cancel_button)			
+ 		container0.add(ok_button)				
+-		cancel_button.connect('clicked', gtk.main_quit)
++		cancel_button.connect('clicked', Gtk.main_quit)
+ 		ok_button.connect('clicked', self.save_conf)
+ 
+ 		#============ GENERAL CONTAINER ================== #
+ 
+-		general_container = gtk.VBox(False,1)
++		general_container = Gtk.VBox(False,1)
+ 
+-		title = gtk.Label()
++		title = Gtk.Label()
+ 		title.set_markup(_("<b>Main settings</b>"))
+-		align2 = gtk.Alignment(0,0,0,0)
++		align2 = Gtk.Alignment.new(0,0,0,0)
+ 		align2.set_padding(0,5,0,0)
+ 		align2.add(title)
+ 
+@@ -128,11 +127,11 @@
+ 		if self.gconf_win_layout == None:
+ 			general_container.add(self.entry4)	#Always on top
+ 
+-		general_container.add(gtk.HSeparator())
+-		general_container.add(gtk.Label())	#White Space
++		general_container.add(Gtk.HSeparator())
++		general_container.add(Gtk.Label())	#White Space
+ 		general_container.add(container0)	#Close & save buttons
+ 
+-		align = gtk.Alignment(0,0,0,0);
++		align = Gtk.Alignment.new(0,0,0,0);
+ 		align.set_padding(10,5,10,10)
+ 
+ 		align.add(general_container)
+@@ -155,7 +154,7 @@
+ 
+ 		config_save(self.config)
+ 		
+-		gtk.main_quit()
++		Gtk.main_quit()
+ 
+ 
+ #==================================== GLOBAL FUNCTIONS ===============================================#		
+@@ -232,13 +231,13 @@
+ g.debug("Path: "   + abspath)
+ g.debug("Config File: " + CONFIG_PATH)
+ 
+-win = gtk.Window()
++win = Gtk.Window()
+ win.set_title(_("Gloobus-Preview Configuration"))
+ #win.set_default_size(400,150)
+-win.connect('delete-event', gtk.main_quit)
++win.connect('delete-event', Gtk.main_quit)
+ 
+ 
+ gui = GUI()
+ 
+-gtk.main()
++Gtk.main()
+ 
diff --git a/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch b/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
deleted file mode 100644
index f5b7c8e00..000000000
--- a/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-------------------------------------------------------------
-revno: 291
-committer: Michał Masłowski <mtjm@mtjm.eu>
-branch nick: gloobus-preview
-timestamp: Sun 2013-06-23 14:43:35 +0200
-message:
-  Use bsdtar to open RAR archives if unrar is not available.
-  
-  Needs bsdtar from libarchive 3.0 or newer, not tested with older
-  versions nor checking for them.
-diff:
-=== modified file 'src/plugin-compressed/plugin-compressed.cpp'
---- src/plugin-compressed/plugin-compressed.cpp	2012-04-06 11:25:47 +0000
-+++ src/plugin-compressed/plugin-compressed.cpp	2013-06-23 12:43:35 +0000
-@@ -52,8 +52,9 @@
- 		cmd_args.push_back("--");
- 		line_parser = &iCompressed::parse_line_7z;
- 	}
--	else if ( type == GP_COMPRESSED_RAR
--			|| type == GP_COMPRESSED_RAR_X )
-+	else if ( (type == GP_COMPRESSED_RAR
-+				|| type == GP_COMPRESSED_RAR_X)
-+			&& interface::is_program_available("unrar") )
- 	{
- 		cmd_args.push_back("unrar");
- 		cmd_args.push_back("vb");
-@@ -70,9 +71,15 @@
- 			|| type == GP_COMPRESSED_TAR_LZOP
- 			|| type == GP_COMPRESSED_TAR_X
- 			|| type == GP_COMPRESSED_TAR_XZ
--			|| type == GP_COMPRESSED_TAR_Z )
-+			|| type == GP_COMPRESSED_TAR_Z
-+			|| type == GP_COMPRESSED_RAR
-+			|| type == GP_COMPRESSED_RAR_X )
- 	{
--		cmd_args.push_back("tar");
-+		if ( type == GP_COMPRESSED_RAR
-+	       		|| type == GP_COMPRESSED_RAR_X )
-+			cmd_args.push_back("bsdtar");
-+		else
-+			cmd_args.push_back("tar");
- 		cmd_args.push_back("-tf");
- 		line_parser = &iCompressed::parse_line_rar;
- 	}
-
-=== modified file 'src/plugin-compressed/plugin-compressed.h'
---- src/plugin-compressed/plugin-compressed.h	2010-03-27 15:55:08 +0000
-+++ src/plugin-compressed/plugin-compressed.h	2013-06-23 12:43:35 +0000
-@@ -102,7 +102,7 @@
- 	PluginManager::register_filetype(GP_COMPRESSED_7Z, 1);
- }
- 
--if(interface::is_program_available("unrar")) {
-+if(interface::is_program_available("unrar") || interface::is_program_available("bsdtar")) {
- 	PluginManager::register_filetype(GP_COMPRESSED_RAR, 1);
- 	PluginManager::register_filetype(GP_COMPRESSED_RAR_X, 1);
- }
diff --git a/libre/gloobus-preview-libre/gloobus-preview.install b/libre/gloobus-preview-libre/gloobus-preview.install
deleted file mode 100644
index 16ad7278f..000000000
--- a/libre/gloobus-preview-libre/gloobus-preview.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-  gdk-pixbuf-query-loaders --update-cache
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch b/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch
new file mode 100644
index 000000000..f748da875
--- /dev/null
+++ b/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch
@@ -0,0 +1,21 @@
+diff -Naur gloobus-sushi.orig/src/gloobus-sushi.py gloobus-sushi/src/gloobus-sushi.py
+--- gloobus-sushi.orig/src/gloobus-sushi.py	2014-01-22 21:54:41.297590000 +0100
++++ gloobus-sushi/src/gloobus-sushi.py	2014-01-22 21:45:21.244184455 +0100
+@@ -16,7 +16,7 @@
+ 
+ import dbus
+ import dbus.service
+-import gobject
++from gi.repository import GObject
+ import os
+ 
+ from dbus.mainloop.glib import DBusGMainLoop
+@@ -28,7 +28,7 @@
+     def __init__(self):
+         bus_name = dbus.service.BusName(DBUS_NAME, bus=dbus.SessionBus())
+         super(DBusWrapper, self).__init__(bus_name, DBUS_PATH)
+-        self.loop = gobject.MainLoop()
++        self.loop = GObject.MainLoop()
+         self.loop.run()
+ 
+     @dbus.service.method(DBUS_NAME)
diff --git a/libre/gloobus-preview-libre/use-xdg-open.patch b/libre/gloobus-preview-libre/use-xdg-open.patch
deleted file mode 100644
index 68e219e6a..000000000
--- a/libre/gloobus-preview-libre/use-xdg-open.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-window.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-window.cpp
---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-window.cpp	2012-04-06 15:07:29.000000000 +0200
-+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-window.cpp	2013-05-18 09:49:24.833574800 +0200
-@@ -560,12 +560,12 @@
-     string label(gtk_menu_item_get_label(item));
-     if(label ==  _("Settings"))
-         cmd = "gloobus-preview-configuration";
--    else if(label ==  _("Report a Bug"))
--        cmd = "gnome-open \"https://bugs.launchpad.net/gloobus-preview/\"";
-+    else if(label ==  _("Report a Problem"))
-+        cmd = "xdg-open \"https://bugs.launchpad.net/gloobus-preview/\"";
-     else if(label == _("Blog"))
--        cmd = "gnome-open \"http://gloobus.wordpress.com\"" ;
-+        cmd = "xdg-open \"http://gloobus.wordpress.com\"" ;
-     else if(label == _("Donate"))
--        cmd = "gnome-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ;
-+        cmd = "xdg-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ;
-     else if(label == _("About"))
-         ui->create_about();
-     else if(label == _("Quit"))
diff --git a/libre/gnome-menus/PKGBUILD b/libre/gnome-menus/PKGBUILD
deleted file mode 100644
index 186473b5b..000000000
--- a/libre/gnome-menus/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jan@archlinux.org>
-
-pkgname=gnome-menus
-pkgver=3.6.2
-pkgrel=1.1
-pkgdesc="GNOME menu specifications, Parabola rebranded"
-arch=('i686' 'x86_64' 'mips64el')
-depends=('glib2' 'python2-gobject')
-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
-        menus.patch)
-sha256sums=('f6cefb25ce3ca2a0e4cb43894089cc6079bf948230e99bc0e244b380fa84bf4f'
-            'de14815d63ab98f999975680a8981702dee0f70d129d4d4fcf4778d966e67435')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np0 -i "$srcdir/menus.patch"
-
-  PYTHON=/usr/bin/python2 ./configure \
-      --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var  --disable-static
-  make
-}
-
-package(){
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  sed -i "1s|#!/usr/bin/env python$|&2|" \
-    "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py"
-}
diff --git a/libre/gnome-menus/menus.patch b/libre/gnome-menus/menus.patch
deleted file mode 100644
index 6648e09ec..000000000
--- a/libre/gnome-menus/menus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- layout/applications.menu	2005-06-28 10:16:39.000000000 +0200
-+++ layout/applications.menu	2005-09-12 23:21:20.000000000 +0200
-@@ -7,7 +7,6 @@
-   <Directory>Applications.directory</Directory>
- 
-   <!-- Scan legacy dirs first, as later items take priority -->
--  <KDELegacyDirs/>
-   <LegacyDir>/etc/X11/applnk</LegacyDir>
-   <LegacyDir>/usr/share/gnome/apps</LegacyDir>
- 
-@@ -18,6 +17,14 @@
-   <!-- Read in overrides and child menus from applications-merged/ -->
-   <DefaultMergeDirs/>
- 
-+  <!-- Parabola submenu -->
-+  <Menu>
-+    <Name>Parabola</Name>
-+    <Directory>Parabola.directory</Directory>
-+    <Include>
-+      <Category>Parabola</Category>
-+    </Include>
-+  </Menu> <!-- End Parabola -->
-   <!-- Accessories submenu -->
-   <Menu>
-     <Name>Accessories</Name>
diff --git a/libre/gnormalize-libre/PKGBUILD b/libre/gnormalize-libre/PKGBUILD
deleted file mode 100644
index 75edbfc1e..000000000
--- a/libre/gnormalize-libre/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 91575 2013-05-24 12:41:56Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Chris Brannon <cmbrannon79@gmail.com>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor:JZsolt Varadi (karmaxxl) 
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=gnormalize
-pkgname=gnormalize-libre
-pkgver=0.63
-pkgrel=5
-pkgdesc='Audio normalizer, converter, encoder/decoder, ripper, tagger and player, without nonfree faac and mac recommendation'
-arch=('any')
-url='http://gnormalize.sourceforge.net/'
-license=('GPL')
-depends=('perl' 'cddb_get' 'desktop-file-utils' 'gtk2-perl' 'hicolor-icon-theme')
-makedepends=('xz' 'gendesk')
-optdepends=('flac: FLAC encoding, FLAC playing in conjunction with mplayer'
-            'lame: MP3 encoding'
-            'mpg321: MP3 playing'
-            'mplayer: FLAC/WAV playing'
-            'musepack-tools: full Musepack support'
-            'perl-mp3-info: MP3 ID3 tags'
-            'vorbis-tools: full OGG Vorbis support'
-            'cdcd: CD playing'
-            'cdparanoia: CD ripping'
-            'cdrkit: CD ripping - alternative to cdparanoia'
-            'wavegain: sound normalization')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-install=gnormalize.install
-source=("http://downloads.sourceforge.net/sourceforge/gnormalize/${_pkgname}-${pkgver}.tar.gz")
-sha256sums=('80fd9aa2da8d7fcc88bd180be2adce1aed863bedba7d715144029bd95b61ccb6')
-
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  gendesk -n --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --mimetypes \
-  'audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg'
-  lzma -qd gnormalize.1.lzma
-} 
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  install -Dm755 "$_pkgname" "$pkgdir/usr/bin/$_pkgname"
-  install -Dm644 "$_pkgname.1" "$pkgdir/usr/share/man/man1/$_pkgname.1"
-  install -d "$pkgdir/usr/share/$_pkgname/animations"
-  install -m644 animations/*.gif "$pkgdir/usr/share/$_pkgname/animations/"
-  install -Dm644 README "$pkgdir/usr/share/doc/$_pkgname/README"
-  install -Dm644 "icons/$_pkgname.png" \
-    "$pkgdir/usr/share/pixmaps/$_pkgname.png"
-  for i in 16 32 48 ; do
-    install -Dm644 "icons/gnormalize-$i.png" \
-      "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/$_pkgname.png"
-  done
-  install -Dm644 "$_pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$_pkgname.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/gnormalize-libre/gnormalize.desktop b/libre/gnormalize-libre/gnormalize.desktop
deleted file mode 100644
index 4d4061308..000000000
--- a/libre/gnormalize-libre/gnormalize.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=gnormalize
-Comment=Encoder/Decoder, normalize frontend, etc.
-Exec=gnormalize
-Icon=gnormalize
-MimeType=audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg;
-Categories=GTK;AudioVideo;Player;
-Terminal=false
-Type=Application
diff --git a/libre/gnormalize-libre/gnormalize.install b/libre/gnormalize-libre/gnormalize.install
deleted file mode 100644
index ef533df53..000000000
--- a/libre/gnormalize-libre/gnormalize.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD
index f23b29ec0..817e6a418 100644
--- a/libre/gnu-ghostscript/PKGBUILD
+++ b/libre/gnu-ghostscript/PKGBUILD
@@ -2,25 +2,25 @@
 
 _pkgname=ghostscript
 pkgname=gnu-ghostscript
-_gspkgver=9.10 # ghostscript package version
+_gspkgver=9.10 # ghostscript-libre package version
 _pkgver=9.06
 pkgver=9.06.0
-pkgrel=6
+pkgrel=7
 pkgdesc="An interpreter for the PostScript language maintained by a team of GNU programmers"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg'
-         'libtiff>=4.0.0' 'lcms2' 'dbus')
-makedepends=('gtk2' 'gnutls' 'openjpeg')
+         'libtiff>=4.0.0' 'lcms2' 'dbus' 'libpaper')
+makedepends=('gtk3' 'gnutls')
 optdepends=('texlive-core:      needed for dvipdf'
-            'gtk2:              needed for gsx')
+            'gtk3:              needed for gsx')
 conflicts=${_pkgname}
 provides="${_pkgname}=${_gspkgver}"
 url="https://www.gnu.org/software/${_pkgname}/"
 source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${pkgname}-${pkgver}.tar.xz
         ijs-automake.patch
         libtool.patch)
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 md5sums=('85a5e07a6b91937c157576293b381065'
          '83bcae456ad4c9fb790be483914dbeba'
          '5bd5d4966007b460deed866a30a0b3c8')
@@ -35,7 +35,9 @@ build() {
   patch -Np1 -i ${srcdir}/libtool.patch
 
   # force it to use system-libs
-  rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype openjpeg cups/libs # jbig2dec is in community
+  # keep heavily patched included openjpeg, leads to segfault with system openjpeg
+  # https://bugs.archlinux.org/task/38226
+  rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype cups/libs # jbig2dec is in community
 
   ./configure --prefix=/usr \
 	--enable-dynamic \
@@ -45,12 +47,13 @@ build() {
 	--with-x \
 	--with-drivers=ALL\
 	--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
-	--with-install-cups \
 	--enable-fontconfig \
 	--enable-freetype \
+	--enable-openjpeg \
 	--without-luratech \
 	--without-omni \
 	--with-system-libtiff \
+	--with-libpaper \
 	--disable-compile-inits #--help # needed for linking with system-zlib
   make
 
diff --git a/libre/gnu-ghostscript/ijs-automake.patch b/libre/gnu-ghostscript/ijs-automake.patch
deleted file mode 100644
index 7b5f77ca1..000000000
--- a/libre/gnu-ghostscript/ijs-automake.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnu-ghostscript-9.06.0.orig/ijs/configure.ac	2012-12-26 23:11:50.000000000 -0200
-+++ gnu-ghostscript-9.06.0/ijs/configure.ac	2013-02-04 13:28:10.656069912 -0200
-@@ -117,7 +117,6 @@
- dnl Checks for programs
- 
- AC_PROG_CC
--AM_PROG_CC_STDC
- AM_PROG_LIBTOOL
- AC_SUBST(LIBTOOL_DEPS)
- AC_ISC_POSIX
diff --git a/libre/gnu-ghostscript/libtool.patch b/libre/gnu-ghostscript/libtool.patch
deleted file mode 100644
index 4271ce69b..000000000
--- a/libre/gnu-ghostscript/libtool.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gnu-ghostscript-9.04.1/ltmain.sh	2011-12-31 08:26:26.000000000 -0200
-+++ gnu-ghostscript-9.04.1/ltmain.sh	2012-04-10 05:08:19.253341477 -0300
-@@ -79,9 +79,9 @@
- 
- PROGRAM=libtool
- PACKAGE=libtool
--VERSION=2.4
-+VERSION=2.4.2
- TIMESTAMP=""
--package_revision=1.3293
-+package_revision=1.3337
- 
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
diff --git a/libre/grub-legacy/040_all_grub-0.96-nxstack.patch b/libre/grub-legacy/040_all_grub-0.96-nxstack.patch
deleted file mode 100644
index 121941c75..000000000
--- a/libre/grub-legacy/040_all_grub-0.96-nxstack.patch
+++ /dev/null
@@ -1,623 +0,0 @@
-Fix NX segfaulting on amd64.
-
-Patch by Peter Jones.
-
-http://lists.gnu.org/archive/html/bug-grub/2005-03/msg00011.html
-
---- grub-0.97/grub/asmstub.c
-+++ grub-0.97/grub/asmstub.c
-@@ -42,6 +42,7 @@
- #include <sys/time.h>
- #include <termios.h>
- #include <signal.h>
-+#include <sys/mman.h>
- 
- #ifdef __linux__
- # include <sys/ioctl.h>		/* ioctl */
-@@ -79,7 +80,7 @@
- struct apm_info apm_bios_info;
- 
- /* Emulation requirements. */
--char *grub_scratch_mem = 0;
-+void *grub_scratch_mem = 0;
- 
- struct geometry *disks = 0;
- 
-@@ -103,14 +104,62 @@
- static unsigned int serial_speed;
- #endif /* SIMULATE_SLOWNESS_OF_SERIAL */
- 
-+/* This allocates page-aligned storage of the specified size, which must be
-+ * a multiple of the page size as determined by calling sysconf(_SC_PAGESIZE)
-+ */
-+#ifdef __linux__
-+static void *
-+grub_mmap_alloc(size_t len)
-+{
-+  int mmap_flags = MAP_ANONYMOUS|MAP_PRIVATE|MAP_EXECUTABLE;
-+
-+#ifdef MAP_32BIT
-+  mmap_flags |= MAP_32BIT;
-+#endif
-+  /* Mark the simulated stack executable, as GCC uses stack trampolines
-+   * to implement nested functions. */
-+  return mmap(NULL, len, PROT_READ|PROT_WRITE|PROT_EXEC, mmap_flags, -1, 0);
-+}
-+#else /* !defined(__linux__) */
-+static void *
-+grub_mmap_alloc(size_t len)
-+{
-+  int fd = 0, offset = 0, ret = 0;
-+  void *pa = MAP_FAILED; 
-+  char template[] = "/tmp/grub_mmap_alloc_XXXXXX";
-+  errno_t e;
-+
-+  fd = mkstemp(template);
-+  if (fd < 0)
-+    return pa;
-+
-+  unlink(template);
-+
-+  ret = ftruncate(fd, len);
-+  if (ret < 0)
-+    return pa;
-+
-+  /* Mark the simulated stack executable, as GCC uses stack trampolines
-+   * to implement nested functions. */
-+  pa = mmap(NULL, len, PROT_READ|PROT_WRITE|PROT_EXEC,
-+                  MAP_PRIVATE|MAP_EXECUTABLE, fd, offset);
-+
-+  e = errno;
-+  close(fd);
-+  errno = e;
-+  return pa;
-+}
-+#endif /* defined(__linux__) */
-+
- /* The main entry point into this mess. */
- int
- grub_stage2 (void)
- {
-   /* These need to be static, because they survive our stack transitions. */
-   static int status = 0;
--  static char *realstack;
--  char *scratch, *simstack;
-+  static void *realstack;
-+  void *simstack_alloc_base, *simstack;
-+  size_t simstack_size, page_size;
-   int i;
- 
-   /* We need a nested function so that we get a clean stack frame,
-@@ -140,9 +189,35 @@
-   }
- 
-   assert (grub_scratch_mem == 0);
--  scratch = malloc (0x100000 + EXTENDED_MEMSIZE + 15);
--  assert (scratch);
--  grub_scratch_mem = (char *) ((((int) scratch) >> 4) << 4);
-+
-+  /* Allocate enough pages for 0x100000 + EXTENDED_SIZE + 15, and
-+   * make sure the memory is aligned to a multiple of the system's
-+   * page size */
-+  page_size = sysconf (_SC_PAGESIZE);
-+  simstack_size = ( 0x100000 + EXTENDED_MEMSIZE + 15);
-+  if (simstack_size % page_size)
-+    {
-+      /* If we're not on a page_size boundary, round up to the next one */
-+      simstack_size &= ~(page_size-1);
-+      simstack_size += page_size;
-+    }
-+
-+  /* Add one for a PROT_NONE boundary page at each end. */
-+  simstack_size += 2 * page_size;
-+
-+  simstack_alloc_base = grub_mmap_alloc(simstack_size);
-+  assert (simstack_alloc_base != MAP_FAILED);
-+
-+  /* mark pages above and below our simstack area as innaccessable.
-+   * If the implementation we're using doesn't support that, then the
-+   * new protection modes are undefined.  It's safe to just ignore
-+   * them, though.  It'd be nice if we knew that we'd get a SEGV for
-+   * touching the area, but that's all.  it'd be nice to have. */
-+  mprotect (simstack_alloc_base, page_size, PROT_NONE);
-+  mprotect ((void *)((unsigned long)simstack_alloc_base +
-+                         simstack_size - page_size),  page_size, PROT_NONE);
-+
-+  grub_scratch_mem = (void *)((unsigned long)simstack_alloc_base + page_size);
- 
-   /* FIXME: simulate the memory holes using mprot, if available. */
- 
-@@ -215,7 +290,7 @@
-   device_map = 0;
-   free (disks);
-   disks = 0;
--  free (scratch);
-+  munmap(simstack_alloc_base, simstack_size);
-   grub_scratch_mem = 0;
- 
-   if (serial_device)
---- grub-0.97/stage2/builtins.c
-+++ grub-0.97/stage2/builtins.c
-@@ -131,63 +131,98 @@
- }
- 
- 
-+/* blocklist_read_helper nee disk_read_blocklist_func was a nested
-+ * function, to which pointers were taken and exposed globally.  Even
-+ * in the GNU-C nested functions extension, they have local linkage,
-+ * and aren't guaranteed to be accessable *at all* outside of their 
-+ * containing scope.
-+ *
-+ * Above and beyond all of that, the variables within blocklist_func_context
-+ * are originally local variables, with local (not even static) linkage,
-+ * from within blocklist_func.  These were each referenced by
-+ * disk_read_blocklist_func, which is only called from other functions
-+ * through a globally scoped pointer.
-+ * 
-+ * The documentation in GCC actually uses the words "all hell will break
-+ * loose" to describe this scenario.
-+ *
-+ * Also, "start_sector" was also used uninitialized, but gcc doesn't warn
-+ * about it (possibly because of the scoping madness?)
-+ */
-+   
-+static struct {
-+       int start_sector;
-+       int num_sectors;
-+       int num_entries;
-+       int last_length;
-+} blocklist_func_context = {
-+       .start_sector = 0,
-+       .num_sectors = 0,
-+       .num_entries = 0,
-+       .last_length = 0
-+};
-+
-+/* Collect contiguous blocks into one entry as many as possible,
-+   and print the blocklist notation on the screen.  */
-+static void
-+blocklist_read_helper (int sector, int offset, int length)
-+{
-+  int *start_sector = &blocklist_func_context.start_sector;
-+  int *num_sectors = &blocklist_func_context.num_sectors;
-+  int *num_entries = &blocklist_func_context.num_entries;
-+  int *last_length = &blocklist_func_context.last_length;
-+
-+  if (*num_sectors > 0)
-+  {
-+    if (*start_sector + *num_sectors == sector
-+      && offset == 0 && *last_length == SECTOR_SIZE)
-+    {
-+      *num_sectors++;
-+      *last_length = length;
-+      return;
-+    }
-+    else
-+    {
-+      if (*last_length == SECTOR_SIZE)
-+        grub_printf ("%s%d+%d", *num_entries ? "," : "",
-+          *start_sector - part_start, *num_sectors);
-+      else if (*num_sectors > 1)
-+        grub_printf ("%s%d+%d,%d[0-%d]", *num_entries ? "," : "",
-+          *start_sector - part_start, *num_sectors-1,
-+          *start_sector + *num_sectors-1 - part_start, 
-+          *last_length);
-+      else
-+        grub_printf ("%s%d[0-%d]", *num_entries ? "," : "",
-+          *start_sector - part_start, *last_length);
-+      *num_entries++;
-+      *num_sectors = 0;
-+    }
-+  }
-+
-+  if (offset > 0)
-+  {
-+    grub_printf("%s%d[%d-%d]", *num_entries ? "," : "",
-+          sector-part_start, offset, offset+length);
-+    *num_entries++;
-+  }
-+  else
-+  {
-+    *start_sector = sector;
-+    *num_sectors = 1;
-+    *last_length = length;
-+  }
-+}
-+
- /* blocklist */
- static int
- blocklist_func (char *arg, int flags)
- {
-   char *dummy = (char *) RAW_ADDR (0x100000);
--  int start_sector;
--  int num_sectors = 0;
--  int num_entries = 0;
--  int last_length = 0;
--
--  auto void disk_read_blocklist_func (int sector, int offset, int length);
--  
--  /* Collect contiguous blocks into one entry as many as possible,
--     and print the blocklist notation on the screen.  */
--  auto void disk_read_blocklist_func (int sector, int offset, int length)
--    {
--      if (num_sectors > 0)
--	{
--	  if (start_sector + num_sectors == sector
--	      && offset == 0 && last_length == SECTOR_SIZE)
--	    {
--	      num_sectors++;
--	      last_length = length;
--	      return;
--	    }
--	  else
--	    {
--	      if (last_length == SECTOR_SIZE)
--		grub_printf ("%s%d+%d", num_entries ? "," : "",
--			     start_sector - part_start, num_sectors);
--	      else if (num_sectors > 1)
--		grub_printf ("%s%d+%d,%d[0-%d]", num_entries ? "," : "",
--			     start_sector - part_start, num_sectors-1,
--			     start_sector + num_sectors-1 - part_start, 
--			     last_length);
--	      else
--		grub_printf ("%s%d[0-%d]", num_entries ? "," : "",
--			     start_sector - part_start, last_length);
--	      num_entries++;
--	      num_sectors = 0;
--	    }
--	}
--
--      if (offset > 0)
--	{
--	  grub_printf("%s%d[%d-%d]", num_entries ? "," : "",
--		      sector-part_start, offset, offset+length);
--	  num_entries++;
--	}
--      else
--	{
--	  start_sector = sector;
--	  num_sectors = 1;
--	  last_length = length;
--	}
--    }
- 
-+  int *start_sector = &blocklist_func_context.start_sector;
-+  int *num_sectors = &blocklist_func_context.num_sectors;
-+  int *num_entries = &blocklist_func_context.num_entries;
-+  
-   /* Open the file.  */
-   if (! grub_open (arg))
-     return 1;
-@@ -204,15 +241,15 @@
-   grub_printf (")");
- 
-   /* Read in the whole file to DUMMY.  */
--  disk_read_hook = disk_read_blocklist_func;
-+  disk_read_hook = blocklist_read_helper;
-   if (! grub_read (dummy, -1))
-     goto fail;
- 
-   /* The last entry may not be printed yet.  Don't check if it is a
-    * full sector, since it doesn't matter if we read too much. */
--  if (num_sectors > 0)
--    grub_printf ("%s%d+%d", num_entries ? "," : "",
--		 start_sector - part_start, num_sectors);
-+  if (*num_sectors > 0)
-+	grub_printf ("%s%d+%d", *num_entries ? "," : "",
-+                *start_sector - part_start, *num_sectors);
- 
-   grub_printf ("\n");
-   
-@@ -1868,6 +1905,77 @@
- 
- 
- /* install */
-+static struct {
-+       int saved_sector;
-+       int installaddr;
-+       int installlist;
-+       char *stage2_first_buffer;
-+} install_func_context = {
-+       .saved_sector = 0,
-+       .installaddr = 0,
-+       .installlist = 0,
-+       .stage2_first_buffer = NULL,
-+};
-+
-+/* Save the first sector of Stage2 in STAGE2_SECT.  */
-+/* Formerly disk_read_savesect_func with local scope inside install_func */
-+static void
-+install_savesect_helper(int sector, int offset, int length)
-+{
-+  if (debug)
-+    printf ("[%d]", sector);
-+
-+  /* ReiserFS has files which sometimes contain data not aligned
-+     on sector boundaries.  Returning an error is better than
-+     silently failing. */
-+  if (offset != 0 || length != SECTOR_SIZE)
-+    errnum = ERR_UNALIGNED;
-+
-+  install_func_context.saved_sector = sector;
-+}
-+
-+/* Write SECTOR to INSTALLLIST, and update INSTALLADDR and  INSTALLSECT.  */
-+/* Formerly disk_read_blocklist_func with local scope inside install_func */
-+static void
-+install_blocklist_helper (int sector, int offset, int length)
-+{
-+  int *installaddr = &install_func_context.installaddr;
-+  int *installlist = &install_func_context.installlist;
-+  char **stage2_first_buffer = &install_func_context.stage2_first_buffer;
-+  /* Was the last sector full? */
-+  static int last_length = SECTOR_SIZE;
-+
-+  if (debug)
-+    printf("[%d]", sector);
-+
-+  if (offset != 0 || last_length != SECTOR_SIZE)
-+    {
-+      /* We found a non-sector-aligned data block. */
-+      errnum = ERR_UNALIGNED;
-+      return;
-+    }
-+
-+  last_length = length;
-+
-+  if (*((unsigned long *) (*installlist - 4))
-+      + *((unsigned short *) *installlist) != sector
-+      || *installlist == (int) *stage2_first_buffer + SECTOR_SIZE + 4)
-+    {
-+      *installlist -= 8;
-+
-+      if (*((unsigned long *) (*installlist - 8)))
-+        errnum = ERR_WONT_FIT;
-+      else
-+        {
-+          *((unsigned short *) (*installlist + 2)) = (*installaddr >> 4);
-+          *((unsigned long *) (*installlist - 4)) = sector;
-+        }
-+    }
-+
-+  *((unsigned short *) *installlist) += 1;
-+  *installaddr += 512;
-+}
-+
- static int
- install_func (char *arg, int flags)
- {
-@@ -1875,8 +1983,12 @@
-   char *stage1_buffer = (char *) RAW_ADDR (0x100000);
-   char *stage2_buffer = stage1_buffer + SECTOR_SIZE;
-   char *old_sect = stage2_buffer + SECTOR_SIZE;
--  char *stage2_first_buffer = old_sect + SECTOR_SIZE;
--  char *stage2_second_buffer = stage2_first_buffer + SECTOR_SIZE;
-+  /* stage2_first_buffer used to be defined as:
-+   * char *stage2_first_buffer = old_sect + SECTOR_SIZE;  */
-+  char **stage2_first_buffer = &install_func_context.stage2_first_buffer;
-+  /* and stage2_second_buffer was:
-+   * char *stage2_second_buffer = stage2_first_buffer + SECTOR_SIZE; */
-+  char *stage2_second_buffer = old_sect + SECTOR_SIZE + SECTOR_SIZE;
-   /* XXX: Probably SECTOR_SIZE is reasonable.  */
-   char *config_filename = stage2_second_buffer + SECTOR_SIZE;
-   char *dummy = config_filename + SECTOR_SIZE;
-@@ -1885,10 +1997,11 @@
-   int src_drive, src_partition, src_part_start;
-   int i;
-   struct geometry dest_geom, src_geom;
--  int saved_sector;
-+  int *saved_sector = &install_func_context.saved_sector;
-   int stage2_first_sector, stage2_second_sector;
-   char *ptr;
--  int installaddr, installlist;
-+  int *installaddr = &install_func_context.installaddr;
-+  int *installlist = &install_func_context.installlist;
-   /* Point to the location of the name of a configuration file in Stage 2.  */
-   char *config_file_location;
-   /* If FILE is a Stage 1.5?  */
-@@ -1897,67 +2010,13 @@
-   int is_open = 0;
-   /* If LBA is forced?  */
-   int is_force_lba = 0;
--  /* Was the last sector full? */
--  int last_length = SECTOR_SIZE;
--  
-+
-+  *stage2_first_buffer = old_sect + SECTOR_SIZE;
- #ifdef GRUB_UTIL
-   /* If the Stage 2 is in a partition mounted by an OS, this will store
-      the filename under the OS.  */
-   char *stage2_os_file = 0;
- #endif /* GRUB_UTIL */
--  
--  auto void disk_read_savesect_func (int sector, int offset, int length);
--  auto void disk_read_blocklist_func (int sector, int offset, int length);
--  
--  /* Save the first sector of Stage2 in STAGE2_SECT.  */
--  auto void disk_read_savesect_func (int sector, int offset, int length)
--    {
--      if (debug)
--	printf ("[%d]", sector);
--
--      /* ReiserFS has files which sometimes contain data not aligned
--         on sector boundaries.  Returning an error is better than
--         silently failing. */
--      if (offset != 0 || length != SECTOR_SIZE)
--	errnum = ERR_UNALIGNED;
--
--      saved_sector = sector;
--    }
--
--  /* Write SECTOR to INSTALLLIST, and update INSTALLADDR and
--     INSTALLSECT.  */
--  auto void disk_read_blocklist_func (int sector, int offset, int length)
--    {
--      if (debug)
--	printf("[%d]", sector);
--
--      if (offset != 0 || last_length != SECTOR_SIZE)
--	{
--	  /* We found a non-sector-aligned data block. */
--	  errnum = ERR_UNALIGNED;
--	  return;
--	}
--
--      last_length = length;
--
--      if (*((unsigned long *) (installlist - 4))
--	  + *((unsigned short *) installlist) != sector
--	  || installlist == (int) stage2_first_buffer + SECTOR_SIZE + 4)
--	{
--	  installlist -= 8;
--
--	  if (*((unsigned long *) (installlist - 8)))
--	    errnum = ERR_WONT_FIT;
--	  else
--	    {
--	      *((unsigned short *) (installlist + 2)) = (installaddr >> 4);
--	      *((unsigned long *) (installlist - 4)) = sector;
--	    }
--	}
--
--      *((unsigned short *) installlist) += 1;
--      installaddr += 512;
--    }
- 
-   /* First, check the GNU-style long option.  */
-   while (1)
-@@ -1987,10 +2049,10 @@
-   addr = skip_to (0, file);
- 
-   /* Get the installation address.  */
--  if (! safe_parse_maxint (&addr, &installaddr))
-+  if (! safe_parse_maxint (&addr, installaddr))
-     {
-       /* ADDR is not specified.  */
--      installaddr = 0;
-+      *installaddr = 0;
-       ptr = addr;
-       errnum = 0;
-     }
-@@ -2084,17 +2146,17 @@
-     = (dest_drive & BIOS_FLAG_FIXED_DISK);
-   
-   /* Read the first sector of Stage 2.  */
--  disk_read_hook = disk_read_savesect_func;
--  if (grub_read (stage2_first_buffer, SECTOR_SIZE) != SECTOR_SIZE)
-+  disk_read_hook = install_savesect_helper;
-+  if (grub_read (*stage2_first_buffer, SECTOR_SIZE) != SECTOR_SIZE)
-     goto fail;
- 
--  stage2_first_sector = saved_sector;
-+  stage2_first_sector = *saved_sector;
-   
-   /* Read the second sector of Stage 2.  */
-   if (grub_read (stage2_second_buffer, SECTOR_SIZE) != SECTOR_SIZE)
-     goto fail;
- 
--  stage2_second_sector = saved_sector;
-+  stage2_second_sector = *saved_sector;
-   
-   /* Check for the version of Stage 2.  */
-   if (*((short *) (stage2_second_buffer + STAGE2_VER_MAJ_OFFS))
-@@ -2110,27 +2172,27 @@
- 
-   /* If INSTALLADDR is not specified explicitly in the command-line,
-      determine it by the Stage 2 id.  */
--  if (! installaddr)
-+  if (! *installaddr)
-     {
-       if (! is_stage1_5)
- 	/* Stage 2.  */
--	installaddr = 0x8000;
-+	*installaddr = 0x8000;
-       else
- 	/* Stage 1.5.  */
--	installaddr = 0x2000;
-+	*installaddr = 0x2000;
-     }
- 
-   *((unsigned long *) (stage1_buffer + STAGE1_STAGE2_SECTOR))
-     = stage2_first_sector;
-   *((unsigned short *) (stage1_buffer + STAGE1_STAGE2_ADDRESS))
--    = installaddr;
-+    = *installaddr;
-   *((unsigned short *) (stage1_buffer + STAGE1_STAGE2_SEGMENT))
--    = installaddr >> 4;
-+    = *installaddr >> 4;
- 
--  i = (int) stage2_first_buffer + SECTOR_SIZE - 4;
-+  i = (int) *stage2_first_buffer + SECTOR_SIZE - 4;
-   while (*((unsigned long *) i))
-     {
--      if (i < (int) stage2_first_buffer
-+      if (i < (int) *stage2_first_buffer
- 	  || (*((int *) (i - 4)) & 0x80000000)
- 	  || *((unsigned short *) i) >= 0xA00
- 	  || *((short *) (i + 2)) == 0)
-@@ -2144,13 +2206,13 @@
-       i -= 8;
-     }
- 
--  installlist = (int) stage2_first_buffer + SECTOR_SIZE + 4;
--  installaddr += SECTOR_SIZE;
-+  *installlist = (int) *stage2_first_buffer + SECTOR_SIZE + 4;
-+  *installaddr += SECTOR_SIZE;
-   
-   /* Read the whole of Stage2 except for the first sector.  */
-   grub_seek (SECTOR_SIZE);
- 
--  disk_read_hook = disk_read_blocklist_func;
-+  disk_read_hook = install_blocklist_helper;
-   if (! grub_read (dummy, -1))
-     goto fail;
-   
-@@ -2233,7 +2295,7 @@
- 	  /* Skip the first sector.  */
- 	  grub_seek (SECTOR_SIZE);
- 	  
--	  disk_read_hook = disk_read_savesect_func;
-+	  disk_read_hook = install_savesect_helper;
- 	  if (grub_read (stage2_buffer, SECTOR_SIZE) != SECTOR_SIZE)
- 	    goto fail;
- 	  
-@@ -2303,7 +2365,7 @@
- 	  else
- #endif /* GRUB_UTIL */
- 	    {
--	      if (! devwrite (saved_sector - part_start, 1, stage2_buffer))
-+	      if (! devwrite (*saved_sector - part_start, 1, stage2_buffer))
- 		goto fail;
- 	    }
- 	}
-@@ -2325,7 +2387,7 @@
- 	  goto fail;
- 	}
- 
--      if (fwrite (stage2_first_buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE)
-+      if (fwrite (*stage2_first_buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE)
- 	{
- 	  fclose (fp);
- 	  errnum = ERR_WRITE;
-@@ -2352,7 +2414,7 @@
- 	goto fail;
- 
-       if (! devwrite (stage2_first_sector - src_part_start, 1,
--		      stage2_first_buffer))
-+		      *stage2_first_buffer))
- 	goto fail;
- 
-       if (! devwrite (stage2_second_sector - src_part_start, 1,
---- grub-0.97/stage2/shared.h
-+++ grub-0.97/stage2/shared.h
-@@ -36,8 +36,8 @@
- 
- /* Maybe redirect memory requests through grub_scratch_mem. */
- #ifdef GRUB_UTIL
--extern char *grub_scratch_mem;
--# define RAW_ADDR(x) ((x) + (int) grub_scratch_mem)
-+extern void *grub_scratch_mem;
-+# define RAW_ADDR(x) ((x) + (unsigned long) grub_scratch_mem)
- # define RAW_SEG(x) (RAW_ADDR ((x) << 4) >> 4)
- #else
- # define RAW_ADDR(x) (x)
diff --git a/libre/grub-legacy/05-grub-0.97-initrdaddr.diff b/libre/grub-legacy/05-grub-0.97-initrdaddr.diff
deleted file mode 100644
index ccf5f3e54..000000000
--- a/libre/grub-legacy/05-grub-0.97-initrdaddr.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- grub-0.96/stage2/boot.c
-+++ grub-0.96/stage2/boot.c
-@@ -824,8 +824,11 @@
-     moveto = (mbi.mem_upper + 0x400) << 10;
-   
-   moveto = (moveto - len) & 0xfffff000;
--  max_addr = (lh->header == LINUX_MAGIC_SIGNATURE && lh->version >= 0x0203
--	      ? lh->initrd_addr_max : LINUX_INITRD_MAX_ADDRESS);
-+  max_addr = LINUX_INITRD_MAX_ADDRESS;
-+  if (lh->header == LINUX_MAGIC_SIGNATURE &&
-+      lh->version >= 0x0203 &&
-+      lh->initrd_addr_max < max_addr)
-+    max_addr = lh->initrd_addr_max;
-   if (moveto + len >= max_addr)
-     moveto = (max_addr - len) & 0xfffff000;
-   
diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD
deleted file mode 100644
index 57aaa2840..000000000
--- a/libre/grub-legacy/PKGBUILD
+++ /dev/null
@@ -1,97 +0,0 @@
-# $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@parabola.nu>
-# Contributor (Parabola): Jorge López <jorginho@lavabit.com>
-
-pkgname=grub-legacy
-_srcname=grub
-pkgver=0.97
-pkgrel=25.1
-pkgdesc="A GNU multiboot boot loader (Parabola rebranded)"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnu.org/software/grub/"
-depends=('ncurses' 'diffutils' 'sed')
-conflicts=('grub')
-[ "$CARCH" = 'x86_64' ] && makedepends=('gcc-multilib')
-optdepends=('xfsprogs: freezing of xfs /boot in install-grub script')
-source=(ftp://alpha.gnu.org/gnu/grub/${_srcname}-${pkgver}.tar.gz
-        menu.lst
-        install-grub
-        040_all_grub-0.96-nxstack.patch
-        05-grub-0.97-initrdaddr.diff
-        i2o.patch
-        special-devices.patch
-        more-raid.patch
-        intelmac.patch
-        grub-inode-size.patch
-        ext4.patch
-        grub-0.97-ldflags-objcopy-remove-build-id.patch
-        automake-pkglib.patch)
-backup=('boot/grub/menu.lst')
-install=grub.install
-sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
-          'de504b22f586a8919c12ea3446cae3300a8365f0'
-          '3e23bfee50285c8c7b9ef9ec07964310278b1e09'
-          '157b81dbad3576536b08642242accfa1aeb093a9'
-          'adbb4685c98797ffb4dc83561ec75698991dddbd'
-          'f2e0dff29a7c8a45e90aa07298a1b2a9a9d29afc'
-          'c5e2c94ed0e759590b9eb38c9d979f075d19d7c0'
-          '45fe668a3779664fb292591f426976b6c784d6c8'
-          '066d7ab1ae442f88e94c9e4f1867ac6682965d06'
-          '0436aa6fa0b6f768289172f983a3f4b69384629e'
-          'a36f34e51efed540f1ddafd78e9c9f6d83e4c8d4'
-          '61c4b58d2eaa3c1561d8e9d8fc41341ce8882869'
-          '776ed278eb8ff80e949834f763fad68b8741e7cd')
-
-build() {
-  cd ${srcdir}/${_srcname}-${pkgver}
-
-  # optimizations break the build -- disable them
-  # adding special devices to grub, patches are from fedora
-  patch -Np1 -i ../special-devices.patch
-  patch -Np1 -i ../i2o.patch
-  patch -Np1 -i ../more-raid.patch
-  patch -Np1 -i ../intelmac.patch
-  # Add support for bigger inode size to e2fs_stage1_5
-  patch -Np1 -i ../grub-inode-size.patch
-  # Add ext4 support
-  # http://www.mail-archive.com/bug-grub@gnu.org/msg11458.html
-  patch -Np1 -i ../ext4.patch
-  # binutils fix
-  patch -Np1 -i ../grub-0.97-ldflags-objcopy-remove-build-id.patch
-  # "pkglib" is a reserved keyword in automake fix
-  patch -Np1 -i ../automake-pkglib.patch
-
-  sed -e'/^AC_PROG_CC/ a\AM_PROG_CC_C_O\ ' -i "${srcdir}/${_srcname}-${pkgver}/configure.ac"
-  sed -e'/^AC_PROG_CC/ a\AM_PROG_AS\ ' -i "${srcdir}/${_srcname}-${pkgver}/configure.ac"
-
-  ## recreate ./configure script with the required changes in LDFLAGS and objcopy
-  aclocal
-  autoconf
-  autoreconf -i
-  automake
-
-  if [ "$CARCH" = "x86_64" ]; then
-    # patch from gentoo for fixing a segfault
-    patch -Np1 -i ../040_all_grub-0.96-nxstack.patch
-    # patch from frugalware to make it boot when more than 2GB ram installed
-    patch -Np1 -i ../05-grub-0.97-initrdaddr.diff
-    CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin \
-                         --mandir=/usr/share/man --infodir=/usr/share/info
-  else
-    CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin \
-                --mandir=/usr/share/man --infodir=/usr/share/info
-  fi
-}
-
-package() {
-  cd ${srcdir}/${_srcname}-${pkgver}
-
-  CFLAGS= make
-  make DESTDIR=${pkgdir} install
-  install -D -m644 ../menu.lst ${pkgdir}/boot/grub/menu.lst
-  install -D -m755 ../install-grub ${pkgdir}/usr/bin/install-grub
-
-}
diff --git a/libre/grub-legacy/automake-pkglib.patch b/libre/grub-legacy/automake-pkglib.patch
deleted file mode 100644
index a3fff27a1..000000000
--- a/libre/grub-legacy/automake-pkglib.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/stage1/Makefile.am
-+++ b/stage1/Makefile.am
-@@ -1,7 +1,7 @@
--pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
--nodist_pkglib_DATA = stage1
-+stagedir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
-+nodist_stage_DATA = stage1
- 
--CLEANFILES = $(nodist_pkglib_DATA)
-+CLEANFILES = $(nodist_stage_DATA)
- 
- # We can't use builtins or standard includes.
- AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
---- a/stage2/Makefile.am
-+++ b/stage2/Makefile.am
-@@ -27,12 +27,12 @@
- 	-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
- 
- # Stage 2 and Stage 1.5's.
--pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
-+stagedir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
- 
- EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
- 
- if DISKLESS_SUPPORT
--pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
-+stage_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
- 	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
- 	reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \
- 	nbgrub pxegrub
-@@ -43,7 +43,7 @@
- 	reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \
- 	xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec
- else
--pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
-+stage_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
- 	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
- 	reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5
- noinst_DATA = pre_stage2 start start_eltorito
-@@ -112,7 +112,7 @@
- BUILT_SOURCES = stage2_size.h
- endif
- 
--CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES)
-+CLEANFILES = $(stage_DATA) $(noinst_DATA) $(BUILT_SOURCES)
- 
- stage2_size.h: pre_stage2
- 	-rm -f stage2_size.h
diff --git a/libre/grub-legacy/ext4.patch b/libre/grub-legacy/ext4.patch
deleted file mode 100644
index 8a2f9bdb0..000000000
--- a/libre/grub-legacy/ext4.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-diff -ruNp grub-0.97/stage2/fsys_ext2fs.c grub-0.97-patch/stage2/fsys_ext2fs.c
---- grub-0.97/stage2/fsys_ext2fs.c      2004-08-08 20:19:18.000000000 +0200
-+++ grub-0.97-patch/stage2/fsys_ext2fs.c        2007-12-29 16:25:19.000000000 
-+0100
-@@ -51,6 +51,9 @@ typedef unsigned int __u32;
- #define EXT2_TIND_BLOCK                 (EXT2_DIND_BLOCK + 1)
- #define EXT2_N_BLOCKS                   (EXT2_TIND_BLOCK + 1)
- 
-+/* Inode flags */
-+#define EXT4_EXTENTS_FL                 0x00080000 /* Inode uses extents */
-+
- /* include/linux/ext2_fs.h */
- struct ext2_super_block
-   {
-@@ -191,6 +194,42 @@ struct ext2_dir_entry
- #define EXT2_DIR_REC_LEN(name_len)      (((name_len) + 8 + EXT2_DIR_ROUND) & \
-                                          ~EXT2_DIR_ROUND)
- 
-+/* linux/ext4_fs_extents.h */
-+/*
-+ * This is the extent on-disk structure.
-+ * It's used at the bottom of the tree.
-+ */
-+struct ext4_extent {
-+    __u32 ee_block;       /* first logical block extent covers */
-+    __u16 ee_len;         /* number of blocks covered by extent */
-+    __u16 ee_start_hi;    /* high 16 bits of physical block */
-+    __u32 ee_start;       /* low 32 bits of physical block */
-+};
-+
-+/*
-+ * This is index on-disk structure.
-+ * It's used at all the levels except the bottom.
-+ */
-+struct ext4_extent_idx {
-+    __u32 ei_block;       /* index covers logical blocks from 'block' */
-+    __u32 ei_leaf;        /* pointer to the physical block of the next *
-+                                 * level. leaf or next index could be there */
-+    __u16 ei_leaf_hi;     /* high 16 bits of physical block */
-+    __u16 ei_unused;
-+};
-+
-+/*
-+ * Each block (leaves and indexes), even inode-stored has header.
-+ */
-+struct ext4_extent_header {
-+    __u16  eh_magic;       /* probably will support different formats */
-+    __u16  eh_entries;     /* number of valid entries */
-+    __u16  eh_max;         /* capacity of store in entries */
-+    __u16  eh_depth;       /* has tree real underlying blocks? */
-+    __u32  eh_generation;  /* generation of the tree */
-+};
-+
-+#define EXT4_EXT_MAGIC          0xf30a
- 
- /* ext2/super.c */
- #define log2(n) ffz(~(n))
-@@ -279,6 +318,26 @@ ext2_rdfsb (int fsblock, int buffer)
-                  EXT2_BLOCK_SIZE (SUPERBLOCK), (char *) buffer);
- }
- 
-+/* Walk through extents index tree to find the good leaf */
-+static struct ext4_extent_header * 
-+ext4_recurse_extent_index(struct ext4_extent_header *extent_block, int logical_block)
-+{
-+  int i;
-+  struct ext4_extent_idx *index = (struct ext4_extent_idx *) (extent_block + 1);
-+  if (extent_block->eh_magic != EXT4_EXT_MAGIC)
-+    return NULL;
-+  if (extent_block->eh_depth == 0)
-+    return extent_block;
-+  for (i = 0; i < extent_block->eh_entries; i++)
-+    {
-+      if (logical_block < index[i].ei_block)
-+        break;
-+    }
-+  if (i == 0 || !ext2_rdfsb(index[i-1].ei_leaf, DATABLOCK1))
-+    return NULL;
-+  return (ext4_recurse_extent_index((struct ext4_extent_header *) DATABLOCK1, logical_block));
-+}
-+
- /* from
-   ext2/inode.c:ext2_bmap()
- */
---- grub-0.97/stage2/fsys_ext2fs.c~	2008-12-28 20:19:00.000000000 +0100
-+++ grub-0.97/stage2/fsys_ext2fs.c	2008-12-28 20:19:00.000000000 +0100
-@@ -366,83 +366,106 @@
-     }
-   printf ("logical block %d\n", logical_block);
- #endif /* E2DEBUG */
--
--  /* if it is directly pointed to by the inode, return that physical addr */
--  if (logical_block < EXT2_NDIR_BLOCKS)
--    {
--#ifdef E2DEBUG
--      printf ("returning %d\n", (unsigned char *) (INODE->i_block[logical_block]));
--      printf ("returning %d\n", INODE->i_block[logical_block]);
--#endif /* E2DEBUG */
--      return INODE->i_block[logical_block];
--    }
--  /* else */
--  logical_block -= EXT2_NDIR_BLOCKS;
--  /* try the indirect block */
--  if (logical_block < EXT2_ADDR_PER_BLOCK (SUPERBLOCK))
-+  /* standard ext2 inode */
-+  if (!(INODE->i_flags & EXT4_EXTENTS_FL))
-     {
--      if (mapblock1 != 1
--	  && !ext2_rdfsb (INODE->i_block[EXT2_IND_BLOCK], DATABLOCK1))
--	{
--	  errnum = ERR_FSYS_CORRUPT;
--	  return -1;
--	}
--      mapblock1 = 1;
--      return ((__u32 *) DATABLOCK1)[logical_block];
--    }
--  /* else */
--  logical_block -= EXT2_ADDR_PER_BLOCK (SUPERBLOCK);
--  /* now try the double indirect block */
--  if (logical_block < (1 << (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) * 2)))
--    {
--      int bnum;
--      if (mapblock1 != 2
--	  && !ext2_rdfsb (INODE->i_block[EXT2_DIND_BLOCK], DATABLOCK1))
--	{
--	  errnum = ERR_FSYS_CORRUPT;
--	  return -1;
--	}
--      mapblock1 = 2;
--      if ((bnum = (((__u32 *) DATABLOCK1)
--		   [logical_block >> EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK)]))
--	  != mapblock2
--	  && !ext2_rdfsb (bnum, DATABLOCK2))
--	{
--	  errnum = ERR_FSYS_CORRUPT;
--	  return -1;
--	}
--      mapblock2 = bnum;
-+      /* if it is directly pointed to by the inode, return that physical addr */
-+      if (logical_block < EXT2_NDIR_BLOCKS)
-+        {
-+#ifdef E2DEBUG
-+          printf ("returning %d\n", (unsigned char *) (INODE->i_block[logical_block]));
-+          printf ("returning %d\n", INODE->i_block[logical_block]);
-+#endif /* E2DEBUG */
-+          return INODE->i_block[logical_block];
-+        }
-+      /* else */
-+      logical_block -= EXT2_NDIR_BLOCKS;
-+      /* try the indirect block */
-+      if (logical_block < EXT2_ADDR_PER_BLOCK (SUPERBLOCK))
-+        {
-+          if (mapblock1 != 1
-+         && !ext2_rdfsb (INODE->i_block[EXT2_IND_BLOCK], DATABLOCK1))
-+       {
-+         errnum = ERR_FSYS_CORRUPT;
-+         return -1;
-+       }
-+          mapblock1 = 1;
-+          return ((__u32 *) DATABLOCK1)[logical_block];
-+        }
-+      /* else */
-+      logical_block -= EXT2_ADDR_PER_BLOCK (SUPERBLOCK);
-+      /* now try the double indirect block */
-+      if (logical_block < (1 << (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) * 2)))
-+        {
-+          int bnum;
-+          if (mapblock1 != 2
-+         && !ext2_rdfsb (INODE->i_block[EXT2_DIND_BLOCK], DATABLOCK1))
-+       {
-+         errnum = ERR_FSYS_CORRUPT;
-+         return -1;
-+       }
-+          mapblock1 = 2;
-+          if ((bnum = (((__u32 *) DATABLOCK1)
-+                  [logical_block >> EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK)]))
-+         != mapblock2
-+         && !ext2_rdfsb (bnum, DATABLOCK2))
-+       {
-+         errnum = ERR_FSYS_CORRUPT;
-+         return -1;
-+       }
-+          mapblock2 = bnum;
-+          return ((__u32 *) DATABLOCK2)
-+            [logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)];
-+        }
-+      /* else */
-+      mapblock2 = -1;
-+      logical_block -= (1 << (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) * 2));
-+      if (mapblock1 != 3
-+          && !ext2_rdfsb (INODE->i_block[EXT2_TIND_BLOCK], DATABLOCK1))
-+        {
-+          errnum = ERR_FSYS_CORRUPT;
-+          return -1;
-+        }
-+      mapblock1 = 3;
-+      if (!ext2_rdfsb (((__u32 *) DATABLOCK1)
-+                  [logical_block >> (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK)
-+                                     * 2)],
-+                  DATABLOCK2))
-+        {
-+          errnum = ERR_FSYS_CORRUPT;
-+          return -1;
-+        }
-+      if (!ext2_rdfsb (((__u32 *) DATABLOCK2)
-+                  [(logical_block >> EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK))
-+                   & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)],
-+                  DATABLOCK2))
-+        {
-+          errnum = ERR_FSYS_CORRUPT;
-+          return -1;
-+        }
-       return ((__u32 *) DATABLOCK2)
--	[logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)];
--    }
--  /* else */
--  mapblock2 = -1;
--  logical_block -= (1 << (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) * 2));
--  if (mapblock1 != 3
--      && !ext2_rdfsb (INODE->i_block[EXT2_TIND_BLOCK], DATABLOCK1))
--    {
--      errnum = ERR_FSYS_CORRUPT;
--      return -1;
-+       [logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)];
-     }
--  mapblock1 = 3;
--  if (!ext2_rdfsb (((__u32 *) DATABLOCK1)
--		   [logical_block >> (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK)
--				      * 2)],
--		   DATABLOCK2))
--    {
--      errnum = ERR_FSYS_CORRUPT;
--      return -1;
--    }
--  if (!ext2_rdfsb (((__u32 *) DATABLOCK2)
--		   [(logical_block >> EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK))
--		    & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)],
--		   DATABLOCK2))
-+  /* inode is in extents format */
-+  else
-     {
-+      int i;
-+      struct ext4_extent_header *extent_hdr = ext4_recurse_extent_index((struct ext4_extent_header *) INODE->i_block, logical_block);
-+      struct ext4_extent *extent = (struct ext4_extent *) (extent_hdr + 1);
-+      if ( extent_hdr == NULL || extent_hdr->eh_magic != EXT4_EXT_MAGIC)
-+      {
-+        errnum = ERR_FSYS_CORRUPT;
-+        return -1;
-+      }
-+      for (i = 0; i<extent_hdr->eh_entries; i++)
-+        {
-+          if (extent[i].ee_block <= logical_block && logical_block < extent[i].ee_block + extent[i].ee_len && !(extent[i].ee_len>>15))
-+            return (logical_block - extent[i].ee_block + extent[i].ee_start);
-+        }
-+      /* We should not arrive here */
-       errnum = ERR_FSYS_CORRUPT;
-       return -1;
-     }
--  return ((__u32 *) DATABLOCK2)
--    [logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)];
- }
- 
- /* preconditions: all preconds of ext2fs_block_map */
diff --git a/libre/grub-legacy/grub-0.97-ldflags-objcopy-remove-build-id.patch b/libre/grub-legacy/grub-0.97-ldflags-objcopy-remove-build-id.patch
deleted file mode 100644
index 2b7cc32d0..000000000
--- a/libre/grub-legacy/grub-0.97-ldflags-objcopy-remove-build-id.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 6652366..ba058eb 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -112,6 +112,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
-+LOADER_LDFLAGS = @LOADER_LDFLAGS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-diff --git a/acinclude.m4 b/acinclude.m4
-index 368839c..32b3fa6 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -57,7 +57,7 @@ else
- fi
- grub_cv_prog_objcopy_absolute=yes
- for link_addr in 2000 8000 7C00; do
--  if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec]); then :
-+  if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr -Wl,--build-id=none conftest.o -o conftest.exec]); then :
-   else
-     AC_MSG_ERROR([${CC-cc} cannot link at address $link_addr])
-   fi
-diff --git a/configure.ac b/configure.ac
-index bb9e1d9..9ac5c9f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -115,6 +115,9 @@ if test "x$ac_cv_prog_gcc" = xyes; then
-   fi
- fi
- 
-+LOADER_LDFLAGS="-Wl,--build-id=none"
-+AC_SUBST(LOADER_LDFLAGS)
-+
- AC_SUBST(STAGE1_CFLAGS)
- AC_SUBST(STAGE2_CFLAGS)
- AC_SUBST(GRUB_CFLAGS)
-diff --git a/docs/Makefile.in b/docs/Makefile.in
-index 3e2de4b..7b2c94d 100644
---- a/docs/Makefile.in
-+++ b/docs/Makefile.in
-@@ -131,6 +131,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
-+LOADER_LDFLAGS = @LOADER_LDFLAGS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-diff --git a/grub/Makefile.in b/grub/Makefile.in
-index 136c38f..7c23ebe 100644
---- a/grub/Makefile.in
-+++ b/grub/Makefile.in
-@@ -108,6 +108,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
-+LOADER_LDFLAGS = @LOADER_LDFLAGS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-diff --git a/lib/Makefile.in b/lib/Makefile.in
-index 3dae206..449e126 100644
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -107,6 +107,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
-+LOADER_LDFLAGS = @LOADER_LDFLAGS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-diff --git a/netboot/Makefile.in b/netboot/Makefile.in
-index 75ac299..0275768 100644
---- a/netboot/Makefile.in
-+++ b/netboot/Makefile.in
-@@ -108,6 +108,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
-+LOADER_LDFLAGS = @LOADER_LDFLAGS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-diff --git a/stage1/Makefile.am b/stage1/Makefile.am
-index 0afc285..3d83356 100644
---- a/stage1/Makefile.am
-+++ b/stage1/Makefile.am
-@@ -5,7 +5,7 @@ CLEANFILES = $(nodist_pkglib_DATA)
- 
- # We can't use builtins or standard includes.
- AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
--LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
-+LDFLAGS = $(LOADER_LDFLAGS) -nostdlib -Wl,-N,-Ttext,7C00
- 
- noinst_PROGRAMS = stage1.exec
- stage1_exec_SOURCES = stage1.S stage1.h
-diff --git a/stage1/Makefile.in b/stage1/Makefile.in
-index 7134bdf..ee4477f 100644
---- a/stage1/Makefile.in
-+++ b/stage1/Makefile.in
-@@ -110,9 +110,10 @@ INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
-+LDFLAGS = $(LOADER_LDFLAGS) -nostdlib -Wl,-N,-Ttext,7C00
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
-+LOADER_LDFLAGS = @LOADER_LDFLAGS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-diff --git a/stage2/Makefile.am b/stage2/Makefile.am
-index f8e6d42..ff6f347 100644
---- a/stage2/Makefile.am
-+++ b/stage2/Makefile.am
-@@ -55,11 +55,11 @@ noinst_PROGRAMS = pre_stage2.exec start.exec start_eltorito.exec \
- endif
- MOSTLYCLEANFILES = $(noinst_PROGRAMS)
- 
--PRE_STAGE2_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8200
--START_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8000
--NBLOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0
--PXELOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00
--START_ELTORITO_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00
-+PRE_STAGE2_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8200 $(LOADER_LDFLAGS)
-+START_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8000 $(LOADER_LDFLAGS)
-+NBLOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0 $(LOADER_LDFLAGS)
-+PXELOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00 $(LOADER_LDFLAGS)
-+START_ELTORITO_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00 $(LOADER_LDFLAGS)
- 
- if NETBOOT_SUPPORT
- NETBOOT_FLAGS = -I$(top_srcdir)/netboot -DSUPPORT_NETBOOT=1
-@@ -82,7 +82,7 @@ endif
- STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	$(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS)
- 
--STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000
-+STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000 $(LOADER_LDFLAGS)
- STAGE1_5_COMPILE = $(STAGE2_COMPILE) -DNO_DECOMPRESSION=1 -DSTAGE1_5=1
- 
- # For stage2 target.
-diff --git a/stage2/Makefile.in b/stage2/Makefile.in
-index d0062bd..88b2038 100644
---- a/stage2/Makefile.in
-+++ b/stage2/Makefile.in
-@@ -355,6 +355,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
-+LOADER_LDFLAGS = @LOADER_LDFLAGS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-@@ -468,11 +469,11 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
- @DISKLESS_SUPPORT_FALSE@noinst_DATA = pre_stage2 start start_eltorito
- @DISKLESS_SUPPORT_TRUE@noinst_DATA = pre_stage2 start start_eltorito nbloader pxeloader diskless
- MOSTLYCLEANFILES = $(noinst_PROGRAMS)
--PRE_STAGE2_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8200
--START_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8000
--NBLOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0
--PXELOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00
--START_ELTORITO_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00
-+PRE_STAGE2_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8200 $(LOADER_LDFLAGS)
-+START_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8000 $(LOADER_LDFLAGS)
-+NBLOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0 $(LOADER_LDFLAGS)
-+PXELOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00 $(LOADER_LDFLAGS)
-+START_ELTORITO_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00 $(LOADER_LDFLAGS)
- @NETBOOT_SUPPORT_FALSE@NETBOOT_FLAGS = 
- @NETBOOT_SUPPORT_TRUE@NETBOOT_FLAGS = -I$(top_srcdir)/netboot -DSUPPORT_NETBOOT=1
- @SERIAL_SUPPORT_FALSE@SERIAL_FLAGS = 
-@@ -482,7 +483,7 @@ START_ELTORITO_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00
- STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	$(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS)
- 
--STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000
-+STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000 $(LOADER_LDFLAGS)
- STAGE1_5_COMPILE = $(STAGE2_COMPILE) -DNO_DECOMPRESSION=1 -DSTAGE1_5=1
- 
- # For stage2 target.
-diff --git a/util/Makefile.in b/util/Makefile.in
-index e700cf7..cd3bf51 100644
---- a/util/Makefile.in
-+++ b/util/Makefile.in
-@@ -113,6 +113,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
-+LOADER_LDFLAGS = @LOADER_LDFLAGS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
diff --git a/libre/grub-legacy/grub-inode-size.patch b/libre/grub-legacy/grub-inode-size.patch
deleted file mode 100644
index f5ceb110b..000000000
--- a/libre/grub-legacy/grub-inode-size.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -Naur grub-0.97-800/stage2/fsys_ext2fs.c grub-0.97-810/stage2/fsys_ext2fs.c
---- grub-0.97-800/stage2/fsys_ext2fs.c	2008-07-21 00:40:21.668879475 -0600
-+++ grub-0.97-810/stage2/fsys_ext2fs.c	2008-07-21 01:01:11.063953773 -0600
-@@ -79,7 +79,52 @@
-     __u32 s_rev_level;		/* Revision level */
-     __u16 s_def_resuid;		/* Default uid for reserved blocks */
-     __u16 s_def_resgid;		/* Default gid for reserved blocks */
--    __u32 s_reserved[235];	/* Padding to the end of the block */
-+    /*
-+     * These fields are for EXT2_DYNAMIC_REV superblocks only.
-+     *
-+     * Note: the difference between the compatible feature set and
-+     * the incompatible feature set is that if there is a bit set
-+     * in the incompatible feature set that the kernel doesn't
-+     * know about, it should refuse to mount the filesystem.
-+     *
-+     * e2fsck's requirements are more strict; if it doesn't know
-+     * about a feature in either the compatible or incompatible
-+     * feature set, it must abort and not try to meddle with
-+     * things it doesn't understand...
-+     */
-+    __u32 s_first_ino;		/* First non-reserved inode */
-+    __u16 s_inode_size;		/* size of inode structure */
-+    __u16 s_block_group_nr;	/* block group # of this superblock */
-+    __u32 s_feature_compat;	/* compatible feature set */
-+    __u32 s_feature_incompat;	/* incompatible feature set */
-+    __u32 s_feature_ro_compat;	/* readonly-compatible feature set */
-+    __u8  s_uuid[16];		/* 128-bit uuid for volume */
-+    char  s_volume_name[16];	/* volume name */
-+    char  s_last_mounted[64];	/* directory where last mounted */
-+    __u32 s_algorithm_usage_bitmap; /* For compression */
-+    /*
-+     * Performance hints.  Directory preallocation should only
-+     * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on.
-+     */
-+    __u8  s_prealloc_blocks;	/* Nr of blocks to try to preallocate*/
-+    __u8  s_prealloc_dir_blocks;	/* Nr to preallocate for dirs */
-+    __u16 s_reserved_gdt_blocks;/* Per group table for online growth */
-+    /*
-+     * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set.
-+     */
-+    __u8 s_journal_uuid[16];	/* uuid of journal superblock */
-+    __u32 s_journal_inum;	/* inode number of journal file */
-+    __u32 s_journal_dev;	/* device number of journal file */
-+    __u32 s_last_orphan;	/* start of list of inodes to delete */
-+    __u32 s_hash_seed[4];	/* HTREE hash seed */
-+    __u8  s_def_hash_version;	/* Default hash version to use */
-+    __u8  s_jnl_backup_type; 	/* Default type of journal backup */
-+    __u16 s_reserved_word_pad;
-+    __u32 s_default_mount_opts;
-+    __u32 s_first_meta_bg;	/* First metablock group */
-+    __u32 s_mkfs_time;		/* When the filesystem was created */
-+    __u32 s_jnl_blocks[17]; 	/* Backup of the journal inode */
-+    __u32 s_reserved[172];	/* Padding to the end of the block */
-   };
- 
- struct ext2_group_desc
-@@ -218,6 +263,14 @@
- #define EXT2_ADDR_PER_BLOCK(s)          (EXT2_BLOCK_SIZE(s) / sizeof (__u32))
- #define EXT2_ADDR_PER_BLOCK_BITS(s)		(log2(EXT2_ADDR_PER_BLOCK(s)))
- 
-+#define EXT2_GOOD_OLD_REV   0   /* The good old (original) format */
-+#define EXT2_DYNAMIC_REV    1   /* V2 format w/ dynamic inode sizes */
-+#define EXT2_GOOD_OLD_INODE_SIZE 128
-+#define EXT2_INODE_SIZE(s)  (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \
-+                 EXT2_GOOD_OLD_INODE_SIZE : \
-+                 (s)->s_inode_size)
-+#define EXT2_INODES_PER_BLOCK(s)	(EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s))
-+
- /* linux/ext2_fs.h */
- #define EXT2_BLOCK_SIZE_BITS(s)        ((s)->s_log_block_size + 10)
- /* kind of from ext2/super.c */
-@@ -553,7 +606,7 @@
-       gdp = GROUP_DESC;
-       ino_blk = gdp[desc].bg_inode_table +
- 	(((current_ino - 1) % (SUPERBLOCK->s_inodes_per_group))
--	 >> log2 (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode)));
-+	 >> log2 (EXT2_INODES_PER_BLOCK (SUPERBLOCK)));
- #ifdef E2DEBUG
-       printf ("inode table fsblock=%d\n", ino_blk);
- #endif /* E2DEBUG */
-@@ -565,13 +618,12 @@
-       /* reset indirect blocks! */
-       mapblock2 = mapblock1 = -1;
- 
--      raw_inode = INODE +
--	((current_ino - 1)
--	 & (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode) - 1));
-+      raw_inode = (struct ext2_inode *)((char *)INODE +
-+	((current_ino - 1) & (EXT2_INODES_PER_BLOCK (SUPERBLOCK) - 1)) *
-+	EXT2_INODE_SIZE (SUPERBLOCK));
- #ifdef E2DEBUG
-       printf ("ipb=%d, sizeof(inode)=%d\n",
--	      (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode)),
--	      sizeof (struct ext2_inode));
-+	      EXT2_INODES_PER_BLOCK (SUPERBLOCK), EXT2_INODE_SIZE (SUPERBLOCK));
-       printf ("inode=%x, raw_inode=%x\n", INODE, raw_inode);
-       printf ("offset into inode table block=%d\n", (int) raw_inode - (int) INODE);
-       for (i = (unsigned char *) INODE; i <= (unsigned char *) raw_inode;
-
diff --git a/libre/grub-legacy/grub.install b/libre/grub-legacy/grub.install
deleted file mode 100644
index c1f077d59..000000000
--- a/libre/grub-legacy/grub.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(grub.info multiboot.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/libre/grub-legacy/i2o.patch b/libre/grub-legacy/i2o.patch
deleted file mode 100644
index 2af846c90..000000000
--- a/libre/grub-legacy/i2o.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Only in grub-0.94/docs: grub.info
-Only in grub-0.94/docs: multiboot.info
-diff -ur grub-0.94/lib/device.c grub-0.94.new/lib/device.c
---- grub-0.94/lib/device.c	2004-05-07 04:50:36.375238696 +0200
-+++ grub-0.94.new/lib/device.c	2004-05-07 04:48:57.611253104 +0200
-@@ -419,6 +419,12 @@
- {
-   sprintf (name, "/dev/rd/c%dd%d", controller, drive);
- }
-+
-+static void
-+get_i2o_disk_name (char *name, int unit)
-+{
-+  sprintf (name, "/dev/i2o/hd%c", unit + 'a');
-+}
- #endif
- 
- /* Check if DEVICE can be read. If an error occurs, return zero,
-@@ -789,6 +795,26 @@
- 	  }
-       }
-   }
-+
-+  /* I2O disks.  */
-+  for (i = 0; i < 8; i++)
-+    {
-+      char name[16];
-+      
-+      get_i2o_disk_name (name, i);
-+      if (check_device (name))
-+	{
-+	  (*map)[num_hd + 0x80] = strdup (name);
-+	  assert ((*map)[num_hd + 0x80]);
-+	  
-+	  /* If the device map file is opened, write the map.  */
-+	  if (fp)
-+	    fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
-+	  
-+	  num_hd++;
-+	}
-+    }
-+  
- #endif /* __linux__ */
-   
-   /* OK, close the device map file if opened.  */
diff --git a/libre/grub-legacy/install-grub b/libre/grub-legacy/install-grub
deleted file mode 100644
index affc9c38a..000000000
--- a/libre/grub-legacy/install-grub
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/bin/bash
-
-#
-# This is a little helper script that tries to convert linux-style device
-# names to grub-style.  It's not very smart, so it
-# probably won't work for more complicated setups.
-#
-# If it doesn't work for you, try installing grub manually:
-#
-#    # mkdir -p /boot/grub
-#    # cp /usr/lib/grub/i386-pc/* /boot/grub/
-#
-# Then start up the 'grub' shell and run something like the following:
-#
-#    grub> root (hd0,0)
-#    grub> setup (hd0)
-#
-# The "root" line should point to the partition your kernel is located on,
-# /boot if you have a separate boot partition, otherwise your root (/).
-#
-# The "setup" line tells grub which disc/partition to install the
-# bootloader to.  In the example above, it will install to the MBR of the
-# primary master hard drive.
-#
-
-usage() {
-  echo "usage: install-grub <install_device> [boot_device]"
-  echo
-  echo "where <install_device> is the device where Grub will be installed"
-  echo "and [boot_device] is the partition that contains the /boot"
-  echo "directory (auto-detected if omitted)"
-  echo
-  echo "examples: install-grub /dev/hda"
-  echo "          install-grub /dev/hda /dev/hda1"
-  echo
-  exit 0
-}
-
-## new install-grub, code was taken from setup script
-ROOTDEV=${1}
-PART_ROOT=${2}
-
-if [ "${ROOTDEV}" = "" ]; then
-  usage
-fi
-if [ "${PART_ROOT}" = "" ]; then
-  PART_ROOT=$(mount | grep "on /boot type" | cut -d' ' -f 1)
-fi
-if [ "$PART_ROOT" = "" ]; then
-  PART_ROOT=$(mount | grep "on / type" | cut -d' ' -f 1)
-fi
-if [ "${PART_ROOT}" = "" ]; then
-  echo "error: could not determine BOOT_DEVICE, please specify manually" >&2
-  exit 1
-fi
-
-
-get_grub_map() {
-  [ -e /tmp/dev.map ]  && rm /tmp/dev.map	
-  /sbin/grub --no-floppy --device-map /tmp/dev.map >/tmp/grub.log 2>&1 <<EOF
-quit
-EOF
-}
-
-mapdev() {
-  partition_flag=0
-  device_found=0
-  devs=$(cat /tmp/dev.map | grep -v fd | sed 's/ *\t/ /' | sed ':a;$!N;$!ba;s/\n/ /g')
-  linuxdevice=$(echo $1 | cut -b1-8)
-  if [ "$(echo ${1} | egrep '[0-9]$')" ]; then
-    # /dev/hdXY
-    pnum=$(echo ${1} | cut -b9-)
-    pnum=$((${pnum}-1))
-    partition_flag=1
-  fi
-  for  dev in ${devs}; do
-    if [ "(" = $(echo ${dev} | cut -b1) ]; then
-      grubdevice="${dev}"
-    else
-      if [ "${dev}" = "${linuxdevice}" ]; then
-	device_found=1
-	break   
-      fi
-    fi
-  done	
-  if [ "${device_found}" = "1" ]; then
-    if [ "${partition_flag}" = "0" ]; then
-      echo "${grubdevice}"
-    else
-      grubdevice_stringlen=${#grubdevice}
-      let grubdevice_stringlen--
-      grubdevice=$(echo $grubdevice | cut -b1-$grubdevice_stringlen)
-      echo "${grubdevice},${pnum})"
-    fi
-  else
-    echo " DEVICE NOT FOUND"
-  fi
-}
-
-dogrub() {
-  get_grub_map	
-  if [ ! -f /boot/grub/menu.lst ]; then
-    echo "Error: Couldn't find /boot/grub/menu.lst.  Is GRUB installed?"
-    exit 1
-  fi
-  # try to auto-configure GRUB...
-  if [ "${PART_ROOT}" != "" -a "$S_GRUB" != "1" ]; then
-    grubdev=$(mapdev ${PART_ROOT})
-    # look for a separately-mounted /boot partition
-    bootdev=$(mount | grep /boot | cut -d' ' -f 1)
-    if [ "${grubdev}" != "" -o "${bootdev}" != "" ]; then
-      cp /boot/grub/menu.lst /tmp/.menu.lst
-      # remove the default entries by truncating the file at our little tag (#-*)
-      head -n $(cat /tmp/.menu.lst | grep -n '#-\*' | cut -d: -f 1) /tmp/.menu.lst >/boot/grub/menu.lst
-      rm -f /tmp/.menu.lst
-
-      for kernel in /boot/vmlinuz-linux* /boot/vmlinuz26-*; do
-	if [ ${kernel} == "/boot/vmlinuz-linux*" ] || [ ${kernel} == "/boot/vmlinuz26-*" ] ; then
-	  echo > /dev/null
-	else
-	  VMLINUZ=$( echo ${kernel} | cut -c 7- )
-
-	  if [ "$( echo ${VMLINUZ} | cut -c -13 )" = "vmlinuz-linux" ]; then # new naming scheme for linux > 3.0
-	    extension=$( echo ${VMLINUZ} | cut -c 14- )
-	    INITRAMFS_BASENAME=initramfs-linux${extension}
-	  else # old naming scheme for lts kernel
-	    extension=$( echo ${VMLINUZ} | cut -c 10- ) 
-	    INITRAMFS_BASENAME=kernel26${extension}
-	  fi
-
-	  echo "" >>/boot/grub/menu.lst
-	  echo "# (0) Parabola GNU/Linux-libre" >>/boot/grub/menu.lst
-	  echo "title  Parabola GNU/Linux-libre - ${VMLINUZ}" >>/boot/grub/menu.lst
-	  subdir=
-	  if [ "${bootdev}" != "" ]; then
-	    grubdev=$(mapdev ${bootdev})
-	  else
-	    subdir="/boot"
-	  fi
-	  echo "root   ${grubdev}" >>/boot/grub/menu.lst
-	  echo "kernel ${subdir}/${VMLINUZ} root=${PART_ROOT} ro" >>/boot/grub/menu.lst
-	  echo "initrd ${subdir}/${INITRAMFS_BASENAME}.img" >>/boot/grub/menu.lst
-	  echo "" >>/boot/grub/menu.lst
-		
-	  # adding fallback/full image
-	  echo "# (1) Parabola GNU/Linux-libre" >>/boot/grub/menu.lst
-	  echo "title Parabola GNU/Linux-libre Fallback - ${VMLINUZ}" >>/boot/grub/menu.lst
-	  echo "root   ${grubdev}" >>/boot/grub/menu.lst
-	  echo "kernel ${subdir}/${VMLINUZ} root=${PART_ROOT} ro" >>/boot/grub/menu.lst
-	  echo "initrd ${subdir}/${INITRAMFS_BASENAME}-fallback.img" >>/boot/grub/menu.lst
-	  echo "" >>/boot/grub/menu.lst
-	fi
-      done
-    fi
-  fi
-
-  echo "Installing the GRUB bootloader..."
-  cp -a /usr/lib/grub/i386-pc/* /boot/grub/
-  sync
-
-  # freeze xfs filesystems to enable grub installation on xfs filesystems
-  if [ -x /usr/sbin/xfs_freeze ]; then
-    [ "$(stat -fLc %T /boot)" == "xfs" ] && /usr/sbin/xfs_freeze -f /boot > /dev/null 2>&1
-    [ "$(stat -fLc %T /)" == "xfs" ] && /usr/sbin/xfs_freeze -f / > /dev/null 2>&1
-  fi
-
-  # look for a separately-mounted /boot partition
-  bootpart=$(mount | grep /boot | cut -d' ' -f 1)
-  if [ "${bootpart}" = "" ]; then
-    bootpart=${PART_ROOT}
-  fi
-  bootpart=$(mapdev ${bootpart})
-  bootdev=$(mapdev ${ROOTDEV})
-  if [ "${bootpart}" = "" ]; then
-    echo "Error: Missing/Invalid root device: ${bootpart}"
-    exit 1
-  fi
-
-  echo ${bootpart}
-  echo ${bootdev}
-  /sbin/grub --no-floppy --batch >/tmp/grub.log 2>&1 <<EOF
-root ${bootpart}
-setup ${bootdev}
-quit
-EOF
-  cat /tmp/grub.log
-
-  # unfreeze xfs filesystems
-  if [ -x /usr/sbin/xfs_freeze ]; then
-    [ "$(stat -fLc %T /boot)" == "xfs" ] && /usr/sbin/xfs_freeze -u /boot > /dev/null 2>&1
-    [ "$(stat -fLc %T /)" == "xfs" ] && /usr/sbin/xfs_freeze -u / > /dev/null 2>&1
-  fi
-  if grep "Error [0-9]*: " /tmp/grub.log >/dev/null; then
-    echo "Error installing GRUB. (see /tmp/grub.log for output)"
-    exit 1
-  fi
-  echo "GRUB was successfully installed."
-
-  rm -f /tmp/grub.log
-
-  exit 0
-}
-
-dogrub
diff --git a/libre/grub-legacy/intelmac.patch b/libre/grub-legacy/intelmac.patch
deleted file mode 100644
index a3fabc733..000000000
--- a/libre/grub-legacy/intelmac.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- grub-0.97.orig/stage2/asm.S	2004-06-19 18:55:22.000000000 +0200
-+++ grub-0.97/stage2/asm.S	2006-04-21 11:10:52.000000000 +0200
-@@ -1651,7 +1651,29 @@
- 	jnz	3f
- 	ret
- 
--3:	/* use keyboard controller */
-+3:	/*
-+	 * try to switch gateA20 using PORT92, the "Fast A20 and Init"
-+	 * register
-+	*/
-+	mov $0x92, %dx
-+	inb %dx, %al
-+	/* skip the port92 code if it's unimplemented (read returns 0xff) */
-+	cmpb $0xff, %al
-+	jz 6f
-+	
-+	/* set or clear bit1, the ALT_A20_GATE bit */
-+	movb 4(%esp), %ah
-+	testb %ah, %ah
-+	jz 4f
-+	orb $2, %al
-+	jmp 5f
-+4:	and $0xfd, %al
-+	
-+	/* clear the INIT_NOW bit don't accidently reset the machine */
-+5:	and $0xfe, %al
-+	outb %al, %dx
-+	
-+6:	/* use keyboard controller */
- 	pushl	%eax
- 
- 	call    gloop1
-@@ -1661,9 +1683,12 @@
- 
- gloopint1:
- 	inb	$K_STATUS
-+	cmpb	$0xff, %al
-+	jz	gloopint1_done
- 	andb	$K_IBUF_FUL, %al
- 	jnz	gloopint1
- 
-+gloopint1_done:	
- 	movb	$KB_OUTPUT_MASK, %al
- 	cmpb	$0, 0x8(%esp)
- 	jz	gdoit
-@@ -1684,6 +1709,8 @@
- 
- gloop1:
- 	inb	$K_STATUS
-+	cmpb	$0xff, %al
-+	jz	gloop2ret
- 	andb	$K_IBUF_FUL, %al
- 	jnz	gloop1
- 
-@@ -1991,6 +2018,11 @@
- ENTRY(console_getkey)
- 	push	%ebp
- 
-+wait_for_key:
-+	call	EXT_C(console_checkkey)
-+	incl	%eax
-+	jz	wait_for_key
-+	
- 	call	EXT_C(prot_to_real)
- 	.code16
-  
diff --git a/libre/grub-legacy/menu.lst b/libre/grub-legacy/menu.lst
deleted file mode 100644
index f405baa91..000000000
--- a/libre/grub-legacy/menu.lst
+++ /dev/null
@@ -1,43 +0,0 @@
-# Config file for GRUB - The GNU GRand Unified Bootloader
-# /boot/grub/menu.lst
-
-# DEVICE NAME CONVERSIONS 
-#
-#  Linux           Grub
-# -------------------------
-#  /dev/fd0        (fd0)
-#  /dev/sda        (hd0)
-#  /dev/sdb2       (hd1,1)
-#  /dev/sda3       (hd0,2)
-#
-
-#  FRAMEBUFFER RESOLUTION SETTINGS
-#     +-------------------------------------------------+
-#          | 640x480    800x600    1024x768   1280x1024
-#      ----+--------------------------------------------
-#      256 | 0x301=769  0x303=771  0x305=773   0x307=775
-#      32K | 0x310=784  0x313=787  0x316=790   0x319=793
-#      64K | 0x311=785  0x314=788  0x317=791   0x31A=794
-#      16M | 0x312=786  0x315=789  0x318=792   0x31B=795
-#     +-------------------------------------------------+
-#  for more details and different resolutions see
-#  https://wiki.archlinux.org/index.php/GRUB#Framebuffer_resolution
-
-# general configuration:
-timeout   5
-default   0
-color magenta/black white/magenta
-
-# boot sections follow
-# each is implicitly numbered from 0 in the order of appearance below
-#
-# TIP: If you want a 1024x768 framebuffer, add "vga=773" to your kernel line.
-#
-#-*
-
-# (0) Parabola GNU/Linux-libre
-title  Parabola GNU/Linux-libre  [/boot/vmlinuz-linux-libre]
-root   (hd0,0)
-kernel /vmlinuz-linux-libre root=/dev/sda3 ro
-initrd /initramfs-linux-libre.img
-
diff --git a/libre/grub-legacy/more-raid.patch b/libre/grub-legacy/more-raid.patch
deleted file mode 100644
index 39db23474..000000000
--- a/libre/grub-legacy/more-raid.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- grub-0.95/lib/device.c.moreraid	2004-11-30 17:09:36.736099360 -0500
-+++ grub-0.95/lib/device.c	2004-11-30 17:12:17.319686944 -0500
-@@ -544,6 +544,17 @@
- }
- 
- static void
-+get_cciss_disk_name (char * name, int controller, int drive)
-+{
-+  sprintf (name, "/dev/cciss/c%dd%d", controller, drive);
-+}
-+
-+static void
-+get_cpqarray_disk_name (char * name, int controller, int drive)
-+{
-+  sprintf (name, "/dev/ida/c%dd%d", controller, drive);
-+}
-+static void
- get_ataraid_disk_name (char *name, int unit)
- {
-   sprintf (name, "/dev/ataraid/d%c", unit + '0');
-@@ -920,7 +931,7 @@
-     
-     for (controller = 0; controller < 8; controller++)
-       {
--	for (drive = 0; drive < 15; drive++)
-+	for (drive = 0; drive < 32; drive++)
- 	  {
- 	    char name[24];
- 	    
-@@ -940,6 +951,70 @@
-       }
-   }
- #endif /* __linux__ */
-+
-+#ifdef __linux__
-+  /* This is for cciss - we have
-+     /dev/cciss/c<controller>d<logical drive>p<partition>.
-+     
-+     cciss driver currently supports up to 8 controllers, 16 logical
-+     drives, and 7 partitions.  */
-+  {
-+    int controller, drive;
-+    
-+    for (controller = 0; controller < 8; controller++)
-+      {
-+	for (drive = 0; drive < 16; drive++)
-+	  {
-+	    char name[24];
-+	    
-+	    get_cciss_disk_name (name, controller, drive);
-+	    if (check_device (name))
-+	      {
-+		(*map)[num_hd + 0x80] = strdup (name);
-+		assert ((*map)[num_hd + 0x80]);
-+		
-+		/* If the device map file is opened, write the map.  */
-+		if (fp)
-+		  fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
-+		
-+		num_hd++;
-+	      }
-+	  }
-+      }
-+  }
-+#endif /* __linux__ */
-+
-+#ifdef __linux__
-+  /* This is for cpqarray - we have
-+     /dev/ida/c<controller>d<logical drive>p<partition>.
-+     
-+     cpqarray driver currently supports up to 8 controllers, 16 logical
-+     drives, and 15 partitions.  */
-+  {
-+    int controller, drive;
-+    
-+    for (controller = 0; controller < 8; controller++)
-+      {
-+	for (drive = 0; drive < 15; drive++)
-+	  {
-+	    char name[24];
-+	    
-+	    get_cpqarray_disk_name (name, controller, drive);
-+	    if (check_device (name))
-+	      {
-+		(*map)[num_hd + 0x80] = strdup (name);
-+		assert ((*map)[num_hd + 0x80]);
-+		
-+		/* If the device map file is opened, write the map.  */
-+		if (fp)
-+		  fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
-+		
-+		num_hd++;
-+	      }
-+	  }
-+      }
-+  }
-+#endif /* __linux__ */
-   
-   /* OK, close the device map file if opened.  */
-   if (fp)
diff --git a/libre/grub-legacy/special-devices.patch b/libre/grub-legacy/special-devices.patch
deleted file mode 100644
index 894f3e887..000000000
--- a/libre/grub-legacy/special-devices.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- grub-0.93/lib/device.c.raid	2002-05-20 05:53:46.000000000 -0400
-+++ grub-0.93/lib/device.c	2002-12-28 23:24:10.000000000 -0500
-@@ -689,7 +689,14 @@
-       if (strcmp (dev + strlen(dev) - 5, "/disc") == 0)
- 	strcpy (dev + strlen(dev) - 5, "/part");
-     }
--  sprintf (dev + strlen(dev), "%d", ((partition >> 16) & 0xFF) + 1);
-+
-+  sprintf (dev + strlen(dev), "%s%d", 
-+	   /* Compaq smart and others */
-+	   (strncmp(dev, "/dev/ida/", 9) == 0 ||
-+	    strncmp(dev, "/dev/ataraid/", 13) == 0 ||
-+	    strncmp(dev, "/dev/cciss/", 11) == 0 ||
-+	    strncmp(dev, "/dev/rd/", 8) == 0) ? "p" : "",
-+	   ((partition >> 16) & 0xFF) + 1);
-   
-   /* Open the partition.  */
-   fd = open (dev, O_RDWR);
diff --git a/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch b/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
deleted file mode 100644
index e043633af..000000000
--- a/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From d09689a5a2863043d007c1acb9bf0a8d1d3b776d Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@ubuntu.com>
-Date: Fri, 28 Dec 2012 06:43:35 +0000
-Subject: [PATCH 069/364] Backport gnulib fixes for C11.  Fixes Savannah bug
- #37738.
-
-* grub-core/gnulib/stdio.in.h (gets): Warn on use only if
-HAVE_RAW_DECL_GETS.
-* m4/stdio_h.m4 (gl_STDIO_H): Check for gets.
----
- ChangeLog                   | 8 ++++++++
- grub-core/gnulib/stdio.in.h | 6 ++++--
- m4/stdio_h.m4               | 2 +-
- 3 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/grub-core/gnulib/stdio.in.h b/grub-core/gnulib/stdio.in.h
-index 80b9dbf..a8b00c6 100644
---- a/grub-core/gnulib/stdio.in.h
-+++ b/grub-core/gnulib/stdio.in.h
-@@ -138,10 +138,12 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
- #endif
- 
- /* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
-+   so any use of gets warrants an unconditional warning; besides, C11
-+   removed it.  */
- #undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
-diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4
-index f5650cd..8458bec 100644
---- a/m4/stdio_h.m4
-+++ b/m4/stdio_h.m4
-@@ -37,7 +37,7 @@ AC_DEFUN([gl_STDIO_H],
-   dnl corresponding gnulib module is not in use, and which is not
-   dnl guaranteed by C89.
-   gl_WARN_ON_USE_PREPARE([[#include <stdio.h>
--    ]], [dprintf fpurge fseeko ftello getdelim getline popen renameat
-+    ]], [dprintf fpurge fseeko ftello getdelim getline gets popen renameat
-     snprintf tmpfile vdprintf vsnprintf])
- ])
- 
--- 
-1.8.1.4
-
diff --git a/libre/grub/60_memtest86+ b/libre/grub/60_memtest86+
deleted file mode 100644
index 086f0cc84..000000000
--- a/libre/grub/60_memtest86+
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-########################################################
-# This script generates a memtest86+ entry on grub.cfg #
-# if memtest is installed on the system.               #
-########################################################
-
-prefix="/usr"
-exec_prefix="${prefix}"
-
-datarootdir="/usr/share"
-datadir="${datarootdir}"
-
-. "${datadir}/grub/grub-mkconfig_lib"
-
-MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin"
-CLASS="--class memtest86 --class gnu --class tool"
-
-if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}" ; then
-    ## image exists, create menu entry
-    echo "Found memtest86+ image: ${MEMTEST86_IMAGE}" >&2
-    _GRUB_MEMTEST_HINTS_STRING="$(${grub_probe} --target=hints_string ${MEMTEST86_IMAGE})"
-    _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})"
-    _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})"
-    cat << EOF
-if [ "\${grub_platform}" == "pc" ]; then
-    menuentry "Memory Tester (memtest86+)" ${CLASS} {
-        search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID}
-        linux16 ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86}
-    }
-fi
-EOF
-fi
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
deleted file mode 100644
index a4a17b4c8..000000000
--- a/libre/grub/PKGBUILD
+++ /dev/null
@@ -1,284 +0,0 @@
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer : Ronald van Haren <ronald.archlinux.org>
-# Contributor: Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
-
-_pkgver="2.00"
-_GRUB_GIT_COMMIT="5ae5c54c7e5cb048cdd78a53181cee0da698a953"
-
-## grub-extras gpxe is not needed
-
-[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
-[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
-
-pkgname="grub"
-pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)"
-pkgver=2.00.1282.g5ae5c54
-pkgrel=1.3
-epoch="1"
-url="https://www.gnu.org/software/grub/"
-arch=('x86_64' 'i686')
-license=('GPL3')
-backup=('etc/default/grub' 'etc/grub.d/40_custom')
-install="${pkgname}.install"
-options=('!makeflags')
-
-conflicts=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}" 'grub-legacy')
-replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
-provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
-
-makedepends=('git' 'bzr' 'rsync' 'xz' 'freetype2' 'ttf-dejavu'
-             'python2' 'autogen' 'texinfo' 'help2man'
-             'gettext' 'device-mapper' 'fuse')
-depends=('sh' 'xz' 'gettext' 'device-mapper')
-optdepends=('freetype2: For grub-mkfont usage'
-            'fuse: For grub-mount usage'
-            'dosfstools: For grub-mkrescue FAT FS and EFI support' 
-            'efibootmgr: For grub-install EFI support'
-            'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue'
-            'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
-            'mtools: For grub-mkrescue FAT FS support')
-
-# source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
-source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#commit=${_GRUB_GIT_COMMIT}"
-        'http://unifoundry.com/unifont-5.1.20080820.bdf.gz'
-        'parabola_grub_mkconfig_fixes.patch'
-        '60_memtest86+'
-        'grub.default')
-
-md5sums=('SKIP'
-         '6b8263ceccef33bd633aa019d74b7943'
-         'aec37e36ba7806217be33d12a7eed062'
-         'be55eabc102f2c60b38ed35c203686d6'
-         'a9ef0067f6824944fa1ae22a5162d7d4'
-         'SKIP'
-         'SKIP'
-         'SKIP')
-
-for _DIR_ in 915resolution lua ntldr-img ; do
-	source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=")
-done
-
-pkgver() {
-	cd "${srcdir}/grub-${_pkgver}/"
-	echo "$(git describe --tags)" | sed -e 's|-|\.|g'
-}
-
-prepare() {
-	
-	cd "${srcdir}/grub-${_pkgver}/"
-	
-	msg "Patch to enable grub-mkconfig detect Parabola kernels and initramfs"
-	patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
-	
-	msg "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme"
-	sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${_pkgver}/configure.ac"
-	
-	msg "Fix mkinitcpio 'rw' FS#36275"
-	sed 's| ro | rw |g' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in"
-	
-	msg "autogen.sh requires python (2/3). since bzr is in makedepends, use python2 and no need to pull python3"
-	sed 's|python |python2 |g' -i "${srcdir}/grub-${_pkgver}/autogen.sh"
-	
-	msg "Pull in latest language files"
-	./linguas.sh
-	echo
-	
-	msg "Remove non working langs which need LC_ALL=C.UTF-8"
-	sed -e 's#en@cyrillic en@greek##g' -i "${srcdir}/grub-${_pkgver}/po/LINGUAS"
-	
-	msg "Avoid problem with unifont during compile of grub, http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847"
-	cp "${srcdir}/unifont-5.1.20080820.bdf" "${srcdir}/grub-${_pkgver}/unifont.bdf"
-	
-	msg "Fix freetype header path file"
-	sed 's|freetype/ftsynth[.]h|freetype2/ftsynth.h|g' -i "${srcdir}/grub-${_pkgver}/util/grub-"{gen-{asciih,widthspec},mkfont}.c
-}
-
-_build_grub-common_and_bios() {
-	
-	msg "Set ARCH dependent variables for bios build"
-	if [[ "${CARCH}" == 'x86_64' ]]; then
-		_EFIEMU="--enable-efiemu"
-	else
-		_EFIEMU="--disable-efiemu"
-	fi
-	
-	msg "Copy the source for building the bios package"
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-bios"
-	cd "${srcdir}/grub-${_pkgver}-bios/"
-	
-	msg "Add the grub-extra sources for bios build"
-	install -d "${srcdir}/grub-${_pkgver}-bios/grub-extras"
-	for _DIR_ in 915resolution ntldr-img ; do
-		cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${_pkgver}-bios/grub-extras/${_DIR_}"
-	done
-	export GRUB_CONTRIB="${srcdir}/grub-bios/grub-extras/"
-	
-	msg "Unset all compiler FLAGS for bios build"
-	unset CFLAGS
-	unset CPPFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-	unset MAKEFLAGS
-	
-	cd "${srcdir}/grub-${_pkgver}-bios/"
-	
-	msg "Run autogen.sh for bios build"
-	./autogen.sh
-	echo
-	
-	msg "Run ./configure for bios build"
-	./configure \
-		--with-platform="pc" \
-		--target="i386" \
-		"${_EFIEMU}" \
-		--enable-mm-debug \
-		--enable-nls \
-		--enable-device-mapper \
-		--enable-cache-stats \
-		--enable-boot-time \
-		--enable-grub-mkfont \
-		--enable-grub-mount \
-		--prefix="/usr" \
-		--bindir="/usr/bin" \
-		--sbindir="/usr/bin" \
-		--mandir="/usr/share/man" \
-		--infodir="/usr/share/info" \
-		--datarootdir="/usr/share" \
-		--sysconfdir="/etc" \
-	 	--program-prefix="" \
-		--with-bootdir="/boot" \
-		--with-grubdir="grub" \
-		--disable-silent-rules \
-		--disable-werror
-	echo
-	
-	msg "Run make for bios build"
-	make
-	echo
-}
-
-_build_grub-efi() {
-	
-	msg "Copy the source for building the efi package"
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-efi"
-	cd "${srcdir}/grub-${_pkgver}-efi/"
-	
-	msg "Add the grub-extra sources for efi build"
-	install -d "${srcdir}/grub-${_pkgver}-efi/grub-extras/"
-	for _DIR_ in lua ; do
-		cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${_pkgver}-efi/grub-extras/${_DIR_}"
-	done
-	# export GRUB_CONTRIB="${srcdir}/grub-efi/grub-extras/"
-	
-	msg "Unset all compiler FLAGS for efi build"
-	unset CFLAGS
-	unset CPPFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-	unset MAKEFLAGS
-	
-	cd "${srcdir}/grub-${_pkgver}-efi/"
-	
-	msg "Run autogen.sh for efi build"
-	./autogen.sh
-	echo
-	
-	msg "Run ./configure for efi build"
-	./configure \
-		--with-platform="efi" \
-		--target="${_EFI_ARCH}" \
-		--disable-efiemu \
-		--enable-mm-debug \
-		--enable-nls \
-		--enable-device-mapper \
-		--enable-cache-stats \
-		--enable-boot-time \
-		--enable-grub-mkfont \
-		--enable-grub-mount \
-		--prefix="/usr" \
-		--bindir="/usr/bin" \
-		--sbindir="/usr/bin" \
-		--mandir="/usr/share/man" \
-		--infodir="/usr/share/info" \
-		--datarootdir="/usr/share" \
-		--sysconfdir="/etc" \
-		--program-prefix="" \
-		--with-bootdir="/boot" \
-		--with-grubdir="grub" \
-		--disable-silent-rules \
-		--disable-werror
-	echo
-	
-	msg "Run make for efi build"
-	make
-	echo
-	
-}
-
-build() {
-	
-	cd "${srcdir}/grub-${_pkgver}/"
-	
-	msg "Build grub bios stuff"
-	_build_grub-common_and_bios
-	echo
-	
-	msg "Build grub efi stuff"
-	_build_grub-efi
-	echo
-	
-}
-
-_package_grub-common_and_bios() {
-	
-	cd "${srcdir}/grub-${_pkgver}-bios/"
-	
-	msg "Run make install for bios build"
-	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
-	echo
-	
-	msg "Remove gdb debugging related files for bios build"
-	rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true
-	
-	msg "Install extra /etc/grub.d/ files"
-	install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+"
-	
-	msg "Install /etc/default/grub (used by grub-mkconfig)"
-	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
-	
-	msg "Add msdos.mod symlink"
-	ln -s "msdospart.mod" "${pkgdir}/usr/lib/grub/i386-pc/msdos.mod" || true
-	
-}
-
-_package_grub-efi() {
-	
-	cd "${srcdir}/grub-${_pkgver}-efi/"
-	
-	msg "Run make install for efi build"
-	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
-	echo
-	
-	msg "Remove gdb debugging related files for efi build"
-	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true
-	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true
-	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
-	
-	msg "Add msdos.mod symlink"
-	ln -s "msdospart.mod" "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi/msdos.mod" || true
-	
-}
-
-package() {
-	
-	msg "Package grub efi stuff"
-	_package_grub-efi
-	
-	msg "Package grub bios stuff"
-	_package_grub-common_and_bios
-	
-}
diff --git a/libre/grub/grub-2.00-fix-docs.patch b/libre/grub/grub-2.00-fix-docs.patch
deleted file mode 100644
index 0aa481154..000000000
--- a/libre/grub/grub-2.00-fix-docs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 40d6b00fa48ae9c1cecf143da5c6061f6ffcb719 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com
-Date: Tue, 12 Mar 2013 15:23:02 -0400
-Subject: [PATCH] Fix docs
-
-I think the doc generation tools got stricter, so fix up the .texi file
-to work.
-
-diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
---- a/docs/grub-dev.texi
-+++ b/docs/grub-dev.texi
-@@ -1394,8 +1394,8 @@ grub_video_blit_glyph (&glyph, color, 0,
- 
- @node Bitmap API
- @section Bitmap API
--@itemize
- @subsection grub_video_bitmap_create
-+@itemize
- @item Prototype:
- @example
- grub_err_t grub_video_bitmap_create (struct grub_video_bitmap **bitmap, unsigned int width, unsigned int height, enum grub_video_blit_format blit_format)
diff --git a/libre/grub/grub-2.00-mkinitcpio-0.15.patch b/libre/grub/grub-2.00-mkinitcpio-0.15.patch
deleted file mode 100644
index 1af848fa3..000000000
--- a/libre/grub/grub-2.00-mkinitcpio-0.15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- util/grub.d/10_linux.in.old	2013-07-28 08:55:47.825946239 +0200
-+++ util/grub.d/10_linux.in	2013-07-28 08:56:14.082201512 +0200
-@@ -138,7 +138,7 @@
-   message="$(gettext_printf "Loading Linux %s ..." "${version}")"
-   sed "s/^/$submenu_indentation/" << EOF
- 	echo	'$(echo "$message" | grub_quote)'
--	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-+	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} rw ${args}
- EOF
-   if test -n "${initrd}" ; then
-     # TRANSLATORS: ramdisk isn't identifier. Should be translated.
diff --git a/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch b/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch
deleted file mode 100644
index 9a2eb3ff7..000000000
--- a/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-There is no explicit option to turn off alignment; it is implicitly
-disabled if one of --separator or --nameprefixes option is used.
-
---separator was added in 2007, --nameprefixes - in 2009. So let's use
---separator to extend range of versions we are compatible with. Note that
-one or another must be used, current parsing is broken otherwise.
-
-Signed-off-by: Andrey Borzenkov <address@hidden>
-
----
- util/getroot.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/util/getroot.c b/util/getroot.c
-index 2ad8a55..3afcf96 100644
---- a/util/getroot.c
-+++ b/util/getroot.c
-@@ -1322,7 +1322,7 @@ grub_util_get_dev_abstraction (const char *os_dev)
- static void
- pull_lvm_by_command (const char *os_dev)
- {
--  char *argv[6];
-+  char *argv[8];
-   int fd;
-   pid_t pid;
-   FILE *mdadm;
-@@ -1351,12 +1351,17 @@ pull_lvm_by_command (const char *os_dev)
- 
-   /* execvp has inconvenient types, hence the casts.  None of these
-      strings will actually be modified.  */
-+  /* by default PV name is left aligned in 10 character field, meaning that
-+     we do not know where name ends. Using dummy --separator disables
-+     alignment. We have a single field, so separator itself is not output */
-   argv[0] = (char *) "vgs";
-   argv[1] = (char *) "--options";
-   argv[2] = (char *) "pv_name";
-   argv[3] = (char *) "--noheadings";
--  argv[4] = vgname;
--  argv[5] = NULL;
-+  argv[4] = (char *) "--separator";
-+  argv[5] = (char *) ":";
-+  argv[6] = vgname;
-+  argv[7] = NULL;
- 
-   pid = exec_pipe (argv, &fd);
-   free (vgname);
-@@ -1376,6 +1381,7 @@ pull_lvm_by_command (const char *os_dev)
-   while (getline (&buf, &len, mdadm) > 0)
-     {
-       char *ptr;
-+      /* LVM adds two spaces as standard prefix */
-       for (ptr = buf; ptr < buf + 2 && *ptr == ' '; ptr++);
-       if (*ptr == '\0')
-        continue;
diff --git a/libre/grub/grub.default b/libre/grub/grub.default
deleted file mode 100644
index 38bb4a57f..000000000
--- a/libre/grub/grub.default
+++ /dev/null
@@ -1,50 +0,0 @@
-GRUB_DEFAULT=0
-GRUB_TIMEOUT=5
-GRUB_DISTRIBUTOR="Parabola"
-GRUB_CMDLINE_LINUX_DEFAULT="quiet"
-GRUB_CMDLINE_LINUX=""
-
-# Preload both GPT and MBR modules so that they are not missed
-GRUB_PRELOAD_MODULES="part_gpt part_msdos"
-
-# Uncomment to enable Hidden Menu, and optionally hide the timeout count
-#GRUB_HIDDEN_TIMEOUT=5
-#GRUB_HIDDEN_TIMEOUT_QUIET=true
-
-# Uncomment to use basic console
-GRUB_TERMINAL_INPUT=console
-
-# Uncomment to disable graphical terminal
-#GRUB_TERMINAL_OUTPUT=console
-
-# The resolution used on graphical terminal
-# note that you can use only modes which your graphic card supports via VBE
-# you can see them in real GRUB with the command `vbeinfo'
-GRUB_GFXMODE=auto
-
-# Uncomment to allow the kernel use the same resolution used by grub
-GRUB_GFXPAYLOAD_LINUX=keep
-
-# Uncomment if you want GRUB to pass to the Linux kernel the old parameter 
-# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" 
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entries
-GRUB_DISABLE_RECOVERY=true
-
-# Uncomment and set to the desired menu colors.  Used by normal and wallpaper 
-# modes only.  Entries specified as foreground/background.
-GRUB_COLOR_NORMAL="magenta/black"
-GRUB_COLOR_HIGHLIGHT="white/magenta"
-
-# Uncomment one of them for the gfx desired, a image background or a gfxtheme
-#GRUB_BACKGROUND="/path/to/wallpaper"
-#GRUB_THEME="/path/to/gfxtheme"
-
-# Uncomment to get a beep at GRUB start
-#GRUB_INIT_TUNE="480 440 1"
-
-#GRUB_SAVEDEFAULT="true"
-
-# Disable advanced submenu, due 10_linux script file generates submenu without closing bracket with grub-mkconfig
-GRUB_DISABLE_SUBMENU="y"
diff --git a/libre/grub/grub.install b/libre/grub/grub.install
deleted file mode 100644
index 9188b357a..000000000
--- a/libre/grub/grub.install
+++ /dev/null
@@ -1,33 +0,0 @@
-infodir="usr/share/info"
-filelist=('grub.info' 'grub-dev.info')
-
-post_install() {
-  if [ -f /boot/grub/grub.cfg.pacsave ]; then
-    echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg"
-    install -D -m0644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg
-  fi
-
-  cat << 'EOM'
-Generating grub.cfg.example config file...
-This may fail on some machines running a custom kernel.
-EOM
-  
-  grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null
-  echo "done."
-
-  for file in ${filelist[@]}; do
-    install-info ${infodir}/${file}.gz ${infodir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  for file in ${filelist[@]}; do
-    install-info ${infodir}/${file}.gz ${infodir}/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete ${infodir}/${file} ${infodir}/dir 2> /dev/null
-  done
-}
diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch
deleted file mode 100644
index 6e3a524f0..000000000
--- a/libre/grub/parabola_grub_mkconfig_fixes.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 016ee82..2cdbdd8 100644
---- a/util/grub-mkconfig.in
-+++ b/util/grub-mkconfig.in
-@@ -214,6 +214,8 @@ export GRUB_DEFAULT \
-   GRUB_THEME \
-   GRUB_GFXPAYLOAD_LINUX \
-   GRUB_DISABLE_OS_PROBER \
-+  GRUB_COLOR_NORMAL \
-+  GRUB_COLOR_HIGHLIGHT \
-   GRUB_INIT_TUNE \
-   GRUB_SAVEDEFAULT \
-   GRUB_ENABLE_CRYPTODISK \
-diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index d2e7252..8259f45 100644
---- a/util/grub.d/00_header.in
-+++ b/util/grub.d/00_header.in
-@@ -125,6 +125,14 @@ cat <<EOF
- 
- EOF
- 
-+if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then
-+    cat << EOF
-+set menu_color_normal=$GRUB_COLOR_NORMAL
-+set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT
-+
-+EOF
-+fi
-+
- serial=0;
- gfxterm=0;
- for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index e27d6f7..a946e71 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -31,7 +31,25 @@ CLASS="--class gnu-linux --class gnu --class os"
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
-   OS=GNU/Linux
- else
--  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  if [ "${GRUB_DISTRIBUTOR}" = "Parabola" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "parabola" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "Blag" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} Linux and GNU"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "blag" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} Linux and GNU"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "Musix" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU+Linux"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "musix" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU+Linux"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "Dragora" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "dragora" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
-+  else
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  fi
-   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
- fi
- 
-@@ -87,6 +105,8 @@ linux_entry ()
-       case $type in
- 	  recovery)
- 	      title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
-+	  fallback)
-+	      title="$(gettext_printf "%s, with Linux %s (Fallback initramfs)" "${os}" "${version}")" ;;
- 	  *)
- 	      title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
-       esac
-@@ -100,7 +120,7 @@ linux_entry ()
-   else
-       echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
-   fi      
--  if [ x$type != xrecovery ] ; then
-+  if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then
-       save_default_entry | grub_add_tab
-   fi
- 
-@@ -132,7 +152,8 @@ linux_entry ()
-     fi
-     printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
-   fi
--  message="$(gettext_printf "Loading Linux %s ..." ${version})"
-+
-+  message="$(gettext_printf "Loading Linux %s ..." "${version}")"
-   sed "s/^/$submenu_indentation/" << EOF
- 	echo	'$(echo "$message" | grub_quote)'
- 	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-@@ -190,7 +211,22 @@ while [ "x$list" != "x" ] ; do
-   alt_version=`echo $version | sed -e "s,\.old$,,g"`
-   linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
- 
-+  if test -e "/etc/parabola-release" ; then
-+    if echo "${basename}" | grep -q 'vmlinuz-linux-libre' ; then
-+      version="`echo "${basename}" | sed -e 's,vmlinuz-linux-libre,,g'`"
-+      
-+      if [ "x${version}" = "x" ] ; then
-+        version="libre kernel"
-+      else
-+        version="`echo "${version}" | sed -e 's,-,,g'`"
-+        version="libre ${version} kernel"
-+      fi
-+    fi
-+  fi
-+  
-   initrd=
-+  initrd_arch="`echo "${basename}" | sed -e 's,vmlinuz,initramfs,g'`"
-+
-   for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
- 	   "initrd-${version}" "initramfs-${version}.img" \
- 	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
-@@ -198,7 +234,8 @@ while [ "x$list" != "x" ] ; do
- 	   "initramfs-genkernel-${version}" \
- 	   "initramfs-genkernel-${alt_version}" \
- 	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
--	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
-+	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \
-+	   "${initrd_arch}.img" ; do
-     if test -e "${dirname}/${i}" ; then
-       initrd="$i"
-       break
-@@ -226,6 +263,22 @@ while [ "x$list" != "x" ] ; do
-     linux_root_device_thisversion=${GRUB_DEVICE}
-   fi
- 
-+  if test -e "/etc/parabola-release" ; then
-+    is_first_entry="false"
-+    
-+    linux_entry "${OS}" "${version}" true \
-+              "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+    
-+    for i in "${initrd_arch}-fallback.img" "initramfs-${version}-fallback.img" ; do
-+      if test -e "${dirname}/${i}" ; then
-+        initrd="${i}"
-+        linux_entry "${OS}" "${version}" fallback \
-+                    "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+        break
-+      fi
-+    done
-+  fi
-+
-   if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
-     linux_entry "${OS}" "${version}" simple \
-     "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-@@ -240,8 +293,11 @@ while [ "x$list" != "x" ] ; do
-     is_top_level=false
-   fi
- 
-+  if ! test -e "/etc/parabola-release" ; then
-   linux_entry "${OS}" "${version}" advanced \
-               "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+  fi
-+
-   if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
-     linux_entry "${OS}" "${version}" recovery \
-                 "single ${GRUB_CMDLINE_LINUX}"
-@@ -252,8 +308,10 @@ done
- 
- # If at least one kernel was found, then we need to
- # add a closing '}' for the submenu command.
-+if ! test -e "/etc/parabola-release" ; then
- if [ x"$is_top_level" != xtrue ]; then
-   echo '}'
- fi
-+fi
- 
- echo "$title_correction_code"
diff --git a/libre/gsoap-legacy/LICENSE b/libre/gsoap-legacy/LICENSE
deleted file mode 100644
index 00b8ad810..000000000
--- a/libre/gsoap-legacy/LICENSE
+++ /dev/null
@@ -1,163 +0,0 @@
-gSOAP Public License
-Version 1.3a
-The gSOAP public license is derived from the Mozilla Public License (MPL1.1). The sections that were deleted from the original MPL1.1 text are 1.0.1, 2.1.(c),(d), 2.2.(c),(d), 8.2.(b), 10, and 11. Section 3.8 was added. The modified sections are 2.1.(b), 2.2.(b), 3.2 (simplified), 3.5 (deleted the last sentence), and 3.6 (simplified).
-1  DEFINITIONS.
-
-1.0.1.
-1.1. "Contributor"
-    means each entity that creates or contributes to the creation of Modifications.
-1.2. "Contributor Version"
-    means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor.
-1.3. "Covered Code"
-    means the Original Code, or Modifications or the combination of the Original Code, and Modifications, in each case including portions thereof.
-1.4. "Electronic Distribution Mechanism"
-    means a mechanism generally accepted in the software development community for the electronic transfer of data.
-1.5. "Executable"
-    means Covered Code in any form other than Source Code.
-1.6. "Initial Developer"
-    means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A.
-1.7. "Larger Work"
-    means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.
-1.8. "License"
-    means this document.
-1.8.1. "Licensable"
-    means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
-1.9. "Modifications"
-    means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is:
-
-    A.
-        Any addition to or deletion from the contents of a file containing Original Code or previous Modifications.
-    B.
-        Any new file that contains any part of the Original Code, or previous Modifications. 
-
-1.10. "Original Code"
-    means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License.
-1.10.1. "Patent Claims"
-    means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
-1.11. "Source Code"
-    means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.
-1.12. "You" (or "Your")
-    means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You" includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-
-2  SOURCE CODE LICENSE.
-
-2.1. The Initial Developer Grant.
-
-    The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-    (a)
-        under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and
-    (b)
-        under patents now or hereafter owned or controlled by Initial Developer, to make, have made, use and sell ("offer to sell and import") the Original Code, Modifications, or portions thereof, but solely to the extent that any such patent is reasonably necessary to enable You to utilize, alone or in combination with other software, the Original Code, Modifications, or any combination or portions thereof.
-    (c)
-    (d)
-
-
-2.2. Contributor Grant.
-
-    Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license
-
-    (a)
-        under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and
-    (b)
-        under patents now or hereafter owned or controlled by Contributor, to make, have made, use and sell ("offer to sell and import") the Contributor Version (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to utilize, alone or in combination with other software, the Contributor Version (or portions thereof).
-    (c)
-    (d)
-
-3  DISTRIBUTION OBLIGATIONS.
-
-3.1. Application of License.
-
-    The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.
-
-3.2. Availability of Source Code.
-
-    Any Modification created by You will be provided to the Initial Developer in Source Code form and are subject to the terms of the License.
-
-3.3. Description of Modifications.
-
-    You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code.
-
-3.4. Intellectual Property Matters.
-
-    (a) Third Party Claims.
-        If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL" which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.
-    (b) Contributor APIs.
-        If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file.
-    (c) Representations.
-        Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License.
-
-
-3.5. Required Notices.
-
-    You must duplicate the notice in Exhibit A in each file of the Source Code. If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice. If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A. You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor.
-
-3.6. Distribution of Executable Versions.
-
-    You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. If you distribute executable versions containing Covered Code as part of a product, you must reproduce the notice in Exhibit B in the documentation and/or other materials provided with the product.
-
-3.7. Larger Works.
-
-    You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.
-
-3.8. Restrictions.
-
-    You may not remove any product identification, copyright, proprietary notices or labels from gSOAP.
-
-4  INABILITY TO COMPLY DUE TO STATUTE OR REGULATION.
-If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.
-5  APPLICATION OF THIS LICENSE.
-This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code.
-6  VERSIONS OF THE LICENSE.
-
-6.1. New Versions.
-
-    Grantor may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
-
-6.2. Effect of New Versions.
-
-    Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License.
-
-6.3. Derivative Works.
-
-    If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrase "gSOAP" or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the gSOAP Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.)
-
-7  DISCLAIMER OF WARRANTY.
-COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY RIGHTS, AND ANY WARRANTY THAT MAY ARISE BY REASON OF TRADE USAGE, CUSTOM, OR COURSE OF DEALING. WITHOUT LIMITING THE FOREGOING, YOU ACKNOWLEDGE THAT THE SOFTWARE IS PROVIDED "AS IS" AND THAT THE AUTHORS DO NOT WARRANT THE SOFTWARE WILL RUN UNINTERRUPTED OR ERROR FREE. LIMITED LIABILITY THE ENTIRE RISK AS TO RESULTS AND PERFORMANCE OF THE SOFTWARE IS ASSUMED BY YOU. UNDER NO CIRCUMSTANCES WILL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES OF ANY KIND OR NATURE WHATSOEVER, WHETHER BASED ON CONTRACT, WARRANTY, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, ARISING OUT OF OR IN ANY WAY RELATED TO THE SOFTWARE, EVEN IF THE AUTHORS HAVE BEEN ADVISED ON THE POSSIBILITY OF SUCH DAMAGE OR IF SUCH DAMAGE COULD HAVE BEEN REASONABLY FORESEEN, AND NOTWITHSTANDING ANY FAILURE OF ESSENTIAL PURPOSE OF ANY EXCLUSIVE REMEDY PROVIDED. SUCH LIMITATION ON DAMAGES INCLUDES, BUT IS NOT LIMITED TO, DAMAGES FOR LOSS OF GOODWILL, LOST PROFITS, LOSS OF DATA OR SOFTWARE, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION OR IMPAIRMENT OF OTHER GOODS. IN NO EVENT WILL THE AUTHORS BE LIABLE FOR THE COSTS OF PROCUREMENT OF SUBSTITUTE SOFTWARE OR SERVICES. YOU ACKNOWLEDGE THAT THIS SOFTWARE IS NOT DESIGNED FOR USE IN ON-LINE EQUIPMENT IN HAZARDOUS ENVIRONMENTS SUCH AS OPERATION OF NUCLEAR FACILITIES, AIRCRAFT NAVIGATION OR CONTROL, OR LIFE-CRITICAL APPLICATIONS. THE AUTHORS EXPRESSLY DISCLAIM ANY LIABILITY RESULTING FROM USE OF THE SOFTWARE IN ANY SUCH ON-LINE EQUIPMENT IN HAZARDOUS ENVIRONMENTS AND ACCEPTS NO LIABILITY IN RESPECT OF ANY ACTIONS OR CLAIMS BASED ON THE USE OF THE SOFTWARE IN ANY SUCH ON-LINE EQUIPMENT IN HAZARDOUS ENVIRONMENTS BY YOU. FOR PURPOSES OF THIS PARAGRAPH, THE TERM "LIFE-CRITICAL APPLICATION" MEANS AN APPLICATION IN WHICH THE FUNCTIONING OR MALFUNCTIONING OF THE SOFTWARE MAY RESULT DIRECTLY OR INDIRECTLY IN PHYSICAL INJURY OR LOSS OF HUMAN LIFE. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-8  TERMINATION.
-
-8.1.
-    This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
-8.2.
-8.3.
-    If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license.
-8.4.
-    In the event of termination under Sections 8.1 or 8.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.
-
-9  LIMITATION OF LIABILITY.
-UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-10  U.S. GOVERNMENT END USERS.
-11  MISCELLANEOUS.
-12  RESPONSIBILITY FOR CLAIMS.
-As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
-EXHIBIT A.
-"The contents of this file are subject to the gSOAP Public License Version 1.3 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-
-    http://genivia.com/Products/gsoap/license.pdf 
-
-More information on licensing options, support contracts, and consulting can be found at
-
-    http://genivia.com/Products/gsoap/contract.html 
-
-Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
-The Original Code of the gSOAP Software is: stdsoap.h, stdsoap2.h, stdsoap.c, stdsoap2.c, stdsoap.cpp, stdsoap2.cpp, soapcpp2.h, soapcpp2.c, soapcpp2_lex.l, soapcpp2_yacc.y, error2.h, error2.c, symbol2.c, init2.c, soapdoc2.html, and soapdoc2.pdf, httpget.h, httpget.c, stl.h, stldeque.h, stllist.h, stlvector.h, stlset.h.
-The Initial Developer of the Original Code is Robert A. van Engelen. Portions created by Robert A. van Engelen are Copyright (C) 2001-2004 Robert A. van Engelen, Genivia inc. All Rights Reserved.
-Contributor(s):
-
-"________________________."
-
-[Note: The text of this Exhibit A may differ slightly form the text of the notices in the Source Code files of the Original code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.]
-EXHIBIT B.
-"Part of the software embedded in this product is gSOAP software.
-Portions created by gSOAP are Copyright (C) 2001-2004 Robert A. van Engelen, Genivia inc. All Rights Reserved.
-THE SOFTWARE IN THIS PRODUCT WAS IN PART PROVIDED BY GENIVIA INC AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." 
diff --git a/libre/gsoap-legacy/PKGBUILD b/libre/gsoap-legacy/PKGBUILD
deleted file mode 100644
index addcd690a..000000000
--- a/libre/gsoap-legacy/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Tor Krill <tor@krill.nu>
-# Contributor: Lee.MaRS <leemars@gmail.com>
-
-_pkgname=gsoap
-pkgname=gsoap-legacy
-pkgver=2.8.11
-pkgrel=1
-pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++ (legacy version)"
-url="http://www.cs.fsu.edu/~engelen/soap.html"
-arch=('i686' 'x86_64')
-license=('GPL' 'custom')
-depends=('openssl' 'zlib' 'gcc-libs')
-makedepends=('autoconf' 'automake')
-conflicts=('gsoap')
-source=(http://prdownloads.sourceforge.net/gsoap2/${_pkgname}_${pkgver}.zip
-	LICENSE)
-md5sums=('ea2d7ee876d274a188b8fbb365702eec'
-         '27aaa3f5166db94d44044c11a7b2c37b')
-
-build() {
-  cd $srcdir/gsoap-2.8
-  [ -f Makefile ] || CXXFLAGS=-fPIC CFLAGS=-fPIC LDFLAGS=-fPIC ./configure --prefix=/usr
-  make -j1
-}
-
-package() {
-  cd $srcdir/gsoap-2.8
-  make DESTDIR=$pkgdir install
-  mkdir -p $pkgdir/usr/share/gsoap/import
-  mkdir -p $pkgdir/usr/share/gsoap/WS
-  cp -R gsoap/import $pkgdir/usr/share/gsoap/
-  cp -R gsoap/WS $pkgdir/usr/share/gsoap/
-  install -D ../LICENSE $pkgdir/usr/share/licenses/$_pkgname/LICENSE
-}
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD
deleted file mode 100644
index 2b10f2b54..000000000
--- a/libre/gst-plugins-bad-libre/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 202893 2013-12-28 22:45:58Z bpiotrowski $
-# 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.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' 'wildmidi')
-makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python' 'valgrind' 'wildmidi'
-             'gobject-introspection')
-provides=($_pkgname=$pkgver)
-conflicts=$_pkgname
-replaces=$_pkgname
-options=(!emptydirs)
-source=(${url}/src/$_pkgname/$_pkgname-$pkgver.tar.xz)
-sha256sums=('f33e7c81fcb742fe50b73ad87ef8a4baa7d6b59c5002a10bf63c8dee22404929')
-
-build() {
-  cd $_pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Bad Plugins (Parabola GNU/Linux-libre)" \
-    --with-package-origin="https://parabolagnulinux.org/" \
-    --with-gtk=3.0
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-check() {
-  cd $_pkgname-$pkgver
-  # don't have a camera for the camerabin test
-  make -k check || :
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD
deleted file mode 100644
index 2958425b2..000000000
--- a/libre/gstreamer0.10-bad-libre/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 202895 2013-12-28 22:46:10Z bpiotrowski $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-# 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=7
-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' 'git' 'spandsp' 'celt')
-url="http://gstreamer.freedesktop.org/"
-options=(!emptydirs)
-source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-bad#commit=57569a4854a0f2d14ef19a8264a4ae9a7a1d1125"
-        disable-assrender-test.patch
-        disable-camerabin-test.patch)
-sha256sums=('SKIP'
-            'e66642affa6c0e69837d37615010e67e59ef3d672663303d46c1e2591e2ddfc6'
-            '01e780ddf1f8161a6115dded9dc5bf4bdd4d09a9eee00fa423b1330e90e76c68')
-
-prepare() {
-  cd gst-plugins-bad
-  sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.ac
-  patch -Np1 -i ../disable-assrender-test.patch
-  patch -Np1 -i ../disable-camerabin-test.patch
-}
-
-build() {
-  cd gst-plugins-bad
-  NOCONFIGURE=1 ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental --disable-gtk-doc \
-    --with-package-name="GStreamer Bad Plugins (Parabola GNU/Linux-libre)" \
-    --with-package-origin="https://parabolagnulinux.org/"
-
-  make
-  sed -e 's/gst sys ext/gst/' -i Makefile
-}
-
-check() {
-  cd gst-plugins-bad
-  make check
-}
-
-package_gstreamer0.10-bad-libre() {
-  pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad), without nonfree faac support"
-  depends=('gstreamer0.10-base>=0.10.34')
-  provides=("gstreamer0.10-bad=$pkgver")
-  conflicts=('gstreamer0.10-bad')
-  replaces=('gstreamer0.10-bad')
-
-  cd gst-plugins-bad
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gstreamer0.10-bad-libre-plugins() {
-  pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad), without nonfree faac support"
-  depends=("gstreamer0.10-bad-libre=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg' 'wildmidi' 'opus' 'celt' 'spandsp')
-  groups=('gstreamer0.10-plugins')
-  install=gstreamer0.10-bad-plugins.install
-  provides=("gstreamer0.10-bad-plugins=$pkgver")
-  conflicts=('gstreamer0.10-bad-plugins')
-  replaces=('gstreamer0.10-bad-plugins')
-
-  cd gst-plugins-bad
-  make -C gst-libs DESTDIR="${pkgdir}" install
-  make -C ext DESTDIR="${pkgdir}" install
-  make -C sys DESTDIR="${pkgdir}" install
-  make -C gst-libs DESTDIR="${pkgdir}" uninstall
-}
diff --git a/libre/gstreamer0.10-bad-libre/disable-assrender-test.patch b/libre/gstreamer0.10-bad-libre/disable-assrender-test.patch
deleted file mode 100644
index 07ce4f1bb..000000000
--- a/libre/gstreamer0.10-bad-libre/disable-assrender-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tests/check/elements/assrender.c
-+++ b/tests/check/elements/assrender.c
-@@ -289,8 +289,6 @@ assrender_suite (void)
-   tcase_set_timeout (tc_chain, 120);
- 
-   suite_add_tcase (s, tc_chain);
--  tcase_add_test (tc_chain, test_assrender_basic_xRGB);
--  tcase_add_test (tc_chain, test_assrender_basic_I420);
- 
-   return s;
- }
diff --git a/libre/gstreamer0.10-bad-libre/disable-camerabin-test.patch b/libre/gstreamer0.10-bad-libre/disable-camerabin-test.patch
deleted file mode 100644
index 964351ae6..000000000
--- a/libre/gstreamer0.10-bad-libre/disable-camerabin-test.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gst-plugins-bad/tests/check/Makefile.am.orig	2013-12-10 22:01:50.504567189 +0000
-+++ gst-plugins-bad/tests/check/Makefile.am	2013-12-10 22:02:17.081058500 +0000
-@@ -181,7 +181,6 @@
- 	elements/autovideoconvert \
- 	elements/asfmux \
- 	elements/baseaudiovisualizer \
--	elements/camerabin \
-         elements/camerabin2 \
- 	elements/dataurisrc \
- 	elements/legacyresample \
diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD
deleted file mode 100644
index bd697b3f6..000000000
--- a/libre/gummiboot/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 202399 2013-12-21 16:55:19Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# 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@parabola.nu>
-
-pkgname="gummiboot"
-pkgver="41"
-pkgrel="1"
-pkgdesc="Simple text-mode UEFI Boot Manager (Parabola rebranded)"
-url="http://freedesktop.org/wiki/Software/gummiboot"
-arch=('x86_64' 'i686' 'mips64el')
-license=('LGPL2.1')
-makedepends=('gnu-efi-libs' 'docbook-xsl' 'git')
-depends=('util-linux')
-conflicts=('gummiboot-efi')
-provides=('gummiboot-efi')
-replaces=('gummiboot-efi')
-options=('!strip' '!makeflags')
-source=("git://anongit.freedesktop.org/${pkgname}#commit=ba731cee"
-        'loader.conf'
-        'parabola.conf'
-        'splash-parabola.bmp')
-install="gummiboot.install"
-md5sums=('SKIP'
-         '3d700d13aec5ab1b78a921eaf22e5bfa'
-         '36ee74767ac8734dede1cbd0f4f275d7'
-         'c146ea0e16fff867164e113c48c91fff')
-
-build() {
-	cd ${srcdir}/${pkgname}
-
-	./autogen.sh
-	./configure --sysconfdir=/etc  --with-efi-ldsdir=/usr/lib --libexecdir=/usr/lib --libdir=/usr/lib
-	
-	make
-}
-
-package() {
-	## Install gummiboot example configuration files (can go away with systemd's kernel-install)
-	install -D -m0644 "${srcdir}/loader.conf" "${pkgdir}/usr/lib/gummiboot/loader/loader.conf"
-	install -D -m0644 "${srcdir}/parabola.conf" "${pkgdir}/usr/lib/gummiboot/loader/entries/parabola.conf"
-
-	## ship an Parabola GNU/Linux-libre boot splash (still has to be dropped in manually to take effect)
-	install -D -m0644 "${srcdir}/splash-parabola.bmp" "${pkgdir}/usr/lib/gummiboot/splash-parabola.bmp"
-
-	cd ${srcdir}/${pkgname}
-
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/libre/gummiboot/gummiboot.install b/libre/gummiboot/gummiboot.install
deleted file mode 100644
index 20861d4c8..000000000
--- a/libre/gummiboot/gummiboot.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	mkdir -p /boot/EFI/gummiboot
-	/usr/bin/gummiboot update
-	echo ":: Run '/usr/bin/gummiboot install' to make gummiboot your default bootloader"
-}
-
-post_upgrade() {
-	/usr/bin/gummiboot update
-}
-
-pre_remove() {
-	/usr/bin/gummiboot remove
-}
diff --git a/libre/gummiboot/loader.conf b/libre/gummiboot/loader.conf
deleted file mode 100644
index b8bfb988e..000000000
--- a/libre/gummiboot/loader.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-timeout 10
-default parabola
diff --git a/libre/gummiboot/parabola.conf b/libre/gummiboot/parabola.conf
deleted file mode 100644
index 111072ea2..000000000
--- a/libre/gummiboot/parabola.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-## This is just an example config file.
-## Please edit the paths and kernel parameters according to your system.
-
-title   Parabola GNU/Linux-libre
-linux   /vmlinuz-linux-libre
-initrd  /initramfs-linux-libre.img
-options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap
diff --git a/libre/gummiboot/splash-parabola.bmp b/libre/gummiboot/splash-parabola.bmp
deleted file mode 100644
index 11ceeff28..000000000
--- a/libre/gummiboot/splash-parabola.bmp
+++ /dev/null
diff --git a/libre/h-client/PKGBUILD b/libre/h-client/PKGBUILD
deleted file mode 100644
index 5e988d060..000000000
--- a/libre/h-client/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
-
-pkgname=h-client
-_pkgver=0.0a0.dev-r129
-pkgver=${_pkgver/-/.}
-pkgrel=1
-pkgdesc="A client for an h-source server (such as http://www.h-node.org/)"
-arch=('any')
-url="https://savannah.nongnu.org/projects/h-client/"
-license=('GPL3')
-depends=('python2' 'python2-distribute' 'python2-pycurl' 'pygtk')
-options=(!emptydirs)
-# Official source is in SVN, this is made by "python2 setup.py sdist"
-# on a machine having Subversion 1.6.x (e.g. on Trisquel 4.0).
-source=("https://mtjm.eu/releases/hclient-${_pkgver}.tar.gz"{,.sig})
-sha512sums=('e4f8f88db5cd27bb3304c1421bd661da9c52a15297d273cd6fa81ccfd0f1c9b210dc87373ecc6d414585c525a570c7f783d706fa67e247562fd8c7fa5e59a9e7'
-            '5712b41c4a4d45482e96825762955855212c3594b61624495e6ddec0b85a4718e080da1c99be22cb91aa644ee65d3708cc06b004f84b6facf2531b7b4c897c03')
-
-build() {
-  cd "$srcdir/hclient-${_pkgver}"
-  make
-}
-
-check() {
-  cd "$srcdir/hclient-${_pkgver}"
-  python2 setup.py test
-}
-
-package() {
-  cd "$srcdir/hclient-${_pkgver}"
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-  make DESTDIR="$pkgdir" prefix=/usr install-data
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD
deleted file mode 100644
index a66dc20df..000000000
--- a/libre/hardinfo/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=hardinfo
-pkgver=0.5.1
-pkgrel=5
-pkgdesc="A system information and benchmark tool."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://hardinfo.berlios.de/wiki/index.php/Main_Page"
-license=('GPL2')
-depends=('gtk2' 'libsoup')
-options=('!emptydirs')
-source=(http://download.berlios.de/hardinfo/${pkgname}-${pkgver}.tar.bz2 \
-        fixsensors.patch hardinfo.distro)
-sha1sums=('983f0445aa60e02156bc5a5eaedeffb30b8e4d64'
-          'd2151dce76dca238102937d0e15541f172bca530'
-          '9425e09191cd3a365a3afce57ca1973a6439fa57')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../fixsensors.patch
-  sed -i 's|/usr/lib64|/usr/lib|' configure
-  ./configure --prefix=/usr
-  sed -i 's|lib64|lib|' binreloc.c
-  sed -i 's|{ DB_PREFIX "debian_version",	"deb"  },|{ DB_PREFIX "hardinfo.distro",       "parabola"  },{ DB_PREFIX "debian_version",	"deb"  },|' computer.h 
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 ../hardinfo.distro "${pkgdir}/etc/hardinfo.distro"
-}
diff --git a/libre/hardinfo/fixsensors.patch b/libre/hardinfo/fixsensors.patch
deleted file mode 100644
index 812c29458..000000000
--- a/libre/hardinfo/fixsensors.patch
+++ /dev/null
@@ -1,13 +0,0 @@
- diff -upNr hardinfo-0.4.2.2.orign/util.c hardinfo-0.4.2.2/util.c
---- hardinfo-0.4.2.2.orign/util.c	2007-07-20 16:45:08.000000000 +0200
-+++ hardinfo-0.4.2.2/util.c	2007-07-26 10:15:32.000000000 +0200
-@@ -996,7 +996,8 @@ gchar *h_strdup_cprintf(const gchar * fo
-     if (source) {
- 	retn = g_strconcat(source, buffer, NULL);
- 	g_free(buffer);
--        g_free(source);
-+        if(strlen(source))
-+		 g_free(source);
-     } else {
- 	retn = buffer;
-     }
diff --git a/libre/hardinfo/hardinfo.distro b/libre/hardinfo/hardinfo.distro
deleted file mode 100644
index cf378523a..000000000
--- a/libre/hardinfo/hardinfo.distro
+++ /dev/null
@@ -1 +0,0 @@
-Parabola GNU/Linux-Libre
diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD
deleted file mode 100644
index b1c9228a6..000000000
--- a/libre/hexchat-libre/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $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@parabola.nu>
-
-_pkgname=hexchat
-pkgname=hexchat-libre
-pkgver=2.9.6.1
-pkgrel=1
-pkgdesc="A popular and easy to use graphical IRC (chat) client, without nonfree browser reference (Parabola rebranded)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://hexchat.github.io/"
-license=('GPL')
-depends=('dbus-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'libcanberra' 'libnotify' 'libproxy' 'libsexy' 'pciutils')
-makedepends=('perl' 'python')
-optdepends=('enchant: Spell check'
-            'perl: Perl plugin'
-            'python: Python plugin')
-options=('!libtool')
-install="${_pkgname}.install"
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-source=("http://dl.hexchat.org/${_pkgname}/${_pkgname}-${pkgver}.tar.xz")
-sha256sums=('6267ff3c4d0aec8a808365b384115a769d5001d99dbb10403634667c43966470')
-
-build() {
-  cd ${_pkgname}-${pkgver}
-
-# Rebrand to Parabola
-  sed -i 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c
-
-# Remove nonfree browser references
-  sed -i '\|NAME Open Link| s|Firefox|Iceweasel|' src/common/hexchat.c
-  sed -i '\|NAME Open Link| s|firefox -private %s\\n\\n";|iceweasel -private %s\\n\\n"\\\n		"NAME Open Link in Private Icecat Window\\n"		"CMD !icecat -private %s\\n\\n";|' src/common/hexchat.c
-
-  ./configure --prefix='/usr' --enable-{python='python3',shm,spell='libsexy',textfe}
-  make
-}
-
-package() {
-  cd ${_pkgname}-${pkgver}
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim: ts=2 sw=2 et:
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 18351214e..f0cdd45db 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 201437 2013-12-11 16:52:25Z andyrtr $
+# $Id: PKGBUILD 204311 2014-01-17 09:00:06Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
@@ -6,8 +6,8 @@
 
 _pkgname=hplip
 pkgname=hplip-libre
-pkgver=3.13.11
-pkgrel=2.1
+pkgver=3.14.1
+pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation (Parabola rebranded)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hplipopensource.com"
@@ -31,7 +31,7 @@ provides=$_pkgname=$pkgver
 install=hplip.install
 source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
         disable_upgrade.patch)
-md5sums=('8ee362d9bc45fd4eddd3c9d9e583d728'
+md5sums=('11eb45f3d3edf1f03887fd13afc61b51'
          'SKIP'
          'a853ba0eb0883f4bcee00b4277128b29')
 
diff --git a/libre/hplip-libre/cups-1.6-buildfix.diff b/libre/hplip-libre/cups-1.6-buildfix.diff
deleted file mode 100644
index 8341a1610..000000000
--- a/libre/hplip-libre/cups-1.6-buildfix.diff
+++ /dev/null
@@ -1,392 +0,0 @@
-diff -up hplip-3.12.6/prnt/cupsext/cupsext.c.ipp_accessors hplip-3.12.6/prnt/cupsext/cupsext.c
---- hplip-3.12.6/prnt/cupsext/cupsext.c.ipp_accessors	2012-06-18 12:41:19.000000000 +0200
-+++ hplip-3.12.6/prnt/cupsext/cupsext.c	2012-07-19 17:11:47.606524137 +0200
-@@ -87,6 +87,46 @@ typedef int Py_ssize_t;
- #define PY_SSIZE_T_MIN INT_MIN
- #endif
- 
-+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
-+#define HAVE_CUPS_1_6 1
-+#endif
-+
-+#ifndef HAVE_CUPS_1_6
-+#define ippGetCount(attr)     attr->num_values
-+#define ippGetGroupTag(attr)  attr->group_tag
-+#define ippGetValueTag(attr)  attr->value_tag
-+#define ippGetName(attr)      attr->name
-+#define ippGetBoolean(attr, element) attr->values[element].boolean
-+#define ippGetInteger(attr, element) attr->values[element].integer
-+#define ippGetStatusCode(ipp) ipp->request.status.status_code
-+#define ippGetString(attr, element, language) attr->values[element].string.text
-+
-+static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp )
-+{
-+    if (!ipp)
-+        return (NULL);
-+    return (ipp->current = ipp->attrs);
-+}
-+
-+static ipp_attribute_t * ippNextAttribute( ipp_t *ipp )
-+{
-+    if (!ipp || !ipp->current)
-+        return (NULL);
-+    return (ipp->current = ipp->current->next);
-+}
-+
-+static int ippSetOperation( ipp_t *ipp, ipp_op_t op )
-+{
-+    ipp->request.op.operation_id = op;
-+    return (1);
-+}
-+
-+static int ippSetRequestId( ipp_t *ipp, int request_id )
-+{
-+    ipp->request.any.request_id = request_id;
-+    return (1);
-+}
-+#endif
- 
- int g_num_options = 0;
- cups_option_t * g_options;
-@@ -333,8 +373,8 @@ PyObject * getPrinters( PyObject * self,
-     request = ippNew();
-     language = cupsLangDefault();
- 
--    request->request.op.operation_id = CUPS_GET_PRINTERS;
--    request->request.any.request_id = 1;
-+    ippSetOperation( request, CUPS_GET_PRINTERS );
-+    ippSetRequestId ( request, 1);
- 
-     ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                   "attributes-charset", NULL, cupsLangEncoding( language ) );
-@@ -378,10 +418,10 @@ PyObject * getPrinters( PyObject * self,
-         ipp_pstate_t state;
-         int i = 0;
- 
--        for ( attr = response->attrs; attr != NULL; attr = attr->next )
-+        for ( attr = ippFirstAttribute( response ); attr != NULL; attr = ippNextAttribute( response ) )
-         {
--            while ( attr != NULL && attr->group_tag != IPP_TAG_PRINTER )
--                attr = attr->next;
-+            while ( attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER )
-+                attr = ippNextAttribute( response );
- 
-             if ( attr == NULL )
-                 break;
-@@ -390,41 +430,41 @@ PyObject * getPrinters( PyObject * self,
-             state = IPP_PRINTER_IDLE;
-             accepting = 0;
- 
--            while ( attr != NULL && attr->group_tag == IPP_TAG_PRINTER )
-+            while ( attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER )
-             {
--                if ( strcmp( attr->name, "printer-name" ) == 0 &&
--                        attr->value_tag == IPP_TAG_NAME )
--                    name = attr->values[ 0 ].string.text;
--
--                else if ( strcmp( attr->name, "device-uri" ) == 0 &&
--                        attr->value_tag == IPP_TAG_URI )
--                    device_uri = attr->values[ 0 ].string.text;
--
--                else if ( strcmp( attr->name, "printer-uri-supported" ) == 0 &&
--                        attr->value_tag == IPP_TAG_URI )
--                    printer_uri = attr->values[ 0 ].string.text;
--
--                else if ( strcmp( attr->name, "printer-info" ) == 0 &&
--                        attr->value_tag == IPP_TAG_TEXT )
--                    info = attr->values[ 0 ].string.text;
--
--                else if ( strcmp( attr->name, "printer-location" ) == 0 &&
--                        attr->value_tag == IPP_TAG_TEXT )
--                    location = attr->values[ 0 ].string.text;
--
--                else if ( strcmp( attr->name, "printer-make-and-model" ) == 0 &&
--                        attr->value_tag == IPP_TAG_TEXT )
--                    make_model = attr->values[ 0 ].string.text;
--
--                else if ( strcmp( attr->name, "printer-state" ) == 0 &&
--                        attr->value_tag == IPP_TAG_ENUM )
--                    state = ( ipp_pstate_t ) attr->values[ 0 ].integer;
--
--                else if (!strcmp(attr->name, "printer-is-accepting-jobs") &&
--                        attr->value_tag == IPP_TAG_BOOLEAN)
--                    accepting = attr->values[ 0 ].boolean;
-+                if ( strcmp( ippGetName( attr ), "printer-name" ) == 0 &&
-+                        ippGetValueTag( attr ) == IPP_TAG_NAME )
-+                    name = ippGetString( attr, 0, NULL );
-+
-+                else if ( strcmp( ippGetName( attr ), "device-uri" ) == 0 &&
-+                        ippGetValueTag( attr ) == IPP_TAG_URI )
-+                    device_uri = ippGetString( attr, 0, NULL );
-+
-+                else if ( strcmp( ippGetName( attr ), "printer-uri-supported" ) == 0 &&
-+                        ippGetValueTag( attr ) == IPP_TAG_URI )
-+                    printer_uri = ippGetString( attr, 0, NULL );
-+
-+                else if ( strcmp( ippGetName( attr ), "printer-info" ) == 0 &&
-+                        ippGetValueTag( attr ) == IPP_TAG_TEXT )
-+                    info = ippGetString( attr, 0, NULL );
-+
-+                else if ( strcmp( ippGetName( attr ), "printer-location" ) == 0 &&
-+                        ippGetValueTag( attr ) == IPP_TAG_TEXT )
-+                    location = ippGetString( attr, 0, NULL );
-+
-+                else if ( strcmp( ippGetName( attr ), "printer-make-and-model" ) == 0 &&
-+                        ippGetValueTag( attr ) == IPP_TAG_TEXT )
-+                    make_model = ippGetString( attr, 0, NULL );
-+
-+                else if ( strcmp( ippGetName( attr ), "printer-state" ) == 0 &&
-+                        ippGetValueTag( attr ) == IPP_TAG_ENUM )
-+                    state = ( ipp_pstate_t ) ippGetInteger( attr, 0 );
-+
-+                else if (!strcmp(ippGetName( attr ), "printer-is-accepting-jobs") &&
-+                        ippGetValueTag( attr ) == IPP_TAG_BOOLEAN)
-+                    accepting = ippGetBoolean( attr, 0 );
- 
--                attr = attr->next;
-+                attr = ippNextAttribute( response );
-             }
- 
-             if ( device_uri == NULL )
-@@ -522,8 +562,8 @@ PyObject * addPrinter( PyObject * self,
-     request = ippNew();
-     language = cupsLangDefault();
- 
--    request->request.op.operation_id = CUPS_ADD_PRINTER;
--    request->request.any.request_id = 1;
-+    ippSetOperation( request, CUPS_ADD_PRINTER );
-+    ippSetRequestId ( request, 1 );
- 
-     ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                   "attributes-charset", NULL, cupsLangEncoding( language ) );
-@@ -568,7 +608,7 @@ PyObject * addPrinter( PyObject * self,
-     }
-     else
-     {
--        status = response->request.status.status_code;
-+        status = ippGetStatusCode( response );
-         //ippDelete( response );
-         r = 1;
-     }
-@@ -631,8 +671,8 @@ PyObject * delPrinter( PyObject * self,
-        */
-     request = ippNew();
- 
--    request->request.op.operation_id = CUPS_DELETE_PRINTER;
--    request->request.op.request_id = 1;
-+    ippSetOperation( request, CUPS_DELETE_PRINTER );
-+    ippSetRequestId ( request, 1 );
- 
-     language = cupsLangDefault();
- 
-@@ -650,7 +690,7 @@ PyObject * delPrinter( PyObject * self,
-      */
-     response = cupsDoRequest( http, request, "/admin/" );
- 
--    if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
-+    if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) )
-     {
-         r = 1;
-     }
-@@ -721,8 +761,8 @@ PyObject * setDefaultPrinter( PyObject *
- 
-     request = ippNew();
- 
--    request->request.op.operation_id = CUPS_SET_DEFAULT;
--    request->request.op.request_id = 1;
-+    ippSetOperation( request, CUPS_SET_DEFAULT );
-+    ippSetRequestId ( request, 1 );
- 
-     language = cupsLangDefault();
- 
-@@ -743,7 +783,7 @@ PyObject * setDefaultPrinter( PyObject *
- 
-     response = cupsDoRequest( http, request, "/admin/" );
- 
--    if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
-+    if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) )
-     {
-         r = 1;
-     }
-@@ -797,8 +837,8 @@ PyObject * controlPrinter( PyObject * se
- 
-     request = ippNew();
- 
--    request->request.op.operation_id = op;
--    request->request.op.request_id = 1;
-+    ippSetOperation( request, op );
-+    ippSetRequestId ( request, 1 );
- 
-     language = cupsLangDefault();
- 
-@@ -822,7 +862,7 @@ PyObject * controlPrinter( PyObject * se
- 
-     response = cupsDoRequest(http, request, "/admin/");
- 
--    if (( response != NULL ) && (response->request.status.status_code <= IPP_OK_CONFLICT))
-+    if (( response != NULL ) && (ippGetStatusCode( response ) <= IPP_OK_CONFLICT))
-     {
-         r = 1;
-     }
-@@ -837,7 +877,7 @@ abort:
-     if ( response != NULL )
-         ippDelete( response );
- 
--    return Py_BuildValue( "i", r );;
-+    return Py_BuildValue( "i", r );
- }
- 
- 
-@@ -1116,8 +1156,8 @@ PyObject * getPPDList( PyObject * self,
- 
-     request = ippNew();
- 
--    request->request.op.operation_id = CUPS_GET_PPDS;
--    request->request.op.request_id   = 1;
-+    ippSetOperation( request, CUPS_GET_PPDS );
-+    ippSetRequestId ( request, 1 );
- 
-     language = cupsLangDefault();
- 
-@@ -1143,43 +1183,43 @@ PyObject * getPPDList( PyObject * self,
-     if ((response = cupsDoRequest(http, request, "/")) != NULL)
-     {
- 
--        for (attr = response->attrs; attr; attr = attr->next)
-+        for (attr = ippFirstAttribute( response ); attr; attr = ippNextAttribute( response ))
-         {
-             PyObject *dict;
-             char *ppdname = NULL;
- 
--            while (attr && attr->group_tag != IPP_TAG_PRINTER)
--                attr = attr->next;
-+            while (attr && ippGetGroupTag( attr ) != IPP_TAG_PRINTER)
-+                attr = ippNextAttribute( response );
- 
-             if (!attr)
-                 break;
- 
-             dict = PyDict_New ();
- 
--            for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next)
-+            for (; attr && ippGetGroupTag( attr ) == IPP_TAG_PRINTER; attr = ippNextAttribute( response ))
-             {
-                 PyObject *val = NULL;
- 
--                if (!strcmp (attr->name, "ppd-name") && attr->value_tag == IPP_TAG_NAME)
-+                if (!strcmp (ippGetName( attr ), "ppd-name") && ippGetValueTag( attr ) == IPP_TAG_NAME)
-                 {
--                    ppdname = attr->values[0].string.text;
-+                    ppdname = ippGetString( attr, 0, NULL );
- 
-                     //sprintf( buf, "print '%s'", ppdname);
-                     //PyRun_SimpleString( buf );
-                 }
- 
--                else if (attr->value_tag == IPP_TAG_TEXT || attr->value_tag == IPP_TAG_NAME || attr->value_tag == IPP_TAG_KEYWORD)
--                //else if ((!strcmp (attr->name, "ppd-natural-language") && attr->value_tag == IPP_TAG_LANGUAGE) ||
--                //    (!strcmp (attr->name, "ppd-make-and-model") && attr->value_tag == IPP_TAG_TEXT) ||
--                //    (!strcmp (attr->name, "ppd-make") && attr->value_tag == IPP_TAG_TEXT) ||
--                //    (!strcmp (attr->name, "ppd-device-id") && attr->value_tag == IPP_TAG_TEXT))
-+                else if (ippGetValueTag( attr ) == IPP_TAG_TEXT || ippGetValueTag( attr ) == IPP_TAG_NAME || ippGetValueTag( attr ) == IPP_TAG_KEYWORD)
-+                //else if ((!strcmp (ippGetName( attr ), "ppd-natural-language") && ippGetValueTag( attr ) == IPP_TAG_LANGUAGE) ||
-+                //    (!strcmp (ippGetName( attr ), "ppd-make-and-model") && ippGetValueTag( attr ) == IPP_TAG_TEXT) ||
-+                //    (!strcmp (ippGetName( attr ), "ppd-make") && ippGetValueTag( attr ) == IPP_TAG_TEXT) ||
-+                //    (!strcmp (ippGetName( attr ), "ppd-device-id") && ippGetValueTag( attr ) == IPP_TAG_TEXT))
-                 {
--                    val = PyObj_from_UTF8(attr->values[0].string.text);
-+                    val = PyObj_from_UTF8(ippGetString( attr, 0, NULL ));
-                 }
- 
-                 if (val)
-                 {
--                    PyDict_SetItemString (dict, attr->name, val);
-+                    PyDict_SetItemString (dict, ippGetName( attr ), val);
-                     Py_DECREF (val);
-                 }
-             }
-diff -up hplip-3.12.6/scan/sane/hpaio.c.ipp_accessors hplip-3.12.6/scan/sane/hpaio.c
---- hplip-3.12.6/scan/sane/hpaio.c.ipp_accessors	2012-06-18 12:42:51.000000000 +0200
-+++ hplip-3.12.6/scan/sane/hpaio.c	2012-07-19 17:12:34.557848760 +0200
-@@ -47,6 +47,43 @@
- #define DEBUG_DECLARE_ONLY
- #include "sanei_debug.h"
- 
-+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
-+#define HAVE_CUPS_1_6 1
-+#endif
-+
-+#ifndef HAVE_CUPS_1_6
-+#define ippGetGroupTag(attr)  attr->group_tag
-+#define ippGetValueTag(attr)  attr->value_tag
-+#define ippGetName(attr)      attr->name
-+#define ippGetString(attr, element, language) attr->values[element].string.text
-+
-+static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp )
-+{
-+    if (!ipp)
-+        return (NULL);
-+    return (ipp->current = ipp->attrs);
-+}
-+
-+static ipp_attribute_t * ippNextAttribute( ipp_t *ipp )
-+{
-+    if (!ipp || !ipp->current)
-+        return (NULL);
-+    return (ipp->current = ipp->current->next);
-+}
-+
-+static int ippSetOperation( ipp_t *ipp, ipp_op_t op )
-+{
-+    ipp->request.op.operation_id = op;
-+    return (1);
-+}
-+
-+static int ippSetRequestId( ipp_t *ipp, int request_id )
-+{
-+    ipp->request.any.request_id = request_id;
-+    return (1);
-+}
-+#endif
-+
- static SANE_Device **DeviceList = NULL;
- 
- static int AddDeviceList(char *uri, char *model, SANE_Device ***pd)
-@@ -186,8 +223,8 @@ static int GetCupsPrinters(char ***print
-    /* Assemble the IPP request */
-    request = ippNew();
- 
--   request->request.op.operation_id = CUPS_GET_PRINTERS;
--   request->request.any.request_id  = 1;
-+   ippSetOperation( request, CUPS_GET_PRINTERS );
-+   ippSetRequestId( request, 1 );
- 
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, "utf-8");
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, "en");
-@@ -197,20 +234,20 @@ static int GetCupsPrinters(char ***print
-    if ((response = cupsDoRequest(http, request, "/")) == NULL)
-       goto bugout;
- 
--   for (attr = response->attrs; attr != NULL; attr = attr->next)
-+   for (attr = ippFirstAttribute ( response ); attr != NULL; attr = ippNextAttribute( response ))
-    {
-       /* Skip leading attributes until we hit a printer. */
--      while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER)
--         attr = attr->next;
-+      while (attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER)
-+         attr = ippNextAttribute( response );
- 
-       if (attr == NULL)
-          break;
- 
--      while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
-+      while (attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER)
-       {
--         if (strcmp(attr->name, "device-uri") == 0 && attr->value_tag == IPP_TAG_URI && AddCupsList(attr->values[0].string.text, printer) == 0)
-+         if (strcmp(ippGetName( attr ), "device-uri") == 0 && ippGetValueTag( attr ) == IPP_TAG_URI && AddCupsList(ippGetString( attr, 0, NULL ), printer) == 0)
-             cnt++;
--         attr = attr->next;
-+         attr = ippNextAttribute( response );
-       }
- 
-       if (attr == NULL)
diff --git a/libre/hplip-libre/disable_upgrade.patch b/libre/hplip-libre/disable_upgrade.patch
deleted file mode 100644
index 600d6ccc7..000000000
--- a/libre/hplip-libre/disable_upgrade.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- upgrade.py.orig	2013-10-31 12:46:54.000000000 +0100
-+++ upgrade.py	2013-12-04 14:58:03.000000000 +0100
-@@ -134,6 +134,11 @@ except getopt.GetoptError, e:
- if os.getenv("HPLIP_DEBUG"):
-     log.set_level('debug')
- 
-+
-+log.error("HPLIP upgrade is disabled by Parabola for security reasons, see https://bugs.archlinux.org/task/38083 - if you like to upgrade HPLIP, use the Parabola software package manager pacman.")
-+clean_exit(1)
-+
-+
- for o, a in opts:
-     if o in ('-h', '--help'):
-         usage()
diff --git a/libre/hplip-libre/hp-mkuri.patch b/libre/hplip-libre/hp-mkuri.patch
deleted file mode 100644
index 518e7608f..000000000
--- a/libre/hplip-libre/hp-mkuri.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- io/hpmud/hp-mkuri.c.orig	2013-03-17 09:15:15.360624061 -0400
-+++ io/hpmud/hp-mkuri.c	2013-03-17 09:15:30.924316847 -0400
-@@ -266,7 +266,7 @@
- 
-     /* Bypass glib build dependencies by loading libnotify manually. */  
- 
--    if ((handle = load_library("libnotify.so.1")) == NULL)
-+    if ((handle = load_library("libnotify.so.4")) == NULL)
-     {
-        BUG("failed to open libnotify: %m\n");
-        goto bugout;
diff --git a/libre/hplip-libre/hplip-CVE-2013-4325.patch b/libre/hplip-libre/hplip-CVE-2013-4325.patch
deleted file mode 100644
index 85bff893b..000000000
--- a/libre/hplip-libre/hplip-CVE-2013-4325.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/hplip-libre/hplip.install b/libre/hplip-libre/hplip.install
deleted file mode 100644
index 74532cde3..000000000
--- a/libre/hplip-libre/hplip.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  cat << EOF
-
-NOTE
-----
-# If you want to use this driver with sane:
-#  echo "hpaio" >> /etc/sane.d/dll.conf
-
-EOF
-}
-
-post_upgrade() {
-  if [ "`vercmp $2 3.12.4-2`" -lt 0 ]; then
-    # important upgrade notice
-    echo "> Please remove your printer in cups, then add it"
-    echo "> back and reconfigure it to make it work again!"
-  fi
-}
diff --git a/libre/hplip-libre/hplip_typo.patch b/libre/hplip-libre/hplip_typo.patch
deleted file mode 100644
index 8d22f51ea..000000000
--- a/libre/hplip-libre/hplip_typo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- config_usb_printer.py	2013-05-19 02:23:17.506716304 +0300
-+++ config_usb_printer.py.new	2013-05-19 02:23:30.140049848 +0300
-@@ -257,7 +257,7 @@
-        # ******************************* RUNNING FIRMWARE DOWNLOAD TO DEVICE FOR SUPPORTED PRINTER'S
-        fw_download_req = mq.get('fw-download', False)
-        if fw_download_req:
--           fw_cmd = utlis.which('hp-firmware', True)
-+           fw_cmd = utils.which('hp-firmware', True)
-            if fw_cmd:
-                 fw_cmd += " -y3 -s %s"%param
-                 log.debug(fw_cmd)
diff --git a/libre/hydrogen-libre/PKGBUILD b/libre/hydrogen-libre/PKGBUILD
deleted file mode 100644
index 0f9dfb3e3..000000000
--- a/libre/hydrogen-libre/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 184270 2013-05-05 10:45:11Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: K. Piche <kpiche@rogers.com>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-_pkgname=hydrogen
-pkgname=hydrogen-libre
-pkgver=0.9.5.1
-pkgrel=4
-pkgdesc="An advanced drum machine, without nonfree drumkits recommendation"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.hydrogen-music.org/"
-depends=('libarchive' 'liblrdf' 'qt4' 'jack')
-makedepends=('scons' 'optipng')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.gz"
-        'lrdf_raptor2.patch'
-        'install.patch')
-install=$_pkgname.install
-options=('emptydirs')
-md5sums=('52f3a528705818c65acf546a3be4c6fb'
-         '2124851e890f46158189b5fa90006d40'
-         'ce3a83a069b55e46aa532b55e803c9a5')
-
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  # Change to list with only free licensed drumkits
-  sed -i -e 's|www.hydrogen-music.org/feeds/drumkit_list.php|repo.parabolagnulinux.org/other/hydrogen-libre/feeds/drumkit_list.php|'\
-  {data/{hydrogen.default.conf,doc/manual{.docbook,_nl.html,_es.html,_fr.html,.pot,_fr.po,_es.po,_en.html,_ca.html,_it.html}},gui/src/SoundLibrary/SoundLibraryImportDialog.cpp,libs/hydrogen/src/preferences.cpp} || read
-
-  # fix building with newer raptor
-  # see https://bugs.archlinux.org/task/25060
-  # TODO: report upstream
-  patch -Np1 -i "$srcdir/lrdf_raptor2.patch"
-
-  # fix some install-time issues
-  # http://www.assembla.com/spaces/hydrogen/tickets/204
-  patch -Np0 -i "$srcdir/install.patch"
-
-  # fix some pngs that break with newer libpng
-  # see https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024872.html
-  msg2 "Fixing PNGs, please wait..."
-  find -name '*.png' -exec optipng -quiet -force -fix {} +
-}
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  export QTDIR=/usr
-  scons prefix=/usr libarchive=1
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  scons DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/hydrogen-libre/hydrogen.install b/libre/hydrogen-libre/hydrogen.install
deleted file mode 100644
index ef354d1f5..000000000
--- a/libre/hydrogen-libre/hydrogen.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/hydrogen-libre/install.patch b/libre/hydrogen-libre/install.patch
deleted file mode 100644
index 2e6e707a1..000000000
--- a/libre/hydrogen-libre/install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-*** Sconstruct.org	2011-11-06 12:15:40.018119106 +0100
---- Sconstruct	2011-11-06 12:16:21.124122432 +0100
-***************
-*** 298,304 ****
-  
-          for N in glob.glob('./data/i18n/hydrogen.*'):
-              env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N))
-- 	env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
-  
-  	#add every img in ./data/img to the install list. 
-  	os.path.walk("./data/img/",install_images,env) 
---- 298,303 ----
diff --git a/libre/hydrogen-libre/lrdf_raptor2.patch b/libre/hydrogen-libre/lrdf_raptor2.patch
deleted file mode 100644
index ec176b716..000000000
--- a/libre/hydrogen-libre/lrdf_raptor2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -baur hydrogen-0.9.5.old/Sconstruct hydrogen-0.9.5/Sconstruct
---- hydrogen-0.9.5.old/Sconstruct	2011-08-11 18:00:07.889112348 +0800
-+++ hydrogen-0.9.5/Sconstruct	2011-08-11 18:00:34.945632437 +0800
-@@ -83,6 +83,7 @@
- 	includes.append( './' )
- 	includes.append( 'gui/src/' )
- 	includes.append( '3rdparty/install/include' )
-+	includes.append( '/usr/include/raptor2' )
- 
- 	if sys.platform == "darwin":
- 		ldflags.append( '-L/opt/local/lib' )
diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD
deleted file mode 100644
index 00341af26..000000000
--- a/libre/iceape-l10n/PKGBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: fauno <fauno@kiwwwi.com.ar>
-# Contributor: Figue <ffigue@gmail.com>
-# Maintainer: Márcio Silva <coadde@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:
-# - Edit variables in in Makefile.
-# - (optionally) edit PKGBUILD.in
-# - Run 'make'. It will take care of everything else for you.
-
-_debname=iceape
-_debver=2.7.12
-_debrel=deb1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_langpacks=(be ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN)
-
-pkgbase=iceape-l10n
-pkgname=($(for lang in ${_langpacks[@]}
-        do echo $pkgbase-$lang | tr A-Z a-z
-        done))
-epoch=1
-pkgver=${_debver}.${_debrel}
-pkgrel=1
-
-pkgdesc="Language packs for Debian Iceape."
-arch=('any')
-url="http://packages.debian.org/sid/iceape"
-license=('MPL' 'GPL')
-depends=("iceape-libre>=$epoch:$pkgver")
-makedepends=('unzip' 'zip')
-source=('region.properties')
-for lang in ${_langpacks[@]}
-do
-    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel#deb}_all.deb")
-done
-
-_path="/usr/lib/iceape/extensions"
-
-build() {
-  cd "${srcdir}"
-  for f in *.deb
-  do
-      bsdtar xf $f
-      bsdtar xf data.tar.gz
-  done
-
-  cd $srcdir/$_path
-
-  for i in ${_langpacks[@]}
-  do
-    cd $srcdir/$_path
-    unzip -q langpack-$i@iceape.mozilla.org.xpi -d $i
-    rm langpack-$i@iceape.mozilla.org.xpi
-    install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region
-    cd $i
-    zip -q -r $srcdir/$_path/langpack-$i@iceape.mozilla.org.xpi .
-  done
-
-  cd $srcdir
-}
-
-for lang in ${_langpacks[@]}
-do
-    eval "
-package_iceape-l10n-$(echo $lang | tr A-Z a-z)() {
-  replaces=(iceape-i18n-$(echo $lang | tr A-Z a-z))
-  conflicts=(iceape-i18n-$(echo $lang | tr A-Z a-z))
-  provides=(iceape-i18n-$(echo $lang | tr A-Z a-z))
-  install -Dm644 \"\$srcdir$_path/langpack-$lang@iceape.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceape.mozilla.org.xpi\"
-}
-"
-done
-
-md5sums=('7558c5a34cc5f661d4e96885300d0c41'
-         '22a14a6a2f03d0004a1fa990892094ef'
-         'af2379ea50672fe37ff8550d5c9e20a0'
-         'e5975c3b1ffaa5fcb3f5203cdfe8e0fb'
-         '21fcbd011acc382f5ec7a32aa04562ef'
-         '8fbf821c811c55514a100ae5d5e9e844'
-         'bd8f18e0d0f233e0a1c1a518537798a5'
-         '037cbb6fe0576f7f5bbbf956928f01e1'
-         '56964b577fcb077a9b81d07c59cc5af3'
-         'd2fb622717114a921efb37f028f31c6c'
-         '6abe2dbab7fcbdaf43e77290ca6853c9'
-         '558a2d29be749f6506f774703c58952f'
-         '7abdc6eb4154b88509a6c4f119c943a7'
-         '5a4fad9c23c8d19833ac5c76ad9aca4a'
-         '8d45110acc90f388923f01fb9cfca947'
-         'd1acbe2ef1120e70d5365476aa8679f9'
-         '604de00ea6ee06565212804b0d499df3'
-         'ceee78a29bd2f947558f04489ee50f54'
-         'afc6e343f0635a3ee5b7a22af947e8b8'
-         '455bab7a596cb43ac4ad80cb89a78b25'
-         '92a985b40aec8b3726ba22f45667994d'
-         'bc8c98f0518617ed2220fb3bfb03e165'
-         '449c91720751538f09ad3d555dbe2fce'
-         '8843be8937963d094d4272ac33019082')
diff --git a/libre/iceape-l10n/region.properties b/libre/iceape-l10n/region.properties
deleted file mode 100644
index 551605dd7..000000000
--- a/libre/iceape-l10n/region.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Default search engine
-browser.search.defaultenginename=DuckDuckGo HTML
-
-# Search engine order (order displayed in the search bar dropdown)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://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
-# 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
-
-# The default set of protocol handlers for irc:
-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:
-gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
-gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
deleted file mode 100644
index 601de26b9..000000000
--- a/libre/iceape-libre/PKGBUILD
+++ /dev/null
@@ -1,147 +0,0 @@
-# Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@parabola.nu>
-
-# We're getting this from Debian Sid
-_debname=iceape
-_debver=2.7.12
-_debrel=deb1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_pkgname=${_debname}
-pkgname=${_debname}-libre
-epoch=1
-pkgver=${_debver}.${_debrel}
-pkgrel=1
-pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey."
-arch=('i686' 'x86_64' 'mips64el')
-license=('MPL' 'GPL' 'LGPL')
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-ply' 'librsvg' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
-replaces=('seamonkey')
-conflicts=('seamonkey')
-provides=('seamonkey')
-install=$_pkgname.install
-url="http://packages.debian.org/sid/${_pkgname}"
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
-        mozconfig
-        ${_pkgname}.desktop
-        ${_pkgname}-2.0-lang.patch
-        clrf.patch
-        libre.patch)
-md5sums=('1ee82aa6ec73c13e2099b4cb6f16a908'
-         '1fb9c4affad5f030c4e3544aadeaeea2'
-         '70575e76b339fa7e17274a8ed84429fc'
-         '7266333e31731af8bb50c2eca8d0bd26'
-         '25b6fe16ac24cd5c852213e5c1adb272'
-         'c395d443a8c4c16880c7322bcf174743'
-         '14e2f08fb1b98ff287e74de54baf44fe')
-
-prepare() {
-  export DEBIAN_BUILD="comm-release"
-  export DEBIAN_BRANDING_DIR="debian/branding" 
-
-  export ICEAPE_ICONS_BRANDING="suite/branding/nightly"
-
-  export QUILT_PATCHES=debian/patches
-  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
-  export QUILT_DIFF_ARGS='--no-timestamps'
-
-  mv comm-esr10 "${DEBIAN_BUILD}"
-  mv debian "${srcdir}/${DEBIAN_BUILD}"
-  cd "${srcdir}/${DEBIAN_BUILD}"
-  quilt push -av
-
-  patch -Np1 -i "$srcdir/$_pkgname-2.0-lang.patch"
-  patch -Np1 -i "$srcdir/clrf.patch"
-  patch -Np1 -i "$srcdir/libre.patch"
-
-  # set up a simple non-animated throbber from the icon
-  install -m644 debian/extras/Throbber-small.gif suite/themes/classic/communicator/brand/throbber-anim.png
-  install -m644 debian/extras/Throbber-small.png suite/themes/classic/communicator/brand/throbber-single.png
-  install -m644 debian/extras/Throbber-small.gif suite/themes/classic/communicator/brand/throbber16-anim.png
-  install -m644 debian/extras/Throbber-small.png suite/themes/classic/communicator/brand/throbber16-single.png
-  install -m644 debian/extras/Throbber-small.gif suite/themes/modern/communicator/brand/throbber-anim.png
-  install -m644 debian/extras/Throbber-small.png suite/themes/modern/communicator/brand/throbber-single.png
-  install -m644 debian/extras/Throbber-small.gif suite/themes/modern/communicator/brand/throbber16-anim.png
-  install -m644 debian/extras/Throbber-small.png suite/themes/modern/communicator/brand/throbber16-single.png
-
-  install -m644 debian/extras/preview.png suite/themes/classic/preview.png
-
-  # Converting svg file to png and replacing seamonkey by iceape icons
-  rsvg-convert -w 300 -h 280 -o ${ICEAPE_ICONS_BRANDING}/content/about.png ${DEBIAN_BRANDING_DIR}/iceape_logo_plain.svg
-  rsvg-convert -w 64 -h 64 -o ${ICEAPE_ICONS_BRANDING}/content/icon64.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 128 -h 128 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/iceape.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 32 -h 32 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/default.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 32 -h 32 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/main-window.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 16 -h 16 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/default16.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 16 -h 16 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/main-window16.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 48 -h 48 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/default48.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 48 -h 48 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/main-window48.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  
-  # Creating app-icons Folder for iceape*.png icons
-
-  install -m755 -d "${DEBIAN_BRANDING_DIR}/app-icons"
-
-  # Icons for /usr/share/icons/hicolor
-  rsvg-convert -w 16 -h 16 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape16.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 32 -h 32 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape32.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 48 -h 48 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape48.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 64 -h 64 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape64.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 128 -h 128 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape128.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-
-  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
-}
-
-build() {
-  export DEBIAN_BUILD="comm-release"
-  export DEBIAN_BRANDING_DIR="debian/branding"
-
-  export ICEAPE_ICONS_BRANDING="suite/branding/nightly"
-
-  cd "${srcdir}/${DEBIAN_BUILD}"
-
-  export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}"
-  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
-  unset MAKEFLAGS
-
-  # Don't exit with error when some libs are missing which we have in
-  # system.
-  sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-      -i suite/installer/Makefile.in
-
-  make -j1 -f client.mk build
-}
-
-package() {
-  export DEBIAN_BUILD="comm-release"
-  export DEBIAN_BRANDING_DIR="debian/branding"
-
-  export ICEAPE_ICONS_BRANDING="suite/branding/nightly"
-
-  cd "${srcdir}/${DEBIAN_BUILD}"
-
-  make -j1 -f client.mk DESTDIR="${pkgdir}" install
-
-  rm -rf "$pkgdir"/usr/lib/$_pkgname/{dictionaries,hyphenation,searchplugins}
-  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/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins"
-
-  install -m755 -d "$pkgdir/usr/share/applications"
-  install -m755 -d "$pkgdir/usr/share/pixmaps"
-  install -m644 ${ICEAPE_ICONS_BRANDING}/icons/gtk/iceape.png \
-                "$pkgdir/usr/share/pixmaps/"
-
-  for i in 16x16 32x32 48x48 64x64 128x128; do
-      install -Dm644 "${DEBIAN_BRANDING_DIR}/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png"
-  done
-  install -Dm644 "${DEBIAN_BRANDING_DIR}/${_pkgname}_icon_plain.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
-
-  install -m644 "$srcdir/$_pkgname.desktop" "$pkgdir/usr/share/applications/"
-}
diff --git a/libre/iceape-libre/clrf.patch b/libre/iceape-libre/clrf.patch
deleted file mode 100644
index 375708ac4..000000000
--- a/libre/iceape-libre/clrf.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-diff -Nur comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
---- comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp	2012-03-12 23:37:12.000000000 -0300
-+++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp	2012-05-07 12:33:58.517612453 -0300
-@@ -688,7 +688,7 @@
-     PL_strcat(encoding, "{");
-     lengthStr.AppendInt((PRInt32) strlen(value));
-     PL_strcat(encoding, lengthStr.get());
--    PL_strcat(encoding, "}"CRLF);
-+    PL_strcat(encoding, "}" CRLF);
-     PL_strcat(encoding, value);
-     return NS_OK;
-   }
-diff -Nur comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
---- comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp	2012-05-07 12:41:08.003264793 -0300
-@@ -753,7 +753,7 @@
-           }
-         }
-       }
--#define EXTRA_KEYWORD_HDR "                                                                                 "MSG_LINEBREAK
-+#define EXTRA_KEYWORD_HDR "                                                                                 " MSG_LINEBREAK
- 
-        // if status offset isn't in the first block, this code won't work. There's no good reason
-       // for the status offset not to be at the beginning of the message anyway.
-@@ -1203,7 +1203,7 @@
-         // check if there's an envelope header; if not, write one.
-         if (strncmp(m_dataBuffer, "From ", 5))
-         {
--          m_fileStream->Write("From "CRLF, 7, &bytesWritten);
-+          m_fileStream->Write("From " CRLF, 7, &bytesWritten);
-           m_offlineMsgSize += bytesWritten;
-         }
-       }
-diff -Nur comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
---- comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp	2012-05-07 12:44:43.127347489 -0300
-@@ -1722,7 +1722,7 @@
- {
-   m_sendDone = PR_TRUE;
-   nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
--  SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server.
-+  SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server.
-   m_nextState = SMTP_RESPONSE;
-   m_nextStateAfterResponse = SMTP_DONE;
-   return(0);
-@@ -1969,7 +1969,7 @@
-     {
-       nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
-       // send a quit command to close the connection with the server.
--      if (SendData(url, "QUIT"CRLF) == NS_OK)
-+      if (SendData(url, "QUIT" CRLF) == NS_OK)
-       {
-         m_nextState = SMTP_RESPONSE;
-         m_nextStateAfterResponse = SMTP_ERROR_DONE;
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp comm-release/mailnews/imap/src/nsImapMailFolder.cpp
---- comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp	2012-05-07 12:48:29.417179064 -0300
-@@ -8298,7 +8298,7 @@
-           bool needMoreData = false;
-           char * newLine = nsnull;
-           PRUint32 numBytesInLine = 0;
--          const char *envelope = "From "CRLF;
-+          const char *envelope = "From " CRLF;
-           offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
-           fileSize += bytesWritten;
-           do
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp comm-release/mailnews/imap/src/nsImapProtocol.cpp
---- comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/imap/src/nsImapProtocol.cpp	2012-05-07 15:45:58.551202719 -0300
-@@ -1410,7 +1410,7 @@
- {
-   // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
-   nsCAutoString commandBuffer(GetServerCommandTag());
--  commandBuffer.Append(" IDLE"CRLF);
-+  commandBuffer.Append(" IDLE" CRLF);
- 
-   do
-   {
-@@ -3290,7 +3290,7 @@
-     commandString.Append(messageIds);
-     commandString.Append(" (");
-     commandString.Append(attribute);
--    commandString.Append(")"CRLF);
-+    commandString.Append(")" CRLF);
-     nsresult rv = SendData(commandString.get());
- 
-     if (NS_SUCCEEDED(rv))
-@@ -5283,7 +5283,7 @@
- 
-   IncrementCommandTagNumber();
-   nsCAutoString command(GetServerCommandTag());
--  command.Append(" expunge"CRLF);
-+  command.Append(" expunge" CRLF);
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -5359,7 +5359,7 @@
-   command.Append(gAppName);
-   command.Append("\" \"version\" \"");
-   command.Append(gAppVersion);
--  command.Append("\")"CRLF);
-+  command.Append("\")" CRLF);
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -5816,7 +5816,7 @@
-     nsCAutoString correctedPassword;
-     EscapeUserNamePasswordString(password.get(), &correctedPassword);
-     command.Append(correctedPassword);
--    command.Append("\""CRLF);
-+    command.Append("\"" CRLF);
-     rv = SendData(command.get(), PR_TRUE /* suppress logging */);
-     NS_ENSURE_SUCCESS(rv, rv);
-     ParseIMAPandCheckForNewMail();
-@@ -7446,7 +7446,7 @@
-   nsCString command(GetServerCommandTag());
-   command += " create \"";
-   command += escapedName;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   nsresult rv = SendData(command.get());
-   if(NS_SUCCEEDED(rv))
-@@ -7549,7 +7549,7 @@
-   nsCString command (GetServerCommandTag());
-   command += " lsub \"\" \"";
-   command += escapedPattern;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   PR_Free(boxnameWithOnlineDirectory);
- 
-@@ -7578,7 +7578,7 @@
-   command += useXLIST ?
-     " xlist \"\" \"" : " list \"\" \"";
-   command += escapedPattern;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   PR_Free(boxnameWithOnlineDirectory);
- 
-@@ -7599,7 +7599,7 @@
-   nsCString command (GetServerCommandTag());
-   command += " subscribe \"";
-   command += escapedName;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -7617,7 +7617,7 @@
-   nsCString command (GetServerCommandTag());
-   command += " unsubscribe \"";
-   command += escapedName;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -7631,7 +7631,7 @@
-   if (m_urlInProgress)
-     return;
-   nsCAutoString command (GetServerCommandTag());
--  command += " IDLE"CRLF;
-+  command += " IDLE" CRLF;
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-   {
-@@ -7658,7 +7658,7 @@
-   nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream);
-   if (asyncInputStream)
-     asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
--  nsresult rv = SendData("DONE"CRLF);
-+  nsresult rv = SendData("DONE" CRLF);
-   // set a short timeout if we don't want to wait for a response
-   if (m_transport && !waitForResponse)
-     m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5);
-@@ -7727,8 +7727,8 @@
-   PRUint32 msgsHandled = 0;
-   const char *formatString;
-   formatString = (idsAreUid)
--      ? "%s uid store %s %s"CRLF
--      : "%s store %s %s"CRLF;
-+      ? "%s uid store %s %s" CRLF
-+      : "%s store %s %s" CRLF;
- 
-   do
-   {
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
---- comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp	2012-05-07 12:57:22.050615120 -0300
-@@ -185,7 +185,7 @@
-   
-   NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' && 
-     *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string");
--  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
-+  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
-   if (sendingIdleDone)
-     fWaitingForMoreClientInput = PR_FALSE;
- 
-diff -Nur comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp comm-release/mailnews/local/src/nsPop3Protocol.cpp
---- comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/local/src/nsPop3Protocol.cpp	2012-05-07 12:59:45.857182813 -0300
-@@ -2483,7 +2483,7 @@
-         return(MK_OUT_OF_MEMORY);
-     m_pop3ConData->next_state_after_response = POP3_GET_LIST;
-     m_listpos = 0;
--    return SendData(m_url, "LIST"CRLF);
-+    return SendData(m_url, "LIST" CRLF);
- }
- 
- 
-diff -Nur comm-release.orig/mailnews/mime/src/mimedrft.cpp comm-release/mailnews/mime/src/mimedrft.cpp
---- comm-release.orig/mailnews/mime/src/mimedrft.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/mime/src/mimedrft.cpp	2012-05-07 13:01:42.912022177 -0300
-@@ -1473,7 +1473,7 @@
-                 *newbody = 0;
-                 PL_strcatn(newbody, newbodylen, "<PRE>");
-                 PL_strcatn(newbody, newbodylen, body);
--                PL_strcatn(newbody, newbodylen, "</PRE>"CRLF);
-+                PL_strcatn(newbody, newbodylen, "</PRE>" CRLF);
-                 PR_Free(body);
-                 body = newbody;
-               }
-diff -Nur comm-release.orig/mailnews/mime/src/mimemult.cpp comm-release/mailnews/mime/src/mimemult.cpp
---- comm-release.orig/mailnews/mime/src/mimemult.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/mime/src/mimemult.cpp	2012-05-07 13:04:41.511265477 -0300
-@@ -280,7 +280,7 @@
-             MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
-             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\""));
-             MimeWriteAString(obj, fileName);
--            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
-+            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
-             MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: "));
-             MimeWriteAString(obj, obj->options->state->detachedFilePath);
-             MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
-@@ -293,10 +293,10 @@
-             status = MimeWriteAString(obj, header);
-             if (status < 0) 
-               return status;
--            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding: 8bit"MSG_LINEBREAK));
-+            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "Content-Transfer-Encoding: 8bit" MSG_LINEBREAK));
-             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: inline; filename=\"Deleted: "));
-             MimeWriteAString(obj, fileName);
--            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\""));
-+            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "X-Mozilla-Altered: AttachmentDeleted; date=\""));
-           }
-           nsCString result;
-           char timeBuffer[128];
-@@ -306,8 +306,8 @@
-                                  "%a %b %d %H:%M:%S %Y",
-                                  &now);
-           MimeWriteAString(obj, nsDependentCString(timeBuffer));
--          MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
--          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK));
-+          MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
-+          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK));
-           MimeHeaders_write_raw_headers(mult->hdrs, obj->options, PR_FALSE);
-         }
-         PRInt32 old_nchildren = container->nchildren;
diff --git a/libre/iceape-libre/gcc47.patch b/libre/iceape-libre/gcc47.patch
deleted file mode 100644
index 115d65131..000000000
--- a/libre/iceape-libre/gcc47.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc comm-release/mozilla/ipc/chromium/src/base/file_util.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:38:11.474783536 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:43:29.218995578 +0000
-@@ -8,7 +8,7 @@
- #include <io.h>
- #endif
- #include <stdio.h>
--#if defined(ANDROID)
-+#if defined(ANDROID) || defined(OS_POSIX)
- #include <unistd.h>
- #endif
- 
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-03 18:38:11.381450924 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-03 18:43:29.218995578 +0000
-@@ -5,6 +5,9 @@
- #include "base/file_util.h"
- 
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
- 
- #include <string>
- #include <vector>
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-03 18:38:11.438117153 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-03 18:43:29.218995578 +0000
-@@ -6,6 +6,9 @@
- 
- #include <errno.h>
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
- 
- #include "eintr_wrapper.h"
- #include "base/logging.h"
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc comm-release/mozilla/ipc/chromium/src/base/time_posix.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-03 18:38:11.418117308 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-03 18:43:29.218995578 +0000
-@@ -14,6 +14,8 @@
- #include <time.h>
- #endif
- 
-+#include <unistd.h>
-+
- #include <limits>
- 
- #include "base/basictypes.h"
-diff -Nur comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in comm-release/mozilla/toolkit/crashreporter/client/Makefile.in
---- comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:38:56.101105510 +0000
-+++ comm-release/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:43:29.218995578 +0000
-@@ -69,6 +69,9 @@
- $(STDCXX_COMPAT) \
- $(NULL)
- 
-+# Needed for moz_free
-+LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
-+
- ifeq ($(OS_ARCH),WINNT)
- CPPSRCS += crashreporter_win.cpp
- LIBS += \
diff --git a/libre/iceape-libre/iceape-2.0-lang.patch b/libre/iceape-libre/iceape-2.0-lang.patch
deleted file mode 100644
index b9f4a5cde..000000000
--- a/libre/iceape-libre/iceape-2.0-lang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-10-11 02:12:44.000000000 +0200
-+++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-09-16 02:56:45.000000000 +0200
-@@ -890,7 +890,7 @@
- pref("intl.charset.detector",               "chrome://global/locale/intl.properties");
- pref("intl.charset.default",                "chrome://global-platform/locale/intl.properties");
- pref("intl.ellipsis",                       "chrome://global-platform/locale/intl.properties");
--pref("intl.locale.matchOS",                 false);
-+pref("intl.locale.matchOS",                 true);
- // fallback charset list for Unicode conversion (converting from Unicode)
- // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
- // for ISO-8859-1
diff --git a/libre/iceape-libre/iceape.desktop b/libre/iceape-libre/iceape.desktop
deleted file mode 100644
index 0868e5058..000000000
--- a/libre/iceape-libre/iceape.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=iceape %u
-Icon=iceape
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=Iceape Internet Suite
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;message/rfc822;x-scheme-handler/mailto;
-StartupNotify=false
-Categories=Application;Network;
diff --git a/libre/iceape-libre/iceape.install b/libre/iceape-libre/iceape.install
deleted file mode 100644
index 709ad81f2..000000000
--- a/libre/iceape-libre/iceape.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch
deleted file mode 100644
index 6473412e4..000000000
--- a/libre/iceape-libre/libre.patch
+++ /dev/null
@@ -1,285 +0,0 @@
---- comm-release.orig/mozilla/browser/locales/en-US/chrome/browser-region/region.properties	2012-02-16 12:08:39.000000000 -0200
-+++ comm-release/mozilla/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-29 22:19:37.998383034 -0200
-@@ -1,23 +1,16 @@
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo HTML
- 
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
--browser.search.order.2=Yahoo
--browser.search.order.3=Bing
--
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
--browser.contentHandlers.types.0.title=Google
--browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
--browser.contentHandlers.types.1.title=My Yahoo!
--browser.contentHandlers.types.1.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=http://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 
-@@ -26,20 +19,10 @@
- # don't make any spelling errors here.
- gecko.handlerService.defaultHandlersVersion=3
- 
--# 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=http://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:
--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
---- comm-release.orig/mozilla/modules/libpref/src/init/all.js	2012-03-16 04:46:09.000000000 -0300
-+++ comm-release/mozilla/modules/libpref/src/init/all.js	2012-05-12 04:03:52.163831535 -0300
-@@ -47,7 +47,7 @@
- // SYNTAX HINTS:  dashes are delimiters.  Use underscores instead.
- //  The first character after a period must be alphabetic.
- 
--pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "https://duckduckgo.com/html/?q=");
- pref("keyword.enabled", false);
- pref("general.useragent.locale", "chrome://global/locale/intl.properties");
- pref("general.useragent.compatMode.firefox", false);
---- comm-release.orig/mozilla/toolkit/content/plugins.html	2012-02-16 12:09:35.000000000 -0200
-+++ comm-release/mozilla/toolkit/content/plugins.html	2012-05-12 03:56:16.599192244 -0300
-@@ -98,18 +98,6 @@
-   else
-     document.writeln("<h1 id=\"noplugs\">" + pluginsbundle.GetStringFromName("nopluginsareenabled_label") + "<\/h1>");
- 
--  document.writeln("<div id=\"findmore\">" + pluginsbundle.GetStringFromName("findmore_label") + " ");
--  document.writeln("<a href=\"" + regionbundle.GetStringFromName("more_plugins_url") + "\">" + regionbundle.GetStringFromName("more_plugins_label") + "<\/a>.");
--  document.writeln("<\/div>");
--
--  document.writeln("<div id=\"findpluginupdates\">" + pluginsbundle.GetStringFromName("findpluginupdates_label") + " ");
--  document.writeln("<a href=\"" + regionbundle.GetStringFromName("pluginupdates_url") + "\">" + regionbundle.GetStringFromName("pluginupdates_label") + "<\/a>.");
--  document.writeln("<\/div>");
--
--  document.writeln("<div id=\"installhelp\">" + pluginsbundle.GetStringFromName("installhelp_label") + " ");
--  document.writeln("<a href=\"" + regionbundle.GetStringFromName("plugindoc_url") + "\">" + regionbundle.GetStringFromName("plugindoc_label") + "<\/a>.");
--  document.writeln("<\/div><hr>");
--
-   for (var i = 0; i < numPlugins; i++)
-   {
-     var plugin = navigator.plugins[i];
---- comm-release.orig/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.js	2012-02-16 12:09:38.000000000 -0200
-+++ comm-release/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.js	2012-05-12 03:59:11.639451163 -0300
-@@ -107,6 +107,7 @@
-     this.mPluginInfoArrayLength++;
-   } else {
-     this.mPluginNotFoundArray[aPluginRequestItem.mimetype] = aPluginRequestItem;
-+    this.mPluginNotFoundArray[aPluginRequestItem.mimetype].pluginsPage = null;
-     this.mPluginNotFoundArrayLength++;
-   }
- 
---- comm-release.orig/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.xul	2012-02-16 12:09:38.000000000 -0200
-+++ comm-release/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.xul	2012-05-12 04:01:29.208462907 -0300
-@@ -138,10 +138,6 @@
- 
-     <description id="pluginSummaryRestartNeeded" style="padding-top:10px;"
-                  value="&pluginWizard.finalPage.restart.label;"/>
--    <spacer flex="1" />
--    <description id="moreInfoLink"
--      style="color:rgb(0, 0, 255); cursor:pointer; text-decoration:underline;"
--      value="&pluginWizard.finalPage.moreInfo.label;"/>
-   </wizardpage>
- 
- </wizard>
---- comm-release.orig/suite/locales/en-US/chrome/browser/region.properties	2012-11-29 21:25:41.879931999 -0200
-+++ comm-release/suite/locales/en-US/chrome/browser/region.properties	2012-11-29 22:25:15.125790092 -0200
-@@ -4,18 +4,11 @@
- #
- browser.startup.homepage=about:
- browser.throbber.url=about:
--browser.search.defaulturl=http://www.google.com/search?q=
-+browser.search.defaulturl=https://duckduckgo.com/html/?q=
- 
--browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
--browser.translation.serviceDomain=translate.google.com
-+browser.translation.service=about:
-+browser.translation.serviceDomain=
- 
- #config.js
- #
- startup.homepage_override_url=about:
--
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
--browser.contentHandlers.types.0.title=Google
--browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
--browser.contentHandlers.types.1.title=My Yahoo!
--browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
---- comm-release.orig/suite/locales/en-US/chrome/common/region.properties	2012-02-16 11:59:54.000000000 -0200
-+++ comm-release/suite/locales/en-US/chrome/common/region.properties	2012-11-29 22:26:25.271781371 -0200
-@@ -1,10 +1,10 @@
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo HTML
- 
- # Search engine order (order displayed in the search bar dropdown)
--browser.search.order.1=Google
--browser.search.order.2=Yahoo
-+browser.search.order.1=DuckDuckGo HTML
-+browser.search.order.2=DuckDuckGo Lite
- 
- # More information about this update link available in the update wizard.
- # Only change this if you are providing localized release notes.
--app.update.url.details=http://www.seamonkey-project.org/releases/
-+app.update.url.details=about:
---- comm-release.orig/suite/locales/en-US/chrome/mailnews/region.properties	2012-02-16 11:59:54.000000000 -0200
-+++ comm-release/suite/locales/en-US/chrome/mailnews/region.properties	2012-05-12 04:28:05.202481512 -0300
-@@ -2,9 +2,9 @@
- # messenger.properties
- # mailnews.js
- mailnews.start_page.url=chrome://messenger/content/start.xhtml
--messenger.throbber.url=http://www.seamonkey-project.org/
--compose.throbber.url=http://www.seamonkey-project.org/
--addressbook.throbber.url=http://www.seamonkey-project.org/
-+messenger.throbber.url=about:
-+compose.throbber.url=about:
-+addressbook.throbber.url=about:
- # To make mapit buttons to disappear in the addressbook, specify empty string.  For example:
- # mail.addr_book.mapit_url.format=
- # The format for "mail.addr_book.mapit_url.format" is:
---- comm-release.orig/suite/locales/en-US/profile/bookmarks.extra	2012-02-16 11:59:54.000000000 -0200
-+++ comm-release/suite/locales/en-US/profile/bookmarks.extra	2012-05-12 04:34:50.172992393 -0300
-@@ -9,9 +9,7 @@
- 
-     <DT><H3>Search the Web</H3>
-     <DL><p>
--        <DT><A HREF="http://www.google.com/">Google</A>
--        <DT><A HREF="http://groups.google.com/">Google Groups</A>
--        <DT><A HREF="http://news.google.com/">Google News</A>
-+        <DT><A HREF="https://duckduckgo.com/html/">Duck Duck Go (HTML)</A>
-     </DL><p>
- 
- #unfilter emptyLines
---- comm-release.orig/suite/browser/browser-prefs.js	2012-10-17 11:29:38.687716662 -0200
-+++ comm-release/suite/browser/browser-prefs.js	2012-10-17 11:39:01.778002338 -0200
-@@ -110,7 +110,7 @@
- pref("browser.doorhanger.enabled", true);
- 
- // search engines URL
--pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search-engines/");
-+pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
- 
- // pointer to the default engine name
- pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties");
-@@ -587,10 +587,10 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);  // also toggles personalized recommendations
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/discovery/pane/%VERSION%/%OS%");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
- 
- // getMoreThemes is used by our UI under our switch theme menu
- pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties");
-@@ -715,7 +715,7 @@
- #endif
- 
- // plugin finder service url
--pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%");
-+pref("pfs.datasource.url", "http://www.gnu.org/software/gnuzilla/addons.html");
- pref("plugins.update.url", "http://www.mozilla.com/%LOCALE%/plugincheck/");
- pref("plugins.update.notifyUser", false);
- pref("plugins.hide_infobar_for_outdated_plugin", false);
---- comm-release.orig/suite/locales/en-US/chrome/branding/brand.dtd	2012-05-12 05:14:55.000000000 -0300
-+++ comm-release/suite/locales/en-US/chrome/branding/brand.dtd	2012-05-12 05:32:18.992033502 -0300
-@@ -1,4 +1,4 @@
- <!ENTITY  brandFullName         "Iceape">
- <!ENTITY  brandShortName        "Iceape">
--<!ENTITY  vendorShortName       "Debian">
-+<!ENTITY  vendorShortName       "Parabola">
- <!ENTITY  sidebarName           "Sidebar">
---- comm-release.orig/suite/locales/en-US/chrome/branding/brand.properties	2012-05-12 05:14:55.000000000 -0300
-+++ comm-release/suite/locales/en-US/chrome/branding/brand.properties	2012-05-12 05:36:38.640803397 -0300
-@@ -1,9 +1,9 @@
- brandFullName=Iceape
- brandShortName=Iceape
--vendorShortName=Debian
-+vendorShortName=Parabola
- sidebarName=Sidebar
--extensions.getMoreThemesURL=https://addons.mozilla.org/%LOCALE%/%APP%/themes
-+extensions.getMoreThemesURL=http://www.gnu.org/software/gnuzilla/addons.html#themes
- extensions.getPersonasURL=https://addons.mozilla.org/%LOCALE%/%APP%/personas
- spellchecker.dictionaries.download.url=https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries
--app.releaseNotesURL=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
--app.vendorURL=http://www.seamonkey-project.org/
-+app.releaseNotesURL=about:
-+app.vendorURL=about:
---- comm-release.orig/suite/locales/generic/profile/bookmarks.html.in	2012-02-16 11:59:54.000000000 -0200
-+++ comm-release/suite/locales/generic/profile/bookmarks.html.in	2012-05-12 04:40:19.221095752 -0300
-@@ -11,37 +11,14 @@
- <DL><p>
-     <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">@personal_toolbarfolder@</H3>
-     <DL><p>
--        <DT><A HREF="http://www.seamonkey-project.org/">@seamonkey@</a>
--        @seamonkey_l10n@
--        <DT><A HREF="http://www.mozilla.org/">@mozilla_org@</A>
--        <DT><A HREF="http://www.mozillazine.org/">@mozillazine@</A>
--        <DT><A HREF="http://www.mozdev.org/">@mozdev@</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="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A>
-+        <DT><A HREF="http://libreplanet.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC">LibrePlanet</A>
-     </DL><p>
--    <DT><H3>@seamonkey_and_mozilla@</H3>
-+    <DT><H3>GNUzilla</H3>
-     <DL><p>
--        <DT><A HREF="http://www.seamonkey-project.org/">@seamonkey_long@</a>
--        @seamonkey_l10n_long@
--        <DT><H3>@mozilla_org@</H3>
--        <DL><p>
--            <DT><A HREF="http://www.mozilla.org/">@mozilla_org_long@</A>
--            <DT><A HREF="http://www.mozilla.org/projects/">@mozilla_projects@</A>
--            <DT><A HREF="http://www.mozilla.org/about/">@mozilla_about@</A>
--        </DL><p>
--        <DT><H3>@extend_seamonkey@</H3>
--        <DL><p>
--            <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/">@seamonkey_addons@</a>
--            <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/themes">@seamonkey_themes@</a>
--            <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/dictionaries">@seamonkey_dictionaries@</a>
--            <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/plugins">@seamonkey_plugins@</a>
--            <DT><A HREF="http://www.mozdev.org/">@mozdev@</A>
--            <DT><A HREF="http://www.mozdev.org/projects/applications/SeaMonkey.html">@mozdev_seamonkey@</A>
--        </DL><p>
--        <DT><H3>@community_support@</H3>
--        <DL><p>
--            <DT><A HREF="http://www.seamonkey-project.org/community">@seamonkey_community@</a>
--            <DT><A HREF="http://www.mozillazine.org/">@mozillazine@</A>
--            <DT><A HREF="http://forums.mozillazine.org/viewforum.php?f=40">@seamonkey_support@</A>
--        </DL><p>
-+        <DT><A HREF="http://www.gnu.org/software/gnuzilla/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">GNUzilla and IceCat</a>
-+        <DT><a href="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</a>
-     </DL><p>
- #include bookmarks.extra
-     <HR>
diff --git a/libre/iceape-libre/mozconfig b/libre/iceape-libre/mozconfig
deleted file mode 100644
index 3093d20ee..000000000
--- a/libre/iceape-libre/mozconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-ac_add_options --enable-application=suite
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# Iceape
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=debian/branding
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-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 --with-pthreads
-
-# Features
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-installer
-
-export MOZILLA_OFFICIAL=1
-
-# Parabola features
-ac_add_options --disable-safe-browsing
diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD
deleted file mode 100644
index 1837c0119..000000000
--- a/libre/icecat-adblock-plus/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 94536 2013-07-26 13:15:58Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=firefox-adblock-plus
-pkgname=icecat-adblock-plus
-pkgver=2.3.1
-_addons_file=206960
-pkgrel=1
-pkgdesc="plugin for icecat which block ads and banners"
-arch=('any')
-url="http://adblockplus.org/"
-license=('GPL')
-depends=("icecat")
-provides=$_pkgname=$pkgver
-makedepends=('unzip')
-noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi")
-source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi)
-md5sums=('0ce162b71d2398b46f4e8cc4ddd64cbb')
-
-package() {
-#  _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1-2 -d.`
-#  depends=("icecat>=${_ffver}" "icecat<=${_ffver/0/99}")
-
-  cd $srcdir
-  [ $NOEXTRACT -eq 1 ] || unzip adblock_plus-$pkgver-fx+tb+fn+sm.xpi
-  local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf)
-  local dstdir=$pkgdir/usr/lib/icecat/browser/extensions/${emid}
-  [ -n ${emid} ] || return 1
-  install -d $dstdir
-#  sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>20.*</em:maxVersion>#' install.rdf
-  cp -R * $dstdir
-  rm $dstdir/*.xpi
-  find $pkgdir -type d -exec chmod 0755 {} \;
-  find $pkgdir -type f -exec chmod 0644 {} \;
-}
diff --git a/libre/icecat-l10n/Makefile b/libre/icecat-l10n/Makefile
deleted file mode 100644
index d1aaf7bff..000000000
--- a/libre/icecat-l10n/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/make -f
-# Use this script to update the PKGBUILD's list of langpacks.
-# This script depends on:
-#  - coreutils
-#  - grep
-#  - pacman
-#  - sed
-#  - wget
-
-# Variables:
-_pkgver=10.0
-pkgver=10.0
-pkgrel=1
-
-# Guts: ##############################################################
-
-default: PHONY all
-all: PHONY PKGBUILD
-
-index.html: Makefile
-	rm -f $@
-	wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/
-langpacks.txt: index.html Makefile
-	egrep -o '[^>".]+\.xpi' $< | sort -u | sed 's/\.xpi//' > $@
-PKGBUILD: PKGBUILD.in langpacks.txt Makefile
-	sed \
-	  -e 's/@_PKGVER@/$(_pkgver)/' \
-	  -e 's/@PKGVER@/$(pkgver)/' \
-	  -e 's/@PKGREL@/$(pkgrel)/' \
-	  -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \
-	  -e '/md5sums/,$$d' \
-	  PKGBUILD.in > $@
-	makepkg -dg >> $@
-
-clean: PHONY
-	rm -f index.html langpacks.txt *.xpi
-
-.PHONY: PHONY FORCE
diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD
deleted file mode 100644
index 939e07019..000000000
--- a/libre/icecat-l10n/PKGBUILD
+++ /dev/null
@@ -1,173 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: fauno <fauno@kiwwwi.com.ar>
-# Contributor: Figue <ffigue@gmail.com>
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Based on firefox-i18n package
-
-# When updating to a newer upstream release:
-# - Edit variables in in Makefile.
-# - (optionally) edit PKGBUILD.in
-# - Run 'make'. It will take care of everything else for you.
-
-_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=(
-  $(for lang in ${_langpacks[@]}
-  do echo icecat-l10n-$lang | tr A-Z a-z
-  done)
-)
-pkgver=24.0
-pkgrel=1
-pkgdesc='Language packs for GNU IceCat.'
-arch=(
-  any
-)
-license=(
-  MPL GPL
-)
-url=http://www.gnu.org/software/gnuzilla/
-depends=(
-  ${pkgbase%-l10n}=$pkgver
-)
-makedepends=(
-  unzip
-  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://mirror.lnx.im/icecat/langpacks/$pkgver/$lang.xpi)
-  done
-
-noextract=(
-  $(for lang in ${_langpacks[@]}
-  do echo $lang.xpi
-  done)
-)
-
-
-_path=/usr/lib/${pkgbase%-l10n}/browser/extensions/
-
-build() {
-  cd $srcdir
-
-  for i in ${_langpacks[@]}
-  do
-      cd $srcdir
-      unzip -q $i.xpi -d $i
-      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
-
-  cd $srcdir
-}
-
-for lang in ${_langpacks[@]}
-do
-    eval "
-package_icecat-l10n-$(echo $lang | tr A-Z a-z) () {
-  replaces=(icecat-i18n-$(echo $lang | tr A-Z a-z))
-  conflicts=(icecat-i18n-$(echo $lang | tr A-Z a-z))
-  provides=(icecat-i18n-$(echo $lang | tr A-Z a-z))
-  install -Dm644 \"\$srcdir/langpack-$lang@firefox.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@firefox.mozilla.org.xpi\"
-}
-"
-done
-
-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
deleted file mode 100644
index fe7f265ce..000000000
--- a/libre/icecat-l10n/region.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Default search engine
-browser.search.defaultenginename=DuckDuckGo HTML
-
-# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=DuckDuckGo HTML
-browser.search.order.2=DuckDuckGo Lite
-browser.search.order.3=Seeks Search
-
-# 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
-# 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
-
-# The default set of protocol handlers for irc:
-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:
-gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
-gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD
index 8e8908ce6..16579acdd 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 102928 2013-12-24 09:48:04Z spupykin $
+# $Id: PKGBUILD 104641 2014-01-24 07:00:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=firefox-noscript
 pkgname=icecat-noscript
-pkgver=2.6.8.8
+pkgver=2.6.8.13
 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=('55c2fe321a121b9708afb147d655adeb')
+md5sums=('75ec11cc5f3f039e81113abfb908110e')
 
 package() {
 #  _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
deleted file mode 100644
index 17a9da2b9..000000000
--- a/libre/icecat/PKGBUILD
+++ /dev/null
@@ -1,188 +0,0 @@
-# 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>
-# Contributor: Figue <ffigue at gmail>
-# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
-# Thank you very much to the older contributors:
-# Contributor: evr <evanroman at gmail>
-# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
-
-_pgo=false
-
-pkgname=icecat
-pkgver=24.0
-pkgrel=5
-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 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'
-            'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing'
-            'gstreamer0.10-good-plugins: webm and mp4 demuxing'
-            'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding'
-            'gstreamer0.10-ugly-plugins: h.264 and mp3 decoding'
-            'gstreamer0.10-ffmpeg: more decoders'
-            'libpulse: PulseAudio audio driver')
-url=http://www.gnu.org/software/gnuzilla/
-install=$pkgname.install
-source=(
-  ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::2}/$pkgname-$pkgver.tar.gz
-  mozconfig
-  mozconfig.pgo
-  libre.patch
-  $pkgname.desktop
-  $pkgname-safe.desktop
-  $pkgname-install-dir.patch
-  vendor.js
-  icecat-20.0.1-fixed-loading-icon.png
-)
-
-md5sums=(
-  0d3fdcec3f5fde494dedb595387e8f21
-  71dce16848bc51503a154841ce99427b
-  df08eaa1ac3bc6c2356be4fbf8ec8932
-  21b5014c55aa97983f833886e047f55c
-  b41f82994fa056ffa5f8e6d99570e27a
-  b30ba2b5562558d510fdd09d626d0faa
-  64826fcf48816b13090042eefddbaa58
-  1dfa11e781950a969205e83840e9741e
-  6e335a517c68488941340ee1c23f97b0
-)
-
-prepare() {
-  mv $pkgname-$pkgver $srcdir/gnuzilla-build
-  cd $srcdir/gnuzilla-build
-
-  cp $srcdir/mozconfig .mozconfig # Load our build config, disable SafeSearch
-
-  if $_pgo; then
-    cat $srcdir/mozconfig.pgo >> .mozconfig
-  fi
-
-  patch -Np1 -i $srcdir/$pkgname-install-dir.patch # install to /usr/lib/$pkgname
-
-  # Patch and remove anything that's left
-  patch -Np1 -i $srcdir/libre.patch
-  sed -i 's|Adobe Flash|SWF Player|g;
-         ' browser/base/content/pageinfo/permissions.js \
-           browser/base/content/browser-plugins.js
-  sed -i '\|URL of the GeoLocation backend|d;
-          \|geo[.]wifi[.]uri|d;
-         ' browser/app/profile/firefox.js
-
-  # Fix for use nspr, sqlite and nss external
-  sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
-    browser/installer/Makefile.in
-
-  # This is a bug, we should fix it
-  if [ $CARCH = mips64el ]; then
-      # Fix MIPS N32 support.
-      sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
-          js/src/assembler/wtf/Platform.h
-      # Disable JIT.
-      sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
-          js/src/assembler/wtf/Platform.h
-      sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in
-      echo 'ac_add_options --disable-methodjit' >> .mozconfig
-      echo 'ac_add_options --disable-tracejit' >> .mozconfig
-      echo 'ac_add_options --disable-jemalloc' >> .mozconfig
-  fi
-
-  # disable necko-wifi and wireless_tools in IceCat
-  #echo 'ac_add_options --disable-necko-wifi' >> .mozconfig
-
-  chmod +x build/unix/run-icecat.sh # fix bug for bad file permition
-
-  # Fix PRE_RELEASE_SUFFIX
-  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
-    browser/base/Makefile.in
-
-  mkdir "$srcdir/path"
-
-  # 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() {
-  cd $srcdir/gnuzilla-build
-
-  export PATH="$srcdir/path:$PATH"
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
-  export PYTHON="/usr/bin/python2"
-
-  if [[ $CARCH == i686 ]]; then
-    # Work around memory address space exhaustion during linking on i686
-    LDFLAGS+=' -Wl,--no-keep-memory'
-  fi
-
-  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
-}
-
-package() {
-  cd $srcdir/gnuzilla-build
-  make -j1 -f client.mk DESTDIR=$pkgdir install
-
-  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
-
-  brandingdir=browser/branding/unofficial
-  icondir=$pkgdir/usr/share/icons/hicolor
-  for i in 16x16 32x32 48x48; do
-    install -Dm644 $brandingdir/default${i/x*/}.png $icondir/$i/apps/$pkgname.png
-  done
-
-  for d in $pkgname $pkgname-safe; do
-    install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop
-  done
-
-  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
-
-  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}
-
-  # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $pkgname $pkgdir/usr/lib/$pkgname/$pkgname-bin
-}
diff --git a/libre/icecat/gcc47.patch b/libre/icecat/gcc47.patch
deleted file mode 100644
index 829d59510..000000000
--- a/libre/icecat/gcc47.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-
-# HG changeset patch
-# User Martin Stránský <stransky@redhat.com>
-# Date 1328886461 -3600
-# Node ID 87a5ed480992788832387ba91a77c69fbe9fe349
-# Parent  67017dd3b7f6650e6bcd5b6f545e0309e8de7049
-Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin
-
-diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc
---- a/ipc/chromium/src/base/file_util_linux.cc
-+++ b/ipc/chromium/src/base/file_util_linux.cc
-@@ -1,15 +1,18 @@
- // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
- #include "base/file_util.h"
-
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include <string>
- #include <vector>
-
- #include "base/eintr_wrapper.h"
- #include "base/file_path.h"
- #include "base/string_util.h"
-
-diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc
---- a/ipc/chromium/src/base/message_pump_libevent.cc
-+++ b/ipc/chromium/src/base/message_pump_libevent.cc
-@@ -1,16 +1,19 @@
- // Copyright (c) 2008 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
- #include "base/message_pump_libevent.h"
-
- #include <errno.h>
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include "eintr_wrapper.h"
- #include "base/logging.h"
- #include "base/scoped_nsautorelease_pool.h"
- #include "base/scoped_ptr.h"
- #include "base/time.h"
- #include "third_party/libevent/event.h"
-
-diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc
---- a/ipc/chromium/src/base/time_posix.cc
-+++ b/ipc/chromium/src/base/time_posix.cc
-@@ -8,16 +8,19 @@
- #include <mach/mach_time.h>
- #endif
- #include <sys/time.h>
- #ifdef ANDROID
- #include <time64.h>
- #else
- #include <time.h>
- #endif
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include <limits>
-
- #include "base/basictypes.h"
- #include "base/logging.h"
-
- namespace base {
diff --git a/libre/icecat/icecat-20.0.1-fixed-loading-icon.png b/libre/icecat/icecat-20.0.1-fixed-loading-icon.png
deleted file mode 100644
index 55f25e591..000000000
--- a/libre/icecat/icecat-20.0.1-fixed-loading-icon.png
+++ /dev/null
diff --git a/libre/icecat/icecat-install-dir.patch b/libre/icecat/icecat-install-dir.patch
deleted file mode 100644
index 7a72b9c9d..000000000
--- a/libre/icecat/icecat-install-dir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk
---- a/config/baseconfig.mk
-+++ b/config/baseconfig.mk
-@@ -1,9 +1,9 @@
- INCLUDED_AUTOCONF_MK = 1
- 
--includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+includedir := $(includedir)/$(MOZ_APP_NAME)
-+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- DIST = $(DEPTH)/dist
- 
- # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff -Nur a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk
---- a/js/src/config/baseconfig.mk
-+++ b/js/src/config/baseconfig.mk
-@@ -1,7 +1,7 @@
- INCLUDED_AUTOCONF_MK = 1
- 
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- 
- ifneq (,$(filter /%,$(TOP_DIST)))
- DIST = $(TOP_DIST)
diff --git a/libre/icecat/icecat-safe.desktop b/libre/icecat/icecat-safe.desktop
deleted file mode 100644
index e33d75469..000000000
--- a/libre/icecat/icecat-safe.desktop
+++ /dev/null
@@ -1,78 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/lib/icecat/icecat -safe-mode %u
-Icon=icecat
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=GNU IceCat - Safe Mode
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Прелистувач на Интернет 
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb 
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
-MimeType=text/html
-StartupNotify=false
-Categories=Application;Network;
diff --git a/libre/icecat/icecat.desktop b/libre/icecat/icecat.desktop
deleted file mode 100644
index 72666a5b8..000000000
--- a/libre/icecat/icecat.desktop
+++ /dev/null
@@ -1,78 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/lib/icecat/icecat %u
-Icon=icecat
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=GNU IceCat
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Прелистувач на Интернет 
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb 
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
-MimeType=text/html
-StartupNotify=false
-Categories=Application;Network;
diff --git a/libre/icecat/icecat.install b/libre/icecat/icecat.install
deleted file mode 100644
index c1fe8284a..000000000
--- a/libre/icecat/icecat.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
deleted file mode 100644
index c8a0a5f0d..000000000
--- a/libre/icecat/libre.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-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,17 +3,12 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- # Default search engine
--browser.search.defaultenginename=DuckDuckGo
-+browser.search.defaultenginename=DuckDuckGo HTML
- 
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=DuckDuckGo
--browser.search.order.2=Google
--browser.search.order.3=Yahoo
--
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
--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
- 
- # 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 
-@@ -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 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:
--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 --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
-@@ -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="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="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>
-+    </DL><p>
-+    <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3>
-+    <DL><p>
-+        <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A>
-+        <DT><A HREF="http://libreplanet.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC">LibrePlanet</A>
-+        <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</A>
-+        <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/libre/icecat/mozconfig b/libre/icecat/mozconfig
deleted file mode 100644
index 2f6d0757b..000000000
--- a/libre/icecat/mozconfig
+++ /dev/null
@@ -1,39 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# IceCat
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.gnuzilla
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-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-pixman
-
-# Features
-ac_add_options --enable-startup-notification
-ac_add_options --enable-pulseaudio
-
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-installer
-
-# Parabola features
-ac_add_options --disable-safe-browsing
-
-# Other
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo
deleted file mode 100644
index 71ba205a4..000000000
--- a/libre/icecat/mozconfig.pgo
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# PGO
-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
deleted file mode 100644
index 3d93cec01..000000000
--- a/libre/icecat/vendor.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default browser checking.
-pref("browser.shell.checkDefaultBrowser", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);
-
-// Disable Social API
-pref("social.remote-install.enabled", false);
diff --git a/libre/icecat/xulrunner-copy-stub.patch b/libre/icecat/xulrunner-copy-stub.patch
deleted file mode 100644
index 8ccf127df..000000000
--- a/libre/icecat/xulrunner-copy-stub.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/browser/app/Makefile.in
-+++ b/browser/app/Makefile.in
-@@ -233,7 +233,7 @@
- else
- ifdef LIBXUL_SDK
- libs::
--	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
-+	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX)
- endif
- endif
- 
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
deleted file mode 100644
index 423b11d2a..000000000
--- a/libre/icedove-l10n/PKGBUILD
+++ /dev/null
@@ -1,122 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-pkgbase=icedove-l10n
-epoch=1
-_pkgver=24.1.1
-pkgver=24.1.1.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)
-
-pkgname=($(for lang in ${_langpacks[@]}
-        do echo $pkgbase-$lang | tr A-Z a-z
-        done))
-
-pkgrel=1
-pkgdesc="Language packs for Debian Icedove."
-arch=('any')
-url="http://packages.debian.org/experimental/icedove"
-license=('MPL' 'GPL')
-depends=("icedove-libre>=$epoch:$pkgver")
-makedepends=('unzip' 'zip')
-_url=https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$_pkgver/linux-i686/xpi
-
-source=('brand.dtd' 'brand.properties')
-for lang in ${_langpacks[@]}
-do
-    source+=("icedove-l10n-$_pkgver-$lang.xpi::$_url/$lang.xpi")
-done
-
-# Don't extract anything
-noextract=(${source[@]##*/})
-
-_path="/usr/lib/icedove/extensions/"
-
-build() {
-  cd $srcdir
-
-  for i in ${_langpacks[@]}
-  do
-    cd $srcdir
-    unzip -q icedove-l10n-$_pkgver-$i.xpi -d $i
-    rm icedove-l10n-$_pkgver-$i.xpi
-    install -Dm644 $srcdir/brand.dtd $i/chrome/$i/locale/$i/branding
-    install -Dm644 $srcdir/brand.properties $i/chrome/$i/locale/$i/branding
-    sed -i -e 's/thunderbird/icedove/' $i/install.rdf
-    cd $i
-    zip -q -r langpack-$i@icedove.mozilla.org.xpi .
-    mv langpack-$i@icedove.mozilla.org.xpi $srcdir 
-  done
-
-  cd $srcdir
-}
-
-for lang in ${_langpacks[@]}
-do
-    eval "
-package_icedove-l10n-$(echo $lang | tr A-Z a-z)() {
-  replaces=(thunderbird-i18n-$(echo $lang | tr A-Z a-z) icedove-i18n-$(echo $lang | tr A-Z a-z))
-  conflicts=(thunderbird-i18n-$(echo $lang | tr A-Z a-z) icedove-i18n-$(echo $lang | tr A-Z a-z))
-  provides=(thunderbird-i18n-$(echo $lang | tr A-Z a-z) icedove-i18n-$(echo $lang | tr A-Z a-z))
-  install -Dm644 \"\$srcdir/langpack-$lang@icedove.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@icedove.mozilla.org.xpi\"
-}
-"
-done
-
-md5sums=('d5b2567a8cc8f64591f313a6efdaaffc'
-         'f3719964e893c1002b7a923e8f95f923'
-         '71b52e9b2ea4b2813579151107b26d7c'
-         '0001f92a0a732b2d8d4abe5b73739871'
-         '0ca3fd860debb0f4bea75c295cd794bf'
-         '3fa1b7e34efb29fcf12ff84c9b7cfb99'
-         '0d412e040d7db1bff6ba7a5901c194a3'
-         '196390a5683708ea9d1dff08d5da4969'
-         '1b580efd13589da4a7c700ce675b4de8'
-         '3f0b570ace30f4b8439328f63424914a'
-         '5d7890dce639c703319185dcca099c19'
-         '02352099e2bb79b9ed57b8b735d1b662'
-         '1b463b18db5640f9fb1fbb82f9862d51'
-         'f8053c0d509c95643be7c993f79469e8'
-         'c7286e9fb549480c7565947162473eb3'
-         'a180d36ebe0e04a452c452d8ca249936'
-         'faa9054e681927eec112b989b9b9f916'
-         'd5b4bbe5cd18b72b7d8c649b68a095bb'
-         '5fd037b2d60ff663eccbf0788a52cce7'
-         '824805de27a69e5323c6e547974c6c02'
-         '6a3e55d20d4945ead133054127b1ba17'
-         '81db405732d6b5e6fd057505be5b03c1'
-         '25338963e6cbf51ea9c18bc7bd786a44'
-         'bfc2a548805ba54bb81d8deaa5fcf406'
-         'da5d4edacaf56bbb015987b334c49a46'
-         '264aa5440cd50dd1d09b1f6c682dde95'
-         '1a671a227b2713f0d7ede3b8c547e003'
-         '4dfce580e8d6f889ef868cf1a85ddd89'
-         'cded11a2ee85f1bfa704a8bcfd7063ac'
-         'ca08979c98adc6b1c1086c1bf037d64a'
-         '6d433d1b6395957c9c16eb9efe79c461'
-         '412186cd09492af191ef5b8e5523997b'
-         '9f5f15ba89ed4a7dd82b973616a84fb1'
-         'ff817ed985260ba5b2284d70ede97cfc'
-         'c6474a9d0a49b177b8d1daca5e3faf54'
-         '81f1379b774a9762918b5bb6fd613a94'
-         'dfb5c1393033518e12ae9ff91afeed97'
-         '24383d610a424cc71c44b9fa923b9743'
-         'c5918f13d25dd124ed8050b7177a6adf'
-         '76ec5c28687220f39bac18fd2381ab29'
-         '03263f5ebc6e38022c808689ff0f848c'
-         'aaa66545fb46d23ea0b5537495b0c08e'
-         '5e105d2fd7ad811f3afbe375ab8ef293'
-         '955a91d8b73bd14f12afa4be13a45bca'
-         'dbd1a1b2ea0777d1df361f973d53c27e'
-         '03f0558bcbc1dafa4b29bcf1a69ca170'
-         'd1a58f928165c099c01b8687e92889af'
-         'a8b3385d0c7679b871cf9bcaf406ca26'
-         '2fbeac1775ab8ce9096ee14d628c68e8'
-         '450ac4b6e744b7ed8cd92e9852d0e80f'
-         '31c56ec4e6de175c75b60e421f1381fc'
-         '43d1335568bc7b6806ed5151e7b38243'
-         'eaece7103da2f8b19967d5f4b5e7befc'
-         '9b3abcfb1ccac0b863dcde99ab487d71'
-         '343fcfdec8f55f2e227bb5e1a5804907'
-         'ee9931bb007f935c0aaa16031c4319e7'
-         'ee92083eea883b10946cee46ac529d21')
diff --git a/libre/icedove-l10n/brand.dtd b/libre/icedove-l10n/brand.dtd
deleted file mode 100644
index 54fcfe419..000000000
--- a/libre/icedove-l10n/brand.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ENTITY  brandShortName        "Icedove">
-<!ENTITY  brandFullName         "Icedove">
-<!ENTITY  vendorShortName       "Mozilla">
-<!ENTITY  trademarkInfo.part1   " ">
diff --git a/libre/icedove-l10n/brand.properties b/libre/icedove-l10n/brand.properties
deleted file mode 100644
index 44bf191d6..000000000
--- a/libre/icedove-l10n/brand.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-brandShortName=Icedove
-brandFullName=Icedove
-vendorShortName=Mozilla
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
deleted file mode 100644
index b21733dd6..000000000
--- a/libre/icedove-libre/PKGBUILD
+++ /dev/null
@@ -1,132 +0,0 @@
-# Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@parabola.nu>
-
-# We're getting this from Debian Experimental
-_debname=icedove
-_debver=24.1.1
-_debrel=deb1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_pkgname=${_debname}
-pkgname=${_debname}-libre
-epoch=1
-pkgver=${_debver}.${_debrel}
-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/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' '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.xz"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
-        mozconfig
-        vendor.js
-        ${_pkgname}.desktop)
-options=(!emptydirs)
-md5sums=('91ddfb44481e6cb456d835a832d885c1'
-         '9f060324dbed3f8d27c896703bda6078'
-         'c46cf2a671c8fdefcabd4c87e38f3d40'
-         '5a53179d14ae9631b7afe5e4d0fc0b25'
-         'e785e0c267f4435ae1a9aa0b03bcacfb')
-
-prepare() {
-  export DEBIAN_BUILD="comm-esr24"
-
-  export QUILT_PATCHES=debian/patches
-  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
-  export QUILT_DIFF_ARGS='--no-timestamps'
-
-  mv debian "${srcdir}/${DEBIAN_BUILD}"
-  cd "${srcdir}/${DEBIAN_BUILD}"
-
-  mv debian/${_pkgname}-branding "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}"
-
-  cp -a debian/app-icons/${_pkgname}big.svg debian/app-icons/${_pkgname}_icon.svg
-  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
-      install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/mailicon${i/x*/}.png"
-  done
-  for i in 48x48 64x64; do
-      install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png"
-  done
-
-  # Fix orthographic issue ("Icdove" to "Icedove") in MOZ_APP_BASENAME line for confvars.sh.
-  sed -i 's|Icdove|Icedove|' debian/patches/debian-hacks/Icedove-branding.patch
-
-  quilt push -av
-
-  # Fix paths on makefile
-  sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/|topsrcdir = @top_srcdir@|;
-          s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|;
-          s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|;
-         ' mail/branding/icedove/Makefile.in
-
-  sed -i 's|topsrcdir      = [.][.]/[.][.]/[.][.]/[.][.]|topsrcdir      = @top_srcdir@|;
-          s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|;
-          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 -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/' mozilla/configure
-}
-
-build() {
-  export DEBIAN_BUILD="comm-esr24"
-
-  cd "${srcdir}/${DEBIAN_BUILD}"
-
-  export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}"
-  export PYTHON="/usr/bin/python2"
-
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
-}
-
-package() {
-  export DEBIAN_BUILD="comm-esr24"
-
-  cd "${srcdir}/${DEBIAN_BUILD}"
-
-  make -j1 -f client.mk DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/vendor.js"
-
-  for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do
-      install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png"
-  done
-  install -Dm644 "debian/app-icons/${_pkgname}_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
-  
-  install -Dm644 "${srcdir}/${_pkgname}.desktop" \
-      "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-  
-  rm -rf "${pkgdir}"/usr/lib/${_pkgname}/{dictionaries,hyphenation,searchplugins}
-  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/searchplugins "${pkgdir}/usr/lib/${_pkgname}/searchplugins"
-
-  # We don't want the development stuff
-  rm -r "${pkgdir}"/usr/{include,lib/${_pkgname}-devel,share/idl}
-}
diff --git a/libre/icedove-libre/icedove.desktop b/libre/icedove-libre/icedove.desktop
deleted file mode 100644
index ef2cd76e9..000000000
--- a/libre/icedove-libre/icedove.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Icedove
-Comment=Mail & News Reader
-GenericName=Mail Client & News Reader
-Exec=icedove %u
-TryExec=icedove
-Icon=icedove
-Terminal=false
-Type=Application
-Categories=Network;Email;
-MimeType=message/rfc822;x-scheme-handler/mailto;
-StartupNotify=true
diff --git a/libre/icedove-libre/mozconfig b/libre/icedove-libre/mozconfig
deleted file mode 100644
index 57c02368a..000000000
--- a/libre/icedove-libre/mozconfig
+++ /dev/null
@@ -1,46 +0,0 @@
-mk_add_options MOZ_CO_PROJECT=mail
-ac_add_options --enable-application=mail
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# Icedove
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=mail/branding/icedove
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-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-pixman
-ac_add_options --with-pthreads
-
-# Features
-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
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
-# Parabola features
-ac_add_options --disable-safe-browsing
diff --git a/libre/icedove-libre/vendor.js b/libre/icedove-libre/vendor.js
deleted file mode 100644
index 170b505a8..000000000
--- a/libre/icedove-libre/vendor.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default mailer checking.
-pref("mail.shell.checkDefaultMail", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);
diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD
deleted file mode 100644
index b3c11d563..000000000
--- a/libre/iceweasel-adblock-plus/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 94536 2013-07-26 13:15:58Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=firefox-adblock-plus
-pkgname=iceweasel-adblock-plus
-pkgver=2.3.1
-_addons_file=206960
-pkgrel=1
-pkgdesc="plugin for iceweasel which block ads and banners"
-arch=('any')
-url="http://adblockplus.org/"
-license=('GPL')
-depends=("iceweasel-libre")
-provides=$_pkgname=$pkgver
-makedepends=('unzip')
-noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi")
-source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi)
-md5sums=('0ce162b71d2398b46f4e8cc4ddd64cbb')
-
-package() {
-#  _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1-2 -d.`
-#  depends=("iceweasel-libre>=${_ffver}" "iceweasel-libre<=${_ffver/0/99}")
-
-  cd $srcdir
-  [ $NOEXTRACT -eq 1 ] || unzip adblock_plus-$pkgver-fx+tb+fn+sm.xpi
-  local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf)
-  local dstdir=$pkgdir/usr/lib/iceweasel/browser/extensions/${emid}
-  [ -n ${emid} ] || return 1
-  install -d $dstdir
-#  sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>20.*</em:maxVersion>#' install.rdf
-  cp -R * $dstdir
-  rm $dstdir/*.xpi
-  find $pkgdir -type d -exec chmod 0755 {} \;
-  find $pkgdir -type f -exec chmod 0644 {} \;
-}
diff --git a/libre/iceweasel-l10n/Makefile b/libre/iceweasel-l10n/Makefile
deleted file mode 100644
index d596111f3..000000000
--- a/libre/iceweasel-l10n/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/make -f
-# Use this script to update the PKGBUILD's list of langpacks.
-# This script depends on:
-#  - coreutils
-#  - pacman
-#  - sed
-
-# Variables:
-# This is to get it from Debian Sid
-debname=iceweasel-l10n
-debver=9.0+debian
-debrel=1
-debrepo=http://ftp.debian.org/debian/pool/main/
-
-pkgver=9.0
-pkgrel=2.1
-
-# Guts: ##############################################################
-
-default: PHONY all
-all: PHONY
-	$(MAKE) clean
-	$(MAKE) PKGBUILD
-.PRECIOUS: PKGBUILD
-
-PKGBUILD.list: Makefile
-	sed \
-	  -e 's/@DEBNAME@/$(debname)/' \
-	  -e 's/@DEBVER@/$(debver)/' \
-	  -e 's/@DEBREL@/$(debrel)/' \
-	  -e 's%@DEBREPO@%$(debrepo)%' \
-	  -e 's/@PKGVER@/$(pkgver)/' \
-	  -e 's/@PKGREL@/$(pkgrel)/' \
-	  -e "s/@LANGPACKS@/(phony)/" \
-	  -e '/CUT HERE/,$$d' \
-	  PKGBUILD.in > $@
-	echo 'package() { exit 0; }' >> $@
-	makepkg -gp $@ >> $@
-langpacks.txt: PKGBUILD.list Makefile
-	makepkg -dp $<
-	ls src/*/upstream | sed 's/\.xpi//' > $@
-PKGBUILD: PKGBUILD.in langpacks.txt Makefile
-	sed \
-	  -e 's/@DEBNAME@/$(debname)/' \
-	  -e 's/@DEBVER@/$(debver)/' \
-	  -e 's/@DEBREL@/$(debrel)/' \
-	  -e 's%@DEBREPO@%$(debrepo)%' \
-	  -e 's/@PKGVER@/$(pkgver)/' \
-	  -e 's/@PKGREL@/$(pkgrel)/' \
-	  -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \
-	  -e '/CUT HERE/d' \
-	  -e '/md5sums/,$$d' \
-	  PKGBUILD.in > $@
-	makepkg -dg >> $@
-
-clean: PHONY
-	rm -f PKGBUILD.list langpacks.txt
-
-.PHONY: PHONY FORCE
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
deleted file mode 100644
index 0f3cb050a..000000000
--- a/libre/iceweasel-l10n/PKGBUILD
+++ /dev/null
@@ -1,166 +0,0 @@
-# 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>
-# Contributor: Figue <ffigue@gmail.com>
-# Based on icecat-i18n package, which is in turn based on firefox-i18n
-
-# When updating to a newer upstream release:
-# - Edit variables in in Makefile.
-# - (optionally) edit PKGBUILD.in
-# - Run 'make'. It will take care of everything else for you.
-
-_debname=iceweasel
-_debver=26.0
-_debrel=deb1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_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=iceweasel-l10n
-pkgname=($(for lang in ${_langpacks[@]}
-        do echo $pkgbase-$lang | tr A-Z a-z
-        done))
-epoch=1
-pkgver=$_debver.$_debrel
-pkgrel=1
-
-pkgdesc="Language packs for Debian Iceweasel."
-arch=('any')
-url="http://packages.debian.org/experimental/iceweasel"
-license=('MPL' 'GPL')
-depends=("iceweasel-libre>=$epoch:$pkgver")
-makedepends=('unzip' 'zip')
-source=('region.properties')
-for lang in ${_langpacks[@]}
-do
-    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel#deb}_all.deb")
-done
-
-_path="/usr/lib/iceweasel/browser/extensions/"
-
-build() {
-  cd "${srcdir}"
-  for f in *.deb
-  do
-      bsdtar xf $f
-      bsdtar xf data.tar.xz
-  done
-
-  cd $srcdir/$_path
-
-  for i in ${_langpacks[@]}
-  do
-    cd $srcdir/$_path
-    unzip -q langpack-$i@iceweasel.mozilla.org.xpi -d $i
-    rm langpack-$i@iceweasel.mozilla.org.xpi
-    install -Dm644 $srcdir/region.properties $i/browser/chrome/$i/locale/browser-region
-    cd $i
-    zip -q -r $srcdir/$_path/langpack-$i@iceweasel.mozilla.org.xpi .
-  done
-
-  cd $srcdir
-}
-
-for lang in ${_langpacks[@]}
-do
-    eval "
-package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
-  replaces=(firefox-i18n-$(echo $lang | tr A-Z a-z) iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
-  conflicts=(firefox-i18n-$(echo $lang | tr A-Z a-z) iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
-  provides=(firefox-i18n-$(echo $lang | tr A-Z a-z) iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
-  install -Dm644 \"\$srcdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\"
-}
-"
-done
-
-md5sums=('a4593936bf1c7a9ec9368ff249f9cc56'
-         '1034ab86bc45115f9ef614b85cfcdc19'
-         '4c34d69b741bf1f33648b77c3322b2da'
-         'aacb59b72dd27ed06881cd01d81fa3a6'
-         'e64213a5fb34e8d53f13200f7b729c82'
-         '0a92bec210e3f8aff64a81fda8780cf3'
-         'd0f290128bbf2a4383e982bf4e686b96'
-         '3f008ae077bc54cb948cc6a08a78a0f6'
-         '84fde08dd4da53def0491960a908f9ff'
-         '2494d4cba834bf49d2e8f0ac6e86dec0'
-         '328c526e9c41f32c5df0916d8633b8e7'
-         '6bbd86c0180764b59e9762f7b33d5db3'
-         'd4c2de19670d608f16158908ae980e0d'
-         '36c76ce311208ad2fcc19a06f02c4d52'
-         '1de6bdd14302fff21d62472bf172e5bf'
-         '8aceec26df106e67c4f19589fcef7588'
-         'edd2c8f8c3f6df1cc819cf8542b76196'
-         '89b3ab8adace5efd25a92a091e3f6bac'
-         'fefbecae93e912447a8119115930f7d5'
-         '236f1fc25ff6e104ca61bcb48342710f'
-         '7a839afc851fcb2e3e630090586245ca'
-         '12fea0abba7caf75da8ba7bcab99728a'
-         '4779ce690c5f45c138ec36fff6360bed'
-         'e3b767cfb3318fc85b96d894ed4cdec5'
-         '2a2d96b793f652520de146f9dc24755c'
-         '17120e297fc252e97e0abd3ff1c2a10b'
-         '2259d8189d34915f32ab31b4d53d6e87'
-         'b7aa28e93264aea26595fd98d7982abe'
-         '01873dd70986ca857cf5e00b85a22adf'
-         '2f88825d3925eb1bb21a0ad092308edd'
-         '485e799de41f283c937cf6055e2f5523'
-         'f19e860a2d5435ee61d48ed328494212'
-         'd64ac8e776f808d61d2c2c4678124294'
-         '74b6666fabaa8e270356eaa7a78b371c'
-         '36304846e8a1ae604b29bdfb6b0c12ba'
-         '0cdfde7a083cca4308bd23f7203bbe7b'
-         '74a2103823f0f9a6b0bc614bd46272ca'
-         'e088239e0f15ad5d23099ab2cad19d92'
-         '16b9e9814f154ffddd8d9612bdf9f8d8'
-         '6a2aca46eabd374d80106328fea6e340'
-         'f680470cc3d6fc87276a9b17d6841ae2'
-         '6964eef1fd96fa810de34f32844f31fc'
-         '223e82aa9efb2376f44b7601e3ddbeae'
-         'd821062dd74179309981c18542412e2e'
-         '7128e964f3d01da8967c5e57b2d76b93'
-         '2cc4b1a603c29450d19dd98c15093fec'
-         '595e155b3d15432d5de2c5962feea581'
-         '9110dc57eff2d7cab6d7eeeb11f8e98c'
-         '0503d87f660e9e86be6a3c32ed73e65c'
-         'e19e8f1702232f5d77ec0624071ccd7d'
-         '5618dcfcc50831b8efccd0c0c093dfc2'
-         '1020905e47d89bf40545a3bbdf52951b'
-         '6d187dc8a4ac042e7c871134ca86b2c0'
-         '36d5a7066f518c7db7464320e2b86fc8'
-         '9654556b5c1a74a4ffe21091edbe26df'
-         'd5e6d93aa7f35e052a24b612730a70ba'
-         'b5f0df97c10290c555f3002655f5bfe6'
-         'f1f4d8897422ed5328e1b2325a1f1198'
-         '3bfa9cbe5abd0ea40c70e16cd2f5c24c'
-         'f27983d5cf79aa478409c33dae988ce2'
-         'cbf40cf391dd5bbac1665a8180f81620'
-         '69ffe26a603ddc25bc7d9e56a70b6399'
-         '90d6449031ae5e06acd8cffdb0d01e05'
-         '326ad24d994971a2405dcb1532cce6bf'
-         '5ced14adbdddd81bda4a9cd2ddd92ee4'
-         'b86565c39ef253d51a39bc851e7b354d'
-         '915f6058a855a59cddeb027d2a518dce'
-         '58f8bfcd609626a2a76ff22206e2033f'
-         '9b0be982d506f060319bd3c41aee0896'
-         '65cd9c3cf11f1937be0a1dc0802f3d1a'
-         '454413e97a0d19ba018ebc60e2502d2b'
-         '45b8f8cdb117eca4eaaa1d6b449569f5'
-         'f10ef03517f558c15fca7db4d9e50ad1'
-         '5a3465027d47bd30da6a77f92e94fd08'
-         '56ecb69e73f7d3447019e6f3b23aebba'
-         'c02e08ff0732233738fe3af877513a34'
-         '3a4fbbfeb24cff45933c53dac27d6fdc'
-         'a2245eca0bca1d615e031e82734b8e43'
-         '62f4ea1010191b721aa8b2d6130a3c1e'
-         '45bd1ab2f164630366ce6004d0070f55'
-         '1cce5000ad1146b1cfc5ff9cd5db175b'
-         'b9283671cf87329296b62f529e8e7709'
-         '17fa69f4617ce5706fe11c54d5a737a8'
-         'cfd0b7b1215f13cfcd8eb1d0ab335aa4'
-         '6ec5cd2855ae69f8998de2305109bd91'
-         '4b121cb7694f5962c99c479a26442905'
-         '6aa873082d24918f489431be9be7300a'
-         'f36aafb79f6120698f9b890c52dbd301'
-         'ff581801e9a9663e4562a5d28d4cbe2d')
diff --git a/libre/iceweasel-l10n/region.properties b/libre/iceweasel-l10n/region.properties
deleted file mode 100644
index 5654eb9ee..000000000
--- a/libre/iceweasel-l10n/region.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Default search engine
-browser.search.defaultenginename=DuckDuckGo HTML
-
-# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=DuckDuckGo HTML
-browser.search.order.2=DuckDuckGo Lite
-browser.search.order.3=Seeks Search
-
-# 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
-# means that it's not possible to update the name of existing handler, so 
-# don't make any spelling errors here.
-gecko.handlerService.defaultHandlersVersion=4
-
-# The default set of protocol handlers for irc:
-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:
-gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
-gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
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
deleted file mode 100644
index c9df18dc4..000000000
--- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-From: Mike Hommey <mh@glandium.org>

-Date: Tue, 5 Jun 2012 08:57:06 +0200

-Subject: Bug 756390 - Make the "Reset Firefox" feature more generic

-

-diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js

-index 91c5c1c..2f8bd1a 100644

---- a/browser/components/migration/content/migration.js

-+++ b/browser/components/migration/content/migration.js

-@@ -249,7 +249,7 @@ var MigrationWizard = {

-     }

- 

-     var brandBundle = document.getElementById("brandBundle");

--    // These strings don't exist when not using official branding. If that's

-+    // These strings may not exist when not using official branding. If that's

-     // the case, just skip this page.

-     try {

-       var pageTitle = brandBundle.getString("homePageMigrationPageTitle");

-@@ -281,8 +281,8 @@ var MigrationWizard = {

-       case "chrome":

-         source = "sourceNameChrome";

-         break;

--      case "firefox":

--        source = "sourceNameFirefox";

-+      case "self":

-+        source = "brand";

-         break;

-     }

- 

-@@ -292,7 +292,12 @@ var MigrationWizard = {

-     var oldHomePageURL = this._migrator.sourceHomePageURL;

- 

-     if (oldHomePageURL && source) {

--      var appName = MigrationUtils.getLocalizedString(source);

-+      var appName;

-+      if (source == "brand") {

-+        appName = brandBundle.GetStringFromName("brandFullName");

-+      } else {

-+        appName = MigrationUtils.getLocalizedString(source);

-+      }

-       var oldHomePageLabel =

-         brandBundle.getFormattedString("homePageImport", [appName]);

-       var oldHomePage = document.getElementById("oldHomePage");

-diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul

-index f030756..23e37ff 100644

---- a/browser/components/migration/content/migration.xul

-+++ b/browser/components/migration/content/migration.xul

-@@ -42,7 +42,7 @@

- #elifdef XP_UNIX

-       <radio id="chrome"    label="&importFromChrome.label;"    accesskey="&importFromChrome.accesskey;"/>

- #endif

--      <radio id="firefox"   label="&importFromFirefox.label;"   accesskey="&importFromFirefox.accesskey;"/>

-+      <radio id="self"      hidden="true"/>

-       <radio id="nothing"   label="&importFromNothing.label;"   accesskey="&importFromNothing.accesskey;" hidden="true"/>

-     </radiogroup>

-     <label id="noSources" hidden="true">&noMigrationSources.label;</label>

-diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest

-index d7fec75..d531b83 100644

---- a/browser/components/migration/src/BrowserProfileMigrators.manifest

-+++ b/browser/components/migration/src/BrowserProfileMigrators.manifest

-@@ -3,7 +3,7 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737

- component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js

- contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}

- component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js

--contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}

-+contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}

- #ifdef HAS_IE_MIGRATOR

- 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 3db6720..a3b3dda 100644

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

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

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

- 

- 

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

--FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=firefox";

-+FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";

- FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");

- 

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

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

-index 2c91e9a..08962c4 100644

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

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

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

-    * @see nsIStringBundle

-    */

-   getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {

--    const OVERRIDES = {

--      "4_firefox": "4_firefox_history_and_bookmarks",

--      "64_firefox": "64_firefox_other"

--    };

--    aKey = OVERRIDES[aKey] || aKey;

--

-     if (aReplacements === undefined)

-       return getMigrationBundle().GetStringFromName(aKey);

-     return getMigrationBundle().formatStringFromName(

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

-   },

- 

-   /**

-+   * Returns whether a given migration type is supported.

-+   *

-+   * @param  aKey   Migrator key

-+   * @returns whether the migrator key is supported.

-+   */

-+  canMigrate:

-+  function MU_canMigrate(aMigratorKey) {

-+    return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;

-+  },

-+

-+  /**

-    * Cleans up references to migrators and nsIProfileInstance instances.

-    */

-   finishMigration: function MU_finishMigration() {

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

-index f67823b..36016b8 100644

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

-+++ b/browser/components/migration/src/ProfileMigrator.js

-@@ -12,6 +12,7 @@ function ProfileMigrator() {

- 

- ProfileMigrator.prototype = {

-   migrate: MigrationUtils.startupMigration.bind(MigrationUtils),

-+  canMigrate: MigrationUtils.canMigrate.bind(MigrationUtils),

-   QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIProfileMigrator]),

-   classDescription: "Profile Migrator",

-   contractID: "@mozilla.org/toolkit/profile-migrator;1",

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

-index 21cf405..f3c1a6b 100644

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

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

-@@ -17,8 +17,6 @@

- <!ENTITY importFromSafari.accesskey     "S">

- <!ENTITY importFromChrome.label         "Chrome">

- <!ENTITY importFromChrome.accesskey     "C">

--<!ENTITY importFromFirefox.label        "Firefox">

--<!ENTITY importFromFirefox.accesskey    "X">

- 

- <!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 094a9dc..a620905 100644

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

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

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

- 2_ie=Cookies

- 2_safari=Cookies

- 2_chrome=Cookies

--2_firefox=Cookies

-+2_self=Cookies

- 

- 4_ie=Browsing History

- 4_safari=Browsing History

- 4_chrome=Browsing History

--4_firefox_history_and_bookmarks=Browsing History and Bookmarks

-+4_self=Browsing History and Bookmarks

- 

- 8_ie=Saved Form History

- 8_safari=Saved Form History

- 8_chrome=Saved Form History

--8_firefox=Saved Form History

-+8_self=Saved Form History

- 

- 16_ie=Saved Passwords

- 16_safari=Saved Passwords

- 16_chrome=Saved Passwords

--16_firefox=Saved Passwords

-+16_self=Saved Passwords

- 

--32_ie=Favorites

-+32_ie=Favourites

- 32_safari=Bookmarks

- 32_chrome=Bookmarks

- 

- 64_ie=Other Data

- 64_safari=Other Data

- 64_chrome=Other Data

--64_firefox_other=Other Data

-+64_self=Other Data

- 

--128_firefox=Windows and Tabs

-+128_self=Windows and Tabs

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

-index d46b43b..2253994 100644

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

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

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

-   populateResetPane("migratedItems");

- }

- 

-+<<<<<<< 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);

-+  }

-+  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.

-+      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

-+++ b/toolkit/profile/nsIProfileMigrator.idl

-@@ -37,7 +37,7 @@ interface nsIProfileStartup : nsISupports

-  * @client   Toolkit (Startup code)

-  * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1")

-  */

--[scriptable, uuid(3df284a5-2258-4d46-a664-761ecdc04c22)]

-+[scriptable, uuid(96d9ab66-082c-4a9e-82ad-f8c21b391342)]

- interface nsIProfileMigrator : nsISupports 

- {

-   /**

-@@ -60,6 +60,14 @@ interface nsIProfileMigrator : nsISupports

-    * @note The startup code ignores COM exceptions thrown from this method.

-    */

-   void migrate(in nsIProfileStartup aStartup, in ACString aKey);

-+

-+  /**

-+   * Returns whether a given migration type is supported.

-+   *

-+   * @param  aKey   Migrator key

-+   * @returns whether the migrator key is supported.

-+   */

-+  bool canMigrate(in ACString aKey);

- };

- 

- %{C++

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

-index 42fbd15..6c3dbfe 100644

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

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

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

-         if (gDoProfileReset) {

-           // Automatically migrate from the current application if we just

-           // reset the profile.

--          aKey = MOZ_APP_NAME;

-+          aKey = "self";

-         }

-         pm->Migrate(&mDirProvider, aKey);

-       }

diff --git a/libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch b/libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch
deleted file mode 100644
index c7c4c355b..000000000
--- a/libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From: Mike Hommey <mh@glandium.org>
-Date: Sat, 16 Nov 2013 13:01:17 +0900
-Subject: Fixup "Reset Firefox" after bad merge
-
----
- toolkit/content/resetProfile.js  | 52 ----------------------------------------
- toolkit/modules/ResetProfile.jsm | 11 +++++----
- 2 files changed, 6 insertions(+), 57 deletions(-)
-
-diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
-index 2253994..d46b43b 100644
---- a/toolkit/content/resetProfile.js
-+++ b/toolkit/content/resetProfile.js
-@@ -28,58 +28,6 @@ function onResetProfileLoad() {
-   populateResetPane("migratedItems");
- }
- 
--<<<<<<< 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);
--  }
--  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.
--      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/modules/ResetProfile.jsm b/toolkit/modules/ResetProfile.jsm
-index db57f2a..d618d08 100644
---- a/toolkit/modules/ResetProfile.jsm
-+++ b/toolkit/modules/ResetProfile.jsm
-@@ -7,8 +7,6 @@
- this.EXPORTED_SYMBOLS = ["ResetProfile"];
- 
- const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
--#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
--#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
- 
- Cu.import("resource://gre/modules/Services.jsm");
- 
-@@ -25,8 +23,11 @@ this.ResetProfile = {
- 
-     // 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);
-+      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);
-@@ -50,7 +51,7 @@ this.ResetProfile = {
-     let dataTypes = [];
-     for (let itemID of MIGRATED_TYPES) {
-       try {
--        let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME);
-+        let typeName = MigrationUtils.getLocalizedString(itemID + "_self");
-         dataTypes.push(typeName);
-       } catch (x) {
-         // Catch exceptions when the string for a data type doesn't exist.
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
deleted file mode 100644
index ad6233f39..000000000
--- a/libre/iceweasel-libre/PKGBUILD
+++ /dev/null
@@ -1,240 +0,0 @@
-# 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>
-# Contributor: Figue <ffigue at gmail>
-# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
-# Thank you very much to the older contributors:
-# Contributor: evr <evanroman at gmail>
-# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
-
-_pgo=true
-
-# We're getting this from Debian Experimental
-_debname=iceweasel
-_debver=26.0
-_debrel=deb1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_pkgname=iceweasel
-pkgname=iceweasel-libre
-epoch=1
-pkgver=$_debver.$_debrel
-pkgrel=2
-
-pkgdesc="A libre version of Debian Iceweasel, 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 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 quilt unzip zip)
-[ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
-options=(!emptydirs !makeflags)
-if $_pgo; then
-  makedepends+=(xorg-server-xvfb)
-  options+=(!ccache)
-fi
-optdepends=('networkmanager: Location detection via available WiFi networks'
-            'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing'
-            'gstreamer0.10-good-plugins: webm and mp4 demuxing'
-            'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding'
-            'gstreamer0.10-ugly-plugins: h.264 and mp3 decoding'
-            'gstreamer0.10-ffmpeg: more decoders'
-            'libpulse: PulseAudio audio driver')
-url="http://packages.debian.org/experimental/${_pkgname}"
-install=iceweasel.install
-replaces=('firefox')
-conflicts=('firefox')
-provides=('firefox')
-source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
-        "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.gz"
-        mozconfig
-        mozconfig.pgo
-        libre.patch
-        gnu_headshadow.png
-        iceweasel.desktop
-        iceweasel-install-dir.patch
-        vendor.js
-        iceweasel-20.0.1-fixed-loading-icon.png
-        Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
-        Fixup-Reset-Firefox-after-bad-merge.patch)
-md5sums=('219cf21e0642e8a364365286f23d0624'
-         '2001d0477bcefd0eeaab584402133691'
-         '023120a970670dc85cea19393f0b94b6'
-         'df08eaa1ac3bc6c2356be4fbf8ec8932'
-         'fea121a94737ec8641b39e7120a048d3'
-         'b03a979a78484503ba8dddad4f2c96d1'
-         '7b9e5996dd9fe0b186a43a297db1c6b5'
-         '6620e724ec9a1be74e65089d81d802f7'
-         '816013881cfc9a1f4f0ede72b014f8b3'
-         '6e335a517c68488941340ee1c23f97b0'
-         'dbf1c021e5f7ac323197b219bf213c50'
-         '8e165ef85ddd72491f0b48f8954afca6')
-
-prepare() {
-  export DEBIAN_BUILD="mozilla-release"
-
-  export QUILT_PATCHES=debian/patches
-  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
-  export QUILT_DIFF_ARGS='--no-timestamps'
-
-  mv debian "$srcdir/$DEBIAN_BUILD"
-  cd "$srcdir/$DEBIAN_BUILD"
-
-  # Doesn't apply and seems unimportant
-  rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
-
-  # Doesn't works in some parts due it has patches for others locales languages, source code hasn't it
-  rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true
-
-  # It needs to be patched after Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
-  rm -v debian/patches/debian-hacks/Fixup-Reset-Firefox-after-bad-merge.patch || true
-
-  quilt push -av
-
-  install -m644 "$srcdir/gnu_headshadow.png" browser/base/content/abouthome # Put gnu_headshadow.png on the source code
-
-  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/Fixup-Reset-Firefox-after-bad-merge.patch"
-  patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
-
-  # Patch and remove anything that's left
-  patch -Np1 -i "$srcdir/libre.patch"
-  sed -i 's|Adobe Flash|SWF Player|g;
-         ' browser/base/content/pageinfo/permissions.js \
-           browser/base/content/browser-plugins.js
-  sed -i '\|URL of the GeoLocation backend|d;
-          \|geo[.]wifi[.]uri|d;
-         ' browser/app/profile/firefox.js \
-           browser/metro/profile/metro.js
-  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
-
-  if $_pgo; then
-    cat "$srcdir/mozconfig.pgo" >> .mozconfig
-  fi
-
-  # From js on abslibre-mips64el.git
-  if [ "$CARCH" = "mips64el" ]; then
-      msg "Force disabling JIT."
-      sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
-          js/src/assembler/wtf/Platform.h
-      sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.{in,ref}
-
-      echo "ac_add_options --disable-methodjit" >> .mozconfig
-      echo "ac_add_options --disable-tracejit" >> .mozconfig
-  fi
-
-  # This is a bug, we should fix it
-  if [ "$CARCH" = "mips64el" ]; then
-      # Fix MIPS N32 support.
-      sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
-          js/src/assembler/wtf/Platform.h
-      # Disable JIT.
-      sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
-          js/src/assembler/wtf/Platform.h
-      sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in
-      echo 'ac_add_options --disable-methodjit' >> .mozconfig
-      echo 'ac_add_options --disable-tracejit' >> .mozconfig
-      echo 'ac_add_options --disable-jemalloc' >> .mozconfig
-  fi
-
-  # Fix PRE_RELEASE_SUFFIX
-  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
-    browser/base/Makefile.in
-
-  mkdir "$srcdir/path"
-
-  # 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/iceweasel-20.0.1-fixed-loading-icon.png" \
-    browser/themes/linux/tabbrowser/loading.png
-}
-
-build() {
-  export DEBIAN_BUILD="mozilla-release"
-
-  cd "$srcdir/$DEBIAN_BUILD"
-
-  export PATH="$srcdir/path:$PATH"
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
-  export PYTHON="/usr/bin/python2"
-
-  if [[ $CARCH == i686 ]]; then
-    # Work around memory address space exhaustion during linking on i686
-    LDFLAGS+=' -Wl,--no-keep-memory'
-  fi
-
-  if $_pgo; 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
-}
-
-package() {
-  export DEBIAN_BUILD="mozilla-release"
-
-  cd "$srcdir/$DEBIAN_BUILD"
-  make -f client.mk DESTDIR="$pkgdir" install
-
-  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$_pkgname/browser/defaults/preferences/vendor.js"
-
-  # I don't even know why we're hitting the objdir, and ConnOS didn't
-  _brandingdir=debian/branding
-  brandingdir=moz-objdir/$_brandingdir
-  icondir="$pkgdir/usr/share/icons/hicolor"
-  for i in 16x16 32x32 48x48 64x64; do
-    install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png"
-  done
-  install -Dm644 "$brandingdir/mozicon128.png"      "$icondir/128x128/apps/$_pkgname.png"
-  install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg"
-
-  install -d                                        "$pkgdir/usr/share/applications"
-  install -m644  "$srcdir/iceweasel.desktop"        "$pkgdir/usr/share/applications"
-
-  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"
-
-  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}
-
-  # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
-}
diff --git a/libre/iceweasel-libre/gnu_headshadow.png b/libre/iceweasel-libre/gnu_headshadow.png
deleted file mode 100644
index e0f73a3bf..000000000
--- a/libre/iceweasel-libre/gnu_headshadow.png
+++ /dev/null
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
deleted file mode 100644
index 55f25e591..000000000
--- a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png
+++ /dev/null
diff --git a/libre/iceweasel-libre/iceweasel-install-dir.patch b/libre/iceweasel-libre/iceweasel-install-dir.patch
deleted file mode 100644
index 3938c0b3e..000000000
--- a/libre/iceweasel-libre/iceweasel-install-dir.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/config/baseconfig.mk b/config/baseconfig.mk
-index 9c70e24..eff0fd2 100644
---- a/config/baseconfig.mk
-+++ b/config/baseconfig.mk
-@@ -1,8 +1,8 @@
- MOZ_APP_BASE_VERSION = $(firstword $(subst ., ,$(MOZ_APP_VERSION))).$(word 2,$(subst ., ,$(MOZ_APP_VERSION)))
--includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION)
-+includedir := $(includedir)/$(MOZ_APP_NAME)
-+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- DIST = $(DEPTH)/dist
- 
- # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff --git a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk
-index 1ff076c..5386569 100644
---- a/js/src/config/baseconfig.mk
-+++ b/js/src/config/baseconfig.mk
-@@ -1,5 +1,5 @@
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- 
- ifneq (,$(filter /%,$(TOP_DIST)))
- DIST = $(TOP_DIST)
diff --git a/libre/iceweasel-libre/iceweasel.desktop b/libre/iceweasel-libre/iceweasel.desktop
deleted file mode 100644
index c4a338cc6..000000000
--- a/libre/iceweasel-libre/iceweasel.desktop
+++ /dev/null
@@ -1,105 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Iceweasel
-Name[bg]=Iceweasel
-Name[ca]=Iceweasel
-Name[cs]=Iceweasel
-Name[el]=Iceweasel
-Name[es]=Iceweasel
-Name[fa]=Iceweasel
-Name[fi]=Iceweasel
-Name[fr]=Iceweasel
-Name[hu]=Iceweasel
-Name[it]=Iceweasel
-Name[ja]=Iceweasel
-Name[ko]=Iceweasel
-Name[nb]=Iceweasel
-Name[nl]=Iceweasel
-Name[nn]=Iceweasel
-Name[no]=Iceweasel
-Name[pl]=Iceweasel
-Name[pt]=Iceweasel
-Name[pt_BR]=Iceweasel
-Name[ru]=Iceweasel
-Name[sk]=Iceweasel
-Name[sv]=Iceweasel
-Comment=Browse the World Wide Web
-Comment[bg]=Сърфиране в Мрежата
-Comment[ca]=Navegueu per el web
-Comment[cs]=Prohlížení stránek World Wide Webu
-Comment[de]=Im Internet surfen
-Comment[el]=Περιηγηθείτε στον παγκόσμιο ιστό
-Comment[es]=Navegue por la web
-Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
-Comment[fi]=Selaa Internetin WWW-sivuja
-Comment[fr]=Navigue sur Internet
-Comment[hu]=A világháló böngészése
-Comment[it]=Esplora il web
-Comment[ja]=ウェブを閲覧します
-Comment[ko]=웹을 돌아 다닙니다
-Comment[nb]=Surf på nettet
-Comment[nl]=Verken het internet
-Comment[nn]=Surf på nettet
-Comment[no]=Surf på nettet
-Comment[pl]=Przeglądanie stron WWW 
-Comment[pt]=Navegue na Internet
-Comment[pt_BR]=Navegue na Internet
-Comment[ru]=Обозреватель Всемирной Паутины
-Comment[sk]=Prehliadanie internetu
-Comment[sv]=Surfa på webben
-GenericName=Web Browser
-GenericName[bg]=Интернет браузър
-GenericName[ca]=Navegador web
-GenericName[cs]=Webový prohlížeč
-GenericName[de]=Webbrowser
-GenericName[el]=Περιηγητής ιστού
-GenericName[es]=Navegador web
-GenericName[fa]=مرورگر اینترنتی
-GenericName[fi]=WWW-selain
-GenericName[fr]=Navigateur Web
-GenericName[hu]=Webböngésző
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブ・ブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[nb]=Nettleser
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[no]=Nettleser
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ru]=Интернет-браузер
-GenericName[sk]=Internetový prehliadač
-GenericName[sv]=Webbläsare
-X-GNOME-FullName=Iceweasel Web Browser
-X-GNOME-FullName[bg]=Интернет браузър (Iceweasel)
-X-GNOME-FullName[ca]=Navegador web Iceweasel
-X-GNOME-FullName[cs]=Iceweasel Webový prohlížeč
-X-GNOME-FullName[el]=Περιηγήτης Ιστού Iceweasel
-X-GNOME-FullName[es]=Navegador web Iceweasel
-X-GNOME-FullName[fa]=مرورگر اینترنتی Iceweasel
-X-GNOME-FullName[fi]=Iceweasel-selain
-X-GNOME-FullName[fr]=Navigateur Web Iceweasel
-X-GNOME-FullName[hu]=Iceweasel webböngésző
-X-GNOME-FullName[it]=Iceweasel Browser Web
-X-GNOME-FullName[ja]=Iceweasel ウェブ・ブラウザ
-X-GNOME-FullName[ko]=Iceweasel 웹 브라우저
-X-GNOME-FullName[nb]=Iceweasel Nettleser
-X-GNOME-FullName[nl]=Iceweasel webbrowser
-X-GNOME-FullName[nn]=Iceweasel Nettlesar
-X-GNOME-FullName[no]=Iceweasel Nettleser
-X-GNOME-FullName[pl]=Przeglądarka WWW Iceweasel
-X-GNOME-FullName[pt]=Iceweasel Navegador Web
-X-GNOME-FullName[pt_BR]=Navegador Web Iceweasel
-X-GNOME-FullName[ru]=Интернет-браузер Iceweasel
-X-GNOME-FullName[sk]=Internetový prehliadač Iceweasel
-X-GNOME-FullName[sv]=Webbläsaren Iceweasel
-Exec=/usr/lib/iceweasel/iceweasel %u
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Icon=iceweasel
-Categories=Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;
-StartupWMClass=Iceweasel
-StartupNotify=true
diff --git a/libre/iceweasel-libre/iceweasel.install b/libre/iceweasel-libre/iceweasel.install
deleted file mode 100644
index 1a1f4b16b..000000000
--- a/libre/iceweasel-libre/iceweasel.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
deleted file mode 100644
index 2384818b4..000000000
--- a/libre/iceweasel-libre/libre.patch
+++ /dev/null
@@ -1,1220 +0,0 @@
-diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index 331edc8..226508d 100644
---- a/browser/app/profile/firefox.js
-+++ b/browser/app/profile/firefox.js
-@@ -242,11 +242,6 @@ pref("browser.slowStartup.notificationDisabled", false);
- pref("browser.slowStartup.timeThreshold", 60000);
- pref("browser.slowStartup.maxSamples", 5);
- 
--// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
--// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
--// repackager of this code using an alternate snippet url, please keep your users safe
--pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.mozilla.com/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
--
- pref("browser.enable_automatic_image_resizing", true);
- pref("browser.chrome.site_icons", true);
- pref("browser.chrome.favicons", true);
-@@ -1283,11 +1278,7 @@ pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false);
- // (This is intentionally on the high side; see bug 746055.)
- pref("image.mem.max_decoded_image_kb", 256000);
- 
--// Default social providers
--pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"shareURL\":\"https://www.facebook.com/sharer/sharer.php?u=%{url}\",\"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\",\"icon32URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAADbklEQVRYCc1Xv08UQRj99tctexAuCEFjRE0kGBEtLDSGqIWNxkYKbTAxNlY2JhaGWltNtNFeKgsKKxITK43/gCYW+IsoRhA4D47bH7fn9+bcvdm5JR7sefolC3Ozu9978+bNN7PayUv3HN3umdY0Y6IWBtSJ0HSTarXqTOiuTep6Lj+tdxAcA8RAgSmwdd2aCDs0clldYALb/FvgYVhjmfliVA2XpjEgWo0Attn42Z6WH1RFor5ehwo9XQIUZMoVn4qlCoVMSo62EvD8Kh0b3U2Xz43R2PBO6mUCGDlAf65V6MadZzT/rUimoccc2kYA4BfPHqJb105RzjJigKhRq9kEJUBIjgYVuXeL7SAI6eD+Abp5dTwVHOmEHxT50d8WBYJqSOdPj5BjW8gZR8UNqFR2xagx/65XFYaMH+BGWwiYpi4UkBPPLxTp9v1Z+lHc4DWvCQXWmIy6EjITgKowVd5Jjv7N3Hd6y5esigoOwpkJIAmMpZpLJGdiaaC4F0UmAj6bD84GCEwmB/qxMmRilmnwb/mpjAocHh4UEoNAt5NLZB7oy9OJo0PxqkAtePdhiSqunyC1LQUwWMPQaOr6GRre258Ajn4cP7KHcEXhsxpXbj+lT19X2TMNGTLVAcjcalS8gDwsQ2UOMhH4k8FkcrEn5E5ub2sKohxLK2VR77Hl9RUcsrgeRIEiVOT6z+tDbIeLy+vk+kGTCbXxycet6xhl//3f6bJEkdHYhA+mLtDIvoH4ieev5+juoxdk5+pjhALYEdXIpEB5w+NlSKSzqVQ/+H7IO6BLtl3fngGMiqhGJgIwlM6qpyUGFjySdk8m0Zg0ubeD7X9OIDEFajltRQgUJaUKx69tdgaQa0FMADuahZPMFtcEwNPm2hA7ZI5sK4aoE2NvYI+o8hkCIe7CwTv68zS0q9Dk5vpbm/8FXxitSzmMFHpsGj0wyLUheTwD2Y9fVgh1Ae0EPUgD9241ZEnld+v5kgnVZ/8fE0brVh5BK+1oCqKKF72Dk7HwBsssB/pklU1dfChy3S659H5+uelgIb+8WRv1/uGTV9Sdb5wJFlfW6fPCalMhwhSU1j2xKwKbP838GcOwJja4TqO0bjdmXxYTy1EYjFdCWoCEYZhseH/GDL3yJPHnuW6YmT7P1SlIA4768Hke4vOcsX8BE346lLHhDUQAAAAASUVORK5CYII=\", \"icon64URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAACNNJREFUeNrtm3tw1NUVxz/399hHHkgCaCBGEFEEREVFYFQcSoOKdkZay4z+4dDpYIsjHWx1WoTMhFi1gzBSpVgVGbU4U1sHfPESKODwEEnRYDFAICEIeZIQshs2u/v73ds/drMsyW7YLEkl2Z6Z32yy+9v7u+fc7znne8+5KzgvAjDunzlv0M13PjDZ6c4cARj0WhEoaZ1tOn3yq9XLf/tNU0O1D5Ad7wq/OpxpaXOL1j5uZAwuaGlVgwNBhULRm0XXBG6HZrlNa9uRrzfM+3DlgjIgGMsA7rl/XDdHOnNf9vosTfVuvTsaQhdkZ4iykh2rHtqydvkxwI58BhjTfv7MmP55E9/1nLNdfU15ACkVvoAaMCRvRPa+re9+DgTaPjMAx+DrJv3M67Mz+6LybWLb4NfTHhxzx31DDhZvOtqGAgNwWbjGICV9XQJB0e/KobcOP1i8qTzaAEYgaDtNU/V5A9hSaUFLuQEt2gVQSgml+j4CUAIppYgK/m0GkCjZ9xGAUNAu0LUhgJRAAAIVzwBSqVRQH4hlAClRKZAFhOgEASoFECBR8QwgUyQGdJT/B8HzCEiBNKhUJzEgBYIgQsTJAkohe9oFZHgHKvQoHtZ9K3tewfiixXABLdoFeuSSEmkF+PH4QTz7+M3o+ENptzvGtS36uSwmjMpAYF10XCllHCYoe84FlLS555Zs5jx6J6ahY+iCl98pJiDNS1hwSZop+cm91zJmxEBefGsPlu1AxKC67V3gf5oGlZSMuz6Dp2fdhWnoAEwaN5T5hsYLb+4hKB1dcgelFDpB8ifk8thDt3DO5+fZxRvxBV0IjQR0EB3KfD1GhJS0GZnnYuGcKTgdF9ZWx4/No/BJjUUrdtJqm4iL+K5SCmSAiWMHMevhcQzNzaa6ron5SzfQ7HeiaSKx+au4m6HupcJKSYZdZVI4dypuV2yo3zoql0VP3cOiFV/Q4jdiGkGhQFqMGpbJL346kbE3DEYIQWNTC39Ysp4Gr4HQtZDyiRhA0NlmSHZbRM7pr1H0m6lckeHqdGXG3jCYoqfupeC17bT49fNRXIFSNrkDTGbNGM9dtw1D10M1DI/Xx3NLP6OqETRdDy1eglPT4rqA7K56gCIrXfHCvHwGZqUnBMtR113FS/N+xHPLtuJpDa1mVobg0emjmX7vqEjsUErhaw1Q8Mo6yk4F0A1HeOW7kIlFx/u7jworRabLpmhuPjmD+iG7YNDrrhnIS09P5cW/buOeO67lkftvJt3tDE06PE7Qsnh++QYOHPOim86wcVUS0+whJug0ghTMmcK1V2eH8m2UHP++nrwhAyIwjiXDcrN5vXAGhqGhFBeMYUvJ0re2sPfgGTTDGUZrEogVopMgmGQWUCgMEWTBE5MZPSLngnGqas/w9j92s31fJfmThvPM7HyMMKRj+qgmOiBHSsnr73/B5r1V6A53KD4k3bFS8dNgckFQoWPxu1kTGDc6N7JqzR4ff/+smE+2H8FSLkx3FluLawhaG3n2iXwcppGoV/Hemt18tK0c3UwLIfUS2nVafBeQJNUXkAF+/dht3H37cKSUBC2bTTv+w98++YazPg1dT0NoIUhruoMd+2sJrtjI7381rQM3iCVrN33N++tL0c30xFNdp0GQeFRYQhcRIO0gv5xxE/fdfSO2bfNVSTmrPtxLZW0A3XSh6VporaLG1XQHu0pOU/TaOhY8+QAuZ3w6vHnnQd74536EkZ50wOsSE0zcugolbWZOG8GM/LGUVdSw6sM97D/UgGa60QxXzMJDZAq6yb7SJgr//CkLn5pOmsvR4Z5dxUdZ9t6XoKfFjNyXkqZjuoBUCpGgCyhp8eDdQ5k++UaWrdrMlr2VSFxoZlpE8YtNWGgGXx9ppnDZpxTMfTCS8gAOlJ5g8ds7kCItTIi6j6FqMVxAC2sV2RB1ekmLCTcNpH+myeyFH7BxT1Voopoe4RKJXQqhmxw45mXh0o/xeH0opThcXs2iv2wmoFyhAnbC4yX+3PgISMDShrA5XHGa3d9UITRniIeTfHASmsGhEz7mL/mI2TPv4sU3t+KzHAnu7JKpCosOkcSIICAB5hZE0OiRCM0Iwb0b6LPQdI5W+Zn/yucoYYayRk+16eK1xqRMDAHtA0r3lep0lNAjO8kfpCpMqpTF4xZEUqA7rIlOCiKpgADVWXc4FQwgEfHPB5AiByTixIDUCYJx+wJoqdIcJV5VOAWygEZcF7BToT2upFDKtuz2BrAtf8v3mju972cBJX2exso6ok6N64BhOtM11xXXPBz6v6340PcuO+DZfaJkzWqgqY3L64Bqaaz0ZV45Mkc308dG2kd97FLSaq4v317gazr5HeCLRoACFTxbfeBw+oDhWYYj4/rw+30H+rb/VMPxXQsbKnbuABqJOi4vogyRiRB5/XNvvz3zytFTDEf61eF9b0dCKTS36c4afymTsgLeQ9Ly13X/aYnzE1Uy6PV7679trNy1xe+tKwPqAH/0Vla0qw65gH7AFeG/Y3Uy9P45o0bm3PTIaplM6lTK9jWf/OBUyQcrpdXaTIyfsXQb9QcLaAn7vJd2vxY5XxBpo8pwDmgFGsLKx1oeh8OVmUUSLXUlrWZPzbdLag9v+BjUqfDzepKAyDDcZbznGHG+1NmqSKHpVlfbadJqLW+o2LHobNX+PUB1WPkfnHwYyTmX6lI7Lehr3F576NM/+T3V3wH17f2w1xkg2ggXuSvga6p8p+bgmpVKWpXAmVh+2AsNEKogdYYAJa0GT03J4obyf60HTgKe6PTTqw0QOpcQ3wXs4LlDZyq2FXrrS4uBmjDxuCw3G5eIgA46yeC5ho11pWsWW35PWTibBC4Xf+9eBLRPg0q2+s5UvHG6bMNqJYPHw7nXutxZYvIIiMoCSgbrPVX/fv7syS+3AKfC5MOmF4iRpP6RjrId8O5vrNhS1NpUWQLUholUr6muXEoatP3emrWNR9e/avk9R8P+HuxNypPkrk93pGdnK0VtXemaN6UdOHo55vdE5b/0NKx+K4AxtAAAAABJRU5ErkJggg==\", \"description\":\"Keep up with friends wherever you go on the web.\",\"author\":\"Facebook\",\"homepageURL\":\"https://www.facebook.com/about/messenger-for-firefox\",\"builtin\":\"true\"}");
--
--pref("social.sidebar.open", true);
--pref("social.sidebar.unload_timeout_ms", 10000);
-+// removed facebook sidebar with Iceweasel.
- 
- pref("dom.identity.enabled", false);
- 
-diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css
-index c270318..049fe6e 100644
---- a/browser/base/content/abouthome/aboutHome.css
-+++ b/browser/base/content/abouthome/aboutHome.css
-@@ -49,11 +49,6 @@ a {
-   background-repeat: no-repeat;
- }
- 
--#searchForm,
--#snippets {
--  width: 470px;
--}
--
- #searchForm {
-   display: -moz-box;
- }
-@@ -72,8 +67,7 @@ a {
- #searchEngineLogo {
-   display: inline-block;
-   height: 28px;
--  width: 70px;
--  min-width: 70px;
-+  width: 47px;
- }
- 
- #searchText {
-@@ -145,48 +139,6 @@ a {
-   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;
-@@ -335,26 +287,25 @@ body[narrow] #restorePreviousSession::before {
-   width: 32px;
- }
- 
--#aboutMozilla {
-+#aboutGNU {
-   display: block;
--  position: relative; /* pin wordmark to edge of document, not of viewport */
-   -moz-box-ordinal-group: 0;
-   opacity: .5;
-   transition: opacity 150ms;
- }
- 
--#aboutMozilla:hover {
-+#aboutGNU:hover {
-   opacity: 1;
- }
- 
--#aboutMozilla::before {
--  content: url("chrome://browser/content/abouthome/mozilla.png");
-+#aboutGNU::before {
-+  content: url("chrome://browser/content/abouthome/gnu_headshadow.png");
-   display: block;
-   position: absolute;
-   top: 12px;
-   right: 12px;
--  width: 69px;
--  height: 19px;
-+  width: 200px;
-+  height: 110px;
- }
- 
- /* [HiDPI]
-@@ -366,26 +317,6 @@ body[narrow] #restorePreviousSession::before {
-     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);
--    transform-origin: 0 0;
--  }
--
-   #downloads::before {
-     content: url("chrome://browser/content/abouthome/downloads@2x.png");
-   }
-@@ -421,9 +352,5 @@ body[narrow] #restorePreviousSession::before {
-   body[narrow] #restorePreviousSession::before {
-     content: url("chrome://browser/content/abouthome/restore@2x.png");
-   }
--
--  #aboutMozilla::before {
--    content: url("chrome://browser/content/abouthome/mozilla@2x.png");
--  }
- }
- 
-diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
-index 432fcdc..8e85f1f 100644
---- a/browser/base/content/abouthome/aboutHome.js
-+++ b/browser/base/content/abouthome/aboutHome.js
-@@ -3,317 +3,99 @@
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
- const SEARCH_ENGINES = {
--  "Google": {
--    // This is the "2x" image designed for OS X retina resolution, Windows at 192dpi, etc.;
--    // it will be scaled down as necessary on lower-dpi displays.
-+  "DuckDuckGo HTML": {
-     image: "data:image/png;base64," +
--           "iVBORw0KGgoAAAANSUhEUgAAAIwAAAA4CAYAAAAvmxBdAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
--           "bWFnZVJlYWR5ccllPAAAGrFJREFUeNrtfHt4VdW172+utZOASLJ5+BaIFrUeXkFsa0Fl++gDnznV" +
--           "VlvFxt7aqvUUarXtse3Bau35ak/rZ9XT26NtfOvV6wFET+FYCQEKWqsQIT5RCAgSXnlnrzXneNw/" +
--           "1lphJSSQ8BB7bub3zW+LO3uN+fiNMcf4jTEX0N/6W3/rb/2tv30smtnXB3zmRi2FQakxQNKX3WkW" +
--           "9S/tgW3HLpmQM543A0BWVSHMYGIwOTDxzxrOf3/RQQfMZ2/SLAvKhTFVBGUqKFONH2QAzwOMF38a" +
--           "wHhYZAxWAqhe/iszp3+b970d/sInc57vz/J8L2eMB2MAEYkBQ6DQ3dRw4dq7AUjcP3rAfPZmLWXC" +
--           "LHKoIAcQAUxaB5EaEfc6AEBhjDEwmcx43/fO9HxT4vkReBIAAZgjgodW3NcPnn1sHgD/iHknn+0d" +
--           "6s8XEUhsXXac/34WAAGw8afuT8GZ3X055YeSJcIsG+pMZwFn0UihezRofPt3G54f/0E8cNMN+Myo" +
--           "8jVTCgYd823PLzrPeIBnABiUQ1F+UoWsVOYb33mkoKp/7/dKyT0AGc47X4s0sjBEoLxbBqAQAMfW" +
--           "Rfe38B4BM+VHUkYOs8mi1FrABbK4dcvK73zwp1M3xYPOxANKBqbpCdXNGb0UwPKRF74xpfDQ0t+K" +
--           "54+IvlKoahmAhaO/mv/ZmicG3tqPgT61ZM2dZMQJOYhIdByRM/F3dCCOox4Bc3oEliqyyNoQCPPu" +
--           "sXceKZqRsigu7pwaWBowiRb46+f9Q1V2wl1nDx09/R7jF30x9adNlN8yPx4DHwht+B/cBIBoRqeI" +
--           "E4hE/oshTcB0wNbT6/o/zrhFyohR5ZxmrVWE+fDxdx4puhGAH4OkPe5B6pykeJAc/7cDEMZ/095Y" +
--           "870P339m+BXs2v4kbCFsm9u2vnpJ3bzR7wAo2B/R2v+PjSnyXcRxtOLUSXFxwAFz5i2SZUIVO82S" +
--           "BWye/vLOIwNvjL8OYqCEfXCmJAZPHkC7sK1REbj2+lmbq86qTVmmfuuyN2cTiREWKCvACgml9kDL" +
--           "7HQksehsZmSdA6yVpsa6P38v3swg7m4vN1dGXrThKGP8yS5fP33j/LEvxKDbl2f2A0YFCtkZQDOa" +
--           "PjLAnP4jrmBGjh1AVhG2ttxfX33++vjY2eeNXf/siLUAzgEwMJZrY2vF/Vu/t4BRqCqgCmj07wMV" +
--           "HXUCzJQfUlZE72ICnANcqNj21h8eiK1AX46gXh29KT9H+rd9XxBjYGCgig7QHOgjPgMAKigXQZYp" +
--           "si4uCOc3v35zY2wF9ufGSgxA7fdd9g8ho9ol4P4ojiQWnSUMMANECrJNy1NWYH8eGfsEvJbLv1IK" +
--           "1XIAUwEtA0xplJMwjcaYlTDeShg8dOgjj6/cJxNYfWIWkHJoh5yyjkSZ8RbB89YBZq4/pXafGeuz" +
--           "b9WciXJxo2B2houqgAjABJCLOwFMqFv57+bBxMIAJm1det3avnl1OYCLAeSgWhofaY1QXQSRuYc+" +
--           "/OiD3QLmUzNdqTBKhRVMADsF5beuToXJB90KtFz+lVIVniXOVUAUqjpXVB4WwPjGTPB8/0zjeTnj" +
--           "ezl43szmKy6vNkDF4MeeXNc3oJyUhfAMkJsJkSxUVrLos6o6z/O8Ucb3phrPzyHKeVTwkpPXseg3" +
--           "Cqe+1SfG+swfaw6KGTAoJ5eyGF3IBeEIJB2AcXxb0FI/L45uFQBMGiu6Z3ai9eqrclBUClFWVatV" +
--           "5GERNT5wEVQnQLUcIuVNX75kFjn60rA5c1d0AoywlkcxfdwZ2LSgbOmBZAv70povu7RcyFUqcZYd" +
--           "Pbxix44fnLv8pbYUOWh+P3ZM9uJRo34xoLDgq8b3YTxvqhqsaPzyJTdmn36msjdyqPqkMhWqBFGZ" +
--           "MtV8uDX4zMjp2zemyEoPgGn4zyOvGzy48A54GcD3Sz1jFrqqE+4uOOvdmb0ASlYEs5mQE9afUdhy" +
--           "0yv3lHzwya/8ZcjgI0+5yssU3QKYkgQ4Ivp60LL1n8kBQfOWuvdnj6uLldgHQKoKxU7HV/eg2y1X" +
--           "XXmXEs1U0ZVb29o//4k5c5P5eQB+s+68aVeUFBTcCxUoS6kRWfjhueecc9SfX3ytA9QTr7eVACqY" +
--           "FDYEwnbB2qcHHg6gLY6ODhpomi77coUyVaojhKH9+ZHzF/wqXiztEg34APxNX/jCvQOLCi83fpy8" +
--           "UsCJXHLYnGdn785S0uKTyyBUBXJZcW5x4bSN56ciyLQcD4Bf/+ThVwwbUvRb+JkoswqAWX5b9Lm1" +
--           "M3uSM/UnUiaCKiZk2blvvnxX0ePxuBNAmpMur51wyLBPzjVeBBoVwIXBk6vuP+SG+LkcuwkWAA96" +
--           "/JjZKnKxkACkkFb5Nztz220xX9bJlWi+6opKFalQlpqlmzZNu6B6SaJ0knKJ/DW5qd8p8TO3x6AB" +
--           "qza1EE06cdmy9wDAY5LjmBTMkQnUnZ42H0ywNF52aU6FK4UY5NySI+cv+E3MCnMM5HyqtwFoO3rB" +
--           "gmuDMFjGjiCOIEQwzH9c+7lzju+JTaYlJ2ehUqXMWWFqeurFxqsAFMVf25Ss9kTOEZdvebClJbxT" +
--           "yUGZoEzwlL/b9tzRX+pOztSfSBZApSqyIrL45buKnkaUJEzLCN5+csxr+ab6fyILkI2OIZYBlx9/" +
--           "2bYvpLgw2+EqKLKdwoceVKJp+tfuEpYKZcaW1tZbLqheEsbj3GV+oxdV3x0GwQZrHUIiWKIST3Vm" +
--           "DG54zFrKrBBWiGgSyx9Uv6Xh0n/MKlGlOII4h80trQ+kuJt8HGklZHg6FZF/Y/uOb7O1YOvAzkGt" +
--           "Kxmoehe6SYNEpkErwZIFC4I2fuLKf2tLtDOPzumPhA6wAPJDLt1yuzjaAEcAMUCMApXfvPP7IcO6" +
--           "gkYFs4RRpgy49qanUsAPu/T8W48e/YwL6S/kYtBYwM8U/yu6KVlQUShr9CkKyK7b1vDVy0qVeaYy" +
--           "gaxbdeK85/8a/z7sYR3zgXM1gXUInEPoCEw8PR6z8YQxaidQPh6RrgrPEOZS4chKjFuydEEKFD1x" +
--           "QgrAnfO3V98Jw/B5dhFgmByU+MK/nnrq6K6gcQtPyqlIubJAibCxPv/fsVVNgCI9yGEAQdBq71NH" +
--           "UEdQIoBo5PBBeklazuQfSpYFM0UAFsDmd2yMf9+1XkUT3otc8AiRwpFChCBCI0detGbSLtYr5uw6" +
--           "tk26XctZwgxhRt65ZSmr1t389M1Jk85wzKcHRAiJkCfasDnI/0sMGN+jlLMrAigMhp0+f+TBBIw4" +
--           "milEYOcQBHZZAoZeEIgKgIIgeJbD2MqEFhxaDAFmdAWMisxQFigzlAUnX9e4rA9yeHuTna3koBQB" +
--           "RogxwOPvxNbQAAA7VHQEFKSQKEFIu4lA5d3HiiuFNB4XQZlhUHBK11QO0oRdD7ouROVCkeJZG7ak" +
--           "/KBOYHlz4sTy1WVlVY5oYego2+bs82+3tFw6YcVrp01dteqpxNfyhKQuGlxCMSsKBh570ABT/8XP" +
--           "5dhRVpyDWAd2Ns0O9yrhWdfcMpvCEByEoNCCwhBgvgBdM+PM5TH5FPW+1ZLo8de2viehe12dhVoH" +
--           "OAtDPO61O4o+kYCTnE5wVuGsxlzKHul7BUDKdomKgwpB2QHAyNiP2Dl+0Z2WRXZ9YP0F55WJczvX" +
--           "0jp09U3fLiurWD1+/NqQaHZIVNbu3O1vt7aM+fSqVRWXvPvu0pRldwAkQ5brjO+NMh0kgMIvGjYZ" +
--           "wIKETPxIrYt1U5M8iThKJil9yZGc++ab298dP36Jb8wZohqhQHRErKEeAA6fG5FT5yIlYYI6tzfO" +
--           "vtiQni3MYDw0ChqEgUMyejyAdwGwDeW4ZI9FAGQOmwzgv/cERmZbDXhnKBNUGMJkUhGVduSSJJ1P" +
--           "6rw8HIalJo7ilBkchgCgL48fVzLceDc4kZnWUdap1AQi10x+660n4jXyk1M7ZXEZgHhMUkMO4Njp" +
--           "hQGMf8h56Fx++ZE1a+1xZC2Szjs3sk9uUEhUbSMvP3LeyOGZ0tKJiearo1J1DHVRPYmS7JUcG2g1" +
--           "pxxUsooBnpmQWAOb10YbKGygcKFCZOC0XqxrRKokCBQG5euX77In2k1P+2hhWEZBAAoCuCCEcW7E" +
--           "2xMn/m6oYo0jyjnmuc3Off6UN96YMvmtt5LILSmQ61r3xAA0I+xqPBiIejAd1f7e2MPPfvm4LQs/" +
--           "89a+bP6nZuSzfsaU+T7g+UBixYQVRFGS01kFO22srRy0EgA4CEvFRHS3MANMY/fGbybmlQqAFSBV" +
--           "sCp8kWwCGA5dqefFShnnRV77ecHYU37iXuqLoB0tsuIo34v3NfJR1GlJsrnOuiXGy1y8k+rwxh57" +
--           "3srSD/6rbLdra7yMqgjUCGAULR8uWr0LJPYAGApCeCbKNygLPKIxJ65YOSU+YpLUUCYGiqBzQVy3" +
--           "Ft1zbevnJl60UARqACgcVDo9ZZr63Mqua68QxlpmrWJC1FmrmLSKCFVktcpZrbKhzg4D26E5Lgjg" +
--           "8vnoMwwh1hU/dvTRo/qcDyJqcESw5Dp6o3XNHVrqLDSubAdFjuXwwWZcX+Wc9APboKxQUoiLurXa" +
--           "IYfCpjlCDsoxZ6OCouLRt+xpbY3nA8aDMR6E2+9vffOWxl02cQ+Bbdjevt7l83D5ABRaKNHYO484" +
--           "YmgMkoJ4jElCOL8Lz9NN87YumrRDxc2DElQZKgIVhZcZcO1hZ74wtK/H0thvtuXGXdM2S0S/ziQ1" +
--           "FPJiG7pHwvbgDhtKnQ0VNhCEeUHQLmiuf2fymieGvJGY8DCfX+yCEC5xWIlwtO+P6+s4VESJGS4+" +
--           "liwxKjZ/2FGRZvPhYgktxEZdHWOAr2P34ihWIQWTgJ2CnWJbo9Ymz1g/5+h1QsF9wgKJ19Z4hV87" +
--           "4fKNE3cnx8v4V8H4UOjqhvce+zW6qdWVlOvSjQsDlw/WUT4A5QNQGIJDizMPHXR+CiRBb4GSzlYr" +
--           "26Z7vYKSC42nUOPBqA9VU1I0ZOJPEYWj1NvVW/3AoEUAFgO4IzZ1hYk2jf9WUw7IjCIXHUVhXrFp" +
--           "/sQtKZPIoXXr/PjoSkZeoHo6gP/bFyeciECqcHG3IrXp37a2SF3xQNPxRAXgq5nS1bHsDWCYALYA" +
--           "u+h0W/impI8Pad9ec/vAoWVTjV84Nsn5FAwcvmDMN5rOqf1jyatdHzjuGjvThloKYH3b5qVXt775" +
--           "44ZuN1QEKknF3a6ImfDee4tWjBrV6R5Qoeq1AP6Avaxx8gDolhdPXAh2qzQmZFQ4ZhALrj/mvLpT" +
--           "+qhxya0BP5VVZQBkA6jNR0AJ2xUUcjKGjsx4k3PVYUwaJU6rJ3reLiHlHppjBjF3fLYSzU/noEZ8" +
--           "3611VusoVJBVsFWAdezim/3jemSFe+SNIsvCpAhCXf7TBZI+PnTr4nO2t2xcME3ZroYKIouEEqDo" +
--           "xfHfav/GxOttFgBOucGWll0XVqrqXYDWNLz3aG7bsovWp4i2TvkhScLqNBezq/M/zxLBxV2Yx/75" +
--           "yCPP6usc04CJ+B3bcLMwQTiK+0UIwgz1ip8+4pyaYX0x0SnWMkjnYGygkm9nBO0MGzoI2TTDyQBw" +
--           "7ubNawPmeZYZNt5wZhrxX8OHX9yXSTJzGcVgIWasbs8/hc7XRzXM670cg0Vs5H+MHm6u74ucrb/K" +
--           "lAlFPoySoqFFn+rm+OCGV762df2cYWe4fP0M5qDWhoowRIm1/h+s1YZx3wrVOV1LDhXMaGzfXntF" +
--           "46vXtMQRS/clsqRRT9SNd0GMBo6edRStZbKeg4D//ciQIcP2CTDbqsdVKQePq1JMFkXxv4qO9AaM" +
--           "fPGoaeuG9kXp0LkU0wGgMFC1gYAdAeyg0m3IrE3W3mtTvodjRpHq9X3xL4h5Qsq63P/z9ra6LqSc" +
--           "vvmBPkwOTex2lnf4wNee/47fa99NGGVJ8Zl1qP3UPfwkdr15mDDV+Y3Pf+Kh9c9kz9pee89J7dve" +
--           "vaRt+7qLbVv47y5UUKggp3BB/okNz0/aHI8332OaIgELxWDpptQtt6X+Qcu03nVYGQYxjxzl+7/e" +
--           "GyvjdYrCtv31JiW7QTjy6qWj83jF4AeP/MLaodiHRtZBXAihEEIWkq4eSgGmvKGhqpX5d1YEVhiW" +
--           "BaI6Zf6QITN7s5ELhw4tZZavkwhIZMOC1rZfo5s64nPv4+1NzXot2/hYiqKckglH4/7eRojCOosp" +
--           "St6u2ijfS1Hv3I0SdVy5aam9ecumBeOqN8w7aRkxSlMVdRDmRHa4m5xWPKPEusUA6maIrcy/cCKw" +
--           "InASKaCoXrlo2LAH+xpMpAEjLauu2ObaNnxVmZqUHaI8SaR+KnIhTPHCo6ZtOn6vk4qUPNNGnV2P" +
--           "J0ptENweMq92zHBMcMwwIrfMLS6etKdJEnMlCYOZm9YE4dUPkWvsIUckJ/+SZwd5PCEOEBc5rh7j" +
--           "grqf+VfvSc7mO/xZSihVAra3YMY/PqqrUhZVe7C8yRHTBqAVQJuQN5idgJ2ASQAz4PJjptWevKc0" +
--           "RZQ0TQATRWDd/dmFDQ2VeaLH0z4dRVTK9EXZ7IqFJSXH7W6eLw0blntp2NAydGOSqPGVs/5mW9Zc" +
--           "JGKbRSxELIRDCFuIuAmiBa8eMW37rcdc1JDtM+3PYdSp43k9/ulPgmDrsnz+vFBktRWBZYEVKSlU" +
--           "feH5wYPP7u5Hfy4uzi4oLq50IjkSaXrf2vIfBPnV6PlKiwKg0XfyNe2BPkmJ8+oUGeh/bLjNu7En" +
--           "0Gy+w5sppLcyKRra9IZJ98hTvciop9MPSSFUwGTnEjHICsgpyKHYHzjquWMvrJ+wewUENPFjCIAx" +
--           "k3uStyIMbw5FVieWJvJpBE5kgqq+X1VcPGdRcfHMxSUluSUlJbmlUZ+1tKRkLRGVnrZ9Rw12rSLt" +
--           "sDpFg8vmfbpw0HH3wcuMMSaiao2XAbwMjPFhPL/ReN6DfsY8tHHekN0WXR929vqsCpWruFshPEqF" +
--           "o3IyADuWTxgea1rYTbRVeEMmc+SnCwp+OcB4l3kmLq0D4BnzkA/MMUBjvDMXC1DBqlkCFr9N9E//" +
--           "HIZpPyDsQVuTFwsMfP273k8GFeLbvo9izwe8DGA8VMPgIc/D2piALlPFDGWUMqNuazOun/RbeQU7" +
--           "L/zl0cfC+SPOXjG84NBRawCvJNoSE7PiBgr5Xx/MKf7jLnzIbUPKlHVF5C11KgJfD9+shY8Vxjd3" +
--           "0780rEvP8bFDDvnVQGO+lU5MeTDwzM5aTbOzNyrw/XNbWx9JFLknk+sjqjobUHJq9XS/cNj3jZcZ" +
--           "Ac9PwBIDyAeMD2O8RhhvpTFYqYpGqMQOM2UhlFOhsvjfgNJ6ofxyoZaXbHPt8mDNjDU9ACYBbyGA" +
--           "AT/KZEZ/MpO5qciYyRlgROeJGSh0nQCL21Ufmx4EL8dMpqScRt4DFVAAYMCtORx+0Rhz7aFF+GJB" +
--           "BmNM/JKklGo1KlBtHZ474U79P9hZOZcQYb0unD/mwu05qADCZwE4C8Y7I3kTk4kFx+mUuzfMKf5e" +
--           "+rn+rUMq4PR4hFII0gw0xpdvGAWGoDqHf9m8IuV8m2Qtf1pQMPok37+50JhpHlC8EzwRcAzwOqs+" +
--           "Vkv06I+da04nInd3RvuxgCIAhcUTF5zvFQ79oucP+Cy8zIjE6qQnt5Pviu5IqAogVKNCNSrBUte6" +
--           "blnrqi/Vo3O9rI3Pc7cbP6sgGQcAf7rvl3zK908uBKjAGK5jrrmNKKHj/RS3E6L3V2USLUzkZAB4" +
--           "i75pTivwwQMyoKYQ685+QOtScvzUHPbIlJ54ZVsuDPTrZDmnQqUQggo1qkoNRDyFeJ6XGQfjF0fW" +
--           "3O9YWxW6adNzw36Dzm/JKEJ0k7QgtfiSygd1vSrkdZ3jlb6fneT7Y+MN1xrmVX9gbkw9q1MdsemF" +
--           "U5wkpwqSRSw49gfZAcPPHOsVlIww/sBjjPEVnqfGZEQlWKVCjWK31TW/dv56pCruU126TGxPl+US" +
--           "IrAgNQ7TQ+pNukQqfalLNimApvMt6CZMTvsiu3VOJ17XnrNWZ9m85oK8Qmz4sFB+CeXrF29dfOqG" +
--           "1PwKs6fOKyvKjrnb8wrHGD8TWfCOEoX85zb96dgXY9leN2NM+y3SJZG4u7XsSldIykFPz09NHxbR" +
--           "T2U3M11AsKf8aRqtnBqQoG91oWkGOS0/XaQo2Pf3u5mUDK9LukD7Mv5Tv9teSQ4VzipsINUtW9Zc" +
--           "t/mFiRu7WbcOuQNP+MXQ4hGX3mEKBl1mjB9bbwAqSz6cf+TZ8Qaabta/u6hM92ItpZs5dvyor5R/" +
--           "dwvp9QAa6eFzfxRlpVMk2mXh93czeyPn1Bn5ShWtYAJsyEve+OPgC7Hzmgx3USDtejQedlbtDX7h" +
--           "0Ns6HChV5LcvP7rpb1+qx/690dHrtewL05c2c7ZLtrM91fOpDGjXyvT9+WYBPQAg3NPcey1n4vVt" +
--           "FUJSIfGNjJZNy2ekkqzpazIJOefSoTaA9q1VY+5Wbvs9NAoYVBkFh5Sesi9lJ/u6lt5+WETpoi2M" +
--           "PpZU/k9szmKGtVGRWBjQ6g3zP78pxfSGKb+tJ4LPAsi31S/+uXCUlVZmCIc+DlI15L4Cpr/1FA1d" +
--           "0VLqAilzgcCGChdQc5eoTXqpkNS66hv1YLsUElURiG1sOZj7lunf3v3fwlBKjRfX9EjEHKcscV98" +
--           "D40zRKIqgEpz4yvTVnfjU/VbmL/r4yhwTTbPCNsZNi8g50/OnvbCsXu5wQqVURCBuOb7seu98n7A" +
--           "/L23Tc8NX8mW6pL73UoOhYPH/GJv/I7Dzlqbg5pRUG1q++A//+Ng+4f9gDlATVzLHfErZiHioKrn" +
--           "H37uhgeG597sdYnIYeeszypQqQawre9dHNbd0Yj9/5KnfsB8DJpuXXj8Q+ryj3dUZglD1Uz3MsWv" +
--           "HX7uh1fv6QGHn7upAmrWQpEV2zSt+bVptamw+6C9VaP/hcoHrvkABgydUjPLywy6Oboh6HW6PgLj" +
--           "LYqStqYRQHKDMQflMhXOQrnata27tvGvufrEn8ZBfmdPP2AO7NpmAAw85B8qTyjKlt1svAHTjPGL" +
--           "k4w0jAcTAyllnBoh9Kxw/tEdS8cuT0WyH4vX1PYD5qMBzQDE2eFDxz09zsscWuwVHX6a8YwaFAiM" +
--           "NAkHr4vdUdf82rQN6JwnSl4N4vAxeKdxP2A+mjXuKTvcXcY9TdOnyxPk4zKZ/vbRAqe75C3QfZZY" +
--           "0P/y6/7299z+H4QrdGsoib8JAAAAAElFTkSuQmCC"
-+           "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" +
-+           "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" +
-+           "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" +
-+           "RRQFY4gWaQZQUJFwCUhISHLzuo9zzj67Hy4Cd+RD6XDBD90z59uZdX5rrf96nC24xkd7jtlb/7VS" +
-+           "da6jQEYKQiA8nUwlzcm39oWfXnvuWn5LXCtDyk6V9N6x4FGvu2ceydQw7amA8PsNAO04rvD7E8KQ" +
-+           "HxlTqncWbnnu0c8MfM+C+mfVh8fv144jfXPuwJoxA5QLUoJS4Gm0cnF27cY52IKsGOFas2ofDP/q" +
-+           "yT/cMPieurmjvb7BfdhOuTl1CtbM27FfehnnjTdB6+yXLQv/nfMwqqqwd7+COtWGHDKkMfit+xYH" +
-+           "V349fl3hu2fPne6dOv26UXWL36qdjtO4H/ffLWBZYBgIkW1aaw1KIQwTY9IEzPFjcfY1opXXWdS8" +
-+           "t0wI4V03+PPjqm1z0kTLml5D4hdrIBRC5ueh471opUDKTzlw0QlABAIEVq4gtXELsqT4fNH+vaVX" +
-+           "yyD/F/Cu22a2GUOHWOb4sQw+9jhCCNwVy8k/2Exh6zEiL2zBP6cOhMg4cnm0hEAIgU6lSG36I8EH" +
-+           "v4Pu6y/pqZu/PueR75k5Z40biz2ct3oVid+tg1QK7XlQ+XkYNZLQN+4lWDcbPA/7zztIbdmK09SM" +
-+           "yAt9OgtKIaNRAl9dSnLbdl18+J2wEGIgJ/D9q38UTv1pR8z/pTmFWinsV19DSIl2XOTSeoqeWpsl" +
-+           "j09kM/DIT0lt3IQwzSvKyJo0AW3bYPnejv69oSYnskm/uHsWEPEvXYK98x9gGBmAihFEn3yMWDxN" +
-+           "v62ywPvTinP3fRsqKtBXip4QqLPtyLIyvFNt07TWMifwwm8u9dXOEKmGv4A/gAA0IKtvpVsZ9KYV" +
-+           "QTO7UC1DUHZTOaG7F2d6/hWO19GJMfxzeL29xO9e/uOcwOu0PducUo29Zy/CMi/qTuWFKMz3Ma4k" +
-+           "wJneNN5lPT5gSp7Z20bnvEXgumg0WpP14HlopTKySiTrcwM/mChGCoTnwWXRdfv60I7L0XMJxjze" +
-+           "RMLObtnn+9OoqjGgTUhIZL7CrEohIypjRgjUqVPIMaPxunvK/lse86pkEwrlXRBqdtrbTqNTKaqG" +
-+           "5nP8J7cT8sks3f980U1AF/0L41izbMzKNKJAkdxcTLohkmmpPXFkaSnuB8fNnMBj2y5CWGid5YBx" +
-+           "tp1ET5xIOExFNPDJeonu24n38SqEHQMg72EDr89AfeQj9fxQnJYQWBrQiEAAkkkIBr3cwLtuHMMM" +
-+           "ak8jjMuKsqOTwY4OIiMrLkksdQgduwvdaZHYPgwZcfE6LJzDQVSrD2FqxAVO7WmM4cOxm5qRxUWD" +
-+           "uek20Wird+YMxpjKi5NTC4FQCrvlUNb4xyiBYCXCL7D35ZPcWEz6n2GwBf76OP5FvWhHZEpea0RJ" +
-+           "MbqrC5Rqygm81xPfYL/+BoEV90A6fWnKmSbqrX+hL/RtAOEbTnrPQ6RfihD+dRuR52IUvnCCyLMx" +
-+           "Aov6UCf8F78u8vLQA4MgJb6vLN2WE9kYI0c0qw8+tIXf5zMqKlAdHQgpQUqCh48woBQFFwYXgE4G" +
-+           "SawvRmwqQg51EHkeXp+B126B1AhDAwI5rAwViyFLSwbyf/C93TmJfFHjniOypORo4olfEvjuA5d2" +
-+           "dinxn4zRf64jOzITxyJ8mYKk3cQ94cc7b4KpEUYmb9p28N85D/e9Y1g1U1fmdKs0J0/+snYc7R46" +
-+           "jDV9Gtp1M51HStz9zbTbJzkaf4/OdC/p2qkMhH0cmhhm/iOjcE0QaITI1IZ2HPzLl+G+exRhmrGC" +
-+           "36zdcVUsVwsfeX7Dma6pMx+wX35lXWjVQ2DbOM1vIywLeeAg79c6bDj+NzpUlFHBCAM/HI0oD/KO" +
-+           "GKS11MfYM2mUASiFf9kSdFc3duObnlU9+R5a3sr9Pl98oHG9CATWDf7sCXwLF+BbOB8MA1/LYVwv" +
-+           "YzKW+Ji23pO0lucjTYnlaoS+tEn6Fi4A18VuasJXM21lYcPW5uv6D3t+0m3biceX+ZbUC1GQj9vV" +
-+           "w7HVc9iXfpfKwhqmRW+hPFRG1zNP07Dr9yxr9RMYPwFj/FjUsfexG/e71heqv1nYsHXzDbk96K6u" +
-+           "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" +
-+           "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" +
-+           "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="
-   }
- };
- 
--// 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"
--, "https://addons.mozilla.org/firefox/?utm_source=snippet&utm_medium=snippet&utm_campaign=addons"
--];
- 
--const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
-+// Bug with dom.storage.enabled set as false
-+// We are using DDG as a default in this case.
-+let gSearchEngine = {"name": "DuckDuckGo HTML", "searchUrl": "https://duckduckgo.com/html/?t=iceweasel&q=_searchTerms_"};
- 
--// 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) {
--  for (let mutation of mutations) {
--    if (mutation.attributeName == "searchEngineName") {
--      setupSearchEngine();
--      if (!gInitialized) {
--        ensureSnippetsMapThen(loadSnippets);
--        gInitialized = true;
--      }
--      return;
--    }
--  }
--});
--
--window.addEventListener("pageshow", function () {
--  // Delay search engine setup, cause browser.js::BrowserOnAboutPageLoad runs
--  // later and may use asynchronous getters.
--  window.gObserver.observe(document.documentElement, { attributes: true });
--  fitToWidth();
--  window.addEventListener("resize", fitToWidth);
--
--  // Ask chrome to update snippets.
--  var event = new CustomEvent("AboutHomeLoad", {bubbles:true});
--  document.dispatchEvent(event);
--});
--
--window.addEventListener("pagehide", function() {
--  window.gObserver.disconnect();
--  window.removeEventListener("resize", fitToWidth);
-+document.addEventListener("DOMContentLoaded", function init() {
-+  setupSearchEngine();
- });
-+window.addEventListener("load", fitToWidth);
-+window.addEventListener("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)
-+function onSearchSubmit(aEvent)
- {
--  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());
-+  let searchTerms = document.getElementById("searchText").value;
-+  if (gSearchEngine && searchTerms.length > 0) {
-+    const SEARCH_TOKENS = {
-+      "_searchTerms_": encodeURIComponent(searchTerms)
-     }
--
--    for (let callback of gSnippetsMapCallbacks) {
--      callback(gSnippetsMap);
-+    let url = gSearchEngine.searchUrl;
-+    for (let key in SEARCH_TOKENS) {
-+      url = url.replace(key, SEARCH_TOKENS[key]);
-     }
--    gSnippetsMapCallbacks.length = 0;
-+    window.location.href = url;
-   }
- 
--  let openRequest = indexedDB.open(DATABASE_NAME, DATABASE_VERSION);
-+  aEvent.preventDefault();
-+}
- 
--  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);
--    }
-+function setupSearchEngine()
-+{
-+  if (localStorage && localStorage["search-engine"]) {
-+        gSearchEngine = JSON.parse(localStorage["search-engine"]);
-   }
- 
--  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);
--    }
-+  
-+  // Look for extended information, like logo and links.
-+  var searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name];
-+  if (searchEngineInfo) {
-+    for (let prop in searchEngineInfo)
-+      gSearchEngine[prop] = searchEngineInfo[prop];
-   }
--}
- 
--function onSearchSubmit(aEvent)
--{
--  let searchTerms = document.getElementById("searchText").value;
--  let engineName = document.documentElement.getAttribute("searchEngineName");
-+  // Enqueue additional params if required by the engine definition.
-+  if (gSearchEngine.params)
-+    gSearchEngine.searchUrl += "&" + gSearchEngine.params;
- 
--  if (engineName && searchTerms.length > 0) {
--    // Send an event that will perform a search and Firefox Health Report will
--    // record that a search from about:home has occurred.
--    let eventData = JSON.stringify({
--      engineName: engineName,
--      searchTerms: searchTerms
--    });
--    let event = new CustomEvent("AboutHomeSearchEvent", {detail: eventData});
--    document.dispatchEvent(event);
-+  // Add search engine logo.
-+  if (gSearchEngine.image) {
-+    let logoElt = document.getElementById("searchEngineLogo");
-+    logoElt.src = gSearchEngine.image;
-+    logoElt.alt = gSearchEngine.name;
-   }
- 
--  aEvent.preventDefault();
--}
--
--
--function setupSearchEngine()
--{
-   // The "autofocus" attribute doesn't focus the form element
-   // immediately when the element is first drawn, so the
-   // attribute is also used for styling when the page first loads.
-@@ -322,173 +104,6 @@ function setupSearchEngine()
-     searchText.removeEventListener("blur", searchText_onBlur);
-     searchText.removeAttribute("autofocus");
-   });
-- 
--  let searchEngineName = document.documentElement.getAttribute("searchEngineName");
--  let searchEngineInfo = SEARCH_ENGINES[searchEngineName];
--  let logoElt = document.getElementById("searchEngineLogo");
--
--  // Add search engine logo.
--  if (searchEngineInfo && searchEngineInfo.image) {
--    logoElt.parentNode.hidden = false;
--    logoElt.src = searchEngineInfo.image;
--    logoElt.alt = searchEngineName;
--    searchText.placeholder = "";
--  }
--  else {
--    logoElt.parentNode.hidden = true;
--    searchText.placeholder = searchEngineName;
--  }
--
--}
--
--/**
-- * Inform the test harness that we're done loading the page.
-- */
--function loadSucceeded()
--{
--  var event = new CustomEvent("AboutHomeLoadSnippetsSucceeded", {bubbles:true});
--  document.dispatchEvent(event);
--}
--
--/**
-- * 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");
--
--  // Allow tests to modify the snippets map before using it.
--  var event = new CustomEvent("AboutHomeLoadSnippets", {bubbles:true});
--  document.dispatchEvent(event);
--
--  // 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();
--      loadSucceeded();
--      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();
--      loadSucceeded();
--    };
--    xhr.send(null);
--  } else {
--    showSnippets();
--    loadSucceeded();
--  }
--}
--
--/**
-- * 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() {
-diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml
-index 1d03d38..fda3095 100644
---- a/browser/base/content/abouthome/aboutHome.xhtml
-+++ b/browser/base/content/abouthome/aboutHome.xhtml
-@@ -43,30 +43,9 @@
-           <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"/>
- 
--    <div id="launcher">
--      <button class="launchButton" id="downloads">&abouthome.downloadsButton.label;</button>
--      <button class="launchButton" id="bookmarks">&abouthome.bookmarksButton.label;</button>
--      <button class="launchButton" id="history">&abouthome.historyButton.label;</button>
--      <button class="launchButton" id="apps" hidden="true">&abouthome.appsButton.label;</button>
--      <button class="launchButton" id="addons">&abouthome.addonsButton.label;</button>
--      <button class="launchButton" id="sync">&abouthome.syncButton.label;</button>
--      <button class="launchButton" id="settings">&abouthome.settingsButton.label;</button>
--      <div id="restorePreviousSessionSeparator"/>
--      <button class="launchButton" id="restorePreviousSession">&historyRestoreLastSession.label;</button>
--    </div>
--
--    <a id="aboutMozilla" href="https://www.mozilla.org/about/?utm_source=about-home&amp;utm_medium=Referral"/>
-+    <a id="aboutGNU" href="http://gnu.org"></a>
-   </body>
- </html>
-diff --git a/browser/base/content/content.js b/browser/base/content/content.js
-index 9428613..fc3c00a 100644
---- a/browser/base/content/content.js
-+++ b/browser/base/content/content.js
-@@ -50,216 +50,3 @@ if (Services.prefs.getBoolPref("browser.tabs.remote")) {
-     LoginManagerContent.onUsernameInput(event);
-   });
- }
--
--let AboutHomeListener = {
--  init: function(chromeGlobal) {
--    chromeGlobal.addEventListener('AboutHomeLoad', () => this.onPageLoad(), false, true);
--  },
--
--  handleEvent: function(aEvent) {
--    switch (aEvent.type) {
--      case "AboutHomeLoad":
--        this.onPageLoad();
--        break;
--    }
--  },
--
--  receiveMessage: function(aMessage) {
--    switch (aMessage.name) {
--      case "AboutHome:Update":
--        this.onUpdate(aMessage.data);
--        break;
--    }
--  },
--
--  onUpdate: function(aData) {
--    let doc = content.document;
--    if (doc.documentURI.toLowerCase() != "about:home")
--      return;
--
--    if (aData.showRestoreLastSession && !PrivateBrowsingUtils.isWindowPrivate(content))
--      doc.getElementById("launcher").setAttribute("session", "true");
--
--    // Inject search engine and snippets URL.
--    let docElt = doc.documentElement;
--    // set the following attributes BEFORE searchEngineName, which triggers to
--    // show the snippets when it's set.
--    docElt.setAttribute("snippetsURL", aData.snippetsURL);
--    if (aData.showKnowYourRights)
--      docElt.setAttribute("showKnowYourRights", "true");
--    docElt.setAttribute("snippetsVersion", aData.snippetsVersion);
--    docElt.setAttribute("searchEngineName", Services.search.defaultEngine.name);
--  },
--
--  onPageLoad: function() {
--    let doc = content.document;
--    if (doc.documentURI.toLowerCase() != "about:home" ||
--        doc.documentElement.hasAttribute("hasBrowserHandlers")) {
--      return;
--    }
--
--    doc.documentElement.setAttribute("hasBrowserHandlers", "true");
--    let updateListener = this;
--    addMessageListener("AboutHome:Update", updateListener);
--    addEventListener("click", this.onClick, true);
--    addEventListener("pagehide", function onPageHide(event) {
--      if (event.target.defaultView.frameElement)
--        return;
--      removeMessageListener("AboutHome:Update", updateListener);
--      removeEventListener("click", this.onClick, true);
--      removeEventListener("pagehide", onPageHide, true);
--      if (event.target.documentElement)
--        event.target.documentElement.removeAttribute("hasBrowserHandlers");
--    }, true);
--
--    // XXX bug 738646 - when Marketplace is launched, remove this statement and
--    // the hidden attribute set on the apps button in aboutHome.xhtml
--    if (Services.prefs.getPrefType("browser.aboutHome.apps") == Services.prefs.PREF_BOOL &&
--        Services.prefs.getBoolPref("browser.aboutHome.apps"))
--      doc.getElementById("apps").removeAttribute("hidden");
--
--    sendAsyncMessage("AboutHome:RequestUpdate");
--
--    doc.addEventListener("AboutHomeSearchEvent", function onSearch(e) {
--      sendAsyncMessage("AboutHome:Search", { searchData: e.detail });
--    }, true, true);
--  },
--
--  onClick: function(aEvent) {
--    if (!aEvent.isTrusted || // Don't trust synthetic events
--        aEvent.button == 2 || aEvent.target.localName != "button") {
--      return;
--    }
--
--    let originalTarget = aEvent.originalTarget;
--    let ownerDoc = originalTarget.ownerDocument;
--    let elmId = originalTarget.getAttribute("id");
--
--    switch (elmId) {
--      case "restorePreviousSession":
--        sendAsyncMessage("AboutHome:RestorePreviousSession");
--        ownerDoc.getElementById("launcher").removeAttribute("session");
--        break;
--
--      case "downloads":
--        sendAsyncMessage("AboutHome:Downloads");
--        break;
--
--      case "bookmarks":
--        sendAsyncMessage("AboutHome:Bookmarks");
--        break;
--
--      case "history":
--        sendAsyncMessage("AboutHome:History");
--        break;
--
--      case "apps":
--        sendAsyncMessage("AboutHome:Apps");
--        break;
--
--      case "addons":
--        sendAsyncMessage("AboutHome:Addons");
--        break;
--
--      case "sync":
--        sendAsyncMessage("AboutHome:Sync");
--        break;
--
--      case "settings":
--        sendAsyncMessage("AboutHome:Settings");
--        break;
--    }
--  },
--};
--AboutHomeListener.init(this);
--
--
--var global = this;
--
--let ClickEventHandler = {
--  init: function init() {
--    Cc["@mozilla.org/eventlistenerservice;1"]
--      .getService(Ci.nsIEventListenerService)
--      .addSystemEventListener(global, "click", this, true);
--  },
--
--  handleEvent: function(event) {
--    // Bug 903016: Most of this code is an unfortunate duplication from
--    // contentAreaClick in browser.js.
--    if (!event.isTrusted || event.defaultPrevented || event.button == 2)
--      return;
--
--    let [href, node] = this._hrefAndLinkNodeForClickEvent(event);
--
--    let json = { button: event.button, shiftKey: event.shiftKey,
--                 ctrlKey: event.ctrlKey, metaKey: event.metaKey,
--                 altKey: event.altKey, href: null, title: null,
--                 bookmark: false };
--
--    if (href) {
--      json.href = href;
--      if (node) {
--        json.title = node.getAttribute("title");
--
--        if (event.button == 0 && !event.ctrlKey && !event.shiftKey &&
--            !event.altKey && !event.metaKey) {
--          json.bookmark = node.getAttribute("rel") == "sidebar";
--          if (json.bookmark)
--            event.preventDefault(); // Need to prevent the pageload.
--        }
--      }
--
--      sendAsyncMessage("Content:Click", json);
--      return;
--    }
--
--    // This might be middle mouse navigation.
--    if (event.button == 1)
--      sendAsyncMessage("Content:Click", json);
--  },
--
--  /**
--   * Extracts linkNode and href for the current click target.
--   *
--   * @param event
--   *        The click event.
--   * @return [href, linkNode].
--   *
--   * @note linkNode will be null if the click wasn't on an anchor
--   *       element (or XLink).
--   */
--  _hrefAndLinkNodeForClickEvent: function(event) {
--    function isHTMLLink(aNode) {
--      // Be consistent with what nsContextMenu.js does.
--      return ((aNode instanceof content.HTMLAnchorElement && aNode.href) ||
--              (aNode instanceof content.HTMLAreaElement && aNode.href) ||
--              aNode instanceof content.HTMLLinkElement);
--    }
--
--    let node = event.target;
--    while (node && !isHTMLLink(node)) {
--      node = node.parentNode;
--    }
--
--    if (node)
--      return [node.href, node];
--
--    // If there is no linkNode, try simple XLink.
--    let href, baseURI;
--    node = event.target;
--    while (node && !href) {
--      if (node.nodeType == content.Node.ELEMENT_NODE) {
--        href = node.getAttributeNS("http://www.w3.org/1999/xlink", "href");
--        if (href)
--          baseURI = node.ownerDocument.baseURIObject;
--      }
--      node = node.parentNode;
--    }
--
--    // In case of XLink, we don't return the node we got href from since
--    // callers expect <a>-like elements.
--    // Note: makeURI() will throw if aUri is not a valid URI.
--    return [href ? makeURI(href, null, baseURI).spec : null, null];
--  }
--};
--ClickEventHandler.init();
-diff --git a/browser/base/jar.mn b/browser/base/jar.mn
-index f2a820c..9478039 100644
---- a/browser/base/jar.mn
-+++ b/browser/base/jar.mn
-@@ -33,7 +33,7 @@ browser.jar:
-         content/browser/abouthome/settings.png        (content/abouthome/settings.png)
-         content/browser/abouthome/restore.png         (content/abouthome/restore.png)
-         content/browser/abouthome/restore-large.png   (content/abouthome/restore-large.png)
--        content/browser/abouthome/mozilla.png         (content/abouthome/mozilla.png)
-+        content/browser/abouthome/gnu_headshadow.png  (content/abouthome/gnu_headshadow.png)
-         content/browser/abouthome/snippet1@2x.png      (content/abouthome/snippet1@2x.png)
-         content/browser/abouthome/snippet2@2x.png      (content/abouthome/snippet2@2x.png)
-         content/browser/abouthome/downloads@2x.png     (content/abouthome/downloads@2x.png)
-@@ -45,7 +45,6 @@ browser.jar:
-         content/browser/abouthome/settings@2x.png      (content/abouthome/settings@2x.png)
-         content/browser/abouthome/restore@2x.png       (content/abouthome/restore@2x.png)
-         content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png)
--        content/browser/abouthome/mozilla@2x.png       (content/abouthome/mozilla@2x.png)
- #ifdef MOZ_SERVICES_HEALTHREPORT
-         content/browser/abouthealthreport/abouthealth.xhtml   (content/abouthealthreport/abouthealth.xhtml)
-         content/browser/abouthealthreport/abouthealth.js      (content/abouthealthreport/abouthealth.js)
-diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd
-index e84341f..5476d32 100644
---- a/browser/locales/en-US/chrome/browser/aboutHome.dtd
-+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd
-@@ -13,17 +13,6 @@
- 
- <!ENTITY abouthome.searchEngineButton.label "Search">
- 
--<!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1):
--     text in <a/> will be linked to the Firefox features page on mozilla.com
---->
--<!ENTITY abouthome.defaultSnippet1.v1 "Thanks for choosing Firefox! To get the most out of your browser, learn more about the <a>latest features</a>.">
--<!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1):
--     text in <a/> will be linked to the featured add-ons on addons.mozilla.org
---->
--<!ENTITY abouthome.defaultSnippet2.v1 "It's easy to customize your Firefox exactly the way you want it. <a>Choose from thousands of add-ons</a>.">
--<!-- LOCALIZATION NOTE (abouthome.rightsSnippet): text in <a/> will be linked to about:rights -->
--<!ENTITY abouthome.rightsSnippet "&brandFullName; is free and open source software from the non-profit Mozilla Foundation. <a>Know your rights…</a>">
--
- <!ENTITY abouthome.bookmarksButton.label "Bookmarks">
- <!ENTITY abouthome.historyButton.label   "History">
- <!ENTITY abouthome.settingsButton.label  "Settings">
-diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
-index 087cc50..5654eb9 100644
---- a/browser/locales/en-US/chrome/browser-region/region.properties
-+++ b/browser/locales/en-US/chrome/browser-region/region.properties
-@@ -3,17 +3,12 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo HTML
- 
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
--browser.search.order.2=Yahoo
--browser.search.order.3=Bing
--
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
--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
- 
- # 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 
-@@ -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=4
- 
--# The default set of protocol handlers for webcal:
--gecko.handlerService.schemes.webcal.0.name=30 Boxes
--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
--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:
--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 --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
-@@ -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="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="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/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Labs</A>
-+    </DL><p>
-+    <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3>
-+    <DL><p>
-+        <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A>
-+        <DT><A HREF="http://libreplanet.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC">LibrePlanet</A>
-+        <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</A>
-+        <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/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm
-index 98c443d..0173762 100644
---- a/browser/modules/AboutHome.jsm
-+++ b/browser/modules/AboutHome.jsm
-@@ -8,7 +8,7 @@ let Cc = Components.classes;
- let Ci = Components.interfaces;
- let Cu = Components.utils;
- 
--this.EXPORTED_SYMBOLS = [ "AboutHomeUtils", "AboutHome" ];
-+this.EXPORTED_SYMBOLS = [ "AboutHome" ];
- 
- Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
- Components.utils.import("resource://gre/modules/Services.jsm");
-@@ -16,66 +16,6 @@ Components.utils.import("resource://gre/modules/Services.jsm");
- XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
-   "resource://gre/modules/PrivateBrowsingUtils.jsm");
- 
--// Url to fetch snippets, in the urlFormatter service format.
--const SNIPPETS_URL_PREF = "browser.aboutHomeSnippets.updateUrl";
--
--// Should be bumped up if the snippets content format changes.
--const STARTPAGE_VERSION = 4;
--
--this.AboutHomeUtils = {
--  get snippetsVersion() STARTPAGE_VERSION,
--
--  /*
--   * showKnowYourRights - Determines if the user should be shown the
--   * about:rights notification. The notification should *not* be shown if
--   * we've already shown the current version, or if the override pref says to
--   * never show it. The notification *should* be shown if it's never been seen
--   * before, if a newer version is available, or if the override pref says to
--   * always show it.
--   */
--  get showKnowYourRights() {
--    // Look for an unconditional override pref. If set, do what it says.
--    // (true --> never show, false --> always show)
--    try {
--      return !Services.prefs.getBoolPref("browser.rights.override");
--    } catch (e) { }
--    // Ditto, for the legacy EULA pref.
--    try {
--      return !Services.prefs.getBoolPref("browser.EULA.override");
--    } catch (e) { }
--
--#ifndef MOZILLA_OFFICIAL
--    // Non-official builds shouldn't show the notification.
--    return false;
--#endif
--
--    // Look to see if the user has seen the current version or not.
--    var currentVersion = Services.prefs.getIntPref("browser.rights.version");
--    try {
--      return !Services.prefs.getBoolPref("browser.rights." + currentVersion + ".shown");
--    } catch (e) { }
--
--    // Legacy: If the user accepted a EULA, we won't annoy them with the
--    // equivalent about:rights page until the version changes.
--    try {
--      return !Services.prefs.getBoolPref("browser.EULA." + currentVersion + ".accepted");
--    } catch (e) { }
--
--    // We haven't shown the notification before, so do so now.
--    return true;
--  }
--};
--
--/**
-- * Returns the URL to fetch snippets from, in the urlFormatter service format.
-- */
--XPCOMUtils.defineLazyGetter(AboutHomeUtils, "snippetsURL", function() {
--  let updateURL = Services.prefs
--                          .getCharPref(SNIPPETS_URL_PREF)
--                          .replace("%STARTPAGE_VERSION%", STARTPAGE_VERSION);
--  return Services.urlFormatter.formatURL(updateURL);
--});
--
- /**
-  * This code provides services to the about:home page. Whenever
-  * about:home needs to do something chrome-privileged, it sends a
-@@ -185,17 +125,8 @@ let AboutHome = {
-     ss.promiseInitialized.then(function() {
-       let data = {
-         showRestoreLastSession: ss.canRestoreLastSession,
--        snippetsURL: AboutHomeUtils.snippetsURL,
--        showKnowYourRights: AboutHomeUtils.showKnowYourRights,
--        snippetsVersion: AboutHomeUtils.snippetsVersion
-       };
- 
--      if (AboutHomeUtils.showKnowYourRights) {
--        // Set pref to indicate we've shown the notification.
--        let currentVersion = Services.prefs.getIntPref("browser.rights.version");
--        Services.prefs.setBoolPref("browser.rights." + currentVersion + ".shown", true);
--      }
--
-       if (target) {
-         target.messageManager.sendAsyncMessage("AboutHome:Update", data);
-       } else {
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
deleted file mode 100644
index 957ea0dbf..000000000
--- a/libre/iceweasel-libre/mozconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# Iceweasel
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=debian/branding
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-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-pixman
-
-# Features
-ac_add_options --enable-startup-notification
-ac_add_options --enable-pulseaudio
-
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-installer
-ac_add_options --disable-debug-symbols
-
-# Parabola features
-ac_add_options --disable-safe-browsing
-
-# Other
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo
deleted file mode 100644
index 71ba205a4..000000000
--- a/libre/iceweasel-libre/mozconfig.pgo
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js
deleted file mode 100644
index 6510944a7..000000000
--- a/libre/iceweasel-libre/vendor.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default browser checking.
-pref("browser.shell.checkDefaultBrowser", false);
-
-// Don't disable our bundled extensions in the application directory
-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);
-
-// Disable localstorage for privacy reasons.
-pref("dom.storage.enabled", false);
-
-// Disable missing nonfree flash notification
-pref("plugins.notifyMissingFlash", false);
diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD
index 9cd3b1a43..5cde02a92 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 102928 2013-12-24 09:48:04Z spupykin $
+# $Id: PKGBUILD 104641 2014-01-24 07:00:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=firefox-noscript
 pkgname=iceweasel-noscript
-pkgver=2.6.8.8
+pkgver=2.6.8.13
 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=('55c2fe321a121b9708afb147d655adeb')
+md5sums=('75ec11cc5f3f039e81113abfb908110e')
 
 package() {
 #  _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
deleted file mode 100644
index a9b7a2423..000000000
--- a/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 55bd14c586f0f64b8ee5515161be1aa1098d3226 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Tue, 3 Jul 2012 22:28:05 -0400
-Subject: [initscripts][PATCH] remove /run/nologin before leaving rc.multi
-To: arch-projects@archlinux.org
-
-systemd-186 writes this file when running systemd-tmpfiles, but
-initscripts never removes it. This disallows all non-root logins.
-
-Reported-by: Dan McGee <dan@archlinux.org>
-Signed-off-by: Dave Reisner <dreisner@archlinux.org>
----
- rc.multi | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/rc.multi b/rc.multi
-index daf2372..7d4acaa 100755
---- a/rc.multi
-+++ b/rc.multi
-@@ -31,4 +31,6 @@ run_hook multi_end
- 
- bootlogd_stop
- 
-+rm -f /run/nologin
-+
- # vim: set ts=2 sw=2 noet:
--- 
-1.7.11.1
-
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
deleted file mode 100644
index 1f68a6356..000000000
--- a/libre/initscripts/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 167943 2012-10-03 23:12:35Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Thomas Bächler <thomas@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
-
-pkgname=initscripts
-pkgver=2012.10.5
-pkgrel=1
-pkgdesc="System initialization/bootup scripts (Parabola branding)"
-arch=('any')
-url="https://parabolagnulinux.org"
-license=('GPL2')
-groups=('base')
-provides=('initscripts-systemd')
-conflicts=('initscripts-systemd')
-replaces=('initscripts-systemd')
-backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
-depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit-tools')
-optdepends=('dhcpcd: DHCP network configuration'
-            'bridge-utils: Legacy network bridging support'
-            'net-tools: Legacy network support'
-            'wireless_tools: Legacy wireless networking'
-            'sysvinit: Legacy init support')
-makedepends=(asciidoc)
-install=initscripts.install
-source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"{,.sig})
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
-md5sums=('16039aeb4c996194d9466a8c66a06f5a'
-         '522804c7981c32c3c779964844d64377')
-md5sums=('3be94446496bda58051141e0d3863a7b'
-         '3f03d3a5c7d8b7e1ddebb13334441440')
diff --git a/libre/initscripts/initscripts.install b/libre/initscripts/initscripts.install
deleted file mode 100644
index 557faafe4..000000000
--- a/libre/initscripts/initscripts.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_upgrade() {
-  if [ "$(vercmp $2 2009.07)" -lt 0 ]; then
-    echo "==> Adjusting /etc/inittab for transition to /dev/tty standard."
-    echo "==> Original file saved as /etc/inittab.pacsave"
-    sed -i'.pacsave' 's#vc/\([0-9]\)#tty\1#' /etc/inittab
-  fi
-  if [ "$(vercmp $2 2011.06.1)" -lt 0 ]; then
-    echo "Blacklisting of modules is no longer supported in rc.conf,"
-    echo "please add blacklist entries to /etc/modprobe.d/ instead."
-  fi
-  if [ "$(vercmp $2 2011.07.2)" -lt 0 ]; then
-    echo "VERBOSE= in rc.conf no longer has any effect."
-    echo "Please append 'quiet' to your kernel command line."
-  fi
-  if [ "$(vercmp $2 2011.10.1)" -lt 0 ]; then
-    echo "If using non-bash-compatible shell, please set LANG in /etc/locale.conf,"
-    echo "as LOCALE in /etc/rc.conf no longer works."
-  fi
-  if [ "$(vercmp $2 2012.08.1)" -lt 0 ]; then
-    echo "----"
-    echo "> initscripts now ships a compatibility layer to make systemd use MODULES and"
-    echo "> DAEMONS from rc.conf; and run rc.local and rc.local.shutdown on boot and"
-    echo "> shutdown, respectively. Refer to arch-modules-load(8) and arch-daemons(8)."
-    echo "----"
-  fi
-}
diff --git a/libre/initscripts/split-hwclock-calls.diff b/libre/initscripts/split-hwclock-calls.diff
deleted file mode 100644
index c0a6a4fd6..000000000
--- a/libre/initscripts/split-hwclock-calls.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/rc.sysinit b/rc.sysinit
-index eb49e2b..8f9727b 100755
---- a/rc.sysinit
-+++ b/rc.sysinit
-@@ -34,7 +34,6 @@ bootlogd -p /run/bootlogd.pid
- 
- run_hook sysinit_start
- 
--HWCLOCK_PARAMS="--systz"
- case $HARDWARECLOCK in
- 	"") ;;
- 	UTC) HWCLOCK_PARAMS+=" --utc --noadjfile";;
-@@ -54,7 +53,7 @@ if [[ $HWCLOCK_PARAMS ]]; then
- 
- 	[[ $TIMEZONE ]] && export TZ=$TIMEZONE
- 
--	hwclock $HWCLOCK_PARAMS && stat_done || stat_fail
-+	{ hwclock $HWCLOCK_PARAMS && hwclock --systz; } && stat_done || stat_fail
- 
- 	unset TZ
- fi
diff --git a/libre/initscripts/wireless.conf.d b/libre/initscripts/wireless.conf.d
deleted file mode 100644
index 47540ef40..000000000
--- a/libre/initscripts/wireless.conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Settings for wireless cards
-#
-# For each wireless interface declared in INTERFACES (in rc.conf), declare
-# a wlan_${IF} variable that contains the arguments to be passed to
-# iwconfig(8).  Then list the original interface name in the
-# WLAN_INTERFACES array.
-#
-
-#wlan_eth0="eth0 mode managed essid default"
-#WLAN_INTERFACES=(eth0)
-
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
deleted file mode 100644
index 93d55bbac..000000000
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z 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@parabola.nu>
-
-_pkgname='kdebase-konqueror'
-pkgname='kdebase-konqueror-libre'
-pkgver=4.12.0
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-url="http://kde.org/applications/internet/konqueror/"
-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"
-        'konq-about-fsdg.diff')
-sha1sums=('e85b5445380e44894efcaa21f4c95fad1ed4c4f6'
-          'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
-pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation'
-depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
-optdepends=('kwebkitpart: to enable webkit engine')
-install='kdebase-konqueror.install'
-conflicts=('kdebase-nsplugins' 'kdebase-konqueror')
-replaces=('kdebase-nsplugins' 'kdebase-konqueror')
-provides=("kdebase-konqueror=$pkgver")
-
-prepare() {
-  mkdir build
-
-  cd kde-baseapps-${pkgver}
-  # Don't recommend nonfree software or Google.
-  patch -Np1 -i "${srcdir}/konq-about-fsdg.diff"
-}
-
-build() {
-	cd build
-	cmake ../kde-baseapps-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DKDE4_BUILD_TESTS=OFF \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-        for i in konqueror doc/konqueror nsplugins; do
-            cd $srcdir/build/${i}
-	    make
-        done
-}
-
-package() {
-        for i in konqueror doc/konqueror nsplugins; do
-              cd $srcdir/build/${i}
-              make DESTDIR=$pkgdir install
-        done
-}
diff --git a/libre/kdebase-konqueror-libre/kdebase-konqueror.install b/libre/kdebase-konqueror-libre/kdebase-konqueror.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/libre/kdebase-konqueror-libre/kdebase-konqueror.install
+++ /dev/null
@@ -1,12 +0,0 @@
-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/libre/kdebase-konqueror-libre/konq-about-fsdg.diff b/libre/kdebase-konqueror-libre/konq-about-fsdg.diff
deleted file mode 100644
index 93ef4016a..000000000
--- a/libre/kdebase-konqueror-libre/konq-about-fsdg.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ru kde-baseapps-4.8.0.orig/konqueror/about/konq_aboutpage.cc kde-baseapps-4.8.0/konqueror/about/konq_aboutpage.cc
---- kde-baseapps-4.8.0.orig/konqueror/about/konq_aboutpage.cc	2012-01-30 19:28:59.506176399 +0100
-+++ kde-baseapps-4.8.0/konqueror/about/konq_aboutpage.cc	2012-01-30 19:34:50.695537153 +0100
-@@ -214,14 +214,11 @@
- 		     QString("http://www.ecma-international.org/publications/standards/ECMA-262.HTM")) )
-           .arg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.", QString("exec:/kcmshell4 khtml_java_js")) )
-           .arg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.", QString("exec:/kcmshell4 khtml_java_js")) ) // leave the double backslashes here, they are necessary for javascript !
--          .arg( i18n("Secure <A HREF=\"%1\">Java</A><SUP>&reg;</SUP> support", QString("http://www.oracle.com/technetwork/java/index.html")) )
--          .arg( i18n("JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">IBM</A> or <A HREF=\"%2\">Sun/Oracle</A>)",
--                       QString("http://www.ibm.com"), QString("http://www.oracle.com/technetwork/java/index.html")) )
-+          .arg( i18n("Secure Java<SUP>&reg;</SUP> support") )
-+          .arg( i18n("JDK 1.2.0 (Java 2) compatible VM") )
-           .arg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.", QString("exec:/kcmshell4 khtml_java_js")) ) // TODO Maybe test if Java is enabled ?
--          .arg( i18n("Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%4\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2\">Real<SUP>&reg;</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>&reg;</SUP></A>Video, etc.)",
--                       QString("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"),
--                       QString("http://www.real.com"), QString("http://www.real.com"),
--                       QString("about:plugins")) )
-+          .arg( i18n("Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%1\">plugins</A> ",
-+                       QString("about:plugins")) )
-           .arg( i18n("built-in") )
-           .arg( i18n("Secure Sockets Layer") )
-           .arg( i18n("(TLS/SSL v2/3) for secure communications up to 168bit") )
-@@ -293,8 +290,8 @@
- 	.arg( i18n( "Tips" ) )
- 	.arg( i18n( "Specifications" ) )
- 	.arg( i18n( "Tips &amp; Tricks" ) )
--	  .arg( i18n( "Use Web-Shortcuts: by typing \"gg: KDE\" one can search the Internet, "
--		      "using Google, for the search phrase \"KDE\". There are a lot of "
-+	  .arg( i18n( "Use Web-Shortcuts: by typing \"dd: KDE\" one can search the Internet, "
-+		      "using DuckDuckGo HTML, for the search phrase \"KDE\". There are a lot of "
- 		      "Web-Shortcuts predefined to make searching for software or looking "
- 		      "up certain words in an encyclopedia a breeze. You can even "
-                       "<a href=\"%1\">create your own</a> Web-Shortcuts." , QString("exec:/kcmshell4 ebrowsing")) )
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 5be70de9c..6ae82841a 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
+# $Id: PKGBUILD 204616 2014-01-24 10:54:17Z andyrtr $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdebase-runtime
 pkgname=kdebase-runtime-libre
-pkgver=4.12.0
-pkgrel=1
+pkgver=4.12.1
+pkgrel=2
 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kde-runtime'
@@ -26,7 +26,7 @@ install="${_pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
         'duckduckgo_html.desktop'
         'duckduckgo_lite.desktop')
-sha1sums=('7c077b5ff2839fee1cc55016cd6711da1abb584c'
+sha1sums=('e62d0b6a8fea172ac4b36a16004f10161406872a'
           'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
           'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
 
diff --git a/libre/kdebase-runtime-libre/duckduckgo_html.desktop b/libre/kdebase-runtime-libre/duckduckgo_html.desktop
deleted file mode 100644
index ba6a602ad..000000000
--- a/libre/kdebase-runtime-libre/duckduckgo_html.desktop
+++ /dev/null
@@ -1,113 +0,0 @@
-[Desktop Entry]
-Charset=
-Hidden=false
-Keys=duckduckgo,dd,dukgo
-Name=Duck Duck Go HTML
-Name[ar]=Duck Duck Go HTML
-Name[ast]=Duck Duck Go HTML
-Name[bg]=Duck Duck Go HTML
-Name[bn]=Duck Duck Go HTML
-Name[bs]=Dak dak go HTML
-Name[ca]=Duck Duck Go HTML
-Name[ca@valencia]=Duck Duck Go HTML
-Name[cs]=Duck Duck Go HTML
-Name[da]=Duck Duck Go HTML
-Name[de]=Duck Duck Go HTML
-Name[el]=Duck Duck Go HTML
-Name[en_GB]=Duck Duck Go HTML
-Name[eo]=Duck Duck Go HTML
-Name[es]=Duck Duck Go HTML
-Name[et]=Duck Duck Go HTML
-Name[eu]=Duck Duck Go HTML
-Name[fa]=Duck Duck Go HTML
-Name[fi]=Duck Duck Go HTML
-Name[fr]=Duck Duck Go HTML
-Name[ga]=Duck Duck Go HTML
-Name[gl]=Duck Duck Go HTML
-Name[gu]=Duck Duck Go HTML
-Name[he]=Duck Duck Go HTML
-Name[hi]=Duck Duck Go HTML
-Name[hr]=Duck Duck Go HTML
-Name[hu]=Duck Duck Go HTML
-Name[ia]=Duck Duck Go HTML
-Name[id]=Duck Duck Go HTML
-Name[is]=Duck Duck Go HTML
-Name[it]=Duck Duck Go HTML
-Name[ja]=Duck Duck Go HTML
-Name[kk]=Duck Duck Go HTML
-Name[km]=Duck Duck Go HTML
-Name[kn]=Duck Duck Go HTML
-Name[ko]=Duck Duck Go HTML
-Name[lt]=Duck Duck Go HTML
-Name[lv]=Duck Duck Go HTML
-Name[ml]=Duck Duck Go HTML
-Name[nb]=Duck Duck Go HTML
-Name[nds]=Duck Duck Go HTML
-Name[nl]=Duck Duck Go HTML
-Name[nn]=Duck Duck Go HTML
-Name[pa]=Duck Duck Go HTML
-Name[pl]=Duck Duck Go HTML
-Name[pt]=Duck Duck Go HTML
-Name[pt_BR]=Duck Duck Go HTML
-Name[ro]=Duck Duck Go HTML
-Name[ru]=Поиск Duck Duck Go HTML
-Name[si]=Duck Duck Go HTML
-Name[sk]=Duck Duck Go HTML
-Name[sl]=Duck Duck Go HTML
-Name[sr]=Duck Duck Go HTML
-Name[sr@ijekavian]=Duck Duck Go HTML
-Name[sr@ijekavianlatin]=Duck Duck Go HTML
-Name[sr@latin]=Duck Duck Go HTML
-Name[sv]=Duck Duck Go HTML
-Name[tg]=Duck Duck Go HTML
-Name[th]=Duck Duck Go HTML
-Name[tr]=Duck Duck Go HTML
-Name[ug]=Duck Duck Go HTML
-Name[uk]=Duck Duck Go HTML
-Name[vi]=Duck Duck Go HTML
-Name[wa]=Duck Duck Go HTML
-Name[x-test]=xxDuck Duck Go HTMLxx
-Name[zh_CN]=Duck Duck Go HTML
-Name[zh_TW]=Duck Duck Go HTML
-Query=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[bg]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[bn]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[ca]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[cs]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[da]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[de]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[el]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[eo]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[es]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[et]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[fi]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[fr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[gl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[hi]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[hu]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[ia]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[it]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[kk]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[km]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[nb]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[nl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[pa]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[pl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[pt]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[pt_BR]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[ro]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[ru]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[sl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[sr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[sr@ijekavian]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[sr@ijekavianlatin]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[sr@latin]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[sv]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[tr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[uk]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[wa]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[x-test]=xxhttp://duckduckgo.com/html/?q=\\{@}&t=KDExx
-Query[zh_CN]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-Query[zh_TW]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
-ServiceTypes=SearchProvider
-Type=Service
diff --git a/libre/kdebase-runtime-libre/duckduckgo_lite.desktop b/libre/kdebase-runtime-libre/duckduckgo_lite.desktop
deleted file mode 100644
index 0da670dbe..000000000
--- a/libre/kdebase-runtime-libre/duckduckgo_lite.desktop
+++ /dev/null
@@ -1,113 +0,0 @@
-[Desktop Entry]
-Charset=
-Hidden=false
-Keys=duckduckgolite,ddlite,dukgolite
-Name=Duck Duck Go Lite
-Name[ar]=Duck Duck Go Lite
-Name[ast]=Duck Duck Go Lite
-Name[bg]=Duck Duck Go Lite
-Name[bn]=Duck Duck Go Lite
-Name[bs]=Dak dak go Lite
-Name[ca]=Duck Duck Go Lite
-Name[ca@valencia]=Duck Duck Go Lite
-Name[cs]=Duck Duck Go Lite
-Name[da]=Duck Duck Go Lite
-Name[de]=Duck Duck Go Lite
-Name[el]=Duck Duck Go Lite
-Name[en_GB]=Duck Duck Go Lite
-Name[eo]=Duck Duck Go Lite
-Name[es]=Duck Duck Go Lite
-Name[et]=Duck Duck Go Lite
-Name[eu]=Duck Duck Go Lite
-Name[fa]=Duck Duck Go Lite
-Name[fi]=Duck Duck Go Lite
-Name[fr]=Duck Duck Go Lite
-Name[ga]=Duck Duck Go Lite
-Name[gl]=Duck Duck Go Lite
-Name[gu]=Duck Duck Go Lite
-Name[he]=Duck Duck Go Lite
-Name[hi]=Duck Duck Go Lite
-Name[hr]=Duck Duck Go Lite
-Name[hu]=Duck Duck Go Lite
-Name[ia]=Duck Duck Go Lite
-Name[id]=Duck Duck Go Lite
-Name[is]=Duck Duck Go Lite
-Name[it]=Duck Duck Go Lite
-Name[ja]=Duck Duck Go Lite
-Name[kk]=Duck Duck Go Lite
-Name[km]=Duck Duck Go Lite
-Name[kn]=Duck Duck Go Lite
-Name[ko]=Duck Duck Go Lite
-Name[lt]=Duck Duck Go Lite
-Name[lv]=Duck Duck Go Lite
-Name[ml]=Duck Duck Go Lite
-Name[nb]=Duck Duck Go Lite
-Name[nds]=Duck Duck Go Lite
-Name[nl]=Duck Duck Go Lite
-Name[nn]=Duck Duck Go Lite
-Name[pa]=Duck Duck Go Lite
-Name[pl]=Duck Duck Go Lite
-Name[pt]=Duck Duck Go Lite
-Name[pt_BR]=Duck Duck Go Lite
-Name[ro]=Duck Duck Go Lite
-Name[ru]=Поиск Duck Duck Go Lite
-Name[si]=Duck Duck Go Lite
-Name[sk]=Duck Duck Go Lite
-Name[sl]=Duck Duck Go Lite
-Name[sr]=Duck Duck Go Lite
-Name[sr@ijekavian]=Duck Duck Go Lite
-Name[sr@ijekavianlatin]=Duck Duck Go Lite
-Name[sr@latin]=Duck Duck Go Lite
-Name[sv]=Duck Duck Go Lite
-Name[tg]=Duck Duck Go Lite
-Name[th]=Duck Duck Go Lite
-Name[tr]=Duck Duck Go Lite
-Name[ug]=Duck Duck Go Lite
-Name[uk]=Duck Duck Go Lite
-Name[vi]=Duck Duck Go Lite
-Name[wa]=Duck Duck Go Lite
-Name[x-test]=xxDuck Duck Go Litexx
-Name[zh_CN]=Duck Duck Go Lite
-Name[zh_TW]=Duck Duck Go Lite
-Query=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[bg]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[bn]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[ca]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[cs]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[da]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[de]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[el]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[eo]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[es]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[et]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[fi]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[fr]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[gl]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[hi]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[hu]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[ia]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[it]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[kk]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[km]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[nb]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[nl]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[pa]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[pl]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[pt]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[pt_BR]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[ro]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[ru]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[sl]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[sr]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[sr@ijekavian]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[sr@ijekavianlatin]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[sr@latin]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[sv]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[tr]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[uk]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[wa]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[x-test]=xxhttp://duckduckgo.com/lite/?q=\\{@}&t=KDExx
-Query[zh_CN]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-Query[zh_TW]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
-ServiceTypes=SearchProvider
-Type=Service
diff --git a/libre/kdebase-runtime-libre/kdebase-runtime.install b/libre/kdebase-runtime-libre/kdebase-runtime.install
deleted file mode 100644
index c77e68041..000000000
--- a/libre/kdebase-runtime-libre/kdebase-runtime.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
deleted file mode 100644
index 5929de23d..000000000
--- a/libre/kdelibs-libre/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=kdelibs
-pkgname=kdelibs-libre
-pkgver=4.12.0
-pkgrel=1
-pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support"
-arch=('i686' 'x86_64' 'mips64el')
-url='https://projects.kde.org/projects/kde/kdelibs'
-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-qt4'
-        'media-player-info' 'libxtst' 'libutempter' 'qtwebkit')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
-provides=("kdelibs=$pkgver")
-replaces=('kdelibs')
-conflicts=('kdelibs')
-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=('a510f9dc2675c5656af00a92f81b747129ff70d1'
-          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          'ed1f57ee661e5c7440efcaba7e51d2554709701c'
-          'a1502a964081ad583a00cf90c56e74bf60121830')
-
-prepare() {
-       cd ${_pkgname}-${pkgver}
-       # avoid file conflict with gnome-menus
-       patch -p1 -i "${srcdir}"/kde-applications-menu.patch
-       # qmake refers to Qt5
-       patch -p1 -i "${srcdir}"/qt4.patch
-       # Don't ask the user to download a plugin, it's probably nonfree.
-       patch -p1 -i "${srcdir}"/khtml-fsdg.diff
-}
-
-build() {
-       mkdir build
-       cd build
-       cmake ../${_pkgname}-${pkgver} \
-               -DCMAKE_BUILD_TYPE=Release \
-               -DKDE4_BUILD_TESTS=OFF \
-               -DCMAKE_SKIP_RPATH=ON \
-               -DKDE_DISTRIBUTION_TEXT='Parabola GNU/Linux-libre' \
-               -DCMAKE_INSTALL_PREFIX=/usr \
-               -DSYSCONF_INSTALL_DIR=/etc \
-               -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-               -DKDE_DEFAULT_HOME='.kde4' \
-               -DWITH_FAM=OFF \
-               -DWITH_SOLID_UDISKS2=ON
-       make
-}
-
-package() {
-       cd "${srcdir}"/build
-       make DESTDIR="${pkgdir}" install
-
-       # cert bundle seems to be hardcoded
-       # link it to the one from ca-certificates
-       rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-       ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-}
diff --git a/libre/kdelibs-libre/fix-xfreepixmap-call.patch b/libre/kdelibs-libre/fix-xfreepixmap-call.patch
deleted file mode 100644
index 5f5354633..000000000
--- a/libre/kdelibs-libre/fix-xfreepixmap-call.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 9323adac35d40da69e3cb18504340e984c4afd05
-Author: Anne-Marie Mahfouf <annma@kde.org>
-Date:   Fri May 10 17:12:33 2013 +0200
-
-    Fix crash when quitting apps
-    
-    Backport to 4.10 branch
-    
-    CCBUG: 319137
-
-diff --git a/plasma/private/dialogshadows.cpp b/plasma/private/dialogshadows.cpp
-index b54fb1a..1925670 100644
---- a/plasma/private/dialogshadows.cpp
-+++ b/plasma/private/dialogshadows.cpp
-@@ -336,6 +336,9 @@ void DialogShadows::Private::freeX11Pixmaps()
- {
- #ifdef Q_WS_X11
-     foreach (const QPixmap &pixmap, m_shadowPixmaps) {
-+        if (!QX11Info::display()) {
-+            return;
-+        }
-         if (!pixmap.isNull()) {
-             XFreePixmap(QX11Info::display(), pixmap.handle());
-         }
diff --git a/libre/kdelibs-libre/kde-applications-menu.patch b/libre/kdelibs-libre/kde-applications-menu.patch
deleted file mode 100644
index 4b513298a..000000000
--- a/libre/kdelibs-libre/kde-applications-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
-@@ -69,7 +69,7 @@
- if (WIN32)
- install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
- else (WIN32)
--install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
-@@ -302,7 +302,7 @@
-      if (!m_trackId.isEmpty())
-         g_vfolder->setTrackId(m_trackId);
- 
--     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
- 
-      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
-      entry->setLayoutInfo(kdeMenu->layoutList);
diff --git a/libre/kdelibs-libre/kdelibs.install b/libre/kdelibs-libre/kdelibs.install
deleted file mode 100644
index c77e68041..000000000
--- a/libre/kdelibs-libre/kdelibs.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/libre/kdelibs-libre/khtml-fsdg.diff b/libre/kdelibs-libre/khtml-fsdg.diff
deleted file mode 100644
index 1a531b3c8..000000000
--- a/libre/kdelibs-libre/khtml-fsdg.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ru kdelibs-4.8.0.orig/khtml/html/html_objectimpl.cpp kdelibs-4.8.0/khtml/html/html_objectimpl.cpp
---- kdelibs-4.8.0.orig/khtml/html/html_objectimpl.cpp	2012-01-30 19:46:27.684114289 +0100
-+++ kdelibs-4.8.0/khtml/html/html_objectimpl.cpp	2012-01-30 19:47:47.222111046 +0100
-@@ -577,46 +577,6 @@
- 
- void HTMLObjectBaseElementImpl::slotPartLoadingErrorNotify()
- {
--    // If we have an embed, we may be able to tell the user where to
--    // download the plugin.
--
--    HTMLEmbedElementImpl *embed = relevantEmbed();
--    QString serviceType; // shadows ours, but we don't care.
--
--    if (!embed)
--        return;
--
--    serviceType = embed->serviceType;
--
--    KHTMLPart* part = document()->part();
--    KParts::BrowserExtension *ext = part->browserExtension();
--
--    if(!embed->pluginPage.isEmpty() && ext) {
--        // Prepare the mimetype to show in the question (comment if available, name as fallback)
--        QString mimeName = serviceType;
--        KMimeType::Ptr mime = KMimeType::mimeType(serviceType, KMimeType::ResolveAliases);
--        if ( mime && mime->name() != KMimeType::defaultMimeType() )
--            mimeName = mime->comment();
--
--        // Check if we already asked the user, for this page
--        if (!mimeName.isEmpty() && !part->pluginPageQuestionAsked(serviceType))
--        {
--            part->setPluginPageQuestionAsked(serviceType);
--
--            // Prepare the URL to show in the question (host only if http, to make it short)
--            KUrl pluginPageURL(embed->pluginPage);
--            QString shortURL = pluginPageURL.protocol() == "http" ? pluginPageURL.host() : pluginPageURL.prettyUrl();
--            int res = KMessageBox::questionYesNo( part->view(),
--                                                  i18n("No plugin found for '%1'.\nDo you want to download one from %2?", mimeName, shortURL),
--                                                  i18n("Missing Plugin"), KGuiItem(i18n("Download")), KGuiItem(i18n("Do Not Download")), QString("plugin-")+serviceType);
--            if (res == KMessageBox::Yes)
--            {
--                // Display vendor download page
--                ext->createNewWindow(pluginPageURL);
--                return;
--            }
--        }
--    }
- }
- 
- 
diff --git a/libre/kdelibs-libre/qt4.patch b/libre/kdelibs-libre/qt4.patch
deleted file mode 100644
index bb4312d40..000000000
--- a/libre/kdelibs-libre/qt4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdelibs-4.10.1/cmake/modules/FindQt4.cmake~	2013-03-07 16:57:29.735552097 +0000
-+++ kdelibs-4.10.1/cmake/modules/FindQt4.cmake	2013-03-07 16:57:52.038725421 +0000
-@@ -446,7 +446,7 @@
- # check for qmake
- # Debian uses qmake-qt4
- # macports' Qt uses qmake-mac
--FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
-+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac PATHS
-   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
-   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
-   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
diff --git a/libre/kdelibs-libre/security-fix.patch b/libre/kdelibs-libre/security-fix.patch
deleted file mode 100644
index 3d98a47ae..000000000
--- a/libre/kdelibs-libre/security-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 65d736dab592bced4410ccfa4699de89f78c96ca
-Author: Grégory Oestreicher <greg@kamago.net>
-Date:   Wed May 8 23:16:00 2013 +0200
-
-    Don't show passwords contained in HTTP URLs in error messages
-    BUG: 319428
-
-diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp
-index 2d139a9..129fc7b 100644
---- a/kioslave/http/http.cpp
-+++ b/kioslave/http/http.cpp
-@@ -3056,7 +3056,7 @@ try_again:
-             ; // Ignore error
-         } else {
-             if (!sendErrorPageNotification()) {
--                error(ERR_INTERNAL_SERVER, m_request.url.url());
-+                error(ERR_INTERNAL_SERVER, m_request.url.prettyUrl());
-                 return false;
-             }
-         }
-@@ -3072,9 +3072,9 @@ try_again:
-         // Tell that we will only get an error page here.
-         if (!sendErrorPageNotification()) {
-             if (m_request.responseCode == 403)
--                error(ERR_ACCESS_DENIED, m_request.url.url());
-+                error(ERR_ACCESS_DENIED, m_request.url.prettyUrl());
-             else
--                error(ERR_DOES_NOT_EXIST, m_request.url.url());
-+                error(ERR_DOES_NOT_EXIST, m_request.url.prettyUrl());
-             return false;
-         }
-     } else if (m_request.responseCode >= 301 && m_request.responseCode<= 303) {
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
deleted file mode 100644
index 46e2732a5..000000000
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=kdenetwork-kopete
-pkgname=kdenetwork-kopete-libre
-pkgver=4.12.0
-pkgrel=1
-pkgdesc='Instant Messenger, without skype support'
-url='http://kde.org/applications/internet/kopete/'
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdenetwork')
-depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn' 'libidn'
-         'qimageblitz' 'libgadu' 'mediastreamer' 'jsoncpp')
-makedepends=('cmake' 'automoc4' 'boost')
-install=${_pkgname}.install
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz")
-sha1sums=('c1ef611b27079388e48e558a65e2de80db93d875')
-
-prepare() {
-  cd kopete-${pkgver}
-  # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
-  sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' protocols/CMakeLists.txt
-  rm -rf protocols/skype
-  sed 's/, Skype//' -i doc/index.docbook
-  cd ..
-  mkdir build
-}
-
-build() {
-  cd build
-  cmake ../kopete-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR=$pkgdir install
-}
diff --git a/libre/kdenetwork-kopete-libre/kdenetwork.install b/libre/kdenetwork-kopete-libre/kdenetwork.install
deleted file mode 100644
index e70c054ec..000000000
--- a/libre/kdenetwork-kopete-libre/kdenetwork.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
deleted file mode 100644
index 96dca0a5d..000000000
--- a/libre/kdepim-libre/PKGBUILD
+++ /dev/null
@@ -1,282 +0,0 @@
-# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgbase=kdepim
-pkgbase=kdepim-libre
-pkgname=('kdepim-akonadiconsole-libre'
-         'kdepim-akregator-libre'
-         'kdepim-blogilo-libre'
-         'kdepim-console-libre'
-         'kdepim-kaddressbook-libre'
-         'kdepim-kalarm-libre'
-         'kdepim-kjots-libre'
-         'kdepim-kleopatra-libre'
-         'kdepim-kmail-libre'
-         'kdepim-knode-libre'
-         'kdepim-knotes-libre'
-         'kdepim-kontact-libre'
-         'kdepim-korganizer-libre'
-         'kdepim-kresources-libre'
-         'kdepim-ktimetracker-libre'
-         'kdepim-ktnef-libre'
-         'kdepim-libkdepim-libre')
-pkgver=4.12.0
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-url='http://pim.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-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=('1ca184dc89f8c8395ffe4ec62a3fdcd0a7397ac4')
-
-build() {
-	mkdir build
-	cd build
-	cmake ../${_pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DKDE4_BUILD_TESTS=OFF \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DKDEPIM_BUILD_MOBILE=OFF
-	make
-}
-
-package_kdepim-akonadiconsole-libre() {
-	pkgdesc='Akonadi Management and Debugging Console, without nonfree pilot-link support'
-	depends=('kdepim-libkdepim' 'nepomuk-widgets')
-	url='http://pim.kde.org'
-	replaces=('kdepim-akonadiconsole')
-	conflicts=('kdepim-akonadiconsole')
-	provides=("kdepim-akonadiconsole=${pkgver}")
-	install='kdepim.install'
-	cd "${srcdir}"/build/akonadiconsole
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-akregator-libre() {
-	pkgdesc='A Feed Reader for KDE, without nonfree pilot-link support'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/akregator/"
-	replaces=('kdepim-akregator')
-	conflicts=('kdepim-akregator')
-	provides=("kdepim-akregator=${pkgver}")
-	install='kdepim-akregator.install'
-	cd "${srcdir}"/build/akregator
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/akregator
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-blogilo-libre() {
-	pkgdesc='A KDE Blogging Client, without nonfree pilot-link support'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/blogilo/"
-	replaces=('kdepim-blogilo' 'blogilo')
-	conflicts=('kdepim-blogilo' 'blogilo')
-	provides=("kdepim-blogilo=${pkgver}")
-	install='kdepim.install'
-	cd "${srcdir}"/build/blogilo
-	make DESTDIR="${pkgdir}" install
-    cd "${srcdir}"/build/composereditor-ng
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-console-libre() {
-	pkgdesc='Command line tool for accessing calendar files, without nonfree pilot-link support'
-	depends=('kdepim-libkdepim')
-	url='http://pim.kde.org'
-	replaces=('kdepim-console')
-	conflicts=('kdepim-console')
-	provides=("kdepim-console=${pkgver}")
-	install='kdepim.install'
-	cd "${srcdir}"/build/console
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kaddressbook-libre() {
-	pkgdesc='Contact Manager, without nonfree pilot-link support'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/office/kaddressbook/"
-	replaces=('kdepim-kaddressbook')
-	conflicts=('kdepim-kaddressbook')
-	provides=("kdepim-kaddressbook=${pkgver}")
-	install='kdepim.install'
-  for i in kaddressbook kontact/plugins/kaddressbook \
-    plugins/kaddressbook contactthemeeditor; do
-    cd "${srcdir}"/build/${i}
-    make DESTDIR="${pkgdir}" install
-  done
-}
-
-package_kdepim-kalarm-libre() {
-	pkgdesc='Personal Alarm Scheduler, without nonfree pilot-link support'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/utilities/kalarm/"
-	replaces=('kdepim-kalarm')
-	conflicts=('kdepim-kalarm')
-	provides=("kdepim-kalarm=${pkgver}")
-	install='kdepim.install'
-	cd "${srcdir}"/build/kalarm
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kjots-libre() {
-	pkgdesc='Note Taker, without nonfree pilot-link support'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/utilities/kjots/"
-	replaces=('kdepim-kjots')
-	conflicts=('kdepim-kjots')
-	provides=("kdepim-kjots=${pkgver}")
-	install='kdepim.install'
-	cd "${srcdir}"/build/kjots
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/kjots
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kleopatra-libre() {
-	pkgdesc='Certificate Manager and Unified Crypto GUI, without nonfree pilot-link support'
-	depends=('kdepim-libkdepim')
-	install='kdepim-kleopatra.install'
-	url="http://kde.org/applications/utilities/kleopatra/"
-	replaces=('kdepim-kleopatra')
-	conflicts=('kdepim-kleopatra')
-	provides=("kdepim-kleopatra=${pkgver}")
-	cd "${srcdir}"/build/kleopatra
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kmail-libre() {
-	pkgdesc='Mail Client, without nonfree pilot-link support'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/kmail/"
-	install='kdepim-kmail.install'
-	conflicts=('kdepim-kmail' 'kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
-	           'kdepim-mimelib' 'kdepim-plugins')
-	replaces=('kdepim-kmail' 'kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
-	          'kdepim-mimelib' 'kdepim-plugins')
-	provides=("kdepim-kmail=${pkgver}")
-  for i in kmail kmailcvt agents/archivemailagent agents/folderarchiveagent\
-    agents/mailfilteragent importwizard ksendemail libksieve messagelist \
-    ontologies kontact/plugins/kmail headerthemeeditor mboximporter; do
-    cd "${srcdir}"/build/${i}
-    make DESTDIR="${pkgdir}" install
-  done
-}
-
-package_kdepim-knode-libre() {
-	pkgdesc='News Reader, without nonfree pilot-link support'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/knode/"
-	replaces=('kdepim-knode')
-	conflicts=('kdepim-knode')
-	provides=("kdepim-knode=${pkgver}")
-	install='kdepim-knode.install'
-	cd "${srcdir}"/build/knode
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/knode
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-knotes-libre() {
-	pkgdesc='Popup Notes, without nonfree pilot-link support'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/utilities/knotes/"
-	replaces=('kdepim-knotes')
-	conflicts=('kdepim-knotes')
-	provides=("kdepim-knotes=${pkgver}")
-	install='kdepim.install'
-	cd "${srcdir}"/build/knotes
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/knotes
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kontact-libre() {
-	pkgdesc='Personal Information Manager, without nonfree pilot-link support'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/office/kontact/"
-	install='kdepim.install'
-	conflicts=('kdepim-kontact' 'kdepim-kontactinterfaces')
-	replaces=('kdepim-kontact' 'kdepim-kontactinterfaces')
-	provides=("kdepim-kontact=${pkgver}")
-	for i in kontact/src kontact/plugins/summary \
-		kontact/plugins/specialdates; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-}
-
-package_kdepim-korganizer-libre() {
-	pkgdesc='Calendar and Scheduling Program, without nonfree pilot-link support'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/office/korganizer"
-	replaces=('kdepim-korganizer')
-	conflicts=('kdepim-korganizer')
-	provides=("kdepim-korganizer=${pkgver}")
-	install='kdepim-korganizer.install'
-	for i in korganizer korgac kontact/plugins/korganizer calendarviews; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-}
-
-package_kdepim-kresources-libre() {
-	pkgdesc='KDE PIM resources, without nonfree pilot-link support'
-	depends=('kdepim-libkdepim')
-	url='http://pim.kde.org'
-	replaces=('kdepim-kresources')
-	conflicts=('kdepim-kresources')
-	provides=("kdepim-kresources=${pkgver}")
-	cd "${srcdir}"/build/kresources
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-ktimetracker-libre() {
-	pkgdesc='Personal Time Tracker, without nonfree pilot-link support'
-	depends=('kdepim-kresources')
-	url="http://kde.org/applications/utilities/ktimetracker/"
-	replaces=('kdepim-ktimetracker')
-	conflicts=('kdepim-ktimetracker')
-	provides=("kdepim-ktimetracker=${pkgver}")
-	install='kdepim.install'
-	cd "${srcdir}"/build/ktimetracker
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-ktnef-libre() {
-	pkgdesc='A viewer/extractor for TNEF files, without nonfree pilot-link support'
-	depends=('kdebase-runtime' 'kdepimlibs')
-	url="https://projects.kde.org/projects/kde/kdepim/ktnef"
-	install=kdepim-ktnef.install
-	replaces=('kdepim-ktnef')
-	conflicts=('kdepim-ktnef')
-	provides=("kdepim-ktnef=${pkgver}")
-	cd "${srcdir}"/build/ktnef
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-libkdepim-libre() {
-	pkgdesc='Library for KDE PIM, without nonfree pilot-link support'
-	groups=()
-	depends=('kde-agent' 'kdepim-runtime' 'link-grammar')
-	url='http://pim.kde.org'
-	conflicts=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
-                   'kdepim-akonadi')
-	replaces=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
-                  'kdepim-akonadi')
-	provides=("kdepim-libkdepim=${pkgver}")
-	for i in agents/sendlateragent akonadi_next calendarsupport \
-  incidenceeditor-ng kaddressbookgrantlee kdgantt2 libkdepim \
-  libkdepimdbusinterfaces libkleo libkpgp mailcommon mailimporter \
-  messagecomposer messagecore messageviewer icons templateparser \
-  plugins/messageviewer grammar grantleetheme grantleethemeeditor \
-  plugins/ktexteditor pimactivity pimcommon pimsettingexporter; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-}
diff --git a/libre/kdepim-libre/fix-completion.patch b/libre/kdepim-libre/fix-completion.patch
deleted file mode 100644
index c2edefe00..000000000
--- a/libre/kdepim-libre/fix-completion.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-commit 6a06c57f52a00018d607085efa7570deb91dc707
-Author: David Faure <faure@kde.org>
-Date:   Mon Apr 8 17:41:39 2013 +0200
-
-    Fix kmail autocompletion from akonadi.
-    
-    My commit 02f5f0214e made autocompletion from nepomuk work better, but broke
-    completion from akonadi. I kept the "keywords" based code, but now it's only
-    used for the special case of nickname-based search (because the nickname shouldn't
-    appear in the completion item). For everything else it really doesn't make sense
-    to have a search engine (akonadi/nepomuk) on top of a search engine
-    (the one inside KCompletion).
-    
-    This time I verified that:
-    * nepomuk search still works
-    * contacts from akonadi work again
-    * contact groups from akonadi work (after previous commit)
-    * nickname-search in akonadi still doesn't work, but it didn't before. More work
-    needed for that one. This is the only reason to keep KMailCompletion around btw,
-    everything else would work without it.
-    
-    BUG: 259949
-    FIXED-IN: 4.10.3
-
-diff --git a/libkdepim/addresseelineedit.cpp b/libkdepim/addresseelineedit.cpp
-index b7b11be..ec4caf9 100644
---- a/libkdepim/addresseelineedit.cpp
-+++ b/libkdepim/addresseelineedit.cpp
-@@ -30,6 +30,8 @@
- #include "completionordereditor.h"
- #endif
- 
-+#include "kmailcompletion.h"
-+
- #include <Akonadi/Contact/ContactSearchJob>
- #include <Akonadi/Contact/ContactGroupSearchJob>
- #include <Akonadi/CollectionFetchJob>
-@@ -77,6 +79,10 @@
- 
- using namespace KPIM;
- 
-+namespace KPIM {
-+  typedef QMap< QString, QPair<int,int> > CompletionItemsMap;
-+}
-+
- class AddresseeLineEditStatic
- {
-   public:
-@@ -496,11 +502,9 @@ void AddresseeLineEdit::Private::addCompletionItem( const QString &string, int w
-     s_static->completionItemMap.insert( string, qMakePair( weight, completionItemSource ) );
-   }
- 
--  if ( keyWords == 0 ) {
--    s_static->completion->addItem( string, weight );
--  } else {
--    s_static->completion->addItemWithKeys( string, weight, keyWords );
--  }
-+  s_static->completion->addItem(string, weight);
-+  if (keyWords && !keyWords->isEmpty())
-+    s_static->completion->addItemWithKeys(string, weight, keyWords); // see kmailcompletion.cpp
- }
- 
- const QStringList KPIM::AddresseeLineEdit::Private::adjustedCompletionItems( bool fullSearch )
-@@ -1348,17 +1352,13 @@ void AddresseeLineEdit::addItem( const Akonadi::Item &item, int weight, int sour
- void AddresseeLineEdit::addContactGroup( const KABC::ContactGroup &group, int weight, int source )
- {
-   d->addCompletionItem( group.name(), weight, source );
--  QStringList keyWords;
--  keyWords.append( group.name() );
--  d->addCompletionItem( group.name(), weight, source, &keyWords );
- }
- 
- void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int source )
- {
-   const QStringList emails = addr.emails();
-   QStringList::ConstIterator it;
--  const int prefEmailWeight = 1;     //increment weight by prefEmailWeight
--  int isPrefEmail = prefEmailWeight; //first in list is preferredEmail
-+  int isPrefEmail = 1; //first in list is preferredEmail
-   QStringList::ConstIterator end( emails.constEnd() );
-   for ( it = emails.constBegin(); it != end; ++it ) {
-     //TODO: highlight preferredEmail
-@@ -1368,40 +1368,6 @@ void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int
-     const QString nickName  = addr.nickName();
-     QString fullEmail       = addr.fullEmail( email );
- 
--    // Prepare keywords (for CompletionShell, CompletionPopup)
--    QStringList keyWords;
--    const QString realName  = addr.realName();
--
--    if ( !givenName.isEmpty() && !familyName.isEmpty() ) {
--      keyWords.append( givenName  + QLatin1Char( ' ' ) + familyName );
--      keyWords.append( familyName + QLatin1Char( ' ' ) + givenName );
--      keyWords.append( familyName + QLatin1String( ", " ) + givenName );
--    } else if ( !givenName.isEmpty() ) {
--      keyWords.append( givenName );
--    } else if ( !familyName.isEmpty() ) {
--      keyWords.append( familyName );
--    }
--
--    if ( !nickName.isEmpty() ) {
--      keyWords.append( nickName );
--    }
--
--    if ( !realName.isEmpty() ) {
--      keyWords.append( realName );
--    }
--
--    keyWords.append( email );
--
--    /* KMailCompletion does not have knowledge about identities, it stores emails and
--     * keywords for each email. KMailCompletion::allMatches does a lookup on the
--     * keywords and returns an ordered list of emails. In order to get the preferred
--     * email before others for each identity we use this little trick.
--     * We remove the <blank> in adjustedCompletionItems.
--     */
--    if ( isPrefEmail == prefEmailWeight ) {
--      fullEmail.replace( QLatin1String( " <" ), QLatin1String( "  <" ) );
--    }
--
-     // Prepare "givenName" + ' ' + "familyName"
-     QString fullName = givenName;
-     if (!familyName.isEmpty()) {
-@@ -1413,12 +1379,16 @@ void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int
-     // Finally, we can add the completion items
-     if (!fullName.isEmpty()) {
-       const QString address = KPIMUtils::normalizedAddress(fullName, email, QString());
--      d->addCompletionItem(address, weight + isPrefEmail, source, &keyWords);
-+      if (fullEmail != address) {
-+        // This happens when fullEmail contains a middle name, while our own fullName+email only has "first last".
-+        // Let's offer both, the fullEmail with 3 parts, looks a tad formal.
-+        d->addCompletionItem(address, weight + isPrefEmail, source);
-+      }
-     }
- 
--    if ( !nickName.isEmpty() ) {
--      const QString address = KPIMUtils::normalizedAddress(nickName, email, QString());
--      d->addCompletionItem(address, weight + isPrefEmail, source, &keyWords);
-+    QStringList keyWords;
-+    if (!nickName.isEmpty()) {
-+      keyWords.append(nickName);
-     }
- 
-     d->addCompletionItem( fullEmail, weight + isPrefEmail, source, &keyWords );
-diff --git a/libkdepim/addresseelineedit.h b/libkdepim/addresseelineedit.h
-index 4e6784b..b2af4a9 100644
---- a/libkdepim/addresseelineedit.h
-+++ b/libkdepim/addresseelineedit.h
-@@ -27,7 +27,6 @@
- #ifndef KDEPIM_ADDRESSEELINEEDIT_H
- #define KDEPIM_ADDRESSEELINEEDIT_H
- 
--#include "kmailcompletion.h"
- #include "kdepim_export.h"
- 
- #include "ldap/ldapclient.h"
-@@ -50,10 +49,6 @@ namespace KABC {
-   class ContactGroup;
- }
- 
--namespace KPIM {
--  typedef QMap< QString, QPair<int,int> > CompletionItemsMap;
--}
--
- namespace Nepomuk2 {
-   namespace Query {
-     class Result;
-diff --git a/libkdepim/kmailcompletion.h b/libkdepim/kmailcompletion.h
-index e8574cc..93771d3 100644
---- a/libkdepim/kmailcompletion.h
-+++ b/libkdepim/kmailcompletion.h
-@@ -32,7 +32,9 @@ namespace KPIM {
- 
- /**
-  * KMailCompletion allows lookup of email addresses by keyword.
-- * Typically a keywods would be firstname, lastname, nickname or domain.
-+ * This is used for lookup by nickname, since we don't want the nickname to appear in the final email.
-+ * E.g. you have a nickname "idiot" for your boss, you want to type "idiot" but you want the completion
-+ * to offer "Full Name <email@domain>", without the nickname being visible.
-  */
- class KMailCompletion : public KCompletion
- {
diff --git a/libre/kdepim-libre/kdepim-akregator.install b/libre/kdepim-libre/kdepim-akregator.install
deleted file mode 100644
index 5787df72f..000000000
--- a/libre/kdepim-libre/kdepim-akregator.install
+++ /dev/null
@@ -1,12 +0,0 @@
-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/libre/kdepim-libre/kdepim-kleopatra.install b/libre/kdepim-libre/kdepim-kleopatra.install
deleted file mode 100644
index 5787df72f..000000000
--- a/libre/kdepim-libre/kdepim-kleopatra.install
+++ /dev/null
@@ -1,12 +0,0 @@
-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/libre/kdepim-libre/kdepim-kmail.install b/libre/kdepim-libre/kdepim-kmail.install
deleted file mode 100644
index 5787df72f..000000000
--- a/libre/kdepim-libre/kdepim-kmail.install
+++ /dev/null
@@ -1,12 +0,0 @@
-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/libre/kdepim-libre/kdepim-knode.install b/libre/kdepim-libre/kdepim-knode.install
deleted file mode 100644
index 5787df72f..000000000
--- a/libre/kdepim-libre/kdepim-knode.install
+++ /dev/null
@@ -1,12 +0,0 @@
-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/libre/kdepim-libre/kdepim-korganizer.install b/libre/kdepim-libre/kdepim-korganizer.install
deleted file mode 100644
index 5787df72f..000000000
--- a/libre/kdepim-libre/kdepim-korganizer.install
+++ /dev/null
@@ -1,12 +0,0 @@
-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/libre/kdepim-libre/kdepim-ktnef.install b/libre/kdepim-libre/kdepim-ktnef.install
deleted file mode 100644
index 5787df72f..000000000
--- a/libre/kdepim-libre/kdepim-ktnef.install
+++ /dev/null
@@ -1,12 +0,0 @@
-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/libre/kdepim-libre/kdepim.install b/libre/kdepim-libre/kdepim.install
deleted file mode 100644
index e70c054ec..000000000
--- a/libre/kdepim-libre/kdepim.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
deleted file mode 100644
index 84aaaad77..000000000
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=kdeutils-ark
-pkgname=kdeutils-ark-libre
-pkgver=4.12.0
-pkgrel=1
-pkgdesc='Archiving Tool, with unar support'
-url='http://kde.org/applications/utilities/ark/'
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeutils')
-depends=('kdebase-runtime' 'kdebase-lib' 'libarchive' 'qjson')
-makedepends=('cmake' 'automoc4')
-optdepends=('p7zip' 'zip' 'unzip' 'unar')
-install=${_pkgname}.install
-provides=("kdeutils-ark=$pkgver")
-replaces=('kdeutils-ark')
-conflicts=('kdeutils-ark')
-source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz"
-        'ark-unar-06.patch')
-sha1sums=('d7b9fbf595b7fc7a67e52a8ad1f0977b07abd274'
-          'a0a836950f185d9b2245204579f969203036fdec')
-
-build() {
-  cd "${srcdir}/ark-${pkgver}"
-  
-  # This patch will allow Ark to use The Unarchiver command line utilities (unar/lsar) to operate on RAR files, particularly RARv3.
-  patch -Np1 -i "${srcdir}/ark-unar-06.patch"
-  
-  cd ..
-  mkdir build
-  cd build
-  cmake ../ark-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-}
diff --git a/libre/kdeutils-ark-libre/ark-unar-06.patch b/libre/kdeutils-ark-libre/ark-unar-06.patch
deleted file mode 100644
index ab2ef274f..000000000
--- a/libre/kdeutils-ark-libre/ark-unar-06.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-diff --git a/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop
-new file mode 100644
-index 0000000..2b5bd9e
---- /dev/null
-+++ b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop
-@@ -0,0 +1,15 @@
-+[Desktop Entry]
-+Type=Service
-+X-KDE-ServiceTypes=Kerfuffle/Plugin
-+X-KDE-Library=kerfuffle_cliunarchiver
-+X-KDE-PluginInfo-Author=Luke Shumaker
-+X-KDE-PluginInfo-Email=lukeshu@sbcglobal.net
-+X-KDE-PluginInfo-Name= kerfuffle_cliunarchiver
-+X-KDE-PluginInfo-Version=0.0.1
-+X-KDE-PluginInfo-Website=http://www.kde.org
-+X-KDE-PluginInfo-License=GPLv2+
-+X-KDE-Priority=150
-+X-KDE-Kerfuffle-APIRevision=1
-+X-KDE-Kerfuffle-ReadWrite=false
-+Name=The Unarchiver plugin
-+MimeType=application/x-rar;
-diff --git a/plugins/cliunarchiverplugin/cliplugin.cpp b/plugins/cliunarchiverplugin/cliplugin.cpp
-new file mode 100644
-index 0000000..e0adcf7
---- /dev/null
-+++ b/plugins/cliunarchiverplugin/cliplugin.cpp
-@@ -0,0 +1,170 @@
-+ /*
-+ * ark -- archiver for the KDE project
-+ *
-+ * Copyright (C) 2011 Luke Shumaker <lukeshu@sbcglobal.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.
-+ *
-+ */
-+
-+#include "kerfuffle/cliinterface.h"
-+#include "kerfuffle/kerfuffle_export.h"
-+
-+#include <KDebug>
-+
-+#include <QDateTime>
-+#include <QDir>
-+#include <QRegExp>
-+#include <QString>
-+#include <QStringList>
-+
-+using namespace Kerfuffle;
-+
-+class CliPlugin: public CliInterface
-+{
-+public:
-+    explicit CliPlugin(QObject *parent, const QVariantList & args)
-+        : CliInterface(parent, args) {
-+        m_indentLevel = 0;
-+    }
-+
-+    virtual ~CliPlugin() {
-+    }
-+
-+    virtual ParameterList parameterList() const {
-+        static ParameterList p;
-+        if (p.isEmpty()) {
-+            /* Limitations:
-+             *  01 - creates an empty file upon entering wrong password
-+             *  02 - unar detects if output is being redirected and then does not accept any input
-+             */
-+
-+            ///////////////[ COMMON ]/////////////
-+
-+            p[CaptureProgress] = false;
-+            p[PasswordPromptPattern] = QLatin1String("Password (will not be shown): ");
-+
-+            ///////////////[ LIST ]/////////////
-+
-+            p[ListProgram] = QLatin1String("lsar");
-+            p[ListArgs] = QStringList() << QLatin1String("-json") << QLatin1String("$Archive");
-+
-+            ///////////////[ EXTRACT ]/////////////
-+
-+            p[ExtractProgram] = QLatin1String("unar");
-+            p[ExtractArgs] = QStringList() << QLatin1String("$Archive") << QLatin1String("$Files") << QLatin1String("$PasswordSwitch") << QLatin1String("$RootNodeSwitch");
-+            p[NoTrailingSlashes]  = true;
-+            p[PasswordSwitch] = QStringList() << QLatin1String("-password") << QLatin1String("$Password");
-+	    p[RootNodeSwitch] = QStringList() << QLatin1String("-output-directory") << QLatin1String("$Path");
-+            p[FileExistsExpression] = QLatin1String("^\\\"(.+)\\\" already exists.");
-+            p[FileExistsInput] = QStringList()
-+                     << QLatin1String("o") //overwrite
-+                     << QLatin1String("s") //skip
-+                     << QLatin1String("O") //overwrite all
-+                     << QLatin1String("S") //autoskip
-+                     << QLatin1String("q") //cancel
-+                     ;
-+
-+            ///////////////[ DELETE ]/////////////
-+
-+            p[DeleteProgram] = QLatin1String("x-fakeprogram");
-+            //p[DeleteArgs]    =
-+
-+            ///////////////[ ADD ]/////////////
-+
-+            p[AddProgram] = QLatin1String("x-fakeprogram");
-+            //p[AddArgs]    =
-+
-+            ///////////////[ ERRORS ]/////////////
-+
-+            p[ExtractionFailedPatterns] = QStringList()
-+                << QLatin1String("Failed! \\((.+)\\)$")
-+                << QLatin1String("Segmentation fault$");
-+
-+            p[WrongPasswordPatterns] = QStringList()
-+                << QLatin1String("Failed! \\((.+)\\)$");
-+        }
-+        return p;
-+    }
-+
-+    QString m_entryFilename, m_internalId;
-+    ArchiveEntry m_currentEntry;
-+    int m_indentLevel;
-+
-+    bool readListLine(const QString &line) {
-+        /* lsar will give us JSON output.  However, we actually parse based on
-+         * the indentation.  Ugly, I know, but
-+         *  1. It's easier
-+         *  2. lsar's JSON is invalid JSON, so actual parsers bork.
-+         */
-+
-+        int spaces;
-+        for(spaces=0;(spaces<line.size())&&(line[spaces]==QLatin1Char(' '));spaces++){}
-+        // Since this is so ugly anyway, I'm not even going to check to
-+        // make sure that spaces is even.  I mean, what would I do about it?
-+        int m_newIndentLevel = spaces/2;
-+
-+        if (m_newIndentLevel>m_indentLevel) {
-+            if (m_newIndentLevel==3) {
-+                m_currentEntry.clear();
-+                m_currentEntry[IsDirectory] = false;
-+            }
-+        } else if (m_newIndentLevel<m_indentLevel) {
-+            if ( (m_newIndentLevel<3) && (m_indentLevel>=3) ) {
-+                EntryMetaDataType index = IsDirectory;
-+                if (m_currentEntry[index].toBool()) {
-+                    m_currentEntry[FileName].toString().append(QLatin1String("/"));
-+                }
-+                kDebug() << "Added entry:" << m_currentEntry;
-+                entry(m_currentEntry);
-+            }
-+        }
-+        m_indentLevel = m_newIndentLevel;
-+
-+        QRegExp rx(QLatin1String("^\\s*\"([^\"]*)\": (.*),$"));
-+        if (rx.indexIn(line) >= 0) {
-+            QRegExp rx_unquote(QLatin1String("^\"(.*)\"$"));
-+            QString key = rx.cap(1);
-+            QString value = rx.cap(2);
-+
-+            if (false) {
-+            } else if (key==QLatin1String("XADFileName")) {
-+                rx_unquote.indexIn(value);
-+                m_currentEntry[FileName] = m_currentEntry[InternalID] = rx_unquote.cap(1);
-+            } else if (key==QLatin1String("XADFileSize")) {
-+                m_currentEntry[Size] = value.toInt();
-+            } else if (key==QLatin1String("XADCompressedSize")) {
-+                m_currentEntry[CompressedSize] = value.toInt();
-+            } else if (key==QLatin1String("XADLastModificationDate")) {
-+                QDateTime ts(QDate::fromString(value, QLatin1String("\"YYYY-MM-DD hh:mm:ss")));
-+                m_currentEntry[Timestamp] = ts;
-+            } else if (key==QLatin1String("XADIsDirectory")) {
-+                m_currentEntry[IsDirectory] = (value==QLatin1String("1"));
-+            } else if (key==QLatin1String("RARCRC32")) {
-+                m_currentEntry[CRC] = value.toInt();
-+            } else if (key==QLatin1String("RARCompressionMethod")) {
-+                m_currentEntry[Method] = value.toInt();
-+            } else if (key==QLatin1String("Encrypted")) {
-+                m_currentEntry[IsPasswordProtected] = (value.toInt() != 0);
-+            }
-+            // TODO: add RAR version. ([Version])
-+        }
-+
-+        return true;
-+    }
-+};
-+
-+KERFUFFLE_EXPORT_PLUGIN(CliPlugin)
-+
-diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
-index 3619412..6368839 100644
---- a/plugins/CMakeLists.txt
-+++ b/plugins/CMakeLists.txt
-@@ -20,6 +20,7 @@ if (LIBARCHIVE_FOUND)
- endif (LIBARCHIVE_FOUND)
- 
- add_subdirectory( clirarplugin )
-+add_subdirectory( cliunarchiverplugin )
- add_subdirectory( cli7zplugin )
- add_subdirectory( clizipplugin )
- add_subdirectory( libsinglefileplugin )
-diff --git a/plugins/cliunarchiverplugin/CMakeLists.txt b/plugins/cliunarchiverplugin/CMakeLists.txt
-new file mode 100644
-index 0000000..ccd52e7
---- /dev/null
-+++ b/plugins/cliunarchiverplugin/CMakeLists.txt
-@@ -0,0 +1,21 @@
-+
-+include_directories(
-+                     ${CMAKE_CURRENT_SOURCE_DIR}/../..
-+                     ${CMAKE_CURRENT_BINARY_DIR}/../..
-+                   )
-+
-+########### next target ###############
-+
-+set(kerfuffle_cliunarchiver_SRCS cliplugin.cpp)
-+
-+kde4_add_plugin(kerfuffle_cliunarchiver ${kerfuffle_cliunarchiver_SRCS})
-+
-+target_link_libraries(kerfuffle_cliunarchiver  ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} kerfuffle )
-+
-+
-+
-+########### install files ###############
-+
-+install(TARGETS kerfuffle_cliunarchiver  DESTINATION ${PLUGIN_INSTALL_DIR} )
-+install( FILES kerfuffle_cliunarchiver.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
-+
diff --git a/libre/kdeutils-ark-libre/kdeutils-ark.install b/libre/kdeutils-ark-libre/kdeutils-ark.install
deleted file mode 100644
index 8a26818d8..000000000
--- a/libre/kdeutils-ark-libre/kdeutils-ark.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    update-desktop-database -q
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_update() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/libre/kile-libre/PKGBUILD b/libre/kile-libre/PKGBUILD
deleted file mode 100644
index 9fd47bf7a..000000000
--- a/libre/kile-libre/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 171256 2012-11-16 22:51:16Z allan $
-# 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@parabola.nu>
-
-_pkgname=kile
-pkgname=kile-libre
-pkgver=2.1.3
-pkgrel=2
-pkgdesc="A user friendly TeX/LaTeX frontend for KDE"
-arch=("i686" "x86_64" "mips64el")
-license=('GPL2')
-url="http://kile.sourceforge.net/"
-depends=('kdebase-runtime' 'texlive-core' 'kdebase-katepart')
-makedepends=('cmake' 'automoc4')
-optdepends=('kdebase-konsole: embedded terminal')
-conflicts=('kile')
-replaces=('kile')
-provides=('kile')
-install=${_pkgname}.install
-source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2"
-        "no-acroread.patch")
-sha1sums=('1a80748d5f01f359b5e5c28140ec90691f0166c5'
-          '9bbe5d1b0e2a78b13667fcf4e5e21f801447f9d6')
-
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  # Don't recommend a nonfree PDF viewer.
-  patch -Np1 -i "${srcdir}/no-acroread.patch"
-  cd ..
-  mkdir build
-  cd build
-  cmake ../${_pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/libre/kile-libre/kile.install b/libre/kile-libre/kile.install
deleted file mode 100644
index 9fe93eeac..000000000
--- a/libre/kile-libre/kile.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-        update-mime-database usr/share/mime &> /dev/null
-        update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/libre/kile-libre/no-acroread.patch b/libre/kile-libre/no-acroread.patch
deleted file mode 100644
index 7d305a2d0..000000000
--- a/libre/kile-libre/no-acroread.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -Nru kile-2.1.orig/README-win.txt kile-2.1/README-win.txt
---- kile-2.1.orig/README-win.txt	2011-12-18 14:44:55.824341708 +0100
-+++ kile-2.1/README-win.txt	2011-12-18 14:49:23.722382332 +0100
-@@ -10,8 +10,6 @@
- -----------------------------
- The most common problem you'll prbably encounter when trying to use Kile on Windows is Kile not being able to find all the supporting applications it depends on (latex, dvips, etc).  If this happens, the easiest solution is to just add the directories containing these programs to your PATH variable (details below).  To see which programs Kile is able to find, run the system checker (Settings -> System Checker) and see what you get.  
- 
--Note: acroread does not by default add itself to your PATH so you probably won't be able to use it directly.  However, if you have Adobe Reader setup as your default PDF viewer, setting Kile to System Default for ViewPDF should still work.  You could also just add C:\Program Files\Adobe\path\to\acrord32.exe to your path but it isn't really necessary.
--
- Setting your PATH
- -----------------
- At a minimum, latex.exe and friends should be in your PATH.  MikTeX will do this for you during the install process, but if it doesn't work for some reason, you can add it manually by:
-diff -Nru kile-2.1.orig/src/configtester.cpp kile-2.1/src/configtester.cpp
---- kile-2.1.orig/src/configtester.cpp	2011-12-18 14:44:55.697674394 +0100
-+++ kile-2.1/src/configtester.cpp	2011-12-18 14:46:52.644940609 +0100
-@@ -159,11 +159,6 @@
- 	// which are not needed, but probably useful for the work with kile
- 	ConfigTest::addFailureMessage("dvipng", i18n("You cannot use the png preview for mathgroups in the bottom bar."));
- 	ConfigTest::addFailureMessage("convert", i18n("You cannot use the png previews with conversions 'dvi->ps->png' and 'pdf->png'."));
--#ifdef Q_WS_WIN
--	ConfigTest::addFailureMessage("acrord32", i18n("You cannot open pdf documents with Adobe Reader because acroread could not be found in your path.  <br>If Adobe Reader is your default pdf viewer, try setting ViewPDF to System Default.  Alternatively, you could use Okular."));
--#else
--	ConfigTest::addFailureMessage("acroread", i18n("You cannot open pdf documents with Adobe Reader, but you could use Okular."));
--#endif
- 
- 	ConfigTest::addPrettyName("okular", i18n("ForwardDVI"));
- 	ConfigTest::addSuccessMessage("okular", i18n("Supported."));
-diff -Nru kile-2.1.orig/src/data/kilestdtools.rc kile-2.1/src/data/kilestdtools.rc
---- kile-2.1.orig/src/data/kilestdtools.rc	2011-12-18 14:44:55.787674856 +0100
-+++ kile-2.1/src/data/kilestdtools.rc	2011-12-18 14:47:50.381903415 +0100
-@@ -747,15 +747,6 @@
- state=Viewer
- type=Part
- 
--[Tool/ViewPDF/Acroread]
--class=View
--command=acroread
--options='%target'
--state=Viewer
--from=pdf
--to=pdf
--type=Process
--
- [Tool/Lilypond/PDF]
- class=Compile
- command=lilypond
-diff -Nru kile-2.1.orig/src/data/kilestdtools-win.rc kile-2.1/src/data/kilestdtools-win.rc
---- kile-2.1.orig/src/data/kilestdtools-win.rc	2011-12-18 14:44:55.741007951 +0100
-+++ kile-2.1/src/data/kilestdtools-win.rc	2011-12-18 14:47:59.695284518 +0100
-@@ -740,15 +740,6 @@
- state=Viewer
- type=Part
- 
--[Tool/ViewPDF/Acroread]
--class=View
--command=acroread
--options="%target"
--state=Viewer
--from=pdf
--to=pdf
--type=Process
--
- [Tool/ViewPDF/SystemDefault]
- class=View
- command=cmd
-diff -Nru kile-2.1.orig/src/test/runTests.bat kile-2.1/src/test/runTests.bat
---- kile-2.1.orig/src/test/runTests.bat	2011-12-18 14:44:55.697674394 +0100
-+++ kile-2.1/src/test/runTests.bat	2011-12-18 14:45:37.097886600 +0100
-@@ -185,12 +185,6 @@
- call :setKey executable okular
- call :findAndSetWhere okular
- 
--echo starting test: Acroread
--call :setTool Acroread
--call :setKey mustpass ""
--call :setKey executable acrord32
--call :findAndSetWhere acrord32
--
- echo starting test: DVItoPNG
- call :setTool DVItoPNG
- call :setKey mustpass ""
-diff -Nru kile-2.1.orig/src/test/runTests.sh kile-2.1/src/test/runTests.sh
---- kile-2.1.orig/src/test/runTests.sh	2011-12-18 14:44:55.697674394 +0100
-+++ kile-2.1/src/test/runTests.sh	2011-12-18 14:45:26.427831910 +0100
-@@ -210,12 +210,6 @@
- performTest okular "isTheOkularVersionRecentEnough"
- setKey where `which okular`
- 
--echo "starting test: Acroread"
--setTool Acroread
--setKey mustpass ""
--setKey executable acroread
--setKey where `which acroread`
--
- echo "starting test: DVItoPNG"
- setTool DVItoPNG
- setKey mustpass ""
diff --git a/libre/lesspipe-libre/PKGBUILD b/libre/lesspipe-libre/PKGBUILD
deleted file mode 100644
index 22c6ecbd8..000000000
--- a/libre/lesspipe-libre/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 14692 2010-04-07 09:06:46Z spupykin $
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: solsTiCe d'Hiver <solstice.dhiver@gmail.com>
-
-_pkgname=lesspipe
-pkgname=lesspipe-libre
-pkgver=1.71
-pkgrel=1
-pkgdesc='an input filter for the pager less'
-depends=('less')
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-optdepends=('rpmextract: support for rpm files'
-	    'fastjar: support for jar files'
-	    'unzip: support for zip files'
-	    'p7zip: support for 7za files'
-	    'cabextract: support for cab files'
-	    'cdrkit: support for iso files'
-	    'html2text: support for html files'
-	    'antiword: support for word file'
-	    'unrtf: support for rtf file'
-	    'imagemagick: support for some image file')
-url="http://www-zeuthen.desy.de/~friebel/unix/lesspipe.html"
-source=(http://www-zeuthen.desy.de/~friebel/unix/less/lesspipe.tar.gz \
-	lesspipe.sh)
-md5sums=('6d921dc4ce9809d405cb8d694ac7cbbd'
-         '675b56f560c600f43108adfd98222251')
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-replaces=("$_pkgname")
-
-build() {
-  cd $srcdir/$_pkgname-$pkgver
-
-  ./configure --prefix=/usr --yes
-  make || return 1
-  mkdir -p $pkgdir/usr/share/man/man1
-  make install PREFIX=$pkgdir/usr || return 1
-
-  install -D $srcdir/lesspipe.sh $pkgdir/etc/profile.d/lesspipe.sh
-}
-
diff --git a/libre/lesspipe-libre/lesspipe.sh b/libre/lesspipe-libre/lesspipe.sh
deleted file mode 100644
index 05526e46c..000000000
--- a/libre/lesspipe-libre/lesspipe.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export LESSOPEN='|/usr/bin/lesspipe.sh %s'
-
diff --git a/libre/lesspipe-libre/rePKGBUILD b/libre/lesspipe-libre/rePKGBUILD
deleted file mode 100644
index cb388a715..000000000
--- a/libre/lesspipe-libre/rePKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
-source PKGBUILD
-#CARCH=x86_64
-unset build package md5sums source
-_repo=community       # Put the repo here
-_mirror=http://mirrors.kernel.org/archlinux  # Put mirror here
-source=(PKGBUILD
-        "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT"
-        # files for pkg modifications below this line
-        )
-options=(!strip)
-
-build() {
-  cd "${srcdir}/"
-  rm .{INSTALL,PKGINFO} || true
-  # put actions for package modifications below this line
-
-}
-
-package() {
-  find ${srcdir} -maxdepth 1 -type l -delete
-  cp -a ${srcdir}/* ${pkgdir}
-}
-
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/lib32-libclc-svn/PKGBUILD b/libre/lib32-libclc-svn/PKGBUILD
deleted file mode 100644
index c1c7e021c..000000000
--- a/libre/lib32-libclc-svn/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-_pkgname=libclc
-pkgname=lib32-$_pkgname-svn
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
-pkgrel=2
-arch=x86_64
-pkgdesc='Library requirements of the OpenCL C programming language (32-bit)'
-url=http://libclc.llvm.org/
-license=MIT
-depends=(lib32-llvm-libs libclc-svn)
-makedepends=(clang lib32-llvm python2 svn)
-provides=(lib32-$_pkgname)
-conflicts=lib32-$_pkgname
-source=$_pkgname::svn+http://llvm.org/svn/llvm-project/libclc/trunk
-sha512sums=SKIP
-
-prepare() {
-  sed -i 's|/usr/bin/python|/usr/bin/python2|g;
-         ' $srcdir/$_pkgname/{configure,build/ninja_syntax}.py
-}
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-
-  cd $srcdir/$_pkgname
-  ./configure.py --prefix=/usr\
-    --libexecdir=/usr/lib32/clc\
-    --pkgconfigdir=/usr/lib32/pkgconfig\
-    --with-llvm-config=/usr/bin/llvm-config32
-  make
-}
-
-package() {
-  cd $srcdir/$_pkgname
-  make DESTDIR=$pkgdir install
-  install -vDm644 LICENSE.TXT $pkgdir/usr/share/licenses/$pkgname/LICENSE
-  msg 'remove useless include dir'
-  rm -vrf $pkgdir/usr/include
-}
diff --git a/libre/lib32-mesa-demos-libre/PKGBUILD b/libre/lib32-mesa-demos-libre/PKGBUILD
deleted file mode 100644
index d5efffe26..000000000
--- a/libre/lib32-mesa-demos-libre/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $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@parabola.nu>
-
-_pkgbasename=mesa-demos-libre
-pkgname=lib32-$_pkgbasename
-pkgver=8.1.0
-pkgrel=1
-arch=(x86_64)
-pkgdesc="Mesa demos and tools (32-bit), without nonfree demos"
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-provides=("lib32-mesa-demos=$pkgver")
-replaces=('lib32-mesa-demos')
-conflicts=('lib32-mesa-demos')
-makedepends=(gcc-multilib 'lib32-mesa-libgl>=9.1' 'lib32-glew' 'libgl>=9.1')
-source=(ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2
-        mesa-demos-libre.patch)
-md5sums=('9df33ba69a26bbfbc7c8148602e59542'
-         '5ce0660b46beb1230194fbd852d33ab0')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/mesa-demos-${pkgver}"
-
-  # Remove nonfree demos (pointblast and spriteblast)
-  rm -v src/demos/{pointblast,spriteblast}.c
-  patch -Np1 -i "${srcdir}/mesa-demos-libre.patch"
-
-  ./configure --prefix=/usr \
-    --enable-gles1 \
-    --enable-gles2
-
-  make
-}
-
-package() {
-  depends=('lib32-glew' mesa-demos-libre)
-
-  cd "${srcdir}/mesa-demos-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  for i in "$pkgdir/usr/bin/"*; do
-    mv "$i" "$i"32
-  done
-
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s mesa-demos "$pkgdir/usr/share/licenses/lib32-mesa-demos"
-}
diff --git a/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch b/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch
deleted file mode 100755
index d630f373c..000000000
--- a/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.am mesa-demos-8.1.0/src/demos/Makefile.am
---- mesa-demos-8.1.0.orig/src/demos/Makefile.am	2012-12-15 05:17:06.000000000 -0200
-+++ mesa-demos-8.1.0/src/demos/Makefile.am	2013-02-26 17:22:04.845832793 -0200
-@@ -65,7 +65,6 @@
- 	multiarb \
- 	paltex \
- 	pixeltest \
--	pointblast \
- 	projtex \
- 	ray \
- 	readpix \
-@@ -74,7 +73,6 @@
- 	shadowtex \
- 	singlebuffer \
- 	spectex \
--	spriteblast \
- 	stex3d \
- 	teapot \
- 	terrain \
-diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos/Makefile.in
---- mesa-demos-8.1.0.orig/src/demos/Makefile.in	2013-02-24 09:12:04.000000000 -0200
-+++ mesa-demos-8.1.0/src/demos/Makefile.in	2013-02-26 17:48:36.711995049 -0200
-@@ -90,11 +90,11 @@
- @HAVE_GLUT_TRUE@	ipers$(EXEEXT) isosurf$(EXEEXT) \
- @HAVE_GLUT_TRUE@	lodbias$(EXEEXT) morph3d$(EXEEXT) \
- @HAVE_GLUT_TRUE@	multiarb$(EXEEXT) paltex$(EXEEXT) \
--@HAVE_GLUT_TRUE@	pixeltest$(EXEEXT) pointblast$(EXEEXT) \
-+@HAVE_GLUT_TRUE@	pixeltest$(EXEEXT) \
- @HAVE_GLUT_TRUE@	projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \
- @HAVE_GLUT_TRUE@	reflect$(EXEEXT) renormal$(EXEEXT) \
- @HAVE_GLUT_TRUE@	shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \
--@HAVE_GLUT_TRUE@	spectex$(EXEEXT) spriteblast$(EXEEXT) \
-+@HAVE_GLUT_TRUE@	spectex$(EXEEXT) \
- @HAVE_GLUT_TRUE@	stex3d$(EXEEXT) teapot$(EXEEXT) \
- @HAVE_GLUT_TRUE@	terrain$(EXEEXT) tessdemo$(EXEEXT) \
- @HAVE_GLUT_TRUE@	texcyl$(EXEEXT) texenv$(EXEEXT) \
-@@ -219,9 +219,6 @@
- pixeltest_SOURCES = pixeltest.c
- pixeltest_OBJECTS = pixeltest.$(OBJEXT)
- pixeltest_LDADD = $(LDADD)
--pointblast_SOURCES = pointblast.c
--pointblast_OBJECTS = pointblast.$(OBJEXT)
--pointblast_LDADD = $(LDADD)
- projtex_SOURCES = projtex.c
- projtex_OBJECTS = projtex.$(OBJEXT)
- projtex_DEPENDENCIES = ../util/libutil.la
-@@ -246,9 +243,6 @@
- spectex_SOURCES = spectex.c
- spectex_OBJECTS = spectex.$(OBJEXT)
- spectex_LDADD = $(LDADD)
--spriteblast_SOURCES = spriteblast.c
--spriteblast_OBJECTS = spriteblast.$(OBJEXT)
--spriteblast_LDADD = $(LDADD)
- stex3d_SOURCES = stex3d.c
- stex3d_OBJECTS = stex3d.$(OBJEXT)
- stex3d_LDADD = $(LDADD)
-@@ -325,8 +319,8 @@
- 	fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \
- 	gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \
- 	ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \
--	pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \
--	renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \
-+	pixeltest.c projtex.c ray.c readpix.c reflect.c \
-+	renormal.c shadowtex.c singlebuffer.c spectex.c \
- 	stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \
- 	textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \
- 	winpos.c
-@@ -336,8 +330,8 @@
- 	fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \
- 	gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \
- 	ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \
--	pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \
--	renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \
-+	pixeltest.c projtex.c ray.c readpix.c reflect.c \
-+	renormal.c shadowtex.c singlebuffer.c spectex.c \
- 	stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \
- 	textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \
- 	winpos.c
-@@ -722,9 +716,6 @@
- pixeltest$(EXEEXT): $(pixeltest_OBJECTS) $(pixeltest_DEPENDENCIES) $(EXTRA_pixeltest_DEPENDENCIES) 
- 	@rm -f pixeltest$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(pixeltest_OBJECTS) $(pixeltest_LDADD) $(LIBS)
--pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) $(EXTRA_pointblast_DEPENDENCIES) 
--	@rm -f pointblast$(EXEEXT)
--	$(AM_V_CCLD)$(LINK) $(pointblast_OBJECTS) $(pointblast_LDADD) $(LIBS)
- projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) $(EXTRA_projtex_DEPENDENCIES) 
- 	@rm -f projtex$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(projtex_OBJECTS) $(projtex_LDADD) $(LIBS)
-@@ -749,9 +740,6 @@
- spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) $(EXTRA_spectex_DEPENDENCIES) 
- 	@rm -f spectex$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS)
--spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) $(EXTRA_spriteblast_DEPENDENCIES) 
--	@rm -f spriteblast$(EXEEXT)
--	$(AM_V_CCLD)$(LINK) $(spriteblast_OBJECTS) $(spriteblast_LDADD) $(LIBS)
- stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) $(EXTRA_stex3d_DEPENDENCIES) 
- 	@rm -f stex3d$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(stex3d_OBJECTS) $(stex3d_LDADD) $(LIBS)
-@@ -828,7 +816,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiarb.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paltex.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixeltest.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointblast.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projtex.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ray.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpix.Po@am__quote@
-@@ -837,7 +824,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowtex.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlebuffer.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spectex.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spriteblast.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stex3d.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teapot.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@
diff --git a/libre/lib32-sdl-libre/PKGBUILD b/libre/lib32-sdl-libre/PKGBUILD
deleted file mode 100644
index 6c319e676..000000000
--- a/libre/lib32-sdl-libre/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id$
-# 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@parabola.nu>
-
-_pkgbasename=sdl-libre
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.15
-pkgrel=3
-pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit)"
-arch=('x86_64')
-url="http://www.libsdl.org"
-license=('LGPL')
-provides=("lib32-sdl=${pkgver}")
-conflicts=('lib32-sdl')
-replaces=('lib32-sdl')
-depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename)
-makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' gcc-multilib)
-optdepends=('lib32-alsa-lib: ALSA audio driver'
-            'lib32-libpulse: PulseAudio audio driver')
-options=('!libtool')
-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
-        libre.patch)
-md5sums=('9d96df8417572a2afb781a7c4c811a85'
-         '04d8c179f125e04bcd4c9d60e013c2d7'
-         'e5c16b7611f62c7cb25f0534eff68852'
-         '687586a108b597a2a6b73070c1d37e51'
-         '3dd50347d8856160a9cbd7f80383a1f8'
-         '5c665f72b8a2adc97a91f6db6f2da79a')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  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 ../libre.patch
-  ./configure --prefix=/usr --disable-nasm --enable-alsa \
-              --with-x --disable-rpath --disable-static --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd SDL-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  rm -rf "$pkgdir"/usr/{include,share}
-
-  cd "$pkgdir/usr/bin"
-  mv sdl-config sdl-config-32
-}
diff --git a/libre/lib32-sdl-libre/fix_joystick_misc_axes.diff b/libre/lib32-sdl-libre/fix_joystick_misc_axes.diff
deleted file mode 100644
index 75e3755c9..000000000
--- a/libre/lib32-sdl-libre/fix_joystick_misc_axes.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
-index ee43974..80e46e4 100644
---- a/src/joystick/linux/SDL_sysjoystick.c
-+++ b/src/joystick/linux/SDL_sysjoystick.c
-@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd)
- 				++joystick->nbuttons;
- 			}
- 		}
--		for ( i=0; i<ABS_MISC; ++i ) {
-+		for ( i=0; i<ABS_MAX; ++i ) {
- 			/* Skip hats */
- 			if ( i == ABS_HAT0X ) {
- 				i = ABS_HAT3Y;
diff --git a/libre/lib32-sdl-libre/libre.patch b/libre/lib32-sdl-libre/libre.patch
deleted file mode 100644
index 72f7da56a..000000000
--- a/libre/lib32-sdl-libre/libre.patch
+++ /dev/null
@@ -1,578 +0,0 @@
---- src/video/fbcon/riva_mmio.h		2012-01-19 04:30:06.000000000 -0200
-+++ /dev/null				2012-04-01 13:58:27.776718756 -0300
-@@ -1,449 +0,0 @@
--/***************************************************************************\
--|*                                                                           *|
--|*       Copyright 1993-1999 NVIDIA, Corporation.  All rights reserved.      *|
--|*                                                                           *|
--|*     NOTICE TO USER:   The source code  is copyrighted under  U.S. and     *|
--|*     international laws.  Users and possessors of this source code are     *|
--|*     hereby granted a nonexclusive,  royalty-free copyright license to     *|
--|*     use this code in individual and commercial software.                  *|
--|*                                                                           *|
--|*     Any use of this source code must include,  in the user documenta-     *|
--|*     tion and  internal comments to the code,  notices to the end user     *|
--|*     as follows:                                                           *|
--|*                                                                           *|
--|*       Copyright 1993-1999 NVIDIA, Corporation.  All rights reserved.      *|
--|*                                                                           *|
--|*     NVIDIA, CORPORATION MAKES NO REPRESENTATION ABOUT THE SUITABILITY     *|
--|*     OF  THIS SOURCE  CODE  FOR ANY PURPOSE.  IT IS  PROVIDED  "AS IS"     *|
--|*     WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND.  NVIDIA, CORPOR-     *|
--|*     ATION DISCLAIMS ALL WARRANTIES  WITH REGARD  TO THIS SOURCE CODE,     *|
--|*     INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGE-     *|
--|*     MENT,  AND FITNESS  FOR A PARTICULAR PURPOSE.   IN NO EVENT SHALL     *|
--|*     NVIDIA, CORPORATION  BE LIABLE FOR ANY SPECIAL,  INDIRECT,  INCI-     *|
--|*     DENTAL, OR CONSEQUENTIAL DAMAGES,  OR ANY DAMAGES  WHATSOEVER RE-     *|
--|*     SULTING 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 SOURCE CODE.     *|
--|*                                                                           *|
--|*     U.S. Government  End  Users.   This source code  is a "commercial     *|
--|*     item,"  as that  term is  defined at  48 C.F.R. 2.101 (OCT 1995),     *|
--|*     consisting  of "commercial  computer  software"  and  "commercial     *|
--|*     computer  software  documentation,"  as such  terms  are  used in     *|
--|*     48 C.F.R. 12.212 (SEPT 1995)  and is provided to the U.S. Govern-     *|
--|*     ment only as  a commercial end item.   Consistent with  48 C.F.R.     *|
--|*     12.212 and  48 C.F.R. 227.7202-1 through  227.7202-4 (JUNE 1995),     *|
--|*     all U.S. Government End Users  acquire the source code  with only     *|
--|*     those rights set forth herein.                                        *|
--|*                                                                           *|
--\***************************************************************************/
--
--#ifndef __RIVA_HW_H__
--#define __RIVA_HW_H__
--#define RIVA_SW_VERSION 0x00010003
--
--/*
-- * Typedefs to force certain sized values.
-- */
--typedef Uint8  U008;
--typedef Uint16 U016;
--typedef Uint32 U032;
--
--/*
-- * HW access macros.
-- */
--#define NV_WR08(p,i,d)  (((U008 *)(p))[i]=(d))
--#define NV_RD08(p,i)    (((U008 *)(p))[i])
--#define NV_WR16(p,i,d)  (((U016 *)(p))[(i)/2]=(d))
--#define NV_RD16(p,i)    (((U016 *)(p))[(i)/2])
--#define NV_WR32(p,i,d)  (((U032 *)(p))[(i)/4]=(d))
--#define NV_RD32(p,i)    (((U032 *)(p))[(i)/4])
--#define VGA_WR08(p,i,d) NV_WR08(p,i,d)
--#define VGA_RD08(p,i)   NV_RD08(p,i)
--
--/*
-- * Define supported architectures.
-- */
--#define NV_ARCH_03  0x03
--#define NV_ARCH_04  0x04
--#define NV_ARCH_10  0x10
--/***************************************************************************\
--*                                                                           *
--*                             FIFO registers.                               *
--*                                                                           *
--\***************************************************************************/
--
--/*
-- * Raster OPeration. Windows style ROP3.
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop;
--    U032 reserved01[0x0BB];
--    U032 Rop3;
--} RivaRop;
--/*
-- * 8X8 Monochrome pattern.
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop;
--    U032 reserved01[0x0BD];
--    U032 Shape;
--    U032 reserved03[0x001];
--    U032 Color0;
--    U032 Color1;
--    U032 Monochrome[2];
--} RivaPattern;
--/*
-- * Scissor clip rectangle.
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop;
--    U032 reserved01[0x0BB];
--    U032 TopLeft;
--    U032 WidthHeight;
--} RivaClip;
--/*
-- * 2D filled rectangle.
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop[1];
--    U032 reserved01[0x0BC];
--    U032 Color;
--    U032 reserved03[0x03E];
--    U032 TopLeft;
--    U032 WidthHeight;
--} RivaRectangle;
--/*
-- * 2D screen-screen BLT.
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop;
--    U032 reserved01[0x0BB];
--    U032 TopLeftSrc;
--    U032 TopLeftDst;
--    U032 WidthHeight;
--} RivaScreenBlt;
--/*
-- * 2D pixel BLT.
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop[1];
--    U032 reserved01[0x0BC];
--    U032 TopLeft;
--    U032 WidthHeight;
--    U032 WidthHeightIn;
--    U032 reserved02[0x03C];
--    U032 Pixels;
--} RivaPixmap;
--/*
-- * Filled rectangle combined with monochrome expand.  Useful for glyphs.
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop;
--    U032 reserved01[0x0BB];
--    U032 reserved03[(0x040)-1];
--    U032 Color1A;
--    struct
--    {
--        U032 TopLeft;
--        U032 WidthHeight;
--    } UnclippedRectangle[64];
--    U032 reserved04[(0x080)-3];
--    struct
--    {
--        U032 TopLeft;
--        U032 BottomRight;
--    } ClipB;
--    U032 Color1B;
--    struct
--    {
--        U032 TopLeft;
--        U032 BottomRight;
--    } ClippedRectangle[64];
--    U032 reserved05[(0x080)-5];
--    struct
--    {
--        U032 TopLeft;
--        U032 BottomRight;
--    } ClipC;
--    U032 Color1C;
--    U032 WidthHeightC;
--    U032 PointC;
--    U032 MonochromeData1C;
--    U032 reserved06[(0x080)+121];
--    struct
--    {
--        U032 TopLeft;
--        U032 BottomRight;
--    } ClipD;
--    U032 Color1D;
--    U032 WidthHeightInD;
--    U032 WidthHeightOutD;
--    U032 PointD;
--    U032 MonochromeData1D;
--    U032 reserved07[(0x080)+120];
--    struct
--    {
--        U032 TopLeft;
--        U032 BottomRight;
--    } ClipE;
--    U032 Color0E;
--    U032 Color1E;
--    U032 WidthHeightInE;
--    U032 WidthHeightOutE;
--    U032 PointE;
--    U032 MonochromeData01E;
--} RivaBitmap;
--/*
-- * 3D textured, Z buffered triangle.
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop;
--    U032 reserved01[0x0BC];
--    U032 TextureOffset;
--    U032 TextureFormat;
--    U032 TextureFilter;
--    U032 FogColor;
--/* This is a problem on LynxOS */
--#ifdef Control
--#undef Control
--#endif
--    U032 Control;
--    U032 AlphaTest;
--    U032 reserved02[0x339];
--    U032 FogAndIndex;
--    U032 Color;
--    float ScreenX;
--    float ScreenY;
--    float ScreenZ;
--    float EyeM;
--    float TextureS;
--    float TextureT;
--} RivaTexturedTriangle03;
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop;
--    U032 reserved01[0x0BB];
--    U032 ColorKey;
--    U032 TextureOffset;
--    U032 TextureFormat;
--    U032 TextureFilter;
--    U032 Blend;
--/* This is a problem on LynxOS */
--#ifdef Control
--#undef Control
--#endif
--    U032 Control;
--    U032 FogColor;
--    U032 reserved02[0x39];
--    struct
--    {
--        float ScreenX;
--        float ScreenY;
--        float ScreenZ;
--        float EyeM;
--        U032 Color;
--        U032 Specular;
--        float TextureS;
--        float TextureT;
--    } Vertex[16];
--    U032 DrawTriangle3D;
--} RivaTexturedTriangle05;
--/*
-- * 2D line.
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop[1];
--    U032 reserved01[0x0BC];
--    U032 Color;             /* source color               0304-0307*/
--    U032 Reserved02[0x03e];
--    struct {                /* start aliased methods in array   0400-    */
--        U032 point0;        /* y_x S16_S16 in pixels            0-   3*/
--        U032 point1;        /* y_x S16_S16 in pixels            4-   7*/
--    } Lin[16];              /* end of aliased methods in array      -047f*/
--    struct {                /* start aliased methods in array   0480-    */
--        U032 point0X;       /* in pixels, 0 at left                0-   3*/
--        U032 point0Y;       /* in pixels, 0 at top                 4-   7*/
--        U032 point1X;       /* in pixels, 0 at left                8-   b*/
--        U032 point1Y;       /* in pixels, 0 at top                 c-   f*/
--    } Lin32[8];             /* end of aliased methods in array      -04ff*/
--    U032 PolyLin[32];       /* y_x S16_S16 in pixels         0500-057f*/
--    struct {                /* start aliased methods in array   0580-    */
--        U032 x;             /* in pixels, 0 at left                0-   3*/
--        U032 y;             /* in pixels, 0 at top                 4-   7*/
--    } PolyLin32[16];        /* end of aliased methods in array      -05ff*/
--    struct {                /* start aliased methods in array   0600-    */
--        U032 color;         /* source color                     0-   3*/
--        U032 point;         /* y_x S16_S16 in pixels            4-   7*/
--    } ColorPolyLin[16];     /* end of aliased methods in array      -067f*/
--} RivaLine;
--/*
-- * 2D/3D surfaces
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop;
--    U032 reserved01[0x0BE];
--    U032 Offset;
--} RivaSurface;
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop;
--    U032 reserved01[0x0BD];
--    U032 Pitch;
--    U032 RenderBufferOffset;
--    U032 ZBufferOffset;
--} RivaSurface3D;
--    
--/***************************************************************************\
--*                                                                           *
--*                        Virtualized RIVA H/W interface.                    *
--*                                                                           *
--\***************************************************************************/
--
--struct _riva_hw_inst;
--struct _riva_hw_state;
--/*
-- * Virtialized chip interface. Makes RIVA 128 and TNT look alike.
-- */
--typedef struct _riva_hw_inst
--{
--    /*
--     * Chip specific settings.
--     */
--    U032 Architecture;
--    U032 Version;
--    U032 CrystalFreqKHz;
--    U032 RamAmountKBytes;
--    U032 MaxVClockFreqKHz;
--    U032 RamBandwidthKBytesPerSec;
--    U032 EnableIRQ;
--    U032 IO;
--    U032 VBlankBit;
--    U032 FifoFreeCount;
--    U032 FifoEmptyCount;
--    /*
--     * Non-FIFO registers.
--     */
--    volatile U032 *PCRTC;
--    volatile U032 *PRAMDAC;
--    volatile U032 *PFB;
--    volatile U032 *PFIFO;
--    volatile U032 *PGRAPH;
--    volatile U032 *PEXTDEV;
--    volatile U032 *PTIMER;
--    volatile U032 *PMC;
--    volatile U032 *PRAMIN;
--    volatile U032 *FIFO;
--    volatile U032 *CURSOR;
--    volatile U032 *CURSORPOS;
--    volatile U032 *VBLANKENABLE;
--    volatile U032 *VBLANK;
--    volatile U008 *PCIO;
--    volatile U008 *PVIO;
--    volatile U008 *PDIO;
--    /*
--     * Common chip functions.
--     */
--    int  (*Busy)(struct _riva_hw_inst *);
--    void (*CalcStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *,int,int,int,int,int,int,int,int,int,int,int,int,int);
--    void (*LoadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *);
--    void (*UnloadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *);
--    void (*SetStartAddress)(struct _riva_hw_inst *,U032);
--    void (*SetSurfaces2D)(struct _riva_hw_inst *,U032,U032);
--    void (*SetSurfaces3D)(struct _riva_hw_inst *,U032,U032);
--    int  (*ShowHideCursor)(struct _riva_hw_inst *,int);
--    void (*LockUnlock)(struct _riva_hw_inst *, int);
--    /*
--     * Current extended mode settings.
--     */
--    struct _riva_hw_state *CurrentState;
--    /*
--     * FIFO registers.
--     */
--    RivaRop                 *Rop;
--    RivaPattern             *Patt;
--    RivaClip                *Clip;
--    RivaPixmap              *Pixmap;
--    RivaScreenBlt           *Blt;
--    RivaBitmap              *Bitmap;
--    RivaLine                *Line;
--    RivaTexturedTriangle03  *Tri03;
--    RivaTexturedTriangle05  *Tri05;
--} RIVA_HW_INST;
--/*
-- * Extended mode state information.
-- */
--typedef struct _riva_hw_state
--{
--    U032 bpp;
--    U032 width;
--    U032 height;
--    U032 repaint0;
--    U032 repaint1;
--    U032 screen;
--    U032 pixel;
--    U032 horiz;
--    U032 arbitration0;
--    U032 arbitration1;
--    U032 vpll;
--    U032 pllsel;
--    U032 general;
--    U032 config;
--    U032 cursor0;
--    U032 cursor1;
--    U032 cursor2;
--    U032 offset0;
--    U032 offset1;
--    U032 offset2;
--    U032 offset3;
--    U032 pitch0;
--    U032 pitch1;
--    U032 pitch2;
--    U032 pitch3;
--} RIVA_HW_STATE;
--
--/*
-- * FIFO Free Count. Should attempt to yield processor if RIVA is busy.
-- */
--
--#define RIVA_FIFO_FREE(hwptr,cnt)                                  \
--{                                                                  \
--   while (FifoFreeCount < (cnt))                                   \
--	FifoFreeCount = hwptr->FifoFree >> 2;                      \
--   FifoFreeCount -= (cnt);                                         \
--}
--#endif /* __RIVA_HW_H__ */
--
---- src/video/fbcon/SDL_fbriva.c	2012-01-19 04:30:06.000000000 -0200
-+++ src/video/fbcon/SDL_fbriva.c	2012-04-01 15:10:10.108451467 -0300
-@@ -24,12 +24,10 @@
- #include "SDL_video.h"
- #include "../SDL_blit.h"
- #include "SDL_fbriva.h"
--#include "riva_mmio.h"
- #include "riva_regs.h"
- 
- 
- static int FifoEmptyCount = 0;
--static int FifoFreeCount = 0;
- 
- /* Wait for vertical retrace */
- static void WaitVBL(_THIS)
-@@ -41,20 +39,6 @@
- 	while ( !(*port & 0x08) )
- 		;
- }
--static void NV3WaitIdle(_THIS)
--{
--	RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET);
--	while ( (Rop->FifoFree < FifoEmptyCount) ||
--	        (*(mapped_io + PGRAPH_OFFSET + 0x000006B0) & 0x01) )
--		;
--}
--static void NV4WaitIdle(_THIS)
--{
--	RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET);
--	while ( (Rop->FifoFree < FifoEmptyCount) ||
--	        (*(mapped_io + PGRAPH_OFFSET + 0x00000700) & 0x01) )
--		;
--}
- 
- #if 0 /* Not yet implemented? */
- /* Sets video mem colorkey and accelerated blit function */
-@@ -74,7 +58,6 @@
- {
- 	int dstX, dstY;
- 	int dstW, dstH;
--	RivaBitmap *Bitmap = (RivaBitmap *)(mapped_io + BITMAP_OFFSET);
- 
- 	/* Don't blit to the display surface when switched away */
- 	if ( switched_away ) {
-@@ -93,13 +76,6 @@
- 	dstX += rect->x;
- 	dstY += rect->y;
- 
--	RIVA_FIFO_FREE(Bitmap, 1);
--	Bitmap->Color1A = color;
--
--	RIVA_FIFO_FREE(Bitmap, 2);
--	Bitmap->UnclippedRectangle[0].TopLeft     = (dstX << 16) | dstY; 
--	Bitmap->UnclippedRectangle[0].WidthHeight = (dstW << 16) | dstH;
--
- 	FB_AddBusySurface(dst);
- 
- 	if ( dst == this->screen ) {
-@@ -115,7 +91,6 @@
- 	int srcX, srcY;
- 	int dstX, dstY;
- 	int dstW, dstH;
--	RivaScreenBlt *Blt = (RivaScreenBlt *)(mapped_io + BLT_OFFSET);
- 
- 	/* FIXME: For now, only blit to display surface */
- 	if ( dst->pitch != SDL_VideoSurface->pitch ) {
-@@ -142,11 +117,6 @@
- 	dstX += dstrect->x;
- 	dstY += dstrect->y;
- 
--	RIVA_FIFO_FREE(Blt, 3);
--	Blt->TopLeftSrc  = (srcY << 16) | srcX;
--	Blt->TopLeftDst  = (dstY << 16) | dstX;
--	Blt->WidthHeight = (dstH  << 16) | dstW;
--
- 	FB_AddBusySurface(src);
- 	FB_AddBusySurface(dst);
- 
-@@ -185,23 +155,15 @@
- 
- void FB_RivaAccel(_THIS, __u32 card)
- {
--	RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET);
- 
- 	/* We have hardware accelerated surface functions */
- 	this->CheckHWBlit = CheckHWBlit;
- 	wait_vbl = WaitVBL;
- 	switch (card) {
--	    case FB_ACCEL_NV3:
--		wait_idle = NV3WaitIdle;
--		break;
--	    case FB_ACCEL_NV4:
--		wait_idle = NV4WaitIdle;
--		break;
- 	    default:
- 		/* Hmm... FIXME */
- 		break;
- 	}
--	FifoEmptyCount = Rop->FifoFree;
- 
- 	/* The Riva has an accelerated color fill */
- 	this->info.blit_fill = 1;
---- src/video/fbcon/SDL_fbvideo.c.orig	2011-09-08 17:30:03.670583685 +0200
-+++ src/video/fbcon/SDL_fbvideo.c	2011-09-08 17:30:24.230582737 +0200
-@@ -46,7 +46,6 @@
- #include "SDL_fbevents_c.h"
- #include "SDL_fb3dfx.h"
- #include "SDL_fbmatrox.h"
--#include "SDL_fbriva.h"
- 
- /*#define FBCON_DEBUG*/
- 
-@@ -769,13 +768,6 @@
- #endif
- 			FB_3DfxAccel(this, finfo.accel);
- 			break;
--		    case FB_ACCEL_NV3:
--		    case FB_ACCEL_NV4:
--#ifdef FBACCEL_DEBUG
--			printf("NVidia hardware accelerator!\n");
--#endif
--			FB_RivaAccel(this, finfo.accel);
--			break;
- 		    default:
- #ifdef FBACCEL_DEBUG
- 			printf("Unknown hardware accelerator.\n");
diff --git a/libre/lib32-sdl-libre/libsdl-1.2.15-resizing.patch b/libre/lib32-sdl-libre/libsdl-1.2.15-resizing.patch
deleted file mode 100644
index 0655a13e1..000000000
--- a/libre/lib32-sdl-libre/libsdl-1.2.15-resizing.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Revert change that breaks window corner resizing
- http://bugzilla.libsdl.org/show_bug.cgi?id=1430
-Author: Andrew Caudwell <acaudwell@gmail.com>
-Last-Update: 2012-04-10
-Bug-Debian: http://bugs.debian.org/665779
-
-diff -r c787fb1b5699 src/video/x11/SDL_x11events.c
---- a/src/video/x11/SDL_x11events.c	Mon Feb 20 23:51:08 2012 -0500
-+++ b/src/video/x11/SDL_x11events.c	Mon Mar 26 12:26:52 2012 +1300
-@@ -57,12 +57,6 @@
- static SDLKey MISC_keymap[256];
- SDLKey X11_TranslateKeycode(Display *display, KeyCode kc);
- 
--/*
-- Pending resize target for ConfigureNotify (so outdated events don't
-- cause inappropriate resize events)
--*/
--int X11_PendingConfigureNotifyWidth = -1;
--int X11_PendingConfigureNotifyHeight = -1;
- 
- #ifdef X_HAVE_UTF8_STRING
- Uint32 Utf8ToUcs4(const Uint8 *utf8)
-@@ -825,16 +819,6 @@
- #ifdef DEBUG_XEVENTS
- printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height);
- #endif
--		if ((X11_PendingConfigureNotifyWidth != -1) &&
--		    (X11_PendingConfigureNotifyHeight != -1)) {
--		    if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) &&
--			(xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) {
--			    /* Event is from before the resize, so ignore. */
--			    break;
--		    }
--		    X11_PendingConfigureNotifyWidth = -1;
--		    X11_PendingConfigureNotifyHeight = -1;
--		}
- 		if ( SDL_VideoSurface ) {
- 		    if ((xevent.xconfigure.width != SDL_VideoSurface->w) ||
- 		        (xevent.xconfigure.height != SDL_VideoSurface->h)) {
-diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h
---- a/src/video/x11/SDL_x11events_c.h	Mon Feb 20 23:51:08 2012 -0500
-+++ b/src/video/x11/SDL_x11events_c.h	Mon Mar 26 12:26:52 2012 +1300
-@@ -27,8 +27,3 @@
- extern void X11_InitOSKeymap(_THIS);
- extern void X11_PumpEvents(_THIS);
- extern void X11_SetKeyboardState(Display *display, const char *key_vec);
--
--/* Variables to be exported */
--extern int X11_PendingConfigureNotifyWidth;
--extern int X11_PendingConfigureNotifyHeight;
--
-diff -r c787fb1b5699 src/video/x11/SDL_x11video.c
---- a/src/video/x11/SDL_x11video.c	Mon Feb 20 23:51:08 2012 -0500
-+++ b/src/video/x11/SDL_x11video.c	Mon Mar 26 12:26:52 2012 +1300
-@@ -1182,8 +1182,6 @@
- 			current = NULL;
- 			goto done;
- 		}
--		X11_PendingConfigureNotifyWidth = width;
--		X11_PendingConfigureNotifyHeight = height;
- 	} else {
- 		if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) {
- 			current = NULL;
diff --git a/libre/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch
deleted file mode 100644
index 1bb6e0e47..000000000
--- a/libre/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# and another one from FS#26020
-
---- a/src/video/SDL_yuv_sw.c    2009-10-13 06:07:15.000000000 +0700
-+++ b/src/video/SDL_yuv_sw.c    2011-09-20 19:26:30.247742620 +0700
-@@ -89,6 +89,8 @@
- #include "SDL_yuvfuncs.h"
- #include "SDL_yuv_sw_c.h"
- 
-+#undef __OPTIMIZE__
-+
- /* The functions used to manipulate software video overlays */
- static struct private_yuvhwfuncs sw_yuvfuncs = {
- 	SDL_LockYUV_SW,
diff --git a/libre/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch b/libre/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch
deleted file mode 100644
index 7d3e5acfc..000000000
--- a/libre/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig	2010-04-08 11:57:05.003169834 -0700
-+++ SDL-1.2.14/src/video/x11/SDL_x11events.c	2010-04-08 12:33:51.690926340 -0700
-@@ -423,12 +423,15 @@
- if ( xevent.xcrossing.mode == NotifyUngrab )
- printf("Mode: NotifyUngrab\n");
- #endif
--		if ( this->input_grab == SDL_GRAB_OFF ) {
--			posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-+		if ( (xevent.xcrossing.mode != NotifyGrab) &&
-+		     (xevent.xcrossing.mode != NotifyUngrab) ) {
-+			if ( this->input_grab == SDL_GRAB_OFF ) {
-+				posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-+			}
-+			posted = SDL_PrivateMouseMotion(0, 0,
-+					xevent.xcrossing.x,
-+					xevent.xcrossing.y);
- 		}
--		posted = SDL_PrivateMouseMotion(0, 0,
--				xevent.xcrossing.x,
--				xevent.xcrossing.y);
- 	    }
- 	    break;
- 
diff --git a/libre/libclc-svn/PKGBUILD b/libre/libclc-svn/PKGBUILD
deleted file mode 100644
index 3b7034348..000000000
--- a/libre/libclc-svn/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-_pkgname=libclc
-pkgname=$_pkgname-svn
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
-pkgrel=1
-arch=(mips64el x86_64 i686)
-pkgdesc='Library requirements of the OpenCL C programming language'
-url=http://libclc.llvm.org/
-license=MIT
-depends=llvm-libs
-makedepends=(clang python2 svn)
-provides=($_pkgname)
-conflicts=$_pkgname
-source=$_pkgname::svn+http://llvm.org/svn/llvm-project/libclc/trunk
-sha512sums=SKIP
-
-prepare() {
-  sed -i 's|/usr/bin/python|/usr/bin/python2|g;
-         ' $srcdir/$_pkgname/{configure,build/ninja_syntax}.py
-}
-
-build() {
-  cd $srcdir/$_pkgname
-  ./configure.py --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$_pkgname
-  make DESTDIR=$pkgdir install
-  install -vDm644 LICENSE.TXT $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD
deleted file mode 100644
index c616282ec..000000000
--- a/libre/libquicktime-libre/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 100489 2013-11-05 09:06:26Z bpiotrowski $
-# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
-# Maintainer: Mateusz Herych   <heniekk@gmail.com>
-# Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com>
-
-pkgname=libquicktime-libre
-_pkgname=libquicktime
-pkgver=1.2.4
-pkgrel=8
-pkgdesc="A library for reading and writing quicktime files, without nonfree faac support"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://libquicktime.sourceforge.net/"
-depends=('gtk2' 'ffmpeg' 'libxv' 'libxaw' 'faad2')
-makedepends=('mesa-libgl')
-source=("http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz"
-        ffmpeg2.0.patch)
-sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368'
-            'a1c8415e8e7bc04c81b946b9e3746f7d5ef24819135962280c3a7ddb3f2baa2b')
-provides=("$_pkgname=$pkgver")
-conflicts=($_pkgname)
-replaces=($_pkgname)
-
-prepare() {
-  cd $_pkgname-$pkgver
-  patch -Np1 -i ../ffmpeg2.0.patch
-}
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  ./configure --prefix=/usr \
-  	--enable-gpl \
-	--with-ffmpeg \
-	--with-x264 \
-	--without-doxygen
-	make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/libre/libquicktime-libre/ffmpeg2.0.patch b/libre/libquicktime-libre/ffmpeg2.0.patch
deleted file mode 100644
index 6bec4d99a..000000000
--- a/libre/libquicktime-libre/ffmpeg2.0.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-Binary files a/plugins/ffmpeg/.lqt_ffmpeg.c.swp and b/plugins/ffmpeg/.lqt_ffmpeg.c.swp differ
-diff -rupN a/plugins/ffmpeg/ffmpeg.h b/plugins/ffmpeg/ffmpeg.h
---- a/plugins/ffmpeg/ffmpeg.h	2012-02-15 20:48:30.000000000 +0100
-+++ b/plugins/ffmpeg/ffmpeg.h	2013-07-15 15:05:19.307534593 +0200
-@@ -45,3 +45,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
- 
- 
- #endif
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
-+#define CODEC_FLAG2_STRICT_GOP 0x00000002
-+#define CODEC_FLAG_QP_RD 0x08000000
-+#define CODEC_FLAG_CBP_RD 0x04000000
-diff -rupN a/plugins/ffmpeg/lqt_ffmpeg.c b/plugins/ffmpeg/lqt_ffmpeg.c
---- a/plugins/ffmpeg/lqt_ffmpeg.c	2012-02-15 20:48:30.000000000 +0100
-+++ b/plugins/ffmpeg/lqt_ffmpeg.c	2013-07-15 15:19:09.730831655 +0200
-@@ -89,19 +89,8 @@ int ffmpeg_num_video_codecs = -1;
-     PARAM_QSCALE, \
-     PARAM_QCOMPRESS, \
-     PARAM_QBLUR, \
--    PARAM_QUANTIZER_NOISE_SHAPING, \
-     PARAM_TRELLIS
- 
--#define ENCODE_PARAM_VIDEO_QUANTIZER_IP \
--  ENCODE_PARAM_VIDEO_QUANTIZER_I, \
--  PARAM_I_QUANT_FACTOR, \
--  PARAM_I_QUANT_OFFSET
--
--#define ENCODE_PARAM_VIDEO_QUANTIZER_IPB \
--  ENCODE_PARAM_VIDEO_QUANTIZER_IP, \
--  PARAM_B_QUANT_FACTOR, \
--  PARAM_B_QUANT_OFFSET
--
- #define ENCODE_PARAM_VIDEO_FRAMETYPES_IP \
-   { \
-     .name =      "frame_types", \
-@@ -207,7 +196,6 @@ static lqt_parameter_info_static_t encod
-   ENCODE_PARAM_VIDEO_FRAMETYPES_IPB,
-   PARAM_FLAG_AC_PRED_MPEG4,
-   ENCODE_PARAM_VIDEO_RATECONTROL,
--  ENCODE_PARAM_VIDEO_QUANTIZER_IPB,
-   PARAM_FLAG_CBP_RD,
-   ENCODE_PARAM_VIDEO_ME,
-   PARAM_FLAG_GMC,
-@@ -225,7 +213,6 @@ static lqt_parameter_info_static_t encod
- static lqt_parameter_info_static_t encode_parameters_dx50[] = {
-   ENCODE_PARAM_VIDEO_FRAMETYPES_IP,
-   ENCODE_PARAM_VIDEO_RATECONTROL,
--  ENCODE_PARAM_VIDEO_QUANTIZER_IP,
-   ENCODE_PARAM_VIDEO_ME,
-   ENCODE_PARAM_VIDEO_ME_PRE,
-   ENCODE_PARAM_VIDEO_MASKING,
-@@ -237,7 +224,6 @@ static lqt_parameter_info_static_t encod
- static lqt_parameter_info_static_t encode_parameters_h263[] = {
-   ENCODE_PARAM_VIDEO_FRAMETYPES_IP,
-   ENCODE_PARAM_VIDEO_RATECONTROL,
--  ENCODE_PARAM_VIDEO_QUANTIZER_IP,
-   ENCODE_PARAM_VIDEO_ME,
-   PARAM_FLAG_4MV,
-   ENCODE_PARAM_VIDEO_ME_PRE,
-@@ -250,7 +236,6 @@ static lqt_parameter_info_static_t encod
- static lqt_parameter_info_static_t encode_parameters_h263p[] = {
-   ENCODE_PARAM_VIDEO_FRAMETYPES_IP,
-   ENCODE_PARAM_VIDEO_RATECONTROL,
--  ENCODE_PARAM_VIDEO_QUANTIZER_IP,
-   ENCODE_PARAM_VIDEO_ME,
-   PARAM_FLAG_4MV,
-   ENCODE_PARAM_VIDEO_ME_PRE,
-@@ -264,7 +249,6 @@ static lqt_parameter_info_static_t encod
- static lqt_parameter_info_static_t encode_parameters_msmpeg4v3[] = {
-   ENCODE_PARAM_VIDEO_FRAMETYPES_IP,
-   ENCODE_PARAM_VIDEO_RATECONTROL,
--  ENCODE_PARAM_VIDEO_QUANTIZER_IP,
-   ENCODE_PARAM_VIDEO_ME,
-   ENCODE_PARAM_VIDEO_ME_PRE,
-   ENCODE_PARAM_VIDEO_MASKING,
-diff -rupN a/plugins/ffmpeg/params.c b/plugins/ffmpeg/params.c
---- a/plugins/ffmpeg/params.c	2012-03-07 15:10:41.000000000 +0100
-+++ b/plugins/ffmpeg/params.c	2013-07-15 15:09:38.214189953 +0200
-@@ -202,8 +202,10 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
-   PARAM_INT("ff_max_b_frames",max_b_frames);
-   PARAM_FLOAT("ff_b_quant_factor",b_quant_factor);
-   PARAM_INT("ff_b_frame_strategy",b_frame_strategy);
-+#if (LIBAVCODEC_VERSION_MAJOR < 55)
-   PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold);
-   PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold);
-+#endif
-   PARAM_INT("ff_strict_std_compliance",strict_std_compliance);
-   PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset);
-   PARAM_INT("ff_rc_min_rate",rc_min_rate);
-@@ -241,8 +243,10 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
-   PARAM_QP2LAMBDA("ff_lmax", lmax);
-   PARAM_INT("ff_noise_reduction",noise_reduction);
-   PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000);
-+#if #if (LIBAVCODEC_VERSION_MAJOR < 55)
-   PARAM_INT("ff_inter_threshold",inter_threshold);
-   PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping);
-+#endif
-   PARAM_INT("ff_thread_count",thread_count);
-   PARAM_INT("ff_me_threshold",me_threshold);
-   PARAM_INT("ff_mb_threshold",mb_threshold);
-diff -rupN a/plugins/ffmpeg/params.h b/plugins/ffmpeg/params.h
---- a/plugins/ffmpeg/params.h	2011-05-11 17:13:39.000000000 +0200
-+++ b/plugins/ffmpeg/params.h	2013-07-15 15:09:04.860858069 +0200
-@@ -177,6 +177,7 @@ the reference. Unused for constant quant
-     .val_max =     { .val_int = 1 }, \
-   }
- 
-+#if (LIBAVCODEC_VERSION_MAJOR < 55)
- #define PARAM_LUMA_ELIM_THRESHOLD \
-   { \
-     .name =        "ff_luma_elim_threshold", \
-@@ -202,6 +203,7 @@ recommendation") \
- chrominamce. Negative values also consider dc \
- coefficient. 7 is JVT recommendation") \
-   }
-+#endif
- 
- #define PARAM_STRICT_STANDARD_COMPLIANCE \
-   { \
-@@ -739,6 +741,7 @@ with max and/or min bitrate, this must b
- 
- /* Does nothing */
- /** Frame types */
-+#if (LIBAVCODEC_VERSION_MAJOR < 55)
- #define PARAM_INTER_THRESHOLD \
-   { \
-     .name =        "ff_inter_threshold", \
-@@ -759,6 +762,7 @@ with max and/or min bitrate, this must b
-     .help_string = TRS("Choose quantization such that noise will be masked by " \
-                        "similar-frequency content in the image")        \
-   }
-+#endif
- 
- /** Motion estimation */
- #define PARAM_ME_THRESHOLD \
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 569706f80..51d33f1cd 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -1,5 +1,5 @@
-# Maintainer: Joshua Haase <hahj87@gmail.com
-# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: Joshua Haase <hahj87@gmail.com
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Márcio Silva <coadde@lavabit.com>
 
@@ -9,9 +9,9 @@ pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20131112
-_libretools_commit=0f03eb7ac94ad72f551eb1b2470b850d6bcf8bf0
-_devtools_commit=021653a0acecc8763e1bbe90dbb770b4e6df4390
+pkgver=20140120.1
+_libretools_commit=641002eff37a30eb2b8237b15b74cc15b4d9f822
+_devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd
 
 _packages_url=https://projects.parabolagnulinux.org/packages
 source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
@@ -64,8 +64,8 @@ package_libretools() {
 
   depends=(
     "librelib=$pkgver"
+    "gitget=$pkgver" # `createworkdir`
     arch-install-scripts # `archroot` uses `pacstrap`
-    git # `createworkdir`
     openssh # `librerelease`
     rsync # `librerelease` and `makechrootpkg.sh`
     subversion # `diff-unfree`
@@ -87,5 +87,5 @@ package_libretools-mips64el() {
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
 
-md5sums=('81e6d3d6fe1964a407a4520ce0916c0d'
-         '656008e8e35e6adba527b7bfc367b9f7')
+md5sums=('8991b27aed494b60f33c84dd48aea874'
+         'ec69dffa68829f063224de19bbd55fa9')
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index d46990da8..35edf68c7 100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -1,14 +1,54 @@
 #!/bin/sh
 
-_makepkgconf_append='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")'
+_edit_code="          'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'"
+_edit_cmnt='#%s # commented out by the libretools post_install script'
+
+_add_cmnt='# The following line is added by the libretools post_install script'
+_add_code='DLAGENTS+=({https,libre}'\''::/usr/bin/librefetch -p "$BUILDFILE" -- %u %o'\'')'
+
+# These lines were installed by previous versions of this script
+_old_code=(
+	'[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")'
+	'[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p \"\$BUILDFILE\" -- %u %o")'
+	'DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p $(printf "%q" "$BUILDFILE") -- %u %o")'
+)
+
+# has_line $line
+has_line() { grep -Fxq -- "$1" etc/makepkg.conf; }
+# add_line $line
+add_line() { printf '%s\n' "$1" >> etc/makepkg.conf; }
+# del_line $line
+del_line() {
+	local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1))
+	if [[ "${#lineno[@]}" -gt 0 ]]; then
+		sed -i "$(printf '%dd;' "${lineno[@]}")" etc/makepkg.conf;
+	fi
+}
+# rep_line $orig $replacement_bre
+rep_line() {
+	local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1))
+	if [[ "${#lineno[@]}" == 1 ]]; then
+		sed -i "${lineno}s|.*|${2//|/\\|}|" etc/makepkg.conf;
+	fi
+}
 
 # arg 1:  the new package version
 post_install() {
-	if grep -q 'libre::' etc/makepkg.conf; then
+	if grep -q 'librefetch' etc/makepkg.conf; then
 		libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf"
+		local line del=false
+		for line in "${_old_code[@]}"; do
+			if has_line "$line"; then
+				pre_remove
+				post_install
+				return $?
+			fi
+		done
 	else
-		libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf"
-		printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf
+		libremessages msg2 "libretools: adding librefetch to /etc/makepkg.conf"
+		rep_line "$_edit_code" "$(printf "$_edit_cmnt" '&')"
+		add_line "$_add_cmnt"
+		add_line "$_add_code"
 	fi
 }
 
@@ -19,10 +59,14 @@ post_upgrade() {
 }
 
 pre_remove() {
-	if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then
-		libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf"
-		sed -i '/libre::/d' etc/makepkg.conf
-	else
-		libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it"
-	fi
+	libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf"
+
+	rep_line "$(printf "$_edit_cmnt" "$_edit_code")" "$_edit_code"
+	del_line "$_add_cmnt"
+	del_line "$_add_code"
+
+	local line
+	for line in "${_old_code[@]}"; do
+		del_line "$line"
+	done
 }
diff --git a/libre/libui-sh/PKGBUILD b/libre/libui-sh/PKGBUILD
deleted file mode 100644
index 075d8c0a6..000000000
--- a/libre/libui-sh/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id$
-# Maintainer: Dieter Plaetinck <dieter@plaetinck.be>
-
-pkgname=libui-sh
-pkgver=2011.10.09
-pkgrel=2
-pkgdesc="a shell library providing useful UI functions"
-arch=('any')
-url="http://github.com/Dieterbe/libui-sh/"
-license=('GPL3')
-depends=('bash')
-optdepends=('dialog: for ncurses support')
-source=(ftp://ftp.archlinux.org/other/libui-sh/libui-sh-$pkgver.tar.gz)
-md5sums=('6f855b407d791ab66b78f839835ed915')
-
-build() {
-
-  cd $srcdir/libui-sh-$pkgver/
-  
-  make DESTDIR="$pkgdir/" install
-
-}
-
-# vim:set ts=2 sw=2 et:
-
diff --git a/libre/licenses-libre/PKGBUILD b/libre/licenses-libre/PKGBUILD
deleted file mode 100644
index 24b2cc4d8..000000000
--- a/libre/licenses-libre/PKGBUILD
+++ /dev/null
@@ -1,134 +0,0 @@
-# $Id: PKGBUILD 176952 2013-02-03 00:38:36Z dan $
-# 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@parabola.nu>
-
-pkgname=licenses-libre
-pkgver=20130203
-pkgrel=1.1
-pkgdesc="The standard licenses distribution package"
-arch=('any')
-license=('custom:none')
-url="https://parabolagnulinux.org/"
-groups=('base')
-provides=("licenses=${pkgver}")
-conflicts=('licenses')
-replaces=('licenses')
-makedepends=(links)
-source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt
-        cc-by-3.0.txt
-        cc-by-sa-3.0.txt
-        cc-readme.txt
-        cddl-1.0.txt
-        eclipse-1.0.txt
-        http://www.gnu.org/licenses/agpl-3.0.txt
-        http://www.gnu.org/licenses/gpl-2.0.txt
-        http://www.gnu.org/licenses/gpl-3.0.txt
-        http://www.gnu.org/licenses/lgpl-2.1.txt
-        http://www.gnu.org/licenses/lgpl-3.0.txt
-        http://www.gnu.org/licenses/fdl-1.2.txt
-        http://www.gnu.org/licenses/fdl-1.3.txt
-        http://www.latex-project.org/lppl.txt
-        mpl-1.1.txt::http://www.mozilla.org/MPL/1.1/index.txt
-        perlartistic.txt
-        http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt
-        php-3.0.txt::http://www.php.net/license/3_0.txt
-        ruby-license.txt::http://www.ruby-lang.org/en/about/license.txt
-        cpl-1.0.txt
-        python-2.txt
-        w3c.txt
-        ZopePublicLicense.txt)
-md5sums=('3b83ef96387f14655fc854ddc3c6bd57'
-         'ffb24d1bbf8b83d373f0b8edc3feb0c6'
-         '5367190077e12a7f55403d531ef3998e'
-         '77651e5c686cbc0f8cec5ac7e6504235'
-         '6cb35f3976cd093011967fa1abbce386'
-         'f300afd598546add034364cd0a533261'
-         '73f1eb20517c55bf9493b7dd6e480788'
-         'b234ee4d69f5fce4486a80fdaf4a4263'
-         'd32239bcb673463ab874e80d47fae504'
-         '4fbd65380cdd255951079008b364516c'
-         'e6a600fd5e1d9cbde2d983680233ad02'
-         '24ea4c7092233849b4394699333b5c56'
-         '10b9de612d532fdeeb7fe8fcd1435cc6'
-         '9f4337828d782bdea41f03dd2ad1b808'
-         'bfe1f75d606912a4111c90743d6c7325'
-         'd09c120ca7db95ef2aeecec0cb08293b'
-         'b4a94da2a1f918b217ef5156634fc9e0'
-         'a45bb1bbeed9e26b26c5763df1d3913d'
-         'f24b942d957112d759762054b6e7cf34'
-         'f083e41c43db25e18f36c91e57750b64'
-         'a055911c32fb4ed6e96c453ceaeba857'
-         '6f2095b5d61770740852873b195a4d21'
-         'dc8502850eab9e1ff330a12d7ca18a19')
-
-package() {
-  cd "$pkgdir"
-  mkdir -p usr/share/licenses/common
-  cd usr/share/licenses/common
-
-  mkdir AGPL3
-  cp "$srcdir"/agpl-3.0.txt AGPL3/license.txt
-  ln -s AGPL3 AGPL
-
-  mkdir Apache
-  cp "$srcdir"/apache-2.0.txt Apache/license.txt
-  ln -s Apache APACHE
-
-  mkdir Artistic2.0
-  cp "$srcdir"/artistic-2_0.txt Artistic2.0/license.txt
-
-  mkdir CCPL
-  cp "$srcdir"/cc-by-3.0.txt CCPL/
-  cp "$srcdir"/cc-by-sa-3.0.txt CCPL/
-  cp "$srcdir"/cc-readme.txt CCPL/
-
-  mkdir CDDL
-  cp "$srcdir"/cddl-1.0.txt CDDL/license.txt
-
-  mkdir CPL
-  cp "$srcdir"/cpl-1.0.txt CPL/license.txt
-
-  mkdir EPL
-  cp "$srcdir"/eclipse-1.0.txt EPL/license.txt
-
-  mkdir {GPL2,GPL3}
-  cp "$srcdir"/gpl-2.0.txt GPL2/license.txt
-  cp "$srcdir"/gpl-3.0.txt GPL3/license.txt
-  ln -s GPL2 GPL
-
-  mkdir {FDL1.2,FDL1.3}
-  cp "$srcdir"/fdl-1.2.txt FDL1.2/license.txt
-  cp "$srcdir"/fdl-1.3.txt FDL1.3/license.txt
-  ln -s FDL1.2 FDL
-
-  mkdir {LGPL2.1,LGPL3}
-  cp "$srcdir"/lgpl-2.1.txt LGPL2.1/license.txt
-  cp "$srcdir"/lgpl-3.0.txt LGPL3/license.txt
-  ln -s LGPL2.1 LGPL
-
-  mkdir LPPL
-  cp "$srcdir"/lppl.txt LPPL/license.txt
-
-  mkdir MPL
-  cp "$srcdir"/mpl-1.1.txt MPL/license.txt
-
-  mkdir PerlArtistic
-  cp "$srcdir"/perlartistic.txt PerlArtistic/license.txt
-
-  mkdir PHP
-  cp "$srcdir"/php-3.0.txt PHP/license.txt
-  
-  mkdir PSF
-  cp "$srcdir"/python-2.txt PSF/license.txt
-
-  mkdir RUBY
-  cp "$srcdir"/ruby-license.txt RUBY/license.txt
-
-  mkdir W3C
-  cp "$srcdir"/w3c.txt W3C/license.txt
-
-  mkdir ZPL
-  cp "$srcdir"/ZopePublicLicense.txt ZPL/license.txt
-}
diff --git a/libre/licenses-libre/ZopePublicLicense.txt b/libre/licenses-libre/ZopePublicLicense.txt
deleted file mode 100644
index 0f06d960d..000000000
--- a/libre/licenses-libre/ZopePublicLicense.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-Zope Public License (ZPL) Version 2.1
--------------------------------------
-
-A copyright notice accompanies this license document that
-identifies the copyright holders.
-
-This license has been certified as open source. It has also
-been designated as GPL compatible by the Free Software
-Foundation (FSF).
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions in source code must retain the
-   accompanying copyright notice, this list of conditions,
-   and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the accompanying
-   copyright notice, this list of conditions, and the
-   following disclaimer in the documentation and/or other
-   materials provided with the distribution.
-
-3. Names of the copyright holders must not be used to
-   endorse or promote products derived from this software
-   without prior written permission from the copyright
-   holders.
-
-4. The right to distribute this software or to use it for
-   any purpose does not give you the right to use
-   Servicemarks (sm) or Trademarks (tm) of the copyright
-   holders. Use of them is covered by separate agreement
-   with the copyright holders.
-
-5. If any files are modified, you must cause the modified
-   files to carry prominent notices stating that you changed
-   the files and the date of any change.
-
-Disclaimer
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
-  AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-  NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-  AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
-  NO EVENT SHALL THE COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-  DAMAGE.
diff --git a/libre/licenses-libre/cc-by-3.0.txt b/libre/licenses-libre/cc-by-3.0.txt
deleted file mode 100644
index 4c79aa8ae..000000000
--- a/libre/licenses-libre/cc-by-3.0.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-License
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License.
-   3. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   4. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   5. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   6. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   7. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-   8. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-   9. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(b), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(b), as requested.
-   2. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4 (b) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   3. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
diff --git a/libre/licenses-libre/cc-by-sa-3.0.txt b/libre/licenses-libre/cc-by-sa-3.0.txt
deleted file mode 100644
index 7252d9ca5..000000000
--- a/libre/licenses-libre/cc-by-sa-3.0.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-License
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
diff --git a/libre/licenses-libre/cc-readme.txt b/libre/licenses-libre/cc-readme.txt
deleted file mode 100644
index d71e2254f..000000000
--- a/libre/licenses-libre/cc-readme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-There are 2 different Creative Commons Licenses, all of which are included
-in this licenses directory:
-
-cc-by-3.0.txt       - Attribution
-cc-by-sa-3.0.txt    - Attribution-ShareAlike
-
-If a package uses one of these licenses, it should be referenced as follows:
-license=('CCPL:by-sa')
-
-Note: nd and nc licenses were removed because they aren't copyleft friendly
diff --git a/libre/licenses-libre/cddl-1.0.txt b/libre/licenses-libre/cddl-1.0.txt
deleted file mode 100644
index d83893249..000000000
--- a/libre/licenses-libre/cddl-1.0.txt
+++ /dev/null
@@ -1,377 +0,0 @@
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0
-
-1. Definitions.
-
-    1.1. "Contributor" means each individual or entity that creates
-         or contributes to the creation of Modifications.
-
-    1.2. "Contributor Version" means the combination of the Original
-         Software, prior Modifications used by a Contributor (if any),
-         and the Modifications made by that particular Contributor.
-
-    1.3. "Covered Software" means (a) the Original Software, or (b)
-         Modifications, or (c) the combination of files containing
-         Original Software with files containing Modifications, in
-         each case including portions thereof.
-
-    1.4. "Executable" means the Covered Software in any form other
-         than Source Code.
-
-    1.5. "Initial Developer" means the individual or entity that first
-         makes Original Software available under this License.
-
-    1.6. "Larger Work" means a work which combines Covered Software or
-         portions thereof with code not governed by the terms of this
-         License.
-
-    1.7. "License" means this document.
-
-    1.8. "Licensable" means having the right to grant, to the maximum
-         extent possible, whether at the time of the initial grant or
-         subsequently acquired, any and all of the rights conveyed
-         herein.
-
-    1.9. "Modifications" means the Source Code and Executable form of
-         any of the following:
-
-        A. Any file that results from an addition to, deletion from or
-           modification of the contents of a file containing Original
-           Software or previous Modifications;
-
-        B. Any new file that contains any part of the Original
-           Software or previous Modifications; or
-
-        C. Any new file that is contributed or otherwise made
-           available under the terms of this License.
-
-    1.10. "Original Software" means the Source Code and Executable
-          form of computer software code that is originally released
-          under this License.
-
-    1.11. "Patent Claims" means any patent claim(s), now owned or
-          hereafter acquired, including without limitation, method,
-          process, and apparatus claims, in any patent Licensable by
-          grantor.
-
-    1.12. "Source Code" means (a) the common form of computer software
-          code in which modifications are made and (b) associated
-          documentation included in or with such code.
-
-    1.13. "You" (or "Your") means an individual or a legal entity
-          exercising rights under, and complying with all of the terms
-          of, this License.  For legal entities, "You" includes any
-          entity which controls, is controlled by, or is under common
-          control with You.  For purposes of this definition,
-          "control" means (a) the power, direct or indirect, to cause
-          the direction or management of such entity, whether by
-          contract or otherwise, or (b) ownership of more than fifty
-          percent (50%) of the outstanding shares or beneficial
-          ownership of such entity.
-
-2. License Grants.
-
-    2.1. The Initial Developer Grant.
-
-    Conditioned upon Your compliance with Section 3.1 below and
-    subject to third party intellectual property claims, the Initial
-    Developer hereby grants You a world-wide, royalty-free,
-    non-exclusive license:
-
-        (a) under intellectual property rights (other than patent or
-            trademark) Licensable by Initial Developer, to use,
-            reproduce, modify, display, perform, sublicense and
-            distribute the Original Software (or portions thereof),
-            with or without Modifications, and/or as part of a Larger
-            Work; and
-
-        (b) under Patent Claims infringed by the making, using or
-            selling of Original Software, to make, have made, use,
-            practice, sell, and offer for sale, and/or otherwise
-            dispose of the Original Software (or portions thereof).
-
-        (c) The licenses granted in Sections 2.1(a) and (b) are
-            effective on the date Initial Developer first distributes
-            or otherwise makes the Original Software available to a
-            third party under the terms of this License.
-
-        (d) Notwithstanding Section 2.1(b) above, no patent license is
-            granted: (1) for code that You delete from the Original
-            Software, or (2) for infringements caused by: (i) the
-            modification of the Original Software, or (ii) the
-            combination of the Original Software with other software
-            or devices.
-
-    2.2. Contributor Grant.
-
-    Conditioned upon Your compliance with Section 3.1 below and
-    subject to third party intellectual property claims, each
-    Contributor hereby grants You a world-wide, royalty-free,
-    non-exclusive license:
-
-        (a) under intellectual property rights (other than patent or
-            trademark) Licensable by Contributor to use, reproduce,
-            modify, display, perform, sublicense and distribute the
-            Modifications created by such Contributor (or portions
-            thereof), either on an unmodified basis, with other
-            Modifications, as Covered Software and/or as part of a
-            Larger Work; and
-
-        (b) under Patent Claims infringed by the making, using, or
-            selling of Modifications made by that Contributor either
-            alone and/or in combination with its Contributor Version
-            (or portions of such combination), to make, use, sell,
-            offer for sale, have made, and/or otherwise dispose of:
-            (1) Modifications made by that Contributor (or portions
-            thereof); and (2) the combination of Modifications made by
-            that Contributor with its Contributor Version (or portions
-            of such combination).
-
-        (c) The licenses granted in Sections 2.2(a) and 2.2(b) are
-            effective on the date Contributor first distributes or
-            otherwise makes the Modifications available to a third
-            party.
-
-        (d) Notwithstanding Section 2.2(b) above, no patent license is
-            granted: (1) for any code that Contributor has deleted
-            from the Contributor Version; (2) for infringements caused
-            by: (i) third party modifications of Contributor Version,
-            or (ii) the combination of Modifications made by that
-            Contributor with other software (except as part of the
-            Contributor Version) or other devices; or (3) under Patent
-            Claims infringed by Covered Software in the absence of
-            Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
-    3.1. Availability of Source Code.
-
-    Any Covered Software that You distribute or otherwise make
-    available in Executable form must also be made available in Source
-    Code form and that Source Code form must be distributed only under
-    the terms of this License.  You must include a copy of this
-    License with every copy of the Source Code form of the Covered
-    Software You distribute or otherwise make available.  You must
-    inform recipients of any such Covered Software in Executable form
-    as to how they can obtain such Covered Software in Source Code
-    form in a reasonable manner on or through a medium customarily
-    used for software exchange.
-
-    3.2. Modifications.
-
-    The Modifications that You create or to which You contribute are
-    governed by the terms of this License.  You represent that You
-    believe Your Modifications are Your original creation(s) and/or
-    You have sufficient rights to grant the rights conveyed by this
-    License.
-
-    3.3. Required Notices.
-
-    You must include a notice in each of Your Modifications that
-    identifies You as the Contributor of the Modification.  You may
-    not remove or alter any copyright, patent or trademark notices
-    contained within the Covered Software, or any notices of licensing
-    or any descriptive text giving attribution to any Contributor or
-    the Initial Developer.
-
-    3.4. Application of Additional Terms.
-
-    You may not offer or impose any terms on any Covered Software in
-    Source Code form that alters or restricts the applicable version
-    of this License or the recipients' rights hereunder.  You may
-    choose to offer, and to charge a fee for, warranty, support,
-    indemnity or liability obligations to one or more recipients of
-    Covered Software.  However, you may do so only on Your own behalf,
-    and not on behalf of the Initial Developer or any Contributor.
-    You must make it absolutely clear that any such warranty, support,
-    indemnity or liability obligation is offered by You alone, and You
-    hereby agree to indemnify the Initial Developer and every
-    Contributor for any liability incurred by the Initial Developer or
-    such Contributor as a result of warranty, support, indemnity or
-    liability terms You offer.
-
-    3.5. Distribution of Executable Versions.
-
-    You may distribute the Executable form of the Covered Software
-    under the terms of this License or under the terms of a license of
-    Your choice, which may contain terms different from this License,
-    provided that You are in compliance with the terms of this License
-    and that the license for the Executable form does not attempt to
-    limit or alter the recipient's rights in the Source Code form from
-    the rights set forth in this License.  If You distribute the
-    Covered Software in Executable form under a different license, You
-    must make it absolutely clear that any terms which differ from
-    this License are offered by You alone, not by the Initial
-    Developer or Contributor.  You hereby agree to indemnify the
-    Initial Developer and every Contributor for any liability incurred
-    by the Initial Developer or such Contributor as a result of any
-    such terms You offer.
-
-    3.6. Larger Works.
-
-    You may create a Larger Work by combining Covered Software with
-    other code not governed by the terms of this License and
-    distribute the Larger Work as a single product.  In such a case,
-    You must make sure the requirements of this License are fulfilled
-    for the Covered Software.
-
-4. Versions of the License.
-
-    4.1. New Versions.
-
-    Sun Microsystems, Inc. is the initial license steward and may
-    publish revised and/or new versions of this License from time to
-    time.  Each version will be given a distinguishing version number.
-    Except as provided in Section 4.3, no one other than the license
-    steward has the right to modify this License.
-
-    4.2. Effect of New Versions.
-
-    You may always continue to use, distribute or otherwise make the
-    Covered Software available under the terms of the version of the
-    License under which You originally received the Covered Software.
-    If the Initial Developer includes a notice in the Original
-    Software prohibiting it from being distributed or otherwise made
-    available under any subsequent version of the License, You must
-    distribute and make the Covered Software available under the terms
-    of the version of the License under which You originally received
-    the Covered Software.  Otherwise, You may also choose to use,
-    distribute or otherwise make the Covered Software available under
-    the terms of any subsequent version of the License published by
-    the license steward.
-
-    4.3. Modified Versions.
-
-    When You are an Initial Developer and You want to create a new
-    license for Your Original Software, You may create and use a
-    modified version of this License if You: (a) rename the license
-    and remove any references to the name of the license steward
-    (except to note that the license differs from this License); and
-    (b) otherwise make it clear that the license contains terms which
-    differ from this License.
-
-5. DISCLAIMER OF WARRANTY.
-
-    COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
-    BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-    INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-    SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-    PURPOSE OR NON-INFRINGING.  THE ENTIRE RISK AS TO THE QUALITY AND
-    PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU.  SHOULD ANY
-    COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-    INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
-    NECESSARY SERVICING, REPAIR OR CORRECTION.  THIS DISCLAIMER OF
-    WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE.  NO USE OF
-    ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-    DISCLAIMER.
-
-6. TERMINATION.
-
-    6.1. This License and the rights granted hereunder will terminate
-    automatically if You fail to comply with terms herein and fail to
-    cure such breach within 30 days of becoming aware of the breach.
-    Provisions which, by their nature, must remain in effect beyond
-    the termination of this License shall survive.
-
-    6.2. If You assert a patent infringement claim (excluding
-    declaratory judgment actions) against Initial Developer or a
-    Contributor (the Initial Developer or Contributor against whom You
-    assert such claim is referred to as "Participant") alleging that
-    the Participant Software (meaning the Contributor Version where
-    the Participant is a Contributor or the Original Software where
-    the Participant is the Initial Developer) directly or indirectly
-    infringes any patent, then any and all rights granted directly or
-    indirectly to You by such Participant, the Initial Developer (if
-    the Initial Developer is not the Participant) and all Contributors
-    under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
-    notice from Participant terminate prospectively and automatically
-    at the expiration of such 60 day notice period, unless if within
-    such 60 day period You withdraw Your claim with respect to the
-    Participant Software against such Participant either unilaterally
-    or pursuant to a written agreement with Participant.
-
-    6.3. In the event of termination under Sections 6.1 or 6.2 above,
-    all end user licenses that have been validly granted by You or any
-    distributor hereunder prior to termination (excluding licenses
-    granted to You by any distributor) shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
-    UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-    (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-    INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-    COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-    LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-    CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-    LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-    STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-    COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-    INFORMED OF THE POSSIBILITY OF SUCH DAMAGES.  THIS LIMITATION OF
-    LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-    INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-    APPLICABLE LAW PROHIBITS SUCH LIMITATION.  SOME JURISDICTIONS DO
-    NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-    CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-    APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
-    The Covered Software is a "commercial item," as that term is
-    defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-    computer software" (as that term is defined at 48
-    C.F.R. 252.227-7014(a)(1)) and "commercial computer software
-    documentation" as such terms are used in 48 C.F.R. 12.212
-    (Sept. 1995).  Consistent with 48 C.F.R. 12.212 and 48
-    C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all
-    U.S. Government End Users acquire Covered Software with only those
-    rights set forth herein.  This U.S. Government Rights clause is in
-    lieu of, and supersedes, any other FAR, DFAR, or other clause or
-    provision that addresses Government rights in computer software
-    under this License.
-
-9. MISCELLANEOUS.
-
-    This License represents the complete agreement concerning subject
-    matter hereof.  If any provision of this License is held to be
-    unenforceable, such provision shall be reformed only to the extent
-    necessary to make it enforceable.  This License shall be governed
-    by the law of the jurisdiction specified in a notice contained
-    within the Original Software (except to the extent applicable law,
-    if any, provides otherwise), excluding such jurisdiction's
-    conflict-of-law provisions.  Any litigation relating to this
-    License shall be subject to the jurisdiction of the courts located
-    in the jurisdiction and venue specified in a notice contained
-    within the Original Software, with the losing party responsible
-    for costs, including, without limitation, court costs and
-    reasonable attorneys' fees and expenses.  The application of the
-    United Nations Convention on Contracts for the International Sale
-    of Goods is expressly excluded.  Any law or regulation which
-    provides that the language of a contract shall be construed
-    against the drafter shall not apply to this License.  You agree
-    that You alone are responsible for compliance with the United
-    States export administration regulations (and the export control
-    laws and regulation of any other countries) when You use,
-    distribute or otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
-    As between Initial Developer and the Contributors, each party is
-    responsible for claims and damages arising, directly or
-    indirectly, out of its utilization of rights under this License
-    and You agree to work with Initial Developer and Contributors to
-    distribute such responsibility on an equitable basis.  Nothing
-    herein is intended or shall be deemed to constitute any admission
-    of liability.
-
---------------------------------------------------------------------
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND
-DISTRIBUTION LICENSE (CDDL)
-
-For Covered Software in this distribution, this License shall
-be governed by the laws of the State of California (excluding
-conflict-of-law provisions).
-
-Any litigation relating to this License shall be subject to the
-jurisdiction of the Federal Courts of the Northern District of
-California and the state courts of the State of California, with
-venue lying in Santa Clara County, California.
diff --git a/libre/licenses-libre/cpl-1.0.txt b/libre/licenses-libre/cpl-1.0.txt
deleted file mode 100644
index c48081b33..000000000
--- a/libre/licenses-libre/cpl-1.0.txt
+++ /dev/null
@@ -1,217 +0,0 @@
-Common Public License Version 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
-LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-    a) in the case of the initial Contributor, the initial code and documentation
-    distributed under this Agreement, and
-
-    b) in the case of each subsequent Contributor:
-
-    i) changes to the Program, and
-
-    ii) additions to the Program;
-
-    where such changes and/or additions to the Program originate from and are
-    distributed by that particular Contributor. A Contribution 'originates' from a
-    Contributor if it was added to the Program by such Contributor itself or anyone
-    acting on such Contributor's behalf. Contributions do not include additions to
-    the Program which: (i) are separate modules of software distributed in
-    conjunction with the Program under their own license agreement, and (ii) are
-    not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are
-necessarily infringed by the use or sale of its Contribution alone or when
-combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this
-Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement,
-including all Contributors.
-
-2. GRANT OF RIGHTS
-
-    a) Subject to the terms of this Agreement, each Contributor hereby grants
-    Recipient a non-exclusive, worldwide, royalty-free copyright license to
-    reproduce, prepare derivative works of, publicly display, publicly perform,
-    distribute and sublicense the Contribution of such Contributor, if any, and
-    such derivative works, in source code and object code form.
-
-    b) Subject to the terms of this Agreement, each Contributor hereby grants
-    Recipient a non-exclusive, worldwide, royalty-free patent license under
-    Licensed Patents to make, use, sell, offer to sell, import and otherwise
-    transfer the Contribution of such Contributor, if any, in source code and
-    object code form. This patent license shall apply to the combination of the
-    Contribution and the Program if, at the time the Contribution is added by the
-    Contributor, such addition of the Contribution causes such combination to be
-    covered by the Licensed Patents. The patent license shall not apply to any
-    other combinations which include the Contribution. No hardware per se is
-    licensed hereunder.
-
-    c) Recipient understands that although each Contributor grants the licenses
-    to its Contributions set forth herein, no assurances are provided by any
-    Contributor that the Program does not infringe the patent or other intellectual
-    property rights of any other entity. Each Contributor disclaims any liability
-    to Recipient for claims brought by any other entity based on infringement of
-    intellectual property rights or otherwise. As a condition to exercising the
-    rights and licenses granted hereunder, each Recipient hereby assumes sole
-    responsibility to secure any other intellectual property rights needed, if any.
-    For example, if a third party patent license is required to allow Recipient to
-    distribute the Program, it is Recipient's responsibility to acquire that
-    license before distributing the Program.
-
-    d) Each Contributor represents that to its knowledge it has sufficient
-    copyright rights in its Contribution, if any, to grant the copyright license
-    set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under
-its own license agreement, provided that:
-
-    a) it complies with the terms and conditions of this Agreement; and
-
-    b) its license agreement:
-
-    i) effectively disclaims on behalf of all Contributors all warranties and
-    conditions, express and implied, including warranties or conditions of title
-    and non-infringement, and implied warranties or conditions of merchantability
-    and fitness for a particular purpose;
-
-    ii) effectively excludes on behalf of all Contributors all liability for
-    damages, including direct, indirect, special, incidental and consequential
-    damages, such as lost profits;
-
-    iii) states that any provisions which differ from this Agreement are offered
-    by that Contributor alone and not by any other party; and
-
-    iv) states that source code for the Program is available from such
-    Contributor, and informs licensees how to obtain it in a reasonable manner on
-    or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-    a) it must be made available under this Agreement; and
-
-    b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within
-the Program.
-
-Each Contributor must identify itself as the originator of its Contribution,
-if any, in a manner that reasonably allows subsequent Recipients to identify
-the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with
-respect to end users, business partners and the like. While this license is
-intended to facilitate the commercial use of the Program, the Contributor who
-includes the Program in a commercial product offering should do so in a manner
-which does not create potential liability for other Contributors. Therefore, if
-a Contributor includes the Program in a commercial product offering, such
-Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-every other Contributor ("Indemnified Contributor") against any losses, damages
-and costs (collectively "Losses") arising from claims, lawsuits and other legal
-actions brought by a third party against the Indemnified Contributor to the
-extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may
-participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product
-offering, Product X. That Contributor is then a Commercial Contributor. If that
-Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such
-Commercial Contributor's responsibility alone. Under this section, the
-Commercial Contributor would have to defend claims against the other
-Contributors related to those performance claims and warranties, and if a court
-requires any other Contributor to pay any damages as a result, the Commercial
-Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-Recipient is solely responsible for determining the appropriateness of using
-and distributing the Program and assumes all risks associated with its exercise
-of rights under this Agreement, including but not limited to the risks and
-costs of program errors, compliance with applicable laws, damage to or loss of
-data, programs or equipment, and unavailability or interruption of operations.
-
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of the
-remainder of the terms of this Agreement, and without further action by the
-parties hereto, such provision shall be reformed to the minimum extent
-necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against a Contributor with respect
-to a patent applicable to software (including a cross-claim or counterclaim in
-a lawsuit), then any patent licenses granted by that Contributor to such
-Recipient under this Agreement shall terminate as of the date such litigation
-is filed. In addition, if Recipient institutes patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other software or
-hardware) infringes such Recipient's patent(s), then such Recipient's rights
-granted under Section 2(b) shall terminate as of the date such litigation is
-filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to
-comply with any of the material terms or conditions of this Agreement and does
-not cure such failure in a reasonable period of time after becoming aware of
-such noncompliance. If all Recipient's rights under this Agreement terminate,
-Recipient agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient's obligations under this Agreement
-and any licenses granted by Recipient relating to the Program shall continue
-and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in
-order to avoid inconsistency the Agreement is copyrighted and may only be
-modified in the following manner. The Agreement Steward reserves the right to
-publish new versions (including revisions) of this Agreement from time to time.
-No one other than the Agreement Steward has the right to modify this Agreement.
-IBM is the initial Agreement Steward. IBM may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the
-intellectual property laws of the United States of America. No party to this
-Agreement will bring a legal action under this Agreement more than one year
-after the cause of action arose. Each party waives its rights to a jury trial
-in any resulting litigation.
diff --git a/libre/licenses-libre/eclipse-1.0.txt b/libre/licenses-libre/eclipse-1.0.txt
deleted file mode 100644
index f61d34dfe..000000000
--- a/libre/licenses-libre/eclipse-1.0.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-
- 
diff --git a/libre/licenses-libre/perlartistic.txt b/libre/licenses-libre/perlartistic.txt
deleted file mode 100644
index aaf7c8801..000000000
--- a/libre/licenses-libre/perlartistic.txt
+++ /dev/null
@@ -1,151 +0,0 @@
-NAME
-    perlartistic - the Perl Artistic License
-
-SYNOPSIS
-     You can refer to this document in Pod via "L<perlartistic>"
-     Or you can see this document by entering "perldoc perlartistic"
-
-DESCRIPTION
-    This is "The Artistic License". It's here so that modules, programs,
-    etc., that want to declare this as their distribution license, can link
-    to it.
-
-    It is also one of the two licenses Perl allows itself to be
-    redistributed and/or modified; for the other one, the GNU General Public
-    License, see the perlgpl.
-
-The "Artistic License"
-  Preamble
-    The intent of this document is to state the conditions under which a
-    Package may be copied, such that the Copyright Holder maintains some
-    semblance of artistic control over the development of the package, while
-    giving the users of the package the right to use and distribute the
-    Package in a more-or-less customary fashion, plus the right to make
-    reasonable modifications.
-
-  Definitions
-    "Package"
-        refers to the collection of files distributed by the Copyright
-        Holder, and derivatives of that collection of files created through
-        textual modification.
-
-    "Standard Version"
-        refers to such a Package if it has not been modified, or has been
-        modified in accordance with the wishes of the Copyright Holder as
-        specified below.
-
-    "Copyright Holder"
-        is whoever is named in the copyright or copyrights for the package.
-
-    "You"
-        is you, if you're thinking about copying or distributing this
-        Package.
-
-    "Reasonable copying fee"
-        is whatever you can justify on the basis of media cost, duplication
-        charges, time of people involved, and so on. (You will not be
-        required to justify it to the Copyright Holder, but only to the
-        computing community at large as a market that must bear the fee.)
-
-    "Freely Available"
-        means that no fee is charged for the item itself, though there may
-        be fees involved in handling the item. It also means that recipients
-        of the item may redistribute it under the same conditions they
-        received it.
-
-  Conditions
-    1.  You may make and give away verbatim copies of the source form of the
-        Standard Version of this Package without restriction, provided that
-        you duplicate all of the original copyright notices and associated
-        disclaimers.
-
-    2.  You may apply bug fixes, portability fixes and other modifications
-        derived from the Public Domain or from the Copyright Holder. A
-        Package modified in such a way shall still be considered the
-        Standard Version.
-
-    3.  You may otherwise modify your copy of this Package in any way,
-        provided that you insert a prominent notice in each changed file
-        stating how and when you changed that file, and provided that you do
-        at least ONE of the following:
-
-        a)  place your modifications in the Public Domain or otherwise make
-            them Freely Available, such as by posting said modifications to
-            Usenet or an equivalent medium, or placing the modifications on
-            a major archive site such as uunet.uu.net, or by allowing the
-            Copyright Holder to include your modifications in the Standard
-            Version of the Package.
-
-        b)  use the modified Package only within your corporation or
-            organization.
-
-        c)  rename any non-standard executables so the names do not conflict
-            with standard executables, which must also be provided, and
-            provide a separate manual page for each non-standard executable
-            that clearly documents how it differs from the Standard Version.
-
-        d)  make other distribution arrangements with the Copyright Holder.
-
-    4.  You may distribute the programs of this Package in object code or
-        executable form, provided that you do at least ONE of the following:
-
-        a)  distribute a Standard Version of the executables and library
-            files, together with instructions (in the manual page or
-            equivalent) on where to get the Standard Version.
-
-        b)  accompany the distribution with the machine-readable source of
-            the Package with your modifications.
-
-        c)  give non-standard executables non-standard names, and clearly
-            document the differences in manual pages (or equivalent),
-            together with instructions on where to get the Standard Version.
-
-        d)  make other distribution arrangements with the Copyright Holder.
-
-    5.  You may charge a reasonable copying fee for any distribution of this
-        Package. You may charge any fee you choose for support of this
-        Package. You may not charge a fee for this Package itself. However,
-        you may distribute this Package in aggregate with other (possibly
-        commercial) programs as part of a larger (possibly commercial)
-        software distribution provided that you do not advertise this
-        Package as a product of your own. You may embed this Package's
-        interpreter within an executable of yours (by linking); this shall
-        be construed as a mere form of aggregation, provided that the
-        complete Standard Version of the interpreter is so embedded.
-
-    6.  The scripts and library files supplied as input to or produced as
-        output from the programs of this Package do not automatically fall
-        under the copyright of this Package, but belong to whoever generated
-        them, and may be sold commercially, and may be aggregated with this
-        Package. If such scripts or library files are aggregated with this
-        Package via the so-called "undump" or "unexec" methods of producing
-        a binary executable image, then distribution of such an image shall
-        neither be construed as a distribution of this Package nor shall it
-        fall under the restrictions of Paragraphs 3 and 4, provided that you
-        do not represent such an executable image as a Standard Version of
-        this Package.
-
-    7.  C subroutines (or comparably compiled subroutines in other
-        languages) supplied by you and linked into this Package in order to
-        emulate subroutines and variables of the language defined by this
-        Package shall not be considered part of this Package, but are the
-        equivalent of input as in Paragraph 6, provided these subroutines do
-        not change the language in any way that would cause it to fail the
-        regression tests for the language.
-
-    8.  Aggregation of this Package with a commercial distribution is always
-        permitted provided that the use of this Package is embedded; that
-        is, when no overt attempt is made to make this Package's interfaces
-        visible to the end user of the commercial distribution. Such use
-        shall not be construed as a distribution of this Package.
-
-    9.  The name of the Copyright Holder may not be used to endorse or
-        promote products derived from this software without specific prior
-        written permission.
-
-    10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-        WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-        MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-    The End
-
diff --git a/libre/licenses-libre/python-2.txt b/libre/licenses-libre/python-2.txt
deleted file mode 100644
index 454f4ea69..000000000
--- a/libre/licenses-libre/python-2.txt
+++ /dev/null
@@ -1,193 +0,0 @@
-PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
---------------------------------------------
-
-1. This LICENSE AGREEMENT is between the Python Software Foundation
-("PSF"), and the Individual or Organization ("Licensee") accessing and
-otherwise using this software ("Python") in source or binary form and
-its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, PSF
-hereby grants Licensee a nonexclusive, royalty-free, world-wide
-license to reproduce, analyze, test, perform and/or display publicly,
-prepare derivative works, distribute, and otherwise use Python
-alone or in any derivative version, provided, however, that PSF's
-License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
-2001, 2002, 2003, 2004, 2005, 2006, 2007 Python Software Foundation; 
-All Rights Reserved" are retained in Python alone or in any derivative 
-version prepared by Licensee.
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to Python.
-
-4. PSF is making Python available to Licensee on an "AS IS"
-basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. Nothing in this License Agreement shall be deemed to create any
-relationship of agency, partnership, or joint venture between PSF and
-Licensee.  This License Agreement does not grant permission to use PSF
-trademarks or trade name in a trademark sense to endorse or promote
-products or services of Licensee, or any third party.
-
-8. By copying, installing or otherwise using Python, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
-
-
-BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
--------------------------------------------
-
-BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
-
-1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
-office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
-Individual or Organization ("Licensee") accessing and otherwise using
-this software in source or binary form and its associated
-documentation ("the Software").
-
-2. Subject to the terms and conditions of this BeOpen Python License
-Agreement, BeOpen hereby grants Licensee a non-exclusive,
-royalty-free, world-wide license to reproduce, analyze, test, perform
-and/or display publicly, prepare derivative works, distribute, and
-otherwise use the Software alone or in any derivative version,
-provided, however, that the BeOpen Python License is retained in the
-Software, alone or in any derivative version prepared by Licensee.
-
-3. BeOpen is making the Software available to Licensee on an "AS IS"
-basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
-SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
-AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
-DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-5. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-6. This License Agreement shall be governed by and interpreted in all
-respects by the law of the State of California, excluding conflict of
-law provisions.  Nothing in this License Agreement shall be deemed to
-create any relationship of agency, partnership, or joint venture
-between BeOpen and Licensee.  This License Agreement does not grant
-permission to use BeOpen trademarks or trade names in a trademark
-sense to endorse or promote products or services of Licensee, or any
-third party.  As an exception, the "BeOpen Python" logos available at
-http://www.pythonlabs.com/logos.html may be used according to the
-permissions granted on that web page.
-
-7. By copying, installing or otherwise using the software, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
-
-
-CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
----------------------------------------
-
-1. This LICENSE AGREEMENT is between the Corporation for National
-Research Initiatives, having an office at 1895 Preston White Drive,
-Reston, VA 20191 ("CNRI"), and the Individual or Organization
-("Licensee") accessing and otherwise using Python 1.6.1 software in
-source or binary form and its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, CNRI
-hereby grants Licensee a nonexclusive, royalty-free, world-wide
-license to reproduce, analyze, test, perform and/or display publicly,
-prepare derivative works, distribute, and otherwise use Python 1.6.1
-alone or in any derivative version, provided, however, that CNRI's
-License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
-1995-2001 Corporation for National Research Initiatives; All Rights
-Reserved" are retained in Python 1.6.1 alone or in any derivative
-version prepared by Licensee.  Alternately, in lieu of CNRI's License
-Agreement, Licensee may substitute the following text (omitting the
-quotes): "Python 1.6.1 is made available subject to the terms and
-conditions in CNRI's License Agreement.  This Agreement together with
-Python 1.6.1 may be located on the Internet using the following
-unique, persistent identifier (known as a handle): 1895.22/1013.  This
-Agreement may also be obtained from a proxy server on the Internet
-using the following URL: http://hdl.handle.net/1895.22/1013".
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python 1.6.1 or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to Python 1.6.1.
-
-4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
-basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. This License Agreement shall be governed by the federal
-intellectual property law of the United States, including without
-limitation the federal copyright law, and, to the extent such
-U.S. federal law does not apply, by the law of the Commonwealth of
-Virginia, excluding Virginia's conflict of law provisions.
-Notwithstanding the foregoing, with regard to derivative works based
-on Python 1.6.1 that incorporate non-separable material that was
-previously distributed under the GNU General Public License (GPL), the
-law of the Commonwealth of Virginia shall govern this License
-Agreement only as to issues arising under or with respect to
-Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this
-License Agreement shall be deemed to create any relationship of
-agency, partnership, or joint venture between CNRI and Licensee.  This
-License Agreement does not grant permission to use CNRI trademarks or
-trade name in a trademark sense to endorse or promote products or
-services of Licensee, or any third party.
-
-8. By clicking on the "ACCEPT" button where indicated, or by copying,
-installing or otherwise using Python 1.6.1, Licensee agrees to be
-bound by the terms and conditions of this License Agreement.
-
-        ACCEPT
-
-
-CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
---------------------------------------------------
-
-Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
-The Netherlands.  All rights reserved.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-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 Stichting Mathematisch
-Centrum or CWI not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM 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/libre/licenses-libre/w3c.txt b/libre/licenses-libre/w3c.txt
deleted file mode 100644
index 6a29463d3..000000000
--- a/libre/licenses-libre/w3c.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-W3C Software Notice and License
-
-This work (and included software, documentation such as READMEs, or
-other related items) is being provided by the copyright holders under
-the following license.  
-
-License
-
-By obtaining, using and/or copying this work, you (the licensee) agree
-that you have read, understood, and will comply with the following
-terms and conditions.
-
-Permission to copy, modify, and distribute this software and its
-documentation, with or without modification, for any purpose and
-without fee or royalty is hereby granted, provided that you include
-the following on ALL copies of the software and documentation or
-portions thereof, including modifications:
-
-    - The full text of this NOTICE in a location viewable to users of
-      the redistributed or derivative work.
-
-    - Any pre-existing intellectual property disclaimers, notices, or
-      terms and conditions. If none exist, the W3C Software Short
-      Notice should be included (hypertext is preferred, text is
-      permitted) within the body of any redistributed or derivative
-      code.  
-        *"W3C Software Short Notice" above links to:
-         www.w3.org/Consortium/Legal/2002/copyright-software-short-notice-20021231.html
-
-    - Notice of any changes or modifications to the files, including
-      the date changes were made. (We recommend you provide URIs to
-      the location from which the code is derived.)
-
-Disclaimers
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
-HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
-DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
-TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
-OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
-DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in
-advertising or publicity pertaining to the software without specific,
-written prior permission. Title to copyright in this software and any
-associated documentation will at all times remain with copyright
-holders.  Notes
-
-This version:
-http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-This formulation of W3C's notice and license became active on December
-31 2002. This version removes the copyright ownership notice such that
-this license can be used with materials other than those owned by the
-W3C, reflects that ERCIM is now a host of the W3C, includes references
-to this specific dated version of the license, and removes the
-ambiguous grant of "use". Otherwise, this version is the same as the
-previous version and is written so as to preserve the Free Software
-Foundation's assessment of GPL compatibility and OSI's certification
-under the Open Source Definition.
-
-      *"previous version" above links to:
-       http://www.w3.org/Consortium/Legal/copyright-software-19980720
-
-      *"Free Software Foundation's assessment of GPL compatibility" links to:
-       http://www.gnu.org/philosophy/license-list.html#GPLCompatibleLicenses
-
-      *"OSI's certification" above links to:
-       http://opensource.org/licenses/W3C.php
-
-      *"Open Source Definition" above links to:
-       http://opensource.org/docs/definition.php
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 8db1deae6..e3da52814 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 196228 2013-10-08 23:20:06Z eric $
+# $Id: PKGBUILD 204300 2014-01-16 22:28:49Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor (Parabola): bitlord
 # Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=liferea
 pkgname=liferea-libre
-pkgver=1.10.3
+pkgver=1.10.5
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions"
 arch=('i686' 'x86_64' 'mips64el')
@@ -22,11 +22,11 @@ optdepends=('gnome-keyring: for keyring plugin support'
 	    'gst-plugins-base: for media player plugin support'
 	    'gst-plugins-good: for media player plugin support'
 	    'gst-plugins-bad-libre: for media player plugin support')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=liferea.install
-source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2
+source=(https://github.com/lwindolf/liferea/releases/download/v${pkgver}/liferea-${pkgver}.tar.bz2
         remove-non-free-suggestions.patch)
-sha1sums=('70ea247cd84274cd6a144f63772d97af4e6b5ebb'
+sha1sums=('a2378f2ba117fcc6475f82d961515adc367ef535'
           '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1')
 
 build() {
diff --git a/libre/liferea-libre/libnotify-0.7.patch b/libre/liferea-libre/libnotify-0.7.patch
deleted file mode 100644
index 6dbbffb87..000000000
--- a/libre/liferea-libre/libnotify-0.7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u -Nr liferea-1.6.5/src/notification/libnotify.c liferea-1.6.5-libnotify/src/notification/libnotify.c
---- liferea-1.6.5/src/notification/libnotify.c	2009-06-20 20:33:19.000000000 +0200
-+++ liferea-1.6.5-libnotify/src/notification/libnotify.c	2011-03-06 23:53:45.783336455 +0100
-@@ -150,7 +150,7 @@
- //		notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL);
- //		notify_notification_clear_actions(n);
- 
--		n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL, NULL);
-+		n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL);
- 
- 		notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p));
- 
-@@ -244,7 +244,7 @@
- 
- 	labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count), 
- 	                                  node_get_title (node), item_count);
--	n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL);
-+	n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL);
- 	g_free(labelSummary_p);
- 
- 	notify_notification_set_icon_from_pixbuf (n, node_get_icon (node));
diff --git a/libre/liferea-libre/liferea.install b/libre/liferea-libre/liferea.install
deleted file mode 100644
index 7fff91b49..000000000
--- a/libre/liferea-libre/liferea.install
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgname=liferea
-
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-pre_upgrade() {
-  if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then
-    gconfpkg --uninstall $pkgname
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/libre/liferea-libre/remove-non-free-suggestions.patch b/libre/liferea-libre/remove-non-free-suggestions.patch
deleted file mode 100644
index 5024f19ee..000000000
--- a/libre/liferea-libre/remove-non-free-suggestions.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/src/browser.c b/src/browser.c
-index f91901f..28b0c2b 100644
---- a/src/browser.c
-+++ b/src/browser.c
-@@ -35,23 +35,16 @@ static struct browser browsers[] = {
- 		NULL, NULL
- 	},
- 	{
--		/* tested with Firefox 1.5 and 2.0 */
--		"firefox", "Firefox", "firefox \"%s\"",
--		NULL, "firefox -a firefox -remote \"openURL(%s)\"",
--		NULL, "firefox -a firefox -remote 'openURL(%s,new-window)'",
--		NULL, "firefox -a firefox -remote 'openURL(%s,new-tab)'"
-+		"iceweasel", "Iceweasel", "iceweasel %s",
-+		NULL, "iceweasel \"%s\"",
-+		NULL, "iceweasel -new-window \"%s\"",
-+		NULL, "iceweasel -new-tab \"%s\""
- 	},
- 	{
--		"google-chrome", "Chrome", "google-chrome \"%s\"",
--		NULL, NULL,
--		NULL, NULL,
--		NULL, NULL
--	},		
--	{
--		"opera", "Opera", "opera \"%s\"",
--		"opera \"%s\"", "opera -remote \"openURL(%s)\"",
--		"opera -newwindow \"%s\"", NULL,
--		"opera -newpage \"%s\"", NULL
-+		"icecat", "Icecat", "icecat %s",
-+		NULL, "icecat \"%s\"",
-+		NULL, "icecat -new-window \"%s\"",
-+		NULL, "icecat -new-tab \"%s\""
- 	},
- 	{
- 		"epiphany", "Epiphany", "epiphany \"%s\"",
-@@ -60,13 +53,6 @@ static struct browser browsers[] = {
- 		"epiphany -n \"%s\"", NULL
- 	},
- 	{
--		/* tested with SeaMonkey 1.0.6 */
--		"mozilla", "Mozilla", "mozilla %s",
--		NULL, "mozilla -remote openURL(%s)",
--		NULL, "mozilla -remote 'openURL(%s,new-window)'",
--		NULL, "mozilla -remote 'openURL(%s,new-tab)'"
--	},
--	{
- 		"konqueror", "Konqueror", "kfmclient openURL \"%s\"",
- 		NULL, NULL,
- 		NULL, NULL,
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
deleted file mode 100644
index 0517b685e..000000000
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 201421 2013-12-11 13:48:25Z 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
-
-pkgname=linux-libre-api-headers
-_basekernel=3.12
-_sublevel=4
-pkgver=${_basekernel}.${_sublevel}
-pkgrel=1
-pkgdesc="Kernel headers sanitized for use in userspace"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gnu.org/software/libc"
-license=('GPL2')
-provides=("linux-api-headers=${pkgver}")
-conflicts=('linux-api-headers')
-replaces=('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")
-md5sums=('254f59707b6676b59ce5ca5c3c698319'
-         'ba123db2fbc72133d6292ca9aba51dd4')
-
-build() {
-  cd ${srcdir}/linux-${_basekernel}
-
-  if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
-  fi
-
-  make mrproper
-  make headers_check
-}
-
-package() {
-  cd ${srcdir}/linux-${_basekernel}
-  make INSTALL_HDR_PATH=${pkgdir}/usr headers_install
-
-  # use headers from libdrm
-  rm -r ${pkgdir}/usr/include/drm
-  
-  # clean-up unnecessary files generated during install
-  find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete
-}
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
deleted file mode 100644
index a4e4f03ea..000000000
--- a/libre/linux-libre-firmware/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Contributor: Márcio Silva <coadde@lavabit.com>
-
-pkgname=linux-libre-firmware
-pkgver=3.12
-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')
-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'
-           'amd-ucode')
-replaces=('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'
-          'amd-ucode')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
-md5sums=('254f59707b6676b59ce5ca5c3c698319')
-
-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/linux-libre-lts/3.10.6-logitech-dj.patch b/libre/linux-libre-lts/3.10.6-logitech-dj.patch
deleted file mode 100644
index 1c112ccde..000000000
--- a/libre/linux-libre-lts/3.10.6-logitech-dj.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From c63e0e370028d7e4033bd40165f18499872b5183 Mon Sep 17 00:00:00 2001
-From: Nestor Lopez Casado <nlopezcasad@logitech.com>
-Date: Thu, 18 Jul 2013 13:21:30 +0000
-Subject: HID: Revert "Revert "HID: Fix logitech-dj: missing Unifying device issue""
-
-This reverts commit 8af6c08830b1ae114d1a8b548b1f8b056e068887.
-
-This patch re-adds the workaround introduced by 596264082f10dd4
-which was reverted by 8af6c08830b1ae114.
-
-The original patch 596264 was needed to overcome a situation where
-the hid-core would drop incoming reports while probe() was being
-executed.
-
-This issue was solved by c849a6143bec520af which added
-hid_device_io_start() and hid_device_io_stop() that enable a specific
-hid driver to opt-in for input reports while its probe() is being
-executed.
-
-Commit a9dd22b730857347 modified hid-logitech-dj so as to use the
-functionality added to hid-core. Having done that, workaround 596264
-was no longer necessary and was reverted by 8af6c08.
-
-We now encounter a different problem that ends up 'again' thwarting
-the Unifying receiver enumeration. The problem is time and usb controller
-dependent. Ocasionally the reports sent to the usb receiver to start
-the paired devices enumeration fail with -EPIPE and the receiver never
-gets to enumerate the paired devices.
-
-With dcd9006b1b053c7b1c the problem was "hidden" as the call to the usb
-driver became asynchronous and none was catching the error from the
-failing URB.
-
-As the root cause for this failing SET_REPORT is not understood yet,
--possibly a race on the usb controller drivers or a problem with the
-Unifying receiver- reintroducing this workaround solves the problem.
-
-Overall what this workaround does is: If an input report from an
-unknown device is received, then a (re)enumeration is performed.
-
-related bug:
-https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1194649
-
-Signed-off-by: Nestor Lopez Casado <nlopezcasad@logitech.com>
-Signed-off-by: Jiri Kosina <jkosina@suse.cz>
----
-diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
-index 5207591a..cd33084 100644
---- a/drivers/hid/hid-logitech-dj.c
-+++ b/drivers/hid/hid-logitech-dj.c
-@@ -192,6 +192,7 @@ static struct hid_ll_driver logi_dj_ll_driver;
- static int logi_dj_output_hidraw_report(struct hid_device *hid, u8 * buf,
- 					size_t count,
- 					unsigned char report_type);
-+static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev);
- 
- static void logi_dj_recv_destroy_djhid_device(struct dj_receiver_dev *djrcv_dev,
- 						struct dj_report *dj_report)
-@@ -232,6 +233,7 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev,
- 	if (dj_report->report_params[DEVICE_PAIRED_PARAM_SPFUNCTION] &
- 	    SPFUNCTION_DEVICE_LIST_EMPTY) {
- 		dbg_hid("%s: device list is empty\n", __func__);
-+		djrcv_dev->querying_devices = false;
- 		return;
- 	}
- 
-@@ -242,6 +244,12 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev,
- 		return;
- 	}
- 
-+	if (djrcv_dev->paired_dj_devices[dj_report->device_index]) {
-+		/* The device is already known. No need to reallocate it. */
-+		dbg_hid("%s: device is already known\n", __func__);
-+		return;
-+	}
-+
- 	dj_hiddev = hid_allocate_device();
- 	if (IS_ERR(dj_hiddev)) {
- 		dev_err(&djrcv_hdev->dev, "%s: hid_allocate_device failed\n",
-@@ -305,6 +313,7 @@ static void delayedwork_callback(struct work_struct *work)
- 	struct dj_report dj_report;
- 	unsigned long flags;
- 	int count;
-+	int retval;
- 
- 	dbg_hid("%s\n", __func__);
- 
-@@ -337,6 +346,25 @@ static void delayedwork_callback(struct work_struct *work)
- 		logi_dj_recv_destroy_djhid_device(djrcv_dev, &dj_report);
- 		break;
- 	default:
-+	/* A normal report (i. e. not belonging to a pair/unpair notification)
-+	 * arriving here, means that the report arrived but we did not have a
-+	 * paired dj_device associated to the report's device_index, this
-+	 * means that the original "device paired" notification corresponding
-+	 * to this dj_device never arrived to this driver. The reason is that
-+	 * hid-core discards all packets coming from a device while probe() is
-+	 * executing. */
-+	if (!djrcv_dev->paired_dj_devices[dj_report.device_index]) {
-+		/* ok, we don't know the device, just re-ask the
-+		 * receiver for the list of connected devices. */
-+		retval = logi_dj_recv_query_paired_devices(djrcv_dev);
-+		if (!retval) {
-+			/* everything went fine, so just leave */
-+			break;
-+		}
-+		dev_err(&djrcv_dev->hdev->dev,
-+			"%s:logi_dj_recv_query_paired_devices "
-+			"error:%d\n", __func__, retval);
-+		}
- 		dbg_hid("%s: unexpected report type\n", __func__);
- 	}
- }
-@@ -367,6 +395,12 @@ static void logi_dj_recv_forward_null_report(struct dj_receiver_dev *djrcv_dev,
- 	if (!djdev) {
- 		dbg_hid("djrcv_dev->paired_dj_devices[dj_report->device_index]"
- 			" is NULL, index %d\n", dj_report->device_index);
-+		kfifo_in(&djrcv_dev->notif_fifo, dj_report, sizeof(struct dj_report));
-+
-+		if (schedule_work(&djrcv_dev->work) == 0) {
-+			dbg_hid("%s: did not schedule the work item, was already "
-+			"queued\n", __func__);
-+		}
- 		return;
- 	}
- 
-@@ -397,6 +431,12 @@ static void logi_dj_recv_forward_report(struct dj_receiver_dev *djrcv_dev,
- 	if (dj_device == NULL) {
- 		dbg_hid("djrcv_dev->paired_dj_devices[dj_report->device_index]"
- 			" is NULL, index %d\n", dj_report->device_index);
-+		kfifo_in(&djrcv_dev->notif_fifo, dj_report, sizeof(struct dj_report));
-+
-+		if (schedule_work(&djrcv_dev->work) == 0) {
-+			dbg_hid("%s: did not schedule the work item, was already "
-+			"queued\n", __func__);
-+		}
- 		return;
- 	}
- 
-@@ -444,6 +484,10 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)
- 	struct dj_report *dj_report;
- 	int retval;
- 
-+	/* no need to protect djrcv_dev->querying_devices */
-+	if (djrcv_dev->querying_devices)
-+		return 0;
-+
- 	dj_report = kzalloc(sizeof(struct dj_report), GFP_KERNEL);
- 	if (!dj_report)
- 		return -ENOMEM;
-@@ -455,6 +499,7 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)
- 	return retval;
- }
- 
-+
- static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,
- 					  unsigned timeout)
- {
-diff --git a/drivers/hid/hid-logitech-dj.h b/drivers/hid/hid-logitech-dj.h
-index fd28a5e..4a40003 100644
---- a/drivers/hid/hid-logitech-dj.h
-+++ b/drivers/hid/hid-logitech-dj.h
-@@ -101,6 +101,7 @@ struct dj_receiver_dev {
- 	struct work_struct work;
- 	struct kfifo notif_fifo;
- 	spinlock_t lock;
-+	bool querying_devices;
- };
- 
- struct dj_device {
---
-cgit v0.9.2
diff --git a/libre/linux-libre-lts/ChangeLog b/libre/linux-libre-lts/ChangeLog
deleted file mode 100644
index 552a488bf..000000000
--- a/libre/linux-libre-lts/ChangeLog
+++ /dev/null
@@ -1,39 +0,0 @@
-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@parabola.nu>
-
-        * linux-libre-3.9-2
-        * Removed CONFIG_STUB_POULSBO module from config files.
-
-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@parabola.nu>
-
-	* linux-libre-3.4.4-1
-	* Replaced email account andre.paulista@adinet.com.uy to emulatorman@parabola.nu.
-
-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@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@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@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/Kbuild b/libre/linux-libre-lts/Kbuild
deleted file mode 100644
index 8a9d7dceb..000000000
--- a/libre/linux-libre-lts/Kbuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Fail on warnings - also for files referenced in subdirs
-# -Werror can be disabled for specific files using:
-# CFLAGS_<file.o> := -Wno-error
-subdir-ccflags-y := -Wno-error
-
-# platform specific definitions
-include arch/mips/Kbuild.platforms
-obj-y := $(platform-y)
-
-# make clean traverses $(obj-) without having included .config, so
-# everything ends up here
-obj- := $(platform-)
-
-# mips object files
-# The object files are linked as core-y files would be linked
-
-obj-y += kernel/
-obj-y += mm/
-obj-y += math-emu/
diff --git a/libre/linux-libre-lts/Kbuild.platforms b/libre/linux-libre-lts/Kbuild.platforms
deleted file mode 100644
index 90a226888..000000000
--- a/libre/linux-libre-lts/Kbuild.platforms
+++ /dev/null
@@ -1,6 +0,0 @@
-# All platforms listed in alphabetic order
-
-platforms += loongson
-
-# include the platform specific files
-include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms))
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 8205a1b43..685d70501 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202368 2013-12-21 13:18:01Z andyrtr $
+# $Id: PKGBUILD 204271 2014-01-16 08:13:43Z bpiotrowski $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -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=25
+_sublevel=27
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.25 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.27 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -30,10 +30,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'criu-no-expert.patch'
-        '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'
-         '2b357d6f2048c46ed2f4ecee1b539fd8'
+         '20d0ea2ae02745d7a525126a3b8a5ce7'
          '85ce008eaacbb2fc54b81116d35cf946'
          '16867e648e4b9f89bec949cb643888c2'
          'c072b17032e80debc6a8626299245d46'
@@ -42,8 +41,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c'
          'd50c1ac47394e9aec637002ef3392bd1'
-         '3ff40ca684cfe719723e627e2cef7cea'
-         'a294af0fcd2398c39d3d3b6dd2961323')
+         '7e5b9d817f296a7e305f2262a00b9fb3')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -72,9 +70,6 @@ prepare() {
   # patch from fedora
   patch -Np1 -i "${srcdir}/criu-no-expert.patch"
  
-  # fix https://bugs.archlinux.org/task/35991 - [linux] 3.10.x renders Logitech Unified Receivers useless
-  patch -Np1 -i  "${srcdir}/3.10.6-logitech-dj.patch"
-
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-lts|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre-lts/boot-logo.patch b/libre/linux-libre-lts/boot-logo.patch
deleted file mode 100644
index c392928a5..000000000
--- a/libre/linux-libre-lts/boot-logo.patch
+++ /dev/null
@@ -1,23163 +0,0 @@
-diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_clut224.ppm
---- linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm	2011-06-02 21:34:20.000000000 -0300
-+++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_clut224.ppm	2011-06-22 13:42:06.000000000 -0300
-@@ -1,1604 +1,861 @@
- P3
--# Standard 224-color Linux logo
--80 80
-+80 78
- 255
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  10  10  10  10  10  10
-- 10  10  10   6   6   6   6   6   6   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 22  22  22  26  26  26  30  30  30  34  34  34
-- 30  30  30  30  30  30  26  26  26  18  18  18
-- 14  14  14  10  10  10   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  26  26  26  42  42  42
-- 54  54  54  66  66  66  78  78  78  78  78  78
-- 78  78  78  74  74  74  66  66  66  54  54  54
-- 42  42  42  26  26  26  18  18  18  10  10  10
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 22  22  22  42  42  42  66  66  66  86  86  86
-- 66  66  66  38  38  38  38  38  38  22  22  22
-- 26  26  26  34  34  34  54  54  54  66  66  66
-- 86  86  86  70  70  70  46  46  46  26  26  26
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 50  50  50  82  82  82  58  58  58   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  54  54  54  86  86  86  66  66  66
-- 38  38  38  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 78  78  78  34  34  34   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6  70  70  70
-- 78  78  78  46  46  46  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  42  42  42  82  82  82
-- 26  26  26   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 46  46  46  34  34  34   6   6   6   2   2   6
-- 42  42  42  78  78  78  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  30  30  30  66  66  66  58  58  58
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 86  86  86 101 101 101  46  46  46  10  10  10
--  2   2   6  58  58  58  70  70  70  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  86  86  86  10  10  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  30  30  30
-- 94  94  94  94  94  94  58  58  58  26  26  26
--  2   2   6   6   6   6  78  78  78  54  54  54
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  62  62  62  62  62  62   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 54  54  54  38  38  38  18  18  18  10  10  10
--  2   2   6   2   2   6  34  34  34  82  82  82
-- 38  38  38  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 10  10  10   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  54  54  54
-- 66  66  66  26  26  26   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  82  82  82   2   2   6   2   2   6
--  2   2   6   6   6   6  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 14  14  14  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  18  18  18
-- 82  82  82  34  34  34  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
--  6   6   6   6   6   6  22  22  22  34  34  34
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  34  34  34
-- 10  10  10  50  50  50  22  22  22   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 86  86  86  42  42  42  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
-- 38  38  38 116 116 116  94  94  94  22  22  22
-- 22  22  22   2   2   6   2   2   6   2   2   6
-- 14  14  14  86  86  86 138 138 138 162 162 162
--154 154 154  38  38  38  26  26  26   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  14  14  14
--134 134 134 198 198 198 195 195 195 116 116 116
-- 10  10  10   2   2   6   2   2   6   6   6   6
--101  98  89 187 187 187 210 210 210 218 218 218
--214 214 214 134 134 134  14  14  14   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  50  50  50  18  18  18   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  54  54  54
--218 218 218 195 195 195 226 226 226 246 246 246
-- 58  58  58   2   2   6   2   2   6  30  30  30
--210 210 210 253 253 253 174 174 174 123 123 123
--221 221 221 234 234 234  74  74  74   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  82  82  82   2   2   6 106 106 106
--170 170 170  26  26  26  86  86  86 226 226 226
--123 123 123  10  10  10  14  14  14  46  46  46
--231 231 231 190 190 190   6   6   6  70  70  70
-- 90  90  90 238 238 238 158 158 158   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  86  86  86   6   6   6 116 116 116
--106 106 106   6   6   6  70  70  70 149 149 149
--128 128 128  18  18  18  38  38  38  54  54  54
--221 221 221 106 106 106   2   2   6  14  14  14
-- 46  46  46 190 190 190 198 198 198   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  94  94  94  14  14  14 101 101 101
--128 128 128   2   2   6  18  18  18 116 116 116
--118  98  46 121  92   8 121  92   8  98  78  10
--162 162 162 106 106 106   2   2   6   2   2   6
--  2   2   6 195 195 195 195 195 195   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   1
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  90  90  90  14  14  14  58  58  58
--210 210 210  26  26  26  54  38   6 154 114  10
--226 170  11 236 186  11 225 175  15 184 144  12
--215 174  15 175 146  61  37  26   9   2   2   6
-- 70  70  70 246 246 246 138 138 138   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  66  66  66  26  26  26   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14  10  10  10
--195 195 195 188 164 115 192 133   9 225 175  15
--239 182  13 234 190  10 232 195  16 232 200  30
--245 207  45 241 208  19 232 195  16 184 144  12
--218 194 134 211 206 186  42  42  42   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  74  74  74  30  30  30   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  86  86  86  14  14  14   2   2   6
--121  87  25 192 133   9 219 162  10 239 182  13
--236 186  11 232 195  16 241 208  19 244 214  54
--246 218  60 246 218  38 246 215  20 241 208  19
--241 208  19 226 184  13 121  87  25   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  82  82  82  34  34  34  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  82  82  82  30  30  30  61  42   6
--180 123   7 206 145  10 230 174  11 239 182  13
--234 190  10 238 202  15 241 208  19 246 218  74
--246 218  38 246 215  20 246 215  20 246 215  20
--226 184  13 215 174  15 184 144  12   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 26  26  26  94  94  94  42  42  42  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  50  50  50 104  69   6
--192 133   9 216 158  10 236 178  12 236 186  11
--232 195  16 241 208  19 244 214  54 245 215  43
--246 215  20 246 215  20 241 208  19 198 155  10
--200 144  11 216 158  10 156 118  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  90  90  90  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  46  46  46  22  22  22
--137  92   6 210 162  10 239 182  13 238 190  10
--238 202  15 241 208  19 246 215  20 246 215  20
--241 208  19 203 166  17 185 133  11 210 150  10
--216 158  10 210 150  10 102  78  10   2   2   6
--  6   6   6  54  54  54  14  14  14   2   2   6
--  2   2   6  62  62  62  74  74  74  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  78  78  78  50  50  50   6   6   6
-- 94  70  30 139 102  15 190 146  13 226 184  13
--232 200  30 232 195  16 215 174  15 190 146  13
--168 122  10 192 133   9 210 150  10 213 154  11
--202 150  34 182 157 106 101  98  89   2   2   6
--  2   2   6  78  78  78 116 116 116  58  58  58
--  2   2   6  22  22  22  90  90  90  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  50  50  50   6   6   6
--128 128 128 174 154 114 156 107  11 168 122  10
--198 155  10 184 144  12 197 138  11 200 144  11
--206 145  10 206 145  10 197 138  11 188 164 115
--195 195 195 198 198 198 174 174 174  14  14  14
--  2   2   6  22  22  22 116 116 116 116 116 116
-- 22  22  22   2   2   6  74  74  74  70  70  70
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 101 101 101  26  26  26  10  10  10
--138 138 138 190 190 190 174 154 114 156 107  11
--197 138  11 200 144  11 197 138  11 192 133   9
--180 123   7 190 142  34 190 178 144 187 187 187
--202 202 202 221 221 221 214 214 214  66  66  66
--  2   2   6   2   2   6  50  50  50  62  62  62
--  6   6   6   2   2   6  10  10  10  90  90  90
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  34  34  34
-- 74  74  74  74  74  74   2   2   6   6   6   6
--144 144 144 198 198 198 190 190 190 178 166 146
--154 121  60 156 107  11 156 107  11 168 124  44
--174 154 114 187 187 187 190 190 190 210 210 210
--246 246 246 253 253 253 253 253 253 182 182 182
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  62  62  62
-- 74  74  74  34  34  34  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  22  22  22  54  54  54
-- 94  94  94  18  18  18   2   2   6  46  46  46
--234 234 234 221 221 221 190 190 190 190 190 190
--190 190 190 187 187 187 187 187 187 190 190 190
--190 190 190 195 195 195 214 214 214 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
-- 82  82  82   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 86  86  86  54  54  54  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  46  46  46  90  90  90
-- 46  46  46  18  18  18   6   6   6 182 182 182
--253 253 253 246 246 246 206 206 206 190 190 190
--190 190 190 190 190 190 190 190 190 190 190 190
--206 206 206 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--202 202 202  14  14  14   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  86  86  86  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  38  38  38  74  74  74  66  66  66
--  2   2   6   6   6   6  90  90  90 250 250 250
--253 253 253 253 253 253 238 238 238 198 198 198
--190 190 190 190 190 190 195 195 195 221 221 221
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253  82  82  82   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  78  78  78  70  70  70  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  66  66  66  78  78  78   6   6   6
--  2   2   6  18  18  18 218 218 218 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--226 226 226 231 231 231 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 178 178 178   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  18  18  18  90  90  90  62  62  62
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 58  58  58  90  90  90  18  18  18   2   2   6
--  2   2   6 110 110 110 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231  18  18  18   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  94  94  94
-- 54  54  54  26  26  26  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 90  90  90  26  26  26   2   2   6   2   2   6
-- 14  14  14 195 195 195 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 242 242 242  54  54  54   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
-- 86  86  86  50  50  50  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  38  38  38  82  82  82
-- 34  34  34   2   2   6   2   2   6   2   2   6
-- 42  42  42 195 195 195 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 242 242 242 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 246 246 246 238 238 238
--226 226 226 231 231 231 101 101 101   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 38  38  38  82  82  82  42  42  42  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  62  62  62  66  66  66
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 70  70  70 170 170 170 206 206 206 234 234 234
--246 246 246 250 250 250 250 250 250 238 238 238
--226 226 226 231 231 231 238 238 238 250 250 250
--250 250 250 250 250 250 246 246 246 231 231 231
--214 214 214 206 206 206 202 202 202 202 202 202
--198 198 198 202 202 202 182 182 182  18  18  18
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  62  62  62  66  66  66  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  82  82  82  18  18  18
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 94  94  94 182 182 182 218 218 218 242 242 242
--250 250 250 253 253 253 253 253 253 250 250 250
--234 234 234 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--238 238 238 226 226 226 210 210 210 202 202 202
--195 195 195 195 195 195 210 210 210 158 158 158
--  6   6   6  14  14  14  50  50  50  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  86  86  86  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54  70  70  70   2   2   6
--  2   2   6  10  10  10   2   2   6  22  22  22
--166 166 166 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--231 231 231 206 206 206 198 198 198 226 226 226
-- 94  94  94   2   2   6   6   6   6  38  38  38
-- 30  30  30   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  62  62  62  66  66  66
-- 26  26  26  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74  50  50  50   2   2   6
-- 26  26  26  26  26  26   2   2   6 106 106 106
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246 218 218 218 202 202 202
--210 210 210  14  14  14   2   2   6   2   2   6
-- 30  30  30  22  22  22   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  86  86  86
-- 42  42  42  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  90  90  90  22  22  22   2   2   6
-- 42  42  42   2   2   6  18  18  18 218 218 218
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 221 221 221
--218 218 218 101 101 101   2   2   6  14  14  14
-- 18  18  18  38  38  38  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 58  58  58  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  82  82  82   2   2   6  26  26  26
-- 22  22  22   2   2   6 123 123 123 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--238 238 238 198 198 198   6   6   6  38  38  38
-- 58  58  58  26  26  26  38  38  38   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
-- 78  78  78  30  30  30  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  30  30  30
-- 74  74  74  58  58  58   2   2   6  42  42  42
--  2   2   6  22  22  22 231 231 231 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246  46  46  46  38  38  38
-- 42  42  42  14  14  14  38  38  38  14  14  14
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  42  42  42
-- 90  90  90  18  18  18  18  18  18  26  26  26
--  2   2   6 116 116 116 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253  94  94  94   6   6   6
--  2   2   6   2   2   6  10  10  10  34  34  34
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  26  26  26  66  66  66
-- 82  82  82   2   2   6  38  38  38   6   6   6
-- 14  14  14 210 210 210 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 246 246 246 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 144 144 144   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  74  74  74  30  30  30  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  42  42  42  90  90  90
-- 26  26  26   6   6   6  42  42  42   2   2   6
-- 74  74  74 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 242 242 242 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 182 182 182   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 10  10  10  86  86  86  38  38  38  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  66  66  66  82  82  82
--  2   2   6  22  22  22  18  18  18   2   2   6
--149 149 149 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  86  86  86  46  46  46  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  46  46  46  86  86  86  18  18  18
--  2   2   6  34  34  34  10  10  10   6   6   6
--210 210 210 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 221 221 221   6   6   6
--  2   2   6   2   2   6   6   6   6  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 26  26  26  66  66  66  62  62  62   2   2   6
--  2   2   6  38  38  38  10  10  10  26  26  26
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231   6   6   6
--  2   2   6   2   2   6  10  10  10  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  78  78  78   6   6   6   2   2   6
--  2   2   6  46  46  46  14  14  14  42  42  42
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  10  10  10
--  2   2   6   2   2   6  22  22  22  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50  74  74  74   2   2   6   2   2   6
-- 14  14  14  70  70  70  34  34  34  62  62  62
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  14  14  14
--  2   2   6   2   2   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  62  62  62   2   2   6   2   2   6
--  2   2   6  30  30  30  46  46  46  70  70  70
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 226 226 226  10  10  10
--  2   2   6   6   6   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58  62  62  62   2   2   6   2   2   6
--  2   2   6   2   2   6  30  30  30  78  78  78
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
-- 22  22  22  34  34  34  18  14   6  22  22  22
-- 26  26  26  18  18  18   6   6   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  26  26  26
-- 62  62  62 106 106 106  74  54  14 185 133  11
--210 162  10 121  92   8   6   6   6  62  62  62
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 158 158 158  18  18  18
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  6   6   6  18  18  18  66  66  66  38  38  38
--  6   6   6  94  94  94  50  50  50  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 10  10  10  10  10  10  18  18  18  38  38  38
-- 78  78  78 142 134 106 216 158  10 242 186  14
--246 190  14 246 190  14 156 118  10  10  10  10
-- 90  90  90 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 230 190
--238 204  91 238 204  91 181 142  44  37  26   9
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  38  38  38  46  46  46
-- 26  26  26 106 106 106  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  22  22  22
-- 30  30  30  38  38  38  50  50  50  70  70  70
--106 106 106 190 142  34 226 170  11 242 186  14
--246 190  14 246 190  14 246 190  14 154 114  10
--  6   6   6  74  74  74 226 226 226 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 228 184  62
--241 196  14 241 208  19 232 195  16  38  30  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  30  30  30  26  26  26
--203 166  17 154 142  90  66  66  66  26  26  26
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  38  38  38  58  58  58
-- 78  78  78  86  86  86 101 101 101 123 123 123
--175 146  61 210 150  10 234 174  13 246 186  14
--246 190  14 246 190  14 246 190  14 238 190  10
--102  78  10   2   2   6  46  46  46 198 198 198
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 224 178  62
--242 186  14 241 196  14 210 166  10  22  18   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6 121  92   8
--238 202  15 232 195  16  82  82  82  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  38  38  38  70  70  70 154 122  46
--190 142  34 200 144  11 197 138  11 197 138  11
--213 154  11 226 170  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--225 175  15  46  32   6   2   2   6  22  22  22
--158 158 158 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 242 242 242 224 178  62
--239 182  13 236 186  11 213 154  11  46  32   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 225 175  15
--238 190  10 236 186  11 112 100  78  42  42  42
-- 14  14  14   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54 154 122  46 213 154  11
--226 170  11 230 174  11 226 170  11 226 170  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 184 144  12  10  10  10   2   2   6
--  6   6   6 116 116 116 242 242 242 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231 198 198 198 214 170  54
--236 178  12 236 178  12 210 150  10 137  92   6
-- 18  14   6   2   2   6   2   2   6   2   2   6
--  6   6   6  70  47   6 200 144  11 236 178  12
--239 182  13 239 182  13 124 112  88  58  58  58
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  70  70  70 180 133  36 226 170  11
--239 182  13 242 186  14 242 186  14 246 186  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16  98  70   6   2   2   6
--  2   2   6   2   2   6  66  66  66 221 221 221
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 206 206 206 198 198 198 214 166  58
--230 174  11 230 174  11 216 158  10 192 133   9
--163 110   8 116  81   8 102  78  10 116  81   8
--167 114   7 197 138  11 226 170  11 239 182  13
--242 186  14 242 186  14 162 146  94  78  78  78
-- 34  34  34  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78 190 142  34 226 170  11
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 241 196  14 203 166  17  22  18   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--218 218 218 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 206 206 206 198 198 198 202 162  69
--226 170  11 236 178  12 224 166  10 210 150  10
--200 144  11 197 138  11 192 133   9 197 138  11
--210 150  10 226 170  11 242 186  14 246 190  14
--246 190  14 246 186  14 225 175  15 124 112  88
-- 62  62  62  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 174 135  50 224 166  10
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 139 102  15
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 78  78  78 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 214 214 214 198 198 198 190 150  46
--219 162  10 236 178  12 234 174  13 224 166  10
--216 158  10 213 154  11 213 154  11 216 158  10
--226 170  11 239 182  13 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 206 162  42
--101 101 101  58  58  58  30  30  30  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74 174 135  50 216 158  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 226 184  13
-- 61  42   6   2   2   6   2   2   6   2   2   6
-- 22  22  22 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 226 226 226 187 187 187 180 133  36
--216 158  10 236 178  12 239 182  13 236 178  12
--230 174  11 226 170  11 226 170  11 230 174  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 186  14 239 182  13
--206 162  42 106 106 106  66  66  66  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 213 154  11
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 241 196  14
--190 146  13  18  14   6   2   2   6   2   2   6
-- 46  46  46 246 246 246 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 221 221 221  86  86  86 156 107  11
--216 158  10 236 178  12 242 186  14 246 186  14
--242 186  14 239 182  13 239 182  13 242 186  14
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 225 175  15 142 122  72  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 210 150  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--232 195  16 121  92   8  34  34  34 106 106 106
--221 221 221 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--242 242 242  82  82  82  18  14   6 163 110   8
--216 158  10 236 178  12 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 163 133  67
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 163 133  67 210 150  10
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 215 174  15 190 178 144 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 218 218 218
-- 58  58  58   2   2   6  22  18   6 167 114   7
--216 158  10 236 178  12 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 186  14 242 186  14 190 150  46
-- 54  54  54  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 38  38  38  86  86  86 180 133  36 213 154  11
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16 190 146  13 214 214 214
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 170 170 170  26  26  26
--  2   2   6   2   2   6  37  26   9 163 110   8
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 224 166  10 142 122  72
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 109 106  95 192 133   9 224 166  10
--242 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 226 184  13 210 162  10 142 110  46
--226 226 226 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--198 198 198  66  66  66   2   2   6   2   2   6
--  2   2   6   2   2   6  50  34   6 156 107  11
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 242 186  14
--234 174  13 213 154  11 154 122  46  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58 154 121  60 206 145  10 234 174  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 210 162  10 163 110   8
-- 61  42   6 138 138 138 218 218 218 250 250 250
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 210 210 210 144 144 144  66  66  66
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 163 110   8
--216 158  10 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 239 182  13 230 174  11 216 158  10
--190 142  34 124 112  88  70  70  70  38  38  38
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 62  62  62 168 124  44 206 145  10 224 166  10
--236 178  12 239 182  13 242 186  14 242 186  14
--246 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 236 178  12 216 158  10 175 118   6
-- 80  54   7   2   2   6   6   6   6  30  30  30
-- 54  54  54  62  62  62  50  50  50  38  38  38
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 167 114   7
--213 154  11 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 242 186  14 239 182  13 239 182  13
--230 174  11 210 150  10 174 135  50 124 112  88
-- 82  82  82  54  54  54  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 158 118  36 192 133   9 200 144  11
--216 158  10 219 162  10 224 166  10 226 170  11
--230 174  11 236 178  12 239 182  13 239 182  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 230 174  11 210 150  10 163 110   8
--104  69   6  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  91  60   6 167 114   7
--206 145  10 230 174  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 186  14 242 186  14
--239 182  13 230 174  11 224 166  10 213 154  11
--180 133  36 124 112  88  86  86  86  58  58  58
-- 38  38  38  22  22  22  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  70  70  70 138 110  50 158 118  36
--167 114   7 180 123   7 192 133   9 197 138  11
--200 144  11 206 145  10 213 154  11 219 162  10
--224 166  10 230 174  11 239 182  13 242 186  14
--246 186  14 246 186  14 246 186  14 246 186  14
--239 182  13 216 158  10 185 133  11 152  99   6
--104  69   6  18  14   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 152  99   6
--192 133   9 219 162  10 236 178  12 239 182  13
--246 186  14 242 186  14 239 182  13 236 178  12
--224 166  10 206 145  10 192 133   9 154 121  60
-- 94  94  94  62  62  62  42  42  42  22  22  22
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  34  34  34  58  58  58  78  78  78
--101  98  89 124 112  88 142 110  46 156 107  11
--163 110   8 167 114   7 175 118   6 180 123   7
--185 133  11 197 138  11 210 150  10 219 162  10
--226 170  11 236 178  12 236 178  12 234 174  13
--219 162  10 197 138  11 163 110   8 130  83   6
-- 91  60   6  10  10  10   2   2   6   2   2   6
-- 18  18  18  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  26  26  26   2   2   6
--  2   2   6   6   6   6  70  47   6 137  92   6
--175 118   6 200 144  11 219 162  10 230 174  11
--234 174  13 230 174  11 219 162  10 210 150  10
--192 133   9 163 110   8 124 112  88  82  82  82
-- 50  50  50  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  22  22  22  34  34  34
-- 42  42  42  58  58  58  74  74  74  86  86  86
--101  98  89 122 102  70 130  98  46 121  87  25
--137  92   6 152  99   6 163 110   8 180 123   7
--185 133  11 197 138  11 206 145  10 200 144  11
--180 123   7 156 107  11 130  83   6 104  69   6
-- 50  34   6  54  54  54 110 110 110 101  98  89
-- 86  86  86  82  82  82  78  78  78  78  78  78
-- 78  78  78  78  78  78  78  78  78  78  78  78
-- 78  78  78  82  82  82  86  86  86  94  94  94
--106 106 106 101 101 101  86  66  34 124  80   6
--156 107  11 180 123   7 192 133   9 200 144  11
--206 145  10 200 144  11 192 133   9 175 118   6
--139 102  15 109 106  95  70  70  70  42  42  42
-- 22  22  22  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  10  10  10
-- 14  14  14  22  22  22  30  30  30  38  38  38
-- 50  50  50  62  62  62  74  74  74  90  90  90
--101  98  89 112 100  78 121  87  25 124  80   6
--137  92   6 152  99   6 152  99   6 152  99   6
--138  86   6 124  80   6  98  70   6  86  66  30
--101  98  89  82  82  82  58  58  58  46  46  46
-- 38  38  38  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  38  38  38  42  42  42
-- 54  54  54  82  82  82  94  86  76  91  60   6
--134  86   6 156 107  11 167 114   7 175 118   6
--175 118   6 167 114   7 152  99   6 121  87  25
--101  98  89  62  62  62  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6   6   6   6  10  10  10
-- 18  18  18  22  22  22  30  30  30  42  42  42
-- 50  50  50  66  66  66  86  86  86 101  98  89
--106  86  58  98  70   6 104  69   6 104  69   6
--104  69   6  91  60   6  82  62  34  90  90  90
-- 62  62  62  38  38  38  22  22  22  14  14  14
-- 10  10  10  10  10  10  10  10  10  10  10  10
-- 10  10  10  10  10  10   6   6   6  10  10  10
-- 10  10  10  10  10  10  10  10  10  14  14  14
-- 22  22  22  42  42  42  70  70  70  89  81  66
-- 80  54   7 104  69   6 124  80   6 137  92   6
--134  86   6 116  81   8 100  82  52  86  86  86
-- 58  58  58  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 18  18  18  26  26  26  38  38  38  54  54  54
-- 70  70  70  86  86  86  94  86  76  89  81  66
-- 89  81  66  86  86  86  74  74  74  50  50  50
-- 30  30  30  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  34  34  34  58  58  58
-- 82  82  82  89  81  66  89  81  66  89  81  66
-- 94  86  66  94  86  76  74  74  74  50  50  50
-- 26  26  26  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  14  14  14  18  18  18
-- 30  30  30  38  38  38  46  46  46  54  54  54
-- 50  50  50  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  26  26  26
-- 38  38  38  50  50  50  58  58  58  58  58  58
-- 54  54  54  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
--  6   6   6  10  10  10  14  14  14  18  18  18
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  18  18  18  22  22  22  22  22  22
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 23 30 36 44 54 65 57 72 88 44 54 65 6 12 15 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 31 41 52 
-+103 134 161 163 205 246 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 143 185 225 
-+82 108 129 8 14 16 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 17 24 30 126 162 196 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 161 203 243 92 119 140 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 44 54 65 154 195 235 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 138 174 208 21 27 33 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 70 96 117 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 157 198 239 49 59 70 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 3 6 52 62 74 170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 
-+82 108 129 149 191 231 170 212 252 170 212 252 170 212 252 129 165 199 82 108 129 149 191 231 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 37 48 59 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 21 13 4 31 23 12 0 2 0 0 2 0 105 75 32 155 111 43 23 15 7 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 6 9 3 10 13 146 188 228 170 212 252 170 212 252 170 212 252 157 198 239 0 6 9 
-+0 2 0 52 62 74 170 212 252 170 212 252 154 195 235 0 6 9 0 2 0 55 66 77 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 151 193 233 17 24 30 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+10 12 8 23 15 7 139 99 44 206 148 61 67 49 21 0 2 0 125 92 35 206 148 61 
-+15 9 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 96 127 154 170 212 252 170 212 252 170 212 252 170 212 252 92 119 140 21 22 20 
-+10 12 8 53 68 84 170 212 252 170 212 252 92 119 140 10 12 8 7 10 5 53 68 84 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 134 170 204 
-+0 6 9 0 3 6 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 21 22 20 
-+62 64 61 38 40 37 0 2 0 34 26 8 212 153 66 64 46 18 0 2 0 170 124 49 
-+180 132 57 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+18 22 24 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 65 87 102 115 117 114 
-+43 44 42 88 115 136 170 212 252 170 212 252 68 83 99 108 110 107 60 62 59 88 115 136 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+80 98 121 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 10 12 8 56 58 55 95 96 94 178 180 177 215 217 214 198 200 197 
-+158 160 156 138 140 137 82 83 81 0 2 0 64 46 18 228 167 73 23 15 7 41 31 10 
-+250 179 73 55 39 17 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+75 94 116 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 63 78 94 0 2 0 
-+0 2 0 126 162 196 170 212 252 170 212 252 57 72 88 0 2 0 0 2 0 126 162 196 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+157 198 239 8 14 16 0 6 9 0 2 0 45 47 44 195 197 194 192 194 191 38 40 37 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 192 194 191 234 236 233 176 178 175 118 120 117 143 145 142 176 178 175 
-+215 217 214 234 236 233 234 236 233 104 106 103 0 2 0 142 101 40 134 100 43 0 2 0 
-+164 119 51 170 124 49 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 115 152 185 8 14 16 
-+49 59 70 166 207 248 170 212 252 170 212 252 119 150 178 8 14 16 55 66 77 166 207 248 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 92 119 140 0 2 0 0 2 0 200 202 199 254 255 252 254 255 252 244 246 243 
-+40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 38 40 37 234 236 233 234 236 233 234 236 233 135 137 134 215 217 214 171 173 170 
-+141 142 139 138 140 137 138 140 137 135 137 134 31 32 30 3 6 2 212 153 66 15 9 7 
-+78 58 25 248 178 79 41 31 10 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 3 6 21 27 33 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 163 205 246 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 154 195 235 0 6 9 82 83 81 254 255 252 254 255 252 254 255 252 254 255 252 
-+188 190 187 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 62 64 61 234 236 233 234 236 233 234 236 233 198 200 197 131 133 130 198 200 197 
-+232 234 231 234 236 233 234 236 233 234 236 233 152 154 151 0 2 0 147 105 44 67 49 21 
-+23 15 7 250 179 73 158 114 46 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 61 76 92 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 154 195 235 103 134 161 80 98 121 
-+52 62 74 18 22 24 0 2 0 3 10 13 38 45 51 80 98 121 151 193 233 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 109 141 168 0 2 0 169 171 168 254 255 252 254 255 252 254 255 252 254 255 252 
-+226 228 225 65 66 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 43 44 42 234 236 233 234 236 233 234 236 233 234 236 233 131 133 130 192 194 191 
-+152 154 151 141 142 139 141 142 139 141 142 139 158 160 156 3 6 2 82 62 28 129 95 39 
-+0 2 0 206 148 61 248 178 79 21 13 4 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 96 115 138 
-+170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 18 22 24 0 2 0 0 2 0 
-+34 26 8 75 55 22 114 83 33 95 68 30 55 39 17 7 0 0 0 6 9 84 103 125 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 84 103 125 0 2 0 229 231 228 254 255 252 254 255 252 254 255 252 171 173 170 
-+0 2 0 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 18 20 17 234 236 233 234 236 233 234 236 233 234 236 233 138 140 137 178 180 177 
-+226 228 225 234 236 233 234 236 233 234 236 233 231 233 230 45 47 44 23 15 7 190 136 56 
-+0 2 0 147 105 44 250 179 73 64 46 18 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 126 162 196 0 2 0 26 20 13 190 136 56 245 175 76 
-+250 179 73 161 117 49 164 119 51 245 175 76 250 179 73 206 148 61 75 55 22 0 2 0 
-+126 162 196 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 68 83 99 0 2 0 252 254 250 254 255 252 254 255 252 254 255 252 71 73 70 
-+8 14 16 88 115 136 17 24 30 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 232 234 231 234 236 233 234 236 233 234 236 233 215 217 214 148 150 147 
-+183 185 181 141 142 139 135 137 134 135 137 134 141 142 139 87 89 86 0 2 0 202 145 58 
-+3 6 2 88 66 26 250 179 73 109 79 35 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 157 198 239 
-+170 212 252 170 212 252 166 207 248 26 33 39 26 20 13 224 163 69 250 179 73 250 179 73 
-+250 179 73 197 142 62 202 145 58 250 179 73 250 179 73 250 179 73 234 172 70 21 13 4 
-+38 45 51 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 52 62 74 21 22 20 254 255 252 254 255 252 254 255 252 254 255 252 21 22 20 
-+49 59 70 170 212 252 166 207 248 91 123 149 8 14 16 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 215 217 214 234 236 233 234 236 233 234 236 233 234 236 233 123 125 122 
-+188 190 187 229 231 228 234 236 233 234 236 233 222 224 221 118 120 117 0 2 0 168 123 54 
-+34 26 8 67 49 21 250 179 73 134 100 43 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 34 41 47 170 212 252 
-+170 212 252 170 212 252 85 112 133 0 2 0 164 119 51 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 129 95 39 
-+0 2 0 138 174 208 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 34 44 55 45 47 44 254 255 252 254 255 252 254 255 252 254 255 252 24 22 25 
-+52 62 74 170 212 252 170 212 252 170 212 252 138 174 208 10 16 18 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 178 180 177 234 236 233 234 236 233 234 236 233 234 236 233 141 142 139 
-+198 200 197 148 150 147 135 137 134 135 137 134 148 150 147 123 125 122 0 2 0 190 136 56 
-+21 13 4 78 58 25 250 179 73 129 95 39 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 82 108 129 170 212 252 
-+170 212 252 170 212 252 23 30 36 58 42 19 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 147 105 44 
-+0 2 0 139 181 221 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 34 41 47 45 47 44 254 255 252 254 255 252 254 255 252 254 255 252 56 58 55 
-+25 32 38 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 10 16 18 0 6 9 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 91 93 90 234 236 233 234 236 233 234 236 233 234 236 233 126 127 125 
-+169 171 168 222 224 221 234 236 233 229 231 228 178 180 177 71 73 70 0 2 0 212 153 66 
-+0 2 0 95 68 30 250 179 73 119 87 37 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 138 174 208 170 212 252 
-+170 212 252 154 195 235 0 2 0 125 92 35 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 119 87 37 
-+0 2 0 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 57 72 88 7 10 5 252 254 250 254 255 252 254 255 252 254 255 252 95 96 94 
-+0 6 9 166 207 248 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 8 14 16 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 7 10 5 222 224 221 234 236 233 234 236 233 234 236 233 141 142 139 
-+183 185 181 138 140 137 131 133 130 141 142 139 192 194 191 102 104 101 0 2 0 224 163 69 
-+0 2 0 105 75 32 250 179 73 55 39 17 7 0 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 21 27 33 170 212 252 170 212 252 
-+170 212 252 115 152 185 0 2 0 180 132 57 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 228 167 73 10 12 8 
-+38 45 51 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 82 108 129 0 2 0 222 224 221 254 255 252 254 255 252 254 255 252 158 160 156 
-+0 2 0 92 119 140 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 122 159 192 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 141 142 139 234 236 233 234 236 233 234 236 233 131 133 130 
-+185 187 183 231 233 230 222 224 221 158 160 156 138 140 137 48 50 48 3 6 2 250 179 73 
-+134 100 43 206 148 61 218 158 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 75 94 116 170 212 252 170 212 252 
-+170 212 252 92 119 140 0 2 0 224 163 69 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 87 61 23 7 0 0 
-+134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 109 141 168 0 2 0 178 180 177 254 255 252 254 255 252 254 255 252 252 254 250 
-+39 43 45 10 16 18 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+88 115 136 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 45 47 44 234 236 233 234 236 233 234 236 233 131 133 130 
-+148 150 147 138 140 137 148 150 147 210 212 209 152 154 151 26 27 25 29 21 8 250 179 73 
-+250 179 73 234 172 70 55 39 17 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 126 162 196 170 212 252 170 212 252 
-+170 212 252 103 134 161 0 2 0 202 145 58 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 238 175 73 75 55 22 0 2 0 75 102 123 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 140 177 211 0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 
-+183 185 181 0 2 0 75 94 116 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 57 72 88 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 162 164 161 234 236 233 234 236 233 135 137 134 
-+226 228 225 198 200 197 104 106 103 15 17 14 0 2 0 15 9 7 147 105 44 250 179 73 
-+248 178 79 55 39 17 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 21 27 33 170 212 252 170 212 252 170 212 252 
-+170 212 252 122 159 192 0 2 0 175 129 54 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 202 145 58 55 39 17 0 2 0 82 108 129 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 12 17 20 60 62 59 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 69 71 68 0 6 9 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 159 201 241 26 33 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 7 10 5 162 164 161 215 217 214 95 96 94 
-+56 58 55 0 2 0 0 2 0 0 2 0 61 44 16 238 175 73 250 179 73 250 179 73 
-+218 158 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 88 115 136 170 212 252 170 212 252 170 212 252 
-+170 212 252 143 185 225 0 2 0 147 105 44 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 212 153 66 95 68 30 0 2 0 8 14 16 103 134 161 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 68 83 99 0 2 0 231 233 230 254 255 252 254 255 252 254 255 252 
-+254 255 252 210 212 209 0 6 9 53 68 84 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 126 162 196 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 23 15 7 250 179 73 250 179 73 250 179 73 
-+250 179 73 29 21 8 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 166 207 248 0 2 0 52 36 13 158 114 46 180 132 57 161 117 49 119 87 37 
-+41 31 10 0 2 0 0 2 0 72 87 103 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 115 152 185 0 2 0 152 154 151 254 255 252 238 241 237 85 87 84 
-+229 231 228 254 255 252 99 101 98 0 2 0 126 162 196 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 63 78 94 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 202 145 58 250 179 73 250 179 73 
-+250 179 73 105 75 32 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 32 39 45 0 2 0 57 72 88 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 85 112 133 12 17 20 0 2 0 0 2 0 0 2 0 0 2 0 
-+34 41 47 92 110 133 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 166 207 248 6 12 15 71 73 70 254 255 252 229 231 228 0 2 0 
-+141 142 139 254 255 252 231 233 230 10 12 8 34 44 55 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 154 195 235 6 12 15 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 125 92 35 250 179 73 250 179 73 
-+250 179 73 180 132 57 0 2 0 0 2 0 0 2 0 0 2 0 3 10 13 68 83 99 
-+129 165 199 85 112 133 0 2 0 122 159 192 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 126 162 196 119 156 189 134 170 204 149 191 231 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 57 72 88 3 6 2 242 244 240 254 255 252 35 37 34 
-+78 80 77 254 255 252 254 255 252 128 130 127 0 2 0 105 137 164 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 91 123 149 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 55 39 17 250 179 73 250 179 73 
-+250 179 73 245 175 76 7 10 5 0 2 0 44 54 65 103 134 161 161 203 243 170 212 252 
-+170 212 252 21 27 33 25 32 38 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 61 76 92 0 2 0 242 244 240 254 255 252 102 104 101 
-+10 12 8 231 233 230 254 255 252 244 246 243 26 27 25 21 27 33 159 201 241 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 32 39 45 0 6 9 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 218 158 64 250 179 73 
-+250 179 73 250 179 73 75 55 22 0 2 0 161 203 243 170 212 252 170 212 252 170 212 252 
-+115 147 174 0 2 0 91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 159 201 241 146 188 228 
-+140 177 211 134 170 204 146 188 228 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 17 24 30 62 64 61 254 255 252 254 255 252 215 217 214 
-+0 2 0 102 104 101 254 255 252 254 255 252 166 168 165 0 2 0 72 87 103 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 75 32 250 179 73 
-+250 179 73 250 179 73 150 108 46 0 2 0 113 145 172 170 212 252 170 212 252 170 212 252 
-+49 59 70 3 10 13 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 166 207 248 109 141 168 65 87 102 28 35 41 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 28 35 41 70 96 117 138 174 208 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 0 2 0 102 104 101 254 255 252 254 255 252 254 255 252 
-+102 104 101 0 2 0 192 194 191 254 255 252 254 255 252 78 80 77 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 34 44 55 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 61 76 92 154 195 235 0 6 9 29 21 8 250 179 73 
-+250 179 73 250 179 73 224 163 69 0 2 0 68 83 99 170 212 252 170 212 252 143 179 213 
-+0 2 0 72 87 103 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+161 203 243 96 115 138 17 24 30 0 2 0 0 2 0 45 47 44 102 104 101 123 125 122 
-+138 140 137 143 145 142 115 117 114 82 83 81 43 44 42 0 2 0 0 2 0 32 39 45 
-+126 162 196 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 0 2 0 85 87 84 254 255 252 254 255 252 254 255 252 
-+242 244 240 27 29 27 35 37 34 254 255 252 254 255 252 231 233 230 10 12 8 21 27 33 
-+159 201 241 170 212 252 170 212 252 170 212 252 170 212 252 163 205 246 0 6 9 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 44 54 65 170 212 252 170 212 252 34 44 55 0 2 0 82 62 28 
-+109 79 35 224 163 69 250 179 73 52 36 13 15 20 22 170 212 252 170 212 252 75 89 106 
-+0 2 0 143 179 213 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 134 170 204 
-+25 32 38 0 2 0 40 41 39 155 157 153 238 241 237 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 210 212 209 115 117 114 18 20 17 
-+0 2 0 68 83 99 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 52 62 74 7 10 5 234 236 233 254 255 252 254 255 252 
-+254 255 252 195 197 194 102 104 101 254 255 252 254 255 252 254 255 252 162 164 161 0 2 0 
-+72 87 103 170 212 252 170 212 252 170 212 252 170 212 252 119 156 189 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 115 147 174 170 212 252 91 123 149 0 2 0 0 2 0 6 12 15 
-+0 2 0 15 9 7 197 142 62 125 92 35 0 2 0 115 152 185 113 145 172 3 6 2 
-+41 51 62 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 113 145 172 0 6 9 
-+10 12 8 155 157 153 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 232 234 231 
-+87 89 86 0 2 0 32 39 45 154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 115 152 185 0 2 0 138 140 137 254 255 252 254 255 252 
-+254 255 252 254 255 252 249 251 248 254 255 252 254 255 252 254 255 252 254 255 252 65 66 64 
-+0 2 0 122 159 192 170 212 252 170 212 252 170 212 252 66 80 97 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 154 195 235 170 212 252 143 179 213 88 115 136 149 191 231 170 212 252 
-+126 162 196 3 6 2 64 46 18 202 145 58 0 2 0 0 2 0 0 2 0 0 2 0 
-+92 119 140 170 212 252 170 212 252 170 212 252 170 212 252 143 179 213 3 10 13 27 29 27 
-+215 217 214 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 155 157 153 0 2 0 32 39 45 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 23 30 36 27 29 27 249 251 248 254 255 252 
-+254 255 252 188 190 187 7 10 5 226 228 225 254 255 252 254 255 252 254 255 252 231 233 230 
-+7 10 5 21 27 33 159 201 241 170 212 252 103 134 161 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 119 156 189 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 55 66 77 11 4 3 250 179 73 24 17 10 0 2 0 0 2 0 0 2 0 
-+143 185 225 170 212 252 170 212 252 170 212 252 159 201 241 28 35 41 7 10 5 200 202 199 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 155 157 153 0 2 0 55 66 77 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 96 127 154 0 2 0 158 160 156 254 255 252 
-+254 255 252 192 194 191 0 2 0 176 178 175 254 255 252 254 255 252 254 255 252 254 255 252 
-+141 142 139 0 2 0 72 87 103 129 165 199 0 6 9 0 6 9 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 12 17 20 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 
-+138 174 208 17 24 30 29 21 8 250 179 73 101 72 28 0 2 0 0 2 0 32 39 45 
-+170 212 252 170 212 252 170 212 252 170 212 252 57 72 88 0 2 0 152 154 151 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 108 110 107 0 2 0 115 152 185 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 18 22 24 40 41 39 254 255 252 
-+254 255 252 232 234 231 0 2 0 148 150 147 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 10 12 8 0 2 0 8 14 16 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 41 51 62 61 76 92 34 44 55 3 10 13 
-+0 2 0 11 4 3 164 119 51 250 179 73 175 129 54 0 2 0 0 2 0 82 108 129 
-+170 212 252 170 212 252 170 212 252 98 129 156 0 2 0 95 96 94 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 238 241 237 18 20 17 25 32 38 166 207 248 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 85 112 133 0 2 0 188 190 187 
-+254 255 252 254 255 252 198 200 197 242 244 240 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 120 122 119 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 0 2 0 0 6 9 7 0 0 
-+31 23 12 202 145 58 250 179 73 250 179 73 238 175 73 0 2 0 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 28 35 41 31 32 30 244 246 243 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 152 154 151 0 2 0 85 112 133 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 0 2 0 148 150 147 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 222 224 221 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+7 0 0 234 172 70 250 179 73 250 179 73 250 179 73 34 26 8 0 2 0 149 191 231 
-+170 212 252 170 212 252 129 165 199 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 252 254 250 48 50 48 3 10 13 146 188 228 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 157 198 239 0 2 0 118 120 117 
-+254 255 252 254 255 252 254 255 252 169 171 168 231 233 230 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 170 124 49 250 179 73 250 179 73 250 179 73 48 33 15 6 12 15 170 212 252 
-+170 212 252 170 212 252 65 87 102 0 2 0 222 224 221 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 195 197 194 0 2 0 84 103 125 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 3 10 13 85 87 84 
-+254 255 252 254 255 252 234 236 233 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 99 101 98 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 95 68 30 250 179 73 250 179 73 250 179 73 34 26 8 34 44 55 170 212 252 
-+170 212 252 163 205 246 8 14 16 62 64 61 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 35 37 34 34 44 55 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 26 33 39 60 62 59 
-+254 255 252 254 255 252 238 241 237 0 2 0 108 110 107 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 158 160 156 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 23 15 7 248 178 79 250 179 73 245 175 76 0 2 0 63 78 94 170 212 252 
-+170 212 252 109 141 168 0 2 0 158 160 156 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 104 106 103 0 2 0 
-+154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 21 27 33 69 71 68 
-+254 255 252 254 255 252 244 246 243 0 2 0 91 93 90 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 215 217 214 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 197 142 62 250 179 73 212 153 66 0 2 0 92 110 133 170 212 252 
-+170 212 252 80 98 121 0 2 0 231 233 230 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 176 178 175 0 2 0 
-+105 137 164 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 8 14 16 87 89 86 
-+254 255 252 254 255 252 254 255 252 40 41 39 21 22 20 252 254 250 254 255 252 254 255 252 
-+254 255 252 254 255 252 252 254 250 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 125 92 35 250 179 73 170 124 49 0 2 0 113 145 172 170 212 252 
-+170 212 252 53 68 84 15 17 14 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 242 244 240 0 2 0 
-+63 78 94 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 0 2 0 104 106 103 
-+254 255 252 254 255 252 254 255 252 123 125 122 0 2 0 166 168 165 254 255 252 254 255 252 
-+254 255 252 254 255 252 234 236 233 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 7 0 0 52 36 13 250 179 73 129 95 39 0 2 0 143 179 213 170 212 252 
-+170 212 252 32 39 45 48 50 48 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 60 62 59 
-+18 22 24 170 212 252 170 212 252 170 212 252 170 212 252 163 205 246 0 2 0 102 104 101 
-+254 255 252 254 255 252 254 255 252 226 228 225 15 17 14 10 12 8 215 217 214 254 255 252 
-+254 255 252 254 255 252 210 212 209 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 88 66 26 29 21 8 0 2 0 166 207 248 170 212 252 
-+170 212 252 3 10 13 85 87 84 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 123 125 122 
-+0 2 0 149 191 231 170 212 252 170 212 252 170 212 252 170 212 252 21 27 33 56 58 55 
-+254 255 252 254 255 252 254 255 252 254 255 252 178 180 177 0 2 0 38 40 37 238 241 237 
-+254 255 252 254 255 252 210 212 209 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 7 0 0 0 2 0 161 203 243 170 212 252 
-+149 191 231 0 2 0 123 125 122 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 141 142 139 
-+0 2 0 143 179 213 170 212 252 170 212 252 170 212 252 170 212 252 66 80 97 0 2 0 
-+210 212 209 254 255 252 254 255 252 254 255 252 254 255 252 120 122 119 0 2 0 21 22 20 
-+143 145 142 244 246 243 219 221 218 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 149 191 231 170 212 252 
-+129 165 199 0 2 0 158 160 156 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 155 157 153 
-+0 2 0 134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 143 185 225 0 6 9 
-+69 71 68 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 71 73 70 0 2 0 
-+0 2 0 0 2 0 40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 139 181 221 170 212 252 
-+129 165 199 0 2 0 162 164 161 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 169 171 168 
-+0 2 0 119 156 189 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 75 94 116 
-+0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 69 71 68 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 134 170 204 170 212 252 
-+134 170 204 0 2 0 152 154 151 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 183 185 181 
-+0 2 0 113 145 172 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 
-+44 54 65 0 2 0 162 164 161 254 255 252 254 255 252 254 255 252 35 37 34 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 126 162 196 170 212 252 
-+138 174 208 0 2 0 143 145 142 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 198 200 197 
-+0 2 0 103 134 161 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+157 198 239 28 35 41 0 2 0 188 190 187 254 255 252 252 254 250 3 6 2 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 115 152 185 170 212 252 
-+143 179 213 0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 210 212 209 
-+0 2 0 91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 146 188 228 0 6 9 26 27 25 242 244 240 176 178 175 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 137 164 170 212 252 
-+143 185 225 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 185 187 183 
-+0 2 0 105 137 164 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 163 205 246 0 2 0 0 2 0 102 104 101 60 62 59 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 80 98 121 170 212 252 
-+149 191 231 0 2 0 118 120 117 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 143 145 142 
-+0 2 0 134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 143 179 213 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 44 54 65 170 212 252 
-+170 212 252 3 10 13 85 87 84 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 108 110 107 
-+0 2 0 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 115 152 185 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 3 10 13 170 212 252 
-+170 212 252 34 44 55 43 44 42 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 69 71 68 
-+15 20 22 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 75 94 116 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 139 181 221 
-+170 212 252 63 78 94 3 6 2 249 251 248 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 31 32 30 
-+41 51 62 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+161 203 243 6 12 15 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 137 164 
-+170 212 252 88 115 136 0 2 0 210 212 209 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 249 251 248 0 2 0 
-+68 83 99 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+96 127 154 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 61 76 92 
-+170 212 252 119 150 178 0 2 0 169 171 168 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 183 185 181 0 2 0 
-+91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+28 35 41 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 
-+146 188 228 143 185 225 0 2 0 126 127 125 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 85 87 84 0 6 9 
-+154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 98 129 156 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+72 90 112 170 212 252 18 22 24 56 58 55 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 238 241 237 7 10 5 55 66 77 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 122 159 192 0 6 9 
-+0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 122 159 192 72 87 103 0 2 0 229 231 228 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 152 154 151 0 2 0 113 145 172 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 139 181 221 8 14 16 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 18 22 24 109 141 168 0 2 0 148 150 147 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 56 58 55 12 17 20 166 207 248 
-+170 212 252 170 212 252 170 212 252 170 212 252 146 188 228 23 30 36 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 101 72 28 202 145 58 
-+180 132 57 0 2 0 38 45 51 3 10 13 69 71 68 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 200 202 199 0 2 0 75 89 106 170 212 252 
-+170 212 252 170 212 252 170 212 252 109 141 168 8 14 16 0 2 0 21 13 4 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 7 0 0 0 2 0 101 72 28 218 158 64 250 179 73 250 179 73 
-+250 179 73 139 99 44 0 2 0 8 14 16 0 2 0 238 241 237 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 244 246 243 38 40 37 3 10 13 139 181 221 170 212 252 
-+170 212 252 161 203 243 66 80 97 0 2 0 31 23 12 191 142 60 248 183 74 180 132 57 
-+44 34 15 0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 23 15 7 190 136 56 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 150 108 46 0 2 0 0 2 0 82 83 81 222 224 221 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 102 104 101 0 2 0 98 129 156 170 212 252 163 205 246 
-+98 129 156 23 30 36 0 2 0 82 62 28 234 172 70 248 183 74 248 183 74 248 183 74 
-+248 183 74 158 114 46 29 21 8 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 64 46 18 109 79 35 150 108 46 224 163 69 250 179 73 
-+250 179 73 250 179 73 250 179 73 158 114 46 0 2 0 0 2 0 3 6 2 115 117 114 
-+234 236 233 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 176 178 175 0 2 0 57 72 88 146 188 228 80 98 121 8 14 16 
-+0 2 0 24 17 10 158 114 46 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 242 178 77 58 42 19 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 0 2 0 67 49 21 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 228 167 73 95 68 30 0 2 0 0 2 0 
-+0 2 0 52 54 51 108 110 107 162 164 161 219 221 218 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 252 254 250 
-+219 221 218 178 180 177 18 20 17 6 12 15 26 33 39 0 2 0 0 2 0 52 36 13 
-+164 119 51 242 178 77 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 242 178 77 
-+187 138 56 175 129 54 158 114 46 82 62 28 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 78 58 25 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 234 172 70 142 101 40 
-+44 34 15 10 12 8 0 2 0 0 2 0 0 2 0 18 20 17 60 62 59 71 73 70 
-+82 83 81 95 96 94 104 106 103 118 120 117 115 117 114 78 80 77 40 41 39 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 44 34 15 105 75 32 191 142 60 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 105 75 32 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 187 138 56 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 142 101 40 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 206 148 61 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 161 117 49 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 228 167 73 250 179 73 
-+238 175 73 190 136 56 158 114 46 234 172 70 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 147 105 44 0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 67 49 21 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 
-+31 23 12 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 10 5 21 13 4 
-+0 2 0 0 2 0 0 2 0 147 105 44 250 179 73 250 179 73 250 179 73 250 179 73 
-+134 100 43 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 155 111 43 248 183 74 248 183 74 
-+248 183 74 248 183 74 224 163 69 55 39 17 64 46 18 164 119 51 242 178 77 248 183 74 
-+75 55 22 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 202 145 58 250 179 73 250 179 73 228 167 73 88 66 26 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 168 123 54 248 183 74 
-+248 183 74 248 183 74 158 114 46 0 2 0 7 0 0 0 2 0 10 12 8 44 34 15 
-+15 9 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 29 21 8 250 179 73 250 179 73 158 114 46 15 14 3 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 175 129 54 
-+248 183 74 248 183 74 114 83 33 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 29 21 8 147 105 44 58 42 19 0 2 0 7 0 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+105 75 32 218 158 64 23 15 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_mono.pbm
---- linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm	2011-06-02 21:34:20.000000000 -0300
-+++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_mono.pbm	2011-06-22 13:42:06.000000000 -0300
-@@ -1,203 +1,159 @@
--P1
--# Standard black and white Linux logo
--80 80
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 0 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1
--1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 0 0 1 1 1 1 1 1 0 0 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 0 0 0 1 1 1 1 0 0 0 0 0 0 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 1 1 0 0 1 1 1 0 0 1 1 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 1 1 1 0 1 1 1 1 0 0 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 0 1 1 1 0 1 1 1 1 0 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 1 1 0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 0 0 1 0 0 0 0 0 1 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 0 0 0 0 0 0 0 0 0 1 1 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 0 0 0 0 0 1 1 0 0 0 0 1 1
--1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 0 0 0 0 1 1 0 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 1 0 0 0 0 0 0 0 0 1 1 0 0 0 1
--1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1
--0 0 1 0 0 0 0 0 1 1 0 0 0 0 0 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0
--1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 0 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1
--0 0 0 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 0 1 1 1 1 1 1 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 0
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1
--1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 0 1 1 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 0 0 0 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 1 0 0 0 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 1 1 1 1 1 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 1 1 1 1 1 1 1 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 1 1 1 1 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
--1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1
--1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1
--1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--1 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0
--1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
--1 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 0 0 0 0 0 0 0 0 0 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-+P2
-+80  78
-+255 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 255 255 255 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 255 255 255 255 255 0 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 
-+255 0 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 
-+255 255 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 
-+255 255 0 0 0 0 0 0 0 0 
-+0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 
-+255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 255 255 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 0 255 255 0 0 255 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 255 255 255 0 0 255 
-+255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 0 255 255 255 0 255 
-+255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 0 255 255 255 0 0 
-+255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 
-+0 255 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 
-+0 255 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 
-+0 0 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 255 255 0 0 255 255 0 0 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 255 255 255 
-+255 0 0 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 255 0 0 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 
-+255 0 0 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 0 0 255 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 255 255 255 
-+255 255 0 0 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 255 255 255 255 0 255 255 255 
-+255 255 255 0 0 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 0 255 255 255 
-+255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 0 0 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 255 0 
-+0 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 255 255 
-+0 0 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 0 0 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_vga16.ppm
---- linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm	2011-06-02 21:34:20.000000000 -0300
-+++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_vga16.ppm	2011-06-22 13:42:06.000000000 -0300
-@@ -1,1604 +1,18724 @@
- P3
--# Standard 16-color Linux logo
--80 80
-+# CREATOR: GIMP PNM Filter Version 1.1
-+80 78
- 255
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 170 170 170  85  85  85   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170 170 170 170 170 170
--170 170 170   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170 170 170 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170 170 170 170 255 255 255 255 255 255
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 255 255 255 170 170 170 170 170 170
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170   0   0   0   0   0   0 255 255 255
-- 85  85  85   0   0   0   0   0   0   0   0   0
--255 255 255 170 170 170   0   0   0  85  85  85
--170 170 170 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0 170 170 170
-- 85  85  85   0   0   0   0   0   0   0   0   0
--255 255 255  85  85  85   0   0   0   0   0   0
-- 85  85  85 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170   0   0   0   0   0   0 170 170 170
-- 85  85  85  85  85  85  85  85  85  85  85  85
--255 255 255  85  85  85   0   0   0   0   0   0
-- 85  85  85 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
-- 85  85  85 255 255 255   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--170 170 170 170 170 170 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170 170 170 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0 170  85   0  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
-- 85  85  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0  85  85  85   0   0   0
--  0   0   0  85  85  85 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
-- 85  85  85 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170 170 170 170 170 170 170 170 170   0   0   0
--  0   0   0   0   0   0 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170 170 170 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 170 170 170
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0 170 170 170
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0  85  85  85 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 170 170 170
--170 170 170 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 170 170 170 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170 170 170
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0 170 170 170
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0  85  85  85
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--  0   0   0  85  85  85 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0  85  85  85
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--  0   0   0 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0  85  85  85   0   0   0   0   0   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170  85  85  85 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85  85  85  85  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 170 170 170
-- 85  85  85   0   0   0   0   0   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170  85  85  85
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 170  85   0 170  85   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85  85  85  85  85  85  85 170  85   0
--170  85   0 170  85   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
diff --git a/libre/linux-libre-lts/change-default-console-loglevel.patch b/libre/linux-libre-lts/change-default-console-loglevel.patch
deleted file mode 100644
index 2685d4d23..000000000
--- a/libre/linux-libre-lts/change-default-console-loglevel.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
---- linux-3.0.orig/kernel/printk.c	2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0/kernel/printk.c	2011-07-27 14:43:07.000000000 +0300
-@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea
- 
- /* We show everything that is MORE important than this.. */
- #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
--#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
-+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */
- 
- DECLARE_WAIT_QUEUE_HEAD(log_wait);
- 
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
deleted file mode 100644
index 942c1a052..000000000
--- a/libre/linux-libre-lts/config.i686
+++ /dev/null
@@ -1,6308 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.15-1 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_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_LOCALVERSION="-LIBRE-LTS"
-# CONFIG_LOCALVERSION_AUTO is not set
-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_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_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
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_HARDIRQS=y
-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_RCU=y
-# CONFIG_PREEMPT_RCU is not set
-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 is not set
-# CONFIG_TREE_RCU_TRACE 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_PID_NS=y
-CONFIG_NET_NS=y
-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_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HOTPLUG=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_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_OPTPROBES=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_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
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=m
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=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_GOLDFISH 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_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=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-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_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=y
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=100
-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_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_PROC_EVENT is not set
-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_I2C=m
-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
-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=m
-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_ARCH_SUPPORTS_MSI=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
-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
-CONFIG_RAPIDIO_TSI57X=y
-CONFIG_RAPIDIO_CPS_XX=y
-CONFIG_RAPIDIO_TSI568=y
-CONFIG_RAPIDIO_CPS_GEN2=y
-CONFIG_RAPIDIO_TSI500=y
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_HAVE_AOUT=y
-CONFIG_BINFMT_AOUT=m
-CONFIG_BINFMT_MISC=y
-CONFIG_COREDUMP=y
-CONFIG_HAVE_ATOMIC_IOMAP=y
-CONFIG_HAVE_TEXT_POKE_SMP=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_ARPD=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_TPROXY=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_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_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_MSG is not set
-# 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_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_VSOCKETS=m
-CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_NETLINK_MMAP=y
-CONFIG_NETLINK_DIAG=m
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_NETPRIO_CGROUP=m
-CONFIG_BQL=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_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_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 is not set
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
-# 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
-# CONFIG_CMA is not set
-
-#
-# 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_DEVICE=y
-CONFIG_OF_I2C=m
-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_INTEL_MID_PTI=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_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_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_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_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-# CONFIG_NET_FC is not set
-CONFIG_MII=m
-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_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
-
-#
-# 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_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_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_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_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_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 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_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_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_B43=m
-CONFIG_B43_BCMA=y
-# CONFIG_B43_BCMA_EXTRA is not set
-CONFIG_B43_SSB=y
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-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_IWLWIFI_P2P is not set
-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_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_RTLWIFI=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192CU=m
-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
-
-#
-# 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_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=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
-
-#
-# 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_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
-# CONFIG_STALDRV 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_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_INTEL_MID=m
-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_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
-
-#
-# Qualcomm MSM SSBI bus support
-#
-# CONFIG_SSBI 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_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
-
-#
-# 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_SMB347 is not set
-# CONFIG_BATTERY_GOLDFISH 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_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-# CONFIG_SENSORS_GPIO_FAN is not set
-CONFIG_SENSORS_HIH6130=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 is not set
-# CONFIG_CPU_THERMAL is not set
-# CONFIG_THERMAL_EMULATION is not set
-CONFIG_INTEL_POWERCLAMP=m
-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
-
-#
-# 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_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_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_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_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
-
-#
-# 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=m
-CONFIG_VIDEO_STK1160_AC97=y
-
-#
-# 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_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_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_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
-# CONFIG_SMS_SIANO_DEBUGFS is not set
-
-#
-# 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_I810 is not set
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=y
-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=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
-
-#
-# 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_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
-# 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_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_TEA575X=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_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_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_EZKEY=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HOLTEK_FF=y
-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_PS3REMOTE=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_WIIMOTE_EXT=y
-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_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_XHCI=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_XHCI_HCD_DEBUGGING is not set
-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_OHCI_HCD=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-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_MUSB_HDRC=m
-CONFIG_USB_MUSB_TUSB6010=m
-CONFIG_USB_MUSB_DSPS=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_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_FUNSOFT=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_MOTOROLA=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_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
-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_VIVOPAY_SERIAL=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SERIAL_ZIO=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_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
-CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=m
-# CONFIG_OMAP_CONTROL_USB is not set
-# CONFIG_OMAP_USB3 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_R8A66597=m
-CONFIG_USB_RENESAS_USBHS_UDC=m
-CONFIG_USB_PXA27X=m
-CONFIG_USB_MV_UDC=m
-CONFIG_USB_MV_U3D=m
-CONFIG_USB_GADGET_MUSB_HDRC=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_F_SERIAL=m
-CONFIG_USB_F_OBEX=m
-# 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
-
-#
-# 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_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA9633=m
-# 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_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
-
-#
-# 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=m
-# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
-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=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_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_ISA_DRIVERS=y
-CONFIG_COMEDI_ACL7225B=m
-CONFIG_COMEDI_PCL711=m
-CONFIG_COMEDI_PCL724=m
-CONFIG_COMEDI_PCL725=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_PCM3730=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_FL512=m
-CONFIG_COMEDI_AIO_AIO12_8=m
-CONFIG_COMEDI_AIO_IIRO_16=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_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_UNIOXX5=m
-CONFIG_COMEDI_GSC_HPDI=m
-CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_II_PCI20KC=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_S526=m
-CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=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_FB_OLPC_DCON is not set
-CONFIG_ASUS_OLED=m
-# CONFIG_PANEL is not set
-CONFIG_R8187SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
-CONFIG_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_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_CSR_WIFI=m
-CONFIG_NET_VENDOR_SILICOM=y
-CONFIG_SBYPASS=m
-CONFIG_BPCTL=m
-CONFIG_CED1401=m
-CONFIG_DGRP=m
-CONFIG_FIREWIRE_SERIAL=m
-CONFIG_ZCACHE=m
-# CONFIG_ZCACHE_DEBUG is not set
-# CONFIG_USB_DWC2 is not set
-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_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_EXTCON_GPIO=m
-CONFIG_MEMORY=y
-# CONFIG_IIO is not set
-# CONFIG_VME_BUS is not set
-CONFIG_PWM=y
-CONFIG_IRQCHIP=y
-CONFIG_IPACK_BUS=m
-CONFIG_BOARD_TPCI200=m
-CONFIG_SERIAL_IPOCTAL=m
-# CONFIG_RESET_CONTROLLER is not set
-
-#
-# 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_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_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_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_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_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_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_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_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
-CONFIG_PRINTK_TIME=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1024
-CONFIG_MAGIC_SYSRQ=y
-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_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-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_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_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_SCHED_DEBUG=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# 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_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_STACK_USAGE is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_CPU_STALL_INFO is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_LKDTM=m
-# 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_DEBUG_PAGEALLOC 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_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
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-CONFIG_DYNAMIC_DEBUG=y
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_TEST_STRING_HELPERS is not set
-CONFIG_TEST_KSTRTOX=m
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_DEBUG_STACKOVERFLOW 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
-
-#
-# 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_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=m
-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_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=m
-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
-
-#
-# 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_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=m
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_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_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
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
deleted file mode 100644
index b798887e7..000000000
--- a/libre/linux-libre-lts/config.x86_64
+++ /dev/null
@@ -1,6109 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.15-1 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_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_LOCALVERSION="-LIBRE-LTS"
-# CONFIG_LOCALVERSION_AUTO is not set
-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_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_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
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_HARDIRQS=y
-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_RCU=y
-# CONFIG_PREEMPT_RCU is not set
-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 is not set
-# CONFIG_TREE_RCU_TRACE 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=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-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_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HOTPLUG=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_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_OPTPROBES=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_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
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_BLOCK_COMPAT=y
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=m
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=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_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=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-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_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=y
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=100
-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_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_PROC_EVENT is not set
-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_I2C=m
-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
-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=m
-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_ARCH_SUPPORTS_MSI=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
-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
-CONFIG_RAPIDIO_TSI57X=y
-CONFIG_RAPIDIO_CPS_XX=y
-CONFIG_RAPIDIO_TSI568=y
-CONFIG_RAPIDIO_CPS_GEN2=y
-CONFIG_RAPIDIO_TSI500=y
-
-#
-# 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_HAVE_TEXT_POKE_SMP=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_ARPD=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_TPROXY=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_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_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_MSG is not set
-# 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_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_VSOCKETS=m
-CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_NETLINK_MMAP=y
-CONFIG_NETLINK_DIAG=m
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_NETPRIO_CGROUP=m
-CONFIG_BQL=y
-CONFIG_BPF_JIT=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_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_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 is not set
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
-# 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_INTEL_MID_PTI=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_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_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_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_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_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-# CONFIG_NET_FC is not set
-CONFIG_MII=m
-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_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
-
-#
-# 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_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_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_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_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_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 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_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_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_B43=m
-CONFIG_B43_BCMA=y
-# CONFIG_B43_BCMA_EXTRA is not set
-CONFIG_B43_SSB=y
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-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_IWLWIFI_P2P is not set
-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_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_RTLWIFI=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192CU=m
-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
-
-#
-# 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_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
-
-#
-# 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
-# CONFIG_STALDRV 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_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_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_INTEL_MID=m
-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_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
-
-#
-# Qualcomm MSM SSBI bus support
-#
-CONFIG_SSBI=m
-# 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_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
-
-#
-# 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_SMB347 is not set
-# CONFIG_BATTERY_GOLDFISH 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_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-# CONFIG_SENSORS_GPIO_FAN is not set
-CONFIG_SENSORS_HIH6130=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 is not set
-# CONFIG_CPU_THERMAL is not set
-# CONFIG_THERMAL_EMULATION is not set
-CONFIG_INTEL_POWERCLAMP=m
-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_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_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_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_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_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
-
-#
-# 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=m
-CONFIG_VIDEO_STK1160_AC97=y
-
-#
-# 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_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_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_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
-# CONFIG_SMS_SIANO_DEBUGFS is not set
-
-#
-# 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_I810 is not set
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=y
-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_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_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_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
-
-#
-# 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_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
-# 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_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_TEA575X=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_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_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_EZKEY=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HOLTEK_FF=y
-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_PS3REMOTE=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_WIIMOTE_EXT=y
-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_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_XHCI=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_XHCI_HCD_DEBUGGING is not set
-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_OHCI_HCD=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-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_MUSB_HDRC=m
-CONFIG_USB_MUSB_TUSB6010=m
-CONFIG_USB_MUSB_DSPS=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_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_FUNSOFT=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_MOTOROLA=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_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
-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_VIVOPAY_SERIAL=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SERIAL_ZIO=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_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
-CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=m
-# CONFIG_OMAP_CONTROL_USB is not set
-# CONFIG_OMAP_USB3 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_R8A66597=m
-CONFIG_USB_RENESAS_USBHS_UDC=m
-CONFIG_USB_PXA27X=m
-CONFIG_USB_MV_UDC=m
-CONFIG_USB_MV_U3D=m
-CONFIG_USB_GADGET_MUSB_HDRC=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_F_SERIAL=m
-CONFIG_USB_F_OBEX=m
-# 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
-
-#
-# 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_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA9633=m
-# 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_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
-
-#
-# 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=m
-# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
-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=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_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_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_UNIOXX5=m
-CONFIG_COMEDI_GSC_HPDI=m
-CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_II_PCI20KC=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_S526=m
-CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=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_ASUS_OLED=m
-# CONFIG_PANEL is not set
-CONFIG_R8187SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
-CONFIG_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_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_CSR_WIFI=m
-CONFIG_NET_VENDOR_SILICOM=y
-CONFIG_SBYPASS=m
-CONFIG_BPCTL=m
-CONFIG_CED1401=m
-CONFIG_DGRP=m
-CONFIG_FIREWIRE_SERIAL=m
-CONFIG_ZCACHE=m
-# CONFIG_ZCACHE_DEBUG is not set
-CONFIG_RAMSTER=m
-# CONFIG_RAMSTER_DEBUG is not set
-# CONFIG_USB_DWC2 is not set
-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_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
-
-#
-# 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_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_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_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_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_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_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_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_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
-CONFIG_PRINTK_TIME=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
-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_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-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_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_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_SCHED_DEBUG=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# 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_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_STACK_USAGE is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_CPU_STALL_INFO is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_LKDTM=m
-# 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_DEBUG_PAGEALLOC 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_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
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-CONFIG_DYNAMIC_DEBUG=y
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_TEST_STRING_HELPERS is not set
-CONFIG_TEST_KSTRTOX=m
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_DEBUG_STACKOVERFLOW 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_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
-
-#
-# 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_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=m
-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_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=m
-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
-
-#
-# 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_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_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_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_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
diff --git a/libre/linux-libre-lts/criu-no-expert.patch b/libre/linux-libre-lts/criu-no-expert.patch
deleted file mode 100644
index 2124427e9..000000000
--- a/libre/linux-libre-lts/criu-no-expert.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/init/Kconfig b/init/Kconfig
-index be8b7f5..7461760 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP
- endif # CGROUPS
- 
- config CHECKPOINT_RESTORE
--	bool "Checkpoint/restore support" if EXPERT
-+	bool "Checkpoint/restore support"
- 	default n
- 	help
- 	  Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1000,7 +1000,7 @@ config CHECKPOINT_RESTORE
- 	  If unsure, say N here.
- 
- menuconfig NAMESPACES
--	bool "Namespaces support" if EXPERT
-+	bool "Namespaces support"
- 	default !EXPERT
- 	help
- 	  Provides the way to make tasks work with different objects using
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
deleted file mode 100644
index 7a4a271df..000000000
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ /dev/null
@@ -1,35 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-KERNEL_NAME=-lts
-KERNEL_VERSION=
-
-post_install () {
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  if command -v mkinitcpio 2>&1 > /dev/null; then
-    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-    mkinitcpio -p linux-libre${KERNEL_NAME}
-  fi
-}
-
-post_upgrade() {
-  if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
-    echo "WARNING: /boot appears to be a separate partition but is not mounted."
-  fi
-
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  if command -v mkinitcpio 2>&1 > /dev/null; then
-    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-    mkinitcpio -p linux-libre${KERNEL_NAME}
-  fi
-}
-
-post_remove() {
-  # also remove the compat symlinks
-  rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img
-  rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img
-}
diff --git a/libre/linux-libre-lts/linux-libre-lts.preset b/libre/linux-libre-lts/linux-libre-lts.preset
deleted file mode 100644
index 37cf35ed0..000000000
--- a/libre/linux-libre-lts/linux-libre-lts.preset
+++ /dev/null
@@ -1,14 +0,0 @@
-# mkinitcpio preset file for the 'linux-libre-lts' package
-
-ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="/boot/vmlinuz-linux-libre-lts"
-
-PRESETS=('default' 'fallback')
-
-#default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-linux-libre-lts.img"
-#default_options=""
-
-#fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/initramfs-linux-libre-lts-fallback.img" 
-fallback_options="-S autodetect"
diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD
deleted file mode 100644
index 877805172..000000000
--- a/libre/linux-libre-manpages/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 199517 2013-11-13 23:06:20Z thomas $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgname=linux-libre-manpages
-pkgver=3.12
-pkgrel=1
-pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux-libre kernel"
-arch=('any')
-url="http://linux-libre.fsfla.org/"
-license=('GPL2')
-makedepends=('xmlto' 'docbook-xsl')
-replaces=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages')
-conflicts=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages')
-provides=('kernel26-manpages' 'linux-manpages')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/linux-libre-${pkgver}-gnu.tar.xz")
-md5sums=('254f59707b6676b59ce5ca5c3c698319')
-
-build() {
-  cd "${srcdir}/linux-$pkgver"
-  make mandocs
-}
-
-package() {
-  install -d "${pkgdir}/usr/share/man/man9/"
-  install "${srcdir}"/linux-$pkgver/Documentation/DocBook/man/*.9.gz \
-    "${pkgdir}/usr/share/man/man9/"
-
-  find "${pkgdir}" -type f -exec chmod 644 {} \;
-}
diff --git a/libre/linux-libre-tools/01-fix-perf-python.patch b/libre/linux-libre-tools/01-fix-perf-python.patch
new file mode 100644
index 000000000..d46bd773c
--- /dev/null
+++ b/libre/linux-libre-tools/01-fix-perf-python.patch
@@ -0,0 +1,12 @@
+--- a/tools/perf/config/feature-checks/Makefile  2014-01-21 01:58:25.444339009 +0100
++++ b/tools/perf/config/feature-checks/Makefile  2014-01-21 01:46:58.081780576 +0100
+@@ -103,9 +103,6 @@
+ test-libperl:
+        $(BUILD) $(FLAGS_PERL_EMBED)
+ 
+-override PYTHON := python
+-override PYTHON_CONFIG := python-config
+-
+ escape-for-shell-sq =  $(subst ','\'',$(1))
+ shell-sq = '$(escape-for-shell-sq)'
+ 
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 700f45bc6..95d3bf880 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,18 +1,24 @@
-# $Id: PKGBUILD 102149 2013-12-05 21:51:01Z seblu $
+# $Id: PKGBUILD 104447 2014-01-21 01:10:56Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgbase=linux-libre-tools
-pkgname=('linux-libre-tools-meta'
-         'libtraceevent-libre'
-         'perf-libre'
-         'cpupower-libre'
-         'usbip-libre')
-_basekernel=3.12
-_sublevel=3
-_pkgver=$_basekernel.$_sublevel
+pkgname=(
+  'acpidump-libre'
+  'cgroup_event_listener-libre'
+  'cpupower-libre'
+  'libtraceevent-libre'
+  'linux-libre-tools-meta'
+  'perf-libre'
+  'tmon-libre'
+  'usbip-libre'
+  'x86_energy_perf_policy-libre'
+)
+_basekernel=3.13
+#_sublevel=3
+#_pkgver=$_basekernel.$_sublevel
 pkgver=$_basekernel
-pkgrel=2
+pkgrel=1
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -21,24 +27,28 @@ options=('!strip')
 # kernel source deps
 makedepends=('asciidoc' 'xmlto')
 # perf-libre deps
-makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind')
+makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'numactl')
 # cpupower-libre deps
 makedepends+=('pciutils')
 # usbip-libre deps
 makedepends+=('glib2' 'sysfsutils')
+# tmon-libre deps
+makedepends+=('ncurses')
 groups=("$pkgbase")
 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"
+        #"http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/patch-$_basekernel-gnu-$_pkgver-gnu.xz"
         'cpupower.default'
         'cpupower.systemd'
         'cpupower.service'
-        'usbipd.service')
-sha256sums=('66c1fa816cb4a3b2f6078e1f6256133697ca4cc4186758c58c2b4d0153ed3237'
-            '561644a6a5d4c434dcd1f1e1dc48c4d8924bfa0407f697b66b7e6de02451acbb'
+        'usbipd.service'
+        '01-fix-perf-python.patch')
+sha256sums=('6e68eef826b17ae9d7df01ac13e46ef5d978670071d1b05aed775bdbff8fed96'
+            #'561644a6a5d4c434dcd1f1e1dc48c4d8924bfa0407f697b66b7e6de02451acbb'
             '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
             'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
             'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
-            '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f')
+            '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f'
+            'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a')
 
 prepare() {
   # apply stable patching set
@@ -51,38 +61,40 @@ prepare() {
 }
 
 build() {
-  msg2 'Build libtraceevent-libre'
+  msg2 'libtraceevent-libre'
   pushd linux-$pkgver/tools/lib/traceevent
   make
   popd
 
-  msg2 'Build perf-libre'
+  msg2 'perf-libre'
   pushd linux-$pkgver/tools/perf
   make \
     WERROR=0 \
     DESTDIR="$pkgdir/usr" \
     perfexecdir='lib/perf' \
     PYTHON=python2 \
+    PYTHON_CONFIG=python2-config \
     NO_GTK2=1 \
     PERF_VERSION=$pkgver-$pkgrel \
     all man
   popd
 
-  msg2 'Build cpupower-libre'
+  msg2 'cpupower-libre'
   pushd linux-$pkgver/tools/power/cpupower
   # we cannot use --as-needed
-  LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
+  #LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
   make VERSION=$pkgver-$pkgrel
   popd
 
   if [ "$CARCH" != "mips64el" ]; then
-    msg2 'Build x86_energy_perf_policy-libre'
-    pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
-    make
-    popd
+  msg2 'x86_energy_perf_policy-libre'
+  pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
+  make
+  popd
+
   fi
 
-  msg2 'Build usbip-libre'
+  msg2 'usbip-libre'
   pushd linux-$pkgver/drivers/staging/usbip/userspace
   # fix missing man page
   sed -i 's/usbip_bind_driver.8//' Makefile.am
@@ -90,12 +102,36 @@ build() {
   ./configure --prefix=/usr --sbindir=/usr/bin
   make
   popd
+
+  msg2 'tmon-libre'
+  pushd linux-$pkgver/tools/thermal/tmon
+  make
+  popd
+
+  msg2 'acpidump-libre'
+  pushd linux-$pkgver/tools/power/acpi
+  make
+  popd
+
+  msg2 'cgroup_event_listener-libre'
+  pushd linux-$pkgver/tools/cgroup
+  make
+  popd
 }
 
 package_linux-libre-tools-meta() {
   pkgdesc='Linux kernel tools meta package'
   groups=()
-  depends=('libtraceevent-libre' 'perf-libre' 'cpupower-libre' 'usbip-libre')
+  depends=(
+    'acpidump-libre'
+    'cgroup_event_listener-libre'
+    'cpupower-libre'
+    'libtraceevent-libre'
+    'linux-libre-tools-meta'
+    'perf-libre'
+    'tmon-libre'
+    'usbip-libre'
+  )
   [ "$CARCH" != "mips64el" ] && depends+=('x86_energy_perf_policy-libre')
   replaces=('linux-tools-meta')
   conflicts=('linux-tools-meta')
@@ -116,7 +152,8 @@ package_libtraceevent-libre() {
 
 package_perf-libre() {
   pkgdesc='Linux kernel performance auditing tool'
-  depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils')
+  depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils'
+           'numactl')
   replaces=('perf')  
   conflicts=('perf')
   provides=("perf=$pkgver")
@@ -127,6 +164,7 @@ package_perf-libre() {
     DESTDIR="$pkgdir/usr" \
     perfexecdir='lib/perf' \
     PYTHON=python2 \
+    PYTHON_CONFIG=python2-config \
     NO_GTK2=1 \
     PERF_VERSION=$pkgver-$pkgrel \
     install install-man
@@ -188,4 +226,38 @@ package_usbip-libre() {
   install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
 }
 
+package_tmon-libre() {
+  pkgdesc='Monitoring and Testing Tool for Linux kernel thermal subsystem'
+  depends=('glibc' 'ncurses')
+  replaces=('tmon')
+  conflicts=('tmon')
+  provides=("tmon=$pkgver")
+
+  cd linux-$pkgver/tools/thermal/tmon
+  make install INSTALL_ROOT="$pkgdir"
+}
+
+package_acpidump-libre() {
+  pkgdesc='Dump system ACPI tables to an ASCII file'
+  depends=('glibc')
+  replaces=('acpidump')
+  conflicts=('acpidump' 'iasl')
+  provides=("acpidump=$pkgver")
+
+  cd linux-$pkgver/tools/power/acpi
+  install -Dm755 acpidump "$pkgdir/usr/bin/acpidump"
+  install -Dm644 acpidump.8 "$pkgdir/usr/share/man/man8/acpidump.8"
+}
+
+package_cgroup_event_listener-libre() {
+  pkgdesc='Simple listener of cgroup events'
+  depends=('glibc')
+  replaces=('cgroup_event_listener')
+  conflicts=('cgroup_event_listener')
+  provides=("cgroup_event_listener=$pkgver")
+
+  cd linux-$pkgver/tools/cgroup
+  install -Dm755 cgroup_event_listener "$pkgdir/usr/bin/cgroup_event_listener"
+}
+
 # vim:set ts=2 sw=2 et:
diff --git a/libre/linux-libre-tools/cpupower.default b/libre/linux-libre-tools/cpupower.default
deleted file mode 100644
index b5c522ea1..000000000
--- a/libre/linux-libre-tools/cpupower.default
+++ /dev/null
@@ -1,29 +0,0 @@
-# Define CPUs governor
-# valid governors: ondemand, performance, powersave, conservative, userspace.
-#governor='ondemand'
-
-# Limit frequency range
-# Valid suffixes: Hz, kHz (default), MHz, GHz, THz
-#min_freq="2.25GHz"
-#max_freq="3GHz"
-
-# Specific frequency to be set.
-# Requires userspace governor to be available.
-# Do not set governor field if you use this one.
-#freq=
-
-# Utilizes cores in one processor package/socket first before processes are 
-# scheduled to other processor packages/sockets.
-# See man (1) CPUPOWER-SET for additional details.
-#mc_scheduler=
-
-# Utilizes thread siblings of one processor core first before processes are
-# scheduled to other cores. See man (1) CPUPOWER-SET for additional details.
-#smp_scheduler=
-
-#  Sets a register on supported Intel processore which allows software to convey
-# its policy for the relative importance of performance versus energy savings to
-# the  processor. See man (1) CPUPOWER-SET for additional details.
-#perf_bias=
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/cpupower.install b/libre/linux-libre-tools/cpupower.install
deleted file mode 100644
index 10e07ae52..000000000
--- a/libre/linux-libre-tools/cpupower.install
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  if [ "$(vercmp $2 3.7-4)" -le 0 ]; then
-    cat << EOF
-===> cpupower startup config file moved to /etc/default/cpupower
-EOF
-    fi
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/cpupower.service b/libre/linux-libre-tools/cpupower.service
deleted file mode 100644
index aaeba2b08..000000000
--- a/libre/linux-libre-tools/cpupower.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Apply cpupower configuration
-
-[Service]
-Type=oneshot
-ExecStart=/usr/lib/systemd/scripts/cpupower
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/linux-libre-tools/cpupower.systemd b/libre/linux-libre-tools/cpupower.systemd
deleted file mode 100644
index 51c645415..000000000
--- a/libre/linux-libre-tools/cpupower.systemd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-. /etc/default/cpupower
-
-declare -i fail=0
-
-# parse frequency options
-declare -a params=()
-params+=(${governor:+-g $governor})
-params+=(${min_freq:+-d $min_freq})
-params+=(${max_freq:+-u $max_freq})
-params+=(${freq:+-f $freq})
-
-# apply frequency options
-if ((${#params[@]} > 0)); then
-  cpupower frequency-set "${params[@]}" >/dev/null || fail=1
-fi
-
-# parse cpu options
-declare -a params=()
-params+=(${mc_scheduler:+-m $mc_scheduler})
-params+=(${smp_scheduler:+-s $smp_scheduler})
-params+=(${perf_bias:+-b $perf_bias})
-
-# apply cpu options
-if ((${#params[@]} > 0)); then
-  cpupower set "${params[@]}" >/dev/null || fail=1
-fi
-
-exit $fail
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/usbipd.service b/libre/linux-libre-tools/usbipd.service
deleted file mode 100644
index 1807e94b1..000000000
--- a/libre/linux-libre-tools/usbipd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=USB/IP server
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/usbipd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/linux-libre/Kbuild b/libre/linux-libre/Kbuild
deleted file mode 100644
index 8a9d7dceb..000000000
--- a/libre/linux-libre/Kbuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Fail on warnings - also for files referenced in subdirs
-# -Werror can be disabled for specific files using:
-# CFLAGS_<file.o> := -Wno-error
-subdir-ccflags-y := -Wno-error
-
-# platform specific definitions
-include arch/mips/Kbuild.platforms
-obj-y := $(platform-y)
-
-# make clean traverses $(obj-) without having included .config, so
-# everything ends up here
-obj- := $(platform-)
-
-# mips object files
-# The object files are linked as core-y files would be linked
-
-obj-y += kernel/
-obj-y += mm/
-obj-y += math-emu/
diff --git a/libre/linux-libre/Kbuild.platforms b/libre/linux-libre/Kbuild.platforms
deleted file mode 100644
index 90a226888..000000000
--- a/libre/linux-libre/Kbuild.platforms
+++ /dev/null
@@ -1,6 +0,0 @@
-# All platforms listed in alphabetic order
-
-platforms += loongson
-
-# include the platform specific files
-include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms))
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 7a53752b8..3b6e38fb8 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202239 2013-12-20 19:15:03Z tpowa $
+# $Id: PKGBUILD 204729 2014-01-26 08:54:46Z thomas $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -10,10 +10,10 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.12
-_sublevel=6
+_sublevel=9
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -30,18 +30,30 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'criu-no-expert.patch'
+        'sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch'
+        'sunrpc-replace-gssd_running-with-more-reliable-check.patch'
+        'nfs-check-gssd-running-before-krb5i-auth.patch'
+        'rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch'
+        'sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch'
+        'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
 md5sums=('254f59707b6676b59ce5ca5c3c698319'
-         '4b18ce60daff87504e6740670edf6b50'
-         'aa6614d1dbf46ab7d317bcde1e58f80c'
-         '3ecb40ee3bdd78e4d310c2afc1ccf209'
+         '348975e36e4dd27f5d8fc50e92de8922'
+         '568ce15a9df133072489cbac8c4fefb3'
+         '772873c548059c57c8ec7898f35c0e2b'
          'e49ac236dfeef709f91a3d993ea7b62c'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '44260d2cb1a8b51c119d2ce1f83e457a'
          '98beb36f9b8cf16e58de2483ea9985e3'
          'd50c1ac47394e9aec637002ef3392bd1'
-         '71bbddd5f9799aa045660d92baa05845')
+         'd4a75f77e6bd5d700dcd534cd5f0dfce'
+         'dc86fdc37615c97f03c1e0c31b7b833a'
+         '88eef9d3b5012ef7e82af1af8cc4e517'
+         'cec0bb8981936eab2943b2009b7a6fff'
+         '88d9cddf9e0050a76ec4674f264fb2a1'
+         'cb9016630212ef07b168892fbcfd4e5d'
+         '0569e96c071703cc244f1ea7ee87d40a')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -64,6 +76,9 @@ prepare() {
   # fix issue on Hal8188EFWImg_CE.c deblobbed file
   sed -i "\|DEBLOBBED| s|,||" drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c
 
+  # add latest fixes from stable queue, if needed
+  # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
+
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
@@ -73,6 +88,17 @@ prepare() {
   # patch from fedora
   patch -Np1 -i "${srcdir}/criu-no-expert.patch"
 
+  # fix 15 seconds nfs delay
+  patch -Np1 -i "${srcdir}/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch"
+  patch -Np1 -i "${srcdir}/sunrpc-replace-gssd_running-with-more-reliable-check.patch"
+  patch -Np1 -i "${srcdir}/nfs-check-gssd-running-before-krb5i-auth.patch"
+  # fix nfs kernel oops
+  # #37866
+  patch -Np1 -i "${srcdir}/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch"
+  patch -Np1 -i "${srcdir}/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch"
+
+  patch -Np1 -i "${srcdir}/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch"
+
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre/boot-logo.patch b/libre/linux-libre/boot-logo.patch
deleted file mode 100644
index 3f4e0dea4..000000000
--- a/libre/linux-libre/boot-logo.patch
+++ /dev/null
@@ -1,23167 +0,0 @@
-diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
-index 3c14e43..c9d8373 100644
---- a/drivers/video/logo/logo_linux_clut224.ppm
-+++ b/drivers/video/logo/logo_linux_clut224.ppm
-@@ -1,1604 +1,861 @@
- P3
--# Standard 224-color Linux logo
--80 80
-+80 78
- 255
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  10  10  10  10  10  10
-- 10  10  10   6   6   6   6   6   6   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 22  22  22  26  26  26  30  30  30  34  34  34
-- 30  30  30  30  30  30  26  26  26  18  18  18
-- 14  14  14  10  10  10   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  26  26  26  42  42  42
-- 54  54  54  66  66  66  78  78  78  78  78  78
-- 78  78  78  74  74  74  66  66  66  54  54  54
-- 42  42  42  26  26  26  18  18  18  10  10  10
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 22  22  22  42  42  42  66  66  66  86  86  86
-- 66  66  66  38  38  38  38  38  38  22  22  22
-- 26  26  26  34  34  34  54  54  54  66  66  66
-- 86  86  86  70  70  70  46  46  46  26  26  26
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 50  50  50  82  82  82  58  58  58   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  54  54  54  86  86  86  66  66  66
-- 38  38  38  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 78  78  78  34  34  34   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6  70  70  70
-- 78  78  78  46  46  46  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  42  42  42  82  82  82
-- 26  26  26   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 46  46  46  34  34  34   6   6   6   2   2   6
-- 42  42  42  78  78  78  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  30  30  30  66  66  66  58  58  58
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 86  86  86 101 101 101  46  46  46  10  10  10
--  2   2   6  58  58  58  70  70  70  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  86  86  86  10  10  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  30  30  30
-- 94  94  94  94  94  94  58  58  58  26  26  26
--  2   2   6   6   6   6  78  78  78  54  54  54
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  62  62  62  62  62  62   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 54  54  54  38  38  38  18  18  18  10  10  10
--  2   2   6   2   2   6  34  34  34  82  82  82
-- 38  38  38  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 10  10  10   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  54  54  54
-- 66  66  66  26  26  26   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  82  82  82   2   2   6   2   2   6
--  2   2   6   6   6   6  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 14  14  14  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  18  18  18
-- 82  82  82  34  34  34  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
--  6   6   6   6   6   6  22  22  22  34  34  34
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  34  34  34
-- 10  10  10  50  50  50  22  22  22   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 86  86  86  42  42  42  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
-- 38  38  38 116 116 116  94  94  94  22  22  22
-- 22  22  22   2   2   6   2   2   6   2   2   6
-- 14  14  14  86  86  86 138 138 138 162 162 162
--154 154 154  38  38  38  26  26  26   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  14  14  14
--134 134 134 198 198 198 195 195 195 116 116 116
-- 10  10  10   2   2   6   2   2   6   6   6   6
--101  98  89 187 187 187 210 210 210 218 218 218
--214 214 214 134 134 134  14  14  14   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  50  50  50  18  18  18   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  54  54  54
--218 218 218 195 195 195 226 226 226 246 246 246
-- 58  58  58   2   2   6   2   2   6  30  30  30
--210 210 210 253 253 253 174 174 174 123 123 123
--221 221 221 234 234 234  74  74  74   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  82  82  82   2   2   6 106 106 106
--170 170 170  26  26  26  86  86  86 226 226 226
--123 123 123  10  10  10  14  14  14  46  46  46
--231 231 231 190 190 190   6   6   6  70  70  70
-- 90  90  90 238 238 238 158 158 158   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  86  86  86   6   6   6 116 116 116
--106 106 106   6   6   6  70  70  70 149 149 149
--128 128 128  18  18  18  38  38  38  54  54  54
--221 221 221 106 106 106   2   2   6  14  14  14
-- 46  46  46 190 190 190 198 198 198   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  94  94  94  14  14  14 101 101 101
--128 128 128   2   2   6  18  18  18 116 116 116
--118  98  46 121  92   8 121  92   8  98  78  10
--162 162 162 106 106 106   2   2   6   2   2   6
--  2   2   6 195 195 195 195 195 195   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   1
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  90  90  90  14  14  14  58  58  58
--210 210 210  26  26  26  54  38   6 154 114  10
--226 170  11 236 186  11 225 175  15 184 144  12
--215 174  15 175 146  61  37  26   9   2   2   6
-- 70  70  70 246 246 246 138 138 138   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  66  66  66  26  26  26   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14  10  10  10
--195 195 195 188 164 115 192 133   9 225 175  15
--239 182  13 234 190  10 232 195  16 232 200  30
--245 207  45 241 208  19 232 195  16 184 144  12
--218 194 134 211 206 186  42  42  42   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  74  74  74  30  30  30   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  86  86  86  14  14  14   2   2   6
--121  87  25 192 133   9 219 162  10 239 182  13
--236 186  11 232 195  16 241 208  19 244 214  54
--246 218  60 246 218  38 246 215  20 241 208  19
--241 208  19 226 184  13 121  87  25   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  82  82  82  34  34  34  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  82  82  82  30  30  30  61  42   6
--180 123   7 206 145  10 230 174  11 239 182  13
--234 190  10 238 202  15 241 208  19 246 218  74
--246 218  38 246 215  20 246 215  20 246 215  20
--226 184  13 215 174  15 184 144  12   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 26  26  26  94  94  94  42  42  42  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  50  50  50 104  69   6
--192 133   9 216 158  10 236 178  12 236 186  11
--232 195  16 241 208  19 244 214  54 245 215  43
--246 215  20 246 215  20 241 208  19 198 155  10
--200 144  11 216 158  10 156 118  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  90  90  90  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  46  46  46  22  22  22
--137  92   6 210 162  10 239 182  13 238 190  10
--238 202  15 241 208  19 246 215  20 246 215  20
--241 208  19 203 166  17 185 133  11 210 150  10
--216 158  10 210 150  10 102  78  10   2   2   6
--  6   6   6  54  54  54  14  14  14   2   2   6
--  2   2   6  62  62  62  74  74  74  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  78  78  78  50  50  50   6   6   6
-- 94  70  30 139 102  15 190 146  13 226 184  13
--232 200  30 232 195  16 215 174  15 190 146  13
--168 122  10 192 133   9 210 150  10 213 154  11
--202 150  34 182 157 106 101  98  89   2   2   6
--  2   2   6  78  78  78 116 116 116  58  58  58
--  2   2   6  22  22  22  90  90  90  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  50  50  50   6   6   6
--128 128 128 174 154 114 156 107  11 168 122  10
--198 155  10 184 144  12 197 138  11 200 144  11
--206 145  10 206 145  10 197 138  11 188 164 115
--195 195 195 198 198 198 174 174 174  14  14  14
--  2   2   6  22  22  22 116 116 116 116 116 116
-- 22  22  22   2   2   6  74  74  74  70  70  70
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 101 101 101  26  26  26  10  10  10
--138 138 138 190 190 190 174 154 114 156 107  11
--197 138  11 200 144  11 197 138  11 192 133   9
--180 123   7 190 142  34 190 178 144 187 187 187
--202 202 202 221 221 221 214 214 214  66  66  66
--  2   2   6   2   2   6  50  50  50  62  62  62
--  6   6   6   2   2   6  10  10  10  90  90  90
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  34  34  34
-- 74  74  74  74  74  74   2   2   6   6   6   6
--144 144 144 198 198 198 190 190 190 178 166 146
--154 121  60 156 107  11 156 107  11 168 124  44
--174 154 114 187 187 187 190 190 190 210 210 210
--246 246 246 253 253 253 253 253 253 182 182 182
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  62  62  62
-- 74  74  74  34  34  34  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  22  22  22  54  54  54
-- 94  94  94  18  18  18   2   2   6  46  46  46
--234 234 234 221 221 221 190 190 190 190 190 190
--190 190 190 187 187 187 187 187 187 190 190 190
--190 190 190 195 195 195 214 214 214 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
-- 82  82  82   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 86  86  86  54  54  54  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  46  46  46  90  90  90
-- 46  46  46  18  18  18   6   6   6 182 182 182
--253 253 253 246 246 246 206 206 206 190 190 190
--190 190 190 190 190 190 190 190 190 190 190 190
--206 206 206 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--202 202 202  14  14  14   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  86  86  86  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  38  38  38  74  74  74  66  66  66
--  2   2   6   6   6   6  90  90  90 250 250 250
--253 253 253 253 253 253 238 238 238 198 198 198
--190 190 190 190 190 190 195 195 195 221 221 221
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253  82  82  82   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  78  78  78  70  70  70  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  66  66  66  78  78  78   6   6   6
--  2   2   6  18  18  18 218 218 218 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--226 226 226 231 231 231 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 178 178 178   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  18  18  18  90  90  90  62  62  62
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 58  58  58  90  90  90  18  18  18   2   2   6
--  2   2   6 110 110 110 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231  18  18  18   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  94  94  94
-- 54  54  54  26  26  26  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 90  90  90  26  26  26   2   2   6   2   2   6
-- 14  14  14 195 195 195 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 242 242 242  54  54  54   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
-- 86  86  86  50  50  50  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  38  38  38  82  82  82
-- 34  34  34   2   2   6   2   2   6   2   2   6
-- 42  42  42 195 195 195 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 242 242 242 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 246 246 246 238 238 238
--226 226 226 231 231 231 101 101 101   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 38  38  38  82  82  82  42  42  42  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  62  62  62  66  66  66
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 70  70  70 170 170 170 206 206 206 234 234 234
--246 246 246 250 250 250 250 250 250 238 238 238
--226 226 226 231 231 231 238 238 238 250 250 250
--250 250 250 250 250 250 246 246 246 231 231 231
--214 214 214 206 206 206 202 202 202 202 202 202
--198 198 198 202 202 202 182 182 182  18  18  18
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  62  62  62  66  66  66  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  82  82  82  18  18  18
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 94  94  94 182 182 182 218 218 218 242 242 242
--250 250 250 253 253 253 253 253 253 250 250 250
--234 234 234 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--238 238 238 226 226 226 210 210 210 202 202 202
--195 195 195 195 195 195 210 210 210 158 158 158
--  6   6   6  14  14  14  50  50  50  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  86  86  86  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54  70  70  70   2   2   6
--  2   2   6  10  10  10   2   2   6  22  22  22
--166 166 166 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--231 231 231 206 206 206 198 198 198 226 226 226
-- 94  94  94   2   2   6   6   6   6  38  38  38
-- 30  30  30   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  62  62  62  66  66  66
-- 26  26  26  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74  50  50  50   2   2   6
-- 26  26  26  26  26  26   2   2   6 106 106 106
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246 218 218 218 202 202 202
--210 210 210  14  14  14   2   2   6   2   2   6
-- 30  30  30  22  22  22   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  86  86  86
-- 42  42  42  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  90  90  90  22  22  22   2   2   6
-- 42  42  42   2   2   6  18  18  18 218 218 218
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 221 221 221
--218 218 218 101 101 101   2   2   6  14  14  14
-- 18  18  18  38  38  38  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 58  58  58  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  82  82  82   2   2   6  26  26  26
-- 22  22  22   2   2   6 123 123 123 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--238 238 238 198 198 198   6   6   6  38  38  38
-- 58  58  58  26  26  26  38  38  38   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
-- 78  78  78  30  30  30  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  30  30  30
-- 74  74  74  58  58  58   2   2   6  42  42  42
--  2   2   6  22  22  22 231 231 231 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246  46  46  46  38  38  38
-- 42  42  42  14  14  14  38  38  38  14  14  14
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  42  42  42
-- 90  90  90  18  18  18  18  18  18  26  26  26
--  2   2   6 116 116 116 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253  94  94  94   6   6   6
--  2   2   6   2   2   6  10  10  10  34  34  34
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  26  26  26  66  66  66
-- 82  82  82   2   2   6  38  38  38   6   6   6
-- 14  14  14 210 210 210 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 246 246 246 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 144 144 144   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  74  74  74  30  30  30  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  42  42  42  90  90  90
-- 26  26  26   6   6   6  42  42  42   2   2   6
-- 74  74  74 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 242 242 242 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 182 182 182   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 10  10  10  86  86  86  38  38  38  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  66  66  66  82  82  82
--  2   2   6  22  22  22  18  18  18   2   2   6
--149 149 149 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  86  86  86  46  46  46  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  46  46  46  86  86  86  18  18  18
--  2   2   6  34  34  34  10  10  10   6   6   6
--210 210 210 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 221 221 221   6   6   6
--  2   2   6   2   2   6   6   6   6  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 26  26  26  66  66  66  62  62  62   2   2   6
--  2   2   6  38  38  38  10  10  10  26  26  26
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231   6   6   6
--  2   2   6   2   2   6  10  10  10  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  78  78  78   6   6   6   2   2   6
--  2   2   6  46  46  46  14  14  14  42  42  42
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  10  10  10
--  2   2   6   2   2   6  22  22  22  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50  74  74  74   2   2   6   2   2   6
-- 14  14  14  70  70  70  34  34  34  62  62  62
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  14  14  14
--  2   2   6   2   2   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  62  62  62   2   2   6   2   2   6
--  2   2   6  30  30  30  46  46  46  70  70  70
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 226 226 226  10  10  10
--  2   2   6   6   6   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58  62  62  62   2   2   6   2   2   6
--  2   2   6   2   2   6  30  30  30  78  78  78
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
-- 22  22  22  34  34  34  18  14   6  22  22  22
-- 26  26  26  18  18  18   6   6   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  26  26  26
-- 62  62  62 106 106 106  74  54  14 185 133  11
--210 162  10 121  92   8   6   6   6  62  62  62
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 158 158 158  18  18  18
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  6   6   6  18  18  18  66  66  66  38  38  38
--  6   6   6  94  94  94  50  50  50  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 10  10  10  10  10  10  18  18  18  38  38  38
-- 78  78  78 142 134 106 216 158  10 242 186  14
--246 190  14 246 190  14 156 118  10  10  10  10
-- 90  90  90 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 230 190
--238 204  91 238 204  91 181 142  44  37  26   9
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  38  38  38  46  46  46
-- 26  26  26 106 106 106  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  22  22  22
-- 30  30  30  38  38  38  50  50  50  70  70  70
--106 106 106 190 142  34 226 170  11 242 186  14
--246 190  14 246 190  14 246 190  14 154 114  10
--  6   6   6  74  74  74 226 226 226 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 228 184  62
--241 196  14 241 208  19 232 195  16  38  30  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  30  30  30  26  26  26
--203 166  17 154 142  90  66  66  66  26  26  26
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  38  38  38  58  58  58
-- 78  78  78  86  86  86 101 101 101 123 123 123
--175 146  61 210 150  10 234 174  13 246 186  14
--246 190  14 246 190  14 246 190  14 238 190  10
--102  78  10   2   2   6  46  46  46 198 198 198
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 224 178  62
--242 186  14 241 196  14 210 166  10  22  18   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6 121  92   8
--238 202  15 232 195  16  82  82  82  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  38  38  38  70  70  70 154 122  46
--190 142  34 200 144  11 197 138  11 197 138  11
--213 154  11 226 170  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--225 175  15  46  32   6   2   2   6  22  22  22
--158 158 158 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 242 242 242 224 178  62
--239 182  13 236 186  11 213 154  11  46  32   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 225 175  15
--238 190  10 236 186  11 112 100  78  42  42  42
-- 14  14  14   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54 154 122  46 213 154  11
--226 170  11 230 174  11 226 170  11 226 170  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 184 144  12  10  10  10   2   2   6
--  6   6   6 116 116 116 242 242 242 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231 198 198 198 214 170  54
--236 178  12 236 178  12 210 150  10 137  92   6
-- 18  14   6   2   2   6   2   2   6   2   2   6
--  6   6   6  70  47   6 200 144  11 236 178  12
--239 182  13 239 182  13 124 112  88  58  58  58
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  70  70  70 180 133  36 226 170  11
--239 182  13 242 186  14 242 186  14 246 186  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16  98  70   6   2   2   6
--  2   2   6   2   2   6  66  66  66 221 221 221
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 206 206 206 198 198 198 214 166  58
--230 174  11 230 174  11 216 158  10 192 133   9
--163 110   8 116  81   8 102  78  10 116  81   8
--167 114   7 197 138  11 226 170  11 239 182  13
--242 186  14 242 186  14 162 146  94  78  78  78
-- 34  34  34  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78 190 142  34 226 170  11
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 241 196  14 203 166  17  22  18   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--218 218 218 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 206 206 206 198 198 198 202 162  69
--226 170  11 236 178  12 224 166  10 210 150  10
--200 144  11 197 138  11 192 133   9 197 138  11
--210 150  10 226 170  11 242 186  14 246 190  14
--246 190  14 246 186  14 225 175  15 124 112  88
-- 62  62  62  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 174 135  50 224 166  10
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 139 102  15
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 78  78  78 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 214 214 214 198 198 198 190 150  46
--219 162  10 236 178  12 234 174  13 224 166  10
--216 158  10 213 154  11 213 154  11 216 158  10
--226 170  11 239 182  13 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 206 162  42
--101 101 101  58  58  58  30  30  30  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74 174 135  50 216 158  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 226 184  13
-- 61  42   6   2   2   6   2   2   6   2   2   6
-- 22  22  22 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 226 226 226 187 187 187 180 133  36
--216 158  10 236 178  12 239 182  13 236 178  12
--230 174  11 226 170  11 226 170  11 230 174  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 186  14 239 182  13
--206 162  42 106 106 106  66  66  66  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 213 154  11
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 241 196  14
--190 146  13  18  14   6   2   2   6   2   2   6
-- 46  46  46 246 246 246 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 221 221 221  86  86  86 156 107  11
--216 158  10 236 178  12 242 186  14 246 186  14
--242 186  14 239 182  13 239 182  13 242 186  14
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 225 175  15 142 122  72  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 210 150  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--232 195  16 121  92   8  34  34  34 106 106 106
--221 221 221 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--242 242 242  82  82  82  18  14   6 163 110   8
--216 158  10 236 178  12 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 163 133  67
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 163 133  67 210 150  10
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 215 174  15 190 178 144 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 218 218 218
-- 58  58  58   2   2   6  22  18   6 167 114   7
--216 158  10 236 178  12 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 186  14 242 186  14 190 150  46
-- 54  54  54  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 38  38  38  86  86  86 180 133  36 213 154  11
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16 190 146  13 214 214 214
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 170 170 170  26  26  26
--  2   2   6   2   2   6  37  26   9 163 110   8
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 224 166  10 142 122  72
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 109 106  95 192 133   9 224 166  10
--242 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 226 184  13 210 162  10 142 110  46
--226 226 226 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--198 198 198  66  66  66   2   2   6   2   2   6
--  2   2   6   2   2   6  50  34   6 156 107  11
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 242 186  14
--234 174  13 213 154  11 154 122  46  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58 154 121  60 206 145  10 234 174  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 210 162  10 163 110   8
-- 61  42   6 138 138 138 218 218 218 250 250 250
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 210 210 210 144 144 144  66  66  66
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 163 110   8
--216 158  10 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 239 182  13 230 174  11 216 158  10
--190 142  34 124 112  88  70  70  70  38  38  38
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 62  62  62 168 124  44 206 145  10 224 166  10
--236 178  12 239 182  13 242 186  14 242 186  14
--246 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 236 178  12 216 158  10 175 118   6
-- 80  54   7   2   2   6   6   6   6  30  30  30
-- 54  54  54  62  62  62  50  50  50  38  38  38
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 167 114   7
--213 154  11 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 242 186  14 239 182  13 239 182  13
--230 174  11 210 150  10 174 135  50 124 112  88
-- 82  82  82  54  54  54  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 158 118  36 192 133   9 200 144  11
--216 158  10 219 162  10 224 166  10 226 170  11
--230 174  11 236 178  12 239 182  13 239 182  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 230 174  11 210 150  10 163 110   8
--104  69   6  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  91  60   6 167 114   7
--206 145  10 230 174  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 186  14 242 186  14
--239 182  13 230 174  11 224 166  10 213 154  11
--180 133  36 124 112  88  86  86  86  58  58  58
-- 38  38  38  22  22  22  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  70  70  70 138 110  50 158 118  36
--167 114   7 180 123   7 192 133   9 197 138  11
--200 144  11 206 145  10 213 154  11 219 162  10
--224 166  10 230 174  11 239 182  13 242 186  14
--246 186  14 246 186  14 246 186  14 246 186  14
--239 182  13 216 158  10 185 133  11 152  99   6
--104  69   6  18  14   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 152  99   6
--192 133   9 219 162  10 236 178  12 239 182  13
--246 186  14 242 186  14 239 182  13 236 178  12
--224 166  10 206 145  10 192 133   9 154 121  60
-- 94  94  94  62  62  62  42  42  42  22  22  22
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  34  34  34  58  58  58  78  78  78
--101  98  89 124 112  88 142 110  46 156 107  11
--163 110   8 167 114   7 175 118   6 180 123   7
--185 133  11 197 138  11 210 150  10 219 162  10
--226 170  11 236 178  12 236 178  12 234 174  13
--219 162  10 197 138  11 163 110   8 130  83   6
-- 91  60   6  10  10  10   2   2   6   2   2   6
-- 18  18  18  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  26  26  26   2   2   6
--  2   2   6   6   6   6  70  47   6 137  92   6
--175 118   6 200 144  11 219 162  10 230 174  11
--234 174  13 230 174  11 219 162  10 210 150  10
--192 133   9 163 110   8 124 112  88  82  82  82
-- 50  50  50  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  22  22  22  34  34  34
-- 42  42  42  58  58  58  74  74  74  86  86  86
--101  98  89 122 102  70 130  98  46 121  87  25
--137  92   6 152  99   6 163 110   8 180 123   7
--185 133  11 197 138  11 206 145  10 200 144  11
--180 123   7 156 107  11 130  83   6 104  69   6
-- 50  34   6  54  54  54 110 110 110 101  98  89
-- 86  86  86  82  82  82  78  78  78  78  78  78
-- 78  78  78  78  78  78  78  78  78  78  78  78
-- 78  78  78  82  82  82  86  86  86  94  94  94
--106 106 106 101 101 101  86  66  34 124  80   6
--156 107  11 180 123   7 192 133   9 200 144  11
--206 145  10 200 144  11 192 133   9 175 118   6
--139 102  15 109 106  95  70  70  70  42  42  42
-- 22  22  22  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  10  10  10
-- 14  14  14  22  22  22  30  30  30  38  38  38
-- 50  50  50  62  62  62  74  74  74  90  90  90
--101  98  89 112 100  78 121  87  25 124  80   6
--137  92   6 152  99   6 152  99   6 152  99   6
--138  86   6 124  80   6  98  70   6  86  66  30
--101  98  89  82  82  82  58  58  58  46  46  46
-- 38  38  38  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  38  38  38  42  42  42
-- 54  54  54  82  82  82  94  86  76  91  60   6
--134  86   6 156 107  11 167 114   7 175 118   6
--175 118   6 167 114   7 152  99   6 121  87  25
--101  98  89  62  62  62  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6   6   6   6  10  10  10
-- 18  18  18  22  22  22  30  30  30  42  42  42
-- 50  50  50  66  66  66  86  86  86 101  98  89
--106  86  58  98  70   6 104  69   6 104  69   6
--104  69   6  91  60   6  82  62  34  90  90  90
-- 62  62  62  38  38  38  22  22  22  14  14  14
-- 10  10  10  10  10  10  10  10  10  10  10  10
-- 10  10  10  10  10  10   6   6   6  10  10  10
-- 10  10  10  10  10  10  10  10  10  14  14  14
-- 22  22  22  42  42  42  70  70  70  89  81  66
-- 80  54   7 104  69   6 124  80   6 137  92   6
--134  86   6 116  81   8 100  82  52  86  86  86
-- 58  58  58  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 18  18  18  26  26  26  38  38  38  54  54  54
-- 70  70  70  86  86  86  94  86  76  89  81  66
-- 89  81  66  86  86  86  74  74  74  50  50  50
-- 30  30  30  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  34  34  34  58  58  58
-- 82  82  82  89  81  66  89  81  66  89  81  66
-- 94  86  66  94  86  76  74  74  74  50  50  50
-- 26  26  26  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  14  14  14  18  18  18
-- 30  30  30  38  38  38  46  46  46  54  54  54
-- 50  50  50  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  26  26  26
-- 38  38  38  50  50  50  58  58  58  58  58  58
-- 54  54  54  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
--  6   6   6  10  10  10  14  14  14  18  18  18
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  18  18  18  22  22  22  22  22  22
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 23 30 36 44 54 65 57 72 88 44 54 65 6 12 15 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 31 41 52 
-+103 134 161 163 205 246 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 143 185 225 
-+82 108 129 8 14 16 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 17 24 30 126 162 196 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 161 203 243 92 119 140 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 44 54 65 154 195 235 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 138 174 208 21 27 33 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 70 96 117 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 157 198 239 49 59 70 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 3 6 52 62 74 170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 
-+82 108 129 149 191 231 170 212 252 170 212 252 170 212 252 129 165 199 82 108 129 149 191 231 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 37 48 59 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 21 13 4 31 23 12 0 2 0 0 2 0 105 75 32 155 111 43 23 15 7 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 6 9 3 10 13 146 188 228 170 212 252 170 212 252 170 212 252 157 198 239 0 6 9 
-+0 2 0 52 62 74 170 212 252 170 212 252 154 195 235 0 6 9 0 2 0 55 66 77 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 151 193 233 17 24 30 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+10 12 8 23 15 7 139 99 44 206 148 61 67 49 21 0 2 0 125 92 35 206 148 61 
-+15 9 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 96 127 154 170 212 252 170 212 252 170 212 252 170 212 252 92 119 140 21 22 20 
-+10 12 8 53 68 84 170 212 252 170 212 252 92 119 140 10 12 8 7 10 5 53 68 84 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 134 170 204 
-+0 6 9 0 3 6 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 21 22 20 
-+62 64 61 38 40 37 0 2 0 34 26 8 212 153 66 64 46 18 0 2 0 170 124 49 
-+180 132 57 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+18 22 24 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 65 87 102 115 117 114 
-+43 44 42 88 115 136 170 212 252 170 212 252 68 83 99 108 110 107 60 62 59 88 115 136 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+80 98 121 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 10 12 8 56 58 55 95 96 94 178 180 177 215 217 214 198 200 197 
-+158 160 156 138 140 137 82 83 81 0 2 0 64 46 18 228 167 73 23 15 7 41 31 10 
-+250 179 73 55 39 17 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+75 94 116 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 63 78 94 0 2 0 
-+0 2 0 126 162 196 170 212 252 170 212 252 57 72 88 0 2 0 0 2 0 126 162 196 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+157 198 239 8 14 16 0 6 9 0 2 0 45 47 44 195 197 194 192 194 191 38 40 37 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 192 194 191 234 236 233 176 178 175 118 120 117 143 145 142 176 178 175 
-+215 217 214 234 236 233 234 236 233 104 106 103 0 2 0 142 101 40 134 100 43 0 2 0 
-+164 119 51 170 124 49 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 115 152 185 8 14 16 
-+49 59 70 166 207 248 170 212 252 170 212 252 119 150 178 8 14 16 55 66 77 166 207 248 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 92 119 140 0 2 0 0 2 0 200 202 199 254 255 252 254 255 252 244 246 243 
-+40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 38 40 37 234 236 233 234 236 233 234 236 233 135 137 134 215 217 214 171 173 170 
-+141 142 139 138 140 137 138 140 137 135 137 134 31 32 30 3 6 2 212 153 66 15 9 7 
-+78 58 25 248 178 79 41 31 10 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 3 6 21 27 33 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 163 205 246 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 154 195 235 0 6 9 82 83 81 254 255 252 254 255 252 254 255 252 254 255 252 
-+188 190 187 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 62 64 61 234 236 233 234 236 233 234 236 233 198 200 197 131 133 130 198 200 197 
-+232 234 231 234 236 233 234 236 233 234 236 233 152 154 151 0 2 0 147 105 44 67 49 21 
-+23 15 7 250 179 73 158 114 46 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 61 76 92 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 154 195 235 103 134 161 80 98 121 
-+52 62 74 18 22 24 0 2 0 3 10 13 38 45 51 80 98 121 151 193 233 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 109 141 168 0 2 0 169 171 168 254 255 252 254 255 252 254 255 252 254 255 252 
-+226 228 225 65 66 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 43 44 42 234 236 233 234 236 233 234 236 233 234 236 233 131 133 130 192 194 191 
-+152 154 151 141 142 139 141 142 139 141 142 139 158 160 156 3 6 2 82 62 28 129 95 39 
-+0 2 0 206 148 61 248 178 79 21 13 4 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 96 115 138 
-+170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 18 22 24 0 2 0 0 2 0 
-+34 26 8 75 55 22 114 83 33 95 68 30 55 39 17 7 0 0 0 6 9 84 103 125 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 84 103 125 0 2 0 229 231 228 254 255 252 254 255 252 254 255 252 171 173 170 
-+0 2 0 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 18 20 17 234 236 233 234 236 233 234 236 233 234 236 233 138 140 137 178 180 177 
-+226 228 225 234 236 233 234 236 233 234 236 233 231 233 230 45 47 44 23 15 7 190 136 56 
-+0 2 0 147 105 44 250 179 73 64 46 18 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 126 162 196 0 2 0 26 20 13 190 136 56 245 175 76 
-+250 179 73 161 117 49 164 119 51 245 175 76 250 179 73 206 148 61 75 55 22 0 2 0 
-+126 162 196 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 68 83 99 0 2 0 252 254 250 254 255 252 254 255 252 254 255 252 71 73 70 
-+8 14 16 88 115 136 17 24 30 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 232 234 231 234 236 233 234 236 233 234 236 233 215 217 214 148 150 147 
-+183 185 181 141 142 139 135 137 134 135 137 134 141 142 139 87 89 86 0 2 0 202 145 58 
-+3 6 2 88 66 26 250 179 73 109 79 35 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 157 198 239 
-+170 212 252 170 212 252 166 207 248 26 33 39 26 20 13 224 163 69 250 179 73 250 179 73 
-+250 179 73 197 142 62 202 145 58 250 179 73 250 179 73 250 179 73 234 172 70 21 13 4 
-+38 45 51 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 52 62 74 21 22 20 254 255 252 254 255 252 254 255 252 254 255 252 21 22 20 
-+49 59 70 170 212 252 166 207 248 91 123 149 8 14 16 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 215 217 214 234 236 233 234 236 233 234 236 233 234 236 233 123 125 122 
-+188 190 187 229 231 228 234 236 233 234 236 233 222 224 221 118 120 117 0 2 0 168 123 54 
-+34 26 8 67 49 21 250 179 73 134 100 43 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 34 41 47 170 212 252 
-+170 212 252 170 212 252 85 112 133 0 2 0 164 119 51 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 129 95 39 
-+0 2 0 138 174 208 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 34 44 55 45 47 44 254 255 252 254 255 252 254 255 252 254 255 252 24 22 25 
-+52 62 74 170 212 252 170 212 252 170 212 252 138 174 208 10 16 18 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 178 180 177 234 236 233 234 236 233 234 236 233 234 236 233 141 142 139 
-+198 200 197 148 150 147 135 137 134 135 137 134 148 150 147 123 125 122 0 2 0 190 136 56 
-+21 13 4 78 58 25 250 179 73 129 95 39 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 82 108 129 170 212 252 
-+170 212 252 170 212 252 23 30 36 58 42 19 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 147 105 44 
-+0 2 0 139 181 221 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 34 41 47 45 47 44 254 255 252 254 255 252 254 255 252 254 255 252 56 58 55 
-+25 32 38 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 10 16 18 0 6 9 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 91 93 90 234 236 233 234 236 233 234 236 233 234 236 233 126 127 125 
-+169 171 168 222 224 221 234 236 233 229 231 228 178 180 177 71 73 70 0 2 0 212 153 66 
-+0 2 0 95 68 30 250 179 73 119 87 37 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 138 174 208 170 212 252 
-+170 212 252 154 195 235 0 2 0 125 92 35 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 119 87 37 
-+0 2 0 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 57 72 88 7 10 5 252 254 250 254 255 252 254 255 252 254 255 252 95 96 94 
-+0 6 9 166 207 248 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 8 14 16 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 7 10 5 222 224 221 234 236 233 234 236 233 234 236 233 141 142 139 
-+183 185 181 138 140 137 131 133 130 141 142 139 192 194 191 102 104 101 0 2 0 224 163 69 
-+0 2 0 105 75 32 250 179 73 55 39 17 7 0 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 21 27 33 170 212 252 170 212 252 
-+170 212 252 115 152 185 0 2 0 180 132 57 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 228 167 73 10 12 8 
-+38 45 51 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 82 108 129 0 2 0 222 224 221 254 255 252 254 255 252 254 255 252 158 160 156 
-+0 2 0 92 119 140 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 122 159 192 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 141 142 139 234 236 233 234 236 233 234 236 233 131 133 130 
-+185 187 183 231 233 230 222 224 221 158 160 156 138 140 137 48 50 48 3 6 2 250 179 73 
-+134 100 43 206 148 61 218 158 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 75 94 116 170 212 252 170 212 252 
-+170 212 252 92 119 140 0 2 0 224 163 69 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 87 61 23 7 0 0 
-+134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 109 141 168 0 2 0 178 180 177 254 255 252 254 255 252 254 255 252 252 254 250 
-+39 43 45 10 16 18 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+88 115 136 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 45 47 44 234 236 233 234 236 233 234 236 233 131 133 130 
-+148 150 147 138 140 137 148 150 147 210 212 209 152 154 151 26 27 25 29 21 8 250 179 73 
-+250 179 73 234 172 70 55 39 17 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 126 162 196 170 212 252 170 212 252 
-+170 212 252 103 134 161 0 2 0 202 145 58 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 238 175 73 75 55 22 0 2 0 75 102 123 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 140 177 211 0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 
-+183 185 181 0 2 0 75 94 116 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 57 72 88 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 162 164 161 234 236 233 234 236 233 135 137 134 
-+226 228 225 198 200 197 104 106 103 15 17 14 0 2 0 15 9 7 147 105 44 250 179 73 
-+248 178 79 55 39 17 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 21 27 33 170 212 252 170 212 252 170 212 252 
-+170 212 252 122 159 192 0 2 0 175 129 54 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 202 145 58 55 39 17 0 2 0 82 108 129 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 12 17 20 60 62 59 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 69 71 68 0 6 9 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 159 201 241 26 33 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 7 10 5 162 164 161 215 217 214 95 96 94 
-+56 58 55 0 2 0 0 2 0 0 2 0 61 44 16 238 175 73 250 179 73 250 179 73 
-+218 158 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 88 115 136 170 212 252 170 212 252 170 212 252 
-+170 212 252 143 185 225 0 2 0 147 105 44 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 212 153 66 95 68 30 0 2 0 8 14 16 103 134 161 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 68 83 99 0 2 0 231 233 230 254 255 252 254 255 252 254 255 252 
-+254 255 252 210 212 209 0 6 9 53 68 84 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 126 162 196 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 23 15 7 250 179 73 250 179 73 250 179 73 
-+250 179 73 29 21 8 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 166 207 248 0 2 0 52 36 13 158 114 46 180 132 57 161 117 49 119 87 37 
-+41 31 10 0 2 0 0 2 0 72 87 103 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 115 152 185 0 2 0 152 154 151 254 255 252 238 241 237 85 87 84 
-+229 231 228 254 255 252 99 101 98 0 2 0 126 162 196 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 63 78 94 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 202 145 58 250 179 73 250 179 73 
-+250 179 73 105 75 32 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 32 39 45 0 2 0 57 72 88 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 85 112 133 12 17 20 0 2 0 0 2 0 0 2 0 0 2 0 
-+34 41 47 92 110 133 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 166 207 248 6 12 15 71 73 70 254 255 252 229 231 228 0 2 0 
-+141 142 139 254 255 252 231 233 230 10 12 8 34 44 55 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 154 195 235 6 12 15 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 125 92 35 250 179 73 250 179 73 
-+250 179 73 180 132 57 0 2 0 0 2 0 0 2 0 0 2 0 3 10 13 68 83 99 
-+129 165 199 85 112 133 0 2 0 122 159 192 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 126 162 196 119 156 189 134 170 204 149 191 231 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 57 72 88 3 6 2 242 244 240 254 255 252 35 37 34 
-+78 80 77 254 255 252 254 255 252 128 130 127 0 2 0 105 137 164 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 91 123 149 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 55 39 17 250 179 73 250 179 73 
-+250 179 73 245 175 76 7 10 5 0 2 0 44 54 65 103 134 161 161 203 243 170 212 252 
-+170 212 252 21 27 33 25 32 38 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 61 76 92 0 2 0 242 244 240 254 255 252 102 104 101 
-+10 12 8 231 233 230 254 255 252 244 246 243 26 27 25 21 27 33 159 201 241 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 32 39 45 0 6 9 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 218 158 64 250 179 73 
-+250 179 73 250 179 73 75 55 22 0 2 0 161 203 243 170 212 252 170 212 252 170 212 252 
-+115 147 174 0 2 0 91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 159 201 241 146 188 228 
-+140 177 211 134 170 204 146 188 228 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 17 24 30 62 64 61 254 255 252 254 255 252 215 217 214 
-+0 2 0 102 104 101 254 255 252 254 255 252 166 168 165 0 2 0 72 87 103 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 75 32 250 179 73 
-+250 179 73 250 179 73 150 108 46 0 2 0 113 145 172 170 212 252 170 212 252 170 212 252 
-+49 59 70 3 10 13 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 166 207 248 109 141 168 65 87 102 28 35 41 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 28 35 41 70 96 117 138 174 208 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 0 2 0 102 104 101 254 255 252 254 255 252 254 255 252 
-+102 104 101 0 2 0 192 194 191 254 255 252 254 255 252 78 80 77 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 34 44 55 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 61 76 92 154 195 235 0 6 9 29 21 8 250 179 73 
-+250 179 73 250 179 73 224 163 69 0 2 0 68 83 99 170 212 252 170 212 252 143 179 213 
-+0 2 0 72 87 103 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+161 203 243 96 115 138 17 24 30 0 2 0 0 2 0 45 47 44 102 104 101 123 125 122 
-+138 140 137 143 145 142 115 117 114 82 83 81 43 44 42 0 2 0 0 2 0 32 39 45 
-+126 162 196 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 0 2 0 85 87 84 254 255 252 254 255 252 254 255 252 
-+242 244 240 27 29 27 35 37 34 254 255 252 254 255 252 231 233 230 10 12 8 21 27 33 
-+159 201 241 170 212 252 170 212 252 170 212 252 170 212 252 163 205 246 0 6 9 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 44 54 65 170 212 252 170 212 252 34 44 55 0 2 0 82 62 28 
-+109 79 35 224 163 69 250 179 73 52 36 13 15 20 22 170 212 252 170 212 252 75 89 106 
-+0 2 0 143 179 213 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 134 170 204 
-+25 32 38 0 2 0 40 41 39 155 157 153 238 241 237 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 210 212 209 115 117 114 18 20 17 
-+0 2 0 68 83 99 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 52 62 74 7 10 5 234 236 233 254 255 252 254 255 252 
-+254 255 252 195 197 194 102 104 101 254 255 252 254 255 252 254 255 252 162 164 161 0 2 0 
-+72 87 103 170 212 252 170 212 252 170 212 252 170 212 252 119 156 189 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 115 147 174 170 212 252 91 123 149 0 2 0 0 2 0 6 12 15 
-+0 2 0 15 9 7 197 142 62 125 92 35 0 2 0 115 152 185 113 145 172 3 6 2 
-+41 51 62 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 113 145 172 0 6 9 
-+10 12 8 155 157 153 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 232 234 231 
-+87 89 86 0 2 0 32 39 45 154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 115 152 185 0 2 0 138 140 137 254 255 252 254 255 252 
-+254 255 252 254 255 252 249 251 248 254 255 252 254 255 252 254 255 252 254 255 252 65 66 64 
-+0 2 0 122 159 192 170 212 252 170 212 252 170 212 252 66 80 97 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 154 195 235 170 212 252 143 179 213 88 115 136 149 191 231 170 212 252 
-+126 162 196 3 6 2 64 46 18 202 145 58 0 2 0 0 2 0 0 2 0 0 2 0 
-+92 119 140 170 212 252 170 212 252 170 212 252 170 212 252 143 179 213 3 10 13 27 29 27 
-+215 217 214 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 155 157 153 0 2 0 32 39 45 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 23 30 36 27 29 27 249 251 248 254 255 252 
-+254 255 252 188 190 187 7 10 5 226 228 225 254 255 252 254 255 252 254 255 252 231 233 230 
-+7 10 5 21 27 33 159 201 241 170 212 252 103 134 161 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 119 156 189 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 55 66 77 11 4 3 250 179 73 24 17 10 0 2 0 0 2 0 0 2 0 
-+143 185 225 170 212 252 170 212 252 170 212 252 159 201 241 28 35 41 7 10 5 200 202 199 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 155 157 153 0 2 0 55 66 77 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 96 127 154 0 2 0 158 160 156 254 255 252 
-+254 255 252 192 194 191 0 2 0 176 178 175 254 255 252 254 255 252 254 255 252 254 255 252 
-+141 142 139 0 2 0 72 87 103 129 165 199 0 6 9 0 6 9 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 12 17 20 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 
-+138 174 208 17 24 30 29 21 8 250 179 73 101 72 28 0 2 0 0 2 0 32 39 45 
-+170 212 252 170 212 252 170 212 252 170 212 252 57 72 88 0 2 0 152 154 151 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 108 110 107 0 2 0 115 152 185 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 18 22 24 40 41 39 254 255 252 
-+254 255 252 232 234 231 0 2 0 148 150 147 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 10 12 8 0 2 0 8 14 16 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 41 51 62 61 76 92 34 44 55 3 10 13 
-+0 2 0 11 4 3 164 119 51 250 179 73 175 129 54 0 2 0 0 2 0 82 108 129 
-+170 212 252 170 212 252 170 212 252 98 129 156 0 2 0 95 96 94 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 238 241 237 18 20 17 25 32 38 166 207 248 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 85 112 133 0 2 0 188 190 187 
-+254 255 252 254 255 252 198 200 197 242 244 240 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 120 122 119 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 0 2 0 0 6 9 7 0 0 
-+31 23 12 202 145 58 250 179 73 250 179 73 238 175 73 0 2 0 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 28 35 41 31 32 30 244 246 243 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 152 154 151 0 2 0 85 112 133 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 0 2 0 148 150 147 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 222 224 221 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+7 0 0 234 172 70 250 179 73 250 179 73 250 179 73 34 26 8 0 2 0 149 191 231 
-+170 212 252 170 212 252 129 165 199 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 252 254 250 48 50 48 3 10 13 146 188 228 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 157 198 239 0 2 0 118 120 117 
-+254 255 252 254 255 252 254 255 252 169 171 168 231 233 230 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 170 124 49 250 179 73 250 179 73 250 179 73 48 33 15 6 12 15 170 212 252 
-+170 212 252 170 212 252 65 87 102 0 2 0 222 224 221 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 195 197 194 0 2 0 84 103 125 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 3 10 13 85 87 84 
-+254 255 252 254 255 252 234 236 233 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 99 101 98 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 95 68 30 250 179 73 250 179 73 250 179 73 34 26 8 34 44 55 170 212 252 
-+170 212 252 163 205 246 8 14 16 62 64 61 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 35 37 34 34 44 55 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 26 33 39 60 62 59 
-+254 255 252 254 255 252 238 241 237 0 2 0 108 110 107 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 158 160 156 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 23 15 7 248 178 79 250 179 73 245 175 76 0 2 0 63 78 94 170 212 252 
-+170 212 252 109 141 168 0 2 0 158 160 156 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 104 106 103 0 2 0 
-+154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 21 27 33 69 71 68 
-+254 255 252 254 255 252 244 246 243 0 2 0 91 93 90 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 215 217 214 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 197 142 62 250 179 73 212 153 66 0 2 0 92 110 133 170 212 252 
-+170 212 252 80 98 121 0 2 0 231 233 230 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 176 178 175 0 2 0 
-+105 137 164 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 8 14 16 87 89 86 
-+254 255 252 254 255 252 254 255 252 40 41 39 21 22 20 252 254 250 254 255 252 254 255 252 
-+254 255 252 254 255 252 252 254 250 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 125 92 35 250 179 73 170 124 49 0 2 0 113 145 172 170 212 252 
-+170 212 252 53 68 84 15 17 14 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 242 244 240 0 2 0 
-+63 78 94 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 0 2 0 104 106 103 
-+254 255 252 254 255 252 254 255 252 123 125 122 0 2 0 166 168 165 254 255 252 254 255 252 
-+254 255 252 254 255 252 234 236 233 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 7 0 0 52 36 13 250 179 73 129 95 39 0 2 0 143 179 213 170 212 252 
-+170 212 252 32 39 45 48 50 48 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 60 62 59 
-+18 22 24 170 212 252 170 212 252 170 212 252 170 212 252 163 205 246 0 2 0 102 104 101 
-+254 255 252 254 255 252 254 255 252 226 228 225 15 17 14 10 12 8 215 217 214 254 255 252 
-+254 255 252 254 255 252 210 212 209 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 88 66 26 29 21 8 0 2 0 166 207 248 170 212 252 
-+170 212 252 3 10 13 85 87 84 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 123 125 122 
-+0 2 0 149 191 231 170 212 252 170 212 252 170 212 252 170 212 252 21 27 33 56 58 55 
-+254 255 252 254 255 252 254 255 252 254 255 252 178 180 177 0 2 0 38 40 37 238 241 237 
-+254 255 252 254 255 252 210 212 209 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 7 0 0 0 2 0 161 203 243 170 212 252 
-+149 191 231 0 2 0 123 125 122 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 141 142 139 
-+0 2 0 143 179 213 170 212 252 170 212 252 170 212 252 170 212 252 66 80 97 0 2 0 
-+210 212 209 254 255 252 254 255 252 254 255 252 254 255 252 120 122 119 0 2 0 21 22 20 
-+143 145 142 244 246 243 219 221 218 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 149 191 231 170 212 252 
-+129 165 199 0 2 0 158 160 156 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 155 157 153 
-+0 2 0 134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 143 185 225 0 6 9 
-+69 71 68 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 71 73 70 0 2 0 
-+0 2 0 0 2 0 40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 139 181 221 170 212 252 
-+129 165 199 0 2 0 162 164 161 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 169 171 168 
-+0 2 0 119 156 189 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 75 94 116 
-+0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 69 71 68 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 134 170 204 170 212 252 
-+134 170 204 0 2 0 152 154 151 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 183 185 181 
-+0 2 0 113 145 172 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 
-+44 54 65 0 2 0 162 164 161 254 255 252 254 255 252 254 255 252 35 37 34 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 126 162 196 170 212 252 
-+138 174 208 0 2 0 143 145 142 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 198 200 197 
-+0 2 0 103 134 161 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+157 198 239 28 35 41 0 2 0 188 190 187 254 255 252 252 254 250 3 6 2 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 115 152 185 170 212 252 
-+143 179 213 0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 210 212 209 
-+0 2 0 91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 146 188 228 0 6 9 26 27 25 242 244 240 176 178 175 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 137 164 170 212 252 
-+143 185 225 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 185 187 183 
-+0 2 0 105 137 164 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 163 205 246 0 2 0 0 2 0 102 104 101 60 62 59 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 80 98 121 170 212 252 
-+149 191 231 0 2 0 118 120 117 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 143 145 142 
-+0 2 0 134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 143 179 213 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 44 54 65 170 212 252 
-+170 212 252 3 10 13 85 87 84 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 108 110 107 
-+0 2 0 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 115 152 185 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 3 10 13 170 212 252 
-+170 212 252 34 44 55 43 44 42 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 69 71 68 
-+15 20 22 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 75 94 116 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 139 181 221 
-+170 212 252 63 78 94 3 6 2 249 251 248 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 31 32 30 
-+41 51 62 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+161 203 243 6 12 15 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 137 164 
-+170 212 252 88 115 136 0 2 0 210 212 209 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 249 251 248 0 2 0 
-+68 83 99 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+96 127 154 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 61 76 92 
-+170 212 252 119 150 178 0 2 0 169 171 168 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 183 185 181 0 2 0 
-+91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+28 35 41 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 
-+146 188 228 143 185 225 0 2 0 126 127 125 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 85 87 84 0 6 9 
-+154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 98 129 156 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+72 90 112 170 212 252 18 22 24 56 58 55 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 238 241 237 7 10 5 55 66 77 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 122 159 192 0 6 9 
-+0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 122 159 192 72 87 103 0 2 0 229 231 228 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 152 154 151 0 2 0 113 145 172 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 139 181 221 8 14 16 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 18 22 24 109 141 168 0 2 0 148 150 147 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 56 58 55 12 17 20 166 207 248 
-+170 212 252 170 212 252 170 212 252 170 212 252 146 188 228 23 30 36 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 101 72 28 202 145 58 
-+180 132 57 0 2 0 38 45 51 3 10 13 69 71 68 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 200 202 199 0 2 0 75 89 106 170 212 252 
-+170 212 252 170 212 252 170 212 252 109 141 168 8 14 16 0 2 0 21 13 4 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 7 0 0 0 2 0 101 72 28 218 158 64 250 179 73 250 179 73 
-+250 179 73 139 99 44 0 2 0 8 14 16 0 2 0 238 241 237 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 244 246 243 38 40 37 3 10 13 139 181 221 170 212 252 
-+170 212 252 161 203 243 66 80 97 0 2 0 31 23 12 191 142 60 248 183 74 180 132 57 
-+44 34 15 0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 23 15 7 190 136 56 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 150 108 46 0 2 0 0 2 0 82 83 81 222 224 221 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 102 104 101 0 2 0 98 129 156 170 212 252 163 205 246 
-+98 129 156 23 30 36 0 2 0 82 62 28 234 172 70 248 183 74 248 183 74 248 183 74 
-+248 183 74 158 114 46 29 21 8 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 64 46 18 109 79 35 150 108 46 224 163 69 250 179 73 
-+250 179 73 250 179 73 250 179 73 158 114 46 0 2 0 0 2 0 3 6 2 115 117 114 
-+234 236 233 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 176 178 175 0 2 0 57 72 88 146 188 228 80 98 121 8 14 16 
-+0 2 0 24 17 10 158 114 46 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 242 178 77 58 42 19 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 0 2 0 67 49 21 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 228 167 73 95 68 30 0 2 0 0 2 0 
-+0 2 0 52 54 51 108 110 107 162 164 161 219 221 218 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 252 254 250 
-+219 221 218 178 180 177 18 20 17 6 12 15 26 33 39 0 2 0 0 2 0 52 36 13 
-+164 119 51 242 178 77 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 242 178 77 
-+187 138 56 175 129 54 158 114 46 82 62 28 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 78 58 25 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 234 172 70 142 101 40 
-+44 34 15 10 12 8 0 2 0 0 2 0 0 2 0 18 20 17 60 62 59 71 73 70 
-+82 83 81 95 96 94 104 106 103 118 120 117 115 117 114 78 80 77 40 41 39 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 44 34 15 105 75 32 191 142 60 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 105 75 32 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 187 138 56 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 142 101 40 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 206 148 61 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 161 117 49 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 228 167 73 250 179 73 
-+238 175 73 190 136 56 158 114 46 234 172 70 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 147 105 44 0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 67 49 21 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 
-+31 23 12 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 10 5 21 13 4 
-+0 2 0 0 2 0 0 2 0 147 105 44 250 179 73 250 179 73 250 179 73 250 179 73 
-+134 100 43 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 155 111 43 248 183 74 248 183 74 
-+248 183 74 248 183 74 224 163 69 55 39 17 64 46 18 164 119 51 242 178 77 248 183 74 
-+75 55 22 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 202 145 58 250 179 73 250 179 73 228 167 73 88 66 26 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 168 123 54 248 183 74 
-+248 183 74 248 183 74 158 114 46 0 2 0 7 0 0 0 2 0 10 12 8 44 34 15 
-+15 9 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 29 21 8 250 179 73 250 179 73 158 114 46 15 14 3 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 175 129 54 
-+248 183 74 248 183 74 114 83 33 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 29 21 8 147 105 44 58 42 19 0 2 0 7 0 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+105 75 32 218 158 64 23 15 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-diff --git a/drivers/video/logo/logo_linux_mono.pbm b/drivers/video/logo/logo_linux_mono.pbm
-index 2f14d9f..3d3c358 100644
---- a/drivers/video/logo/logo_linux_mono.pbm
-+++ b/drivers/video/logo/logo_linux_mono.pbm
-@@ -1,203 +1,159 @@
--P1
--# Standard black and white Linux logo
--80 80
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 0 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1
--1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 0 0 1 1 1 1 1 1 0 0 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 0 0 0 1 1 1 1 0 0 0 0 0 0 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 1 1 0 0 1 1 1 0 0 1 1 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 1 1 1 0 1 1 1 1 0 0 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 0 1 1 1 0 1 1 1 1 0 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 1 1 0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 0 0 1 0 0 0 0 0 1 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 0 0 0 0 0 0 0 0 0 1 1 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 0 0 0 0 0 1 1 0 0 0 0 1 1
--1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 0 0 0 0 1 1 0 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 1 0 0 0 0 0 0 0 0 1 1 0 0 0 1
--1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1
--0 0 1 0 0 0 0 0 1 1 0 0 0 0 0 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0
--1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 0 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1
--0 0 0 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 0 1 1 1 1 1 1 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 0
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1
--1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 0 1 1 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 0 0 0 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 1 0 0 0 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 1 1 1 1 1 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 1 1 1 1 1 1 1 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 1 1 1 1 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
--1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1
--1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1
--1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--1 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0
--1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
--1 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 0 0 0 0 0 0 0 0 0 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-+P2
-+80  78
-+255 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 255 255 255 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 255 255 255 255 255 0 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 
-+255 0 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 
-+255 255 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 
-+255 255 0 0 0 0 0 0 0 0 
-+0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 
-+255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 255 255 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 0 255 255 0 0 255 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 255 255 255 0 0 255 
-+255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 0 255 255 255 0 255 
-+255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 0 255 255 255 0 0 
-+255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 
-+0 255 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 
-+0 255 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 
-+0 0 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 255 255 0 0 255 255 0 0 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 255 255 255 
-+255 0 0 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 255 0 0 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 
-+255 0 0 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 0 0 255 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 255 255 255 
-+255 255 0 0 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 255 255 255 255 0 255 255 255 
-+255 255 255 0 0 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 0 255 255 255 
-+255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 0 0 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 255 0 
-+0 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 255 255 
-+0 0 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 0 0 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-diff --git a/drivers/video/logo/logo_linux_vga16.ppm b/drivers/video/logo/logo_linux_vga16.ppm
-index 1850c15..f279f97 100644
---- a/drivers/video/logo/logo_linux_vga16.ppm
-+++ b/drivers/video/logo/logo_linux_vga16.ppm
-@@ -1,1604 +1,18724 @@
- P3
--# Standard 16-color Linux logo
--80 80
--255
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 170 170 170  85  85  85   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170 170 170 170 170 170
--170 170 170   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170 170 170 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170 170 170 170 255 255 255 255 255 255
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 255 255 255 170 170 170 170 170 170
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170   0   0   0   0   0   0 255 255 255
-- 85  85  85   0   0   0   0   0   0   0   0   0
--255 255 255 170 170 170   0   0   0  85  85  85
--170 170 170 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0 170 170 170
-- 85  85  85   0   0   0   0   0   0   0   0   0
--255 255 255  85  85  85   0   0   0   0   0   0
-- 85  85  85 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170   0   0   0   0   0   0 170 170 170
-- 85  85  85  85  85  85  85  85  85  85  85  85
--255 255 255  85  85  85   0   0   0   0   0   0
-- 85  85  85 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
-- 85  85  85 255 255 255   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--170 170 170 170 170 170 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170 170 170 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0 170  85   0  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
-- 85  85  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0  85  85  85   0   0   0
--  0   0   0  85  85  85 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
-- 85  85  85 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170 170 170 170 170 170 170 170 170   0   0   0
--  0   0   0   0   0   0 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170 170 170 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 170 170 170
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0 170 170 170
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0  85  85  85 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 170 170 170
--170 170 170 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 170 170 170 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170 170 170
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0 170 170 170
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0  85  85  85
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--  0   0   0  85  85  85 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0  85  85  85
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--  0   0   0 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0  85  85  85   0   0   0   0   0   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170  85  85  85 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85  85  85  85  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 170 170 170
-- 85  85  85   0   0   0   0   0   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170  85  85  85
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 170  85   0 170  85   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85  85  85  85  85  85  85 170  85   0
--170  85   0 170  85   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-+# CREATOR: GIMP PNM Filter Version 1.1
-+80 78
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
diff --git a/libre/linux-libre/change-default-console-loglevel.patch b/libre/linux-libre/change-default-console-loglevel.patch
deleted file mode 100644
index 22cd69a09..000000000
--- a/libre/linux-libre/change-default-console-loglevel.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
---- linux-3.0.orig/kernel/printk/printk.c	2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0/kernel/printk/printk.c	2011-07-27 14:43:07.000000000 +0300
-@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea
- 
- /* We show everything that is MORE important than this.. */
- #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
--#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
-+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */
- 
- DECLARE_WAIT_QUEUE_HEAD(log_wait);
- 
diff --git a/libre/linux-libre/criu-no-expert.patch b/libre/linux-libre/criu-no-expert.patch
deleted file mode 100644
index 2124427e9..000000000
--- a/libre/linux-libre/criu-no-expert.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/init/Kconfig b/init/Kconfig
-index be8b7f5..7461760 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP
- endif # CGROUPS
- 
- config CHECKPOINT_RESTORE
--	bool "Checkpoint/restore support" if EXPERT
-+	bool "Checkpoint/restore support"
- 	default n
- 	help
- 	  Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1000,7 +1000,7 @@ config CHECKPOINT_RESTORE
- 	  If unsure, say N here.
- 
- menuconfig NAMESPACES
--	bool "Namespaces support" if EXPERT
-+	bool "Namespaces support"
- 	default !EXPERT
- 	help
- 	  Provides the way to make tasks work with different objects using
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index aaeebc1c1..277f31c7c 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202421 2013-12-21 18:29:42Z tpowa $
+# $Id: PKGBUILD 204436 2014-01-19 20:29:01Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
@@ -6,7 +6,7 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-libre-utils')
 pkgver=0.9.0
-pkgrel=67
+pkgrel=69
 epoch=1
 _extramodules=extramodules-3.12-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/lirc-libre/irexec.service b/libre/lirc-libre/irexec.service
deleted file mode 100644
index 5d7915b29..000000000
--- a/libre/lirc-libre/irexec.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=IR Exec
-After=lirc.service
-Wants=lirc.service
-
-[Service]
-ExecStart=/usr/bin/irexec --daemon
-Type=forking
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/lirc-libre/kernel-2.6.39.patch b/libre/lirc-libre/kernel-2.6.39.patch
deleted file mode 100644
index 7353d61ca..000000000
--- a/libre/lirc-libre/kernel-2.6.39.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c
---- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c	2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c	2011-06-07 17:02:20.356580306 +0200
-@@ -48,7 +48,6 @@
- #include <linux/slab.h>
- #include <linux/module.h>
- #include <linux/kmod.h>
--#include <linux/smp_lock.h>
- #include <linux/completion.h>
- #include <linux/uaccess.h>
- #include <linux/usb.h>
-diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c
---- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c	2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c	2011-06-07 17:04:19.725933627 +0200
-@@ -555,8 +555,8 @@
- 		kfree(ir);
- 		return -EINVAL;
- 	}
--	printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
--	       adap->id, addr, ir->c.name);
-+	printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
-+	       addr, ir->c.name);
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
- 	/* register device */
-diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c
---- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c	2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c	2011-06-07 17:07:23.984935411 +0200
-@@ -361,14 +361,14 @@
- 		size = count << 3;
- 
- 		ldata = (unsigned long *) data_buf;
--		next_one = generic_find_next_le_bit(ldata, size, 0);
-+		next_one = find_next_zero_bit_le(ldata, size, 0);
- 
- 		if (next_one > 0)
- 			put_pulse_bit(next_one
- 				* WPC8769L_USECS_PER_BIT);
- 
- 		while (next_one < size) {
--			next_zero = generic_find_next_zero_le_bit(ldata,
-+			next_zero = find_next_zero_bit_le(ldata,
- 				size, next_one + 1);
- 
- 			put_space_bit(
-@@ -376,7 +376,7 @@
- 				* WPC8769L_USECS_PER_BIT);
- 
- 			if (next_zero < size) {
--				next_one = generic_find_next_le_bit(ldata,
-+				next_one = find_next_bit_le(ldata,
- 					size, next_zero + 1);
- 
- 				put_pulse_bit(
diff --git a/libre/lirc-libre/linux-3.8.patch b/libre/lirc-libre/linux-3.8.patch
deleted file mode 100644
index 7b6378a83..000000000
--- a/libre/lirc-libre/linux-3.8.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -upr lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c lirc-0.9.0/drivers/lirc_serial/lirc_serial.c
---- lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c	2013-02-21 02:36:25.000000000 +0200
-+++ lirc-0.9.0/drivers/lirc_serial/lirc_serial.c	2013-02-21 02:39:55.000000000 +0200
-@@ -1103,12 +1103,12 @@ static struct lirc_driver driver = {
- 
- static struct platform_device *lirc_serial_dev;
- 
--static int __devinit lirc_serial_probe(struct platform_device *dev)
-+static int lirc_serial_probe(struct platform_device *dev)
- {
- 	return 0;
- }
- 
--static int __devexit lirc_serial_remove(struct platform_device *dev)
-+static int lirc_serial_remove(struct platform_device *dev)
- {
- 	return 0;
- }
-@@ -1159,7 +1159,7 @@ static int lirc_serial_resume(struct pla
- 
- static struct platform_driver lirc_serial_driver = {
- 	.probe		= lirc_serial_probe,
--	.remove		= __devexit_p(lirc_serial_remove),
-+	.remove		= lirc_serial_remove,
- 	.suspend	= lirc_serial_suspend,
- 	.resume		= lirc_serial_resume,
- 	.driver		= {
-diff -upr lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c lirc-0.9.0/drivers/lirc_sir/lirc_sir.c
---- lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c	2013-02-21 02:36:25.000000000 +0200
-+++ lirc-0.9.0/drivers/lirc_sir/lirc_sir.c	2013-02-21 02:38:24.000000000 +0200
-@@ -1290,19 +1290,19 @@ static int init_lirc_sir(void)
- 	return 0;
- }
- 
--static int __devinit lirc_sir_probe(struct platform_device *dev)
-+static int lirc_sir_probe(struct platform_device *dev)
- {
- 	return 0;
- }
- 
--static int __devexit lirc_sir_remove(struct platform_device *dev)
-+static int lirc_sir_remove(struct platform_device *dev)
- {
- 	return 0;
- }
- 
- static struct platform_driver lirc_sir_driver = {
- 	.probe		= lirc_sir_probe,
--	.remove		= __devexit_p(lirc_sir_remove),
-+	.remove		= lirc_sir_remove,
- 	.driver		=	{
- 		.name	= "lirc_sir",
- 		.owner	= THIS_MODULE,
-diff -upr lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c
---- lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c	2013-02-21 02:36:25.000000000 +0200
-+++ lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c	2013-02-21 02:39:39.000000000 +0200
-@@ -930,12 +930,12 @@ static int wpc8769l_acpi_detect(void)
- #ifdef MODULE
- static struct platform_device *lirc_wpc8769l_platform_dev;
- 
--static int __devinit lirc_wpc8769l_probe(struct platform_device *dev)
-+static int lirc_wpc8769l_probe(struct platform_device *dev)
- {
- 	return 0;
- }
- 
--static int __devexit lirc_wpc8769l_remove(struct platform_device *dev)
-+static int lirc_wpc8769l_remove(struct platform_device *dev)
- {
- 	return 0;
- }
-@@ -963,7 +963,7 @@ static int lirc_wpc8769l_resume(struct p
- 
- static struct platform_driver lirc_wpc8769l_platform_driver = {
- 	.probe		= lirc_wpc8769l_probe,
--	.remove		= __devexit_p(lirc_wpc8769l_remove),
-+	.remove		= lirc_wpc8769l_remove,
- 	.suspend	= lirc_wpc8769l_suspend,
- 	.resume		= lirc_wpc8769l_resume,
- 	.driver		= {
diff --git a/libre/lirc-libre/lirc-utils.install b/libre/lirc-libre/lirc-utils.install
deleted file mode 100644
index 293d1ed7c..000000000
--- a/libre/lirc-libre/lirc-utils.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-	systemd-tmpfiles --create lirc.conf
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
deleted file mode 100644
index 50e7566f9..000000000
--- a/libre/lirc-libre/lirc.install
+++ /dev/null
@@ -1,16 +0,0 @@
-EXTRAMODULES=extramodules-3.12-LIBRE
-
-post_install() {
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
-}
-
-post_upgrade() {
-  post_install
-}
-
-# arg 1:  the old package version
-post_remove() {
-  post_install
-}
diff --git a/libre/lirc-libre/lirc.logrotate b/libre/lirc-libre/lirc.logrotate
deleted file mode 100644
index 623c4f328..000000000
--- a/libre/lirc-libre/lirc.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/lircd {
-   missingok
-   notifempty
-   delaycompress
-}
diff --git a/libre/lirc-libre/lirc.service b/libre/lirc-libre/lirc.service
deleted file mode 100644
index a797d1661..000000000
--- a/libre/lirc-libre/lirc.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Linux Infrared Remote Control
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/lirc/lircd.pid
-ExecStart=/usr/sbin/lircd --driver=default --device=/dev/lirc0 
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/libre/lirc-libre/lirc.tmpfiles b/libre/lirc-libre/lirc.tmpfiles
deleted file mode 100644
index 0b80e2e47..000000000
--- a/libre/lirc-libre/lirc.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/lirc 0755 root root -
diff --git a/libre/lirc-libre/lirc_atiusb-kfifo.patch b/libre/lirc-libre/lirc_atiusb-kfifo.patch
deleted file mode 100644
index a64984dce..000000000
--- a/libre/lirc-libre/lirc_atiusb-kfifo.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001
-From: Jason Martin <publicmsu@gmail.com>
-Date: Fri, 3 Jun 2011 00:12:51 -0400
-Subject: [PATCH] lirc_atiusb: fix buffer alloc to work with new kfifo
-
-I came across posts with regards to lirc_atiusb and its compatibility
-with newer kernels, and their use of kfifo.I spent a little bit of time
-this evening, and was able to correct the issues with the driver, and
-now have a functioning lirc_atiusb device under the 2.6.38 kernel.
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_atiusb/lirc_atiusb.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c
-index 52080de..bf2b631 100644
---- a/drivers/lirc_atiusb/lirc_atiusb.c
-+++ b/drivers/lirc_atiusb/lirc_atiusb.c
-@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf)
- 		goto new_irctl_failure_check;
- 	}
- 
--	if (lirc_buffer_init(driver->rbuf, dclen, 1)) {
-+	if (lirc_buffer_init(driver->rbuf, dclen, 2)) {
- 		mem_failure = 4;
- 		goto new_irctl_failure_check;
- 	}
--- 
-1.7.0.1
-
diff --git a/libre/lirc-libre/lirc_wpc8769l.patch b/libre/lirc-libre/lirc_wpc8769l.patch
deleted file mode 100644
index e4e2a049b..000000000
--- a/libre/lirc-libre/lirc_wpc8769l.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?= <skandalfo@gmail.com>
-Date: Wed, 30 Mar 2011 16:46:35 -0400
-Subject: [PATCH] Make lirc_wpc8769l functional again
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_wpc8769l/lirc_wpc8769l.c |   28 +++++++++++++++++-----------
- 1 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-index f820d11..4d04063 100644
---- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-+++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-@@ -816,10 +816,6 @@ static int set_use_inc(void *data)
- 	/* Reset last timeout value. */
- 	lastus = 0;
- 
--	/* Init the read buffer. */
--	if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0)
--		return -ENOMEM;
--
- 	/* Acquire the IRQ. */
- 	result = request_irq(irq, irq_handler,
- 			   IRQF_DISABLED | IRQF_SHARED,
-@@ -863,9 +859,6 @@ static void set_use_dec(void *data)
- 	/* Free the IRQ. */
- 	free_irq(irq, THIS_MODULE);
- 	dprintk("Freed IRQ %d\n", irq);
--
--	/* Free the RX buffer. */
--	lirc_buffer_free(&rbuf);
- }
- 
- static struct lirc_driver driver = {
-@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void)
- 	/* Do load-time checks. */
- 	wpc8769l_power_up_and_check_if_we_woke_us_up();
- 
-+	/* Init the read buffer. */
-+	if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) {
-+		rc = -ENOMEM;
-+		goto exit_platform_exit;
-+	}
-+
- 	/* Configure the driver hooks. */
- 	driver.features = LIRC_CAN_REC_MODE2;
-+	driver.dev = &lirc_wpc8769l_platform_dev->dev;
- 	driver.minor = lirc_register_driver(&driver);
- 	if (driver.minor < 0) {
- 		eprintk("lirc_register_driver failed!\n");
- 		rc = -EIO;
--		goto exit_platform_exit;
-+		goto exit_release_buffer;
- 	}
- 
- 	iprintk("Driver loaded.\n");
- 
- 	return 0; /* Everything OK. */
- 
-+exit_release_buffer:
-+	lirc_buffer_free(&rbuf);
-+
- exit_platform_exit:
- 	lirc_wpc8769l_platform_exit();
- 
-@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init);
- 
- static void __exit lirc_wpc8769l_module_exit(void)
- {
--	/* Unregister the platform driver and device. */
--	lirc_wpc8769l_platform_exit();
--
- 	/* Unregister the LIRC driver. */
- 	lirc_unregister_driver(driver.minor);
- 
-+	/* Free the buffer. */
-+	lirc_buffer_free(&rbuf);
-+
-+	/* Unregister the platform driver and device. */
-+	lirc_wpc8769l_platform_exit();
-+
- 	/* Release the second range. */
- 	if (baseport2)
- 		release_region(baseport2, WPC8769L_IO_REGION_2_SIZE);
--- 
-1.7.0.1
-
diff --git a/libre/lirc-libre/lircd-handle-large-config.patch b/libre/lirc-libre/lircd-handle-large-config.patch
deleted file mode 100644
index 85bc20518..000000000
--- a/libre/lirc-libre/lircd-handle-large-config.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod@redhat.com>
-Date: Wed, 6 Apr 2011 11:04:12 -0400
-Subject: [PATCH] lircd: handle larger config files in write_socket better
-
-Pointed out by Michael Zanetti on list, irsend LIST has issues with long
-config files, which didn't exist in maintainer mode, as we were using a
-do while loop to make sure we spit out everything. Just use that loop
-all the time.
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- daemons/lircd.c |    8 ++------
- 1 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/daemons/lircd.c b/daemons/lircd.c
-index 6c21a3a..ddcca05 100644
---- a/daemons/lircd.c
-+++ b/daemons/lircd.c
-@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len)
- 	int done, todo = len;
- 
- 	while (todo) {
--#ifdef SIM_REC
- 		do {
- 			done = write(fd, buf, todo);
--		}
--		while (done < 0 && errno == EAGAIN);
--#else
--		done = write(fd, buf, todo);
--#endif
-+		} while (done < 0 && errno == EAGAIN);
-+
- 		if (done <= 0)
- 			return (done);
- 		buf += done;
--- 
-1.7.0.1
-
diff --git a/libre/lirc-libre/lircm.service b/libre/lirc-libre/lircm.service
deleted file mode 100644
index c0b5e36b7..000000000
--- a/libre/lirc-libre/lircm.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=LIRC Mouse
-Requires=lirc.service
-After=network.target lirc.service
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/lircmd 
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/libre/lsb-release/PKGBUILD b/libre/lsb-release/PKGBUILD
deleted file mode 100644
index 6f761a81f..000000000
--- a/libre/lsb-release/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 101477 2013-11-26 10:23:04Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# 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@parabola.nu>
-
-pkgname=lsb-release
-pkgver=1.4
-pkgrel=14
-pkgdesc="LSB version query program (Parabola rebranded)"
-arch=('any')
-url="http://www.linuxbase.org/"
-license=('GPL2')
-depends=('bash')
-provides=('lsb-release-libre')
-conflicts=('lsb-release-libre')
-replaces=('lsb-release-libre')
-install=lsb-release.install
-source=(http://downloads.sourceforge.net/lsb/$pkgname-$pkgver.tar.gz
-        lsb_release_description.patch)
-md5sums=('30537ef5a01e0ca94b7b8eb6a36bb1e4'
-         '72f562d8eaa8915ab85fba13e68c8d68')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -Np0 < "$srcdir/lsb_release_description.patch"
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  install -dm755 "$pkgdir/etc"
-  echo "LSB_VERSION=$pkgver" >> "$pkgdir/etc/lsb-release"
-  echo "DISTRIB_ID=Parabola" > "$pkgdir/etc/lsb-release"
-  echo "DISTRIB_RELEASE=rolling" >> "$pkgdir/etc/lsb-release"
-  echo "DISTRIB_DESCRIPTION=\"Parabola GNU/Linux-libre\"" >> "$pkgdir/etc/lsb-release"
-
-  install -Dm 644 lsb_release.1.gz "$pkgdir/usr/share/man/man1/lsb_release.1.gz"
-  install -Dm 755 lsb_release "$pkgdir/usr/bin/lsb_release"
-}
diff --git a/libre/lsb-release/lsb-release.install b/libre/lsb-release/lsb-release.install
deleted file mode 100644
index 62d404892..000000000
--- a/libre/lsb-release/lsb-release.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  rm -f /etc/arch-release
-  echo "Parabola GNU/Linux-libre release" >> /etc/parabola-release
-}
-
-post_upgrade() {
-  rm -f /etc/arch-release
-  sed -e '/Parabola GNU\/Linux-[Ll]ibre release/d' -i /etc/parabola-release
-  echo "Parabola GNU/Linux-libre release" >> /etc/parabola-release
-}
-
-pre_remove() {
-  sed -e '/Parabola GNU\/Linux-[Ll]ibre release/d' -i /etc/parabola-release
-}
diff --git a/libre/lsb-release/lsb_release_description.patch b/libre/lsb-release/lsb_release_description.patch
deleted file mode 100644
index d46835b97..000000000
--- a/libre/lsb-release/lsb_release_description.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lsb_release.orig	2012-11-13 05:12:02.000000000 -0800
-+++ lsb_release	2013-11-24 17:13:55.943608718 -0800
-@@ -216,7 +216,7 @@
-             TMP_DISTRIB_DESC=$DISTRIB_DESCRIPTION
-         fi
- 
--        if [ -z "$TMP_DISTRIB_DESC" ]  # head or lsb-release init
-+        if [ -z "$DISTRIB_DESCRIPTION" ]  # head or lsb-release init
-         then                           # file contains no data
-             DISTRIB_DESCRIPTION=$MSG_NONE
-             NO="y"
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
deleted file mode 100644
index 86f9c296c..000000000
--- a/libre/luxrender-libre/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: flixie <69one@gmx.net>
-# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-_pkgname=luxrender
-pkgname=$_pkgname-libre
-pkgver=1.3.1
-_pkgver=d0b0e20c47cc
-pkgrel=3
-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' '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' \
-             'clang')
-provides=($_pkgname=$pkgver)
-conflicts=$_pkgname
-replaces=$_pkgname
-source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2 \
-        force_python3.diff)
-md5sums=('cbe749f56a1e1976745f5458100efa8a'
-         '42692e65eabc5828693e2682e94b7c64')
-
-prepare() {
-  cd "$srcdir"/$_pkgname-lux-$_pkgver
-
-  patch -Np1 < "$srcdir/force_python3.diff" || true
-}
-
-build() {
-  cd "$srcdir"/$_pkgname-lux-$_pkgver
-
-  export CC=clang
-  export CXX=clang++
-  export CXXFLAGS="$CXXFLAGS -lpthread"
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLUXRAYS_DISABLE_OPENCL=OFF \
-    -DPYTHON_CUSTOM=ON \
-    -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \
-    -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m
-  make
-}
-
-package() {
-  cd "$srcdir"/$_pkgname-lux-$_pkgver
-  make DESTDIR="$pkgdir" install
-
-  # fix library path on 64bit
-  [[ $CARCH == x86_64 ]] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
-
-  #install pylux
-  install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/luxrender-libre/force_python3.diff b/libre/luxrender-libre/force_python3.diff
deleted file mode 100644
index 1ee61e872..000000000
--- a/libre/luxrender-libre/force_python3.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rup luxrender-lux-d0b0e20c47cc/cmake/Dependencies.cmake luxrender-lux-d0b0e20c47cc.new/cmake/Dependencies.cmake
---- luxrender-lux-d0b0e20c47cc/cmake/Dependencies.cmake	2013-11-04 22:25:45.000000000 +0100
-+++ luxrender-lux-d0b0e20c47cc.new/cmake/Dependencies.cmake	2013-12-05 19:43:23.414625854 +0100
-@@ -156,7 +156,7 @@ IF(MSVC AND BOOST_python_LIBRARYDIR)
- 	SET(BOOST_LIBRARYDIR "${BOOST_python_LIBRARYDIR}")
- ENDIF(MSVC AND BOOST_python_LIBRARYDIR)
- 
--FIND_PACKAGE(Boost ${Boost_MINIMUM_VERSION} COMPONENTS python REQUIRED)
-+FIND_PACKAGE(Boost ${Boost_MINIMUM_VERSION} COMPONENTS python3 REQUIRED)
- 
- IF(MSVC AND BOOST_python_LIBRARYDIR)
- 	SET(BOOST_LIBRARYDIR "${_boost_libdir}")
diff --git a/libre/makepkg-git/PKGBUILD b/libre/makepkg-git/PKGBUILD
deleted file mode 100644
index 60453a927..000000000
--- a/libre/makepkg-git/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 150148 2012-02-13 14:49:35Z dreisner $
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Arch): Dan McGee <dan@archlinux.org>
-# Maintainer (Arch): Dave Reisner <dave@archlinux.org>
-
-_pkgname=pacman
-pkgname=makepkg-git
-_relver=4.0.3
-_gitver=2abe1f16461133c0dc386f8ecb8b06865c22940b
-pkgver=${_relver}.git
-
-provides=($_pkgname=$pkgver)
-replaces=(pacman-makepkg-git)
-conflicts=(pacman-makepkg-git)
-
-pkgrel=2
-
-pkgdesc="Pacman's makepkg, built from git sources"
-#arch=('i686' 'x86_64' 'mips64el')
-arch=('any')
-url="http://www.archlinux.org/pacman/"
-license=('GPL')
-#groups=('base')
-depends=('bash' 'libarchive>=3.0.2' 'curl>=7.19.4' 'gpgme')
-makedepends=('asciidoc')
-optdepends=('fakeroot: for makepkg usage as normal user')
-#backup=(etc/pacman.conf etc/makepkg.conf)
-#install=pacman.install
-options=(!libtool)
-source=(https://projects.archlinux.org/pacman.git/snapshot/$_pkgname-$_gitver.tar)
-md5sums=('2152bdff59dcab8e7d36103a4756e5bf')
-
-build() {
-  cd $srcdir/$_pkgname-$_gitver
-
-  ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var
-  make
-}
-
-check() {
-  make -C "$_pkgname-$_gitver" check
-}
-
-package() {
-  install -Dm755 $srcdir/$_pkgname-$_gitver/scripts/makepkg $pkgdir/usr/bin/makepkg-git
-}
diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD
deleted file mode 100644
index a0acf9b81..000000000
--- a/libre/mc-libre/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 101948 2013-12-02 21:12:10Z schuay $
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: schuay <jakob.gruber@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
-
-_pkgname=mc
-pkgname=mc-libre
-pkgver=4.8.11
-pkgrel=1
-pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with arj recommendation included and nonfree unace and unrar recommendation removed"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.ibiblio.org/mc/"
-license=('GPL')
-depends=(
-    'e2fsprogs'
-    'glib2'
-    'gpm'
-    'libssh2'
-    'slang')
-makedepends=('libxt' 'libx11')
-optdepends=(
-    'cabextract: ucab extfs'
-    'cdparanoia: audio extfs'
-    'cdrkit: iso9660 extfs'
-    'gawk: hp48+ extfs'
-    'aspell: spelling corrections'
-    'cvs: CVS support'
-    'mtools: a+ extfs'
-    'perl: needed by several extfs scripts'
-    'python2-boto: s3+ extfs'
-    'python2-pytz: s3+ extfs'
-    'smb: VFS support'
-    'arj: uarj extfs'
-    'zip: uzip extfs'
-    'p7zip: support for 7zip archives')
-conflicts=('mc')
-replaces=('mc')
-provides=("mc=${pkgver}")
-options=('!emptydirs' '!makeflags')
-backup=('etc/mc/edit.indent.rc'
-        'etc/mc/filehighlight.ini'
-        'etc/mc/mcedit.menu'
-        'etc/mc/mc.ext'
-        'etc/mc/mc.keymap'
-        'etc/mc/mc.menu'
-        'etc/mc/sfs.ini')
-source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2")
-
-build() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-
-    ./configure --prefix=/usr --sysconfdir=/etc --enable-vfs-smb \
-        --with-x --libexecdir=/usr/lib
-
-    make
-}
-
-package() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-
-    make DESTDIR="${pkgdir}" install
-
-    # Fix FS#15177
-    sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
-        -i "${pkgdir}/usr/lib/mc/extfs.d/uzip"
-
-    sed 's#/usr/bin/env python#/usr/bin/python2#' \
-        -i "${pkgdir}/usr/lib/mc/extfs.d/s3+"
-}
-
-md5sums=('7262788c0e799393cd37318b43a14adc')
diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD
deleted file mode 100644
index 78104354f..000000000
--- a/libre/mcomix-libre/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $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@parabola.nu>
-
-_pkgname=mcomix
-pkgname=mcomix-libre
-pkgver=1.00
-pkgrel=5.1
-pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, without nonfree unrar recommendation"
-arch=('any')
-url="http://sourceforge.net/projects/mcomix/"
-license=('GPL')
-depends=('pygtk' 'python2-pillow' 'xdg-utils' 'python2' \
-         'desktop-file-utils' 'hicolor-icon-theme' 'python2-setuptools')
-makedepends=('gettext' 'intltool')
-conflicts=('mcomix' 'comix')
-replaces=('mcomix' 'comix')
-provides=("mcomix=${pkgver}")
-install='mcomix.install'
-source=("http://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2")
-
-build() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-
-  # https://www.archlinux.org/todo/replace-pil-with-pillow/
-  sed -i 's/import Image/from PIL import Image/' mime/comicthumb
-
-  # python2 fix
-  for file in $(grep -Rl "/usr/bin/env python" .);
-  do
-    sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
-  done
-}
-
-package() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-
-  export PYTHONPATH=${pkgdir}/usr/lib/python2.7/site-packages/
-  mkdir -p $PYTHONPATH
-
-  python2 setup.py install --prefix=/usr --optimize=1 \
-    --single-version-externally-managed --root=${pkgdir}
-
-  install -Dm755 mime/comicthumb ${pkgdir}/usr/bin/comicthumb
-  install -Dm644 mime/comicthumb.1.gz ${pkgdir}/usr/share/man/man1/comicthumb.1.gz
-  install -Dm644 mime/comicbook.schemas ${pkgdir}/usr/share/gconf/schemas/mcomix.schemas
-}
-
-md5sums=('3a916dd9da17043ab59ccd17e26eb932')
diff --git a/libre/mcomix-libre/mcomix.install b/libre/mcomix-libre/mcomix.install
deleted file mode 100644
index c33c1d5a1..000000000
--- a/libre/mcomix-libre/mcomix.install
+++ /dev/null
@@ -1,30 +0,0 @@
-pkgname=mcomix
-
-post_install() {
-  if [ -f usr/sbin/gconfpkg ]; then
-      usr/sbin/gconfpkg --install ${pkgname} &> /dev/null
-  fi
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  if [ -f usr/sbin/gconfpkg ]; then
-      usr/sbin/gconfpkg --uninstall ${pkgname} &> /dev/null
-  fi
-}
-
-post_remove() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
diff --git a/libre/mesa-demos-libre/LICENSE b/libre/mesa-demos-libre/LICENSE
deleted file mode 100644
index ae33d2709..000000000
--- a/libre/mesa-demos-libre/LICENSE
+++ /dev/null
@@ -1,82 +0,0 @@
-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/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos-libre/PKGBUILD
deleted file mode 100644
index 36f2927b7..000000000
--- a/libre/mesa-demos-libre/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $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@parabola.nu>
-
-pkgname='mesa-demos-libre'
-pkgver=8.1.0
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-pkgdesc="Mesa demos and tools, without nonfree demos"
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-depends=('libgl' 'glew')
-provides=("mesa-demos=$pkgver")
-replaces=('mesa-demos')
-conflicts=('mesa-demos')
-source=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2"
-        'LICENSE'
-        'mesa-demos-libre.patch')
-sha256sums=('9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828'
-            '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
-            '476f58fc62e9074936643b0d61165c5160a6d5aed082e60c10b39d219f56913f')
-
-build() {
-  cd "${srcdir}/mesa-demos-${pkgver}"
-
-  # Remove nonfree demos (pointblast and spriteblast)
-  rm -v src/demos/{pointblast,spriteblast}.c
-  patch -Np1 -i "${srcdir}/mesa-demos-libre.patch"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/mesa-demos-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-demos"
-  install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-demos/"
-}
diff --git a/libre/mesa-demos-libre/mesa-demos-libre.patch b/libre/mesa-demos-libre/mesa-demos-libre.patch
deleted file mode 100755
index d630f373c..000000000
--- a/libre/mesa-demos-libre/mesa-demos-libre.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.am mesa-demos-8.1.0/src/demos/Makefile.am
---- mesa-demos-8.1.0.orig/src/demos/Makefile.am	2012-12-15 05:17:06.000000000 -0200
-+++ mesa-demos-8.1.0/src/demos/Makefile.am	2013-02-26 17:22:04.845832793 -0200
-@@ -65,7 +65,6 @@
- 	multiarb \
- 	paltex \
- 	pixeltest \
--	pointblast \
- 	projtex \
- 	ray \
- 	readpix \
-@@ -74,7 +73,6 @@
- 	shadowtex \
- 	singlebuffer \
- 	spectex \
--	spriteblast \
- 	stex3d \
- 	teapot \
- 	terrain \
-diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos/Makefile.in
---- mesa-demos-8.1.0.orig/src/demos/Makefile.in	2013-02-24 09:12:04.000000000 -0200
-+++ mesa-demos-8.1.0/src/demos/Makefile.in	2013-02-26 17:48:36.711995049 -0200
-@@ -90,11 +90,11 @@
- @HAVE_GLUT_TRUE@	ipers$(EXEEXT) isosurf$(EXEEXT) \
- @HAVE_GLUT_TRUE@	lodbias$(EXEEXT) morph3d$(EXEEXT) \
- @HAVE_GLUT_TRUE@	multiarb$(EXEEXT) paltex$(EXEEXT) \
--@HAVE_GLUT_TRUE@	pixeltest$(EXEEXT) pointblast$(EXEEXT) \
-+@HAVE_GLUT_TRUE@	pixeltest$(EXEEXT) \
- @HAVE_GLUT_TRUE@	projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \
- @HAVE_GLUT_TRUE@	reflect$(EXEEXT) renormal$(EXEEXT) \
- @HAVE_GLUT_TRUE@	shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \
--@HAVE_GLUT_TRUE@	spectex$(EXEEXT) spriteblast$(EXEEXT) \
-+@HAVE_GLUT_TRUE@	spectex$(EXEEXT) \
- @HAVE_GLUT_TRUE@	stex3d$(EXEEXT) teapot$(EXEEXT) \
- @HAVE_GLUT_TRUE@	terrain$(EXEEXT) tessdemo$(EXEEXT) \
- @HAVE_GLUT_TRUE@	texcyl$(EXEEXT) texenv$(EXEEXT) \
-@@ -219,9 +219,6 @@
- pixeltest_SOURCES = pixeltest.c
- pixeltest_OBJECTS = pixeltest.$(OBJEXT)
- pixeltest_LDADD = $(LDADD)
--pointblast_SOURCES = pointblast.c
--pointblast_OBJECTS = pointblast.$(OBJEXT)
--pointblast_LDADD = $(LDADD)
- projtex_SOURCES = projtex.c
- projtex_OBJECTS = projtex.$(OBJEXT)
- projtex_DEPENDENCIES = ../util/libutil.la
-@@ -246,9 +243,6 @@
- spectex_SOURCES = spectex.c
- spectex_OBJECTS = spectex.$(OBJEXT)
- spectex_LDADD = $(LDADD)
--spriteblast_SOURCES = spriteblast.c
--spriteblast_OBJECTS = spriteblast.$(OBJEXT)
--spriteblast_LDADD = $(LDADD)
- stex3d_SOURCES = stex3d.c
- stex3d_OBJECTS = stex3d.$(OBJEXT)
- stex3d_LDADD = $(LDADD)
-@@ -325,8 +319,8 @@
- 	fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \
- 	gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \
- 	ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \
--	pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \
--	renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \
-+	pixeltest.c projtex.c ray.c readpix.c reflect.c \
-+	renormal.c shadowtex.c singlebuffer.c spectex.c \
- 	stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \
- 	textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \
- 	winpos.c
-@@ -336,8 +330,8 @@
- 	fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \
- 	gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \
- 	ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \
--	pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \
--	renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \
-+	pixeltest.c projtex.c ray.c readpix.c reflect.c \
-+	renormal.c shadowtex.c singlebuffer.c spectex.c \
- 	stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \
- 	textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \
- 	winpos.c
-@@ -722,9 +716,6 @@
- pixeltest$(EXEEXT): $(pixeltest_OBJECTS) $(pixeltest_DEPENDENCIES) $(EXTRA_pixeltest_DEPENDENCIES) 
- 	@rm -f pixeltest$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(pixeltest_OBJECTS) $(pixeltest_LDADD) $(LIBS)
--pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) $(EXTRA_pointblast_DEPENDENCIES) 
--	@rm -f pointblast$(EXEEXT)
--	$(AM_V_CCLD)$(LINK) $(pointblast_OBJECTS) $(pointblast_LDADD) $(LIBS)
- projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) $(EXTRA_projtex_DEPENDENCIES) 
- 	@rm -f projtex$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(projtex_OBJECTS) $(projtex_LDADD) $(LIBS)
-@@ -749,9 +740,6 @@
- spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) $(EXTRA_spectex_DEPENDENCIES) 
- 	@rm -f spectex$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS)
--spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) $(EXTRA_spriteblast_DEPENDENCIES) 
--	@rm -f spriteblast$(EXEEXT)
--	$(AM_V_CCLD)$(LINK) $(spriteblast_OBJECTS) $(spriteblast_LDADD) $(LIBS)
- stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) $(EXTRA_stex3d_DEPENDENCIES) 
- 	@rm -f stex3d$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(stex3d_OBJECTS) $(stex3d_LDADD) $(LIBS)
-@@ -828,7 +816,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiarb.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paltex.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixeltest.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointblast.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projtex.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ray.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpix.Po@am__quote@
-@@ -837,7 +824,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowtex.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlebuffer.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spectex.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spriteblast.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stex3d.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teapot.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD
deleted file mode 100644
index 232805e89..000000000
--- a/libre/mesa-libcl/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgbase=mesa
-_pkgname=libcl
-pkgname=$pkgbase-$_pkgname
-_pkgflag=libre
-pkgver=10.0.1
-pkgrel=1
-pkgdesc='Mesa 3-D OpenCL library'
-url=http://${pkgbase}3d.sourceforge.net
-license=(MIT Khronos LGPL)
-arch=(mips64el x86_64 i686)
-depends=(
-  libclc
-  $pkgbase
-)
-optdepends='opencl-headers: headers necessary for OpenCL development'
-makedepends=(
-  clang
-  dri2proto
-  glproto
-  imake
-  libxml2
-  python2
-)
-provides=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
-conflicts=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
-replaces=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
-source=ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2
-sha512sums=7abdc38cb5b8b09bd586e6045b1d67cb809951f467d67a95e866d49b972c0c56d6a5b8612c411580bf59759a7ce49992eaf4dcc1c16aa1d67513f16b869bdfc1
-
-build() {
-  cd $srcdir/${pkgbase^}-$pkgver
-  autoreconf -vfi
-  ./configure --prefix=/usr\
-    --enable-opencl\
-    --enable-gallium-llvm\
-    --enable-r600-llvm-compiler\
-    --with-clang-libdir=/usr/lib\
-    --with-llvm-shared-libs\
-    --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast
-  make V=0
-}
-
-package() {
-  cd $srcdir/${pkgbase^}-$pkgver
-  make -C src/gallium/targets/opencl DESTDIR=$pkgdir install
-  install -vdm755 $pkgdir/usr/share/licenses/$pkgname
-  install -vm644 docs/COPYING      $pkgdir/usr/share/licenses/$pkgname
-  install -vm644 docs/license.html $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/libre/midori-gtk3-libre/PKGBUILD b/libre/midori-gtk3-libre/PKGBUILD
deleted file mode 100644
index 66083d847..000000000
--- a/libre/midori-gtk3-libre/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 101601 2013-11-28 22:21:02Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: rabyte <rabyte.at.gmail.dot.com>
-# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
-# Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=midori-gtk3
-pkgname=midori-gtk3-libre
-pkgver=0.5.6
-pkgrel=2
-pkgdesc='Lightweight web browser (GTK3), without non-privacy search providers'
-arch=('x86_64' 'i686')
-url='http://www.midori-browser.org/'
-license=('LGPL2.1')
-install='midori.install'
-replaces=$_pkgname
-conflicts=('midori' "$_pkgname")
-provides=('midori' "$_pkgname=$pkgver")
-depends=('libzeitgeist' 'webkitgtk3' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr')
-makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 'python2-docutils' 'libsoup' 'vala' 'librsvg' 'cmake')
-optdepends=('gst-plugins-base: HTML5 OGG videos support'
-            'gst-plugins-good: HTML5 H264 and WebM videos support'
-            'gst-libav: HTML5 H264 videos support'
-            'aria2: download utility')
-options=('!emptydirs')
-source=("http://www.midori-browser.org/downloads/${_pkgname/-gtk3}_${pkgver}_all_.tar.bz2")
-sha256sums=('c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a')
-
-prepare() {
-  cd "${_pkgname/-gtk3}-$pkgver"
-
-  # remove non-privacy search providers
-  sed -i 's|Duck Duck Go|DuckDuckGo HTML|
-          s|duckduckgo[.]com|duckduckgo.com/html|
-          \|Yahoo|d
-          \|name=Yahoo|d
-          \|text=Yahoo Web Search|d
-          \|uri=http://search[.]yahoo[.]com/search?p=|d
-          \|token=y|d
-          \|Google|d
-          \|name=Google|d
-          \|text=Web Search|d
-          \|uri=http://www[.]google[.]com/search?q=%s|d
-          \|token=g|d
-          \|Localize text or URL|d
-          \|translate[.]google[.]com/?q=|d
-         ' config/search
-}
-
-build() {
-  cd "${_pkgname/-gtk3}-$pkgver"
-
-  mkdir -p build
-  cd build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DUSE_GTK3=1
-  make
-}
-
-package() {
-  make -C "${_pkgname/-gtk3}-$pkgver/build" DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/midori-gtk3-libre/midori.install b/libre/midori-gtk3-libre/midori.install
deleted file mode 100644
index e6af79c5f..000000000
--- a/libre/midori-gtk3-libre/midori.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/midori-libre/PKGBUILD b/libre/midori-libre/PKGBUILD
deleted file mode 100644
index c0cd14422..000000000
--- a/libre/midori-libre/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 101597 2013-11-28 20:54:40Z arodseth $
-# Maintainer:  Alexander Rødseth <rodseth@gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: rabyte <rabyte.at.gmail.dot.com>
-# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
-# Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=midori
-pkgname=midori-libre
-pkgver=0.5.6
-pkgrel=2
-pkgdesc='Lightweight web browser (GTK2), without non-privacy search providers'
-arch=('x86_64' 'i686' 'mips64el')
-url='http://www.midori-browser.org/'
-license=('LGPL2.1')
-install='midori.install'
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique')
-makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg' 'cmake')
-optdepends=('gstreamer0.10-base-plugins: HTML5 OGG videos support'
-            'gstreamer0.10-bad-plugins: HTML5 WebM videos support'
-            'gstreamer0.10-ffmpeg: HTML5 H264 videos support'
-            'aria2: download utility')
-options=('!emptydirs')
-source=("http://www.midori-browser.org/downloads/${_pkgname}_${pkgver}_all_.tar.bz2")
-sha256sums=('c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a')
-
-prepare() {
-  cd "$_pkgname-$pkgver"
-
-  # remove non-privacy search providers
-  sed -i 's|Duck Duck Go|DuckDuckGo HTML|
-          s|duckduckgo[.]com|duckduckgo.com/html|
-          \|Yahoo|d
-          \|name=Yahoo|d
-          \|text=Yahoo Web Search|d
-          \|uri=http://search[.]yahoo[.]com/search?p=|d
-          \|token=y|d
-          \|Google|d
-          \|name=Google|d
-          \|text=Web Search|d
-          \|uri=http://www[.]google[.]com/search?q=%s|d
-          \|token=g|d
-          \|Localize text or URL|d
-          \|translate[.]google[.]com/?q=|d
-         ' config/search
-}
-
-build() {
-  cd "$_pkgname-$pkgver"
-
-  mkdir -p build
-  cd build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib
-  make
-}
-
-package() {
-  make -C "$_pkgname-$pkgver/build" DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/midori-libre/midori.install b/libre/midori-libre/midori.install
deleted file mode 100644
index e6af79c5f..000000000
--- a/libre/midori-libre/midori.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/mime-types/PKGBUILD b/libre/mime-types/PKGBUILD
deleted file mode 100644
index 31e373545..000000000
--- a/libre/mime-types/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 188113 2013-06-10 01:37:40Z bisson $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=mime-types
-pkgver=9
-pkgrel=1
-pkgdesc='Provides /etc/mime.types (Parabola rebranded)'
-url='https://parabolagnulinux.org/'
-license=('GPL2')
-arch=('any')
-backup=('etc/mime.types')
-source=("http://mirrors.kernel.org/gentoo/distfiles/${pkgname}-${pkgver}.tar.bz2"
-        'parabola.patch')
-sha1sums=('b21b7775a006b60113a6648e20beb1decdac8899'
-          '0d3b34c7b4a384be674192ecbfd8f22271906ae8')
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../parabola.patch
-	install -Dm644 mime.types "${pkgdir}"/etc/mime.types
-}
diff --git a/libre/mime-types/parabola.patch b/libre/mime-types/parabola.patch
deleted file mode 100644
index bbf8406ca..000000000
--- a/libre/mime-types/parabola.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff -au0r old/mime.types new/mime.types
---- old/mime.types	2009-10-15 07:51:24.000000000 -0700
-+++ new/mime.types	2011-08-02 22:49:14.962241561 -0700
-@@ -2 +2,2 @@
--# distributed as the app-misc/mime-types package.
-+# distributed in Parabola as the mime-types package, which is based on
-+# Gentoo's app-misc/mime-types package.
diff --git a/libre/mkisolinux/PKGBUILD b/libre/mkisolinux/PKGBUILD
deleted file mode 100644
index 7c9ab6cc4..000000000
--- a/libre/mkisolinux/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 12670 2008-09-17 21:19:05Z tpowa $
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=mkisolinux
-pkgver=2013.05
-pkgrel=1
-pkgdesc="Advanced, modular isolinux bootcd image creation utility (Parabola rebranded)"
-arch=(any)
-license=('GPL')
-url="https://parabolagnulinux.org/"
-depends=('mkinitcpio' 'cdrkit' 'syslinux' 'pciutils')
-replaces=('mkbootcd')
-backup=(etc/mkisolinux.conf)
-source=('boot.msg' 'mkisolinux' 'mkisolinux.conf' 'options.msg')
-
-
-package()
-{
-  cd "$srcdir/"
-  install -D -m755 mkisolinux "$pkgdir/usr/bin/mkisolinux"
-  install -D -m644 mkisolinux.conf "$pkgdir/etc/mkisolinux.conf"
-  install -D -m644 boot.msg "$pkgdir/usr/share/mkisolinux/boot.msg"
-  install -D -m644 options.msg "$pkgdir/usr/share/mkisolinux/options.msg"
-}
-md5sums=('945d5f5d74f37718c8c9d518bfd5698d'
-         '384aac3786506ff96ec3d1147bcacfe5'
-         '3cc23d74d7e4378d1be431d68a71a173'
-         'ae0007d6679b5a575b2a9e5ac3664baf')
diff --git a/libre/mkisolinux/boot.msg b/libre/mkisolinux/boot.msg
deleted file mode 100644
index 2725404e0..000000000
--- a/libre/mkisolinux/boot.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-------------------------------------------------------------------------------
-Parabola GNU/Linux-libre
-ISOLINUX BOOT
-created with 'mkisolinux' written by Tobias Powalowski <tpowa@archlinux.org>
-rebranded for Parabola by André Silva <emulatorman@parabola.nu>
-
-Press ENTER or type 'parabola' to boot the CD.
-
-If you wish to change your defaults to boot into your existing system,
-type 'vmlinuz initrd=initrd.img <any_other_boot_option>'
-Use the F2 key for troubleshooting and options.
-------------------------------------------------------------------------------
-
diff --git a/libre/mkisolinux/mkisolinux b/libre/mkisolinux/mkisolinux
deleted file mode 100755
index 048d925aa..000000000
--- a/libre/mkisolinux/mkisolinux
+++ /dev/null
@@ -1,116 +0,0 @@
-#! /bin/sh
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
-# Settings
-APPNAME=$(basename "${0}")
-CONFIG="/etc/mkisolinux.conf"
-GENIMG=""
-BURN="0"
-BLANK="0"
-TARNAME=""
-export TEMPDIR=$(mktemp -d /tmp/mkisolinux.XXXX)
-usage ()
-{
-    echo "${APPNAME}: usage"
-    echo "  -g=IMAGE         Generate a ISO image as IMAGE"
-    echo "  -c=CONFIG        Use CONFIG file. default: /etc/mkisolinux.conf"
-    echo "  -B               Burn the ISO image after creation"
-    echo "  -b               Blanking media first"
-    echo "  -h               This message."
-    exit 1
-}
-
-[ "$1" == "" ] && usage
-
-while [ $# -gt 0 ]; do
-	case $1 in
-		-c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-g=*|--g=*) GENIMG="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-B|--B) BURN="1" ;;
-		-b|--b) BLANK="1" ;;
-		-t=*|--t=*) TARNAME="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-h|--h|?) usage ;; 
-		*) usage ;;
-		esac
-	shift
-done
-
-if [ "${TARNAME}" = "" -a "${GENIMG}" = "" ]; then 
-	echo "ERROR: No image name specified, please use the -g option"
-	exit 1
-fi
-
-if [ ! -f "${CONFIG}" ]; then
-	echo "config file '${CONFIG}' cannot be found, aborting..."
-	exit 1
-fi
-
-. "${CONFIG}"
-# export for mkinitcpio
-[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE
-[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE
-
-export RUNPROGRAM="${APPNAME}"
-export BOOTDIRNAME="boot/syslinux"
-
-[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX)
-[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX)
-[ "${ISONAME}" = "" ] && export ISONAME=$(mktemp /tmp/isoname.XXXX)
-export USEKERNEL=${VERSION}
-
-# begin script
-mkdir -p ${TEMPDIR}/${BOOTDIRNAME}/
-# prepare syslinux
-install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin
-for i in /usr/lib/syslinux/*.c32; do
-    install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i)
-done
-install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids
-# create syslinux.cfg
-echo ":: Creating syslinux.cfg ..."
-if [ "${ISOLINUXCFG}" = "" ]; then
-	[ -e  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && rm  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "prompt ${PROMPT}" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "timeout ${TIMEOUT}" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "display boot.msg" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "F1 boot.msg" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "F2 options.msg" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "default parabola"  >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "label parabola" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "kernel /boot/vmlinuz" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "append initrd=/boot/initrd.img ${KERNEL_BOOT_OPTIONS}" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-else
-	sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \
-		${ISOLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-fi
-[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1
-
-echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." 
-# generate initramdisk
-echo ":: Creating initramdisk ..."
-	mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/boot/initrd.img
-echo ":: Using ${KERNEL} as image kernel ..."
-	install -m644 ${KERNEL} ${TEMPDIR}/boot/vmlinuz
-	install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg
-	install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg
-	[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1
-	[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1
-# create image
-echo ":: Creating ISO image ..."
-	[ -e ${GENIMG} ] && rm ${GENIMG}
-	[ -s "${ISONAME}" ] && ISONAME=$(cat $ISONAME) || ISONAME="Parabola GNU/Linux-libre"
-	mkisofs -RlDJLV "${ISONAME}" -b boot/syslinux/isolinux.bin -c boot/syslinux/boot.cat \
-		-no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1 \
-        && echo ":: ISO Image succesfull created at ${GENIMG}"
-	# burning/blanking image
-	if [ "$BLANK" = "1" ]; then
-		echo ":: Blanking media DEVICE=${DEVICE}, BLANKMODE=${BLANKMODE}, SPEED=${SPEED} ..."
-			cdrecord dev=${DEVICE} speed=${SPEED} blank=${BLANKMODE} > /dev/null 2>&1 && echo ":: Successfull."
-	fi
-	if [ "$BURN" = "1" ]; then
-		echo ":: Burning ISO image DEVICE=${DEVICE}, SPEED=${SPEED} ..."
-			cdrecord dev=${DEVICE} speed=${SPEED} -eject ${GENIMG}  > /dev/null 2>&1 && echo ":: Successfull."
-	fi
-
-# clean /tmp
-rm -r ${TEMPDIR}
diff --git a/libre/mkisolinux/mkisolinux.conf b/libre/mkisolinux/mkisolinux.conf
deleted file mode 100644
index e8b1e0df0..000000000
--- a/libre/mkisolinux/mkisolinux.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
-# config file of mkisolinux
-
-# DEFAULT kernel boot options like root=/dev/sda3 etc.
-# add your root= option, if you boot from a disk device
-# and don't want to add it by hand on each boot
-KERNEL_BOOT_OPTIONS=""
-
-# mkinitcpio config file, defaulted to stock config file
-MKINITCPIO_CONFIG="/etc/mkinitcpio.conf"
-
-# kernel version, defaulted to build for runtime kernel
-VERSION="$(uname -r)"
-
-# kernel image, defaulted to stock libre kernel
-KERNEL="/boot/vmlinuz-linux-libre"
-
-# boot message files
-BOOTMESSAGE="/usr/share/mkisolinux/boot.msg"
-OPTIONSBOOTMESSAGE="/usr/share/mkisolinux/options.msg"
-
-# syslinux.cfg file to use
-SYSLINUXCFG=""
-
-# Prompt on boot, 1=yes 0=no
-PROMPT="1"
-
-# Name of the ISO, if empty Parabola GNU/Linux-libre is used if not set by a HOOK later
-ISONAME=""
-
-# Timeout, 30 seconds to fix usb keyboard issues
-# 0 means wait for prompt
-TIMEOUT="300"
-
-# Setting cdrecord options
-DEVICE=""
-SPEED=""
-BLANKMODE=""
diff --git a/libre/mkisolinux/options.msg b/libre/mkisolinux/options.msg
deleted file mode 100644
index 16c6b2eda..000000000
--- a/libre/mkisolinux/options.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-------------------------------------------------------------------------------
-Parabola GNU/Linux-libre options and troubleshooting:
-
-- If your system hangs during the boot process, any combinations of the
-  boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful.
-------------------------------------------------------------------------------
diff --git a/libre/mkpxelinux/PKGBUILD b/libre/mkpxelinux/PKGBUILD
deleted file mode 100644
index b3a94547f..000000000
--- a/libre/mkpxelinux/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 197074 2013-10-21 15:42:46Z tpowa $
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=mkpxelinux
-pkgver=2013.10
-pkgrel=1
-pkgdesc="Advanced, modular network pxe boot image creation utility (Parabola rebranded)"
-arch=(any)
-license=('GPL')
-url="https://parabolagnulinux.org/"
-depends=('mkinitcpio' 'tftp-hpa' 'syslinux')
-backup=(etc/mkpxelinux.conf)
-optdepends=('dhcp: for dhcp server usage')
-source=('boot.msg' 'mkpxelinux' 'mkpxelinux.conf' 'options.msg')
-
-package()
-{
-  cd "$srcdir/"
-  install -D -m755 mkpxelinux "$pkgdir/usr/bin/mkpxelinux"
-  install -D -m644 mkpxelinux.conf "$pkgdir/etc/mkpxelinux.conf"
-  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/boot.msg b/libre/mkpxelinux/boot.msg
deleted file mode 100644
index 6c1fcd476..000000000
--- a/libre/mkpxelinux/boot.msg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-------------------------------------------------------------------------------
-Parabola GNU/Linux-libre
-PXELINUX BOOT
-created with 'mkpxelinux' written by Tobias Powalowski <tpowa@archlinux.org>
-
-Press ENTER or type 'parabola' to boot image.
-
-If you wish to change your defaults to boot into your existing system,
-type 'vmlinuz initrd=initrd.img <any_other_boot_option>'
-Use the F2 key for troubleshooting and options.
-------------------------------------------------------------------------------
-
diff --git a/libre/mkpxelinux/mkpxelinux b/libre/mkpxelinux/mkpxelinux
deleted file mode 100755
index 35e946f82..000000000
--- a/libre/mkpxelinux/mkpxelinux
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
-# Settings
-APPNAME=$(basename "${0}")
-CONFIG="/etc/mkpxelinux.conf"
-
-usage ()
-{
-    echo "${APPNAME}: usage"
-    echo""
-    echo "  -d=INSTALLDIR    Your INSTALLDIR overwrites config default"
-    echo "  -c=CONFIG        Use CONFIG file. default: /etc/mkpxelinux.conf"
-    echo "  -h               This message."
-    exit 1
-}
-
-[ "$1" == "" ] && usage && exit 1
-
-while [ $# -gt 0 ]; do
-	case $1 in
-		-c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-d=*|--d=*) CUSTOMINSTALLDIR="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-h|--h|?) usage ;; 
-		*) usage ;;
-		esac
-	shift
-done
-
-if [ ! -f "${CONFIG}" ]; then
-	echo "config file '${CONFIG}' cannot be found, aborting..."
-    exit 1
-fi
-
-. "${CONFIG}"
-# export for mkinitcpio
-[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE
-[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE
-
-! [ "${CUSTOMINSTALLDIR}" = "" ] && INSTALLDIR=${CUSTOMINSTALLDIR}
-
-if [ "${INSTALLDIR}" = "" ]; then 
-	echo "ERROR: No INSTALLDIR name specified, please use the -d option"
-	 exit 1
-fi
-
-if ! [ $UID -eq 0 ]; then 
-	echo "ERROR: only works when run as root!"
-	exit 1
-fi
-
-! [ -e ${INSTALLDIR} ] && echo "No ${INSTALLDIR} found!" && exit 1 
-export TEMPDIR=${NFSROOTDIR}
-export INSTALLDIR=${INSTALLDIR}
-export RUNPROGRAM="${APPNAME}"
-[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX)
-[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX)
-export USEKERNEL=${VERSION}
-# begin script
-# create default
-echo ":: Creating pxelinux default config file ..."
-mkdir -p ${INSTALLDIR}/pxelinux.cfg
-if [ "${PXELINUX_DEFAULT}" = "" ]; then
-	[ -e ${INSTALLDIR}/pxelinux.cfg/default ] && rm ${INSTALLDIR}/pxelinux.cfg/default
-	echo "prompt ${PROMPT}" >> ${INSTALLDIR}/pxelinux.cfg/default
-	echo "timeout ${TIMEOUT}" >> ${INSTALLDIR}/pxelinux.cfg/default
-	echo "display boot.msg" >> ${INSTALLDIR}/pxelinux.cfg/default
-	echo "F1 boot.msg" >> ${INSTALLDIR}/pxelinux.cfg/default
-	echo "F2 options.msg" >> ${INSTALLDIR}/pxelinux.cfg/default
-	echo "default parabola"  >> ${INSTALLDIR}/pxelinux.cfg/default
-	echo "label parabola" >> ${INSTALLDIR}/pxelinux.cfg/default
-	echo "kernel vmlinuz" >> ${INSTALLDIR}/pxelinux.cfg/default
-	echo "append initrd=initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${INSTALLDIR}/pxelinux.cfg/default
-else
-	sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \
-		${PXELINUX_DEFAULT} >  ${INSTALLDIR}/pxelinux.cfg/default
-fi
-[ ! -s ${INSTALLDIR}/pxelinux.cfg/default ] && echo "No pxelinux default config found" && exit 1
-echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." 
-# generate initramdisk
-echo ":: Creating initramdisk ..."
-	mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${INSTALLDIR}/initrd.img
-echo ":: Using ${KERNEL} as image kernel ..."
-	install -m644 ${KERNEL} ${INSTALLDIR}/vmlinuz
-echo ":: Installing message files to ${INSTALLDIR} ..."
-	install -m644 ${BOOTMESSAGE} ${INSTALLDIR}/boot.msg
-	install -m644 ${OPTIONSBOOTMESSAGE} ${INSTALLDIR}/options.msg
-	[ ! -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/bios/pxelinux.0 ${INSTALLDIR}/pxelinux.0 && echo "Installation completed."
diff --git a/libre/mkpxelinux/mkpxelinux.conf b/libre/mkpxelinux/mkpxelinux.conf
deleted file mode 100644
index 55aba8247..000000000
--- a/libre/mkpxelinux/mkpxelinux.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
-# config file of mkpxelinux
-
-# DEFAULT kernel boot options like ip=:::::eth0:dhcp etc.
-# add your root= option, if you boot from a disk device
-# and don't want to add it by hand on each boot
-KERNEL_BOOT_OPTIONS=""
-
-# mkinitcpio config file, defaulted to stock config file
-MKINITCPIO_CONFIG="/etc/mkinitcpio.conf"
-
-# kernel version, defaulted to build for runtime kernel
-VERSION="$(uname -r)"
-
-# kernel image, defaulted to stock libre kernel
-KERNEL="/boot/vmlinuz-linux-libre"
-
-# boot message files
-BOOTMESSAGE="/usr/share/mkpxelinux/boot.msg"
-OPTIONSBOOTMESSAGE="/usr/share/mkpxelinux/options.msg"
-
-#pxelinux default config file to use
-PXELINUX_DEFAULT=""
-
-# Prompt on boot, 1=yes 0=no
-PROMPT="1"
-
-# Timeout, 30 seconds to fix usb keyboard issues
-# 0 means wait for prompt
-TIMEOUT="300"
-
-# Installdir of tftp, default location
-INSTALLDIR="/var/tftpboot"
-
-# Nfsrootdir, for hooks that might need it
-NFSROOTDIR=""
diff --git a/libre/mkpxelinux/options.msg b/libre/mkpxelinux/options.msg
deleted file mode 100644
index 16c6b2eda..000000000
--- a/libre/mkpxelinux/options.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-------------------------------------------------------------------------------
-Parabola GNU/Linux-libre options and troubleshooting:
-
-- If your system hangs during the boot process, any combinations of the
-  boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful.
-------------------------------------------------------------------------------
diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux/PKGBUILD
deleted file mode 100644
index a64f141fd..000000000
--- a/libre/mksyslinux/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 187120 2013-06-04 06:46:39Z tpowa $
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=mksyslinux
-pkgver=2013.06
-pkgrel=1
-pkgdesc="Advanced, modular syslinux boot image creation utility (Parabola rebranded)"
-arch=(any)
-license=('GPL')
-url="https://parabolagnulinux.org/"
-depends=('mkinitcpio' 'syslinux' 'pciutils')
-backup=(etc/mksyslinux.conf)
-source=('boot.msg' 'mksyslinux' 'mksyslinux.conf' 'options.msg')
-
-package()
-{
-  cd "$srcdir/"
-  install -D -m755 mksyslinux "$pkgdir/usr/bin/mksyslinux"
-  install -D -m644 mksyslinux.conf "$pkgdir/etc/mksyslinux.conf"
-  install -D -m644 boot.msg "$pkgdir/usr/share/mksyslinux/boot.msg"
-  install -D -m644 options.msg  "$pkgdir/usr/share/mksyslinux/options.msg"
-}
-md5sums=('287aad9693ca8061495e248c41ba43a7'
-         '0a9fd93356b5d98ab386f28bc849b808'
-         '15742e47e40a46491694b4b7680d4e38'
-         'ae0007d6679b5a575b2a9e5ac3664baf')
diff --git a/libre/mksyslinux/boot.msg b/libre/mksyslinux/boot.msg
deleted file mode 100644
index 2cfe24d42..000000000
--- a/libre/mksyslinux/boot.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-------------------------------------------------------------------------------
-Parabola GNU/Linux-libre
-SYSLINUX BOOT
-created with 'mksyslinux' by Tobias Powalowski <tpowa@archlinux.org>
-rebranded for Parabola by André Silva <emulatorman@parabola.nu>
-
-Press ENTER or type 'parabola' to boot image.
-
-If you wish to change your defaults to boot into your existing system,
-type 'vmlinuz initrd=initrd.img <any_other_boot_option>'
-Use the F2 key for troubleshooting and options.
-------------------------------------------------------------------------------
-
diff --git a/libre/mksyslinux/mksyslinux b/libre/mksyslinux/mksyslinux
deleted file mode 100755
index 96ad45133..000000000
--- a/libre/mksyslinux/mksyslinux
+++ /dev/null
@@ -1,144 +0,0 @@
-#! /bin/sh
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Settings
-APPNAME=$(basename "${0}")
-CONFIG="/etc/mksyslinux.conf"
-export TEMPDIR=$(mktemp /tmp/mksyslinux.XXX)
-TMPDIR=$(mktemp -d /tmp/mksyslinux-image.XXX)
-BOOTDIRNAME=boot/syslinux
-
-usage ()
-{
-    echo "${APPNAME}: usage"
-    echo "WRITING TO DEVICE:"
-    echo "- PREPARATION: Your device must have a bootable first partition in FAT16 format!"
-    echo "- ATTENTION: The MBR of your DEVICE will be overwritten! You have been warned!"
-    echo ""
-    echo "CREATING AN IMAGE FILE:"
-    echo "- For creating an image file use the -i=IMAGEFILE switch"
-    echo "- use 'dd if=<yourimage> of=<yourdevice>' to write to your device afterwards."
-    echo ""
-    echo "PARAMETERS:"
-    echo "  -d=DEVICE        Your DEVICE first partition from /dev/xxx tree to install"
-    echo "  -i=IMAGENAME     Your IMAGENAME"
-    echo "  -c=CONFIG        Use CONFIG file. default: /etc/mksyslinux.conf"
-    echo "  -h               This message."
-    exit 1
-}
-
-[ "$1" == "" ] && usage && exit 1
-
-
-while [ $# -gt 0 ]; do
-	case $1 in
-		-c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-d=*|--d=*) DEVICE="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-i=*|--i=*) IMAGENAME="$(echo $1 | awk -F= '{print $2;}')" ;;
-		-h|--h|?) usage ;; 
-		*) usage ;;
-		esac
-	shift
-done
-
-if [ ! -f "${CONFIG}" ]; then
-	echo "config file '${CONFIG}' cannot be found, aborting..."
-    exit 1
-fi
-
-if [ "${IMAGENAME}" = "" ]; then
-	if [ "${DEVICE}" = "" ]; then 
-		echo "ERROR: No DEVICE name specified, please use the -d option"
-	 	exit 1
-	fi
-fi
-
-if ! [ $UID -eq 0 ]; then 
-	echo "ERROR: only works when run as root!"
-	exit 1
-fi
-
-. "${CONFIG}"
-# export for mkinitcpio
-[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE
-[ -n "${APPENDBOOTMESSAGE_SYSLINUX}" ] && export APPENDBOOTMESSAGE_SYSLINUX
-[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE
-
-MBRDEVICE="$(echo ${DEVICE} | sed -e 's/[0-9]//g')"
-
-export RUNPROGRAM="${APPNAME}"
-[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX)
-[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX)
-export USEKERNEL=${VERSION}
-# begin script
-[ -e ${TEMPDIR} ] && rm -r ${TEMPDIR}
-mkdir -p ${TEMPDIR}
-echo ":: Mounting ${DEVICE} ..."
-if ! [ "${IMAGENAME}" = "" ]; then
-	modprobe loop
-else
-	mount ${DEVICE} ${TEMPDIR} || exit 1
-fi
-mkdir -p ${TEMPDIR}/${BOOTDIRNAME}
-# prepare syslinux bootloader
-install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin
-for i in /usr/lib/syslinux/*.c32; do
-    install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i)
-done
-install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids
-
-# create syslinux.cfg
-echo ":: Creating syslinux.cfg ..."
-if [ "${SYSLINUXCFG}" = "" ]; then
-	[ -e ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "F1 boot.msg" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "F2 options.msg" >>  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "default parabola"  >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "label parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "kernel /boot/vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-	echo "append initrd=/boot/initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-else
-	sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \
-		${SYSLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
-fi
-[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1
-echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." 
-# generate initramdisk
-echo ":: Creating initramdisk ..."
-	mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/boot/initrd.img
-echo ":: Using ${KERNEL} as image kernel ..."
-	install -m644 ${KERNEL} ${TEMPDIR}/boot/vmlinuz
-	install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg
-	install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg
-	[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1
-	[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1
-if ! [ "${IMAGENAME}" = "" ]; then
-	# ext2 overhead's upper bound is 6%
-	# empirically tested up to 1GB
-	rootsize=$(du -bs ${TEMPDIR}|cut -f1)
-	IMGSZ=$(( (${rootsize}*106)/100/512 + 1)) # image size in sectors
-	# create the filesystem image file
-	dd if=/dev/zero of="${IMAGENAME}" bs=512 count="${IMGSZ}"
-	# create a filesystem on the image
-	mkfs.vfat "${IMAGENAME}"
-	mount -o loop ${IMAGENAME} ${TMPDIR} || exit 1
-	cp -r "${TEMPDIR}"/* "$TMPDIR"
-	umount ${TMPDIR}
-else
-	echo ":: Unmounting ${DEVICE} ..."
-	umount ${TEMPDIR} || exit 1
-fi
-if ! [ "${IMAGENAME}" = "" ]; then
-	echo ":: Installing SYSLINUX on ${IMAGENAME} ..."
-	syslinux ${IMAGENAME} && echo "Installation completed."
-else
-	echo ":: Installing MBR on ${MBRDEVICE} ..."
-	cat ${MBR} > ${MBRDEVICE}
-	echo ":: Installing SYSLINUX on ${DEVICE} ..."
-	syslinux -t offset ${DEVICE} && echo "Installation completed."
-fi
-# clean /tmp
-rm -r ${TEMPDIR}
-! [ ${IMAGENAME} = "" ] && rm -r ${TMPDIR}
diff --git a/libre/mksyslinux/mksyslinux.conf b/libre/mksyslinux/mksyslinux.conf
deleted file mode 100644
index a7d032295..000000000
--- a/libre/mksyslinux/mksyslinux.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
-# config file of mksyslinux
-
-# DEFAULT kernel boot options like root=/dev/sda3 etc.
-# add your root= option, if you boot from a disk device
-# and don't want to add it by hand on each boot
-KERNEL_BOOT_OPTIONS=""
-
-# mkinitcpio config file, defaulted to stock config file
-MKINITCPIO_CONFIG="/etc/mkinitcpio.conf"
-
-# kernel version, defaulted to build for runtime kernel
-VERSION="$(uname -r)"
-
-# kernel image, defaulted to stock libre kernel
-KERNEL="/boot/vmlinuz-linux-libre"
-
-# boot message files
-BOOTMESSAGE="/usr/share/mksyslinux/boot.msg"
-OPTIONSBOOTMESSAGE="/usr/share/mksyslinux/options.msg"
-
-# syslinux.cfg file to use
-SYSLINUXCFG=""
-
-# Prompt on boot, 1=yes 0=no
-PROMPT="1"
-
-# Timeout, 30 seconds to fix usb keyboard issues
-# 0 means wait for prompt
-TIMEOUT="300"
-
-# default MBR
-MBR="/usr/lib/syslinux/mbr.bin"
diff --git a/libre/mksyslinux/options.msg b/libre/mksyslinux/options.msg
deleted file mode 100644
index 16c6b2eda..000000000
--- a/libre/mksyslinux/options.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-------------------------------------------------------------------------------
-Parabola GNU/Linux-libre options and troubleshooting:
-
-- If your system hangs during the boot process, any combinations of the
-  boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful.
-------------------------------------------------------------------------------
diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD
deleted file mode 100644
index 2405ac889..000000000
--- a/libre/mozilla-searchplugins/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Figue <ffigue at gmail>
-# Contributor: Figue <ffigue at gmail>
-# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
-# Thank you very much to the older contributors:
-# Contributor: evr <evanroman at gmail>
-# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
-
-pkgname=mozilla-searchplugins
-pkgver=1.4
-pkgrel=2
-pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers."
-arch=('any')
-license=('MPL' 'GPL' 'LGPL')
-url="https://parabolagnulinux.org/"
-source=(
-  duckduckgo-html.xml
-  duckduckgo-lite.xml
-  internet-archive.xml
-  parabola-packages.xml::https://parabolagnulinux.org/opensearch/packages/
-  parabola-wiki-en.xml::
-  seeks-search.xml::http://www.seeks.fr/opensearch.xml
-#  yacy.xml::http://search.ipredator.se/opensearchdescription.xml
-  yacy.xml
-  wikipedia-en.xml::https://en.wikipedia.org/w/opensearch_desc.php
-)
-
-package() {
-  install -m755 -d                "${pkgdir}/usr/lib/mozilla/searchplugins"
-  install -m644 "${srcdir}"/*.xml "${pkgdir}/usr/lib/mozilla/searchplugins"
-}
-
-md5sums=('b4cc6bd8353af36ade441916217619e4'
-         '766aa6def4bf63c0d65afd6ca1b1ce37'
-         '462c68585461f8cdc23c93c46f6ee4cf'
-         '92f834a3a1d85c9ae202955cdfe941eb'
-         'b9a0893d7f6d41d755c478fd60c44be8'
-         'dc6c76acf4c68a40710383513d72fa8b'
-         '0f6cb4119f54e90d678827e2928474d4'
-         'dbdd9b61e89d73cc3a70cbe20a1160e1')
diff --git a/libre/mozilla-searchplugins/duckduckgo-html.xml b/libre/mozilla-searchplugins/duckduckgo-html.xml
deleted file mode 100644
index b53408077..000000000
--- a/libre/mozilla-searchplugins/duckduckgo-html.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>DuckDuckGo HTML</os:ShortName>
-<os:Description>Search DuckDuckGo HTML</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">http://duckduckgo.com/favicon.ico</os:Image>
-<os:Url type="text/html" method="GET" template="https://duckduckgo.com/html/?q={searchTerms}">
-</os:Url>
-</SearchPlugin>
diff --git a/libre/mozilla-searchplugins/duckduckgo-lite.xml b/libre/mozilla-searchplugins/duckduckgo-lite.xml
deleted file mode 100644
index 1e651abe6..000000000
--- a/libre/mozilla-searchplugins/duckduckgo-lite.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>DuckDuckGo Lite</os:ShortName>
-<os:Description>Search DuckDuckGo Lite</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">http://duckduckgo.com/favicon.ico</os:Image>
-<os:Url type="text/html" method="GET" template="https://duckduckgo.com/lite/?q={searchTerms}">
-</os:Url>
-</SearchPlugin>
diff --git a/libre/mozilla-searchplugins/internet-archive.xml b/libre/mozilla-searchplugins/internet-archive.xml
deleted file mode 100644
index 1556a2d8c..000000000
--- a/libre/mozilla-searchplugins/internet-archive.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Internet Archive</os:ShortName>
-<os:Description>Search www.archive.org</os:Description>
-<os:InputEncoding>ISO-8859-1</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,R0lGODlhEAAQAPf0ABQAABMTERQTEhcXFxUYFRscGCwWEzYQDSAkHiAhICEiISQkIiUmJScnJSkpKSsrKi8vLDcvKjM0LzE1Mjc3NjU6Nj44NTw9OT0+Pj4/PD9CQUYdF00lJEE0KkQ9N0Y9NFItLFUvL1wzLFc/PV01MGE8PWU/OWk5NGo7OkBAP0RFREVJRURJRkVLR0ZIRkdJSUZLSEhMS0pPTFZOSllDQlZXVWFJRWVKQWRLRGtPRG9KSWxQRWxRRmhQTHJCQnFDRHVEQHZFQHpLS3hKTHlNSn5PSn5PTXxOUHRWTXBeU29jXXtgWHxjXn1mZIBQS4BQUIJZUoBZWIVeXYhfW4ZsX41jXYlrXoxuX4RuYoppYotza5NlZ5Zua5J4bpt5ZpaDeaKBb42MiY6MiY6NiY+QjJGIhZGKhZiLgp+IgJGRjJOSjZKSj5SWjpSTkJWVkJWUkpaUkZaVkquLgKmMgayPgK6Sh6mWj6ycj7GQgbKSgLWSgrqXi7maj7Sck7Smn72ilK+so6ytqbanobKppLysoLytor6uprqxqr2wqr+zrL23tMOklsCroMKvpcWqoMSsocStocSupcS1qce2rMa6r8m1rsO8ssa4sM65sty5q9C6sc3DttbEvdbKv9nFt9rHvODAsuDIuuHLvufKvurNvNDLwtDPy9nLwN3Oxt3Xz+TMwODQxuPTxuXRxefRxuHWzO3Ux+/WxunXy+vWyO3XzujYyuzYy+7bz+HZ0eHZ1eLc0uXc0+bc2Ore0u7c0O/f0vHf1eTg2+/h1O/h1u/j2u/m2vDh0/Hg1vDi1fHi1fPh1fPh1/bg1vLq3fXr3/ng1vjl2fnk2fTr5fTs4vHu6Pfw5vb07vnz5vvy5/zy5vry6Pv06vj17/7y6v/17fz47/757v/57v/38Pr58/358f358//68P778v/68/z89v/99f/+9f//9P7+9///9/z8+f//+P//+/7+/v///v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAj+ALeUoDHjAosYKlKsaAHjhYsMgYaAAGABggwNDgbUqMAAgwIKa47oMBChwIQHAQRIQEAgQYMFYX6EGFEmDZk2ceCoYePmjZgxpnxEaSKPntGjR+fRi/dESo9y3MYFy8ULl65Sit6loyaEgw14qQANQuTn0pkPHsxYa2eEC5Nu0ywlMmSn0Z0OSg6RW4fiAA512nahqoQGkqckgqShO+ekypJw2F6titTlTywsnLxtY3diww135k59cjRnESkqmMR9YwdEBI9imwoxqiMHTx4rmohVAxdExI5Wkgg94rNHj5crWr5QulYESo5bxmqJGgUqExg6fSZ1akaEBBJXvlgfybI1C1YoVbSA9XI2xUSWZ9B+IROWTFk0ZsuODcsWEAA7</os:Image>
-<UpdateInterval>7</UpdateInterval>
-<UpdateUrl>http://mycroft.mozdev.org/update.php/id0/archive.src</UpdateUrl>
-<IconUpdateUrl>http://mycroft.mozdev.org/update.php/id0/archive.gif</IconUpdateUrl>
-<SearchForm>http://www.archive.org/</SearchForm>
-<os:Url type="text/html" method="GET" template="http://www.archive.org/search.php?sourceid=Mozilla-search&amp;query={searchTerms}&amp;sort=-%2Fadditional%2Fitem%2Fdownloads">
-</os:Url>
-</SearchPlugin>
\ No newline at end of file
diff --git a/libre/mozilla-searchplugins/parabola-packages.xml b/libre/mozilla-searchplugins/parabola-packages.xml
deleted file mode 100644
index 1cefb19da..000000000
--- a/libre/mozilla-searchplugins/parabola-packages.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Parabola Packages</os:ShortName>
-<os:Description>Search the Parabola package repositories.</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAtFBMVEUAAAB4fap4fKp4gK12fKh4fqt5eap4fqt4fqx4fat4faqAgKp3fap4fat4gKp4fKt4fat3e614fat4fatxcap3fKp4fat6fq14fax1fKx6eq13faoAAP93e6t4fat4fauAgKp6fqt5fqx3fap3d6p4fat3fqx5fqt4fat4fKt5fqp3fat4fatVVap4fat1fKh4fKt4fqp4fat4fax0dKJ4fauAgJ95fKx5gKx7e6p4fav///+r+nENAAAAOnRSTlMAbEIiKYgVgpD2ygZaziR9lz716AlvwkFiJRl4ATrzuQxDZS0P8UfL1KRjrcwD5iNGV6OZC8YIUCgbgnXDKgAAAAFiS0dEOzkO9GwAAAB4SURBVBjTY2DAAxiZGJiYYRwWVjZ2DgYmTi4wj5uHiZePX4BBUMhKGMgVERUTl5CUkpaRlbOykmdQUFRShuhSUbWyslJjEEEYqm5lpYFii6aVlRaKgLaVDjcyX1dPVR9FgYGVIapDjYxR+SamZqgC5hZoXrPE4WUAR5sJeNGfmtcAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTMtMDgtMTVUMTE6MDg6MDItMDM6MDC3YtyCAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEzLTA4LTE1VDExOjA4OjAyLTAzOjAwxj9kPgAAAABJRU5ErkJggg==</os:Image>
-<os:Url type="text/html" method="GET" template="https://parabolagnulinux.org/packages/?q={searchTerms}">
-</os:Url><os:Url type="application/opensearchdescription+xml" method="GET" template="https://parabolagnulinux.org/opensearch/packages/" rel="self">
-</os:Url>
-</SearchPlugin>
diff --git a/libre/mozilla-searchplugins/parabola-wiki-en.xml b/libre/mozilla-searchplugins/parabola-wiki-en.xml
deleted file mode 100644
index a391d7335..000000000
--- a/libre/mozilla-searchplugins/parabola-wiki-en.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Parabola Wiki (en)</os:ShortName>
-<os:Description>Parabola GNU/Linux-Libre Wiki (en)</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAtFBMVEUAAAB4fap4fKp4gK12fKh4fqt5eap4fqt4fqx4fat4faqAgKp3fap4fat4gKp4fKt4fat3e614fat4fatxcap3fKp4fat6fq14fax1fKx6eq13faoAAP93e6t4fat4fauAgKp6fqt5fqx3fap3d6p4fat3fqx5fqt4fat4fKt5fqp3fat4fatVVap4fat1fKh4fKt4fqp4fat4fax0dKJ4fauAgJ95fKx5gKx7e6p4fav///+r+nENAAAAOnRSTlMAbEIiKYgVgpD2ygZaziR9lz716AlvwkFiJRl4ATrzuQxDZS0P8UfL1KRjrcwD5iNGV6OZC8YIUCgbgnXDKgAAAAFiS0dEOzkO9GwAAAB4SURBVBjTY2DAAxiZGJiYYRwWVjZ2DgYmTi4wj5uHiZePX4BBUMhKGMgVERUTl5CUkpaRlbOykmdQUFRShuhSUbWyslJjEEEYqm5lpYFii6aVlRaKgLaVDjcyX1dPVR9FgYGVIapDjYxR+SamZqgC5hZoXrPE4WUAR5sJeNGfmtcAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTMtMDgtMTVUMTE6MDg6MDItMDM6MDC3YtyCAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEzLTA4LTE1VDExOjA4OjAyLTAzOjAwxj9kPgAAAABJRU5ErkJggg==</os:Image>
-<SearchForm>https://wiki.parabolagnulinux.org/Special:Search</SearchForm>
-<os:Url type="text/html" method="GET" template="https://wiki.parabolagnulinux.org/index.php?title=Special:Search&amp;search={searchTerms}">
-</os:Url><os:Url type="application/x-suggestions+json" method="GET" template="https://wiki.parabolagnulinux.org/api.php?action=opensearch&amp;search={searchTerms}&amp;namespace=0">
-</os:Url>
-</SearchPlugin>
diff --git a/libre/mozilla-searchplugins/yacy.xml b/libre/mozilla-searchplugins/yacy.xml
deleted file mode 100644
index 9c97f16cc..000000000
--- a/libre/mozilla-searchplugins/yacy.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OpenSearchDescription
-    xmlns="http://a9.com/-/spec/opensearch/1.1/"
-    xmlns:suggestions="http://www.opensearch.org/specifications/opensearch/extensions/suggestions/1.1">
-  <ShortName>YaCy</ShortName>
-  <LongName>YaCy.net - P2P Web Search</LongName>
-  <Image type="image/gif">http://search.ipredator.se/env/grafics/yacy.png</Image>
-  <Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAAAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////Chiu+fBm+fRq+fRq+fRq+fRq+fRq8ehXMmk////////////////////////////++exjUqGfZsnjYsXbYsXbYsXbZsnjTp2W+fBr///////////////////////////+9exfs2r/69/L58+z58+z58+z59e/z59bChSn///////////////////////////+9fBnnz638+fX69O369e748un38Ob59O3Ll0fVrGz////////////////////////Jk0HJlUjXuYrWt4jVtYPr28T58+r59OzPn1fPnlX////////////////////////Rolu8eRXCiTPEjTvCijbNnlj169359e7Zs3vLlkf////////////////////////UqmrAgSLt3MP27eH1693169327+T59Ozo0rG/gB////////////////////////////+/gCDv4Mn48+v38Of59Oz58+v48+vr2b2+fRv///////////////////////////+9ehXr17n58+z48ejo0bDp07T48+zx49DBhCj///////////////////////////+/fhzjyJ/59Oz59OzQoVvNmU759Oz58+vKlUbXrnH////////////////////////LlkfUqmn59Oz48+vZtHzNm1D48+v59OzPoFjOnlX////////////////////////OnVPOnFL59e348+vq1rnEiC7u38j69vDXsHTIkT3////////////////////////UqWjIkD327+T58+3s2bzAgSLp07T79/Pmzqq+fBn///////////////////////////+/fx7v4Mr7+PTx5NDHkD3kyqP8+vjs2r+9exf///////////////////////////++fBjQoFnVq2zTp2bGjTjJk0LWrW7SpWC+exf////////////////////////////Nm1C6dQy7eBG8eBK9exe8ehS7dxC6dQzLlkj////////////AH///wB8x+sAf///AD/+PwA///8AP///AD///4A9PU+APoz/gB///4AdxvOAHoz/gB3368AfjU/AHT1PwB/+P
-</Image>
-  <Language>en-us</Language>
-  <OutputEncoding>UTF-8</OutputEncoding>
-  <InputEncoding>UTF-8</InputEncoding>
-  <AdultContent>true</AdultContent>
-  <Description>YaCy is an open-source GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer '_anonufe-29422893-0'.</Description>
-  
-  <Url type="text/html" method="GET" template="http://search.ipredator.se/yacysearch.html?query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;nav=all" />
-  <Url type="application/rss+xml" method="GET" template="http://search.ipredator.se/yacysearch.rss?nav=&amp;query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;verify=false" />
-  
-  <Url type="application/x-suggestions+json" template="http://search.ipredator.se/suggest.json?query={searchTerms}"/>
-  <Url type="application/x-suggestions+xml" template="http://search.ipredator.se/suggest.xml?query={searchTerms}"/>
-  <!-- syntax according to http://www.loc.gov/standards/sru/. Set verify=true to get snippets in the search results -->
-  <Developer>See https://gitorious.org/+yacy-developers</Developer>
-  <Query role="example" searchTerms="yacy+open+source" />
-  <Tags>YaCy Open Source P2P Web Search</Tags>
-  <Contact>See http://search.ipredator.se/ViewProfile.html?hash=localhash</Contact>
-  <Attribution>YaCy Software &amp;copy; 2004-2012 by Michael Christen et al., YaCy.net; Content: ask peer owner</Attribution>
-  <SyndicationRight>open</SyndicationRight>
-</OpenSearchDescription>
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 75a1fefd2..8ca2fda87 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 200344 2013-11-26 19:19:01Z bpiotrowski $
+# $Id: PKGBUILD 204039 2014-01-14 12:09:50Z jgc $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -8,7 +8,7 @@ _pkgbase=mplayer
 pkgbase=mplayer-libre
 pkgname=('mplayer-libre' 'mencoder-libre')
 pkgver=36498
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 makedepends=(
     'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
diff --git a/libre/mplayer-libre/cdio-includes.patch b/libre/mplayer-libre/cdio-includes.patch
deleted file mode 100644
index f71472812..000000000
--- a/libre/mplayer-libre/cdio-includes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: configure
-===================================================================
---- configure	(revision 35421)
-+++ configure	(working copy)
-@@ -5968,8 +5968,8 @@
-         cat > $TMPC << EOF
- #include <stdio.h>
- #include <cdio/version.h>
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- int main(void) {
-     void *test = cdda_verbose_set;
-     printf("%s\n", CDIO_VERSION);
-Index: gui/win32/interface.c
-===================================================================
---- gui/win32/interface.c	(revision 35421)
-+++ gui/win32/interface.c	(working copy)
-@@ -24,7 +24,7 @@
- #include "config.h"
- 
- #if defined(CONFIG_LIBCDIO)
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- #elif defined(CONFIG_CDDA)
- #include <cdda_interface.h>
- #endif
-Index: stream/stream_cdda.c
-===================================================================
---- stream/stream_cdda.c	(revision 35421)
-+++ stream/stream_cdda.c	(working copy)
-@@ -21,8 +21,8 @@
- #include <cdda_interface.h>
- #include <cdda_paranoia.h>
- #else
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- #endif
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/libre/mplayer-libre/include-samba-4.0.patch b/libre/mplayer-libre/include-samba-4.0.patch
deleted file mode 100644
index 2ed272b6a..000000000
--- a/libre/mplayer-libre/include-samba-4.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 946b8e345..000000000
--- a/libre/mplayer-libre/mplayer.desktop
+++ /dev/null
@@ -1,22 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=MPlayer Media Player
-Name[ca]=Reproductor multimèdia MPlayer
-Name[pl]=MPlayer odtwarzacz multimedialny 
-GenericName=Multimedia player
-Comment=Play movies and songs
-Comment[ca]=Reproduïu vídeos i cançons
-Comment[de]=Filme und Musik abspielen
-Comment[es]=Reproduzca vídeos y canciones
-Comment[fr]=Lecteur multimédia
-Comment[it]=Lettore multimediale
-Comment[zh]=多媒体播放器
-Comment[pl]=Odtwarzaj filmy i muzykę
-Icon=mplayer
-TryExec=mplayer
-Exec=mplayer %F
-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-libre/mplayer.png b/libre/mplayer-libre/mplayer.png
deleted file mode 100644
index 799769335..000000000
--- a/libre/mplayer-libre/mplayer.png
+++ /dev/null
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index b5bf62590..c18745c87 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103207 2013-12-30 05:16:47Z bpiotrowski $
+# $Id: PKGBUILD 104019 2014-01-14 16:12:02Z bpiotrowski $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
@@ -9,7 +9,7 @@
 _pkgname=mplayer-vaapi
 pkgname=mplayer-vaapi-libre
 pkgver=36265
-pkgrel=7
+pkgrel=8
 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/mplayer-vaapi-libre/cdio-includes.patch b/libre/mplayer-vaapi-libre/cdio-includes.patch
deleted file mode 100644
index 894650717..000000000
--- a/libre/mplayer-vaapi-libre/cdio-includes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: configure
-===================================================================
---- configure	(revision 35421)
-+++ configure	(working copy)
-@@ -5968,8 +5968,8 @@
-         cat > $TMPC << EOF
- #include <stdio.h>
- #include <cdio/version.h>
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- int main(void) {
-     void *test = cdda_verbose_set;
-     printf("%s\n", CDIO_VERSION);
-Index: gui/win32/interface.c
-===================================================================
---- gui/win32/interface.c	(revision 35421)
-+++ gui/win32/interface.c	(working copy)
-@@ -24,7 +24,7 @@
- #include "config.h"
-
- #if defined(CONFIG_LIBCDIO)
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- #elif defined(CONFIG_CDDA)
- #include <cdda_interface.h>
- #endif
-Index: stream/stream_cdda.c
-===================================================================
---- stream/stream_cdda.c	(revision 35421)
-+++ stream/stream_cdda.c	(working copy)
-@@ -21,8 +21,8 @@
- #include <cdda_interface.h>
- #include <cdda_paranoia.h>
- #else
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- #endif
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/libre/mplayer-vaapi-libre/mplayer-vaapi.install b/libre/mplayer-vaapi-libre/mplayer-vaapi.install
deleted file mode 100644
index a44f19aef..000000000
--- a/libre/mplayer-vaapi-libre/mplayer-vaapi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-post_upgrade() {
-  post_install
-}
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch b/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch
deleted file mode 100644
index f1c087377..000000000
--- a/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: sub/subreader.c
-===================================================================
---- sub/subreader.c	(revision 36284)
-+++ sub/subreader.c	(revision 36285)
-@@ -378,14 +378,14 @@
-     int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0;
- 
-     while (!current->text[0]) {
--        char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep;
-+        char line[LINE_LEN + 1], full_line[LINE_LEN + 1];
-         int i;
- 
-         /* Parse SubRip header */
-         if (!stream_read_line(st, line, LINE_LEN, utf16))
-             return NULL;
--        if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",
--                     &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10)
-+        if (sscanf(line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d",
-+                     &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8)
-             continue;
- 
-         current->start = h1 * 360000 + m1 * 6000 + s1 * 100 + ms1 / 10;
-@@ -442,7 +442,7 @@
- #endif
-     while (!current->text[0]) {
- 	if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL;
--	if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10)
-+	if ((len=sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8)
- 	    continue;
- 	current->start = a1*360000+a2*6000+a3*100+a4/10;
- 	current->end   = b1*360000+b2*6000+b3*100+b4/10;
-@@ -1123,7 +1123,7 @@
- 		{*uses_time=1;return SUB_MPL2;}
- 	if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d",     &i, &i, &i, &i, &i, &i, &i, &i)==8)
- 		{*uses_time=1;return SUB_SUBRIP;}
--	if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, (char *)&i, &i, &i, &i, &i, (char *)&i, &i)==10)
-+	if (sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", &i, &i, &i, &i, &i, &i, &i, &i)==8)
- 		{*uses_time=1;return SUB_SUBVIEWER;}
- 	if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i)==4)
- 		{*uses_time=1;return SUB_SUBVIEWER2;}
diff --git a/libre/mplayer-vaapi-libre/tweak-desktop-file.patch b/libre/mplayer-vaapi-libre/tweak-desktop-file.patch
deleted file mode 100644
index 606e356b0..000000000
--- a/libre/mplayer-vaapi-libre/tweak-desktop-file.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- mplayer.desktop.orig	2012-07-08 22:18:27.000000000 +0300
-+++ mplayer.desktop	2012-07-08 22:19:08.000000000 +0300
-@@ -23,8 +23,9 @@ Comment[fr]=Lit les films et musiques
- Comment[it]=Riproduce filmati e musica
- Comment[ja]=動画や音声のファイルを再生します
- Icon=mplayer
--TryExec=gmplayer
--Exec=gmplayer %F
-+TryExec=mplayer
-+Exec=mplayer -really-quiet %F
- Terminal=false
-+NoDisplay=true
- Categories=GTK;AudioVideo;Audio;Video;Player;TV;
- MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm;
diff --git a/libre/netsurf-libre/PKGBUILD b/libre/netsurf-libre/PKGBUILD
deleted file mode 100644
index bcb40c614..000000000
--- a/libre/netsurf-libre/PKGBUILD
+++ /dev/null
@@ -1,128 +0,0 @@
-# $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>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=netsurf
-pkgname=netsurf-libre
-pkgver=3.0
-pkgrel=5
-pkgdesc='Lightweight and fast web browser, without non-privacy search providers'
-arch=('x86_64' 'i686' 'mips64el')
-url='http://www.netsurf-browser.org/'
-license=('MIT' 'GPL2')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-depends=('gtk2' 'libmng' 'curl' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'libcss' 'libwebp' 'libdom' 'lcms') # 'libharu' 'gstreamer0.10'
-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"
-        'netsurf.sh')
-sha256sums=('f0dbcc5d80bf03d706aa8b28a322aa7f169a40813848c2d1505691f6e2c7ef00'
-            '7c6a48d3cc3e9a3e3a51b532ddf60f7697e97bf8b61a6d3b2ced1a2e89fbccc6'
-            '3efaf14b95c9aeb83caac488135bd5b6040d2ede382caa5589ff7ebd2bd506cc')
-
-prepare() {
-  cd "$_pkgname-$pkgver"
-
-  # remove non-privacy search providers
-  sed -i '\|Google|d
-          \|Yahoo|d
-          \|Bing|d
-          \|Business.com|d
-          \|Omgili|d
-          \|BBC News|d
-          \|Ubuntu Packages|d
-          \|Ask[.]com|d
-          \|Answers.com|d
-          \|Youtube|d
-          \|AeroMp3|d
-          \|AOL|d
-          \|Baidu|d
-          \|Amazon|d
-          \|Ebay|d
-          \|IMDB|d
-          \|ESPN|d
-          \|Aminet|d
-          \|OS4Depot|d
-          s|DuckDuckGo|DuckDuckGo HTML|
-          s|duckduckgo[.]com|duckduckgo.com/html|
-          s|duckduckgo[.]com/html/favicon.ico|duckduckgo.com/favicon.ico|
-          s|seeks-project.info|seeks.fr|g
-         ' gtk/res/SearchEngines \
-           \!NetSurf/Resources/SearchEngines \
-           amiga/resources/SearchEngines
-  sed -i '\|readable name such as| s|google|duckduckgo|
-          \|readable name such as| s|yahoo|seeks|
-          \|host address such as www[.]google[.]com| s|google[.]com|duckduckgo.com/html|
-          s|google[.]com?search=%s|duckduckgo.com/html/?q=%s|
-          \|return strdup| s|google[.]com|duckduckgo.com/html|
-          \|return strdup| s|google|duckduckgo|
-          \|return strdup| s|duckduckgo[.]com/html/favicon[.]ico|duckduckgo.com/favicon.ico|
-          s|www[.]google[.]com/search?q=%s|duckduckgo.com/html/?q=%s|
-         ' desktop/searchweb.c
-  sed -i 's|google[.][.a-z]\{0,6\}/search|duckduckgo.com/html/search|
-          s|Google-Suche|DuckDuckGo HTML|
-          s|Google Search|DuckDuckGo HTML|
-          s|Ricerca Google|DuckDuckGo HTML|
-          s|Google検索|DuckDuckGo HTML|
-          \|BBC News|d
-          \|Reuters|d
-          \|CNN|d
-          \|Slashdot|d
-          \|Ars Technica|d
-          \|The Register|d
-          \|W3C|d
-          s|google[.][.a-z]\{0,6\}|duckduckgo.com/html|
-          s|Google|DuckDuckGo HTML|
-          s|[.a-z]\{0,4\}yahoo[.]co[.a-z]\{0,4\}|www.seeks.fr|
-          s|Yahoo!|Seeks|
-          \|IMDB|d
-          s|The Icon Bar|Creative Commons|
-          s|www[.]iconbar[.]com|creativecommons.org|
-          s|ROOL|Dictionary.com|
-          s|www[.]riscosopen[.]org|dictionary.reference.com|
-          \|riscos.info|d
-         ' \!NetSurf/Resources/de/welcome.html\,faf \
-           \!NetSurf/Resources/en/welcome.html\,faf \
-           \!NetSurf/Resources/it/welcome.html\,faf \
-           \!NetSurf/Resources/ja/welcome.html\,faf
-
-  addinclude image/rsvg.c stdio
-  addinclude image/mng.c stdio
-  addinclude image/png.c stdio
-
-  gendesk --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --exec 'netsurf %U' \
-    --genericname 'Web Browser' --comment 'Lightweight web browser' \
-    --mimetypes 'text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo'
-}
-
-build() {
-  cd "$_pkgname-$pkgver"
-
-  make \
-    PREFIX=/usr \
-    TARGET=gtk \
-    NETSURF_USE_WEBP=YES \
-    NETSURF_USE_VIDEO=NO \
-    NETSURF_USE_MOZILLA_JS=YES \
-    NETSURF_USE_HARU_PDF=NO
-}
-
-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"
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/netsurf-libre/netsurf.install b/libre/netsurf-libre/netsurf.install
deleted file mode 100644
index 98f3ea190..000000000
--- a/libre/netsurf-libre/netsurf.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_upgrade() {
-  #gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_install() {
-  post_upgrade
-}
-
-post_remove() {
-  post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/netsurf-libre/netsurf.sh b/libre/netsurf-libre/netsurf.sh
deleted file mode 100644
index 49b1e161e..000000000
--- a/libre/netsurf-libre/netsurf.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/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
deleted file mode 100644
index 58569aafc..000000000
--- a/libre/newton-dynamics-libre/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 84449 2013-02-19 04:20:15Z svenstaro $
-# 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@parabola.nu>
-_pkgname=newton-dynamics
-pkgname=newton-dynamics-libre
-pkgver=2.36
-pkgrel=1
-pkgdesc="A simple physics API"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.newtondynamics.com"
-license=('custom')
-depends=()
-makedepends=('unar')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-source=("http://newton-dynamics.googlecode.com/files/newton-dynamics-${pkgver}.rar")
-noextract=("newton-dynamics-${pkgver}.rar")
-md5sums=('0dffa112d0a6ea39ad9e904e555da69a')
-
-build() {
-  _srcdir="${srcdir}/newton-dynamics-${pkgver}"
-  [[ "$CARCH" = "i686" ]]  && platform="linux32"
-  [[ "$CARCH" = "x86_64" ]] && platform="linux64"
-  builddir="${_srcdir}/coreLibrary_200/projets/${platform}"
-
-  # clean build directory
-  [[ -d "${_srcdir}" ]] && rm -Rf "${_srcdir}"
-
-  # decompress package
-  cd "${srcdir}"
-  unar "newton-dynamics-${pkgver}.rar"
-
-  # needed for building
-  mkdir -p "${_srcdir}/packages/${platform}"
-  
-  ## build lib
-  cd "${builddir}"
-  sed -i 's/ -o libNewton.so/ -lpthread -lstdc++ -o libNewton.so/' makefile
-  sed -i 's/Debug\.cpp.*$/Debug \\/g' makefile
-  make
-}
-
-package() {
-  install -D -m644 "${builddir}/libNewton.a" "${pkgdir}/usr/lib/libNewton.a"
-  install -D -m755 "${builddir}/libNewton.so" "${pkgdir}/usr/lib/libNewton.so"
-  install -D -m644 "${_srcdir}/coreLibrary_200/source/newton/Newton.h" "${pkgdir}/usr/include/Newton.h"
-}
diff --git a/libre/newton-dynamics-libre/assert-fix.patch b/libre/newton-dynamics-libre/assert-fix.patch
deleted file mode 100644
index 83dfdd790..000000000
--- a/libre/newton-dynamics-libre/assert-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: source/core/dgTypes.cpp
-===================================================================
---- source/core/dgTypes.cpp	(revision 506)
-+++ source/core/dgTypes.cpp	(working copy)
-@@ -515,7 +515,7 @@
- 		return 0;

- 	}

- 	_ASSERTE (compareCount <= dgInt32 (strideInBytes / sizeof (dgFloat64)));

--	_ASSERT (strideInBytes == dgInt32 (sizeof (dgFloat64) * (strideInBytes / sizeof (dgFloat64))));

-+	_ASSERTE (strideInBytes == dgInt32 (sizeof (dgFloat64) * (strideInBytes / sizeof (dgFloat64))));

- 

- 	dgInt32 stride = strideInBytes / dgInt32 (sizeof (dgFloat64));

- 	dgInt32 stride2 = stride + 2;

diff --git a/libre/ogmrip-libre/PKGBUILD b/libre/ogmrip-libre/PKGBUILD
deleted file mode 100644
index ef0fc1202..000000000
--- a/libre/ogmrip-libre/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 103017 2013-12-25 16:56:14Z jlichtblau $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Daenyth
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Vrob (Markus Heuser) mheuser@mi.fu-berlin.de
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=ogmrip
-pkgname=ogmrip-libre
-pkgver=1.0.0
-pkgrel=3
-pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder, without nonfree faac support"
-arch=('i686' 'x86_64')
-url="http://ogmrip.sourceforge.net/"
-license=('GPL')
-depends=('libdvdread>=4.1.3' 'mplayer' 'mencoder' 'enca' 'pkg-config' 'gconf' 'libglade' 'libnotify' 'enchant')
-makedepends=('patch' 'intltool' 'perl-xml-parser' 'lame' 'mkvtoolnix' 'libtheora' 'ogmtools' 'gpac' 'vorbis-tools' 'tesseract')
-optdepends=('lame: support for the MP3 audio codec'
-            'mkvtoolnix: create, alter, and inspect Matroska files'
-            'libtheora: decode and encode Ogg Theora files'
-            'ogmtools: support for the Ogg Media container'
-            'gpac: support for the MP4 container'
-            'vorbis-tools: support for the Ogg Vorbis audio codec'
-            'gocr: support for the SRT subtitle format'
-            'ocrad: support for the SRT subtitle format'
-            'tesseract: support for the SRT subtitle format')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-options=('!makeflags')
-changelog=$_pkgname.changelog
-install=$_pkgname.install
-source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
-sha256sums=('6848a622152a62899b6e876e70ec36df1af7be9803b8b9c809ed631196bc18cc')
-
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/usr/share
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/libre/ogmrip-libre/ogmrip.changelog b/libre/ogmrip-libre/ogmrip.changelog
deleted file mode 100644
index f1927f864..000000000
--- a/libre/ogmrip-libre/ogmrip.changelog
+++ /dev/null
@@ -1,33 +0,0 @@
-2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* ogmrip 1.0.0-3 static libraries removed
-
-2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* ogmrip 1.0.0-1
-
-2013-03-13 André Silva <emulatorman@parabola.nu>
-	* Remove nonfree faac support
-
-2012-06-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* ogmrip O.13.8-1
-
-2012-01-26  Eric Belanger  <eric@archlinux.org>
-	* Rebuild against libpng 1.5 and libtiff 4.0
-	* Add .install file
-
-2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* ogmrip O.13.7-1
-
-2010-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* ogmrip O.13.6-1
-
-2010-06-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release O.13.5
-
-2010-04-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release O.13.4
-
-2010-01-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* FS#17517 fixed in minor release O.13.3-2
-
-2010-01-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release O.13.3
diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD
index 57c001e61..9648e5f24 100644
--- a/libre/ogre-libre/PKGBUILD
+++ b/libre/ogre-libre/PKGBUILD
@@ -43,16 +43,44 @@ makedepends=(
   mercurial
   ttf-dejavu
 )
-source=(
+mksource=(
   ogre::hg+https://bitbucket.org/sinbad/ogre/src#tag=v${pkgver//./-}
+  libre.patch
 )
-sha512sums=(
+source=(
+  https://repo.parabolagnulinux.org/other/$pkgbase/$pkgbase-libre-$pkgver.tar.xz
+)
+mksha512sums=(
   SKIP
+  e668b39e4784e4b1b17ec6e21b5cef45f29a8d8e73288817ce7832d1fe24527d5e0d4fd67b8f756db301e4211ceac2d5c387c1599e799ca41de0593457204767
+)
+sha512sums=(
+  9be9dbd78e09c8c50cf833004bfa3fbb7b3cd2a0f52a4e8c4beb1eb30357625455d65906bd007be6c2be9cf90a0e335d5ad7c5011e038c3d0754d5b3b18c4a2a
 )
 
+mksource() {
+  cd ${pkgbase}
+
+  # remove nonfree files
+  rm -v RenderSystems/GL/include/GL/{gl{,ext},wglext,glx{tokens,ext}}.h
+  rm -v RenderSystems/GL3Plus/include/GL/glxtokens-backup.h
+  rm -rv Samples/Media/materials/textures/nvidia
+  rm -v Samples/Media/packs/chiropteraDM.{pk3,txt}
+  rm -v CMake/Templates/quakemap{,_d}.cfg.in
+  patch -Np1 -i $srcdir/libre.patch
+}
+
 build() {
   cd ${pkgbase}
 
+  # add symlinks to point to mesa header files
+  cd RenderSystems/GL/include/GL
+  ln -sv /usr/include/GL/gl.h gl.h
+  ln -sv /usr/include/GL/glext.h glext.h
+  ln -sv /usr/include/GL/wglext.h wglext.h
+  ln -sv /usr/include/GL/glxtokens.h glxtokens.h
+  ln -sv /usr/include/GL/glxext.h glxext.h
+
   # get a clean build dir
   [[ -d build ]] && rm -vrf build
   mkdir -v build && cd build
diff --git a/libre/ogre-libre/libre.patch b/libre/ogre-libre/libre.patch
new file mode 100644
index 000000000..77c32c8d4
--- /dev/null
+++ b/libre/ogre-libre/libre.patch
@@ -0,0 +1,694 @@
+diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cmake
+--- ogre.orig/CMake/InstallResources.cmake	2014-01-15 01:56:25.549401653 -0200
++++ ogre/CMake/InstallResources.cmake	2014-01-21 21:24:52.510763877 -0200
+@@ -116,9 +116,6 @@
+ # create plugins.cfg
+ configure_file(${OGRE_TEMPLATES_DIR}/plugins_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg)
+ configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg)
+-# create quakemap.cfg
+-configure_file(${OGRE_TEMPLATES_DIR}/quakemap_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg)
+-configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg)
+ # create samples.cfg
+ configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg)
+ configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg)
+@@ -219,11 +216,6 @@
+   configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/release/plugins.cfg)
+   configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/plugins.cfg)
+   configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/plugins.cfg)
+-  # create quakemap.cfg
+-  configure_file(${OGRE_TEMPLATES_DIR}/quakemap_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/quakemap_d.cfg)
+-  configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/release/quakemap.cfg)
+-  configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/quakemap.cfg)
+-  configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/quakemap.cfg)
+   # create samples.cfg
+   configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/samples_d.cfg)
+   configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/bin/release/samples.cfg)
+diff -Nur ogre.orig/CMake/Templates/demomedia.wxi.in ogre/CMake/Templates/demomedia.wxi.in
+--- ogre.orig/CMake/Templates/demomedia.wxi.in	2014-01-15 01:56:25.652728172 -0200
++++ ogre/CMake/Templates/demomedia.wxi.in	2014-01-21 21:49:24.962291640 -0200
+@@ -295,13 +295,6 @@
+             <ComponentRef Id="cmpA1FEB51B0386689568AAFC22E0D71B6B" />
+             <ComponentRef Id="cmpA3F7363F0553143ABF1CA52A2FD433D6" />
+             <ComponentRef Id="cmp0344A18C23958D312C044A6E8443CD9D" />
+-            <ComponentRef Id="cmp30B19313C1A692A69AC9C275E4E5D5CC" />
+-            <ComponentRef Id="cmp376B3837DF007338AC14AB58C726A8B1" />
+-            <ComponentRef Id="cmp02B151F3B587EAF5AF116E6A3B09E247" />
+-            <ComponentRef Id="cmpFA2310874B7C3D5229AF9BEACAF6746A" />
+-            <ComponentRef Id="cmpB11E2174087D0D3FC791806231C1DBF5" />
+-            <ComponentRef Id="cmpF00ABD2DB6C6A8D718E0E4B5CD6B1C09" />
+-            <ComponentRef Id="cmpA603C50287BBE370F0BDF5FBE7A3233F" />
+             <ComponentRef Id="cmpEA39DA48CA01586DF3412795541AD2FC" />
+             <ComponentRef Id="cmp50C3E068724D3C32847EEB132308B147" />
+             <ComponentRef Id="cmp78D10E140133F6977C74A8F912B2B217" />
+@@ -328,8 +321,6 @@
+             <ComponentRef Id="cmpDFD58144C55506C82E22CF1AC14714B8" />
+             <ComponentRef Id="cmp9BF13256D468C8147B7050A93B09C032" />
+             <ComponentRef Id="cmp86F908FD9E8E5FFAD0C2D9A37A098E4C" />
+-            <ComponentRef Id="cmpDEED3FE7C35E18D0FA59B8BB3DF42244" />
+-            <ComponentRef Id="cmp98499D3076FA7324AFE1F9F8D10FB421" />
+             <ComponentRef Id="cmp532E67011B733ACE674692F6ED52775D" />
+             <ComponentRef Id="cmp572AE70CCC0D85E8DA35F87B45768634" />
+             <ComponentRef Id="cmp013036935784DEC9BAE62831C93EFA18" />
+@@ -1338,29 +1329,6 @@
+                         <Component Id="cmp0344A18C23958D312C044A6E8443CD9D" Guid="{E47FE6B7-B6BD-4FCA-A903-87281A6B8CEB}">
+                             <File Id="fil39C72570EB0CBAC9AF4FF900C2D5D525" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\WoodPallet.png" />
+                         </Component>
+-                        <Directory Id="dir11696C93BEAB38C45931BCBDDB2A6789" Name="nvidia">
+-                            <Component Id="cmp30B19313C1A692A69AC9C275E4E5D5CC" Guid="{68CA4BF9-5A51-400F-B5C2-701A4DA8D331}">
+-                                <File Id="fil40BA6B2C4D12AD2C5710179390B9D2DB" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds" />
+-                            </Component>
+-                            <Component Id="cmp376B3837DF007338AC14AB58C726A8B1" Guid="{CF5BBEF1-4E44-46E9-8373-4FF589D19F6F}">
+-                                <File Id="fil6A9EC7DE38E4F700741187344AAB9A4C" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\dirt_grayrocky_normalheight.dds" />
+-                            </Component>
+-                            <Component Id="cmp02B151F3B587EAF5AF116E6A3B09E247" Guid="{EB6D162E-A67A-4CD1-948D-66B84457AFBD}">
+-                                <File Id="fil30FFE3069E40D44C734E168BEB336DA0" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\grass_green-01_diffusespecular.dds" />
+-                            </Component>
+-                            <Component Id="cmpFA2310874B7C3D5229AF9BEACAF6746A" Guid="{C6E468AC-67EE-44C6-9F01-69D369D966FC}">
+-                                <File Id="fil4C7A93A8C53E76F5F5ED65D1F52659DD" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\grass_green-01_normalheight.dds" />
+-                            </Component>
+-                            <Component Id="cmpB11E2174087D0D3FC791806231C1DBF5" Guid="{3A30B7B3-6D8D-4475-B31E-5626B54DD65B}">
+-                                <File Id="fil909FAC7A36B3EA5B9F4660701BEC09F5" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds" />
+-                            </Component>
+-                            <Component Id="cmpF00ABD2DB6C6A8D718E0E4B5CD6B1C09" Guid="{EE4979FF-6320-432A-98B2-F183BCAC197A}">
+-                                <File Id="fil23D0DB8C9CA160970B9C29DD8F77B5CF" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds" />
+-                            </Component>
+-                            <Component Id="cmpA603C50287BBE370F0BDF5FBE7A3233F" Guid="{E8AD7243-C2F2-4C00-AE8E-DC38E20927FA}">
+-                                <File Id="fil6A4613F0DA3B5B562C5C68C05DFF0171" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\TextureUsageAgreement.txt" />
+-                            </Component>
+-                        </Directory>
+                     </Directory>
+                 </Directory>
+                 <Directory Id="dir01544E63CCE21518F3D56A0A93D1DC4A" Name="models">
+@@ -1444,12 +1412,6 @@
+                     </Component>
+                 </Directory>
+                 <Directory Id="dir4ABFE5E33570C5CDD587CDA5FEC53CBC" Name="packs">
+-                    <Component Id="cmpDEED3FE7C35E18D0FA59B8BB3DF42244" Guid="{5B8E1BED-1BC5-4A20-BA09-9699D0AF7BFC}">
+-                        <File Id="fil43F38AE712D50BF0076D8C8E08E3264C" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\chiropteraDM.pk3" />
+-                    </Component>
+-                    <Component Id="cmp98499D3076FA7324AFE1F9F8D10FB421" Guid="{38CA3EF3-96E4-47D1-8B4C-682BCCF91E99}">
+-                        <File Id="fil98BCB56BE20EF36A4F72F07CDADC63DE" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\chiropteraDM.txt" />
+-                    </Component>
+                     <Component Id="cmp532E67011B733ACE674692F6ED52775D" Guid="{9AC3FA7E-FBDC-4448-A61B-615EF43EB923}">
+                         <File Id="filC6E116063CEC1DFBE1D6B452FD089931" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\cubemap.zip" />
+                     </Component>
+@@ -1794,4 +1756,4 @@
+             </Directory>
+         </DirectoryRef>
+     </Fragment>
+-</Include>
+\ No newline at end of file
++</Include>
+diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj
+--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj	2014-01-15 01:56:25.872713663 -0200
++++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj	2014-01-21 22:20:00.343185180 -0200
+@@ -555,48 +555,6 @@
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+     </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds">
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+-      <DeploymentContent>true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+-    </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_normalheight.dds">
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+-      <DeploymentContent>true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+-    </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_diffusespecular.dds">
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+-      <DeploymentContent>true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+-    </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_normalheight.dds">
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+-      <DeploymentContent>true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+-    </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds">
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+-      <DeploymentContent>true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+-    </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds">
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+-      <DeploymentContent>true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+-    </None>
+     <None Include="..\..\Media\materials\textures\ogreborder.png">
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+@@ -3671,15 +3629,6 @@
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+     </None>
+-    <None Include="..\..\Media\packs\chiropteraDM.pk3">
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+-      <DeploymentContent>true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+-    </None>
+     <None Include="..\..\Media\packs\cubemap.zip">
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+@@ -4867,20 +4816,6 @@
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+     </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\TextureUsageAgreement.txt">
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+-      <DeploymentContent>true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+-    </None>
+-    <None Include="..\..\Media\packs\chiropteraDM.txt">
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+-      <DeploymentContent>true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+-    </None>
+     <None Include="..\..\Media\RTShaderLib\cache\dummy.txt">
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+@@ -4893,4 +4828,4 @@
+   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
+   <ImportGroup Label="ExtensionTargets">
+   </ImportGroup>
+-</Project>
+\ No newline at end of file
++</Project>
+diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters
+--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters	2014-01-15 01:56:25.872713663 -0200
++++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters	2014-01-21 22:20:41.517291770 -0200
+@@ -628,9 +628,6 @@
+     <None Include="..\..\Media\models\Barrel.mesh">
+       <Filter>Assets\media</Filter>
+     </None>
+-    <None Include="..\..\Media\packs\chiropteraDM.pk3">
+-      <Filter>Assets\media</Filter>
+-    </None>
+     <None Include="..\..\Media\models\column.mesh">
+       <Filter>Assets\media</Filter>
+     </None>
+@@ -1075,9 +1072,6 @@
+     <None Include="..\..\Media\materials\textures\checker.png">
+       <Filter>Assets\media</Filter>
+     </None>
+-    <None Include="..\..\Media\packs\chiropteraDM.txt">
+-      <Filter>Assets\media</Filter>
+-    </None>
+     <None Include="..\..\Media\materials\textures\Chrome.jpg">
+       <Filter>Assets\media</Filter>
+     </None>
+@@ -1105,12 +1099,6 @@
+     <None Include="..\..\Media\materials\textures\dirt01.jpg">
+       <Filter>Assets\media</Filter>
+     </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds">
+-      <Filter>Assets\media</Filter>
+-    </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_normalheight.dds">
+-      <Filter>Assets\media</Filter>
+-    </None>
+     <None Include="..\..\Media\materials\textures\dkyellow.png">
+       <Filter>Assets\media</Filter>
+     </None>
+@@ -1168,24 +1156,12 @@
+     <None Include="..\..\Media\materials\textures\grass_1024.jpg">
+       <Filter>Assets\media</Filter>
+     </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_diffusespecular.dds">
+-      <Filter>Assets\media</Filter>
+-    </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_normalheight.dds">
+-      <Filter>Assets\media</Filter>
+-    </None>
+     <None Include="..\..\Media\materials\textures\SSAO\gray256.png">
+       <Filter>Assets\media</Filter>
+     </None>
+     <None Include="..\..\Media\materials\textures\GreenSkin.jpg">
+       <Filter>Assets\media</Filter>
+     </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds">
+-      <Filter>Assets\media</Filter>
+-    </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds">
+-      <Filter>Assets\media</Filter>
+-    </None>
+     <None Include="..\..\Media\materials\programs\HLSL\hdr.hlsl">
+       <Filter>Assets\media</Filter>
+     </None>
+@@ -1492,9 +1468,6 @@
+     <None Include="..\..\Media\materials\textures\TextureAtlasSampleWrap0.png">
+       <Filter>Assets\media</Filter>
+     </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\TextureUsageAgreement.txt">
+-      <Filter>Assets\media</Filter>
+-    </None>
+     <None Include="..\..\Media\thumbnails\thumb_bezier.png">
+       <Filter>Assets\media</Filter>
+     </None>
+@@ -1658,4 +1631,4 @@
+       <Filter>Assets\media</Filter>
+     </None>
+   </ItemGroup>
+-</Project>
+\ No newline at end of file
++</Project>
+diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj
+--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj	2014-01-15 01:56:25.896045457 -0200
++++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj	2014-01-21 21:53:56.997551091 -0200
+@@ -4356,21 +4356,6 @@
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+     </None>
+-    <None Include="..\..\Media\packs\chiropteraDM.pk3">
+-      <DeploymentContent>true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+-    </None>
+     <None Include="..\..\Media\packs\cubemap.zip">
+       <DeploymentContent>true</DeploymentContent>
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+@@ -6443,96 +6428,6 @@
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+     </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds">
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
+-      <DeploymentContent>true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+-    </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_normalheight.dds">
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
+-      <DeploymentContent>true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+-    </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_diffusespecular.dds">
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
+-      <DeploymentContent>true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+-    </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_normalheight.dds">
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
+-      <DeploymentContent>true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+-    </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds">
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
+-      <DeploymentContent>true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+-    </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds">
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
+-      <DeploymentContent>true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+-    </None>
+     <None Include="..\..\Media\materials\textures\ogreborder.png">
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+@@ -9014,36 +8909,6 @@
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+     </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\TextureUsageAgreement.txt">
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
+-      <DeploymentContent>true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+-    </None>
+-    <None Include="..\..\Media\packs\chiropteraDM.txt">
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild>
+-      <DeploymentContent>true</DeploymentContent>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
+-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
+-    </None>
+     <None Include="..\..\Media\RTShaderLib\cache\dummy.txt">
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild>
+@@ -9264,4 +9129,4 @@
+   <Import Condition="'$(Configuration)'=='Phone Debug' or '$(Configuration)'=='Phone Release'" Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
+   <ImportGroup Label="ExtensionTargets">
+   </ImportGroup>
+-</Project>
+\ No newline at end of file
++</Project>
+diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters
+--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters	2014-01-15 01:56:25.899378571 -0200
++++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters	2014-01-21 21:54:56.166945128 -0200
+@@ -731,9 +731,6 @@
+     <None Include="..\..\Media\models\Barrel.mesh">
+       <Filter>Assets\media</Filter>
+     </None>
+-    <None Include="..\..\Media\packs\chiropteraDM.pk3">
+-      <Filter>Assets\media</Filter>
+-    </None>
+     <None Include="..\..\Media\models\column.mesh">
+       <Filter>Assets\media</Filter>
+     </None>
+@@ -1154,9 +1151,6 @@
+     <None Include="..\..\Media\materials\textures\checker.png">
+       <Filter>Assets\media</Filter>
+     </None>
+-    <None Include="..\..\Media\packs\chiropteraDM.txt">
+-      <Filter>Assets\media</Filter>
+-    </None>
+     <None Include="..\..\Media\materials\textures\Chrome.jpg">
+       <Filter>Assets\media</Filter>
+     </None>
+@@ -1184,12 +1178,6 @@
+     <None Include="..\..\Media\materials\textures\dirt01.jpg">
+       <Filter>Assets\media</Filter>
+     </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds">
+-      <Filter>Assets\media</Filter>
+-    </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_normalheight.dds">
+-      <Filter>Assets\media</Filter>
+-    </None>
+     <None Include="..\..\Media\materials\textures\dkyellow.png">
+       <Filter>Assets\media</Filter>
+     </None>
+@@ -1247,24 +1235,12 @@
+     <None Include="..\..\Media\materials\textures\grass_1024.jpg">
+       <Filter>Assets\media</Filter>
+     </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_diffusespecular.dds">
+-      <Filter>Assets\media</Filter>
+-    </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_normalheight.dds">
+-      <Filter>Assets\media</Filter>
+-    </None>
+     <None Include="..\..\Media\materials\textures\SSAO\gray256.png">
+       <Filter>Assets\media</Filter>
+     </None>
+     <None Include="..\..\Media\materials\textures\GreenSkin.jpg">
+       <Filter>Assets\media</Filter>
+     </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds">
+-      <Filter>Assets\media</Filter>
+-    </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds">
+-      <Filter>Assets\media</Filter>
+-    </None>
+     <None Include="..\..\Media\materials\programs\HLSL\hdr.hlsl">
+       <Filter>Assets\media</Filter>
+     </None>
+@@ -1571,9 +1547,6 @@
+     <None Include="..\..\Media\materials\textures\TextureAtlasSampleWrap0.png">
+       <Filter>Assets\media</Filter>
+     </None>
+-    <None Include="..\..\Media\materials\textures\nvidia\TextureUsageAgreement.txt">
+-      <Filter>Assets\media</Filter>
+-    </None>
+     <None Include="..\..\Media\thumbnails\thumb_bezier.png">
+       <Filter>Assets\media</Filter>
+     </None>
+@@ -1775,4 +1748,4 @@
+       <Filter>Assets\for WMAppManifest</Filter>
+     </Image>
+   </ItemGroup>
+-</Project>
+\ No newline at end of file
++</Project>
+diff -Nur ogre.orig/Samples/CMakeLists.txt ogre/Samples/CMakeLists.txt
+--- ogre.orig/Samples/CMakeLists.txt	2014-01-15 01:56:25.932709706 -0200
++++ ogre/Samples/CMakeLists.txt	2014-01-21 21:23:53.145016405 -0200
+@@ -238,7 +238,6 @@
+ 	set(OGRE_MEDIA_DIR_TMP ${OGRE_MEDIA_DIR_REL})
+ 	set(OGRE_MEDIA_DIR_REL "Media")
+     configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/resources.cfg @ONLY)
+-    configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/quakemap.cfg @ONLY)
+ 	# restore
+ 	set(OGRE_MEDIA_DIR_REL ${OGRE_MEDIA_DIR_TMP})
+     add_custom_target(demo_installer 
+diff -Nur ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h ogre/Samples/EndlessWorld/include/EndlessWorld.h
+--- ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h	2014-01-15 01:56:26.186026332 -0200
++++ ogre/Samples/EndlessWorld/include/EndlessWorld.h	2014-01-21 21:51:44.043058960 -0200
+@@ -304,17 +304,6 @@
+ 		defaultimp.inputScale = 600;
+ 		defaultimp.minBatchSize = 33;
+ 		defaultimp.maxBatchSize = 65;
+-		// textures
+-		defaultimp.layerList.resize(3);
+-		defaultimp.layerList[0].worldSize = 100;
+-		defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds");
+-		defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds");
+-		defaultimp.layerList[1].worldSize = 30;
+-		defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds");
+-		defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds");
+-		defaultimp.layerList[2].worldSize = 200;
+-		defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds");
+-		defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds");
+ 	}
+ 
+ 	/*-----------------------------------------------------------------------------
+diff -Nur ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material ogre/Samples/Media/volumeTerrain/triplanarReference.material
+--- ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material	2014-01-15 01:56:27.849249967 -0200
++++ ogre/Samples/Media/volumeTerrain/triplanarReference.material	2014-01-21 22:24:19.433708607 -0200
+@@ -11,36 +11,6 @@
+             fragment_program_ref TriplanarReferenceHigh_PS    
+             {
+             }
+-            texture_unit
+-            {
+-                texture_alias fromX
+-                texture dirt_grayrocky_diffusespecular.dds
+-            }
+-            texture_unit
+-            {
+-                texture_alias fromXNormal
+-                texture dirt_grayrocky_normalheight.dds
+-            }
+-            texture_unit
+-            {
+-                texture_alias fromY
+-                texture grass_green-01_diffusespecular.dds
+-            }
+-            texture_unit
+-            {
+-                texture_alias fromYNormal
+-                texture grass_green-01_normalheight.dds
+-            }
+-            texture_unit
+-            {
+-                texture_alias fromZ
+-                texture growth_weirdfungus-03_diffusespecular.dds
+-            }
+-            texture_unit
+-            {
+-                texture_alias fromZNormal
+-                texture growth_weirdfungus-03_normalheight.dds
+-            }
+         }
+     }
+ }
+@@ -57,36 +27,6 @@
+             fragment_program_ref TriplanarReferenceLow_PS    
+             {
+             }
+-            texture_unit
+-            {
+-                texture_alias fromX
+-                texture dirt_grayrocky_diffusespecular.dds
+-            }
+-            texture_unit
+-            {
+-                texture_alias fromXNormal
+-                texture dirt_grayrocky_normalheight.dds
+-            }
+-            texture_unit
+-            {
+-                texture_alias fromY
+-                texture grass_green-01_diffusespecular.dds
+-            }
+-            texture_unit
+-            {
+-                texture_alias fromYNormal
+-                texture grass_green-01_normalheight.dds
+-            }
+-            texture_unit
+-            {
+-                texture_alias fromZ
+-                texture growth_weirdfungus-03_diffusespecular.dds
+-            }
+-            texture_unit
+-            {
+-                texture_alias fromZNormal
+-                texture growth_weirdfungus-03_normalheight.dds
+-            }
+         }
+     }
+ }
+@@ -101,4 +41,4 @@
+ 			diffuse 1.0 1.0 1.0
+ 		}
+ 	}
+-}
+\ No newline at end of file
++}
+diff -Nur ogre.orig/Samples/Terrain/include/Terrain.h ogre/Samples/Terrain/include/Terrain.h
+--- ogre.orig/Samples/Terrain/include/Terrain.h	2014-01-15 01:56:28.209226225 -0200
++++ ogre/Samples/Terrain/include/Terrain.h	2014-01-21 21:55:51.099952029 -0200
+@@ -533,17 +533,6 @@
+ 		defaultimp.inputScale = 600;
+ 		defaultimp.minBatchSize = 33;
+ 		defaultimp.maxBatchSize = 65;
+-		// textures
+-		defaultimp.layerList.resize(3);
+-		defaultimp.layerList[0].worldSize = 100;
+-		defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds");
+-		defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds");
+-		defaultimp.layerList[1].worldSize = 30;
+-		defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds");
+-		defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds");
+-		defaultimp.layerList[2].worldSize = 200;
+-		defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds");
+-		defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds");
+ 
+ 
+ 	}
+diff -Nur ogre.orig/Tests/PlayPen/src/PlayPen.cpp ogre/Tests/PlayPen/src/PlayPen.cpp
+--- ogre.orig/Tests/PlayPen/src/PlayPen.cpp	2014-01-15 01:56:28.309219629 -0200
++++ ogre/Tests/PlayPen/src/PlayPen.cpp	2014-01-21 22:31:02.415114645 -0200
+@@ -411,16 +411,6 @@
+ //				mTerrain->update();
+ //				updateDelay = 0.3;
+ //			}
+-//			/*
+-//			if (mKeyboard->isKeyDown(OIS::KC_M) && updateDelay <= 0)
+-//			{
+-//				StringVector texNames;
+-//				texNames.push_back("growth_weirdfungus-03_diffusespecular.dds");
+-//				texNames.push_back("growth_weirdfungus-03_normalheight.dds");
+-//				mTerrain->addLayer(500, &texNames);
+-//				updateDelay = 0.3;
+-//			}
+-//			*/
+ //			updateDelay -= evt.timeSinceLastFrame;
+ //		}
+ //#endif
+@@ -8185,17 +8175,6 @@
+ //		imp.inputScale = 600;
+ //		imp.minBatchSize = 33;
+ //		imp.maxBatchSize = 65;
+-//		// textures
+-//		imp.layerList.resize(3);
+-//		imp.layerList[0].worldSize = 100;
+-//		imp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds");
+-//		imp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds");
+-//		imp.layerList[1].worldSize = 30;
+-//		imp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds");
+-//		imp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds");
+-//		imp.layerList[2].worldSize = 200;
+-//		imp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds");
+-//		imp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds");
+ //		terrain->prepare(imp);
+ //		terrain->load();
+ //
diff --git a/libre/opencollada/PKGBUILD b/libre/opencollada/PKGBUILD
deleted file mode 100644
index d6ec1b979..000000000
--- a/libre/opencollada/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=opencollada
-pkgver=20130413
-pkgrel=1
-pkgdesc="Stream based reader and writer library for COLLADA files (built for the blender-libre package)"
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url=https://github.com/KhronosGroup/OpenCOLLADA
-license=GPL
-depends=(
-  libxml2
-  pcre
-)
-makedepends=(
-  git
-  cmake
-)
-source=git://github.com/KhronosGroup/OpenCOLLADA.git
-sha512sums=SKIP
-
-prepare() {
-  cd $srcdir/OpenCOLLADA
-
-  # adapt source to last blender release
-  git reset --hard 9665d1614b027ffd7815dc745c4fab4d69eb3321 # Sat Apr 13 01:27:39 2013 -0700
-
-  [[ -d build ]] && rm -r build
-  mkdir build
-}
-
-build() {
-  cd $srcdir/OpenCOLLADA/build
-
-  setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/OpenCOLLADA/build
-
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  install -d  $pkgdir/etc/ld.so.conf.d
-  echo /usr/lib/$pkgname > $pkgdir/etc/ld.so.conf.d/$pkgname.conf
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/openexr-libre/PKGBUILD b/libre/openexr-libre/PKGBUILD
deleted file mode 100644
index 36eeb00ef..000000000
--- a/libre/openexr-libre/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 196943 2013-10-21 10:31:44Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=openexr
-pkgname=openexr-libre
-pkgver=2.0.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')
-license=('BSD')
-depends=('zlib' 'ilmbase')
-makedepends=('libcups' 'libxinerama')
-[ "$CARCH" != "mips64el" ] && makedepends+=('libreoffice-writer' 'jre7-openjdk-headless')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-options=('!libtool')
-source=("http://download.savannah.nongnu.org/releases/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
-        "http://repo.parabolagnulinux.org/other/${pkgname}/MultiViewOpenEXR.odt"
-        "http://repo.parabolagnulinux.org/other/${pkgname}/OpenEXRFileLayout.odt"
-        "http://repo.parabolagnulinux.org/other/${pkgname}/ReadingAndWritingImageFiles.odt"
-        "http://repo.parabolagnulinux.org/other/${pkgname}/TechnicalIntroduction.odt")
-noextract=(MultiViewOpenEXR.odt OpenEXRFileLayout.odt ReadingAndWritingImageFiles.odt TechnicalIntroduction.odt)
-
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  [ "$CARCH" = "mips64el" ] && sed -i 's/ doc //' Makefile.in  # no libreoffice yet
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  # remove documentation with embedded nonfree fonts
-  rm -rv "doc/"{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.pdf
-
-  # add source documentation with free fonts
-  install -m644 -v "${srcdir}/"{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt doc
-
-  if [ "$CARCH" != "mips64el" ]; then
-    # convert documentation to pdf format
-    cd doc
-
-    for x in ${noextract[@]}; do
-      libreoffice --headless --invisible --convert-to pdf ${x}
-    done
-
-    cd ..
-  fi
-
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
-
-  install -m644 "doc/"{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt "${pkgdir}/usr/share/doc/OpenEXR-${pkgver}"
-}
-md5sums=('4387e6050d2faa65dd5215618ff2ddce'
-         '69f117d3c91827e5de47f1e00137a4cc'
-         '4d5ffa31f9af63bd5c621c6cbac6c673'
-         'de099240193d8a51086dfae914fff3cf'
-         'ece8bf90d438b89c6bd9fe4a89cc318a')
diff --git a/libre/openexr-libre/gcc43.patch b/libre/openexr-libre/gcc43.patch
deleted file mode 100644
index ab99eb9a1..000000000
--- a/libre/openexr-libre/gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- exrenvmap/blurImage.cpp
-+++ exrenvmap/blurImage.cpp
-@@ -39,6 +39,8 @@
- //
- //-----------------------------------------------------------------------------
- 
-+#include <cstring>
-+
- #include <blurImage.h>
- 
- #include <resizeImage.h>
diff --git a/libre/openshot-libre/PKGBUILD b/libre/openshot-libre/PKGBUILD
deleted file mode 100644
index ca5b029e7..000000000
--- a/libre/openshot-libre/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $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@parabola.nu>
-
-_pkgname=openshot
-pkgname=openshot-libre
-pkgver=1.4.3
-pkgrel=3
-pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework, without nonfree faac recommendation"
-arch=('any')
-url="http://www.openshotvideo.com/"
-license=('GPL')
-depends=('mlt-python-bindings' 'pygoocanvas' 'sdl' 'librsvg' 'mplayer'
-	 'pyxdg' 'pygtk' 'python2-httplib2' 'python2-pillow')
-optdepends=('dvgrab: for IEEE digital sources'
-	    'libquicktime' 'libavc1394' 'jack' 'jack-rack' 'ladspa')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-install=openshot.install
-source=(http://launchpad.net/openshot/${pkgver%.*}/$pkgver/+download/$_pkgname-$pkgver.tar.gz)
-md5sums=('5ec82a7e8b7700ee4a359458aedf19e9')
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-  python2 setup.py install --root=$pkgdir/ --optimize=1
-}
diff --git a/libre/openshot-libre/openshot.install b/libre/openshot-libre/openshot.install
deleted file mode 100644
index 046df0051..000000000
--- a/libre/openshot-libre/openshot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    update-mime-database usr/share/mime &>/dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/libre/oss-libre/PKGBUILD b/libre/oss-libre/PKGBUILD
deleted file mode 100644
index 9efb5f0fe..000000000
--- a/libre/oss-libre/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: PKGBUILD 92058 2013-05-31 02:02:47Z seblu $
-# Maintainer: Kyle Keen <keenerd@gmail.com>
-# 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@parabola.nu>
-
-pkgname=oss-libre
-pkgver=4.2_2007
-pkgrel=4
-arch=('i686' 'x86_64' 'mips64el')
-url="http://developer.opensound.com/"
-license=('GPL2')
-makedepends=('gtk2')
-source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2"
-  "rm-init-scripts.patch"
-  "soundon.patch"
-  "remove-hal.patch"
-  "linux-3.8.patch"
-  "oss.service"
-)
-md5sums=('f995118db1759fee3bcd38483940da6f'
-         'b9a380a0ac8896390d71ac13676f27e1'
-         '65f07fe241bfbf912f76d8b6d8f276b5'
-         'cd7f1dc6166bba8c94d96f3a28e948a5'
-         'effecefb774f1d08ef9f0af0ad205c34'
-         '39c46b10a6bc56fc146d669a61bd3028')
-_dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl
-
-build() {
-  cd "${srcdir}/${_dir}"
-
-  # Avoid these flags conflicting with OSS build system.
-  unset CFLAGS
-  unset LDFLAGS
-  unset OSFLAGS
-  unset LIBRARIES
-  export NO_WARNING_CHECKS=yes
-
-  msg "Preparing the build environment."
-  cd "${srcdir}"
-
-  # Create build directory and configure
-  rm -rf build
-  mkdir build && cd build
-  "${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm
-
-  # ossvermagic hardcodes /lib/modules *grumble*
-  sed -i 's|/lib/modules|/usr&|' \
-      os_cmd/Linux/ossvermagic/ossvermagic.c
-
-  pushd "$srcdir/$_dir"
-  patch -p0 -i "${srcdir}/linux-3.8.patch"
-  popd
-
-  msg "Building OSS."
-  make build
-
-  msg "Patching init scripts."
-  cd "${srcdir}/build/prototype"
-  rm usr/lib/oss/etc/S89oss
-  patch -p0 -i "${srcdir}/rm-init-scripts.patch"
-  patch -p0 -i "${srcdir}/soundon.patch"
-  # remove hal dependency
-  patch -p0 -i "${srcdir}/remove-hal.patch"
-  rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi
-
-  # fix kernel module directories
-  sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/usr/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon
-  sed -i 's#/lib/modules/$UNAME/kernel/#/usr/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh
-  sed -i 's#mkdir /lib/modules#mkdir -p /usr/lib/modules#' usr/lib/oss/build/install.sh
-  sed -i 's#mkdir \(/usr/lib/modules/$UNAME/extramodules/kernel/oss\)#mkdir -p \1#' usr/lib/oss/build/install.sh
-  sed -i 's#\([= ]\)/lib/modules#\1/usr/lib/modules#g' \
-    usr/lib/oss/build/install.sh \
-    usr/lib/oss/scripts/restore_drv.sh \
-    usr/lib/oss/scripts/setup-alsa.sh \
-    usr/lib/oss/scripts/remove_drv.sh \
-    usr/lib/oss/build/Makefile.tmpl \
-    usr/lib/oss/build/Makefile.osscore \
-    usr/lib/oss/cuckoo/Makefile
-}
-
-package() {
-  pkgdesc="Open Sound System UNIX audio architecture, without nonfree libflashsupport-oss recommendation (built for the linux-libre-headers package)"
-  depends=('gcc' 'make' 'linux-libre-headers' 'libtool' 'sed')
-  optdepends=('gtk2: for graphical mixer (ossxmix)')
-  replaces=('oss')
-  conflicts=('oss' 'oss-linux' 'oss-linux-free' 'oss-testing')
-  provides=("oss=${pkgver}")
-  backup=('usr/lib/oss/soundon.user')
-  install=oss.install
-
-  cd "${srcdir}/build/prototype"
-  cp -a * "${pkgdir}"
-
-  cd "$pkgdir"
-  mv usr/sbin/* usr/bin
-  rmdir usr/sbin
-  chmod -R a+r . # All files can have read permission (FS#13815)
-  find . -type d -exec chmod a+x '{}' \; # Make namcap happy
-  install -Dm644 "$srcdir/oss.service" usr/lib/systemd/system/oss.service
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/oss-libre/linux-3.8.patch b/libre/oss-libre/linux-3.8.patch
deleted file mode 100644
index 46200e01a..000000000
--- a/libre/oss-libre/linux-3.8.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- setup/Linux/oss/build/pci_wrapper.inc	2009-08-27 05:19:07.000000000 +0300
-+++ setup/Linux/oss/build/pci_wrapper.inc	2013-02-08 13:56:10.519794975 +0200
-@@ -17,7 +17,11 @@
- static dev_map_t dev_map[MAX_INSTANCE];
- static int n_devmap = 0;
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
- static int __devinit
-+#else
-+static int
-+#endif
- osspci_probe (struct pci_dev *pcidev, const struct pci_device_id *pciid)
- {
-   oss_device_t *osdev;
-@@ -65,7 +69,11 @@
-   return 0;
- }
- 
--static void __devexit
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
-+static int __devexit
-+#else
-+static int
-+#endif
- osspci_remove (struct pci_dev *pcidev)
- {
-   int i;
-@@ -80,10 +88,11 @@
- 	pci_disable_device (dev_map[i].pcidev);
- 	osdev_delete (osdev);
- 
--	return;
-+	return 0;
-       }
- 
-   printk (KERN_ALERT DRIVER_NICK ": Can't find the PCI device to detach\n");
-+  return -EIO;
- }
- 
- void
diff --git a/libre/oss-libre/oss.install b/libre/oss-libre/oss.install
deleted file mode 100644
index 9bd4e1fbc..000000000
--- a/libre/oss-libre/oss.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
-	echo "Running OSS install script..."
-	sh /usr/lib/oss/build/install.sh &>/dev/null
-	echo
-	echo " Note that OSS can't currently work together with kernel"
-	echo " ALSA modules, so they were moved out by the OSS install"
-	echo " scripts. If you want the ALSA kernel modules back, you can"
-	echo " just remove this package using pacman."
-}
-
-post_upgrade() {
-	echo "Running OSS update script..."
-	sh /usr/lib/oss/build/install.sh &>/dev/null
-}
-
-pre_remove() {
-	# Restore any replaced ALSA drivers.
-	sh /usr/lib/oss/scripts/restore_drv.sh
-}
-
-post_remove() {
-	echo " Open Sound System was now removed, and the ALSA kernel"
-	echo " modules were restored."
-}
-
diff --git a/libre/oss-libre/oss.service b/libre/oss-libre/oss.service
deleted file mode 100644
index 0200d2477..000000000
--- a/libre/oss-libre/oss.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Open Sound System v4
-Before=sound.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/soundon
-ExecStop=/usr/bin/soundoff
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/oss-libre/remove-hal.patch b/libre/oss-libre/remove-hal.patch
deleted file mode 100644
index 27e2ef2de..000000000
--- a/libre/oss-libre/remove-hal.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Date: Tue Aug  2 16:37:31 CEST 2011
-Author: Florian Pritz <bluewind@xinu.at>
-This removes all hal dependencies
-
-References:
-http://www.archlinux.org/todo/92/
-
---- usr/lib/oss/build/install_2011-08-02_162647.sh	2011-08-02 16:26:47.000000000 +0200
-+++ usr/lib/oss/build/install.sh	2011-08-02 16:27:13.000000000 +0200
-@@ -336,10 +336,4 @@
-   echo "autosave_mixer yes" > $OSSLIBDIR/etc/userdefs
- fi
- 
--# Hal 0.5.0+ hotplug
--mkdir -p /usr/lib/hal/scripts
--ln -sf $OSSLIBDIR/scripts/oss_usb-create-devices /usr/lib/hal/scripts/
--mkdir -p /usr/share/hal/fdi/policy/20thirdparty/
--ln -sf $OSSLIBDIR/scripts/90-oss_usb-create-device.fdi /usr/share/hal/fdi/policy/20thirdparty/
--
- exit 0
diff --git a/libre/oss-libre/rm-init-scripts.patch b/libre/oss-libre/rm-init-scripts.patch
deleted file mode 100644
index 981ff605f..000000000
--- a/libre/oss-libre/rm-init-scripts.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- usr/lib/oss/build/install.sh.orig	2008-09-25 11:41:47.180167692 -0300
-+++ usr/lib/oss/build/install.sh	2008-09-25 11:41:47.180167692 -0300
-@@ -290,38 +290,6 @@
-    echo 
- fi
- 
--if ! test -d /etc/init.d
--then
--  mkdir /etc/init.d
--fi
--
--rm -f /etc/init.d/oss /etc/rc.d/rc3.d/S89oss /etc/rc3.d/S89oss
--cp -f $OSSLIBDIR/etc/S89oss /etc/init.d/oss
--
--chmod 744 /etc/init.d/oss
--
--if test -x /sbin/chkconfig
--then
--  /sbin/chkconfig oss on        > /dev/null 2>&1
--else
-- if test -x /usr/sbin/update-rc.d
-- then
--   /usr/sbin/update-rc.d oss defaults > /dev/null 2>&1
-- else
--  if test -d etc/rc.d/rc3.d
--  then
--    rm -f /etc/rc.d/rc3.d/S89oss
--    ln -s /etc/init.d/oss /etc/rc.d/rc3.d/S89oss
--  else
--    if test -d /etc/rc3.d
--    then
--      rm -f /etc/rc3.d/S89oss
--      ln -s /etc/init.d/oss /etc/rc3.d/S89oss
--    fi
--  fi
-- fi
--fi
--
- # Install ALSA interface module (Cuckoo)
- #(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1
- #if (cd $OSSLIBDIR/cuckoo && make install) > /var/log/cuckoo.log 2>&1
---- usr/lib/oss/scripts/restore_drv.sh.orig	2008-09-25 11:41:47.210168487 -0300
-+++ usr/lib/oss/scripts/restore_drv.sh	2008-09-25 11:41:47.210168487 -0300
-@@ -18,8 +18,6 @@
-   fi
- fi
- 
--rm -f /etc/init.d/oss
--
- if ! test -d /lib/modules/`uname -r`/kernel/sound
- then
-    if test -f /lib/modules/`uname -r`/sound-preoss.tar.bz2
diff --git a/libre/oss-libre/soundon.patch b/libre/oss-libre/soundon.patch
deleted file mode 100644
index 4702b8680..000000000
--- a/libre/oss-libre/soundon.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- usr/sbin/soundon.old	2009-09-04 06:35:26.000000000 +0100
-+++ usr/sbin/soundon	2009-11-15 13:59:53.000000000 +0000
-@@ -255,7 +255,10 @@
-   then
-      if test "`uname -m` " = "x86_64 "
-      then
--       ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2
-+       # Fix for compatibility with Arch's directory structure
-+       # Not that we use it, there is no $OSSLIBDIR/.libsalsa_installed
-+       ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib/libasound.so.2
-+       #ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2
-        #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
-      else
-        if test -s /lib/libasound.so.2
-@@ -278,8 +281,11 @@
- then
-    if test "`uname -m` " = "x86_64 "
-    then
--     ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
--     ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64
-+     # Fix for compatibility with Arch's directory structure
-+     ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib
-+     ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib
-+     #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
-+     #ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64
-    else
-      if test -s /lib/libasound.so.2
-      then
diff --git a/libre/p7zip-libre/7zFM.desktop b/libre/p7zip-libre/7zFM.desktop
deleted file mode 100644
index 62b8e8562..000000000
--- a/libre/p7zip-libre/7zFM.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=7-Zip FM
-GenericName=7-Zip File Manager
-Type=Application
-Categories=GTK;Utility;Archiving;Compression;
-Terminal=false
-Icon=p7zip
-Exec=7zFM
diff --git a/libre/p7zip-libre/9.04-makefile.patch b/libre/p7zip-libre/9.04-makefile.patch
deleted file mode 100644
index 93a99cc90..000000000
--- a/libre/p7zip-libre/9.04-makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile.orig	2010-01-04 13:58:54.527887746 +0100
-+++ p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile	2010-01-04 13:59:10.290868343 +0100
-@@ -247,8 +247,6 @@
-   MyAes.o \
-   Pbkdf2HmacSha1.o \
-   RandGen.o \
--  Rar20Crypto.o \
--  RarAes.o \
-   Sha1.o \
-   WzAes.o \
-   ZipCrypto.o \
-@@ -298,7 +296,6 @@
-   $(HFS_OBJS) \
-   $(ISO_OBJS) \
-   $(NSIS_OBJS) \
--  $(RAR_OBJS) \
-   $(TAR_OBJS) \
-   $(UDF_OBJS) \
-   $(WIM_OBJS) \
diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD
deleted file mode 100644
index 0d9b79d4e..000000000
--- a/libre/p7zip-libre/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 195474 2013-09-30 18:46:35Z bisson $
-# Contributor: Thayer Williams <thayer@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-# Contributor: TuxSpirit<tuxspirit@archlinux.fr>  2007/11/17 21:22:36 UTC
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=p7zip-libre
-_pkgname=${pkgname%-libre}
-pkgver=9.20.1
-pkgrel=8
-pkgdesc='Command-line version of the 7zip compressed file archiver without Rar'
-url='http://p7zip.sourceforge.net/'
-license=('GPL')
-arch=('i686' 'x86_64' 'mips64el')
-provides=("p7zip=$pkgver")
-conflicts=('p7zip')
-replaces=('p7zip')
-depends=('gcc-libs' 'bash')
-optdepends=('wxgtk: GUI'
-            'desktop-file-utils: desktop entries')
-makedepends=('yasm' 'nasm' 'wxgtk')
-source=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2"
-        'p7zip-libre.patch'
-        '7zFM.desktop')
-sha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7'
-          '8fc0e6e80aeec371a8c80e7a6082594ac6d08aed'
-          'f2c370d6f1b286b7ce9a2804e22541b755616a40')
-
-options=('!makeflags')
-install=install
-
-prepare() {
-	cd "${srcdir}/${_pkgname}_${pkgver}"
-	rm GUI/kde4/p7zip_compress.desktop
-	[[ $CARCH = x86_64 ]] \
-	&& cp makefile.linux_amd64_asm makefile.machine \
-	|| cp makefile.linux_x86_asm_gcc_4.X makefile.machine
-}
-
-build() {
-	cd "${srcdir}/${_pkgname}_${pkgver}"
-    msg "Removing unRar"
-# Generate patch
-#	sed -e '/Rar/d' -i makefile*
-#   find -name '*Rar*' -print0 | xargs -0 rm -rvf
-# Remove Rar mentions in CPP/7zip/Bundles/Format7zFree/makefile
-    patch -Np1 -i ../p7zip-libre.patch
-
-  if [ "$CARCH" = "mips64el" ]; then
-    make all3 OPTFLAGS="${CXXFLAGS}"
-  else
-    make all4 OPTFLAGS="${CXXFLAGS}"
-  fi
-}
-
-package() {
-	cd "${srcdir}/${_pkgname}_${pkgver}"
-	make install \
-		DEST_DIR="${pkgdir}" \
-		DEST_HOME="/usr" \
-		DEST_MAN="/usr/share/man"
-
-	# Licenses
-	install -d "${pkgdir}"/usr/share/licenses/p7zip
-	ln -s -t "${pkgdir}"/usr/share/licenses/p7zip \
-		/usr/share/doc/p7zip/DOCS/License.txt
-
-	# Integration with stuff...
-	install -Dm644 GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png
-	install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus}
-	cp GUI/kde4/* "${pkgdir}"/usr/share/kde4/services/ServiceMenus/
-	cp ../7zFM.desktop "${pkgdir}"/usr/share/applications/
-	ln -s 7zCon.sfx "${pkgdir}"/usr/lib/p7zip/7z.sfx
-
-	find GUI/help -type d -exec chmod 755 {} \;
-	cp -r GUI/help "${pkgdir}"/usr/lib/p7zip/
-
-	chmod -R u+w "${pkgdir}/usr"
-}
diff --git a/libre/p7zip-libre/install b/libre/p7zip-libre/install
deleted file mode 100644
index 7f3cc4358..000000000
--- a/libre/p7zip-libre/install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	[[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
-	[[ -x usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor || true
-}
-
-post_upgrade() {
-	post_install
-}
-
-
-post_remove() {
-	post_install
-}
diff --git a/libre/p7zip-libre/p7zip-libre.patch b/libre/p7zip-libre/p7zip-libre.patch
deleted file mode 100644
index 742faf52d..000000000
--- a/libre/p7zip-libre/p7zip-libre.patch
+++ /dev/null
@@ -1,6540 +0,0 @@
-diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarHandler.cpp p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarHandler.cpp
---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarHandler.cpp	2011-01-08 06:41:37.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarHandler.cpp	1969-12-31 21:00:00.000000000 -0300
-@@ -1,869 +0,0 @@
--// RarHandler.cpp
--
--#include "StdAfx.h"
--
--#include "Common/ComTry.h"
--#include "Common/IntToString.h"
--#include "Common/StringConvert.h"
--
--#include "Windows/PropVariant.h"
--#include "Windows/PropVariantUtils.h"
--#include "Windows/Time.h"
--
--#include "../../IPassword.h"
--
--#include "../../Common/CreateCoder.h"
--#include "../../Common/FilterCoder.h"
--#include "../../Common/MethodId.h"
--#include "../../Common/ProgressUtils.h"
--
--#include "../../Compress/CopyCoder.h"
--
--#include "../../Crypto/Rar20Crypto.h"
--#include "../../Crypto/RarAes.h"
--
--#include "../Common/ItemNameUtils.h"
--#include "../Common/OutStreamWithCRC.h"
--
--#include "RarHandler.h"
--
--using namespace NWindows;
--using namespace NTime;
--
--namespace NArchive {
--namespace NRar {
--
--static const wchar_t *kHostOS[] =
--{
--  L"MS DOS",
--  L"OS/2",
--  L"Win32",
--  L"Unix",
--  L"Mac OS",
--  L"BeOS"
--};
--
--static const int kNumHostOSes = sizeof(kHostOS) / sizeof(kHostOS[0]);
--
--static const wchar_t *kUnknownOS = L"Unknown";
--
--static const CUInt32PCharPair k_Flags[] =
--{
--  { 0, "Volume" },
--  { 1, "Comment" },
--  { 2, "Lock" },
--  { 3, "Solid" },
--  { 4, "NewVolName" }, // pack_comment in old versuons
--  { 5, "Authenticity" },
--  { 6, "Recovery" },
--  { 7, "BlockEncryption" },
--  { 8, "FirstVolume" },
--  { 9, "EncryptVer" }
--};
--
--static const STATPROPSTG kProps[] =
--{
--  { NULL, kpidPath, VT_BSTR},
--  { NULL, kpidIsDir, VT_BOOL},
--  { NULL, kpidSize, VT_UI8},
--  { NULL, kpidPackSize, VT_UI8},
--  { NULL, kpidMTime, VT_FILETIME},
--  { NULL, kpidCTime, VT_FILETIME},
--  { NULL, kpidATime, VT_FILETIME},
--  { NULL, kpidAttrib, VT_UI4},
--
--  { NULL, kpidEncrypted, VT_BOOL},
--  { NULL, kpidSolid, VT_BOOL},
--  { NULL, kpidCommented, VT_BOOL},
--  { NULL, kpidSplitBefore, VT_BOOL},
--  { NULL, kpidSplitAfter, VT_BOOL},
--  { NULL, kpidCRC, VT_UI4},
--  { NULL, kpidHostOS, VT_BSTR},
--  { NULL, kpidMethod, VT_BSTR},
--  { NULL, kpidUnpackVer, VT_UI1}
--};
--
--static const STATPROPSTG kArcProps[] =
--{
--  { NULL, kpidCharacts, VT_BSTR},
--  { NULL, kpidSolid, VT_BOOL},
--  { NULL, kpidNumBlocks, VT_UI4},
--  // { NULL, kpidEncrypted, VT_BOOL},
--  { NULL, kpidIsVolume, VT_BOOL},
--  { NULL, kpidNumVolumes, VT_UI4},
--  { NULL, kpidPhySize, VT_UI8}
--  // { NULL, kpidCommented, VT_BOOL}
--};
--
--IMP_IInArchive_Props
--IMP_IInArchive_ArcProps
--
--UInt64 CHandler::GetPackSize(int refIndex) const
--{
--  const CRefItem &refItem = _refItems[refIndex];
--  UInt64 totalPackSize = 0;
--  for (int i = 0; i < refItem.NumItems; i++)
--    totalPackSize += _items[refItem.ItemIndex + i].PackSize;
--  return totalPackSize;
--}
--
--STDMETHODIMP CHandler::GetArchiveProperty(PROPID propID, PROPVARIANT *value)
--{
--  COM_TRY_BEGIN
--  NWindows::NCOM::CPropVariant prop;
--  switch(propID)
--  {
--    case kpidSolid: prop = _archiveInfo.IsSolid(); break;
--    case kpidCharacts: FLAGS_TO_PROP(k_Flags, _archiveInfo.Flags, prop); break;
--    // case kpidEncrypted: prop = _archiveInfo.IsEncrypted(); break; // it's for encrypted names.
--    case kpidIsVolume: prop = _archiveInfo.IsVolume(); break;
--    case kpidNumVolumes: prop = (UInt32)_archives.Size(); break;
--    case kpidOffset: if (_archiveInfo.StartPosition != 0) prop = _archiveInfo.StartPosition; break;
--    // case kpidCommented: prop = _archiveInfo.IsCommented(); break;
--    case kpidNumBlocks:
--    {
--      UInt32 numBlocks = 0;
--      for (int i = 0; i < _refItems.Size(); i++)
--        if (!IsSolid(i))
--          numBlocks++;
--      prop = (UInt32)numBlocks;
--      break;
--    }
--    case kpidError: if (!_errorMessage.IsEmpty()) prop = _errorMessage; break;
--  }
--  prop.Detach(value);
--  return S_OK;
--  COM_TRY_END
--}
--
--STDMETHODIMP CHandler::GetNumberOfItems(UInt32 *numItems)
--{
--  *numItems = _refItems.Size();
--  return S_OK;
--}
--
--static bool RarTimeToFileTime(const CRarTime &rarTime, FILETIME &result)
--{
--  if (!DosTimeToFileTime(rarTime.DosTime, result))
--    return false;
--  UInt64 value =  (((UInt64)result.dwHighDateTime) << 32) + result.dwLowDateTime;
--  value += (UInt64)rarTime.LowSecond * 10000000;
--  value += ((UInt64)rarTime.SubTime[2] << 16) +
--    ((UInt64)rarTime.SubTime[1] << 8) +
--    ((UInt64)rarTime.SubTime[0]);
--  result.dwLowDateTime = (DWORD)value;
--  result.dwHighDateTime = DWORD(value >> 32);
--  return true;
--}
--
--static void RarTimeToProp(const CRarTime &rarTime, NWindows::NCOM::CPropVariant &prop)
--{
--  FILETIME localFileTime, utcFileTime;
--  if (RarTimeToFileTime(rarTime, localFileTime))
--  {
--    if (!LocalFileTimeToFileTime(&localFileTime, &utcFileTime))
--      utcFileTime.dwHighDateTime = utcFileTime.dwLowDateTime = 0;
--  }
--  else
--    utcFileTime.dwHighDateTime = utcFileTime.dwLowDateTime = 0;
--  prop = utcFileTime;
--}
--
--STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPID propID,  PROPVARIANT *value)
--{
--  COM_TRY_BEGIN
--  NWindows::NCOM::CPropVariant prop;
--  const CRefItem &refItem = _refItems[index];
--  const CItemEx &item = _items[refItem.ItemIndex];
--  switch(propID)
--  {
--    case kpidPath:
--    {
--      UString u;
--      if (item.HasUnicodeName() && !item.UnicodeName.IsEmpty())
--        u = item.UnicodeName;
--      else
--        u = MultiByteToUnicodeString(item.Name, CP_OEMCP);
--      prop = (const wchar_t *)NItemName::WinNameToOSName(u);
--      break;
--    }
--    case kpidIsDir: prop = item.IsDir(); break;
--    case kpidSize: prop = item.Size; break;
--    case kpidPackSize: prop = GetPackSize(index); break;
--    case kpidMTime: RarTimeToProp(item.MTime, prop); break;
--    case kpidCTime: if (item.CTimeDefined) RarTimeToProp(item.CTime, prop); break;
--    case kpidATime: if (item.ATimeDefined) RarTimeToProp(item.ATime, prop); break;
--    case kpidAttrib: prop = item.GetWinAttributes(); break;
--    case kpidEncrypted: prop = item.IsEncrypted(); break;
--    case kpidSolid: prop = IsSolid(index); break;
--    case kpidCommented: prop = item.IsCommented(); break;
--    case kpidSplitBefore: prop = item.IsSplitBefore(); break;
--    case kpidSplitAfter: prop = _items[refItem.ItemIndex + refItem.NumItems - 1].IsSplitAfter(); break;
--    case kpidCRC:
--    {
--      const CItemEx &lastItem = _items[refItem.ItemIndex + refItem.NumItems - 1];
--      prop = ((lastItem.IsSplitAfter()) ? item.FileCRC : lastItem.FileCRC);
--      break;
--    }
--    case kpidUnpackVer: prop = item.UnPackVersion; break;
--    case kpidMethod:
--    {
--      UString method;
--      if (item.Method >= Byte('0') && item.Method <= Byte('5'))
--      {
--        method = L"m";
--        wchar_t temp[32];
--        ConvertUInt64ToString(item.Method - Byte('0'), temp);
--        method += temp;
--        if (!item.IsDir())
--        {
--          method += L":";
--          ConvertUInt64ToString(16 + item.GetDictSize(), temp);
--          method += temp;
--        }
--      }
--      else
--      {
--        wchar_t temp[32];
--        ConvertUInt64ToString(item.Method, temp);
--        method += temp;
--      }
--      prop = method;
--      break;
--    }
--    case kpidHostOS: prop = (item.HostOS < kNumHostOSes) ? (kHostOS[item.HostOS]) : kUnknownOS; break;
--  }
--  prop.Detach(value);
--  return S_OK;
--  COM_TRY_END
--}
--
--class CVolumeName
--{
--  bool _first;
--  bool _newStyle;
--  UString _unchangedPart;
--  UString _changedPart;
--  UString _afterPart;
--public:
--  CVolumeName(): _newStyle(true) {};
--
--  bool InitName(const UString &name, bool newStyle)
--  {
--    _first = true;
--    _newStyle = newStyle;
--    int dotPos = name.ReverseFind('.');
--    UString basePart = name;
--    if (dotPos >= 0)
--    {
--      UString ext = name.Mid(dotPos + 1);
--      if (ext.CompareNoCase(L"rar") == 0)
--      {
--        _afterPart = name.Mid(dotPos);
--        basePart = name.Left(dotPos);
--      }
--      else if (ext.CompareNoCase(L"exe") == 0)
--      {
--        _afterPart = L".rar";
--        basePart = name.Left(dotPos);
--      }
--      else if (!_newStyle)
--      {
--        if (ext.CompareNoCase(L"000") == 0 ||
--            ext.CompareNoCase(L"001") == 0 ||
--            ext.CompareNoCase(L"r00") == 0 ||
--            ext.CompareNoCase(L"r01") == 0)
--        {
--          _afterPart.Empty();
--          _first = false;
--          _changedPart = ext;
--          _unchangedPart = name.Left(dotPos + 1);
--          return true;
--        }
--      }
--    }
--
--    if (!_newStyle)
--    {
--      _afterPart.Empty();
--      _unchangedPart = basePart + UString(L".");
--      _changedPart = L"r00";
--      return true;
--    }
--
--    int numLetters = 1;
--    if (basePart.Right(numLetters) == L"1" || basePart.Right(numLetters) == L"0")
--    {
--      while (numLetters < basePart.Length())
--      {
--        if (basePart[basePart.Length() - numLetters - 1] != '0')
--          break;
--        numLetters++;
--      }
--    }
--    else
--      return false;
--    _unchangedPart = basePart.Left(basePart.Length() - numLetters);
--    _changedPart = basePart.Right(numLetters);
--    return true;
--  }
--
--  UString GetNextName()
--  {
--    UString newName;
--    if (_newStyle || !_first)
--    {
--      int i;
--      int numLetters = _changedPart.Length();
--      for (i = numLetters - 1; i >= 0; i--)
--      {
--        wchar_t c = _changedPart[i];
--        if (c == L'9')
--        {
--          c = L'0';
--          newName = c + newName;
--          if (i == 0)
--            newName = UString(L'1') + newName;
--          continue;
--        }
--        c++;
--        newName = UString(c) + newName;
--        i--;
--        for (; i >= 0; i--)
--          newName = _changedPart[i] + newName;
--        break;
--      }
--      _changedPart = newName;
--    }
--    _first = false;
--    return _unchangedPart + _changedPart + _afterPart;
--  }
--};
--
--HRESULT CHandler::Open2(IInStream *stream,
--    const UInt64 *maxCheckStartPosition,
--    IArchiveOpenCallback *openCallback)
--{
--  {
--    CMyComPtr<IArchiveOpenVolumeCallback> openVolumeCallback;
--    CMyComPtr<ICryptoGetTextPassword> getTextPassword;
--    CMyComPtr<IArchiveOpenCallback> openArchiveCallbackWrap = openCallback;
--    
--    CVolumeName seqName;
--
--    UInt64 totalBytes = 0;
--    UInt64 curBytes = 0;
--
--    if (openCallback)
--    {
--      openArchiveCallbackWrap.QueryInterface(IID_IArchiveOpenVolumeCallback, &openVolumeCallback);
--      openArchiveCallbackWrap.QueryInterface(IID_ICryptoGetTextPassword, &getTextPassword);
--    }
--
--    for (;;)
--    {
--      CMyComPtr<IInStream> inStream;
--      if (!_archives.IsEmpty())
--      {
--        if (!openVolumeCallback)
--          break;
--        
--        if (_archives.Size() == 1)
--        {
--          if (!_archiveInfo.IsVolume())
--            break;
--          UString baseName;
--          {
--            NCOM::CPropVariant prop;
--            RINOK(openVolumeCallback->GetProperty(kpidName, &prop));
--            if (prop.vt != VT_BSTR)
--              break;
--            baseName = prop.bstrVal;
--          }
--          seqName.InitName(baseName, _archiveInfo.HaveNewVolumeName());
--        }
--
--        UString fullName = seqName.GetNextName();
--        HRESULT result = openVolumeCallback->GetStream(fullName, &inStream);
--        if (result == S_FALSE)
--          break;
--        if (result != S_OK)
--          return result;
--        if (!stream)
--          break;
--      }
--      else
--        inStream = stream;
--
--      UInt64 endPos = 0;
--      RINOK(stream->Seek(0, STREAM_SEEK_END, &endPos));
--      RINOK(stream->Seek(0, STREAM_SEEK_SET, NULL));
--      if (openCallback)
--      {
--        totalBytes += endPos;
--        RINOK(openCallback->SetTotal(NULL, &totalBytes));
--      }
--      
--      NArchive::NRar::CInArchive archive;
--      RINOK(archive.Open(inStream, maxCheckStartPosition));
--
--      if (_archives.IsEmpty())
--        archive.GetArchiveInfo(_archiveInfo);
--     
--      CItemEx item;
--      for (;;)
--      {
--        if (archive.m_Position > endPos)
--        {
--          AddErrorMessage("Unexpected end of archive");
--          break;
--        }
--        bool decryptionError;
--        AString errorMessageLoc;
--        HRESULT result = archive.GetNextItem(item, getTextPassword, decryptionError, errorMessageLoc);
--        if (errorMessageLoc)
--          AddErrorMessage(errorMessageLoc);
--        if (result == S_FALSE)
--        {
--          if (decryptionError && _items.IsEmpty())
--            return S_FALSE;
--          break;
--        }
--        RINOK(result);
--        if (item.IgnoreItem())
--          continue;
--
--        bool needAdd = true;
--        if (item.IsSplitBefore())
--        {
--          if (!_refItems.IsEmpty())
--          {
--            CRefItem &refItem = _refItems.Back();
--            refItem.NumItems++;
--            needAdd = false;
--          }
--        }
--        if (needAdd)
--        {
--          CRefItem refItem;
--          refItem.ItemIndex = _items.Size();
--          refItem.NumItems = 1;
--          refItem.VolumeIndex = _archives.Size();
--          _refItems.Add(refItem);
--        }
--        _items.Add(item);
--        if (openCallback && _items.Size() % 100 == 0)
--        {
--          UInt64 numFiles = _items.Size();
--          UInt64 numBytes = curBytes + item.Position;
--          RINOK(openCallback->SetCompleted(&numFiles, &numBytes));
--        }
--      }
--      curBytes += endPos;
--      _archives.Add(archive);
--    }
--  }
--  return S_OK;
--}
--
--STDMETHODIMP CHandler::Open(IInStream *stream,
--    const UInt64 *maxCheckStartPosition,
--    IArchiveOpenCallback *openCallback)
--{
--  COM_TRY_BEGIN
--  Close();
--  try
--  {
--    HRESULT res = Open2(stream, maxCheckStartPosition, openCallback);
--    if (res != S_OK)
--      Close();
--    return res;
--  }
--  catch(const CInArchiveException &) { Close(); return S_FALSE; }
--  catch(...) { Close(); throw; }
--  COM_TRY_END
--}
--
--STDMETHODIMP CHandler::Close()
--{
--  COM_TRY_BEGIN
--  _errorMessage.Empty();
--  _refItems.Clear();
--  _items.Clear();
--  _archives.Clear();
--  return S_OK;
--  COM_TRY_END
--}
--
--struct CMethodItem
--{
--  Byte RarUnPackVersion;
--  CMyComPtr<ICompressCoder> Coder;
--};
--
--
--STDMETHODIMP CHandler::Extract(const UInt32 *indices, UInt32 numItems,
--    Int32 testMode, IArchiveExtractCallback *extractCallback)
--{
--  COM_TRY_BEGIN
--  CMyComPtr<ICryptoGetTextPassword> getTextPassword;
--  UInt64 censoredTotalUnPacked = 0,
--        // censoredTotalPacked = 0,
--        importantTotalUnPacked = 0;
--        // importantTotalPacked = 0;
--  bool allFilesMode = (numItems == (UInt32)-1);
--  if (allFilesMode)
--    numItems = _refItems.Size();
--  if (numItems == 0)
--    return S_OK;
--  int lastIndex = 0;
--  CRecordVector<int> importantIndexes;
--  CRecordVector<bool> extractStatuses;
--
--  for (UInt32 t = 0; t < numItems; t++)
--  {
--    int index = allFilesMode ? t : indices[t];
--    const CRefItem &refItem = _refItems[index];
--    const CItemEx &item = _items[refItem.ItemIndex];
--    censoredTotalUnPacked += item.Size;
--    // censoredTotalPacked += item.PackSize;
--    int j;
--    for (j = lastIndex; j <= index; j++)
--      // if (!_items[_refItems[j].ItemIndex].IsSolid())
--      if (!IsSolid(j))
--        lastIndex = j;
--    for (j = lastIndex; j <= index; j++)
--    {
--      const CRefItem &refItem = _refItems[j];
--      const CItemEx &item = _items[refItem.ItemIndex];
--
--      // const CItemEx &item = _items[j];
--
--      importantTotalUnPacked += item.Size;
--      // importantTotalPacked += item.PackSize;
--      importantIndexes.Add(j);
--      extractStatuses.Add(j == index);
--    }
--    lastIndex = index + 1;
--  }
--
--  RINOK(extractCallback->SetTotal(importantTotalUnPacked));
--  UInt64 currentImportantTotalUnPacked = 0;
--  UInt64 currentImportantTotalPacked = 0;
--  UInt64 currentUnPackSize, currentPackSize;
--
--  CObjectVector<CMethodItem> methodItems;
--
--  NCompress::CCopyCoder *copyCoderSpec = new NCompress::CCopyCoder;
--  CMyComPtr<ICompressCoder> copyCoder = copyCoderSpec;
--
--  CFilterCoder *filterStreamSpec = new CFilterCoder;
--  CMyComPtr<ISequentialInStream> filterStream = filterStreamSpec;
--
--  NCrypto::NRar20::CDecoder *rar20CryptoDecoderSpec = NULL;
--  CMyComPtr<ICompressFilter> rar20CryptoDecoder;
--  NCrypto::NRar29::CDecoder *rar29CryptoDecoderSpec = NULL;
--  CMyComPtr<ICompressFilter> rar29CryptoDecoder;
--
--  CFolderInStream *folderInStreamSpec = NULL;
--  CMyComPtr<ISequentialInStream> folderInStream;
--
--  CLocalProgress *lps = new CLocalProgress;
--  CMyComPtr<ICompressProgressInfo> progress = lps;
--  lps->Init(extractCallback, false);
--
--  bool solidStart = true;
--  for (int i = 0; i < importantIndexes.Size(); i++,
--      currentImportantTotalUnPacked += currentUnPackSize,
--      currentImportantTotalPacked += currentPackSize)
--  {
--    lps->InSize = currentImportantTotalPacked;
--    lps->OutSize = currentImportantTotalUnPacked;
--    RINOK(lps->SetCur());
--    CMyComPtr<ISequentialOutStream> realOutStream;
--
--    Int32 askMode;
--    if (extractStatuses[i])
--      askMode = testMode ?
--          NExtract::NAskMode::kTest :
--          NExtract::NAskMode::kExtract;
--    else
--      askMode = NExtract::NAskMode::kSkip;
--
--    UInt32 index = importantIndexes[i];
--
--    const CRefItem &refItem = _refItems[index];
--    const CItemEx &item = _items[refItem.ItemIndex];
--
--    currentUnPackSize = item.Size;
--
--    currentPackSize = GetPackSize(index);
--
--    if (item.IgnoreItem())
--      continue;
--
--    RINOK(extractCallback->GetStream(index, &realOutStream, askMode));
--
--    if (!IsSolid(index))
--      solidStart = true;
--    if (item.IsDir())
--    {
--      RINOK(extractCallback->PrepareOperation(askMode));
--      RINOK(extractCallback->SetOperationResult(NExtract::NOperationResult::kOK));
--      continue;
--    }
--
--    bool mustBeProcessedAnywhere = false;
--    if (i < importantIndexes.Size() - 1)
--    {
--      // const CRefItem &nextRefItem = _refItems[importantIndexes[i + 1]];
--      // const CItemEx &nextItemInfo = _items[nextRefItem.ItemIndex];
--      // mustBeProcessedAnywhere = nextItemInfo.IsSolid();
--      mustBeProcessedAnywhere = IsSolid(importantIndexes[i + 1]);
--    }
--    
--    if (!mustBeProcessedAnywhere && !testMode && !realOutStream)
--      continue;
--    
--    if (!realOutStream && !testMode)
--      askMode = NExtract::NAskMode::kSkip;
--
--    RINOK(extractCallback->PrepareOperation(askMode));
--
--    COutStreamWithCRC *outStreamSpec = new COutStreamWithCRC;
--    CMyComPtr<ISequentialOutStream> outStream(outStreamSpec);
--    outStreamSpec->SetStream(realOutStream);
--    outStreamSpec->Init();
--    realOutStream.Release();
--    
--    /*
--    for (int partIndex = 0; partIndex < 1; partIndex++)
--    {
--    CMyComPtr<ISequentialInStream> inStream;
--
--    // item redefinition
--    const CItemEx &item = _items[refItem.ItemIndex + partIndex];
--
--    NArchive::NRar::CInArchive &archive = _archives[refItem.VolumeIndex + partIndex];
--
--    inStream.Attach(archive.CreateLimitedStream(item.GetDataPosition(),
--      item.PackSize));
--    */
--    if (!folderInStream)
--    {
--      folderInStreamSpec = new CFolderInStream;
--      folderInStream = folderInStreamSpec;
--    }
--
--    folderInStreamSpec->Init(&_archives, &_items, refItem);
--
--    UInt64 packSize = currentPackSize;
--
--    // packedPos += item.PackSize;
--    // unpackedPos += 0;
--    
--    CMyComPtr<ISequentialInStream> inStream;
--    if (item.IsEncrypted())
--    {
--      CMyComPtr<ICryptoSetPassword> cryptoSetPassword;
--      if (item.UnPackVersion >= 29)
--      {
--        if (!rar29CryptoDecoder)
--        {
--          rar29CryptoDecoderSpec = new NCrypto::NRar29::CDecoder;
--          rar29CryptoDecoder = rar29CryptoDecoderSpec;
--          // RINOK(rar29CryptoDecoder.CoCreateInstance(CLSID_CCryptoRar29Decoder));
--        }
--        rar29CryptoDecoderSpec->SetRar350Mode(item.UnPackVersion < 36);
--        CMyComPtr<ICompressSetDecoderProperties2> cryptoProperties;
--        RINOK(rar29CryptoDecoder.QueryInterface(IID_ICompressSetDecoderProperties2,
--            &cryptoProperties));
--        RINOK(cryptoProperties->SetDecoderProperties2(item.Salt, item.HasSalt() ? sizeof(item.Salt) : 0));
--        filterStreamSpec->Filter = rar29CryptoDecoder;
--      }
--      else if (item.UnPackVersion >= 20)
--      {
--        if (!rar20CryptoDecoder)
--        {
--          rar20CryptoDecoderSpec = new NCrypto::NRar20::CDecoder;
--          rar20CryptoDecoder = rar20CryptoDecoderSpec;
--          // RINOK(rar20CryptoDecoder.CoCreateInstance(CLSID_CCryptoRar20Decoder));
--        }
--        filterStreamSpec->Filter = rar20CryptoDecoder;
--      }
--      else
--      {
--        outStream.Release();
--        RINOK(extractCallback->SetOperationResult(NExtract::NOperationResult::kUnSupportedMethod));
--        continue;
--      }
--      RINOK(filterStreamSpec->Filter.QueryInterface(IID_ICryptoSetPassword,
--          &cryptoSetPassword));
--
--      if (!getTextPassword)
--        extractCallback->QueryInterface(IID_ICryptoGetTextPassword, (void **)&getTextPassword);
--      if (getTextPassword)
--      {
--        CMyComBSTR password;
--        RINOK(getTextPassword->CryptoGetTextPassword(&password));
--        if (item.UnPackVersion >= 29)
--        {
--          CByteBuffer buffer;
--          UString unicodePassword(password);
--          const UInt32 sizeInBytes = unicodePassword.Length() * 2;
--          buffer.SetCapacity(sizeInBytes);
--          for (int i = 0; i < unicodePassword.Length(); i++)
--          {
--            wchar_t c = unicodePassword[i];
--            ((Byte *)buffer)[i * 2] = (Byte)c;
--            ((Byte *)buffer)[i * 2 + 1] = (Byte)(c >> 8);
--          }
--          RINOK(cryptoSetPassword->CryptoSetPassword(
--            (const Byte *)buffer, sizeInBytes));
--        }
--        else
--        {
--          AString oemPassword = UnicodeStringToMultiByte(
--            (const wchar_t *)password, CP_OEMCP);
--          RINOK(cryptoSetPassword->CryptoSetPassword(
--            (const Byte *)(const char *)oemPassword, oemPassword.Length()));
--        }
--      }
--      else
--      {
--        RINOK(cryptoSetPassword->CryptoSetPassword(0, 0));
--      }
--      filterStreamSpec->SetInStream(folderInStream);
--      inStream = filterStream;
--    }
--    else
--    {
--      inStream = folderInStream;
--    }
--    CMyComPtr<ICompressCoder> commonCoder;
--    switch(item.Method)
--    {
--      case '0':
--      {
--        commonCoder = copyCoder;
--        break;
--      }
--      case '1':
--      case '2':
--      case '3':
--      case '4':
--      case '5':
--      {
--        /*
--        if (item.UnPackVersion >= 29)
--        {
--          outStream.Release();
--          RINOK(extractCallback->SetOperationResult(NExtract::NOperationResult::kUnSupportedMethod));
--          continue;
--        }
--        */
--        int m;
--        for (m = 0; m < methodItems.Size(); m++)
--          if (methodItems[m].RarUnPackVersion == item.UnPackVersion)
--            break;
--        if (m == methodItems.Size())
--        {
--          CMethodItem mi;
--          mi.RarUnPackVersion = item.UnPackVersion;
--
--          mi.Coder.Release();
--          if (item.UnPackVersion <= 30)
--          {
--            UInt32 methodID = 0x040300;
--            if (item.UnPackVersion < 20)
--              methodID += 1;
--            else if (item.UnPackVersion < 29)
--              methodID += 2;
--            else
--              methodID += 3;
--            RINOK(CreateCoder(EXTERNAL_CODECS_VARS methodID, mi.Coder, false));
--          }
--         
--          if (mi.Coder == 0)
--          {
--            outStream.Release();
--            RINOK(extractCallback->SetOperationResult(NExtract::NOperationResult::kUnSupportedMethod));
--            continue;
--          }
--
--          m = methodItems.Add(mi);
--        }
--        CMyComPtr<ICompressCoder> decoder = methodItems[m].Coder;
--
--        CMyComPtr<ICompressSetDecoderProperties2> compressSetDecoderProperties;
--        RINOK(decoder.QueryInterface(IID_ICompressSetDecoderProperties2,
--            &compressSetDecoderProperties));
--        
--        Byte isSolid = (Byte)((IsSolid(index) || item.IsSplitBefore()) ? 1: 0);
--        if (solidStart)
--        {
--          isSolid = false;
--          solidStart = false;
--        }
--
--
--        RINOK(compressSetDecoderProperties->SetDecoderProperties2(&isSolid, 1));
--          
--        commonCoder = decoder;
--        break;
--      }
--      default:
--        outStream.Release();
--        RINOK(extractCallback->SetOperationResult(NExtract::NOperationResult::kUnSupportedMethod));
--        continue;
--    }
--    HRESULT result = commonCoder->Code(inStream, outStream, &packSize, &item.Size, progress);
--    if (item.IsEncrypted())
--      filterStreamSpec->ReleaseInStream();
--    if (result == S_FALSE)
--    {
--      outStream.Release();
--      RINOK(extractCallback->SetOperationResult(NExtract::NOperationResult::kDataError));
--      continue;
--    }
--    if (result != S_OK)
--      return result;
--
--    /*
--    if (refItem.NumItems == 1 &&
--        !item.IsSplitBefore() && !item.IsSplitAfter())
--    */
--    {
--      const CItemEx &lastItem = _items[refItem.ItemIndex + refItem.NumItems - 1];
--      bool crcOK = outStreamSpec->GetCRC() == lastItem.FileCRC;
--      outStream.Release();
--      RINOK(extractCallback->SetOperationResult(crcOK ?
--          NExtract::NOperationResult::kOK:
--          NExtract::NOperationResult::kCRCError));
--    }
--    /*
--    else
--    {
--      bool crcOK = true;
--      for (int partIndex = 0; partIndex < refItem.NumItems; partIndex++)
--      {
--        const CItemEx &item = _items[refItem.ItemIndex + partIndex];
--        if (item.FileCRC != folderInStreamSpec->CRCs[partIndex])
--        {
--          crcOK = false;
--          break;
--        }
--      }
--      RINOK(extractCallback->SetOperationResult(crcOK ?
--          NExtract::NOperationResult::kOK:
--          NExtract::NOperationResult::kCRCError));
--    }
--    */
--  }
--  return S_OK;
--  COM_TRY_END
--}
--
--IMPL_ISetCompressCodecsInfo
--
--}}
-diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarHandler.h p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarHandler.h
---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarHandler.h	2011-01-08 06:41:27.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarHandler.h	1969-12-31 21:00:00.000000000 -0300
-@@ -1,66 +0,0 @@
--// Rar/Handler.h
--
--#ifndef __RAR_HANDLER_H
--#define __RAR_HANDLER_H
--
--#include "../IArchive.h"
--
--#include "../../Common/CreateCoder.h"
--
--#include "RarIn.h"
--#include "RarVolumeInStream.h"
--
--namespace NArchive {
--namespace NRar {
--
--class CHandler:
--  public IInArchive,
--  PUBLIC_ISetCompressCodecsInfo
--  public CMyUnknownImp
--{
--  CRecordVector<CRefItem> _refItems;
--  CObjectVector<CItemEx> _items;
--  CObjectVector<CInArchive> _archives;
--  NArchive::NRar::CInArchiveInfo _archiveInfo;
--  AString _errorMessage;
--
--  DECL_EXTERNAL_CODECS_VARS
--
--  UInt64 GetPackSize(int refIndex) const;
--
--  bool IsSolid(int refIndex)
--  {
--    const CItemEx &item = _items[_refItems[refIndex].ItemIndex];
--    if (item.UnPackVersion < 20)
--    {
--      if (_archiveInfo.IsSolid())
--        return (refIndex > 0);
--      return false;
--    }
--    return item.IsSolid();
--  }
--  void AddErrorMessage(const AString &s)
--  {
--    if (!_errorMessage.IsEmpty())
--      _errorMessage += '\n';
--    _errorMessage += s;
--  }
--
--  HRESULT Open2(IInStream *stream,
--      const UInt64 *maxCheckStartPosition,
--      IArchiveOpenCallback *openCallback);
--
--public:
--  MY_QUERYINTERFACE_BEGIN2(IInArchive)
--  QUERY_ENTRY_ISetCompressCodecsInfo
--  MY_QUERYINTERFACE_END
--  MY_ADDREF_RELEASE
--  
--  INTERFACE_IInArchive(;)
--
--  DECL_ISetCompressCodecsInfo
--};
--
--}}
--
--#endif
-diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarHeader.cpp p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarHeader.cpp
---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarHeader.cpp	2008-08-14 06:11:25.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarHeader.cpp	1969-12-31 21:00:00.000000000 -0300
-@@ -1,21 +0,0 @@
--// Archive/Rar/Headers.cpp
--
--#include "StdAfx.h"
--
--#include "RarHeader.h"
--
--namespace NArchive{
--namespace NRar{
--namespace NHeader{
--
--Byte kMarker[kMarkerSize] = {0x52 + 1, 0x61, 0x72, 0x21, 0x1a, 0x07, 0x00};
--  
--class CMarkerInitializer
--{
--public:
--  CMarkerInitializer() { kMarker[0]--; };
--};
--
--static CMarkerInitializer markerInitializer;
--
--}}}
-diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarHeader.h p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarHeader.h
---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarHeader.h	2011-01-08 06:41:27.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarHeader.h	1969-12-31 21:00:00.000000000 -0300
-@@ -1,205 +0,0 @@
--// Archive/RarHeader.h
--
--#ifndef __ARCHIVE_RAR_HEADER_H
--#define __ARCHIVE_RAR_HEADER_H
--
--#include "Common/Types.h"
--
--namespace NArchive {
--namespace NRar {
--namespace NHeader {
--
--const int kMarkerSize = 7;
--extern Byte kMarker[kMarkerSize];
--  
--const int kArchiveSolid = 0x1;
--
--namespace NBlockType
--{
--  enum EBlockType
--  {
--    kMarker = 0x72,
--    kArchiveHeader,
--    kFileHeader,
--    kCommentHeader,
--    kOldAuthenticity,
--    kOldSubBlock,
--    kRecoveryRecord,
--    kAuthenticity,
--    kSubBlock,
--    kEndOfArchive
--  };
--}
--
--namespace NArchive
--{
--  const UInt16 kVolume  = 1;
--  const UInt16 kComment = 2;
--  const UInt16 kLock    = 4;
--  const UInt16 kSolid   = 8;
--  const UInt16 kNewVolName = 0x10; // ('volname.partN.rar')
--  const UInt16 kAuthenticity  = 0x20;
--  const UInt16 kRecovery = 0x40;
--  const UInt16 kBlockEncryption  = 0x80;
--  const UInt16 kFirstVolume = 0x100; // (set only by RAR 3.0 and later)
--  const UInt16 kEncryptVer = 0x200; // RAR 3.6 there is EncryptVer Byte in End of MainHeader
--
--  const int kHeaderSizeMin = 7;
--  
--  const int kArchiveHeaderSize = 13;
--
--  const int kBlockHeadersAreEncrypted = 0x80;
--
--}
--
--namespace NFile
--{
--  const int kSplitBefore = 1 << 0;
--  const int kSplitAfter  = 1 << 1;
--  const int kEncrypted   = 1 << 2;
--  const int kComment     = 1 << 3;
--  const int kSolid       = 1 << 4;
--  
--  const int kDictBitStart     = 5;
--  const int kNumDictBits  = 3;
--  const int kDictMask         = (1 << kNumDictBits) - 1;
--  const int kDictDirectoryValue  = 0x7;
--  
--  const int kSize64Bits    = 1 << 8;
--  const int kUnicodeName   = 1 << 9;
--  const int kSalt          = 1 << 10;
--  const int kOldVersion    = 1 << 11;
--  const int kExtTime       = 1 << 12;
--  // const int kExtFlags      = 1 << 13;
--  // const int kSkipIfUnknown = 1 << 14;
--
--  const int kLongBlock    = 1 << 15;
--  
--  /*
--  struct CBlock
--  {
--    // UInt16 HeadCRC;
--    // Byte Type;
--    // UInt16 Flags;
--    // UInt16 HeadSize;
--    UInt32 PackSize;
--    UInt32 UnPackSize;
--    Byte HostOS;
--    UInt32 FileCRC;
--    UInt32 Time;
--    Byte UnPackVersion;
--    Byte Method;
--    UInt16 NameSize;
--    UInt32 Attributes;
--  };
--  */
--
--  /*
--  struct CBlock32
--  {
--    UInt16 HeadCRC;
--    Byte Type;
--    UInt16 Flags;
--    UInt16 HeadSize;
--    UInt32 PackSize;
--    UInt32 UnPackSize;
--    Byte HostOS;
--    UInt32 FileCRC;
--    UInt32 Time;
--    Byte UnPackVersion;
--    Byte Method;
--    UInt16 NameSize;
--    UInt32 Attributes;
--    UInt16 GetRealCRC(const void *aName, UInt32 aNameSize,
--        bool anExtraDataDefined = false, Byte *anExtraData = 0) const;
--  };
--  struct CBlock64
--  {
--    UInt16 HeadCRC;
--    Byte Type;
--    UInt16 Flags;
--    UInt16 HeadSize;
--    UInt32 PackSizeLow;
--    UInt32 UnPackSizeLow;
--    Byte HostOS;
--    UInt32 FileCRC;
--    UInt32 Time;
--    Byte UnPackVersion;
--    Byte Method;
--    UInt16 NameSize;
--    UInt32 Attributes;
--    UInt32 PackSizeHigh;
--    UInt32 UnPackSizeHigh;
--    UInt16 GetRealCRC(const void *aName, UInt32 aNameSize) const;
--  };
--  */
--  
--  const int kLabelFileAttribute            = 0x08;
--  const int kWinFileDirectoryAttributeMask = 0x10;
--  
--  enum CHostOS
--  {
--    kHostMSDOS = 0,
--      kHostOS2   = 1,
--      kHostWin32 = 2,
--      kHostUnix  = 3,
--      kHostMacOS = 4,
--      kHostBeOS = 5
--  };
--}
--
--namespace NBlock
--{
--  const UInt16 kLongBlock = 1 << 15;
--  struct CBlock
--  {
--    UInt16 CRC;
--    Byte Type;
--    UInt16 Flags;
--    UInt16 HeadSize;
--    //  UInt32 DataSize;
--  };
--}
--
--/*
--struct CSubBlock
--{
--  UInt16 HeadCRC;
--  Byte HeadType;
--  UInt16 Flags;
--  UInt16 HeadSize;
--  UInt32 DataSize;
--  UInt16 SubType;
--  Byte Level; // Reserved : Must be 0
--};
--
--struct CCommentBlock
--{
--  UInt16 HeadCRC;
--  Byte HeadType;
--  UInt16 Flags;
--  UInt16 HeadSize;
--  UInt16 UnpSize;
--  Byte UnpVer;
--  Byte Method;
--  UInt16 CommCRC;
--};
--
--
--struct CProtectHeader
--{
--  UInt16 HeadCRC;
--  Byte HeadType;
--  UInt16 Flags;
--  UInt16 HeadSize;
--  UInt32 DataSize;
--  Byte Version;
--  UInt16 RecSectors;
--  UInt32 TotalBlocks;
--  Byte Mark[8];
--};
--*/
--
--}}}
--
--#endif
-diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarIn.cpp p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarIn.cpp
---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarIn.cpp	2011-01-08 06:41:37.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarIn.cpp	1969-12-31 21:00:00.000000000 -0300
-@@ -1,478 +0,0 @@
--// Archive/RarIn.cpp
--
--#include "StdAfx.h"
--
--#include "../../../../C/7zCrc.h"
--#include "../../../../C/CpuArch.h"
--
--#include "Common/StringConvert.h"
--#include "Common/UTFConvert.h"
--
--#include "../../Common/LimitedStreams.h"
--#include "../../Common/StreamUtils.h"
--
--#include "../Common/FindSignature.h"
--
--#include "RarIn.h"
--
--#define Get16(p) GetUi16(p)
--#define Get32(p) GetUi32(p)
--#define Get64(p) GetUi64(p)
--
--namespace NArchive {
--namespace NRar {
--
--static const char *k_UnexpectedEnd = "Unexpected end of archive";
--static const char *k_DecryptionError = "Decryption Error";
--
--void CInArchive::ThrowExceptionWithCode(
--    CInArchiveException::CCauseType cause)
--{
--  throw CInArchiveException(cause);
--}
--
--HRESULT CInArchive::Open(IInStream *inStream, const UInt64 *searchHeaderSizeLimit)
--{
--  try
--  {
--    Close();
--    HRESULT res = Open2(inStream, searchHeaderSizeLimit);
--    if (res == S_OK)
--      return res;
--    Close();
--    return res;
--  }
--  catch(...) { Close(); throw; }
--}
--
--void CInArchive::Close()
--{
--  m_Stream.Release();
--}
--
--HRESULT CInArchive::ReadBytesSpec(void *data, size_t *resSize)
--{
--  if (m_CryptoMode)
--  {
--    size_t size = *resSize;
--    *resSize = 0;
--    const Byte *bufData = m_DecryptedDataAligned;
--    UInt32 bufSize = m_DecryptedDataSize;
--    size_t i;
--    for (i = 0; i < size && m_CryptoPos < bufSize; i++)
--      ((Byte *)data)[i] = bufData[m_CryptoPos++];
--    *resSize = i;
--    return S_OK;
--  }
--  return ReadStream(m_Stream, data, resSize);
--}
--
--bool CInArchive::ReadBytesAndTestSize(void *data, UInt32 size)
--{
--  size_t processed = size;
--  if (ReadBytesSpec(data, &processed) != S_OK)
--    return false;
--  return processed == size;
--}
--
--HRESULT CInArchive::Open2(IInStream *stream, const UInt64 *searchHeaderSizeLimit)
--{
--  m_CryptoMode = false;
--  RINOK(stream->Seek(0, STREAM_SEEK_SET, &m_StreamStartPosition));
--  m_Position = m_StreamStartPosition;
--
--  UInt64 arcStartPos;
--  RINOK(FindSignatureInStream(stream, NHeader::kMarker, NHeader::kMarkerSize,
--      searchHeaderSizeLimit, arcStartPos));
--  m_Position = arcStartPos + NHeader::kMarkerSize;
--  RINOK(stream->Seek(m_Position, STREAM_SEEK_SET, NULL));
--  Byte buf[NHeader::NArchive::kArchiveHeaderSize + 1];
--
--  RINOK(ReadStream_FALSE(stream, buf, NHeader::NArchive::kArchiveHeaderSize));
--  AddToSeekValue(NHeader::NArchive::kArchiveHeaderSize);
--
--
--  UInt32 blockSize = Get16(buf + 5);
--
--  _header.EncryptVersion = 0;
--  _header.Flags = Get16(buf + 3);
--
--  UInt32 headerSize = NHeader::NArchive::kArchiveHeaderSize;
--  if (_header.IsThereEncryptVer())
--  {
--    if (blockSize <= headerSize)
--      return S_FALSE;
--    RINOK(ReadStream_FALSE(stream, buf + NHeader::NArchive::kArchiveHeaderSize, 1));
--    AddToSeekValue(1);
--    _header.EncryptVersion = buf[NHeader::NArchive::kArchiveHeaderSize];
--    headerSize += 1;
--  }
--  if (blockSize < headerSize ||
--      buf[2] != NHeader::NBlockType::kArchiveHeader ||
--      (UInt32)Get16(buf) != (CrcCalc(buf + 2, headerSize - 2) & 0xFFFF))
--    return S_FALSE;
--
--  size_t commentSize = blockSize - headerSize; 
--  _comment.SetCapacity(commentSize);
--  RINOK(ReadStream_FALSE(stream, _comment, commentSize));
--  AddToSeekValue(commentSize);
--  m_Stream = stream;
--  _header.StartPosition = arcStartPos;
--  return S_OK;
--}
--
--void CInArchive::GetArchiveInfo(CInArchiveInfo &archiveInfo) const
--{
--  archiveInfo = _header;
--}
--
--static void DecodeUnicodeFileName(const char *name, const Byte *encName,
--    int encSize, wchar_t *unicodeName, int maxDecSize)
--{
--  int encPos = 0;
--  int decPos = 0;
--  int flagBits = 0;
--  Byte flags = 0;
--  Byte highByte = encName[encPos++];
--  while (encPos < encSize && decPos < maxDecSize)
--  {
--    if (flagBits == 0)
--    {
--      flags = encName[encPos++];
--      flagBits = 8;
--    }
--    switch(flags >> 6)
--    {
--      case 0:
--        unicodeName[decPos++] = encName[encPos++];
--        break;
--      case 1:
--        unicodeName[decPos++] = (wchar_t)(encName[encPos++] + (highByte << 8));
--        break;
--      case 2:
--        unicodeName[decPos++] = (wchar_t)(encName[encPos] + (encName[encPos + 1] << 8));
--        encPos += 2;
--        break;
--      case 3:
--        {
--          int length = encName[encPos++];
--          if (length & 0x80)
--          {
--            Byte correction = encName[encPos++];
--            for (length = (length & 0x7f) + 2;
--                length > 0 && decPos < maxDecSize; length--, decPos++)
--              unicodeName[decPos] = (wchar_t)(((name[decPos] + correction) & 0xff) + (highByte << 8));
--          }
--          else
--            for (length += 2; length > 0 && decPos < maxDecSize; length--, decPos++)
--              unicodeName[decPos] = name[decPos];
--        }
--        break;
--    }
--    flags <<= 2;
--    flagBits -= 2;
--  }
--  unicodeName[decPos < maxDecSize ? decPos : maxDecSize - 1] = 0;
--}
--
--void CInArchive::ReadName(CItemEx &item, int nameSize)
--{
--  item.UnicodeName.Empty();
--  if (nameSize > 0)
--  {
--    m_NameBuffer.EnsureCapacity(nameSize + 1);
--    char *buffer = (char *)m_NameBuffer;
--
--    for (int i = 0; i < nameSize; i++)
--      buffer[i] = ReadByte();
--
--    int mainLen;
--    for (mainLen = 0; mainLen < nameSize; mainLen++)
--      if (buffer[mainLen] == '\0')
--        break;
--    buffer[mainLen] = '\0';
--    item.Name = buffer;
--
--    if(item.HasUnicodeName())
--    {
--      if(mainLen < nameSize)
--      {
--        int unicodeNameSizeMax = MyMin(nameSize, (0x400));
--        _unicodeNameBuffer.EnsureCapacity(unicodeNameSizeMax + 1);
--        DecodeUnicodeFileName(buffer, (const Byte *)buffer + mainLen + 1,
--            nameSize - (mainLen + 1), _unicodeNameBuffer, unicodeNameSizeMax);
--        item.UnicodeName = _unicodeNameBuffer;
--      }
--      else if (!ConvertUTF8ToUnicode(item.Name, item.UnicodeName))
--        item.UnicodeName.Empty();
--    }
--  }
--  else
--    item.Name.Empty();
--}
--
--Byte CInArchive::ReadByte()
--{
--  if (m_CurPos >= m_PosLimit)
--    throw CInArchiveException(CInArchiveException::kIncorrectArchive);
--  return m_CurData[m_CurPos++];
--}
--
--UInt16 CInArchive::ReadUInt16()
--{
--  UInt16 value = 0;
--  for (int i = 0; i < 2; i++)
--  {
--    Byte b = ReadByte();
--    value |= (UInt16(b) << (8 * i));
--  }
--  return value;
--}
--
--UInt32 CInArchive::ReadUInt32()
--{
--  UInt32 value = 0;
--  for (int i = 0; i < 4; i++)
--  {
--    Byte b = ReadByte();
--    value |= (UInt32(b) << (8 * i));
--  }
--  return value;
--}
--
--void CInArchive::ReadTime(Byte mask, CRarTime &rarTime)
--{
--  rarTime.LowSecond = (Byte)(((mask & 4) != 0) ? 1 : 0);
--  int numDigits = (mask & 3);
--  rarTime.SubTime[0] = rarTime.SubTime[1] = rarTime.SubTime[2] = 0;
--  for (int i = 0; i < numDigits; i++)
--    rarTime.SubTime[3 - numDigits + i] = ReadByte();
--}
--
--void CInArchive::ReadHeaderReal(CItemEx &item)
--{
--  item.Flags = m_BlockHeader.Flags;
--  item.PackSize = ReadUInt32();
--  item.Size = ReadUInt32();
--  item.HostOS = ReadByte();
--  item.FileCRC = ReadUInt32();
--  item.MTime.DosTime = ReadUInt32();
--  item.UnPackVersion = ReadByte();
--  item.Method = ReadByte();
--  int nameSize = ReadUInt16();
--  item.Attrib = ReadUInt32();
--
--  item.MTime.LowSecond = 0;
--  item.MTime.SubTime[0] =
--      item.MTime.SubTime[1] =
--      item.MTime.SubTime[2] = 0;
--
--  if((item.Flags & NHeader::NFile::kSize64Bits) != 0)
--  {
--    item.PackSize |= ((UInt64)ReadUInt32() << 32);
--    item.Size |= ((UInt64)ReadUInt32() << 32);
--  }
--
--  ReadName(item, nameSize);
--
--  if (item.HasSalt())
--    for (int i = 0; i < sizeof(item.Salt); i++)
--      item.Salt[i] = ReadByte();
--
--  // some rar archives have HasExtTime flag without field.
--  if (m_CurPos < m_PosLimit && item.HasExtTime())
--  {
--    Byte accessMask = (Byte)(ReadByte() >> 4);
--    Byte b = ReadByte();
--    Byte modifMask = (Byte)(b >> 4);
--    Byte createMask = (Byte)(b & 0xF);
--    if ((modifMask & 8) != 0)
--      ReadTime(modifMask, item.MTime);
--    item.CTimeDefined = ((createMask & 8) != 0);
--    if (item.CTimeDefined)
--    {
--      item.CTime.DosTime = ReadUInt32();
--      ReadTime(createMask, item.CTime);
--    }
--    item.ATimeDefined = ((accessMask & 8) != 0);
--    if (item.ATimeDefined)
--    {
--      item.ATime.DosTime = ReadUInt32();
--      ReadTime(accessMask, item.ATime);
--    }
--  }
--
--  UInt16 fileHeaderWithNameSize = (UInt16)m_CurPos;
--  
--  item.Position = m_Position;
--  item.MainPartSize = fileHeaderWithNameSize;
--  item.CommentSize = (UInt16)(m_BlockHeader.HeadSize - fileHeaderWithNameSize);
--
--  if (m_CryptoMode)
--    item.AlignSize = (UInt16)((16 - ((m_BlockHeader.HeadSize) & 0xF)) & 0xF);
--  else
--    item.AlignSize = 0;
--  AddToSeekValue(m_BlockHeader.HeadSize);
--}
--
--void CInArchive::AddToSeekValue(UInt64 addValue)
--{
--  m_Position += addValue;
--}
--
--HRESULT CInArchive::GetNextItem(CItemEx &item, ICryptoGetTextPassword *getTextPassword, bool &decryptionError, AString &errorMessage)
--{
--  decryptionError = false;
--  for (;;)
--  {
--    SeekInArchive(m_Position);
--    if (!m_CryptoMode && (_header.Flags &
--        NHeader::NArchive::kBlockHeadersAreEncrypted) != 0)
--    {
--      m_CryptoMode = false;
--      if (getTextPassword == 0)
--        return S_FALSE;
--      if (!m_RarAES)
--      {
--        m_RarAESSpec = new NCrypto::NRar29::CDecoder;
--        m_RarAES = m_RarAESSpec;
--      }
--      m_RarAESSpec->SetRar350Mode(_header.IsEncryptOld());
--
--      // Salt
--      const UInt32 kSaltSize = 8;
--      Byte salt[kSaltSize];
--      if(!ReadBytesAndTestSize(salt, kSaltSize))
--        return S_FALSE;
--      m_Position += kSaltSize;
--      RINOK(m_RarAESSpec->SetDecoderProperties2(salt, kSaltSize))
--      // Password
--      CMyComBSTR password;
--      RINOK(getTextPassword->CryptoGetTextPassword(&password))
--      UString unicodePassword(password);
--
--      CByteBuffer buffer;
--      const UInt32 sizeInBytes = unicodePassword.Length() * 2;
--      buffer.SetCapacity(sizeInBytes);
--      for (int i = 0; i < unicodePassword.Length(); i++)
--      {
--        wchar_t c = unicodePassword[i];
--        ((Byte *)buffer)[i * 2] = (Byte)c;
--        ((Byte *)buffer)[i * 2 + 1] = (Byte)(c >> 8);
--      }
--
--      RINOK(m_RarAESSpec->CryptoSetPassword((const Byte *)buffer, sizeInBytes));
--
--      const UInt32 kDecryptedBufferSize = (1 << 12);
--      if (m_DecryptedData.GetCapacity() == 0)
--      {
--        const UInt32 kAlign = 16;
--        m_DecryptedData.SetCapacity(kDecryptedBufferSize + kAlign);
--        m_DecryptedDataAligned = (Byte *)((ptrdiff_t)((Byte *)m_DecryptedData + kAlign - 1) & ~(ptrdiff_t)(kAlign - 1));
--      }
--      RINOK(m_RarAES->Init());
--      size_t decryptedDataSizeT = kDecryptedBufferSize;
--      RINOK(ReadStream(m_Stream, m_DecryptedDataAligned, &decryptedDataSizeT));
--      m_DecryptedDataSize = (UInt32)decryptedDataSizeT;
--      m_DecryptedDataSize = m_RarAES->Filter(m_DecryptedDataAligned, m_DecryptedDataSize);
--
--      m_CryptoMode = true;
--      m_CryptoPos = 0;
--    }
--
--    m_FileHeaderData.EnsureCapacity(7);
--    size_t processed = 7;
--    RINOK(ReadBytesSpec((Byte *)m_FileHeaderData, &processed));
--    if (processed != 7)
--    {
--      if (processed != 0)
--        errorMessage = k_UnexpectedEnd;
--      return S_FALSE;
--    }
--
--    m_CurData = (Byte *)m_FileHeaderData;
--    m_CurPos = 0;
--    m_PosLimit = 7;
--    m_BlockHeader.CRC = ReadUInt16();
--    m_BlockHeader.Type = ReadByte();
--    m_BlockHeader.Flags = ReadUInt16();
--    m_BlockHeader.HeadSize = ReadUInt16();
--
--    if (m_BlockHeader.HeadSize < 7)
--      ThrowExceptionWithCode(CInArchiveException::kIncorrectArchive);
--
--    if (m_BlockHeader.Type == NHeader::NBlockType::kEndOfArchive)
--      return S_FALSE;
--
--    if (m_BlockHeader.Type == NHeader::NBlockType::kFileHeader)
--    {
--      m_FileHeaderData.EnsureCapacity(m_BlockHeader.HeadSize);
--      m_CurData = (Byte *)m_FileHeaderData;
--      m_PosLimit = m_BlockHeader.HeadSize;
--      if (!ReadBytesAndTestSize(m_CurData + m_CurPos, m_BlockHeader.HeadSize - 7))
--      {
--        errorMessage = k_UnexpectedEnd;
--        return S_FALSE;
--      }
--
--      ReadHeaderReal(item);
--      if ((CrcCalc(m_CurData + 2,
--          m_BlockHeader.HeadSize - item.CommentSize - 2) & 0xFFFF) != m_BlockHeader.CRC)
--        ThrowExceptionWithCode(CInArchiveException::kFileHeaderCRCError);
--
--      FinishCryptoBlock();
--      m_CryptoMode = false;
--      SeekInArchive(m_Position); // Move Position to compressed Data;
--      AddToSeekValue(item.PackSize);  // m_Position points to next header;
--      return S_OK;
--    }
--    if (m_CryptoMode && m_BlockHeader.HeadSize > (1 << 10))
--    {
--      decryptionError = true;
--      errorMessage = k_DecryptionError;
--      return S_FALSE;
--    }
--    if ((m_BlockHeader.Flags & NHeader::NBlock::kLongBlock) != 0)
--    {
--      m_FileHeaderData.EnsureCapacity(7 + 4);
--      m_CurData = (Byte *)m_FileHeaderData;
--      if (!ReadBytesAndTestSize(m_CurData + m_CurPos, 4))
--      {
--        errorMessage = k_UnexpectedEnd;
--        return S_FALSE;
--      }
--      m_PosLimit = 7 + 4;
--      UInt32 dataSize = ReadUInt32();
--      AddToSeekValue(dataSize);
--      if (m_CryptoMode && dataSize > (1 << 27))
--      {
--        decryptionError = true;
--        errorMessage = k_DecryptionError;
--        return S_FALSE;
--      }
--      m_CryptoPos = m_BlockHeader.HeadSize;
--    }
--    else
--      m_CryptoPos = 0;
--    AddToSeekValue(m_BlockHeader.HeadSize);
--    FinishCryptoBlock();
--    m_CryptoMode = false;
--  }
--}
--
--void CInArchive::SeekInArchive(UInt64 position)
--{
--  m_Stream->Seek(position, STREAM_SEEK_SET, NULL);
--}
--
--ISequentialInStream* CInArchive::CreateLimitedStream(UInt64 position, UInt64 size)
--{
--  CLimitedSequentialInStream *streamSpec = new CLimitedSequentialInStream;
--  CMyComPtr<ISequentialInStream> inStream(streamSpec);
--  SeekInArchive(position);
--  streamSpec->SetStream(m_Stream);
--  streamSpec->Init(size);
--  return inStream.Detach();
--}
--
--}}
-diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarIn.h p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarIn.h
---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarIn.h	2011-01-08 06:41:27.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarIn.h	1969-12-31 21:00:00.000000000 -0300
-@@ -1,123 +0,0 @@
--// RarIn.h
--
--#ifndef __ARCHIVE_RAR_IN_H
--#define __ARCHIVE_RAR_IN_H
--
--#include "Common/DynamicBuffer.h"
--#include "Common/MyCom.h"
--
--#include "../../ICoder.h"
--#include "../../IStream.h"
--
--#include "../../Common/StreamObjects.h"
--
--#include "../../Crypto/RarAes.h"
--
--#include "RarHeader.h"
--#include "RarItem.h"
--
--namespace NArchive {
--namespace NRar {
--
--class CInArchiveException
--{
--public:
--  enum CCauseType
--  {
--    kUnexpectedEndOfArchive = 0,
--    kArchiveHeaderCRCError,
--    kFileHeaderCRCError,
--    kIncorrectArchive
--  }
--  Cause;
--  CInArchiveException(CCauseType cause) :   Cause(cause) {}
--};
--
--
--struct CInArchiveInfo
--{
--  UInt32 Flags;
--  Byte EncryptVersion;
--  UInt64 StartPosition;
--  
--  bool IsSolid() const { return (Flags & NHeader::NArchive::kSolid) != 0; }
--  bool IsCommented() const {  return (Flags & NHeader::NArchive::kComment) != 0; }
--  bool IsVolume() const {  return (Flags & NHeader::NArchive::kVolume) != 0; }
--  bool HaveNewVolumeName() const {  return (Flags & NHeader::NArchive::kNewVolName) != 0; }
--  bool IsEncrypted() const { return (Flags & NHeader::NArchive::kBlockEncryption) != 0; }
--  bool IsThereEncryptVer() const { return (Flags & NHeader::NArchive::kEncryptVer) != 0; }
--  bool IsEncryptOld() const { return (!IsThereEncryptVer() || EncryptVersion < 36); }
--};
--
--class CInArchive
--{
--  CMyComPtr<IInStream> m_Stream;
--  
--  UInt64 m_StreamStartPosition;
--  
--  CInArchiveInfo _header;
--  CDynamicBuffer<char> m_NameBuffer;
--  CDynamicBuffer<wchar_t> _unicodeNameBuffer;
--
--  CByteBuffer _comment;
--  
--  void ReadName(CItemEx &item, int nameSize);
--  void ReadHeaderReal(CItemEx &item);
--  
--  HRESULT ReadBytesSpec(void *data, size_t *size);
--  bool ReadBytesAndTestSize(void *data, UInt32 size);
--  
--  HRESULT Open2(IInStream *stream, const UInt64 *searchHeaderSizeLimit);
--
--  void ThrowExceptionWithCode(CInArchiveException::CCauseType cause);
--  void ThrowUnexpectedEndOfArchiveException();
--  
--  void AddToSeekValue(UInt64 addValue);
--  
--  CDynamicBuffer<Byte> m_FileHeaderData;
--  
--  NHeader::NBlock::CBlock m_BlockHeader;
--
--  NCrypto::NRar29::CDecoder *m_RarAESSpec;
--  CMyComPtr<ICompressFilter> m_RarAES;
--  
--  Byte *m_CurData; // it must point to start of Rar::Block
--  UInt32 m_CurPos;
--  UInt32 m_PosLimit;
--  Byte ReadByte();
--  UInt16 ReadUInt16();
--  UInt32 ReadUInt32();
--  void ReadTime(Byte mask, CRarTime &rarTime);
--
--  CBuffer<Byte> m_DecryptedData;
--  Byte *m_DecryptedDataAligned;
--  UInt32 m_DecryptedDataSize;
--
--  bool m_CryptoMode;
--  UInt32 m_CryptoPos;
--  void FinishCryptoBlock()
--  {
--    if (m_CryptoMode)
--      while ((m_CryptoPos & 0xF) != 0)
--      {
--        m_CryptoPos++;
--        m_Position++;
--      }
--  }
--
--public:
--  UInt64 m_Position;
--
--  HRESULT Open(IInStream *inStream, const UInt64 *searchHeaderSizeLimit);
--  void Close();
--  HRESULT GetNextItem(CItemEx &item, ICryptoGetTextPassword *getTextPassword, bool &decryptionError, AString &errorMessage);
--  
--  void GetArchiveInfo(CInArchiveInfo &archiveInfo) const;
--  
--  void SeekInArchive(UInt64 position);
--  ISequentialInStream *CreateLimitedStream(UInt64 position, UInt64 size);
--};
--  
--}}
--  
--#endif
-diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarItem.cpp p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarItem.cpp
---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarItem.cpp	2008-08-14 06:11:25.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarItem.cpp	1969-12-31 21:00:00.000000000 -0300
-@@ -1,55 +0,0 @@
--// RarItem.cpp
--
--#include "StdAfx.h"
--
--#include "RarItem.h"
--
--namespace NArchive{
--namespace NRar{
--
--bool CItem::IgnoreItem() const
--{
--  switch(HostOS)
--  {
--    case NHeader::NFile::kHostMSDOS:
--    case NHeader::NFile::kHostOS2:
--    case NHeader::NFile::kHostWin32:
--      return ((Attrib & NHeader::NFile::kLabelFileAttribute) != 0);
--  }
--  return false;
--}
--
--bool CItem::IsDir() const
--{
--  if (GetDictSize() == NHeader::NFile::kDictDirectoryValue)
--    return true;
--  switch(HostOS)
--  {
--    case NHeader::NFile::kHostMSDOS:
--    case NHeader::NFile::kHostOS2:
--    case NHeader::NFile::kHostWin32:
--      if ((Attrib & FILE_ATTRIBUTE_DIRECTORY) != 0)
--        return true;
--  }
--  return false;
--}
--
--UInt32 CItem::GetWinAttributes() const
--{
--  UInt32 winAttributes;
--  switch(HostOS)
--  {
--    case NHeader::NFile::kHostMSDOS:
--    case NHeader::NFile::kHostOS2:
--    case NHeader::NFile::kHostWin32:
--      winAttributes = Attrib;
--      break;
--    default:
--      winAttributes = 0; // must be converted from unix value;
--  }
--  if (IsDir())
--    winAttributes |= NHeader::NFile::kWinFileDirectoryAttributeMask;
--  return winAttributes;
--}
--
--}}
-diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarItem.h p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarItem.h
---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarItem.h	2008-08-14 06:11:12.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarItem.h	1969-12-31 21:00:00.000000000 -0300
-@@ -1,79 +0,0 @@
--// RarItem.h
--
--#ifndef __ARCHIVE_RAR_ITEM_H
--#define __ARCHIVE_RAR_ITEM_H
--
--#include "Common/Types.h"
--#include "Common/MyString.h"
--
--#include "RarHeader.h"
--
--namespace NArchive{
--namespace NRar{
--
--struct CRarTime
--{
--  UInt32 DosTime;
--  Byte LowSecond;
--  Byte SubTime[3];
--};
--
--struct CItem
--{
--  UInt64 Size;
--  UInt64 PackSize;
--  
--  CRarTime CTime;
--  CRarTime ATime;
--  CRarTime MTime;
--
--  UInt32 FileCRC;
--  UInt32 Attrib;
--
--  UInt16 Flags;
--  Byte HostOS;
--  Byte UnPackVersion;
--  Byte Method;
--
--  bool CTimeDefined;
--  bool ATimeDefined;
--
--  AString Name;
--  UString UnicodeName;
--
--  Byte Salt[8];
--  
--  bool IsEncrypted()   const { return (Flags & NHeader::NFile::kEncrypted) != 0; }
--  bool IsSolid()       const { return (Flags & NHeader::NFile::kSolid) != 0; }
--  bool IsCommented()   const { return (Flags & NHeader::NFile::kComment) != 0; }
--  bool IsSplitBefore() const { return (Flags & NHeader::NFile::kSplitBefore) != 0; }
--  bool IsSplitAfter()  const { return (Flags & NHeader::NFile::kSplitAfter) != 0; }
--  bool HasSalt()       const { return (Flags & NHeader::NFile::kSalt) != 0; }
--  bool HasExtTime()    const { return (Flags & NHeader::NFile::kExtTime) != 0; }
--  bool HasUnicodeName()const { return (Flags & NHeader::NFile::kUnicodeName) != 0; }
--  bool IsOldVersion()  const { return (Flags & NHeader::NFile::kOldVersion) != 0; }
--  
--  UInt32 GetDictSize() const { return (Flags >> NHeader::NFile::kDictBitStart) & NHeader::NFile::kDictMask; }
--  bool IsDir() const;
--  bool IgnoreItem() const;
--  UInt32 GetWinAttributes() const;
--  
--  CItem(): CTimeDefined(false), ATimeDefined(false) {}
--};
--
--class CItemEx: public CItem
--{
--public:
--  UInt64 Position;
--  UInt16 MainPartSize;
--  UInt16 CommentSize;
--  UInt16 AlignSize;
--  UInt64 GetFullSize()  const { return MainPartSize + CommentSize + AlignSize + PackSize; };
--  //  DWORD GetHeaderWithCommentSize()  const { return MainPartSize + CommentSize; };
--  UInt64 GetCommentPosition() const { return Position + MainPartSize; };
--  UInt64 GetDataPosition()    const { return GetCommentPosition() + CommentSize + AlignSize; };
--};
--
--}}
--
--#endif
-diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarRegister.cpp p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarRegister.cpp
---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarRegister.cpp	2009-12-21 08:46:32.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarRegister.cpp	1969-12-31 21:00:00.000000000 -0300
-@@ -1,13 +0,0 @@
--// RarRegister.cpp
--
--#include "StdAfx.h"
--
--#include "../../Common/RegisterArc.h"
--
--#include "RarHandler.h"
--static IInArchive *CreateArc() { return new NArchive::NRar::CHandler; }
--
--static CArcInfo g_ArcInfo =
--  { L"Rar", L"rar r00", 0, 3, {0x52 , 0x61, 0x72, 0x21, 0x1a, 0x07, 0x00}, 7, false, CreateArc, 0,  };
--
--REGISTER_ARC(Rar)
-diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarVolumeInStream.cpp p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarVolumeInStream.cpp
---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarVolumeInStream.cpp	2009-05-30 17:19:19.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarVolumeInStream.cpp	1969-12-31 21:00:00.000000000 -0300
-@@ -1,78 +0,0 @@
--// RarVolumeInStream.cpp
--
--#include "StdAfx.h"
--
--#include "../../../../C/7zCrc.h"
--
--#include "RarVolumeInStream.h"
--
--namespace NArchive {
--namespace NRar {
--
--void CFolderInStream::Init(
--    CObjectVector<CInArchive> *archives,
--    const CObjectVector<CItemEx> *items,
--    const CRefItem &refItem)
--{
--  _archives = archives;
--  _items = items;
--  _refItem = refItem;
--  _curIndex = 0;
--  CRCs.Clear();
--  _fileIsOpen = false;
--}
--
--HRESULT CFolderInStream::OpenStream()
--{
--  while (_curIndex < _refItem.NumItems)
--  {
--    const CItemEx &item = (*_items)[_refItem.ItemIndex + _curIndex];
--    _stream.Attach((*_archives)[_refItem.VolumeIndex + _curIndex].
--        CreateLimitedStream(item.GetDataPosition(), item.PackSize));
--    _curIndex++;
--    _fileIsOpen = true;
--    _crc = CRC_INIT_VAL;
--    return S_OK;
--  }
--  return S_OK;
--}
--
--HRESULT CFolderInStream::CloseStream()
--{
--  CRCs.Add(CRC_GET_DIGEST(_crc));
--  _stream.Release();
--  _fileIsOpen = false;
--  return S_OK;
--}
--
--STDMETHODIMP CFolderInStream::Read(void *data, UInt32 size, UInt32 *processedSize)
--{
--  UInt32 realProcessedSize = 0;
--  while ((_curIndex < _refItem.NumItems || _fileIsOpen) && size > 0)
--  {
--    if (_fileIsOpen)
--    {
--      UInt32 localProcessedSize;
--      RINOK(_stream->Read(
--          ((Byte *)data) + realProcessedSize, size, &localProcessedSize));
--      _crc = CrcUpdate(_crc, ((Byte *)data) + realProcessedSize, localProcessedSize);
--      if (localProcessedSize == 0)
--      {
--        RINOK(CloseStream());
--        continue;
--      }
--      realProcessedSize += localProcessedSize;
--      size -= localProcessedSize;
--      break;
--    }
--    else
--    {
--      RINOK(OpenStream());
--    }
--  }
--  if (processedSize != 0)
--    *processedSize = realProcessedSize;
--  return S_OK;
--}
--
--}}
-diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarVolumeInStream.h p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarVolumeInStream.h
---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarVolumeInStream.h	2008-08-14 06:11:12.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarVolumeInStream.h	1969-12-31 21:00:00.000000000 -0300
-@@ -1,49 +0,0 @@
--// RarVolumeInStream.h
--
--#ifndef __RAR_VOLUME_IN_STREAM_H
--#define __RAR_VOLUME_IN_STREAM_H
--
--#include "../../IStream.h"
--#include "RarIn.h"
--
--namespace NArchive {
--namespace NRar {
--
--struct CRefItem
--{
--  int VolumeIndex;
--  int ItemIndex;
--  int NumItems;
--};
--
--class CFolderInStream:
--  public ISequentialInStream,
--  public CMyUnknownImp
--{
--public:
--  MY_UNKNOWN_IMP
--
--  STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
--
--private:
--  CObjectVector<CInArchive> *_archives;
--  const CObjectVector<CItemEx> *_items;
--  CRefItem _refItem;
--  int _curIndex;
--  UInt32 _crc;
--  bool _fileIsOpen;
--  CMyComPtr<ISequentialInStream> _stream;
--
--  HRESULT OpenStream();
--  HRESULT CloseStream();
--public:
--  void Init(CObjectVector<CInArchive> *archives,
--      const CObjectVector<CItemEx> *items,
--      const CRefItem &refItem);
--
--  CRecordVector<UInt32> CRCs;
--};
--  
--}}
--
--#endif
-diff -ruNa p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile p7zip-libre_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile
---- p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile	2010-11-07 12:41:43.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile	2011-09-07 15:42:04.000000000 -0300
-@@ -158,14 +158,6 @@
-   NsisIn.o \
-   NsisRegister.o \
- 
--RAR_OBJS = \
--  RarHandler.o \
--  RarHeader.o \
--  RarIn.o \
--  RarItem.o \
--  RarVolumeInStream.o \
--  RarRegister.o \
--
- TAR_OBJS = \
-   TarHandler.o \
-   TarHandlerOut.o \
-@@ -243,13 +235,6 @@
-   ZlibEncoder.o \
-   ZDecoder.o \
- 
--COMPRESS_OBJS_NON_FREE = \
--  Rar1Decoder.o \
--  Rar2Decoder.o \
--  Rar3Decoder.o \
--  Rar3Vm.o \
--  RarCodecsRegister.o \
--
- CRYPTO_OBJS = \
-   7zAes.o \
-   7zAesRegister.o \
-@@ -257,8 +242,6 @@
-   MyAes.o \
-   Pbkdf2HmacSha1.o \
-   RandGen.o \
--  Rar20Crypto.o \
--  RarAes.o \
-   Sha1.o \
-   WzAes.o \
-   ZipCrypto.o \
-diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar/makefile p7zip-libre_9.20.1/CPP/7zip/Compress/Rar/makefile
---- p7zip_9.20.1/CPP/7zip/Compress/Rar/makefile	2010-03-16 17:21:18.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar/makefile	1969-12-31 21:00:00.000000000 -0300
-@@ -1,34 +0,0 @@
--PROG=../../../../bin/Codecs/Rar29.so
--
--LOCAL_FLAGS=$(CC_SHARED) -DUNICODE -D_UNICODE
--
--MY_WINDOWS=
--
--include ../../../../makefile.crc32
--include ../../../../makefile.machine
--
--LOCAL_SHARED=$(LINK_SHARED)
--LIBS=$(LOCAL_LIBS)
--
--OBJS = \
--MyWindows.o \
--CRC.o\
--MyVector.o\
--CodecExports.o \
--DllExports.o \
--Rar1Decoder.o \
--Rar2Decoder.o \
--Rar3Decoder.o \
--Rar3Vm.o \
--RarCodecsRegister.o \
--$(OBJ_CRC32) \
--InBuffer.o \
--OutBuffer.o \
--StreamUtils.o \
--LzOutWindow.o \
--Ppmd7.o \
--Ppmd7Dec.o \
--Alloc.o
--
--include ../../../../makefile.glb
--
-diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar/makefile.depend p7zip-libre_9.20.1/CPP/7zip/Compress/Rar/makefile.depend
---- p7zip_9.20.1/CPP/7zip/Compress/Rar/makefile.depend	2011-02-19 06:33:10.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar/makefile.depend	1969-12-31 21:00:00.000000000 -0300
-@@ -1,158 +0,0 @@
--CRC.o: ../../../Common/CRC.cpp ../../../myWindows/StdAfx.h \
-- ../../../myWindows/config.h ../../../Common/MyWindows.h \
-- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
-- ../../../Common/../../C/Types.h ../../../Common/Types.h \
-- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
-- ../../../include_windows/tchar.h ../../../Common/../../C/7zCrc.h \
-- ../../../Common/../../C/Types.h
--MyWindows.o: ../../../Common/MyWindows.cpp ../../../myWindows/StdAfx.h \
-- ../../../myWindows/config.h ../../../Common/MyWindows.h \
-- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
-- ../../../Common/../../C/Types.h ../../../Common/Types.h \
-- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
-- ../../../include_windows/tchar.h ../../../Common/MyWindows.h
--MyVector.o: ../../../Common/MyVector.cpp ../../../myWindows/StdAfx.h \
-- ../../../myWindows/config.h ../../../Common/MyWindows.h \
-- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
-- ../../../Common/../../C/Types.h ../../../Common/Types.h \
-- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
-- ../../../include_windows/tchar.h ../../../Common/MyVector.h \
-- ../../../Common/Defs.h
--InBuffer.o: ../../Common/InBuffer.cpp ../../../myWindows/StdAfx.h \
-- ../../../myWindows/config.h ../../../Common/MyWindows.h \
-- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
-- ../../../Common/../../C/Types.h ../../../Common/Types.h \
-- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
-- ../../../include_windows/tchar.h ../../Common/../../../C/Alloc.h \
-- ../../Common/InBuffer.h ../../Common/../IStream.h \
-- ../../Common/../../Common/MyUnknown.h \
-- ../../Common/../../Common/MyWindows.h ../../Common/../../Common/Types.h \
-- ../../Common/../IDecl.h ../../Common/../../Common/MyCom.h \
-- ../../Common/../../Common/MyException.h
--StreamUtils.o: ../../Common/StreamUtils.cpp ../../../myWindows/StdAfx.h \
-- ../../../myWindows/config.h ../../../Common/MyWindows.h \
-- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
-- ../../../Common/../../C/Types.h ../../../Common/Types.h \
-- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
-- ../../../include_windows/tchar.h ../../Common/StreamUtils.h \
-- ../../Common/../IStream.h ../../Common/../../Common/MyUnknown.h \
-- ../../Common/../../Common/MyWindows.h ../../Common/../../Common/Types.h \
-- ../../Common/../IDecl.h
--OutBuffer.o: ../../Common/OutBuffer.cpp ../../../myWindows/StdAfx.h \
-- ../../../myWindows/config.h ../../../Common/MyWindows.h \
-- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
-- ../../../Common/../../C/Types.h ../../../Common/Types.h \
-- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
-- ../../../include_windows/tchar.h ../../Common/../../../C/Alloc.h \
-- ../../Common/OutBuffer.h ../../Common/../IStream.h \
-- ../../Common/../../Common/MyUnknown.h \
-- ../../Common/../../Common/MyWindows.h ../../Common/../../Common/Types.h \
-- ../../Common/../IDecl.h ../../Common/../../Common/MyCom.h \
-- ../../Common/../../Common/MyException.h
--LzOutWindow.o: ../LzOutWindow.cpp ../../../myWindows/StdAfx.h \
-- ../../../myWindows/config.h ../../../Common/MyWindows.h \
-- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
-- ../../../Common/../../C/Types.h ../../../Common/Types.h \
-- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
-- ../../../include_windows/tchar.h ../LzOutWindow.h ../../IStream.h \
-- ../../../Common/MyUnknown.h ../../../Common/MyWindows.h \
-- ../../../Common/Types.h ../../IDecl.h ../../Common/OutBuffer.h \
-- ../../Common/../IStream.h ../../Common/../../Common/MyCom.h \
-- ../../Common/../../Common/MyWindows.h \
-- ../../Common/../../Common/MyException.h
--CodecExports.o: ../CodecExports.cpp ../../../myWindows/StdAfx.h \
-- ../../../myWindows/config.h ../../../Common/MyWindows.h \
-- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
-- ../../../Common/../../C/Types.h ../../../Common/Types.h \
-- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
-- ../../../include_windows/tchar.h ../../../Common/ComTry.h \
-- ../../../Common/MyWindows.h ../../../Windows/PropVariant.h \
-- ../../../Windows/../Common/MyWindows.h \
-- ../../../Windows/../Common/Types.h ../../ICoder.h ../../IStream.h \
-- ../../../Common/MyUnknown.h ../../../Common/Types.h ../../IDecl.h \
-- ../../Common/RegisterCodec.h ../../Common/../Common/MethodId.h \
-- ../../Common/../Common/../../Common/Types.h
--DllExports.o: ../DllExports.cpp ../../../myWindows/StdAfx.h \
-- ../../../myWindows/config.h ../../../Common/MyWindows.h \
-- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
-- ../../../Common/../../C/Types.h ../../../Common/Types.h \
-- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
-- ../../../include_windows/tchar.h ../../../Common/MyInitGuid.h \
-- ../../ICoder.h ../../IStream.h ../../../Common/MyUnknown.h \
-- ../../../Common/MyWindows.h ../../../Common/Types.h ../../IDecl.h \
-- ../../Common/RegisterCodec.h ../../Common/../Common/MethodId.h \
-- ../../Common/../Common/../../Common/Types.h
--Rar1Decoder.o: ../Rar1Decoder.cpp ../../../myWindows/StdAfx.h \
-- ../../../myWindows/config.h ../../../Common/MyWindows.h \
-- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
-- ../../../Common/../../C/Types.h ../../../Common/Types.h \
-- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
-- ../../../include_windows/tchar.h ../Rar1Decoder.h \
-- ../../../Common/MyCom.h ../../../Common/MyWindows.h ../../ICoder.h \
-- ../../IStream.h ../../../Common/MyUnknown.h ../../../Common/Types.h \
-- ../../IDecl.h ../../Common/InBuffer.h ../../Common/../IStream.h \
-- ../../Common/../../Common/MyCom.h \
-- ../../Common/../../Common/MyException.h \
-- ../../Common/../../Common/MyWindows.h ../BitmDecoder.h ../../IStream.h \
-- ../HuffmanDecoder.h ../../../Common/Types.h ../LzOutWindow.h \
-- ../../Common/OutBuffer.h
--Rar2Decoder.o: ../Rar2Decoder.cpp ../../../myWindows/StdAfx.h \
-- ../../../myWindows/config.h ../../../Common/MyWindows.h \
-- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
-- ../../../Common/../../C/Types.h ../../../Common/Types.h \
-- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
-- ../../../include_windows/tchar.h ../Rar2Decoder.h \
-- ../../../Common/MyCom.h ../../../Common/MyWindows.h ../../ICoder.h \
-- ../../IStream.h ../../../Common/MyUnknown.h ../../../Common/Types.h \
-- ../../IDecl.h ../../Common/InBuffer.h ../../Common/../IStream.h \
-- ../../Common/../../Common/MyCom.h \
-- ../../Common/../../Common/MyException.h \
-- ../../Common/../../Common/MyWindows.h ../BitmDecoder.h ../../IStream.h \
-- ../HuffmanDecoder.h ../../../Common/Types.h ../LzOutWindow.h \
-- ../../Common/OutBuffer.h
--Rar3Decoder.o: ../Rar3Decoder.cpp ../../../myWindows/StdAfx.h \
-- ../../../myWindows/config.h ../../../Common/MyWindows.h \
-- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
-- ../../../Common/../../C/Types.h ../../../Common/Types.h \
-- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
-- ../../../include_windows/tchar.h ../../../../C/Alloc.h \
-- ../../Common/StreamUtils.h ../../Common/../IStream.h \
-- ../../Common/../../Common/MyUnknown.h \
-- ../../Common/../../Common/MyWindows.h ../../Common/../../Common/Types.h \
-- ../../Common/../IDecl.h ../Rar3Decoder.h ../../../../C/Ppmd7.h \
-- ../../../../C/Ppmd.h ../../../../C/Types.h ../../../../C/CpuArch.h \
-- ../../../Common/MyCom.h ../../../Common/MyWindows.h ../../ICoder.h \
-- ../../IStream.h ../../Common/InBuffer.h \
-- ../../Common/../../Common/MyCom.h \
-- ../../Common/../../Common/MyException.h ../BitmDecoder.h ../../IStream.h \
-- ../HuffmanDecoder.h ../../../Common/Types.h ../Rar3Vm.h \
-- ../../../../C/CpuArch.h ../../../Common/MyVector.h \
-- ../../../Common/Defs.h
--Rar3Vm.o: ../Rar3Vm.cpp ../../../myWindows/StdAfx.h \
-- ../../../myWindows/config.h ../../../Common/MyWindows.h \
-- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
-- ../../../Common/../../C/Types.h ../../../Common/Types.h \
-- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
-- ../../../include_windows/tchar.h ../../../../C/7zCrc.h \
-- ../../../../C/Types.h ../../../../C/Alloc.h ../Rar3Vm.h \
-- ../../../../C/CpuArch.h ../../../Common/MyVector.h \
-- ../../../Common/Defs.h
--RarCodecsRegister.o: ../RarCodecsRegister.cpp ../../../myWindows/StdAfx.h \
-- ../../../myWindows/config.h ../../../Common/MyWindows.h \
-- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
-- ../../../Common/../../C/Types.h ../../../Common/Types.h \
-- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
-- ../../../include_windows/tchar.h ../../Common/RegisterCodec.h \
-- ../../Common/../Common/MethodId.h \
-- ../../Common/../Common/../../Common/Types.h ../Rar1Decoder.h \
-- ../../../Common/MyCom.h ../../../Common/MyWindows.h ../../ICoder.h \
-- ../../IStream.h ../../../Common/MyUnknown.h ../../../Common/Types.h \
-- ../../IDecl.h ../../Common/InBuffer.h ../../Common/../IStream.h \
-- ../../Common/../../Common/MyCom.h \
-- ../../Common/../../Common/MyException.h \
-- ../../Common/../../Common/MyWindows.h ../BitmDecoder.h ../../IStream.h \
-- ../HuffmanDecoder.h ../../../Common/Types.h ../LzOutWindow.h \
-- ../../Common/OutBuffer.h ../Rar2Decoder.h ../Rar3Decoder.h \
-- ../../../../C/Ppmd7.h ../../../../C/Ppmd.h ../../../../C/Types.h \
-- ../../../../C/CpuArch.h ../Rar3Vm.h ../../../../C/CpuArch.h \
-- ../../../Common/MyVector.h ../../../Common/Defs.h
-diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar/makefile.list p7zip-libre_9.20.1/CPP/7zip/Compress/Rar/makefile.list
---- p7zip_9.20.1/CPP/7zip/Compress/Rar/makefile.list	2010-03-16 17:23:04.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar/makefile.list	1969-12-31 21:00:00.000000000 -0300
-@@ -1,64 +0,0 @@
--SRCS=\
-- ../../../Common/CRC.cpp \
-- ../../../Common/MyWindows.cpp \
-- ../../../Common/MyVector.cpp \
-- ../../Common/InBuffer.cpp \
-- ../../Common/StreamUtils.cpp \
-- ../../Common/OutBuffer.cpp \
--../LzOutWindow.cpp \
--../CodecExports.cpp \
--../DllExports.cpp \
--../Rar1Decoder.cpp \
--../Rar2Decoder.cpp \
--../Rar3Decoder.cpp \
--../Rar3Vm.cpp \
--../RarCodecsRegister.cpp
--
--SRCS_C=\
-- ../../../../C/Alloc.c \
-- ../../../../C/Ppmd7.c \
-- ../../../../C/Ppmd7Dec.c
--
--CRC.o : ../../../Common/CRC.cpp
--	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../../../Common/CRC.cpp
--MyWindows.o : ../../../Common/MyWindows.cpp
--	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../../../Common/MyWindows.cpp
--MyVector.o : ../../../Common/MyVector.cpp
--	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../../../Common/MyVector.cpp
--DllExports.o : ../DllExports.cpp
--	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../DllExports.cpp
--CodecExports.o : ../CodecExports.cpp
--	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../CodecExports.cpp
--InBuffer.o : ../../Common/InBuffer.cpp
--	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../../Common/InBuffer.cpp
--LzOutWindow.o : ../LzOutWindow.cpp
--	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../LzOutWindow.cpp
--StreamUtils.o : ../../Common/StreamUtils.cpp
--	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../../Common/StreamUtils.cpp
--OutBuffer.o : ../../Common/OutBuffer.cpp
--	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../../Common/OutBuffer.cpp
--Rar1Decoder.o : ../Rar1Decoder.cpp
--	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../Rar1Decoder.cpp
--Rar2Decoder.o : ../Rar2Decoder.cpp
--	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../Rar2Decoder.cpp
--Rar3Decoder.o : ../Rar3Decoder.cpp
--	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../Rar3Decoder.cpp
--Rar3Vm.o : ../Rar3Vm.cpp
--	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../Rar3Vm.cpp
--RarCodecsRegister.o : ../RarCodecsRegister.cpp
--	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../RarCodecsRegister.cpp
--Alloc.o : ../../../../C/Alloc.c
--	$(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/Alloc.c
--Ppmd7.o : ../../../../C/Ppmd7.c
--	$(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/Ppmd7.c
--Ppmd7Dec.o : ../../../../C/Ppmd7Dec.c
--	$(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/Ppmd7Dec.c
--
--# CRC32, C version
--7zCrc.o : ../../../../C/7zCrc.c
--	$(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/7zCrc.c
--7zCrcOpt.o : ../../../../C/7zCrcOpt.c
--	$(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/7zCrcOpt.c
--# CRC32, ASM version
--7zCrcT8.o : ../../../../C/7zCrcT8.c
--	$(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/7zCrcT8.c
-diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar1Decoder.cpp p7zip-libre_9.20.1/CPP/7zip/Compress/Rar1Decoder.cpp
---- p7zip_9.20.1/CPP/7zip/Compress/Rar1Decoder.cpp	2009-12-21 08:46:36.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar1Decoder.cpp	1969-12-31 21:00:00.000000000 -0300
-@@ -1,480 +0,0 @@
--// Rar1Decoder.cpp
--// According to unRAR license, this code may not be used to develop
--// a program that creates RAR archives
-- 
--#include "StdAfx.h"
--
--#include "Rar1Decoder.h"
--
--namespace NCompress {
--namespace NRar1 {
--
--static UInt32 PosL1[]={0,0,0,2,3,5,7,11,16,20,24,32,32, 256};
--static UInt32 PosL2[]={0,0,0,0,5,7,9,13,18,22,26,34,36, 256};
--static UInt32 PosHf0[]={0,0,0,0,0,8,16,24,33,33,33,33,33, 257};
--static UInt32 PosHf1[]={0,0,0,0,0,0,4,44,60,76,80,80,127, 257};
--static UInt32 PosHf2[]={0,0,0,0,0,0,2,7,53,117,233, 257,0};
--static UInt32 PosHf3[]={0,0,0,0,0,0,0,2,16,218,251, 257,0};
--static UInt32 PosHf4[]={0,0,0,0,0,0,0,0,0,255, 257,0,0};
--
--static const UInt32 kHistorySize = (1 << 16);
--
--class CCoderReleaser
--{
--  CDecoder *m_Coder;
--public:
--  CCoderReleaser(CDecoder *coder): m_Coder(coder) {}
--  ~CCoderReleaser() { m_Coder->ReleaseStreams(); }
--};
--
--CDecoder::CDecoder(): m_IsSolid(false) { }
--
--void CDecoder::InitStructures()
--{
--  for(int i = 0; i < kNumRepDists; i++)
--    m_RepDists[i] = 0;
--  m_RepDistPtr = 0;
--  LastLength = 0;
--  LastDist = 0;
--}
--
--UInt32 CDecoder::ReadBits(int numBits) { return m_InBitStream.ReadBits(numBits); }
--
--HRESULT CDecoder::CopyBlock(UInt32 distance, UInt32 len)
--{
--  if (len == 0)
--    return S_FALSE;
--  m_UnpackSize -= len;
--  return m_OutWindowStream.CopyBlock(distance, len) ? S_OK : S_FALSE;
--}
--
--
--UInt32 CDecoder::DecodeNum(const UInt32 *posTab)
--{
--  UInt32 startPos = 2;
--  UInt32 num = m_InBitStream.GetValue(12);
--  for (;;)
--  {
--    UInt32 cur = (posTab[startPos + 1] - posTab[startPos]) << (12 - startPos);
--    if (num < cur)
--      break;
--    startPos++;
--    num -= cur;
--  }
--  m_InBitStream.MovePos(startPos);
--  return((num >> (12 - startPos)) + posTab[startPos]);
--}
--
--static Byte kShortLen1[]  = {1,3,4,4,5,6,7,8,8,4,4,5,6,6 };
--static Byte kShortLen1a[] = {1,4,4,4,5,6,7,8,8,4,4,5,6,6,4 };
--static Byte kShortLen2[]  = {2,3,3,3,4,4,5,6,6,4,4,5,6,6 };
--static Byte kShortLen2a[] = {2,3,3,4,4,4,5,6,6,4,4,5,6,6,4 };
--static UInt32 kShortXor1[] = {0,0xa0,0xd0,0xe0,0xf0,0xf8,0xfc,0xfe,0xff,0xc0,0x80,0x90,0x98,0x9c,0xb0};
--static UInt32 kShortXor2[] = {0,0x40,0x60,0xa0,0xd0,0xe0,0xf0,0xf8,0xfc,0xc0,0x80,0x90,0x98,0x9c,0xb0};
--
--HRESULT CDecoder::ShortLZ()
--{
--  UInt32 len, saveLen, dist;
--  int distancePlace;
--  Byte *kShortLen;
--  const UInt32 *kShortXor;
--  NumHuf = 0;
--
--  if (LCount == 2)
--  {
--    if (ReadBits(1))
--      return CopyBlock(LastDist, LastLength);
--    LCount = 0;
--  }
--
--  UInt32 bitField = m_InBitStream.GetValue(8);
--
--  if (AvrLn1 < 37)
--  {
--    kShortLen = Buf60 ? kShortLen1a : kShortLen1;
--    kShortXor = kShortXor1;
--  }
--  else
--  {
--    kShortLen = Buf60 ? kShortLen2a : kShortLen2;
--    kShortXor = kShortXor2;
--  }
--
--  for (len = 0; ((bitField ^ kShortXor[len]) & (~(0xff >> kShortLen[len]))) != 0; len++);
--  m_InBitStream.MovePos(kShortLen[len]);
--
--  if (len >= 9)
--  {
--    if (len == 9)
--    {
--      LCount++;
--      return CopyBlock(LastDist, LastLength);
--    }
--    if (len == 14)
--    {
--      LCount = 0;
--      len = DecodeNum(PosL2) + 5;
--      dist = 0x8000 + ReadBits(15) - 1;
--      LastLength = len;
--      LastDist = dist;
--      return CopyBlock(dist, len);
--    }
--
--    LCount = 0;
--    saveLen = len;
--    dist = m_RepDists[(m_RepDistPtr - (len - 9)) & 3];
--    len = DecodeNum(PosL1) + 2;
--    if (len == 0x101 && saveLen == 10)
--    {
--      Buf60 ^= 1;
--      return S_OK;
--    }
--    if (dist >= 256)
--      len++;
--    if (dist >= MaxDist3 - 1)
--      len++;
--  }
--  else
--  {
--    LCount = 0;
--    AvrLn1 += len;
--    AvrLn1 -= AvrLn1 >> 4;
--    
--    distancePlace = DecodeNum(PosHf2) & 0xff;
--    dist = ChSetA[distancePlace];
--    if (--distancePlace != -1)
--    {
--      PlaceA[dist]--;
--      UInt32 lastDistance = ChSetA[distancePlace];
--      PlaceA[lastDistance]++;
--      ChSetA[distancePlace + 1] = lastDistance;
--      ChSetA[distancePlace] = dist;
--    }
--    len += 2;
--  }
--  m_RepDists[m_RepDistPtr++] = dist;
--  m_RepDistPtr &= 3;
--  LastLength = len;
--  LastDist = dist;
--  return CopyBlock(dist, len);
--}
--
--
--HRESULT CDecoder::LongLZ()
--{
--  UInt32 len;
--  UInt32 dist;
--  UInt32 distancePlace, newDistancePlace;
--  UInt32 oldAvr2, oldAvr3;
--
--  NumHuf = 0;
--  Nlzb += 16;
--  if (Nlzb > 0xff)
--  {
--    Nlzb = 0x90;
--    Nhfb >>= 1;
--  }
--  oldAvr2=AvrLn2;
--
--  if (AvrLn2 >= 122)
--    len = DecodeNum(PosL2);
--  else if (AvrLn2 >= 64)
--    len = DecodeNum(PosL1);
--  else
--  {
--    UInt32 bitField = m_InBitStream.GetValue(16);
--    if (bitField < 0x100)
--    {
--      len = bitField;
--      m_InBitStream.MovePos(16);
--    }
--    else
--    {
--      for (len = 0; ((bitField << len) & 0x8000) == 0; len++)
--        ;
--      m_InBitStream.MovePos(len + 1);
--    }
--  }
--
--  AvrLn2 += len;
--  AvrLn2 -= AvrLn2 >> 5;
--
--  if (AvrPlcB > 0x28ff)
--    distancePlace = DecodeNum(PosHf2);
--  else if (AvrPlcB > 0x6ff)
--    distancePlace = DecodeNum(PosHf1);
--  else
--    distancePlace = DecodeNum(PosHf0);
--
--  AvrPlcB += distancePlace;
--  AvrPlcB -= AvrPlcB >> 8;
--  for (;;)
--  {
--    dist = ChSetB[distancePlace & 0xff];
--    newDistancePlace = NToPlB[dist++ & 0xff]++;
--    if (!(dist & 0xff))
--      CorrHuff(ChSetB,NToPlB);
--    else
--      break;
--  }
--
--  ChSetB[distancePlace] = ChSetB[newDistancePlace];
--  ChSetB[newDistancePlace] = dist;
--
--  dist = ((dist & 0xff00) >> 1) | ReadBits(7);
--
--  oldAvr3 = AvrLn3;
--  if (len != 1 && len != 4)
--    if (len == 0 && dist <= MaxDist3)
--    {
--      AvrLn3++;
--      AvrLn3 -= AvrLn3 >> 8;
--    }
--    else
--      if (AvrLn3 > 0)
--        AvrLn3--;
--  len += 3;
--  if (dist >= MaxDist3)
--    len++;
--  if (dist <= 256)
--    len += 8;
--  if (oldAvr3 > 0xb0 || AvrPlc >= 0x2a00 && oldAvr2 < 0x40)
--    MaxDist3 = 0x7f00;
--  else
--    MaxDist3 = 0x2001;
--  m_RepDists[m_RepDistPtr++] = --dist;
--  m_RepDistPtr &= 3;
--  LastLength = len;
--  LastDist = dist;
--  return CopyBlock(dist, len);
--}
--
--
--HRESULT CDecoder::HuffDecode()
--{
--  UInt32 curByte, newBytePlace;
--  UInt32 len;
--  UInt32 dist;
--  int bytePlace;
--
--  if      (AvrPlc > 0x75ff)  bytePlace = DecodeNum(PosHf4);
--  else if (AvrPlc > 0x5dff)  bytePlace = DecodeNum(PosHf3);
--  else if (AvrPlc > 0x35ff)  bytePlace = DecodeNum(PosHf2);
--  else if (AvrPlc > 0x0dff)  bytePlace = DecodeNum(PosHf1);
--  else                       bytePlace = DecodeNum(PosHf0);
--  if (StMode)
--  {
--    if (--bytePlace == -1)
--    {
--      if (ReadBits(1))
--      {
--        NumHuf = StMode = 0;
--        return S_OK;
--      }
--      else
--      {
--        len = (ReadBits(1)) ? 4 : 3;
--        dist = DecodeNum(PosHf2);
--        dist = (dist << 5) | ReadBits(5);
--        return CopyBlock(dist - 1, len);
--      }
--    }
--  }
--  else if (NumHuf++ >= 16 && FlagsCnt == 0)
--    StMode = 1;
--  bytePlace &= 0xff;
--  AvrPlc += bytePlace;
--  AvrPlc -= AvrPlc >> 8;
--  Nhfb+=16;
--  if (Nhfb > 0xff)
--  {
--    Nhfb=0x90;
--    Nlzb >>= 1;
--  }
--
--  m_UnpackSize --;
--  m_OutWindowStream.PutByte((Byte)(ChSet[bytePlace] >> 8));
--
--  for (;;)
--  {
--    curByte = ChSet[bytePlace];
--    newBytePlace = NToPl[curByte++ & 0xff]++;
--    if ((curByte & 0xff) > 0xa1)
--      CorrHuff(ChSet, NToPl);
--    else
--      break;
--  }
--
--  ChSet[bytePlace] = ChSet[newBytePlace];
--  ChSet[newBytePlace] = curByte;
--  return S_OK;
--}
--
--
--void CDecoder::GetFlagsBuf()
--{
--  UInt32 flags, newFlagsPlace;
--  UInt32 flagsPlace = DecodeNum(PosHf2);
--
--  for (;;)
--  {
--    flags = ChSetC[flagsPlace];
--    FlagBuf = flags >> 8;
--    newFlagsPlace = NToPlC[flags++ & 0xff]++;
--    if ((flags & 0xff) != 0)
--      break;
--    CorrHuff(ChSetC, NToPlC);
--  }
--
--  ChSetC[flagsPlace] = ChSetC[newFlagsPlace];
--  ChSetC[newFlagsPlace] = flags;
--}
--
--void CDecoder::InitData()
--{
--  if (!m_IsSolid)
--  {
--    AvrPlcB = AvrLn1 = AvrLn2 = AvrLn3 = NumHuf = Buf60 = 0;
--    AvrPlc = 0x3500;
--    MaxDist3 = 0x2001;
--    Nhfb = Nlzb = 0x80;
--  }
--  FlagsCnt = 0;
--  FlagBuf = 0;
--  StMode = 0;
--  LCount = 0;
--}
--
--void CDecoder::CorrHuff(UInt32 *CharSet,UInt32 *NumToPlace)
--{
--  int i;
--  for (i = 7; i >= 0; i--)
--    for (int j = 0; j < 32; j++, CharSet++)
--      *CharSet = (*CharSet & ~0xff) | i;
--  memset(NumToPlace, 0, sizeof(NToPl));
--  for (i = 6; i >= 0; i--)
--    NumToPlace[i] = (7 - i) * 32;
--}
--
--void CDecoder::InitHuff()
--{
--  for (UInt32 i = 0; i < 256; i++)
--  {
--    Place[i] = PlaceA[i] = PlaceB[i] = i;
--    PlaceC[i] = (~i + 1) & 0xff;
--    ChSet[i] = ChSetB[i] = i << 8;
--    ChSetA[i] = i;
--    ChSetC[i] = ((~i + 1) & 0xff) << 8;
--  }
--  memset(NToPl, 0, sizeof(NToPl));
--  memset(NToPlB, 0, sizeof(NToPlB));
--  memset(NToPlC, 0, sizeof(NToPlC));
--  CorrHuff(ChSetB, NToPlB);
--}
--
--HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *outStream,
--    const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo * /* progress */)
--{
--  if (inSize == NULL || outSize == NULL)
--    return E_INVALIDARG;
--
--  if (!m_OutWindowStream.Create(kHistorySize))
--    return E_OUTOFMEMORY;
--  if (!m_InBitStream.Create(1 << 20))
--    return E_OUTOFMEMORY;
--
--  m_UnpackSize = (Int64)*outSize;
--  m_OutWindowStream.SetStream(outStream);
--  m_OutWindowStream.Init(m_IsSolid);
--  m_InBitStream.SetStream(inStream);
--  m_InBitStream.Init();
--
--  CCoderReleaser coderReleaser(this);
--  InitData();
--  if (!m_IsSolid)
--  {
--    InitStructures();
--    InitHuff();
--  }
--  if (m_UnpackSize > 0)
--  {
--    GetFlagsBuf();
--    FlagsCnt = 8;
--  }
--
--  while (m_UnpackSize > 0)
--  {
--    if (StMode)
--    {
--      RINOK(HuffDecode());
--      continue;
--    }
--
--    if (--FlagsCnt < 0)
--    {
--      GetFlagsBuf();
--      FlagsCnt=7;
--    }
--
--    if (FlagBuf & 0x80)
--    {
--      FlagBuf <<= 1;
--      if (Nlzb > Nhfb)
--      {
--        RINOK(LongLZ());
--      }
--      else
--      {
--        RINOK(HuffDecode());
--      }
--    }
--    else
--    {
--      FlagBuf <<= 1;
--      if (--FlagsCnt < 0)
--      {
--        GetFlagsBuf();
--        FlagsCnt = 7;
--      }
--      if (FlagBuf & 0x80)
--      {
--        FlagBuf <<= 1;
--        if (Nlzb > Nhfb)
--        {
--          RINOK(HuffDecode());
--        }
--        else
--        {
--          RINOK(LongLZ());
--        }
--      }
--      else
--      {
--        FlagBuf <<= 1;
--        RINOK(ShortLZ());
--      }
--    }
--  }
--  if (m_UnpackSize < 0)
--    return S_FALSE;
--  return m_OutWindowStream.Flush();
--}
--
--STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream *outStream,
--    const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress)
--{
--  try { return CodeReal(inStream, outStream, inSize, outSize, progress); }
--  catch(const CInBufferException &e) { return e.ErrorCode; }
--  catch(const CLzOutWindowException &e) { return e.ErrorCode; }
--  catch(...) { return S_FALSE; }
--}
--
--STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
--{
--  if (size < 1)
--    return E_INVALIDARG;
--  m_IsSolid = (data[0] != 0);
--  return S_OK;
--}
--
--}}
-diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar1Decoder.h p7zip-libre_9.20.1/CPP/7zip/Compress/Rar1Decoder.h
---- p7zip_9.20.1/CPP/7zip/Compress/Rar1Decoder.h	2009-02-07 15:06:28.000000000 -0200
-+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar1Decoder.h	1969-12-31 21:00:00.000000000 -0300
-@@ -1,88 +0,0 @@
--// Rar1Decoder.h
--// According to unRAR license, this code may not be used to develop
--// a program that creates RAR archives
--
--#ifndef __COMPRESS_RAR1_DECODER_H
--#define __COMPRESS_RAR1_DECODER_H
--
--#include "../../Common/MyCom.h"
--
--#include "../ICoder.h"
--
--#include "../Common/InBuffer.h"
--
--#include "BitmDecoder.h"
--#include "HuffmanDecoder.h"
--#include "LzOutWindow.h"
--
--namespace NCompress {
--namespace NRar1 {
--
--const UInt32 kNumRepDists = 4;
--
--typedef NBitm::CDecoder<CInBuffer> CBitDecoder;
--
--class CDecoder :
--  public ICompressCoder,
--  public ICompressSetDecoderProperties2,
--  public CMyUnknownImp
--{
--public:
--  CLzOutWindow m_OutWindowStream;
--  CBitDecoder m_InBitStream;
--
--  UInt32 m_RepDists[kNumRepDists];
--  UInt32 m_RepDistPtr;
--
--  UInt32 LastDist;
--  UInt32 LastLength;
--
--  Int64 m_UnpackSize;
--  bool m_IsSolid;
--
--  UInt32 ReadBits(int numBits);
--  HRESULT CopyBlock(UInt32 distance, UInt32 len);
--
--  UInt32 DecodeNum(const UInt32 *posTab);
--  HRESULT ShortLZ();
--  HRESULT LongLZ();
--  HRESULT HuffDecode();
--  void GetFlagsBuf();
--  void InitData();
--  void InitHuff();
--  void CorrHuff(UInt32 *CharSet, UInt32 *NumToPlace);
--  void OldUnpWriteBuf();
--  
--  UInt32 ChSet[256],ChSetA[256],ChSetB[256],ChSetC[256];
--  UInt32 Place[256],PlaceA[256],PlaceB[256],PlaceC[256];
--  UInt32 NToPl[256],NToPlB[256],NToPlC[256];
--  UInt32 FlagBuf,AvrPlc,AvrPlcB,AvrLn1,AvrLn2,AvrLn3;
--  int Buf60,NumHuf,StMode,LCount,FlagsCnt;
--  UInt32 Nhfb,Nlzb,MaxDist3;
--
--  void InitStructures();
--
--  HRESULT CodeReal(ISequentialInStream *inStream, ISequentialOutStream *outStream,
--      const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
--
--public:
--  CDecoder();
--
--  MY_UNKNOWN_IMP1(ICompressSetDecoderProperties2)
--
--  void ReleaseStreams()
--  {
--    m_OutWindowStream.ReleaseStream();
--    m_InBitStream.ReleaseStream();
--  }
--
--  STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
--      const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
--
--  STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size);
--
--};
--
--}}
--
--#endif
-diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar2Decoder.cpp p7zip-libre_9.20.1/CPP/7zip/Compress/Rar2Decoder.cpp
---- p7zip_9.20.1/CPP/7zip/Compress/Rar2Decoder.cpp	2009-12-21 08:46:36.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar2Decoder.cpp	1969-12-31 21:00:00.000000000 -0300
-@@ -1,391 +0,0 @@
--// Rar2Decoder.cpp
--// According to unRAR license, this code may not be used to develop
--// a program that creates RAR archives
-- 
--#include "StdAfx.h"
--
--#include "Rar2Decoder.h"
--
--namespace NCompress {
--namespace NRar2 {
--
--namespace NMultimedia {
--
--Byte CFilter::Decode(int &channelDelta, Byte deltaByte)
--{
--  D4 = D3;
--  D3 = D2;
--  D2 = LastDelta - D1;
--  D1 = LastDelta;
--  int predictedValue = ((8 * LastChar + K1 * D1 + K2 * D2 + K3 * D3 + K4 * D4 + K5 * channelDelta) >> 3);
--
--  Byte realValue = (Byte)(predictedValue - deltaByte);
--  int i = ((int)(signed char)deltaByte) << 3;
--
--  Dif[0] += abs(i);
--  Dif[1] += abs(i - D1);
--  Dif[2] += abs(i + D1);
--  Dif[3] += abs(i - D2);
--  Dif[4] += abs(i + D2);
--  Dif[5] += abs(i - D3);
--  Dif[6] += abs(i + D3);
--  Dif[7] += abs(i - D4);
--  Dif[8] += abs(i + D4);
--  Dif[9] += abs(i - channelDelta);
--  Dif[10] += abs(i + channelDelta);
--
--  channelDelta = LastDelta = (signed char)(realValue - LastChar);
--  LastChar = realValue;
--
--  if (((++ByteCount) & 0x1F) == 0)
--  {
--    UInt32 minDif = Dif[0];
--    UInt32 numMinDif = 0;
--    Dif[0] = 0;
--    for (i = 1; i < sizeof(Dif) / sizeof(Dif[0]); i++)
--    {
--      if (Dif[i] < minDif)
--      {
--        minDif = Dif[i];
--        numMinDif = i;
--      }
--      Dif[i] = 0;
--    }
--    switch(numMinDif)
--    {
--      case 1: if (K1 >= -16) K1--; break;
--      case 2: if (K1 <   16) K1++; break;
--      case 3: if (K2 >= -16) K2--; break;
--      case 4: if (K2 <   16) K2++; break;
--      case 5: if (K3 >= -16) K3--; break;
--      case 6: if (K3 <   16) K3++; break;
--      case 7: if (K4 >= -16) K4--; break;
--      case 8: if (K4 <   16) K4++; break;
--      case 9: if (K5 >= -16) K5--; break;
--      case 10:if (K5 <   16) K5++; break;
--    }
--  }
--  return realValue;
--}
--}
--
--static const char *kNumberErrorMessage = "Number error";
--
--static const UInt32 kHistorySize = 1 << 20;
--
--static const int kNumStats = 11;
--
--static const UInt32 kWindowReservSize = (1 << 22) + 256;
--
--CDecoder::CDecoder():
--  m_IsSolid(false)
--{
--}
--
--void CDecoder::InitStructures()
--{
--  m_MmFilter.Init();
--  for(int i = 0; i < kNumRepDists; i++)
--    m_RepDists[i] = 0;
--  m_RepDistPtr = 0;
--  m_LastLength = 0;
--  memset(m_LastLevels, 0, kMaxTableSize);
--}
--
--UInt32 CDecoder::ReadBits(int numBits) { return m_InBitStream.ReadBits(numBits); }
--
--#define RIF(x) { if (!(x)) return false; }
--
--bool CDecoder::ReadTables(void)
--{
--  Byte levelLevels[kLevelTableSize];
--  Byte newLevels[kMaxTableSize];
--  m_AudioMode = (ReadBits(1) == 1);
--
--  if (ReadBits(1) == 0)
--    memset(m_LastLevels, 0, kMaxTableSize);
--  int numLevels;
--  if (m_AudioMode)
--  {
--    m_NumChannels = ReadBits(2) + 1;
--    if (m_MmFilter.CurrentChannel >= m_NumChannels)
--      m_MmFilter.CurrentChannel = 0;
--    numLevels = m_NumChannels * kMMTableSize;
--  }
--  else
--    numLevels = kHeapTablesSizesSum;
-- 
--  int i;
--  for (i = 0; i < kLevelTableSize; i++)
--    levelLevels[i] = (Byte)ReadBits(4);
--  RIF(m_LevelDecoder.SetCodeLengths(levelLevels));
--  i = 0;
--  while (i < numLevels)
--  {
--    UInt32 number = m_LevelDecoder.DecodeSymbol(&m_InBitStream);
--    if (number < kTableDirectLevels)
--    {
--      newLevels[i] = (Byte)((number + m_LastLevels[i]) & kLevelMask);
--      i++;
--    }
--    else
--    {
--      if (number == kTableLevelRepNumber)
--      {
--        int t = ReadBits(2) + 3;
--        for (int reps = t; reps > 0 && i < numLevels ; reps--, i++)
--          newLevels[i] = newLevels[i - 1];
--      }
--      else
--      {
--        int num;
--        if (number == kTableLevel0Number)
--          num = ReadBits(3) + 3;
--        else if (number == kTableLevel0Number2)
--          num = ReadBits(7) + 11;
--        else
--          return false;
--        for (;num > 0 && i < numLevels; num--)
--          newLevels[i++] = 0;
--      }
--    }
--  }
--  if (m_AudioMode)
--    for (i = 0; i < m_NumChannels; i++)
--    {
--      RIF(m_MMDecoders[i].SetCodeLengths(&newLevels[i * kMMTableSize]));
--    }
--  else
--  {
--    RIF(m_MainDecoder.SetCodeLengths(&newLevels[0]));
--    RIF(m_DistDecoder.SetCodeLengths(&newLevels[kMainTableSize]));
--    RIF(m_LenDecoder.SetCodeLengths(&newLevels[kMainTableSize + kDistTableSize]));
--  }
--  memcpy(m_LastLevels, newLevels, kMaxTableSize);
--  return true;
--}
--
--bool CDecoder::ReadLastTables()
--{
--  // it differs a little from pure RAR sources;
--  // UInt64 ttt = m_InBitStream.GetProcessedSize() + 2;
--  // + 2 works for: return 0xFF; in CInBuffer::ReadByte.
--  if (m_InBitStream.GetProcessedSize() + 7 <= m_PackSize) // test it: probably incorrect;
--  // if (m_InBitStream.GetProcessedSize() + 2 <= m_PackSize) // test it: probably incorrect;
--    if (m_AudioMode)
--    {
--      UInt32 symbol = m_MMDecoders[m_MmFilter.CurrentChannel].DecodeSymbol(&m_InBitStream);
--      if (symbol == 256)
--        return ReadTables();
--      if (symbol >= kMMTableSize)
--        return false;
--    }
--    else
--    {
--      UInt32 number = m_MainDecoder.DecodeSymbol(&m_InBitStream);
--      if (number == kReadTableNumber)
--        return ReadTables();
--      if (number >= kMainTableSize)
--        return false;
--    }
--  return true;
--}
--
--class CCoderReleaser
--{
--  CDecoder *m_Coder;
--public:
--  CCoderReleaser(CDecoder *coder): m_Coder(coder) {}
--  ~CCoderReleaser()
--  {
--    m_Coder->ReleaseStreams();
--  }
--};
--
--bool CDecoder::DecodeMm(UInt32 pos)
--{
--  while (pos-- > 0)
--  {
--    UInt32 symbol = m_MMDecoders[m_MmFilter.CurrentChannel].DecodeSymbol(&m_InBitStream);
--    if (symbol == 256)
--      return true;
--    if (symbol >= kMMTableSize)
--      return false;
--    /*
--    Byte byPredict = m_Predictor.Predict();
--    Byte byReal = (Byte)(byPredict - (Byte)symbol);
--    m_Predictor.Update(byReal, byPredict);
--    */
--    Byte byReal = m_MmFilter.Decode((Byte)symbol);
--    m_OutWindowStream.PutByte(byReal);
--    if (++m_MmFilter.CurrentChannel == m_NumChannels)
--      m_MmFilter.CurrentChannel = 0;
--  }
--  return true;
--}
--
--bool CDecoder::DecodeLz(Int32 pos)
--{
--  while (pos > 0)
--  {
--    UInt32 number = m_MainDecoder.DecodeSymbol(&m_InBitStream);
--    UInt32 length, distance;
--    if (number < 256)
--    {
--      m_OutWindowStream.PutByte(Byte(number));
--      pos--;
--      continue;
--    }
--    else if (number >= kMatchNumber)
--    {
--      number -= kMatchNumber;
--      length = kNormalMatchMinLen + UInt32(kLenStart[number]) +
--        m_InBitStream.ReadBits(kLenDirectBits[number]);
--      number = m_DistDecoder.DecodeSymbol(&m_InBitStream);
--      if (number >= kDistTableSize)
--        return false;
--      distance = kDistStart[number] + m_InBitStream.ReadBits(kDistDirectBits[number]);
--      if (distance >= kDistLimit3)
--      {
--        length += 2 - ((distance - kDistLimit4) >> 31);
--        // length++;
--        // if (distance >= kDistLimit4)
--        //  length++;
--      }
--    }
--    else if (number == kRepBothNumber)
--    {
--      length = m_LastLength;
--      if (length == 0)
--        return false;
--      distance = m_RepDists[(m_RepDistPtr + 4 - 1) & 3];
--    }
--    else if (number < kLen2Number)
--    {
--      distance = m_RepDists[(m_RepDistPtr - (number - kRepNumber + 1)) & 3];
--      number = m_LenDecoder.DecodeSymbol(&m_InBitStream);
--      if (number >= kLenTableSize)
--        return false;
--      length = 2 + kLenStart[number] + m_InBitStream.ReadBits(kLenDirectBits[number]);
--      if (distance >= kDistLimit2)
--      {
--        length++;
--        if (distance >= kDistLimit3)
--        {
--          length += 2 - ((distance - kDistLimit4) >> 31);
--          // length++;
--          // if (distance >= kDistLimit4)
--          //   length++;
--        }
--      }
--    }
--    else if (number < kReadTableNumber)
--    {
--      number -= kLen2Number;
--      distance = kLen2DistStarts[number] +
--        m_InBitStream.ReadBits(kLen2DistDirectBits[number]);
--      length = 2;
--    }
--    else if (number == kReadTableNumber)
--      return true;
--    else
--      return false;
--    m_RepDists[m_RepDistPtr++ & 3] = distance;
--    m_LastLength = length;
--    if (!m_OutWindowStream.CopyBlock(distance, length))
--      return false;
--    pos -= length;
--  }
--  return true;
--}
--
--HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *outStream,
--    const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress)
--{
--  if (inSize == NULL || outSize == NULL)
--    return E_INVALIDARG;
--
--  if (!m_OutWindowStream.Create(kHistorySize))
--    return E_OUTOFMEMORY;
--  if (!m_InBitStream.Create(1 << 20))
--    return E_OUTOFMEMORY;
--
--  m_PackSize = *inSize;
--
--  UInt64 pos = 0, unPackSize = *outSize;
--  
--  m_OutWindowStream.SetStream(outStream);
--  m_OutWindowStream.Init(m_IsSolid);
--  m_InBitStream.SetStream(inStream);
--  m_InBitStream.Init();
--
--  CCoderReleaser coderReleaser(this);
--  if (!m_IsSolid)
--  {
--    InitStructures();
--    if (unPackSize == 0)
--    {
--      if (m_InBitStream.GetProcessedSize() + 2 <= m_PackSize) // test it: probably incorrect;
--        if (!ReadTables())
--          return S_FALSE;
--      return S_OK;
--    }
--    if (!ReadTables())
--      return S_FALSE;
--  }
--
--  UInt64 startPos = m_OutWindowStream.GetProcessedSize();
--  while(pos < unPackSize)
--  {
--    UInt32 blockSize = 1 << 20;
--    if (blockSize > unPackSize - pos)
--      blockSize = (UInt32)(unPackSize - pos);
--    UInt64 blockStartPos = m_OutWindowStream.GetProcessedSize();
--    if (m_AudioMode)
--    {
--      if (!DecodeMm(blockSize))
--        return S_FALSE;
--    }
--    else
--    {
--      if (!DecodeLz((Int32)blockSize))
--        return S_FALSE;
--    }
--    UInt64 globalPos = m_OutWindowStream.GetProcessedSize();
--    pos = globalPos - blockStartPos;
--    if (pos < blockSize)
--      if (!ReadTables())
--        return S_FALSE;
--    pos = globalPos - startPos;
--    if (progress != 0)
--    {
--      UInt64 packSize = m_InBitStream.GetProcessedSize();
--      RINOK(progress->SetRatioInfo(&packSize, &pos));
--    }
--  }
--  if (pos > unPackSize)
--    return S_FALSE;
--
--  if (!ReadLastTables())
--    return S_FALSE;
--  return m_OutWindowStream.Flush();
--}
--
--STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream *outStream,
--    const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress)
--{
--  try { return CodeReal(inStream, outStream, inSize, outSize, progress); }
--  catch(const CInBufferException &e) { return e.ErrorCode; }
--  catch(const CLzOutWindowException &e) { return e.ErrorCode; }
--  catch(...) { return S_FALSE; }
--}
--
--STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
--{
--  if (size < 1)
--    return E_INVALIDARG;
--  m_IsSolid = (data[0] != 0);
--  return S_OK;
--}
--
--}}
-diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar2Decoder.h p7zip-libre_9.20.1/CPP/7zip/Compress/Rar2Decoder.h
---- p7zip_9.20.1/CPP/7zip/Compress/Rar2Decoder.h	2009-02-07 15:06:28.000000000 -0200
-+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar2Decoder.h	1969-12-31 21:00:00.000000000 -0300
-@@ -1,174 +0,0 @@
--// Rar2Decoder.h
--// According to unRAR license, this code may not be used to develop
--// a program that creates RAR archives
--
--#ifndef __COMPRESS_RAR2_DECODER_H
--#define __COMPRESS_RAR2_DECODER_H
--
--#include "../../Common/MyCom.h"
--
--#include "../ICoder.h"
--
--#include "../Common/InBuffer.h"
--
--#include "BitmDecoder.h"
--#include "HuffmanDecoder.h"
--#include "LzOutWindow.h"
--
--namespace NCompress {
--namespace NRar2 {
--
--const UInt32 kNumRepDists = 4;
--const UInt32 kDistTableSize = 48;
--
--const int kMMTableSize = 256 + 1;
--
--const UInt32 kMainTableSize = 298;
--const UInt32 kLenTableSize = 28;
--
--const UInt32 kDistTableStart = kMainTableSize;
--const UInt32 kLenTableStart = kDistTableStart + kDistTableSize;
--
--const UInt32 kHeapTablesSizesSum = kMainTableSize + kDistTableSize + kLenTableSize;
--
--const UInt32 kLevelTableSize = 19;
--
--const UInt32 kMMTablesSizesSum = kMMTableSize * 4;
--
--const UInt32 kMaxTableSize = kMMTablesSizesSum;
--
--const UInt32 kTableDirectLevels = 16;
--const UInt32 kTableLevelRepNumber = kTableDirectLevels;
--const UInt32 kTableLevel0Number = kTableLevelRepNumber + 1;
--const UInt32 kTableLevel0Number2 = kTableLevel0Number + 1;
--
--const UInt32 kLevelMask = 0xF;
--
--
--const UInt32 kRepBothNumber = 256;
--const UInt32 kRepNumber = kRepBothNumber + 1;
--const UInt32 kLen2Number = kRepNumber + 4;
--
--const UInt32 kLen2NumNumbers = 8;
--const UInt32 kReadTableNumber = kLen2Number + kLen2NumNumbers;
--const UInt32 kMatchNumber = kReadTableNumber + 1;
--
--const Byte kLenStart[kLenTableSize]      = {0,1,2,3,4,5,6,7,8,10,12,14,16,20,24,28,32,40,48,56,64,80,96,112,128,160,192,224};
--const Byte kLenDirectBits[kLenTableSize] = {0,0,0,0,0,0,0,0,1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4,  4,  5,  5,  5,  5};
--
--const UInt32 kDistStart[kDistTableSize]     = {0,1,2,3,4,6,8,12,16,24,32,48,64,96,128,192,256,384,512,768,1024,1536,2048,3072,4096,6144,8192,12288,16384,24576,32768U,49152U,65536,98304,131072,196608,262144,327680,393216,458752,524288,589824,655360,720896,786432,851968,917504,983040};
--const Byte kDistDirectBits[kDistTableSize] = {0,0,0,0,1,1,2, 2, 3, 3, 4, 4, 5, 5,  6,  6,  7,  7,  8,  8,   9,   9,  10,  10,  11,  11,  12,   12,   13,   13,    14,    14,   15,   15,    16,    16,    16,    16,    16,    16,    16,    16,    16,    16,    16,    16,    16,    16};
--
--const Byte kLevelDirectBits[kLevelTableSize] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7};
--
--const Byte kLen2DistStarts[kLen2NumNumbers]={0,4,8,16,32,64,128,192};
--const Byte kLen2DistDirectBits[kLen2NumNumbers]={2,2,3, 4, 5, 6,  6,  6};
--
--const UInt32 kDistLimit2 = 0x101 - 1;
--const UInt32 kDistLimit3 = 0x2000 - 1;
--const UInt32 kDistLimit4 = 0x40000 - 1;
--
--const UInt32 kMatchMaxLen = 255 + 2;
--const UInt32 kMatchMaxLenMax = 255 + 5;
--const UInt32 kNormalMatchMinLen = 3;
--
--namespace NMultimedia {
--
--struct CFilter
--{
--  int K1,K2,K3,K4,K5;
--  int D1,D2,D3,D4;
--  int LastDelta;
--  UInt32 Dif[11];
--  UInt32 ByteCount;
--  int LastChar;
--
--  Byte Decode(int &channelDelta, Byte delta);
--
--  void Init() { memset(this, 0, sizeof(*this)); }
--
--};
--
--const int kNumChanelsMax = 4;
--
--class CFilter2
--{
--public:
--  CFilter  m_Filters[kNumChanelsMax];
--  int m_ChannelDelta;
--  int CurrentChannel;
--
--  void Init() { memset(this, 0, sizeof(*this)); }
--  Byte Decode(Byte delta)
--  {
--    return m_Filters[CurrentChannel].Decode(m_ChannelDelta, delta);
--  }
--
--};
--
--}
--
--typedef NBitm::CDecoder<CInBuffer> CBitDecoder;
--
--const int kNumHuffmanBits = 15;
--
--class CDecoder :
--  public ICompressCoder,
--  public ICompressSetDecoderProperties2,
--  public CMyUnknownImp
--{
--  CLzOutWindow m_OutWindowStream;
--  CBitDecoder m_InBitStream;
--  NHuffman::CDecoder<kNumHuffmanBits, kMainTableSize> m_MainDecoder;
--  NHuffman::CDecoder<kNumHuffmanBits, kDistTableSize> m_DistDecoder;
--  NHuffman::CDecoder<kNumHuffmanBits, kLenTableSize> m_LenDecoder;
--  NHuffman::CDecoder<kNumHuffmanBits, kMMTableSize> m_MMDecoders[NMultimedia::kNumChanelsMax];
--  NHuffman::CDecoder<kNumHuffmanBits, kLevelTableSize> m_LevelDecoder;
--
--  bool m_AudioMode;
--
--  NMultimedia::CFilter2 m_MmFilter;
--  int m_NumChannels;
--
--  UInt32 m_RepDists[kNumRepDists];
--  UInt32 m_RepDistPtr;
--
--  UInt32 m_LastLength;
--  
--  Byte m_LastLevels[kMaxTableSize];
--
--  UInt64 m_PackSize;
--  bool m_IsSolid;
--
--  void InitStructures();
--  UInt32 ReadBits(int numBits);
--  bool ReadTables();
--  bool ReadLastTables();
--
--  bool DecodeMm(UInt32 pos);
--  bool DecodeLz(Int32 pos);
--
--  HRESULT CodeReal(ISequentialInStream *inStream, ISequentialOutStream *outStream,
--      const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
--
--public:
--  CDecoder();
--
--  MY_UNKNOWN_IMP1(ICompressSetDecoderProperties2)
--
--  void ReleaseStreams()
--  {
--    m_OutWindowStream.ReleaseStream();
--    m_InBitStream.ReleaseStream();
--  }
--
--  STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
--      const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
--
--  STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size);
--
--};
--
--}}
--
--#endif
-diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar3Decoder.cpp p7zip-libre_9.20.1/CPP/7zip/Compress/Rar3Decoder.cpp
---- p7zip_9.20.1/CPP/7zip/Compress/Rar3Decoder.cpp	2010-09-14 16:18:38.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar3Decoder.cpp	1969-12-31 21:00:00.000000000 -0300
-@@ -1,897 +0,0 @@
--// Rar3Decoder.cpp
--// According to unRAR license, this code may not be used to develop
--// a program that creates RAR archives
--
--/* This code uses Carryless rangecoder (1999): Dmitry Subbotin : Public domain */
-- 
--#include "StdAfx.h"
--
--#include "../../../C/Alloc.h"
--
--#include "../Common/StreamUtils.h"
--
--#include "Rar3Decoder.h"
--
--namespace NCompress {
--namespace NRar3 {
--
--static void *SzBigAlloc(void *, size_t size) { return BigAlloc(size); }
--static void SzBigFree(void *, void *address) { BigFree(address); }
--static ISzAlloc g_BigAlloc = { SzBigAlloc, SzBigFree };
--
--static const UInt32 kNumAlignReps = 15;
--
--static const UInt32 kSymbolReadTable = 256;
--static const UInt32 kSymbolRep = 259;
--static const UInt32 kSymbolLen2 = kSymbolRep + kNumReps;
--
--static const Byte kLenStart[kLenTableSize]      = {0,1,2,3,4,5,6,7,8,10,12,14,16,20,24,28,32,40,48,56,64,80,96,112,128,160,192,224};
--static const Byte kLenDirectBits[kLenTableSize] = {0,0,0,0,0,0,0,0,1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4,  4,  5,  5,  5,  5};
--
--static const Byte kDistDirectBits[kDistTableSize] =
--  {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13,14,14,15,15,
--  16,16,16,16,16,16,16,16,16,16,16,16,16,16,
--  18,18,18,18,18,18,18,18,18,18,18,18};
--
--static const Byte kLevelDirectBits[kLevelTableSize] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
--
--static const Byte kLen2DistStarts[kNumLen2Symbols]={0,4,8,16,32,64,128,192};
--static const Byte kLen2DistDirectBits[kNumLen2Symbols]={2,2,3, 4, 5, 6,  6,  6};
--
--static const UInt32 kDistLimit3 = 0x2000 - 2;
--static const UInt32 kDistLimit4 = 0x40000 - 2;
--
--static const UInt32 kNormalMatchMinLen = 3;
--
--static const UInt32 kVmDataSizeMax = 1 << 16;
--static const UInt32 kVmCodeSizeMax = 1 << 16;
--
--extern "C" {
--
--static UInt32 Range_GetThreshold(void *pp, UInt32 total)
--{
--  CRangeDecoder *p = (CRangeDecoder *)pp;
--  return p->Code / (p->Range /= total);
--}
--
--static void Range_Decode(void *pp, UInt32 start, UInt32 size)
--{
--  CRangeDecoder *p = (CRangeDecoder *)pp;
--  start *= p->Range;
--  p->Low += start;
--  p->Code -= start;
--  p->Range *= size;
--  p->Normalize();
--}
--
--static UInt32 Range_DecodeBit(void *pp, UInt32 size0)
--{
--  CRangeDecoder *p = (CRangeDecoder *)pp;
--  if (p->Code / (p->Range >>= 14) < size0)
--  {
--    Range_Decode(p, 0, size0);
--    return 0;
--  }
--  else
--  {
--    Range_Decode(p, size0, (1 << 14) - size0);
--    return 1;
--  }
--}
--
--}
--
--CRangeDecoder::CRangeDecoder()
--{
--  s.GetThreshold = Range_GetThreshold;
--  s.Decode = Range_Decode;
--  s.DecodeBit = Range_DecodeBit;
--}
--
--CDecoder::CDecoder():
--  _window(0),
--  _winPos(0),
--  _wrPtr(0),
--  _lzSize(0),
--  _writtenFileSize(0),
--  _vmData(0),
--  _vmCode(0),
--  m_IsSolid(false)
--{
--  Ppmd7_Construct(&_ppmd);
--}
--
--CDecoder::~CDecoder()
--{
--  InitFilters();
--  ::MidFree(_vmData);
--  ::MidFree(_window);
--  Ppmd7_Free(&_ppmd, &g_BigAlloc);
--}
--
--HRESULT CDecoder::WriteDataToStream(const Byte *data, UInt32 size)
--{
--  return WriteStream(_outStream, data, size);
--}
--
--HRESULT CDecoder::WriteData(const Byte *data, UInt32 size)
--{
--  HRESULT res = S_OK;
--  if (_writtenFileSize < _unpackSize)
--  {
--    UInt32 curSize = size;
--    UInt64 remain = _unpackSize - _writtenFileSize;
--    if (remain < curSize)
--      curSize = (UInt32)remain;
--    res = WriteDataToStream(data, curSize);
--  }
--  _writtenFileSize += size;
--  return res;
--}
--
--HRESULT CDecoder::WriteArea(UInt32 startPtr, UInt32 endPtr)
--{
--  if (startPtr <= endPtr)
--    return WriteData(_window + startPtr, endPtr - startPtr);
--  RINOK(WriteData(_window + startPtr, kWindowSize - startPtr));
--  return WriteData(_window, endPtr);
--}
--
--void CDecoder::ExecuteFilter(int tempFilterIndex, NVm::CBlockRef &outBlockRef)
--{
--  CTempFilter *tempFilter = _tempFilters[tempFilterIndex];
--  tempFilter->InitR[6] = (UInt32)_writtenFileSize;
--  NVm::SetValue32(&tempFilter->GlobalData[0x24], (UInt32)_writtenFileSize);
--  NVm::SetValue32(&tempFilter->GlobalData[0x28], (UInt32)(_writtenFileSize >> 32));
--  CFilter *filter = _filters[tempFilter->FilterIndex];
--  _vm.Execute(filter, tempFilter, outBlockRef, filter->GlobalData);
--  delete tempFilter;
--  _tempFilters[tempFilterIndex] = 0;
--}
--
--HRESULT CDecoder::WriteBuf()
--{
--  UInt32 writtenBorder = _wrPtr;
--  UInt32 writeSize = (_winPos - writtenBorder) & kWindowMask;
--  for (int i = 0; i < _tempFilters.Size(); i++)
--  {
--    CTempFilter *filter = _tempFilters[i];
--    if (filter == NULL)
--      continue;
--    if (filter->NextWindow)
--    {
--      filter->NextWindow = false;
--      continue;
--    }
--    UInt32 blockStart = filter->BlockStart;
--    UInt32 blockSize = filter->BlockSize;
--    if (((blockStart - writtenBorder) & kWindowMask) < writeSize)
--    {
--      if (writtenBorder != blockStart)
--      {
--        RINOK(WriteArea(writtenBorder, blockStart));
--        writtenBorder = blockStart;
--        writeSize = (_winPos - writtenBorder) & kWindowMask;
--      }
--      if (blockSize <= writeSize)
--      {
--        UInt32 blockEnd = (blockStart + blockSize) & kWindowMask;
--        if (blockStart < blockEnd || blockEnd == 0)
--          _vm.SetMemory(0, _window + blockStart, blockSize);
--        else
--        {
--          UInt32 tailSize = kWindowSize - blockStart;
--          _vm.SetMemory(0, _window + blockStart, tailSize);
--          _vm.SetMemory(tailSize, _window, blockEnd);
--        }
--        NVm::CBlockRef outBlockRef;
--        ExecuteFilter(i, outBlockRef);
--        while (i + 1 < _tempFilters.Size())
--        {
--          CTempFilter *nextFilter = _tempFilters[i + 1];
--          if (nextFilter == NULL || nextFilter->BlockStart != blockStart ||
--              nextFilter->BlockSize != outBlockRef.Size || nextFilter->NextWindow)
--            break;
--          _vm.SetMemory(0, _vm.GetDataPointer(outBlockRef.Offset), outBlockRef.Size);
--          ExecuteFilter(++i, outBlockRef);
--        }
--        WriteDataToStream(_vm.GetDataPointer(outBlockRef.Offset), outBlockRef.Size);
--        _writtenFileSize += outBlockRef.Size;
--        writtenBorder = blockEnd;
--        writeSize = (_winPos - writtenBorder) & kWindowMask;
--      }
--      else
--      {
--        for (int j = i; j < _tempFilters.Size(); j++)
--        {
--          CTempFilter *filter = _tempFilters[j];
--          if (filter != NULL && filter->NextWindow)
--            filter->NextWindow = false;
--        }
--        _wrPtr = writtenBorder;
--        return S_OK; // check it
--      }
--    }
--  }
--      
--  _wrPtr = _winPos;
--  return WriteArea(writtenBorder, _winPos);
--}
--
--void CDecoder::InitFilters()
--{
--  _lastFilter = 0;
--  int i;
--  for (i = 0; i < _tempFilters.Size(); i++)
--    delete _tempFilters[i];
--  _tempFilters.Clear();
--  for (i = 0; i < _filters.Size(); i++)
--    delete _filters[i];
--  _filters.Clear();
--}
--
--bool CDecoder::AddVmCode(UInt32 firstByte, UInt32 codeSize)
--{
--  CMemBitDecoder inp;
--  inp.Init(_vmData, codeSize);
--
--  UInt32 filterIndex;
--  if (firstByte & 0x80)
--  {
--    filterIndex = NVm::ReadEncodedUInt32(inp);
--    if (filterIndex == 0)
--      InitFilters();
--    else
--      filterIndex--;
--  }
--  else
--    filterIndex = _lastFilter;
--  if (filterIndex > (UInt32)_filters.Size())
--    return false;
--  _lastFilter = filterIndex;
--  bool newFilter = (filterIndex == (UInt32)_filters.Size());
--
--  CFilter *filter;
--  if (newFilter)
--  {
--    // check if too many filters
--    if (filterIndex > 1024)
--      return false;
--    filter = new CFilter;
--    _filters.Add(filter);
--  }
--  else
--  {
--    filter = _filters[filterIndex];
--    filter->ExecCount++;
--  }
--
--  int numEmptyItems = 0;
--  int i;
--  for (i = 0; i < _tempFilters.Size(); i++)
--  {
--    _tempFilters[i - numEmptyItems] = _tempFilters[i];
--    if (_tempFilters[i] == NULL)
--      numEmptyItems++;
--    if (numEmptyItems > 0)
--      _tempFilters[i] = NULL;
--  }
--  if (numEmptyItems == 0)
--  {
--    _tempFilters.Add(NULL);
--    numEmptyItems = 1;
--  }
--  CTempFilter *tempFilter = new CTempFilter;
--  _tempFilters[_tempFilters.Size() - numEmptyItems] = tempFilter;
--  tempFilter->FilterIndex = filterIndex;
--  tempFilter->ExecCount = filter->ExecCount;
-- 
--  UInt32 blockStart = NVm::ReadEncodedUInt32(inp);
--  if (firstByte & 0x40)
--    blockStart += 258;
--  tempFilter->BlockStart = (blockStart + _winPos) & kWindowMask;
--  if (firstByte & 0x20)
--    filter->BlockSize = NVm::ReadEncodedUInt32(inp);
--  tempFilter->BlockSize = filter->BlockSize;
--  tempFilter->NextWindow = _wrPtr != _winPos && ((_wrPtr - _winPos) & kWindowMask) <= blockStart;
--
--  memset(tempFilter->InitR, 0, sizeof(tempFilter->InitR));
--  tempFilter->InitR[3] = NVm::kGlobalOffset;
--  tempFilter->InitR[4] = tempFilter->BlockSize;
--  tempFilter->InitR[5] = tempFilter->ExecCount;
--  if (firstByte & 0x10)
--  {
--    UInt32 initMask = inp.ReadBits(NVm::kNumGpRegs);
--    for (int i = 0; i < NVm::kNumGpRegs; i++)
--      if (initMask & (1 << i))
--        tempFilter->InitR[i] = NVm::ReadEncodedUInt32(inp);
--  }
--  if (newFilter)
--  {
--    UInt32 vmCodeSize = NVm::ReadEncodedUInt32(inp);
--    if (vmCodeSize >= kVmCodeSizeMax || vmCodeSize == 0)
--      return false;
--    for (UInt32 i = 0; i < vmCodeSize; i++)
--      _vmCode[i] = (Byte)inp.ReadBits(8);
--    _vm.PrepareProgram(_vmCode, vmCodeSize, filter);
--  }
--
--  tempFilter->AllocateEmptyFixedGlobal();
--
--  Byte *globalData = &tempFilter->GlobalData[0];
--  for (i = 0; i < NVm::kNumGpRegs; i++)
--    NVm::SetValue32(&globalData[i * 4], tempFilter->InitR[i]);
--  NVm::SetValue32(&globalData[NVm::NGlobalOffset::kBlockSize], tempFilter->BlockSize);
--  NVm::SetValue32(&globalData[NVm::NGlobalOffset::kBlockPos], 0); // It was commented. why?
--  NVm::SetValue32(&globalData[NVm::NGlobalOffset::kExecCount], tempFilter->ExecCount);
--
--  if (firstByte & 8)
--  {
--    UInt32 dataSize = NVm::ReadEncodedUInt32(inp);
--    if (dataSize > NVm::kGlobalSize - NVm::kFixedGlobalSize)
--      return false;
--    CRecordVector<Byte> &globalData = tempFilter->GlobalData;
--    int requredSize = (int)(dataSize + NVm::kFixedGlobalSize);
--    if (globalData.Size() < requredSize)
--    {
--      globalData.Reserve(requredSize);
--      for (; globalData.Size() < requredSize; i++)
--        globalData.Add(0);
--    }
--    for (UInt32 i = 0; i < dataSize; i++)
--      globalData[NVm::kFixedGlobalSize + i] = (Byte)inp.ReadBits(8);
--  }
--  return true;
--}
--
--bool CDecoder::ReadVmCodeLZ()
--{
--  UInt32 firstByte = ReadBits(8);
--  UInt32 length = (firstByte & 7) + 1;
--  if (length == 7)
--    length = ReadBits(8) + 7;
--  else if (length == 8)
--    length = ReadBits(16);
--  if (length > kVmDataSizeMax)
--    return false;
--  for (UInt32 i = 0; i < length; i++)
--    _vmData[i] = (Byte)ReadBits(8);
--  return AddVmCode(firstByte, length);
--}
--
--bool CDecoder::ReadVmCodePPM()
--{
--  int firstByte = DecodePpmSymbol();
--  if (firstByte < 0)
--    return false;
--  UInt32 length = (firstByte & 7) + 1;
--  if (length == 7)
--  {
--    int b1 = DecodePpmSymbol();
--    if (b1 < 0)
--      return false;
--    length = b1 + 7;
--  }
--  else if (length == 8)
--  {
--    int b1 = DecodePpmSymbol();
--    if (b1 < 0)
--      return false;
--    int b2 = DecodePpmSymbol();
--    if (b2 < 0)
--      return false;
--    length = b1 * 256 + b2;
--  }
--  if (length > kVmDataSizeMax)
--    return false;
--  for (UInt32 i = 0; i < length; i++)
--  {
--    int b = DecodePpmSymbol();
--    if (b < 0)
--      return false;
--    _vmData[i] = (Byte)b;
--  }
--  return AddVmCode(firstByte, length);
--}
--
--#define RIF(x) { if (!(x)) return S_FALSE; }
--
--UInt32 CDecoder::ReadBits(int numBits) { return m_InBitStream.bitDecoder.ReadBits(numBits); }
--
--/////////////////////////////////////////////////
--// PPM
--
--HRESULT CDecoder::InitPPM()
--{
--  Byte maxOrder = (Byte)ReadBits(7);
--
--  bool reset = ((maxOrder & 0x20) != 0);
--  int maxMB = 0;
--  if (reset)
--    maxMB = (Byte)ReadBits(8);
--  else
--  {
--    if (PpmError || !Ppmd7_WasAllocated(&_ppmd))
--      return S_FALSE;
--  }
--  if (maxOrder & 0x40)
--    PpmEscChar = (Byte)ReadBits(8);
--  m_InBitStream.InitRangeCoder();
--  /*
--  if (m_InBitStream.m_BitPos != 0)
--    return S_FALSE;
--  */
--  if (reset)
--  {
--    PpmError = true;
--    maxOrder = (maxOrder & 0x1F) + 1;
--    if (maxOrder > 16)
--      maxOrder = 16 + (maxOrder - 16) * 3;
--    if (maxOrder == 1)
--    {
--      Ppmd7_Free(&_ppmd, &g_BigAlloc);
--      return S_FALSE;
--    }
--    if (!Ppmd7_Alloc(&_ppmd, (maxMB + 1) << 20, &g_BigAlloc))
--      return E_OUTOFMEMORY;
--    Ppmd7_Init(&_ppmd, maxOrder);
--    PpmError = false;
--  }
--  return S_OK;
--}
--
--int CDecoder::DecodePpmSymbol() { return Ppmd7_DecodeSymbol(&_ppmd, &m_InBitStream.s); }
--
--HRESULT CDecoder::DecodePPM(Int32 num, bool &keepDecompressing)
--{
--  keepDecompressing = false;
--  if (PpmError)
--    return S_FALSE;
--  do
--  {
--    if (((_wrPtr - _winPos) & kWindowMask) < 260 && _wrPtr != _winPos)
--    {
--      RINOK(WriteBuf());
--      if (_writtenFileSize > _unpackSize)
--      {
--        keepDecompressing = false;
--        return S_OK;
--      }
--    }
--    int c = DecodePpmSymbol();
--    if (c < 0)
--    {
--      PpmError = true;
--      return S_FALSE;
--    }
--    if (c == PpmEscChar)
--    {
--      int nextCh = DecodePpmSymbol();
--      if (nextCh < 0)
--      {
--        PpmError = true;
--        return S_FALSE;
--      }
--      if (nextCh == 0)
--        return ReadTables(keepDecompressing);
--      if (nextCh == 2 || nextCh == -1)
--        return S_OK;
--      if (nextCh == 3)
--      {
--        if (!ReadVmCodePPM())
--        {
--          PpmError = true;
--          return S_FALSE;
--        }
--        continue;
--      }
--      if (nextCh == 4 || nextCh == 5)
--      {
--        UInt32 distance = 0;
--        UInt32 length = 4;
--        if (nextCh == 4)
--        {
--          for (int i = 0; i < 3; i++)
--          {
--            int c = DecodePpmSymbol();
--            if (c < 0)
--            {
--              PpmError = true;
--              return S_FALSE;
--            }
--            distance = (distance << 8) + (Byte)c;
--          }
--          distance++;
--          length += 28;
--        }
--        int c = DecodePpmSymbol();
--        if (c < 0)
--        {
--          PpmError = true;
--          return S_FALSE;
--        }
--        length += c;
--        if (distance >= _lzSize)
--          return S_FALSE;
--        CopyBlock(distance, length);
--        num -= (Int32)length;
--        continue;
--      }
--    }
--    PutByte((Byte)c);
--    num--;
--  }
--  while (num >= 0);
--  keepDecompressing = true;
--  return S_OK;
--}
--
--/////////////////////////////////////////////////
--// LZ
--
--HRESULT CDecoder::ReadTables(bool &keepDecompressing)
--{
--  keepDecompressing = true;
--  ReadBits((8 - m_InBitStream.bitDecoder.GetBitPosition()) & 7);
--  if (ReadBits(1) != 0)
--  {
--    _lzMode = false;
--    return InitPPM();
--  }
--
--  _lzMode = true;
--  PrevAlignBits = 0;
--  PrevAlignCount = 0;
--
--  Byte levelLevels[kLevelTableSize];
--  Byte newLevels[kTablesSizesSum];
--
--  if (ReadBits(1) == 0)
--    memset(m_LastLevels, 0, kTablesSizesSum);
--
--  int i;
--  for (i = 0; i < kLevelTableSize; i++)
--  {
--    UInt32 length = ReadBits(4);
--    if (length == 15)
--    {
--      UInt32 zeroCount = ReadBits(4);
--      if (zeroCount != 0)
--      {
--        zeroCount += 2;
--        while (zeroCount-- > 0 && i < kLevelTableSize)
--          levelLevels[i++]=0;
--        i--;
--        continue;
--      }
--    }
--    levelLevels[i] = (Byte)length;
--  }
--  RIF(m_LevelDecoder.SetCodeLengths(levelLevels));
--  i = 0;
--  while (i < kTablesSizesSum)
--  {
--    UInt32 number = m_LevelDecoder.DecodeSymbol(&m_InBitStream.bitDecoder);
--    if (number < 16)
--    {
--      newLevels[i] = Byte((number + m_LastLevels[i]) & 15);
--      i++;
--    }
--    else if (number > kLevelTableSize)
--      return S_FALSE;
--    else
--    {
--      int num;
--      if (((number - 16) & 1) == 0)
--        num = ReadBits(3) + 3;
--      else
--        num = ReadBits(7) + 11;
--      if (number < 18)
--      {
--        if (i == 0)
--          return S_FALSE;
--        for (; num > 0 && i < kTablesSizesSum; num--, i++)
--          newLevels[i] = newLevels[i - 1];
--      }
--      else
--      {
--        for (; num > 0 && i < kTablesSizesSum; num--)
--          newLevels[i++] = 0;
--      }
--    }
--  }
--  TablesRead = true;
--
--  // original code has check here:
--  /*
--  if (InAddr > ReadTop)
--  {
--    keepDecompressing = false;
--    return true;
--  }
--  */
--
--  RIF(m_MainDecoder.SetCodeLengths(&newLevels[0]));
--  RIF(m_DistDecoder.SetCodeLengths(&newLevels[kMainTableSize]));
--  RIF(m_AlignDecoder.SetCodeLengths(&newLevels[kMainTableSize + kDistTableSize]));
--  RIF(m_LenDecoder.SetCodeLengths(&newLevels[kMainTableSize + kDistTableSize + kAlignTableSize]));
--
--  memcpy(m_LastLevels, newLevels, kTablesSizesSum);
--  return S_OK;
--}
--
--class CCoderReleaser
--{
--  CDecoder *m_Coder;
--public:
--  CCoderReleaser(CDecoder *coder): m_Coder(coder) {}
--  ~CCoderReleaser()
--  {
--    m_Coder->ReleaseStreams();
--  }
--};
--
--HRESULT CDecoder::ReadEndOfBlock(bool &keepDecompressing)
--{
--  if (ReadBits(1) != 0)
--  {
--    // old file
--    TablesRead = false;
--    return ReadTables(keepDecompressing);
--  }
--  // new file
--  keepDecompressing = false;
--  TablesRead = (ReadBits(1) == 0);
--  return S_OK;
--}
--
--UInt32 kDistStart[kDistTableSize];
--
--class CDistInit
--{
--public:
--  CDistInit() { Init(); }
--  void Init()
--  {
--    UInt32 start = 0;
--    for (UInt32 i = 0; i < kDistTableSize; i++)
--    {
--      kDistStart[i] = start;
--      start += (1 << kDistDirectBits[i]);
--    }
--  }
--} g_DistInit;
--
--HRESULT CDecoder::DecodeLZ(bool &keepDecompressing)
--{
--  UInt32 rep0 = _reps[0];
--  UInt32 rep1 = _reps[1];
--  UInt32 rep2 = _reps[2];
--  UInt32 rep3 = _reps[3];
--  UInt32 length = _lastLength;
--  for (;;)
--  {
--    if (((_wrPtr - _winPos) & kWindowMask) < 260 && _wrPtr != _winPos)
--    {
--      RINOK(WriteBuf());
--      if (_writtenFileSize > _unpackSize)
--      {
--        keepDecompressing = false;
--        return S_OK;
--      }
--    }
--    UInt32 number = m_MainDecoder.DecodeSymbol(&m_InBitStream.bitDecoder);
--    if (number < 256)
--    {
--      PutByte((Byte)number);
--      continue;
--    }
--    else if (number == kSymbolReadTable)
--    {
--      RINOK(ReadEndOfBlock(keepDecompressing));
--      break;
--    }
--    else if (number == 257)
--    {
--      if (!ReadVmCodeLZ())
--        return S_FALSE;
--      continue;
--    }
--    else if (number == 258)
--    {
--      if (length == 0)
--        return S_FALSE;
--    }
--    else if (number < kSymbolRep + 4)
--    {
--      if (number != kSymbolRep)
--      {
--        UInt32 distance;
--        if (number == kSymbolRep + 1)
--          distance = rep1;
--        else
--        {
--          if (number == kSymbolRep + 2)
--            distance = rep2;
--          else
--          {
--            distance = rep3;
--            rep3 = rep2;
--          }
--          rep2 = rep1;
--        }
--        rep1 = rep0;
--        rep0 = distance;
--      }
--
--      UInt32 number = m_LenDecoder.DecodeSymbol(&m_InBitStream.bitDecoder);
--      if (number >= kLenTableSize)
--        return S_FALSE;
--      length = 2 + kLenStart[number] + m_InBitStream.bitDecoder.ReadBits(kLenDirectBits[number]);
--    }
--    else
--    {
--      rep3 = rep2;
--      rep2 = rep1;
--      rep1 = rep0;
--      if (number < 271)
--      {
--        number -= 263;
--        rep0 = kLen2DistStarts[number] + m_InBitStream.bitDecoder.ReadBits(kLen2DistDirectBits[number]);
--        length = 2;
--      }
--      else if (number < 299)
--      {
--        number -= 271;
--        length = kNormalMatchMinLen + (UInt32)kLenStart[number] + m_InBitStream.bitDecoder.ReadBits(kLenDirectBits[number]);
--        UInt32 number = m_DistDecoder.DecodeSymbol(&m_InBitStream.bitDecoder);
--        if (number >= kDistTableSize)
--          return S_FALSE;
--        rep0 = kDistStart[number];
--        int numBits = kDistDirectBits[number];
--        if (number >= (kNumAlignBits * 2) + 2)
--        {
--          if (numBits > kNumAlignBits)
--            rep0 += (m_InBitStream.bitDecoder.ReadBits(numBits - kNumAlignBits) << kNumAlignBits);
--          if (PrevAlignCount > 0)
--          {
--            PrevAlignCount--;
--            rep0 += PrevAlignBits;
--          }
--          else
--          {
--            UInt32 number = m_AlignDecoder.DecodeSymbol(&m_InBitStream.bitDecoder);
--            if (number < (1 << kNumAlignBits))
--            {
--              rep0 += number;
--              PrevAlignBits = number;
--            }
--            else if (number  == (1 << kNumAlignBits))
--            {
--              PrevAlignCount = kNumAlignReps;
--              rep0 += PrevAlignBits;
--            }
--            else
--              return S_FALSE;
--          }
--        }
--        else
--          rep0 += m_InBitStream.bitDecoder.ReadBits(numBits);
--        length += ((kDistLimit4 - rep0) >> 31) + ((kDistLimit3 - rep0) >> 31);
--      }
--      else
--        return S_FALSE;
--    }
--    if (rep0 >= _lzSize)
--      return S_FALSE;
--    CopyBlock(rep0, length);
--  }
--  _reps[0] = rep0;
--  _reps[1] = rep1;
--  _reps[2] = rep2;
--  _reps[3] = rep3;
--  _lastLength = length;
--
--  return S_OK;
--}
--
--HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
--{
--  _writtenFileSize = 0;
--  if (!m_IsSolid)
--  {
--    _lzSize = 0;
--    _winPos = 0;
--    _wrPtr = 0;
--    for (int i = 0; i < kNumReps; i++)
--      _reps[i] = 0;
--    _lastLength = 0;
--    memset(m_LastLevels, 0, kTablesSizesSum);
--    TablesRead = false;
--    PpmEscChar = 2;
--    PpmError = true;
--    InitFilters();
--  }
--  if (!m_IsSolid || !TablesRead)
--  {
--    bool keepDecompressing;
--    RINOK(ReadTables(keepDecompressing));
--    if (!keepDecompressing)
--      return S_OK;
--  }
--
--  for (;;)
--  {
--    bool keepDecompressing;
--    if (_lzMode)
--    {
--      RINOK(DecodeLZ(keepDecompressing))
--    }
--    else
--    {
--      RINOK(DecodePPM(1 << 18, keepDecompressing))
--    }
--    UInt64 packSize = m_InBitStream.bitDecoder.GetProcessedSize();
--    RINOK(progress->SetRatioInfo(&packSize, &_writtenFileSize));
--    if (!keepDecompressing)
--      break;
--  }
--  RINOK(WriteBuf());
--  UInt64 packSize = m_InBitStream.bitDecoder.GetProcessedSize();
--  RINOK(progress->SetRatioInfo(&packSize, &_writtenFileSize));
--  if (_writtenFileSize < _unpackSize)
--    return S_FALSE;
--  return S_OK;
--}
--
--STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream *outStream,
--    const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress)
--{
--  try
--  {
--    if (inSize == NULL || outSize == NULL)
--      return E_INVALIDARG;
--
--    if (_vmData == 0)
--    {
--      _vmData = (Byte *)::MidAlloc(kVmDataSizeMax + kVmCodeSizeMax);
--      if (_vmData == 0)
--        return E_OUTOFMEMORY;
--      _vmCode = _vmData + kVmDataSizeMax;
--    }
--    
--    if (_window == 0)
--    {
--      _window = (Byte *)::MidAlloc(kWindowSize);
--      if (_window == 0)
--        return E_OUTOFMEMORY;
--    }
--    if (!m_InBitStream.bitDecoder.Create(1 << 20))
--      return E_OUTOFMEMORY;
--    if (!_vm.Create())
--      return E_OUTOFMEMORY;
--
--    
--    m_InBitStream.bitDecoder.SetStream(inStream);
--    m_InBitStream.bitDecoder.Init();
--    _outStream = outStream;
--   
--    CCoderReleaser coderReleaser(this);
--    _unpackSize = *outSize;
--    return CodeReal(progress);
--  }
--  catch(const CInBufferException &e)  { return e.ErrorCode; }
--  catch(...) { return S_FALSE; }
--  // CNewException is possible here. But probably CNewException is caused
--  // by error in data stream.
--}
--
--STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
--{
--  if (size < 1)
--    return E_INVALIDARG;
--  m_IsSolid = (data[0] != 0);
--  return S_OK;
--}
--
--}}
-diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar3Decoder.h p7zip-libre_9.20.1/CPP/7zip/Compress/Rar3Decoder.h
---- p7zip_9.20.1/CPP/7zip/Compress/Rar3Decoder.h	2010-03-16 16:08:18.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar3Decoder.h	1969-12-31 21:00:00.000000000 -0300
-@@ -1,267 +0,0 @@
--// Rar3Decoder.h
--// According to unRAR license, this code may not be used to develop
--// a program that creates RAR archives
--
--/* This code uses Carryless rangecoder (1999): Dmitry Subbotin : Public domain */
--
--#ifndef __COMPRESS_RAR3_DECODER_H
--#define __COMPRESS_RAR3_DECODER_H
--
--#include "../../../C/Ppmd7.h"
--
--#include "../../Common/MyCom.h"
--
--#include "../ICoder.h"
--
--#include "../Common/InBuffer.h"
--
--#include "BitmDecoder.h"
--#include "HuffmanDecoder.h"
--#include "Rar3Vm.h"
--
--namespace NCompress {
--namespace NRar3 {
--
--const UInt32 kWindowSize = 1 << 22;
--const UInt32 kWindowMask = (kWindowSize - 1);
--
--const UInt32 kNumReps = 4;
--const UInt32 kNumLen2Symbols = 8;
--const UInt32 kLenTableSize = 28;
--const UInt32 kMainTableSize = 256 + 1 + 1 + 1 + kNumReps + kNumLen2Symbols + kLenTableSize;
--const UInt32 kDistTableSize = 60;
--
--const int kNumAlignBits = 4;
--const UInt32 kAlignTableSize = (1 << kNumAlignBits) + 1;
--
--const UInt32 kLevelTableSize = 20;
--
--const UInt32 kTablesSizesSum = kMainTableSize + kDistTableSize + kAlignTableSize + kLenTableSize;
--
--class CBitDecoder
--{
--  UInt32 m_Value;
--  unsigned m_BitPos;
--public:
--  CInBuffer m_Stream;
--  bool Create(UInt32 bufferSize) { return m_Stream.Create(bufferSize); }
--  void SetStream(ISequentialInStream *inStream) { m_Stream.SetStream(inStream);}
--  void ReleaseStream() { m_Stream.ReleaseStream();}
--
--  void Init()
--  {
--    m_Stream.Init();
--    m_BitPos = 0;
--    m_Value = 0;
--  }
--  
--  UInt64 GetProcessedSize() const { return m_Stream.GetProcessedSize() - (m_BitPos) / 8; }
--  UInt32 GetBitPosition() const { return ((8 - m_BitPos) & 7); }
--  
--  UInt32 GetValue(unsigned numBits)
--  {
--    if (m_BitPos < numBits)
--    {
--      m_BitPos += 8;
--      m_Value = (m_Value << 8) | m_Stream.ReadByte();
--      if (m_BitPos < numBits)
--      {
--        m_BitPos += 8;
--        m_Value = (m_Value << 8) | m_Stream.ReadByte();
--      }
--    }
--    return m_Value >> (m_BitPos - numBits);
--  }
--  
--  void MovePos(unsigned numBits)
--  {
--    m_BitPos -= numBits;
--    m_Value = m_Value & ((1 << m_BitPos) - 1);
--  }
--  
--  UInt32 ReadBits(unsigned numBits)
--  {
--    UInt32 res = GetValue(numBits);
--    MovePos(numBits);
--    return res;
--  }
--};
--
--const UInt32 kTopValue = (1 << 24);
--const UInt32 kBot = (1 << 15);
--
--struct CRangeDecoder
--{
--  IPpmd7_RangeDec s;
--  UInt32 Range;
--  UInt32 Code;
--  UInt32 Low;
--  CBitDecoder bitDecoder;
--  SRes Res;
--
--public:
--  void InitRangeCoder()
--  {
--    Code = 0;
--    Low = 0;
--    Range = 0xFFFFFFFF;
--    for (int i = 0; i < 4; i++)
--      Code = (Code << 8) | bitDecoder.ReadBits(8);
--  }
--
--  void Normalize()
--  {
--    while ((Low ^ (Low + Range)) < kTopValue ||
--       Range < kBot && ((Range = (0 - Low) & (kBot - 1)), 1))
--    {
--      Code = (Code << 8) | bitDecoder.m_Stream.ReadByte();
--      Range <<= 8;
--      Low <<= 8;
--    }
--  }
--
--  CRangeDecoder();
--};
--
--struct CFilter: public NVm::CProgram
--{
--  CRecordVector<Byte> GlobalData;
--  UInt32 BlockStart;
--  UInt32 BlockSize;
--  UInt32 ExecCount;
--  CFilter(): BlockStart(0), BlockSize(0), ExecCount(0) {}
--};
--
--struct CTempFilter: public NVm::CProgramInitState
--{
--  UInt32 BlockStart;
--  UInt32 BlockSize;
--  UInt32 ExecCount;
--  bool NextWindow;
--  
--  UInt32 FilterIndex;
--};
--
--const int kNumHuffmanBits = 15;
--
--class CDecoder:
--  public ICompressCoder,
--  public ICompressSetDecoderProperties2,
--  public CMyUnknownImp
--{
--  CRangeDecoder m_InBitStream;
--  Byte *_window;
--  UInt32 _winPos;
--  UInt32 _wrPtr;
--  UInt64 _lzSize;
--  UInt64 _unpackSize;
--  UInt64 _writtenFileSize; // if it's > _unpackSize, then _unpackSize only written
--  CMyComPtr<ISequentialOutStream> _outStream;
--  NHuffman::CDecoder<kNumHuffmanBits, kMainTableSize> m_MainDecoder;
--  NHuffman::CDecoder<kNumHuffmanBits, kDistTableSize> m_DistDecoder;
--  NHuffman::CDecoder<kNumHuffmanBits, kAlignTableSize> m_AlignDecoder;
--  NHuffman::CDecoder<kNumHuffmanBits, kLenTableSize> m_LenDecoder;
--  NHuffman::CDecoder<kNumHuffmanBits, kLevelTableSize> m_LevelDecoder;
--
--  UInt32 _reps[kNumReps];
--  UInt32 _lastLength;
--  
--  Byte m_LastLevels[kTablesSizesSum];
--
--  Byte *_vmData;
--  Byte *_vmCode;
--  NVm::CVm _vm;
--  CRecordVector<CFilter *> _filters;
--  CRecordVector<CTempFilter *>  _tempFilters;
--  UInt32 _lastFilter;
--
--  bool m_IsSolid;
--
--  bool _lzMode;
--
--  UInt32 PrevAlignBits;
--  UInt32 PrevAlignCount;
--
--  bool TablesRead;
--
--  CPpmd7 _ppmd;
--  int PpmEscChar;
--  bool PpmError;
--  
--  HRESULT WriteDataToStream(const Byte *data, UInt32 size);
--  HRESULT WriteData(const Byte *data, UInt32 size);
--  HRESULT WriteArea(UInt32 startPtr, UInt32 endPtr);
--  void ExecuteFilter(int tempFilterIndex, NVm::CBlockRef &outBlockRef);
--  HRESULT WriteBuf();
--
--  void InitFilters();
--  bool AddVmCode(UInt32 firstByte, UInt32 codeSize);
--  bool ReadVmCodeLZ();
--  bool ReadVmCodePPM();
--  
--  UInt32 ReadBits(int numBits);
--
--  HRESULT InitPPM();
--  int DecodePpmSymbol();
--  HRESULT DecodePPM(Int32 num, bool &keepDecompressing);
--
--  HRESULT ReadTables(bool &keepDecompressing);
--  HRESULT ReadEndOfBlock(bool &keepDecompressing);
--  HRESULT DecodeLZ(bool &keepDecompressing);
--  HRESULT CodeReal(ICompressProgressInfo *progress);
--public:
--  CDecoder();
--  ~CDecoder();
--
--  MY_UNKNOWN_IMP1(ICompressSetDecoderProperties2)
--
--  void ReleaseStreams()
--  {
--    _outStream.Release();
--    m_InBitStream.bitDecoder.ReleaseStream();
--  }
--
--  STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
--      const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
--
--  STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size);
--
--  void CopyBlock(UInt32 distance, UInt32 len)
--  {
--    _lzSize += len;
--    UInt32 pos = (_winPos - distance - 1) & kWindowMask;
--    Byte *window = _window;
--    UInt32 winPos = _winPos;
--    if (kWindowSize - winPos > len && kWindowSize - pos > len)
--    {
--      const Byte *src = window + pos;
--      Byte *dest = window + winPos;
--      _winPos += len;
--      do
--        *dest++ = *src++;
--      while(--len != 0);
--      return;
--    }
--    do
--    {
--      window[winPos] = window[pos];
--      winPos = (winPos + 1) & kWindowMask;
--      pos = (pos + 1) & kWindowMask;
--    }
--    while(--len != 0);
--    _winPos = winPos;
--  }
--  
--  void PutByte(Byte b)
--  {
--    _window[_winPos] = b;
--    _winPos = (_winPos + 1) & kWindowMask;
--    _lzSize++;
--  }
--
--
--};
--
--}}
--
--#endif
-diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar3Vm.cpp p7zip-libre_9.20.1/CPP/7zip/Compress/Rar3Vm.cpp
---- p7zip_9.20.1/CPP/7zip/Compress/Rar3Vm.cpp	2010-10-20 01:56:07.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar3Vm.cpp	1969-12-31 21:00:00.000000000 -0300
-@@ -1,1091 +0,0 @@
--// Rar3Vm.cpp
--// According to unRAR license, this code may not be used to develop
--// a program that creates RAR archives
--
--/*
--Note:
--  Due to performance considerations Rar VM may set Flags C incorrectly
--  for some operands (SHL x, 0, ... ).
--  Check implementation of concrete VM command
--  to see if it sets flags right.
--*/
--
--#include "StdAfx.h"
--
--#include "../../../C/7zCrc.h"
--#include "../../../C/Alloc.h"
--
--#include "Rar3Vm.h"
--
--namespace NCompress {
--namespace NRar3 {
--
--UInt32 CMemBitDecoder::ReadBits(int numBits)
--{
--  UInt32 res = 0;
--  for (;;)
--  {
--    Byte b = _bitPos < _bitSize ? _data[_bitPos >> 3] : 0;
--    int avail = (int)(8 - (_bitPos & 7));
--    if (numBits <= avail)
--    {
--      _bitPos += numBits;
--      return res | (b >> (avail - numBits)) & ((1 << numBits) - 1);
--    }
--    numBits -= avail;
--    res |= (UInt32)(b & ((1 << avail) - 1)) << numBits;
--    _bitPos += avail;
--  }
--}
--
--UInt32 CMemBitDecoder::ReadBit() { return ReadBits(1); }
--
--namespace NVm {
--
--static const UInt32 kStackRegIndex = kNumRegs - 1;
--
--static const UInt32 FLAG_C = 1;
--static const UInt32 FLAG_Z = 2;
--static const UInt32 FLAG_S = 0x80000000;
--
--static const Byte CF_OP0 = 0;
--static const Byte CF_OP1 = 1;
--static const Byte CF_OP2 = 2;
--static const Byte CF_OPMASK = 3;
--static const Byte CF_BYTEMODE = 4;
--static const Byte CF_JUMP = 8;
--static const Byte CF_PROC = 16;
--static const Byte CF_USEFLAGS = 32;
--static const Byte CF_CHFLAGS = 64;
--
--static Byte kCmdFlags[]=
--{
--  /* CMD_MOV   */ CF_OP2 | CF_BYTEMODE,
--  /* CMD_CMP   */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS,
--  /* CMD_ADD   */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS,
--  /* CMD_SUB   */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS,
--  /* CMD_JZ    */ CF_OP1 | CF_JUMP | CF_USEFLAGS,
--  /* CMD_JNZ   */ CF_OP1 | CF_JUMP | CF_USEFLAGS,
--  /* CMD_INC   */ CF_OP1 | CF_BYTEMODE | CF_CHFLAGS,
--  /* CMD_DEC   */ CF_OP1 | CF_BYTEMODE | CF_CHFLAGS,
--  /* CMD_JMP   */ CF_OP1 | CF_JUMP,
--  /* CMD_XOR   */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS,
--  /* CMD_AND   */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS,
--  /* CMD_OR    */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS,
--  /* CMD_TEST  */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS,
--  /* CMD_JS    */ CF_OP1 | CF_JUMP | CF_USEFLAGS,
--  /* CMD_JNS   */ CF_OP1 | CF_JUMP | CF_USEFLAGS,
--  /* CMD_JB    */ CF_OP1 | CF_JUMP | CF_USEFLAGS,
--  /* CMD_JBE   */ CF_OP1 | CF_JUMP | CF_USEFLAGS,
--  /* CMD_JA    */ CF_OP1 | CF_JUMP | CF_USEFLAGS,
--  /* CMD_JAE   */ CF_OP1 | CF_JUMP | CF_USEFLAGS,
--  /* CMD_PUSH  */ CF_OP1,
--  /* CMD_POP   */ CF_OP1,
--  /* CMD_CALL  */ CF_OP1 | CF_PROC,
--  /* CMD_RET   */ CF_OP0 | CF_PROC,
--  /* CMD_NOT   */ CF_OP1 | CF_BYTEMODE,
--  /* CMD_SHL   */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS,
--  /* CMD_SHR   */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS,
--  /* CMD_SAR   */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS,
--  /* CMD_NEG   */ CF_OP1 | CF_BYTEMODE | CF_CHFLAGS,
--  /* CMD_PUSHA */ CF_OP0,
--  /* CMD_POPA  */ CF_OP0,
--  /* CMD_PUSHF */ CF_OP0 | CF_USEFLAGS,
--  /* CMD_POPF  */ CF_OP0 | CF_CHFLAGS,
--  /* CMD_MOVZX */ CF_OP2,
--  /* CMD_MOVSX */ CF_OP2,
--  /* CMD_XCHG  */ CF_OP2 | CF_BYTEMODE,
--  /* CMD_MUL   */ CF_OP2 | CF_BYTEMODE,
--  /* CMD_DIV   */ CF_OP2 | CF_BYTEMODE,
--  /* CMD_ADC   */ CF_OP2 | CF_BYTEMODE | CF_USEFLAGS | CF_CHFLAGS ,
--  /* CMD_SBB   */ CF_OP2 | CF_BYTEMODE | CF_USEFLAGS | CF_CHFLAGS ,
--  /* CMD_PRINT */ CF_OP0
--};
--
--CVm::CVm(): Mem(NULL) {}
--
--bool CVm::Create()
--{
--  if (Mem == NULL)
--    Mem = (Byte *)::MyAlloc(kSpaceSize + 4);
--  return (Mem != NULL);
--}
--
--CVm::~CVm()
--{
--  ::MyFree(Mem);
--}
--
--// CVm::Execute can change CProgram object: it clears progarm if VM returns error.
--
--bool CVm::Execute(CProgram *prg, const CProgramInitState *initState,
--    CBlockRef &outBlockRef, CRecordVector<Byte> &outGlobalData)
--{
--  memcpy(R, initState->InitR, sizeof(initState->InitR));
--  R[kStackRegIndex] = kSpaceSize;
--  R[kNumRegs] = 0;
--  Flags = 0;
--
--  UInt32 globalSize = MyMin((UInt32)initState->GlobalData.Size(), kGlobalSize);
--  if (globalSize != 0)
--    memcpy(Mem + kGlobalOffset, &initState->GlobalData[0], globalSize);
--  UInt32 staticSize = MyMin((UInt32)prg->StaticData.Size(), kGlobalSize - globalSize);
--  if (staticSize != 0)
--    memcpy(Mem + kGlobalOffset + globalSize, &prg->StaticData[0], staticSize);
--
--  bool res = true;
--  #ifdef RARVM_STANDARD_FILTERS
--  if (prg->StandardFilterIndex >= 0)
--    ExecuteStandardFilter(prg->StandardFilterIndex);
--  else
--  #endif
--  {
--    res = ExecuteCode(prg);
--    if (!res)
--      prg->Commands[0].OpCode = CMD_RET;
--  }
--  UInt32 newBlockPos = GetFixedGlobalValue32(NGlobalOffset::kBlockPos) & kSpaceMask;
--  UInt32 newBlockSize = GetFixedGlobalValue32(NGlobalOffset::kBlockSize) & kSpaceMask;
--  if (newBlockPos + newBlockSize >= kSpaceSize)
--    newBlockPos = newBlockSize = 0;
--  outBlockRef.Offset = newBlockPos;
--  outBlockRef.Size = newBlockSize;
--
--  outGlobalData.Clear();
--  UInt32 dataSize = GetFixedGlobalValue32(NGlobalOffset::kGlobalMemOutSize);
--  dataSize = MyMin(dataSize, kGlobalSize - kFixedGlobalSize);
--  if (dataSize != 0)
--  {
--    dataSize += kFixedGlobalSize;
--    outGlobalData.Reserve(dataSize);
--    for (UInt32 i = 0; i < dataSize; i++)
--      outGlobalData.Add(Mem[kGlobalOffset + i]);
--  }
--  return res;
--}
--
--
--#define SET_IP(IP) \
--  if ((IP) >= numCommands) return true; \
--  if (--maxOpCount <= 0) return false; \
--  cmd = commands + (IP);
--
--#define GET_FLAG_S_B(res) (((res) & 0x80) ? FLAG_S : 0)
--#define SET_IP_OP1 { UInt32 val = GetOperand32(&cmd->Op1); SET_IP(val); }
--#define FLAGS_UPDATE_SZ Flags = res == 0 ? FLAG_Z : res & FLAG_S
--#define FLAGS_UPDATE_SZ_B Flags = (res & 0xFF) == 0 ? FLAG_Z : GET_FLAG_S_B(res)
--
--UInt32 CVm::GetOperand32(const COperand *op) const
--{
--  switch(op->Type)
--  {
--    case OP_TYPE_REG: return R[op->Data];
--    case OP_TYPE_REGMEM: return GetValue32(&Mem[(op->Base + R[op->Data]) & kSpaceMask]);
--    default: return op->Data;
--  }
--}
--
--void CVm::SetOperand32(const COperand *op, UInt32 val)
--{
--  switch(op->Type)
--  {
--    case OP_TYPE_REG: R[op->Data] = val; return;
--    case OP_TYPE_REGMEM: SetValue32(&Mem[(op->Base + R[op->Data]) & kSpaceMask], val); return;
--  }
--}
--
--Byte CVm::GetOperand8(const COperand *op) const
--{
--  switch(op->Type)
--  {
--    case OP_TYPE_REG: return (Byte)R[op->Data];
--    case OP_TYPE_REGMEM: return Mem[(op->Base + R[op->Data]) & kSpaceMask];;
--    default: return (Byte)op->Data;
--  }
--}
--
--void CVm::SetOperand8(const COperand *op, Byte val)
--{
--  switch(op->Type)
--  {
--    case OP_TYPE_REG: R[op->Data] = (R[op->Data] & 0xFFFFFF00) | val; return;
--    case OP_TYPE_REGMEM: Mem[(op->Base + R[op->Data]) & kSpaceMask] = val; return;
--  }
--}
--
--UInt32 CVm::GetOperand(bool byteMode, const COperand *op) const
--{
--  if (byteMode)
--    return GetOperand8(op);
--  return GetOperand32(op);
--}
--
--void CVm::SetOperand(bool byteMode, const COperand *op, UInt32 val)
--{
--  if (byteMode)
--    SetOperand8(op, (Byte)(val & 0xFF));
--  else
--    SetOperand32(op, val);
--}
--
--bool CVm::ExecuteCode(const CProgram *prg)
--{
--  Int32 maxOpCount = 25000000;
--  const CCommand *commands = &prg->Commands[0];
--  const CCommand *cmd = commands;
--  UInt32 numCommands = prg->Commands.Size();
--  for (;;)
--  {
--    switch(cmd->OpCode)
--    {
--      #ifndef RARVM_NO_VM
--      
--      case CMD_MOV:
--        SetOperand32(&cmd->Op1, GetOperand32(&cmd->Op2));
--        break;
--      case CMD_MOVB:
--        SetOperand8(&cmd->Op1, GetOperand8(&cmd->Op2));
--        break;
--      case CMD_CMP:
--        {
--          UInt32 v1 = GetOperand32(&cmd->Op1);
--          UInt32 res = v1 - GetOperand32(&cmd->Op2);
--          Flags = res == 0 ? FLAG_Z : (res > v1) | (res & FLAG_S);
--        }
--        break;
--      case CMD_CMPB:
--        {
--          Byte v1 = GetOperand8(&cmd->Op1);
--          Byte res = v1 - GetOperand8(&cmd->Op2);
--          res &= 0xFF;
--          Flags = res == 0 ? FLAG_Z : (res > v1) | GET_FLAG_S_B(res);
--        }
--        break;
--      case CMD_ADD:
--        {
--          UInt32 v1 = GetOperand32(&cmd->Op1);
--          UInt32 res = v1 + GetOperand32(&cmd->Op2);
--          SetOperand32(&cmd->Op1, res);
--          Flags = (res < v1) | (res == 0 ? FLAG_Z : (res & FLAG_S));
--        }
--        break;
--      case CMD_ADDB:
--        {
--          Byte v1 = GetOperand8(&cmd->Op1);
--          Byte res = v1 + GetOperand8(&cmd->Op2);
--          res &= 0xFF;
--          SetOperand8(&cmd->Op1, (Byte)res);
--          Flags = (res < v1) | (res == 0 ? FLAG_Z : GET_FLAG_S_B(res));
--        }
--        break;
--      case CMD_ADC:
--        {
--          UInt32 v1 = GetOperand(cmd->ByteMode, &cmd->Op1);
--          UInt32 FC = (Flags & FLAG_C);
--          UInt32 res = v1 + GetOperand(cmd->ByteMode, &cmd->Op2) + FC;
--          if (cmd->ByteMode)
--            res &= 0xFF;
--          SetOperand(cmd->ByteMode, &cmd->Op1, res);
--          Flags = (res < v1 || res == v1 && FC) | (res == 0 ? FLAG_Z : (res & FLAG_S));
--        }
--        break;
--      case CMD_SUB:
--        {
--          UInt32 v1 = GetOperand32(&cmd->Op1);
--          UInt32 res = v1 - GetOperand32(&cmd->Op2);
--          SetOperand32(&cmd->Op1, res);
--          Flags = res == 0 ? FLAG_Z : (res > v1) | (res & FLAG_S);
--        }
--        break;
--      case CMD_SUBB:
--        {
--          UInt32 v1 = GetOperand8(&cmd->Op1);
--          UInt32 res = v1 - GetOperand8(&cmd->Op2);
--          SetOperand8(&cmd->Op1, (Byte)res);
--          Flags = res == 0 ? FLAG_Z : (res > v1) | (res & FLAG_S);
--        }
--        break;
--      case CMD_SBB:
--        {
--          UInt32 v1 = GetOperand(cmd->ByteMode, &cmd->Op1);
--          UInt32 FC = (Flags & FLAG_C);
--          UInt32 res = v1 - GetOperand(cmd->ByteMode, &cmd->Op2) - FC;
--          // Flags = res == 0 ? FLAG_Z : (res > v1 || res == v1 && FC) | (res & FLAG_S);
--          if (cmd->ByteMode)
--            res &= 0xFF;
--          SetOperand(cmd->ByteMode, &cmd->Op1, res);
--          Flags = (res > v1 || res == v1 && FC) | (res == 0 ? FLAG_Z : (res & FLAG_S));
--        }
--        break;
--      case CMD_INC:
--        {
--          UInt32 res = GetOperand32(&cmd->Op1) + 1;
--          SetOperand32(&cmd->Op1, res);
--          FLAGS_UPDATE_SZ;
--        }
--        break;
--      case CMD_INCB:
--        {
--          Byte res = GetOperand8(&cmd->Op1) + 1;
--          SetOperand8(&cmd->Op1, res);;
--          FLAGS_UPDATE_SZ_B;
--        }
--        break;
--      case CMD_DEC:
--        {
--          UInt32 res = GetOperand32(&cmd->Op1) - 1;
--          SetOperand32(&cmd->Op1, res);
--          FLAGS_UPDATE_SZ;
--        }
--        break;
--      case CMD_DECB:
--        {
--          Byte res = GetOperand8(&cmd->Op1) - 1;
--          SetOperand8(&cmd->Op1, res);;
--          FLAGS_UPDATE_SZ_B;
--        }
--        break;
--      case CMD_XOR:
--        {
--          UInt32 res = GetOperand32(&cmd->Op1) ^ GetOperand32(&cmd->Op2);
--          SetOperand32(&cmd->Op1, res);
--          FLAGS_UPDATE_SZ;
--        }
--        break;
--      case CMD_XORB:
--        {
--          Byte res = GetOperand8(&cmd->Op1) ^ GetOperand8(&cmd->Op2);
--          SetOperand8(&cmd->Op1, res);
--          FLAGS_UPDATE_SZ_B;
--        }
--        break;
--      case CMD_AND:
--        {
--          UInt32 res = GetOperand32(&cmd->Op1) & GetOperand32(&cmd->Op2);
--          SetOperand32(&cmd->Op1, res);
--          FLAGS_UPDATE_SZ;
--        }
--        break;
--      case CMD_ANDB:
--        {
--          Byte res = GetOperand8(&cmd->Op1) & GetOperand8(&cmd->Op2);
--          SetOperand8(&cmd->Op1, res);
--          FLAGS_UPDATE_SZ_B;
--        }
--        break;
--      case CMD_OR:
--        {
--          UInt32 res = GetOperand32(&cmd->Op1) | GetOperand32(&cmd->Op2);
--          SetOperand32(&cmd->Op1, res);
--          FLAGS_UPDATE_SZ;
--        }
--        break;
--      case CMD_ORB:
--        {
--          Byte res = GetOperand8(&cmd->Op1) | GetOperand8(&cmd->Op2);
--          SetOperand8(&cmd->Op1, res);
--          FLAGS_UPDATE_SZ_B;
--        }
--        break;
--      case CMD_TEST:
--        {
--          UInt32 res = GetOperand32(&cmd->Op1) & GetOperand32(&cmd->Op2);
--          FLAGS_UPDATE_SZ;
--        }
--        break;
--      case CMD_TESTB:
--        {
--          Byte res = GetOperand8(&cmd->Op1) & GetOperand8(&cmd->Op2);
--          FLAGS_UPDATE_SZ_B;
--        }
--        break;
--      case CMD_NOT:
--        SetOperand(cmd->ByteMode, &cmd->Op1, ~GetOperand(cmd->ByteMode, &cmd->Op1));
--        break;
--      case CMD_NEG:
--        {
--          UInt32 res = 0 - GetOperand32(&cmd->Op1);
--          SetOperand32(&cmd->Op1, res);
--          Flags = res == 0 ? FLAG_Z : FLAG_C | (res & FLAG_S);
--        }
--        break;
--      case CMD_NEGB:
--        {
--          Byte res = (Byte)(0 - GetOperand8(&cmd->Op1));
--          SetOperand8(&cmd->Op1, res);
--          Flags = res == 0 ? FLAG_Z : FLAG_C | GET_FLAG_S_B(res);
--        }
--        break;
--
--      case CMD_SHL:
--        {
--          UInt32 v1 = GetOperand32(&cmd->Op1);
--          int v2 = (int)GetOperand32(&cmd->Op2);
--          UInt32 res = v1 << v2;
--          SetOperand32(&cmd->Op1, res);
--          Flags = (res == 0 ? FLAG_Z : (res & FLAG_S)) | ((v1 << (v2 - 1)) & 0x80000000 ? FLAG_C : 0);
--        }
--        break;
--      case CMD_SHLB:
--        {
--          Byte v1 = GetOperand8(&cmd->Op1);
--          int v2 = (int)GetOperand8(&cmd->Op2);
--          Byte res = (Byte)(v1 << v2);
--          SetOperand8(&cmd->Op1, res);
--          Flags = (res == 0 ? FLAG_Z : GET_FLAG_S_B(res)) | ((v1 << (v2 - 1)) & 0x80 ? FLAG_C : 0);
--        }
--        break;
--      case CMD_SHR:
--        {
--          UInt32 v1 = GetOperand32(&cmd->Op1);
--          int v2 = (int)GetOperand32(&cmd->Op2);
--          UInt32 res = v1 >> v2;
--          SetOperand32(&cmd->Op1, res);
--          Flags = (res == 0 ? FLAG_Z : (res & FLAG_S)) | ((v1 >> (v2 - 1)) & FLAG_C);
--        }
--        break;
--      case CMD_SHRB:
--        {
--          Byte v1 = GetOperand8(&cmd->Op1);
--          int v2 = (int)GetOperand8(&cmd->Op2);
--          Byte res = (Byte)(v1 >> v2);
--          SetOperand8(&cmd->Op1, res);
--          Flags = (res == 0 ? FLAG_Z : GET_FLAG_S_B(res)) | ((v1 >> (v2 - 1)) & FLAG_C);
--        }
--        break;
--      case CMD_SAR:
--        {
--          UInt32 v1 = GetOperand32(&cmd->Op1);
--          int v2 = (int)GetOperand32(&cmd->Op2);
--          UInt32 res = UInt32(((Int32)v1) >> v2);
--          SetOperand32(&cmd->Op1, res);
--          Flags= (res == 0 ? FLAG_Z : (res & FLAG_S)) | ((v1 >> (v2 - 1)) & FLAG_C);
--        }
--        break;
--      case CMD_SARB:
--        {
--          Byte v1 = GetOperand8(&cmd->Op1);
--          int v2 = (int)GetOperand8(&cmd->Op2);
--          Byte res = (Byte)(((signed char)v1) >> v2);
--          SetOperand8(&cmd->Op1, res);
--          Flags= (res == 0 ? FLAG_Z : GET_FLAG_S_B(res)) | ((v1 >> (v2 - 1)) & FLAG_C);
--        }
--        break;
--
--      case CMD_JMP:
--        SET_IP_OP1;
--        continue;
--      case CMD_JZ:
--        if ((Flags & FLAG_Z) != 0)
--        {
--          SET_IP_OP1;
--          continue;
--        }
--        break;
--      case CMD_JNZ:
--        if ((Flags & FLAG_Z) == 0)
--        {
--          SET_IP_OP1;
--          continue;
--        }
--        break;
--      case CMD_JS:
--        if ((Flags & FLAG_S) != 0)
--        {
--          SET_IP_OP1;
--          continue;
--        }
--        break;
--      case CMD_JNS:
--        if ((Flags & FLAG_S) == 0)
--        {
--          SET_IP_OP1;
--          continue;
--        }
--        break;
--      case CMD_JB:
--        if ((Flags & FLAG_C) != 0)
--        {
--          SET_IP_OP1;
--          continue;
--        }
--        break;
--      case CMD_JBE:
--        if ((Flags & (FLAG_C | FLAG_Z)) != 0)
--        {
--          SET_IP_OP1;
--          continue;
--        }
--        break;
--      case CMD_JA:
--        if ((Flags & (FLAG_C | FLAG_Z)) == 0)
--        {
--          SET_IP_OP1;
--          continue;
--        }
--        break;
--      case CMD_JAE:
--        if ((Flags & FLAG_C) == 0)
--        {
--          SET_IP_OP1;
--          continue;
--        }
--        break;
--      
--      case CMD_PUSH:
--        R[kStackRegIndex] -= 4;
--        SetValue32(&Mem[R[kStackRegIndex] & kSpaceMask], GetOperand32(&cmd->Op1));
--        break;
--      case CMD_POP:
--        SetOperand32(&cmd->Op1, GetValue32(&Mem[R[kStackRegIndex] & kSpaceMask]));
--        R[kStackRegIndex] += 4;
--        break;
--      case CMD_CALL:
--        R[kStackRegIndex] -= 4;
--        SetValue32(&Mem[R[kStackRegIndex] & kSpaceMask], (UInt32)(cmd - commands + 1));
--        SET_IP_OP1;
--        continue;
--
--      case CMD_PUSHA:
--        {
--          for (UInt32 i = 0, SP = R[kStackRegIndex] - 4; i < kNumRegs; i++, SP -= 4)
--            SetValue32(&Mem[SP & kSpaceMask], R[i]);
--          R[kStackRegIndex] -= kNumRegs * 4;
--        }
--        break;
--      case CMD_POPA:
--        {
--          for (UInt32 i = 0, SP = R[kStackRegIndex]; i < kNumRegs; i++, SP += 4)
--            R[kStackRegIndex - i] = GetValue32(&Mem[SP & kSpaceMask]);
--        }
--        break;
--      case CMD_PUSHF:
--        R[kStackRegIndex] -= 4;
--        SetValue32(&Mem[R[kStackRegIndex]&kSpaceMask], Flags);
--        break;
--      case CMD_POPF:
--        Flags = GetValue32(&Mem[R[kStackRegIndex] & kSpaceMask]);
--        R[kStackRegIndex] += 4;
--        break;
--      
--      case CMD_MOVZX:
--        SetOperand32(&cmd->Op1, GetOperand8(&cmd->Op2));
--        break;
--      case CMD_MOVSX:
--        SetOperand32(&cmd->Op1, (UInt32)(Int32)(signed char)GetOperand8(&cmd->Op2));
--        break;
--      case CMD_XCHG:
--        {
--          UInt32 v1 = GetOperand(cmd->ByteMode, &cmd->Op1);
--          SetOperand(cmd->ByteMode, &cmd->Op1, GetOperand(cmd->ByteMode, &cmd->Op2));
--          SetOperand(cmd->ByteMode, &cmd->Op2, v1);
--        }
--        break;
--      case CMD_MUL:
--        {
--          UInt32 res = GetOperand32(&cmd->Op1) * GetOperand32(&cmd->Op2);
--          SetOperand32(&cmd->Op1, res);
--        }
--        break;
--      case CMD_MULB:
--        {
--          Byte res = GetOperand8(&cmd->Op1) * GetOperand8(&cmd->Op2);
--          SetOperand8(&cmd->Op1, res);
--        }
--        break;
--      case CMD_DIV:
--        {
--          UInt32 divider = GetOperand(cmd->ByteMode, &cmd->Op2);
--          if (divider != 0)
--          {
--            UInt32 res = GetOperand(cmd->ByteMode, &cmd->Op1) / divider;
--            SetOperand(cmd->ByteMode, &cmd->Op1, res);
--          }
--        }
--        break;
--      
--      #endif
--      
--      case CMD_RET:
--        {
--          if (R[kStackRegIndex] >= kSpaceSize)
--            return true;
--          UInt32 ip = GetValue32(&Mem[R[kStackRegIndex] & kSpaceMask]);
--          SET_IP(ip);
--          R[kStackRegIndex] += 4;
--          continue;
--        }
--      case CMD_PRINT:
--        break;
--    }
--    cmd++;
--    --maxOpCount;
--  }
--}
--
--
--//////////////////////////////////////////////////////
--// Read program
--
--UInt32 ReadEncodedUInt32(CMemBitDecoder &inp)
--{
--  switch(inp.ReadBits(2))
--  {
--    case 0:
--      return inp.ReadBits(4);
--    case 1:
--    {
--      UInt32 v = inp.ReadBits(4);
--      if (v == 0)
--        return 0xFFFFFF00 | inp.ReadBits(8);
--      else
--        return (v << 4) | inp.ReadBits(4);
--    }
--    case 2:
--      return inp.ReadBits(16);
--    default:
--      return inp.ReadBits(32);
--  }
--}
--
--void CVm::DecodeArg(CMemBitDecoder &inp, COperand &op, bool byteMode)
--{
--  if (inp.ReadBit())
--  {
--    op.Type = OP_TYPE_REG;
--    op.Data = inp.ReadBits(kNumRegBits);
--  }
--  else if (inp.ReadBit() == 0)
--  {
--    op.Type = OP_TYPE_INT;
--    if (byteMode)
--      op.Data = inp.ReadBits(8);
--    else
--      op.Data = ReadEncodedUInt32(inp);
--  }
--  else
--  {
--    op.Type = OP_TYPE_REGMEM;
--    if (inp.ReadBit() == 0)
--    {
--      op.Data = inp.ReadBits(kNumRegBits);
--      op.Base = 0;
--    }
--    else
--    {
--      if (inp.ReadBit() == 0)
--        op.Data = inp.ReadBits(kNumRegBits);
--      else
--        op.Data = kNumRegs;
--      op.Base = ReadEncodedUInt32(inp);
--    }
--  }
--}
--
--void CVm::ReadVmProgram(const Byte *code, UInt32 codeSize, CProgram *prg)
--{
--  CMemBitDecoder inp;
--  inp.Init(code, codeSize);
--
--  prg->StaticData.Clear();
--  if (inp.ReadBit())
--  {
--    UInt32 dataSize = ReadEncodedUInt32(inp) + 1;
--    for (UInt32 i = 0; inp.Avail() && i < dataSize; i++)
--      prg->StaticData.Add((Byte)inp.ReadBits(8));
--  }
--  while (inp.Avail())
--  {
--    prg->Commands.Add(CCommand());
--    CCommand *cmd = &prg->Commands.Back();
--    if (inp.ReadBit() == 0)
--      cmd->OpCode = (ECommand)inp.ReadBits(3);
--    else
--      cmd->OpCode = (ECommand)(8 + inp.ReadBits(5));
--    if (kCmdFlags[cmd->OpCode] & CF_BYTEMODE)
--      cmd->ByteMode = (inp.ReadBit()) ? true : false;
--    else
--      cmd->ByteMode = 0;
--    int opNum = (kCmdFlags[cmd->OpCode] & CF_OPMASK);
--    if (opNum > 0)
--    {
--      DecodeArg(inp, cmd->Op1, cmd->ByteMode);
--      if (opNum == 2)
--        DecodeArg(inp, cmd->Op2, cmd->ByteMode);
--      else
--      {
--        if (cmd->Op1.Type == OP_TYPE_INT && (kCmdFlags[cmd->OpCode] & (CF_JUMP | CF_PROC)))
--        {
--          int Distance = cmd->Op1.Data;
--          if (Distance >= 256)
--            Distance -= 256;
--          else
--          {
--            if (Distance >= 136)
--              Distance -= 264;
--            else if (Distance >= 16)
--              Distance -= 8;
--            else if (Distance >= 8)
--              Distance -= 16;
--            Distance += prg->Commands.Size() - 1;
--          }
--          cmd->Op1.Data = Distance;
--        }
--      }
--    }
--    if (cmd->ByteMode)
--    {
--      switch (cmd->OpCode)
--      {
--        case CMD_MOV: cmd->OpCode = CMD_MOVB; break;
--        case CMD_CMP: cmd->OpCode = CMD_CMPB; break;
--        case CMD_ADD: cmd->OpCode = CMD_ADDB; break;
--        case CMD_SUB: cmd->OpCode = CMD_SUBB; break;
--        case CMD_INC: cmd->OpCode = CMD_INCB; break;
--        case CMD_DEC: cmd->OpCode = CMD_DECB; break;
--        case CMD_XOR: cmd->OpCode = CMD_XORB; break;
--        case CMD_AND: cmd->OpCode = CMD_ANDB; break;
--        case CMD_OR: cmd->OpCode = CMD_ORB; break;
--        case CMD_TEST: cmd->OpCode = CMD_TESTB; break;
--        case CMD_NEG: cmd->OpCode = CMD_NEGB; break;
--        case CMD_SHL: cmd->OpCode = CMD_SHLB; break;
--        case CMD_SHR: cmd->OpCode = CMD_SHRB; break;
--        case CMD_SAR: cmd->OpCode = CMD_SARB; break;
--        case CMD_MUL: cmd->OpCode = CMD_MULB; break;
--      }
--    }
--  }
--}
--
--#ifdef RARVM_STANDARD_FILTERS
--
--enum EStandardFilter
--{
--  SF_E8,
--  SF_E8E9,
--  SF_ITANIUM,
--  SF_RGB,
--  SF_AUDIO,
--  SF_DELTA,
--  SF_UPCASE
--};
--
--struct StandardFilterSignature
--{
--  UInt32 Length;
--  UInt32 CRC;
--  EStandardFilter Type;
--}
--kStdFilters[]=
--{
--  {  53, 0xad576887, SF_E8 },
--  {  57, 0x3cd7e57e, SF_E8E9 },
--  { 120, 0x3769893f, SF_ITANIUM },
--  {  29, 0x0e06077d, SF_DELTA },
--  { 149, 0x1c2c5dc8, SF_RGB },
--  { 216, 0xbc85e701, SF_AUDIO },
--  {  40, 0x46b9c560, SF_UPCASE }
--};
--
--static int FindStandardFilter(const Byte *code, UInt32 codeSize)
--{
--  UInt32 crc = CrcCalc(code, codeSize);
--  for (int i = 0; i < sizeof(kStdFilters) / sizeof(kStdFilters[0]); i++)
--  {
--    StandardFilterSignature &sfs = kStdFilters[i];
--    if (sfs.CRC == crc && sfs.Length == codeSize)
--      return i;
--  }
--  return -1;
--}
--
--#endif
--
--void CVm::PrepareProgram(const Byte *code, UInt32 codeSize, CProgram *prg)
--{
--  Byte xorSum = 0;
--  for (UInt32 i = 1; i < codeSize; i++)
--    xorSum ^= code[i];
--
--  prg->Commands.Clear();
--  #ifdef RARVM_STANDARD_FILTERS
--  prg->StandardFilterIndex = -1;
--  #endif
--
--  if (xorSum == code[0] && codeSize > 0)
--  {
--    #ifdef RARVM_STANDARD_FILTERS
--    prg->StandardFilterIndex = FindStandardFilter(code, codeSize);
--    if (prg->StandardFilterIndex >= 0)
--      return;
--    #endif
--    // 1 byte for checksum
--    ReadVmProgram(code + 1, codeSize - 1, prg);
--  }
--  prg->Commands.Add(CCommand());
--  CCommand *cmd = &prg->Commands.Back();
--  cmd->OpCode = CMD_RET;
--}
--
--void CVm::SetMemory(UInt32 pos, const Byte *data, UInt32 dataSize)
--{
--  if (pos < kSpaceSize && data != Mem + pos)
--    memmove(Mem + pos, data, MyMin(dataSize, kSpaceSize - pos));
--}
--
--#ifdef RARVM_STANDARD_FILTERS
--
--static void E8E9Decode(Byte *data, UInt32 dataSize, UInt32 fileOffset, bool e9)
--{
--  if (dataSize <= 4)
--    return;
--  dataSize -= 4;
--  const UInt32 kFileSize = 0x1000000;
--  Byte cmpByte2 = (e9 ? 0xE9 : 0xE8);
--  for (UInt32 curPos = 0; curPos < dataSize;)
--  {
--    Byte curByte = *(data++);
--    curPos++;
--    if (curByte == 0xE8 || curByte == cmpByte2)
--    {
--      UInt32 offset = curPos + fileOffset;
--      UInt32 addr = (Int32)GetValue32(data);
--      if (addr < kFileSize)
--        SetValue32(data, addr - offset);
--      else if ((Int32)addr < 0 && (Int32)(addr + offset) >= 0)
--        SetValue32(data, addr + kFileSize);
--      data += 4;
--      curPos += 4;
--    }
--  }
--}
--
--static inline UInt32 ItaniumGetOpType(const Byte *data, int bitPos)
--{
--  return (data[(unsigned int)bitPos >> 3] >> (bitPos & 7)) & 0xF;
--}
--
--
--static void ItaniumDecode(Byte *data, UInt32 dataSize, UInt32 fileOffset)
--{
--  UInt32 curPos = 0;
--  fileOffset >>= 4;
--  while (curPos < dataSize - 21)
--  {
--    int b = (data[0] & 0x1F) - 0x10;
--    if (b >= 0)
--    {
--      static Byte kCmdMasks[16] = {4,4,6,6,0,0,7,7,4,4,0,0,4,4,0,0};
--      Byte cmdMask = kCmdMasks[b];
--      if (cmdMask != 0)
--        for (int i = 0; i < 3; i++)
--          if (cmdMask & (1 << i))
--          {
--            int startPos = i * 41 + 18;
--            if (ItaniumGetOpType(data, startPos + 24) == 5)
--            {
--              const UInt32 kMask = 0xFFFFF;
--              Byte *p = data + ((unsigned int)startPos >> 3);
--              UInt32 bitField =  ((UInt32)p[0]) | ((UInt32)p[1] <<  8) | ((UInt32)p[2] << 16);
--              int inBit = (startPos & 7);
--              UInt32 offset = (bitField >> inBit) & kMask;
--              UInt32 andMask = ~(kMask << inBit);
--              bitField = ((offset - fileOffset) & kMask) << inBit;
--              for (int j = 0; j < 3; j++)
--              {
--                p[j] &= andMask;
--                p[j] |= bitField;
--                andMask >>= 8;
--                bitField >>= 8;
--              }
--            }
--          }
--    }
--    data += 16;
--    curPos += 16;
--    fileOffset++;
--  }
--}
--
--static void DeltaDecode(Byte *data, UInt32 dataSize, UInt32 numChannels)
--{
--  UInt32 srcPos = 0;
--  UInt32 border = dataSize * 2;
--  for (UInt32 curChannel = 0; curChannel < numChannels; curChannel++)
--  {
--    Byte prevByte = 0;
--    for (UInt32 destPos = dataSize + curChannel; destPos < border; destPos += numChannels)
--      data[destPos] = (prevByte = prevByte - data[srcPos++]);
--  }
--}
--
--static void RgbDecode(Byte *srcData, UInt32 dataSize, UInt32 width, UInt32 posR)
--{
--  Byte *destData = srcData + dataSize;
--  const UInt32 numChannels = 3;
--  for (UInt32 curChannel = 0; curChannel < numChannels; curChannel++)
--  {
--    Byte prevByte = 0;
--    
--    for (UInt32 i = curChannel; i < dataSize; i+= numChannels)
--    {
--      unsigned int predicted;
--      if (i < width)
--        predicted = prevByte;
--      else
--      {
--        unsigned int upperLeftByte = destData[i - width];
--        unsigned int upperByte = destData[i - width + 3];
--        predicted = prevByte + upperByte - upperLeftByte;
--        int pa = abs((int)(predicted - prevByte));
--        int pb = abs((int)(predicted - upperByte));
--        int pc = abs((int)(predicted - upperLeftByte));
--        if (pa <= pb && pa <= pc)
--          predicted = prevByte;
--        else
--          if (pb <= pc)
--            predicted = upperByte;
--          else
--            predicted = upperLeftByte;
--      }
--      destData[i] = prevByte = (Byte)(predicted - *(srcData++));
--    }
--  }
--  if (dataSize < 3)
--    return;
--  for (UInt32 i = posR, border = dataSize - 2; i < border; i += 3)
--  {
--    Byte g = destData[i + 1];
--    destData[i] = destData[i] + g;
--    destData[i + 2] = destData[i + 2] + g;
--  }
--}
--
--static void AudioDecode(Byte *srcData, UInt32 dataSize, UInt32 numChannels)
--{
--  Byte *destData = srcData + dataSize;
--  for (UInt32 curChannel = 0; curChannel < numChannels; curChannel++)
--  {
--    UInt32 prevByte = 0, prevDelta = 0, dif[7];
--    Int32 D1 = 0, D2 = 0, D3;
--    Int32 K1 = 0, K2 = 0, K3 = 0;
--    memset(dif, 0, sizeof(dif));
--    
--    for (UInt32 i = curChannel, byteCount = 0; i < dataSize; i += numChannels, byteCount++)
--    {
--      D3 = D2;
--      D2 = prevDelta - D1;
--      D1 = prevDelta;
--      
--      UInt32 predicted = 8 * prevByte + K1 * D1 + K2 * D2 + K3 * D3;
--      predicted = (predicted >> 3) & 0xFF;
--      
--      UInt32 curByte = *(srcData++);
--      
--      predicted -= curByte;
--      destData[i] = (Byte)predicted;
--      prevDelta = (UInt32)(Int32)(signed char)(predicted - prevByte);
--      prevByte = predicted;
--      
--      Int32 D = ((Int32)(signed char)curByte) << 3;
--      
--      dif[0] += abs(D);
--      dif[1] += abs(D - D1);
--      dif[2] += abs(D + D1);
--      dif[3] += abs(D - D2);
--      dif[4] += abs(D + D2);
--      dif[5] += abs(D - D3);
--      dif[6] += abs(D + D3);
--      
--      if ((byteCount & 0x1F) == 0)
--      {
--        UInt32 minDif = dif[0], numMinDif = 0;
--        dif[0] = 0;
--        for (int j = 1; j < sizeof(dif) / sizeof(dif[0]); j++)
--        {
--          if (dif[j] < minDif)
--          {
--            minDif = dif[j];
--            numMinDif = j;
--          }
--          dif[j] = 0;
--        }
--        switch (numMinDif)
--        {
--          case 1: if (K1 >= -16) K1--; break;
--          case 2: if (K1 <   16) K1++; break;
--          case 3: if (K2 >= -16) K2--; break;
--          case 4: if (K2 <   16) K2++; break;
--          case 5: if (K3 >= -16) K3--; break;
--          case 6: if (K3 <   16) K3++; break;
--        }
--      }
--    }
--  }
--}
--
--static UInt32 UpCaseDecode(Byte *data, UInt32 dataSize)
--{
--  UInt32 srcPos = 0, destPos = dataSize;
--  while (srcPos < dataSize)
--  {
--    Byte curByte = data[srcPos++];
--    if (curByte == 2 && (curByte = data[srcPos++]) != 2)
--      curByte -= 32;
--    data[destPos++] = curByte;
--  }
--  return destPos - dataSize;
--}
--
--void CVm::ExecuteStandardFilter(int filterIndex)
--{
--  UInt32 dataSize = R[4];
--  if (dataSize >= kGlobalOffset)
--    return;
--  EStandardFilter filterType = kStdFilters[filterIndex].Type;
--
--  switch (filterType)
--  {
--    case SF_E8:
--    case SF_E8E9:
--      E8E9Decode(Mem, dataSize, R[6], (filterType == SF_E8E9));
--      break;
--    case SF_ITANIUM:
--      ItaniumDecode(Mem, dataSize, R[6]);
--      break;
--    case SF_DELTA:
--      if (dataSize >= kGlobalOffset / 2)
--        break;
--      SetBlockPos(dataSize);
--      DeltaDecode(Mem, dataSize, R[0]);
--      break;
--    case SF_RGB:
--      if (dataSize >= kGlobalOffset / 2)
--        break;
--      {
--        UInt32 width = R[0];
--        if (width <= 3)
--          break;
--        SetBlockPos(dataSize);
--        RgbDecode(Mem, dataSize, width, R[1]);
--      }
--      break;
--    case SF_AUDIO:
--      if (dataSize >= kGlobalOffset / 2)
--        break;
--      SetBlockPos(dataSize);
--      AudioDecode(Mem, dataSize, R[0]);
--      break;
--    case SF_UPCASE:
--      if (dataSize >= kGlobalOffset / 2)
--        break;
--      UInt32 destSize = UpCaseDecode(Mem, dataSize);
--      SetBlockSize(destSize);
--      SetBlockPos(dataSize);
--      break;
--  }
--}
--
--#endif
--
--}}}
-diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar3Vm.h p7zip-libre_9.20.1/CPP/7zip/Compress/Rar3Vm.h
---- p7zip_9.20.1/CPP/7zip/Compress/Rar3Vm.h	2009-02-07 15:06:28.000000000 -0200
-+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar3Vm.h	1969-12-31 21:00:00.000000000 -0300
-@@ -1,179 +0,0 @@
--// Rar3Vm.h
--// According to unRAR license, this code may not be used to develop
--// a program that creates RAR archives
--
--#ifndef __COMPRESS_RAR3_VM_H
--#define __COMPRESS_RAR3_VM_H
--
--#include "../../../C/CpuArch.h"
--
--#include "Common/MyVector.h"
--#include "Common/Types.h"
--
--#define RARVM_STANDARD_FILTERS
--
--namespace NCompress {
--namespace NRar3 {
--
--class CMemBitDecoder
--{
--  const Byte *_data;
--  UInt32 _bitSize;
--  UInt32 _bitPos;
--public:
--  void Init(const Byte *data, UInt32 byteSize)
--  {
--    _data = data;
--    _bitSize = (byteSize << 3);
--    _bitPos = 0;
--  }
--  UInt32 ReadBits(int numBits);
--  UInt32 ReadBit();
--  bool Avail() const { return (_bitPos < _bitSize); }
--};
--
--namespace NVm {
--
--inline UInt32 GetValue32(const void *addr) { return GetUi32(addr); }
--inline void SetValue32(void *addr, UInt32 value) { SetUi32(addr, value); }
--
--UInt32 ReadEncodedUInt32(CMemBitDecoder &inp);
--
--const int kNumRegBits = 3;
--const UInt32 kNumRegs = 1 << kNumRegBits;
--const UInt32 kNumGpRegs = kNumRegs - 1;
--
--const UInt32 kSpaceSize = 0x40000;
--const UInt32 kSpaceMask = kSpaceSize -1;
--const UInt32 kGlobalOffset = 0x3C000;
--const UInt32 kGlobalSize = 0x2000;
--const UInt32 kFixedGlobalSize = 64;
--
--namespace NGlobalOffset
--{
--  const UInt32 kBlockSize = 0x1C;
--  const UInt32 kBlockPos  = 0x20;
--  const UInt32 kExecCount = 0x2C;
--  const UInt32 kGlobalMemOutSize = 0x30;
--}
--
--enum ECommand
--{
--  CMD_MOV,  CMD_CMP,  CMD_ADD,  CMD_SUB,  CMD_JZ,   CMD_JNZ,  CMD_INC,  CMD_DEC,
--  CMD_JMP,  CMD_XOR,  CMD_AND,  CMD_OR,   CMD_TEST, CMD_JS,   CMD_JNS,  CMD_JB,
--  CMD_JBE,  CMD_JA,   CMD_JAE,  CMD_PUSH, CMD_POP,  CMD_CALL, CMD_RET,  CMD_NOT,
--  CMD_SHL,  CMD_SHR,  CMD_SAR,  CMD_NEG,  CMD_PUSHA,CMD_POPA, CMD_PUSHF,CMD_POPF,
--  CMD_MOVZX,CMD_MOVSX,CMD_XCHG, CMD_MUL,  CMD_DIV,  CMD_ADC,  CMD_SBB,  CMD_PRINT,
--
--  CMD_MOVB, CMD_CMPB, CMD_ADDB, CMD_SUBB, CMD_INCB, CMD_DECB,
--  CMD_XORB, CMD_ANDB, CMD_ORB,  CMD_TESTB,CMD_NEGB,
--  CMD_SHLB, CMD_SHRB, CMD_SARB, CMD_MULB
--};
--
--enum EOpType {OP_TYPE_REG, OP_TYPE_INT, OP_TYPE_REGMEM, OP_TYPE_NONE};
--
--// Addr in COperand object can link (point) to CVm object!!!
--
--struct COperand
--{
--  EOpType Type;
--  UInt32 Data;
--  UInt32 Base;
--  COperand(): Type(OP_TYPE_NONE), Data(0), Base(0) {}
--};
--
--struct CCommand
--{
--  ECommand OpCode;
--  bool ByteMode;
--  COperand Op1, Op2;
--};
--
--struct CBlockRef
--{
--  UInt32 Offset;
--  UInt32 Size;
--};
--
--struct CProgram
--{
--  CRecordVector<CCommand> Commands;
--  #ifdef RARVM_STANDARD_FILTERS
--  int StandardFilterIndex;
--  #endif
--  CRecordVector<Byte> StaticData;
--};
--
--struct CProgramInitState
--{
--  UInt32 InitR[kNumGpRegs];
--  CRecordVector<Byte> GlobalData;
--
--  void AllocateEmptyFixedGlobal()
--  {
--    GlobalData.Clear();
--    GlobalData.Reserve(NVm::kFixedGlobalSize);
--    for (UInt32 i = 0; i < NVm::kFixedGlobalSize; i++)
--      GlobalData.Add(0);
--  }
--};
--
--class CVm
--{
--  static UInt32 GetValue(bool byteMode, const void *addr)
--  {
--    if (byteMode)
--      return(*(const Byte *)addr);
--    else
--      return GetUi32(addr);
--  }
--
--  static void SetValue(bool byteMode, void *addr, UInt32 value)
--  {
--    if (byteMode)
--      *(Byte *)addr = (Byte)value;
--    else
--      SetUi32(addr, value);
--  }
--
--  UInt32 GetFixedGlobalValue32(UInt32 globalOffset) { return GetValue(false, &Mem[kGlobalOffset + globalOffset]); }
--
--  void SetBlockSize(UInt32 v) { SetValue(&Mem[kGlobalOffset + NGlobalOffset::kBlockSize], v); }
--  void SetBlockPos(UInt32 v) { SetValue(&Mem[kGlobalOffset + NGlobalOffset::kBlockPos], v); }
--public:
--  static void SetValue(void *addr, UInt32 value) { SetValue(false, addr, value); }
--private:
--  UInt32 GetOperand32(const COperand *op) const;
--  void SetOperand32(const COperand *op, UInt32 val);
--  Byte GetOperand8(const COperand *op) const;
--  void SetOperand8(const COperand *op, Byte val);
--  UInt32 GetOperand(bool byteMode, const COperand *op) const;
--  void SetOperand(bool byteMode, const COperand *op, UInt32 val);
--
--  void DecodeArg(CMemBitDecoder &inp, COperand &op, bool byteMode);
--  
--  bool ExecuteCode(const CProgram *prg);
--  
--  #ifdef RARVM_STANDARD_FILTERS
--  void ExecuteStandardFilter(int filterIndex);
--  #endif
--  
--  Byte *Mem;
--  UInt32 R[kNumRegs + 1]; // R[kNumRegs] = 0 always (speed optimization)
--  UInt32 Flags;
--  void ReadVmProgram(const Byte *code, UInt32 codeSize, CProgram *prg);
--public:
--  CVm();
--  ~CVm();
--  bool Create();
--  void PrepareProgram(const Byte *code, UInt32 codeSize, CProgram *prg);
--  void SetMemory(UInt32 pos, const Byte *data, UInt32 dataSize);
--  bool Execute(CProgram *prg, const CProgramInitState *initState,
--      CBlockRef &outBlockRef, CRecordVector<Byte> &outGlobalData);
--  const Byte *GetDataPointer(UInt32 offset) const { return Mem + offset; }
--
--};
--
--#endif
--
--}}}
-diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/RarCodecsRegister.cpp p7zip-libre_9.20.1/CPP/7zip/Compress/RarCodecsRegister.cpp
---- p7zip_9.20.1/CPP/7zip/Compress/RarCodecsRegister.cpp	2009-02-07 15:06:28.000000000 -0200
-+++ p7zip-libre_9.20.1/CPP/7zip/Compress/RarCodecsRegister.cpp	1969-12-31 21:00:00.000000000 -0300
-@@ -1,26 +0,0 @@
--// RarCodecsRegister.cpp
--
--#include "StdAfx.h"
--
--#include "../Common/RegisterCodec.h"
--
--#include "Rar1Decoder.h"
--#include "Rar2Decoder.h"
--#include "Rar3Decoder.h"
--
--#define CREATE_CODEC(x) static void *CreateCodec ## x() { return (void *)(ICompressCoder *)(new NCompress::NRar ## x::CDecoder); }
--
--CREATE_CODEC(1)
--CREATE_CODEC(2)
--CREATE_CODEC(3)
--
--#define RAR_CODEC(x, name) { CreateCodec ## x, 0, 0x040300 + x, L"Rar" name, 1, false }
--
--static CCodecInfo g_CodecsInfo[] =
--{
--  RAR_CODEC(1, L"1"),
--  RAR_CODEC(2, L"2"),
--  RAR_CODEC(3, L"3"),
--};
--
--REGISTER_CODECS(Rar)
-diff -ruNa p7zip_9.20.1/CPP/7zip/Crypto/Rar20Crypto.cpp p7zip-libre_9.20.1/CPP/7zip/Crypto/Rar20Crypto.cpp
---- p7zip_9.20.1/CPP/7zip/Crypto/Rar20Crypto.cpp	2009-05-30 17:19:19.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Crypto/Rar20Crypto.cpp	1969-12-31 21:00:00.000000000 -0300
-@@ -1,133 +0,0 @@
--// Crypto/Rar20Crypto.cpp
--
--#include "StdAfx.h"
--
--#include "../../../C/7zCrc.h"
--#include "../../../C/CpuArch.h"
--#include "../../../C/RotateDefs.h"
--
--#include "Rar20Crypto.h"
--
--namespace NCrypto {
--namespace NRar20 {
--
--static const int kNumRounds = 32;
--
--static const Byte InitSubstTable[256] = {
--  215, 19,149, 35, 73,197,192,205,249, 28, 16,119, 48,221,  2, 42,
--  232,  1,177,233, 14, 88,219, 25,223,195,244, 90, 87,239,153,137,
--  255,199,147, 70, 92, 66,246, 13,216, 40, 62, 29,217,230, 86,  6,
--   71, 24,171,196,101,113,218,123, 93, 91,163,178,202, 67, 44,235,
--  107,250, 75,234, 49,167,125,211, 83,114,157,144, 32,193,143, 36,
--  158,124,247,187, 89,214,141, 47,121,228, 61,130,213,194,174,251,
--   97,110, 54,229,115, 57,152, 94,105,243,212, 55,209,245, 63, 11,
--  164,200, 31,156, 81,176,227, 21, 76, 99,139,188,127, 17,248, 51,
--  207,120,189,210,  8,226, 41, 72,183,203,135,165,166, 60, 98,  7,
--  122, 38,155,170, 69,172,252,238, 39,134, 59,128,236, 27,240, 80,
--  131,  3, 85,206,145, 79,154,142,159,220,201,133, 74, 64, 20,129,
--  224,185,138,103,173,182, 43, 34,254, 82,198,151,231,180, 58, 10,
--  118, 26,102, 12, 50,132, 22,191,136,111,162,179, 45,  4,148,108,
--  161, 56, 78,126,242,222, 15,175,146, 23, 33,241,181,190, 77,225,
--    0, 46,169,186, 68, 95,237, 65, 53,208,253,168,  9, 18,100, 52,
--  116,184,160, 96,109, 37, 30,106,140,104,150,  5,204,117,112, 84
--};
--
--void CData::UpdateKeys(const Byte *data)
--{
--  for (int i = 0; i < 16; i += 4)
--    for (int j = 0; j < 4; j++)
--      Keys[j] ^= g_CrcTable[data[i + j]];
--}
--
--static void Swap(Byte *b1, Byte *b2)
--{
--  Byte b = *b1;
--  *b1 = *b2;
--  *b2 = b;
--}
--
--void CData::SetPassword(const Byte *password, UInt32 passwordLen)
--{
--  Keys[0] = 0xD3A3B879L;
--  Keys[1] = 0x3F6D12F7L;
--  Keys[2] = 0x7515A235L;
--  Keys[3] = 0xA4E7F123L;
--  
--  Byte psw[256];
--  memset(psw, 0, sizeof(psw));
--  memcpy(psw, password, passwordLen);
--  memcpy(SubstTable, InitSubstTable, sizeof(SubstTable));
--
--  for (UInt32 j = 0; j < 256; j++)
--    for (UInt32 i = 0; i < passwordLen; i += 2)
--    {
--      UInt32 n2 = (Byte)g_CrcTable[(psw[i + 1] + j) & 0xFF];
--      UInt32 n1 = (Byte)g_CrcTable[(psw[i] - j) & 0xFF];
--      for (UInt32 k = 1; (n1 & 0xFF) != n2; n1++, k++)
--        Swap(&SubstTable[n1 & 0xFF], &SubstTable[(n1 + i + k) & 0xFF]);
--    }
--  for (UInt32 i = 0; i < passwordLen; i+= 16)
--    EncryptBlock(&psw[i]);
--}
--
--void CData::CryptBlock(Byte *buf, bool encrypt)
--{
--  Byte inBuf[16];
--  UInt32 A, B, C, D, T, TA, TB;
--
--  A = GetUi32(buf +  0) ^ Keys[0];
--  B = GetUi32(buf +  4) ^ Keys[1];
--  C = GetUi32(buf +  8) ^ Keys[2];
--  D = GetUi32(buf + 12) ^ Keys[3];
--
--  if (!encrypt)
--    memcpy(inBuf, buf, sizeof(inBuf));
--  
--  for (int i = 0; i < kNumRounds; i++)
--  {
--    UInt32 key = Keys[(encrypt ? i : (kNumRounds - 1 - i)) & 3];
--    T = ((C + rotlFixed(D, 11)) ^ key);
--    TA = A ^ SubstLong(T);
--    T = ((D ^ rotlFixed(C, 17)) + key);
--    TB = B ^ SubstLong(T);
--    A = C;
--    B = D;
--    C = TA;
--    D = TB;
--  }
--
--  SetUi32(buf +  0, C ^ Keys[0]);
--  SetUi32(buf +  4, D ^ Keys[1]);
--  SetUi32(buf +  8, A ^ Keys[2]);
--  SetUi32(buf + 12, B ^ Keys[3]);
--
--  UpdateKeys(encrypt ? buf : inBuf);
--}
--
--STDMETHODIMP CDecoder::CryptoSetPassword(const Byte *data, UInt32 size)
--{
--  _cipher.SetPassword(data, size);
--  return S_OK;
--}
--
--STDMETHODIMP CDecoder::Init()
--{
--  return S_OK;
--}
--
--static const UInt32 kBlockSize = 16;
--
--STDMETHODIMP_(UInt32) CDecoder::Filter(Byte *data, UInt32 size)
--{
--  if (size == 0)
--    return 0;
--  if (size < kBlockSize)
--    return kBlockSize;
--  UInt32 i;
--  size -= kBlockSize;
--  for (i = 0; i <= size; i += kBlockSize)
--    _cipher.DecryptBlock(data + i);
--  return i;
--}
--
--}}
-diff -ruNa p7zip_9.20.1/CPP/7zip/Crypto/Rar20Crypto.h p7zip-libre_9.20.1/CPP/7zip/Crypto/Rar20Crypto.h
---- p7zip_9.20.1/CPP/7zip/Crypto/Rar20Crypto.h	2009-02-07 15:07:19.000000000 -0200
-+++ p7zip-libre_9.20.1/CPP/7zip/Crypto/Rar20Crypto.h	1969-12-31 21:00:00.000000000 -0300
-@@ -1,50 +0,0 @@
--// Crypto/Rar20Crypto.h
--
--#ifndef __CRYPTO_RAR20_CRYPTO_H
--#define __CRYPTO_RAR20_CRYPTO_H
--
--#include "Common/MyCom.h"
--
--#include "../ICoder.h"
--#include "../IPassword.h"
--
--namespace NCrypto {
--namespace NRar20 {
--
--class CData
--{
--  Byte SubstTable[256];
--  UInt32 Keys[4];
--  
--  UInt32 SubstLong(UInt32 t)
--  {
--    return (UInt32)SubstTable[(int)t & 255] |
--           ((UInt32)SubstTable[(int)(t >> 8) & 255] << 8) |
--           ((UInt32)SubstTable[(int)(t >> 16) & 255] << 16) |
--           ((UInt32)SubstTable[(int)(t >> 24) & 255] << 24);
--  }
--  void UpdateKeys(const Byte *data);
--  void CryptBlock(Byte *buf, bool encrypt);
--public:
--  void EncryptBlock(Byte *buf) { CryptBlock(buf, true); }
--  void DecryptBlock(Byte *buf) { CryptBlock(buf, false); }
--  void SetPassword(const Byte *password, UInt32 passwordLen);
--};
--
--class CDecoder:
--  public ICompressFilter,
--  public ICryptoSetPassword,
--  public CMyUnknownImp
--{
--  CData _cipher;
--public:
--  MY_UNKNOWN_IMP1(ICryptoSetPassword)
--
--  STDMETHOD(Init)();
--  STDMETHOD_(UInt32, Filter)(Byte *data, UInt32 size);
--  STDMETHOD(CryptoSetPassword)(const Byte *data, UInt32 size);
--};
--
--}}
--
--#endif
-diff -ruNa p7zip_9.20.1/CPP/7zip/Crypto/RarAes.cpp p7zip-libre_9.20.1/CPP/7zip/Crypto/RarAes.cpp
---- p7zip_9.20.1/CPP/7zip/Crypto/RarAes.cpp	2010-10-20 01:56:08.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Crypto/RarAes.cpp	1969-12-31 21:00:00.000000000 -0300
-@@ -1,134 +0,0 @@
--// Crypto/RarAes.cpp
--// Note: you must include MyAes.cpp to project to initialize AES tables
--
--#include "StdAfx.h"
--
--#include "RarAes.h"
--#include "Sha1.h"
--
--namespace NCrypto {
--namespace NRar29 {
--
--CDecoder::CDecoder():
--  _thereIsSalt(false),
--  _needCalculate(true),
--  _rar350Mode(false)
--{
--  for (int i = 0; i < sizeof(_salt); i++)
--    _salt[i] = 0;
--}
--
--STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
--{
--  bool thereIsSaltPrev = _thereIsSalt;
--  _thereIsSalt = false;
--  if (size == 0)
--    return S_OK;
--  if (size < 8)
--    return E_INVALIDARG;
--  _thereIsSalt = true;
--  bool same = false;
--  if (_thereIsSalt == thereIsSaltPrev)
--  {
--    same = true;
--    if (_thereIsSalt)
--    {
--      for (unsigned i = 0; i < sizeof(_salt); i++)
--        if (_salt[i] != data[i])
--        {
--          same = false;
--          break;
--        }
--    }
--  }
--  for (unsigned i = 0; i < sizeof(_salt); i++)
--    _salt[i] = data[i];
--  if (!_needCalculate && !same)
--    _needCalculate = true;
--  return S_OK;
--}
--
--static const unsigned kMaxPasswordLength = 127 * 2;
--
--STDMETHODIMP CDecoder::CryptoSetPassword(const Byte *data, UInt32 size)
--{
--  if (size > kMaxPasswordLength)
--    size = kMaxPasswordLength;
--  bool same = false;
--  if (size == buffer.GetCapacity())
--  {
--    same = true;
--    for (UInt32 i = 0; i < size; i++)
--      if (data[i] != buffer[i])
--      {
--        same = false;
--        break;
--      }
--  }
--  if (!_needCalculate && !same)
--    _needCalculate = true;
--  buffer.SetCapacity(size);
--  memcpy(buffer, data, size);
--  return S_OK;
--}
--
--STDMETHODIMP CDecoder::Init()
--{
--  Calculate();
--  SetKey(aesKey, kRarAesKeySize);
--  AesCbc_Init(_aes + _offset, _aesInit);
--  return S_OK;
--}
--
--void CDecoder::Calculate()
--{
--  if (_needCalculate)
--  {
--    const unsigned kSaltSize = 8;
--    
--    Byte rawPassword[kMaxPasswordLength + kSaltSize];
--    
--    memcpy(rawPassword, buffer, buffer.GetCapacity());
--    
--    size_t rawLength = buffer.GetCapacity();
--    
--    if (_thereIsSalt)
--    {
--      memcpy(rawPassword + rawLength, _salt, kSaltSize);
--      rawLength += kSaltSize;
--    }
--    
--    NSha1::CContext sha;
--    sha.Init();
--
--    // rar reverts hash for sha.
--    const unsigned kNumRounds = (1 << 18);
--    unsigned i;
--    for (i = 0; i < kNumRounds; i++)
--    {
--      sha.UpdateRar(rawPassword, rawLength, _rar350Mode);
--      Byte pswNum[3] = { (Byte)i, (Byte)(i >> 8), (Byte)(i >> 16) };
--      sha.UpdateRar(pswNum, 3, _rar350Mode);
--      if (i % (kNumRounds / 16) == 0)
--      {
--        NSha1::CContext shaTemp = sha;
--        Byte digest[NSha1::kDigestSize];
--        shaTemp.Final(digest);
--        _aesInit[i / (kNumRounds / 16)] = (Byte)digest[4 * 4 + 3];
--      }
--    }
--    /*
--    // it's test message for sha
--    const char *message = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
--    sha.Update((const Byte *)message, strlen(message));
--    */
--    Byte digest[20];
--    sha.Final(digest);
--    for (i = 0; i < 4; i++)
--      for (unsigned j = 0; j < 4; j++)
--        aesKey[i * 4 + j] = (digest[i * 4 + 3 - j]);
--  }
--  _needCalculate = false;
--}
--
--}}
-diff -ruNa p7zip_9.20.1/CPP/7zip/Crypto/RarAes.h p7zip-libre_9.20.1/CPP/7zip/Crypto/RarAes.h
---- p7zip_9.20.1/CPP/7zip/Crypto/RarAes.h	2009-12-21 08:46:19.000000000 -0300
-+++ p7zip-libre_9.20.1/CPP/7zip/Crypto/RarAes.h	1969-12-31 21:00:00.000000000 -0300
-@@ -1,47 +0,0 @@
--// Crypto/RarAes.h
--
--#ifndef __CRYPTO_RAR_AES_H
--#define __CRYPTO_RAR_AES_H
--
--#include "../../../C/Aes.h"
--
--#include "Common/Buffer.h"
--
--#include "../IPassword.h"
--
--#include "MyAes.h"
--
--namespace NCrypto {
--namespace NRar29 {
--
--const UInt32 kRarAesKeySize = 16;
--
--class CDecoder:
--  public CAesCbcDecoder,
--  public ICompressSetDecoderProperties2,
--  public ICryptoSetPassword
--{
--  Byte _salt[8];
--  bool _thereIsSalt;
--  CByteBuffer buffer;
--  Byte aesKey[kRarAesKeySize];
--  Byte _aesInit[AES_BLOCK_SIZE];
--  bool _needCalculate;
--  bool _rar350Mode;
--
--  void Calculate();
--public:
--  MY_UNKNOWN_IMP2(
--    ICryptoSetPassword,
--    ICompressSetDecoderProperties2)
--  STDMETHOD(Init)();
--  STDMETHOD(CryptoSetPassword)(const Byte *aData, UInt32 aSize);
--  STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size);
--
--  CDecoder();
--  void SetRar350Mode(bool rar350Mode) { _rar350Mode = rar350Mode; }
--};
--
--}}
--
--#endif
-diff -ruNa p7zip_9.20.1/DOCS/unRarLicense.txt p7zip-libre_9.20.1/DOCS/unRarLicense.txt
---- p7zip_9.20.1/DOCS/unRarLicense.txt	2008-08-01 06:56:23.000000000 -0300
-+++ p7zip-libre_9.20.1/DOCS/unRarLicense.txt	1969-12-31 21:00:00.000000000 -0300
-@@ -1,41 +0,0 @@
-- ******    *****   ******   unRAR - free utility for RAR archives
-- **   **  **   **  **   **  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- ******   *******  ******    License for use and distribution of
-- **   **  **   **  **   **   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- **   **  **   **  **   **         FREE portable version
--                                   ~~~~~~~~~~~~~~~~~~~~~
--
--      The source code of unRAR utility is freeware. This means:
--
--   1. All copyrights to RAR and the utility unRAR are exclusively
--      owned by the author - Alexander Roshal.
--
--   2. The unRAR sources may be used in any software to handle RAR
--      archives without limitations free of charge, but cannot be used
--      to re-create the RAR compression algorithm, which is proprietary.
--      Distribution of modified unRAR sources in separate form or as a
--      part of other software is permitted, provided that it is clearly
--      stated in the documentation and source comments that the code may
--      not be used to develop a RAR (WinRAR) compatible archiver.
--
--   3. The unRAR utility may be freely distributed. No person or company 
--      may charge a fee for the distribution of unRAR without written
--      permission from the copyright holder.
--
--   4. THE RAR ARCHIVER AND THE UNRAR UTILITY ARE DISTRIBUTED "AS IS".
--      NO WARRANTY OF ANY KIND IS EXPRESSED OR IMPLIED.  YOU USE AT 
--      YOUR OWN RISK. THE AUTHOR WILL NOT BE LIABLE FOR DATA LOSS, 
--      DAMAGES, LOSS OF PROFITS OR ANY OTHER KIND OF LOSS WHILE USING
--      OR MISUSING THIS SOFTWARE.
--
--   5. Installing and using the unRAR utility signifies acceptance of
--      these terms and conditions of the license.
--
--   6. If you don't agree with terms of the license you must remove
--      unRAR files from your storage devices and cease to use the
--      utility.
--
--      Thank you for your interest in RAR and unRAR.
--
--
--                                            Alexander L. Roshal
-\ No hay ningún carácter de nueva línea al final del fichero
-diff -ruNa p7zip_9.20.1/makefile p7zip-libre_9.20.1/makefile
---- p7zip_9.20.1/makefile	2011-03-13 08:52:45.000000000 -0300
-+++ p7zip-libre_9.20.1/makefile	2011-09-07 15:41:14.000000000 -0300
-@@ -56,7 +56,6 @@
- 	$(MAKE) -C CPP/7zip/UI/Client7z           depend
- 	$(MAKE) -C CPP/7zip/UI/Console            depend
- 	$(MAKE) -C CPP/7zip/Bundles/Format7zFree  depend
--	$(MAKE) -C CPP/7zip/Compress/Rar          depend
- 	$(MAKE) -C CPP/7zip/UI/GUI                depend
- 	$(MAKE) -C CPP/7zip/UI/FileManager        depend
- 	$(MAKE) -C check/my_86_filter             depend
-@@ -68,7 +67,6 @@
- common7z:common
- 	$(MKDIR) bin/Codecs
- 	$(MAKE) -C CPP/7zip/Bundles/Format7zFree all
--	$(MAKE) -C CPP/7zip/Compress/Rar         all
- 
- 7z: common7z
- 	$(MAKE) -C CPP/7zip/UI/Console           all
-@@ -93,7 +91,6 @@
- 	$(MAKE) -C CPP/7zip/UI/FileManager       clean
- 	$(MAKE) -C CPP/7zip/UI/GUI               clean
- 	$(MAKE) -C CPP/7zip/Bundles/Format7zFree clean
--	$(MAKE) -C CPP/7zip/Compress/Rar         clean
- 	$(MAKE) -C CPP/7zip/Compress/LZMA_Alone  clean
- 	$(MAKE) -C CPP/7zip/Bundles/AloneGCOV    clean
- 	$(MAKE) -C CPP/7zip/TEST/TestUI          clean
-diff -ruNa p7zip_9.20.1/makefile.oldmake p7zip-libre_9.20.1/makefile.oldmake
---- p7zip_9.20.1/makefile.oldmake	2011-03-13 08:53:08.000000000 -0300
-+++ p7zip-libre_9.20.1/makefile.oldmake	2011-09-07 15:41:14.000000000 -0300
-@@ -56,7 +56,6 @@
- 	cd CPP/7zip/UI/Client7z          ; $(MAKE) depend
- 	cd CPP/7zip/UI/Console           ; $(MAKE) depend
- 	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend
--	cd CPP/7zip/Compress/Rar         ; $(MAKE) depend
- 	cd CPP/7zip/UI/GUI               ; $(MAKE) depend
- 	cd CPP/7zip/UI/FileManager       ; $(MAKE) depend
- 	cd check/my_86_filter            ; $(MAKE) depend
-@@ -68,7 +67,6 @@
- common7z:common
- 	$(MKDIR) bin/Codecs
- 	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all
--	cd CPP/7zip/Compress/Rar         ; $(MAKE) all
- 
- 7z: common7z
- 	cd CPP/7zip/UI/Console           ; $(MAKE) all
-@@ -93,7 +91,6 @@
- 	cd CPP/7zip/UI/FileManager       ; $(MAKE) clean
- 	cd CPP/7zip/UI/GUI               ; $(MAKE) clean
- 	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean
--	cd CPP/7zip/Compress/Rar         ; $(MAKE) clean
- 	cd CPP/7zip/Compress/LZMA_Alone  ; $(MAKE) clean
- 	cd CPP/7zip/Bundles/AloneGCOV    ; $(MAKE) clean
- 	cd CPP/7zip/TEST/TestUI          ; $(MAKE) clean
-diff -ruNa p7zip_9.20.1/makefile.qnx_shared.so p7zip-libre_9.20.1/makefile.qnx_shared.so
---- p7zip_9.20.1/makefile.qnx_shared.so	2007-06-28 04:34:14.000000000 -0300
-+++ p7zip-libre_9.20.1/makefile.qnx_shared.so	2011-09-07 15:41:14.000000000 -0300
-@@ -1,5 +1,4 @@
- ###################################################
--# makefile.machine for "7z.so , Codecs/Rar29.so" :
- # tested with p7zip-4.47_beta on qnx-6.3.0 sp3 x86 target
- 
- OPTFLAGS=-O
-diff -ruNa p7zip_9.20.1/makefile.rules p7zip-libre_9.20.1/makefile.rules
---- p7zip_9.20.1/makefile.rules	2010-11-07 13:08:51.000000000 -0300
-+++ p7zip-libre_9.20.1/makefile.rules	2011-09-07 15:41:14.000000000 -0300
-@@ -448,18 +448,6 @@
- NsisRegister.o : ../../Archive/Nsis/NsisRegister.cpp
- 	$(CXX) $(CXXFLAGS) ../../Archive/Nsis/NsisRegister.cpp
- 
--RarHandler.o : ../../Archive/Rar/RarHandler.cpp
--	$(CXX) $(CXXFLAGS) ../../Archive/Rar/RarHandler.cpp
--RarHeader.o : ../../Archive/Rar/RarHeader.cpp
--	$(CXX) $(CXXFLAGS) ../../Archive/Rar/RarHeader.cpp
--RarIn.o : ../../Archive/Rar/RarIn.cpp
--	$(CXX) $(CXXFLAGS) ../../Archive/Rar/RarIn.cpp
--RarItem.o : ../../Archive/Rar/RarItem.cpp
--	$(CXX) $(CXXFLAGS) ../../Archive/Rar/RarItem.cpp
--RarVolumeInStream.o : ../../Archive/Rar/RarVolumeInStream.cpp
--	$(CXX) $(CXXFLAGS) ../../Archive/Rar/RarVolumeInStream.cpp
--RarRegister.o : ../../Archive/Rar/RarRegister.cpp
--	$(CXX) $(CXXFLAGS) ../../Archive/Rar/RarRegister.cpp
- 
- UdfHandler.o : ../../Archive/Udf/UdfHandler.cpp
- 	$(CXX) $(CXXFLAGS) ../../Archive/Udf/UdfHandler.cpp
-@@ -535,10 +523,6 @@
- 	$(CXX) $(CXXFLAGS) ../../Crypto/7zAesRegister.cpp
- WzAes.o : ../../Crypto/WzAes.cpp
- 	$(CXX) $(CXXFLAGS) ../../Crypto/WzAes.cpp
--Rar20Crypto.o : ../../Crypto/Rar20Crypto.cpp
--	$(CXX) $(CXXFLAGS) ../../Crypto/Rar20Crypto.cpp
--RarAes.o : ../../Crypto/RarAes.cpp
--	$(CXX) $(CXXFLAGS) ../../Crypto/RarAes.cpp
- HmacSha1.o : ../../Crypto/HmacSha1.cpp
- 	$(CXX) $(CXXFLAGS) ../../Crypto/HmacSha1.cpp
- Pbkdf2HmacSha1.o : ../../Crypto/Pbkdf2HmacSha1.cpp
diff --git a/libre/pacman-mirrorlist-libre/PKGBUILD b/libre/pacman-mirrorlist-libre/PKGBUILD
deleted file mode 100644
index 0b1ed8fad..000000000
--- a/libre/pacman-mirrorlist-libre/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 193769 2013-08-30 15:44:51Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgname=pacman-mirrorlist-libre
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
-pkgrel=1
-pkgdesc="Parabola GNU/Linux-libre mirror list for use by pacman"
-arch=('any')
-url="https://repo.parabolagnulinux.org/mirrorlist.txt"
-license=('GPL')
-groups=('base')
-backup=(etc/pacman.d/mirrorlist)
-source=(mirrorlist-${pkgver}.txt::${url})
-conflicts=(pacman-mirrorlist)
-replaces=(pacman-mirrorlist)
-provides=(pacman-mirrorlist)
-
-package() {
-  mkdir -p $pkgdir/etc/pacman.d
-  install -m644 $srcdir/mirrorlist-${pkgver}.txt $pkgdir/etc/pacman.d/mirrorlist
-}
-
-md5sums=('d9611e055969ee109b56026ed06e4919')
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
deleted file mode 100644
index ab0f3fb57..000000000
--- a/libre/pacman/PKGBUILD
+++ /dev/null
@@ -1,95 +0,0 @@
-# vim: set ts=2 sw=2 et:
-# $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=4
-pkgdesc="A library-based package manager with dependency support"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.archlinux.org/pacman/"
-license=('GPL')
-groups=('base' 'base-devel')
-depends=('bash>=4.2.042-2' 'glibc>=2.17-2' 'libarchive>=3.1.2' 'curl>=7.19.4'
-         'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring')
-checkdepends=('python2' 'fakechroot')
-optdepends=('fakeroot: for makepkg usage as normal user')
-provides=('pacman-contrib')
-conflicts=('pacman-contrib')
-replaces=('pacman-contrib')
-backup=(etc/pacman.conf etc/makepkg.conf)
-source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
-        pacman.conf.i686
-        pacman.conf.x86_64
-        pacman.conf.mips64el
-        makepkg.conf)
-md5sums=('063c8b0ff6bdf903dc235445525627cd'
-         'SKIP'
-         '688feb0a552f42643a76f72e7198bfe4'
-         '765858b55d2112d948932fc645ea538b'
-         '9e0c64937ef751ae4273fa4d73381484'
-         'f0f310df411f943dbc4e2dd376c88662')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var --enable-doc \
-    --with-scriptlet-shell=/usr/bin/bash \
-    --with-ldconfig=/usr/bin/ldconfig
-  make
-  make -C contrib
-}
-
-check() {
-  make -C "$pkgname-$pkgver" check
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  make DESTDIR=$pkgdir -C contrib install
-
-  # install Arch specific stuff
-  install -dm755 $pkgdir/etc
-  install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/etc/pacman.conf
-  
-  case "$CARCH" in
-    i686)
-      mycarch="i686"
-      mychost="i686-pc-linux-gnu"
-      myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
-      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
-      ;;
-    x86_64)
-      mycarch="x86_64"
-      mychost="x86_64-unknown-linux-gnu"
-      myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
-      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
-      ;;
-    mips64el)
-      mycarch="mips64el"
-      mychost="mips64el-unknown-linux-gnu"
-      myflags="-O2 -march=mips3 -mtune=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4"
-      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro"
-      ;;
-  esac
-  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
-  # set things correctly in the default conf file
-  sed -i $pkgdir/etc/makepkg.conf \
-    -e "s|@CARCH[@]|$mycarch|g" \
-    -e "s|@CHOST[@]|$mychost|g" \
-    -e "s|@LDFLAGS[@]|$myldflags|g" \
-    -e "s|@CARCHFLAGS[@]|$myflags|g"
-    
-  # put bash_completion in the right location
-  install -dm755 ${pkgdir}/usr/share/bash-completion/completions
-  mv ${pkgdir}/etc/bash_completion.d/pacman \
-    ${pkgdir}/usr/share/bash-completion/completions
-  rmdir ${pkgdir}/etc/bash_completion.d
-
-  for f in makepkg pacman-key; do
-    ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f"
-  done
-}
diff --git a/libre/pacman/makepkg.conf b/libre/pacman/makepkg.conf
deleted file mode 100644
index 758d7d029..000000000
--- a/libre/pacman/makepkg.conf
+++ /dev/null
@@ -1,140 +0,0 @@
-#
-# /etc/makepkg.conf
-#
-
-#########################################################################
-# SOURCE ACQUISITION
-#########################################################################
-#
-#-- The download utilities that makepkg should use to acquire sources
-#  Format: 'protocol::agent'
-DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'rsync::/usr/bin/rsync --no-motd -z %u %o'
-          'scp::/usr/bin/scp -C %u %o')
-
-# Other common tools:
-# /usr/bin/snarf
-# /usr/bin/lftpget -c
-# /usr/bin/wget
-
-#########################################################################
-# ARCHITECTURE, COMPILE FLAGS
-#########################################################################
-#
-CARCH="@CARCH@"
-CHOST="@CHOST@"
-
-#-- Compiler and Linker Flags
-# -march (or -mcpu) builds exclusively for an architecture
-# -mtune optimizes for an architecture, but builds for whole processor family
-CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="@CARCHFLAGS@"
-CXXFLAGS="@CARCHFLAGS@"
-LDFLAGS="@LDFLAGS@"
-#-- Make Flags: change this for DistCC/SMP systems
-#MAKEFLAGS="-j2"
-#-- Debugging flags
-DEBUG_CFLAGS="-g -fvar-tracking-assignments"
-DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
-
-#########################################################################
-# BUILD ENVIRONMENT
-#########################################################################
-#
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)
-#  A negated environment option will do the opposite of the comments below.
-#
-#-- fakeroot: Allow building packages as a non-root user
-#-- distcc:   Use the Distributed C/C++/ObjC compiler
-#-- color:    Colorize output messages
-#-- ccache:   Use ccache to cache compilation
-#-- check:    Run the check() function if present in the PKGBUILD
-#-- sign:     Generate PGP signature file
-#
-BUILDENV=(fakeroot !distcc color !ccache check !sign)
-#
-#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
-#-- specify a space-delimited list of hosts running in the DistCC cluster.
-#DISTCC_HOSTS=""
-#
-#-- Specify a directory for package building.
-#BUILDDIR=/tmp/makepkg
-
-#########################################################################
-# GLOBAL PACKAGE OPTIONS
-#   These are default values for the options=() settings
-#########################################################################
-#
-# 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
-#-- docs:       Save doc directories specified by DOC_DIRS
-#-- libtool:    Leave libtool (.la) files in packages
-#-- staticlibs: Leave static library (.a) files in packages
-#-- emptydirs:  Leave empty directories in packages
-#-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
-#-- purge:      Remove files specified by PURGE_TARGETS
-#-- 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)
-
-#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
-INTEGRITY_CHECK=(md5)
-#-- Options to be used when stripping binaries. See `man strip' for details.
-STRIP_BINARIES="--strip-all"
-#-- Options to be used when stripping shared libraries. See `man strip' for details.
-STRIP_SHARED="--strip-unneeded"
-#-- Options to be used when stripping static libraries. See `man strip' for details.
-STRIP_STATIC="--strip-debug"
-#-- Manual (man and info) directories to compress (if zipman is specified)
-MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
-#-- Doc directories to remove (if !docs is specified)
-DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
-#-- Files to be removed from all packages (if purge is specified)
-PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
-
-#########################################################################
-# PACKAGE OUTPUT
-#########################################################################
-#
-# Default: put built package and cached source in build directory
-#
-#-- Destination: specify a fixed directory where all packages will be placed
-#PKGDEST=/home/packages
-#-- Source cache: specify a fixed directory where source files will be cached
-#SRCDEST=/home/sources
-#-- Source packages: specify a fixed directory where all src packages will be placed
-#SRCPKGDEST=/home/srcpackages
-#-- Log files: specify a fixed directory where all log files will be placed
-#LOGDEST=/home/makepkglogs
-#-- Packager: name/email of the person or organization building packages
-#PACKAGER="John Doe <john@doe.com>"
-#-- Specify a key to use for package signing
-#GPGKEY=""
-
-#########################################################################
-# COMPRESSION DEFAULTS
-#########################################################################
-#
-COMPRESSGZ=(gzip -c -f -n)
-COMPRESSBZ2=(bzip2 -c -f)
-COMPRESSXZ=(xz -c -z -)
-COMPRESSLRZ=(lrzip -q)
-COMPRESSLZO=(lzop -q)
-COMPRESSZ=(compress -c -f)
-
-#########################################################################
-# EXTENSION DEFAULTS
-#########################################################################
-#
-# WARNING: Do NOT modify these variables unless you know what you are
-#          doing.
-#
-PKGEXT='.pkg.tar.xz'
-SRCEXT='.src.tar.gz'
-
-# vim: set ft=sh ts=2 sw=2 et:
diff --git a/libre/pacman/pacman.conf.i686 b/libre/pacman/pacman.conf.i686
deleted file mode 100644
index 84cec630c..000000000
--- a/libre/pacman/pacman.conf.i686
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-#UseDelta    = 0.7
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-#TotalDownload
-CheckSpace
-#VerbosePkgLists
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-#[libre-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[libre]
-Include = /etc/pacman.d/mirrorlist
-
-#[testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-# Parabola also supports community projects and personal repositories, to find
-# them check out this wiki page: https://wiki.parabolagnulinux.org/Repositories
-
-# Parabola community repo
-#[pcr]
-#Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el
deleted file mode 100644
index 604040640..000000000
--- a/libre/pacman/pacman.conf.mips64el
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-#UseDelta    = 0.7
-Architecture = mips64el
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-#TotalDownload
-CheckSpace
-#VerbosePkgLists
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-#[libre-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[libre]
-Include = /etc/pacman.d/mirrorlist
-
-#[testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-# Parabola also supports community projects and personal repositories, to find
-# them check out this wiki page: https://wiki.parabolagnulinux.org/Repositories
-
-# Parabola community repo
-#[pcr]
-#Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64
deleted file mode 100644
index 5729b60c5..000000000
--- a/libre/pacman/pacman.conf.x86_64
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-#UseDelta    = 0.7
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-#TotalDownload
-CheckSpace
-#VerbosePkgLists
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-#[libre-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[libre]
-Include = /etc/pacman.d/mirrorlist
-
-#[testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-# If you want to run 32 bit applications on your x86_64 system,
-# enable the multilib repositories as required here.
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist
-
-# Parabola also supports community projects and personal repositories, to find
-# them check out this wiki page: https://wiki.parabolagnulinux.org/Repositories
-
-# Parabola community repo
-#[pcr]
-#Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
deleted file mode 100644
index 78b27ad5e..000000000
--- a/libre/parabola-keyring/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-pkgname=parabola-keyring
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
-pkgrel=1
-pkgdesc='Parabola GNU/Linux-libre PGP keyring'
-arch=('any')
-url='https://projects.parabolagnulinux.org/hackers.git/'
-license=('GPL')
-install=$pkgname.install
-source=("http://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"
-        "http://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz.sig")
-
-package() {
-	cd $srcdir/$pkgname-$pkgver
-	make PREFIX=/usr DESTDIR=${pkgdir} install
-}
-md5sums=('d50f8ba9f108b38c0e084d21742ea059'
-         'SKIP')
diff --git a/libre/parabola-keyring/parabola-keyring.install b/libre/parabola-keyring/parabola-keyring.install
deleted file mode 100644
index 1c70f1a8d..000000000
--- a/libre/parabola-keyring/parabola-keyring.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_upgrade() {
-	if usr/bin/pacman-key -l >/dev/null 2>&1; then
-		usr/bin/pacman-key --populate parabola
-	fi
-}
-
-post_install() {
-	if [ -x usr/bin/pacman-key ]; then
-		post_upgrade
-	fi
-}
diff --git a/libre/parabola-themes-slim/PKGBUILD b/libre/parabola-themes-slim/PKGBUILD
deleted file mode 100644
index a921253da..000000000
--- a/libre/parabola-themes-slim/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Mark J.R.P. <l1mpm4rk@gmail.com>
-# Contributor: Mark J.R.P. <l1mpm4rk@gmail.com>
-
-provides=("parabola-themes-slim=$pkgver")
-replaces=('archlinux-themes-slim')
-conflicts=('archlinux-themes-slim')
-pkgname=parabola-themes-slim
-pkgver=1.0
-pkgrel=1.1
-pkgdesc="a theme parabolero to the Slim login manager"
-arch=('any')
-url="https://parabolagnulinux.org/"
-license=('CCPL')
-optdepends=('slim: simple login manager'
-	    'ttf-liberation: to have a beautiful style of letter in the login')
-source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar)
-md5sums=(bf6bead07cbcca9aa562907230496ba1)
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  mkdir -p $pkgdir/usr/share/slim/themes
-  cp -a Parabola-*/ $pkgdir/usr/share/slim/themes
-}
diff --git a/libre/parabola-xdg-menu/PKGBUILD b/libre/parabola-xdg-menu/PKGBUILD
deleted file mode 100644
index b3085f9c3..000000000
--- a/libre/parabola-xdg-menu/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 101138 2013-11-18 10:37:13Z spupykin $
-# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
-# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgname=parabola-xdg-menu
-pkgver=0.7.6.2
-pkgrel=1
-pkgdesc="automatic generate WM menu from xdg files (Parabola rebranded)"
-arch=('any')
-url="https://wiki.parabolagnulinux.org/Xdg-menu"
-license=("GPL")
-depends=('perl' 'perlxml')
-optdepends=('sux: for xdg_menu_su')
-backup=("etc/update-menus.conf"
-	"etc/xdg/menus/parabola-applications.menu")
-source=("http://archlinux-stuff.googlecode.com/files/arch-xdg-menu-$pkgver.tar.gz")
-replaces=('archlinux-xdg-menu')
-conflicts=('archlinux-xdg-menu')
-provides=("archlinux-xdg-menu=$pkgver")
-md5sums=('e4aadc2a05a8e8330c95c22548a4fcfb')
-
-package() {
-  cd $srcdir
-
-    # Rebranding Archlinux to Parabola 
-    rename -v arch parabola arch-desktop-directories arch-xdg-menu
-    rename -v Arch Parabola parabola-desktop-directories/*
-    rename -v arch parabola parabola-xdg-menu/*
-
-    sed -i -e 's/arch/parabola/'\
-    update-menus || read
-
-    sed -i -e 's/archlinux/parabola/'\
-    xdg_menu || read
-
-    sed -i -e 's/Archlinux/Parabola/'\
-    parabola-xdg-menu/parabola-applications.menu || read
-
-    sed -i -e 's/Arch/Parabola/'\
-    parabola-xdg-menu/parabola-applications.menu || read
-
-  install -D -m 0755 xdg_menu $pkgdir/usr/bin/xdg_menu
-  install -D -m 0755 xdg_menu_su $pkgdir/usr/bin/xdg_menu_su
-  install -D -m 0755 update-menus $pkgdir/usr/bin/update-menus
-  install -D -m 0644 update-menus.conf $pkgdir/etc/update-menus.conf
-  mkdir -p $pkgdir/usr/share/desktop-directories/
-  cp parabola-desktop-directories/* $pkgdir/usr/share/desktop-directories/
-  mkdir -p $pkgdir/etc/xdg/menus/
-  cp parabola-xdg-menu/* $pkgdir/etc/xdg/menus/
-  mkdir -p $pkgdir//var/cache/xdg-menu
-}
diff --git a/libre/parabolaiso-data/PKGBUILD b/libre/parabolaiso-data/PKGBUILD
deleted file mode 100644
index 22c1b98f6..000000000
--- a/libre/parabolaiso-data/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Esteban Carnevale <alfplayer@mailoo.org>
-
-pkgname=parabolaiso-data
-pkgver=1
-pkgrel=1
-pkgdesc="Data files of parabolaiso, the tool to create ISO images"
-arch=('any')
-url="https://projects.parabolagnulinux.org/parabolaiso.git"
-license=('GPL')
-_basesource1='https://projects.parabolagnulinux.org/~old/parabolaiso.git/plain'
-_basesource2='https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2'
-source=("${_basesource1}/configs/releng/syslinux/splash.png"
-        "${_basesource2}/ShellBinPkg/UefiShell/X64/Shell.efi"
-	"${_basesource2}/EdkShellBinPkg/FullShell/X64/Shell_Full.efi")
-md5sums=('befd0e7c38a03442b791f2a530b4dd2d'
-         '01a8ee2759fa2170c065414489d9b823'
-         '92d78841d0c44118064b59e95164b2ee')
-
-package() {
-  cd $srcdir
-
-  datadir="usr/share/parabolaiso/data"
-
-  install -d $pkgdir/$datadir
-
-  install -D -m644 splash.png $pkgdir/$datadir/splash.png
-  install -D -m644 Shell.efi $pkgdir/$datadir/Shell.efi
-  install -D -m644 Shell_Full.efi $pkgdir/$datadir/Shell_Full.efi
-}
diff --git a/libre/parabolaiso/PKGBUILD b/libre/parabolaiso/PKGBUILD
deleted file mode 100644
index 833a6f56b..000000000
--- a/libre/parabolaiso/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
-
-pkgname=parabolaiso
-pkgver=2013.09.01
-pkgrel=2
-pkgdesc='Tools for creating Parabola GNU/Linux-libre live and install iso images'
-arch=('any')
-url='https://projects.parabolagnulinux.org/parabolaiso.git/'
-license=('GPL')
-depends=('make' 'squashfs-tools' 'libisoburn' 'dosfstools' 'parabolaiso-data')
-provides=('archiso')
-conflicts=('archiso')
-source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"
-        "https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig")
-md5sums=('e94c1f49f32e02480c14ee3162e8ee1b'
-         'SKIP')
-
-package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	make DESTDIR=${pkgdir} install
-}
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index 185274efc..69ae3fbd3 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -1,15 +1,16 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgname=(parabolaweb-utils parabolaweb-dev)
-pkgver=20131128
+pkgver=20140117
 pkgdesc="Utilities for managing the parabolaweb website application"
 url="https://projects.parabolagnulinux.org/packages/parabolaweb-utils.git/"
 license=('GPL2')
 
 # The commit to get dependency info for
+# Bump pkgrel if updating this is the only change
 _parabolaweb_commit=86f1ed1ecc94a6a298eb3f690155b03bf013ca78
 
-pkgrel=2
+pkgrel=1
 epoch=1
 arch=('any')
 
@@ -25,7 +26,7 @@ build() {
 
 package_parabolaweb-utils() {
 	cd "$srcdir/$pkgbase-$pkgver"
-	depends=($(cat depends.txt))
+	depends=($(< depends.txt))
 	backup=('etc/conf.d/parabolaweb')
 	make install DESTDIR="$pkgdir"
 }
@@ -36,5 +37,5 @@ package_parabolaweb-dev() {
 	depends=($(sed -r -e 's/\s*#.*//' depends_make.txt))
 }
 
-md5sums=('e83933afda290bfc1fe0e51828c7ad41'
+md5sums=('4543e360c0f5ecbfa3a4a51b2bd9131d'
          '4ed35e37e52f6b8607733c692702d319')
diff --git a/libre/pngcrush/PKGBUILD b/libre/pngcrush/PKGBUILD
deleted file mode 100644
index f44ace016..000000000
--- a/libre/pngcrush/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=pngcrush
-pkgver=1.7.65
-pkgrel=1
-pkgdesc="A tool for optimizing the compression of PNG files"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://pmt.sourceforge.net/pngcrush/"
-license=('custom')
-depends=('libpng' 'zlib')
-source=(http://downloads.sourceforge.net/pmt/$pkgname-$pkgver-nolib.tar.xz)
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver-nolib
-  sed -n '10,17s/^\s*//p' cexcept.h > LICENSE.cexcept.txt
-  sed -rn '97,142s/ \* ?//p' pngcrush.c > LICENSE.pngcrush.txt
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver-nolib
-  install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
-  install -Dm644 LICENSE.cexcept.txt "$pkgdir"/usr/share/licenses/$pkgname/cexcept.txt
-  install -Dm644 LICENSE.pngcrush.txt "$pkgdir"/usr/share/licenses/$pkgname/pngcrush.txt
-}
-
-md5sums=('b4130246c14c1cffc6c2014ff86f1008')
diff --git a/libre/povray-libre/PKGBUILD b/libre/povray-libre/PKGBUILD
deleted file mode 100644
index 70cb073a9..000000000
--- a/libre/povray-libre/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 101605 2013-11-29 04:23:22Z eric $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: red_over_blue
-# Contributor: neri
-
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
-# Don't build povray before 3.7 version (it's nonfree software)
-
-_pkgname=povray
-pkgname=$_pkgname-libre
-pkgver=3.7
-pkgrel=4
-epoch=1
-pkgdesc='Script based raytracer for creating 3D graphics, without nonfree documentation'
-arch=('x86_64' 'i686' 'mips64el')
-license=('AGPL3')
-url='http://povray.org/'
-depends=('libtiff' 'libpng' 'boost-libs')
-makedepends=('boost')
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-replaces=("$_pkgname")
-backup=("etc/povray/$pkgver/povray.conf"
-        "etc/povray/$pkgver/povray.ini")
-source=("https://github.com/POV-Ray/$_pkgname/archive/$pkgver-stable.zip"
-        'povray3.7.0_rc3-user-conf.patch')
-sha256sums=('1261d963327a4b04c09d56bbd7436d0062e6bf8363674e3fb4e240beefb5b5cb'
-            '95b04ec4973e6e8a80fc83df2e3caff0b4d6699c4154144f3017d42cab7236e0')
-
-prepare() {
-  cd "$_pkgname-$pkgver-stable"
-
-  cd unix
-  sed 's/automake --w/automake --add-missing --w/g' -i prebuild.sh
-  sed 's/dist-bzip2/dist-bzip2 subdir-objects/g' -i configure.ac
-  ./prebuild.sh
-  cd ..
-  ./bootstrap
-  patch -p1 < "$srcdir/povray3.7.0_rc3-user-conf.patch"
-}
-
-build() {
-  cd "$_pkgname-$pkgver-stable"
-
-  ./configure LIBS="-lboost_system -lboost_thread" COMPILED_BY='Parabola GNU/Linux-libre' \
-    --prefix=/usr --sysconfdir=/etc
-  make CXXFLAGS+="-w -lboost_system -lboost_thread"
-  gzip -f povray.1
-}
-
-package() {
-  cd "$_pkgname-$pkgver-stable"
-
-  install -d "$pkgdir/usr/share/$_pkgname-$pkgver"
-  cp -r icons include ini scenes scripts "$pkgdir/usr/share/$_pkgname-$pkgver"
-  install -Dm755 unix/povray "$pkgdir/usr/bin/povray"
-  install -Dm644 povray.conf "$pkgdir/etc/povray/$pkgver/povray.conf"
-  install -Dm644 povray.ini "$pkgdir/etc/povray/$pkgver/povray.ini"
-  install -Dm644 povray.1.gz "$pkgdir/usr/share/man/man1/povray.1.gz"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/povray-libre/povray3.7.0_rc3-user-conf.patch b/libre/povray-libre/povray3.7.0_rc3-user-conf.patch
deleted file mode 100644
index f20d9b506..000000000
--- a/libre/povray-libre/povray3.7.0_rc3-user-conf.patch
+++ /dev/null
@@ -1,27 +0,0 @@
- Makefile.am |   13 -------------
- 1 files changed, 0 insertions(+), 13 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 76b394c..9822c52 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -107,19 +107,6 @@ install-data-local:
- 	for f in $$filelist ; do \
- 	  $(INSTALL_DATA) $(top_srcdir)/doc/$$f $(DESTDIR)$(povdocdir)/$$f && echo "$(DESTDIR)$(povdocdir)/$$f" >> $(povinstall); \
- 	done
--	@echo "Creating user directories..."; \
--	for p in $(povuser) $(povconfuser) ; do \
--	  $(mkdir_p) $$p && chown $(povowner) $$p && chgrp $(povgroup) $$p && printf "%s\n" "$$p" "`cat $(povinstall)`" > $(povinstall); \
--	done
--	@echo "Copying user configuration and INI files..."; \
--	for f in povray.conf povray.ini ; do \
--	  if test -f $(povconfuser)/$$f; then \
--	    echo "Creating backup of $(povconfuser)/$$f"; \
--	    mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \
--	  fi; \
--	done; \
--	$(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf && chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup) $(povconfuser)/povray.conf  && echo "$(povconfuser)/povray.conf" >> $(povinstall); \
--	$(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini && chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup) $(povconfuser)/povray.ini  && echo "$(povconfuser)/povray.ini" >> $(povinstall)
- 
- # Remove data, config, and empty folders for 'make uninstall'.
- # Use 'hook' instead of 'local' so as to properly remove *empty* folders (e.g. scripts).
diff --git a/libre/psi/PKGBUILD b/libre/psi/PKGBUILD
deleted file mode 100644
index e37c37f05..000000000
--- a/libre/psi/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $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=2
-pkgdesc='Instant messaging application designed for the Jabber IM (Parabola rebranded)'
-url='http://psi-im.org/'
-license=('GPL')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('qca-ossl' 'qca-gnupg' 'enchant' 'libxss' 'xdg-utils')
-makedepends=('icu')
-install='psi.install'
-source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2"
-        'parabola.patch')
-md5sums=('aea15f17cf93e7cea52f305523f761be'
-         'a641b77517c82c6e1f254d5595a25113')
-
-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
-}
-
-package() {
-	cd ${srcdir}/psi-${pkgver}
-	make INSTALL_ROOT=${pkgdir} install
-	rm -rf ${pkgdir}/usr/share/psi/certs/
-}
diff --git a/libre/psi/parabola.patch b/libre/psi/parabola.patch
deleted file mode 100644
index cafe67fa1..000000000
--- a/libre/psi/parabola.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- src/systeminfo.cpp	2012-10-03 21:53:03.000000000 -0300
-+++ src/systeminfo.cpp	2013-03-25 21:27:28.691880863 -0300
-@@ -75,23 +75,7 @@
- 	enum LinuxName {
- 		LinuxNone = 0,
- 
--		LinuxMandrake,
--		LinuxDebian,
--		LinuxRedHat,
--		LinuxGentoo,
--		LinuxExherbo,
--		LinuxSlackware,
--		LinuxSuSE,
--		LinuxConectiva,
--		LinuxCaldera,
--		LinuxLFS,
--
--		LinuxASP, // Russian Linux distros
--		LinuxALT,
--
--		LinuxPLD, // Polish Linux distros
--		LinuxAurox,
--		LinuxArch
-+		LinuxParabola
- 	};
- 
- 	enum OsFlags {
-@@ -106,24 +90,7 @@
- 		QString file;
- 		QString name;
- 	} osInfo[] = {
--		{ LinuxMandrake,	OsUseFile,	"/etc/mandrake-release",	"Mandrake Linux"	},
--		{ LinuxDebian,		OsAppendFile,	"/etc/debian_version",		"Debian GNU/Linux"	},
--		{ LinuxGentoo,		OsUseFile,	"/etc/gentoo-release",		"Gentoo Linux"		},
--		{ LinuxExherbo,		OsUseName,	"/etc/exherbo-release",		"Exherbo Linux"		},
--		{ LinuxArch,		OsUseName,	"/etc/arch-release",		"Arch Linux"		},
--		{ LinuxSlackware,	OsAppendFile,	"/etc/slackware-version",	"Slackware Linux"	},
--		{ LinuxPLD,		OsUseFile,	"/etc/pld-release",		"PLD Linux"		},
--		{ LinuxAurox,		OsUseName,	"/etc/aurox-release",		"Aurox Linux"		},
--		{ LinuxArch,		OsUseFile,	"/etc/arch-release",		"Arch Linux"		},
--		{ LinuxLFS,		OsAppendFile,	"/etc/lfs-release",		"LFS Linux"		},
--
--		// untested
--		{ LinuxSuSE,		OsUseFile,	"/etc/SuSE-release",		"SuSE Linux"		},
--		{ LinuxConectiva,	OsUseFile,	"/etc/conectiva-release",	"Conectiva Linux"	},
--		{ LinuxCaldera,		OsUseFile,	"/etc/.installed",		"Caldera Linux"		},
--
--		// many distros use the /etc/redhat-release for compatibility, so RedHat will be the last :)
--		{ LinuxRedHat,		OsUseFile,	"/etc/redhat-release",		"RedHat Linux"		},
-+		{ LinuxParabola,	OsUseName,	"/etc/arch-release",		"Parabola GNU/Linux-libre" },
- 
- 		{ LinuxNone,		OsUseName,	"",				""			}
- 	};
diff --git a/libre/psi/psi.install b/libre/psi/psi.install
deleted file mode 100644
index 464d2e625..000000000
--- a/libre/psi/psi.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD
deleted file mode 100644
index a9f697ae0..000000000
--- a/libre/psutils-libre/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 176972 2013-02-03 07:11:03Z allan $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: eric <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): xihh <hahj87@gmail.com>
-
-_pkgname=psutils
-pkgname=psutils-libre
-pkgver=1.17
-pkgrel=4
-arch=('i686' 'x86_64' 'mips64el')
-pkgdesc="A set of postscript utilities, without nonfree files"
-url="http://knackered.org/angus/psutils/"
-license=('custom')
-depends=('glibc' 'ghostscript')
-provides=('psutils-lprng' 'psutils')
-replaces=('psutils-lprng' 'psutils')
-conflicts=('psutils-lprng' 'psutils')
-options=('!makeflags')
-source=("ftp://ftp.archlinux.org/other/psutils/${_pkgname}-${pkgver}.tar.gz"
-        'psutils-1.17.diff'
-        'libre.patch')
-md5sums=('b161522f3bd1507655326afa7db4a0ad'
-         '2b49e9e796000b42f42804d4b50a2be1'
-         'a4beaf371607085e89ef190c1db7aee3')
-
-build() {
-  cd "${srcdir}/${_pkgname}"
-  patch -Np1 -i "${srcdir}/psutils-1.17.diff"
-  # apply patch to remove nonfree files support from Makefile
-  patch -Np1 -i "${srcdir}/libre.patch"
-  # remove nonfree files
-  rm -v {fixmacps.{man,pl},md{68_0,71_0}.ps} 
-  make -f Makefile.unix BINDIR=/usr/bin \
-    INCLUDEDIR=/usr/include/psutils PERL=/usr/bin/perl \
-    MANDIR=/usr/share/man/man1 \
-    CFLAGS="$CFLAGS -DPAPER=\\\"letter\\\" -DUNIX -Wall" \
-    CCFLAGS="$LDFLAGS"
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}"
-  install -d -m755 "${pkgdir}/usr/include"
-  install -d -m755 "${pkgdir}/usr/share/man"
-  make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \
-    INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \
-    MANDIR="${pkgdir}/usr/share/man/man1" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${_pkgname}"
-  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/"
-}
diff --git a/libre/psutils-libre/libre.patch b/libre/psutils-libre/libre.patch
deleted file mode 100644
index c2bd21245..000000000
--- a/libre/psutils-libre/libre.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- psutils.orig/Makefile.unix	2013-06-21 05:46:39.671197867 -0300
-+++ psutils/Makefile.unix	2013-06-21 05:55:30.248672628 -0300
-@@ -44,15 +44,14 @@
- BIN = psbook psselect pstops epsffit psnup \
- 	psresize
- SHELLSCRIPTS = getafm showchar
--PERLSCRIPTS = fixfmps fixmacps fixpsditps fixpspps \
-+PERLSCRIPTS = fixfmps fixpsditps fixpspps \
- 	fixtpps fixwfwps fixwpps fixscribeps fixwwps \
- 	fixdlsrps extractres includeres psmerge
- MANPAGES = psbook.$(MANEXT) psselect.$(MANEXT) pstops.$(MANEXT) epsffit.$(MANEXT) psnup.$(MANEXT) \
- 	psresize.$(MANEXT) psmerge.$(MANEXT) fixscribeps.$(MANEXT) getafm.$(MANEXT) \
--	fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixmacps.$(MANEXT) fixpsditps.$(MANEXT) \
-+	fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixpsditps.$(MANEXT) \
- 	fixpspps.$(MANEXT) fixtpps.$(MANEXT) fixwfwps.$(MANEXT) fixwpps.$(MANEXT) \
- 	fixwwps.$(MANEXT) extractres.$(MANEXT) includeres.$(MANEXT)
--INCLUDES = md68_0.ps md71_0.ps
- 
- all: $(BIN) $(PERLSCRIPTS) $(MANPAGES) $(SHELLSCRIPTS)
- 
-@@ -106,10 +105,6 @@
- 	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
- 	$(CHMOD) $(BINMODE) $@
- 
--fixmacps: fixmacps.pl
--	$(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
--	$(CHMOD) $(BINMODE) $@
--
- fixpsditps: fixpsditps.pl
- 	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
- 	$(CHMOD) $(BINMODE) $@
-@@ -174,9 +169,6 @@
- fixfmps.$(MANEXT): fixfmps.man
- 	$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
- 
--fixmacps.$(MANEXT): fixmacps.man
--	$(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@
--
- fixpsditps.$(MANEXT): fixpsditps.man
- 	$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
- 
diff --git a/libre/psutils-libre/psutils-1.17.diff b/libre/psutils-libre/psutils-1.17.diff
deleted file mode 100644
index 4af32bd7f..000000000
--- a/libre/psutils-libre/psutils-1.17.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -u -r --new-file psutils.orig/Makefile.unix psutils/Makefile.unix
---- psutils.orig/Makefile.unix	Tue Mar 11 14:52:59 1997
-+++ psutils/Makefile.unix	Thu Jan 18 20:53:36 2001
-@@ -19,16 +19,16 @@
- # psnup puts multiple logical pages on one physical page
- # psresize scales and moves pages to fit on different paper sizes
- 
--PAPER=a4
-+PAPER=letter
- 
- # Makefile for PSUtils under Unix
- 
- OS = UNIX
- 
--BINDIR = /usr/local/bin
-+BINDIR = /usr/bin
- SCRIPTDIR = $(BINDIR)
--INCLUDEDIR = /usr/local/share/psutils
--PERL = /usr/local/bin/perl
-+INCLUDEDIR = /usr/share/psutils
-+PERL = /usr/bin/perl
- 
- BINMODE = 0755
- MANMODE = 0644
-@@ -36,7 +36,7 @@
- INSTALL = install -c -m $(BINMODE)
- INSTALLMAN = install -c -m $(MANMODE)
- MANEXT = 1
--MANDIR = /usr/local/share/man/man$(MANEXT)
-+MANDIR = /usr/man/man$(MANEXT)
- 
- CC = gcc
- CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
diff --git a/libre/python-pgpdump/PKGBUILD b/libre/python-pgpdump/PKGBUILD
deleted file mode 100644
index e65f60dfa..000000000
--- a/libre/python-pgpdump/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=pgpdump
-pkgname=(python-pgpdump python2-pgpdump)
-pkgver=1.4
-pkgdesc=" a Python library for parsing PGP packets"
-url="https://github.com/toofishes/python-pgpdump"
-license=('custom:BSD3')
-
-pkgrel=1
-arch=(any)
-makedepends=(python python2)
-provides=(python2-pgpdump)
-source=(http://pypi.python.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz)
-md5sums=(b437c28ff9d6a6257a0062c0bbe2a9ec)
-
-package_python-pgpdump() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  python setup.py install --root="$pkgdir/" --optimize=1
-  install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-package_python2-pgpdump() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-  install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/libre/python2-bencode/PKGBUILD b/libre/python2-bencode/PKGBUILD
deleted file mode 100644
index 762d55cad..000000000
--- a/libre/python2-bencode/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=bencode
-pkgname=python2-bencode
-pkgver=1.0
-pkgdesc="BitTorrent bencode module as leight-weight, standalone package"
-url="http://pypi.python.org/pypi/BitTorrent-bencode"
-license=('custom:BitTorrent Open Source License')
-
-pkgrel=1
-arch=('any')
-depends=('python2')
-makedepends=('python2-distribute')
-source=(http://pypi.python.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz
-	bittorrent-osl.txt)
-
-package(){
-  cd "$srcdir/$_pkgname-$pkgver"
-  python2 setup.py install --root="$pkgdir" --optimize=1
-  install -Dm644 "$srcdir"/bittorrent-osl.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-md5sums=('400dd42ff346eb7db91245403f8f2b7b'
-         '016d959cb9f7a319e48d9699c4ef2f42')
diff --git a/libre/python2-bencode/bittorrent-osl.txt b/libre/python2-bencode/bittorrent-osl.txt
deleted file mode 100644
index f0625f45c..000000000
--- a/libre/python2-bencode/bittorrent-osl.txt
+++ /dev/null
@@ -1,510 +0,0 @@
-BitTorrent Open Source License
-
-Version 1.1
-
-This BitTorrent Open Source License (the "License") applies to the
-BitTorrent client and related software products as well as any updates
-or maintenance releases of that software ("BitTorrent Products") that
-are distributed by BitTorrent, Inc. ("Licensor"). Any BitTorrent
-Product licensed pursuant to this License is a Licensed
-Product. Licensed Product, in its entirety, is protected by
-U.S. copyright law. This License identifies the terms under which you
-may use, copy, distribute or modify Licensed Product.
-
-Preamble
-
-This Preamble is intended to describe, in plain English, the nature
-and scope of this License. However, this Preamble is not a part of
-this license. The legal effect of this License is dependent only upon
-the terms of the License and not this Preamble.
-
-This License complies with the Open Source Definition and is derived
-from the Jabber Open Source License 1.0 (the "JOSL"), which has been
-approved by Open Source Initiative. Sections 4(c) and 4(f)(iii) from
-the JOSL have been deleted.
-
-This License provides that:
-
-1. You may use or give away the Licensed Product, alone or as a
-component of an aggregate software distribution containing programs
-from several different sources. No royalty or other fee is required.
-
-2. Both Source Code and executable versions of the Licensed Product,
-including Modifications made by previous Contributors, are available
-for your use. (The terms "Licensed Product," "Modifications,"
-"Contributors" and "Source Code" are defined in the License.)
-
-3. You are allowed to make Modifications to the Licensed Product, and
-you can create Derivative Works from it. (The term "Derivative Works"
-is defined in the License.)
-
-4. By accepting the Licensed Product under the provisions of this
-License, you agree that any Modifications you make to the Licensed
-Product and then distribute are governed by the provisions of this
-License. In particular, you must make the Source Code of your
-Modifications available to others free of charge and without a
-royalty.
-
-5. You may sell, accept donations or otherwise receive compensation
-for executable versions of a Licensed Product, without paying a
-royalty or other fee to the Licensor or any Contributor, provided that
-such executable versions contain your or another Contributor?s
-material Modifications. For the avoidance of doubt, to the extent your
-executable version of a Licensed Product does not contain your or
-another Contributor?s material Modifications, you may not sell, accept
-donations or otherwise receive compensation for such executable.
-
-You may use the Licensed Product for any purpose, but the Licensor is
-not providing you any warranty whatsoever, nor is the Licensor
-accepting any liability in the event that the Licensed Product doesn't
-work properly or causes you any injury or damages.
-
-6. If you sublicense the Licensed Product or Derivative Works, you may
-charge fees for warranty or support, or for accepting indemnity or
-liability obligations to your customers. You cannot charge for, sell,
-accept donations or otherwise receive compensation for the Source
-Code.
-
-7. If you assert any patent claims against the Licensor relating to
-the Licensed Product, or if you breach any terms of the License, your
-rights to the Licensed Product under this License automatically
-terminate.
-
-You may use this License to distribute your own Derivative Works, in
-which case the provisions of this License will apply to your
-Derivative Works just as they do to the original Licensed Product.
-
-Alternatively, you may distribute your Derivative Works under any
-other OSI-approved Open Source license, or under a proprietary license
-of your choice. If you use any license other than this License,
-however, you must continue to fulfill the requirements of this License
-(including the provisions relating to publishing the Source Code) for
-those portions of your Derivative Works that consist of the Licensed
-Product, including the files containing Modifications.
-
-New versions of this License may be published from time to time in
-connection with new versions of a Licensed Product or otherwise. You
-may choose to continue to use the license terms in this version of the
-License for the Licensed Product that was originally licensed
-hereunder, however, the new versions of this License will at all times
-apply to new versions of the Licensed Product released by Licensor
-after the release of the new version of this License. Only the
-Licensor has the right to change the License terms as they apply to
-the Licensed Product.
-
-This License relies on precise definitions for certain terms. Those
-terms are defined when they are first used, and the definitions are
-repeated for your convenience in a Glossary at the end of the License.
-
-License Terms
-
-1. Grant of License From Licensor. Subject to the terms and conditions
-of this License, Licensor hereby grants you a world-wide,
-royalty-free, non-exclusive license, subject to third party
-intellectual property claims, to do the following:
-
-a. Use, reproduce, modify, display, perform, sublicense and distribute
-any Modifications created by a Contributor or portions thereof, in
-both Source Code or as an executable program, either on an unmodified
-basis or as part of Derivative Works.
-
-b. Under claims of patents now or hereafter owned or controlled by
-Contributor, to make, use, sell, offer for sale, have made, and/or
-otherwise dispose of Modifications or portions thereof, but solely to
-the extent that any such claim is necessary to enable you to make,
-use, sell, offer for sale, have made, and/or otherwise dispose of
-Modifications or portions thereof or Derivative Works thereof.
-
-2. Grant of License to Modifications From Contributor. "Modifications"
-means any additions to or deletions from the substance or structure of
-(i) a file containing a Licensed Product, or (ii) any new file that
-contains any part of a Licensed Product. Hereinafter in this License,
-the term "Licensed Product" shall include all previous Modifications
-that you receive from any Contributor. Subject to the terms and
-conditions of this License, By application of the provisions in
-Section 4(a) below, each person or entity who created or contributed
-to the creation of, and distributed, a Modification (a "Contributor")
-hereby grants you a world-wide, royalty-free, non-exclusive license,
-subject to third party intellectual property claims, to do the
-following:
-
-a. Use, reproduce, modify, display, perform, sublicense and distribute
-any Modifications created by such Contributor or portions thereof, in
-both Source Code or as an executable program, either on an unmodified
-basis or as part of Derivative Works.
-
-b. Under claims of patents now or hereafter owned or controlled by
-Contributor, to make, use, sell, offer for sale, have made, and/or
-otherwise dispose of Modifications or portions thereof, but solely to
-the extent that any such claim is necessary to enable you to make,
-use, sell, offer for sale, have made, and/or otherwise dispose of
-Modifications or portions thereof or Derivative Works thereof.
-
-3. Exclusions From License Grant. Nothing in this License shall be
-deemed to grant any rights to trademarks, copyrights, patents, trade
-secrets or any other intellectual property of Licensor or any
-Contributor except as expressly stated herein. No patent license is
-granted separate from the Licensed Product, for code that you delete
-from the Licensed Product, or for combinations of the Licensed Product
-with other software or hardware. No right is granted to the trademarks
-of Licensor or any Contributor even if such marks are included in the
-Licensed Product. Nothing in this License shall be interpreted to
-prohibit Licensor from licensing under different terms from this
-License any code that Licensor otherwise would have a right to
-license. As an express condition for your use of the Licensed Product,
-you hereby agree that you will not, without the prior written consent
-of Licensor, use any trademarks, copyrights, patents, trade secrets or
-any other intellectual property of Licensor or any Contributor except
-as expressly stated herein. For the avoidance of doubt and without
-limiting the foregoing, you hereby agree that you will not use or
-display any trademark of Licensor or any Contributor in any domain
-name, directory filepath, advertisement, link or other reference to
-you in any manner or in any media.
-
-4. Your Obligations Regarding Distribution.
-
-a. Application of This License to Your Modifications. As an express
-condition for your use of the Licensed Product, you hereby agree that
-any Modifications that you create or to which you contribute, and
-which you distribute, are governed by the terms of this License
-including, without limitation, Section 2. Any Modifications that you
-create or to which you contribute may be distributed only under the
-terms of this License or a future version of this License released
-under Section 7. You must include a copy of this License with every
-copy of the Modifications you distribute. You agree not to offer or
-impose any terms on any Source Code or executable version of the
-Licensed Product or Modifications that alter or restrict the
-applicable version of this License or the recipients' rights
-hereunder. However, you may include an additional document offering
-the additional rights described in Section 4(d).
-
-b. Availability of Source Code. You must make available, without
-charge, under the terms of this License, the Source Code of the
-Licensed Product and any Modifications that you distribute, either on
-the same media as you distribute any executable or other form of the
-Licensed Product, or via a mechanism generally accepted in the
-software development community for the electronic transfer of data (an
-"Electronic Distribution Mechanism"). The Source Code for any version
-of Licensed Product or Modifications that you distribute must remain
-available for as long as any executable or other form of the Licensed
-Product is distributed by you. You are responsible for ensuring that
-the Source Code version remains available even if the Electronic
-Distribution Mechanism is maintained by a third party.
-
-c. Intellectual Property Matters.
-
-i. Third Party Claims. If you have knowledge that a license to a third
-party's intellectual property right is required to exercise the rights
-granted by this License, you must include a text file with the Source
-Code distribution titled "LEGAL" that describes the claim and the
-party making the claim in sufficient detail that a recipient will know
-whom to contact. If you obtain such knowledge after you make any
-Modifications available as described in Section 4(b), you shall
-promptly modify the LEGAL file in all copies you make available
-thereafter and shall take other steps (such as notifying appropriate
-mailing lists or newsgroups) reasonably calculated to inform those who
-received the Licensed Product from you that new knowledge has been
-obtained.
-
-ii. Contributor APIs. If your Modifications include an application
-programming interface ("API") and you have knowledge of patent
-licenses that are reasonably necessary to implement that API, you must
-also include this information in the LEGAL file.
-
-iii. Representations. You represent that, except as disclosed pursuant
-to 4(c)(i) above, you believe that any Modifications you distribute
-are your original creations and that you have sufficient rights to
-grant the rights conveyed by this License.
-
-d. Required Notices. You must duplicate this License in any
-documentation you provide along with the Source Code of any
-Modifications you create or to which you contribute, and which you
-distribute, wherever you describe recipients' rights relating to
-Licensed Product. You must duplicate the notice contained in Exhibit A
-(the "Notice") in each file of the Source Code of any copy you
-distribute of the Licensed Product. If you created a Modification, you
-may add your name as a Contributor to the Notice. If it is not
-possible to put the Notice in a particular Source Code file due to its
-structure, then you must include such Notice in a location (such as a
-relevant directory file) where a user would be likely to look for such
-a notice. You may choose to offer, and charge a fee for, warranty,
-support, indemnity or liability obligations to one or more recipients
-of Licensed Product. However, you may do so only on your own behalf,
-and not on behalf of the Licensor or any Contributor. You must make it
-clear that any such warranty, support, indemnity or liability
-obligation is offered by you alone, and you hereby agree to indemnify
-the Licensor and every Contributor for any liability incurred by the
-Licensor or such Contributor as a result of warranty, support,
-indemnity or liability terms you offer.
-
-e. Distribution of Executable Versions. You may distribute Licensed
-Product as an executable program under a license of your choice that
-may contain terms different from this License provided (i) you have
-satisfied the requirements of Sections 4(a) through 4(d) for that
-distribution, (ii) you include a conspicuous notice in the executable
-version, related documentation and collateral materials stating that
-the Source Code version of the Licensed Product is available under the
-terms of this License, including a description of how and where you
-have fulfilled the obligations of Section 4(b), and (iii) you make it
-clear that any terms that differ from this License are offered by you
-alone, not by Licensor or any Contributor. You hereby agree to
-indemnify the Licensor and every Contributor for any liability
-incurred by Licensor or such Contributor as a result of any terms you
-offer.
-
-f. Distribution of Derivative Works. You may create Derivative Works
-(e.g., combinations of some or all of the Licensed Product with other
-code) and distribute the Derivative Works as products under any other
-license you select, with the proviso that the requirements of this
-License are fulfilled for those portions of the Derivative Works that
-consist of the Licensed Product or any Modifications thereto.
-
-g. Compensation for Distribution of Executable Versions of Licensed
-Products, Modifications or Derivative Works. Notwithstanding any
-provision of this License to the contrary, by distributing, selling,
-licensing, sublicensing or otherwise making available any Licensed
-Product, or Modification or Derivative Work thereof, you and Licensor
-hereby acknowledge and agree that you may sell, license or sublicense
-for a fee, accept donations or otherwise receive compensation for
-executable versions of a Licensed Product, without paying a royalty or
-other fee to the Licensor or any other Contributor, provided that such
-executable versions (i) contain your or another Contributor?s material
-Modifications, or (ii) are otherwise material Derivative Works. For
-purposes of this License, an executable version of the Licensed
-Product will be deemed to contain a material Modification, or will
-otherwise be deemed a material Derivative Work, if (a) the Licensed
-Product is modified with your own or a third party?s software programs
-or other code, and/or the Licensed Product is combined with a number
-of your own or a third party?s software programs or code,
-respectively, and (b) such software programs or code add or contribute
-material value, functionality or features to the License Product. For
-the avoidance of doubt, to the extent your executable version of a
-Licensed Product does not contain your or another Contributor?s
-material Modifications or is otherwise not a material Derivative Work,
-in each case as contemplated herein, you may not sell, license or
-sublicense for a fee, accept donations or otherwise receive
-compensation for such executable. Additionally, without limitation of
-the foregoing and notwithstanding any provision of this License to the
-contrary, you cannot charge for, sell, license or sublicense for a
-fee, accept donations or otherwise receive compensation for the Source
-Code.
-
-5. Inability to Comply Due to Statute or Regulation. If it is
-impossible for you to comply with any of the terms of this License
-with respect to some or all of the Licensed Product due to statute,
-judicial order, or regulation, then you must (i) comply with the terms
-of this License to the maximum extent possible, (ii) cite the statute
-or regulation that prohibits you from adhering to the License, and
-(iii) describe the limitations and the code they affect. Such
-description must be included in the LEGAL file described in Section
-4(d), and must be included with all distributions of the Source
-Code. Except to the extent prohibited by statute or regulation, such
-description must be sufficiently detailed for a recipient of ordinary
-skill at computer programming to be able to understand it.
-
-6. Application of This License. This License applies to code to which
-Licensor or Contributor has attached the Notice in Exhibit A, which is
-incorporated herein by this reference.
-
-7. Versions of This License.
-
-a. New Versions. Licensor may publish from time to time revised and/or
-new versions of the License.
-
-b. Effect of New Versions. Once Licensed Product has been published
-under a particular version of the License, you may always continue to
-use it under the terms of that version, provided that any such license
-be in full force and effect at the time, and has not been revoked or
-otherwise terminated. You may also choose to use such Licensed Product
-under the terms of any subsequent version (but not any prior version)
-of the License published by Licensor. No one other than Licensor has
-the right to modify the terms applicable to Licensed Product created
-under this License.
-
-c. Derivative Works of this License. If you create or use a modified
-version of this License, which you may do only in order to apply it to
-software that is not already a Licensed Product under this License,
-you must rename your license so that it is not confusingly similar to
-this License, and must make it clear that your license contains terms
-that differ from this License. In so naming your license, you may not
-use any trademark of Licensor or any Contributor.
-
-8. Disclaimer of Warranty. LICENSED PRODUCT IS PROVIDED UNDER THIS
-LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER
-EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE
-LICENSED PRODUCT IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A
-PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE
-QUALITY AND PERFORMANCE OF THE LICENSED PRODUCT IS WITH YOU. SHOULD
-LICENSED PRODUCT PROVE DEFECTIVE IN ANY RESPECT, YOU (AND NOT THE
-LICENSOR OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
-CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF LICENSED
-PRODUCT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-9. Termination.
-
-a. Automatic Termination Upon Breach. This license and the rights
-granted hereunder will terminate automatically if you fail to comply
-with the terms herein and fail to cure such breach within ten (10)
-days of being notified of the breach by the Licensor. For purposes of
-this provision, proof of delivery via email to the address listed in
-the ?WHOIS? database of the registrar for any website through which
-you distribute or market any Licensed Product, or to any alternate
-email address which you designate in writing to the Licensor, shall
-constitute sufficient notification. All sublicenses to the Licensed
-Product that are properly granted shall survive any termination of
-this license so long as they continue to complye with the terms of
-this License. Provisions that, by their nature, must remain in effect
-beyond the termination of this License, shall survive.
-
-b. Termination Upon Assertion of Patent Infringement. If you initiate
-litigation by asserting a patent infringement claim (excluding
-declaratory judgment actions) against Licensor or a Contributor
-(Licensor or Contributor against whom you file such an action is
-referred to herein as Respondent) alleging that Licensed Product
-directly or indirectly infringes any patent, then any and all rights
-granted by such Respondent to you under Sections 1 or 2 of this
-License shall terminate prospectively upon sixty (60) days notice from
-Respondent (the "Notice Period") unless within that Notice Period you
-either agree in writing (i) to pay Respondent a mutually agreeable
-reasonably royalty for your past or future use of Licensed Product
-made by such Respondent, or (ii) withdraw your litigation claim with
-respect to Licensed Product against such Respondent. If within said
-Notice Period a reasonable royalty and payment arrangement are not
-mutually agreed upon in writing by the parties or the litigation claim
-is not withdrawn, the rights granted by Licensor to you under Sections
-1 and 2 automatically terminate at the expiration of said Notice
-Period.
-
-c. Reasonable Value of This License. If you assert a patent
-infringement claim against Respondent alleging that Licensed Product
-directly or indirectly infringes any patent where such claim is
-resolved (such as by license or settlement) prior to the initiation of
-patent infringement litigation, then the reasonable value of the
-licenses granted by said Respondent under Sections 1 and 2 shall be
-taken into account in determining the amount or value of any payment
-or license.
-
-d. No Retroactive Effect of Termination. In the event of termination
-under Sections 9(a) or 9(b) above, all end user license agreements
-(excluding licenses to distributors and resellers) that have been
-validly granted by you or any distributor hereunder prior to
-termination shall survive termination.
-
-10. Limitation of Liability. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL
-THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE,
-SHALL THE LICENSOR, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF LICENSED
-PRODUCT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY
-PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF
-GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND
-ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE
-BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-11. Responsibility for Claims. As between Licensor and Contributors,
-each party is responsible for claims and damages arising, directly or
-indirectly, out of its utilization of rights under this License. You
-agree to work with Licensor and Contributors to distribute such
-responsibility on an equitable basis. Nothing herein is intended or
-shall be deemed to constitute any admission of liability.
-
-12. U.S. Government End Users. The Licensed Product is a commercial
-item, as that term is defined in 48 C.F.R. 2.101 (Oct. 1995),
-consisting of commercial computer software and commercial computer
-software documentation, as such terms are used in 48 C.F.R. 12.212
-(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48
-C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government
-End Users acquire Licensed Product with only those rights set forth
-herein.
-
-13. Miscellaneous. This License represents the complete agreement
-concerning the subject matter hereof. If any provision of this License
-is held to be unenforceable, such provision shall be reformed only to
-the extent necessary to make it enforceable. This License shall be
-governed by California law provisions (except to the extent applicable
-law, if any, provides otherwise), excluding its conflict-of-law
-provisions. You expressly agree that in any litigation relating to
-this license the losing party shall be responsible for costs
-including, without limitation, court costs and reasonable attorneys
-fees and expenses. The application of the United Nations Convention on
-Contracts for the International Sale of Goods is expressly
-excluded. Any law or regulation that provides that the language of a
-contract shall be construed against the drafter shall not apply to
-this License.
-
-14. Definition of You in This License. You throughout this License,
-whether in upper or lower case, means an individual or a legal entity
-exercising rights under, and complying with all of the terms of, this
-License or a future version of this License issued under Section
-7. For legal entities, you includes any entity that controls, is
-controlled by, is under common control with, or affiliated with,
-you. For purposes of this definition, control means (i) the power,
-direct or indirect, to cause the direction or management of such
-entity, whether by contract or otherwise, or (ii) ownership of fifty
-percent (50%) or more of the outstanding shares, or (iii) beneficial
-ownership of such entity. You are responsible for advising any
-affiliated entity of the terms of this License, and that any rights or
-privileges derived from or obtained by way of this License are subject
-to the restrictions outlined herein.
-
-15. Glossary. All defined terms in this License that are used in more
-than one Section of this License are repeated here, in alphabetical
-order, for the convenience of the reader. The Section of this License
-in which each defined term is first used is shown in parentheses.
-
-Contributor: Each person or entity who created or contributed to the
-creation of, and distributed, a Modification. (See Section 2)
-
-Derivative Works: That term as used in this License is defined under
-U.S. copyright law. (See Section 1(b))
-
-License: This BitTorrent Open Source License. (See first paragraph of License)
-
-Licensed Product: Any BitTorrent Product licensed pursuant to this
-License. The term "Licensed Product" includes all previous
-Modifications from any Contributor that you receive. (See first
-paragraph of License and Section 2)
-
-Licensor: BitTorrent, Inc. (See first paragraph of License)
-
-Modifications: Any additions to or deletions from the substance or
-structure of (i) a file containing Licensed Product, or (ii) any new
-file that contains any part of Licensed Product. (See Section 2)
-
-Notice: The notice contained in Exhibit A. (See Section 4(e))
-
-Source Code: The preferred form for making modifications to the
-Licensed Product, including all modules contained therein, plus any
-associated interface definition files, scripts used to control
-compilation and installation of an executable program, or a list of
-differential comparisons against the Source Code of the Licensed
-Product. (See Section 1(a))
-
-You: This term is defined in Section 14 of this License.
-
-EXHIBIT A
-
-The Notice below must appear in each file of the Source Code of any
-copy you distribute of the Licensed Product or any
-hereto. Contributors to any Modifications may add their own copyright
-notices to identify their own contributions.
-
-License:
-
-The contents of this file are subject to the BitTorrent Open Source
-License Version 1.0 (the License). You may not copy or use this file,
-in either source code or executable form, except in compliance with
-the License. You may obtain a copy of the License at
-http://www.bittorrent.com/license/.
-
-Software distributed under the License is distributed on an AS IS
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-the License for the specific language governing rights and limitations
-under the License.
-
-BitTorrent, Inc.
diff --git a/libre/python2-cssmin-fredj/PKGBUILD b/libre/python2-cssmin-fredj/PKGBUILD
deleted file mode 100644
index ba21b8fc4..000000000
--- a/libre/python2-cssmin-fredj/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=python2-cssmin
-pkgname=python2-cssmin-fredj
-pkgver=0.1.4.git4 # 0.1.4.git<number of commits after 0.1.4>
-_gitver='commit=3422b9962c5a6c2adb9597f418131d73e991c9b6'
-pkgdesc="A Python port of the YUI CSS compression algorithm"
-license=('custom:MIT' 'custom:BSD3')
-url="https://github.com/fredj/cssmin"
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-
-pkgrel=2
-arch=(any)
-
-makedepends=('python2-distribute')
-source=("libre://$pkgname-$pkgver.tar.gz")
-md5sums=('09649b374d148014a5644e9df8fcf18e')
-
-mkmakedepends=('git')
-mksource=("$pkgname-$pkgver::git://github.com/fredj/cssmin.git#${_gitver}")
-mkmd5sums=('SKIP')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py src/cssmin.py
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./setup.py install --root="$pkgdir/" --optimize=1
-}
-
diff --git a/libre/python2-django-countries/PKGBUILD b/libre/python2-django-countries/PKGBUILD
deleted file mode 100644
index 36bc6a580..000000000
--- a/libre/python2-django-countries/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=django-countries
-pkgname=python2-$_pkgname
-pkgver=1.5
-pkgdesc="Provides a country field for Django models"
-url="http://bitbucket.org/smileychris/$_pkgname/"
-license=('custom:MIT')
-
-replaces=($_pkgname)
-conflicts=($_pkgname)
-
-pkgrel=3
-arch=(any)
-depends=('python2-django')
-makedepends=('python2-distribute')
-source=(http://pypi.python.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
-md5sums=(6c65fcc3aa7de065a54cdb619397626d)
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py */bin/*.py
-  # fix help message: (python2, typo)
-  # "python regenenerate.py" -> "python2 regenerate.py"
-  sed -i 's|python regen[a-z]*\.py|python2 regenerate.py|' */bin/regenerate.py
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  ./setup.py install --root="$pkgdir/" --optimize=1
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/libre/python2-jsmin/PKGBUILD b/libre/python2-jsmin/PKGBUILD
deleted file mode 100644
index 00c158324..000000000
--- a/libre/python2-jsmin/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=jsmin
-pkgname=python2-jsmin
-pkgver=2.0.8
-pkgdesc="JavaScript minifier"
-url="https://bitbucket.org/dcs/jsmin"
-license=('MIT')
-
-pkgrel=1
-arch=('any')
-depends=('python2')
-makedepends=('python2-distribute')
-source=(http://pypi.python.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
-
-build() {
-	cd "$srcdir/$_pkgname-$pkgver"
-	sed -rn 's/^#\s?//p' jsmin/__init__.py > license.txt
-}
-
-package() {
-	cd "$srcdir/$_pkgname-$pkgver"
-	python2 setup.py install --root="$pkgdir" --optimize=1
-	install -Dm644 license.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-md5sums=('d830a979d63bfa0bc23e11fdbc816e7d')
diff --git a/libre/python2-ply/PKGBUILD b/libre/python2-ply/PKGBUILD
deleted file mode 100644
index fec80926a..000000000
--- a/libre/python2-ply/PKGBUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-# Contributor: Marcin "avalan" Falkiewicz <avalatron@gmail.com>
-# Maintainer: C Anthony Risinger <anthony@xtfx.me>
-
-pkgname='python2-ply'
-pkgver=3.4
-pkgrel=1
-pkgdesc='Implementation of lex and yacc parsing tools for Python.'
-arch=('any')
-url='http://www.dabeaz.com/ply/'
-license=('BSD')
-depends=('python2')
-makedepends=('python2-distribute')
-source=("${url}ply-${pkgver}.tar.gz")
-md5sums=('ffdc95858819347bf92d7c2acc074894')
-
-build() { cd "ply-${pkgver}"; python2 setup.py install --root="${pkgdir}"; }
diff --git a/libre/python2-reportlab-libre/PKGBUILD b/libre/python2-reportlab-libre/PKGBUILD
deleted file mode 100755
index 0fc667e51..000000000
--- a/libre/python2-reportlab-libre/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 97428 2013-09-19 18:56:42Z jelle $
-# Maintainer:
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor: borgo <nomail>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgbase=python-reportlab-libre
-pkgname=python2-reportlab-libre
-_origname=reportlab
-pkgver=2.7
-pkgrel=1
-pkgdesc="A proven industry-strength PDF generating solution, without nonfree Adobe T1 fonts"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.reportlab.org/rl_toolkit.html"
-depends=('python2' 'freetype2')
-conflicts=('python-reportlab<=2.5-2' 'python2-reportlab')
-replaces=('python-reportlab<=2.5-2' 'python2-reportlab')
-provides=("python2-reportlab=$pkgver")
-license=('custom')
-source=(http://www.reportlab.com/ftp/reportlab-$pkgver.tar.gz
-        free-fonts.patch)
-md5sums=('78300e6fe8a0d020fc16734a3de80cc4'
-         '1588b88851711cc6c868db4c7d4f4dea')
-
-build() {
-    cd $srcdir/${_origname}-$pkgver
-
-    # remove nonfree Adobe T1 fonts
-    patch -p1 -i $srcdir/free-fonts.patch
-
-    # Parabola contains those fonts from the ttf-bitstream-vera package
-    rm -f src/reportlab/fonts/{bitstream-vera-license.txt,Vera*}
-
-    # python2 fix
-    for file in src/reportlab/graphics/widgets/table.py src/reportlab/lib/normalDate.py \
-                src/reportlab/pdfgen/pycanvas.py; do
-        sed -i 's_#!.*/usr/bin/env python_#!/usr/bin/env python2_' $file
-    done
-}
-
-package_python2-reportlab-libre() {
-    cd $srcdir/${_origname}-$pkgver
-    python2 setup.py install --root=$pkgdir --optimize=1
-    install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt
-}
-
-check() {
-    cd ${srcdir}/${_origname}-${pkgver}
-#    python2 setup.py tests
-}
diff --git a/libre/python2-reportlab-libre/free-fonts.patch b/libre/python2-reportlab-libre/free-fonts.patch
deleted file mode 100644
index b2683931b..000000000
--- a/libre/python2-reportlab-libre/free-fonts.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff -rupN reportlab-2.6.orig/setup.py reportlab-2.6/setup.py
---- reportlab-2.6.orig/setup.py	2012-09-27 13:14:06.000000000 -0300
-+++ reportlab-2.6/setup.py	2012-10-18 14:34:16.750336101 -0200
-@@ -222,11 +222,11 @@ def get_fonts(PACKAGE_DIR, reportlab_fil
-         infoline("Standard T1 font curves already downloaded")
-         return
-     try:
--        infoline("Downloading standard T1 font curves")
-+        #infoline("Downloading standard T1 font curves")
- 
--        remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip")
--        zipdata = StringIO.StringIO(remotehandle.read())
--        remotehandle.close()
-+        #remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip")
-+        #zipdata = StringIO.StringIO(remotehandle.read())
-+        #remotehandle.close()
-         archive = zipfile.ZipFile(zipdata)
-         dst = pjoin(rl_dir, 'fonts')
- 
-@@ -239,7 +239,7 @@ def get_fonts(PACKAGE_DIR, reportlab_fil
-     except:
-         xitmsg = "Failed to download standard T1 font curves"
-     reportlab_files = [x for x in reportlab_files if os.path.isfile(pjoin(rl_dir,x))]
--    infoline(xitmsg)
-+    #infoline(xitmsg)
- 
- def main():
-     #test to see if we've a special command
-diff -rupN reportlab-2.6.orig/src/reportlab/pdfbase/_fontdata.py reportlab-2.6/src/reportlab/pdfbase/_fontdata.py
---- reportlab-2.6.orig/src/reportlab/pdfbase/_fontdata.py	2012-09-27 11:39:39.000000000 -0300
-+++ reportlab-2.6/src/reportlab/pdfbase/_fontdata.py	2012-10-18 14:36:08.018365073 -0200
-@@ -72,20 +72,20 @@ _font2fnrMapWin32 = {
-                     }
- if sys.platform in ('linux2',):
-     _font2fnrMapLinux2 ={
--                'symbol': 'Symbol',
--                'zapfdingbats': 'ZapfDingbats',
--                'helvetica': 'Arial',
--                'helvetica-bold': 'Arial-Bold',
--                'helvetica-boldoblique': 'Arial-BoldItalic',
--                'helvetica-oblique': 'Arial-Italic',
--                'times-bold': 'TimesNewRoman-Bold',
--                'times-bolditalic':'TimesNewRoman-BoldItalic',
--                'times-italic': 'TimesNewRoman-Italic',
--                'times-roman': 'TimesNewRoman',
--                'courier-bold': 'Courier-Bold',
--                'courier-boldoblique': 'Courier-BoldOblique',
--                'courier': 'Courier',
--                'courier-oblique': 'Courier-Oblique',
-+                'symbol': 's050000l.pfb',
-+                'zapfdingbats': 'd050000l.pfb',
-+                'helvetica': 'n019003l.pfb',
-+                'helvetica-bold': 'n019004l.pfb',
-+                'helvetica-boldoblique': 'n019024l.pfb',
-+                'helvetica-oblique': 'n019023l.pfb',
-+                'times-bold': 'n021004l.pfb',
-+                'times-bolditalic':'n021024l.pfb',
-+                'times-italic': 'n021023l.pfb',
-+                'times-roman': 'n021003l.pfb',
-+                'courier-bold': 'n022004l.pfb',
-+                'courier-boldoblique': 'n022024l.pfb',
-+                'courier': 'n022003l.pfb',
-+                'courier-oblique': 'n022023l.pfb',
-                 }
-     _font2fnrMap = _font2fnrMapLinux2
-     for k, v in _font2fnrMap.items():
-diff -rupN reportlab-2.6.orig/src/reportlab/rl_config.py reportlab-2.6/src/reportlab/rl_config.py
---- reportlab-2.6.orig/src/reportlab/rl_config.py	2012-09-27 11:39:39.000000000 -0300
-+++ reportlab-2.6/src/reportlab/rl_config.py	2012-10-18 16:05:12.683766581 -0200
-@@ -49,25 +49,7 @@ ttfAsciiReadable=           1
- 
- # places to look for T1Font information
- T1SearchPath =  (
--                'c:/Program Files/Adobe/Acrobat 9.0/Resource/Font', 
--                'c:/Program Files/Adobe/Acrobat 8.0/Resource/Font', 
--                'c:/Program Files/Adobe/Acrobat 7.0/Resource/Font', 
--                'c:/Program Files/Adobe/Acrobat 6.0/Resource/Font', #Win32, Acrobat 6
--                'c:/Program Files/Adobe/Acrobat 5.0/Resource/Font',     #Win32, Acrobat 5
--                'c:/Program Files/Adobe/Acrobat 4.0/Resource/Font', #Win32, Acrobat 4
--                '%(disk)s/Applications/Python %(sys_version)s/reportlab/fonts', #Mac?
--                '/usr/lib/Acrobat9/Resource/Font',      #Linux, Acrobat 5?
--                '/usr/lib/Acrobat8/Resource/Font',      #Linux, Acrobat 5?
--                '/usr/lib/Acrobat7/Resource/Font',      #Linux, Acrobat 5?
--                '/usr/lib/Acrobat6/Resource/Font',      #Linux, Acrobat 5?
--                '/usr/lib/Acrobat5/Resource/Font',      #Linux, Acrobat 5?
--                '/usr/lib/Acrobat4/Resource/Font',      #Linux, Acrobat 4
--                '/usr/local/Acrobat9/Resource/Font',    #Linux, Acrobat 5?
--                '/usr/local/Acrobat8/Resource/Font',    #Linux, Acrobat 5?
--                '/usr/local/Acrobat7/Resource/Font',    #Linux, Acrobat 5?
--                '/usr/local/Acrobat6/Resource/Font',    #Linux, Acrobat 5?
--                '/usr/local/Acrobat5/Resource/Font',    #Linux, Acrobat 5?
--                '/usr/local/Acrobat4/Resource/Font',    #Linux, Acrobat 4
-+                '/usr/share/fonts/Type1',
-                 '%(REPORTLAB_DIR)s/fonts',              #special
-                 '%(REPORTLAB_DIR)s/../fonts',           #special
-                 '%(REPORTLAB_DIR)s/../../fonts',        #special
-@@ -76,44 +58,17 @@ T1SearchPath =  (
- 
- # places to look for TT Font information
- TTFSearchPath = (
--                'c:/winnt/fonts',
--                'c:/windows/fonts',
--                '/usr/lib/X11/fonts/TrueType/',
--                '/usr/share/fonts/truetype',
-+                '/usr/share/fonts/TTF',
-                 '%(REPORTLAB_DIR)s/fonts',      #special
-                 '%(REPORTLAB_DIR)s/../fonts',   #special
-                 '%(REPORTLAB_DIR)s/../../fonts',#special
-                 '%(HOME)s/fonts',               #special
--                #mac os X - from
--                #http://developer.apple.com/technotes/tn/tn2024.html
--                '~/Library/Fonts',
--                '/Library/Fonts',
--                '/Network/Library/Fonts',
--                '/System/Library/Fonts',
--                
-                 )
- 
- # places to look for CMap files - should ideally merge with above
- CMapSearchPath = (
--                  '/usr/lib/Acrobat9/Resource/CMap',
--                  '/usr/lib/Acrobat8/Resource/CMap',
--                  '/usr/lib/Acrobat7/Resource/CMap',
--                  '/usr/lib/Acrobat6/Resource/CMap',
--                  '/usr/lib/Acrobat5/Resource/CMap',
--                  '/usr/lib/Acrobat4/Resource/CMap',
--                  '/usr/local/Acrobat9/Resource/CMap',
--                  '/usr/local/Acrobat8/Resource/CMap',
--                  '/usr/local/Acrobat7/Resource/CMap',
--                  '/usr/local/Acrobat6/Resource/CMap',
--                  '/usr/local/Acrobat5/Resource/CMap',
--                  '/usr/local/Acrobat4/Resource/CMap',
--                  'C:\\Program Files\\Adobe\\Acrobat\\Resource\\CMap',
--                  'C:\\Program Files\\Adobe\\Acrobat 9.0\\Resource\\CMap',
--                  'C:\\Program Files\\Adobe\\Acrobat 8.0\\Resource\\CMap',
--                  'C:\\Program Files\\Adobe\\Acrobat 7.0\\Resource\\CMap',
--                  'C:\\Program Files\\Adobe\\Acrobat 6.0\\Resource\\CMap',
--                  'C:\\Program Files\\Adobe\\Acrobat 5.0\\Resource\\CMap',
--                  'C:\\Program Files\\Adobe\\Acrobat 4.0\\Resource\\CMap',
-+                  '/usr/share/ghostscript/9.04/Resource/CMap',
-+                  '/usr/share/ghostscript/9.06/Resource/CMap',
-                   '%(REPORTLAB_DIR)s/fonts/CMap',       #special
-                   '%(REPORTLAB_DIR)s/../fonts/CMap',    #special
-                   '%(REPORTLAB_DIR)s/../../fonts/CMap', #special
diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD
deleted file mode 100644
index bf945b53f..000000000
--- a/libre/qupzilla-libre/PKGBUILD
+++ /dev/null
@@ -1,88 +0,0 @@
-# $Id: PKGBUILD 102853 2013-12-22 11:43:13Z speps $
-# Maintainer: speps <speps at aur dot archlinux dot org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgbase=qupzilla
-pkgbase=qupzilla-libre
-pkgname=(qupzilla-libre qupzilla-libre-qt5)
-pkgver=1.4.4
-pkgrel=2
-arch=(i686 x86_64 mips64el)
-url="http://www.qupzilla.com/"
-license=('GPL3')
-makedepends=('qtwebkit' 'qt5-webkit' 'qt5-script' 'hunspell')
-optdepends=('bash-completion: bash completion support')
-source=("$_pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/$_pkgbase/tarball/v$pkgver"
-         'searchenginesmanager.cpp.sed'
-         'speeddial.cpp.sed'
-         'start.html.sed')
-noextract=("$_pkgbase-$pkgver.tar.gz")
-install="$_pkgbase.install"
-md5sums=('cfbf5cd23d184275c389c79a39a28631'
-         '1d926e97a5b287d40fb695f6516f2a06'
-         '0f166fa102af975b3b8ac030d477e9b8'
-         '77120a0c39ba8254e5b2c273910f029a')
-
-prepare() {
-  # extract
-  mkdir -p qt{4,5}
-  bsdtar --strip-components 1 -zxf $_pkgbase-$pkgver.tar.gz -C qt4
-  bsdtar --strip-components 1 -zxf $_pkgbase-$pkgver.tar.gz -C qt5
-
-  # configure
-  export USE_WEBGL=true \
-         QUPZILLA_PREFIX=/usr/
-
-  # remove Google and Youtube support, replaces it to DDG HTML
-  cd qt4
-  sed -i -f $srcdir/searchenginesmanager.cpp.sed src/lib/opensearch/searchenginesmanager.cpp
-  sed -i -f $srcdir/speeddial.cpp.sed src/lib/plugins/speeddial.cpp
-  sed -i -f $srcdir/start.html.sed src/lib/data/html/start.html
-
-  cd ../qt5
-  sed -i -f $srcdir/searchenginesmanager.cpp.sed src/lib/opensearch/searchenginesmanager.cpp
-  sed -i -f $srcdir/speeddial.cpp.sed src/lib/plugins/speeddial.cpp
-  sed -i -f $srcdir/start.html.sed src/lib/data/html/start.html
-}
-
-build() {
-  cd qt4
-  qmake-qt4
-  make
-
-  cd ../qt5
-  qmake
-  make
-}
-
-package_qupzilla-libre() {
-  pkgdesc="Cross-platform QtWebKit browser, without non-privacy search providers"
-  depends=('qtwebkit' 'hunspell')
-  provides=qupzilla=$pkgver
-  conflicts=qupzilla
-  replaces=qupzilla
-
-  cd qt4
-  make INSTALL_ROOT="$pkgdir/" install
-
-  # zsh completion
-  install -Dm644 linux/completion/zsh_completion.sh \
-    "$pkgdir/usr/share/zsh/site-functions/_$_pkgbase"
-}
-
-package_qupzilla-libre-qt5() {
-  pkgdesc="Cross-platform QtWebKit browser (Qt5), without non-privacy search providers"
-  depends=('qt5-webkit' 'qt5-script' 'hunspell' 'desktop-file-utils' 'hicolor-icon-theme')
-  provides=("qupzilla-qt5=$pkgver" 'qupzilla-libre')
-  conflicts=('qupzilla-qt5' 'qupzilla-libre')
-  replaces=qupzilla-qt5
-
-  cd qt5
-  make INSTALL_ROOT="$pkgdir/" install
-
-  # zsh completion
-  install -Dm644 linux/completion/zsh_completion.sh \
-    "$pkgdir/usr/share/zsh/site-functions/_$_pkgbase"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/qupzilla-libre/qupzilla.install b/libre/qupzilla-libre/qupzilla.install
deleted file mode 100644
index 029294d67..000000000
--- a/libre/qupzilla-libre/qupzilla.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/libre/qupzilla-libre/searchenginesmanager.cpp.sed b/libre/qupzilla-libre/searchenginesmanager.cpp.sed
deleted file mode 100644
index 76011d058..000000000
--- a/libre/qupzilla-libre/searchenginesmanager.cpp.sed
+++ /dev/null
@@ -1,19 +0,0 @@
-s|DuckDuckGo|DuckDuckGo HTML|
-\|m_startingEngineName = settings[.]value("activeEngine", "Google")[.]toString();| s|Google|DuckDuckGo HTML|
-\|m_defaultEngineName = settings[.]value("DefaultEngine", "Google")[.]toString();| s|Google|DuckDuckGo HTML|
-\|Engine google;|d
-\|google[.]name = "Google";|d
-\|google[.]icon = QIcon(":icons/sites/google[.]png");|d
-\|google[.]url = "http://www[.]google[.]com/search?client=qupzilla[&]q=%s";|d
-\|google[.]shortcut = "g";|d
-\|google[.]suggestionsUrl = "http://suggestqueries[.]google[.]com/complete/search?output=firefox[&]q=%s";|d
-\|Engine yt;|d
-\|yt[.]name = "YouTube";|d
-\|yt[.]icon = QIcon(":/icons/sites/youtube.png");|d
-\|yt[.]url = "http://www[.]youtube[.]com/results?search_query=%s[&]search=Search";|d
-\|yt[.]shortcut = "yt";|d
-\|yt[.]suggestionsUrl = "http://suggestqueries[.]google[.]com/complete/search?ds=yt[&]output=firefox[&]q=%s";|d
-\|https://duckduckgo[.]com/?q=%s[&]t=qupzilla| s|duckduckgo[.]com|duckduckgo.com/html|
-\|addEngine(google);|d
-\|addEngine(yt);|d
-\|m_defaultEngine = google;| s|google|duck|
diff --git a/libre/qupzilla-libre/speeddial.cpp.sed b/libre/qupzilla-libre/speeddial.cpp.sed
deleted file mode 100644
index b8f591e87..000000000
--- a/libre/qupzilla-libre/speeddial.cpp.sed
+++ /dev/null
@@ -1,4 +0,0 @@
-s|www[.]google[.]com|duckduckgo.com/html|
-s|Google|DuckDuckGo HTML|
-\#"url:[\]"https://github[.]com/QupZilla/qupzilla[\]"|title:[\]"QupZilla GitHub[\]";"# s#$#;#
-\#"url:[\]"https://duckduckgo[.]com[\]"|title:[\]"DuckDuckGo[\]";";#d
diff --git a/libre/qupzilla-libre/start.html.sed b/libre/qupzilla-libre/start.html.sed
deleted file mode 100644
index f59a65979..000000000
--- a/libre/qupzilla-libre/start.html.sed
+++ /dev/null
@@ -1 +0,0 @@
-\|<form action="https://duckduckgo[.]com/" method="GET">| s|duckduckgo[.]com|duckduckgo.com/html|
diff --git a/libre/reflector/PKGBUILD b/libre/reflector/PKGBUILD
deleted file mode 100644
index d3b64fd8e..000000000
--- a/libre/reflector/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-#Maintainer: Xyne <ac xunilhcra enyx, backwards>
-#Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-pkgname=reflector
-pkgver=2013.12.15.1
-pkgrel=1
-pkgdesc='A Python 3 module and script to retrieve and filter the latest Pacman mirror list (Parabola rebranded)'
-arch=(any)
-license=(GPL)
-url="http://xyne.archlinux.ca/projects/reflector"
-depends=(python3)
-source=(
-  http://xyne.archlinux.ca/projects/reflector/src/reflector-2013.12.15.1.tar.xz
-  http://xyne.archlinux.ca/projects/reflector/src/reflector-2013.12.15.1.tar.xz.sig
-  rebranding.patch
-)
-sha512sums=(
-  ac8a23fb6746d85ee4e4d707659da07f5a7b6c18cadba03c8b03430cae70f444e6b35404342da2f9c0ea490e8c4c0f408657880de00a57d9f94d4ab335aa7c55
-  SKIP
-  83609177f88c0412f1a543f0431ecfb8be229bfef76d7087c35e9273988faedaf24a98ca45d98248eb5dfaa9a27e321dea99a256c68c5bc86a8a0ba53ed56d02
-)
-md5sums=(
-  ccb315013442b7c8aa42c1d017835d38
-  SKIP
-  24c2a21bc1ac0d3758d8043f36d95add
-)
-
-prepare ()
-{
-  cd "$srcdir/$pkgname-$pkgver"
-  # Rebranding for Parabola
-  patch -Np1 -i "$srcdir/rebranding.patch"
-}
-
-package ()
-{
-  cd "$srcdir/$pkgname-$pkgver"
-  python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-  install -Dm755 "$srcdir/$pkgname-$pkgver/$pkgname" "$pkgdir/usr/bin/$pkgname"
-}
-
-
-# vim: set ts=2 sw=2 et:
diff --git a/libre/reflector/rebranding.patch b/libre/reflector/rebranding.patch
deleted file mode 100644
index d78462b06..000000000
--- a/libre/reflector/rebranding.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/Reflector.py b/Reflector.py
-index c046d23..ddf3ac8 100644
---- a/Reflector.py
-+++ b/Reflector.py
-@@ -63,7 +63,7 @@ def get_cache_file():
- 
- class MirrorStatus():
-   # JSON URI
--  URL = 'https://www.archlinux.org/mirrors/status/json/'
-+  URL = 'https://parabolagnulinux.org/mirrors/status/json/'
-   # Mirror URL format. Accepts server base URL, repository, and architecture.
-   MIRROR_URL_FORMAT = '{0}{1}/os/{2}'
-   MIRRORLIST_ENTRY_FORMAT = "Server = " + MIRROR_URL_FORMAT + "\n"
-@@ -92,8 +92,12 @@ class MirrorStatus():
-     'extra',
-     'gnome-unstable',
-     'kde-unstable',
-+    'libre',
-+    'libre-testing',
-     'multilib',
--    'multilib-testing'
-+    'multilib-testing',
-+    'nonprism',
-+    'pcr',
-     'staging',
-     'testing'
-   )
-@@ -449,7 +453,7 @@ class MirrorStatus():
- 
-     width = 80
-     colw = 11
--    header = '# Arch Linux mirrorlist generated by Reflector #'.center(width, '#')
-+    header = '# Parabola GNU/Linux-libre mirrorlist generated by Reflector #'.center(width, '#')
-     border = '#' * len(header)
-     mirrorlist = '{}\n{}\n{}\n'.format(border, header, border) + \
-       '\n' + \
-@@ -516,7 +520,7 @@ def add_arguments(parser):
-   '''
-   Add reflector arguments to the argument parser.
-   '''
--  parser = argparse.ArgumentParser(description='retrieve and filter a list of the latest Arch Linux mirrors')
-+  parser = argparse.ArgumentParser(description='retrieve and filter a list of the latest Parabola GNU/Linux-libre mirrors')
- 
-   parser.add_argument(
-     '--connection-timeout', dest='connection_timeout', type=int, metavar='n', default=5,
-@@ -535,7 +539,7 @@ def add_arguments(parser):
- 
-   parser.add_argument(
-     '--cache-timeout', dest='cache_timeout', type=int, metavar='n', default=300,
--    help='The cache timeout in seconds for the data retrieved from the Arch Linux Mirror Status API. The default is 300 (5 minutes).'
-+    help='The cache timeout in seconds for the data retrieved from the Parabola GNU/Linux-libre Mirror Status API. The default is 300 (5 minutes).'
-   )
- 
-   parser.add_argument(
-@@ -615,7 +619,7 @@ def parse_args(args=None):
-   Parse command-line arguments.
-   '''
-   parser = argparse.ArgumentParser(
--    description='retrieve and filter a list of the latest Arch Linux mirrors'
-+    description='retrieve and filter a list of the latest Parabola GNU/Linux-libre mirrors'
-   )
-   parser = add_arguments(parser)
-   options = parser.parse_args(args)
diff --git a/libre/ronn/PKGBUILD b/libre/ronn/PKGBUILD
deleted file mode 100644
index 4bd097048..000000000
--- a/libre/ronn/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
-
-_gemname=ronn
-pkgname=$_gemname
-pkgver=0.7.3
-pkgdesc="The opposite of roff; manual authoring tool"
-url="http://rtomayko.github.io/ronn/"
-license=('custom:MIT')
-
-provides=(ruby-$_gemname=$pkgver)
-
-pkgrel=4
-arch=('any')
-depends=('ruby' 'ruby-hpricot' 'ruby-rdiscount' 'ruby-mustache')
-makedepends=('rubygems')
-source=(http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem)
-noextract=($_gemname-$pkgver.gem)
-md5sums=('c5aa4ef58d35d0cc635b769281e03225')
-
-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"
-
-  install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \
-                 "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-  shopt -s nullglob
-  for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do
-    install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/}
-  done
-}
diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
deleted file mode 100644
index f7adb5b80..000000000
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $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@parabola.nu>
-
-_pkgname=rp-pppoe
-pkgname=rp-pppoe-libre
-pkgver=3.11
-pkgrel=4
-pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client, without nonfree ServPoET recommendation"
-arch=('i686' 'x86_64')
-url="http://www.roaringpenguin.com/pppoe/"
-license=('GPL')
-depends=('ppp>=2.4.5' 'sh' 'net-tools')
-backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq 
-        etc/ppp/pppoe-server-options)
-options=('!makeflags')
-provides=("rp-pppoe=$pkgver")
-replaces=('rp-pppoe')
-conflicts=('rp-pppoe')
-install=rp-pppoe.install
-source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} 
-       adsl.service 
-       kmode.patch
-       $pkgname.patch)
-
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  
-  ## Adding patch to remove nonfree software recommendation (ServPoET)
-  patch -Np1 -i "$srcdir/rp-pppoe-libre.patch"
-
-  cd "$srcdir/$_pkgname-$pkgver/src"
-  patch -Np2 -i ../../kmode.patch
-}
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver/src"
-  ./configure --prefix=/usr --sbindir=/usr/bin --enable-plugin
-  make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver/src"
-  make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install
-
-  #install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl"
-  install -Dm644 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service"
-}
-md5sums=('13b5900c56bd602df6cc526e5e520722'
-         'SKIP'
-         '45dc8fc3d0341a3930182a480859ad76'
-         'd38a903a247d689ff0323d7b6caa1c6b'
-         '3c53d550ac408608abb0b6cd6b76b6c2')
diff --git a/libre/rp-pppoe-libre/adsl b/libre/rp-pppoe-libre/adsl
deleted file mode 100644
index 33bd91839..000000000
--- a/libre/rp-pppoe-libre/adsl
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting ADSL Connection"
-    /usr/sbin/pppoe-start &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon adsl
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ADSL Connection"
-    /usr/sbin/pppoe-stop &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon adsl
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/libre/rp-pppoe-libre/adsl.service b/libre/rp-pppoe-libre/adsl.service
deleted file mode 100644
index f9a2fdcc6..000000000
--- a/libre/rp-pppoe-libre/adsl.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=ADSL Deamon
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/pppoe-start
-ExecStop=/usr/bin/pppoe-stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/rp-pppoe-libre/kmode.patch b/libre/rp-pppoe-libre/kmode.patch
deleted file mode 100644
index 37eef58f7..000000000
--- a/libre/rp-pppoe-libre/kmode.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up rp-pppoe-3.11/src/configure.orig rp-pppoe-3.11/src/configure
---- rp-pppoe-3.11/src/configure.orig	2012-08-17 12:31:25.000000000 -0600
-+++ rp-pppoe-3.11/src/configure	2013-02-11 14:23:05.000000000 -0700
-@@ -3679,6 +3679,7 @@ do :
- #include<net/ethernet.h>
- #include<linux/if.h>
- #include<linux/in.h>
-+#include<linux/in6.h>
- 
- "
- if test "x$ac_cv_header_linux_if_pppox_h" = x""yes; then :
-@@ -4525,6 +4526,7 @@ else
- #include <net/ethernet.h>
- #include <linux/if.h>
- #include <linux/in.h>
-+#include <linux/in6.h>
- #include <linux/if_pppox.h>
- int main()
- {
diff --git a/libre/rp-pppoe-libre/rp-pppoe-libre.patch b/libre/rp-pppoe-libre/rp-pppoe-libre.patch
deleted file mode 100644
index 9cf16d7d7..000000000
--- a/libre/rp-pppoe-libre/rp-pppoe-libre.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -Nur rp-pppoe-3.11.orig/rp-pppoe.spec rp-pppoe-3.11/rp-pppoe.spec
---- rp-pppoe-3.11.orig/rp-pppoe.spec	2012-08-17 15:31:25.000000000 -0300
-+++ rp-pppoe-3.11/rp-pppoe.spec	2012-10-05 01:42:29.964508454 -0300
-@@ -55,7 +55,7 @@
- 
- %files
- %defattr(-,root,root)
--%doc doc/CHANGES doc/HOW-TO-CONNECT doc/LICENSE doc/KERNEL-MODE-PPPOE README SERVPOET
-+%doc doc/CHANGES doc/HOW-TO-CONNECT doc/LICENSE doc/KERNEL-MODE-PPPOE README
- %config(noreplace) /etc/ppp/pppoe.conf
- %config(noreplace) /etc/ppp/pppoe-server-options
- %config(noreplace) /etc/ppp/firewall-masq
-diff -Nur rp-pppoe-3.11.orig/SERVPOET /dev/null
---- rp-pppoe-3.11.orig/SERVPOET	2012-08-17 15:31:25.000000000 -0300
-+++ /dev/null	2012-10-05 01:27:08.580078512 -0300
-@@ -1,18 +0,0 @@
--# LIC: GPL
--
--ServPoET
----------
--
--ServPoET is a commercial version of the PPPoE server.  While everything
--you received in this package is licensed under the GNU General Public
--License, ServPoET is not free software and is licensed under a traditional
--commercial license.
--
--ServPoET features RADIUS support, support for different realms,
--real-time server status reporting and a friendly curses-based GUI for
--administration.  For information on ServPoET:
--
--Contact Fine Point Technologies, Inc.  (http://www.finepoint.com/)
--
----
--David F. Skoll <dfs@roaringpenguin.com>
-diff -Nur rp-pppoe-3.11.orig/src/Makefile.in rp-pppoe-3.11/src/Makefile.in
---- rp-pppoe-3.11.orig/src/Makefile.in	2012-08-17 15:31:25.000000000 -0300
-+++ rp-pppoe-3.11/src/Makefile.in	2012-10-05 01:46:13.121336619 -0300
-@@ -44,9 +44,6 @@
- PPPOE_PATH=$(sbindir)/pppoe
- PPPD_PATH=@PPPD@
- 
--# Include ServPoET version if we're building for ServPoET
--@LIC_MAKEFILE_INCLUDE@
--
- # Kernel-mode plugin gets installed here.
- PLUGIN_DIR=/etc/ppp/plugins
- PLUGIN_PATH=$(PLUGIN_DIR)/rp-pppoe.so
-@@ -152,7 +149,6 @@
- 	$(install) -m 644 ../doc/HOW-TO-CONNECT $(DESTDIR)$(docdir)
- 	$(install) -m 644 ../doc/LICENSE $(DESTDIR)$(docdir)
- 	$(install) -m 644 ../README $(DESTDIR)$(docdir)
--	$(install) -m 644 ../SERVPOET $(DESTDIR)$(docdir)
- 	$(install) -m 644 ../configs/pap-secrets $(DESTDIR)$(docdir)
- 	-mkdir -p $(DESTDIR)$(mandir)/man8
- 	for i in $(TARGETS) ; do \
-@@ -210,25 +206,15 @@
- 	@echo ""
- 	@echo "Type 'pppoe-setup' to configure the software."
- 
--servpoet-tgz: distro-servpoet
--	cd .. && tar cvf servpoet-$(VERSION)$(BETA).tar servpoet-$(VERSION)$(BETA)
--	gzip -f -v -9 ../servpoet-$(VERSION)$(BETA).tar
--	rm -rf ../servpoet-$(VERSION)$(BETA)
--
- tgz: distro
- 	cd .. && tar cvf rp-pppoe-$(VERSION)$(BETA).tar rp-pppoe-$(VERSION)$(BETA)
- 	gzip -f -v -9 ../rp-pppoe-$(VERSION)$(BETA).tar
- 	rm -rf ../rp-pppoe-$(VERSION)$(BETA)
- 
--distro-servpoet: distro
--	cp ../servpoet.spec ../rp-pppoe-$(VERSION)$(BETA)
--	$(MAKE) -C licensed-only distro VERSION=$(VERSION) BETA=$(BETA)
--	mv ../rp-pppoe-$(VERSION)$(BETA) ../servpoet-$(VERSION)$(BETA)
--
- distro:
- 	rm -rf ../rp-pppoe-$(VERSION)$(BETA)
- 	mkdir ../rp-pppoe-$(VERSION)$(BETA)
--	for i in README SERVPOET go go-gui rp-pppoe.spec ; do \
-+	for i in README go go-gui rp-pppoe.spec ; do \
- 		cp ../$$i ../rp-pppoe-$(VERSION)$(BETA) || exit 1; \
- 	done
- 	mkdir ../rp-pppoe-$(VERSION)$(BETA)/gui
-@@ -286,10 +272,6 @@
- 		/usr/src/redhat/RPMS/i386/rp-pppoe-$(VERSION)-1.i386.rpm \
- 		/usr/src/redhat/RPMS/i386/rp-pppoe-gui-$(VERSION)-1.i386.rpm
- 
--servpoet-rpms: servpoet-tgz
--	cp ../servpoet-$(VERSION).tar.gz /usr/src/redhat/SOURCES
--	cd .. && rpm -ba servpoet.spec
--
- clean:
- 	rm -f *.o pppoe-relay pppoe pppoe-sniff pppoe-server core rp-pppoe.so plugin/*.o plugin/libplugin.a *~
- 	test -f licensed-only/Makefile && $(MAKE) -C licensed-only clean || true
-@@ -304,15 +286,13 @@
- update-version:
- 	sed -e 's/^Version: .*$$/Version: $(VERSION)/' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec
- 	sed -e 's+^Source: .*$$+Source: http://www.roaringpenguin.com/pppoe/rp-pppoe-$(VERSION).tar.gz+' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec
--	test -f ../servpoet.spec && sed -e 's/^Version: .*$$/Version: $(VERSION)/' ../servpoet.spec > ../servpoet.spec.new && mv ../servpoet.spec.new ../servpoet.spec || true
--	test -f ../servpoet.spec && sed -e 's+^Source: .*$$+Source: http://www.roaringpenguin.com/pppoe/servpoet-$(VERSION).tar.gz+' ../servpoet.spec > ../servpoet.spec.new && mv ../servpoet.spec.new ../servpoet.spec || true
- 
- # Convenience target for David!  Don't try to use this one.
- km:
- 	./configure --enable-plugin=/home/dfs/Archive/PPP/ppp-2.4.0.pppoe4-patched-dfs
- 
- licensed-only:
--	$(MAKE) -C licensed-only all VERSION=$(VERSION) SERVPOET_VERSION=$(SERVPOET_VERSION)
-+	$(MAKE) -C licensed-only all VERSION=$(VERSION)
- 
- l2tp: libevent/libevent.a
- 	$(MAKE) -C l2tp all
diff --git a/libre/rp-pppoe-libre/rp-pppoe.install b/libre/rp-pppoe-libre/rp-pppoe.install
deleted file mode 100644
index 1d4bccce2..000000000
--- a/libre/rp-pppoe-libre/rp-pppoe.install
+++ /dev/null
@@ -1,12 +0,0 @@
-#arg 1:  the new package version
-post_install() {
-echo ">>> The kernel-mode plugin has a new place."
-echo ">>> It's now located under /usr/lib/rp-pppoe/rp-pppoe.so"
-echo ">>> Change LINUX_PLUGIN to the new path in your /etc/ppp/pppoe.conf"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
diff --git a/libre/ruby-hpricot/PKGBUILD b/libre/ruby-hpricot/PKGBUILD
deleted file mode 100644
index ad9aefc36..000000000
--- a/libre/ruby-hpricot/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
-
-_gemname=hpricot
-pkgname=ruby-$_gemname
-pkgver=0.8.6
-pkgdesc="_why's old HTML parser"
-url="http://github.com/hpricot/hpricot"
-license=('custom:MIT')
-
-pkgrel=1
-arch=('i686' 'x86_64')
-depends=('ruby')
-makedepends=('rubygems')
-source=(http://rubygems.org/downloads/${_gemname}-${pkgver}.gem)
-noextract=(${_gemname}-${pkgver}.gem)
-md5sums=('b0f1f02448037f4f6243c33d5f818fa4')
-
-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"
-  install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \
-                 "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
diff --git a/libre/ruby-mustache/PKGBUILD b/libre/ruby-mustache/PKGBUILD
deleted file mode 100644
index d7090cc0d..000000000
--- a/libre/ruby-mustache/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): David Campbell <davekong@archlinux.us>
-
-_gemname=mustache
-pkgname=ruby-$_gemname
-pkgver=0.99.4
-pkgdesc="A framework-agnostic way to render logic-free views."
-url="http://mustache.github.io/"
-license=('custom:MIT')
-
-pkgrel=3
-arch=('any')
-depends=('ruby>=2')
-makedepends=('rubygems')
-source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem")
-md5sums=('650194ec2c166feb087377647414b9dc')
-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"
-
-  install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/LICENSE \
-                 "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-  shopt -s nullglob
-  for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do
-    install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/}
-  done
-}
diff --git a/libre/ruby-rdiscount/PKGBUILD b/libre/ruby-rdiscount/PKGBUILD
deleted file mode 100644
index b6cbcc4cc..000000000
--- a/libre/ruby-rdiscount/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
-# Maintainer (AUR): Alexsandr Pavlov <kidoz at mail dot ru>
-# Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail dot com>
-
-_gemname=rdiscount
-pkgname=ruby-$_gemname
-pkgver=2.1.6
-pkgdesc="C implementation of John Gruber's Markdown."
-url="http://dafoster.net/projects/rdiscount/"
-
-license=('BSD3')
-
-pkgrel=1
-arch=('i686' 'x86_64')
-depends=('ruby')
-makedepends=('rubygems')
-source=(http://rubygems.org/downloads/$_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"
-
-  install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \
-                 "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-  shopt -s nullglob
-  for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do
-    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
deleted file mode 100644
index 63b2b36f3..000000000
--- a/libre/sdl-libre/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $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@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=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"
-license=('LGPL')
-provides=("sdl=${pkgver}")
-conflicts=('sdl')
-replaces=('sdl')
-depends=('glibc' 'libxext' 'libxrender' 'libx11')
-makedepends=('alsa-lib' 'mesa' 'libpulse' 'glu')
-optdepends=('alsa-lib: ALSA audio driver'
-            'libpulse: PulseAudio audio driver')
-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')
-
-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
-}
-
-package() {
-  cd SDL-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/libre/sdl-libre/fix_joystick_misc_axes.diff b/libre/sdl-libre/fix_joystick_misc_axes.diff
deleted file mode 100644
index 75e3755c9..000000000
--- a/libre/sdl-libre/fix_joystick_misc_axes.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
-index ee43974..80e46e4 100644
---- a/src/joystick/linux/SDL_sysjoystick.c
-+++ b/src/joystick/linux/SDL_sysjoystick.c
-@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd)
- 				++joystick->nbuttons;
- 			}
- 		}
--		for ( i=0; i<ABS_MISC; ++i ) {
-+		for ( i=0; i<ABS_MAX; ++i ) {
- 			/* Skip hats */
- 			if ( i == ABS_HAT0X ) {
- 				i = ABS_HAT3Y;
diff --git a/libre/sdl-libre/libre.patch b/libre/sdl-libre/libre.patch
deleted file mode 100644
index 72f7da56a..000000000
--- a/libre/sdl-libre/libre.patch
+++ /dev/null
@@ -1,578 +0,0 @@
---- src/video/fbcon/riva_mmio.h		2012-01-19 04:30:06.000000000 -0200
-+++ /dev/null				2012-04-01 13:58:27.776718756 -0300
-@@ -1,449 +0,0 @@
--/***************************************************************************\
--|*                                                                           *|
--|*       Copyright 1993-1999 NVIDIA, Corporation.  All rights reserved.      *|
--|*                                                                           *|
--|*     NOTICE TO USER:   The source code  is copyrighted under  U.S. and     *|
--|*     international laws.  Users and possessors of this source code are     *|
--|*     hereby granted a nonexclusive,  royalty-free copyright license to     *|
--|*     use this code in individual and commercial software.                  *|
--|*                                                                           *|
--|*     Any use of this source code must include,  in the user documenta-     *|
--|*     tion and  internal comments to the code,  notices to the end user     *|
--|*     as follows:                                                           *|
--|*                                                                           *|
--|*       Copyright 1993-1999 NVIDIA, Corporation.  All rights reserved.      *|
--|*                                                                           *|
--|*     NVIDIA, CORPORATION MAKES NO REPRESENTATION ABOUT THE SUITABILITY     *|
--|*     OF  THIS SOURCE  CODE  FOR ANY PURPOSE.  IT IS  PROVIDED  "AS IS"     *|
--|*     WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND.  NVIDIA, CORPOR-     *|
--|*     ATION DISCLAIMS ALL WARRANTIES  WITH REGARD  TO THIS SOURCE CODE,     *|
--|*     INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGE-     *|
--|*     MENT,  AND FITNESS  FOR A PARTICULAR PURPOSE.   IN NO EVENT SHALL     *|
--|*     NVIDIA, CORPORATION  BE LIABLE FOR ANY SPECIAL,  INDIRECT,  INCI-     *|
--|*     DENTAL, OR CONSEQUENTIAL DAMAGES,  OR ANY DAMAGES  WHATSOEVER RE-     *|
--|*     SULTING 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 SOURCE CODE.     *|
--|*                                                                           *|
--|*     U.S. Government  End  Users.   This source code  is a "commercial     *|
--|*     item,"  as that  term is  defined at  48 C.F.R. 2.101 (OCT 1995),     *|
--|*     consisting  of "commercial  computer  software"  and  "commercial     *|
--|*     computer  software  documentation,"  as such  terms  are  used in     *|
--|*     48 C.F.R. 12.212 (SEPT 1995)  and is provided to the U.S. Govern-     *|
--|*     ment only as  a commercial end item.   Consistent with  48 C.F.R.     *|
--|*     12.212 and  48 C.F.R. 227.7202-1 through  227.7202-4 (JUNE 1995),     *|
--|*     all U.S. Government End Users  acquire the source code  with only     *|
--|*     those rights set forth herein.                                        *|
--|*                                                                           *|
--\***************************************************************************/
--
--#ifndef __RIVA_HW_H__
--#define __RIVA_HW_H__
--#define RIVA_SW_VERSION 0x00010003
--
--/*
-- * Typedefs to force certain sized values.
-- */
--typedef Uint8  U008;
--typedef Uint16 U016;
--typedef Uint32 U032;
--
--/*
-- * HW access macros.
-- */
--#define NV_WR08(p,i,d)  (((U008 *)(p))[i]=(d))
--#define NV_RD08(p,i)    (((U008 *)(p))[i])
--#define NV_WR16(p,i,d)  (((U016 *)(p))[(i)/2]=(d))
--#define NV_RD16(p,i)    (((U016 *)(p))[(i)/2])
--#define NV_WR32(p,i,d)  (((U032 *)(p))[(i)/4]=(d))
--#define NV_RD32(p,i)    (((U032 *)(p))[(i)/4])
--#define VGA_WR08(p,i,d) NV_WR08(p,i,d)
--#define VGA_RD08(p,i)   NV_RD08(p,i)
--
--/*
-- * Define supported architectures.
-- */
--#define NV_ARCH_03  0x03
--#define NV_ARCH_04  0x04
--#define NV_ARCH_10  0x10
--/***************************************************************************\
--*                                                                           *
--*                             FIFO registers.                               *
--*                                                                           *
--\***************************************************************************/
--
--/*
-- * Raster OPeration. Windows style ROP3.
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop;
--    U032 reserved01[0x0BB];
--    U032 Rop3;
--} RivaRop;
--/*
-- * 8X8 Monochrome pattern.
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop;
--    U032 reserved01[0x0BD];
--    U032 Shape;
--    U032 reserved03[0x001];
--    U032 Color0;
--    U032 Color1;
--    U032 Monochrome[2];
--} RivaPattern;
--/*
-- * Scissor clip rectangle.
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop;
--    U032 reserved01[0x0BB];
--    U032 TopLeft;
--    U032 WidthHeight;
--} RivaClip;
--/*
-- * 2D filled rectangle.
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop[1];
--    U032 reserved01[0x0BC];
--    U032 Color;
--    U032 reserved03[0x03E];
--    U032 TopLeft;
--    U032 WidthHeight;
--} RivaRectangle;
--/*
-- * 2D screen-screen BLT.
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop;
--    U032 reserved01[0x0BB];
--    U032 TopLeftSrc;
--    U032 TopLeftDst;
--    U032 WidthHeight;
--} RivaScreenBlt;
--/*
-- * 2D pixel BLT.
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop[1];
--    U032 reserved01[0x0BC];
--    U032 TopLeft;
--    U032 WidthHeight;
--    U032 WidthHeightIn;
--    U032 reserved02[0x03C];
--    U032 Pixels;
--} RivaPixmap;
--/*
-- * Filled rectangle combined with monochrome expand.  Useful for glyphs.
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop;
--    U032 reserved01[0x0BB];
--    U032 reserved03[(0x040)-1];
--    U032 Color1A;
--    struct
--    {
--        U032 TopLeft;
--        U032 WidthHeight;
--    } UnclippedRectangle[64];
--    U032 reserved04[(0x080)-3];
--    struct
--    {
--        U032 TopLeft;
--        U032 BottomRight;
--    } ClipB;
--    U032 Color1B;
--    struct
--    {
--        U032 TopLeft;
--        U032 BottomRight;
--    } ClippedRectangle[64];
--    U032 reserved05[(0x080)-5];
--    struct
--    {
--        U032 TopLeft;
--        U032 BottomRight;
--    } ClipC;
--    U032 Color1C;
--    U032 WidthHeightC;
--    U032 PointC;
--    U032 MonochromeData1C;
--    U032 reserved06[(0x080)+121];
--    struct
--    {
--        U032 TopLeft;
--        U032 BottomRight;
--    } ClipD;
--    U032 Color1D;
--    U032 WidthHeightInD;
--    U032 WidthHeightOutD;
--    U032 PointD;
--    U032 MonochromeData1D;
--    U032 reserved07[(0x080)+120];
--    struct
--    {
--        U032 TopLeft;
--        U032 BottomRight;
--    } ClipE;
--    U032 Color0E;
--    U032 Color1E;
--    U032 WidthHeightInE;
--    U032 WidthHeightOutE;
--    U032 PointE;
--    U032 MonochromeData01E;
--} RivaBitmap;
--/*
-- * 3D textured, Z buffered triangle.
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop;
--    U032 reserved01[0x0BC];
--    U032 TextureOffset;
--    U032 TextureFormat;
--    U032 TextureFilter;
--    U032 FogColor;
--/* This is a problem on LynxOS */
--#ifdef Control
--#undef Control
--#endif
--    U032 Control;
--    U032 AlphaTest;
--    U032 reserved02[0x339];
--    U032 FogAndIndex;
--    U032 Color;
--    float ScreenX;
--    float ScreenY;
--    float ScreenZ;
--    float EyeM;
--    float TextureS;
--    float TextureT;
--} RivaTexturedTriangle03;
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop;
--    U032 reserved01[0x0BB];
--    U032 ColorKey;
--    U032 TextureOffset;
--    U032 TextureFormat;
--    U032 TextureFilter;
--    U032 Blend;
--/* This is a problem on LynxOS */
--#ifdef Control
--#undef Control
--#endif
--    U032 Control;
--    U032 FogColor;
--    U032 reserved02[0x39];
--    struct
--    {
--        float ScreenX;
--        float ScreenY;
--        float ScreenZ;
--        float EyeM;
--        U032 Color;
--        U032 Specular;
--        float TextureS;
--        float TextureT;
--    } Vertex[16];
--    U032 DrawTriangle3D;
--} RivaTexturedTriangle05;
--/*
-- * 2D line.
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop[1];
--    U032 reserved01[0x0BC];
--    U032 Color;             /* source color               0304-0307*/
--    U032 Reserved02[0x03e];
--    struct {                /* start aliased methods in array   0400-    */
--        U032 point0;        /* y_x S16_S16 in pixels            0-   3*/
--        U032 point1;        /* y_x S16_S16 in pixels            4-   7*/
--    } Lin[16];              /* end of aliased methods in array      -047f*/
--    struct {                /* start aliased methods in array   0480-    */
--        U032 point0X;       /* in pixels, 0 at left                0-   3*/
--        U032 point0Y;       /* in pixels, 0 at top                 4-   7*/
--        U032 point1X;       /* in pixels, 0 at left                8-   b*/
--        U032 point1Y;       /* in pixels, 0 at top                 c-   f*/
--    } Lin32[8];             /* end of aliased methods in array      -04ff*/
--    U032 PolyLin[32];       /* y_x S16_S16 in pixels         0500-057f*/
--    struct {                /* start aliased methods in array   0580-    */
--        U032 x;             /* in pixels, 0 at left                0-   3*/
--        U032 y;             /* in pixels, 0 at top                 4-   7*/
--    } PolyLin32[16];        /* end of aliased methods in array      -05ff*/
--    struct {                /* start aliased methods in array   0600-    */
--        U032 color;         /* source color                     0-   3*/
--        U032 point;         /* y_x S16_S16 in pixels            4-   7*/
--    } ColorPolyLin[16];     /* end of aliased methods in array      -067f*/
--} RivaLine;
--/*
-- * 2D/3D surfaces
-- */
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop;
--    U032 reserved01[0x0BE];
--    U032 Offset;
--} RivaSurface;
--typedef volatile struct
--{
--    U032 reserved00[4];
--    U016 FifoFree;
--    U016 Nop;
--    U032 reserved01[0x0BD];
--    U032 Pitch;
--    U032 RenderBufferOffset;
--    U032 ZBufferOffset;
--} RivaSurface3D;
--    
--/***************************************************************************\
--*                                                                           *
--*                        Virtualized RIVA H/W interface.                    *
--*                                                                           *
--\***************************************************************************/
--
--struct _riva_hw_inst;
--struct _riva_hw_state;
--/*
-- * Virtialized chip interface. Makes RIVA 128 and TNT look alike.
-- */
--typedef struct _riva_hw_inst
--{
--    /*
--     * Chip specific settings.
--     */
--    U032 Architecture;
--    U032 Version;
--    U032 CrystalFreqKHz;
--    U032 RamAmountKBytes;
--    U032 MaxVClockFreqKHz;
--    U032 RamBandwidthKBytesPerSec;
--    U032 EnableIRQ;
--    U032 IO;
--    U032 VBlankBit;
--    U032 FifoFreeCount;
--    U032 FifoEmptyCount;
--    /*
--     * Non-FIFO registers.
--     */
--    volatile U032 *PCRTC;
--    volatile U032 *PRAMDAC;
--    volatile U032 *PFB;
--    volatile U032 *PFIFO;
--    volatile U032 *PGRAPH;
--    volatile U032 *PEXTDEV;
--    volatile U032 *PTIMER;
--    volatile U032 *PMC;
--    volatile U032 *PRAMIN;
--    volatile U032 *FIFO;
--    volatile U032 *CURSOR;
--    volatile U032 *CURSORPOS;
--    volatile U032 *VBLANKENABLE;
--    volatile U032 *VBLANK;
--    volatile U008 *PCIO;
--    volatile U008 *PVIO;
--    volatile U008 *PDIO;
--    /*
--     * Common chip functions.
--     */
--    int  (*Busy)(struct _riva_hw_inst *);
--    void (*CalcStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *,int,int,int,int,int,int,int,int,int,int,int,int,int);
--    void (*LoadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *);
--    void (*UnloadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *);
--    void (*SetStartAddress)(struct _riva_hw_inst *,U032);
--    void (*SetSurfaces2D)(struct _riva_hw_inst *,U032,U032);
--    void (*SetSurfaces3D)(struct _riva_hw_inst *,U032,U032);
--    int  (*ShowHideCursor)(struct _riva_hw_inst *,int);
--    void (*LockUnlock)(struct _riva_hw_inst *, int);
--    /*
--     * Current extended mode settings.
--     */
--    struct _riva_hw_state *CurrentState;
--    /*
--     * FIFO registers.
--     */
--    RivaRop                 *Rop;
--    RivaPattern             *Patt;
--    RivaClip                *Clip;
--    RivaPixmap              *Pixmap;
--    RivaScreenBlt           *Blt;
--    RivaBitmap              *Bitmap;
--    RivaLine                *Line;
--    RivaTexturedTriangle03  *Tri03;
--    RivaTexturedTriangle05  *Tri05;
--} RIVA_HW_INST;
--/*
-- * Extended mode state information.
-- */
--typedef struct _riva_hw_state
--{
--    U032 bpp;
--    U032 width;
--    U032 height;
--    U032 repaint0;
--    U032 repaint1;
--    U032 screen;
--    U032 pixel;
--    U032 horiz;
--    U032 arbitration0;
--    U032 arbitration1;
--    U032 vpll;
--    U032 pllsel;
--    U032 general;
--    U032 config;
--    U032 cursor0;
--    U032 cursor1;
--    U032 cursor2;
--    U032 offset0;
--    U032 offset1;
--    U032 offset2;
--    U032 offset3;
--    U032 pitch0;
--    U032 pitch1;
--    U032 pitch2;
--    U032 pitch3;
--} RIVA_HW_STATE;
--
--/*
-- * FIFO Free Count. Should attempt to yield processor if RIVA is busy.
-- */
--
--#define RIVA_FIFO_FREE(hwptr,cnt)                                  \
--{                                                                  \
--   while (FifoFreeCount < (cnt))                                   \
--	FifoFreeCount = hwptr->FifoFree >> 2;                      \
--   FifoFreeCount -= (cnt);                                         \
--}
--#endif /* __RIVA_HW_H__ */
--
---- src/video/fbcon/SDL_fbriva.c	2012-01-19 04:30:06.000000000 -0200
-+++ src/video/fbcon/SDL_fbriva.c	2012-04-01 15:10:10.108451467 -0300
-@@ -24,12 +24,10 @@
- #include "SDL_video.h"
- #include "../SDL_blit.h"
- #include "SDL_fbriva.h"
--#include "riva_mmio.h"
- #include "riva_regs.h"
- 
- 
- static int FifoEmptyCount = 0;
--static int FifoFreeCount = 0;
- 
- /* Wait for vertical retrace */
- static void WaitVBL(_THIS)
-@@ -41,20 +39,6 @@
- 	while ( !(*port & 0x08) )
- 		;
- }
--static void NV3WaitIdle(_THIS)
--{
--	RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET);
--	while ( (Rop->FifoFree < FifoEmptyCount) ||
--	        (*(mapped_io + PGRAPH_OFFSET + 0x000006B0) & 0x01) )
--		;
--}
--static void NV4WaitIdle(_THIS)
--{
--	RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET);
--	while ( (Rop->FifoFree < FifoEmptyCount) ||
--	        (*(mapped_io + PGRAPH_OFFSET + 0x00000700) & 0x01) )
--		;
--}
- 
- #if 0 /* Not yet implemented? */
- /* Sets video mem colorkey and accelerated blit function */
-@@ -74,7 +58,6 @@
- {
- 	int dstX, dstY;
- 	int dstW, dstH;
--	RivaBitmap *Bitmap = (RivaBitmap *)(mapped_io + BITMAP_OFFSET);
- 
- 	/* Don't blit to the display surface when switched away */
- 	if ( switched_away ) {
-@@ -93,13 +76,6 @@
- 	dstX += rect->x;
- 	dstY += rect->y;
- 
--	RIVA_FIFO_FREE(Bitmap, 1);
--	Bitmap->Color1A = color;
--
--	RIVA_FIFO_FREE(Bitmap, 2);
--	Bitmap->UnclippedRectangle[0].TopLeft     = (dstX << 16) | dstY; 
--	Bitmap->UnclippedRectangle[0].WidthHeight = (dstW << 16) | dstH;
--
- 	FB_AddBusySurface(dst);
- 
- 	if ( dst == this->screen ) {
-@@ -115,7 +91,6 @@
- 	int srcX, srcY;
- 	int dstX, dstY;
- 	int dstW, dstH;
--	RivaScreenBlt *Blt = (RivaScreenBlt *)(mapped_io + BLT_OFFSET);
- 
- 	/* FIXME: For now, only blit to display surface */
- 	if ( dst->pitch != SDL_VideoSurface->pitch ) {
-@@ -142,11 +117,6 @@
- 	dstX += dstrect->x;
- 	dstY += dstrect->y;
- 
--	RIVA_FIFO_FREE(Blt, 3);
--	Blt->TopLeftSrc  = (srcY << 16) | srcX;
--	Blt->TopLeftDst  = (dstY << 16) | dstX;
--	Blt->WidthHeight = (dstH  << 16) | dstW;
--
- 	FB_AddBusySurface(src);
- 	FB_AddBusySurface(dst);
- 
-@@ -185,23 +155,15 @@
- 
- void FB_RivaAccel(_THIS, __u32 card)
- {
--	RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET);
- 
- 	/* We have hardware accelerated surface functions */
- 	this->CheckHWBlit = CheckHWBlit;
- 	wait_vbl = WaitVBL;
- 	switch (card) {
--	    case FB_ACCEL_NV3:
--		wait_idle = NV3WaitIdle;
--		break;
--	    case FB_ACCEL_NV4:
--		wait_idle = NV4WaitIdle;
--		break;
- 	    default:
- 		/* Hmm... FIXME */
- 		break;
- 	}
--	FifoEmptyCount = Rop->FifoFree;
- 
- 	/* The Riva has an accelerated color fill */
- 	this->info.blit_fill = 1;
---- src/video/fbcon/SDL_fbvideo.c.orig	2011-09-08 17:30:03.670583685 +0200
-+++ src/video/fbcon/SDL_fbvideo.c	2011-09-08 17:30:24.230582737 +0200
-@@ -46,7 +46,6 @@
- #include "SDL_fbevents_c.h"
- #include "SDL_fb3dfx.h"
- #include "SDL_fbmatrox.h"
--#include "SDL_fbriva.h"
- 
- /*#define FBCON_DEBUG*/
- 
-@@ -769,13 +768,6 @@
- #endif
- 			FB_3DfxAccel(this, finfo.accel);
- 			break;
--		    case FB_ACCEL_NV3:
--		    case FB_ACCEL_NV4:
--#ifdef FBACCEL_DEBUG
--			printf("NVidia hardware accelerator!\n");
--#endif
--			FB_RivaAccel(this, finfo.accel);
--			break;
- 		    default:
- #ifdef FBACCEL_DEBUG
- 			printf("Unknown hardware accelerator.\n");
diff --git a/libre/sdl-libre/libsdl-1.2.15-resizing.patch b/libre/sdl-libre/libsdl-1.2.15-resizing.patch
deleted file mode 100644
index 0655a13e1..000000000
--- a/libre/sdl-libre/libsdl-1.2.15-resizing.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Revert change that breaks window corner resizing
- http://bugzilla.libsdl.org/show_bug.cgi?id=1430
-Author: Andrew Caudwell <acaudwell@gmail.com>
-Last-Update: 2012-04-10
-Bug-Debian: http://bugs.debian.org/665779
-
-diff -r c787fb1b5699 src/video/x11/SDL_x11events.c
---- a/src/video/x11/SDL_x11events.c	Mon Feb 20 23:51:08 2012 -0500
-+++ b/src/video/x11/SDL_x11events.c	Mon Mar 26 12:26:52 2012 +1300
-@@ -57,12 +57,6 @@
- static SDLKey MISC_keymap[256];
- SDLKey X11_TranslateKeycode(Display *display, KeyCode kc);
- 
--/*
-- Pending resize target for ConfigureNotify (so outdated events don't
-- cause inappropriate resize events)
--*/
--int X11_PendingConfigureNotifyWidth = -1;
--int X11_PendingConfigureNotifyHeight = -1;
- 
- #ifdef X_HAVE_UTF8_STRING
- Uint32 Utf8ToUcs4(const Uint8 *utf8)
-@@ -825,16 +819,6 @@
- #ifdef DEBUG_XEVENTS
- printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height);
- #endif
--		if ((X11_PendingConfigureNotifyWidth != -1) &&
--		    (X11_PendingConfigureNotifyHeight != -1)) {
--		    if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) &&
--			(xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) {
--			    /* Event is from before the resize, so ignore. */
--			    break;
--		    }
--		    X11_PendingConfigureNotifyWidth = -1;
--		    X11_PendingConfigureNotifyHeight = -1;
--		}
- 		if ( SDL_VideoSurface ) {
- 		    if ((xevent.xconfigure.width != SDL_VideoSurface->w) ||
- 		        (xevent.xconfigure.height != SDL_VideoSurface->h)) {
-diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h
---- a/src/video/x11/SDL_x11events_c.h	Mon Feb 20 23:51:08 2012 -0500
-+++ b/src/video/x11/SDL_x11events_c.h	Mon Mar 26 12:26:52 2012 +1300
-@@ -27,8 +27,3 @@
- extern void X11_InitOSKeymap(_THIS);
- extern void X11_PumpEvents(_THIS);
- extern void X11_SetKeyboardState(Display *display, const char *key_vec);
--
--/* Variables to be exported */
--extern int X11_PendingConfigureNotifyWidth;
--extern int X11_PendingConfigureNotifyHeight;
--
-diff -r c787fb1b5699 src/video/x11/SDL_x11video.c
---- a/src/video/x11/SDL_x11video.c	Mon Feb 20 23:51:08 2012 -0500
-+++ b/src/video/x11/SDL_x11video.c	Mon Mar 26 12:26:52 2012 +1300
-@@ -1182,8 +1182,6 @@
- 			current = NULL;
- 			goto done;
- 		}
--		X11_PendingConfigureNotifyWidth = width;
--		X11_PendingConfigureNotifyHeight = height;
- 	} else {
- 		if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) {
- 			current = NULL;
diff --git a/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch
deleted file mode 100644
index 1bb6e0e47..000000000
--- a/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# and another one from FS#26020
-
---- a/src/video/SDL_yuv_sw.c    2009-10-13 06:07:15.000000000 +0700
-+++ b/src/video/SDL_yuv_sw.c    2011-09-20 19:26:30.247742620 +0700
-@@ -89,6 +89,8 @@
- #include "SDL_yuvfuncs.h"
- #include "SDL_yuv_sw_c.h"
- 
-+#undef __OPTIMIZE__
-+
- /* The functions used to manipulate software video overlays */
- static struct private_yuvhwfuncs sw_yuvfuncs = {
- 	SDL_LockYUV_SW,
diff --git a/libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch b/libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch
deleted file mode 100644
index 7d3e5acfc..000000000
--- a/libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig	2010-04-08 11:57:05.003169834 -0700
-+++ SDL-1.2.14/src/video/x11/SDL_x11events.c	2010-04-08 12:33:51.690926340 -0700
-@@ -423,12 +423,15 @@
- if ( xevent.xcrossing.mode == NotifyUngrab )
- printf("Mode: NotifyUngrab\n");
- #endif
--		if ( this->input_grab == SDL_GRAB_OFF ) {
--			posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-+		if ( (xevent.xcrossing.mode != NotifyGrab) &&
-+		     (xevent.xcrossing.mode != NotifyUngrab) ) {
-+			if ( this->input_grab == SDL_GRAB_OFF ) {
-+				posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-+			}
-+			posted = SDL_PrivateMouseMotion(0, 0,
-+					xevent.xcrossing.x,
-+					xevent.xcrossing.y);
- 		}
--		posted = SDL_PrivateMouseMotion(0, 0,
--				xevent.xcrossing.x,
--				xevent.xcrossing.y);
- 	    }
- 	    break;
- 
diff --git a/libre/sdl-libre/sdl_x11sym.patch b/libre/sdl-libre/sdl_x11sym.patch
deleted file mode 100644
index 9aaa2353b..000000000
--- a/libre/sdl-libre/sdl_x11sym.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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/seamonkey-libre/PKGBUILD b/libre/seamonkey-libre/PKGBUILD
deleted file mode 100644
index e7d4cc389..000000000
--- a/libre/seamonkey-libre/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 157354 2012-04-27 20:50:49Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-_pkgname=seamonkey
-pkgname=seamonkey-libre
-pkgver=2.9
-pkgrel=1
-pkgdesc="SeaMonkey internet suite, with GNUZilla addons"
-arch=('i686' 'x86_64' 'mips64el')
-license=('MPL')
-depends=('alsa-lib'  'dbus-glib'  'desktop-file-utils'  'gtk2' 'hunspell'  'libevent'  'libnotify'  'libvpx'  'libxt' 'mime-types'  'mozilla-common'  'nss'  'sqlite'  'startup-notification')
-makedepends=('unzip' 'zip' 'pkg-config'  'python2' 'yasm' 'wireless_tools' 'mesa' 'autoconf2.13')
-replaces=('mozilla' 'seamonkey')
-conflicts=('seamonkey')
-provides=("seamonkey=$pkgver")
-install=$_pkgname.install
-url="http://www.mozilla.org/projects/seamonkey"
-source=(ftp://releases.mozilla.org/pub/mozilla.org/$_pkgname/releases/$pkgver/source/$_pkgname-$pkgver.source.tar.bz2
-        mozconfig
-        seamonkey.desktop
-        seamonkey-2.0-lang.patch
-        gcc47.patch
-        clrf.patch
-        gnuzilla-addons.patch)
-md5sums=('4af38acf517a8ab850e6aa7a6b085325'
-         'b8887c39a190e3168a9c7e4355ae3dd4'
-         '6119a2254716752c9d08e366f8d4c048'
-         '25b6fe16ac24cd5c852213e5c1adb272'
-         '1e3ad86899c61f0993c429d10913edb4'
-         'abe8f73faa71ea2a1e4c6f5a33f56c27'
-         'f7beeb1f94390957259212dd1dbc171f')
-
-build() {
-  cd "$srcdir/comm-release"
-  patch -Np1 -i "$srcdir/seamonkey-2.0-lang.patch"
-  patch -Np1 -i "$srcdir/gcc47.patch"
-  patch -Np1 -i "$srcdir/clrf.patch"
-  patch -Np1 -i "${srcdir}/gnuzilla-addons.patch"
-
-  cp "$srcdir/mozconfig" .mozconfig
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/seamonkey-$pkgver"
-
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-}
-
-package() {
-  cd "$srcdir/comm-release"
-
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
-
-  rm -rf "$pkgdir"/usr/lib/seamonkey-$pkgver/{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/seamonkey-$pkgver/dictionaries"
-  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/seamonkey-$pkgver/hyphenation"
-
-  install -m755 -d "$pkgdir/usr/share/applications"
-  install -m755 -d "$pkgdir/usr/share/pixmaps"
-  install -m644 suite/branding/nightly/icons/gtk/seamonkey.png \
-                "$pkgdir/usr/share/pixmaps/"
-  install -m644 "$srcdir/seamonkey.desktop" "$pkgdir/usr/share/applications/"
-
-  rm -f "$pkgdir/usr/lib/pkgconfig/"seamonkey-ns{s,pr}.pc
-  rm -r "$pkgdir"/usr/{include,lib/seamonkey-devel-$pkgver,share/idl}
-}
diff --git a/libre/seamonkey-libre/clrf.patch b/libre/seamonkey-libre/clrf.patch
deleted file mode 100644
index 5a77f2b01..000000000
--- a/libre/seamonkey-libre/clrf.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -Nur comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
---- comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp	2012-04-25 01:09:10.468804374 +0000
-+++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp	2012-04-25 01:09:45.928528202 +0000
-@@ -688,7 +688,7 @@
-     PL_strcat(encoding, "{");
-     lengthStr.AppendInt((PRInt32) strlen(value));
-     PL_strcat(encoding, lengthStr.get());
--    PL_strcat(encoding, "}"CRLF);
-+    PL_strcat(encoding, "}" CRLF);
-     PL_strcat(encoding, value);
-     return NS_OK;
-   }
-diff -Nur comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
---- comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp	2012-04-25 01:09:10.475470988 +0000
-+++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp	2012-04-25 01:09:45.928528202 +0000
-@@ -758,7 +758,7 @@
-           }
-         }
-       }
--#define EXTRA_KEYWORD_HDR "                                                                                 "MSG_LINEBREAK
-+#define EXTRA_KEYWORD_HDR "                                                                                 " MSG_LINEBREAK
- 
-        // if status offset isn't in the first block, this code won't work. There's no good reason
-       // for the status offset not to be at the beginning of the message anyway.
-@@ -1216,7 +1216,7 @@
-         // check if there's an envelope header; if not, write one.
-         if (strncmp(m_dataBuffer, "From ", 5))
-         {
--          m_fileStream->Write("From "CRLF, 7, &bytesWritten);
-+          m_fileStream->Write("From " CRLF, 7, &bytesWritten);
-           m_offlineMsgSize += bytesWritten;
-         }
-       }
-diff -Nur comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
---- comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp	2012-04-25 01:09:10.542137136 +0000
-+++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp	2012-04-25 01:09:45.928528202 +0000
-@@ -1722,7 +1722,7 @@
- {
-   m_sendDone = true;
-   nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
--  SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server.
-+  SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server.
-   m_nextState = SMTP_RESPONSE;
-   m_nextStateAfterResponse = SMTP_DONE;
-   return(0);
-@@ -1969,7 +1969,7 @@
-     {
-       nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
-       // send a quit command to close the connection with the server.
--      if (SendData(url, "QUIT"CRLF) == NS_OK)
-+      if (SendData(url, "QUIT" CRLF) == NS_OK)
-       {
-         m_nextState = SMTP_RESPONSE;
-         m_nextStateAfterResponse = SMTP_ERROR_DONE;
-@@ -2118,4 +2118,3 @@
-     NS_ENSURE_SUCCESS(rv,rv);
-     return rv;
- }
--
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp comm-release/mailnews/imap/src/nsImapMailFolder.cpp
---- comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp	2012-04-25 01:09:10.605469976 +0000
-+++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp	2012-04-25 01:09:45.928528202 +0000
-@@ -8309,7 +8309,7 @@
-           bool needMoreData = false;
-           char * newLine = nsnull;
-           PRUint32 numBytesInLine = 0;
--          const char *envelope = "From "CRLF;
-+          const char *envelope = "From " CRLF;
-           offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
-           fileSize += bytesWritten;
-           do
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp comm-release/mailnews/imap/src/nsImapProtocol.cpp
---- comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp	2012-04-25 01:09:10.605469976 +0000
-+++ comm-release/mailnews/imap/src/nsImapProtocol.cpp	2012-04-25 01:09:45.931861509 +0000
-@@ -1409,7 +1409,7 @@
- {
-   // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
-   nsCAutoString commandBuffer(GetServerCommandTag());
--  commandBuffer.Append(" IDLE"CRLF);
-+  commandBuffer.Append(" IDLE" CRLF);
- 
-   do
-   {
-@@ -3287,7 +3287,7 @@
-     commandString.Append(messageIds);
-     commandString.Append(" (");
-     commandString.Append(attribute);
--    commandString.Append(")"CRLF);
-+    commandString.Append(")" CRLF);
-     nsresult rv = SendData(commandString.get());
- 
-     if (NS_SUCCEEDED(rv))
-@@ -5283,7 +5283,7 @@
- 
-   IncrementCommandTagNumber();
-   nsCAutoString command(GetServerCommandTag());
--  command.Append(" expunge"CRLF);
-+  command.Append(" expunge" CRLF);
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -5359,7 +5359,7 @@
-   command.Append(gAppName);
-   command.Append("\" \"version\" \"");
-   command.Append(gAppVersion);
--  command.Append("\")"CRLF);
-+  command.Append("\")" CRLF);
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -5816,7 +5816,7 @@
-     nsCAutoString correctedPassword;
-     EscapeUserNamePasswordString(password.get(), &correctedPassword);
-     command.Append(correctedPassword);
--    command.Append("\""CRLF);
-+    command.Append("\"" CRLF);
-     rv = SendData(command.get(), true /* suppress logging */);
-     NS_ENSURE_SUCCESS(rv, rv);
-     ParseIMAPandCheckForNewMail();
-@@ -7447,7 +7447,7 @@
-   nsCString command(GetServerCommandTag());
-   command += " create \"";
-   command += escapedName;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   nsresult rv = SendData(command.get());
-   if(NS_SUCCEEDED(rv))
-@@ -7550,7 +7550,7 @@
-   nsCString command (GetServerCommandTag());
-   command += " lsub \"\" \"";
-   command += escapedPattern;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   PR_Free(boxnameWithOnlineDirectory);
- 
-@@ -7579,7 +7579,7 @@
-   command += useXLIST ?
-     " xlist \"\" \"" : " list \"\" \"";
-   command += escapedPattern;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   PR_Free(boxnameWithOnlineDirectory);
- 
-@@ -7600,7 +7600,7 @@
-   nsCString command (GetServerCommandTag());
-   command += " subscribe \"";
-   command += escapedName;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -7618,7 +7618,7 @@
-   nsCString command (GetServerCommandTag());
-   command += " unsubscribe \"";
-   command += escapedName;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -7632,7 +7632,7 @@
-   if (m_urlInProgress)
-     return;
-   nsCAutoString command (GetServerCommandTag());
--  command += " IDLE"CRLF;
-+  command += " IDLE" CRLF;
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-   {
-@@ -7659,7 +7659,7 @@
-   nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream);
-   if (asyncInputStream)
-     asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
--  nsresult rv = SendData("DONE"CRLF);
-+  nsresult rv = SendData("DONE" CRLF);
-   // set a short timeout if we don't want to wait for a response
-   if (m_transport && !waitForResponse)
-     m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5);
-@@ -7728,8 +7728,8 @@
-   PRUint32 msgsHandled = 0;
-   const char *formatString;
-   formatString = (idsAreUid)
--      ? "%s uid store %s %s"CRLF
--      : "%s store %s %s"CRLF;
-+      ? "%s uid store %s %s" CRLF
-+      : "%s store %s %s" CRLF;
- 
-   do
-   {
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
---- comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp	2012-04-25 01:09:10.605469976 +0000
-+++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp	2012-04-25 01:09:45.931861509 +0000
-@@ -185,7 +185,7 @@
-   
-   NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' && 
-     *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string");
--  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
-+  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
-   if (sendingIdleDone)
-     fWaitingForMoreClientInput = false;
- 
-diff -Nur comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp comm-release/mailnews/local/src/nsPop3Protocol.cpp
---- comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp	2012-04-25 01:09:10.492137526 +0000
-+++ comm-release/mailnews/local/src/nsPop3Protocol.cpp	2012-04-25 01:09:45.931861509 +0000
-@@ -2483,7 +2483,7 @@
-         return(MK_OUT_OF_MEMORY);
-     m_pop3ConData->next_state_after_response = POP3_GET_LIST;
-     m_listpos = 0;
--    return SendData(m_url, "LIST"CRLF);
-+    return SendData(m_url, "LIST" CRLF);
- }
- 
- 
-diff -Nur comm-release.orig/mailnews/mime/src/mimedrft.cpp comm-release/mailnews/mime/src/mimedrft.cpp
---- comm-release.orig/mailnews/mime/src/mimedrft.cpp	2012-04-25 01:09:10.488804218 +0000
-+++ comm-release/mailnews/mime/src/mimedrft.cpp	2012-04-25 01:09:45.931861509 +0000
-@@ -1473,7 +1473,7 @@
-                 *newbody = 0;
-                 PL_strcatn(newbody, newbodylen, "<PRE>");
-                 PL_strcatn(newbody, newbodylen, body);
--                PL_strcatn(newbody, newbodylen, "</PRE>"CRLF);
-+                PL_strcatn(newbody, newbodylen, "</PRE>" CRLF);
-                 PR_Free(body);
-                 body = newbody;
-               }
-diff -Nur comm-release.orig/mailnews/mime/src/mimemult.cpp comm-release/mailnews/mime/src/mimemult.cpp
---- comm-release.orig/mailnews/mime/src/mimemult.cpp	2012-04-25 01:09:10.488804218 +0000
-+++ comm-release/mailnews/mime/src/mimemult.cpp	2012-04-25 01:12:53.383735715 +0000
-@@ -280,7 +280,7 @@
-             MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
-             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\""));
-             MimeWriteAString(obj, fileName);
--            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
-+            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
-             MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: "));
-             MimeWriteAString(obj, obj->options->state->detachedFilePath);
-             MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
-@@ -293,10 +293,10 @@
-             status = MimeWriteAString(obj, header);
-             if (status < 0) 
-               return status;
--            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding: 8bit"MSG_LINEBREAK));
-+            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "Content-Transfer-Encoding: 8bit" MSG_LINEBREAK));
-             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: inline; filename=\"Deleted: "));
-             MimeWriteAString(obj, fileName);
--            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\""));
-+            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "X-Mozilla-Altered: AttachmentDeleted; date=\""));
-           }
-           nsCString result;
-           char timeBuffer[128];
-@@ -306,8 +306,8 @@
-                                  "%a %b %d %H:%M:%S %Y",
-                                  &now);
-           MimeWriteAString(obj, nsDependentCString(timeBuffer));
--          MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
--          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK));
-+          MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
-+          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK));
-           MimeHeaders_write_raw_headers(mult->hdrs, obj->options, false);
-         }
-         PRInt32 old_nchildren = container->nchildren;
diff --git a/libre/seamonkey-libre/gcc47.patch b/libre/seamonkey-libre/gcc47.patch
deleted file mode 100644
index 080502c23..000000000
--- a/libre/seamonkey-libre/gcc47.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-24 23:15:57.347221336 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-24 23:18:34.116046872 +0000
-@@ -5,6 +5,9 @@
- #include "base/file_util.h"
- 
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
- 
- #include <string>
- #include <vector>
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-24 23:15:57.353887955 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-24 23:18:34.116046872 +0000
-@@ -6,6 +6,9 @@
- 
- #include <errno.h>
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
- 
- #include "eintr_wrapper.h"
- #include "base/logging.h"
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc comm-release/mozilla/ipc/chromium/src/base/time_posix.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-24 23:15:57.350554645 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-24 23:18:34.116046872 +0000
-@@ -13,6 +13,9 @@
- #else
- #include <time.h>
- #endif
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
- 
- #include <limits>
- 
diff --git a/libre/seamonkey-libre/gnuzilla-addons.patch b/libre/seamonkey-libre/gnuzilla-addons.patch
deleted file mode 100644
index 32a28b3e4..000000000
--- a/libre/seamonkey-libre/gnuzilla-addons.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur comm-release.orig/suite/browser/browser-prefs.js comm-release/suite/browser/browser-prefs.js
---- comm-release.orig/suite/browser/browser-prefs.js	2012-03-13 02:23:17.000000000 -0300
-+++ comm-release/suite/browser/browser-prefs.js		2012-04-11 01:57:44.005731215 -0300
-@@ -587,11 +587,10 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);  // also toggles personalized recommendations
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%");
--pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
- 
- // getMoreThemes is used by our UI under our switch theme menu
- pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties");
-@@ -716,7 +715,7 @@
- #endif
- 
- // plugin finder service url
--pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%");
-+pref("pfs.datasource.url", "http://www.gnu.org/software/gnuzilla/addons.html");
- pref("plugins.update.url", "http://www.mozilla.com/%LOCALE%/plugincheck/");
- pref("plugins.update.notifyUser", false);
- pref("plugins.hide_infobar_for_outdated_plugin", false);
diff --git a/libre/seamonkey-libre/libvpx.patch b/libre/seamonkey-libre/libvpx.patch
deleted file mode 100644
index d0f9a0f4c..000000000
--- a/libre/seamonkey-libre/libvpx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur comm-release.orig/mozilla/configure.in comm-release/mozilla/configure.in
---- comm-release.orig/mozilla/configure.in	2012-02-05 18:02:17.376830377 +0000
-+++ comm-release/mozilla/configure.in	2012-02-05 18:03:25.246274275 +0000
-@@ -5629,7 +5629,7 @@
-             dnl v0.9.6 one to check for.
-             AC_TRY_COMPILE([
-                 #include <vpx/vpx_decoder.h>
--                #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
-+                #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
-                     #error "test failed."
-                 #endif
-                 ],
diff --git a/libre/seamonkey-libre/mozconfig b/libre/seamonkey-libre/mozconfig
deleted file mode 100644
index 4d04c96d5..000000000
--- a/libre/seamonkey-libre/mozconfig
+++ /dev/null
@@ -1,36 +0,0 @@
-ac_add_options --enable-application=suite
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-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 --with-pthreads
-
-# Features
-ac_add_options --enable-startup-notification
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
diff --git a/libre/seamonkey-libre/python27.patch b/libre/seamonkey-libre/python27.patch
deleted file mode 100644
index f00681fd2..000000000
--- a/libre/seamonkey-libre/python27.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in~	2010-10-20 17:43:42.843358798 -0700
-+++ configure.in	2010-10-20 17:43:16.373359032 -0700
-@@ -874,7 +874,7 @@
-     AC_MSG_RESULT([yes])    
- fi
- 
--AC_PATH_PROGS(PYTHON, $PYTHON python2.5 python2.4 python)
-+AC_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.5 python2.4 python)
- if test -z "$PYTHON"; then
-     AC_MSG_ERROR([python was not found in \$PATH])
- fi
diff --git a/libre/seamonkey-libre/seamonkey-2.0-lang.patch b/libre/seamonkey-libre/seamonkey-2.0-lang.patch
deleted file mode 100644
index b9f4a5cde..000000000
--- a/libre/seamonkey-libre/seamonkey-2.0-lang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-10-11 02:12:44.000000000 +0200
-+++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-09-16 02:56:45.000000000 +0200
-@@ -890,7 +890,7 @@
- pref("intl.charset.detector",               "chrome://global/locale/intl.properties");
- pref("intl.charset.default",                "chrome://global-platform/locale/intl.properties");
- pref("intl.ellipsis",                       "chrome://global-platform/locale/intl.properties");
--pref("intl.locale.matchOS",                 false);
-+pref("intl.locale.matchOS",                 true);
- // fallback charset list for Unicode conversion (converting from Unicode)
- // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
- // for ISO-8859-1
diff --git a/libre/seamonkey-libre/seamonkey.desktop b/libre/seamonkey-libre/seamonkey.desktop
deleted file mode 100644
index dd92a2432..000000000
--- a/libre/seamonkey-libre/seamonkey.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=seamonkey %u
-Icon=seamonkey
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=SeaMonkey internet suite
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;message/rfc822;x-scheme-handler/mailto;
-StartupNotify=false
-Categories=Application;Network;
diff --git a/libre/seamonkey-libre/seamonkey.install b/libre/seamonkey-libre/seamonkey.install
deleted file mode 100644
index 709ad81f2..000000000
--- a/libre/seamonkey-libre/seamonkey.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/libre/sh-roundup/PKGBUILD b/libre/sh-roundup/PKGBUILD
deleted file mode 100644
index 7c17669d3..000000000
--- a/libre/sh-roundup/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
-
-pkgname=sh-roundup
-pkgver=0.0.5.git17
-_gitver='commit=695ae7609353a360556e1f465ac81ce447235179'
-
-pkgdesc='A unit testing framework for POSIX shell'
-license=("custom:MIT")
-url="http://bmizerany.github.io/roundup/"
-
-pkgrel=1
-arch=('any')
-depends=(sh)
-makedepends=(ronn)
-
-source=("libre://$pkgname-$pkgver.tar.gz" 'makefile-fix.patch')
-md5sums=('8b1f85316d178eb9e809e168f52d0f2d'
-         '9efcd83d666c1e84302fe611610c60fa')
-
-mksource=("git://github.com/bmizerany/roundup.git#${_gitver}")
-mkmd5sums=('SKIP')
-mksource() {
-  cd "$srcdir"
-  rm -rf $pkgname-*
-  mv roundup $pkgname-$pkgver
-}
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -i ../makefile-fix.patch Makefile
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix="$pkgdir"/usr
-  make -j1 build man
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -j1 install install-man
-  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
diff --git a/libre/sh-roundup/makefile-fix.patch b/libre/sh-roundup/makefile-fix.patch
deleted file mode 100644
index b97bebf23..000000000
--- a/libre/sh-roundup/makefile-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -79,7 +79,7 @@
- 	chmod 0755 $(bindir)/roundup
- 
- install-man: man
--	-for i in {1..9} ; do cp *.$$i $(mandir)/man$$i 2>/dev/null ; done
-+	shopt -s nullglob; for file in *.{1..9}; do install -Dm644 $$file $(mandir)/man$${file##*.}/$${file##*/}; done
- 
- .PHONY: pages
- pages : doc
diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD
deleted file mode 100644
index 80b19719e..000000000
--- a/libre/soundkonverter-libre/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 94548 2013-07-26 17:20:11Z stativ $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Darwin Bautista <djclue917@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=soundkonverter
-pkgname=soundkonverter-libre
-pkgver=2.0.4
-pkgrel=1
-pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation"
-arch=('i686' 'x86_64')
-url="http://www.kde-apps.org/content/show.php?content=29024"
-license=('GPL')
-depends=('kdebase-runtime' 'libkcddb' 'cdparanoia' 'taglib')
-makedepends=('automoc4' 'cmake')
-optdepends=('cdrkit: cdda2wav backend'
-            'faad2: faad backend'
-            'ffmpeg: ffmpeg backend'
-            'flac: flac backend'
-            'fluidsynth: flouidsynth backend'
-            'lame: lame backend'
-            'mplayer: mplayer backend'
-            'mp3gain: mp3gain backend'
-            'opus-tools: opus backend'
-            'speex: speexenc, speexdec backends'
-            'timidity++: midi backend'
-            'twolame: twolame backend'
-            'vorbisgain: vorbisgain backend'
-            'vorbis-tools: vorbis tools backend'
-            'wavpack: wavpack backend'
-            'sox: sox plugin (change sample rate, various effects)')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-install=$_pkgname.install
-source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz")
-md5sums=('8b6684e693bf1af604dec8fab837447b')
-
-build() {
-  cd "$srcdir"/$_pkgname-$pkgver
-  cmake . \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "$srcdir"/$_pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/libre/soundkonverter-libre/soundkonverter.install b/libre/soundkonverter-libre/soundkonverter.install
deleted file mode 100644
index 0e8feb79c..000000000
--- a/libre/soundkonverter-libre/soundkonverter.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
diff --git a/libre/spectrwm-libre/LICENSE b/libre/spectrwm-libre/LICENSE
deleted file mode 100644
index 24c04f3a0..000000000
--- a/libre/spectrwm-libre/LICENSE
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
- * Copyright (c) 2009 Ryan McBride <mcbride@countersiege.com>
- *
- * 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 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.
- */
-/*
- * Much code and ideas taken from dwm under the following license:
- * MIT/X Consortium License
- *
- * 2006-2008 Anselm R Garbe <garbeam at gmail dot com>
- * 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * 2006-2007 Jukka Salmi <jukka at salmi dot ch>
- * 2007 Premysl Hruby <dfenze at gmail dot com>
- * 2007 Szabolcs Nagy <nszabolcs at gmail dot com>
- * 2007 Christof Musik <christof at sendfax dot de>
- * 2007-2008 Enno Gottox Boland <gottox at s01 dot de>
- * 2007-2008 Peter Hartlich <sgkkr at hartlich dot com>
- * 2008 Martin Hurton <martin dot hurton at gmail dot com>
- *
- * 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.
- */
diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD
deleted file mode 100644
index 854b9f409..000000000
--- a/libre/spectrwm-libre/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 101697 2013-11-30 11:24:42Z bpiotrowski $
-# Maintainer: Kyle Keen <keenerd@gmail.com>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-_pkgname=spectrwm
-pkgname=spectrwm-libre
-pkgver=2.4.0
-pkgrel=1
-pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.spectrwm.org"
-_watch="https://opensource.conformal.com/snapshots/spectrwm/"
-license=('custom:ISC')
-depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor')
-replaces=('spectrwm' 'scrotwm')
-conflicts=('spectrwm')
-provides=("spectrwm=$pkgver")
-makedepends=('libxt')
-optdepends=('scrot: screenshots' 'xlockmore: great screenlocker' 'terminus-font: great font')
-backup=(etc/spectrwm.conf)
-source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \
-	LICENSE \
-        baraction.sh)
-md5sums=('23e32c1e292f2fc94ed88195ffe60023'
-         'a67cfe51079481e5b0eab1ad371379e3'
-         '950d663692e1da56e0ac864c6c3ed80e')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  
-  # it is like a patch, only less fragile
-  sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c
-  sed -i 's/verbose_layout = 0;/verbose_layout = 1;/' spectrwm.c
-  sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf
-  # crashes if defaults can't be found, use smaller defaults
-  sed -i 's/-\*-terminus-medium-\*-\*-\*-\*/-*-profont-*-*-*-*-12/' spectrwm.conf
-  #sed -i 's/# program[lock].*/program[lock] = slock/' spectrwm.conf
-
-  # see spectrwm FS#403
-  sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c
-
-  cd linux
-  make PREFIX="/usr"
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver/linux"
-  make PREFIX="/usr" DESTDIR="$pkgdir" install
-  install -Dm644 spectrwm.desktop "$pkgdir/usr/share/xsessions/spectrwm.desktop"
-  cd ..
-  install -Dm644 spectrwm.conf "$pkgdir/etc/spectrwm.conf"
-  install -Dm755 screenshot.sh "$pkgdir/usr/share/spectrwm/screenshot.sh"
-  mkdir -p "$pkgdir/etc/spectrwm"
-  cp spectrwm_*.conf "$pkgdir/etc/spectrwm/"
-  cd "$srcdir"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
-  install -Dm755 baraction.sh "$pkgdir/usr/share/spectrwm/baraction.sh"
-
-  #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0"
-  #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so"
-
-  # fix this for real in the makefile
-  rm "$pkgdir/usr/bin/scrotwm"
-  ln -s "/usr/bin/spectrwm" "$pkgdir/usr/bin/scrotwm"
-  mkdir -p "$pkgdir"/usr/share/man/{es,it,pt,ru}/man1/
-  mv "$pkgdir/usr/share/man/man1/spectrwm_es.1" "$pkgdir/usr/share/man/es/man1/"
-  mv "$pkgdir/usr/share/man/man1/spectrwm_it.1" "$pkgdir/usr/share/man/it/man1/"
-  mv "$pkgdir/usr/share/man/man1/spectrwm_pt.1" "$pkgdir/usr/share/man/pt/man1/"
-  mv "$pkgdir/usr/share/man/man1/spectrwm_ru.1" "$pkgdir/usr/share/man/ru/man1/"
-}
diff --git a/libre/spectrwm-libre/baraction.sh b/libre/spectrwm-libre/baraction.sh
deleted file mode 100644
index 96a8a7b1a..000000000
--- a/libre/spectrwm-libre/baraction.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-# baraction.sh for spectrwm status bar
-# From http://wiki.archlinux.org/index.php/Scrotwm
-
-SLEEP_SEC=5
-#loops forever outputting a line every SLEEP_SEC secs
-while :; do
-
- 	eval $(cat /proc/acpi/battery/BAT0/state | awk '/charging state/ {printf "BAT_CHGSTATE=%s;", $3}; /remaining capacity/ {printf "BAT_REMNG=%s;",$3}; /present rate/ {printf "BAT_RATE=%s;",$3};' -)
- 	eval $(cat /proc/acpi/battery/BAT0/info | awk '/present/ {printf "BAT_PRESENT=%s;", $2}; /last full capacity/ {printf "BAT_LASTFULL=%s;",$4};' -)
- 
-	BAT_REMNG_WH=`echo "scale=1; a=($BAT_REMNG+50)/1000; print a" | bc -l`
-	BAT_RATE_W=`echo "scale=1; a=($BAT_RATE+50)/1000; print a" | bc -l`
-	BCSCRIPT="scale=0; a=(100*$BAT_REMNG / $BAT_LASTFULL); print a"
-	BAT_PCT=`echo $BCSCRIPT | bc -l`%
-
-	case $BAT_PRESENT in
-		no)
-		POWER_STR="AC, NO BATTERY"
-		;;
-		yes)
-
-		case $BAT_CHGSTATE in
-			charged)
-			#on ac
-			AC_STATUS="ON AC"
-			TIME_REMNG="N/A"
-			POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT"
-			;;
-			charging)
-			#on ac
-			AC_STATUS="ON AC"
-			BCSCRIPT="scale=1; a=(60*($BAT_LASTFULL - $BAT_REMNG) / $BAT_RATE); print a"
-			TIMETOFULL_MIN=`echo $BCSCRIPT | bc -l`
-			POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT C="$BAT_REMNG_WH"Wh Rate="$BAT_RATE_W"W TTF="$TIMETOFULL_MIN"min"
-			;;
-			discharging)
-			AC_STATUS="ON BATT"
-			TIME_REMNG_MIN=`echo "scale=0; a=(60*$BAT_REMNG / $BAT_RATE); print a" | bc -l`
-			TIME_REMNG_HH=`echo "scale=0; a=($BAT_REMNG / $BAT_RATE); if (a<10) {print "0"; print a} else {print a}" | bc -l`
-
-			TIME_REMNG_MM=`echo "scale=0; a=($TIME_REMNG_MIN-60*$TIME_REMNG_HH); if (a<10) {print "0"; print a} else {print a}" | bc -l`
-			POWER_STR="$AC_STATUS $BAT_PCT C="$BAT_REMNG_WH"Wh P="$BAT_RATE_W"W R="$TIME_REMNG_HH":"$TIME_REMNG_MM
-			;;
-			*)
-			POWER_STR=$BAT_CHGSTATE
-			;;
-		esac
-
-		;;
-		*)
-		POWER_STR="error"
-		;;
-	esac
-
-	#spectrwm bar_print can't handle UTF-8 characters, such as degree symbol
-	#Core 0:      +67.0°C  (crit = +100.0°C)
-	eval $(sensors 2>/dev/null | sed s/[°+]//g | awk '/^Core 0/ {printf "CORE0TEMP=%s;", $3}; /^Core 1/ {printf "CORE1TEMP=%s;",$3}; /^fan1/ {printf "FANSPD=%s;",$2};' -)
-	TEMP_STR="Tcpu=$CORE0TEMP,$CORE1TEMP F=$FANSPD"
-
-	WLAN_ESSID=$(iwconfig wlan0 | awk -F "\"" '/wlan0/ { print $2 }')
-	eval $(cat /proc/net/wireless | sed s/[.]//g | awk '/wlan0/ {printf "WLAN_QULTY=%s; WLAN_SIGNL=%s; WLAN_NOISE=%s", $3,$4,$5};' -)
-	BCSCRIPT="scale=0;a=100*$WLAN_QULTY/70;print a"
-	WLAN_QPCT=`echo $BCSCRIPT | bc -l`
-	WLAN_POWER=`iwconfig 2>/dev/null| grep "Tx-Power"| awk {'print $4'}|sed s/Tx-Power=//`
-	WLAN_STR="$WLAN_ESSID: Q=$WLAN_QPCT% S/N="$WLAN_SIGNL"/"$WLAN_NOISE"dBm T="$WLAN_POWER"dBm"
-
-	CPUFREQ_STR=`echo "Freq:"$(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;')`
-	CPULOAD_STR="Load:$(uptime | sed 's/.*://; s/,//g')"
-
-	eval $(awk '/^MemTotal/ {printf "MTOT=%s;", $2}; /^MemFree/ {printf "MFREE=%s;",$2}' /proc/meminfo)
-	MUSED=$(( $MTOT - $MFREE ))
-	MUSEDPT=$(( ($MUSED * 100) / $MTOT ))
-	MEM_STR="Mem:${MUSEDPT}%"
-
-	echo -e "$POWER_STR  $TEMP_STR  $CPUFREQ_STR  $CPULOAD_STR  $MEM_STR  $WLAN_STR"
-        #alternatively if you prefer a different date format
-        #DATE_STR=`date +"%H:%M %a %d %b`
-	#echo -e "$DATE_STR   $POWER_STR  $TEMP_STR  $CPUFREQ_STR  $CPULOAD_STR  $MEM_STR  $WLAN_STR"
-
-	sleep $SLEEP_SEC
-done
diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD
deleted file mode 100644
index 338fc5d7a..000000000
--- a/libre/stuntrally-data-libre/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgname=stuntrally-data-libre
-_pkgname=stuntrally-data
-pkgver=2.2.1
-pkgrel=1
-pkgdesc="Stunt Rally game with track editor, based on VDrift (data files), without nonfree data files"
-arch=('any')
-license=('GPL3' 'custom')
-url="http://code.google.com/p/vdrift-ogre"
-makedepends=('cmake' 'boost' 'libvorbis' 'mygui' 'sdl2' 'enet' 'hicolor-icon-theme' 'libxcursor')
-source=("$_pkgname-$pkgver.tar.gz::https://github.com/stuntrally/stuntrally/archive/${pkgver}.tar.gz"
-        "$_pkgname-tracks-$pkgver.tar.gz::https://github.com/stuntrally/tracks/archive/${pkgver}.tar.gz"
-        libre.patch )
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-sha256sums=('305b5f498ab150e4cf1fd1d47410ea04ad3cf439b60278ea2b73a01278d9ca51'
-            '45e9c976964e22348530a99a99c0dac30bc766d2f9edbe1a83a7b6791850d565'
-            '89eed28f625758a22460f2cea67547d2ea6cffa2bef8133083077b1753cf2b64')
-prepare() {
-  # patch some data files and remove nonfree data files
-  cd "${srcdir}/stuntrally-${pkgver}/"
-
-  patch -Np1 -i "${srcdir}/libre.patch"
-
-  rm -rv "data/"{grass/grassJungle.png,sounds/{0{1,2,3,4,5,6,7,8,9},1{0,1,2},boost,dirt{1,2},mud{1,_cont},scrap,screech,terrain{1,2,3,4,5},water{1,2,3,_cont}}.wav,terrain,trees2,cars/{3S,CT,M3,NS,TC6,XM}}
-
-  cd "${srcdir}/tracks-${pkgver}/"
-
-  rm -rv {detroit,ruudskogen,virginia,weekend}
-}
-
-build() {
-  # build the sources
-  cd "${srcdir}/stuntrally-${pkgver}/"
-
-  rm -rf build
-  mkdir build && cd build
-
-  cmake .. \
-      -DCMAKE_INSTALL_PREFIX="/usr" \
-      -DSHARE_INSTALL="share/stuntrally"
-  make
-
-  # build the tracks
-  cd "${srcdir}/tracks-${pkgver}/"
-
-  rm -rf build
-  mkdir build && cd build
-
-  cmake .. \
-      -DCMAKE_INSTALL_PREFIX="/usr"
-  make
-}
-
-package() {
-  # install the sources
-  cd "${srcdir}/stuntrally-${pkgver}/build/"
-  make DESTDIR="${pkgdir}" install
-
-  # install the tracks
-  cd "${srcdir}/tracks-${pkgver}/build"
-  make DESTDIR="${pkgdir}/usr/share/stuntrally/" install
-
-  # clean up
-  rm -rf "${pkgdir}/usr/share/stuntrally/tracks/build"
-  rm -rf "${pkgdir}/usr/share/icons"
-  rm -rf "${pkgdir}/usr/share/applications"
-  rm -rf "${pkgdir}/usr/bin"
-}
diff --git a/libre/stuntrally-data-libre/libre.patch b/libre/stuntrally-data-libre/libre.patch
deleted file mode 100644
index d55a4e54a..000000000
--- a/libre/stuntrally-data-libre/libre.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index c43ef18..aa6373e 100644
---- a/data/CMakeLists.txt
-+++ b/data/CMakeLists.txt
-@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
- 
- # Install data files
- # TODO: make this use all data/* subdirs without tracks, not entered by hand ..
--foreach(datadir  cars carsim compositor editor fonts ghosts grass gui hud loading materials materials2 objects particles road road_s skies skies_s sounds terrain terrain2 trees-old trees trees2)
-+foreach(datadir  cars carsim compositor editor fonts ghosts grass gui hud loading materials materials2 objects particles road road_s skies skies_s sounds terrain2 trees-old trees)
- 	install(DIRECTORY ${datadir} DESTINATION ${SHARE_INSTALL})
- endforeach()
- 
-diff --git a/data/grass/_grass.txt b/data/grass/_grass.txt
-index 787737e..84197af 100644
---- a/data/grass/_grass.txt
-+++ b/data/grass/_grass.txt
-@@ -10,10 +10,3 @@ http://opengameart.org/content/plants-textures-pack-03
- http://opengameart.org/content/plants-textures-pack-04
- 
- many colored by CryHam for SR
--
------ Old
--grassJungle.png  rest is colored
--
--This grass texture included with PagedGeometry was kindly provided by
--Agnisola Philippe (http://www.blitz3dfr.com/portal_joomla/) for 
--commercial or non-commercial use.
-diff --git a/data/sounds/_sounds_info.txt b/data/sounds/_sounds_info.txt
-index 2cab386..eb4e086 100644
---- a/data/sounds/_sounds_info.txt
-+++ b/data/sounds/_sounds_info.txt
-@@ -7,39 +7,3 @@ grass
- gravel
- tire_squeal
- wind
--
---- new sounds from
--http://www.freesound.org/
--
--various smaller cuts, from:
--[author  soundname]
--
--  metal hits 01..12:
--halleck  metal-medium-hit
--halleck  metal-hits-medium-1
--halleck  metal-hits-light-1
--halleck  metal-thump
--sagetyrtle  crash-1
--sagetyrtle  crash-2
--halleck  big-metal-side-impact-1
--halleck  big-metal-side-impact-2
--halleck  metal-crash-1
--  metal scrap,screech
--halleck  metal-roll-cage-hits-heavy
--halleck  metal-screech-and-scraping
--
--  water,mud:
--cgeffex  large-splashes
--
--  mud_cont, water_cont
--justinbw  water-spigget-onto-mud-1
--justinbw  water-spigget-onto-mud-2
--
--  terrain,dirt:
--halleck  hit-with-dirt-spray-1
--halleck  hit-with-dirt-spray-1-body
--halleck  hit-with-dirt-spray-2-body
--halleck  hit-with-dirt-spray-3
--
--  boost
--nathanshadow  thruster-level-ii
diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD
deleted file mode 100644
index 234f7a43f..000000000
--- a/libre/syslinux/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-# Contributor: Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgname="syslinux"
-pkgver="6.02"
-pkgrel="8"
-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')
-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'
-        'syslinux-6.02-fix-bios-isolinux.patch'
-        'syslinux-6.02-fix-efi-ovmf.patch'
-        'splash.png')
-md5sums=('6f275813a1b08cf852e55c0a3f8fbc78'
-         'f048880b57e2c5a7017ff8804bfda327'
-         '9376f18fa3e42fc36cffa4cff0a84c09'
-         '9dbede6b71a4de9e46aac4aad65334d7'
-         'adf71eceb4fccecd9a7efe1ab3d54918'
-         '62d22b101ef2ef53e25b4f86d9f41cb5'
-         'cb46ca47c6b6323127d908440057d98f')
-prepare() {
-    
-    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"
-    
-    # fix bios booting from isohybrid
-    # http://www.syslinux.org/archives/2013-November/021189.html
-    patch -Np1 -i "${srcdir}/syslinux-6.02-fix-bios-isolinux.patch"
-
-    # fix efi booting in qemu/ovmf
-    # http://bugzilla.syslinux.org/show_bug.cgi?id=23
-    patch -Np1 -i  "${srcdir}/syslinux-6.02-fix-efi-ovmf.patch"
-    
-}
-
-_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}/"
-    
-    ## 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_syslinux_efi() {
-    
-    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() {
-    
-    cd "${srcdir}/${pkgname}-${pkgver}/"
-    
-    _package_syslinux_efi
-    
-    _package_syslinux_bios
-    
-}
-
diff --git a/libre/syslinux/splash.png b/libre/syslinux/splash.png
deleted file mode 100644
index eac14536b..000000000
--- a/libre/syslinux/splash.png
+++ /dev/null
diff --git a/libre/syslinux/splash.xcf b/libre/syslinux/splash.xcf
deleted file mode 100644
index c27d04445..000000000
--- a/libre/syslinux/splash.xcf
+++ /dev/null
diff --git a/libre/syslinux/syslinux-6.00-efi-export-kbdmap.patch b/libre/syslinux/syslinux-6.00-efi-export-kbdmap.patch
deleted file mode 100644
index cbcd9a6da..000000000
--- a/libre/syslinux/syslinux-6.00-efi-export-kbdmap.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2a81889c7d680fbe51de63dbbeb4e8c290ec46fa Mon Sep 17 00:00:00 2001
-From: Matt Fleming <matt.fleming@intel.com>
-Date: Fri, 21 Jun 2013 07:14:24 +0000
-Subject: efi: Tag symbols with __export
-
-I missed some symbols previously that are required to be exported when
-loading vesamenu.c32.
-
-Signed-off-by: Matt Fleming <matt.fleming@intel.com>
----
-diff --git a/efi/main.c b/efi/main.c
-index 51ff9f3..71333a4 100644
---- a/efi/main.c
-+++ b/efi/main.c
-@@ -21,7 +21,7 @@ uint32_t _IdleTimer = 0;
- char __lowmem_heap[32];
- uint32_t BIOS_timer_next;
- uint32_t timer_irq;
--uint8_t KbdMap[256];
-+__export uint8_t KbdMap[256];
- char aux_seg[256];
- 
- static inline EFI_STATUS
-diff --git a/efi/vesa.c b/efi/vesa.c
-index d259f60..b4a541b 100644
---- a/efi/vesa.c
-+++ b/efi/vesa.c
-@@ -297,7 +297,7 @@ static int efi_vesacon_font_query(uint8_t **font)
-     return cp865_8x16_font_height;
- }
- 
--int __vesacon_i915resolution(int x, int y)
-+__export int __vesacon_i915resolution(int x, int y)
- {
- 	/* We don't support this function */
- 	return 1;
---
-cgit v0.9.2
diff --git a/libre/syslinux/syslinux-6.00-efi-fix-libcom32.patch b/libre/syslinux/syslinux-6.00-efi-fix-libcom32.patch
deleted file mode 100644
index 7460cd195..000000000
--- a/libre/syslinux/syslinux-6.00-efi-fix-libcom32.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 013ef7679a573b3b3454f914f3a7f865991db9f2 Mon Sep 17 00:00:00 2001
-From: Matt Fleming <matt.fleming@intel.com>
-Date: Fri, 21 Jun 2013 07:13:16 +0000
-Subject: efi: Export __bcopyxx_len
-
-We need to provide a __bcopyxx_len symbol for EFI because it's
-referenced in generic code in libcom32.c32. Without this change,
-libcom32.c32 will fail to load under EFI.
-
-Signed-off-by: Matt Fleming <matt.fleming@intel.com>
----
-diff --git a/core/include/core.h b/core/include/core.h
-index 5736d39..127ac65 100644
---- a/core/include/core.h
-+++ b/core/include/core.h
-@@ -26,6 +26,7 @@ extern char cmd_line[];
- extern char ConfigFile[];
- extern char syslinux_banner[];
- extern char copyright_str[];
-+extern unsigned int __bcopyxx_len;
- 
- /*
-  * Mark symbols that are only used by BIOS as __weak until we can move
-@@ -35,7 +36,6 @@ extern char copyright_str[];
- extern __weak uint16_t BIOSName;
- extern __weak char KernelName[];
- extern __weak char StackBuf[];
--extern __weak unsigned int __bcopyxx_len;
- 
- extern uint8_t KbdMap[256];
- 
-diff --git a/efi/main.c b/efi/main.c
-index 438e88c..51ff9f3 100644
---- a/efi/main.c
-+++ b/efi/main.c
-@@ -153,6 +153,7 @@ void pxenv(void)
- uint16_t BIOS_fbm = 1;
- far_ptr_t InitStack;
- far_ptr_t PXEEntry;
-+__export unsigned int __bcopyxx_len = 0;
- 
- void gpxe_unload(void)
- {
---
-cgit v0.9.2
diff --git a/libre/syslinux/syslinux-6.02-fix-bios-isolinux.patch b/libre/syslinux/syslinux-6.02-fix-bios-isolinux.patch
deleted file mode 100644
index 48df46f12..000000000
--- a/libre/syslinux/syslinux-6.02-fix-bios-isolinux.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/core/isolinux.asm b/core/isolinux.asm
-index bd4e9556922d..c4db4133e274 100644
---- a/core/isolinux.asm
-+++ b/core/isolinux.asm
-@@ -420,7 +420,7 @@ MaxLMA		equ 384*1024		; Reasonable limit (384K)
- 		call getlinsec
- 		pop eax
- 		pop cx
--		mov dx,cx
-+		movzx edx,cx
- 		pop bp
- 		pop bx
diff --git a/libre/syslinux/syslinux-6.02-fix-chainloading.patch b/libre/syslinux/syslinux-6.02-fix-chainloading.patch
deleted file mode 100644
index 6fd7ef4a8..000000000
--- a/libre/syslinux/syslinux-6.02-fix-chainloading.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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-6.02-fix-efi-ovmf.patch b/libre/syslinux/syslinux-6.02-fix-efi-ovmf.patch
deleted file mode 100644
index f33f4c1de..000000000
--- a/libre/syslinux/syslinux-6.02-fix-efi-ovmf.patch
+++ /dev/null
@@ -1,621 +0,0 @@
-The value of the field rva_and_sizes_nr is used by OVMF to check the
-consistency of the PE file with respect to the field optional_hdr_sz. It
-now have the right value.
-
-Signed-off-by: Celelibi <celelibi at gmail.com>
----
- efi/wrapper.c |  6 +++---
- efi/wrapper.h | 28 ++++++++++++++++------------
- 2 files changed, 19 insertions(+), 15 deletions(-)
-
-diff --git a/efi/wrapper.c b/efi/wrapper.c
-index 04c895f..ec77271 100644
---- a/efi/wrapper.c
-+++ b/efi/wrapper.c
-@@ -102,7 +102,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
- 		e_hdr.image_sz = total_sz;
- 		e_hdr.headers_sz = 512;
- 		e_hdr.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
--		e_hdr.rva_and_sizes_nr = 1;
-+		e_hdr.rva_and_sizes_nr = sizeof(e_hdr.data_directory) / sizeof(__uint64_t);
- 		fwrite(&e_hdr, sizeof(e_hdr), 1, f);
- 	}
- 	else if (class == ELFCLASS64) {
-@@ -130,7 +130,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
- 		e_hdr_pe32p.image_sz = total_sz;
- 		e_hdr_pe32p.headers_sz = 512;
- 		e_hdr_pe32p.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
--		e_hdr_pe32p.rva_and_sizes_nr = 1;
-+		e_hdr_pe32p.rva_and_sizes_nr = sizeof(e_hdr_pe32p.data_directory) / sizeof(__uint64_t);
- 		fwrite(&e_hdr_pe32p, sizeof(e_hdr_pe32p), 1, f);
- 	}
- 
-@@ -237,7 +237,7 @@ int main(int argc, char **argv)
- 		fprintf(stderr, "Unsupported architecture\n");
- 		exit(EXIT_FAILURE);
- 	}
--		
-+
- 	if (id[EI_MAG0] != ELFMAG0 ||
- 	    id[EI_MAG1] != ELFMAG1 ||
- 	    id[EI_MAG2] != ELFMAG2 ||
-diff --git a/efi/wrapper.h b/efi/wrapper.h
-index 4f76991..0e6b38e 100644
---- a/efi/wrapper.h
-+++ b/efi/wrapper.h
-@@ -102,12 +102,14 @@ struct extra_hdr {
- 	__uint32_t heap_commit_sz;
- 	__uint32_t loader_flags;
- 	__uint32_t rva_and_sizes_nr;
--	__uint64_t export_table;
--	__uint64_t import_table;
--	__uint64_t resource_table;
--	__uint64_t exception_table;
--	__uint64_t certification_table;
--	__uint64_t base_relocation_table;
-+	struct {
-+		__uint64_t export_table;
-+		__uint64_t import_table;
-+		__uint64_t resource_table;
-+		__uint64_t exception_table;
-+		__uint64_t certification_table;
-+		__uint64_t base_relocation_table;
-+	} data_directory;
- } __packed;
- 
- /* Extra header for PE32+ format 
-@@ -136,12 +138,14 @@ struct extra_hdr_pe32p {
- 	__uint64_t heap_commit_sz;
- 	__uint32_t loader_flags;
- 	__uint32_t rva_and_sizes_nr;
--	__uint64_t export_table;
--	__uint64_t import_table;
--	__uint64_t resource_table;
--	__uint64_t exception_table;
--	__uint64_t certification_table;
--	__uint64_t base_relocation_table;
-+	struct {
-+		__uint64_t export_table;
-+		__uint64_t import_table;
-+		__uint64_t resource_table;
-+		__uint64_t exception_table;
-+		__uint64_t certification_table;
-+		__uint64_t base_relocation_table;
-+	} data_directory;
- } __packed;
- 
- struct section {
-In the generated PE file, the section header for the .text section used
-to address more than the whole file. Starting at offset 0 (before the
-end of the headers) is illegal and is rejected by OVMF. Giving a size
-greater than the actual file size is also illegal and rejected.
-
-Moreover, the actual data inside the PE file have to be aligned to at
-least 512 bytes. Hence, .text need to be aligned as well.
-
-Signed-off-by: Celelibi <celelibi at gmail.com>
----
- efi/wrapper.c | 44 +++++++++++++++++++++++++-------------------
- 1 file changed, 25 insertions(+), 19 deletions(-)
-
-diff --git a/efi/wrapper.c b/efi/wrapper.c
-index ec77271..bd2c175 100644
---- a/efi/wrapper.c
-+++ b/efi/wrapper.c
-@@ -54,11 +54,15 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
- 	struct coff_hdr c_hdr;
- 	struct header hdr;
- 	struct coff_reloc c_rel;
--	__uint32_t total_sz = so_size;
-+	__uint32_t total_sz = data_size;
- 	__uint32_t dummy = 0;
- 	__uint32_t hdr_sz;
- 	__uint32_t reloc_start, reloc_end;
- 
-+	hdr_sz = 512;
-+	total_sz += hdr_sz;
-+	entry += hdr_sz;
-+
- 	memset(&hdr, 0, sizeof(hdr));
- 	hdr.msdos_signature = MSDOS_SIGNATURE;
- 
-@@ -77,11 +81,6 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
- 	c_hdr.nr_sections = 2;
- 	c_hdr.nr_syms = 1;
- 	if (class == ELFCLASS32) {
--		hdr_sz = sizeof(o_hdr) + sizeof(t_sec) + sizeof(e_hdr) +
--				sizeof(r_sec) + sizeof(c_hdr) + sizeof(hdr) + sizeof(c_rel)
--				+ sizeof(dummy);
--		total_sz += hdr_sz;
--		entry += hdr_sz;
- 		c_hdr.arch = IMAGE_FILE_MACHINE_I386;
- 		c_hdr.characteristics = IMAGE_FILE_32BIT_MACHINE |
- 			IMAGE_FILE_DEBUG_STRIPPED | IMAGE_FILE_EXECUTABLE_IMAGE |
-@@ -92,25 +91,20 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
- 		o_hdr.format = PE32_FORMAT;
- 		o_hdr.major_linker_version = 0x02;
- 		o_hdr.minor_linker_version = 0x14;
--		o_hdr.code_sz = total_sz;
-+		o_hdr.code_sz = data_size;
- 		o_hdr.entry_point = entry;
- 		o_hdr.initialized_data_sz = data_size;
- 		fwrite(&o_hdr, sizeof(o_hdr), 1, f);
- 		memset(&e_hdr, 0, sizeof(e_hdr));
- 		e_hdr.section_align = 4096;
- 		e_hdr.file_align = 512;
--		e_hdr.image_sz = total_sz;
--		e_hdr.headers_sz = 512;
-+		e_hdr.image_sz = hdr_sz + so_size;
-+		e_hdr.headers_sz = hdr_sz;
- 		e_hdr.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
- 		e_hdr.rva_and_sizes_nr = sizeof(e_hdr.data_directory) / sizeof(__uint64_t);
- 		fwrite(&e_hdr, sizeof(e_hdr), 1, f);
- 	}
- 	else if (class == ELFCLASS64) {
--		hdr_sz = sizeof(o_hdr_pe32p) + sizeof(t_sec) + sizeof(e_hdr_pe32p) +
--				sizeof(r_sec) + sizeof(c_hdr) + sizeof(hdr) + sizeof(c_rel)
--				+ sizeof(dummy);
--		total_sz += hdr_sz;
--		entry += hdr_sz;
- 		c_hdr.arch = IMAGE_FILE_MACHINE_X86_64;
- 		c_hdr.characteristics = IMAGE_FILE_DEBUG_STRIPPED | IMAGE_FILE_EXECUTABLE_IMAGE |
- 			IMAGE_FILE_LINE_NUMBERS_STRIPPED;
-@@ -120,15 +114,15 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
- 		o_hdr_pe32p.format = PE32P_FORMAT;
- 		o_hdr_pe32p.major_linker_version = 0x02;
- 		o_hdr_pe32p.minor_linker_version = 0x14;
--		o_hdr_pe32p.code_sz = total_sz;
-+		o_hdr_pe32p.code_sz = data_size;
- 		o_hdr_pe32p.entry_point = entry;
- 		o_hdr.initialized_data_sz = data_size;
- 		fwrite(&o_hdr_pe32p, sizeof(o_hdr_pe32p), 1, f);
- 		memset(&e_hdr_pe32p, 0, sizeof(e_hdr));
- 		e_hdr_pe32p.section_align = 4096;
- 		e_hdr_pe32p.file_align = 512;
--		e_hdr_pe32p.image_sz = total_sz;
--		e_hdr_pe32p.headers_sz = 512;
-+		e_hdr_pe32p.image_sz = hdr_sz + so_size;
-+		e_hdr_pe32p.headers_sz = hdr_sz;
- 		e_hdr_pe32p.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
- 		e_hdr_pe32p.rva_and_sizes_nr = sizeof(e_hdr_pe32p.data_directory) / sizeof(__uint64_t);
- 		fwrite(&e_hdr_pe32p, sizeof(e_hdr_pe32p), 1, f);
-@@ -136,8 +130,10 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
- 
- 	memset(&t_sec, 0, sizeof(t_sec));
- 	strcpy((char *)t_sec.name, ".text");
--	t_sec.virtual_sz = total_sz;
--	t_sec.raw_data_sz = total_sz;
-+	t_sec.virtual_sz = data_size;
-+	t_sec.virtual_address = hdr_sz;
-+	t_sec.raw_data_sz = t_sec.virtual_sz;
-+	t_sec.raw_data = t_sec.virtual_address;
- 	t_sec.characteristics = IMAGE_SCN_CNT_CODE |
- 		IMAGE_SCN_ALIGN_16BYTES | IMAGE_SCN_MEM_EXECUTE |
- 		IMAGE_SCN_MEM_READ;
-@@ -163,6 +159,16 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
- 	fwrite(&c_rel, sizeof(c_rel), 1, f);
- 	fwrite(&dummy, sizeof(dummy), 1, f);
- 
-+	/*
-+	 * Add some padding to align the ELF as needed
-+	 */
-+	if (ftell(f) > t_sec.virtual_address) {
-+		// A fseek that rewind would be a bug hard to track
-+		fprintf(stderr, "PE+ headers are too large.\n");
-+		exit(EXIT_FAILURE);
-+	}
-+
-+	fseek(f, t_sec.virtual_address, SEEK_SET);
- }
- 
- static void usage(char *progname)
-There is no need to have a relocation section that nothing points at.
-The image is still seen as relocatable as long as the Characteristics of
-the FileHeader do not say otherwise.
-
-Moreover, the field base_relocation_table wasn't initialized properly
-leading to unpredictable bugs.
-
-Signed-off-by: Celelibi <celelibi at gmail.com>
----
-
-I'm not 100% positive about the uselessness of the relocation section. However:
-1) it works on my real hardware;
-2) OVMF doesn't check the section headers at all;
-3) all the docs I could find say that the section names are arbitrary;
-4) the only way to make the relocation actually happen is by setting the
-base_relocation_table field of the extra headers to point to this section;
-5) The right way to indicate the image is not relocatable would be by setting
-the characteristics IMAGE_FILE_RELOCS_STRIPPED in the coff header.
-
-Moreover, the relocation entry cannot be inserted before the end of the headers
-(512 bytes), this mean we would have to push everything a few bytes further.
-And I think it's better if it can be avoided. :)
-
- efi/wrapper.c | 28 +++-------------------------
- 1 file changed, 3 insertions(+), 25 deletions(-)
-
-diff --git a/efi/wrapper.c b/efi/wrapper.c
-index bd2c175..9652368 100644
---- a/efi/wrapper.c
-+++ b/efi/wrapper.c
-@@ -48,14 +48,12 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
- {
- 	struct optional_hdr o_hdr;
- 	struct optional_hdr_pe32p o_hdr_pe32p;
--	struct section t_sec, r_sec;
-+	struct section t_sec;
- 	struct extra_hdr e_hdr;
- 	struct extra_hdr_pe32p e_hdr_pe32p;
- 	struct coff_hdr c_hdr;
- 	struct header hdr;
--	struct coff_reloc c_rel;
- 	__uint32_t total_sz = data_size;
--	__uint32_t dummy = 0;
- 	__uint32_t hdr_sz;
- 	__uint32_t reloc_start, reloc_end;
- 
-@@ -78,7 +76,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
- 	fwrite(&hdr, sizeof(hdr), 1, f);
- 
- 	memset(&c_hdr, 0, sizeof(c_hdr));
--	c_hdr.nr_sections = 2;
-+	c_hdr.nr_sections = 1;
- 	c_hdr.nr_syms = 1;
- 	if (class == ELFCLASS32) {
- 		c_hdr.arch = IMAGE_FILE_MACHINE_I386;
-@@ -118,7 +116,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
- 		o_hdr_pe32p.entry_point = entry;
- 		o_hdr.initialized_data_sz = data_size;
- 		fwrite(&o_hdr_pe32p, sizeof(o_hdr_pe32p), 1, f);
--		memset(&e_hdr_pe32p, 0, sizeof(e_hdr));
-+		memset(&e_hdr_pe32p, 0, sizeof(e_hdr_pe32p));
- 		e_hdr_pe32p.section_align = 4096;
- 		e_hdr_pe32p.file_align = 512;
- 		e_hdr_pe32p.image_sz = hdr_sz + so_size;
-@@ -140,26 +138,6 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
- 	fwrite(&t_sec, sizeof(t_sec), 1, f);
- 
- 	/*
--	 * Write our dummy relocation and reloc section.
--	 */
--	memset(&r_sec, 0, sizeof(r_sec));
--	strcpy((char *)r_sec.name, ".reloc");
--	r_sec.virtual_sz = sizeof(c_rel);
--	r_sec.virtual_address = ftell(f) + sizeof(r_sec);
--	r_sec.raw_data_sz = r_sec.virtual_sz;
--	r_sec.raw_data = r_sec.virtual_address;
--	r_sec.characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA |
--		IMAGE_SCN_ALIGN_1BYTES | IMAGE_SCN_MEM_DISCARDABLE |
--		IMAGE_SCN_MEM_READ;
--	fwrite(&r_sec, sizeof(r_sec), 1, f);
--
--	memset(&c_rel, 0, sizeof(c_rel));
--	c_rel.virtual_address = ftell(f) + sizeof(c_rel);
--	c_rel.symtab_index = 10;
--	fwrite(&c_rel, sizeof(c_rel), 1, f);
--	fwrite(&dummy, sizeof(dummy), 1, f);
--
--	/*
- 	 * Add some padding to align the ELF as needed
- 	 */
- 	if (ftell(f) > t_sec.virtual_address) {
-PE headers code_sz and image_sz indicate more or less, the size of the
-file and the size of the in-memory image. They are now given the right
-value.
-
-In the ELF format, only the program headers are reliable to determine
-the actually needed part of the file and the in-memory size.
-
-The .bss section should always be marked as NOLOAD for ld since its
-content shouldn't be included into the binary file.
-
-Signed-off-by: Celelibi <celelibi at gmail.com>
----
-
-Again, I'm not 100% positive about the semantics of NOLOAD in a linker script.
-However I found this make things work better.
-Actually the file core/fs/fs.o have a .bss16 section that is not empty. If I
-understood correctly, only .bss can be empty in a .o. Thus ld generates the
-zeros that belong to that section in the .o. Then, when merging the section
-.bss16 into the .bss of syslinux.so, ld is forced to generate ALL the zeros
-that belong to the .bss section. Marking this section as NOLOAD make ld to
-ignore its content but still produce a PT_LOAD program header with the right
-memory size, as needed for the bss.
-
- efi/i386/syslinux.ld   |   4 +-
- efi/wrapper.c          | 138 +++++++++++++++----------------------------------
- efi/x86_64/syslinux.ld |   4 +-
- 3 files changed, 45 insertions(+), 101 deletions(-)
-
-diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld
-index 523a9b9..bab3fc7 100644
---- a/efi/i386/syslinux.ld
-+++ b/efi/i386/syslinux.ld
-@@ -136,7 +136,7 @@ SECTIONS
- 		*(.strtab)
- 	}
- 
--	.bss : {
-+	.bss (NOLOAD) : {
- 		/* the EFI loader doesn't seem to like a .bss section,
- 		   so we stick it all into .data: */
- 		__bss_start = .;
-@@ -153,7 +153,7 @@ SECTIONS
- 	__bss_dwords = (__bss_len + 3) >> 2;
- 
- 	. = ALIGN(128);
--	
-+
- 	/* Very large objects which don't need to be zeroed */
- 
- 	.hugebss : {
-diff --git a/efi/wrapper.c b/efi/wrapper.c
-index 9652368..a5247ae 100644
---- a/efi/wrapper.c
-+++ b/efi/wrapper.c
-@@ -35,7 +35,7 @@ typedef Elf64_Addr Elf_Addr;
- #endif
- 
- /*
-- * 'so_size' is the file size of the ELF shared object.
-+ * 'so_memsz' is the size of the ELF shared object once loaded.
-  * 'data_size' is the size of initialised data in the shared object.
-  *  'class' dictates how the header is written
-  * 	For 32bit machines (class == ELFCLASS32), the optional
-@@ -44,7 +44,7 @@ typedef Elf64_Addr Elf_Addr;
-  * 	header includes PE32+header fields
-  */
- static void write_header(FILE *f, __uint32_t entry, size_t data_size,
--			 __uint32_t so_size, __uint8_t class)
-+			 __uint32_t so_memsz, __uint8_t class)
- {
- 	struct optional_hdr o_hdr;
- 	struct optional_hdr_pe32p o_hdr_pe32p;
-@@ -96,7 +96,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
- 		memset(&e_hdr, 0, sizeof(e_hdr));
- 		e_hdr.section_align = 4096;
- 		e_hdr.file_align = 512;
--		e_hdr.image_sz = hdr_sz + so_size;
-+		e_hdr.image_sz = hdr_sz + so_memsz;
- 		e_hdr.headers_sz = hdr_sz;
- 		e_hdr.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
- 		e_hdr.rva_and_sizes_nr = sizeof(e_hdr.data_directory) / sizeof(__uint64_t);
-@@ -119,7 +119,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
- 		memset(&e_hdr_pe32p, 0, sizeof(e_hdr_pe32p));
- 		e_hdr_pe32p.section_align = 4096;
- 		e_hdr_pe32p.file_align = 512;
--		e_hdr_pe32p.image_sz = hdr_sz + so_size;
-+		e_hdr_pe32p.image_sz = hdr_sz + so_memsz;
- 		e_hdr_pe32p.headers_sz = hdr_sz;
- 		e_hdr_pe32p.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
- 		e_hdr_pe32p.rva_and_sizes_nr = sizeof(e_hdr_pe32p.data_directory) / sizeof(__uint64_t);
-@@ -157,17 +157,16 @@ static void usage(char *progname)
- 
- int main(int argc, char **argv)
- {
--	struct stat st;
- 	Elf32_Ehdr e32_hdr;
- 	Elf64_Ehdr e64_hdr;
- 	__uint32_t entry;
- 	__uint8_t class;
--	__uint64_t shoff;
--	__uint16_t shnum, shentsize, shstrndx;
-+	__uint64_t phoff = 0;
-+	__uint16_t phnum = 0, phentsize = 0;
- 	unsigned char *id;
- 	FILE *f_in, *f_out;
- 	void *buf;
--	size_t datasz, rv;
-+	size_t datasz, memsz, rv;
- 
- 	if (argc < 3) {
- 		usage(argv[0]);
-@@ -180,11 +179,6 @@ int main(int argc, char **argv)
- 		exit(EXIT_FAILURE);
- 	}
- 
--	if (stat(argv[1], &st) != 0) {
--		perror("stat");
--		exit(EXIT_FAILURE);
--	}
--
- 	f_out = fopen(argv[2], "w");
- 	if (!f_out) {
- 		perror("fopen");
-@@ -194,15 +188,14 @@ int main(int argc, char **argv)
- 	/*
- 	 * Parse the ELF header and find the entry point.
- 	 */
-- 	fread((void *)&e32_hdr, sizeof(e32_hdr), 1, f_in);
-+	fread((void *)&e32_hdr, sizeof(e32_hdr), 1, f_in);
- 	if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS32) {
- 		id = e32_hdr.e_ident;
- 		class = ELFCLASS32;
- 		entry = e32_hdr.e_entry;
--		shoff = e32_hdr.e_shoff;
--		shnum = e32_hdr.e_shnum;
--		shstrndx = e32_hdr.e_shstrndx;
--		shentsize = e32_hdr.e_shentsize;
-+		phoff = e32_hdr.e_phoff;
-+		phnum = e32_hdr.e_phnum;
-+		phentsize = e32_hdr.e_phentsize;
- 	}
- 	else if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS64) {
- 		/* read the header again for x86_64 
-@@ -213,10 +206,9 @@ int main(int argc, char **argv)
- 		fread((void *)&e64_hdr, sizeof(e64_hdr), 1, f_in);
- 		id = e64_hdr.e_ident;
- 		entry = e64_hdr.e_entry;
--		shoff = e64_hdr.e_shoff;
--		shnum = e64_hdr.e_shnum;
--		shstrndx = e64_hdr.e_shstrndx;
--		shentsize = e64_hdr.e_shentsize;
-+		phoff = e64_hdr.e_phoff;
-+		phnum = e64_hdr.e_phnum;
-+		phentsize = e64_hdr.e_phentsize;
- 	} else {
- 		fprintf(stderr, "Unsupported architecture\n");
- 		exit(EXIT_FAILURE);
-@@ -230,98 +222,47 @@ int main(int argc, char **argv)
- 		exit(EXIT_FAILURE);
- 	}
- 
--	if (!shoff || !shnum || (shstrndx == SHN_UNDEF)) {
--		fprintf(stderr, "Cannot find section table\n");
-+	if (!phoff || !phnum) {
-+		fprintf(stderr, "Cannot find segment table\n");
- 		exit(EXIT_FAILURE);
- 	}
- 
- 	/*
--	 * Find the beginning of the .bss section. Everything preceding
--	 * it is copied verbatim to the output file.
-+	 * Find the LOAD program header. Everything in this segment
-+	 * is copied verbatim to the output file.
-+	 * Although there may be several LOAD program headers, only
-+	 * one is currently copied.
- 	 */
- 	if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS32) {
--		const char *shstrtab, *name;
--		Elf32_Shdr shdr;
-+		Elf32_Phdr phdr;
- 		int i;
--		void *strtab;
--
--		fseek(f_in, shoff, SEEK_SET);
--
--		/* First find the strtab section */
--		fseek(f_in, shstrndx * shentsize, SEEK_CUR);
--		fread(&shdr, sizeof(shdr), 1, f_in);
- 
--		strtab = malloc(shdr.sh_size);
--		if (!strtab) {
--			fprintf(stderr, "Failed to malloc strtab\n");
--			exit(EXIT_FAILURE);
--		}
--
--		fseek(f_in, shdr.sh_offset, SEEK_SET);
--		fread(strtab, shdr.sh_size, 1, f_in);
--
--		/* Now search for the .bss section */
--		fseek(f_in, shoff, SEEK_SET);
--		for (i = 0; i < shnum; i++) {
--			rv = fread(&shdr, sizeof(shdr), 1, f_in);
--			if (!rv) {
--				fprintf(stderr, "Failed to read section table\n");
--				exit(EXIT_FAILURE);
--			}
-+		/* Find the first LOAD program header */
-+		for (i = 0; i < phnum; i++) {
-+			fseek(f_in, phoff + i * phentsize, SEEK_SET);
-+			fread(&phdr, sizeof(phdr), 1, f_in);
- 
--			name = strtab + shdr.sh_name;
--			if (!strcmp(name, ".bss"))
-+			if (phdr.p_type == PT_LOAD)
- 				break;
- 		}
- 
--		if (i == shnum) {
--			fprintf(stderr, "Failed to find .bss section\n");
--			exit(EXIT_FAILURE);
--		}
--
--		datasz = shdr.sh_offset;
--	}
--	else if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS64) {
--		const char *shstrtab, *name;
--		Elf64_Shdr shdr;
-+		datasz = phdr.p_filesz;
-+		memsz = phdr.p_memsz;
-+	} else if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS64) {
-+		Elf64_Phdr phdr;
- 		int i;
--		void *strtab;
--
--		fseek(f_in, shoff, SEEK_SET);
- 
--		/* First find the strtab section */
--		fseek(f_in, shstrndx * shentsize, SEEK_CUR);
--		fread(&shdr, sizeof(shdr), 1, f_in);
--
--		strtab = malloc(shdr.sh_size);
--		if (!strtab) {
--			fprintf(stderr, "Failed to malloc strtab\n");
--			exit(EXIT_FAILURE);
--		}
-+		/* Find the first LOAD program header */
-+		for (i = 0; i < phnum; i++) {
-+			fseek(f_in, phoff + i * phentsize, SEEK_SET);
-+			fread(&phdr, sizeof(phdr), 1, f_in);
- 
--		fseek(f_in, shdr.sh_offset, SEEK_SET);
--		fread(strtab, shdr.sh_size, 1, f_in);
--
--		/* Now search for the .bss section */
--		fseek(f_in, shoff, SEEK_SET);
--		for (i = 0; i < shnum; i++) {
--			rv = fread(&shdr, sizeof(shdr), 1, f_in);
--			if (!rv) {
--				fprintf(stderr, "Failed to read section table\n");
--				exit(EXIT_FAILURE);
--			}
--
--			name = strtab + shdr.sh_name;
--			if (!strcmp(name, ".bss"))
-+			if (phdr.p_type == PT_LOAD)
- 				break;
- 		}
- 
--		if (i == shnum) {
--			fprintf(stderr, "Failed to find .bss section\n");
--			exit(EXIT_FAILURE);
--		}
--
--		datasz = shdr.sh_offset;
-+		datasz = phdr.p_filesz;
-+		memsz = phdr.p_memsz;
- 	}
- 
- 	buf = malloc(datasz);
-@@ -330,7 +271,7 @@ int main(int argc, char **argv)
- 		exit(EXIT_FAILURE);
- 	}
- 
--	write_header(f_out, entry, datasz, st.st_size, class);
-+	write_header(f_out, entry, datasz, memsz, class);
- 
- 	/* Write out the entire ELF shared object */
- 	rewind(f_in);
-@@ -341,5 +282,8 @@ int main(int argc, char **argv)
- 	}
- 
- 	fwrite(buf, datasz, rv, f_out);
-+	free(buf);
-+	fclose(f_out);
-+	fclose(f_in);
- 	return 0;
- }
-diff --git a/efi/x86_64/syslinux.ld b/efi/x86_64/syslinux.ld
-index 95160bd..450641c 100644
---- a/efi/x86_64/syslinux.ld
-+++ b/efi/x86_64/syslinux.ld
-@@ -136,7 +136,7 @@ SECTIONS
- 		*(.strtab)
- 	}
- 
--	.bss : {
-+	.bss (NOLOAD) : {
- 		/* the EFI loader doesn't seem to like a .bss section,
- 		   so we stick it all into .data: */
- 		__bss_start = .;
-@@ -153,7 +153,7 @@ SECTIONS
- 	__bss_dwords = (__bss_len + 3) >> 2;
- 
- 	. = ALIGN(128);
--	
-+
- 	/* Very large objects which don't need to be zeroed */
- 
- 	.hugebss : {
diff --git a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
deleted file mode 100644
index 54151ab87..000000000
--- a/libre/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/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update
deleted file mode 100644
index 3843b5fed..000000000
--- a/libre/syslinux/syslinux-install_update
+++ /dev/null
@@ -1,453 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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
-# 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.
-#
-#-----------------
-# ChangeLog:
-# 2013-10-23 : Keshav Padram Amburay : Updated script to work with Syslinux 6.02 Arch Linux pkg
-#-----------------
-# 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_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 syslinux *.c32 modules to /boot
-    rm "$bios_bootpath"/*.c32 &> /dev/null
-    cp "$bios_libpath"/*.c32 "$bios_bootpath"/ &> /dev/null
-
-    # 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
-}
-
-_install() {
-    install_modules
-
-    if device_is_raid "$bootpart" ; then
-        echo "Detected RAID on /boot - installing Syslinux with --raid"
-        "$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 - updating Syslinux with --raid"
-        "$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
-
-# 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
-    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/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg
deleted file mode 100644
index 0c0c6339a..000000000
--- a/libre/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/syslinux/syslinux.install b/libre/syslinux/syslinux.install
deleted file mode 100644
index ed8387773..000000000
--- a/libre/syslinux/syslinux.install
+++ /dev/null
@@ -1,43 +0,0 @@
-post_install() {
-  
-  cat << EOF
-
-==> For setting up Syslinux BIOS using the syslinux-install_update script follow 
-    https://wiki.parabolagnulinux.org/index.php/Syslinux#Automatic_Install
-EOF
-  
-  ## Message specific to Syslinux 4.xx (or 5.xx) to 6.xx upgrade
-  if [ "$(vercmp $2 6.00)" -lt 0 ]; then
-    
-    cat << EOF
-
-==> If you are upgrading from Syslinux 4.xx or 5.xx, please re-install
-    (not update) Syslinux BIOS manually (not using the install script) once
-    by following https://wiki.parabolagnulinux.org/index.php/Syslinux#Manual_install
-
-==> The install script may not properly upgrade Syslinux to 6.xx version
-EOF
-    
-  fi
-  
-  cat << EOF
-
-==> For setting up Syslinux EFI follow
-    https://wiki.parabolagnulinux.org/index.php/Syslinux#UEFI_Systems
-
-==> The syslinux-install_update script does not currently support EFI install
-
-EOF
-  
-}
-
-post_upgrade() {
-  
-  ## auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
-  /usr/bin/syslinux-install_update -s
-  
-  post_install
-  
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/texlive-bin-libre/09-texlive-fonts.conf b/libre/texlive-bin-libre/09-texlive-fonts.conf
deleted file mode 100644
index f870fbd7a..000000000
--- a/libre/texlive-bin-libre/09-texlive-fonts.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <dir>/usr/share/texmf-dist/fonts/opentype</dir>
-  <dir>/usr/share/texmf-dist/fonts/truetype</dir>
-  <dir>/usr/local/share/texmf/fonts/opentype</dir>
-  <dir>/usr/local/share/texmf/fonts/truetype</dir>
-</fontconfig>
-
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
deleted file mode 100644
index ce3b3789e..000000000
--- a/libre/texlive-bin-libre/PKGBUILD
+++ /dev/null
@@ -1,304 +0,0 @@
-# $Id: PKGBUILD 200613 2013-11-29 21:10:52Z andyrtr $
-# 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@parabola.nu>
-
-pkgname=texlive-bin-libre
-pkgver=2013.30973
-pkgrel=7
-pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)"
-license=('GPL')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler>=0.24.4'
-         'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
-         'icu' 'harfbuzz' 'harfbuzz-icu')
-makedepends=('perl' 'clisp' 'ffcall')
-optdepends=('ed: for texconfig')
-provides=('texlive-bin' 'lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam')
-conflicts=('texlive-bin' 'pdfjam')
-replaces=('texlive-bin')
-options=('!strip')
-url='http://tug.org/texlive/'
-install="texlive.install"
-source=('fix-fontforge-encoding.patch'
-        "http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-${pkgver}.tar.xz"
-)
-md5sums=('bfb9716aa00c86c08cd31e5b32edeb98'
-         '0a8ffd5c0002a080a4202057b1f106c6')
-
-build() {
-   cd "$srcdir"
-
-   if [ "${CARCH}" != "i686" ]; then
-     export CFLAGS="${CFLAGS} -fPIC"
-     export CXXFLAGS="${CXXFLAGS} -fPIC"
-   fi
-
-   # this patch removes spurious error message with locale "xx_YY.utf8"
-   #patch -Np0 -i fix-fontforge-encoding.patch
-   # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251)
-   sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c
-   #############################################################
-   ### configure
-   cd source
-   ## prevent compiling Xdvi with libXp
-   sed -i~ 's|-lXp ||' texk/xdvik/configure
-   test ! -d Work && mkdir Work
-   cd Work
-   echo "--> Initial configuration..."
-   # we use temporary prefix to avoid messing the existing
-   # $pkgdir/usr/share/texmf tree
-   # system zlib is disabled due to issues with zlib 1.2.6 (FS#28221)
-   ../configure --prefix=/usr -C \
-     --sysconfdir=/etc \
-     --datarootdir=/usr/share \
-     --datadir=/usr/share \
-     --mandir=/usr/share/man \
-     --disable-native-texlive-build \
-     --with-banner-add="/Parabola GNU/Linux-libre" \
-     --disable-multiplatform \
-     --disable-dialog \
-     --disable-psutils \
-     --disable-t1utils \
-     --disable-bibtexu \
-     --disable-xz \
-     --enable-shared \
-     --disable-static \
-     --with-system-zlib \
-     --with-system-zziplib \
-     --with-system-pnglib \
-     --with-system-ncurses \
-     --with-system-t1lib \
-     --with-system-gd \
-     --with-system-poppler \
-     --with-system-xpdf \
-     --with-system-freetype2 \
-     --with-system-pixman \
-     --with-system-cairo \
-     --with-system-harfbuzz \
-     --with-system-graphite \
-     --with-system-icu \
-     --with-freetype2-libdir=/usr/lib \
-     --with-freetype2-include=/usr/include/freetype2 \
-     --with-xdvi-x-toolkit=xaw \
-     --disable-dump-share \
-     --disable-aleph \
-     --enable-luatex \
-     --with-clisp-runtime=default \
-     --enable-xindy --disable-xindy-rules --disable-xindy-docs
-   #############################################################
-   ### make
-   echo "-------------------------------------------------------"
-   echo "--> Building the whole beast ..."
-   echo "-------------------------------------------------------"
-   make
-}
-
-package() {
-   cd "$srcdir"
-
-   #############################################################
-   ### install
-   cd source
-   # fixes for xindy
-   find utils/xindy -name Makefile -exec sed -i -e "s|^prefix =.\+$|prefix = $pkgdir/usr|" -e "s|^mandir =.\+$|mandir = \${prefix}/share/man|" -e "s|^datadir =.\+$|datadir = \${datarootdir}/texmf|" -e "s|^docdir =.\+$|docdir = \${datadir}/doc/xindy|" '{}' \;
-
-   echo "-------------------------------------------------------"
-   echo "--> Proceeding with make install ..."
-   echo "-------------------------------------------------------"
-   cd Work
-   make DESTDIR="${pkgdir}" texmf="$pkgdir"/usr/share/texmf install
-   rm -rf "${pkgdir}"/usr/{texmf,share/texmf-dist}
-
-   ## install Perl libraries
-   mkdir -p "$pkgdir"/usr/share/tlpkg/TeXLive
-   install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "${pkgdir}/usr/share/tlpkg/TeXLive"
-
-   ## symlink engines by hand. texlinks has moved to texlive-core...
-   mkdir -p ${pkgdir}/usr/bin
-   ln -s eptex ${pkgdir}/usr/bin/platex
-   ln -s euptex ${pkgdir}/usr/bin/uplatex
-   ln -s luatex ${pkgdir}/usr/bin/dvilualatex
-   ln -s luatex ${pkgdir}/usr/bin/dviluatex
-   ln -s luatex ${pkgdir}/usr/bin/lualatex
-   ln -s pdftex ${pkgdir}/usr/bin/amstex
-   ln -s pdftex ${pkgdir}/usr/bin/cslatex
-   ln -s pdftex ${pkgdir}/usr/bin/csplain
-   ln -s pdftex ${pkgdir}/usr/bin/eplain
-   ln -s pdftex ${pkgdir}/usr/bin/etex
-   ln -s pdftex ${pkgdir}/usr/bin/jadetex
-   ln -s pdftex ${pkgdir}/usr/bin/latex
-   ln -s pdftex ${pkgdir}/usr/bin/mex
-   ln -s pdftex ${pkgdir}/usr/bin/mllatex
-   ln -s pdftex ${pkgdir}/usr/bin/mltex
-   ln -s pdftex ${pkgdir}/usr/bin/pdfetex
-   ln -s pdftex ${pkgdir}/usr/bin/pdfcslatex
-   ln -s pdftex ${pkgdir}/usr/bin/pdfcsplain
-   ln -s pdftex ${pkgdir}/usr/bin/pdfjadetex
-   ln -s pdftex ${pkgdir}/usr/bin/pdflatex
-   ln -s pdftex ${pkgdir}/usr/bin/pdfmex
-   ln -s pdftex ${pkgdir}/usr/bin/pdfxmltex
-   ln -s pdftex ${pkgdir}/usr/bin/texsis
-   ln -s pdftex ${pkgdir}/usr/bin/utf8mex
-   ln -s pdftex ${pkgdir}/usr/bin/xmltex
-   ln -s xetex ${pkgdir}/usr/bin/xelatex
-
-   #############################################################
-   # remove dangling symlinks
-   _bibtexextra_scripts="
-bibexport
-listbib
-multibibliography
-urlbst
-"
-   _core_scripts="
-a2ping
-a5toa4
-adhocfilelist
-afm2afm
-allcm
-allec
-allneeded
-arara
-arlatex
-autoinst
-bundledoc
-checkcites
-chkweb
-context
-ctanify
-ctanupload
-ctxtools
-de-macro
-deweb
-dosepsbin
-dtxgen
-dvi2fax
-dviasm
-dvired
-e2pall
-epstopdf
-findhyph
-fmtutil
-fmtutil-sys
-fontinst
-fragmaster
-installfont-tl
-kpsepath
-kpsetool
-kpsewhere
-kpsexpand
-latex2man
-latexdiff
-latexdiff-vc
-latexfileversion
-latexmk
-latexpand
-latexrevise
-listings-ext.sh
-ltxfileinfo
-lua2dox_filter
-luaotfload-tool
-luatools
-match_parens
-mf2pt1
-mkjobtexmf
-mkluatexfontdb
-mkt1font
-mktexfmt
-mptopdf
-mtxrun
-ot2kpx
-pdf180
-pdf270
-pdf90
-pdfatfi
-pdfbook
-pdfcrop
-pdfflip
-pdfjam
-pdfjam-pocketmod
-pdfjam-slides3up
-pdfjam-slides6up
-pdfjoin
-pdfnup
-pdfpun
-pfarrei
-pkfix
-pkfix-helper
-ps2eps
-ps2frag
-pslatex
-pstopdf
-purifyeps
-repstopdf
-rpdfcrop
-rungs
-simpdftex
-sty2dtx
-texconfig
-texconfig-dialog
-texconfig-sys
-texcount
-texdef
-texdiff
-texdirflatten
-texdoc
-texdoctk
-texexec
-texindy
-texlinks
-texliveonfly
-texloganalyser
-texmfstart
-thumbpdf
-typeoutfileinfo
-updmap
-updmap-sys
-vpl2ovp
-vpl2vpl
-xindy
-"
-   _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht"
-   _langcyrillic_scripts="rubibtex rumakeindex"
-   _langcjk_scripts="convbkmk ptex2pdf
-kanji-fontmap-creator
-kanji-config-updmap
-kanji-config-updmap-sys
-"
-   _langextra_scripts="ebong"
-   _langgreek_scripts="mkgrkindex"
-   _latexextra_scripts="
-authorindex
-exceltex
-makeglossaries
-pdfannotextractor
-perltex
-ps4pdf
-splitindex
-svn-multi
-vpe"
-   _music_scripts="m-tx musixtex musixflx pmx2pdf"
-   _pictures_scripts="cachepic epspdf epspdftk fig4latex mathspic"
-   _pstricks_scripts="pedigree pst2pdf"
-   _science_scripts="ulqda"
-   for s in \
-        ${_bibtexextra_scripts} \
-        ${_core_scripts}       \
-        ${_htmlxml_scripts}    \
-        ${_langcjk_scripts}    \
-        ${_langcyrillic_scripts} \
-        ${_langextra_scripts}  \
-        ${_langgreek_scripts}  \
-        ${_latexextra_scripts} \
-        ${_music_scripts}      \
-        ${_pictures_scripts}   \
-        ${_pstricks_scripts}   \
-        ${_science_scripts}    \
-        tlmgr; do
-       ! readlink -e "$pkgdir"/usr/bin/$s && rm "$pkgdir"/usr/bin/$s
-   done
-   ###################################################################
-}
-
diff --git a/libre/texlive-bin-libre/fix-fontforge-encoding.patch b/libre/texlive-bin-libre/fix-fontforge-encoding.patch
deleted file mode 100644
index 8104b3289..000000000
--- a/libre/texlive-bin-libre/fix-fontforge-encoding.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/noprefs.c.orig	2009-09-30 19:27:00.935039526 +0200
-+++ source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/noprefs.c	2009-09-30 19:28:04.908364646 +0200
-@@ -495,6 +495,9 @@
- 	{ "Big5HKSCS", e_big5hkscs },
- 	{ "Big5-HKSCS", e_big5hkscs },
- 	{ "UTF-8", e_utf8 },
-+	{ "utf-8", e_utf8 },
-+	{ "UTF8", e_utf8 },
-+	{ "utf8", e_utf8 },
- 	{ "ISO-10646/UTF-8", e_utf8 },
- 	{ "ISO_10646/UTF-8", e_utf8 },
- 	{ "UCS2", e_unicode },
diff --git a/libre/texlive-bin-libre/luatex-poppler-0.20.patch b/libre/texlive-bin-libre/luatex-poppler-0.20.patch
deleted file mode 100644
index 175824f3e..000000000
--- a/libre/texlive-bin-libre/luatex-poppler-0.20.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- source/texk/web2c/luatexdir/lua/lepdflib.cc.orig	2011-10-06 06:14:20.000000000 +0000
-+++ source/texk/web2c/luatexdir/lua/lepdflib.cc	2012-05-17 11:30:26.327236883 +0000
-@@ -157,7 +157,7 @@
-         pdfdoc_changed_error(L);
-     uout = new_Annot_userdata(L);
-     uout->d =
--        new Annot((XRef *) uxref->d, (Dict *) udict->d, (Catalog *) ucatalog->d,
-+        new Annot((PDFDoc *) uxref->pd, (Dict *) udict->d,
-                   (Object *) uref->d);
-     uout->atype = ALLOC_LEPDF;
-     uout->pc = uxref->pc;
-@@ -179,7 +179,7 @@
-         pdfdoc_changed_error(L);
-     uout = new_Annots_userdata(L);
-     uout->d =
--        new Annots((XRef *) uxref->d, (Catalog *) ucatalog->d,
-+        new Annots((PDFDoc *) uxref->pd,
-                    (Object *) uannotsobj->d);
-     uout->atype = ALLOC_LEPDF;
-     uout->pc = uxref->pc;
-@@ -369,7 +369,7 @@
- // Annot
- 
- m_poppler_get_BOOL(Annot, isOk);
--m_poppler_get_OBJECT(Annot, getAppearance);
-+m_poppler_get_OBJECT(Annot, getAppearanceResDict);
- m_poppler_get_poppler(Annot, AnnotBorder, getBorder);
- 
- static int m_Annot_match(lua_State * L)
-@@ -408,7 +408,7 @@
- 
- static const struct luaL_Reg Annot_m[] = {
-     {"isOk", m_Annot_isOk},
--    {"getAppearance", m_Annot_getAppearance},
-+    {"getAppearance", m_Annot_getAppearanceResDict},
-     {"getBorder", m_Annot_getBorder},
-     {"match", m_Annot_match},
-     {"__tostring", m_Annot__tostring},
-@@ -1433,7 +1433,7 @@
- 
- static int m_Object_getTypeName(lua_State * L)
- {
--    char *s;
-+    const char *s;
-     udstruct *uin;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-@@ -2120,7 +2120,7 @@
-     if ((uin->pd != NULL && uin->pd->pc != uin->pc)
-         || (ucat->pd != NULL && ucat->pd->pc != ucat->pd->pc))
-         pdfdoc_changed_error(L);
--    links = ((Page *) uin->d)->getLinks((Catalog *) ucat->d);
-+    links = ((Page *) uin->d)->getLinks();
-     if (links != NULL) {
-         uout = new_Links_userdata(L);
-         uout->d = links;
-@@ -2738,7 +2738,10 @@
-     return 1;
- }
- 
--m_poppler_get_INT(XRef, getSize);
-+static int m_XRef_getSize(lua_State * L)
-+{
-+    return m_XRef_getNumObjects(L);
-+}
- 
- static int m_XRef_getEntry(lua_State * L)
- {
-@@ -2748,7 +2751,7 @@
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-         pdfdoc_changed_error(L);
-     i = luaL_checkint(L, 2);
--    size = ((XRef *) uin->d)->getSize();
-+    size = ((XRef *) uin->d)->getNumObjects();
-     if (i > 0 && i <= size) {
-         uout = new_XRefEntry_userdata(L);
-         uout->d = ((XRef *) uin->d)->getEntry(i);
diff --git a/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch b/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch
deleted file mode 100644
index f925a1a93..000000000
--- a/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: source/texk/web2c/luatexdir/tex/mlist.w
-===================================================================
---- source/texk/web2c/luatexdir/tex/mlist.w	(revision 4448)
-+++ source/texk/web2c/luatexdir/tex/mlist.w	(revision 4449)
-@@ -1798,7 +1798,17 @@
-         theta = fraction_rule(cur_style);
-         y = var_delimiter(left_delimiter(q), cur_size,
-                           height(x) + depth(x) + clr + theta, NULL, cur_style);
--        theta = height(y);
-+	/* If |y| is a composite then set |theta| to the height of its top
-+           character, else set it to the height of |y|. */
-+        if (list_ptr(y) != null
-+            && type(list_ptr(y)) == hlist_node
-+            && list_ptr(list_ptr(y)) != null
-+            && type(list_ptr(list_ptr(y))) == glyph_node) {     /* and it should be */
-+            theta = char_height(font(list_ptr(list_ptr(y))),
-+                           character(list_ptr(list_ptr(y))));
-+        } else {
-+            theta = height(y);
-+        }
-     } else {
-         y = var_delimiter(left_delimiter(q), cur_size,
-                           height(x) + depth(x) + clr + theta, NULL, cur_style);
diff --git a/libre/texlive-bin-libre/poppler-0.20.patch b/libre/texlive-bin-libre/poppler-0.20.patch
deleted file mode 100644
index 3bd8183ab..000000000
--- a/libre/texlive-bin-libre/poppler-0.20.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- source/texk/web2c/luatexdir/lua/lepdflib.cc.orig	2011-10-06 06:14:20.000000000 +0000
-+++ source/texk/web2c/luatexdir/lua/lepdflib.cc	2012-05-17 11:30:26.327236883 +0000
-@@ -1433,7 +1433,7 @@
- 
- static int m_Object_getTypeName(lua_State * L)
- {
--    char *s;
-+    const char *s;
-     udstruct *uin;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
---- source/texk/web2c/pdftexdir/pdftosrc.cc.orig	2012-06-24 17:12:34.376329435 +0200
-+++ source/texk/web2c/pdftexdir/pdftosrc.cc	2012-06-24 17:12:25.490003152 +0200
-@@ -134,7 +134,7 @@
-         exit(1);
-     }
-     if (extract_xref_table) {
--        int size = xref->getSize();
-+        int size = xref->getNumObjects();
-         int i;
-         for (i = 0; i < size; i++) {
-             if (xref->getEntry(i)->offset == 0xffffffff)
diff --git a/libre/texlive-bin-libre/texlive.install b/libre/texlive-bin-libre/texlive.install
deleted file mode 100644
index 96a41bcfc..000000000
--- a/libre/texlive-bin-libre/texlive.install
+++ /dev/null
@@ -1,50 +0,0 @@
-infodir=usr/share/info
-filelist=(dvipng.info dvips.info eplain.info epspdf.info fontname.info kpathsea.info latex2e-es.info latex2e.info latex2man.info mf2pt1.info tds.info texdraw.info web2c.info)
-
-post_install() {
-  if [[ -f usr/bin/mktexlsr ]]; then
-    echo    ">>> texlive: updating the filename database..."
-    usr/bin/mktexlsr
-  fi
-  if [[ -f usr/bin/fmtutil-sys ]]; then
-    echo -n   "creating all formats..."
-    usr/bin/fmtutil-sys --all 1>/dev/null
-    echo      " done." 
-    echo      " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
-  fi
-  [[ -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() {
-  local corename corever _pacout
-  if [[ -f usr/bin/mktexlsr ]]; then
-    echo    ">>> texlive: updating the filename database..."
-    usr/bin/mktexlsr
-  fi
-  _pacout=$(pacman -Q texlive-core 2>/dev/null)
-  read corename corever <<< ${_pacout}
-  if [[ ${corever} == 2012* ]]; then
-      if [[ -f usr/bin/fmtutil-sys ]]; then
-        echo -n   "recreating all formats..."
-        usr/bin/fmtutil-sys --all 1>/dev/null
-        echo      " done." 
-        echo      " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
-      fi
-  else
-      echo "WARNING: not recreating formats since texlive-core has version '$corever'"
-  fi
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
diff --git a/libre/texlive-bin-libre/texmf.cnf b/libre/texlive-bin-libre/texmf.cnf
deleted file mode 100644
index 76975ee5c..000000000
--- a/libre/texlive-bin-libre/texmf.cnf
+++ /dev/null
@@ -1,724 +0,0 @@
-% texmf.cnf for TeXLive/Arch Linux -- runtime path configuration file for kpathsea.
-% Public domain.
-% 
-% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
-% updated.  Instead, put your changes -- and only your changes, not an
-% entire copy of the full texmf.cnf! -- in ../../texmf.cnf.  That is, if
-% this file is installed in /some/path/to/texlive/2011/texmf/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2011/texmf.cnf.
-% 
-% What follows is a super-summary of what this .cnf file can
-% contain. Please read the Kpathsea manual for more information.
-%
-% Any identifier (sticking to A-Za-z_ for names is safest) can be assigned.
-% The `=' (and surrounding spaces) is optional.
-% $foo (or ${foo}) in a value expands to the envvar or cnf value of foo.
-% Long lines can be continued with a \.
-%
-% Earlier entries (in the same or another file) override later ones, and
-% an environment variable foo overrides any texmf.cnf definition of foo.
-%
-% All definitions are read before anything is expanded, so you can use
-% variables before they are defined.
-%
-% If a variable assignment is qualified with `.PROGRAM', it is ignored
-% unless the current executable (last filename component of argv[0]) is
-% named PROGRAM.  This foo.PROGRAM construct is not recognized on the
-% right-hand side. For environment variables, use FOO_PROGRAM.
-%
-% Which file formats use which paths for searches is described in the
-% various programs' and the Kpathsea documentation (http://tug.org/kpathsea).
-%
-% // means to search subdirectories (recursively).
-% A leading !! means to look only in the ls-R db, never on the disk.
-% In this file, either ; or : can be used to separate path components.
-% A leading/trailing/doubled path separator in the paths will be
-%   expanded into the compile-time default. Probably not what you want.
-%
-% Brace notation is supported, for example: /usr/local/{mytex,othertex}
-% expands to /usr/local/mytex:/usr/local/othertex.  We make extensive
-% use of this.
-
-
-%  Part 1: Search paths and directories.
-
-% This is the parent directory of our several trees, i.e.,
-% /usr/local/texlive/YYYY in the original TeX Live distribution.
-%
-% All trees must be organized according to the TeX Directory Structure
-% (http://tug.org/tds), or files may not be found.
-%
-% Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
-TEXMFROOT = $SELFAUTODIR/share
-
-% The tree containing runtime files related to the specific
-% distribution and version.
-TEXMFMAIN = $TEXMFROOT/texmf
-
-% The main tree of packages, distribution-agnostic:
-TEXMFDIST = $TEXMFROOT/texmf-dist
-
-% Local additions to the distribution trees.
-TEXMFLOCAL = /usr/local/share/texmf
-
-% TEXMFSYSVAR, where *-sys store cached runtime data.
-TEXMFSYSVAR = /var/lib/texmf
-
-% TEXMFSYSCONFIG, where *-sys store configuration data.
-TEXMFSYSCONFIG = /etc/texmf
-
-% Per-user texmf tree(s) -- organized per the TDS, as usual.  To define
-% more than one per-user tree, set this to a list of directories in
-% braces, as described above.  (This used to be HOMETEXMF.)  ~ expands
-% to %USERPROFILE% on Windows, $HOME otherwise.
-TEXMFHOME = ~/texmf
-
-% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive/texmf-var
-
-% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive/texmf-config
-
-% List all the texmf trees.
-%
-% For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named
-% explicitly and before all other trees.
-% 
-% TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the
-% files in TEXMFMAIN are tightly coupled with the particular version of
-% the distribution, such as configuration files.  Overriding them would
-% be more likely to cause trouble than help.  On the other hand, the
-% bulk of packages and fonts are in TEXMFDIST, and locally-installed
-% versions should take precedence over those -- although it is generally
-% a source of confusion to have different versions of a package
-% installed, whatever the trees, so try to avoid it.
-TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
-
-% Where to look for ls-R files.  There need not be an ls-R in the
-% directories in this path, but if there is one, Kpathsea will use it.
-% By default, this is only the !! elements of TEXMF, so that mktexlsr
-% does not create ls-R files in the non-!! elements -- because if an
-% ls-R is present, it will be used, and the disk will not be searched.
-% This is arguably a bug in kpathsea.
-TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
-
-% The system trees.  These are the trees that are shared by all users.
-% If a tree appears in this list, the mktex* scripts will use
-% VARTEXFONTS for generated files, if the original tree isn't writable;
-% otherwise the current working directory is used.
-SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST
-
-% Where generated fonts may be written.  This tree is used when the sources
-% were found in a system tree and either that tree wasn't writable, or the
-% varfonts feature was enabled in MT_FEATURES in mktex.cnf.
-VARTEXFONTS = $TEXMFVAR/fonts
-
-% On some systems, there will be a system tree which contains all the font
-% files that may be created as well as the formats.  For example
-%   TEXMFVAR = /var/lib/texmf
-% is used in many distros.  In this case, set VARTEXFONTS like this
-%VARTEXFONTS = $TEXMFVAR/fonts
-% and do not mention it in TEXMFDBS (but _do_ mention TEXMFVAR).
-%
-% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below
-% one of the TEXMF directories (avoids overlapping ls-R files).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Usually you will not need to edit any of the following variables.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% WEB2C is for Web2C specific files.  The current directory may not be
-% a good place to look for them.
-WEB2C = $TEXMF/web2c
-
-% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input
-% or \openin, including .sty, .eps, etc.  We specify paths for all known
-% formats, past or present.  Not all of them are built these days.
-
-% Plain TeX.  Have the command tex check all directories as a last
-% resort, we may have plain-compatible stuff anywhere.
-TEXINPUTS.tex           = .;$TEXMF/tex/{plain,generic,}//
-
-% Fontinst needs to read afm files.
-TEXINPUTS.fontinst      = .;$TEXMF/{tex,fonts/afm}//
-
-% Other plain-based formats.
-TEXINPUTS.amstex        = .;$TEXMF/tex/{amstex,plain,generic,}//
-TEXINPUTS.csplain       = .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.eplain        = .;$TEXMF/tex/{eplain,plain,generic,}//
-TEXINPUTS.ftex          = .;$TEXMF/tex/{formate,plain,generic,}//
-TEXINPUTS.mex           = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.texinfo       = .;$TEXMF/tex/{texinfo,plain,generic,}//
-
-% LaTeX 2e specific macros are stored in latex/, macros that can only be
-% used with 2.09 in latex209/.  In addition, we look in the directory
-% latex209, useful for macros that were written for 2.09 and do not
-% mention 2e at all, but can be used with 2e.
-TEXINPUTS.cslatex       = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.latex         = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.latex209      = .;$TEXMF/tex/{latex209,generic,latex,}//
-TEXINPUTS.olatex        = .;$TEXMF/tex/{latex,generic,}//
-
-% MLTeX.
-TEXINPUTS.frlatex       = .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frtex         = .;$TEXMF/tex/{french,plain,generic,}//
-TEXINPUTS.mllatex       = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.mltex         = .;$TEXMF/tex/{plain,generic,}//
-
-% e-TeX.
-TEXINPUTS.elatex        = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.etex          = .;$TEXMF/tex/{plain,generic,}//
-
-% pdfTeX.
-TEXINPUTS.pdfcslatex    = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.pdfcsplain    = .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.pdflatex      = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfmex        = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.utf8mex       = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdftex        = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.pdftexinfo    = .;$TEXMF/tex/{texinfo,plain,generic,}//
-TEXINPUTS.pdfamstex     = .;$TEXMF/tex/{amstex,plain,generic,}//
-
-% pdfeTeX.
-TEXINPUTS.pdfelatex     = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfetex       = .;$TEXMF/tex/{plain,generic,}//
-
-% pdfxTeX.
-TEXINPUTS.pdfxlatex     = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfxmex       = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdfxtex       = .;$TEXMF/tex/{plain,generic,}//
-
-% LuaTeX.
-TEXINPUTS.lualatex      = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.luatex        = .;$TEXMF/tex/{luatex,plain,generic,}//
-TEXINPUTS.dvilualatex   = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.dviluatex     = .;$TEXMF/tex/{luatex,plain,generic,}//
-
-% XeTeX.
-TEXINPUTS.xelatex       = .;$TEXMF/tex/{xelatex,latex,xetex,generic,}//
-TEXINPUTS.xeplain       = .;$TEXMF/tex/{xeplain,eplain,plain,xetex,generic,}//
-TEXINPUTS.xetex         = .;$TEXMF/tex/{xetex,plain,generic,}//
-
-% Omega / Aleph.
-TEXINPUTS.aleph         = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.elambda       = .;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.eomega        = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.lambda        = .;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.lamed         = .;$TEXMF/tex/{lamed,lambda,latex,generic,}//
-TEXINPUTS.omega         = .;$TEXMF/tex/{plain,generic,}//
-
-% p(La)TeX.
-TEXINPUTS.ptex          = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}//
-TEXINPUTS.platex        = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}//
-
-% epTeX.
-TEXINPUTS.eptex         = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}//
-
-% pBibTeX bibliographies and style files.
-BIBINPUTS.pbibtex       = .;$TEXMF/{pbibtex,bibtex}/bib//
-BSTINPUTS.pbibtex       = .;$TEXMF/{pbibtex,bibtex}/bst//
-
-% ConTeXt.
-TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic,}//
-
-% jadetex.
-TEXINPUTS.jadetex       = .;$TEXMF/tex/{jadetex,latex,generic,}//
-TEXINPUTS.pdfjadetex    = .;$TEXMF/tex/{jadetex,latex,generic,}//
-
-% XMLTeX.
-TEXINPUTS.xmltex        = .;$TEXMF/tex/{xmltex,latex,generic,}//
-TEXINPUTS.pdfxmltex     = .;$TEXMF/tex/{xmltex,latex,generic,}//
-
-% Miscellany, no longer built.
-TEXINPUTS.lamstex       = .;$TEXMF/tex/{lamstex,plain,generic,}//
-TEXINPUTS.lollipop      = .;$TEXMF/tex/{lollipop,plain,generic,}//
-TEXINPUTS.frpdflatex    = .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frpdftex      = .;$TEXMF/tex/{french,plain,generic,}//
-
-% Earlier entries override later ones, so put this generic one last.
-TEXINPUTS               = .;$TEXMF/tex/{$progname,generic,}//
-
-% ttf2tfm.
-TTF2TFMINPUTS =                 .;$TEXMF/ttf2pk//
-
-% Metafont, MetaPost inputs.
-MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
-MPINPUTS = .;$TEXMF/metapost//
-
-% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read.
-% We want to find the engine-specific file, e.g., cont-en.fmt can
-% exist under both pdftex/ and xetex/.  But just in case some formats
-% end up without an engine directory, look directly in web2c/ too.
-% We repeat the same definition three times because of the way fmtutil
-% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats
-% will not be found.
-TEXFORMATS = .;$TEXMF/web2c{/$engine,}
-MFBASES = .;$TEXMF/web2c{/$engine,}
-MPMEMS = .;$TEXMF/web2c{/$engine,}
-%
-% As of 2008, pool files don't exist any more (the strings are compiled
-% into the binaries), but just in case something expects to find these:
-TEXPOOL = .;$TEXMF/web2c
-MFPOOL = ${TEXPOOL}
-MPPOOL = ${TEXPOOL}
-
-% support the original xdvi.  Must come before the generic settings.
-PKFONTS.XDvi   = .;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}//
-VFFONTS.XDvi   = .;$TEXMF/%s
-PSHEADERS.XDvi = .;$TEXMF/%q{dvips,fonts/type1}//
-TEXPICTS.XDvi  = .;$TEXMF/%q{dvips,tex}//
-
-% Device-independent font metric files.
-VFFONTS = .;$TEXMF/fonts/vf//
-TFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm//
-
-% The $MAKETEX_MODE below means the drivers will not use a cx font when
-% the mode is ricoh.  If no mode is explicitly specified, kpse_prog_init
-% sets MAKETEX_MODE to /, so all subdirectories are searched.  See the manual.
-% The modeless part guarantees that bitmaps for PostScript fonts are found.
-PKFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}//
-
-% Similarly for the GF format, which only remains in existence because
-% Metafont outputs it (and MF isn't going to change).
-GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MODE//
-
-% A backup for PKFONTS and GFFONTS. Not used for anything.
-GLYPHFONTS = .;$TEXMF/fonts
-
-% A place to puth everything that doesn't fit the other font categories.
-MISCFONTS = .;$TEXMF/fonts/misc//
-
-% font name map files.  This isn't just fonts/map// because ConTeXt
-% wants support for having files with the same name in the different
-% subdirs.  Maybe if the programs ever get unified to accepting the same
-% map file syntax the definition can be simplified again.
-TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,pdftex,dvips,}//
-
-% BibTeX bibliographies and style files.  bibtex8 also uses these.
-BIBINPUTS = .;$TEXMF/bibtex/bib//
-BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}//
-
-% MlBibTeX.
-MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}//
-MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}//
-
-% .ris and .bltxml bibliography formats.
-RISINPUTS = .;$TEXMF/bibtex/ris//
-BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml//
-
-% MFT style files.
-MFTINPUTS = .;$TEXMF/mft//
-
-% PostScript headers and prologues (.pro); unfortunately, some programs
-% also use this for acessing font files (enc, type1, truetype)
-TEXPSHEADERS = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3}}//
-TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3,truetype}}//
-
-% OSFONTDIR is to provide a convenient hook for allowing TeX to find
-% fonts installed on the system (outside of TeX).  An empty default
-% value would add "//" to the search paths, so we give it a dummy value.
-% OSFONTDIR = /usr/share/fonts
-
-% PostScript Type 1 outline fonts.
-T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR//
-
-% PostScript AFM metric files.
-AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR//
-
-% TrueType outline fonts.
-TTFONTS = .;$TEXMF/fonts/{truetype,opentype}//;$OSFONTDIR//
-
-% OpenType outline fonts.
-OPENTYPEFONTS = .;$TEXMF/fonts/{opentype,truetype}//;$OSFONTDIR//
-
-% Type 42 outline fonts.
-T42FONTS = .;$TEXMF/fonts/type42//
-
-% Ligature definition files.
-LIGFONTS =  .;$TEXMF/fonts/lig//
-
-% Dvips' config.* files (this name should not start with `TEX'!).
-TEXCONFIG = $TEXMF/dvips//
-
-% Makeindex style (.ist) files.
-INDEXSTYLE = .;$TEXMF/makeindex//
-
-% Font encoding files (.enc).
-ENCFONTS = .;$TEXMF/fonts/enc//
-
-% CMap files.
-CMAPFONTS = .;$TEXMF/fonts/cmap//
-
-% Subfont definition files.
-SFDFONTS = .;$TEXMF/fonts/sfd//
-
-% OpenType feature files (.fea).
-FONTFEATURES=.;$TEXMF/fonts/fea//
-
-% .cid and .cidmap
-FONTCIDMAPS=.;$TEXMF/fonts/cid//
-
-% pdftex config files:
-PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}//
-
-% Used by DMP (ditroff-to-mpx), called by makempx -troff.
-TRFONTS = /usr{/local,}/share/groff/{current/font,site-font}/devps
-MPSUPPORT = .;$TEXMF/metapost/support
-
-% For xdvi to find mime.types and .mailcap, if they do not exist in
-% ~.  These are single directories, not paths.
-% (But the default mime.types, at least, may well suffice.)
-MIMELIBDIR = /etc
-MAILCAPLIBDIR = /etc
-
-% Default settings for the fontconfig library as used by the Windows
-% versions of xetex/xdvipdfmx.  On Unixish systems, fontconfig ignores
-% this.  ConTeXT MkIV (all platforms) also use these values.
-% 
-FONTCONFIG_FILE = fonts.conf
-FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf
-FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache
-
-% TeX documentation and source files, for use with texdoc and kpsewhich.
-TEXDOCS = $TEXMF/doc//
-TEXSOURCES = .;$TEXMF/source//
-
-% Web and CWeb input paths.
-WEBINPUTS = .;$TEXMF/web//
-CWEBINPUTS = .;$TEXMF/cweb//
-
-% Omega-related fonts and other files.
-OFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}//
-OPLFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/opl//
-OVFFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ovf,vf}//
-OVPFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp//
-OTPINPUTS = .;$TEXMF/omega/otp//
-OCPINPUTS = .;$TEXMF/omega/ocp//
-
-% Some additional input variables for several programs.  If you add
-% a program that uses the `other text files' or `other binary files'
-% search formats, you'll want to add their variables here as well.
-T4HTINPUTS   = .;$TEXMF/tex4ht//
-
-%% t4ht utility, sharing files with TeX4ht
-TEX4HTFONTSET=alias,iso8859,unicode
-TEX4HTINPUTS = .;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts/{$TEX4HTFONTSET}//
-
-% TeXworks editor configuration and settings
-TW_LIBPATH = $TEXMFCONFIG/texworks
-TW_INIPATH = $TW_LIBPATH
-
-% For security, do not look in . for dvipdfmx.cfg, since the D option
-% would allow command execution.
-DVIPDFMXINPUTS = $TEXMF/dvipdfmx
-
-% Lua needs to look in TEXINPUTS for lua scripts distributed with packages.
-% 
-% But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in
-% the environment with a colon, say, TEXINPUTS=/some/dir:, the intended
-% default expansion of TEXINPUTS will not happen and .lua files under
-% the /tex/ will not be found.
-% 
-% So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex.
-% The default LUAINPUTS sufficess for luatex and dviluatex.
-%
-LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,}//
-
-% Lua needs to look for binary lua libraries distributed with packages.
-CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua//
-
-% Architecture independent executables.
-TEXMFSCRIPTS = $TEXMF/scripts/{$progname,$engine,}//
-
-% Other languages.
-JAVAINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/java//
-PERLINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/perl//
-PYTHONINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/python//
-RUBYINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
-
-
-%% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment.
-% KPSE_DOT = .
-
-% This definition isn't used from this .cnf file itself (that would be
-% paradoxical), but the compile-time default in paths.h is built from it.
-% The SELFAUTO* variables are set automatically from the location of
-% argv[0], in kpse_set_program_name.
-% 
-% This main texmf.cnf file is installed, for a release YYYY, in a
-% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf.
-% Since this file is subject to future updates, the TeX Live installer
-% or human administrator may also create a file
-% /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file
-% will take precedence over the distributed one under texmf/web2c.
-% 
-% For security reasons, it is better not to include . in this path.
-%
-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
-
-% kpathsea 3.5.3 and later sets these at runtime. To avoid empty
-% expansions from binaries linked against an earlier version of the
-% library, we set $progname and $engine to something non-empty:
-progname = unsetprogname
-engine = unsetengine
-
-
-%  Part 2: Options.
-
-% If this option is set to true, `tex a.b' will look first for a.b.tex
-% (within each path element), and then for a.b, i.e., we try standard
-% extensions first.  If this is false, we first look for a.b and then
-% a.b.tex, i.e., we try the name as-is first.
-%
-% Both names are always tried; the difference is the order in which they
-% are tried.  The setting applies to all searches, not just .tex.
-%
-% This setting only affects names being looked up which *already* have
-% an extension.  A name without an extension (e.g., `tex story') will
-% always have an extension added first.
-%
-% The default is true, because we already avoid adding the standard
-% extension(s) in the usual cases.  E.g., babel.sty will only look for
-% babel.sty, not babel.sty.tex, regardless of this setting.
-try_std_extension_first = t
-
-% Enable system commands via \write18{...}.  When enabled fully (set to
-% t), obviously insecure.  When enabled partially (set to p), only the
-% commands listed in shell_escape_commands are allowed.  Although this
-% is not fully secure either, it is much better, and so useful that we
-% enable it for everything but bare tex.
-shell_escape = p
-
-% No spaces in this command list.
-% 
-% The programs listed here are as safe as any we know: they either do
-% not write any output files, respect openout_any, or have hard-coded
-% restrictions similar or higher to openout_any=p.  They also have no
-% features to invoke arbitrary other programs, and no known exploitable
-% bugs.  All to the best of our knowledge.  They also have practical use
-% for being called from TeX.
-% 
-shell_escape_commands = \
-bibtex,bibtex8,\
-kpsewhich,\
-makeindex,\
-repstopdf,\
-
-% we'd like to allow:
-% dvips - but external commands can be executed, need at least -R1.
-% epspdf, ps2pdf, pstopdf - need to respect openout_any,
-%   and gs -dSAFER must be used and check for shell injection with filenames.
-% (img)convert (ImageMagick) - delegates.mgk possible misconfig, besides,
-%   without Unix convert it hardly seems worth it, and Windows convert
-%   is something completely different that destroys filesystems, so skip.
-% pygmentize - but is the filter feature insecure?
-% ps4pdf - but it calls an unrestricted latex.
-% rpdfcrop - maybe ok, but let's get experience with repstopdf first.
-% texindy,xindy - but is the module feature insecure?
-% ulqda - but requires optional SHA1.pm, so why bother.
-% tex, latex, etc. - need to forbid --shell-escape, and inherit openout_any.
-
-% plain TeX should remain unenhanced.
-shell_escape.tex = f
-shell_escape.initex = f
-
-% This is used by the Windows script wrapper for restricting searching
-% for the purportedly safe shell_escape_commands above to system
-% directories.
-TEXMF_RESTRICTED_SCRIPTS = \
-  {!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}//
-
-% Allow TeX \openin, \openout, or \input on filenames starting with `.'
-% (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)?
-% a (any)        : any file can be opened.
-% r (restricted) : disallow opening "dotfiles".
-% p (paranoid)   : as `r' and disallow going to parent directories, and
-%                  restrict absolute paths to be under $TEXMFOUTPUT.
-openout_any = p
-openin_any = a
-
-% Write .log/.dvi/etc. files here, if the current directory is unwritable.
-%TEXMFOUTPUT = /tmp
-
-% If a dynamic file creation fails, log the command to this file, in
-% either the current directory or TEXMFOUTPUT.  Set to the
-% empty string or  0  to avoid logging.
-MISSFONT_LOG = missfont.log
-
-% Set to a colon-separated list of words specifying warnings to suppress.
-% To suppress everything, use TEX_HUSH = all; this is currently equivalent to
-% TEX_HUSH = checksum:lostchar:readable:special
-% To suppress nothing, use TEX_HUSH = none or do not set the variable at all.
-TEX_HUSH = none
-
-% Allow TeX, and MF to parse the first line of an input file for
-% the %&format construct.
-parse_first_line = t
-
-% But don't parse the first line if invoked as "tex", since we want that
-% to remain Knuth-compatible.  The src_specials and
-% file_line_error_style settings, as well as the options -enctex,
-% -mltex, -8bit, etc., also affect this, but they are all off by default.
-parse_first_line.tex = f
-parse_first_line.initex = f
-
-% Control file:line:error style messages.
-file_line_error_style = f
-
-% Enable the mktex... scripts by default?  These must be set to 0 or 1.
-% Particular programs can and do override these settings, for example
-% dvips's -M option.  Your first chance to specify whether the scripts
-% are invoked by default is at configure time.
-%
-% These values are ignored if the script names are changed; e.g., if you
-% set DVIPSMAKEPK to `foo', what counts is the value of the environment
-% variable/config value `FOO', not the `MKTEXPK' value.
-%
-%MKTEXTEX = 0
-%MKTEXPK = 0
-%MKTEXMF = 0
-%MKTEXTFM = 0
-%MKTEXFMT = 0
-%MKOCP = 0
-%MKOFM = 0
-
-% Used by makempx to run TeX.  We use "etex" because MetaPost is
-% expecting DVI, and not "tex" because we want first line parsing.
-TEX = etex
-
-% These variables specify the external program called for the
-% interactive `e' option.  %d is replaced by the line number and %s by
-% the current filename.  The default is specified at compile-time, and
-% we let that stay in place since different platforms like different values.
-%TEXEDIT = vi +%d '%s'                    % default for Unix
-%TEXEDIT = texworks --position=+%d "%s"   % default for Windows
-%MFEDIT = ${TEXEDIT}
-%MPEDIT = ${TEXEDIT}
-
-% The default `codepage and sort order' file for BibTeX8, when none is
-% given as command line option or environment variable.
-BIBTEX_CSFILE = 88591lat.csf
-
-% This variable is specific to Windows.  It must be set to 0 or 1.  The
-% default is 0.  Setting it to 1 tells the Windows script wrappers to
-% use an already installed Perl interpreter if one is found on the
-% search path, in preference to the Perl shipped with TeX Live.  Thus,
-% it may be useful if you both (a) installed a full Perl distribution
-% for general use, and (b) need to run Perl programs from TL that use
-% additional modules we don't provide.  The TL Perl does provide all the
-% standard Perl modules.
-%
-%TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0
-
-
-%  Part 3: Array and other sizes for TeX (and Metafont).
-%
-% If you want to change some of these sizes only for a certain TeX
-% variant, the usual dot notation works, e.g.,
-% main_memory.hugetex = 20000000
-%
-% If a change here appears to be ignored, try redumping the format file.
-
-% Memory. Must be less than 8,000,000 total.
-%
-% main_memory is relevant only to initex, extra_mem_* only to non-ini.
-% Thus, have to redump the .fmt file after changing main_memory; to add
-% to existing fmt files, increase extra_mem_*.  (To get an idea of how
-% much, try \tracingstats=2 in your TeX source file;
-% web2c/tests/memtest.tex might also be interesting.)
-%
-% To increase space for boxes (as might be needed by, e.g., PiCTeX),
-% increase extra_mem_bot.
-%
-% For some xy-pic samples, you may need as much as 700000 words of memory.
-% For the vast majority of documents, 60000 or less will do.
-%
-main_memory = 3000000 % words of inimemory available; also applies to inimf&mp
-extra_mem_top = 0     % extra high memory for chars, tokens, etc.
-extra_mem_bot = 0     % extra low memory for boxes, glue, breakpoints, etc.
-
-% ConTeXt needs lots of memory.
-extra_mem_top.context = 2000000
-extra_mem_bot.context = 4000000
-
-% Words of font info for TeX (total size of all TFM files, approximately).
-% Must be >= 20000 and <= 147483647 (without tex.ch changes).
-font_mem_size = 3000000
-
-% Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes).
-font_max = 9000
-
-% Extra space for the hash table of control sequences.
-hash_extra = 200000
-
-% Max number of characters in all strings, including all error messages,
-% help texts, font names, control sequences.  These values apply to TeX.
-pool_size = 3250000
-% Minimum pool space after TeX's own strings; must be at least
-% 25000 less than pool_size, but doesn't need to be nearly that large.
-string_vacancies = 90000
-% Maximum number of strings.
-max_strings = 500000
-% min pool space left after loading .fmt
-pool_free = 47500
-
-% Buffer size.  TeX uses the buffer to contain input lines, but macro
-% expansion works by writing material into the buffer and reparsing the
-% line.  As a consequence, certain constructs require the buffer to be
-% very large, even though most documents can be handled with a small value.
-buf_size = 200000
-
-% Hyphenation trie.  The maximum possible is 4194303 (ssup_trie_size in
-% the sources), but we don't need that much.  The value here suffices
-% for all known free hyphenation patterns to be loaded simultaneously
-% (as TeX Live does).
-%
-trie_size = 1000000
-
-hyph_size = 8191        % prime number of hyphenation exceptions, >610, <32767.
-                        % http://primes.utm.edu/curios/page.php/8191.html
-nest_size = 500         % simultaneous semantic levels (e.g., groups)
-max_in_open = 15        % simultaneous input files and error insertions, 
-                        % also applies to MetaPost
-param_size = 10000      % simultaneous macro parameters, also applies to MP
-save_size = 50000       % for saving values outside current group
-stack_size = 5000       % simultaneous input sources
-
-% These are Omega-specific.
-ocp_buf_size = 500000   % character buffers for ocp filters.
-ocp_stack_size = 10000  % stacks for ocp computations.
-ocp_list_size = 1000    % control for multiple ocps.
-
-% These work best if they are the same as the I/O buffer size, but it
-% doesn't matter much.  Must be a multiple of 8.
-dvi_buf_size = 16384 % TeX
-gf_buf_size = 16384  % MF
-
-% It's probably inadvisable to change these. At any rate, we must have:
-% 45 < error_line      < 255;
-% 30 < half_error_line < error_line - 15;
-% 60 <= max_print_line;
-% These apply to TeX, Metafont, and MetaPost.
-error_line = 79
-half_error_line = 50
-max_print_line = 79
-
-% Metafont only.
-screen_width.mf = 1664
-screen_depth.mf = 1200
-
-% BibTeX only (max_strings also determines hash_size and hash_prime).
-ent_str_size =  250
-glob_str_size = 5000
-max_strings.bibtex = 35307
-max_strings.bibtex8 = 35307
-max_strings.bibtexu = 35307
-max_strings.pbibtex = 35307
-
-% GFtype only.
-line_length.gftype = 500
-max_rows.gftype = 8191
-max_cols.gftype = 8191
diff --git a/libre/texlive-core-libre/09-texlive-fonts.conf b/libre/texlive-core-libre/09-texlive-fonts.conf
deleted file mode 100644
index f870fbd7a..000000000
--- a/libre/texlive-core-libre/09-texlive-fonts.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <dir>/usr/share/texmf-dist/fonts/opentype</dir>
-  <dir>/usr/share/texmf-dist/fonts/truetype</dir>
-  <dir>/usr/local/share/texmf/fonts/opentype</dir>
-  <dir>/usr/local/share/texmf/fonts/truetype</dir>
-</fontconfig>
-
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
deleted file mode 100644
index 6bd33d769..000000000
--- a/libre/texlive-core-libre/PKGBUILD
+++ /dev/null
@@ -1,309 +0,0 @@
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgname=texlive-core-libre
-_pkgname=texlive-core
-pkgver=2013.31589
-_revnr=${pkgver#2013.}
-pkgrel=1.1
-pkgdesc="TeX Live core distribution, without nonfree add-on packages (Parabola rebranded)"
-license=('GPL')
-arch=(any)
-depends=('texlive-bin-libre' 'perl')
-optdepends=(
-  'ruby:        for old ConTeXT MkII and epspdf'
-  'tk:          for texdoctk'
-  'python2:     for dviasm'
-  'ghostscript: for epstopdf, epspdf and other ConTeXt tools' 
-  'psutils:     to manipulate the output of dvips'
-  't1utils:     can be useful when installing Type1 fonts'
-  'jre7-openjdk: for utilities like arara'
-)
-groups=('texlive-most')
-conflicts=('tetex' 'texlive-latex3' 'texlive-core')
-provides=('tetex' 'texlive-latex3' "texlive-core=$pkgver")
-replaces=('tetex' 'texlive-latex3' 'texlive-core')
-url='http://tug.org/texlive/'
-source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip"
-        "$_pkgname.maps"
-        "texmf.cnf"
-        "09-texlive-fonts.conf")
-options=(!strip)
-install=texlive.install
-backup=(etc/texmf/web2c/texmf.cnf \
-        etc/texmf/chktex/chktexrc \
-	etc/texmf/dvipdfmx/dvipdfmx.cfg \
-	etc/texmf/dvips/config/config.ps \
-	etc/texmf/tex/generic/config/language.dat \
-	etc/texmf/tex/generic/config/language.def \
-	etc/texmf/tex/generic/config/pdftexconfig.tex \
-	etc/texmf/ttf2pk/ttf2pk.cfg \
-	etc/texmf/web2c/fmtutil.cnf \
-	etc/texmf/web2c/mktex.cnf \
-	etc/texmf/xdvi/XDvi)
-
-md5sums=('80c7fa3db1b468f9043c6acdd941a526'
-         '306ab28bb9b070fc3e40d86d28ea7e8e'
-         'd5a3f442ec3b7aa1518170f64f9d006b'
-         '393a4bf67adc7ca5df2b386759d1a637')
-
-build() {
-   cd "$srcdir"
-
-   # remove nonfree packages
-   # MeX licensed packages.
-   rm {cc-pl,cs,ec,mex,pl}.tar.xz
-   # Public domain, will be relicensed.
-   rm context-{account,algorithmic,fixme,games,letter,ruby}.tar.xz
-   # No specific free license.
-   rm euro-ce.tar.xz
-   # Remove them from package list.
-   sed -ri '/^(cc-pl|cs|ec|mex|pl|context-(account|algorithmic|fixme|games|letter|ruby)|euro-ce) /d' CONTENTS
-
-   echo -n "   --> extracting all packages... "
-   for p in *.tar.xz; do 
-     bsdtar -xf $p
-   done
-   echo "done"
-   rm -rf {tlpkg,doc,source,omega} || true
-
-   # remove nonfree packages from updmap.cfg
-   sed -i '/ccpl.map/d'       texmf-dist/web2c/updmap.cfg
-   sed -i '/cs-charter.map/d' texmf-dist/web2c/updmap.cfg
-   sed -i '/csfonts.map/d'    texmf-dist/web2c/updmap.cfg
-   sed -i '/plother.map/d'    texmf-dist/web2c/updmap.cfg
-   sed -i '/pltext.map/d'     texmf-dist/web2c/updmap.cfg 
-
-   # remove nonfree packages from texlive-core.maps
-   sed -i '/ccpl.map/d'       texlive-core.maps
-   sed -i '/cs-charter.map/d' texlive-core.maps
-   sed -i '/csfonts.map/d'    texlive-core.maps
-   sed -i '/plother.map/d'    texlive-core.maps
-   sed -i '/pltext.map/d'     texlive-core.maps
-
-   # remove nonfree packages from fmtutil.cnf
-   sed -i '/cslatex/d'     texmf-dist/web2c/fmtutil.cnf
-   sed -i '/csplain/d'     texmf-dist/web2c/fmtutil.cnf
-   sed -i '/from mex/d'    texmf-dist/web2c/fmtutil.cnf
-   sed -i '/mexconf.tex/d' texmf-dist/web2c/fmtutil.cnf
-}
-
-package() {
-   cd "$srcdir"
-
-   # Install packages.
-   install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs
-   sed -i '/^#/d' CONTENTS
-   install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs
-   install -m644 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
-   install -m755 -d $pkgdir/usr/share
-   wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true
-   for dir in $wanteddirs; do
-     find $dir -type d -exec install -d -m755 $pkgdir/usr/share/texmf-dist/'{}' \;
-     find $dir -type f -exec install -m644 '{}' $pkgdir/usr/share/texmf-dist/'{}' \;
-   done
-   find texmf-dist -type d -exec install -d -m755 $pkgdir/usr/share/'{}' \;
-   find texmf-dist -type f -exec install -m644 '{}' $pkgdir/usr/share/'{}' \;
-   find texmf-dist -type f -executable -exec chmod 755 $pkgdir/usr/share/'{}' \;
- 
-   #############################################################
-   ### install texmf tree
-   echo "--> installing the /etc/texmf tree"
-   install -d -m755 "$pkgdir"/etc/texmf/web2c
-   install -d -m755 "$pkgdir"/etc/texmf/chktex
-   install -d -m755 "$pkgdir"/etc/texmf/dvips/config
-   install -d -m755 "$pkgdir"/etc/texmf/dvipdfmx
-   install -d -m755 "$pkgdir"/etc/texmf/tex/generic/config
-   install -d -m755 "$pkgdir"/etc/texmf/ttf2pk
-   install -d -m755 "$pkgdir"/etc/texmf/xdvi
-   install -d -m755 "$pkgdir"/etc/fonts/conf.avail
-   install -m644 "$srcdir"/09-texlive-fonts.conf "$pkgdir"/etc/fonts/conf.avail/
-
-   # Remove manpages (already in texlive-bin).
-   rm -rf "$pkgdir"/usr/share/texmf-dist/doc/man
-
-   # copy config files to $TEXMFCONFIG tree
-   cp -a "$pkgdir"/usr/share/texmf-dist/chktex/chktexrc \
-     	"$pkgdir"/etc/texmf/chktex/
-   cp -a "$pkgdir"/usr/share/texmf-dist/web2c/mktex.cnf \
-   	  "$pkgdir"/etc/texmf/web2c/
-   cp -a "$pkgdir"/usr/share/texmf-dist/web2c/updmap.cfg \
-   	  "$pkgdir"/etc/texmf/web2c/
-   cp -a "$pkgdir"/usr/share/texmf-dist/web2c/fmtutil.cnf \
-   	  "$pkgdir"/etc/texmf/web2c/
-   cp -a "$pkgdir"/usr/share/texmf-dist/dvips/config/config.ps \
-   	  "$pkgdir"/etc/texmf/dvips/config/
-   cp -a "$pkgdir"/usr/share/texmf-dist/dvipdfmx/dvipdfmx.cfg \
-   	  "$pkgdir"/etc/texmf/dvipdfmx/
-   cp -a "$pkgdir"/usr/share/texmf-dist/tex/generic/config/pdftexconfig.tex \
-   	  "$pkgdir"/etc/texmf/tex/generic/config/
-   cp -a "$pkgdir"/usr/share/texmf-dist/tex/generic/config/language.dat \
-   	  "$pkgdir"/etc/texmf/tex/generic/config/
-   cp -a "$pkgdir"/usr/share/texmf-dist/tex/generic/config/language.def \
-   	  "$pkgdir"/etc/texmf/tex/generic/config/
-   cp -a "$pkgdir"/usr/share/texmf-dist/ttf2pk/ttf2pk.cfg \
-   	  "$pkgdir"/etc/texmf/ttf2pk/
-   cp -a "$pkgdir"/usr/share/texmf-dist/xdvi/XDvi \
-   	  "$pkgdir"/etc/texmf/xdvi/
-   # remove TL specific warnings in the language.{dat,def} files:
-   sed -i -e '/DO NOT EDIT/,+3 d' "$pkgdir"/etc/texmf/tex/generic/config/language.*
-   # clean updmap.cfg
-   sed -i '/^\(Map\|MixedMap\)/d' "$pkgdir"/etc/texmf/web2c/updmap.cfg
-   sed -i '/^#! \(Map\|MixedMap\)/d' "$pkgdir"/etc/texmf/web2c/updmap.cfg
-
-
-   # replace upstream texmf.cnf with ours
-   rm -f "$pkgdir"/usr/share/texmf-dist/web2c/texmf.cnf
-   install -m644 "$srcdir"/texmf.cnf "$pkgdir"/etc/texmf/web2c/texmf.cnf
-   # since the location of texmf.cnf is hard-wired to be under /usr/share/texmf/web2c
-   # we make a symlink from /etc/texmf/web2c/texmf.cnf to the latter
-   ln -sf /etc/texmf/web2c/texmf.cnf "$pkgdir"/usr/share/texmf-dist/web2c/texmf.cnf
-   # fix location of TEXMFCACHE for luatools
-   sed -i 's#texlive2013#texlive#' "$pkgdir"/usr/share/texmf-dist/web2c/texmfcnf.lua
-   ## remove aleph from fmtutil.cnf
-   sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf-dist/web2c/fmtutil.cnf
-
-   # create symlinks for formats 
-   echo "--> Create symlinks for TeX formats ..."
-   mkdir -p "${pkgdir}/usr/bin"
-   bash "${pkgdir}"/usr/share/texmf-dist/scripts/texlive/texlinks.sh -f "$pkgdir"/usr/share/texmf-dist/web2c/fmtutil.cnf "$pkgdir"/usr/bin/
-
-   # use python2 for dviasm
-   sed -i 's/env python/env python2/' $pkgdir/usr/share/texmf-dist/scripts/dviasm/dviasm.py
-
-   # copy config file to texmf-config
-   #mkdir -p $pkgdir/etc/texmf/tex/context/config
-   #cp -a $pkgdir/usr/share/texmf-dist/tex/context/config/cont-usr.tex \
-   #	  $pkgdir/etc/texmf/tex/context/config/cont-usr.tex
-   
-   # remove obsolete stuff (we don't provide the omega and aleph binaries anyway)
-   rm -f $pkgdir/usr/share/texmf-dist/tex/plain/config/{omega,aleph}.ini
-   #sed -i '/cherokee\.map/d; /oinuit\.map/d; /omega\.map/d' \
-   #    "${pkgdir}/usr/share/texmf-dist/web2c/updmap.cfg"
-
-   # remove upstream updmap.cfg: it contains too many maps.
-   rm "${pkgdir}/usr/share/texmf-dist/web2c/updmap.cfg"
- 
-   # more cleanup
-   rm -rf $pkgdir/usr/share/texmf-dist/scripts/context/stubs/mswin/
-
-    # link programs from /usr/share/texmf-dist/scripts
-    _linked_scripts="
-a2ping/a2ping.pl
-accfonts/mkt1font
-accfonts/vpl2ovp
-accfonts/vpl2vpl
-adhocfilelist/adhocfilelist.sh
-arara/arara.sh
-bundledoc/arlatex
-bundledoc/bundledoc
-checkcites/checkcites.lua
-chktex/chkweb.sh
-chktex/deweb.pl
-context/perl/mptopdf.pl
-context/stubs/unix/context
-context/stubs/unix/ctxtools
-context/stubs/unix/luatools
-context/stubs/unix/mtxrun
-context/stubs/unix/pstopdf
-context/stubs/unix/texexec
-context/stubs/unix/texmfstart
-ctanify/ctanify
-ctanupload/ctanupload.pl
-de-macro/de-macro
-dosepsbin/dosepsbin.pl
-dtxgen/dtxgen
-dviasm/dviasm.py
-epstopdf/epstopdf.pl
-findhyph/findhyph
-fontools/afm2afm
-fontools/autoinst
-fontools/ot2kpx
-fragmaster/fragmaster.pl
-installfont/installfont-tl
-latex2man/latex2man
-latexdiff/latexdiff-vc.pl
-latexdiff/latexdiff.pl
-latexdiff/latexrevise.pl
-latexfileversion/latexfileversion
-latexmk/latexmk.pl
-latexpand/latexpand
-ltxfileinfo/ltxfileinfo
-lua2dox/lua2dox_filter
-luaotfload/luaotfload-tool.lua
-match_parens/match_parens
-mf2pt1/mf2pt1.pl
-mkjobtexmf/mkjobtexmf.pl
-oberdiek/pdfatfi.pl
-pdfcrop/pdfcrop.pl
-pdfjam/pdf180
-pdfjam/pdf270
-pdfjam/pdf90
-pdfjam/pdfbook
-pdfjam/pdfflip
-pdfjam/pdfjam
-pdfjam/pdfjam-pocketmod
-pdfjam/pdfjam-slides3up
-pdfjam/pdfjam-slides6up
-pdfjam/pdfjoin
-pdfjam/pdfnup
-pdfjam/pdfpun
-pfarrei/a5toa4.tlu
-pfarrei/pfarrei.tlu
-pkfix-helper/pkfix-helper
-pkfix/pkfix.pl
-ps2eps/ps2eps.pl
-purifyeps/purifyeps
-simpdftex/simpdftex
-sty2dtx/sty2dtx.pl
-texcount/texcount.pl
-texdef/texdef.pl
-texdiff/texdiff
-texdirflatten/texdirflatten
-texdoc/texdoc.tlu
-texdoctk/texdoctk.pl
-texlive/allcm.sh
-texlive/allneeded.sh
-texlive/dvi2fax.sh
-texlive/dvired.sh
-texlive/e2pall.sh
-texlive/fmtutil-sys.sh
-texlive/fmtutil.sh
-texlive/fontinst.sh
-texlive/kpsetool.sh
-texlive/kpsewhere.sh
-texlive/ps2frag.sh
-texlive/pslatex.sh
-texlive/rungs.tlu
-texlive/texconfig-dialog.sh
-texlive/texconfig-sys.sh
-texlive/texconfig.sh
-texlive/texlinks.sh
-texlive/updmap-sys.sh
-texlive/updmap.pl
-texliveonfly/texliveonfly.py
-texloganalyser/texloganalyser
-thumbpdf/thumbpdf.pl
-typeoutfileinfo/typeoutfileinfo.sh
-xindy/texindy.pl
-xindy/xindy.pl
-"
-    install -m755 -d $pkgdir/usr/bin
-    for _script in ${_linked_scripts}; do
-        _scriptbase=$(basename $_script)
-        _scriptbase=${_scriptbase%.*}
-        [[ -f ${pkgdir}/usr/share/texmf-dist/scripts/${_script} ]] &&
-            ln -s /usr/share/texmf-dist/scripts/${_script} ${pkgdir}/usr/bin/${_scriptbase}
-    done
-    ln -s /usr/share/texmf-dist/scripts/listings-ext/listings-ext.sh ${pkgdir}/usr/bin/listings-ext.sh
-
-    # additional symlinks
-    ln -s allcm ${pkgdir}/usr/bin/allec
-    ln -s fmtutil ${pkgdir}/usr/bin/mktexfmt
-    ln -s kpsetool ${pkgdir}/usr/bin/kpsexpand
-    ln -s kpsetool ${pkgdir}/usr/bin/kpsepath
-    ln -s epstopdf ${pkgdir}/usr/bin/repstopdf
-    ln -s pdfcrop ${pkgdir}/usr/bin/rpdfcrop
-    ln -s luaotfload-tool ${pkgdir}/usr/bin/mkluatexfontdb
-}
diff --git a/libre/texlive-core-libre/texlive-core.maps b/libre/texlive-core-libre/texlive-core.maps
deleted file mode 100644
index 8d86bfad1..000000000
--- a/libre/texlive-core-libre/texlive-core.maps
+++ /dev/null
@@ -1,46 +0,0 @@
-Map      euler.map
-Map charter.map
-Map cs-charter.map
-Map csfonts.map
-Map fpls.map
-Map l7x-urwvn.map
-Map lm.map
-Map marvosym.map
-Map mathpple.map
-Map original-context-symbol.map
-Map pazo.map
-Map pxfonts.map
-Map qag.map
-Map qbk.map
-Map qcr.map
-Map qcs.map
-Map qhv.map
-Map qpl.map
-Map qtm.map
-Map qzc.map
-Map tabvar.map
-Map troff-updmap.map
-Map txfonts.map
-Map utopia.map
-MixedMap ccpl.map
-MixedMap cm-super-t1.map
-MixedMap cm-super-t2a.map
-MixedMap cm-super-t2b.map
-MixedMap cm-super-t2c.map
-MixedMap cm-super-ts1.map
-MixedMap cm-super-x2.map
-MixedMap cm.map
-MixedMap cmextra.map
-MixedMap cmtext-bsr-interpolated.map
-MixedMap cyrillic.map
-MixedMap eurosym.map
-MixedMap latxfont.map
-MixedMap mflogo.map
-MixedMap plother.map
-MixedMap pltext.map
-MixedMap rsfs.map
-MixedMap stmaryrd.map
-MixedMap symbols.map
-MixedMap tipa.map
-MixedMap wasy.map
-MixedMap yhmath.map
diff --git a/libre/texlive-core-libre/texlive.install b/libre/texlive-core-libre/texlive.install
deleted file mode 100644
index 77d4213be..000000000
--- a/libre/texlive-core-libre/texlive.install
+++ /dev/null
@@ -1,58 +0,0 @@
-PKGNAME="texlive-core"
-UPDMAP="etc/texmf/web2c/updmap.cfg"
-UPDMAPLOCAL="etc/texmf/web2c/updmap-local.cfg"
-SYNCWITHTREES=''
-
-MAPFILE="var/lib/texmf/arch/installedpkgs/$PKGNAME.maps"
-
-post_install() {
-  TMPFILE=`mktemp`
-  echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
-  cp "$UPDMAP" "$TMPFILE"
-  echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
-  echo    "             into /etc/texmf/web2c/updmap-local.cfg"
-  cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP
-  cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
-  [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP
-  echo    ">>> texlive: updating the filename database..."
-  usr/bin/mktexlsr
-  echo    ">>> texlive: updating the fontmap files with updmap..."
-  usr/bin/updmap-sys --quiet --nohash
-  echo    " done." 
-  echo -n   "creating all formats..."
-  usr/bin/fmtutil-sys --all 1>/dev/null
-  echo      " done." 
-  echo      " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
-  echo    "NB: To setup ConTeXt and the lua(la)tex font db,"
-  echo    "    see http://wiki.archlinux.org/index.php/TeX_Live"
-}
-
-post_upgrade() {
-  TMPFILE=`mktemp`
-  echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
-  cp "$UPDMAP" "$TMPFILE"
-  echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
-  echo    "             into /etc/texmf/web2c/updmap-local.cfg"
-  cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP
-  cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
-  [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP
-  echo    ">>> texlive: updating the filename database..."
-  usr/bin/mktexlsr
-  echo    ">>> texlive: updating the fontmap files with updmap..."
-  usr/bin/updmap-sys --quiet --nohash $SYNCWITHTREES
-  echo    " done." 
-  echo    ">>> texlive: recreating all formats..."
-  usr/bin/fmtutil-sys --all 1>/dev/null
-  echo      " done." 
-  echo      " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
-  echo    "NB: To setup ConTeXt and the lua(la)tex font db,"
-  echo    "    see http://wiki.archlinux.org/index.php/TeX_Live"
-  if [[ "$2" == 200* ]]; then
-    echo      "Important note. Some directories have moved:"
-    echo      " \$TEXMFSYSVAR    is now /var/lib/texmf (previously /usr/share/texmf-var)"
-    echo      " \$TEXMFSYSCONFIG is now /etc/texmf     (previously /usr/share/texmf-config)"
-    echo      "Please move and update the config files you had modified and delete the rest."
-    echo      "(Note however that updmap.cfg has been automatically copied and updated.)"
-  fi
-}
-
diff --git a/libre/texlive-core-libre/texmf.cnf b/libre/texlive-core-libre/texmf.cnf
deleted file mode 100644
index c96c20e39..000000000
--- a/libre/texlive-core-libre/texmf.cnf
+++ /dev/null
@@ -1,782 +0,0 @@
-% texmf.cnf for TeXLive/Parabola GNU/Linux-libre -- runtime path configuration file for kpathsea.
-% Public domain.
-% 
-% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
-% updated.  Instead, put your changes -- and only your changes, not an
-% entire copy! -- in ../../texmf.cnf.  That is, if this file is
-% installed in /some/path/to/texlive/2013/texmf-dist/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2013/texmf.cnf.
-% 
-% What follows is a super-summary of what this .cnf file can
-% contain. Please read the Kpathsea manual for more information.
-%
-% Any identifier (sticking to A-Za-z_ for names is safest) can be assigned.
-% The `=' (and surrounding spaces) is optional.
-% $foo (or ${foo}) in a value expands to the envvar or cnf value of foo.
-% Long lines can be continued with a \.
-%
-% Earlier entries (in the same or another file) override later ones, and
-% an environment variable foo overrides any texmf.cnf definition of foo.
-%
-% All definitions are read before anything is expanded, so you can use
-% variables before they are defined.
-%
-% If a variable assignment is qualified with `.PROGRAM', it is ignored
-% unless the current executable (last filename component of argv[0]) is
-% named PROGRAM.  This foo.PROGRAM construct is not recognized on the
-% right-hand side. For environment variables, use FOO_PROGRAM.
-%
-% Which file formats use which paths for searches is described in the
-% various programs' and the Kpathsea documentation (http://tug.org/kpathsea).
-%
-% // means to search subdirectories (recursively).
-% A leading !! means to look only in the ls-R db, never on the disk.
-% In this file, either ; or : can be used to separate path components.
-% A leading/trailing/doubled path separator in the paths will be
-%   expanded into the compile-time default. Probably not what you want.
-%
-% Brace notation is supported, for example: /usr/local/{mytex,othertex}
-% expands to /usr/local/mytex:/usr/local/othertex.  We make extensive
-% use of this.
-
-
-%  Part 1: Search paths and directories.
-
-% This is the parent directory of our several trees, i.e.,
-% /usr/local/texlive/YYYY in the original TeX Live distribution.
-%
-% All trees must be organized according to the TeX Directory Structure
-% (http://tug.org/tds), or files may not be found.
-%
-% Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
-% Kpathsea sets SELFAUTOLOC (the directory with the binary),
-% SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent).
-TEXMFROOT = $SELFAUTODIR/share
-
-% The main tree of distributed packages and programs:
-TEXMFDIST = $TEXMFROOT/texmf-dist
-
-% We used to have a separate /texmf tree with some core programs and files.
-% Keep the variable name.
-TEXMFMAIN = $TEXMFDIST
-
-% Local additions to the distribution trees.
-TEXMFLOCAL = /usr/local/share/texmf;/usr/share/texmf
-
-% TEXMFSYSVAR, where *-sys store cached runtime data.
-TEXMFSYSVAR = /var/lib/texmf
-
-% TEXMFSYSCONFIG, where *-sys store configuration data.
-TEXMFSYSCONFIG = /etc/texmf
-
-% Per-user texmf tree(s) -- organized per the TDS, as usual.  To define
-% more than one per-user tree, set this to a list of directories in
-% braces, as described above.  (This used to be HOMETEXMF.)  ~ expands
-% to %USERPROFILE% on Windows, $HOME otherwise.
-TEXMFHOME = ~/texmf
-
-% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive/texmf-var
-
-% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive/texmf-config
-
-% List all the texmf trees. For an explanation of what they are, see the
-% TeX Live manual.
-%
-% For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named
-% explicitly and before all other trees.
-% 
-% TEXMFLOCAL precedes TEXMFDIST because locally-installed versions
-% should take precedence over distribution files -- although it is
-% generally a source of confusion to have different versions of a
-% package installed, whatever the trees, so try to avoid it.
-TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST}
-
-% Where to look for ls-R files.  There need not be an ls-R in the
-% directories in this path, but if there is one, Kpathsea will use it.
-% By default, this is only the !! elements of TEXMF, so that mktexlsr
-% does not create ls-R files in the non-!! elements -- because if an
-% ls-R is present, it will be used, and the disk will not be searched.
-% This is arguably a bug in kpathsea.
-TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST}
-
-% The system trees.  These are the trees that are shared by all users.
-% If a tree appears in this list, the mktex* scripts will use
-% VARTEXFONTS for generated files, if the original tree isn't writable;
-% otherwise the current working directory is used.
-SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFDIST
-
-% First writable tree here is used by Lua(La)TeX for the font cache.
-% LuaLaTeX uses the value here, while ConTeXt uses the same variable but
-% from texmfcnf.lua; therefore the two values should be kept in sync.
-% (As should everything else in texmf.cnf <-> texmfcnf.lua.)
-TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR
-
-% Where generated fonts may be written.  This tree is used when the sources
-% were found in a system tree and either that tree wasn't writable, or the
-% varfonts feature was enabled in MT_FEATURES in mktex.cnf.
-VARTEXFONTS = $TEXMFVAR/fonts
-
-% On some systems, there will be a system tree which contains all the font
-% files that may be created as well as the formats.  For example
-%   TEXMFVAR = /var/lib/texmf
-% is used in many distros.  In this case, set VARTEXFONTS like this
-%VARTEXFONTS = $TEXMFVAR/fonts
-% and do not mention it in TEXMFDBS (but _do_ mention TEXMFVAR).
-%
-% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below
-% one of the TEXMF directories (avoids overlapping ls-R files).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Usually you will not need to edit any of the following variables.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% WEB2C is for Web2C specific files.  The current directory may not be
-% a good place to look for them.
-WEB2C = $TEXMF/web2c
-
-% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input
-% or \openin, including .sty, .eps, etc.  We specify paths for all known
-% formats, past or present.  Not all of them are built these days.
-
-% Plain TeX.  Have the command tex check all directories as a last
-% resort, we may have plain-compatible stuff anywhere.
-TEXINPUTS.tex           = .;$TEXMF/tex/{plain,generic,}//
-
-% Fontinst needs to read afm files.
-TEXINPUTS.fontinst      = .;$TEXMF/{tex,fonts/afm}//
-
-% Other plain-based formats.
-TEXINPUTS.amstex        = .;$TEXMF/tex/{amstex,plain,generic,}//
-TEXINPUTS.csplain       = .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.eplain        = .;$TEXMF/tex/{eplain,plain,generic,}//
-TEXINPUTS.ftex          = .;$TEXMF/tex/{formate,plain,generic,}//
-TEXINPUTS.mex           = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.texinfo       = .;$TEXMF/tex/{texinfo,plain,generic,}//
-
-% LaTeX 2e specific macros are stored in latex/, macros that can only be
-% used with 2.09 in latex209/.  In addition, we look in the directory
-% latex209, useful for macros that were written for 2.09 and do not
-% mention 2e at all, but can be used with 2e.
-TEXINPUTS.cslatex       = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.latex         = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.latex209      = .;$TEXMF/tex/{latex209,generic,latex,}//
-TEXINPUTS.olatex        = .;$TEXMF/tex/{latex,generic,}//
-
-% MLTeX.
-TEXINPUTS.frlatex       = .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frtex         = .;$TEXMF/tex/{french,plain,generic,}//
-TEXINPUTS.mllatex       = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.mltex         = .;$TEXMF/tex/{plain,generic,}//
-
-% e-TeX.
-TEXINPUTS.elatex        = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.etex          = .;$TEXMF/tex/{plain,generic,}//
-
-% pdfTeX.
-TEXINPUTS.pdfcslatex    = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.pdfcsplain    = .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.pdflatex      = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfmex        = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.utf8mex       = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdftex        = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.pdftexinfo    = .;$TEXMF/tex/{texinfo,plain,generic,}//
-TEXINPUTS.pdfamstex     = .;$TEXMF/tex/{amstex,plain,generic,}//
-
-% pdfeTeX.
-TEXINPUTS.pdfelatex     = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfetex       = .;$TEXMF/tex/{plain,generic,}//
-
-% pdfxTeX.
-TEXINPUTS.pdfxlatex     = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfxmex       = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdfxtex       = .;$TEXMF/tex/{plain,generic,}//
-
-% LuaTeX.
-TEXINPUTS.lualatex      = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.luatex        = .;$TEXMF/tex/{luatex,plain,generic,}//
-TEXINPUTS.dvilualatex   = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.dviluatex     = .;$TEXMF/tex/{luatex,plain,generic,}//
-
-% XeTeX.
-TEXINPUTS.xelatex       = .;$TEXMF/tex/{xelatex,latex,xetex,generic,}//
-TEXINPUTS.xeplain       = .;$TEXMF/tex/{xeplain,eplain,plain,xetex,generic,}//
-TEXINPUTS.xetex         = .;$TEXMF/tex/{xetex,plain,generic,}//
-
-% Omega / Aleph.
-TEXINPUTS.aleph         = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.elambda       = .;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.eomega        = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.lambda        = .;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.lamed         = .;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.omega         = .;$TEXMF/tex/{plain,generic,}//
-
-% p(La)TeX.
-TEXINPUTS.ptex          = .;$TEXMF/tex/{ptex,plain,generic,}//
-TEXINPUTS.platex        = .;$TEXMF/tex/{platex,latex,generic,}//
-
-% epTeX, and for pmpost.
-TEXINPUTS.eptex         = .;$TEXMF/tex/{ptex,plain,generic,}//
-TEX.pmpost = eptex
-
-% (e)up(La)TeX.
-TEXINPUTS.uplatex = .;$TEXMF/tex/{uplatex,platex,latex,generic,}//
-TEXINPUTS.uptex   = .;$TEXMF/tex/{uptex,ptex,plain,generic,}//
-TEXINPUTS.euptex  = .;$TEXMF/tex/{uptex,ptex,plain,generic}//
-
-% pBibTeX bibliographies and style files.
-BIBINPUTS.pbibtex       = .;$TEXMF/{pbibtex,bibtex}/bib//
-BSTINPUTS.pbibtex       = .;$TEXMF/{pbibtex,bibtex}/bst//
-
-% ConTeXt.
-TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic}//
-
-% jadetex.
-TEXINPUTS.jadetex       = .;$TEXMF/tex/{jadetex,latex,generic,}//
-TEXINPUTS.pdfjadetex    = .;$TEXMF/tex/{jadetex,latex,generic,}//
-
-% XMLTeX.
-TEXINPUTS.xmltex        = .;$TEXMF/tex/{xmltex,latex,generic,}//
-TEXINPUTS.pdfxmltex     = .;$TEXMF/tex/{xmltex,latex,generic,}//
-
-% Miscellany, no longer built.
-TEXINPUTS.lamstex       = .;$TEXMF/tex/{lamstex,plain,generic,}//
-TEXINPUTS.lollipop      = .;$TEXMF/tex/{lollipop,plain,generic,}//
-TEXINPUTS.frpdflatex    = .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frpdftex      = .;$TEXMF/tex/{french,plain,generic,}//
-
-% Earlier entries override later ones, so put this generic one last.
-TEXINPUTS               = .;$TEXMF/tex/{$progname,generic,}//
-
-% ttf2tfm.
-TTF2TFMINPUTS =                 .;$TEXMF/ttf2pk//
-
-% Metafont, MetaPost inputs.
-MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
-MPINPUTS = .;$TEXMF/metapost//
-
-% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read.
-% We want to find the engine-specific file, e.g., cont-en.fmt can
-% exist under both pdftex/ and xetex/.  But just in case some formats
-% end up without an engine directory, look directly in web2c/ too.
-% We repeat the same definition three times because of the way fmtutil
-% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats
-% will not be found.
-TEXFORMATS = .;$TEXMF/web2c{/$engine,}
-MFBASES = .;$TEXMF/web2c{/$engine,}
-MPMEMS = .;$TEXMF/web2c{/$engine,}
-%
-% As of 2008, pool files don't exist any more (the strings are compiled
-% into the binaries), but just in case something expects to find these:
-TEXPOOL = .;$TEXMF/web2c
-MFPOOL = ${TEXPOOL}
-MPPOOL = ${TEXPOOL}
-
-% support the original xdvi.  Must come before the generic settings.
-PKFONTS.XDvi   = .;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}//
-VFFONTS.XDvi   = .;$TEXMF/%s
-PSHEADERS.XDvi = .;$TEXMF/%q{dvips,fonts/type1}//
-TEXPICTS.XDvi  = .;$TEXMF/%q{dvips,tex}//
-
-% Device-independent font metric files.
-VFFONTS = .;$TEXMF/fonts/vf//
-TFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm//
-
-% The $MAKETEX_MODE below means the drivers will not use a cx font when
-% the mode is ricoh.  If no mode is explicitly specified, kpse_prog_init
-% sets MAKETEX_MODE to /, so all subdirectories are searched.  See the manual.
-% The modeless part guarantees that bitmaps for PostScript fonts are found.
-PKFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}//
-
-% Similarly for the GF format, which only remains in existence because
-% Metafont outputs it (and MF isn't going to change).
-GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MODE//
-
-% A backup for PKFONTS and GFFONTS. Not used for anything.
-GLYPHFONTS = .;$TEXMF/fonts
-
-% A place to puth everything that doesn't fit the other font categories.
-MISCFONTS = .;$TEXMF/fonts/misc//
-
-% font name map files.  This isn't just fonts/map// because ConTeXt
-% wants support for having files with the same name in the different
-% subdirs.  Maybe if the programs ever get unified to accepting the same
-% map file syntax the definition can be simplified again.
-TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,pdftex,dvips,}//
-
-% BibTeX bibliographies and style files.  bibtex8 also uses these.
-BIBINPUTS = .;$TEXMF/bibtex/bib//
-BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}//
-
-% MlBibTeX.
-MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}//
-MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}//
-
-% .ris and .bltxml bibliography formats.
-RISINPUTS = .;$TEXMF/bibtex/ris//
-BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml//
-
-% MFT style files.
-MFTINPUTS = .;$TEXMF/mft//
-
-% PostScript headers and prologues (.pro); unfortunately, some programs
-% also use this for acessing font files (enc, type1, truetype)
-TEXPSHEADERS = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3}}//
-TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3,truetype}}//
-
-% OSFONTDIR is to provide a convenient hook for allowing TeX to find
-% fonts installed on the system (outside of TeX).  An empty default
-% value would add "//" to the search paths, so we give it a dummy value.
-% OSFONTDIR = /usr/share/fonts
-
-% PostScript Type 1 outline fonts.
-T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR//
-
-% PostScript AFM metric files.
-AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR//
-
-% TrueType outline fonts.
-TTFONTS = .;$TEXMF/fonts/{truetype,opentype}//;$OSFONTDIR//
-
-% OpenType outline fonts.
-OPENTYPEFONTS = .;$TEXMF/fonts/{opentype,truetype}//;$OSFONTDIR//
-
-% Type 42 outline fonts.
-T42FONTS = .;$TEXMF/fonts/type42//
-
-% Ligature definition files.
-LIGFONTS =  .;$TEXMF/fonts/lig//
-
-% Dvips' config.* files (this name should not start with `TEX'!).
-TEXCONFIG = $TEXMF/dvips//
-
-% Makeindex style (.ist) files.
-INDEXSTYLE = .;$TEXMF/makeindex//
-
-% Font encoding files (.enc).
-ENCFONTS = .;$TEXMF/fonts/enc//
-
-% CMap files.
-CMAPFONTS = .;$TEXMF/fonts/cmap//
-
-% Subfont definition files.
-SFDFONTS = .;$TEXMF/fonts/sfd//
-
-% OpenType feature files (.fea).
-FONTFEATURES=.;$TEXMF/fonts/fea//
-
-% .cid and .cidmap
-FONTCIDMAPS=.;$TEXMF/fonts/cid//
-
-% pdftex config files:
-PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}//
-
-% Used by DMP (ditroff-to-mpx), called by makempx -troff.
-TRFONTS = /usr{/local,}/share/groff/{current/font,site-font}/devps
-MPSUPPORT = .;$TEXMF/metapost/support
-
-% For xdvi to find mime.types and .mailcap, if they do not exist in
-% ~.  These are single directories, not paths.
-% (But the default mime.types, at least, may well suffice.)
-MIMELIBDIR = /etc
-MAILCAPLIBDIR = /etc
-
-% Default settings for the fontconfig library as used by the Windows
-% versions of xetex/xdvipdfmx.  Not used by xetex on Unixish systems.
-% ConTeXT MkIV (all platforms) also use these values.
-% 
-FONTCONFIG_FILE = fonts.conf
-FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf
-FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache
-
-% TeX documentation and source files, for use with texdoc and kpsewhich.
-TEXDOCS = $TEXMF/doc//
-TEXSOURCES = .;$TEXMF/source//
-
-% Web and CWeb input paths.
-WEBINPUTS = .;$TEXMF/web//
-CWEBINPUTS = .;$TEXMF/cweb//
-
-% Omega-related fonts and other files.
-OFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}//
-OPLFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/opl//
-OVFFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ovf,vf}//
-OVPFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp//
-OTPINPUTS = .;$TEXMF/omega/otp//
-OCPINPUTS = .;$TEXMF/omega/ocp//
-
-% Some additional input variables for several programs.  If you add
-% a program that uses the `other text files' or `other binary files'
-% search formats, you'll want to add their variables here as well.
-T4HTINPUTS   = .;$TEXMF/tex4ht//
-
-%% t4ht utility, sharing files with TeX4ht
-TEX4HTFONTSET=alias,iso8859,unicode
-TEX4HTINPUTS = .;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts/{$TEX4HTFONTSET}//
-
-% TeXworks editor configuration and settings
-TW_LIBPATH = $TEXMFCONFIG/texworks
-TW_INIPATH = $TW_LIBPATH
-
-% For security, do not look in . for dvipdfmx.cfg, since the D option
-% would allow command execution.
-DVIPDFMXINPUTS = $TEXMF/dvipdfmx
-
-% Lua needs to look in TEXINPUTS for lua scripts distributed with packages.
-% 
-% But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in
-% the environment with a colon, say, TEXINPUTS=/some/dir:, the intended
-% default expansion of TEXINPUTS will not happen and .lua files under
-% the /tex/ will not be found.
-% 
-% So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex.
-% The default LUAINPUTS suffices for luatex and dviluatex.
-%
-LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,}//
-
-% Lua needs to look for binary lua libraries distributed with packages.
-CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua//
-
-% Architecture independent executables.
-TEXMFSCRIPTS = $TEXMF/scripts/{$progname,$engine,}//
-
-% Other languages.
-JAVAINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/java//
-PERLINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/perl//
-PYTHONINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/python//
-RUBYINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
-
-
-%% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment.
-% KPSE_DOT = .
-
-% This definition isn't used from this .cnf file itself (that would be
-% paradoxical), but the compile-time default in paths.h is built from it.
-% The SELFAUTO* variables are set automatically from the location of
-% argv[0], in kpse_set_program_name.
-% 
-% This main texmf.cnf file is installed, for a release YYYY, in a
-% directory such as /usr/local/texlive/YYYY/texmf-dist/web2c/texmf.cnf.
-% Since this file is subject to future updates, the TeX Live installer
-% or human administrator may also create a file
-% /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file
-% will take precedence over the distributed one.
-% 
-% For security reasons, it is best not to include . in this path.
-%
-% The idea behind this lengthy definition: for each of
-% SELFAUTO{LOC,DIR,PARENT}, look in the directory,
-% then the subdirectories share/texmf-local, share/texmf-dist, share/texmf,
-% then the subdirectories ./texmf-local, texmf-dist, ./texmf.
-% At any given installation, most of these directories will not exist,
-% but they all turn out to be useful somewhere.
-% 
-% Special addition -- we want to include one more directory: the
-% great-grandparent's texmf-local, because that is how TL is installed
-% by default.  That is, given a binary
-% /usr/local/texlive/YYYY/bin/PLATFORM/kpsewhich, it should find
-% /usr/local/texlive/texmf-local/web2c/texmf.cnf.  I.e., not under YYYY.
-% 
-% As a result, we cannot use actual brace expansion in the definition,
-% since we don't want to scatter ../'s throughout the value.  Hence we
-% explicitly list every directory.  Arguably more understandable anyway.
-%
-TEXMFCNF = {\
-$SELFAUTOLOC,\
-$SELFAUTOLOC/share/texmf-local/web2c,\
-$SELFAUTOLOC/share/texmf-dist/web2c,\
-$SELFAUTOLOC/share/texmf/web2c,\
-$SELFAUTOLOC/texmf-local/web2c,\
-$SELFAUTOLOC/texmf-dist/web2c,\
-$SELFAUTOLOC/texmf/web2c,\
-\
-$SELFAUTODIR,\
-$SELFAUTODIR/share/texmf-local/web2c,\
-$SELFAUTODIR/share/texmf-dist/web2c,\
-$SELFAUTODIR/share/texmf/web2c,\
-$SELFAUTODIR/texmf-local/web2c,\
-$SELFAUTODIR/texmf-dist/web2c,\
-$SELFAUTODIR/texmf/web2c,\
-\
-$SELFAUTOPARENT/../texmf-local/web2c,\
-$SELFAUTOPARENT,\
-\
-$SELFAUTOPARENT/share/texmf-local/web2c,\
-$SELFAUTOPARENT/share/texmf-dist/web2c,\
-$SELFAUTOPARENT/share/texmf/web2c,\
-$SELFAUTOPARENT/texmf-local/web2c,\
-$SELFAUTOPARENT/texmf-dist/web2c,\
-$SELFAUTOPARENT/texmf/web2c\
-}
-%
-% For reference, here is the old brace-using definition:
-%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
-
-% kpathsea 3.5.3 and later sets these at runtime. To avoid empty
-% expansions from binaries linked against an earlier version of the
-% library, we set $progname and $engine to something non-empty:
-progname = unsetprogname
-engine = unsetengine
-
-
-%  Part 2: Options.
-
-% If this option is set to true, `tex a.b' will look first for a.b.tex
-% (within each path element), and then for a.b, i.e., we try standard
-% extensions first.  If this is false, we first look for a.b and then
-% a.b.tex, i.e., we try the name as-is first.
-%
-% Both names are always tried; the difference is the order in which they
-% are tried.  The setting applies to all searches, not just .tex.
-%
-% This setting only affects names being looked up which *already* have
-% an extension.  A name without an extension (e.g., `tex story') will
-% always have an extension added first.
-%
-% The default is true, because we already avoid adding the standard
-% extension(s) in the usual cases.  E.g., babel.sty will only look for
-% babel.sty, not babel.sty.tex, regardless of this setting.
-try_std_extension_first = t
-
-% Enable system commands via \write18{...}.  When enabled fully (set to
-% t), obviously insecure.  When enabled partially (set to p), only the
-% commands listed in shell_escape_commands are allowed.  Although this
-% is not fully secure either, it is much better, and so useful that we
-% enable it for everything but bare tex.
-shell_escape = p
-
-% No spaces in this command list.
-% 
-% The programs listed here are as safe as any we know: they either do
-% not write any output files, respect openout_any, or have hard-coded
-% restrictions similar or higher to openout_any=p.  They also have no
-% features to invoke arbitrary other programs, and no known exploitable
-% bugs.  All to the best of our knowledge.  They also have practical use
-% for being called from TeX.
-% 
-shell_escape_commands = \
-bibtex,bibtex8,\
-kpsewhich,\
-makeindex,\
-mpost,\
-repstopdf,\
-
-% we'd like to allow:
-% dvips - but external commands can be executed, need at least -R1.
-% epspdf, ps2pdf, pstopdf - need to respect openout_any,
-%   and gs -dSAFER must be used and check for shell injection with filenames.
-% (img)convert (ImageMagick) - delegates.mgk possible misconfig, besides,
-%   without Unix convert it hardly seems worth it, and Windows convert
-%   is something completely different that destroys filesystems, so skip.
-% pygmentize - but is the filter feature insecure?
-% ps4pdf - but it calls an unrestricted latex.
-% rpdfcrop - maybe ok, but let's get experience with repstopdf first.
-% texindy,xindy - but is the module feature insecure?
-% ulqda - but requires optional SHA1.pm, so why bother.
-% tex, latex, etc. - need to forbid --shell-escape, and inherit openout_any.
-
-% plain TeX should remain unenhanced.
-shell_escape.tex = f
-shell_escape.initex = f
-
-% This is used by the Windows script wrapper for restricting searching
-% for the purportedly safe shell_escape_commands above to system
-% directories.
-TEXMF_RESTRICTED_SCRIPTS = \
-  {!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}//
-
-% Allow TeX \openin, \openout, or \input on filenames starting with `.'
-% (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)?
-% a (any)        : any file can be opened.
-% r (restricted) : disallow opening "dotfiles".
-% p (paranoid)   : as `r' and disallow going to parent directories, and
-%                  restrict absolute paths to be under $TEXMFOUTPUT.
-openout_any = p
-openin_any = a
-
-% Write .log/.dvi/etc. files here, if the current directory is unwritable.
-%TEXMFOUTPUT = /tmp
-
-% If a dynamic file creation fails, log the command to this file, in
-% either the current directory or TEXMFOUTPUT.  Set to the
-% empty string or  0  to avoid logging.
-MISSFONT_LOG = missfont.log
-
-% Set to a colon-separated list of words specifying warnings to suppress.
-% To suppress everything, use TEX_HUSH = all; this is currently equivalent to
-% TEX_HUSH = checksum:lostchar:readable:special
-% To suppress nothing, use TEX_HUSH = none or do not set the variable at all.
-TEX_HUSH = none
-
-% Allow TeX, and MF to parse the first line of an input file for
-% the %&format construct.
-parse_first_line = t
-
-% But don't parse the first line if invoked as "tex", since we want that
-% to remain Knuth-compatible.  The src_specials and
-% file_line_error_style settings, as well as the options -enctex,
-% -mltex, -8bit, etc., also affect this, but they are all off by default.
-parse_first_line.tex = f
-parse_first_line.initex = f
-
-% Control file:line:error style messages.
-file_line_error_style = f
-
-% Enable the mktex... scripts by default?  These must be set to 0 or 1.
-% Particular programs can and do override these settings, for example
-% dvips's -M option.  Your first chance to specify whether the scripts
-% are invoked by default is at configure time.
-%
-% These values are ignored if the script names are changed; e.g., if you
-% set DVIPSMAKEPK to `foo', what counts is the value of the environment
-% variable/config value `FOO', not the `MKTEXPK' value.
-%
-%MKTEXTEX = 0
-%MKTEXPK = 0
-%MKTEXMF = 0
-%MKTEXTFM = 0
-%MKTEXFMT = 0
-%MKOCP = 0
-%MKOFM = 0
-
-% Used by makempx to run TeX.  We use "etex" because MetaPost is
-% expecting DVI, and not "tex" because we want first line parsing.
-TEX = etex
-
-% These variables specify the external program called for the
-% interactive `e' option.  %d is replaced by the line number and %s by
-% the current filename.  The default is specified at compile-time, and
-% we let that stay in place since different platforms like different values.
-%TEXEDIT = vi +%d '%s'                    % default for Unix
-%TEXEDIT = texworks --position=+%d "%s"   % default for Windows
-%MFEDIT = ${TEXEDIT}
-%MPEDIT = ${TEXEDIT}
-
-% The default `codepage and sort order' file for BibTeX8, when none is
-% given as command line option or environment variable.
-BIBTEX_CSFILE = 88591lat.csf
-
-% This variable is specific to Windows.  It must be set to 0 or 1.  The
-% default is 0.  Setting it to 1 tells the Windows script wrappers to
-% use an already installed Perl interpreter if one is found on the
-% search path, in preference to the Perl shipped with TeX Live.  Thus,
-% it may be useful if you both (a) installed a full Perl distribution
-% for general use, and (b) need to run Perl programs from TL that use
-% additional modules we don't provide.  The TL Perl does provide all the
-% standard Perl modules.
-%
-%TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0
-
-
-%  Part 3: Array and other sizes for TeX (and Metafont).
-%
-% If you want to change some of these sizes only for a certain TeX
-% variant, the usual dot notation works, e.g.,
-% main_memory.hugetex = 20000000
-%
-% If a change here appears to be ignored, try redumping the format file.
-
-% Memory. Must be less than 8,000,000 total.
-%
-% main_memory is relevant only to initex, extra_mem_* only to non-ini.
-% Thus, have to redump the .fmt file after changing main_memory; to add
-% to existing fmt files, increase extra_mem_*.  (To get an idea of how
-% much, try \tracingstats=2 in your TeX source file;
-% web2c/tests/memtest.tex might also be interesting.)
-%
-% To increase space for boxes (as might be needed by, e.g., PiCTeX),
-% increase extra_mem_bot.
-%
-% For some xy-pic samples, you may need as much as 700000 words of memory.
-% For the vast majority of documents, 60000 or less will do.
-%
-main_memory = 5000000 % words of inimemory available; also applies to inimf&mp
-extra_mem_top = 0     % extra high memory for chars, tokens, etc.
-extra_mem_bot = 0     % extra low memory for boxes, glue, breakpoints, etc.
-
-% ConTeXt needs lots of memory.
-extra_mem_top.context = 2000000
-extra_mem_bot.context = 4000000
-
-% Words of font info for TeX (total size of all TFM files, approximately).
-% Must be >= 20000 and <= 147483647 (without tex.ch changes).
-font_mem_size = 8000000
-
-% Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes).
-font_max = 9000
-
-% Extra space for the hash table of control sequences.
-hash_extra = 600000
-
-% Max number of characters in all strings, including all error messages,
-% help texts, font names, control sequences.  These values apply to TeX.
-pool_size = 6250000
-% Minimum pool space after TeX's own strings; must be at least
-% 25000 less than pool_size, but doesn't need to be nearly that large.
-string_vacancies = 90000
-% Maximum number of strings.
-max_strings = 500000
-% min pool space left after loading .fmt
-pool_free = 47500
-
-% Buffer size.  TeX uses the buffer to contain input lines, but macro
-% expansion works by writing material into the buffer and reparsing the
-% line.  As a consequence, certain constructs require the buffer to be
-% very large, even though most documents can be handled with a small value.
-buf_size = 200000
-
-% Hyphenation trie.  The maximum possible is 4194303 (ssup_trie_size in
-% the sources), but we don't need that much.  The value here suffices
-% for all known free hyphenation patterns to be loaded simultaneously
-% (as TeX Live does).
-%
-trie_size = 1000000
-
-hyph_size = 8191        % prime number of hyphenation exceptions, >610, <32767.
-                        % http://primes.utm.edu/curios/page.php/8191.html
-nest_size = 500         % simultaneous semantic levels (e.g., groups)
-max_in_open = 15        % simultaneous input files and error insertions, 
-                        % also applies to MetaPost
-param_size = 10000      % simultaneous macro parameters, also applies to MP
-save_size  = 100000     % for saving values outside current group
-stack_size = 5000       % simultaneous input sources
-
-% These are Omega-specific.
-ocp_buf_size = 500000   % character buffers for ocp filters.
-ocp_stack_size = 10000  % stacks for ocp computations.
-ocp_list_size = 1000    % control for multiple ocps.
-
-% These work best if they are the same as the I/O buffer size, but it
-% doesn't matter much.  Must be a multiple of 8.
-dvi_buf_size = 16384 % TeX
-gf_buf_size = 16384  % MF
-
-% It's probably inadvisable to change these. At any rate, we must have:
-% 45 < error_line      < 255;
-% 30 < half_error_line < error_line - 15;
-% 60 <= max_print_line;
-% These apply to TeX, Metafont, and MetaPost.
-error_line = 79
-half_error_line = 50
-max_print_line = 79
-
-% Metafont only.
-screen_width.mf = 1664
-screen_depth.mf = 1200
-
-% BibTeX only (max_strings also determines hash_size and hash_prime).
-ent_str_size =  250
-glob_str_size = 20000
-max_strings.bibtex = 35307
-max_strings.bibtex8 = 35307
-max_strings.bibtexu = 35307
-max_strings.pbibtex = 35307
-
-% GFtype only.
-line_length.gftype = 500
-max_rows.gftype = 8191
-max_cols.gftype = 8191
diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD
deleted file mode 100644
index 7d3fc7d20..000000000
--- a/libre/texlive-fontsextra-libre/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# Maintainer: Rémy Oudompheng <remy.archlinux.org>
-# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgname=texlive-fontsextra-libre
-_pkgname=texlive-fontsextra
-pkgver=2013.31570
-_revnr=${pkgver#2013.}
-pkgrel=1
-pkgdesc="TeX Live - all sorts of extra fonts, without nonfree add-on packages"
-license=('GPL')
-arch=(any)
-depends=('texlive-core')
-groups=('texlive-most')
-replaces=('texlive-fontsextra')
-conflicts=('texlive-fontsextra')
-provides=('texlive-fontsextra')
-url='http://tug.org/texlive/'
-source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
-options=('!emptydirs')
-options=(!strip)
-install=texlive.install
-md5sums=('3f519371dd2e22e5b32daa461b89aea2'
-         'f489cc5f762dcdbe6acb11624de7e138')
-
-build() {
-   cd "$srcdir"
-   # remove nonfree packages
-   # No specific free license.
-   rm ogham.tar.xz
-   # Remove them from package list.
-   sed -ri '/^ogham /d' CONTENTS
-   for p in *.tar.xz; do
-	   bsdtar -xf $p
-   done
-   rm -rf {tlpkg,doc,source} || true
-}
-
-package() {
-   cd "$srcdir"
-   install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs
-   sed -i '/^#/d' CONTENTS
-   install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs
-   install -m644 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
-   install -m755 -d $pkgdir/usr/share
-   wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true
-   for dir in $wanteddirs; do
-     find $dir -type d -exec install -d -m755 $pkgdir/usr/share/texmf-dist/'{}' \;
-     find $dir -type f -exec install -m644 '{}' $pkgdir/usr/share/texmf-dist/'{}' \;
-   done
-   if [[ -d texmf-dist ]]; then
-     find texmf-dist -type d -exec install -d -m755 $pkgdir/usr/share/'{}' \;
-     find texmf-dist -type f -exec install -m644 '{}' $pkgdir/usr/share/'{}' \;
-   fi
-   if [[ -d $pkgdir/usr/share/texmf-dist/scripts ]]; then
-     find $pkgdir/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \;
-   fi
-}
diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
deleted file mode 100644
index 852afce52..000000000
--- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
+++ /dev/null
@@ -1,134 +0,0 @@
-Map Acorn.map
-Map AnnSton.map
-Map ArrowsADF.map
-Map ArtNouv.map
-Map ArtNouvc.map
-Map BulletsADF.map
-Map Carrickc.map
-Map CountriesOfEurope.map
-Map EBGaramond.map
-Map ESSTIX.map
-Map Eichenla.map
-Map Eileen.map
-Map EileenBl.map
-Map Elzevier.map
-Map GotIn.map
-Map GoudyIn.map
-Map Kinigcap.map
-Map Konanur.map
-Map Kramer.map
-Map LibreBaskerville.map
-Map LibreCaslon.map
-Map MnSymbol.map
-Map MorrisIn.map
-Map Nouveaud.map
-Map OrnementsADF.map
-Map Raleway.map
-Map Romantik.map
-Map Rothdn.map
-Map RoyalIn.map
-Map Sanremo.map
-Map SourceCodePro.map
-Map SourceSansPro.map
-Map Starburst.map
-Map Typocaps.map
-Map Zallman.map
-Map antt.map
-Map ap.map
-Map archaicprw.map
-Map arev.map
-Map ascii.map
-Map aspectratio.map
-Map augie.map
-Map auncial.map
-Map aurical.map
-Map belleek.map
-Map bera.map
-Map bguq.map
-Map boondox.map
-Map cabin.map
-Map calligra.map
-Map cantarell.map
-Map ccicons.map
-Map clm.map
-Map cm-lgc.map
-Map cmin.map
-Map comfortaa.map
-Map cyklop.map
-Map dejavu-type1.map
-Map dictsym.map
-Map droid.map
-Map dstroke.map
-Map dutchcal.map
-Map epigrafica.map
-Map esvect.map
-Map fbb.map
-Map fdsymbol.map
-Map fge.map
-Map foekfont.map
-Map fonetika.map
-Map fourier-utopia-expert.map
-Map fourier.map
-Map frcursive.map
-Map gentium-type1.map
-Map gfsartemisia.map
-Map gfsbodoni.map
-Map gfscomplutum.map
-Map gfsdidot.map
-Map gfsneohellenic.map
-Map gfssolomos.map
-Map gptimes.map
-Map hacm.map
-Map icelandic.map
-Map ipaex-type1.map
-Map iwona.map
-Map kpfonts.map
-Map kurier.map
-Map lato.map
-Map libertine.map
-Map linearA.map
-Map mathabx.map
-Map mdbch.map
-Map mdgreek.map
-Map mdput.map
-Map mdsymbol.map
-Map newpx.map
-Map newtx.map
-Map ocrb.map
-Map opensans.map
-Map paratype-type1.map
-Map pbsi.map
-Map phaistos.map
-Map prodint.map
-Map pxtx.map
-Map quattrocento.map
-Map recycle.map
-Map rsfso.map
-Map sansmathaccent.map
-Map sansmathfonts.map
-Map sqrcaps.map
-Map starfont.map
-Map superiors.map
-Map tfrupee.map
-Map uaq.map
-Map ugq.map
-Map ybd.map
-Map ybv.map
-Map yes.map
-Map yfrak.map
-Map yly.map
-Map yrd.map
-Map yv1.map
-Map yv2.map
-Map yv3.map
-Map yvo.map
-Map yvt.map
-Map zi4.map
-MixedMap allrunes.map
-MixedMap bbold.map
-MixedMap cmll.map
-MixedMap hfbright.map
-MixedMap lxfonts.map
-MixedMap pigpen.map
-MixedMap semaf.map
-MixedMap trajan.map
diff --git a/libre/texlive-fontsextra-libre/texlive.install b/libre/texlive-fontsextra-libre/texlive.install
deleted file mode 100644
index bfd2222a0..000000000
--- a/libre/texlive-fontsextra-libre/texlive.install
+++ /dev/null
@@ -1,52 +0,0 @@
-PKGNAME="texlive-fontsextra"
-UPDMAP="etc/texmf/web2c/updmap.cfg"
-UPDMAPLOCAL="etc/texmf/web2c/updmap-local.cfg"
-SYNCWITHTREES=''
-
-MAPFILE="var/lib/texmf/arch/installedpkgs/$PKGNAME.maps"
-
-post_install() {
-  TMPFILE=`mktemp`
-  echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
-  cp "$UPDMAP" "$TMPFILE"
-  echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
-  echo    "             into /etc/texmf/web2c/updmap-local.cfg"
-  cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP
-  cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
-  [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP
-  echo    ">>> texlive: updating the filename database..."
-  usr/bin/mktexlsr
-  echo    ">>> texlive: updating the fontmap files with updmap..."
-  usr/bin/updmap-sys --quiet --nohash
-  echo    " done." 
-}
-
-post_upgrade() {
-  TMPFILE=`mktemp`
-  echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
-  cp "$UPDMAP" "$TMPFILE"
-  echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
-  echo    "             into /etc/texmf/web2c/updmap-local.cfg"
-  cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP
-  cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
-  [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP
-  echo    ">>> texlive: updating the filename database..."
-  usr/bin/mktexlsr
-  echo    ">>> texlive: updating the fontmap files with updmap..."
-  usr/bin/updmap-sys --quiet --nohash $SYNCWITHTREES
-  echo    " done." 
-}
-
-pre_remove() {
-for m in `cut -d' ' -f2 $MAPFILE`; do 
-  sed -i "/\s$m/d" $UPDMAP ; 
-done
-}
-
-post_remove() {
-  echo    ">>> texlive: updating the filename database..."
-  usr/bin/mktexlsr
-  echo    ">>> texlive: updating the fontmap files with updmap..."
-  usr/bin/updmap-sys --quiet --nohash
-  echo    " done." 
-}
diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD
deleted file mode 100644
index ba22b53be..000000000
--- a/libre/texlive-latexextra-libre/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Id: PKGBUILD 193983 2013-09-09 12:57:56Z remy $
-# 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@parabola.nu>
-
-pkgname=texlive-latexextra-libre
-_pkgname=texlive-latexextra
-pkgver=2013.31588
-_revnr=${pkgver#2013.}
-pkgrel=1
-pkgdesc="TeX Live - Large collection of add-on packages for LaTeX, without nonfree add-on packages"
-license=('GPL')
-arch=(any)
-depends=('texlive-core'
-         'perl-file-which' # for pdfannotextractor
-        )
-optdepends=(
-  'texlive-genericextra: to use the calctab package'
-  'texlive-pictures: to use the package overpic'
-  'jdk7-openjdk: to use pdfannotextractor'
-)
-provides=('texlive-latexextra')
-replaces=('texlive-latexextra')
-conflicts=('texlive-latexextra')
-groups=('texlive-most')
-url='http://tug.org/texlive/'
-source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
-options=('!emptydirs')
-options=(!strip)
-install=texlive.install
-md5sums=('7c9755ca4e104089fab816d805990f6f'
-         '9e4825f47dac663dd62c4bfa67899e84')
-
-build() {
-   # remove nonfree packages
-   # No specific free license.
-   rm {authoraftertitle,clock,fnpara}.tar.xz
-   # Remove them from package list.
-   sed -ri '/^(authoraftertitle|fnpara) /d' CONTENTS
-   for p in *.tar.xz; do
-	   bsdtar -xf $p
-   done
-   rm -rf {tlpkg,doc,source} || true
-}
-package() {
-   install -m755 -d "$pkgdir"/var/lib/texmf/arch/installedpkgs
-   sed -i '/^#/d' CONTENTS
-   install -m644 CONTENTS "$pkgdir"/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs
-   install -m644 $_pkgname.maps "$pkgdir"/var/lib/texmf/arch/installedpkgs/
-   install -m755 -d "$pkgdir"/usr/share
-   wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true
-   for dir in $wanteddirs; do
-     find $dir -type d -exec install -d -m755 "$pkgdir"/usr/share/texmf-dist/'{}' \;
-     find $dir -type f -exec install -m644 '{}' "$pkgdir"/usr/share/texmf-dist/'{}' \;
-   done
-   if [[ -d texmf-dist ]]; then
-     find texmf-dist -type d -exec install -d -m755 "$pkgdir"/usr/share/'{}' \;
-     find texmf-dist -type f -exec install -m644 '{}' "$pkgdir"/usr/share/'{}' \;
-   fi
-   if [[ -d "$pkgdir"/usr/share/texmf-dist/scripts ]]; then
-     find "$pkgdir"/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \;
-   fi
-   #add symlinks that were in texlive-bin:
-   install -m755 -d "$pkgdir"/usr/bin
-   ln -s /usr/share/texmf-dist/scripts/authorindex/authorindex "$pkgdir"/usr/bin/authorindex
-   ln -s /usr/share/texmf-dist/scripts/exceltex/exceltex "$pkgdir"/usr/bin/exceltex
-   ln -s /usr/share/texmf-dist/scripts/glossaries/makeglossaries "$pkgdir"/usr/bin/makeglossaries
-   ln -s /usr/share/texmf-dist/scripts/pax/pdfannotextractor.pl "$pkgdir"/usr/bin/pdfannotextractor
-   ln -s /usr/share/texmf-dist/scripts/perltex/perltex.pl "$pkgdir"/usr/bin/perltex
-   ln -s /usr/share/texmf-dist/scripts/pst-pdf/ps4pdf "$pkgdir"/usr/bin/ps4pdf
-   ln -s /usr/share/texmf-dist/scripts/splitindex/splitindex.pl "$pkgdir"/usr/bin/splitindex
-   ln -s /usr/share/texmf-dist/scripts/svn-multi/svn-multi.pl "$pkgdir"/usr/bin/svn-multi
-   ln -s /usr/share/texmf-dist/scripts/vpe/vpe.pl "$pkgdir"/usr/bin/vpe
-   rm "$pkgdir"/usr/share/texmf-dist/scripts/glossaries/makeglossaries.bat
-   rm "$pkgdir"/usr/share/texmf-dist/scripts/pst-pdf/ps4pdf.bat*
-   rm "$pkgdir"/usr/share/texmf-dist/scripts/shipunov/biokey2html.bat
-}
diff --git a/libre/texlive-latexextra-libre/texlive-latexextra.maps b/libre/texlive-latexextra-libre/texlive-latexextra.maps
deleted file mode 100644
index b97f37fdd..000000000
--- a/libre/texlive-latexextra-libre/texlive-latexextra.maps
+++ /dev/null
@@ -1,3 +0,0 @@
-Map epiolmec.map
-MixedMap esint.map
-MixedMap manfnt.map
diff --git a/libre/texlive-latexextra-libre/texlive.install b/libre/texlive-latexextra-libre/texlive.install
deleted file mode 100644
index befc29143..000000000
--- a/libre/texlive-latexextra-libre/texlive.install
+++ /dev/null
@@ -1,52 +0,0 @@
-PKGNAME="texlive-latexextra"
-UPDMAP="etc/texmf/web2c/updmap.cfg"
-UPDMAPLOCAL="etc/texmf/web2c/updmap-local.cfg"
-SYNCWITHTREES=''
-
-MAPFILE="var/lib/texmf/arch/installedpkgs/$PKGNAME.maps"
-
-post_install() {
-  TMPFILE=`mktemp`
-  echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
-  cp "$UPDMAP" "$TMPFILE"
-  echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
-  echo    "             into /etc/texmf/web2c/updmap-local.cfg"
-  cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP
-  cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
-  [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP
-  echo    ">>> texlive: updating the filename database..."
-  usr/bin/mktexlsr
-  echo    ">>> texlive: updating the fontmap files with updmap..."
-  usr/bin/updmap-sys --quiet --nohash
-  echo    " done." 
-}
-
-post_upgrade() {
-  TMPFILE=`mktemp`
-  echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
-  cp "$UPDMAP" "$TMPFILE"
-  echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
-  echo    "             into /etc/texmf/web2c/updmap-local.cfg"
-  cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP
-  cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
-  [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP
-  echo    ">>> texlive: updating the filename database..."
-  usr/bin/mktexlsr
-  echo    ">>> texlive: updating the fontmap files with updmap..."
-  usr/bin/updmap-sys --quiet --nohash $SYNCWITHTREES
-  echo    " done." 
-}
-
-pre_remove() {
-for m in `cut -d' ' -f2 $MAPFILE`; do 
-  sed -i "/\s$m/d" $UPDMAP ; 
-done
-}
-
-post_remove() {
-  echo    ">>> texlive: updating the filename database..."
-  usr/bin/mktexlsr
-  echo    ">>> texlive: updating the fontmap files with updmap..."
-  usr/bin/updmap-sys --quiet --nohash
-  echo    " done." 
-}
diff --git a/libre/tokyocabinet/PKGBUILD b/libre/tokyocabinet/PKGBUILD
deleted file mode 100755
index 1add6c535..000000000
--- a/libre/tokyocabinet/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Mark Foxwell <fastfret79@archlinux.org.uk>
-# Contributor: Nicolas Martyanoff <khaelin@gmail.com> 
-
-pkgname=tokyocabinet
-pkgver=1.4.48
-pkgrel=2
-pkgdesc="a modern implementation of DBM"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://fallabs.com/tokyocabinet/"
-license=('LGPL')
-makedepends=('gcc>=3.1' 'make' 'pkgconfig')
-depends=('zlib' 'bzip2')
-source=("http://fallabs.com/tokyocabinet/${pkgname}-${pkgver}.tar.gz")
-md5sums=('fd03df6965f8f56dd5b8518ca43b4f5e')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  [ "$CARCH" != "mips64el" ] && extra=--enable-fastest
-
-  ./configure --prefix=/usr --enable-off64 $extra
-  make
-}
-
-# uncomment check routine if needed (can take ~5mins to run check)
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index b5639d522..de5c899c6 100644
--- a/libre/tp_smapi-libre-lts/PKGBUILD
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102970 2013-12-25 07:48:12Z bpiotrowski $
+# $Id: PKGBUILD 104131 2014-01-16 08:33:59Z bpiotrowski $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: xduugu
 # Contributor: nh2
@@ -13,7 +13,7 @@ pkgname=tp_smapi-libre-lts
 _pkgname=tp_smapi
 _extramodules=/usr/lib/modules/extramodules-3.10-LIBRE-LTS
 pkgver=0.41
-pkgrel=21
+pkgrel=23
 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-lts/tp_smapi-lts.install b/libre/tp_smapi-libre-lts/tp_smapi-lts.install
deleted file mode 100644
index 58c23092e..000000000
--- a/libre/tp_smapi-libre-lts/tp_smapi-lts.install
+++ /dev/null
@@ -1,13 +0,0 @@
-extramodules=/usr/lib/modules/extramodules-3.10-LIBRE-LTS
-
-post_install() {
-  depmod -v $(< "$extramodules/version") &>/dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index ba5a3747f..4b53e4463 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102837 2013-12-21 18:35:00Z tpowa $
+# $Id: PKGBUILD 104391 2014-01-19 20:28:42Z tpowa $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: xduugu
 # Contributor: nh2
@@ -12,7 +12,7 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=41
+pkgrel=43
 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/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install
deleted file mode 100644
index 2f81a4e15..000000000
--- a/libre/tp_smapi-libre/tp_smapi.install
+++ /dev/null
@@ -1,13 +0,0 @@
-extramodules=/usr/lib/modules/extramodules-3.12-LIBRE
-
-post_install() {
-  depmod -v $(< "$extramodules/version") &>/dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/libre/ttf-thai-libre/PKGBUILD b/libre/ttf-thai-libre/PKGBUILD
deleted file mode 100644
index 3d1d4ec3d..000000000
--- a/libre/ttf-thai-libre/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Henry Jensen <hjensen@connochaetos.org>
-
-pkgname=ttf-thai-libre
-pkgver=0.4.14
-pkgrel=1
-pkgdesc="A collection of basic Thai fonts, libre version"
-arch=(any)
-license=('GPL')
-depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig)
-makedepends=(fontforge)
-provides=('thai-ttf' "ttf-thai=$pkgver")
-conflicts=('ttf-thai')
-replaces=('ttf-thai')
-url="http://www.connochaetos.org"
-install=ttf.install
-source=(http://www.connochaetos.org/misc/thaifonts-scalable-libre-${pkgver}.tar.gz)
-md5sums=('205436d69d273aca33dbbf31c61fa6b9')
-
-build() {
-  cd ${srcdir}/thaifonts-scalable-libre-${pkgver}
-  ./configure --prefix=/usr --with-ttfdir=/usr/share/fonts/TTF --sysconfdir=/etc
-  make
-  make DESTDIR=${pkgdir}/ install
-  rm ${pkgdir}/usr/share/fonts/TTF/fonts.dir
-  rm ${pkgdir}/usr/share/fonts/TTF/fonts.scale
-}
-
diff --git a/libre/ttf-thai-libre/ttf.install b/libre/ttf-thai-libre/ttf.install
deleted file mode 100644
index 203190187..000000000
--- a/libre/ttf-thai-libre/ttf.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo -n "Updating font cache... "
-  fc-cache -fs > /dev/null
-  mkfontscale usr/share/fonts/TTF
-  mkfontdir usr/share/fonts/TTF
-  echo "done."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD
deleted file mode 100755
index e7f632461..000000000
--- a/libre/unar/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Maintainer: Cedric Girard <girard.cedric@gmail.com>
-# Contributor: N30N <archlinux@alunamation.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgname=unar
-pkgver=1.8.1
-pkgrel=1
-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>=52.1' 'icu<52.2' 'gcc-libs' 'zlib')
-makedepends=('gcc-objc')
-replaces=('unarchiver' 'unrar')
-conflicts=('unarchiver' 'unrar')
-provides=('unarchiver' 'unrar')
-source=("http://theunarchiver.googlecode.com/files/${pkgname}${pkgver}_src.zip"
-        "native_obj_exceptions.patch")
-
-build() {
-  cd "$srcdir/The Unarchiver"
-
-  patch -p1 < ../native_obj_exceptions.patch
-
-  cd XADMaster
-  . /usr/share/GNUstep/Makefiles/GNUstep.sh
-  make -f Makefile.linux
-}
-
-package() {
-  cd "$srcdir/The Unarchiver/XADMaster"
-  install -d "$pkgdir/usr/bin/"
-  install -m755 unar lsar "$pkgdir/usr/bin/"
-
-  cd "$srcdir/The Unarchiver/Extra"
-  install -d "$pkgdir/usr/share/man/man1"
-  gzip -c lsar.1 > "$pkgdir/usr/share/man/man1"/lsar.1.gz
-  gzip -c unar.1 > "$pkgdir/usr/share/man/man1"/unar.1.gz
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('4f952153fa849093efe2238498350fbe'
-         '4fa4ecc6e4ba14d3b6952d064e728511')
diff --git a/libre/unar/libz.patch b/libre/unar/libz.patch
deleted file mode 100755
index acba51463..000000000
--- a/libre/unar/libz.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur The Unarchiver/XADMaster/Makefile.linux The Unarchiver_patched/XADMaster/Makefile.linux
---- The Unarchiver/XADMaster/Makefile.linux	2011-04-27 03:32:21.000000000 +0200
-+++ The Unarchiver_patched/XADMaster/Makefile.linux	2011-12-22 10:56:13.749166606 +0100
-@@ -51,7 +51,8 @@
- 	-licuuc \
- 	-lobjc \
- 	-lstdc++ \
--	-lm
-+	-lm \
-+	-lz
- 
- LDFLAGS =	-Wl,--whole-archive \
- 		-fexceptions \
diff --git a/libre/unar/native_obj_exceptions.patch b/libre/unar/native_obj_exceptions.patch
deleted file mode 100755
index 9c84918b2..000000000
--- a/libre/unar/native_obj_exceptions.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur The Unarchiver/UniversalDetector/Makefile.linux The Unarchiver_patched/UniversalDetector/Makefile.linux
---- The Unarchiver/UniversalDetector/Makefile.linux	2011-04-27 03:32:21.000000000 +0200
-+++ The Unarchiver_patched/UniversalDetector/Makefile.linux	2011-12-22 10:48:32.138621163 +0100
-@@ -16,7 +16,6 @@
- 
- GNUSTEP_OPTS =	-DGNUSTEP \
- 		-DGNU_RUNTIME=1 \
--		-D_NATIVE_OBJC_EXCEPTIONS \
- 		-fgnu-runtime \
- 		-fexceptions \
- 		-fobjc-exceptions \
-diff -Naur The Unarchiver/XADMaster/Makefile.linux The Unarchiver_patched/XADMaster/Makefile.linux
---- The Unarchiver/XADMaster/Makefile.linux	2011-04-27 03:32:21.000000000 +0200
-+++ The Unarchiver_patched/XADMaster/Makefile.linux	2011-12-22 10:48:15.488721721 +0100
-@@ -16,7 +16,6 @@
- 
- GNUSTEP_OPTS =	-DGNUSTEP \
- 		-DGNU_RUNTIME=1 \
--		-D_NATIVE_OBJC_EXCEPTIONS \
- 		-fgnu-runtime \
- 		-fexceptions \
- 		-fobjc-exceptions \
diff --git a/libre/ununrar/PKGBUILD b/libre/ununrar/PKGBUILD
deleted file mode 100644
index e4ac77b11..000000000
--- a/libre/ununrar/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Michał Masłowski  <mtjm@mtjm.eu>
-
-pkgname=ununrar
-pkgver=0.0a0dev20130105
-pkgrel=1
-pkgdesc="An unrar-compatible interface to Unarchiver"
-arch=('any')
-url="http://hg.mtjm.eu/ununrar/"
-license=('AGPL')
-depends=('python2' 'python2-distribute' 'unarchiver')
-provides=('unrar' 'unrar-libre')
-conflicts=('unrar' 'unrar-libre')
-options=(!emptydirs)
-source=("http://mtjm.eu/releases/Ununrar-${pkgver}.tar.gz")
-sha512sums=('d8872d529b8e813b44f353f2958712c7e602776810ed51c6de7b6364e024cde9058e724569f83445a324edf41ca25757f3d94d67018ba18e3db027a9ee6c9200')
-
-package() {
-  cd "$srcdir/Ununrar-$pkgver"
-  python2 setup.py install --root=$pkgdir/ --optimize=1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/unzip-libre/PKGBUILD b/libre/unzip-libre/PKGBUILD
deleted file mode 100644
index 00c5906ea..000000000
--- a/libre/unzip-libre/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 150452 2012-02-17 23:21:23Z allan $
-# Maintainer:
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: Robson Peixoto
-
-_pkgname=unzip
-pkgname=unzip-libre
-pkgver=6.0
-pkgrel=6
-pkgdesc="Unpacks .zip archives such as those made by PKZIP"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.info-zip.org/"
-license=('custom')
-depends=('bzip2' 'bash')
-provides=("${_pkgname}=${pkgver}")
-conflicts=("${_pkgname}")
-replaces=("${_pkgname}")
-source=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz'
-        'match.patch')
-md5sums=('62b490407489521db863b523a7f86375'
-         'e6d9f0c204c2abe6a57dc5e1637d5140')
-
-build() {
-  cd ${srcdir}/${_pkgname}${pkgver/./}
-
-  # from http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/DATA/unzip/match.patch
-  patch -Np0 -i ${srcdir}/match.patch
-
-  # set CFLAGS -- from Debian
-  export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DACORN_FTYPE_NFS \
-  -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT \
-  -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DDATE_FORMAT=DF_YMD \
-  -DUSE_BZIP2 -DNATIVE"
-
-  sed -i "/MANDIR =/s#)/#)/share/#" unix/Makefile
-
-  # make -- from Debian
-  make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr LF2="" \
-  D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips
-}
-
-package(){
-  cd ${srcdir}/${_pkgname}${pkgver/./}
-
-  # install -- from Debian
-  make -f unix/Makefile prefix=${pkgdir}/usr INSTALL_PROGRAM="install" install
-
-  # install the license file
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/unzip/LICENSE
-}
-
diff --git a/libre/unzip-libre/match.patch b/libre/unzip-libre/match.patch
deleted file mode 100644
index 6ba65fee0..000000000
--- a/libre/unzip-libre/match.patch
+++ /dev/null
@@ -1,472 +0,0 @@
---- match.c	2011-09-07 23:00:58.037644003 +0200
-+++ match.final.c	2011-09-07 23:32:19.433644002 +0200
-@@ -27,16 +27,14 @@
- 
-   ---------------------------------------------------------------------------
- 
--  Copyright on recmatch() from Zip's util.c (although recmatch() was almost
--  certainly written by Mark Adler...ask me how I can tell :-) ):
-+  Copyright on recmatch() from Zip's util.c
-+	 Copyright (c) 1990-2005 Info-ZIP.  All rights reserved.
- 
--     Copyright (C) 1990-1992 Mark Adler, Richard B. Wales, Jean-loup Gailly,
--     Kai Uwe Rommel and Igor Mandrichenko.
-+	 See the accompanying file LICENSE, version 2004-May-22 or later
-+	 for terms of use.
-+	 If, for some reason, both of these files are missing, the Info-ZIP license
-+	 also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html  
- 
--     Permission is granted to any individual or institution to use, copy,
--     or redistribute this software so long as all of the original files are
--     included unmodified, that it is not sold for profit, and that this copy-
--     right notice is retained.
- 
-   ---------------------------------------------------------------------------
- 
-@@ -53,7 +51,7 @@
- 
-   A set is composed of characters or ranges; a range looks like ``character
-   hyphen character'' (as in 0-9 or A-Z).  [0-9a-zA-Z_] is the minimal set of
--  characters allowed in the [..] pattern construct.  Other characters are
-+  characters ALlowed in the [..] pattern construct.  Other characters are
-   allowed (i.e., 8-bit characters) if your system will support them.
- 
-   To suppress the special syntactic significance of any of ``[]*?!^-\'', in-
-@@ -101,8 +99,32 @@
- #  define WILDCHAR   '?'
- #  define BEG_RANGE  '['
- #  define END_RANGE  ']'
-+#  define WILDCHR_SINGLE '?'
-+#  define DIRSEP_CHR '/'
-+#  define WILDCHR_MULTI '*'
- #endif
- 
-+#ifdef WILD_STOP_AT_DIR
-+   int wild_stop_at_dir = 1; /* default wildcards do not include / in matches */
-+#else
-+   int wild_stop_at_dir = 0; /* default wildcards do include / in matches */
-+#endif
-+
-+
-+
-+/*
-+ * case mapping functions. case_map is used to ignore case in comparisons,
-+ * to_up is used to force upper case even on Unix (for dosify option).
-+ */
-+#ifdef USE_CASE_MAP
-+#  define case_map(c) upper[(c) & 0xff]
-+#  define to_up(c)    upper[(c) & 0xff]
-+#else
-+#  define case_map(c) (c)
-+#  define to_up(c)    ((c) >= 'a' && (c) <= 'z' ? (c)-'a'+'A' : (c))
-+#endif /* USE_CASE_MAP */
-+
-+
- #if 0                /* GRR:  add this to unzip.h someday... */
- #if !(defined(MSDOS) && defined(DOSWILD))
- #ifdef WILD_STOP_AT_DIR
-@@ -114,8 +136,8 @@
-                  int ignore_case __WDLPRO));
- #endif
- #endif /* 0 */
--static int recmatch OF((ZCONST uch *pattern, ZCONST uch *string,
--                        int ignore_case __WDLPRO));
-+static int recmatch OF((ZCONST char *, ZCONST char *, 
-+                        int));
- static char *isshexp OF((ZCONST char *p));
- static int namecmp OF((ZCONST char *s1, ZCONST char *s2));
- 
-@@ -154,192 +176,236 @@
-             }
-             dospattern[j-1] = '\0';                    /* nuke the end "." */
-         }
--        j = recmatch((uch *)dospattern, (uch *)string, ignore_case __WDL);
-+        j = recmatch(dospattern, string, ignore_case);
-         free(dospattern);
-         return j == 1;
-     } else
- #endif /* MSDOS && DOSWILD */
--    return recmatch((uch *)pattern, (uch *)string, ignore_case __WDL) == 1;
-+    return recmatch(pattern, string, ignore_case) == 1;
- }
- 
- 
- 
--static int recmatch(p, s, ic __WDL)
--    ZCONST uch *p;        /* sh pattern to match */
--    ZCONST uch *s;        /* string to which to match it */
--    int ic;               /* true for case insensitivity */
--    __WDLDEF              /* directory sepchar for WildStopAtDir mode, or 0 */
-+static int recmatch(p, s, cs)
-+ZCONST char *p;         /* sh pattern to match */
-+ZCONST char *s;         /* string to match it to */
-+int cs;                 /* flag: force case-sensitive matching */
- /* Recursively compare the sh pattern p with the string s and return 1 if
-- * they match, and 0 or 2 if they don't or if there is a syntax error in the
-- * pattern.  This routine recurses on itself no more deeply than the number
-- * of characters in the pattern. */
-+   they match, and 0 or 2 if they don't or if there is a syntax error in the
-+   pattern.  This routine recurses on itself no deeper than the number of
-+   characters in the pattern. */
- {
--    unsigned int c;       /* pattern char or start of range in [-] loop */
-+  int c;                /* pattern char or start of range in [-] loop */
-+  /* Get first character, the pattern for new recmatch calls follows */
-+ /* borrowed from Zip's global.c */
-+ int no_wild = 0; 
-+ int allow_regex=1;
-+  /* This fix provided by akt@m5.dion.ne.jp for Japanese.
-+     See 21 July 2006 mail.
-+     It only applies when p is pointing to a doublebyte character and
-+     things like / and wildcards are not doublebyte.  This probably
-+     should not be needed. */
- 
--    /* Get first character, the pattern for new recmatch calls follows */
--    c = *p; INCSTR(p);
-+#ifdef _MBCS
-+  if (CLEN(p) == 2) {
-+    if (CLEN(s) == 2) {
-+      return (*p == *s && *(p+1) == *(s+1)) ?
-+        recmatch(p + 2, s + 2, cs) : 0;
-+    } else {
-+      return 0;
-+    }
-+  }
-+#endif /* ?_MBCS */
- 
--    /* If that was the end of the pattern, match if string empty too */
--    if (c == 0)
--        return *s == 0;
-+  c = *POSTINCSTR(p);
- 
--    /* '?' (or '%') matches any character (but not an empty string). */
--    if (c == WILDCHAR)
--#ifdef WILD_STOP_AT_DIR
--        /* If uO.W_flag is non-zero, it won't match '/' */
--        return (*s && (!sepc || *s != (uch)sepc))
--               ? recmatch(p, s + CLEN(s), ic, sepc) : 0;
--#else
--        return *s ? recmatch(p, s + CLEN(s), ic) : 0;
--#endif
-+  /* If that was the end of the pattern, match if string empty too */
-+  if (c == 0)
-+    return *s == 0;
-+
-+  /* '?' (or '%' or '#') matches any character (but not an empty string) */
-+  if (c == WILDCHR_SINGLE) {
-+    if (wild_stop_at_dir)
-+      return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), cs) : 0;
-+    else
-+      return *s ? recmatch(p, s + CLEN(s), cs) : 0;
-+  }
- 
--    /* '*' matches any number of characters, including zero */
-+  /* WILDCHR_MULTI ('*') matches any number of characters, including zero */
- #ifdef AMIGA
--    if (c == '#' && *p == '?')     /* "#?" is Amiga-ese for "*" */
--        c = '*', p++;
-+  if (!no_wild && c == '#' && *p == '?')            /* "#?" is Amiga-ese for "*" */
-+    c = WILDCHR_MULTI, p++;
- #endif /* AMIGA */
--    if (c == '*') {
--#ifdef WILD_STOP_AT_DIR
--        if (sepc) {
--          /* check for single "*" or double "**" */
--#  ifdef AMIGA
--          if ((c = p[0]) == '#' && p[1] == '?') /* "#?" is Amiga-ese for "*" */
--            c = '*', p++;
--          if (c != '*') {
--#  else /* !AMIGA */
--          if (*p != '*') {
--#  endif /* ?AMIGA */
--            /* single "*": this doesn't match the dirsep character */
--            for (; *s && *s != (uch)sepc; INCSTR(s))
--                if ((c = recmatch(p, s, ic, sepc)) != 0)
--                    return (int)c;
--            /* end of pattern: matched if at end of string, else continue */
--            if (*p == '\0')
--                return (*s == 0);
--            /* continue to match if at sepc in pattern, else give up */
--            return (*p == (uch)sepc || (*p == '\\' && p[1] == (uch)sepc))
--                   ? recmatch(p, s, ic, sepc) : 2;
--          }
--          /* "**": this matches slashes */
--          ++p;        /* move p behind the second '*' */
--          /* and continue with the non-W_flag code variant */
--        }
--#endif /* WILD_STOP_AT_DIR */
-+  if (!no_wild && c == WILDCHR_MULTI)
-+  {
-+    if (wild_stop_at_dir) {
-+      /* Check for an immediately following WILDCHR_MULTI */
-+# ifdef AMIGA
-+      if ((c = p[0]) == '#' && p[1] == '?') /* "#?" is Amiga-ese for "*" */
-+        c = WILDCHR_MULTI, p++;
-+      if (c != WILDCHR_MULTI) {
-+# else /* !AMIGA */
-+      if (*p != WILDCHR_MULTI) {
-+# endif /* ?AMIGA */
-+        /* Single WILDCHR_MULTI ('*'): this doesn't match slashes */
-+        for (; *s && *s != DIRSEP_CHR; INCSTR(s))
-+          if ((c = recmatch(p, s, cs)) != 0)
-+            return c;
-+        /* end of pattern: matched if at end of string, else continue */
-         if (*p == 0)
--            return 1;
--        if (isshexp((ZCONST char *)p) == NULL) {
--            /* Optimization for rest of pattern being a literal string:
--             * If there are no other shell expression chars in the rest
--             * of the pattern behind the multi-char wildcard, then just
--             * compare the literal string tail.
--             */
--            ZCONST uch *srest;
--
--            srest = s + (strlen((ZCONST char *)s) - strlen((ZCONST char *)p));
--            if (srest - s < 0)
--                /* remaining literal string from pattern is longer than rest
--                 * of test string, there can't be a match
--                 */
--                return 0;
--            else
--              /* compare the remaining literal pattern string with the last
--               * bytes of the test string to check for a match
--               */
-+          return (*s == 0);
-+        /* continue to match if at DIRSEP_CHR in pattern, else give up */
-+        return (*p == DIRSEP_CHR || (*p == '\\' && p[1] == DIRSEP_CHR))
-+               ? recmatch(p, s, cs) : 2;
-+      }
-+      /* Two consecutive WILDCHR_MULTI ("**"): this matches DIRSEP_CHR ('/') */
-+      p++;        /* move p past the second WILDCHR_MULTI */
-+      /* continue with the normal non-WILD_STOP_AT_DIR code */
-+    } /* wild_stop_at_dir */
-+
-+    /* Not wild_stop_at_dir */
-+    if (*p == 0)
-+      return 1;
-+    if (!isshexp((char *)p))
-+    {
-+      /* optimization for rest of pattern being a literal string */
-+
-+      /* optimization to handle patterns like *.txt */
-+      /* if the first char in the pattern is '*' and there */
-+      /* are no other shell expression chars, i.e. a literal string */
-+      /* then just compare the literal string at the end */
-+
-+      ZCONST char *srest;
-+
-+      srest = s + (strlen(s) - strlen(p));
-+      if (srest - s < 0)
-+        /* remaining literal string from pattern is longer than rest of
-+           test string, there can't be a match
-+         */
-+        return 0;
-+      else
-+        /* compare the remaining literal pattern string with the last bytes
-+           of the test string to check for a match */
- #ifdef _MBCS
--            {
--                ZCONST uch *q = s;
-+      {
-+        ZCONST char *q = s;
- 
--                /* MBCS-aware code must not scan backwards into a string from
--                 * the end.
--                 * So, we have to move forward by character from our well-known
--                 * character position s in the test string until we have
--                 * advanced to the srest position.
--                 */
--                while (q < srest)
--                  INCSTR(q);
--                /* In case the byte *srest is a trailing byte of a multibyte
--                 * character in the test string s, we have actually advanced
--                 * past the position (srest).
--                 * For this case, the match has failed!
--                 */
--                if (q != srest)
--                    return 0;
--                return ((ic
--                         ? namecmp((ZCONST char *)p, (ZCONST char *)q)
--                         : strcmp((ZCONST char *)p, (ZCONST char *)q)
--                        ) == 0);
--            }
-+        /* MBCS-aware code must not scan backwards into a string from
-+         * the end.
-+         * So, we have to move forward by character from our well-known
-+         * character position s in the test string until we have advanced
-+         * to the srest position.
-+         */
-+        while (q < srest)
-+          INCSTR(q);
-+        /* In case the byte *srest is a trailing byte of a multibyte
-+         * character, we have actually advanced past the position (srest).
-+         * For this case, the match has failed!
-+         */
-+        if (q != srest)
-+          return 0;
-+        return ((cs ? strcmp(p, q) : namecmp(p, q)) == 0);
-+      }
- #else /* !_MBCS */
--                return ((ic
--                         ? namecmp((ZCONST char *)p, (ZCONST char *)srest)
--                         : strcmp((ZCONST char *)p, (ZCONST char *)srest)
--                        ) == 0);
-+        return ((cs ? strcmp(p, srest) : namecmp(p, srest)) == 0);
- #endif /* ?_MBCS */
--        } else {
--            /* pattern contains more wildcards, continue with recursion... */
--            for (; *s; INCSTR(s))
--                if ((c = recmatch(p, s, ic __WDL)) != 0)
--                    return (int)c;
--            return 2;  /* 2 means give up--match will return false */
--        }
-     }
--
--    /* Parse and process the list of characters and ranges in brackets */
--    if (c == BEG_RANGE) {
--        int e;          /* flag true if next char to be taken literally */
--        ZCONST uch *q;  /* pointer to end of [-] group */
--        int r;          /* flag true to match anything but the range */
--
--        if (*s == 0)                            /* need a character to match */
--            return 0;
--        p += (r = (*p == '!' || *p == '^'));    /* see if reverse */
--        for (q = p, e = 0; *q; INCSTR(q))       /* find closing bracket */
--            if (e)
--                e = 0;
--            else
--                if (*q == '\\')      /* GRR:  change to ^ for MS-DOS, OS/2? */
--                    e = 1;
--                else if (*q == END_RANGE)
--                    break;
--        if (*q != END_RANGE)         /* nothing matches if bad syntax */
--            return 0;
--        for (c = 0, e = (*p == '-'); p < q; INCSTR(p)) {
--            /* go through the list */
--            if (!e && *p == '\\')               /* set escape flag if \ */
--                e = 1;
--            else if (!e && *p == '-')           /* set start of range if - */
--                c = *(p-1);
--            else {
--                unsigned int cc = Case(*s);
--
--                if (*(p+1) != '-')
--                    for (c = c ? c : *p; c <= *p; c++)  /* compare range */
--                        if ((unsigned)Case(c) == cc) /* typecast for MSC bug */
--                            return r ? 0 : recmatch(q + 1, s + 1, ic __WDL);
--                c = e = 0;   /* clear range, escape flags */
--            }
--        }
--        return r ? recmatch(q + CLEN(q), s + CLEN(s), ic __WDL) : 0;
--                                        /* bracket match failed */
-+    else
-+    {
-+      /* pattern contains more wildcards, continue with recursion... */
-+      for (; *s; INCSTR(s))
-+        if ((c = recmatch(p, s, cs)) != 0)
-+          return c;
-+      return 2;           /* 2 means give up--shmatch will return false */
-     }
-+  }
- 
--    /* if escape ('\\'), just compare next character */
--    if (c == '\\' && (c = *p++) == 0)     /* if \ at end, then syntax error */
--        return 0;
-+#ifndef VMS             /* No bracket matching in VMS */
-+  /* Parse and process the list of characters and ranges in brackets */
-+  if (!no_wild && allow_regex && c == '[')
-+  {
-+    int e;              /* flag true if next char to be taken literally */
-+    ZCONST char *q;     /* pointer to end of [-] group */
-+    int r;              /* flag true to match anything but the range */
-+
-+    if (*s == 0)                        /* need a character to match */
-+      return 0;
-+    p += (r = (*p == '!' || *p == '^')); /* see if reverse */
-+    for (q = p, e = 0; *q; q++)         /* find closing bracket */
-+      if (e)
-+        e = 0;
-+      else
-+        if (*q == '\\')
-+          e = 1;
-+        else if (*q == ']')
-+          break;
-+    if (*q != ']')                      /* nothing matches if bad syntax */
-+      return 0;
-+    for (c = 0, e = *p == '-'; p < q; p++)      /* go through the list */
-+    {
-+      if (e == 0 && *p == '\\')         /* set escape flag if \ */
-+        e = 1;
-+      else if (e == 0 && *p == '-')     /* set start of range if - */
-+        c = *(p-1);
-+      else
-+      {
-+        uch cc = (cs ? (uch)*s : case_map((uch)*s));
-+        uch uc = (uch) c;
-+        if (*(p+1) != '-')
-+          for (uc = uc ? uc : (uch)*p; uc <= (uch)*p; uc++)
-+            /* compare range */
-+            if ((cs ? uc : case_map(uc)) == cc)
-+              return r ? 0 : recmatch(q + CLEN(q), s + CLEN(s), cs);
-+        c = e = 0;                      /* clear range, escape flags */
-+      }
-+    }
-+    return r ? recmatch(q + CLEN(q), s + CLEN(s), cs) : 0;
-+                                        /* bracket match failed */
-+  }
-+#endif /* !VMS */
- 
--    /* just a character--compare it */
--#ifdef QDOS
--    return QMatch(Case((uch)c), Case(*s)) ?
--           recmatch(p, s + CLEN(s), ic __WDL) : 0;
--#else
--    return Case((uch)c) == Case(*s) ?
--           recmatch(p, s + CLEN(s), ic __WDL) : 0;
--#endif
-+  /* If escape ('\'), just compare next character */
-+  if (!no_wild && c == '\\')
-+    if ((c = *p++) == '\0')             /* if \ at end, then syntax error */
-+      return 0;
-+
-+#ifdef VMS
-+  /* 2005-11-06 SMS.
-+     Handle "..." wildcard in p with "." or "]" in s.
-+  */
-+  if ((c == '.') && (*p == '.') && (*(p+ CLEN( p)) == '.') &&
-+   ((*s == '.') || (*s == ']')))
-+  {
-+    /* Match "...]" with "]".  Continue after "]" in both. */
-+    if ((*(p+ 2* CLEN( p)) == ']') && (*s == ']'))
-+      return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs);
-+
-+    /* Else, look for a reduced match in s, until "]" in or end of s. */
-+    for (; *s && (*s != ']'); INCSTR(s))
-+      if (*s == '.')
-+        /* If reduced match, then continue after "..." in p, "." in s. */
-+        if ((c = recmatch( (p+ CLEN( p)), s, cs)) != 0)
-+          return (int)c;
-+
-+    /* Match "...]" with "]".  Continue after "]" in both. */
-+    if ((*(p+ 2* CLEN( p)) == ']') && (*s == ']'))
-+      return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs);
-+
-+    /* No reduced match.  Quit. */
-+    return 2;
-+  }
-+
-+#endif /* def VMS */
-+
-+  /* Just a character--compare it */
-+  return (cs ? c == *s : case_map((uch)c) == case_map((uch)*s)) ?
-+          recmatch(p, s + CLEN(s), cs) : 0;
-+}
- 
--} /* end function recmatch() */
- 
- 
- 
-+/*************************************************************************************************/
- static char *isshexp(p)
- ZCONST char *p;
- /* If p is a sh expression, a pointer to the first special character is
diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD
deleted file mode 100644
index 5344a65c2..000000000
--- a/libre/usermin/PKGBUILD
+++ /dev/null
@@ -1,129 +0,0 @@
-# $Id: PKGBUILD 195999 2013-10-07 10:42:06Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=usermin
-pkgver=1.570
-pkgrel=1
-pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding (Parabola rebranded)"
-arch=(i686 x86_64 mips64el)
-license=('custom:usermin')
-url="http://www.webmin.com/"
-depends=('perl' 'webmin')
-makedepends=('perl-net-ssleay')
-backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' 'etc/usermin/config' 'etc/usermin/usermin.cats' \
-'etc/usermin/at/config' \
-'etc/usermin/man/config' \
-'etc/usermin/ssh/config' \
-'etc/usermin/chfn/config' \
-'etc/usermin/cron/config' \
-'etc/usermin/file/config' \
-'etc/usermin/plan/config' \
-'etc/usermin/proc/config' \
-'etc/usermin/spam/config' \
-'etc/usermin/htaccess/config' \
-'etc/usermin/cshrc/config' \
-'etc/usermin/gnupg/config' \
-'etc/usermin/mysql/config' \
-'etc/usermin/quota/config' \
-'etc/usermin/shell/config' \
-'etc/usermin/theme/config' \
-'etc/usermin/mailbox/config' \
-'etc/usermin/schedule/config' \
-'etc/usermin/config' \
-'etc/usermin/commands/config' \
-'etc/usermin/htaccess-htpasswd/config' \
-'etc/usermin/forward/config' \
-'etc/usermin/telnet/config' \
-'etc/usermin/tunnel/config' \
-'etc/usermin/updown/config' \
-'etc/usermin/procmail/config' \
-'etc/usermin/fetchmail/config' \
-'etc/usermin/changepass/config' \
-'etc/usermin/language/config' \
-'etc/usermin/postgresql/config' \
-'etc/usermin/usermount/config' \
-)
-install=usermin.install
-source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
-	usermin.service
-	ftp://ftp.archlinux.org/other/usermin/usermin-config.tar.bz2) 
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-    
-  # remove modules we do not support
-
-  #remove config files from other distros
-  rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*')
-  
-  # remove caldera theme
-  rm -rf caldera
-
-  # remove init-scripts from other distros
-  rm usermin-init
-  rm usermin-daemon
-
-  # setting perl path
-  (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-  
-  # create dirs
-  mkdir -p "$pkgdir"/opt/usermin
-  mkdir -p "$pkgdir"/var/log/usermin
-  mkdir -p "$pkgdir"/etc/usermin
-  
-  # install pam stuff
-  install -D -m 644 usermin-pam "$pkgdir"/etc/pam.d/usermin
-  
-  # remove other distros and add only Parabola GNU/Linux-libre don't change next line else it will not work!
-  rm os_list.txt
-  echo 'Parabola GNU/Linux-libre			Any version	generic-linux	*	-d "/etc/pacman.d"' >> os_list.txt
-  
-  # copy stuff to right dirs
-  cd "$srcdir"/$pkgname-$pkgver
-  cp -rp * "$pkgdir"/opt/usermin
-  cd "$srcdir"/usermin-config
-  cp -rfp * "$pkgdir"/opt/usermin
-
-  # define parameters for setup.sh
-  config_dir="$pkgdir"/etc/usermin
-  var_dir="$pkgdir"/var/log/usermin
-  perl=/usr/bin/perl
-  autoos=1
-  port=20000
-  login=root
-  crypt="XXX"
-  ssl=1
-  atboot=0
-  nostart=1
-  nochown=1
-  autothird=1
-  nouninstall=1
-  noperlpath=1
-  atbootyn=n
-  tempdir="$pkgdir"/tmp
-  export config_dir var_dir perl autoos port tempdir ssl nochown autothird nouninstall nostart noperlpath atbootyn login crypt
-  
-  # Fix setup.sh
-  sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/usermin/setup.sh
-  "$pkgdir"/opt/usermin/setup.sh
-  
-  # Fixup the config files to use their real locations
-  sed -i 's:^pidfile=.*$:pidfile=/var/run/usermin.pid:' "$pkgdir"/etc/usermin/miniserv.conf
-  find "$pkgdir"/etc/usermin -type f -exec sed -i "s:$pkgdir::g" {} \; 
-  
-  # make it only accessible by localhost
-  echo 'allow=127.0.0.1' >> "$pkgdir"/etc/usermin/miniserv.conf
-  
-  # enable user and password login
-  sed -i -e '/localauth/d' "$pkgdir"/etc/usermin/miniserv.conf
-
-  #install systemd service file
-  install -D -m 644 "$srcdir"/usermin.service "$pkgdir"/usr/lib/systemd/system/usermin.service
-
-  # delete temp dir
-  rm -r "$pkgdir"/tmp
-  #install license
-  install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE
-}
-md5sums=('4cfb713bb2fa2582cfe9a62802d588ab'
-         'a5bd5e5ee779f8a3cf3d776ca77ee36e'
-         'ec37a79f948f778224550930d2a7ca07')
diff --git a/libre/usermin/usermin.install b/libre/usermin/usermin.install
deleted file mode 100644
index 3ace10ea2..000000000
--- a/libre/usermin/usermin.install
+++ /dev/null
@@ -1,34 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
-  crypt=${crypt//\\/\\\\}
-  crypt=${crypt//\//\\\/}
-  sed -i "s/root:XXX/root:${crypt}/" /etc/usermin/miniserv.users
-cat << EOF
-Note:
-==> It is not allowed to install 3rd party modules, or delete existing modules.
-==> Please write your own PKGBUILDS for 3rd party modules and additional themes.
-Setup:
-==> To make usermin start at boot time, add usermin to rc.conf daemons
-==> Point your web browser to http://localhost:20000 to use usermin.
-==> To change the modules setup please use webmin.
-
-==> The access is restricted to localhost, if you want to connect from other locations
-==> change /etc/usermin/miniserv.conf to something like that: allow=127.0.0.1 <your-ip>
-==> If you want to have ssl encryption please install 'perl-net-ssleay' additional.
-EOF
-# fix man module
-  cd /opt/usermin/man
-  gzip -df $(find . -name '*.gz')
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  # uninstall unzipped files
-  rm -r /opt/usermin/man
-}
diff --git a/libre/usermin/usermin.service b/libre/usermin/usermin.service
deleted file mode 100644
index e91164c63..000000000
--- a/libre/usermin/usermin.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Usermin
-
-[Service]
-Type=forking
-ExecStart=/opt/usermin/miniserv.pl /etc/usermin/miniserv.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/vhba-module-libre/60-vhba.rules b/libre/vhba-module-libre/60-vhba.rules
deleted file mode 100644
index 39ae3a4ec..000000000
--- a/libre/vhba-module-libre/60-vhba.rules
+++ /dev/null
@@ -1 +0,0 @@
-ACTION=="add", KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu", TAG+="uaccess"
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 31ec4c26e..ed87b2b70 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102839 2013-12-21 18:35:50Z tpowa $
+# $Id: PKGBUILD 104393 2014-01-19 20:29:02Z tpowa $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
@@ -8,7 +8,7 @@ _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20130607
 _extramodules=extramodules-3.12-LIBRE
-pkgrel=21
+pkgrel=23
 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/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install
deleted file mode 100644
index 793cffd8d..000000000
--- a/libre/vhba-module-libre/vhba-module.install
+++ /dev/null
@@ -1,22 +0,0 @@
-EXTRAMODULES=
-
-_updatemod() {
-  echo "  > Updating module dependencies..."
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-  post_upgrade
-}
-
-post_upgrade() {
-  getent group cdemu &>/dev/null || groupadd -r cdemu
-  _updatemod
-}
-
-post_remove() {
-  _updatemod
-  groupdel cdemu
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/vim-runtime/PKGBUILD b/libre/vim-runtime/PKGBUILD
deleted file mode 100644
index 20cccfb53..000000000
--- a/libre/vim-runtime/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
-
-pkgbase=vim
-pkgname=vim-runtime
-_topver=7.4
-_patchlevel=86
-__hgrev=f6940759212d
-_versiondir="vim${_topver//./}"
-pkgver=${_topver}.${_patchlevel}
-pkgrel=1
-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=('436d4d3c6402ce20309bf2cdedce63c0'
-         '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
deleted file mode 100644
index bc3c1f82e..000000000
--- a/libre/vim-runtime/parabola.vim
+++ /dev/null
@@ -1,27 +0,0 @@
-" 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
deleted file mode 100644
index fc67e7eb0..000000000
--- a/libre/vim-runtime/vimrc
+++ /dev/null
@@ -1,16 +0,0 @@
-" 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
deleted file mode 100644
index 6a5f9eff8..000000000
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ /dev/null
@@ -1,74 +0,0 @@
-# $Id: PKGBUILD 93525 2013-07-05 00:46:26Z seblu $
-# 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@parabola.nu>
-# Contributor (Parabola): Jorge López <jorginho@lavabit.com>
-
-pkgbase=virtualbox-libre-modules-lts
-pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
-pkgver=4.2.16
-pkgrel=1.1
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL')
-makedepends=('linux-libre-lts'
-             'linux-libre-lts-headers'
-             "virtualbox-libre-host-dkms>=$pkgver"
-             "virtualbox-libre-guest-dkms>=$pkgver"
-             'expac'
-             'sed'
-             'bc')
-
-build() {
-  _kernmaj=$(expac -Q '%v' linux-libre-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/version)
-  # dkms need modification to be run as user
-  cp -r /var/lib/dkms .
-  echo "dkms_tree='$srcdir/dkms'" > dkms.conf
-  # build host modules
-  msg2 'Host modules'
-  dkms --dkmsframework dkms.conf build "vboxhost/$pkgver" -k "$_kernver"
-  # build guest modules
-  msg2 'Guest modules'
-  dkms --dkmsframework dkms.conf build "vboxguest/$pkgver" -k "$_kernver"
-}
-
-package_virtualbox-libre-host-modules-lts(){
-  _kernmaj=$(expac -Q '%v' linux-libre-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/version)
-  pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre-lts kernel package)'
-#  depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)")
-  depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
-  replaces=('virtualbox-host-modules-lts' 'virtualbox-modules-lts' 'virtualbox-libre-modules-lts')
-  conflicts=('virtualbox-host-modules-lts' 'virtualbox-modules-lts' 'virtualbox-libre-modules-lts')
-  provides=("virtualbox-host-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver")
-  install=virtualbox-libre-host-modules-lts.install
-
-  cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/"
-  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/"
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-libre-host-modules-lts.install"
-}
-
-package_virtualbox-libre-guest-modules-lts(){
-  _kernmaj=$(expac -Q '%v' linux-libre-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/version)
-  pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre-lts kernel package)'
-  license=('GPL')
-#  depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)")
-  depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
-  replaces=('virtualbox-guest-modules-lts' 'virtualbox-archlinux-modules-lts' 'virtualbox-libre-parabola-modules-lts')
-  conflicts=('virtualbox-guest-modules-lts' 'virtualbox-archlinux-modules-lts' 'virtualbox-libre-parabola-modules-lts')
-  provides=("virtualbox-guest-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver")
-  install=virtualbox-libre-guest-modules-lts.install
-
-  cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/"
-  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/"
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-libre-guest-modules-lts.install"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules-lts/build.sh b/libre/virtualbox-libre-modules-lts/build.sh
deleted file mode 100755
index 895bea0b1..000000000
--- a/libre/virtualbox-libre-modules-lts/build.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if (( $# != 1 )); then
-  echo "usage: $0 extra"
-  echo "       $0 testing"
-  exit 1
-fi
-
-here=$PWD
-cd /var/empty
-linux32 makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
-cd "$here"
-linux32 makechrootpkg -n -r /var/lib/archbuild/$1-i686
-
-cd /var/empty
-makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
-cd "$here"
-makechrootpkg -n -r /var/lib/archbuild/$1-x86_64
-
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre-modules-lts/virtualbox-libre-guest-modules-lts.install b/libre/virtualbox-libre-modules-lts/virtualbox-libre-guest-modules-lts.install
deleted file mode 100644
index 923bd68e3..000000000
--- a/libre/virtualbox-libre-modules-lts/virtualbox-libre-guest-modules-lts.install
+++ /dev/null
@@ -1,21 +0,0 @@
-_depmod() {
-  EXTRAMODULES='extramodules-3.0-LIBRE-LTS'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-  cat << EOF
-===> You may want to load vboxguest, vboxsf and vboxvideo
-EOF
-  _depmod
-}
-
-post_upgrade() {
-  _depmod
-}
-
-post_remove() {
-  _depmod
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules-lts/virtualbox-libre-host-modules-lts.install b/libre/virtualbox-libre-modules-lts/virtualbox-libre-host-modules-lts.install
deleted file mode 100644
index 97212dba1..000000000
--- a/libre/virtualbox-libre-modules-lts/virtualbox-libre-host-modules-lts.install
+++ /dev/null
@@ -1,23 +0,0 @@
-_depmod() {
-  EXTRAMODULES='extramodules-3.0-LIBRE-LTS'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-  cat << EOF
-===> You must load vboxdrv module before starting VirtualBox:
-===> # modprobe vboxdrv
-EOF
-  _depmod
-}
-
-post_upgrade() {
-  _depmod
-  echo 'In order to use the new version, reload all virtualbox modules manually.'
-}
-
-post_remove() {
-  _depmod
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
deleted file mode 100644
index cc0d6741d..000000000
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Id: PKGBUILD 94381 2013-07-22 13:58:51Z tpowa $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Maintainer: Sébastien Luttringer
-# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgbase=virtualbox-libre-modules
-pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
-pkgver=4.2.16
-pkgrel=3
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL')
-makedepends=('linux-libre>=3.10' 'linux-libre<3.11'
-             'linux-libre-headers>=3.10' 'linux-libre-headers<3.11'
-             "virtualbox-libre-host-dkms>=$pkgver"
-             "virtualbox-libre-guest-dkms>=$pkgver"
-             'expac'
-             'sed'
-             'bc')
-
-# remember to also adjust the .install files and the package deps below
-_extramodules=extramodules-3.10-LIBRE
-
-build() {
-  _kernmaj=$(expac -Q '%v' linux-libre|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE/version)
-  # dkms need modification to be run as user
-  cp -r /var/lib/dkms .
-  echo "dkms_tree='$srcdir/dkms'" > dkms.conf
-  # build host modules
-  msg2 'Host modules'
-  dkms --dkmsframework dkms.conf build "vboxhost/$pkgver" -k "$_kernver"
-  # build guest modules
-  msg2 'Guest modules'
-  dkms --dkmsframework dkms.conf build "vboxguest/$pkgver" -k "$_kernver"
-}
-
-package_virtualbox-libre-host-modules(){
-  _kernmaj=$(expac -Q '%v' linux-libre|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE/version)
-  pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)'
-  #depends=("linux-libre>=$_kernmaj" "linux-libre<$(echo "$_kernmaj+0.1"|bc)")
-  depends=('linux-libre>=3.10' 'linux-libre<3.11')
-  provides=("virtualbox-host-modules=${pkgver}")
-  replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
-  conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
-  install=virtualbox-libre-host-modules.install
-
-  cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE/"
-  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE/"
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-libre-host-modules.install"
-}
-
-package_virtualbox-libre-guest-modules(){
-  _kernmaj=$(expac -Q '%v' linux-libre|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE/version)
-  pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)'
-  license=('GPL')
-  #depends=("linux-libre>=$_kernmaj" "linux-libre<$(echo "$_kernmaj+0.1"|bc)")
-  depends=('linux-libre>=3.10' 'linux-libre<3.11')
-  provides=("virtualbox-guest-modules=${pkgver}")
-  replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
-  conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
-  install=virtualbox-libre-guest-modules.install
-
-  cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE/"
-  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE/"
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-libre-guest-modules.install"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules/build.sh b/libre/virtualbox-libre-modules/build.sh
deleted file mode 100755
index 895bea0b1..000000000
--- a/libre/virtualbox-libre-modules/build.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if (( $# != 1 )); then
-  echo "usage: $0 extra"
-  echo "       $0 testing"
-  exit 1
-fi
-
-here=$PWD
-cd /var/empty
-linux32 makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
-cd "$here"
-linux32 makechrootpkg -n -r /var/lib/archbuild/$1-i686
-
-cd /var/empty
-makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
-cd "$here"
-makechrootpkg -n -r /var/lib/archbuild/$1-x86_64
-
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
deleted file mode 100755
index eb1707471..000000000
--- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
+++ /dev/null
@@ -1,21 +0,0 @@
-_depmod() {
-  EXTRAMODULES='extramodules-3.10-LIBRE'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-  cat << EOF
-===> You may want to load vboxguest, vboxsf and vboxvideo
-EOF
-  _depmod
-}
-
-post_upgrade() {
-  _depmod
-}
-
-post_remove() {
-  _depmod
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
deleted file mode 100755
index df643c9a6..000000000
--- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
+++ /dev/null
@@ -1,23 +0,0 @@
-_depmod() {
-  EXTRAMODULES='extramodules-3.10-LIBRE'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-  cat << EOF
-===> You must load vboxdrv module before starting VirtualBox:
-===> # modprobe vboxdrv
-EOF
-  _depmod
-}
-
-post_upgrade() {
-  _depmod
-  echo 'In order to use the new version, reload all virtualbox modules manually.'
-}
-
-post_remove() {
-  _depmod
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre/001-vboxdrv-reference.patch b/libre/virtualbox-libre/001-vboxdrv-reference.patch
deleted file mode 100644
index b75c3c565..000000000
--- a/libre/virtualbox-libre/001-vboxdrv-reference.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
---- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:22:13.636083176 +0000
-+++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:48:58.915541368 +0000
-@@ -75,10 +75,9 @@
-   "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
-   "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
-   "module by executing<br/><br/>"
--  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
--  "as root. If it is available in your distribution, you should install the "
--  "DKMS package first. This package keeps track of Linux kernel changes and "
--  "recompiles the vboxdrv kernel module if necessary."
-+  "  <font color=blue>'pacman -S virtualbox-libre-host-modules'</font><br/><br/>"
-+  "as root. If you don't use our stock kernel, install virtualbox-libre-host-source and "
-+  "execute dkms autoinstall ."
-   );
- 
- QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
-@@ -90,11 +89,8 @@
- 
- QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
-   "The VirtualBox kernel modules do not match this version of "
--  "VirtualBox. The installation of VirtualBox was apparently not "
--  "successful. Executing<br/><br/>"
--  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
--  "may correct this. Make sure that you do not mix the "
--  "OSE version and the PUEL version of VirtualBox."
-+  "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> "
-+  "  <font color=blue>'dkms autoinstall'</font><br/><br/>"
-   );
- 
- QString g_QStrHintOtherNoDriver = QApplication::tr(
-diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh
---- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:22:13.549415814 +0000
-+++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:56:50.735874087 +0000
-@@ -32,17 +32,18 @@
-     cat << EOF
- WARNING: The vboxdrv kernel module is not loaded. Either there is no module
-          available for the current kernel (`uname -r`) or it failed to
--         load. Please recompile the kernel module and install it by
-+         load. Please reinstall the kernel module virtualbox-libre-host-modules or
-+         if you don't use our stock kernel compile the modules with
- 
--           sudo /etc/init.d/vboxdrv setup
-+           sudo dkms autoinstall
- 
-          You will not be able to start VMs until this problem is fixed.
- EOF
- elif [ ! -c /dev/vboxdrv ]; then
-     cat << EOF
--WARNING: The character device /dev/vboxdrv does not exist. Try
-+WARNING: The character device /dev/vboxdrv does not exist. Try to load the module
- 
--           sudo /etc/init.d/vboxdrv restart
-+           sudo modprobe vboxdrv
- 
-          and if that is not successful, try to re-install the package.
- 
diff --git a/libre/virtualbox-libre/002-change_default_driver_dir.patch b/libre/virtualbox-libre/002-change_default_driver_dir.patch
deleted file mode 100755
index d8531499d..000000000
--- a/libre/virtualbox-libre/002-change_default_driver_dir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2011-07-19 15:11:37.903456612 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2011-07-19 15:12:41.024021274 +0000
-@@ -36,13 +36,8 @@
- //#define DEBUG_DRI_CALLS
- 
- //@todo this could be different...
--#ifdef RT_ARCH_AMD64
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
- # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--#else
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri"
--# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--#endif
- 
- #ifdef DEBUG_DRI_CALLS
-  #define SWDRI_SHOWNAME(pext, func) \
diff --git a/libre/virtualbox-libre/003-gcc-48.patch b/libre/virtualbox-libre/003-gcc-48.patch
deleted file mode 100644
index 3039ea2c6..000000000
--- a/libre/virtualbox-libre/003-gcc-48.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: configure
-===================================================================
---- a/configure	(revision 45449)
-+++ a/configure	(revision 45450)
-@@ -416,7 +416,7 @@
-       elif [ $cc_maj -lt 3 \
-              -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
-              -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
--             -o \( $cc_maj -eq 4 -a $cc_min -gt 7 \) \
-+             -o \( $cc_maj -eq 4 -a $cc_min -gt 8 \) \
-              -o $cc_maj -gt 4 ]; then
-         log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<8"
-         fail really
-Index: Config.kmk
-===================================================================
---- a/Config.kmk	(revision 45449)
-+++ a/Config.kmk	(revision 45450)
-@@ -1503,7 +1503,7 @@
- #
- # Compiler optimization flags.
- #
--VBOX_GCC_WARN     ?= -Wall $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) -Wno-unused -Wno-trigraphs $(VBOX_GCC_fdiagnostics-show-option)
-+VBOX_GCC_WARN     ?= -Wall $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) -Wno-unused -Wno-trigraphs $(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_no-unused-parameter)
- VBOX_GCC_WARN_PEDANTIC = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long
- ifdef VBOX_WITH_MASOCHISTIC_WARNINGS
-  VBOX_GCC_WARN_PEDANTIC += -Wunused-variable -Wunused-function -Wunused-label -Wunused-parameter
-@@ -2285,6 +2285,12 @@
- 	$(QUIET)$(APPEND) '$@' ' endif'
- 	$(QUIET)$(APPEND) '$@' 'endif'
- endif
-+# Prevent warnings about unused parameters as of gcc-4.8 as this warning is now very verbose
-+	$(QUIET)$(APPEND) '$@' 'ifneq ($$(VBOX_GCC_VERSION_CXX),)'
-+	$(QUIET)$(APPEND) '$@' ' ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CXX),40800),)'
-+	$(QUIET)$(APPEND) '$@' '  VBOX_GCC_no-unused-parameter ?= -Wno-unused-parameter'
-+	$(QUIET)$(APPEND) '$@' ' endif'
-+	$(QUIET)$(APPEND) '$@' 'endif'
- ifeq ($(KBUILD_TARGET),solaris)
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_msave-args            ?= $(call VBOX_GCC_CHECK_CXX,-msave-args,)'
- # Detect the solaris assembler. It is used by the the 4.x gcc compilers,
diff --git a/libre/virtualbox-libre/003-linux-3.8.patch b/libre/virtualbox-libre/003-linux-3.8.patch
deleted file mode 100644
index 0c6d9fbbf..000000000
--- a/libre/virtualbox-libre/003-linux-3.8.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c	(revision 43343)
-+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c	(revision 44317)
-@@ -196,7 +196,11 @@
- 
- 
- /** PCI hotplug structure. */
--static const struct pci_device_id __devinitdata g_VBoxGuestPciId[] =
-+static const struct pci_device_id
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-+__devinitdata
-+#endif
-+g_VBoxGuestPciId[] =
- {
-     {
-         vendor:     VMMDEV_VENDORID,
diff --git a/libre/virtualbox-libre/004-system-xorg.patch b/libre/virtualbox-libre/004-system-xorg.patch
deleted file mode 100644
index c527f7f20..000000000
--- a/libre/virtualbox-libre/004-system-xorg.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:55:28.774951223 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:58:06.337193736 +0000
-@@ -63,18 +63,12 @@
- VBoxOGL_INCS           = .
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
-  VBoxOGL_INCS     += \
--	$(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
--	$(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
--	$(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
--	$(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
--	$(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
--	$(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
--	$(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
--	$(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
--	$(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
--	$(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
-+	/usr/include/x11 \
-+	/usr/include/xorg \
-+	/usr/include/pixman-1 \
- 	$(VBOX_MESA_INCS) \
--	$(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
-+	/usr/include/drm \
-+	/usr/include/libdrm
-  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
- endif
- 
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2013-03-19 18:55:28.778284533 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
-@@ -40,8 +40,8 @@
- 	VBoxGuestR3LibShared
- ifndef VBOX_ONLY_TESTSUITE
-  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
--  LIBRARIES += \
--  	VBoxGuestR3LibXFree86
-+#  LIBRARIES += \
-+#  	VBoxGuestR3LibXFree86
-  endif
- endif
- LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk	2013-03-19 18:55:28.974949837 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
-@@ -17,6 +17,10 @@
- SUB_DEPTH = ../../../..
- include $(KBUILD_PATH)/subheader.kmk
- 
-+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110 111)
-+ XSERVER_VERSION := 17
-+endif
-+
- # Include sub-makefiles.
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
-  include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	2013-03-19 18:55:28.818284256 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
-@@ -29,7 +29,6 @@
- # vboxmouse_drv
- #
- if1of ($(KBUILD_TARGET), linux)
-- SYSMODS += vboxmouse_drv
-  vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
-  vboxmouse_drv_DEFS.linux = linux
-  vboxmouse_drv_DEFS.x86 += __i386__
-@@ -69,7 +68,6 @@
- #
- # vboxmouse_drv_70
- #
--DLLS += vboxmouse_drv_70
- vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_70_DEFS = \
- 	XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE DONT_DEFINE_WRAPPERS NO_ANSIC
-@@ -85,7 +83,6 @@
- #
- # vboxmouse_drv_71
- #
--DLLS += vboxmouse_drv_71
- vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_71_INCS := \
-@@ -100,7 +97,6 @@
- #
- # vboxmouse_drv_13
- #
--DLLS += vboxmouse_drv_13
- vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_13_INCS := \
-@@ -114,7 +110,6 @@
- #
- # vboxmouse_drv_14
- #
--DLLS += vboxmouse_drv_14
- vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_14_INCS := \
-@@ -128,7 +123,6 @@
- #
- # vboxmouse_drv_15
- #
--DLLS += vboxmouse_drv_15
- vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_15_INCS := \
-@@ -142,7 +136,6 @@
- #
- # vboxmouse_drv_16
- #
--DLLS += vboxmouse_drv_16
- vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_16_INCS := \
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2013-03-19 18:55:28.974949837 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
-@@ -53,7 +53,6 @@
- # vboxvideo_drv
- #
- if1of ($(KBUILD_TARGET), linux)
-- SYSMODS += vboxvideo_drv
- endif   # target linux
- vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
- vboxvideo_drv_DEFS.linux = linux
-@@ -128,7 +127,6 @@
- #         base keywords instead of using .solaris or .linux.
- #         Also it is *important* to use := and not = when deriving a property.
- #
--DLLS += vboxvideo_drv_70
- vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
- if1of ($(KBUILD_TARGET), linux)
-  vboxvideo_drv_70_CFLAGS += \
-@@ -149,7 +147,6 @@
- #
- # vboxvideo_drv_71
- #
--DLLS += vboxvideo_drv_71
- vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_71_DEFS := $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700100000
-@@ -164,7 +161,6 @@
- #
- # vboxvideo_drv_13
- #
--DLLS += vboxvideo_drv_13
- vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_13_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100300000
-@@ -178,7 +174,6 @@
- #
- # vboxvideo_drv_14
- #
--DLLS += vboxvideo_drv_14
- vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_14_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100400000
-@@ -192,7 +187,6 @@
- #
- # vboxvideo_drv_15
- #
--DLLS += vboxvideo_drv_15
- vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000
-@@ -213,7 +207,6 @@
- #
- # vboxvideo_drv_16
- #
--DLLS += vboxvideo_drv_16
- vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000
-@@ -227,7 +220,6 @@
- #
- # vboxvideo_drv_17
- #
--DLLS += vboxvideo_drv_17
- vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
-@@ -241,7 +233,6 @@
- #
- # vboxvideo_drv_18
- #
--DLLS += vboxvideo_drv_18
- vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100800000
-@@ -255,7 +246,6 @@
- #
- # vboxvideo_drv_19
- #
--DLLS += vboxvideo_drv_19
- vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100900000
-@@ -269,7 +259,6 @@
- #
- # vboxvideo_drv_110
- #
--DLLS += vboxvideo_drv_110
- vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
-@@ -283,7 +272,6 @@
- #
- # vboxvideo_drv_111
- #
--DLLS += vboxvideo_drv_111
- vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
-@@ -297,7 +285,6 @@
- #
- # vboxvideo_drv_112
- #
--DLLS += vboxvideo_drv_112
- vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
-@@ -341,6 +328,23 @@
- endif
- 
- 
-+vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
-+vboxvideo_drv_$(XSERVER_VERSION)_INCS := \
-+	/usr/include/xorg \
-+	/usr/include/x11 \
-+	/usr/include/pixman-1 \
-+	/usr/include/X11/dri \
-+	/usr/include/drm \
-+	/usr/include/libdrm
-+vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-+DLLS += vboxvideo_drv_$(XSERVER_VERSION)
-+
-+# required for lenny backports
-+ifeq ($(XSERVER_VERSION),14)
-+	vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg
-+endif
-+
-+
- # Check the undefined symbols in the X.Org modules against lists of allowed
- # symbols.  Not very elegant, but it will catch problems early.
- 
diff --git a/libre/virtualbox-libre/10-vboxdrv.rules b/libre/virtualbox-libre/10-vboxdrv.rules
deleted file mode 100644
index 37403ae2f..000000000
--- a/libre/virtualbox-libre/10-vboxdrv.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" ENV{ACL_MANAGE}="1"
-SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
diff --git a/libre/virtualbox-libre/60-vboxguest.rules b/libre/virtualbox-libre/60-vboxguest.rules
deleted file mode 100644
index 6285f7249..000000000
--- a/libre/virtualbox-libre/60-vboxguest.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600"
-ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"
diff --git a/libre/virtualbox-libre/LocalConfig.kmk b/libre/virtualbox-libre/LocalConfig.kmk
deleted file mode 100644
index 6eca06d9b..000000000
--- a/libre/virtualbox-libre/LocalConfig.kmk
+++ /dev/null
@@ -1,20 +0,0 @@
-VBOX_WITH_ADDITION_DRIVERS =
-VBOX_WITH_INSTALLER = 1
-VBOX_WITH_LINUX_ADDITIONS = 1
-VBOX_WITH_X11_ADDITIONS = 1
-VBOX_WITH_TESTCASES =
-VBOX_WITH_TESTSUITE =
-VBOX_WITH_ORIGIN :=
-VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
-VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
-VBOX_PATH_APP_DOCS := /usr/share/virtualbox
-VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS)
-VBOX_WITH_REGISTRATION_REQUEST =
-VBOX_WITH_UPDATE_REQUEST =
-VBOX_WITH_VNC := 1
-VBOX_BLD_PYTHON = python2
-VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
-VBOX_GCC_WERR =
-VBOX_GCC_WARN =
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
deleted file mode 100644
index b53a9f61e..000000000
--- a/libre/virtualbox-libre/PKGBUILD
+++ /dev/null
@@ -1,339 +0,0 @@
-# $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@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>
-# Contributor (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
-
-pkgbase=virtualbox-libre
-pkgname=('virtualbox-libre'
-         'virtualbox-libre-host-dkms'
-         'virtualbox-libre-guest-dkms'
-         'virtualbox-libre-sdk'
-         'virtualbox-libre-guest-utils')
-pkgver=4.2.16
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL' 'custom')
-makedepends=('alsa-lib'
-             'bin86'
-             'cdrkit'
-             'curl'
-             'dev86'
-             'device-mapper'
-             'glu'
-             'gsoap-legacy'
-             'iasl'
-             'jdk7-openjdk'
-             'libidl2'
-             'libpulse'
-             'libstdc++5'
-             'libxcomposite'
-             'libxcursor'
-             'libxinerama'
-             'libxml2'
-             'libxmu'
-             'libxrandr'
-             'libxslt'
-             'libxtst'
-             'linux-libre-headers'
-             'mesa'
-             'python2'
-             'qt4'
-             'sdl'
-             'sdl_ttf'
-             'vde2'
-             'xalan-c'
-             'xf86driproto'
-             'xorg-server-devel')
-[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
-source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2"
-        '10-vboxdrv.rules'
-        '60-vboxguest.rules'
-        'LocalConfig.kmk'
-        'vboxservice.service'
-        'vboxweb.service'
-        '001-vboxdrv-reference.patch'
-        '002-change_default_driver_dir.patch'
-        '004-system-xorg.patch'
-        'os_blag_64.png'
-        'os_blag.png'
-        'os_dragora_64.png'
-        'os_dragora.png'
-        'os_dynebolic.png'
-        'os_gnewsense_64.png'
-        'os_gnewsense.png'
-        'os_gnu_64.png'
-        'os_gnu.png'
-        'os_musix_64.png'
-        'os_musix.png' 
-        'os_parabola_64.png'
-        'os_parabola.png'
-        'os_trisquel_64.png'
-        'os_trisquel.png'
-        'os_ututo_64.png'
-        'os_ututo.png'
-        'os_venenux.png'
-        'libre.patch'
-        'free-distros.patch')
-md5sums=('c4a36e2099a317f4715cd3861cdae238'
-         '5f85710e0b8606de967716ded7b2d351'
-         'ed1341881437455d9735875ddf455fbe'
-         '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
-         '07c5f6d86c4b7839d719c8ee0c53653b'
-         'bc9efed88e0469cd7fc460d5a5cd7b4b'
-         'f4e4c7895ede9c524109589bf16ae660'
-         '97e193f050574dd272a38e5ee5ebe62b'
-         '4da461f8c90caa123b47c62479f426b4'
-         '8538dba8686d7449cb481c9bae9d722a'
-         '545c925b46f2ac95e5f8ae407fad101a'
-         'f6416f509c2e5460e4dc624e0a57f3c1'
-         'bbfb59dd517c020a23701b480187a355'
-         'efacfdb61918286ea9bc89866b8fd239'
-         '7c3eb09995e8bafeef414374e44ad4ce'
-         'a49ed3ab6bd0fb084de0ab3dd97ae93e'
-         '6b432b3305ed446125eef052c38355a6'
-         'a70022a468bd3e9daf01818d2d74ac3c'
-         '380eb2ab6cad3da198094585853c129c'
-         'a60bb9a98abcc3c34156f9051d00df9a'
-         '3a908ef6952bcf987e63ef2fe4e98d24'
-         '02e87c39c353634cecacf98f1707fa15'
-         '0cf41a41e7a415d404d5584e047fd450'
-         '449cde3b58390284b59c5d663de3edc9'
-         'c7951fe6888d939f3a7d0dafe477e82b'
-         '4da8eeb2ece7e475fc7a0d1003da26c6'
-         '5e4187af59726d71c5be48d0cd816c34'
-         '9e0b199059faa3f99def5b0ba6e74009'
-         '1e2274facace125e6c2c8fcd7966fca7')
-
-prepare() {
-    cd "VirtualBox-$pkgver"
-    # Apply patches
-    for _p in "$srcdir"/*.patch; do
-        [[ -e $_p ]] || continue
-        msg2 "Apply patch ${_p##*/}"
-        patch -Np1 -i "$_p"
-    done
-
- ## Removing Nonfree directories and Nonfree files
-    rm -rv "./include/VBox/ExtPack"
-    rm -rv "./src/VBox/ExtPacks"
-    rm -rv "./src/VBox/Main/src-helper-apps"
-    rm -rv "./src/VBox/Main/include/ExtPackManagerImpl.h"
-    rm -rv "./src/VBox/Main/include/ExtPackUtil.h"
-    rm -rv "./src/VBox/Main/src-all/ExtPackManagerImpl.cpp"
-    rm -rv "./src/VBox/Main/src-all/ExtPackUtil.cpp"
-
- ## Removing Oracle VM VirtualBox Extension Pack icons
-    rm -v "./src/VBox/Resources/darwin/virtualbox-vbox-extpack.icns"
-    rm -v "./src/VBox/Resources/other/virtualbox-vbox-extpack-"{16px,20px,24px,32px,40px,48px,64px,72px,80px,96px,128px,256px,512px}.png
-    rm -v "./src/VBox/Resources/win/OSE/virtualbox-vbox-extpack.ico"
-    rm -v "./src/VBox/Frontends/VirtualBox/images/extension_pack_"{16px,32px,disabled{_16px,_32px},install{_16px,_32px},install_disabled{_16px,_32px},uninstall{_16px,_32px},uninstall_disabled{_16px,_32px}}.png
-
- ## Adding distros icons
-    for i in {dynebolic,venenux,{gnu,parabola,gnewsense,blag,dragora,ututo,musix,trisquel}{,_64}}; do
-      cp -v "$srcdir/os_${i}.png" "./src/VBox/Frontends/VirtualBox/images"
-    done
-}
-
-build() {
-    cd "VirtualBox-$pkgver"
-    cp "$srcdir/LocalConfig.kmk" .
-    # fake makeself binary to compile without nofatal
-    ln -s /bin/echo makeself
-    export PATH="$CWD:$PATH"
-
-    ./configure --disable-docs \
-        --enable-webservice \
-        --enable-vde \
-        --disable-kmods
-    source ./env.sh
-    kmk all
-
-    # fix python2
-    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
-
-    # build rdesktop-vrdp (broken from LocalConfig.kmk)
-    pushd src/VBox/RDP/client
-    cp "$srcdir/LocalConfig.kmk" .
-    # fix keymap path FS#32548
-    sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk
-    kmk all
-    popd
-}
-
-package_virtualbox-libre() {
-    pkgdesc='Powerful x86 virtualization for enterprise as well as home use, with free distros presets (nonfree Extension Pack and Guest Additions ISO image support removed)'
-    depends=('curl'
-             'libpng'
-             'libxcursor'
-             'libxinerama'
-             'libxml2'
-             'libxmu'
-             'sdl'
-             'shared-mime-info'
-             'virtualbox-libre-host-modules')
-    optdepends=('qt4: VirtualBox GUI support'
-                'vde2: Virtual Distributed Ethernet support'
-                'virtualbox-libre-sdk: Developer kit'
-                'virtualbox-libre-host-dkms: Host kernel source modules for non-stock kernels'
-                'net-tools: Host-only or bridged networking support')
-    backup=('etc/vbox/vbox.cfg')
-    replaces=('virtualbox' 'virtualbox-ose')
-    conflicts=('virtualbox' 'virtualbox-ose')
-    provides=("virtualbox=$pkgver")
-    install=virtualbox-libre.install
-
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-    install -dm755 "$pkgdir"/usr/{bin,lib/virtualbox/components,share/virtualbox/nls,share/virtualbox/rdesktop-vrdp-keymaps}
-
-    #Binaries and Wrapper with Launchers
-    install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox"
-
-    for i in VBoxHeadless VBoxManage VBoxSDL VirtualBox vboxwebsrv VBoxBalloonCtrl; do
-        ln -sf VBox "$pkgdir/usr/bin/$i"
-        ln -sf VBox "$pkgdir/usr/bin/${i,,}"
-    done
-    install -m 0755 VBoxTunctl "$pkgdir/usr/bin"
-    install -m 0755 rdesktop-vrdp "$pkgdir/usr/bin"
-
-    #components
-    install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
-
-    #lib
-    install -m 0755 *.so "$pkgdir/usr/lib/virtualbox"
-    install -m 0644 *.gc *.r0  VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
-
-    #setuid root binaries
-    install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox"
-    #other binaries
-    install -m 0755 VBoxManage VBoxSVC VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
-
-    #language
-    install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
-
-    #rdesktop keymaps
-    install -m 0644 rdesktop-vrdp-keymaps/* "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
-
-    #useless scripts
-    install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox"
-
-    #icons
-    install -D -m 0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png"
-
-    pushd icons
-    for i in *; do
-        install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
-        cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
-    done
-    popd
-
-    #desktop
-    install -D -m 0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop"
-    install -D -m 0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml"
-
-    #install configuration
-    mkdir -p "$pkgdir/etc/vbox"
-    echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg"
-
-    #udev and licence
-    install -D -m 0644 "$srcdir/VirtualBox-${pkgver}/COPYING" \
-        "$pkgdir/usr/share/licenses/virtualbox/LICENSE"
-    install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
-        "$pkgdir/usr/lib/udev/rules.d/10-vboxdrv.rules"
-
-    # install systemd service
-    install -D -m644 "$srcdir/vboxweb.service" \
-        "$pkgdir/usr/lib/systemd/system/vboxweb.service"
-}
-
-package_virtualbox-libre-sdk() {
-    pkgdesc='VirtualBox Software Developer Kit (SDK)'
-    depends=('python2')
-    replaces=('virtualbox-sdk')
-    conflicts=('virtualbox-sdk')
-    provides=("virtualbox-sdk=$pkgver")
-
-    install -dm755 "$pkgdir/usr/lib/virtualbox"
-
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-
-    install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
-    #python sdk
-    pushd sdk/installer
-    VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "$pkgdir"
-    popd
-    rm -rf sdk/installer
-    mv sdk "$pkgdir/usr/lib/virtualbox"
-}
-
-package_virtualbox-libre-host-dkms() {
-    pkgdesc='VirtualBox Host kernel modules sources'
-    depends=('dkms' 'gcc' 'make')
-    provides=("virtualbox-host-dkms=$pkgver" 'virtualbox-libre-host-modules')
-    replaces=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source')
-    conflicts=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source')
-    optdepends=('linux-libre-headers'
-                'linux-libre-lts-headers')
-    install=virtualbox-libre-host-dkms.install
-
-    install -dm755 "$pkgdir/usr/src"
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-    cp -r src "$pkgdir/usr/src/vboxhost-$pkgver"
-}
-
-package_virtualbox-libre-guest-dkms() {
-    pkgdesc='VirtualBox Guest kernel modules sources'
-    depends=('dkms' 'gcc' 'make')
-    provides=("virtualbox-guest-dkms=$pkgver" 'virtualbox-libre-guest-modules')
-    replaces=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source' 'virtualbox-guest-source' 'virtualbox-libre-guest-source')
-    conflicts=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source'  'virtualbox-guest-source' 'virtualbox-libre-guest-source')
-    optdepends=('linux-libre-headers'
-                'linux-libre-lts-headers')
-    install=virtualbox-libre-guest-dkms.install
-
-    install -dm755 "$pkgdir/usr/src"
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
-    cp -r src "$pkgdir/usr/src/vboxguest-$pkgver"
-}
-
-package_virtualbox-libre-guest-utils(){
-    pkgdesc='VirtualBox Guest userspace utilities'
-    depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
-    optdepends=('virtualbox-libre-guest-dkms: Guest kernel source modules for non-stock kernels')
-    provides=("virtualbox-guest-utils=$pkgver")
-    replaces=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
-    conflicts=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
-    install=virtualbox-libre-guest-utils.install
-
-    source "VirtualBox-$pkgver/env.sh"
-    pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
-    install -d "$pkgdir/usr/bin"
-    install -m755 VBoxClient VBoxControl VBoxService mount.vboxsf "$pkgdir/usr/bin"
-    install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
-        "$pkgdir"/usr/bin/VBoxClient-all
-    install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \
-        "$pkgdir"/etc/xdg/autostart/vboxclient.desktop
-    install -D vboxvideo_drv.so \
-        "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so"
-    install -d "$pkgdir/usr/lib/xorg/modules/dri"
-    install -m755 VBoxOGL*.so "$pkgdir/usr/lib"
-    ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so"
-    install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
-    popd
-    # install udev rules
-    install -D -m 0644 60-vboxguest.rules \
-        "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
-    # install systemd service file
-    install -D -m644 vboxservice.service \
-        "$pkgdir/usr/lib/systemd/system/vboxservice.service"
-}
-
-# vim:set ts=4 sw=4 et:
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
deleted file mode 100644
index 025a2b9f4..000000000
--- a/libre/virtualbox-libre/free-distros.patch
+++ /dev/null
@@ -1,1803 +0,0 @@
-diff --git a/src/VBox/Main/src-all/Global.cpp b/src/VBox/Main/src-all/Global.cpp
-index 2cd5a81..f234d58 100644
---- a/src/VBox/Main/src-all/Global.cpp
-+++ b/src/VBox/Main/src-all/Global.cpp
-@@ -33,293 +33,369 @@ const Global::OSType Global::sOSTypes[] =
-       VBOXOSTYPE_Unknown,         VBOXOSHINT_NONE,
-         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-       StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
--    { "Windows", "Microsoft Windows", "Windows31",          "Windows 3.1",
--      VBOXOSTYPE_Win31,           VBOXOSHINT_FLOPPY,
--        32,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "Windows", "Microsoft Windows", "Windows95",          "Windows 95",
--      VBOXOSTYPE_Win95,           VBOXOSHINT_FLOPPY,
--        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "Windows", "Microsoft Windows", "Windows98",          "Windows 98",
--      VBOXOSTYPE_Win98,           VBOXOSHINT_FLOPPY,
--        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "Windows", "Microsoft Windows", "WindowsMe",          "Windows ME",
--      VBOXOSTYPE_WinMe,           VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET,
--        128,  4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Windows", "Microsoft Windows", "WindowsNT4",         "Windows NT 4",
--      VBOXOSTYPE_WinNT4,          VBOXOSHINT_NONE,
--       128,  16,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "Windows", "Microsoft Windows", "Windows2000",        "Windows 2000",
--      VBOXOSTYPE_Win2k,            VBOXOSHINT_USBTABLET,
--       168,  16,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Windows", "Microsoft Windows", "WindowsXP",          "Windows XP",
--      VBOXOSTYPE_WinXP,            VBOXOSHINT_USBTABLET,
--       192,  16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Windows", "Microsoft Windows", "WindowsXP_64",       "Windows XP (64 bit)",
--      VBOXOSTYPE_WinXP_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       192,  16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Windows", "Microsoft Windows", "Windows2003",        "Windows 2003",
--      VBOXOSTYPE_Win2k3,           VBOXOSHINT_USBTABLET,
--       256,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Windows", "Microsoft Windows", "Windows2003_64",     "Windows 2003 (64 bit)",
--      VBOXOSTYPE_Win2k3_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       256,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "WindowsVista",       "Windows Vista",
--      VBOXOSTYPE_WinVista,         VBOXOSHINT_USBTABLET,
--       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "WindowsVista_64",    "Windows Vista (64 bit)",
--      VBOXOSTYPE_WinVista_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows2008",        "Windows 2008",
--      VBOXOSTYPE_Win2k8,           VBOXOSHINT_USBTABLET,
--       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows2008_64",     "Windows 2008 (64 bit)",
--      VBOXOSTYPE_Win2k8_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows7",           "Windows 7",
--      VBOXOSTYPE_Win7,             VBOXOSHINT_USBTABLET,
--       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows7_64",        "Windows 7 (64 bit)",
--      VBOXOSTYPE_Win7_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows8",           "Windows 8",
--      VBOXOSTYPE_Win8,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
--       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows8_64",        "Windows 8 (64 bit)",
--      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows81",          "Windows 8.1",
--      VBOXOSTYPE_Win8,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
--       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows81_64",       "Windows 8.1 (64 bit)",
--      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows2012_64",     "Windows 2012 (64 bit)",
--      VBOXOSTYPE_Win2k12_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "WindowsNT",          "Other Windows",
--      VBOXOSTYPE_WinNT,           VBOXOSHINT_NONE,
--       512,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux22",            "Linux 2.2",
-+    { "GNU",       "GNU",             "GNU",                "GNU",
-+      VBOXOSTYPE_GNU,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "GNU",       "GNU",             "GNU_64",             "GNU (64 bit)",
-+      VBOXOSTYPE_GNU_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "GNU-Hurd",  "GNU-Hurd",        "GNUHurd",            "GNU-Hurd",
-+      VBOXOSTYPE_GNUHurd,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "GNU/Linux",   "GNU/Linux",             "Linux22",            "GNU/Linux with kernel v2.2",
-       VBOXOSTYPE_Linux22,         VBOXOSHINT_RTCUTC,
-         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux24",            "Linux 2.4",
-+    { "GNU/Linux",   "GNU/Linux",             "Linux24",            "GNU/Linux with kernel v2.4",
-       VBOXOSTYPE_Linux24,         VBOXOSHINT_RTCUTC,
-        128,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux24_64",         "Linux 2.4 (64 bit)",
-+    { "GNU/Linux",   "GNU/Linux",             "Linux24_64",         "GNU/Linux with kernel v2.4 (64 bit)",
-       VBOXOSTYPE_Linux24_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
-        128,   4,  4 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux26",            "Linux 2.6",
-+    { "GNU/Linux",   "GNU/Linux",             "Linux26",            "GNU/Linux with kernel v2.6",
-       VBOXOSTYPE_Linux26,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux26_64",         "Linux 2.6 (64 bit)",
-+    { "GNU/Linux",   "GNU/Linux",             "Linux26_64",         "GNU/Linux with kernel v2.6 (64 bit)",
-       VBOXOSTYPE_Linux26_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "ArchLinux",          "Arch Linux",
-+    { "GNU/Linux",   "GNU/Linux",             "Linux",              "Other GNU/Linux",
-+      VBOXOSTYPE_Linux,           VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Parabola",           "Parabola GNU/Linux-libre",
-+      VBOXOSTYPE_Parabola,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Parabola_64",        "Parabola GNU/Linux-libre (64 bit)",
-+      VBOXOSTYPE_Parabola_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "gNewSense",          "gNewSense",
-+      VBOXOSTYPE_gNewSense,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "gNewSense_64",       "gNewSense (64 bit)",
-+      VBOXOSTYPE_gNewSense_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
-+    { "Free Distros", "Free GNU/Linux Distros",       "Blag",               "Blag Linux and GNU",
-+      VBOXOSTYPE_Blag,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Blag_64",            "Blag Linux and GNU (64 bit)",
-+      VBOXOSTYPE_Blag_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Dragora",            "Dragora",
-+      VBOXOSTYPE_Dragora,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Dragora_64",         "Dragora (64 bit)",
-+      VBOXOSTYPE_Dragora_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Ututo",              "Ututo XS",
-+      VBOXOSTYPE_Ututo,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Ututo_64",           "Ututo XS (64 bit)",
-+      VBOXOSTYPE_Ututo_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Musix",              "Musix",
-+      VBOXOSTYPE_Musix,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Musix_64",           "Musix (64 bit)",
-+      VBOXOSTYPE_Musix_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
-+    { "Free Distros", "Free GNU/Linux Distros",       "Trisquel",           "Trisquel",
-+      VBOXOSTYPE_Trisquel,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
-+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Trisquel_64",        "Trisquel (64 bit)",
-+      VBOXOSTYPE_Trisquel_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Dynebolic",          "Dyne:bolic",
-+      VBOXOSTYPE_Dynebolic,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "ArchLinux",          "Arch Linux",
-       VBOXOSTYPE_ArchLinux,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "ArchLinux_64",       "Arch Linux (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "ArchLinux_64",       "Arch Linux (64 bit)",
-       VBOXOSTYPE_ArchLinux_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Debian",             "Debian",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Debian",             "Debian",
-       VBOXOSTYPE_Debian,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Debian_64",          "Debian (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Debian_64",          "Debian (64 bit)",
-       VBOXOSTYPE_Debian_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
--    { "Linux",   "Linux",             "OpenSUSE",           "openSUSE",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "OpenSUSE",           "openSUSE",
-       VBOXOSTYPE_OpenSUSE,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "OpenSUSE_64",        "openSUSE (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "OpenSUSE_64",        "openSUSE (64 bit)",
-       VBOXOSTYPE_OpenSUSE_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Fedora",             "Fedora",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Fedora",             "Fedora",
-       VBOXOSTYPE_FedoraCore,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Fedora_64",          "Fedora (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Fedora_64",          "Fedora (64 bit)",
-       VBOXOSTYPE_FedoraCore_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Gentoo",             "Gentoo",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Gentoo",             "Gentoo",
-       VBOXOSTYPE_Gentoo,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Gentoo_64",          "Gentoo (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Gentoo_64",          "Gentoo (64 bit)",
-       VBOXOSTYPE_Gentoo_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Mandriva",           "Mandriva",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Mandriva",           "Mandriva",
-       VBOXOSTYPE_Mandriva,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Mandriva_64",        "Mandriva (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Mandriva_64",        "Mandriva (64 bit)",
-       VBOXOSTYPE_Mandriva_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "RedHat",             "Red Hat",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "RedHat",             "Red Hat",
-       VBOXOSTYPE_RedHat,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "RedHat_64",          "Red Hat (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "RedHat_64",          "Red Hat (64 bit)",
-       VBOXOSTYPE_RedHat_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Turbolinux",         "Turbolinux",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Turbolinux",         "Turbolinux",
-       VBOXOSTYPE_Turbolinux,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Turbolinux_64",      "Turbolinux (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Turbolinux_64",      "Turbolinux (64 bit)",
-       VBOXOSTYPE_Turbolinux_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Ubuntu",             "Ubuntu",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Ubuntu",             "Ubuntu",
-       VBOXOSTYPE_Ubuntu,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Ubuntu_64",          "Ubuntu (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Ubuntu_64",          "Ubuntu (64 bit)",
-       VBOXOSTYPE_Ubuntu_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Xandros",            "Xandros",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Xandros",            "Xandros",
-       VBOXOSTYPE_Xandros,         VBOXOSHINT_RTCUTC,
-        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Xandros_64",         "Xandros (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Xandros_64",         "Xandros (64 bit)",
-       VBOXOSTYPE_Xandros_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
-        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Oracle",             "Oracle",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Oracle",             "Oracle",
-       VBOXOSTYPE_Oracle,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
-        512,  12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Oracle_64",          "Oracle (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Oracle_64",          "Oracle (64 bit)",
-       VBOXOSTYPE_Oracle_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
-        512,  12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux",              "Other Linux",
--      VBOXOSTYPE_Linux,           VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
--       256,  12,  8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",       "Venenux",            "Venenux",
-+      VBOXOSTYPE_Venenux,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows31",          "Windows 3.1",
-+      VBOXOSTYPE_Win31,           VBOXOSHINT_FLOPPY,
-+        32,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows95",          "Windows 95",
-+      VBOXOSTYPE_Win95,           VBOXOSHINT_FLOPPY,
-+        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows98",          "Windows 98",
-+      VBOXOSTYPE_Win98,           VBOXOSHINT_FLOPPY,
-+        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsMe",          "Windows ME",
-+      VBOXOSTYPE_WinMe,           VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET,
-+        128,  4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsNT4",         "Windows NT 4",
-+      VBOXOSTYPE_WinNT4,          VBOXOSHINT_NONE,
-+       128,  16,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2000",        "Windows 2000",
-+      VBOXOSTYPE_Win2k,            VBOXOSHINT_USBTABLET,
-+       168,  16,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsXP",          "Windows XP",
-+      VBOXOSTYPE_WinXP,            VBOXOSHINT_USBTABLET,
-+       192,  16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsXP_64",       "Windows XP (64 bit)",
-+      VBOXOSTYPE_WinXP_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       192,  16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2003",        "Windows 2003",
-+      VBOXOSTYPE_Win2k3,           VBOXOSHINT_USBTABLET,
-+       256,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2003_64",     "Windows 2003 (64 bit)",
-+      VBOXOSTYPE_Win2k3_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       256,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsVista",       "Windows Vista",
-+      VBOXOSTYPE_WinVista,         VBOXOSHINT_USBTABLET,
-+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsVista_64",    "Windows Vista (64 bit)",
-+      VBOXOSTYPE_WinVista_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2008",        "Windows 2008",
-+      VBOXOSTYPE_Win2k8,           VBOXOSHINT_USBTABLET,
-+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2008_64",     "Windows 2008 (64 bit)",
-+      VBOXOSTYPE_Win2k8_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows7",           "Windows 7",
-+      VBOXOSTYPE_Win7,             VBOXOSHINT_USBTABLET,
-+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows7_64",        "Windows 7 (64 bit)",
-+      VBOXOSTYPE_Win7_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows8",           "Windows 8",
-+      VBOXOSTYPE_Win8,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
-+       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows8_64",        "Windows 8 (64 bit)",
-+      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows81",          "Windows 8.1",
-+      VBOXOSTYPE_Win8,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
-+       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows81_64",       "Windows 8.1 (64 bit)",
-+      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2012_64",     "Windows 2012 (64 bit)",
-+      VBOXOSTYPE_Win2k12_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsNT",          "Other Windows",
-+      VBOXOSTYPE_WinNT,           VBOXOSHINT_NONE,
-+       512,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Solaris", "Solaris",           "Solaris",            "Oracle Solaris 10 5/09 and earlier",
-+    { "Non-free OSs", "Non-free Operating Systems",           "Solaris",            "Oracle Solaris 10 5/09 and earlier",
-       VBOXOSTYPE_Solaris,         VBOXOSHINT_NONE,
-        768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Solaris", "Solaris",           "Solaris_64",         "Oracle Solaris 10 5/09 and earlier (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",           "Solaris_64",         "Oracle Solaris 10 5/09 and earlier (64 bit)",
-       VBOXOSTYPE_Solaris_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-       1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Solaris", "Solaris",           "OpenSolaris",        "Oracle Solaris 10 10/09 and later",
-+    { "Non-free OSs", "Non-free Operating Systems",           "OpenSolaris",        "Oracle Solaris 10 10/09 and later",
-       VBOXOSTYPE_OpenSolaris,     VBOXOSHINT_USBTABLET,
-        768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Solaris", "Solaris",           "OpenSolaris_64",     "Oracle Solaris 10 10/09 and later (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",           "OpenSolaris_64",     "Oracle Solaris 10 10/09 and later (64 bit)",
-       VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-       1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Solaris", "Solaris",           "Solaris11_64",       "Oracle Solaris 11 (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",           "Solaris11_64",       "Oracle Solaris 11 (64 bit)",
-       VBOXOSTYPE_Solaris11_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-       1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "BSD",     "BSD",               "FreeBSD",            "FreeBSD",
-+    { "Non-free OSs", "Non-free Operating Systems",               "FreeBSD",            "FreeBSD",
-       VBOXOSTYPE_FreeBSD,         VBOXOSHINT_NONE,
-        128,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "BSD",     "BSD",               "FreeBSD_64",         "FreeBSD (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",               "FreeBSD_64",         "FreeBSD (64 bit)",
-       VBOXOSTYPE_FreeBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-        128,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "BSD",     "BSD",               "OpenBSD",            "OpenBSD",
-+    { "Non-free OSs", "Non-free Operating Systems",               "OpenBSD",            "OpenBSD",
-       VBOXOSTYPE_OpenBSD,         VBOXOSHINT_HWVIRTEX,
-         64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "BSD",     "BSD",               "OpenBSD_64",         "OpenBSD (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",               "OpenBSD_64",         "OpenBSD (64 bit)",
-       VBOXOSTYPE_OpenBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-         64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "BSD",     "BSD",               "NetBSD",             "NetBSD",
-+    { "Non-free OSs", "Non-free Operating Systems",               "NetBSD",             "NetBSD",
-       VBOXOSTYPE_NetBSD,          VBOXOSHINT_NONE,
-         64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "BSD",     "BSD",               "NetBSD_64",          "NetBSD (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",               "NetBSD_64",          "NetBSD (64 bit)",
-       VBOXOSTYPE_NetBSD_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-         64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "OS2",     "IBM OS/2",          "OS2Warp3",           "OS/2 Warp 3",
-+    { "Non-free OSs", "Non-free Operating Systems",          "OS2Warp3",           "OS/2 Warp 3",
-       VBOXOSTYPE_OS2Warp3,        VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
-         48,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "OS2",     "IBM OS/2",          "OS2Warp4",           "OS/2 Warp 4",
-+    { "Non-free OSs", "Non-free Operating Systems",          "OS2Warp4",           "OS/2 Warp 4",
-       VBOXOSTYPE_OS2Warp4,        VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
-         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "OS2",     "IBM OS/2",          "OS2Warp45",          "OS/2 Warp 4.5",
-+    { "Non-free OSs", "Non-free Operating Systems",          "OS2Warp45",          "OS/2 Warp 4.5",
-       VBOXOSTYPE_OS2Warp45,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
-         128,  4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "OS2",     "IBM OS/2",          "OS2eCS",             "eComStation",
-+    { "Non-free OSs", "Non-free Operating Systems",          "OS2eCS",             "eComStation",
-       VBOXOSTYPE_ECS,             VBOXOSHINT_HWVIRTEX,
-         256,  4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "OS2",     "IBM OS/2",          "OS2",                "Other OS/2",
-+    { "Non-free OSs", "Non-free Operating Systems",          "OS2",                "Other OS/2",
-       VBOXOSTYPE_OS2,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
-         96,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "MacOS",   "Mac OS X",          "MacOS",              "Mac OS X",
-+    { "Non-free OSs", "Non-free Operating Systems",          "MacOS",              "Mac OS X",
-       VBOXOSTYPE_MacOS,           VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
-       2048,   4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
-        StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
-       ChipsetType_ICH9, AudioControllerType_HDA  },
--    { "MacOS",   "Mac OS X",          "MacOS_64",           "Mac OS X (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",          "MacOS_64",           "Mac OS X (64 bit)",
-       VBOXOSTYPE_MacOS_x64,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE |  VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
-       2048,   4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
-       StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
-       ChipsetType_ICH9, AudioControllerType_HDA  },
--    { "Other",   "Other",             "DOS",                "DOS",
-+    { "Non-free OSs", "Non-free Operating Systems",             "DOS",                "DOS",
-       VBOXOSTYPE_DOS,             VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
-         32,   4,  500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "Other",   "Other",             "Netware",            "Netware",
-+    { "Non-free OSs", "Non-free Operating Systems",             "Netware",            "Netware",
-       VBOXOSTYPE_Netware,         VBOXOSHINT_HWVIRTEX,
-        512,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Other",   "Other",             "L4",                 "L4",
-+    { "Non-free OSs", "Non-free Operating Systems",             "L4",                 "L4",
-       VBOXOSTYPE_L4,              VBOXOSHINT_NONE,
-         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Other",   "Other",             "QNX",                "QNX",
-+    { "Non-free OSs", "Non-free Operating Systems",             "QNX",                "QNX",
- #ifdef VBOX_WITH_RAW_RING1
-       VBOXOSTYPE_QNX,             VBOXOSHINT_NONE,
- #else
-@@ -327,7 +403,7 @@ const Global::OSType Global::sOSTypes[] =
- #endif
-        512,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-       StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Other",   "Other",             "JRockitVE",          "JRockitVE",
-+    { "Non-free OSs", "Non-free Operating Systems",             "JRockitVE",          "JRockitVE",
-         VBOXOSTYPE_JRockitVE,     VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE,
-         1024, 4,  8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97  },
-diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-index bd5bd86..c7a8c87 100644
---- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-@@ -44,10 +44,80 @@ struct osTypePattern
- 
- static const osTypePattern gs_OSTypePattern[] =
- {
--    /* DOS: */
--    { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
-+    /* Code names for free GNU/Linux distributions */
-+    { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" },
-+    { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" },
-+    { QRegExp("((metad)|(parkes)|(three)).*64", Qt::CaseInsensitive), "gNewSense_64" },
-+    { QRegExp("(deltah)|(metad)|(parkes)|(three)", Qt::CaseInsensitive), "gNewSense" },
-+    { QRegExp("((90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)).*64", Qt::CaseInsensitive), "Blag_64" },
-+    { QRegExp("(90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)", Qt::CaseInsensitive), "Blag" },
-+
-+    /* Regular names of free GNU/Linux distributions */
-+    { QRegExp("Pa.*64", Qt::CaseInsensitive), "Parabola_64" },
-+    { QRegExp("Pa", Qt::CaseInsensitive), "Parabola" },
-+    { QRegExp("((gNe)|(new)|(Sen)).*64", Qt::CaseInsensitive), "gNewSense_64" },
-+    { QRegExp("(gNe)|(new)|(Sen)", Qt::CaseInsensitive), "gNewSense" },
-+    { QRegExp("Bla.*64", Qt::CaseInsensitive), "Blag_64" },
-+    { QRegExp("Bla", Qt::CaseInsensitive), "Blag" },
-+    { QRegExp("Dra.*64", Qt::CaseInsensitive), "Dragora_64" },
-+    { QRegExp("Dra", Qt::CaseInsensitive), "Dragora" },
-+    { QRegExp("((Utu)|(XS)).*64", Qt::CaseInsensitive), "Ututo_64" },
-+    { QRegExp("(Utu)|(XS)", Qt::CaseInsensitive), "Ututo" },
-+    { QRegExp("Mus.*64", Qt::CaseInsensitive), "Musix_64" },
-+    { QRegExp("Mus", Qt::CaseInsensitive), "Musix" },
-+    { QRegExp("Tri.*64", Qt::CaseInsensitive), "Trisquel_64" },
-+    { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" },
-+    { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" },
-+
-+    /* Code names for non-free GNU/Linux distributions: */
-+    { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
-+    { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)", Qt::CaseInsensitive), "Ubuntu" },
-+    { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
-+    { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)", Qt::CaseInsensitive), "Debian" },
-+    { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", Qt::CaseInsensitive), "Fedora_64" },
-+    { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)", Qt::CaseInsensitive), "Fedora" },
- 
--    /* Windows: */
-+    /* Regular names of non-free GNU/Linux distributions: */
-+    { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
-+    { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
-+    { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
-+    { QRegExp("Deb", Qt::CaseInsensitive), "Debian" },
-+    { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "OpenSUSE_64" },
-+    { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "OpenSUSE" },
-+    { QRegExp("Fe.*64", Qt::CaseInsensitive), "Fedora_64" },
-+    { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
-+    { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
-+    { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
-+    { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" },
-+    { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" },
-+    { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
-+    { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" },
-+    { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
-+    { QRegExp("Tur", Qt::CaseInsensitive), "Turbolinux" },
-+    { QRegExp("Ub.*64", Qt::CaseInsensitive), "Ubuntu_64" },
-+    { QRegExp("Ub", Qt::CaseInsensitive), "Ubuntu" },
-+    { QRegExp("Xa.*64", Qt::CaseInsensitive), "Xandros_64" },
-+    { QRegExp("Xa", Qt::CaseInsensitive), "Xandros" },
-+    { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "Oracle_64" },
-+    { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
-+    { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
-+    { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
-+    { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
-+
-+    /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */
-+    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
-+    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
-+    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
-+    { QRegExp("((((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
-+    { QRegExp("(((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
-+    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
-+    { QRegExp("(GNU[/|!-]{,1}Li)|(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
-+    { QRegExp("(GNU-Hu)|(GNU[/|!-]{,1}Hu)|(Hu)", Qt::CaseInsensitive), "GNUHurd" },
-+    { QRegExp("GNU.*64", Qt::CaseInsensitive), "GNU_64" },
-+    { QRegExp("GNU", Qt::CaseInsensitive), "GNU" },
-+
-+    /* Regular names of non-free operating systems: */
-+    { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
-     { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },
-     { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" },
-     { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" },
-@@ -70,63 +140,16 @@ static const osTypePattern gs_OSTypePattern[] =
-     { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" },
-     { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" },
-     { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
--
--    /* Solaris: */
-     { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" },
-     { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" },
-     { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" },
-     { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" },
-     { QRegExp("So", Qt::CaseInsensitive), "Solaris" },
--
--    /* OS/2: */
-     { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
-     { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
-     { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
-     { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
-     { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
--
--    /* Code names for Linux distributions: */
--    { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
--    { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)", Qt::CaseInsensitive), "Ubuntu" },
--    { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
--    { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)", Qt::CaseInsensitive), "Debian" },
--    { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", Qt::CaseInsensitive), "Fedora_64" },
--    { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)", Qt::CaseInsensitive), "Fedora" },
--
--    /* Regular names of Linux distributions: */
--    { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
--    { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
--    { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
--    { QRegExp("Deb", Qt::CaseInsensitive), "Debian" },
--    { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "OpenSUSE_64" },
--    { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "OpenSUSE" },
--    { QRegExp("Fe.*64", Qt::CaseInsensitive), "Fedora_64" },
--    { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
--    { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
--    { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
--    { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" },
--    { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" },
--    { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
--    { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" },
--    { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
--    { QRegExp("Tur", Qt::CaseInsensitive), "Turbolinux" },
--    { QRegExp("Ub.*64", Qt::CaseInsensitive), "Ubuntu_64" },
--    { QRegExp("Ub", Qt::CaseInsensitive), "Ubuntu" },
--    { QRegExp("Xa.*64", Qt::CaseInsensitive), "Xandros_64" },
--    { QRegExp("Xa", Qt::CaseInsensitive), "Xandros" },
--    { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "Oracle_64" },
--    { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
--    { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
--    { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
--    { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
--    { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
--    { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
--    { QRegExp("((((Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
--    { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
--    { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
--    { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
--
--    /* Other: */
-     { QRegExp("L4", Qt::CaseInsensitive), "L4" },
-     { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" },
-     { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" },
-@@ -139,6 +162,8 @@ static const osTypePattern gs_OSTypePattern[] =
-     { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" },
-     { QRegExp("Net", Qt::CaseInsensitive), "Netware" },
-     { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
-+
-+    /* Other: */
-     { QRegExp("Ot", Qt::CaseInsensitive), "Other" },
- };
- 
-@@ -233,11 +258,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
-     /* Create widgets: */
-     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-     {
-+        pMainLayout->setContentsMargins(8, 6, 8, 6);
-         m_pLabel = new QIRichTextLabel(this);
-+        m_pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
-         m_pNameAndSystemEditor = new UINameAndSystemEditor(this);
--        pMainLayout->addWidget(m_pLabel);
--        pMainLayout->addWidget(m_pNameAndSystemEditor);
--        pMainLayout->addStretch();
-+        m_pNameAndSystemEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
-+        pMainLayout->addWidget(m_pLabel, 1);
-+        pMainLayout->addWidget(m_pNameAndSystemEditor, 1);
-     }
- 
-     /* Setup connections: */
-diff --git a/src/VBox/Main/xml/Settings.cpp b/src/VBox/Main/xml/Settings.cpp
-index 8cb1e12..20e3eda 100644
---- a/src/VBox/Main/xml/Settings.cpp
-+++ b/src/VBox/Main/xml/Settings.cpp
-@@ -3405,7 +3405,18 @@ const struct {
-     { "netware", "Netware" },
-     { "solaris", "Solaris" },
-     { "opensolaris", "OpenSolaris" },
--    { "l4", "L4" }
-+    { "l4", "L4" },
-+    { "gnu", "GNU" },
-+    { "gnuhurd", "GNUHurd" },
-+    { "parabola", "Parabola" },
-+    { "gnewsense", "gNewSense" },
-+    { "blag", "Blag" },
-+    { "dragora", "Dragora" },
-+    { "ututo", "Ututo" },
-+    { "musix", "Musix" },
-+    { "trisquel", "Trisquel" },
-+    { "dynebolic", "Dynebolic" },
-+    { "venenux", "Venenux" }
- };
- 
- void MachineConfigFile::convertOldOSType_pre1_5(Utf8Str &str)
-diff --git a/src/VBox/Main/xml/SettingsConverter.xsl b/src/VBox/Main/xml/SettingsConverter.xsl
-index 9a31a4c..7db11ad 100644
---- a/src/VBox/Main/xml/SettingsConverter.xsl
-+++ b/src/VBox/Main/xml/SettingsConverter.xsl
-@@ -763,6 +763,17 @@ Value '<xsl:value-of select="@type"/>' of 'HardDisk::type' attribute is invalid.
-         <xsl:when test="@OSType='solaris'">Solaris</xsl:when>
-         <xsl:when test="@OSType='opensolaris'">OpenSolaris</xsl:when>
-         <xsl:when test="@OSType='l4'">L4</xsl:when>
-+        <xsl:when test="@OSType='gnu'">GNU</xsl:when>
-+        <xsl:when test="@OSType='gnuhurd'">GNUHurd</xsl:when>
-+        <xsl:when test="@OSType='parabola'">Parabola</xsl:when>
-+        <xsl:when test="@OSType='gnewsense'">gNewSense</xsl:when>
-+        <xsl:when test="@OSType='blag'">Blag</xsl:when>
-+        <xsl:when test="@OSType='dragora'">Dragora</xsl:when>
-+        <xsl:when test="@OSType='ututo'">Ututo</xsl:when>
-+        <xsl:when test="@OSType='musix'">Musix</xsl:when>
-+        <xsl:when test="@OSType='trisquel'">Trisquel</xsl:when>
-+        <xsl:when test="@OSType='dynebolic'">Dynebolic</xsl:when>
-+        <xsl:when test="@OSType='venenux'">Venenux</xsl:when>
-       </xsl:choose>
-     </xsl:attribute>
-     <xsl:apply-templates select="@*[name()!='OSType']" mode="v1.5"/>
-diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
-index 4523dad..38ae21a 100644
---- a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
-+++ b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
-@@ -71,6 +71,24 @@
-         <file alias="os_oracle_64.png">images/os_oracle_64.png</file>
-         <file alias="os_macosx.png">images/os_macosx.png</file>
-         <file alias="os_macosx_64.png">images/os_macosx_64.png</file>
-+        <file alias="os_parabola.png">images/os_parabola.png</file>
-+        <file alias="os_parabola_64.png">images/os_parabola_64.png</file>
-+        <file alias="os_gnewsense.png">images/os_gnewsense.png</file>
-+        <file alias="os_gnewsense_64.png">images/os_gnewsense_64.png</file>
-+        <file alias="os_blag.png">images/os_blag.png</file>
-+        <file alias="os_blag_64.png">images/os_blag_64.png</file>
-+        <file alias="os_ututo.png">images/os_ututo.png</file>
-+        <file alias="os_ututo_64.png">images/os_ututo_64.png</file>
-+        <file alias="os_gnu.png">images/os_gnu.png</file>
-+        <file alias="os_gnu_64.png">images/os_gnu_64.png</file>
-+        <file alias="os_musix.png">images/os_musix.png</file>
-+        <file alias="os_musix_64.png">images/os_musix_64.png</file>
-+        <file alias="os_dragora.png">images/os_dragora.png</file>
-+        <file alias="os_dragora_64.png">images/os_dragora_64.png</file>
-+        <file alias="os_dynebolic.png">images/os_dynebolic.png</file>
-+        <file alias="os_venenux.png">images/os_venenux.png</file>
-+        <file alias="os_trisquel.png">images/os_trisquel.png</file>
-+        <file alias="os_trisquel_64.png">images/os_trisquel_64.png</file>
-         <file alias="hd_16px.png">images/hd_16px.png</file>
-         <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file>
-         <file alias="hd_32px.png">images/hd_32px.png</file>
-diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
-index 8af9597..39a8d39 100644
---- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
-@@ -4336,11 +4336,11 @@ void VBoxGlobal::init()
-         {"OS2Warp45",       ":/os_os2warp45.png"},
-         {"OS2eCS",          ":/os_os2ecs.png"},
-         {"OS2",             ":/os_os2_other.png"},
--        {"Linux22",         ":/os_linux22.png"},
--        {"Linux24",         ":/os_linux24.png"},
--        {"Linux24_64",      ":/os_linux24_64.png"},
--        {"Linux26",         ":/os_linux26.png"},
--        {"Linux26_64",      ":/os_linux26_64.png"},
-+        {"Linux22",         ":/os_gnu.png"},
-+        {"Linux24",         ":/os_gnu.png"},
-+        {"Linux24_64",      ":/os_gnu_64.png"},
-+        {"Linux26",         ":/os_gnu.png"},
-+        {"Linux26_64",      ":/os_gnu_64.png"},
-         {"ArchLinux",       ":/os_archlinux.png"},
-         {"ArchLinux_64",    ":/os_archlinux_64.png"},
-         {"Debian",          ":/os_debian.png"},
-@@ -4363,7 +4363,7 @@ void VBoxGlobal::init()
-         {"Xandros_64",      ":/os_xandros_64.png"},
-         {"Oracle",          ":/os_oracle.png"},
-         {"Oracle_64",       ":/os_oracle_64.png"},
--        {"Linux",           ":/os_linux_other.png"},
-+        {"Linux",           ":/os_gnu.png"},
-         {"FreeBSD",         ":/os_freebsd.png"},
-         {"FreeBSD_64",      ":/os_freebsd_64.png"},
-         {"OpenBSD",         ":/os_openbsd.png"},
-@@ -4379,6 +4379,25 @@ void VBoxGlobal::init()
-         {"MacOS",           ":/os_macosx.png"},
-         {"MacOS_64",        ":/os_macosx_64.png"},
-         {"JRockitVE",       ":/os_jrockitve.png"},
-+        {"GNU",             ":/os_gnu.png"},
-+        {"GNU_64",          ":/os_gnu_64.png"},
-+        {"GNUHurd",         ":/os_gnu.png"},
-+        {"Parabola",        ":/os_parabola.png"},
-+        {"Parabola_64",     ":/os_parabola_64.png"},
-+        {"gNewSense",       ":/os_gnewsense.png"},
-+        {"gNewSense_64",    ":/os_gnewsense_64.png"},
-+        {"Blag",            ":/os_blag.png"},
-+        {"Blag_64",         ":/os_blag_64.png"},
-+        {"Dragora",         ":/os_dragora.png"},
-+        {"Dragora_64",      ":/os_dragora_64.png"},
-+        {"Ututo",           ":/os_ututo.png"},
-+        {"Ututo_64",        ":/os_ututo_64.png"},
-+        {"Musix",           ":/os_musix.png"},
-+        {"Musix_64",        ":/os_musix_64.png"},
-+        {"Trisquel",        ":/os_trisquel.png"},
-+        {"Trisquel_64",     ":/os_trisquel_64.png"},
-+        {"Dynebolic",       ":/os_dynebolic.png"},
-+        {"Venenux",         ":/os_venenux.png"},
-     };
-     for (uint n = 0; n < SIZEOF_ARRAY (kOSTypeIcons); ++ n)
-     {
-diff --git a/include/VBox/ostypes.h b/include/VBox/ostypes.h
-index cbc0b73..31516cd 100644
---- a/include/VBox/ostypes.h
-+++ b/include/VBox/ostypes.h
-@@ -116,6 +116,25 @@ typedef enum VBOXOSTYPE
-     VBOXOSTYPE_MacOS            = 0xB0000,
-     VBOXOSTYPE_MacOS_x64        = 0xB0100,
-     VBOXOSTYPE_JRockitVE        = 0xC0000,
-+    VBOXOSTYPE_GNU              = 0xD0000,
-+    VBOXOSTYPE_GNU_x64          = 0xD0100,
-+    VBOXOSTYPE_GNUHurd          = 0xE0000,
-+    VBOXOSTYPE_Parabola         = 0xF0000,
-+    VBOXOSTYPE_Parabola_x64     = 0xF0100,
-+    VBOXOSTYPE_gNewSense        = 0xF1000,
-+    VBOXOSTYPE_gNewSense_x64    = 0xF1100,
-+    VBOXOSTYPE_Blag             = 0xF2000,
-+    VBOXOSTYPE_Blag_x64         = 0xF2100,
-+    VBOXOSTYPE_Dragora          = 0xF3000,
-+    VBOXOSTYPE_Dragora_x64      = 0xF3100,
-+    VBOXOSTYPE_Ututo            = 0xF4000,
-+    VBOXOSTYPE_Ututo_x64        = 0xF4100,
-+    VBOXOSTYPE_Musix            = 0xF5000,
-+    VBOXOSTYPE_Musix_x64        = 0xF5100,
-+    VBOXOSTYPE_Trisquel         = 0xF6000,
-+    VBOXOSTYPE_Trisquel_x64     = 0xF6100,
-+    VBOXOSTYPE_Dynebolic        = 0xF7000,
-+    VBOXOSTYPE_Venenux          = 0xF8000,
- /** The bit number which indicates 64-bit or 32-bit. */
- #define VBOXOSTYPE_x64_BIT       8
-     /** The mask which indicates 64-bit. */
-diff --git a/src/VBox/Main/src-server/ApplianceImpl.cpp b/src/VBox/Main/src-server/ApplianceImpl.cpp
-index 05fc3b6..dc06073 100644
---- a/src/VBox/Main/src-server/ApplianceImpl.cpp
-+++ b/src/VBox/Main/src-server/ApplianceImpl.cpp
-@@ -84,7 +84,31 @@ g_osTypes[] =
-     { ovf::CIMOSType_CIMOS_MACOS,                                VBOXOSTYPE_MacOS },
-     { ovf::CIMOSType_CIMOS_MACOS,                                VBOXOSTYPE_MacOS_x64 },            // there is no CIM 64-bit type for this
- 
--    // Linuxes
-+    // Custom GNU and GNU-Hurd OS
-+    { ovf::CIMOSType_CIMOS_GNU,                                  VBOXOSTYPE_GNU },
-+    { ovf::CIMOSType_CIMOS_GNU_64,                               VBOXOSTYPE_GNU_x64 },
-+    { ovf::CIMOSType_CIMOS_GNUHurd,                              VBOXOSTYPE_GNUHurd },
-+    
-+    // Free GNU/Linux distros
-+    { ovf::CIMOSType_CIMOS_gNewSense,                            VBOXOSTYPE_gNewSense },
-+    { ovf::CIMOSType_CIMOS_gNewSense_64,                         VBOXOSTYPE_gNewSense_x64 },
-+    { ovf::CIMOSType_CIMOS_Dragora,                              VBOXOSTYPE_Dragora },
-+    { ovf::CIMOSType_CIMOS_Dragora_64,                           VBOXOSTYPE_Dragora_x64 },
-+    { ovf::CIMOSType_CIMOS_Musix,                                VBOXOSTYPE_Musix },
-+    { ovf::CIMOSType_CIMOS_Musix_64,                             VBOXOSTYPE_Musix_x64 },
-+    { ovf::CIMOSType_CIMOS_Trisquel,                             VBOXOSTYPE_Trisquel },
-+    { ovf::CIMOSType_CIMOS_Trisquel_64,                          VBOXOSTYPE_Trisquel_x64 },
-+    { ovf::CIMOSType_CIMOS_Dynebolic,                            VBOXOSTYPE_Dynebolic },
-+    
-+    // Free GNU/Linux distros that we have support for but CIM doesn't
-+    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Parabola },
-+    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Parabola_x64 },
-+    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Blag },
-+    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Blag_x64 },
-+    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Ututo },
-+    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Ututo_x64 },
-+
-+    // Non-free GNU/Linux distros
-     { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux,                VBOXOSTYPE_RedHat },
-     { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64,             VBOXOSTYPE_RedHat_x64 },
-     { ovf::CIMOSType_CIMOS_Solaris_64,                           VBOXOSTYPE_Solaris_x64 },
-@@ -104,13 +128,14 @@ g_osTypes[] =
-     { ovf::CIMOSType_CIMOS_Ubuntu_64,                            VBOXOSTYPE_Ubuntu_x64 },
-     { ovf::CIMOSType_CIMOS_Debian,                               VBOXOSTYPE_Debian },
-     { ovf::CIMOSType_CIMOS_Debian_64,                            VBOXOSTYPE_Debian_x64 },
-+    { ovf::CIMOSType_CIMOS_Venenux,                              VBOXOSTYPE_Venenux },
-     { ovf::CIMOSType_CIMOS_Linux_2_4_x,                          VBOXOSTYPE_Linux24 },
-     { ovf::CIMOSType_CIMOS_Linux_2_4_x_64,                       VBOXOSTYPE_Linux24_x64 },
-     { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Linux26 },
-     { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Linux26_x64 },
-     { ovf::CIMOSType_CIMOS_Linux_64,                             VBOXOSTYPE_Linux26_x64 },
- 
--    // types that we have support for but CIM doesn't
-+    // Non-free GNU/Linux distros and non-free operating systems types that we have support for but CIM doesn't
-     { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_ArchLinux },
-     { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_ArchLinux_x64 },
-     { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_FedoraCore },
-@@ -151,53 +176,72 @@ struct osTypePattern
- /* These are the 32-Bit ones. They are sorted by priority. */
- static const osTypePattern g_osTypesPattern[] =
- {
--    {"Windows NT",    VBOXOSTYPE_WinNT4},
--    {"Windows XP",    VBOXOSTYPE_WinXP},
--    {"Windows 2000",  VBOXOSTYPE_Win2k},
--    {"Windows 2003",  VBOXOSTYPE_Win2k3},
--    {"Windows Vista", VBOXOSTYPE_WinVista},
--    {"Windows 2008",  VBOXOSTYPE_Win2k8},
--    {"SUSE",          VBOXOSTYPE_OpenSUSE},
--    {"Novell",        VBOXOSTYPE_OpenSUSE},
--    {"Red Hat",       VBOXOSTYPE_RedHat},
--    {"Mandriva",      VBOXOSTYPE_Mandriva},
--    {"Ubuntu",        VBOXOSTYPE_Ubuntu},
--    {"Debian",        VBOXOSTYPE_Debian},
--    {"QNX",           VBOXOSTYPE_QNX},
--    {"Linux 2.4",     VBOXOSTYPE_Linux24},
--    {"Linux 2.6",     VBOXOSTYPE_Linux26},
--    {"Linux",         VBOXOSTYPE_Linux},
--    {"OpenSolaris",   VBOXOSTYPE_OpenSolaris},
--    {"Solaris",       VBOXOSTYPE_OpenSolaris},
--    {"FreeBSD",       VBOXOSTYPE_FreeBSD},
--    {"NetBSD",        VBOXOSTYPE_NetBSD},
--    {"Windows 95",    VBOXOSTYPE_Win95},
--    {"Windows 98",    VBOXOSTYPE_Win98},
--    {"Windows Me",    VBOXOSTYPE_WinMe},
--    {"Windows 3.",    VBOXOSTYPE_Win31},
--    {"DOS",           VBOXOSTYPE_DOS},
--    {"OS2",           VBOXOSTYPE_OS2}
-+    {"Windows NT",         VBOXOSTYPE_WinNT4},
-+    {"Windows XP",         VBOXOSTYPE_WinXP},
-+    {"Windows 2000",       VBOXOSTYPE_Win2k},
-+    {"Windows 2003",       VBOXOSTYPE_Win2k3},
-+    {"Windows Vista",      VBOXOSTYPE_WinVista},
-+    {"Windows 2008",       VBOXOSTYPE_Win2k8},
-+    {"SUSE",               VBOXOSTYPE_OpenSUSE},
-+    {"Novell",             VBOXOSTYPE_OpenSUSE},
-+    {"Red Hat",            VBOXOSTYPE_RedHat},
-+    {"Mandriva",           VBOXOSTYPE_Mandriva},
-+    {"Ubuntu",             VBOXOSTYPE_Ubuntu},
-+    {"Debian",             VBOXOSTYPE_Debian},
-+    {"QNX",                VBOXOSTYPE_QNX},
-+    {"GNU/Linux 2.4",      VBOXOSTYPE_Linux24},
-+    {"GNU/Linux 2.6",      VBOXOSTYPE_Linux26},
-+    {"GNU/Linux",          VBOXOSTYPE_Linux},
-+    {"OpenSolaris",        VBOXOSTYPE_OpenSolaris},
-+    {"Solaris",            VBOXOSTYPE_OpenSolaris},
-+    {"FreeBSD",            VBOXOSTYPE_FreeBSD},
-+    {"NetBSD",             VBOXOSTYPE_NetBSD},
-+    {"Windows 95",         VBOXOSTYPE_Win95},
-+    {"Windows 98",         VBOXOSTYPE_Win98},
-+    {"Windows Me",         VBOXOSTYPE_WinMe},
-+    {"Windows 3.",         VBOXOSTYPE_Win31},
-+    {"DOS",                VBOXOSTYPE_DOS},
-+    {"OS2",                VBOXOSTYPE_OS2},
-+    {"Parabola",           VBOXOSTYPE_Parabola},
-+    {"gNewSense",          VBOXOSTYPE_gNewSense},
-+    {"Blag",               VBOXOSTYPE_Blag},
-+    {"Dragora",            VBOXOSTYPE_Dragora},
-+    {"Ututo XS",           VBOXOSTYPE_Ututo},
-+    {"Musix",              VBOXOSTYPE_Musix},
-+    {"Trisquel",           VBOXOSTYPE_Trisquel},
-+    {"Dyne:bolic",         VBOXOSTYPE_Dynebolic},
-+    {"Venenux",            VBOXOSTYPE_Venenux},
-+    {"GNU",                VBOXOSTYPE_GNU},
-+    {"GNU-Hurd",           VBOXOSTYPE_GNUHurd},
- };
- 
- /* These are the 64-Bit ones. They are sorted by priority. */
- static const osTypePattern g_osTypesPattern64[] =
- {
--    {"Windows XP",    VBOXOSTYPE_WinXP_x64},
--    {"Windows 2003",  VBOXOSTYPE_Win2k3_x64},
--    {"Windows Vista", VBOXOSTYPE_WinVista_x64},
--    {"Windows 2008",  VBOXOSTYPE_Win2k8_x64},
--    {"SUSE",          VBOXOSTYPE_OpenSUSE_x64},
--    {"Novell",        VBOXOSTYPE_OpenSUSE_x64},
--    {"Red Hat",       VBOXOSTYPE_RedHat_x64},
--    {"Mandriva",      VBOXOSTYPE_Mandriva_x64},
--    {"Ubuntu",        VBOXOSTYPE_Ubuntu_x64},
--    {"Debian",        VBOXOSTYPE_Debian_x64},
--    {"Linux 2.4",     VBOXOSTYPE_Linux24_x64},
--    {"Linux 2.6",     VBOXOSTYPE_Linux26_x64},
--    {"Linux",         VBOXOSTYPE_Linux26_x64},
--    {"OpenSolaris",   VBOXOSTYPE_OpenSolaris_x64},
--    {"Solaris",       VBOXOSTYPE_OpenSolaris_x64},
--    {"FreeBSD",       VBOXOSTYPE_FreeBSD_x64},
-+    {"Windows XP",         VBOXOSTYPE_WinXP_x64},
-+    {"Windows 2003",       VBOXOSTYPE_Win2k3_x64},
-+    {"Windows Vista",      VBOXOSTYPE_WinVista_x64},
-+    {"Windows 2008",       VBOXOSTYPE_Win2k8_x64},
-+    {"SUSE",               VBOXOSTYPE_OpenSUSE_x64},
-+    {"Novell",             VBOXOSTYPE_OpenSUSE_x64},
-+    {"Red Hat",            VBOXOSTYPE_RedHat_x64},
-+    {"Mandriva",           VBOXOSTYPE_Mandriva_x64},
-+    {"Ubuntu",             VBOXOSTYPE_Ubuntu_x64},
-+    {"Debian",             VBOXOSTYPE_Debian_x64},
-+    {"GNU/Linux 2.4",      VBOXOSTYPE_Linux24_x64},
-+    {"GNU/Linux 2.6",      VBOXOSTYPE_Linux26_x64},
-+    {"GNU/Linux",          VBOXOSTYPE_Linux26_x64},
-+    {"OpenSolaris",        VBOXOSTYPE_OpenSolaris_x64},
-+    {"Solaris",            VBOXOSTYPE_OpenSolaris_x64},
-+    {"FreeBSD",            VBOXOSTYPE_FreeBSD_x64},
-+    {"Parabola",           VBOXOSTYPE_Parabola_x64},
-+    {"gNewSense",          VBOXOSTYPE_gNewSense_x64},
-+    {"Blag",               VBOXOSTYPE_Blag_x64},
-+    {"Dragora",            VBOXOSTYPE_Dragora_x64},
-+    {"Ututo XS",           VBOXOSTYPE_Ututo_x64},
-+    {"Musix",              VBOXOSTYPE_Musix_x64},
-+    {"Trisquel",           VBOXOSTYPE_Trisquel_x64},
-+    {"GNU",                VBOXOSTYPE_GNU_x64},
- };
- 
- /**
-diff --git a/src/VBox/Main/include/ovfreader.h b/src/VBox/Main/include/ovfreader.h
-index e1e21d5..6d2da12 100644
---- a/src/VBox/Main/include/ovfreader.h
-+++ b/src/VBox/Main/include/ovfreader.h
-@@ -145,8 +145,20 @@ enum CIMOSType_T
-     CIMOSType_CIMOS_CentOS_64 = 107,
-     CIMOSType_CIMOS_OracleEnterpriseLinux = 108,
-     CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109,
--    CIMOSType_CIMOS_eComStation = 110
-+    CIMOSType_CIMOS_eComStation = 110,
-     // no new types added with CIM 2.26.0
-+    CIMOSType_CIMOS_gNewSense = 111,
-+    CIMOSType_CIMOS_gNewSense_64 = 112,
-+    CIMOSType_CIMOS_Dragora = 113,
-+    CIMOSType_CIMOS_Dragora_64 = 114,
-+    CIMOSType_CIMOS_Musix = 115,
-+    CIMOSType_CIMOS_Musix_64 = 116,
-+    CIMOSType_CIMOS_Trisquel = 117,
-+    CIMOSType_CIMOS_Trisquel_64 = 118,
-+    CIMOSType_CIMOS_Dynebolic = 119,
-+    CIMOSType_CIMOS_Venenux = 120,
-+    CIMOSType_CIMOS_GNU = 121,
-+    CIMOSType_CIMOS_GNU_64 = 122
- };
- 
- 
-diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
-index 59749be..8e2b425 100644
---- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
-@@ -141,7 +141,7 @@ void UIMachineSettingsDisplay::setGuestOSType(CGuestOSType guestOSType)
- #ifdef VBOX_WITH_VIDEOHWACCEL
-     /* Check if 2D video acceleration supported by the guest OS type: */
-     QString strguestOSTypeFamily = m_guestOSType.GetFamilyId();
--    m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Windows";
-+    m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Non-free OSs";
- #endif /* VBOX_WITH_VIDEOHWACCEL */
- #ifdef VBOX_WITH_CRHGSMI
-     /* Check if WDDM mode supported by the guest OS type: */
-diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
-index f67cfc2..438ffee 100644
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
-@@ -32,6 +32,11 @@ enum
-     TypeID = Qt::UserRole + 1
- };
- 
-+const char* FreedomLabel = "We hope you don't use non-free "
-+                           "GNU/Linux distros and non-free operating "
-+                           "systems, since to use them is to surrender "
-+                           "your freedom.";
-+
- UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent)
-     : QIWithRetranslateUI<QWidget>(pParent)
- {
-@@ -39,55 +44,91 @@ UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent)
-     qRegisterMetaType<CGuestOSType>();
- 
-     /* Create widgets: */
--    QGridLayout *pMainLayout = new QGridLayout(this);
-+    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-     {
-         pMainLayout->setContentsMargins(0, 0, 0, 0);
--        m_pNameLabel = new QLabel(this);
--        {
--            m_pNameLabel->setAlignment(Qt::AlignRight);
--            m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
--        }
--        m_pNameEditor = new QLineEdit(this);
--        {
--            m_pNameEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
--            m_pNameLabel->setBuddy(m_pNameEditor);
--        }
--        m_pFamilyLabel = new QLabel(this);
--        {
--            m_pFamilyLabel->setAlignment(Qt::AlignRight);
--            m_pFamilyLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
--        }
--        m_pFamilyCombo = new QComboBox(this);
--        {
--            m_pFamilyCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
--            m_pFamilyLabel->setBuddy(m_pFamilyCombo);
--        }
--        m_pTypeLabel = new QLabel(this);
--        {
--            m_pTypeLabel->setAlignment(Qt::AlignRight);
--            m_pTypeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
--        }
--        m_pTypeCombo = new QComboBox(this);
--        {
--            m_pTypeCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
--            m_pTypeLabel->setBuddy(m_pTypeCombo);
--        }
--        QVBoxLayout *pIconLayout = new QVBoxLayout;
--        {
--            m_pTypeIcon = new QLabel(this);
-+
-+	/* Top QWidget */
-+	m_pGlobalCnt = new QFrame;
-+        m_pGlobalCnt->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
-+
-+	QVBoxLayout *pGlobalLayout = new QVBoxLayout(m_pGlobalCnt);
-+	{
-+	    m_pGridCnt = new QFrame;
-+            m_pGridCnt->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
-+	    m_pGridCnt->setMinimumWidth(500);
-+
-+	    QGridLayout *pGridLayout = new QGridLayout(m_pGridCnt);
-             {
--                m_pTypeIcon->setFixedSize(32, 32);
--            }
--            pIconLayout->addWidget(m_pTypeIcon);
--            pIconLayout->addStretch();
--        }
--        pMainLayout->addWidget(m_pNameLabel, 0, 0);
--        pMainLayout->addWidget(m_pNameEditor, 0, 1, 1, 2);
--        pMainLayout->addWidget(m_pFamilyLabel, 1, 0);
--        pMainLayout->addWidget(m_pFamilyCombo, 1, 1);
--        pMainLayout->addWidget(m_pTypeLabel, 2, 0);
--        pMainLayout->addWidget(m_pTypeCombo, 2, 1);
--        pMainLayout->addLayout(pIconLayout, 1, 2, 2, 1);
-+	        pGridLayout->setContentsMargins(4, 4, 4, 4);
-+	        m_pNameLabel = new QLabel(m_pGridCnt);
-+	        {
-+	            m_pNameLabel->setAlignment(Qt::AlignRight);
-+	            m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-+	        }
-+	        m_pNameEditor = new QLineEdit(m_pGridCnt);
-+	        {
-+	            m_pNameEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-+	            m_pNameLabel->setBuddy(m_pNameEditor);
-+	        }
-+	        m_pFamilyLabel = new QLabel(m_pGridCnt);
-+	        {
-+	            m_pFamilyLabel->setAlignment(Qt::AlignRight);
-+	            m_pFamilyLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-+	        }
-+	        m_pFamilyCombo = new QComboBox(m_pGridCnt);
-+	        {
-+	            m_pFamilyCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-+	            m_pFamilyLabel->setBuddy(m_pFamilyCombo);
-+	        }
-+	        m_pTypeLabel = new QLabel(m_pGridCnt);
-+	        {
-+	            m_pTypeLabel->setAlignment(Qt::AlignRight);
-+	            m_pTypeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-+	        }
-+	        m_pTypeCombo = new QComboBox(m_pGridCnt);
-+	        {
-+	            m_pTypeCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-+	            m_pTypeLabel->setBuddy(m_pTypeCombo);
-+	        }
-+	        QVBoxLayout *pIconLayout = new QVBoxLayout;
-+                {
-+	            m_pTypeIcon = new QLabel;
-+	            {
-+	                m_pTypeIcon->setFixedSize(32, 32);
-+	            }
-+	            pIconLayout->addWidget(m_pTypeIcon);
-+	            pIconLayout->addStretch();
-+	        }
-+
-+	        pGridLayout->addWidget(m_pNameLabel, 0, 0);
-+	        pGridLayout->addWidget(m_pNameEditor, 0, 1, 1, 2);
-+	        pGridLayout->addWidget(m_pFamilyLabel, 1, 0);
-+	        pGridLayout->addWidget(m_pFamilyCombo, 1, 1);
-+	        pGridLayout->addWidget(m_pTypeLabel, 2, 0);
-+	        pGridLayout->addWidget(m_pTypeCombo, 2, 1);
-+	        pGridLayout->addLayout(pIconLayout, 1, 2, 2, 1);
-+	    }
-+
-+	    m_pFreedomLabel = new QLabel(m_pGlobalCnt);
-+	    {
-+                m_pFreedomLabel->setStyleSheet("color: red;"
-+                                               "border-radius: 4px;"
-+                                               "padding: 2px;"
-+                                               "background-color: #DDDDDD;");
-+	        m_pFreedomLabel->setWordWrap(true);
-+		m_pFreedomLabel->setAlignment(Qt::AlignCenter);
-+	        m_pFreedomLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
-+		m_pFreedomLabel->hide();
-+	    }
-+
-+	    pGlobalLayout->addStretch();
-+	    pGlobalLayout->addWidget(m_pGridCnt, 0, Qt::AlignCenter);
-+	    pGlobalLayout->addWidget(m_pFreedomLabel);
-+	    pGlobalLayout->addStretch();
-+	}
-+
-+        pMainLayout->addWidget(m_pGlobalCnt);
-     }
- 
-     /* Check if host supports (AMD-V or VT-x) and long mode: */
-@@ -165,6 +206,7 @@ void UINameAndSystemEditor::retranslateUi()
-     m_pTypeCombo->setWhatsThis(tr("Displays the operating system type that "
-                                   "you plan to install into this virtual machine "
-                                   "(called a guest operating system)."));
-+    m_pFreedomLabel->setText(tr(FreedomLabel));
- }
- 
- void UINameAndSystemEditor::sltFamilyChanged(int iIndex)
-@@ -210,6 +252,20 @@ void UINameAndSystemEditor::sltFamilyChanged(int iIndex)
-     /* Else simply select the first one present: */
-     else m_pTypeCombo->setCurrentIndex(0);
- 
-+    /* Hide or show the freedom label if it is translated to the active language */
-+    int isEnglish = QLocale::system().language();
-+    if (m_pFreedomLabel->text() != FreedomLabel || isEnglish == 1 || isEnglish == 31)
-+    {
-+        if (strFamilyId == "Non-free OSs" || strFamilyId == "Non-free Distros")
-+        {
-+	    m_pFreedomLabel->show();
-+        }
-+        else
-+        {
-+            m_pFreedomLabel->hide();
-+        }
-+    }
-+
-     /* Update all the stuff: */
-     sltTypeChanged(m_pTypeCombo->currentIndex());
- 
-diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h
-index 6a698c0..3c23845 100644
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h
-@@ -30,6 +30,7 @@
- class QLabel;
- class QLineEdit;
- class QComboBox;
-+class QFrame;
- 
- /* QWidget reimplementation providing editor for basic VM parameters: */
- class UINameAndSystemEditor : public QIWithRetranslateUI<QWidget>
-@@ -76,6 +77,8 @@ private slots:
- private:
- 
-     /* Widgets: */
-+    QFrame *m_pGlobalCnt;
-+    QFrame *m_pGridCnt;
-     QLabel *m_pNameLabel;
-     QLabel *m_pFamilyLabel;
-     QLabel *m_pTypeLabel;
-@@ -83,6 +86,7 @@ private:
-     QLineEdit *m_pNameEditor;
-     QComboBox *m_pFamilyCombo;
-     QComboBox *m_pTypeCombo;
-+    QLabel *m_pFreedomLabel;
- 
-     /* Variables: */
-     CGuestOSType m_type;
-diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
-index 100cb8c..5ab98ad 100644
---- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
-@@ -19,7 +19,7 @@
- 
- /* Global includes: */
- #include <QVBoxLayout>
--#include <QHBoxLayout>
-+#include <QVBoxLayout>
- #include <QGroupBox>
- #include <QGridLayout>
- #include <QSpacerItem>
-@@ -47,8 +47,11 @@ UIWizardNewVMPageExpert::UIWizardNewVMPageExpert(const QString &strGroup)
-         m_pNameAndSystemCnt = new QGroupBox(this);
-         {
-             m_pNameAndSystemCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
--            QHBoxLayout *pNameAndSystemCntLayout = new QHBoxLayout(m_pNameAndSystemCnt);
-+	    m_pNameAndSystemCnt->setFixedHeight(170);
-+
-+            QVBoxLayout *pNameAndSystemCntLayout = new QVBoxLayout(m_pNameAndSystemCnt);
-             {
-+                pNameAndSystemCntLayout->setContentsMargins(8, 2, 8, 2);
-                 m_pNameAndSystemEditor = new UINameAndSystemEditor(m_pNameAndSystemCnt);
-                 pNameAndSystemCntLayout->addWidget(m_pNameAndSystemEditor);
-             }
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
-index cea825b..7ade350 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
-@@ -7235,6 +7235,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Показва вида на операционната система, която планирате да инсталирате на виртуалната машина (наричана виртуална операционна система).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Надяваме се, че не ползвате несвободни дистрибуции на GNU/Линукс и несвободни операционни системи, тъй като използването им означава, че се отказвате от свободата си.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
-index e41d97d..f449069 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
-@@ -7667,6 +7667,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Mostra el tipus de sistema operatiu que voleu instal·lar a dins d&apos;aquesta màquina virtual (anomenat sistema operatiu client).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
-index e82fc7c..a98be2c 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
-@@ -7667,6 +7667,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Mostra el tipus de sistema operatiu que voleu instal·lar a dins d&apos;esta màquina virtual (anomenat sistema operatiu client).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
-index 176f417..bb58906 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
-@@ -7659,6 +7659,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Zobrazuje typ operačního systému, který se chystáte instalovat na tento virtuální počítač (nazývaný hostovaný operační systém).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManager</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
-index 3f88de8..1d48468 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
-@@ -7085,6 +7085,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Viser typen af operativsystem som du planlægger at installere i denne virtuelle maskine (kaldet gæsteoperativsystemet).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
-index 14a3721..945d554 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
-@@ -4838,6 +4838,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Zeigt den Typ des Betriebssystems, das Sie in der virtuellen Maschine installieren wollen (auch als Gast bezeichnet).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Wir hoffen, dass keine unfreie GNU/Linux-Distributionen und unfreie Betriebssysteme genutzt werden, da deren Nutzung bedeutet, die Freiheit aufzugeben.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
-index 4e52534..3d7dba6 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
-@@ -7518,6 +7518,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Muestra el tipo de sistema operativo que planea instalar en esta máquina virtual (llamado sistema operativo invitado).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Esperamos que no uses distros no libres de GNU/Linux y sistemas operativos no libres, ya que al hacerlo pierdes tu libertad.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
-index 275e1e6..34171eb 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
-@@ -5951,6 +5951,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Makina birtual honetan instalatzea pentsatzen duzun sistema eragilea erakusten du (sistema eragile bezeroa deiturikoa).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
-index f902373..625da36 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
-@@ -4850,6 +4850,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
-index 3f31f8f..9248344 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
-@@ -6717,6 +6717,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Näyttää virtuaalikoneeseen asennettavan käyttöjärjestelmän tyypin.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
-index b918edb..a6868a4 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
-@@ -6432,6 +6432,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Affiche le type du système d&apos;exploitation (dit système d&apos;exploitation invité) que vous allez installer dans cette machine virtuelle.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Nous espérons que vous n&apos;utilisez pas de distribution GNU/Linux non libre ni de système d&apos;exploitation non libre car, si vous le faites, vous abdiquez votre liberté.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
-index b04f31b..77a389f 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
-@@ -6508,6 +6508,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Mostrar o tipo do sistema operativo  que planeas instalar nesta máquina virtual (chamado un sistema operativo convidado).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
-index 76d4371..c1aff65 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
-@@ -7486,6 +7486,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>A tervezett vendég operációs rendszer típusa.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
-index 349d776..fb81c2c 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
-@@ -6768,6 +6768,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished"></translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
-index 61f6a37..70e66b9 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
-@@ -8063,6 +8063,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Visualizza il tipo di sistema operativo che intendi installare nella macchina virtuale (chiamato sistema operativo Guest).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Sconsigliamo di utilizzare distribuzioni GNU/Linux non libere e sistemi operativi non liberi, poiché usarli equivale a cedere la propria libertà.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManager</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
-index 9ab3823..40006f9 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
-@@ -8727,6 +8727,11 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>仮想マシンで実行するOS(ゲストOSと呼びます)のタイプを表示します。</translation>
-     </message>
-+    <message>
-+        <location filename="../src/widgets/UINameAndSystemEditor.cpp" line="180"/>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">わたしたちは、あなたが不自由なGNU/Linuxディストロや不自由なオペレーティング・システムを使わないことを願います。それを使うことは、あなた自身の自由を放棄することだからです。</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
-index be82aab..7d73e23 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
-@@ -6451,6 +6451,10 @@ medium</comment>
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">បង្ហាញ​ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​​មាន​​គម្រោង​ដំឡើង​ម៉ាស៊ីន​និម្មិត​នេះ (បាន​ហៅ​ប្រព័ន្ធ​ប្រតិបត្តិ​របស់​ម៉ាស៊ីន​ភ្ញៀវ) ។</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
-index 05ccf51..3fb2a07 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
-@@ -7351,6 +7351,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>이 가상 머신에 설치할 운영 체제(게스트 운영 체제라고도 함) 종류를 표시합니다.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">자유롭지 못한 GNU/Linux 배포판과 독점 운영체제를 사용하는 것은 우 리의 자유를 포기하는 것과 마찬가지 이므로,  사용하지 않을 것을 권유합니다.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
-index 3e06e93..cadd54b 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
-@@ -6767,6 +6767,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Rodo operacinės sistemos tipą, kurį ketinate įdiegti šioje virtualioje mašinoje (pastaroji dar vadinama svečio operacine sistema).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
-index 2b81abd..610dad8 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
-@@ -5894,6 +5894,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Toont het type besturingssysteem dat u van plan bent op deze virtuele machine te installeren (dit wordt het gastbesturingssysteem genoemd).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Hopelijk gebruik je geen niet-vrije GNU/Linux distributies of gesloten besturingssystemen want daarmee geef je je vrijheid op.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
-index 7122389..ca0b4b2 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
-@@ -7311,6 +7311,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished"></translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Mamy nadzieję, że nie używasz niewolnych dystrybucji GNU/Linuksa aniniewolnych systemów operacyjnych, gdyż używanie ich to oddanie Twojej wolności.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
-index ebcba39..0bb693b 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
-@@ -6816,6 +6816,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Mostra o tipo de sistema operativo que planeia instalar nesta máquina virtual (chamado de sistema operativo convidado).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
-index 6a82c7e..c866fa4 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
-@@ -8029,6 +8029,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Exibe o tipo de sistema operacional que você planeja instalar nesta máquina virtual (chamado de sistema operacional convidado).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Esperamos que não se usem distros não-livres de GNU/Linux e sistemas operacionais não-livres, pois ao usá-los abre-se mão de sua liberdade.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManager</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
-index 3b79282..345725c 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
-@@ -6919,6 +6919,10 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Afișează tipul sistemului de operare pe care plănuiți să îl instalați în această mașină virtuală (denumit sistem de operare musafir).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
-index c2230a2..653f436 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
-@@ -7406,6 +7406,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Определяет версию операционной системы, которую вы хотите установить на эту виртуальную машину (эта операционная система называется &quot;гостевая ОС&quot;).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Мы надеемся, что вы не пользуетесь несвободными дистрибутивами GNU/Linux и несвободными операционными системами, поскольку пользование ими означает, что вы отказываетесь от своей свободы.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
-index 40eec9d..dcecd31 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
-@@ -6762,6 +6762,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Zobrazí typ operačného systému, ktorý sa chystáte nainštalovať na tento virtuálny stroj (nazýva sa hosťovský operačný systém).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
-index 9eeef05..649c108 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
-@@ -7171,6 +7171,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Показује тип система који планирате да инсталирате на машину (позвано гост систем).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
-index 800d10b..239a8d4 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
-@@ -7768,6 +7768,10 @@ serial ports</comment>
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished"></translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Vi hoppas att du inte använder en begränsad, icke fri GNU/Linux distribution eller annat kommersiellt operativsystem, eftersom att du ger bort din frihet genom att göra detta.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManager</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
-index cdb888e..4c8d86c 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
-@@ -6312,6 +6312,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Bu sanal makine içerisine kurmayı planladığınız işletim sistemi türünü gösterir (misafir işletim sistemi olarak adlandırılır).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
-index 8b51e82..2557231 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
-@@ -7179,6 +7179,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Показує тип операційної системи, котру ви плануєте встановити на цю віртуальну машину, тобто гостьова операційна система.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManager</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
-index 2690322..0ea229a 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
-@@ -4810,6 +4810,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished"></translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
-index 5b567f7..8709191 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
-@@ -5858,6 +5858,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>显示你要安装到虚拟电脑的操作系统类型.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">我们真心希望您能拒绝使用非自由的操作系统，包括非自由的GNU/Linux发 行版。因为使用非自由的软件将会损害您的权利。</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
-index 5d1d136..095c169 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
-@@ -4834,6 +4834,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>顯示計畫安裝到此虛擬機器的作業系統類型 (稱為客體作業系統)。</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
deleted file mode 100644
index 7f236a678..000000000
--- a/libre/virtualbox-libre/libre.patch
+++ /dev/null
@@ -1,1085 +0,0 @@
---- VirtualBox-4.2.12.orig/Config.kmk	2013-04-12 07:33:55.000000000 -0300
-+++ VirtualBox-4.2.12/Config.kmk	2013-05-23 18:48:57.560690206 -0300
-@@ -56,9 +56,6 @@
- PROPS_SYSMODS_ACCUMULATE_L   += INTERMEDIATES
- PROPS_MISCBINS_ACCUMULATE_L  += INTERMEDIATES
- 
--# Misc names used bye the install paths below.
--VBOX_PUEL_MANGLED_NAME := Oracle_VM_VirtualBox_Extension_Pack
--
- # Install paths
- ## @todo This will change after 4.1 is branched off!
- # What is now 'bin' and 'lib' will be moved down under 'staged/', except on
-@@ -129,9 +126,6 @@
- endif
- 
- INST_DOC              = doc/
--INST_EXTPACK          = $(INST_BIN)ExtensionPacks/
--INST_EXTPACK_CERTS    = $(INST_BIN)ExtPackCertificates/
--INST_EXTPACK_PUEL     = $(INST_EXTPACK)$(VBOX_PUEL_MANGLED_NAME)/
- INST_PACKAGES         = packages/
- 
- VBOX_PATH_SDK         = $(patsubst %/,%,$(PATH_STAGE)/$(INST_SDK))
-@@ -140,7 +134,6 @@
- VBOX_PATH_ADDITIONS   = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS))
- VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO))
- VBOX_PATH_ADDITIONS_LIB = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_LIB))
--VBOX_PATH_EXTPACK_PUEL= $(patsubst %/,%,$(PATH_STAGE)/$(INST_EXTPACK_PUEL))
- VBOX_PATH_PACKAGES    = $(patsubst %/,%,$(PATH_STAGE)/$(INST_PACKAGES))
- 
- 
-@@ -215,7 +208,6 @@
-  export VBOX_ADDITIONS_SH_MODE     = release
-  export VBOX_DOCUMENTATION_SH_MODE = release
-  export VBOX_EFI_SH_MODE           = release
-- export VBOX_EXTPACKS_SH_MODE      = release
- endif
- 
- # Some info on the vendor
-@@ -368,8 +360,6 @@
- VBOX_WITH_USB = 1
- # Enable the USB 1.1 controller plus virtual USB HID devices.
- VBOX_WITH_VUSB = 1
--# Enable the USB 2.0 controller.
--VBOX_WITH_EHCI = 1
- # Enable the ISCSI feature.
- VBOX_WITH_ISCSI = 1
- # Enable INIP support in the ISCSI feature.
-@@ -441,9 +431,6 @@
- ifdef VBOX_WITH_USB
-  VBOX_WITH_VUSB = 1
- endif
--ifdef VBOX_WITH_EHCI
-- VBOX_WITH_EHCI_IMPL = 1
--endif
- ifdef VBOX_WITH_PCI_PASSTHROUGH
-  VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1
- endif
-@@ -584,8 +571,6 @@
- if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win)
-  VBOX_WITH_CROGL = 1
- endif
--# Enable the VNC server extension pack (GPL only).
--#VBOX_WITH_EXTPACK_VNC = 1
- # Enable S3 support (requires libcurl)
- VBOX_WITH_S3 = 1
- # Enable Host=>Guest Drag'n'Drop
-@@ -625,17 +610,6 @@
- endif
- ## @}
- 
--
--## @name Extension pack
--## @{
--# Enables the extension pack feature.
--VBOX_WITH_EXTPACK = 1
--# Enables separating code into the Oracle VM VirtualBox Extension Pack, dubbed PUEL.
--VBOX_WITH_EXTPACK_PUEL = 1
--# Enables building+packing the Oracle VM VirtualBox Extension Pack, includes VBOX_WITH_EXTPACK_PUEL
--VBOX_WITH_EXTPACK_PUEL_BUILD = 1
--## @}
--
- ## @name Misc
- ## @{
- # Enable Seamless mode
-@@ -826,14 +800,6 @@
- # Skip stuff.
- #
- 
--ifdef VBOX_ONLY_EXTPACKS
-- # Clear some VBOX_WITH_XXX variables instead of adding ifdefs all over the place.
-- VBOX_WITH_DEBUGGER =
-- VBOX_WITH_ADDITIONS =
-- VBOX_WITH_VBOXDRV =
-- VBOX_WITH_TESTCASES =
--endif
--
- # VBOX_QUICK can be used by core developers to speed to the build
- ifdef VBOX_QUICK
-  # undefine variables by assigning blank.
-@@ -888,7 +854,6 @@
-  VBOX_WITH_TESTSUITE=
-  VBOX_WITH_QTGUI=
-  VBOX_WITH_USB=
-- VBOX_WITH_EHCI=
-  VBOX_WITH_DOCS=
-  VBOX_WITH_PDM_ASYNC_COMPLETION=
-  VBOX_WITH_KCHMVIEWER=
-@@ -910,7 +875,6 @@
-  VBOX_WITH_CROGL=
-  VBOX_WITH_DEBUGGER=
-  VBOX_WITH_DOCS=
-- VBOX_WITH_EHCI=
-  VBOX_WITH_HARDENING=
-  VBOX_WITH_HEADLESS=
-  VBOX_WITH_HGCM=
-@@ -983,7 +947,7 @@
- #
- # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set.
- #
--VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK TESTSUITE\
-+VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS SDK TESTSUITE\
- 	, $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x))))
- if $(words $(VBOX_ONLY_BUILD)) > 1
-  $(error VBox: More than one VBOX_ONLY build enabled! $(VBOX_ONLY_BUILD))
-@@ -1001,9 +965,6 @@
- #
- ifdef VBOX_OSE
-  VBOX_WITH_VRDP=
-- VBOX_WITH_EHCI_IMPL=
-- VBOX_WITH_EXTPACK_PUEL=
-- VBOX_WITH_EXTPACK_PUEL_BUILD=
-  VBOX_WITH_PCI_PASSTHROUGH_IMPL=
-  VBOX_WITH_OS2_ADDITIONS_BIN=
-  VBOX_WITH_SECURELABEL=
-@@ -1135,10 +1096,6 @@
-  VBOX_WITH_KCHMVIEWER=
- endif
- 
--ifdef VBOX_WITH_EXTPACK_PUEL_BUILD
-- VBOX_WITH_EXTPACK_PUEL = 1
--endif
--
- #
- # Mark OSE builds clearly, helps figuring out limitations more easily.
- #
-@@ -1743,9 +1700,6 @@
- # bin2c (convert binary files into C arrays)
- VBOX_BIN2C      ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE)
- 
--# RTManifest (extension pack manifest utility)
--VBOX_RTMANIFEST ?= $(PATH_OBJ)/bldRTManifest/bldRTManifest$(HOSTSUFF_EXE)
--
- # VBoxCmp (simple /bin/cmp with more sensible output)
- VBOX_VBOXCMP    ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE)
- 
-@@ -2633,13 +2587,6 @@
-  SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE)
- endif
- 
--SDK_VBoxOpenSslExtPack                 = Internal use only.
--SDK_VBoxOpenSslExtPack_INCS            = $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)
--SDK_VBoxOpenSslExtPack_ORDERDEPS       = $(crypto-headers_1_TARGET)
--SDK_VBoxOpenSslExtPack_LIBS    = \
--	$(PATH_STAGE_LIB)/VBoxExtPack-libssl$(VBOX_SUFF_LIB) \
--	$(PATH_STAGE_LIB)/VBoxExtPack-libcrypto$(VBOX_SUFF_LIB)
--
- SDK_VBOX_BLD_OPENSSL      = .
- SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL
- SDK_VBOX_BLD_OPENSSL_LIBS ?= \
-@@ -4100,99 +4047,6 @@
- TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin))
- 
- 
--
--#
--# Templates used for building the extension packs.
--#
--ifdef VBOX_WITH_EXTPACK
-- # Base templates (native or portable).
-- TEMPLATE_VBoxR3ExtPack = For the ring-3 context extension pack modules.
-- if 1 # Native for now.
--  TEMPLATE_VBoxR3ExtPack_EXTENDS = VBOXR3DLLNOXCPT
--  TEMPLATE_VBoxR3ExtPack_DEFS = $(TEMPLATE_VBOXR3DLLNOXCPT_DEFS) VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R3
-- else
--  TEMPLATE_VBoxR3ExtPack_EXTENDS = VBOXNOCRTGCC
--  TEMPLATE_VBoxR3ExtPack_DEFS = $(TEMPLATE_VBOXNOCRTGCC_DEFS) VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R3 IPRT_NO_CRT IN_RING3
--  TEMPLATE_VBoxR3ExtPack_INCS = $(PATH_ROOT)/include/iprt/nocrt $(TEMPLATE_VBOXR3DLLNOXCPT_INCS)
-- endif
-- ifneq ($(KBUILD_TARGET),win)
--  TEMPLATE_VBoxR3ExtPack_CXXFLAGS = $(TEMPLATE_VBOXR3DLLNOXCPT_CXXFLAGS) -fno-rtti
-- endif
-- TEMPLATE_VBoxR3ExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
-- ifeq ($(KBUILD_TARGET),linux)
--  TEMPLATE_VBoxR3ExtPack_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBOXR3DLLNOXCPT_LDFLAGS))
-- else
--  if !defined(VBOX_WITH_RUNPATH) && defined(VBOX_WITH_RELATIVE_RUNPATH)
--   TEMPLATE_VBoxR3ExtPack_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/../../..' $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBOXR3DLLNOXCPT_LDFLAGS))
--  endif
-- endif
-- ifdef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
--  if1of ($(KBUILD_TARGET), win os2)
--   TEMPLATE_VBoxR3ExtPack_LIBS = \
--   	$(TEMPLATE_LIBS_VBOXR3) \
--   	$(PATH_STAGE_LIB)/VMMR3Imp$(VBOX_SUFF_LIB) \
--   	$(PATH_STAGE_LIB)/VBoxRTImp$(VBOX_SUFF_LIB)
--  else
--   TEMPLATE_VBoxR3ExtPack_LIBS = \
--   	$(TEMPLATE_LIBS_VBOXR3) \
--   	$(PATH_STAGE_LIB)/VMMR3Imp$(VBOX_SUFF_DLL) \
--   	$(PATH_STAGE_LIB)/VBoxRTImp$(VBOX_SUFF_DLL)
--  endif
-- else
--  TEMPLATE_VBoxR3ExtPack_LIBS = \
--  	$(TEMPLATE_LIBS_VBOXR3) \
--  	$(LIB_RUNTIME) \
--  	$(LIB_VMM)
-- endif
--
-- TEMPLATE_VBoxR0ExtPack = For the ring-0 context extension pack modules.
-- TEMPLATE_VBoxR0ExtPack_EXTENDS = VBoxR0
-- TEMPLATE_VBoxR0ExtPack_EXTENDS_BY = appending
-- TEMPLATE_VBoxR0ExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
-- TEMPLATE_VBoxR0ExtPack_DEFS = VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R0
-- if1of ($(VBOX_LDR_FMT), pe lx)
--  TEMPLATE_VBoxR0ExtPack_LIBS = \
--	$(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
--	$(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
-- endif
--
-- TEMPLATE_VBoxRcExtPack = For the raw-mode context extension pack modules.
-- TEMPLATE_VBoxRcExtPack_EXTENDS = VBoxRc
-- TEMPLATE_VBoxRcExtPack_EXTENDS_BY = appending
-- TEMPLATE_VBoxRcExtPack_SYSSUFF = .rc
-- TEMPLATE_VBoxRcExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
-- TEMPLATE_VBoxRcExtPack_DEFS = VBOX_IN_EXTPACK VBOX_IN_EXTPACK_RC
-- if1of ($(VBOX_LDR_FMT32), pe lx)
--  TEMPLATE_VBoxRcExtPack_LIBS = \
--	$(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
--	$(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
-- endif
--
-- TEMPLATE_VBoxInsExtPack = For the install targets of an extension pack.
-- TEMPLATE_VBoxInsExtPack_MODE = 0644
-- TEMPLATE_VBoxInsExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
--
-- # For each individual extension pack
-- ifdef VBOX_WITH_EXTPACK_PUEL
--  TEMPLATE_VBoxR3ExtPackPuel = For the ring-3 context modules in the PUEL extension pack.
--  TEMPLATE_VBoxR3ExtPackPuel_EXTENDS = VBoxR3ExtPack
--  TEMPLATE_VBoxR3ExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
--
--  TEMPLATE_VBoxR0ExtPackPuel = For the ring-0 context modules in the PUEL extension pack.
--  TEMPLATE_VBoxR0ExtPackPuel_EXTENDS = VBoxR0ExtPack
--  TEMPLATE_VBoxR0ExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
--
--  TEMPLATE_VBoxRcExtPackPuel = For the raw-mode context modules in the PUEL extension pack.
--  TEMPLATE_VBoxRcExtPackPuel_EXTENDS = VBoxRcExtPack
--  TEMPLATE_VBoxRcExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
--
--  TEMPLATE_VBoxInsExtPackPuel = For the install targets of an extension pack.
--  TEMPLATE_VBoxInsExtPackPuel_EXTENDS = VBoxR0ExtPack
--  TEMPLATE_VBoxInsExtPackPuel_INST = $(INST_EXTPACK_PUEL)
--endif
--endif # VBOX_WITH_EXTPACK
--
--
- #
- # Qt 4
- # Qt 4
---- VirtualBox-4.2.6.orig/configure	2012-12-19 16:24:34.000000000 -0200
-+++ VirtualBox-4.2.6/configure		2012-12-27 14:26:25.743442978 -0200
-@@ -90,8 +90,6 @@
- WITH_HARDENING=1
- WITH_UDPTUNNEL=1
- WITH_VDE=0
--WITH_VNC=0
--WITH_EXTPACK=1
- WITH_DOCS=1
- BUILD_LIBXML2=
- BUILD_LIBCURL=
-@@ -124,8 +122,6 @@
- MESA="-lGL"
- INCZ=""
- LIBZ="-lz"
--INCVNCSERVER=""
--LIBVNCSERVER="-lvncserver"
- INCDEVMAPPER=""
- LIBDEVMAPPER="-ldevmapper"
- CXX_FLAGS=""
-@@ -930,47 +926,6 @@
- }
- 
- #
--# Check for libvncserver, needed for VNC in OSE
--#
--check_vncserver()
--{
--  test_header libvncserver
--  cat > $ODIR.tmp_src.cc <<EOF
--#include <cstdio>
--#include <rfb/rfbconfig.h>
--
--extern "C" int main()
--{
--  const char* v=LIBVNCSERVER_VERSION;
--  unsigned int major = 0, minor = 0, micro = 0;
--
--  for (; *v !='.' && *v != '\0'; v++) major = major*10 + *v-'0';
--  if (*v == '.') v++;
--  for (; *v !='.' && *v != '\0'; v++) minor = minor*10 + *v-'0';
--  if (*v == '.') v++;
--  for (; *v !='.' && *v != '\0'; v++) micro = micro*10 + *v-'0';
--
--  printf("found version %s", LIBVNCSERVER_PACKAGE_VERSION);
--  if (major*10000 + minor*100 + micro >= 900)
--  {
--    printf(", OK.\n");
--    return 0;
--  }
--  else
--  {
--    printf(", expected version 0.9 or higher\n");
--    return 1;
--  }
--}
--EOF
--  if test_compile "$LIBVNCSERVER $INCVNCSERVER" libvncserver libvncserver; then
--    if test_execute; then
--      cnf_append "VBOX_WITH_EXTPACK_VNC" "1"
--    fi
--  fi
--}
--
--#
- # Check for libcurl, needed by S3
- #
- check_curl()
-@@ -2173,8 +2128,6 @@
- [ $WITH_KMODS   -eq 1 ] && echo "  --disable-kmods          don't build Linux kernel modules (host and guest)"
- [ $WITH_OPENGL  -eq 1 ] && echo "  --disable-opengl         disable OpenGL support (2D & 3D)"
- [ $WITH_GSOAP   -eq 0 ] && echo "  --enable-webservice      enable the webservice stuff"
--[ $OSE          -eq 1 ] && echo "  --enable-vnc             enable the VNC server"
--[ $OSE          -eq 0 ] && echo "  --disable-extpack        don't build the extpack"
- [ $WITH_DOCS    -eq 1 ] && echo "  --disable-docs           don't build the documentation"
- [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo "  --enable-vde             enable VDE networking"
- cat << EOF
-@@ -2346,15 +2299,9 @@
-     --enable-webservice)
-       [ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1
-       ;;
--    --enable-vnc)
--      WITH_VNC=1
--      ;;
-     --disable-hardening)
-       WITH_HARDENING=0
-       ;;
--    --disable-extpack)
--      WITH_EXTPACK=0
--      ;;
-     --disable-docs)
-       WITH_DOCS=0
-       ;;
-@@ -2512,15 +2459,6 @@
-   echo >> $CNF
- fi
- 
--# extpack
--if [ $OSE -eq 0 ]; then
--  if [ $WITH_EXTPACK -eq 1 ]; then
--    BUILD_LIBSSL=1
--  else
--    cnf_append "VBOX_WITH_EXTPACK_PUEL_BUILD" ""
--  fi
--fi
--
- # headless
- if [ -n "$HEADLESS" ]; then
-   cnf_append "VBOX_HEADLESS" "1"
-@@ -2646,15 +2584,6 @@
-   cnf_append "VBOX_WITH_DOCS_PACKING" ""
- fi
- 
--# VNC server support
--if [ $OSE -ge 1 ]; then
--  if [ $WITH_VNC = 1 ]; then
--    check_vncserver
--  else
--    cnf_append "VBOX_WITH_EXTPACK_VNC" ""
--  fi
--fi
--
- # success!
- echo
- echo "Successfully generated '$CNF' and '$ENV'."
---- VirtualBox-4.2.12.orig/Makefile.kmk	2013-04-12 07:33:55.000000000 -0300
-+++ VirtualBox-4.2.12/Makefile.kmk	2013-05-10 15:04:21.967970195 -0300
-@@ -388,7 +388,6 @@
- 	include/VBox \
- 	include/VBox/vmm \
- 	include/VBox/com \
--	include/VBox/ExtPack \
- 	include/VBox/HostServices \
- 	include/VBox/GuestHost \
- 	include/VBox/HGSMI \
-@@ -1010,200 +1009,6 @@
- 
- 
- #
--# Build the extension packs, all of them.
--#
--# This is tailored (hardcoded) for the extension pack build box.
--#
--# The fetching must be done in serial fashion, while the building should be
--# more flexible wrt to -jN.
--#
--extpacks-fetch:
--	+ $(KMK) -C tools fetch VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=darwin  BUILD_TARGET_ARCH=amd64 BUILD_TARGET=darwin   VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=darwin  BUILD_TARGET_ARCH=x86   BUILD_TARGET=darwin   VBOX_ONLY_EXTPACKS=1
--#	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=amd64 BUILD_TARGET=freebsd  VBOX_ONLY_EXTPACKS=1
--#	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=x86   BUILD_TARGET=freebsd  VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=linux   BUILD_TARGET_ARCH=amd64 BUILD_TARGET=linux    VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=linux   BUILD_TARGET_ARCH=x86   BUILD_TARGET=linux    VBOX_ONLY_EXTPACKS=1
--#	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=os2     BUILD_TARGET_ARCH=x86   BUILD_TARGET=os2      VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=solaris BUILD_TARGET_ARCH=amd64 BUILD_TARGET=solaris  VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=solaris BUILD_TARGET_ARCH=x86   BUILD_TARGET=solaris  VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=win     BUILD_TARGET_ARCH=amd64 BUILD_TARGET=win	     VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=win     BUILD_TARGET_ARCH=x86   BUILD_TARGET=win	     VBOX_ONLY_EXTPACKS=1
--
--
--extpacks-build: \
--	extpacks-build-win.amd64 \
--	extpacks-build-win.x86 \
--	extpacks-build-solaris.amd64 \
--	extpacks-build-solaris.x86 \
--	extpacks-build-os2.x86 \
--	extpacks-build-linux.amd64 \
--	extpacks-build-linux.x86 \
--	extpacks-build-darwin.amd64 \
--	extpacks-build-darwin.x86 \
--	extpacks-build-freebsd.amd64 \
--	extpacks-build-freebsd.x86
--
--VBOX_EXTPACKS_BUILD.amd64 = VBOX_ONLY_EXTPACKS=1 \
--	KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
--	KBUILD_TARGET_ARCH=amd64 BUILD_TARGET_ARCH=amd64 \
--	VBOX_SVN_REV=$(VBOX_SVN_REV)
--
--VBOX_EXTPACKS_BUILD.x86 = VBOX_ONLY_EXTPACKS=1 \
--	KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
--	KBUILD_TARGET_ARCH=x86 BUILD_TARGET_ARCH=x86 \
--	VBOX_SVN_REV=$(VBOX_SVN_REV)
--
--# Automatically determine the extpack build subdir name. Used for figuring out
--# directory names inside the extension pack building VMs.
--VBOX_EXTPACKS_BUILD_SUBDIRNAME := $(lastword $(subst /, ,$(PATH_ROOT)))
--
--# When building in parallel on a Windows host, make sure we finish the host
--# bit before kicking off any UNIX guest or we'll run into file sharing issues.
--ifeq ($(KBUILD_TARGET),win)
--VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST = extpacks-build-win.x86 extpacks-build-win.amd64
--else
--VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST =
--endif
--
--extpacks-build-win.amd64:
--ifeq ($(KBUILD_TARGET),win)
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--else
--	$(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
--	$(call VBOX_BLD_VM_MSG_END__,Windows/amd64 extension packs)
--endif
--
--extpacks-build-win.x86:
--ifeq ($(KBUILD_TARGET),win)
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--else
--	$(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_X86_IP) " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.x86) all"
--	$(call VBOX_BLD_VM_MSG_END__,Windows/x86 extension packs)
--endif
--
--ifeq ($(KBUILD_TARGET),solaris)
--extpacks-build-solaris.amd64:
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--
--extpacks-build-solaris.x86: extpacks-build-solaris.amd64
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--
--else
--# Serialize 32-bit and 64-bit ASSUMING the same VM builds both.
--extpacks-build-solaris.rsync-into-vm: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--	$(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,solaris,*) . $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
--
--extpacks-build-solaris.build-it: extpacks-build-solaris.rsync-into-vm
--	$(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
--	$(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 extension packs)
--	$(call VBOX_BLD_VM_MSG_BEGIN,Solaris/x86 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/x86   && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
--	$(call VBOX_BLD_VM_MSG_END__,Solaris/x86 extension packs)
--
--extpacks-build-solaris.rsync-out-of-vm: extpacks-build-solaris.build-it
--	$(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.x86 out/
--	$(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
--
--.NOTPARALLEL: extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm
--.PHONY:       extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm extpacks-build-solaris.build-it
--
--extpacks-build-solaris.amd64: extpacks-build-solaris.rsync-out-of-vm
--extpacks-build-solaris.x86: extpacks-build-solaris.rsync-out-of-vm
--endif
--
--extpacks-build-os2.x86:
--#ifeq ($(KBUILD_TARGET),os2)
--#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--#else
--#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_OS2_IP) " cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) "
--#endif
--
--extpacks-build-linux.amd64:   $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--else
--	$(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
--	$(call VBOX_BLD_VM_MSG_END__,Linux/amd64 extension packs)
--endif
--
--extpacks-build-linux.x86:   $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86)
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--else
--	$(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_NEW_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
--	$(call VBOX_BLD_VM_MSG_END__,Linux/x86 extension packs)
--endif
--
--extpacks-build-freebsd.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.amd64)
--#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--#else
--#	$(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/amd64 extension packs)
--#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
--#	$(call VBOX_BLD_VM_MSG_END__,FreeBSD/amd64 extension packs)
--#endif
--
--extpacks-build-freebsd.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.x86)
--#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--#else
--#	$(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/x86 extension packs)
--#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
--#	$(call VBOX_BLD_VM_MSG_END__,FreeBSD/x86 extension packs)
--#endif
--
--extpacks-build-darwin.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.amd64)
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--else
--	$(call VBOX_BLD_VM_MSG_BEGIN,Darwin/amd64 extension packs)
--	$(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,amd64) . $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_AMD64_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
--	$(VBOX_KMK_TIME) rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
--	$(call VBOX_BLD_VM_MSG_END__,Darwin/amd64 extension packs)
--endif
--
--extpacks-build-darwin.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.x86)
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--else
--	$(call VBOX_BLD_VM_MSG_BEGIN,Darwin/x86 extension packs)
--	$(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,x86) . $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_X86_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
--	$(VBOX_KMK_TIME) rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.x86 out/
--	$(call VBOX_BLD_VM_MSG_END__,Darwin/x86 extension packs)
--endif
--
--
--extpacks-packing:
--	+ $(KMK) VBOX_ONLY_EXTPACKS=1 \
--		VBOX_WITH_EXTPACK_OS_ARCHS="darwin.amd64 darwin.x86 linux.amd64 linux.x86 solaris.amd64 solaris.x86 win.amd64 win.x86" \
--		packing
--# +++ freebsd.amd64 freebsd.x86 os2.x86 ^^^
--
--.PHONY: \
--	extpacks-build-win.x86 \
--	extpacks-build-win.amd64 \
--	extpacks-build-solaris.amd64 \
--	extpacks-build-solaris.x86 \
--	extpacks-build-os2.x86 \
--	extpacks-build-linux.amd64 \
--	extpacks-build-linux.x86 \
--	extpacks-build-freebsd.amd64 \
--	extpacks-build-freebsd.x86 \
--	extpacks-build-darwin.amd64 \
--	extpacks-build-darwin.x86 \
--	extpacks-packing
--
--
--#
- # Build the test suite, all of it.
- #
- # This is currently tailored (hardcoded) for the additions build box just like
---- VirtualBox-4.1.18.orig/src/VBox/Devices/build/VBoxDD.cpp		2012-06-20 10:15:51.000000000 -0300
-+++ VirtualBox-4.1.18/src/VBox/Devices/build/VBoxDD.cpp			2012-07-24 16:18:03.964493454 -0300
-@@ -132,11 +132,6 @@
-     if (RT_FAILURE(rc))
-         return rc;
- #endif
--#ifdef VBOX_WITH_EHCI_IMPL
--    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceEHCI);
--    if (RT_FAILURE(rc))
--        return rc;
--#endif
- #ifdef VBOX_ACPI
-     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceACPI);
-     if (RT_FAILURE(rc))
---- VirtualBox-4.1.18.orig/src/VBox/Devices/build/VBoxDD.h		2012-06-20 10:15:51.000000000 -0300
-+++ VirtualBox-4.1.18/src/VBox/Devices/build/VBoxDD.h			2012-07-24 16:20:35.939205389 -0300
-@@ -62,7 +62,6 @@
- extern const PDMDEVREG g_DeviceICH6_HDA;
- extern const PDMDEVREG g_DeviceAudioSniffer;
- extern const PDMDEVREG g_DeviceOHCI;
--extern const PDMDEVREG g_DeviceEHCI;
- extern const PDMDEVREG g_DeviceACPI;
- extern const PDMDEVREG g_DeviceDMA;
- extern const PDMDEVREG g_DeviceFloppyController;
---- VirtualBox-4.1.18.orig/include/Makefile.kmk		2012-06-20 10:07:49.000000000 -0300
-+++ VirtualBox-4.1.18/include/Makefile.kmk		2012-07-24 21:11:57.007068865 -0300
-@@ -51,7 +51,6 @@
- 	VBox/vd-cache-plugin.h \
- 	VBox/vmm/uvm.h \
- 	VBox/vscsi.h \
--	$(wildcard VBox/ExtPack/*.h ) \
- 	iprt/alloca.h \
- 	iprt/tcp.h \
- 	iprt/localipc.h \
---- VirtualBox-4.2.0.orig/src/Makefile.kmk	2012-08-03 09:28:25.000000000 -0300
-+++ VirtualBox-4.2.0/src/Makefile.kmk		2012-09-19 03:01:57.588337894 -0300
-@@ -23,10 +23,8 @@
- if !defined(VBOX_ONLY_ADDITIONS)
-  include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
- endif
--if defined(VBOX_ONLY_EXTPACKS) && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) && defined(VBOX_WITH_REM)
-- include $(PATH_SUB_CURRENT)/recompiler/Makefile.kmk
- 
--else if !defined(VBOX_ONLY_BUILD)
-+if !defined(VBOX_ONLY_BUILD)
-  # Normal build.
-  if1of ($(KBUILD_TARGET_ARCH), x86 amd64)
-   ifdef VBOX_WITH_REM
---- VirtualBox-4.2.0.orig/src/VBox/Makefile.kmk		2012-05-30 07:39:32.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Makefile.kmk		2012-09-19 00:03:08.577726965 -0300
-@@ -33,19 +33,6 @@
-  include $(PATH_SUB_CURRENT)/HostDrivers/Makefile.kmk
-  include $(PATH_SUB_CURRENT)/Frontends/Makefile.kmk
- 
--else ifdef VBOX_ONLY_EXTPACKS
-- include $(PATH_SUB_CURRENT)/Runtime/Makefile.kmk
-- include $(PATH_SUB_CURRENT)/Devices/Makefile.kmk
-- include $(PATH_SUB_CURRENT)/HostDrivers/Makefile.kmk
-- include $(PATH_SUB_CURRENT)/ExtPacks/Makefile.kmk
-- ifdef VBOX_WITH_VRDP
--  include $(PATH_SUB_CURRENT)/RDP/Makefile.kmk
-- endif
-- include $(PATH_SUB_CURRENT)/VMM/Makefile.kmk
-- ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
--  include $(PATH_SUB_CURRENT)/Disassembler/Makefile.kmk
-- endif
--
- else ifdef VBOX_ONLY_SDK
-  include $(PATH_SUB_CURRENT)/Main/Makefile.kmk
-  ifdef VBOX_WITH_VRDP
-@@ -92,7 +79,6 @@
-  if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
-   include $(PATH_SUB_CURRENT)/NetworkServices/Makefile.kmk
-  endif
-- include $(PATH_SUB_CURRENT)/ExtPacks/Makefile.kmk
-  ifdef VBOX_WITH_INSTALLER
-   include $(PATH_SUB_CURRENT)/Installer/Makefile.kmk 		        # Keep this last.
-  endif
---- VirtualBox-4.2.12.orig/src/libs/Makefile.kmk	2013-04-12 07:39:14.000000000 -0300
-+++ VirtualBox-4.2.12/src/libs/Makefile.kmk		2013-04-13 02:00:29.294392443 -0300
-@@ -48,13 +48,6 @@
-  include $(PATH_SUB_CURRENT)/kStuff/Makefile.kmk
- endif
- 
--# OpenSSL.
--if !defined(VBOX_ONLY_SDK) \
-- && (   "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" \
--     || defined(VBOX_WITH_EXTPACK_PUEL_BUILD))
-- include $(PATH_SUB_CURRENT)/openssl-0.9.8y/Makefile.kmk
--endif
--
- # libjpeg for VRDP video redirection
- if defined(VBOX_WITH_VRDP) && defined(VBOX_WITH_VRDP_VIDEO_CHANNEL)
-  include $(PATH_SUB_CURRENT)/jpeg-8a/Makefile.kmk
---- VirtualBox-4.2.0.orig/src/VBox/Devices/Makefile.kmk		2012-08-03 09:28:25.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Devices/Makefile.kmk		2012-09-19 02:54:35.912748288 -0300
-@@ -25,9 +25,7 @@
- 
- # Include sub-makefiles.
- include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
--if defined(VBOX_WITH_INTEL_PXE) || defined(VBOX_ONLY_EXTPACKS)
-- include $(PATH_SUB_CURRENT)/PC/PXE/Makefile.kmk
--else if defined(VBOX_WITH_PXE_ROM)
-+if defined(VBOX_WITH_PXE_ROM)
-  if !defined(VBOX_WITHOUT_ETHERBOOT)
-   include $(PATH_SUB_CURRENT)/PC/Etherboot-src/Makefile.kmk
-  endif
-@@ -71,9 +69,6 @@
-  ifdef VBOX_WITH_USB
-   VBoxDDU_DEFS           += VBOX_WITH_USB IN_USBLIB
-   VBoxDDU_SDKS.win        = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
--  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
--   VBoxDDU_DEFS          += VBOX_WITH_EHCI_IMPL
--  endif
-   ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
-    VBoxDDU_DEFS.darwin   += VBOX_WITH_NEW_USB_CODE_ON_DARWIN
-   endif
-@@ -326,15 +321,7 @@
-    	Storage/UsbMsd.cpp
-   endif
- 
--  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
--   VBoxDD_DEFS          += VBOX_WITH_EHCI_IMPL
--  endif
-   VBoxDD_DEFS           += VBOX_WITH_USB
--  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
--   VBoxDD_DEFS          += VBOX_WITH_EHCI_IMPL
--   VBoxDD_SOURCES       += \
-- 	USB/DevEHCI.cpp
--  endif
- 
-  endif # VBOX_WITH_USB
- 
-@@ -869,11 +856,6 @@
- 
-   ifdef VBOX_WITH_USB
-    VBoxDDGC_DEFS        += VBOX_WITH_USB
--   if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
--    VBoxDDGC_DEFS       += VBOX_WITH_EHCI_IMPL
--    VBoxDDGC_SOURCES    += \
--  	USB/DevEHCI.cpp
--   endif
-   endif
- 
-   ifdef VBOX_WITH_VIDEOHWACCEL
-@@ -1020,11 +1002,6 @@
-  endif
-  ifdef VBOX_WITH_USB
-  VBoxDDR0_DEFS          += VBOX_WITH_USB
--  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
--   VBoxDDR0_DEFS        += VBOX_WITH_EHCI_IMPL
--   VBoxDDR0_SOURCES     += \
-- 	USB/DevEHCI.cpp
--  endif
-  endif
- 
-  if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
-@@ -1163,50 +1140,5 @@
- endif # !VBOX_ONLY_EXTPACKS
- 
- 
--if defined(VBOX_WITH_EXTPACK_PUEL) && defined(VBOX_WITH_EXTPACK_PUEL_BUILD)
-- #
-- # The EHCI (USB 2.0) Extension Pack Modules.
-- #
-- if defined(VBOX_WITH_USB)
--  DLLS += VBoxEhciR3
--  VBoxEhciR3_TEMPLATE = VBoxR3ExtPackPuel
--  VBoxEhciR3_SOURCES  = USB/DevEHCI.cpp
--
--  SYSMODS += VBoxEhciR0
--  VBoxEhciR0_TEMPLATE = VBoxR0ExtPackPuel
--  VBoxEhciR0_SOURCES  = USB/DevEHCI.cpp
--
--  ifdef VBOX_WITH_RAW_MODE
--   SYSMODS += VBoxEhciRC
--   VBoxEhciRC_TEMPLATE = VBoxRcExtPackPuel
--   VBoxEhciRC_SOURCES  = USB/DevEHCI.cpp
--  endif
-- endif
--
-- if defined(VBOX_WITH_PCI_PASSTHROUGH)
--  DLLS += VBoxPciRawR3
--  VBoxPciRawR3_TEMPLATE = VBoxR3ExtPackPuel
--  VBoxPciRawR3_SOURCES  = Bus/DevPciRaw.cpp
--
--  DLLS += VBoxPciRawDrv
--  VBoxPciRawDrv_TEMPLATE = VBoxR3ExtPackPuel
--  VBoxPciRawDrv_SOURCES = Bus/DrvPciRaw.cpp
--
--  SYSMODS += VBoxPciRawR0
--  VBoxPciRawR0_TEMPLATE = VBoxR0ExtPackPuel
--  VBoxPciRawR0_SOURCES  = Bus/DevPciRaw.cpp
--
--  Bus/DevPciRaw.cpp_INCS   = Bus
-- endif
--
--
-- #
-- # The Intel PXE rom.
-- #
-- INSTALLS += VBoxExtPackPuelInsRoms
-- VBoxExtPackPuelInsRoms_TEMPLATE = VBoxInsExtPackPuel
-- VBoxExtPackPuelInsRoms_SOURCES = PC/PXE/PXE-Intel.rom=>PXE-Intel.rom
--endif # VBOX_WITH_EXTPACK_PUEL
--
- include $(FILE_KBUILD_SUB_FOOTER)
- 
---- VirtualBox-4.2.0.orig/src/VBox/Main/Makefile.kmk	2012-09-04 09:48:44.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Main/Makefile.kmk		2012-09-19 00:46:39.251763337 -0300
-@@ -233,14 +233,12 @@
- 	$(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,) \
- 	$(if $(VBOX_USB_WITH_INOTIFY),VBOX_USB_WITH_INOTIFY,) \
- 	$(if $(VBOX_WITH_LIVE_MIGRATION),VBOX_WITH_LIVE_MIGRATION,) \
--	$(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
- 	$(if $(VBOX_WITH_VUSB),VBOX_WITH_VUSB,) \
- 	$(if $(VBOX_WITH_S3),VBOX_WITH_S3,) \
- 	$(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,)
- ifdef VBOX_WITH_USB
-  VBoxSVC_DEFS += \
- 	VBOX_WITH_USB \
--	$(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI,) \
- 	$(if $(VBOX_WITH_NEW_USB_CODE_ON_DARWIN),VBOX_WITH_NEW_USB_CODE_ON_DARWIN,)
- endif
- VBoxSVC_DEFS.win += VBOX_COM_OUTOFPROC_MODULE
-@@ -293,7 +291,6 @@
- 	src-all/SharedFolderImpl.cpp \
- 	src-all/VirtualBoxBase.cpp \
- 	src-all/VirtualBoxErrorInfoImpl.cpp \
--	$(if $(VBOX_WITH_EXTPACK),src-all/ExtPackManagerImpl.cpp src-all/ExtPackUtil.cpp,) \
- 	src-server/ApplianceImpl.cpp \
- 	src-server/ApplianceImplExport.cpp \
- 	src-server/ApplianceImplImport.cpp \
-@@ -538,8 +535,6 @@
- 	$(if $(VBOX_WITH_DRAG_AND_DROP),VBOX_WITH_DRAG_AND_DROP,) \
- 	$(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,) \
- 	$(if $(VBOX_WITH_USB),VBOX_WITH_USB,) \
--	$(if-expr defined(VBOX_WITH_EHCI) && defined(VBOX_WITH_USB),VBOX_WITH_EHCI,) \
--	$(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
- 	$(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,) \
- 	$(if $(VBOX_WITH_VPX),VBOX_WITH_VPX,)
- 
-@@ -605,7 +600,6 @@
- 	src-all/SharedFolderImpl.cpp \
- 	src-all/VirtualBoxBase.cpp \
- 	src-all/VirtualBoxErrorInfoImpl.cpp \
--	$(if $(VBOX_WITH_EXTPACK),src-all/ExtPackManagerImpl.cpp src-all/ExtPackUtil.cpp,) \
- 	$(if $(VBOX_WITH_USB_VIDEO),src-client/UsbWebcamInterface.cpp,) \
- 	$(if $(VBOX_WITH_USB_CARDREADER),src-client/UsbCardReader.cpp,) \
- 	src-client/Nvram.cpp \
-@@ -733,22 +727,6 @@
- 	$(if $(VBOX_BLEEDING_EDGE),VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\",)
- 
- 
--#
--# The VBoxExtPackHelperApp.
--#
--ifdef VBOX_WITH_EXTPACK
-- PROGRAMS += VBoxExtPackHelperApp
-- VBoxExtPackHelperApp_TEMPLATE = VBoxR3SetUidToRoot
-- VBoxExtPackHelperApp_LDFLAGS.darwin = -framework Security
-- VBoxExtPackHelperApp_LDFLAGS.win = /SUBSYSTEM:windows
-- VBoxExtPackHelperApp_SOURCES = \
--	src-helper-apps/VBoxExtPackHelperApp.cpp \
--	src-all/ExtPackUtil.cpp
-- VBoxExtPackHelperApp_LIBS = \
--	$(LIB_RUNTIME)
--endif # VBOX_WITH_EXTPACK
--
--
- endif # !VBOX_ONLY_SDK (the ifndef is far above)
- 
- 
---- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/Makefile.kmk		2012-07-24 23:25:04.575825175 -0300
-+++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/Makefile.kmk		2012-07-24 23:25:04.619156084 -0300
-@@ -888,7 +888,6 @@
- 	$(VBOX_MACOSX_ICON_FILE)=>Resources/virtualbox.icns \
- 	$(VBOX_BRAND_GUI_VBOX_64PX_PNG)=>Resources/virtualbox.png \
- 	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vbox.icns=>Resources/virtualbox-vbox.icns \
--	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vbox-extpack.icns=>Resources/virtualbox-vbox-extpack.icns \
- 	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ovf.icns=>Resources/virtualbox-ovf.icns \
- 	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ova.icns=>Resources/virtualbox-ova.icns \
- 	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vdi.icns=>Resources/virtualbox-vdi.icns \
---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc		2012-05-30 07:39:18.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc		2012-09-19 00:51:25.413310527 -0300
-@@ -169,18 +169,6 @@
-         <file alias="status_check_32px.png">images/status_check_32px.png</file>
-         <file alias="status_error_16px.png">images/status_error_16px.png</file>
-         <file alias="status_error_32px.png">images/status_error_32px.png</file>
--        <file alias="extension_pack_16px.png">images/extension_pack_16px.png</file>
--        <file alias="extension_pack_disabled_16px.png">images/extension_pack_disabled_16px.png</file>
--        <file alias="extension_pack_32px.png">images/extension_pack_32px.png</file>
--        <file alias="extension_pack_disabled_32px.png">images/extension_pack_disabled_32px.png</file>
--        <file alias="extension_pack_install_16px.png">images/extension_pack_install_16px.png</file>
--        <file alias="extension_pack_install_disabled_16px.png">images/extension_pack_install_disabled_16px.png</file>
--        <file alias="extension_pack_install_32px.png">images/extension_pack_install_32px.png</file>
--        <file alias="extension_pack_install_disabled_32px.png">images/extension_pack_install_disabled_32px.png</file>
--        <file alias="extension_pack_uninstall_16px.png">images/extension_pack_uninstall_16px.png</file>
--        <file alias="extension_pack_uninstall_disabled_16px.png">images/extension_pack_uninstall_disabled_16px.png</file>
--        <file alias="extension_pack_uninstall_32px.png">images/extension_pack_uninstall_32px.png</file>
--        <file alias="extension_pack_uninstall_disabled_32px.png">images/extension_pack_uninstall_disabled_32px.png</file>
-         <file alias="proxy_16px.png">images/proxy_16px.png</file>
-         <file alias="proxy_disabled_16px.png">images/proxy_disabled_16px.png</file>
-         <file alias="proxy_32px.png">images/proxy_32px.png</file>
---- VirtualBox-4.1.18.orig/src/VBox/Installer/linux/Makefile.kmk	2012-07-25 00:32:00.780012664 -0300
-+++ VirtualBox-4.1.18/src/VBox/Installer/linux/Makefile.kmk		2012-07-25 00:32:00.806677728 -0300
-@@ -170,11 +170,6 @@
- 	VBox.sh \
- 	VBox.png
- 
--ifdef VBOX_WITH_EXTPACK
-- VBOX_LNX_STRIP_BIN += \
--	VBoxExtPackHelperApp
--endif
--
- # Qt4 GUI
- ifdef VBOX_WITH_QTGUI
-  include $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
-@@ -286,7 +281,7 @@
- 
- VBOX_MIME_ICONS = \
- 	$(addprefix $(PATH_ROOT)/src/VBox/Resources/other/,\
--	    $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
-+	    $(foreach f,ova ovf vbox vdi vmdk vhd hdd, \
- 	        $(foreach s,16 20 24 32 48 64 72 96 128 256,\
- 		    virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/virtualbox-$(f).png)))
- 
---- VirtualBox-4.1.18.orig/src/VBox/Installer/win/Makefile.kmk		2012-07-25 00:34:52.253398525 -0300
-+++ VirtualBox-4.1.18/src/VBox/Installer/win/Makefile.kmk		2012-07-25 00:34:52.300062531 -0300
-@@ -435,7 +435,6 @@
- 		-E 'VBOX_WITH_DEBUGGER_GUI=$(if-expr defined(VBOX_WITH_DEBUGGER_GUI) && defined(VBOX_WITH_QTGUI),yes,no)' \
- 		-E 'VBOX_WITH_DOCS_PACKING=$(if $(VBOX_WITH_DOCS_PACKING),yes,no)' \
- 		-E 'VBOX_WITH_EFIFW_PACKING=$(if $(VBOX_WITH_EFIFW_PACKING),yes,no)' \
--		-E 'VBOX_WITH_EXTPACK=$(if $(VBOX_WITH_EXTPACK),yes,no)' \
- 		-E 'VBOX_WITH_GUEST_CONTROL=$(if $(VBOX_WITH_GUEST_CONTROL),yes,no)' \
- 		-E 'VBOX_WITH_GUEST_PROPS=$(if $(VBOX_WITH_GUEST_PROPS),yes,no)' \
- 		-E 'VBOX_WITH_NETFLT=$(if $(VBOX_WITH_NETFLT),yes,no)' \
---- VirtualBox-4.2.0.orig/src/VBox/Installer/darwin/Makefile.kmk	2012-09-08 06:36:03.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Installer/darwin/Makefile.kmk		2012-09-19 00:55:08.991167973 -0300
-@@ -497,7 +497,6 @@
- 	MacOS/VirtualBoxVM \
- 	MacOS/VBoxNetAdpCtl \
- 	MacOS/VBoxNetDHCP \
--	MacOS/VBoxExtPackHelperApp \
- 	MacOS/VBoxBalloonCtrl \
- 	MacOS/VBoxAutostart
- ifdef VBOX_WITH_WEBSERVICES
-@@ -522,7 +521,6 @@
- 	Resources/virtualbox.icns \
- 	Resources/virtualbox.png \
- 	Resources/virtualbox-vbox.icns \
--	Resources/virtualbox-vbox-extpack.icns \
- 	Resources/virtualbox-ovf.icns \
- 	Resources/virtualbox-ova.icns \
- 	Resources/virtualbox-vdi.icns \
---- VirtualBox-4.1.18/src/VBox/Installer/solaris/Makefile.kmk.orig	2012-07-25 00:38:48.476398293 -0300
-+++ VirtualBox-4.1.18/src/VBox/Installer/solaris/Makefile.kmk		2012-07-25 00:38:48.516396159 -0300
-@@ -185,12 +185,12 @@
- 
- VBOX_MIME_ICONS = \
- 	$(addprefix $(PATH_ROOT)/src/VBox/Resources/other/,\
--	    $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
-+	    $(foreach f,ova ovf vbox vdi vmdk vhd hdd, \
- 	        $(foreach s,16 20 24 32 48 64 72 96 128 256,\
- 	            virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/mimetypes/virtualbox-$(f).png)))
- 
- SOLARIS_COMMON_ICONS = \
--	$(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
-+	$(foreach f,ova ovf vbox vdi vmdk vhd hdd, \
- 	    $(foreach s,16 20 24 32 48 64 72 96 128 256,\
- 	        $(s)x$(s)/mimetypes/virtualbox-$(f).png))
- 
-@@ -210,7 +210,6 @@
- 	$(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
- 	$(if $(VBOX_WITH_NETADP),VBoxNetAdpCtl,) \
- 	VBoxNetDHCP \
--	$(if $(VBOX_WITH_EXTPACK),VBoxExtPackHelperApp,) \
- 	VBoxSVC \
- 	$(if $(VBOX_WITH_CROGL),VBoxTestOGL,) \
- 	VBoxXPCOMIPCD \
---- VirtualBox-4.1.18.orig/src/VBox/Runtime/Makefile.kmk	2012-07-25 00:40:58.745522450 -0300
-+++ VirtualBox-4.1.18/src/VBox/Runtime/Makefile.kmk		2012-07-25 00:40:58.782186960 -0300
-@@ -53,15 +53,6 @@
-  #
-  LIBRARIES += RuntimeR3 RuntimeBldProg
- 
--else ifdef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
-- #
-- # Build docs only - need just regular R3 runtime.
-- #
-- LIBRARIES += RuntimeBldProg
-- LIBRARIES.solaris += RuntimeR0Stub
-- LIBRARIES.win += RuntimeR0Stub RuntimeRCStub
-- include $(PATH_SUB_CURRENT)/tools/Makefile.kmk
--
- else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_TESTSUITE && !VBOX_ONLY_DOCS
- 
-  #
-diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp
---- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp	2013-04-12 07:38:01.000000000 -0300
-+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp		2013-05-23 18:59:56.434051894 -0300
-@@ -650,27 +650,6 @@
-     }
- };
- 
--class PerformInstallGuestToolsAction : public UIActionSimple
--{
--    Q_OBJECT;
--
--public:
--
--    PerformInstallGuestToolsAction(QObject *pParent)
--        : UIActionSimple(pParent, ":/guesttools_16px.png", ":/guesttools_disabled_16px.png")
--    {
--        retranslateUi();
--    }
--
--protected:
--
--    void retranslateUi()
--    {
--        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "&Install Guest Additions...")), gMS->shortcut(UIMachineShortcuts::InstallGuestAdditionsShortcut)));
--        setStatusTip(QApplication::translate("UIActionPool", "Mount the Guest Additions installation image"));
--    }
--};
--
- #ifdef VBOX_WITH_DEBUGGER_GUI
- class MenuDebugAction : public UIActionMenu
- {
-@@ -889,7 +868,6 @@
-     m_pool[UIActionIndexRuntime_Simple_NetworkAdaptersDialog] = new ShowNetworkAdaptersDialogAction(this);
-     m_pool[UIActionIndexRuntime_Simple_SharedFoldersDialog] = new ShowSharedFoldersDialogAction(this);
-     m_pool[UIActionIndexRuntime_Toggle_VRDEServer] = new ToggleVRDEServerAction(this);
--    m_pool[UIActionIndexRuntime_Simple_InstallGuestTools] = new PerformInstallGuestToolsAction(this);
- 
- #ifdef VBOX_WITH_DEBUGGER_GUI
-     /* 'Debug' actions: */
-diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h
---- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h	2013-04-12 07:38:01.000000000 -0300
-+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h		2013-05-24 11:26:13.789861574 -0300
-@@ -62,7 +62,6 @@
-     UIActionIndexRuntime_Menu_SharedFolders,
-     UIActionIndexRuntime_Simple_SharedFoldersDialog,
-     UIActionIndexRuntime_Toggle_VRDEServer,
--    UIActionIndexRuntime_Simple_InstallGuestTools,
- 
- #ifdef VBOX_WITH_DEBUGGER_GUI
-     /* 'Debugger' menu actions: */
-diff -Nur VirtualBox-4.2.14.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp VirtualBox-4.2.14/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
---- VirtualBox-4.2.14.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	2013-06-21 09:26:42.000000000 -0300
-+++ VirtualBox-4.2.14/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	2013-06-24 18:08:12.915719347 -0300
-@@ -704,7 +704,6 @@
-     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders));
-     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog));
-     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer));
--    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools));
- 
-     /* Move actions into running-n-paused-n-stuck actions group: */
-     m_pRunningOrPausedOrStuckActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_PowerOff));
-@@ -765,8 +764,6 @@
-             this, SLOT(sltOpenSharedFoldersDialog()));
-     connect(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer), SIGNAL(toggled(bool)),
-             this, SLOT(sltSwitchVrde(bool)));
--    connect(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools), SIGNAL(triggered()),
--            this, SLOT(sltInstallGuestAdditions()));
- 
- #ifdef VBOX_WITH_DEBUGGER_GUI
-     /* "Debug" actions connections: */
-diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp
---- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp	2013-04-12 07:38:01.000000000 -0300
-+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp		2013-05-24 11:28:03.193841501 -0300
-@@ -244,8 +244,6 @@
-     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkAdaptersDialog));
-     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog));
-     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer));
--    pMenu->addSeparator();
--    pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools));
- }
- 
- #ifdef VBOX_WITH_DEBUGGER_GUI
diff --git a/libre/virtualbox-libre/os_blag.png b/libre/virtualbox-libre/os_blag.png
deleted file mode 100644
index 61995ca10..000000000
--- a/libre/virtualbox-libre/os_blag.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_blag_64.png b/libre/virtualbox-libre/os_blag_64.png
deleted file mode 100644
index aa4463a97..000000000
--- a/libre/virtualbox-libre/os_blag_64.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_dragora.png b/libre/virtualbox-libre/os_dragora.png
deleted file mode 100644
index d1df45880..000000000
--- a/libre/virtualbox-libre/os_dragora.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_dragora_64.png b/libre/virtualbox-libre/os_dragora_64.png
deleted file mode 100644
index 64bcecf20..000000000
--- a/libre/virtualbox-libre/os_dragora_64.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_dynebolic.png b/libre/virtualbox-libre/os_dynebolic.png
deleted file mode 100644
index 67b07d4c0..000000000
--- a/libre/virtualbox-libre/os_dynebolic.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_gnewsense.png b/libre/virtualbox-libre/os_gnewsense.png
deleted file mode 100644
index 76d9e38b3..000000000
--- a/libre/virtualbox-libre/os_gnewsense.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_gnewsense_64.png b/libre/virtualbox-libre/os_gnewsense_64.png
deleted file mode 100644
index 8859c34e8..000000000
--- a/libre/virtualbox-libre/os_gnewsense_64.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_gnu.png b/libre/virtualbox-libre/os_gnu.png
deleted file mode 100644
index 26c4550f9..000000000
--- a/libre/virtualbox-libre/os_gnu.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_gnu_64.png b/libre/virtualbox-libre/os_gnu_64.png
deleted file mode 100644
index 4161634e9..000000000
--- a/libre/virtualbox-libre/os_gnu_64.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_gnuhurd.png b/libre/virtualbox-libre/os_gnuhurd.png
deleted file mode 100644
index 26c4550f9..000000000
--- a/libre/virtualbox-libre/os_gnuhurd.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_gnulinux.png b/libre/virtualbox-libre/os_gnulinux.png
deleted file mode 100644
index 26c4550f9..000000000
--- a/libre/virtualbox-libre/os_gnulinux.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_gnulinux_64.png b/libre/virtualbox-libre/os_gnulinux_64.png
deleted file mode 100644
index 4161634e9..000000000
--- a/libre/virtualbox-libre/os_gnulinux_64.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_musix.png b/libre/virtualbox-libre/os_musix.png
deleted file mode 100644
index fb7b94577..000000000
--- a/libre/virtualbox-libre/os_musix.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_musix_64.png b/libre/virtualbox-libre/os_musix_64.png
deleted file mode 100644
index a1bbbbf3a..000000000
--- a/libre/virtualbox-libre/os_musix_64.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_os64base.png b/libre/virtualbox-libre/os_os64base.png
deleted file mode 100644
index 7aec20314..000000000
--- a/libre/virtualbox-libre/os_os64base.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_os64base.xcf b/libre/virtualbox-libre/os_os64base.xcf
deleted file mode 100644
index d8e28e35e..000000000
--- a/libre/virtualbox-libre/os_os64base.xcf
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_osbase.png b/libre/virtualbox-libre/os_osbase.png
deleted file mode 100644
index 00f197fca..000000000
--- a/libre/virtualbox-libre/os_osbase.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_osbase.xcf b/libre/virtualbox-libre/os_osbase.xcf
deleted file mode 100644
index c4463c857..000000000
--- a/libre/virtualbox-libre/os_osbase.xcf
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_parabola.png b/libre/virtualbox-libre/os_parabola.png
deleted file mode 100644
index 757abc484..000000000
--- a/libre/virtualbox-libre/os_parabola.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_parabola_64.png b/libre/virtualbox-libre/os_parabola_64.png
deleted file mode 100644
index 5ac7c2767..000000000
--- a/libre/virtualbox-libre/os_parabola_64.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_trisquel.png b/libre/virtualbox-libre/os_trisquel.png
deleted file mode 100644
index c6f0d3d7a..000000000
--- a/libre/virtualbox-libre/os_trisquel.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_trisquel_64.png b/libre/virtualbox-libre/os_trisquel_64.png
deleted file mode 100644
index ebca3dd43..000000000
--- a/libre/virtualbox-libre/os_trisquel_64.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_ututo.png b/libre/virtualbox-libre/os_ututo.png
deleted file mode 100644
index e1dffb575..000000000
--- a/libre/virtualbox-libre/os_ututo.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_ututo_64.png b/libre/virtualbox-libre/os_ututo_64.png
deleted file mode 100644
index 158468e0a..000000000
--- a/libre/virtualbox-libre/os_ututo_64.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_venenux.png b/libre/virtualbox-libre/os_venenux.png
deleted file mode 100644
index 5e0c1585d..000000000
--- a/libre/virtualbox-libre/os_venenux.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/vboxservice.service b/libre/virtualbox-libre/vboxservice.service
deleted file mode 100644
index bbd61617d..000000000
--- a/libre/virtualbox-libre/vboxservice.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=VirtualBox Guest Service
-ConditionVirtualization=oracle
-
-[Service]
-ExecStart=/usr/bin/VBoxService -f
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/virtualbox-libre/vboxweb.service b/libre/virtualbox-libre/vboxweb.service
deleted file mode 100644
index 303381597..000000000
--- a/libre/virtualbox-libre/vboxweb.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=VirtualBox Web Service
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/vboxweb.pid
-ExecStart=/usr/bin/vboxwebsrv --pidfile /run/vboxweb.pid  --background
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
deleted file mode 100644
index 067c5b35e..000000000
--- a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# arg 1:  the new package version
-post_install() {
-  dkms add vboxguest/${1%-*}
-  cat << EOF
-==> To build and install your modules run: dkms install vboxguest/${1%-*}
-==> To do this automatically at startup run: systemctl enable dkms.service
-EOF
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  pre_remove "$2"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  # Remove modules using dkms
-  [ -n "${1%-*}" ] && dkms remove vboxguest/${1%-*} --all >/dev/null || true
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-utils.install b/libre/virtualbox-libre/virtualbox-libre-guest-utils.install
deleted file mode 100755
index 38bbe807d..000000000
--- a/libre/virtualbox-libre/virtualbox-libre-guest-utils.install
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# arg 1:  the new package version
-post_install() {
-  getent group vboxsf > /dev/null || groupadd -g 109 vboxsf
-  true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-  # rename /etc/rc.d/vboxservice
-  if [ "`vercmp $2 4.1.18-3`" -lt 0 ]; then
-    cat << EOF
-==> rc.d vbox-service script was renamed to vboxservice.
-EOF
-  fi
-  # fix gid of vboxsf
-  if [ "`vercmp $2 4.1.18-4`" -lt 0 ]; then
-    groupmod -g 109 vboxsf
-  fi
-  true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  groupdel vboxsf >/dev/null 2>&1 || true
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
deleted file mode 100644
index 8bc316e49..000000000
--- a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
+++ /dev/null
@@ -1,30 +0,0 @@
-#/bin/sh
-
-# arg 1:  the new package version
-post_install() {
-  dkms add vboxhost/${1%-*}
-  cat << EOF
-==> To build and install your modules run: dkms install vboxhost/${1%-*}
-==> To do this automatically at startup run: systemctl enable dkms.service
-EOF
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  pre_remove "$2"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  # Remove modules using dkms
-  [ -n "${1%-*}" ] && dkms remove vboxhost/${1%-*} --all >/dev/null || true
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install
deleted file mode 100644
index ad4f70f76..000000000
--- a/libre/virtualbox-libre/virtualbox-libre.install
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-utils() {
-  if [ -x usr/bin/update-mime-database ]; then
-    update-mime-database usr/share/mime > /dev/null 2>&1
-  fi
-
-  if [ -x usr/bin/xdg-icon-resource ]; then
-    xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1
-  fi
-
-  if [ -x usr/bin/update-desktop-database ]; then
-    usr/bin/update-desktop-database -q
-  fi
-
-  if [ -x usr/bin/udevadm ]; then
-    usr/bin/udevadm control --reload
-  fi
-}
-
-# arg 1:  the new package version
-post_install() {
-  getent group vboxusers >/dev/null || usr/sbin/groupadd -g 108 vboxusers
-  utils
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-}
-
-# arg 1:  the old package version
-post_remove() {
-  groupdel vboxusers >/dev/null 2>&1 || true
-  utils
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD
deleted file mode 100644
index 17d02e437..000000000
--- a/libre/webmin/PKGBUILD
+++ /dev/null
@@ -1,216 +0,0 @@
-# $Id: PKGBUILD 195997 2013-10-07 10:38:56Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=webmin
-pkgver=1.660
-pkgrel=1
-pkgdesc="a web-based interface for system administration (Parabola rebranded)"
-arch=(i686 x86_64 mips64el)
-license=('custom:webmin')
-url="http://www.webmin.com/"
-depends=('perl' 'perl-perl4-corelibs')
-makedepends=('perl-net-ssleay')
-backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/config' 'etc/webmin/webmin.cats' \
-'etc/webmin/pacman/config' \
-'etc/webmin/at/config' \
-'etc/webmin/acl/config' \
-'etc/webmin/lvm/config' \
-'etc/webmin/net/config' \
-'etc/webmin/nis/config' \
-'etc/webmin/pam/config' \
-'etc/webmin/cron/config' \
-'etc/webmin/file/config' \
-'etc/webmin/grub/config' \
-'etc/webmin/init/config' \
-'etc/webmin/ipfw/config' \
-'etc/webmin/lilo/config' \
-'etc/webmin/proc/config' \
-'etc/webmin/raid/config' \
-'etc/webmin/spam/config' \
-'etc/webmin/sshd/config' \
-'etc/webmin/time/config' \
-'etc/webmin/cluster-passwd/config' \
-'etc/webmin/software/config' \
-'etc/webmin/webminlog/config' \
-'etc/webmin/cluster-webmin/config' \
-'etc/webmin/bind8/config' \
-'etc/webmin/dhcpd/config' \
-'etc/webmin/fdisk/config' \
-'etc/webmin/mount/config' \
-'etc/webmin/mysql/config' \
-'etc/webmin/quota/config' \
-'etc/webmin/samba/config' \
-'etc/webmin/shell/config' \
-'etc/webmin/squid/config' \
-'etc/webmin/adsl-client/config' \
-'etc/webmin/servers/config' \
-'etc/webmin/cluster-shell/config' \
-'etc/webmin/bandwidth/config' \
-'etc/webmin/ppp-client/config' \
-'etc/webmin/lpadmin/config' \
-'etc/webmin/apache/config' \
-'etc/webmin/firewall/config' \
-'etc/webmin/stunnel/config' \
-'etc/webmin/burner/config' \
-'etc/webmin/exports/config' \
-'etc/webmin/backup-config/config' \
-'etc/webmin/custom/config' \
-'etc/webmin/htaccess-htpasswd/config' \
-'etc/webmin/logrotate/config' \
-'etc/webmin/format/config' \
-'etc/webmin/fsdump/config' \
-'etc/webmin/passwd/config' \
-'etc/webmin/cluster-useradmin/config' \
-'etc/webmin/cluster-software/config' \
-'etc/webmin/cluster-copy/config' \
-'etc/webmin/cluster-cron/config' \
-'etc/webmin/telnet/config' \
-'etc/webmin/status/config' \
-'etc/webmin/syslog/config' \
-'etc/webmin/updown/config' \
-'etc/webmin/usermin/config' \
-'etc/webmin/webmin/config' \
-'etc/webmin/xinetd/config' \
-'etc/webmin/openslp/config' \
-'etc/webmin/procmail/config' \
-'etc/webmin/fetchmail/config' \
-'etc/webmin/postgresql/config' \
-'etc/webmin/useradmin/config' \
-'etc/webmin/mailboxes/config' \
-'etc/webmin/inittab/config' \
-'etc/webmin/change-user/config' \
-'etc/webmin/postfix/config' \
-'etc/webmin/proftpd/config' \
-'etc/webmin/pserver/config' \
-'etc/webmin/dnsadmin/config' )
-install=webmin.install
-source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
-	ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 
-	ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2
-	webmin.service) 
-options=(!strip)
-
-package() {
-  # NOTE: USE --asroot build option to avoid fakeroot error!
-  cd "$srcdir"/$pkgname-$pkgver
-  # add patches from webmin.com
-  #for i in ../*.wbm 
-  #do tar xvf $i
-  #done
-  #for i in ../*.wbt
-  #do tar xvf $i
-  #done
-  # delete stuff that's not needed
-  rm -f mount/freebsd-mounts*
-  rm -f mount/openbsd-mounts*
-  rm -f mount/macos-mounts*
-  
-  # remove modules we do not support
-  rm -rf {bacula-backup,ldap-useradmin,mon,sentry,frox,jabber,majordomo,qmail,sendmail,sarg,wuftpd,webalizer,inetd,ipsec,pap,pptp-client,pptp-server,shorewall,smart-status,vgetty,heartbeat,cfengine,cpan,sgiexports,hpuxexports,qmailadmin,bsdexports,dfsadmin}
-  
-  #remove config files from other distros
-  rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*')
-  
-  # remove caldera theme
-  rm -rf caldera
-
-  # remove init-scripts from other distros
-  rm webmin-gentoo-init
-  rm webmin-init
-  rm webmin-caldera-init
-  rm webmin-daemon
-
-  # remove update stuff to avoid problems with updating webmin,modules and themes without pacman
-  rm -f webmin/{update.cgi,update.pl,update_sched.cgi,upgrade.cgi,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi}
-  rm -f usermin/{upgrade.cgi,update.cgi,update.pl,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi}
-
-  # remove modules add because we don't want files installed without pacman control
-  rm -f webmin/{install_mod.cgi,delete_mod.cgi}  
-
-  # setting perl path
-  (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-  
-  # create dirs
-  mkdir -p "$pkgdir"/opt/webmin
-  mkdir -p "$pkgdir"/var/log/webmin
-  mkdir -p "$pkgdir"/etc/webmin
-  
-  # install pam stuff
-  install -D -m 644 webmin-pam "$pkgdir"/etc/pam.d/webmin
-  
-  # remove other distros and add only Parabola GNU/Linux-libre don't change next line else it will not work!
-  rm os_list.txt
-  echo 'Parabola GNU/linux-libre			Any version	generic-linux	*	-d "/etc/pacman.d"' >> os_list.txt
-  
-  # Add rc.conf support to boot and shutdown menu and lock editing of this module
-  cd init/
-  sed -i -e 's:^local_down=.*:local_down=Parabola GNU/Linux-libre RC.CONF,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*')
-  sed -i -e 's:^local_script=.*:local_script=Parabola GNU/Linux-libre RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') 
-  sed -i -e 's:^index_downscript=.*:index_downscript=Parabola GNU/Linux-libre RC.CONF:g' lang/*
-  sed -i -e 's:^index_script=.*:index_script=Parabola GNU/Linux-libre RC.LOCAL:g' lang/*
-  sed -i -e 's:^noconfig=0:noconfig=1:g'  defaultacl
-
-  # Add pacman menu
-  cd "$srcdir"/$pkgname-$pkgver
-  cp -rf custom/ pacman
-  cp -rf mscstyle3/custom mscstyle3/pacman
-  sed -i -e 's:^noconfig=0:noconfig=1:g' -e 's:^edit=1:edit=0:g' pacman/defaultacl
-  sed -i -e '/desc/d' -e '/longdesc/d' pacman/module.info
-  sed -i -e 's:^name=Custom:name=Pacman:g' pacman/module.info
-  echo 'category=system' >> pacman/module.info
-  echo 'desc=Pacman' >> pacman/module.info
-  sed -i -e 's:^index_title=.*:index_title=Pacman:g' pacman/lang/*
-
-  # copy stuff to right dirs
-  cd "$srcdir"/$pkgname-$pkgver
-  cp -rp * "$pkgdir"/opt/webmin
-  cd "$srcdir"/webmin-config
-  cp -rfp * "$pkgdir"/opt/webmin
-
-  # define parameters for setup.sh
-  config_dir="$pkgdir"/etc/webmin
-  var_dir="$pkgdir"/var/log/webmin
-  perl=/usr/bin/perl
-  autoos=1
-  port=10000
-  login=root
-  crypt="XXX"
-  ssl=1
-  atboot=0
-  nostart=1
-  nochown=1
-  autothird=1
-  nouninstall=1
-  noperlpath=1
-  atbootyn=n
-  tempdir="$pkgdir"/tmp
-  export config_dir var_dir perl autoos port tempdir login crypt ssl nochown autothird nouninstall nostart noperlpath atbootyn
-  
-  # Fix setup.sh
-  sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/webmin/setup.sh
-  "$pkgdir"/opt/webmin/setup.sh
-  
-  # Fixup the config files to use their real locations
-  sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf
-  find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \; 
-  
-  # make it only accessible by localhost
-  echo 'allow=127.0.0.1' >> "$pkgdir"/etc/webmin/miniserv.conf
-  
-  # install pacman menu
-  cd "$srcdir"/webmin-pacman/config
-  cp -rfp * "$pkgdir"/etc/webmin/pacman
-
-  # install systemd files
-  install -D -m 644 $srcdir/webmin.service $pkgdir/usr/lib/systemd/system/webmin.service
-
-  # delete temp dir
-  rm -r "$pkgdir"/tmp
-  # change sticky bit
-  chmod 0644 $pkgdir/opt/webmin/man/config-generic-linux
-  # install license
-  install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
-}
-md5sums=('56a685a665b864470eeb7ce6b97961d8'
-         'b0b3e3fb231a12e60165b6b4d604dcfa'
-         'c86518037449e0fc0c60fc24537ea038'
-         'fc29ecb6a5cd8c278abe054e60381095')
diff --git a/libre/webmin/webmin.install b/libre/webmin/webmin.install
deleted file mode 100644
index efdd9291d..000000000
--- a/libre/webmin/webmin.install
+++ /dev/null
@@ -1,35 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
-  crypt=${crypt//\\/\\\\}
-  crypt=${crypt//\//\\\/}
-  sed -i "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users
-
-cat << EOF
-Note:
-==> It is not allowed to install 3rd party modules, or delete existing modules.
-==> Please write your own PKGBUILDS for 3rd party modules and additional themes.
-Setup:
-==> To make webmin start at boot time, add webmin to rc.conf daemons
-==> Point your web browser to http://localhost:10000 to use webmin.
-==> The access is restricted to localhost, if you want to connect from other locations
-==> change /etc/webmin/miniserv.conf to something like that: allow=127.0.0.1 <your-ip>
-==> If you want to have ssl encryption please install 'perl-net-ssleay' additional.
-EOF
-# fix man module
-  cd /opt/webmin/man
-  for i in $(find . -name '*.gz'); do
-  gzip -df $i
-  done
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  # uninstall unzipped files
-  rm -r /opt/webmin/man
-}
diff --git a/libre/webmin/webmin.service b/libre/webmin/webmin.service
deleted file mode 100644
index a8a384a8c..000000000
--- a/libre/webmin/webmin.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Webmin
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/etc/webmin/start
-ExecStop=/etc/webmin/stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/wings3d-libre/PKGBUILD b/libre/wings3d-libre/PKGBUILD
deleted file mode 100644
index dfbd783c7..000000000
--- a/libre/wings3d-libre/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 95697 2013-08-15 18:20:27Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: kappa <kappacurve@gmail.com>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
-
-_name=wings
-_pkgname=${_name}3d
-pkgname=$_pkgname-libre
-pkgver=1.5.2
-pkgrel=1
-pkgdesc='3D modeling program, without nonfree kerkythea render support'
-arch=('x86_64' 'i686' 'mips64el')
-url='http://www.wings3d.com/'
-license=('GPL')
-depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils' 'erlang')
-makedepends=('gendesk')
-optdepends=('povray-libre: rendering support via POV-Ray')
-provides=("$_pkgname")
-conflicts=("$_pkgname")
-replaces=("$_pkgname")
-install=$_pkgname.install
-source=("$_pkgname-$pkgver.tar.gz::https://github.com/dgud/wings/archive/v$pkgver.tar.gz"
-        "$_pkgname.sh"
-        "$_pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png")
-sha256sums=('d86980e4fa91a04ca96b989b0dcba53a37c8cfda4e6d98accb8e7bd9a289094b'
-            '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e'
-            '6658977cc3bc8db2c9358edf3a2d6cb6bb8084c9a1d96ca573a83dd4e8781f1a')
-
-prepare() {
-  gendesk --pkgname "$_pkgname" --pkgdesc "$pkgdesc" \
-    --genericname '3D Modeler' --categories 'Graphics;3DGraphics'
-
-  cd "$_name-$pkgver"
-  sed -i "s|v1[.]2[.]x[.]y[.]WINGS|v$pkgver.$pkgrel.PARABOLA|" WINGS-VERSION-GEN
-}
-
-build() {
-  cd "$_name-$pkgver"
-
-  export ESDL_PATH=$(echo /usr/lib/erlang/lib/esdl-*)
-  make
-  make lang
-}
-
-package() {
-  cd "$_name-$pkgver"
-
-  mkdir -p "$pkgdir/usr/lib/$_pkgname"
-  for subdir in ebin fonts patches plugins shaders textures; do
-    cp -r "$srcdir/$_name-$pkgver/$subdir/" "$pkgdir/usr/lib/$_pkgname"
-  done
-  cd "$srcdir"
-  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"
-
-  msg 'remove nonfree kerkythea render support plugin'
-  rm -v $pkgdir/usr/lib/wings3d/plugins/import_export/wpc_kerky.beam
-
-  msg 'remove obsolete yafray render support plugin'
-  rm -v $pkgdir/usr/lib/wings3d/plugins/import_export/wpc_yafray{.beam,_{de,en,fr,ko}.lang}
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/wings3d-libre/wings3d.install b/libre/wings3d-libre/wings3d.install
deleted file mode 100644
index 98f3ea190..000000000
--- a/libre/wings3d-libre/wings3d.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_upgrade() {
-  #gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_install() {
-  post_upgrade
-}
-
-post_remove() {
-  post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/wings3d-libre/wings3d.png b/libre/wings3d-libre/wings3d.png
deleted file mode 100644
index 1fe6579dc..000000000
--- a/libre/wings3d-libre/wings3d.png
+++ /dev/null
diff --git a/libre/wings3d-libre/wings3d.sh b/libre/wings3d-libre/wings3d.sh
deleted file mode 100644
index c0fd3b2fb..000000000
--- a/libre/wings3d-libre/wings3d.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-erl -noinput -smp disable -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin -run wings_start start_halt ${1+"$@"}
diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD
index 0d3f55edc..e606e65f4 100644
--- a/libre/xarchiver-libre/PKGBUILD
+++ b/libre/xarchiver-libre/PKGBUILD
@@ -1,64 +1,105 @@
-# $Id: PKGBUILD 154769 2012-03-30 16:45:24Z pierre $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
+# $Id: PKGBUILD 104651 2014-01-24 08:23:36Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=xarchiver
 pkgname=xarchiver-libre
 pkgver=0.5.2
-pkgrel=5.1
-pkgdesc="GTK+ frontend to various command line archivers"
+pkgrel=6
+pkgdesc="GTK+ frontend to various command line archivers, with unar support"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://xarchiver.sourceforge.net"
+url="http://xarchiver.sourceforge.net/"
 license=('GPL')
-groups=('xfce4-goodies')
-depends=('gtk2' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool')
 provides=("$_pkgname=$pkgver")
 conflicts=("$_pkgname")
-replacesk=("$_pkgname")
-optdepends=('tar: TAR support'
-            'gzip: GZIP support'
-            'bzip2: BZIP2 support'
-            'zip: ZIP support'
+replaces=("$_pkgname")
+depends=('gtk2' 'desktop-file-utils')
+makedepends=('intltool')
+optdepends=('zip: ZIP support'
             'unzip: ZIP support'
             'unar: RAR support'
             'p7zip: 7z support'
             'arj: ARJ support'
-            'lha: LHA support'
-            'xz: LZMA support'
-            'lzop: LZOP support')
-options=('!libtool')
+            'lzop: LZOP support'
+            'cpio: RPM support')
 install=xarchiver.install
 source=(http://downloads.sourceforge.net/xarchiver/xarchiver-$pkgver.tar.bz2
-        # rpm2cpio.patch by Daniel Hokka Zakrisson
-        # taken from https://bugzilla.redhat.com/show_bug.cgi?id=577480
-        # sent upstream through
-        # https://sourceforge.net/tracker/?func=detail&aid=3310768&group_id=140153&atid=745602
-        xarchiver-0.5.2-rpm2cpio.patch
-        # segfault-open-with.patch by Bastiaan Jacques
-        # taken from https://bugzilla.redhat.com/show_bug.cgi?id=690012
-        # sent upstream through
-        # https://sourceforge.net/tracker/?func=detail&aid=3310778&group_id=140153&atid=745600
+        xarchiver-0.5.2-no-donators-menu.patch
+        xarchiver-0.5.2-add_xz_support.patch
         xarchiver-0.5.2-segfault-open-with.patch
-        # fix-7z-support.patch by taken from
-        # https://sourceforge.net/tracker/?func=detail&aid=3137589&group_id=140153&atid=745602
-        xarchiver-0.5.2-fix_7z_support.patch)
+        xarchiver-0.5.2-fix_7z_support.patch
+        xarchiver-0.5.2-drag-n-drop_escaped_path.patch
+        xarchiver-0.5.2-fix-double-escaping.patch
+        xarchiver-0.5.2-fix-non-existent-archive.patch
+        xarchiver-0.5.2-segfault-delete-file.patch
+        xarchiver-0.5.2-segfault-password-protected.patch
+        xarchiver-0.5.2-add_unar_support.patch
+        xarchiver-0.5.2-add_mime_types.patch)
 md5sums=('2bc7f06403cc6582dd4a8029ec9d038d'
-         'd4a1accdbba2b50e5707097dd3548d7a'
+         '7ef9fe9aee9f0fbc141ed9683e91ea1c'
+         '5d5ef8dd1b8b7790af4ece5fcedcd370'
          'f9036a44157b318cbc59ed012b04974b'
-         '782f55c1f1021dc02c7739bf8a47336e')
+         '782f55c1f1021dc02c7739bf8a47336e'
+         'fcd9e04222c5e0ef459977bd7cd0ae4e'
+         '6178d7ab679b761469c880a8db991907'
+         '22ed2783e72684a102243c5834bf5ca3'
+         'e518b1e0bc4407383aae2783c0c19a04'
+         'c46daf2ee9fce7ece608eca33174db6b'
+         '1bfed3e1a9f8f4858ec90f0d66cfc5ba'
+         '36a4c3181230aab1e0ce1596acc5ef88')
 
-build() {
-  cd "$srcdir/xarchiver-$pkgver"
-  #patches taken from: http://pkgs.fedoraproject.org/gitweb/?p=xarchiver.git
-  patch -Np1 -i ../xarchiver-0.5.2-rpm2cpio.patch
+prepare() {
+  cd $_pkgname-$pkgver
+
+  # Fix donators menu item (upstream patch)
+  patch -Np2 -i ../xarchiver-0.5.2-no-donators-menu.patch
+
+  # Add XZ support
+  # http://sourceforge.net/p/xarchiver/bugs/28/
+  patch -Np1 -i ../xarchiver-0.5.2-add_xz_support.patch
+
+  # Fix segfault on open with dialog
+  # http://sourceforge.net/p/xarchiver/bugs/52/
   patch -Np1 -i ../xarchiver-0.5.2-segfault-open-with.patch
+
+  # Fix 7z support
+  # http://sourceforge.net/p/xarchiver/patches/5/
   patch -Np1 -i ../xarchiver-0.5.2-fix_7z_support.patch
+
+  # Fix extraction when the Drag'n'Drop target path contains spaces
+  patch -Np1 -i ../xarchiver-0.5.2-drag-n-drop_escaped_path.patch
+
+  # Fix error when trying to create archives with spaces
+  patch -Np1 -i ../xarchiver-0.5.2-fix-double-escaping.patch
+
+  # Fix segfault when non-existent archive specified
+  patch -Np1 -i ../xarchiver-0.5.2-fix-non-existent-archive.patch
+
+  # Fix segfault when deleting a file
+  patch -Np1 -i ../xarchiver-0.5.2-segfault-delete-file.patch
+
+  # Fix segfault when handling password protected files
+  patch -Np1 -i ../xarchiver-0.5.2-segfault-password-protected.patch
+
+  # Add unar support
+  patch -Np1 -i ../xarchiver-0.5.2-add_unar_support.patch
+
+  # Add more MIME types in the desktop file
+  patch -Np1 -i ../xarchiver-0.5.2-add_mime_types.patch
+
+  # Update upstream URL
+  find -type f | xargs sed -i 's|http://xarchiver.xfce.org|http://xarchiver.sf.net|'
+}
+
+build() {
+  cd $_pkgname-$pkgver
   ./configure --prefix=/usr --libexecdir=/usr/lib/xfce4
   make
 }
 
 package() {
-  cd "$srcdir/xarchiver-$pkgver"
+  cd $_pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/libre/xarchiver-libre/rePKGBUILD b/libre/xarchiver-libre/rePKGBUILD
deleted file mode 100644
index 7f435d23f..000000000
--- a/libre/xarchiver-libre/rePKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
-source PKGBUILD
-#CARCH=x86_64
-unset build package md5sums source
-_repo=extra       # Put the repo here
-_mirror=ftp://ftp.archlinux.org # Put mirror here
-source=(PKGBUILD
-        "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT"
-        # files for pkg modifications below this line
-        )
-options=(!strip)
-
-build() {
-  cd "${srcdir}/"
-  rm -vf ./.{INSTALL,PKGINFO}
-  # put actions for package modifications below this line
-
-}
-
-package() {
-  find ${srcdir} -maxdepth 1 -type l -delete
-  cp -a ${srcdir}/* ${pkgdir}
-}
-
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-add_mime_types.patch b/libre/xarchiver-libre/xarchiver-0.5.2-add_mime_types.patch
new file mode 100644
index 000000000..3b510fcb8
--- /dev/null
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-add_mime_types.patch
@@ -0,0 +1,9 @@
+diff -Naur xarchiver-0.5.2.orig/xarchiver.desktop.in xarchiver-0.5.2/xarchiver.desktop.in
+--- xarchiver-0.5.2.orig/xarchiver.desktop.in	2014-01-24 04:05:33.438561000 +0100
++++ xarchiver-0.5.2/xarchiver.desktop.in	2014-01-24 04:44:00.625750394 +0100
+@@ -11,4 +11,4 @@
+ X-MultipleArgs=false
+ Categories=GTK;Archiving;Utility;
+ StartupNotify=true
+-MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;multipart/x-zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;
++MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-debian-package;application/x-rpm;
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch
new file mode 100644
index 000000000..0168f4e63
--- /dev/null
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch
@@ -0,0 +1,380 @@
+diff -Nur xarchiver-0.5.2.orig/doc/html/ch03s03.html xarchiver-0.5.2/doc/html/ch03s03.html
+--- xarchiver-0.5.2.orig/doc/html/ch03s03.html	2008-11-03 04:49:49.000000000 -0200
++++ xarchiver-0.5.2/doc/html/ch03s03.html	2014-01-24 11:02:20.640986656 -0200
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>General</title><link rel="stylesheet" href="xarchiver.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.71.0" /><link rel="start" href="index.html" title="Xarchiver 0.5" /><link rel="up" href="ch03.html" title="Chapter 3. Usage" /><link rel="prev" href="ch03s02.html" title="Command line options" /><link rel="next" href="ch03s04.html" title="Xarchiver menu" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">General</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s02.html">Prev</a> </td><th width="60%" align="center">Chapter 3. Usage</th><td width="20%" align="right"> <a accesskey="n" href="ch03s04.html">Next</a></td></tr></table><hr /></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="general"></a>General</h2></div></div></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="general_startup"></a>Startup</h3></div></div></div><p>
+-					At startup, Xarchiver detects the available installed archivers (tar,rar,zip etc) and the script <i>xdg-open</i> for handling different file types. Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free edition of rar, unrar, Xarchiver can't create rar archives since unrar allows rar archives to be opened, tested and extracted but not to be created.
++					At startup, Xarchiver detects the available installed archivers (tar,rar,zip etc) and the script <i>xdg-open</i> for handling different file types. Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free as in freedom alternative of rar, unar, Xarchiver can't create rar archives since unar allows rar archives to be opened, tested and extracted but not to be created.
+ 				</p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="how_it_works"></a>How it works</h3></div></div></div><p>
+ 					Xarchiver will run in the background the cmd-line executable of the archiver with the archiver's proper switches to perform the selected operation. If something goes wrong Xarchiver reports the full output of the archiver executable in the command line output window. From the release 0.5 the files in the archive can be opened within Xarchiver. The script <i>xdg-open</i> will detect the file type and run the proper application to handle it. If you don't have such script installed in your system (it's found in the xdg-utils package) Xarchiver will recognize HTML, txt and images files only. The Preferences dialog will notify this to you when you click the Advanced section inside it.
+ 				</p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="dnd"></a>Drag and Drop</h3></div></div></div><p>
+diff -Nur xarchiver-0.5.2.orig/doc/xarchiver.docbook xarchiver-0.5.2/doc/xarchiver.docbook
+--- xarchiver-0.5.2.orig/doc/xarchiver.docbook	2007-08-22 07:49:19.000000000 -0300
++++ xarchiver-0.5.2/doc/xarchiver.docbook	2014-01-24 11:01:17.088748863 -0200
+@@ -204,7 +204,7 @@
+ 			<section id="general_startup">
+ 				<title>Startup</title>
+ 				<para>
+-					At startup, &app; detects the available installed archivers (tar,rar,zip etc). Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free edition of rar, unrar, Xarchiver can't create rar archives since unrar allows rar archives to be opened, tested and extracted but not to be created.
++					At startup, &app; detects the available installed archivers (tar,rar,zip etc). Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free as in freedom alternative of rar, unar, Xarchiver can't create rar archives since unar allows rar archives to be opened and extracted but not to be created.
+ 				</para>
+ 			</section>
+ 			<section id="how_it_works">
+diff -Nur xarchiver-0.5.2.orig/src/extract_dialog.c xarchiver-0.5.2/src/extract_dialog.c
+--- xarchiver-0.5.2.orig/src/extract_dialog.c	2008-11-10 08:28:11.000000000 -0200
++++ xarchiver-0.5.2/src/extract_dialog.c	2014-01-24 10:55:28.209263885 -0200
+@@ -24,7 +24,7 @@
+ #include "string_utils.h"
+ #include "support.h"
+ 
+-extern gboolean unrar,batch_mode;
++extern gboolean unar,batch_mode;
+ extern Prefs_dialog_data *prefs_window;
+ extern Progress_bar_data *pb;
+ extern extract_func extract	[XARCHIVETYPE_COUNT];
+@@ -290,11 +290,7 @@
+ 	GSList *names = NULL;
+ 	GtkTreeModel *model;
+ 	int response;
+-
+-	if (unrar)
+-		rar = "unrar";
+-	else
+-		rar = "rar";
++	rar = "unar";
+ 
+     while (! done)
+ 	{
+diff -Nur xarchiver-0.5.2.orig/src/interface.c xarchiver-0.5.2/src/interface.c
+--- xarchiver-0.5.2.orig/src/interface.c	2008-11-11 06:09:01.000000000 -0200
++++ xarchiver-0.5.2/src/interface.c	2014-01-24 10:56:03.893317117 -0200
+@@ -45,7 +45,7 @@
+   { "text/uri-list",0,0 },
+ };
+ 
+-extern gboolean unrar,batch_mode;
++extern gboolean unar,batch_mode;
+ 
+ static gboolean xa_progress_dialog_delete_event (GtkWidget *caller,GdkEvent *event,GPid pid);
+ static void xa_progress_dialog_stop_action (GtkWidget *widget,GPid pid);
+@@ -629,7 +629,7 @@
+ 		{
+ 			gtk_widget_show(selected_frame);
+ 			gtk_widget_set_sensitive(deselect_all,TRUE);
+-			if (archive[id]->type == XARCHIVETYPE_RAR && unrar)
++			if (archive[id]->type == XARCHIVETYPE_RAR && unar)
+ 			{
+ 				gtk_widget_set_sensitive (delete_menu,FALSE);
+ 				gtk_widget_set_sensitive (rename_menu,FALSE);
+diff -Nur xarchiver-0.5.2.orig/src/main.c xarchiver-0.5.2/src/main.c
+--- xarchiver-0.5.2.orig/src/main.c	2008-11-10 09:21:43.000000000 -0200
++++ xarchiver-0.5.2/src/main.c	2014-01-24 12:18:53.211684553 -0200
+@@ -33,7 +33,7 @@
+ gchar *add_files;
+ gboolean error_output, file_to_open, ask_and_extract, ask_and_add, multi_extract;
+ gboolean batch_mode = FALSE;
+-gboolean unrar = FALSE;
++gboolean unar = FALSE;
+ gboolean sevenzr = FALSE, sevenza = FALSE, xdg_open = FALSE;
+ int response;
+ extern gchar *current_open_directory;
+@@ -312,7 +312,6 @@
+ 	delete[XARCHIVETYPE_GZIP]  = 0;
+ 	delete[XARCHIVETYPE_LZMA]  = 0;
+ 	delete[XARCHIVETYPE_XZ]  = 0;
+-	delete[XARCHIVETYPE_RAR]  = &xa_rar_delete;
+ 	delete[XARCHIVETYPE_RPM]  = 0;
+ 	delete[XARCHIVETYPE_TAR]  = delete[XARCHIVETYPE_TAR_BZ2] = delete[XARCHIVETYPE_TAR_GZ] = delete[XARCHIVETYPE_TAR_LZMA] = delete[XARCHIVETYPE_TAR_XZ] = delete[XARCHIVETYPE_TAR_LZOP] = &xa_tar_delete;
+ 	delete[XARCHIVETYPE_ZIP] = &xa_zip_delete;
+@@ -325,7 +324,6 @@
+ 	add[XARCHIVETYPE_ARJ]  = &xa_arj_add;
+ 	add[XARCHIVETYPE_DEB]  = 0;
+ 	add[XARCHIVETYPE_BZIP2]  = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = add[XARCHIVETYPE_XZ] = &xa_tar_add;
+-	add[XARCHIVETYPE_RAR]  = &xa_rar_add;
+ 	add[XARCHIVETYPE_RPM]  = 0;
+ 	add[XARCHIVETYPE_TAR]  = add[XARCHIVETYPE_TAR_BZ2] = add[XARCHIVETYPE_TAR_GZ] = add[XARCHIVETYPE_TAR_LZMA] = add[XARCHIVETYPE_TAR_XZ] = add[XARCHIVETYPE_TAR_LZOP] = &xa_tar_add;
+ 	add[XARCHIVETYPE_ZIP] = &xa_zip_add;
+@@ -348,7 +346,6 @@
+ 	test[XARCHIVETYPE_7ZIP]  = &xa_7zip_test;
+ 	test[XARCHIVETYPE_ARJ]  = &xa_arj_test;
+ 	test[XARCHIVETYPE_DEB]  = test[XARCHIVETYPE_BZIP2] = test[XARCHIVETYPE_GZIP] = test[XARCHIVETYPE_LZMA] = test[XARCHIVETYPE_XZ] = 0;
+-	test[XARCHIVETYPE_RAR]  = &xa_rar_test;
+ 	test[XARCHIVETYPE_RPM]  = 0;
+ 	test[XARCHIVETYPE_TAR]  = test[XARCHIVETYPE_TAR_BZ2] = test[XARCHIVETYPE_TAR_GZ] = test[XARCHIVETYPE_TAR_LZMA] = test[XARCHIVETYPE_TAR_XZ] = test[XARCHIVETYPE_TAR_LZOP] = 0;
+ 	test[XARCHIVETYPE_ZIP] = &xa_zip_test;
+@@ -420,24 +417,14 @@
+ 		//ArchiveSuffix = g_list_append(ArchiveSuffix, "");
+ 	}
+ 
+-	absolute_path = g_find_program_in_path ("rar");
+-    if ( absolute_path )
++	absolute_path = g_find_program_in_path("unar");
++	if ( absolute_path )
+ 	{
++		unar = TRUE;
+ 		ArchiveType = g_list_append(ArchiveType, "rar");
+ 		ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar");
+ 		g_free (absolute_path);
+ 	}
+-	else
+-	{
+-		absolute_path = g_find_program_in_path("unrar");
+-		if ( absolute_path )
+-		{
+-			unrar = TRUE;
+-			ArchiveType = g_list_append(ArchiveType, "rar");
+-			ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar");
+-			g_free (absolute_path);
+-		}
+-	}
+ 
+ 	absolute_path = g_find_program_in_path("cpio");
+     if ( absolute_path )
+diff -Nur xarchiver-0.5.2.orig/src/new_dialog.c xarchiver-0.5.2/src/new_dialog.c
+--- xarchiver-0.5.2.orig/src/new_dialog.c	2008-11-11 06:28:46.000000000 -0200
++++ xarchiver-0.5.2/src/new_dialog.c	2014-01-24 10:56:34.274491565 -0200
+@@ -24,7 +24,7 @@
+ #include "string_utils.h"
+ #include "main.h"
+ 
+-extern gboolean unrar;
++extern gboolean unar;
+ extern Prefs_dialog_data *prefs_window;
+ gchar *current_new_directory = NULL;
+ gint  new_combo_box = -1;
+diff -Nur xarchiver-0.5.2.orig/src/pref_dialog.c xarchiver-0.5.2/src/pref_dialog.c
+--- xarchiver-0.5.2.orig/src/pref_dialog.c	2008-11-10 06:05:07.000000000 -0200
++++ xarchiver-0.5.2/src/pref_dialog.c	2014-01-24 10:54:07.611853842 -0200
+@@ -23,7 +23,7 @@
+ #include "main.h"
+ #include "support.h"
+ 
+-extern gboolean unrar;
++extern gboolean unar;
+ extern gboolean xdg_open;
+ extern Extract_dialog_data *extract_window;
+ extern Add_dialog_data *add_window;
+@@ -104,7 +104,7 @@
+ 	{
+ 		if (strcmp(archive_type->data, "tgz") == 0 ||
+ 			strcmp(archive_type->data, "rpm") == 0 ||
+-			(strcmp(archive_type->data, "rar") == 0 && unrar) )
++			(strcmp(archive_type->data, "rar") == 0 && unar) )
+ 			goto next;
+ 		else
+ 			gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_format),archive_type->data );
+diff -Nur xarchiver-0.5.2.orig/src/rar.c xarchiver-0.5.2/src/rar.c
+--- xarchiver-0.5.2.orig/src/rar.c	2008-11-10 06:05:07.000000000 -0200
++++ xarchiver-0.5.2/src/rar.c	2014-01-24 13:09:12.838038687 -0200
+@@ -20,7 +20,7 @@
+ #include "rar.h"
+ #include <unistd.h>
+ 
+-extern gboolean unrar;
++extern gboolean unar;
+ extern void xa_reload_archive_content(XArchive *archive);
+ extern void xa_create_liststore ( XArchive *archive, gchar *columns_names[]);
+ 
+@@ -30,19 +30,10 @@
+ 	gchar *command = NULL;
+ 	gchar *rar = NULL;
+ 	jump_header = read_filename = last_line = encrypted = FALSE;
++	rar = "unar";
++	archive->can_add = archive->has_sfx = FALSE;
+ 
+-	if (unrar)
+-	{
+-		rar = "unrar";
+-		archive->can_add = archive->has_sfx = FALSE;
+-	}
+-	else
+-	{
+-		rar = "rar";
+-		archive->can_add = archive->has_sfx = TRUE;
+-	}
+-
+-	command = g_strconcat ( rar," v " , archive->escaped_path, NULL );
++	command = g_strconcat ( rar, archive->escaped_path, NULL );
+ 	archive->can_extract = archive->has_test = archive->has_properties = TRUE;
+ 	archive->dummy_size = 0;
+     archive->nr_of_files = 0;
+@@ -222,71 +213,6 @@
+ 	}
+ }
+ 
+-void xa_rar_delete (XArchive *archive,GSList *names)
+-{
+-	gchar *command,*e_filename = NULL;
+-	GSList *list = NULL,*_names;
+-	GString *files = g_string_new("");
+-
+- 	_names = names;
+- 	while (_names)
+-	{
+-		e_filename  = xa_escape_filename((gchar*)_names->data,"$'`\"\\!?* ()[]&|:;<>#");
+-		g_string_prepend (files,e_filename);
+-		g_string_prepend_c (files,' ');
+-		_names = _names->next;
+-	}
+-	g_slist_foreach(names,(GFunc)g_free,NULL);
+-	g_slist_free(names);
+-	
+-	command = g_strconcat ("rar d ",archive->escaped_path," ",files->str,NULL);
+-	g_string_free(files,TRUE);
+-	list = g_slist_append(list,command);
+-
+-	xa_run_command (archive,list);
+-	if (archive->status == XA_ARCHIVESTATUS_DELETE)
+-		xa_reload_archive_content(archive);
+-}
+-
+-void xa_rar_add (XArchive *archive,GString *files,gchar *compression_string)
+-{
+-	GSList *list = NULL;
+-	gchar *command = NULL;
+-
+-	if (archive->location_entry_path != NULL)
+-		archive->working_dir = g_strdup(archive->tmp);
+-
+-	if (compression_string == NULL)
+-		compression_string = "3";
+-	if (archive->passwd != NULL)
+-		command = g_strconcat ( "rar a ",
+-									archive->update ? "-u " : "",
+-									archive->freshen ? "-f " : "",
+-									archive->solid_archive ? "-s " : "",
+-									archive->remove_files ? "-df " : "",
+-									"-p" , archive->passwd,
+-									" -idp ",
+-									"-m",compression_string," ",
+-									archive->escaped_path,
+-									files->str,NULL);
+-	else
+-		command = g_strconcat ( "rar a ",
+-									archive->update ? "-u " : "",
+-									archive->freshen ? "-f " : "",
+-									archive->solid_archive ? "-s " : " ",
+-									archive->remove_files ? "-df " : " ",
+-									"-idp ",
+-									"-m",compression_string," ",
+-									archive->escaped_path,
+-									files->str,NULL);
+-
+-	g_string_free(files,TRUE);
+-	list = g_slist_append(list,command);
+-
+-	xa_run_command (archive,list);
+-	xa_reload_archive_content(archive);
+-}
+-
+ gboolean xa_rar_extract(XArchive *archive,GSList *files)
+ {
+ 	gchar *rar, *command, *e_filename = NULL;
+@@ -295,10 +221,7 @@
+ 	gboolean result = FALSE;
+ 
+ 	_files = files;
+-	if (unrar)
+-		rar = "unrar";
+-	else
+-		rar = "rar";
++	rar = "unar";
+ 
+ 	while (_files)
+ 	{
+@@ -311,42 +234,16 @@
+ 	g_slist_free(_files);
+ 	
+ 	if (archive->passwd != NULL)
+-		command = g_strconcat (rar," ",archive->full_path ? "x " : "e ",
+-										archive->freshen ? "-f " : "" , archive->update ? "-u " : "",
+-										" -p",archive->passwd,
+-										archive->overwrite ? " -o+" : " -o-",
+-										" -idp ",
+-										archive->escaped_path,names->str," ",archive->extraction_path , NULL );
+-	else
+-		command = g_strconcat (rar," ",archive->full_path ? "x " : "e ",
+-										archive->freshen ? "-f " : "" , archive->update ? "-u " : "",
+-										archive->overwrite ? "-o+" : "-o-",
+-										" -idp ",
+-										archive->escaped_path,names->str," ",archive->extraction_path , NULL );
++		command = g_strconcat (rar," -p",archive->passwd,
++								archive->overwrite ? " -f" : "" ,
++								archive->escaped_path,names->str," ",archive->extraction_path , NULL );
++	else
++		command = g_strconcat (rar," ",
++								archive->overwrite ? " -f" : "" ,
++								archive->escaped_path,names->str," ",archive->extraction_path , NULL );
+ 	g_string_free(names,TRUE);
+ 	list = g_slist_append(list,command);
+ 
+ 	result = xa_run_command (archive,list);
+ 	return result;
+ }
+-
+-void xa_rar_test (XArchive *archive)
+-{
+-	gchar *rar = NULL;
+-	gchar *command = NULL;
+-	GSList *list = NULL;
+-
+-	if (unrar)
+-		rar = "unrar";
+-	else
+-		rar = "rar";
+-
+-	archive->status = XA_ARCHIVESTATUS_TEST;
+-	if (archive->passwd != NULL)
+-		command = g_strconcat (rar," t -idp -p" , archive->passwd ," " , archive->escaped_path, NULL);
+-	else
+-		command = g_strconcat (rar," t -idp " , archive->escaped_path, NULL);
+-
+-	list = g_slist_append(list,command);
+-	xa_run_command (archive,list);
+- }
+diff -Nur xarchiver-0.5.2.orig/src/rar.h xarchiver-0.5.2/src/rar.h
+--- xarchiver-0.5.2.orig/src/rar.h	2008-08-22 05:12:38.000000000 -0300
++++ xarchiver-0.5.2/src/rar.h	2014-01-24 10:49:13.140141939 -0200
+@@ -26,10 +26,7 @@
+ #include "support.h"
+ #include "archive.h"
+ gboolean jump_header,jump_comment,read_filename, last_line, encrypted;
+-void xa_rar_delete (XArchive *,GSList *);
+-void xa_rar_add (XArchive *,GString *,gchar *);
+ gboolean xa_rar_extract(XArchive *,GSList *);
+-void xa_rar_test (XArchive *);
+ void xa_get_rar_line_content (gchar *line, gpointer data);
+ void xa_open_rar ( XArchive *archive );
+ #endif
+diff -Nur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c
+--- xarchiver-0.5.2.orig/src/window.c	2008-11-11 06:31:45.000000000 -0200
++++ xarchiver-0.5.2/src/window.c	2014-01-24 10:54:28.673636196 -0200
+@@ -26,7 +26,7 @@
+ 
+ extern GList *ArchiveType;
+ extern GList *ArchiveSuffix;
+-extern gboolean unrar;
++extern gboolean unar;
+ extern gboolean xdg_open;
+ extern Prefs_dialog_data	*prefs_window;
+ extern Extract_dialog_data	*extract_window;
+@@ -1567,7 +1567,7 @@
+ 		gtk_widget_show(selected_frame);
+ 		gtk_widget_set_sensitive(deselect_all,TRUE);
+ 	}
+-	if ( (archive->type == XARCHIVETYPE_RAR && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP)
++	if ( (archive->type == XARCHIVETYPE_RAR && unar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP)
+ 	{
+ 		gtk_widget_set_sensitive (delete_menu,FALSE);
+ 		gtk_widget_set_sensitive (rename_menu,FALSE);
+@@ -1781,7 +1781,7 @@
+ 	else
+ 		idx = xa_find_archive_index (current_page);
+ 
+-	if (archive[idx]->type == XARCHIVETYPE_RAR && unrar)
++	if (archive[idx]->type == XARCHIVETYPE_RAR && unar)
+ 	{
+ 		response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't perform this action:"),_("You have to install rar package!"));
+ 		return;
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-add_xz_support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-add_xz_support.patch
new file mode 100644
index 000000000..d246a8e19
--- /dev/null
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-add_xz_support.patch
@@ -0,0 +1,397 @@
+diff -uNr xarchiver-0.5.2.orig/src/add_dialog.c xarchiver-0.5.2/src/add_dialog.c
+--- xarchiver-0.5.2.orig/src/add_dialog.c	2008-11-10 19:41:31.000000000 +0900
++++ xarchiver-0.5.2/src/add_dialog.c	2013-05-11 10:01:47.887094708 +0900
+@@ -209,7 +209,7 @@
+ 	else
+ 		gtk_widget_set_size_request (add_dialog->dialog1,530,420);
+ 
+-	if (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_LZOP)
++	if (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP)
+ 		gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(add_dialog->filechooserwidget1),FALSE);
+ 	else
+ 		gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(add_dialog->filechooserwidget1),TRUE);
+@@ -222,7 +222,7 @@
+ 	else
+ 		gtk_widget_set_sensitive(add_dialog->store_path,TRUE);
+ 	/* 7z doesn't appear to let the user chooses if storing full paths */
+-	if (archive->type == XARCHIVETYPE_7ZIP || archive->type == XARCHIVETYPE_LZOP || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA)
++	if (archive->type == XARCHIVETYPE_7ZIP || archive->type == XARCHIVETYPE_LZOP || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ )
+  	{
+  		flag = FALSE;
+ 	}
+@@ -244,7 +244,7 @@
+ 		flag = TRUE;
+ 	gtk_widget_set_sensitive(add_dialog->solid_archive,flag);
+ 	
+-	if (archive->type != XARCHIVETYPE_TAR && archive->type != XARCHIVETYPE_TAR_GZ && archive->type != XARCHIVETYPE_TAR_LZMA && archive->type != XARCHIVETYPE_TAR_BZ2 && archive->type != XARCHIVETYPE_TAR_LZOP)
++	if (archive->type != XARCHIVETYPE_TAR && archive->type != XARCHIVETYPE_TAR_GZ && archive->type != XARCHIVETYPE_TAR_LZMA && archive->type != XARCHIVETYPE_TAR_XZ && archive->type != XARCHIVETYPE_TAR_BZ2 && archive->type != XARCHIVETYPE_TAR_LZOP)
+ 	{
+ 		flag = TRUE;
+ 		if (archive->type == XARCHIVETYPE_7ZIP)
+@@ -306,7 +306,7 @@
+ 		g_signal_connect (G_OBJECT (add_dialog->compression_value),"value-changed",G_CALLBACK (fix_adjustment_value), NULL);
+ 	gtk_tooltips_set_tip (add_dialog->option_tooltip,add_dialog->compression_scale, compression_msg, NULL );
+ 
+-	if (archive->type == XARCHIVETYPE_TAR || archive->type == XARCHIVETYPE_TAR_GZ || archive->type == XARCHIVETYPE_TAR_LZMA || archive->type == XARCHIVETYPE_TAR_BZ2 || archive->type == XARCHIVETYPE_TAR_LZOP)
++	if (archive->type == XARCHIVETYPE_TAR || archive->type == XARCHIVETYPE_TAR_GZ || archive->type == XARCHIVETYPE_TAR_LZMA || archive->type == XARCHIVETYPE_TAR_XZ || archive->type == XARCHIVETYPE_TAR_BZ2 || archive->type == XARCHIVETYPE_TAR_LZOP)
+ 		flag = FALSE;
+ 	else
+ 		flag = TRUE;
+diff -uNr xarchiver-0.5.2.orig/src/archive.h xarchiver-0.5.2/src/archive.h
+--- xarchiver-0.5.2.orig/src/archive.h	2008-11-07 17:49:41.000000000 +0900
++++ xarchiver-0.5.2/src/archive.h	2013-05-11 10:01:47.888094708 +0900
+@@ -30,6 +30,7 @@
+ 	XARCHIVETYPE_BZIP2,
+ 	XARCHIVETYPE_GZIP,
+ 	XARCHIVETYPE_LZMA,
++	XARCHIVETYPE_XZ,
+ 	XARCHIVETYPE_LZOP,
+ 	XARCHIVETYPE_RAR,
+ 	XARCHIVETYPE_RPM,
+@@ -37,6 +38,7 @@
+ 	XARCHIVETYPE_TAR_BZ2,
+ 	XARCHIVETYPE_TAR_GZ,
+ 	XARCHIVETYPE_TAR_LZMA,
++	XARCHIVETYPE_TAR_XZ,
+ 	XARCHIVETYPE_TAR_LZOP,
+ 	XARCHIVETYPE_ZIP,
+ 	XARCHIVETYPE_LHA,
+diff -uNr xarchiver-0.5.2.orig/src/bzip2.c xarchiver-0.5.2/src/bzip2.c
+--- xarchiver-0.5.2.orig/src/bzip2.c	2008-11-10 20:17:48.000000000 +0900
++++ xarchiver-0.5.2/src/bzip2.c	2013-05-11 10:01:47.888094708 +0900
+@@ -54,6 +54,15 @@
+ 		archive->extract = 	extract[archive->type];
+ 		xa_open_tar_compressed_file(archive);
+ 	}
++	else if (g_str_has_suffix(archive->escaped_path,".tar.xz") || g_str_has_suffix (archive->escaped_path,".txz"))
++	{
++		archive->type = XARCHIVETYPE_TAR_XZ;
++		archive->format = "TAR.XZ";
++		archive->delete =	delete[archive->type];
++		archive->add = 		add[archive->type];
++		archive->extract = 	extract[archive->type];
++		xa_open_tar_compressed_file(archive);
++	}
+ 	else if (g_str_has_suffix(archive->escaped_path,".tar.lzop") ||
+ 		g_str_has_suffix (archive->escaped_path,".tzo") ||
+ 		g_str_has_suffix(archive->escaped_path,".tar.lzo"))
+@@ -85,6 +94,12 @@
+ 			executable = "lzma ";
+ 			len = 5;
+ 		}
++		else if (archive->type == XARCHIVETYPE_XZ)
++		{
++			archive->format = "XZ";
++			executable = "xz ";
++			len = 5;
++		}
+ 		else if (archive->type == XARCHIVETYPE_LZOP)
+ 		{
+ 			archive->format = "LZOP";
+@@ -163,6 +178,8 @@
+ 		command = g_strconcat(tar," tfjv ",archive->escaped_path,NULL);
+ 	else if (archive->type == XARCHIVETYPE_TAR_LZMA)
+ 		command = g_strconcat(tar," tv --use-compress-program=lzma -f ",archive->escaped_path,NULL);
++	else if (archive->type == XARCHIVETYPE_TAR_XZ)
++		command = g_strconcat(tar," tv --use-compress-program=xz -f ",archive->escaped_path,NULL);
+ 	else if (archive->type == XARCHIVETYPE_TAR_LZOP)
+ 		command = g_strconcat(tar," tv --use-compress-program=lzop -f ",archive->escaped_path,NULL);
+ 	/* else fail? */
+@@ -205,6 +222,11 @@
+ 		executable = "lzma ";
+ 		len = 5;
+ 	}
++	else if (archive->type == XARCHIVETYPE_XZ)
++	{
++		executable = "xz ";
++		len = 5;
++	}
+ 	else if (archive->type == XARCHIVETYPE_LZOP)
+ 	{
+ 		executable = "lzop ";
+diff -uNr xarchiver-0.5.2.orig/src/extract_dialog.c xarchiver-0.5.2/src/extract_dialog.c
+--- xarchiver-0.5.2.orig/src/extract_dialog.c	2008-11-10 19:28:11.000000000 +0900
++++ xarchiver-0.5.2/src/extract_dialog.c	2013-05-11 10:01:47.889094708 +0900
+@@ -815,6 +815,11 @@
+ 		archive->type = XARCHIVETYPE_TAR_LZMA;
+ 		archive->extract = 	extract[XARCHIVETYPE_TAR_LZMA];
+ 	}
++	else if (g_str_has_suffix(archive->escaped_path,".tar.xz")|| g_str_has_suffix (archive->escaped_path,".txz"))
++	{
++		archive->type = XARCHIVETYPE_TAR_XZ;
++		archive->extract = 	extract[XARCHIVETYPE_TAR_XZ];
++	}
+ 	else if (g_str_has_suffix(archive->escaped_path,".tar.lzop") ||
+ 			g_str_has_suffix (archive->escaped_path,".tzo") ||
+ 			g_str_has_suffix(archive->escaped_path,".tar.lzo"))
+diff -uNr xarchiver-0.5.2.orig/src/main.c xarchiver-0.5.2/src/main.c
+--- xarchiver-0.5.2.orig/src/main.c	2008-11-10 20:21:43.000000000 +0900
++++ xarchiver-0.5.2/src/main.c	2013-05-11 10:17:01.696094044 +0900
+@@ -296,9 +296,10 @@
+ 	open_archive[XARCHIVETYPE_BZIP2]  = &xa_open_bzip2_lzma;
+ 	open_archive[XARCHIVETYPE_GZIP]  = &xa_open_gzip;
+ 	open_archive[XARCHIVETYPE_LZMA]  = &xa_open_bzip2_lzma;
++	open_archive[XARCHIVETYPE_XZ]  = &xa_open_bzip2_lzma;
+ 	open_archive[XARCHIVETYPE_RAR]  = &xa_open_rar;
+ 	open_archive[XARCHIVETYPE_RPM]  = &xa_open_rpm;
+-	open_archive[XARCHIVETYPE_TAR]  = open_archive[XARCHIVETYPE_TAR_BZ2] = open_archive[XARCHIVETYPE_TAR_GZ] = open_archive[XARCHIVETYPE_TAR_LZMA] = open_archive[XARCHIVETYPE_TAR_LZOP] = &xa_open_tar;
++	open_archive[XARCHIVETYPE_TAR]  = open_archive[XARCHIVETYPE_TAR_BZ2] = open_archive[XARCHIVETYPE_TAR_GZ] = open_archive[XARCHIVETYPE_TAR_LZMA] = open_archive[XARCHIVETYPE_TAR_XZ] = open_archive[XARCHIVETYPE_TAR_LZOP] = &xa_open_tar;
+ 	open_archive[XARCHIVETYPE_ZIP] = &xa_open_zip;
+ 	open_archive[XARCHIVETYPE_LHA] = &xa_open_lha;
+ 	open_archive[XARCHIVETYPE_LZOP] = &xa_open_bzip2_lzma;
+@@ -310,9 +311,10 @@
+ 	delete[XARCHIVETYPE_BZIP2]  = 0;
+ 	delete[XARCHIVETYPE_GZIP]  = 0;
+ 	delete[XARCHIVETYPE_LZMA]  = 0;
++	delete[XARCHIVETYPE_XZ]  = 0;
+ 	delete[XARCHIVETYPE_RAR]  = &xa_rar_delete;
+ 	delete[XARCHIVETYPE_RPM]  = 0;
+-	delete[XARCHIVETYPE_TAR]  = delete[XARCHIVETYPE_TAR_BZ2] = delete[XARCHIVETYPE_TAR_GZ] = delete[XARCHIVETYPE_TAR_LZMA] = delete[XARCHIVETYPE_TAR_LZOP] = &xa_tar_delete;
++	delete[XARCHIVETYPE_TAR]  = delete[XARCHIVETYPE_TAR_BZ2] = delete[XARCHIVETYPE_TAR_GZ] = delete[XARCHIVETYPE_TAR_LZMA] = delete[XARCHIVETYPE_TAR_XZ] = delete[XARCHIVETYPE_TAR_LZOP] = &xa_tar_delete;
+ 	delete[XARCHIVETYPE_ZIP] = &xa_zip_delete;
+ 	delete[XARCHIVETYPE_LHA] = &xa_lha_delete;
+ 	delete[XARCHIVETYPE_LZOP] = 0;
+@@ -322,10 +324,10 @@
+ 	add[XARCHIVETYPE_7ZIP]  = &xa_7zip_add;
+ 	add[XARCHIVETYPE_ARJ]  = &xa_arj_add;
+ 	add[XARCHIVETYPE_DEB]  = 0;
+-	add[XARCHIVETYPE_BZIP2]  = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = &xa_tar_add;
++	add[XARCHIVETYPE_BZIP2]  = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = add[XARCHIVETYPE_XZ] = &xa_tar_add;
+ 	add[XARCHIVETYPE_RAR]  = &xa_rar_add;
+ 	add[XARCHIVETYPE_RPM]  = 0;
+-	add[XARCHIVETYPE_TAR]  = add[XARCHIVETYPE_TAR_BZ2] = add[XARCHIVETYPE_TAR_GZ] = add[XARCHIVETYPE_TAR_LZMA] = add[XARCHIVETYPE_TAR_LZOP] = &xa_tar_add;
++	add[XARCHIVETYPE_TAR]  = add[XARCHIVETYPE_TAR_BZ2] = add[XARCHIVETYPE_TAR_GZ] = add[XARCHIVETYPE_TAR_LZMA] = add[XARCHIVETYPE_TAR_XZ] = add[XARCHIVETYPE_TAR_LZOP] = &xa_tar_add;
+ 	add[XARCHIVETYPE_ZIP] = &xa_zip_add;
+ 	add[XARCHIVETYPE_LHA] = &xa_lha_add;
+ 	add[XARCHIVETYPE_LZOP] = &xa_tar_add;
+@@ -334,10 +336,10 @@
+ 	extract[XARCHIVETYPE_7ZIP]  = &xa_7zip_extract;
+ 	extract[XARCHIVETYPE_ARJ]  = &xa_arj_extract;
+ 	extract[XARCHIVETYPE_DEB]  = &xa_deb_extract;;
+-	extract[XARCHIVETYPE_BZIP2]  = extract[XARCHIVETYPE_GZIP] = extract[XARCHIVETYPE_LZMA] = &xa_tar_extract;
++	extract[XARCHIVETYPE_BZIP2]  = extract[XARCHIVETYPE_GZIP] = extract[XARCHIVETYPE_LZMA] = extract[XARCHIVETYPE_XZ] = &xa_tar_extract;
+ 	extract[XARCHIVETYPE_RAR]  = &xa_rar_extract;
+ 	extract[XARCHIVETYPE_RPM]  = &xa_rpm_extract;
+-	extract[XARCHIVETYPE_TAR]  = extract[XARCHIVETYPE_TAR_BZ2] = extract[XARCHIVETYPE_TAR_GZ] = extract[XARCHIVETYPE_TAR_LZMA] = extract[XARCHIVETYPE_TAR_LZOP] = &xa_tar_extract;
++	extract[XARCHIVETYPE_TAR]  = extract[XARCHIVETYPE_TAR_BZ2] = extract[XARCHIVETYPE_TAR_GZ] = extract[XARCHIVETYPE_TAR_LZMA] = extract[XARCHIVETYPE_TAR_XZ] = extract[XARCHIVETYPE_TAR_LZOP] = &xa_tar_extract;
+ 	extract[XARCHIVETYPE_ZIP] = &xa_zip_extract;
+ 	extract[XARCHIVETYPE_LHA] = &xa_lha_extract;
+ 	extract[XARCHIVETYPE_LZOP] = &xa_tar_extract;
+@@ -345,10 +347,10 @@
+ 	test[0]  = 0;
+ 	test[XARCHIVETYPE_7ZIP]  = &xa_7zip_test;
+ 	test[XARCHIVETYPE_ARJ]  = &xa_arj_test;
+-	test[XARCHIVETYPE_DEB]  = test[XARCHIVETYPE_BZIP2] = test[XARCHIVETYPE_GZIP] = test[XARCHIVETYPE_LZMA] = 0;
++	test[XARCHIVETYPE_DEB]  = test[XARCHIVETYPE_BZIP2] = test[XARCHIVETYPE_GZIP] = test[XARCHIVETYPE_LZMA] = test[XARCHIVETYPE_XZ] = 0;
+ 	test[XARCHIVETYPE_RAR]  = &xa_rar_test;
+ 	test[XARCHIVETYPE_RPM]  = 0;
+-	test[XARCHIVETYPE_TAR]  = test[XARCHIVETYPE_TAR_BZ2] = test[XARCHIVETYPE_TAR_GZ] = test[XARCHIVETYPE_TAR_LZMA] = test[XARCHIVETYPE_TAR_LZOP] = 0;
++	test[XARCHIVETYPE_TAR]  = test[XARCHIVETYPE_TAR_BZ2] = test[XARCHIVETYPE_TAR_GZ] = test[XARCHIVETYPE_TAR_LZMA] = test[XARCHIVETYPE_TAR_XZ] = test[XARCHIVETYPE_TAR_LZOP] = 0;
+ 	test[XARCHIVETYPE_ZIP] = &xa_zip_test;
+ 	test[XARCHIVETYPE_LHA] = &xa_lha_test;
+ 	test[XARCHIVETYPE_LZOP] = 0;
+@@ -392,6 +394,14 @@
+ 		g_free (absolute_path);
+ 	}
+ 
++	absolute_path = g_find_program_in_path("xz");
++	if ( absolute_path )
++	{
++		ArchiveType = g_list_append(ArchiveType, "xz");
++		ArchiveSuffix = g_list_append(ArchiveSuffix, "*.xz");
++		g_free (absolute_path);
++	}
++
+ 	absolute_path = g_find_program_in_path("lzop");
+ 	if ( absolute_path )
+ 	{
+@@ -460,6 +470,11 @@
+ 			ArchiveType = g_list_append(ArchiveType, "tar.lzma");
+ 			ArchiveSuffix = g_list_append(ArchiveSuffix, "*.tlz");
+ 		}
++		if ( g_list_find ( ArchiveType , "xz") )
++		{
++			ArchiveType = g_list_append(ArchiveType, "tar.xz");
++			ArchiveSuffix = g_list_append(ArchiveSuffix, "*.txz");
++		}
+ 		if ( g_list_find ( ArchiveType , "lzo") )
+ 		{
+ 			ArchiveType = g_list_append(ArchiveType, "tar.lzo");
+@@ -528,6 +543,8 @@
+ 		archive->type = XARCHIVETYPE_TAR_GZ;
+ 	else if ( g_str_has_suffix ( archive->escaped_path , ".tar.lzma") || g_str_has_suffix ( archive->escaped_path , ".tlz") )
+ 		archive->type = XARCHIVETYPE_TAR_LZMA;
++	else if ( g_str_has_suffix ( archive->escaped_path , ".tar.xz") || g_str_has_suffix ( archive->escaped_path , ".txz") )
++		archive->type = XARCHIVETYPE_TAR_XZ;
+ 	else if ( g_str_has_suffix ( archive->escaped_path , ".tar.lzo") ||
+ 		g_str_has_suffix ( archive->escaped_path , ".tzo") ||
+ 		g_str_has_suffix ( archive->escaped_path , ".tar.lzop"))
+diff -uNr xarchiver-0.5.2.orig/src/new_dialog.c xarchiver-0.5.2/src/new_dialog.c
+--- xarchiver-0.5.2.orig/src/new_dialog.c	2008-11-11 17:28:46.000000000 +0900
++++ xarchiver-0.5.2/src/new_dialog.c	2013-05-11 10:01:47.890094708 +0900
+@@ -202,6 +202,8 @@
+ 			type = XARCHIVETYPE_GZIP;
+ 		else if (strcmp ( ComboArchiveType,"lzma") == 0)
+ 			type = XARCHIVETYPE_LZMA;
++		else if (strcmp ( ComboArchiveType,"xz") == 0)
++			type = XARCHIVETYPE_XZ;
+ 		else if (strcmp ( ComboArchiveType,"lzo") == 0)
+ 			type = XARCHIVETYPE_LZOP;
+ 		else if (strcmp ( ComboArchiveType,"rar") == 0)
+@@ -214,6 +216,8 @@
+ 			type = XARCHIVETYPE_TAR_GZ;
+ 		else if (strcmp ( ComboArchiveType,"tar.lzma") == 0)
+ 			type = XARCHIVETYPE_TAR_LZMA;
++		else if (strcmp ( ComboArchiveType,"tar.xz") == 0)
++			type = XARCHIVETYPE_TAR_XZ;
+ 		else if (strcmp ( ComboArchiveType,"tar.lzo") == 0)
+ 			type = XARCHIVETYPE_TAR_LZOP;
+ 		else if (strcmp ( ComboArchiveType,"jar") == 0 || strcmp ( ComboArchiveType,"zip") == 0 )
+diff -Naur xarchiver-0.5.2.orig/src/rpm.c xarchiver-0.5.2/src/rpm.c
+--- xarchiver-0.5.2.orig/src/rpm.c	2014-01-24 03:07:47.729711000 +0100
++++ xarchiver-0.5.2/src/rpm.c	2014-01-24 03:12:43.717122918 +0100
+@@ -111,8 +111,10 @@
+ 	}
+ 	if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_GZIP)
+ 		executable = "gzip -dc ";
+-	else
++	else if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_BZIP2)
+ 		executable = "bzip2 -dc ";
++	else
++		executable = "xz -dc ";
+ 
+ 	command = g_strconcat("sh -c \"",executable,gzip_tmp," > ",archive->tmp,"/file.cpio\"",NULL);
+ 	g_free(gzip_tmp);diff -uNr xarchiver-0.5.2.orig/src/tar.c xarchiver-0.5.2/src/tar.c
+--- xarchiver-0.5.2.orig/src/tar.c	2008-11-10 19:28:34.000000000 +0900
++++ xarchiver-0.5.2/src/tar.c	2013-05-11 10:12:01.027094262 +0900
+@@ -242,6 +242,17 @@
+ 									files->str , NULL );
+ 		break;
+ 		
++		case XARCHIVETYPE_TAR_XZ:
++		if ( g_file_test ( archive->escaped_path , G_FILE_TEST_EXISTS ) )
++			xa_add_delete_bzip2_gzip_lzma_compressed_tar (files,archive,1);
++		else
++			command = g_strconcat (tar, " ",
++									archive->add_recurse ? "" : "--no-recursion ",
++									archive->remove_files ? "--remove-files " : "",
++									"--use-compress-program=xz -cvvf ",archive->escaped_path,
++									files->str , NULL );
++		break;
++		
+ 		case XARCHIVETYPE_TAR_LZOP:
+ 		if ( g_file_test ( archive->escaped_path , G_FILE_TEST_EXISTS ) )
+ 			xa_add_delete_bzip2_gzip_lzma_compressed_tar (files,archive,1);
+@@ -265,6 +276,10 @@
+ 			command = g_strconcat("sh -c \"lzma -c ",files->str,"> ",archive->escaped_path,"\"",NULL);
+ 		break;
+ 
++		case XARCHIVETYPE_XZ:
++			command = g_strconcat("sh -c \"xz -c ",files->str,"> ",archive->escaped_path,"\"",NULL);
++		break;
++
+ 		case XARCHIVETYPE_LZOP:
+ 			command = g_strconcat("sh -c \"lzop -c ",files->str,"> ",archive->escaped_path,"\"",NULL);
+ 		break;
+@@ -378,6 +393,25 @@
+ 		}
+ 		break;
+ 
++		case XARCHIVETYPE_TAR_XZ:
++		if (archive->full_path == 1)
++		{
++			command = g_strconcat (tar, " --use-compress-program=xz -xvf " , archive->escaped_path,
++						#ifdef __FreeBSD__
++								archive->overwrite ? " " : " -k",
++						#else
++								archive->overwrite ? " --overwrite" : " --keep-old-files",
++						#endif
++								archive->tar_touch ? " --touch" : "",
++								" -C ",archive->extraction_path," ",names->str,NULL);
++		}
++		else
++		{
++			result = xa_extract_tar_without_directories ( "tar --use-compress-program=xz -xvf ",archive,names->str);
++			command = NULL;
++		}
++		break;
++
+ 		case XARCHIVETYPE_TAR_LZOP:
+ 		if (archive->full_path == 1)
+ 		{
+@@ -402,6 +436,11 @@
+ 		command = NULL;
+ 		break;
+ 
++		case XARCHIVETYPE_XZ:
++		result = lzma_bzip2_extract(archive,NULL);
++		command = NULL;
++		break;
++
+ 		case XARCHIVETYPE_LZOP:
+ 		result = lzma_bzip2_extract(archive,NULL);
+ 		command = NULL;
+@@ -449,6 +488,10 @@
+ 			executable = "lzma -f ";
+ 			filename = "dummy.lzma";
+ 		break;
++		case XARCHIVETYPE_TAR_XZ:
++			executable = "xz -f ";
++			filename = "dummy.xz";
++		break;
+ 		case XARCHIVETYPE_TAR_LZOP:
+ 			executable = "lzop -f ";
+ 			filename = "dummy.lzo";
+@@ -493,7 +536,7 @@
+ 
+ gboolean is_tar_compressed (gint type)
+ {
+-	return (type == XARCHIVETYPE_TAR_BZ2 || type == XARCHIVETYPE_TAR_GZ || type == XARCHIVETYPE_TAR_LZMA || type == XARCHIVETYPE_TAR_LZOP);
++	return (type == XARCHIVETYPE_TAR_BZ2 || type == XARCHIVETYPE_TAR_GZ || type == XARCHIVETYPE_TAR_LZMA || type == XARCHIVETYPE_TAR_XZ || type == XARCHIVETYPE_TAR_LZOP);
+ }
+ 
+ gboolean xa_extract_tar_without_directories (gchar *string,XArchive *archive,gchar *files_to_extract)
+diff -uNr xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c
+--- xarchiver-0.5.2.orig/src/window.c	2008-11-11 17:31:45.000000000 +0900
++++ xarchiver-0.5.2/src/window.c	2013-05-11 10:01:47.892094708 +0900
+@@ -1125,6 +1125,8 @@
+ 		xx = XARCHIVETYPE_GZIP;
+ 	else if (memcmp ( magic,"\x5d\x00\x00\x80",4) == 0)
+ 		xx = XARCHIVETYPE_LZMA;
++	else if ((memcmp ( magic,"\xFD" "7zXZ\x00\x00",7) == 0) || (memcmp ( magic,"\xFD" "7zXZ\x00\x10",7) == 0))
++		xx = XARCHIVETYPE_XZ;
+ 	else if (memcmp ( magic,"\211LZO",4) == 0)
+ 		xx = XARCHIVETYPE_LZOP;
+ 	else if (memcmp ( magic,"\xed\xab\xee\xdb",4) == 0)
+@@ -1462,6 +1464,7 @@
+ 		case XARCHIVETYPE_GZIP:
+ 		case XARCHIVETYPE_BZIP2:
+ 		case XARCHIVETYPE_LZMA:
++		case XARCHIVETYPE_XZ:
+ 		case XARCHIVETYPE_LZOP:
+ 		case XARCHIVETYPE_RPM:
+ 		pos = 3;
+@@ -1481,6 +1484,7 @@
+ 		case XARCHIVETYPE_TAR_GZ:
+ 		case XARCHIVETYPE_TAR_BZ2:
+ 		case XARCHIVETYPE_TAR_LZMA:
++		case XARCHIVETYPE_TAR_XZ:
+ 		case XARCHIVETYPE_TAR_LZOP:
+ 		case XARCHIVETYPE_TAR:
+ 		case XARCHIVETYPE_ZIP:
+@@ -1525,6 +1529,7 @@
+ 		case XARCHIVETYPE_GZIP:
+ 		case XARCHIVETYPE_BZIP2:
+ 		case XARCHIVETYPE_LZMA:
++		case XARCHIVETYPE_XZ:
+ 		case XARCHIVETYPE_LZOP:
+ 		case XARCHIVETYPE_RPM:
+ 		pos = 3;
+@@ -1544,6 +1549,7 @@
+ 		case XARCHIVETYPE_TAR_GZ:
+ 		case XARCHIVETYPE_TAR_BZ2:
+ 		case XARCHIVETYPE_TAR_LZMA:
++		case XARCHIVETYPE_TAR_XZ:
+ 		case XARCHIVETYPE_TAR_LZOP:
+ 		case XARCHIVETYPE_TAR:
+ 		case XARCHIVETYPE_ZIP:
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-drag-n-drop_escaped_path.patch b/libre/xarchiver-libre/xarchiver-0.5.2-drag-n-drop_escaped_path.patch
new file mode 100644
index 000000000..10def7d21
--- /dev/null
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-drag-n-drop_escaped_path.patch
@@ -0,0 +1,13 @@
+diff -Naur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c
+--- xarchiver-0.5.2.orig/src/window.c	2012-01-12 13:28:54.000000000 +0100
++++ xarchiver-0.5.2/src/window.c	2012-01-23 20:43:49.622745851 +0100
+@@ -1724,6 +1724,9 @@
+ 			gtk_tree_selection_selected_foreach (selection,(GtkTreeSelectionForeachFunc) xa_concat_selected_filenames,&names);
+ 			archive->full_path = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (extract_window->extract_full));
+ 			archive->overwrite = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (extract_window->overwrite_check));
++			gchar *unescaped_extraction_path = archive->extraction_path;
++			archive->extraction_path = xa_escape_filename(unescaped_extraction_path, "$'`\"\\!?* ()[]&|:;<>#");
++			g_free(unescaped_extraction_path);
+ 			(*archive->extract) (archive,names);
+ 
+ 			g_list_foreach (row_list,(GFunc) gtk_tree_path_free,NULL);
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-fix-double-escaping.patch b/libre/xarchiver-libre/xarchiver-0.5.2-fix-double-escaping.patch
new file mode 100644
index 000000000..8b44d91a0
--- /dev/null
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-fix-double-escaping.patch
@@ -0,0 +1,32 @@
+From: =?UTF-8?q?Guido=20Berh=C3=B6rster?= <gber@opensuse.org>
+Date: Sat, 19 Jan 2013 09:27:36 +0100
+Subject: fix-double-escaping
+
+Do not escape file names twice. Fixes an error when trying to create archives
+with spaces.
+
+Bug: http://bugs.debian.org/697493.
+---
+ src/main.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index a13d737..a6a7f93 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -208,13 +208,13 @@ int main (int argc, char **argv)
+ 				g_free(_current_dir);
+ 				GSList *files = NULL;
+ 				_current_dir = g_path_get_basename(add_files);
+-				files = g_slist_append(files,xa_escape_filename(_current_dir,"$'`\"\\!?* ()[]&|:;<>#"));
++				files = g_slist_append(files,g_strdup(_current_dir));
+ 				g_free(_current_dir);
+ 				g_free(add_files);
+ 				for (x = 1; x< argc; x++)
+ 				{
+ 					_current_dir = g_path_get_basename(argv[x]);
+-					files = g_slist_append(files,xa_escape_filename(_current_dir,"$'`\"\\!?* ()[]&|:;<>#"));
++					files = g_slist_append(files,g_strdup(_current_dir));
+ 					g_free (_current_dir);
+ 				}
+ 				xa_execute_add_commands(archive,files,NULL);
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-fix-non-existent-archive.patch b/libre/xarchiver-libre/xarchiver-0.5.2-fix-non-existent-archive.patch
new file mode 100644
index 000000000..e63687579
--- /dev/null
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-fix-non-existent-archive.patch
@@ -0,0 +1,26 @@
+From: Markus Koschany <apo@gambaru.de>
+Date: Thu, 28 Feb 2013 17:45:50 +0100
+Subject: fix segfault non-existent archive cmdl switch x
+
+If using the command line switch -x, the user needs to specify a valid/existent
+archive. If the name of the archive is mistyped, xarchiver will segfault. This
+patch fixes the issue.
+
+Bug: http://bugs.debian.org/701909
+---
+ src/main.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.c b/src/main.c
+index a6a7f93..a6e05e3 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -141,7 +141,7 @@ int main (int argc, char **argv)
+ 		/* Switch -x */
+ 		if (extract_path != NULL)
+ 		{
+-			if (argv[1] == NULL)
++			if (argv[1] == NULL || archive == NULL)
+ 			{
+ 				response = xa_show_message_dialog (NULL,GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't extract files from the archive:"),_("You missed the archive name!\n"));
+ 				return -1;
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch
deleted file mode 100644
index f7ff098c0..000000000
--- a/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -Nur xarchiver-0.5.2.orig/src/7zip.c xarchiver-0.5.2/src/7zip.c
---- xarchiver-0.5.2.orig/src/7zip.c	2008-10-25 00:41:17.000000000 +1300
-+++ xarchiver-0.5.2/src/7zip.c	2010-12-15 11:24:26.000000000 +1300
-@@ -64,15 +64,14 @@
- 	XEntry *entry;
- 	gchar *filename;
- 	gpointer item[5];
--	gint linesize = 0,n = 0,a = 0;
--	gboolean dir = FALSE;
-+	gint linesize = 0,a = 0;
- 
- 	if (last_line)
- 		return;
- 
- 	if (jump_header == FALSE)
- 	{
--		if (line[0] == '-')
-+		if ((line[0] == '-') && (line[3] != NULL)) 
- 		{
- 			jump_header = TRUE;
- 			return;
-@@ -93,71 +92,42 @@
- 	item[4] = line;
- 
- 	/* Time */
--	for(n=13; n < linesize; ++n)
--		if(line[n] == ' ')
--			break;
--	line[n] = '\0';
-+	line[19] = '\0';
- 	item[3] = line + 11;
--	a = ++n;
- 	
- 	/* Permissions */
--	for(; n < linesize; n++)
--		if(line[n] == ' ')
--			break;
--	line[n] = '\0';
--	if ((line+a)[0] == 'D')
--		dir = TRUE;
--	item[2] = line + a;
-+	line[25] = '\0';
-+	item[2] = line + 20;
- 	
- 	/* Size */
--	for(++n; n < linesize; ++n)
--		if(line[n] >= '0' && line[n] <= '9')
-+	for(a=26; a < linesize; ++a)
-+		if(line[a] >= '0' && line[a] <= '9')
- 			break;
--	a = n;
- 
--	for(; n < linesize; ++n)
--		if(line[n] == ' ')
--			break;
--
--	line[n] = '\0';
-+	line[38] = '\0';
- 	item[0] = line + a;
- 	archive->dummy_size += g_ascii_strtoull(item[0],NULL,0);
- 
- 	/* Compressed */
--	for(++n; n < linesize; ++n)
--		if(line[n] >= '0' && line[n] <= '9')
--			break;
--	a = n;
--
--	for(; n < linesize; ++n)
--		if(line[n] == ' ')
--			break;
--
--	line[n] = '\0';
--
--	if (line[50] != ' ')
-+	/* Is this item solid? */
-+	if (line[50] == ' ')
- 	{
--		n+=2;
--		item[1] = line + a;
- 		line[linesize-1] = '\0';
--		filename = g_strdup(line + n);
-+		filename = g_strdup(line + 53);
- 	}
--	/* Is this a solid archive? */
-+
- 	else
- 	{
--		item[1] = "0";
--		line[n-1] = '\0';
-+		for(a=39; a < linesize; ++a)
-+			if(line[a] >= '0' && line[a] <= '9')
-+				break;
-+
-+		line[51] = '\0';
-+		item[1] = line + a;
-+		line[linesize-1] = '\0';
- 		filename = g_strdup(line + 53);
- 	}
- 
--	/* Work around for 7za which doesn't
--	* output / with directories */
--	if (dir)
--	{
--		gchar *filename_with_slash = g_strconcat (filename,"/",NULL);
--		g_free (filename);
--		filename = filename_with_slash;
--	}
- 	entry = xa_set_archive_entries_for_each_row (archive,filename,item);
- 	g_free(filename);
- }
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-no-donators-menu.patch b/libre/xarchiver-libre/xarchiver-0.5.2-no-donators-menu.patch
new file mode 100644
index 000000000..aa2283a7e
--- /dev/null
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-no-donators-menu.patch
@@ -0,0 +1,50 @@
+--- xarchiver/trunk/src/interface.c	2009/03/19 18:03:52	29676
++++ xarchiver/trunk/src/interface.c	2009/03/19 20:48:19	29677
+@@ -310,22 +310,14 @@
+ 	gtk_widget_show (tmp_image);
+ 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1),tmp_image);
+ 
++	donate = gtk_image_menu_item_new_with_mnemonic (_("_Donate"));
++	gtk_widget_show (donate);
++	gtk_container_add (GTK_CONTAINER (menuitem4_menu),donate);
++
+ 	about1 = gtk_image_menu_item_new_from_stock ("gtk-about",accel_group);
+ 	gtk_widget_show (about1);
+ 	gtk_container_add (GTK_CONTAINER (menuitem4_menu),about1);
+ 
+-	thanks_to = gtk_image_menu_item_new_with_mnemonic (_("_Thanks to"));
+-	gtk_widget_show (thanks_to);
+-	gtk_container_add (GTK_CONTAINER (menuitem4_menu),thanks_to);
+-
+-	thanks_to_submenu = gtk_menu_new();
+-	gtk_widget_show (thanks_to_submenu);
+-	gtk_menu_item_set_submenu (GTK_MENU_ITEM (thanks_to),thanks_to_submenu);
+-
+-	donators = gtk_image_menu_item_new_with_mnemonic ("Your name and website here");
+-	gtk_widget_show (donators);
+-	gtk_container_add (GTK_CONTAINER (thanks_to_submenu),donators);
+-
+ 	/* Create the toolbar */
+ 	toolbar1 = gtk_toolbar_new ();
+ 	gtk_widget_show (toolbar1);
+@@ -543,7 +535,7 @@
+ 	g_signal_connect ((gpointer) multi_extract_menu,"activate",G_CALLBACK (xa_show_multi_extract_dialog),NULL);
+ 	g_signal_connect ((gpointer) help1,"activate",G_CALLBACK (xa_show_help),NULL);
+ 	g_signal_connect ((gpointer) about1,"activate",G_CALLBACK (xa_about),NULL);
+-	g_signal_connect ((gpointer) donators,"activate",G_CALLBACK (xa_show_donate_page_on_the_web),NULL);
++	g_signal_connect ((gpointer) donate,"activate",G_CALLBACK (xa_show_donate_page_on_the_web),NULL);
+ 
+ 	g_signal_connect ((gpointer) New_button,	"clicked",G_CALLBACK (xa_new_archive),NULL);
+ 	g_signal_connect ((gpointer) Open_button,	"clicked",G_CALLBACK (xa_open_archive),NULL);
+--- xarchiver/trunk/src/interface.h	2008/11/04 10:06:17	28603
++++ xarchiver/trunk/src/interface.h	2009/03/19 20:48:19	29677
+@@ -48,8 +48,8 @@
+ *name_label, *type_label, *compression_data, *encrypted_data, *encrypted_label,*number_of_files_data, *content_data, *comment_data, *size_data, *modified_data, *path_data, *type_data,
+ *name_data, *separatormenuitem1, *separatormenuitem2, *separatormenuitem3, *separatormenuitem4, *separatormenuitem5, *separatormenuitem6, *quit1,
+ *close1, *check_menu, *properties, *menuitem2, *menuitem2_menu, *addfile, *extract_menu, *delete_menu, *comment_menu, *multi_extract_menu,*view_shell_output1,
+-*prefs_menu,*password_entry_menu, *image1, *image2, *menuitem4, *thanks_to,*thanks_to_submenu,*select_all,*deselect_all,*select_pattern, *exe_menu, *menuitem4_menu,
+-*about1, *help1, *donators,*toolbar1, *toolbar2, *hbox1, *tmp_image, *pad_image, *New_button, *Open_button, *back_button, *home_button, *forward_button,
++*prefs_menu,*password_entry_menu, *image1, *image2, *menuitem4, *donate,*select_all,*deselect_all,*select_pattern, *exe_menu, *menuitem4_menu,
++*about1, *help1,*toolbar1, *toolbar2, *hbox1, *tmp_image, *pad_image, *New_button, *Open_button, *back_button, *home_button, *forward_button,
+ *up_button,*separatortoolitem1,*separatortoolitem2,*separatortoolitem3,*AddFile_button,*Extract_button,*Stop_button,*toolitem1,*location_label,
+ *location_entry,*hpaned1,*archive_dir_treeview,*scrolledwindow2,*ddelete,*rename_menu,*rrename,*cut,*copy,*paste,*view,*open_popupmenu;
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch b/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch
deleted file mode 100644
index d962a44af..000000000
--- a/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -up ./src/rpm.c.rpm2cpio ./src/rpm.c
---- ./src/rpm.c.rpm2cpio	2008-10-24 13:43:04.000000000 +0200
-+++ ./src/rpm.c	2011-03-27 03:14:20.225742237 +0200
-@@ -23,11 +23,8 @@ extern gboolean batch_mode;
- 
- void xa_open_rpm (XArchive *archive)
- {
--	unsigned char bytes[8];
- 	unsigned short int i;
--    int dl,il,sigsize,offset,response;
--    gchar *ibs,*executable;
--    gchar *gzip_tmp = NULL;
-+    int response;
- 	GSList *list = NULL;
- 	FILE *stream;
- 	gboolean result;
-@@ -56,66 +53,14 @@ void xa_open_rpm (XArchive *archive)
- 		archive->column_types[i] = types[i];
- 
- 	xa_create_liststore (archive,names);
--    if (fseek ( stream, 104 , SEEK_CUR ) )
--    {
--        fclose (stream);
--        response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't fseek to position 104:"),g_strerror(errno));
--        return;
--    }
--    if ( fread ( bytes, 1, 8, stream ) == 0 )
--	{
--		fclose ( stream );
--		response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't read data from file:"),g_strerror(errno));
--		return;
--    }
--    il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3];
--    dl = 256 * ( 256 * ( 256 * bytes[4] + bytes[5]) + bytes[6] ) + bytes[7];
--    sigsize = 8 + 16 * il + dl;
--    offset = 104 + sigsize + ( 8 - ( sigsize % 8 ) ) % 8 + 8;
--    if (fseek ( stream, offset  , SEEK_SET ) )
--    {
--        fclose (stream);
--        response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't fseek in file:"),g_strerror(errno));
--        return;
--    }
--    if ( fread ( bytes, 1, 8, stream ) == 0 )
--	{
--		fclose ( stream );
--		response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't read data from file:"),g_strerror(errno));
--		return;
--    }
--    il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3];
--    dl = 256 * ( 256 * ( 256 * bytes[4] + bytes[5]) + bytes[6] ) + bytes[7];
--	sigsize = 8 + 16 * il + dl;
--	offset = offset + sigsize;
--	fclose (stream);
- 
- 	/* Create a unique temp dir in /tmp */
- 	result = xa_create_temp_directory (archive);
- 	if (!result)
- 		return;
- 
--	gzip_tmp = g_strconcat (archive->tmp,"/file.gz_bz",NULL);
--	ibs = g_strdup_printf ( "%u" , offset );
--
- 	/* Now I run dd to have the bzip2 / gzip compressed cpio archive in /tmp */
--	gchar *command = g_strconcat ( "dd if=",archive->escaped_path," ibs=",ibs," skip=1 of=",gzip_tmp,NULL);
--	g_free (ibs);
--	list = g_slist_append(list,command);
--	batch_mode = TRUE;
--	result = xa_run_command (archive,list);
--	if (result == FALSE)
--	{	
--		g_free (gzip_tmp);
--		return;
--	}
--	if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_GZIP)
--		executable = "gzip -dc ";
--	else
--		executable = "bzip2 -dc ";
--
--	command = g_strconcat("sh -c \"",executable,gzip_tmp," > ",archive->tmp,"/file.cpio\"",NULL);
--	g_free(gzip_tmp);
-+	gchar *command = g_strconcat ( "sh -c \"rpm2cpio ",archive->escaped_path," > ",archive->tmp, "/file.cpio\"",NULL);
- 	list = NULL;
- 	list = g_slist_append(list,command);
- 	result = xa_run_command (archive,list);
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-delete-file.patch b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-delete-file.patch
new file mode 100644
index 000000000..b8052544b
--- /dev/null
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-delete-file.patch
@@ -0,0 +1,21 @@
+diff -Naur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c
+--- xarchiver-0.5.2.orig/src/window.c	2014-01-24 01:22:27.931903000 +0100
++++ xarchiver-0.5.2/src/window.c	2014-01-24 01:24:49.952825715 +0100
+@@ -1573,7 +1573,7 @@
+ 		gtk_widget_show(selected_frame);
+ 		gtk_widget_set_sensitive(deselect_all,TRUE);
+ 	}
+-	if ( (archive->type == XARCHIVETYPE_RAR && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP)
++	if ( (archive->type == XARCHIVETYPE_RAR && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP)
+ 	{
+ 		gtk_widget_set_sensitive (delete_menu,FALSE);
+ 		gtk_widget_set_sensitive (rename_menu,FALSE);
+@@ -2287,7 +2287,7 @@
+ 			else
+ 				value = TRUE;
+ 		}
+-		if (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_DEB || archive->type == XARCHIVETYPE_RPM)
++		if (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP || archive->type == XARCHIVETYPE_DEB || archive->type == XARCHIVETYPE_RPM)
+ 		{
+ 			gtk_widget_set_sensitive(ddelete,FALSE);
+ 			gtk_widget_set_sensitive(rrename,FALSE);
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch
deleted file mode 100644
index e29d40c41..000000000
--- a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -pur xarchiver-0.5.2/src/open-with-dlg.c xarchiver-0.5.2.new/src/open-with-dlg.c
---- xarchiver-0.5.2/src/open-with-dlg.c	2008-10-17 14:06:03.000000000 +0200
-+++ xarchiver-0.5.2.new/src/open-with-dlg.c	2011-05-16 21:48:49.042839556 +0200
-@@ -289,7 +289,10 @@ static void xa_open_with_dialog_selectio
- 	GtkTreeIter iter;
- 	GtkTreeModel *model;
- 
--	gtk_tree_selection_get_selected(selection,&model,&iter);
-+	if (!gtk_tree_selection_get_selected(selection,&model,&iter)) {
-+		return;
-+	}
-+
- 	gtk_tree_model_get(model,&iter,2,&exec,-1);
- 	
- 	gtk_entry_set_text(GTK_ENTRY(data->custom_command_entry),exec);
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch
new file mode 100644
index 000000000..a1fa1f2ca
--- /dev/null
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch
@@ -0,0 +1,43 @@
+diff -Naur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c
+--- xarchiver-0.5.2.orig/src/window.c	2014-01-24 08:10:09.305990000 +0100
++++ xarchiver-0.5.2/src/window.c	2014-01-24 08:42:45.110729290 +0100
+@@ -1694,7 +1694,7 @@
+ 		{
+ 			if (archive->passwd == NULL)
+ 			{
+-				archive->passwd = xa_create_password_dialog(NULL);
++				archive->passwd = xa_create_password_dialog(archive);
+ 				if ( archive->passwd == NULL)
+ 				{
+ 					gtk_drag_finish (dc,FALSE,FALSE,t);
+@@ -2702,9 +2702,12 @@
+ 
+ 	if (entry->is_encrypted)
+ 	{
+-		archive[idx]->passwd = xa_create_password_dialog(archive[idx]);
+ 		if (archive[idx]->passwd == NULL)
+-			return;
++		{
++			archive[idx]->passwd = xa_create_password_dialog(archive[idx]);
++			if (archive[idx]->passwd == NULL)
++				return;
++		}
+ 	}
+ 	filename = g_strconcat(archive[idx]->tmp,"/",entry->filename,NULL);
+ 	if (g_file_test(filename,G_FILE_TEST_EXISTS))
+@@ -2766,6 +2769,15 @@
+ 	/* The selected entry it's not a dir so extract it to the tmp dir and send it to xa_determine_program_to_run() */
+ 	else
+ 	{
++		if (entry->is_encrypted)
++		{
++			if (archive->passwd == NULL)
++			{
++				archive->passwd = xa_create_password_dialog(archive);
++				if (archive->passwd == NULL)
++					return;
++			}
++		}
+ 	   	if (archive->extraction_path)
+ 	   	{
+ 	   		dummy = g_strdup(archive->extraction_path);
diff --git a/libre/xarchiver-libre/xarchiver.install b/libre/xarchiver-libre/xarchiver.install
deleted file mode 100644
index c317fbaca..000000000
--- a/libre/xarchiver-libre/xarchiver.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/libre/xbmc-libre/ChangeLog b/libre/xbmc-libre/ChangeLog
deleted file mode 100644
index 66ae97e3b..000000000
--- a/libre/xbmc-libre/ChangeLog
+++ /dev/null
@@ -1,69 +0,0 @@
-2010-04-10 BlackEagle <ike DOT devolder AT gmail DOT com>
-	* 9.11-15 :
-	Made it back compliant with FHS ( thx pierre for pointing that out )
-	namcap checked and modified to fit its needs as far as it was possible
-
-2009-03-07 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-10 :
-	Try and fix some autoconf issues (thanks Gentoo ebuild).
-
-2009-02-08 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-9 :
-	Replace some libtool 'ltmain.sh' scripts with the one from libtool 
-	installed with Arch.
-	Make sure XBMCTex isn't linked to OpenGL libraries or it will segfault
-	on systems using the nvidia driver.
-	
-2009-01-30 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-8 :
-	Fix some include's so that gcc 4.3.x is happy, shouldn't complain about
-	undefined '::realloc' anymore.
-	Remove Mac OS X specific files.
-	
-2009-01-25 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-7 :
-	Moved libcdio, pmount, smbclient and unrar to optdepends.
-	Removed unneeded dependency on sdl_gfx.
-	Removed dependency on libpng as sdl_image depends on it.
-
-2008-12-14 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-6 :
-	Added libpng to dependency list.
-	Added gawk to dependency list.
-	Removed '--disable-mms' and '--enable-halmount' configure flags as they
-	are not mentioned as supported in the configure script.
-	
-2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-5 :
-	Added libmad to the dependency list.
-	Streamripper 1.64.0+ does not include tre anymore, removed streamripper
-	and added tre instead.
-	Removed subversion from makedepends.
-	
-2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-4 :
-	Fix permissions for some more scripts, ffmpeg/texi2doc.pl should not
-	fail any longer.
-
-2008-12-05 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-3 :
-	Added lirc to the optdepends array.
-	
-2008-11-26 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-2 :
-	Added install file which informs users that a display depth of at
-	least 24-bit is required.
-
-2008-11-17 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-1 :
-	Initial package, based on previous work by Zeqadious.
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index 2809f8248..623914f4e 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103051 2013-12-25 20:34:37Z idevolder $
+# $Id: PKGBUILD 104515 2014-01-22 06:55:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -11,7 +11,7 @@ _pkgname=xbmc
 pkgname=xbmc-libre
 pkgver=12.3
 _codename=Frodo
-pkgrel=1
+pkgrel=8
 pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
@@ -21,13 +21,13 @@ depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
 	 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2'
 	 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos'
 	 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu'
-	 'tinyxml' 'taglib')
+	 'tinyxml' 'taglib' 'ffmpeg-compat')
 makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec'
 	     'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment')
 optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
 	    'lirc-libre: remote controller support'
 	    'udisks: automount external drives'
-	    'upower: used to trigger suspend functionality'
+	    'upower: used to trigger power management functionality'
 	    'libarchive: access compressed files without unpacking them'
 	    'xorg-xinit: autostart xbmc')
 install="${_pkgname}.install"
@@ -40,7 +40,7 @@ source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
 	"libass.patch::https://bugs.archlinux.org/index.php?getfile=11285")
 md5sums=('7ae385ebf8e5cfcb917393235e6efbdb'
          '8312d6d4ac5d7c3d9eed40ab08a17d3b'
-         'd4cbb6609c8e7b713c714241f529000e'
+         '02f7951824ee13103344f36009c0ef2a'
          '7fd6399d2ffbdf06b724f0cc2efa0784')
 
 prepare() {
@@ -61,6 +61,7 @@ build() {
 
   # Configuring XBMC
   export PYTHON_VERSION=2  # external python v2
+  export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
   ./configure --prefix=$_prefix --exec-prefix=$_prefix \
     --disable-debug \
     --enable-optimizations \
@@ -92,7 +93,7 @@ build() {
     --enable-libusb \
     --enable-libcec \
     --enable-external-libraries \
-    --disable-external-ffmpeg
+    --enable-external-ffmpeg
   # Now (finally) build
   make
 }
@@ -120,7 +121,7 @@ package() {
   done
 
   install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
-  install -Dm0644 $srcdir/polkit.rules $pkgdir/etc/polkit-1/rules.d/10-xbmc.rules
-  chmod 0700 $pkgdir/etc/polkit-1/rules.d/
+  install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules
+  chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/
 }
 # vim:set ts=2 sw=2 et:
diff --git a/libre/xbmc-libre/polkit.rules b/libre/xbmc-libre/polkit.rules
index 5bc7e69f5..4b6d0fda0 100644
--- a/libre/xbmc-libre/polkit.rules
+++ b/libre/xbmc-libre/polkit.rules
@@ -1,11 +1,12 @@
 polkit.addRule(function(action, subject) {
-  if (action.id.match("org.freedesktop.login1.") && subject.isInGroup("power")) {
-    return polkit.Result.YES;
-  }
-});
-
-polkit.addRule(function(action, subject) {
-  if (action.id.indexOf("org.freedesktop.udisks") == 0 && subject.isInGroup("storage")) {
-    return polkit.Result.YES;
-  }
+    if (subject.user == "xbmc") {
+        polkit.log("action=" + action);
+        polkit.log("subject=" + subject);
+        if (action.id.indexOf("org.freedesktop.login1.") == 0) {
+            return polkit.Result.YES;
+        }
+        if (action.id.indexOf("org.freedesktop.udisks.") == 0) {
+            return polkit.Result.YES;
+        }
+    }
 });
diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install
index b104b33e8..32626f28f 100644
--- a/libre/xbmc-libre/xbmc.install
+++ b/libre/xbmc-libre/xbmc.install
@@ -1,9 +1,10 @@
 post_install() {
   [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
   [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
-  getent group xbmc > /dev/null || groupadd xbmc
-  getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc
+  getent group xbmc > /dev/null || groupadd -r xbmc
+  getent passwd xbmc > /dev/null || useradd -r -m -d /var/lib/xbmc -g xbmc xbmc
   usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
+  chown -R xbmc:xbmc var/lib/xbmc
 }
 
 post_upgrade() {
@@ -11,6 +12,7 @@ post_upgrade() {
 }
 
 post_remove() {
-  post_install $1
-  echo "You may want to remove xbmc user and group"
+  [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
+  [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
+  getent passwd xbmc > /dev/null && userdel xbmc
 }
diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service
deleted file mode 100644
index b6430e255..000000000
--- a/libre/xbmc-libre/xbmc.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description = Starts instance of XBMC using xinit
-After = remote-fs.target
-
-[Service]
-User = xbmc
-Group = xbmc
-Type = simple
-ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp
-Restart = on-abort
-
-[Install]
-WantedBy = multi-user.target
diff --git a/libre/xchat-libre/ChangeLog b/libre/xchat-libre/ChangeLog
deleted file mode 100644
index faa8383c8..000000000
--- a/libre/xchat-libre/ChangeLog
+++ /dev/null
@@ -1,49 +0,0 @@
-2010-08-21  Eric Belanger  <eric@archlinux.org>
-
-	* xchat 2.8.8-3
-	* Rebuilt for python2
-
-2010-08-13  Ionut Biru <ibiru@archlinux.org>
-
-	* xchat 2.8.8-2
-	* perl 5.12 rebuild
-
-2010-05-30  Eric Belanger  <eric@archlinux.org>
-
-	* xchat 2.8.8-1
-	* Upstream update
-	* Added python optdepends
-	* Removed old patches
-
-2010-03-29  Eric Belanger  <eric@archlinux.org>
-
-	* Fixed buttons hotkey (close FS#17076)
-
-2009-09-30  Eric Belanger  <eric@archlinux.org>
-
-	* xchat 2.8.6-5
-	* Rebuilt against perl 5.10.1-3
-
-2009-09-28  Eric Belanger  <eric@archlinux.org>
-
-	* xchat 2.8.6-4
-	* Fixed crash when transparent background is enabled (close FS#15360)
-
-2008-11-08  Eric Belanger  <eric@archlinux.org>
-
-	* xchat 2.8.6-3
-	* Rebuild for python-2.6 (close FS#11998)
-	* Applied gtk2 patch
-
-2008-09-05  Eric Belanger  <eric@archlinux.org>
-
-	* xchat 2.8.6-2
-	* Applied upstream maintenance patch
-	* Added tcl optdepends
-
-2008-06-13  Eric Belanger  <eric@archlinux.org>
-
-	* xchat 2.8.6-1
-	* Upstream update
-	* Added spell checking support (close FS#10395)
-	* Added ChangeLog
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD
deleted file mode 100644
index 4f962dcb3..000000000
--- a/libre/xchat-libre/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $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@parabola.nu>
-
-_pkgname=xchat
-pkgname=xchat-libre
-pkgver=2.8.8
-pkgrel=13
-pkgdesc="A GTK+ based IRC client, without nonfree browser reference"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.xchat.org/"
-provides=("xchat=$pkgver")
-replaces=('xchat')
-conflicts=('xchat')
-license=('GPL')
-depends=('gtk2' 'openssl' 'dbus-glib' 'libnotify' 'hicolor-icon-theme')
-makedepends=('tcl' 'perl' 'python2' 'librsvg')
-optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin'
-            'python2: for python plugin')
-options=('!libtool')
-install=xchat.install
-source=(http://www.xchat.org/files/source/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz
-        http://xchat.org/files/icons/xchat-svg.tar.bz2
-        xchat-2.8.8-libnotify07.patch
-        xchat-2.8.8-link-against-libnotify.patch
-        xchat-2.8.8-glib-2.31.patch
-        remove-non-free-suggestion.patch
-        no-firefox.patch)
-sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
-          '0d366346cc11e0efb57fc2648fe423c94a3469bd'
-          'a053fba4e1911d1ee6a8248fe19e344797920fe3'
-          '70c3cc29fc55ff35f701ef8ac23078b6e3761ce1'
-          'aecaf6176a7cfd62555207b02f2793b360aa39da'
-          'e6a3b69ba333fc7ba0f70792d78d44fba7c4a911'
-          '20aef0ae608af6b30e1b4249f9c53830f8f514f6')
-
-prepare() {
-  cd ${_pkgname}-${pkgver}
-  sed -i 's/GDK_HAND1/GDK_HAND2/' src/fe-gtk/xtext.c
-  patch -p1 -i "${srcdir}/xchat-2.8.8-libnotify07.patch"
-  patch -p1 -i "${srcdir}/xchat-2.8.8-link-against-libnotify.patch"
-  patch -p1 -i "${srcdir}/xchat-2.8.8-glib-2.31.patch"
-  patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch"
-  patch -p1 -i "${srcdir}/no-firefox.patch"
-}
-
-build() {
-  cd ${_pkgname}-${pkgver}
-  autoconf
-  autoheader
-
-  LIBS+="-lgmodule-2.0" ./configure --prefix=/usr --sysconfdir=/etc --datadir=/usr/share \
-    --enable-openssl --enable-dbus --disable-textfe --enable-ipv6 --enable-shm --enable-spell=static
-  make
-}
-
-package() {
-  cd ${_pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  for i in 24 32 48 64 128 256 ; do
-    install -d "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps"
-    rsvg-convert -w $i -h $i -o "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/xchat.png" ../xchat-cloned.svg
-  done
-  install -D -m644 ../xchat-cloned.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/xchat.svg"
-  install -D -m644 ../xchat-used.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/xchat2.svg"
-}
diff --git a/libre/xchat-libre/no-firefox.patch b/libre/xchat-libre/no-firefox.patch
deleted file mode 100644
index 60c4846ee..000000000
--- a/libre/xchat-libre/no-firefox.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur xchat-2.8.8.orig/src/fe-gtk/fe-gtk.c xchat-2.8.8/src/fe-gtk/fe-gtk.c
---- xchat-2.8.8.orig/src/fe-gtk/fe-gtk.c	2010-05-16 00:15:42.000000000 -0300
-+++ xchat-2.8.8/src/fe-gtk/fe-gtk.c		2013-01-19 02:11:00.691529212 -0200
-@@ -955,8 +955,10 @@
- 			return;
- 	}
- 
--	/* everything failed, what now? just try firefox */
--	if (try_browser ("firefox", NULL, url))
-+	/* everything failed, what now? just try iceweasel or icecat */
-+	if (try_browser ("iceweasel", NULL, url))
-+		return;
-+	if (try_browser ("icecat", NULL, url))
- 		return;
- 
- 	/* fresh out of ideas... */
diff --git a/libre/xchat-libre/remove-non-free-suggestion.patch b/libre/xchat-libre/remove-non-free-suggestion.patch
deleted file mode 100644
index f20894610..000000000
--- a/libre/xchat-libre/remove-non-free-suggestion.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur xchat-2.8.8.orig/src/common/xchat.c xchat-2.8.8/src/common/xchat.c
---- xchat-2.8.8.orig/src/common/xchat.c	2010-05-16 04:04:45.000000000 -0300
-+++ xchat-2.8.8/src/common/xchat.c	2013-01-30 22:23:44.481258504 -0200
-@@ -602,7 +602,7 @@
- 	"NAME WII\n"			"CMD quote WHOIS %2 %2\n\n";
- 
- static char defaultconf_urlhandlers[] =
--		"NAME Open Link in Opera\n"		"CMD !opera -remote 'openURL(%s)'\n\n";
-+		""		"";
- 
- #ifdef USE_SIGACTION
- /* Close and open log files on SIGUSR1. Usefull for log rotating */
diff --git a/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch b/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch
deleted file mode 100644
index 63f562ff8..000000000
--- a/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Author: Dominique Leuenberger <dimstar@opensuse.org>
-
-http://sourceforge.net/tracker/?func=detail&aid=3446968&group_id=239&atid=100239
-
-glib got stricter in checking includes. Only glib.h (and a few exceptions)
-are to be included directly.
-
-Index: xchat-2.8.8/src/common/servlist.c
-===================================================================
---- xchat-2.8.8.orig/src/common/servlist.c
-+++ xchat-2.8.8/src/common/servlist.c
-@@ -24,7 +24,7 @@
- #include <unistd.h>
- 
- #include "xchat.h"
--#include <glib/ghash.h>
-+#include <glib.h>
- 
- #include "cfgfiles.h"
- #include "fe.h"
-Index: xchat-2.8.8/src/common/text.c
-===================================================================
---- xchat-2.8.8.orig/src/common/text.c
-+++ xchat-2.8.8/src/common/text.c
-@@ -28,7 +28,7 @@
- #include <sys/mman.h>
- 
- #include "xchat.h"
--#include <glib/ghash.h>
-+#include <glib.h>
- #include "cfgfiles.h"
- #include "chanopt.h"
- #include "plugin.h"
-Index: xchat-2.8.8/src/common/util.c
-===================================================================
---- xchat-2.8.8.orig/src/common/util.c
-+++ xchat-2.8.8/src/common/util.c
-@@ -39,7 +39,7 @@
- #include <errno.h>
- #include "xchat.h"
- #include "xchatc.h"
--#include <glib/gmarkup.h>
-+#include <glib.h>
- #include <ctype.h>
- #include "util.h"
- #include "../../config.h"
-Index: xchat-2.8.8/src/common/xchat.h
-===================================================================
---- xchat-2.8.8.orig/src/common/xchat.h
-+++ xchat-2.8.8/src/common/xchat.h
-@@ -1,10 +1,6 @@
- #include "../../config.h"
- 
--#include <glib/gslist.h>
--#include <glib/glist.h>
--#include <glib/gutils.h>
--#include <glib/giochannel.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <time.h>			/* need time_t */
- 
- #ifndef XCHAT_H
diff --git a/libre/xchat-libre/xchat-2.8.8-libnotify07.patch b/libre/xchat-libre/xchat-2.8.8-libnotify07.patch
deleted file mode 100644
index 2a6dce9a2..000000000
--- a/libre/xchat-libre/xchat-2.8.8-libnotify07.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 xchat-2.8.8/src/fe-gtk/plugin-tray.c
---- xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07	2010-11-15 17:32:15.708325783 -0500
-+++ xchat-2.8.8/src/fe-gtk/plugin-tray.c	2010-11-15 18:05:17.322141789 -0500
-@@ -125,8 +125,9 @@ static void *nn_mod = NULL;
- /* prototypes */
- static gboolean (*nn_init) (char *);
- static void (*nn_uninit) (void);
--static void *(*nn_new_with_status_icon) (const gchar *summary, const gchar *message, const gchar *icon, GtkStatusIcon *status_icon);
--static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, GtkWidget *attach);
-+/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an
-+ * extra NULL argument will be fine */
-+static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy);
- static gboolean (*nn_show) (void *noti, GError **error);
- static void (*nn_set_timeout) (void *noti, gint timeout);
- 
-@@ -160,8 +161,6 @@ libnotify_notify_new (const char *title,
- 			goto bad;
- 		if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit))
- 			goto bad;
--		if (!g_module_symbol (nn_mod, "notify_notification_new_with_status_icon", (gpointer)&nn_new_with_status_icon))
--			goto bad;
- 		if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new))
- 			goto bad;
- 		if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show))
diff --git a/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch b/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch
deleted file mode 100644
index 31e6c0854..000000000
--- a/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-From: Christopher Aillon <caillon@redhat.com>
-Date: Thu, 7 Apr 2011 19:34:14 -0700
-Subject: [PATCH] Link directly against libnotify
-
-Dynamically loading the library isn't ideal since the soname
-can change silently on us.  Additionally, notify-send is
-shipped as part of libnotify, so we aren't actually bringing
-in a new dependency.  Since we'd need to patch the source and
-rebuild for new sonames anyway, there's little benefit to
-dynamically loading libnotify.
-
-Plus, this has the benefit of cleaning up the code, as well as
-ensuring we'll catch any future soname changes sooner.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=693362
-https://sourceforge.net/tracker/?func=detail&aid=3280223&group_id=239&atid=100239
----
- configure.in             |   23 +++++++
- src/fe-gtk/plugin-tray.c |  144 ++++++++++-------------------------------------
- 2 files changed, 55 insertions(+), 112 deletions(-)
-
-diff -p -U8 xchat-2.8.8/configure.in.libnotifyso4 xchat-2.8.8/configure.in
---- xchat-2.8.8/configure.in.libnotifyso4	2010-05-29 23:01:16.000000000 -0700
-+++ xchat-2.8.8/configure.in	2011-04-07 19:27:00.448137113 -0700
-@@ -34,16 +34,17 @@ AH_VERBATIM([PREFIX],[#undef PREFIX])
- AH_VERBATIM([XCHATLIBDIR],[#undef XCHATLIBDIR])
- AH_VERBATIM([XCHATSHAREDIR],[#undef XCHATSHAREDIR])
- AH_VERBATIM([SOCKS],[#undef SOCKS])
- AH_VERBATIM([USE_MSPROXY],[#undef USE_MSPROXY])
- dnl AH_VERBATIM([USE_GNOME],[#undef USE_GNOME])
- AH_VERBATIM([USE_SHM],[#undef USE_SHM])
- AH_VERBATIM([USE_GTKSPELL],[#undef USE_GTKSPELL])
- AH_VERBATIM([USE_LIBSEXY],[#undef USE_LIBSEXY])
-+AH_VERBATIM([USE_LIBNOTIFY],[#undef USE_LIBNOTIFY])
- AH_VERBATIM([USE_IPV6],[#undef USE_IPV6])
- AH_VERBATIM([USE_MMX],[#undef USE_MMX])
- AH_VERBATIM([USE_OPENSSL],[#undef USE_OPENSSL])
- AH_VERBATIM([USE_PLUGIN],[#undef USE_PLUGIN])
- AH_VERBATIM([USE_XFT],[#undef USE_XFT])
- AH_VERBATIM([USE_XLIB],[#undef USE_XLIB])
- AH_VERBATIM([USE_SIGACTION],[#undef USE_SIGACTION])
- AH_VERBATIM([USING_FREEBSD],[#undef USING_FREEBSD])
-@@ -126,16 +127,20 @@ AC_ARG_ENABLE(tcl,
- AC_ARG_ENABLE(plugin,
- [  --disable-plugin        disable plugin support],
-         plugin=$enableval, plugin=yes)
- 
- AC_ARG_ENABLE(dbus,
- [  --disable-dbus          disable DBUS support],
-         dbus=$enableval, dbus=yes)
- 
-+AC_ARG_ENABLE(libnotify,
-+[  --disable-libnotify     disable libnotify support],
-+        libnotify=$enableval, libnotify=yes)
-+
- AC_ARG_ENABLE(mmx,
- [  --disable-mmx           disable MMX assembly routines],
-         mmx=$enableval, mmx=yes)
- 
- AC_ARG_ENABLE(shm,
- [  --enable-shm            enable use of XShm for fast tinting (default: no)],
-         shm=$enableval, shm=no)
- 
-@@ -482,16 +487,32 @@ if test "x$dbus" = "xyes" ; then
- 
- 		DBUS_SERVICES_DIR="$DATADIR/dbus-1/services"
- 		AC_SUBST(DBUS_SERVICES_DIR)
- 		AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is])
- 	fi
- fi
- 
- dnl *********************************************************************
-+dnl ** LIBNOTIFY ********************************************************
-+dnl *********************************************************************
-+
-+if test "x$libnotify" = "xyes" ; then
-+	PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= 0.4, [], [
-+		AC_MSG_RESULT(no)
-+		libnotify=no
-+	])
-+	if test "$libnotify" != "no" ; then
-+		GUI_LIBS="$GUI_LIBS $LIBNOTIFY_LIBS"
-+		GUI_CFLAGS="$GUI_CFLAGS $LIBNOTIFY_CFLAGS"
-+		AC_DEFINE(USE_LIBNOTIFY)
-+	fi
-+fi
-+
-+dnl *********************************************************************
- dnl ** SPELL ************************************************************
- dnl *********************************************************************
- 
- if test "$spell" = "gtkspell" ; then
- 	PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, [], [
- 		AC_MSG_RESULT(no)
- 		spell=no
- 	])
-@@ -519,16 +540,17 @@ if test "$spell" = "static" ; then
- fi
- 
- dnl *********************************************************************
- dnl ** CONDITIONALS *****************************************************
- dnl *********************************************************************
- 
- AM_CONDITIONAL(USE_OPENSSL, test "x$openssl" = "xyes")
- AM_CONDITIONAL(USE_LIBSEXY, test "x$spell" = "xstatic")
-+AM_CONDITIONAL(USE_LIBNOTIFY, test "x$libnotify" = "xyes")
- AM_CONDITIONAL(DO_TEXT, test "x$textfe" = "xyes")
- AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes")
- AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes")
- AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes")
- AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes")
- AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes")
- AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes")
- AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno")
-@@ -807,16 +829,17 @@ echo mmx tinting ......... : $mmx\	spell
- echo XShm tinting ........ : $shm\	plugin interface ...... : $plugin
- if test "$xft" = no; then
-   echo text backend ........ : pango\	nls/gettext ........... : $USE_NLS
- else
-   echo text backend ........ : xft\	nls/gettext ........... : $USE_NLS
- fi
- echo openssl support ..... : $openssl\	ipv6 support .......... : $ipv6
- echo dbus support ........ : $dbus\	msproxy ntlm \(ISA\) .... : $have_ntlm
-+echo libnotify support ... : $libnotify
- echo
- echo The binary will be installed in $prefix/bin
- echo
- 
- if test "$gtkfe" = no; then
- 	echo Warning: The GTK \(GUI\) frontend will not be built.
- 	echo
- fi
-diff -p -U8 xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotifyso4 xchat-2.8.8/src/fe-gtk/plugin-tray.c
---- xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotifyso4	2011-04-07 17:57:27.524307905 -0700
-+++ xchat-2.8.8/src/fe-gtk/plugin-tray.c	2011-04-07 19:18:33.429475719 -0700
-@@ -10,17 +10,27 @@
- #include "../common/fe.h"
- #include "../common/util.h"
- #include "fe-gtk.h"
- #include "pixmaps.h"
- #include "maingui.h"
- #include "menu.h"
- #include <gtk/gtk.h>
- 
--#define LIBNOTIFY
-+#ifdef USE_LIBNOTIFY
-+#include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+#if NOTIFY_CHECK_VERSION(0,7,0)
-+#define XC_NOTIFY_NEW(a,b,c,d) notify_notification_new(a,b,c)
-+#else
-+#define XC_NOTIFY_NEW(a,b,c,d) notify_notification_new(a,b,c,d)
-+#endif
-+#endif
- 
- typedef enum	/* current icon status */
- {
- 	TS_NONE,
- 	TS_MESSAGE,
- 	TS_HIGHLIGHT,
- 	TS_FILEOFFER,
- 	TS_CUSTOM /* plugin */
-@@ -112,90 +122,16 @@ tray_count_networks (void)
- 
- void
- fe_tray_set_tooltip (const char *text)
- {
- 	if (sticon)
- 		gtk_status_icon_set_tooltip (sticon, text);
- }
- 
--#ifdef LIBNOTIFY
--
--/* dynamic access to libnotify.so */
--
--static void *nn_mod = NULL;
--/* prototypes */
--static gboolean (*nn_init) (char *);
--static void (*nn_uninit) (void);
--/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an
-- * extra NULL argument will be fine */
--static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy);
--static gboolean (*nn_show) (void *noti, GError **error);
--static void (*nn_set_timeout) (void *noti, gint timeout);
--
--static void
--libnotify_cleanup (void)
--{
--	if (nn_mod)
--	{
--		nn_uninit ();
--		g_module_close (nn_mod);
--		nn_mod = NULL;
--	}
--}
--
--static gboolean
--libnotify_notify_new (const char *title, const char *text, GtkStatusIcon *icon)
--{
--	void *noti;
--
--	if (!nn_mod)
--	{
--		nn_mod = g_module_open ("libnotify", G_MODULE_BIND_LAZY);
--		if (!nn_mod)
--		{
--			nn_mod = g_module_open ("libnotify.so.1", G_MODULE_BIND_LAZY);
--			if (!nn_mod)
--				return FALSE;
--		}
--
--		if (!g_module_symbol (nn_mod, "notify_init", (gpointer)&nn_init))
--			goto bad;
--		if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit))
--			goto bad;
--		if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new))
--			goto bad;
--		if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show))
--			goto bad;
--		if (!g_module_symbol (nn_mod, "notify_notification_set_timeout", (gpointer)&nn_set_timeout))
--			goto bad;
--		if (!nn_init (PACKAGE_NAME))
--			goto bad;
--	}
--
--	text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP);
--	title = strip_color (title, -1, STRIP_ALL);
--	noti = nn_new (title, text, XCHATSHAREDIR"/pixmaps/xchat.png", NULL);
--	g_free ((char *)title);
--	g_free ((char *)text);
--
--	nn_set_timeout (noti, prefs.input_balloon_time*1000);
--	nn_show (noti, NULL);
--	g_object_unref (G_OBJECT (noti));
--
--	return TRUE;
--
--bad:
--	g_module_close (nn_mod);
--	nn_mod = NULL;
--	return FALSE;
--}
--
--#endif
--
- void
- fe_tray_set_balloon (const char *title, const char *text)
- {
- #ifndef WIN32
- 	const char *argv[8];
- 	const char *path;
- 	char time[16];
- 	WinStatus ws;
-@@ -208,52 +144,36 @@ fe_tray_set_balloon (const char *title, 
- 	/* bit 1 of flags means "no balloons unless hidden/iconified" */
- 	if (ws != WS_HIDDEN && (prefs.gui_tray_flags & 2))
- 		return;
- 
- 	/* FIXME: this should close the current balloon */
- 	if (!text)
- 		return;
- 
--#ifdef LIBNOTIFY
--	/* try it via libnotify.so */
--	if (libnotify_notify_new (title, text, sticon))
--		return;	/* success */
--#endif
-+#ifdef USE_LIBNOTIFY
-+	NotifyNotification *notification;
-+	char *notify_text, *notify_title;
- 
--	/* try it the crude way */
--	path = g_find_program_in_path ("notify-send");
--	if (path)
--	{
--		sprintf(time, "%d000",prefs.input_balloon_time);
--		argv[0] = path;
--		argv[1] = "-i";
--		argv[2] = "gtk-dialog-info";
--		if (access (XCHATSHAREDIR"/pixmaps/xchat.png", R_OK) == 0)
--			argv[2] = XCHATSHAREDIR"/pixmaps/xchat.png";
--		argv[3] = "-t";
--		argv[4] = time;
--		argv[5] = title;
--		text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP);
--		argv[6] = text;
--		argv[7] = NULL;
--		xchat_execv (argv);
--		g_free ((char *)path);
--		g_free ((char *)text);
--	}
--	else
--	{
--		/* show this error only once */
--		static unsigned char said_it = FALSE;
--		if (!said_it)
--		{
--			said_it = TRUE;
--			fe_message (_("Cannot find 'notify-send' to open balloon alerts.\nPlease install libnotify."), FE_MSG_ERROR);
--		}
--	}
-+	if (!notify_is_initted())
-+		notify_init(PACKAGE_NAME);
-+
-+	notify_text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP);
-+	notify_title = strip_color (title, -1, STRIP_ALL);
-+
-+	notification = XC_NOTIFY_NEW (notify_title, notify_text, XCHATSHAREDIR"/pixmaps/xchat.png", NULL);
-+
-+	g_free ((char *)notify_title);
-+	g_free ((char *)notify_text);
-+
-+	notify_notification_set_timeout (notification, prefs.input_balloon_time*1000);
-+	notify_notification_show (notification, NULL);
-+
-+	g_object_unref (notification);
-+#endif
- #endif
- }
- 
- static void
- tray_set_balloonf (const char *text, const char *format, ...)
- {
- 	va_list args;
- 	char *buf;
-@@ -840,13 +760,13 @@ tray_plugin_init (xchat_plugin *plugin_h
- 	return 1;       /* return 1 for success */
- }
- 
- int
- tray_plugin_deinit (xchat_plugin *plugin_handle)
- {
- #ifdef WIN32
- 	tray_cleanup ();
--#elif defined(LIBNOTIFY)
--	libnotify_cleanup ();
-+#elif defined(USE_LIBNOTIFY)
-+	notify_uninit ();
- #endif
- 	return 1;
- }
diff --git a/libre/xchat-libre/xchat.install b/libre/xchat-libre/xchat.install
deleted file mode 100644
index eab82d16f..000000000
--- a/libre/xchat-libre/xchat.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor	
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/libre/xmlstarlet/PKGBUILD b/libre/xmlstarlet/PKGBUILD
deleted file mode 100644
index f51ca586e..000000000
--- a/libre/xmlstarlet/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# From https://aur.archlinux.org/packages.php?ID=20101.
-# Maintainer: PyroPeter <abi1789@googlemail.com>
-# Contributor: BlackEagle <ike.devolder@scarlet.be>
-# Contributor: chochem <chochem@gmail.com>
-
-pkgname=xmlstarlet
-pkgver=1.3.1
-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=('custom:MIT')
-depends=('libxslt>=1.1.9')
-source=("xmlstarlet-$pkgver.tar.gz::http://sourceforge.net/projects/xmlstar/files/xmlstarlet/$pkgver/xmlstarlet-$pkgver.tar.gz/download")
-md5sums=('5173ad3f01ec0ba0d54bd1fbfc057abf')
-
-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
-  
-  make
-  make DESTDIR="${pkgdir}" install
-  mkdir -p $pkgdir/usr/share/licenses/$pkgname
-  cp Copyright $pkgdir/usr/share/licenses/$pkgname/COPYING
-  ln -s /usr/bin/xml ${pkgdir}/usr/bin/xmlstarlet
-}
diff --git a/libre/xorg-fonts-100dpi-libre/PKGBUILD b/libre/xorg-fonts-100dpi-libre/PKGBUILD
deleted file mode 100644
index 3f88f1cee..000000000
--- a/libre/xorg-fonts-100dpi-libre/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 71678 2010-03-08 11:58:02Z jgc $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-pkgname=xorg-fonts-100dpi-libre
-pkgver=1.0.3
-pkgrel=2
-pkgdesc="X.org 100dpi fonts"
-arch=(any)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('xorg-fonts-encodings' 'xorg-fonts-alias' 'xorg-font-utils' 'fontconfig')
-groups=('xorg')
-provides=("xorg-fonts-100dpi=$pkgver")
-conflicts=('xorg-fonts-100dpi')
-replaces=('xorg-fonts-100dpi')
-install=xfonts.install
-source=(${url}/releases/individual/font/font-adobe-100dpi-$pkgver.tar.bz2
-        ${url}/releases/individual/font/font-bitstream-100dpi-$pkgver.tar.bz2)
-
-build() {
-  cd "${srcdir}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-
-  for dir in font-*-100dpi*; do
-    if [ -d "${dir}" ]; then
-      pushd ${dir}
-      ./configure --prefix=/usr \
-          --with-fontdir=/usr/share/fonts/100dpi
-      make || return 1
-      make DESTDIR="${pkgdir}" install || return 1
-  
-      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-100dpi-*}" || return 1
-      popd
-    fi
-  done
-  rm -f "${pkgdir}"/usr/share/fonts/100dpi/fonts.*
-}
-md5sums=('1347c3031b74c9e91dc4dfa53b12f143'
-         '6b223a54b15ecbd5a1bc52312ad790d8')
diff --git a/libre/xorg-fonts-100dpi-libre/xfonts.install b/libre/xorg-fonts-100dpi-libre/xfonts.install
deleted file mode 100644
index 5c5e8a2b4..000000000
--- a/libre/xorg-fonts-100dpi-libre/xfonts.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo -n "Updating font cache... "
-  fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/100dpi
-  mkfontdir /usr/share/fonts/100dpi
-  echo "done."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/libre/xorg-fonts-75dpi-libre/PKGBUILD b/libre/xorg-fonts-75dpi-libre/PKGBUILD
deleted file mode 100644
index c262229fc..000000000
--- a/libre/xorg-fonts-75dpi-libre/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 71681 2010-03-08 12:06:26Z jgc $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-pkgname=xorg-fonts-75dpi-libre
-pkgver=1.0.3
-pkgrel=2
-pkgdesc="X.org 75dpi fonts"
-arch=(any)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig)
-groups=('xorg')
-provides=("xorg-fonts-75dpi=$pkgver")
-conflicts=('xorg-fonts-75dpi')
-replaces=('xorg-fonts-75dpi')
-install=xfonts.install
-source=(${url}/releases/individual/font/font-adobe-75dpi-$pkgver.tar.bz2
-        ${url}/releases/individual/font/font-bitstream-75dpi-$pkgver.tar.bz2)
-
-build() {
-  cd "${srcdir}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  for dir in *; do
-    if [ -d "${dir}" ]; then
-      pushd "${dir}"
-      ./configure --prefix=/usr \
-          --with-fontdir=/usr/share/fonts/75dpi || return 1
-      make || return 1
-      make DESTDIR="${pkgdir}" install || return 1
-      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-75dpi-*}" || return 1
-      popd
-    fi
-  done
-  rm -f "${pkgdir}"/usr/share/fonts/75dpi/fonts.*
-}
-md5sums=('6c9f26c92393c0756f3e8d614713495b'
-         'd7c0588c26fac055c0dd683fdd65ac34')
diff --git a/libre/xorg-fonts-75dpi-libre/xfonts.install b/libre/xorg-fonts-75dpi-libre/xfonts.install
deleted file mode 100644
index e52603946..000000000
--- a/libre/xorg-fonts-75dpi-libre/xfonts.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo -n "Updating font cache... "
-  fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/75dpi
-  mkfontdir /usr/share/fonts/75dpi
-  echo "done."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/libre/xorg-fonts-type1-libre/PKGBUILD b/libre/xorg-fonts-type1-libre/PKGBUILD
deleted file mode 100644
index 4904a4477..000000000
--- a/libre/xorg-fonts-type1-libre/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 150375 2012-02-17 09:54:09Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xorg-fonts-type1-libre
-pkgver=7.4
-pkgrel=2
-pkgdesc="X.org Type1 fonts, without nonfree fonts"
-arch=(any)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig)
-provides=("xorg-fonts-type1=${pkgver}")
-conflicts=('xorg-fonts-type1')
-replaces=('xorg-fonts-type1')
-install=xfonts.install
-source=(${url}/releases/individual/font/font-bitstream-type1-1.0.2.tar.bz2
-        ${url}/releases/individual/font/font-xfree86-type1-1.0.3.tar.bz2)
-md5sums=('27c55f6a938e7153c59fb551b2f491f9'
-         'df934bfc0339322cee73ee3c5460a648')
-
-build() {
-  cd "${srcdir}"
-  for dir in *; do
-    if [ -d "${dir}" ]; then
-      pushd "${dir}"
-      ./configure --prefix=/usr \
-        --with-fontdir=/usr/share/fonts/Type1
-      make
-      popd
-    fi
-  done
-}
-
-package() {
-  cd "${srcdir}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  for dir in *; do
-    if [ -d "${dir}" ]; then
-      pushd "${dir}"
-      make DESTDIR="${pkgdir}" install
-      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-*}"
-      popd
-    fi
-  done
-  rm -f "${pkgdir}"/usr/share/fonts/Type1/fonts.*
-}
diff --git a/libre/xorg-fonts-type1-libre/xfonts.install b/libre/xorg-fonts-type1-libre/xfonts.install
deleted file mode 100644
index 51688a1d1..000000000
--- a/libre/xorg-fonts-type1-libre/xfonts.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo -n "Updating font cache... "
-  fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/Type1
-  mkfontdir /usr/share/fonts/Type1
-  echo "done."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/libre/xscreensaver-libre/LICENSE b/libre/xscreensaver-libre/LICENSE
deleted file mode 100644
index 406467cd4..000000000
--- a/libre/xscreensaver-libre/LICENSE
+++ /dev/null
@@ -1,10 +0,0 @@
-/* xscreensaver, Copyright (c) 1991-2013 Jamie Zawinski <jwz@jwz.org>
- *
- * 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.  No representations are made about the suitability of this
- * software for any purpose.  It is provided "as is" without express or 
- * implied warranty.
- */
diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD
deleted file mode 100644
index c2eddaafc..000000000
--- a/libre/xscreensaver-libre/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 201451 2013-12-12 05:18:26Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=xscreensaver
-pkgname=xscreensaver-libre
-pkgver=5.26
-pkgrel=1
-pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.jwz.org/xscreensaver/"
-license=('BSD')
-depends=('libglade' 'libxmu' 'glu' 'xorg-appres' 'perl-libwww')
-makedepends=('bc' 'libxpm' 'gdm')
-optdepends=('gdm: for login manager support')
-replaces=("${_pkgname}")
-conflicts=("${_pkgname}")
-provides=("${_pkgname}=${pkgver}")
-backup=('etc/pam.d/xscreensaver')
-source=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz \
-        xscreensaver-add-electricsheep.diff LICENSE)
-sha1sums=('8055822b661733e68550872a4ae6b6129c0b73fc'
-          'e8dc57b6471fb3867ee099304ac6bf628351cb98'
-          '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
-
-prepare() {
-  cd ${_pkgname}-${pkgver}
-  patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
-
-  # Deleting dmsc.asm file due which don't have source code supplied
-  rm -v hacks/images/m6502/dmsc.asm
-}
-
-build() {
-  cd ${_pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \
-    --with-pam --with-login-manager --with-gtk --with-gl \
-    --without-gle --with-pixbuf --with-jpeg
-  make
-}
-
-package() {
-  cd ${_pkgname}-${pkgver}
-  install -d "${pkgdir}/etc/pam.d"
-  make install_prefix="${pkgdir}" install
-  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
-  chmod 755 "${pkgdir}/usr/bin/xscreensaver"
-  echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop"
-}
diff --git a/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff b/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff
deleted file mode 100644
index 0c5c3ff40..000000000
--- a/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- driver/XScreenSaver.ad.in-orig	2013-07-16 16:47:10.183068023 -0400
-+++ driver/XScreenSaver.ad.in	2013-07-16 16:48:23.293473297 -0400
-@@ -157,6 +157,7 @@
- !
- *programs:								      \
- 				maze -root				    \n\
-+				electricsheep --root 1			    \n\
- @GL_KLUDGE@ GL: 				superquadrics -root			    \n\
- 				attraction -root			    \n\
- 				blitspin -root				    \n\
diff --git a/libre/xsp/PKGBUILD b/libre/xsp/PKGBUILD
deleted file mode 100644
index 02e172c8f..000000000
--- a/libre/xsp/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 188153 2013-06-10 16:36:32Z daniel $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=xsp
-pkgver=3.0.11
-pkgrel=1
-pkgdesc="A simple webserver based on mono - provides ASP.NET support (Parabola rebranded)"
-arch=('i686' 'x86_64' 'mips64el')
-license=('custom')
-url="http://www.go-mono.com"
-depends=('mono' 'sqlite')
-options=(!makeflags)
-install=${pkgname}.install
-source=(https://github.com/mono/xsp/archive/${pkgver}.tar.gz
-        ${pkgname}.webapp
-        ${pkgname}.service)
-md5sums=('6a694d5e87ebe57e532ec80a16b6966d'
-         'c917c07f68b945691506c29750db482f'
-         '9d83bd36d209f8d36a11dfbc4fa50819')
-
-build() {
- # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR=${srcdir}/src/weird
-  mkdir -p "${MONO_SHARED_DIR}"
- # import pathes
- # build
-  cd ${srcdir}/${pkgname}-${pkgver}
-  #sed -i 's|/bin/sh|\0\nexport MONO_PATH=${MONO_PATH}:/opt/mono/lib/mono/1.0|' scripts/script.in
-  ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
- # tweak the xsp shellscript to grab system dll's
-  for script in scripts/*2; do
-    sed -i 's|/usr/lib/mono/1.0|/usr/lib/mono/2.0|' $script
-  done
-   #destdir related bugfixes
-  sed -i 's|mkdir \$(datadir)|mkdir $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile
-  sed -i 's|gif \$(datadir)|gif $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir}/ install
- # move test files from share to arch' default html home
-  mkdir -p ${pkgdir}/srv/http/html
-  mv ${pkgdir}/usr/lib/xsp/test ${pkgdir}/srv/http/html/xsp
-  rm -rf ${pkgdir}/usr/share
-  chown -R http:http ${pkgdir}/srv/http/html/${pkgname}
-
- # install a xsp configuration home
-  install -D -m644 ${srcdir}/${pkgname}.webapp \
-    ${pkgdir}/etc/${pkgname}/${pkgname}.webapp
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
- # install systemd service file
-  install -D -m644 ${srcdir}/${pkgname}.service \
-    ${pkgdir}/usr/lib/systemd/system/xsp.service
-}
diff --git a/libre/xsp/xsp.conf.d b/libre/xsp/xsp.conf.d
deleted file mode 100644
index b100baef1..000000000
--- a/libre/xsp/xsp.conf.d
+++ /dev/null
@@ -1,10 +0,0 @@
-# xsp options
-
-
-# note that is just the helping app for mod_mono if you like production like
-# quality
-# xsp is for ASP testing mainly  -- read the manpage for xsp to know what
-# options are available. Parabola will provide xsp configured by a .webapp
-# configuration file which rests in /etc/xsp
-
-XSP_PARAMS="--appconfigdir /etc/xsp"
diff --git a/libre/xsp/xsp.install b/libre/xsp/xsp.install
deleted file mode 100644
index d2cc5955a..000000000
--- a/libre/xsp/xsp.install
+++ /dev/null
@@ -1,37 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  cat << EOM
-
--->  xsp is just the helping app for mod_mono if you like a production like
--->  server. xsp itself is for ASP testing mainly  -- read the manpage for xsp
--->  to know which options are available.
--->  Parabola will provide xsp configured by a .webapp configuration file
--->  which rests in /etc/xsp. Just put your other webapp files there to let
--->  xsp pick them up.
--->  xsp is commandline based configuration is done in /etc/conf.d/xsp. Set all
--->  your arguments there. Don't forget that you can run xsp from the console
--->  as oridinary user, which is safer and for testing absolutely sufficient!!
-
--->  You can run the testpages simply by starting the server and calling 
-                       http://localhost:8080
--->  from your browser's location bar
-
-
-EOM
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
diff --git a/libre/xsp/xsp.rc.d b/libre/xsp/xsp.rc.d
deleted file mode 100644
index b4fcda15c..000000000
--- a/libre/xsp/xsp.rc.d
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/xsp ] && . /etc/conf.d/xsp
-
-PID=`pidof -o %PPID /usr/bin/mono`
-case "$1" in
-  start)
-    stat_busy "Starting Xsp Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/bin/xsp $XSP_PARAMS --nonstop &> /dev/null &
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon xsp
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Xsp Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon xsp
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/libre/xsp/xsp.service b/libre/xsp/xsp.service
deleted file mode 100644
index 36b802e21..000000000
--- a/libre/xsp/xsp.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=XSP Web Server
-
-[Service]
-ExecStart=/usr/bin/xsp --appconfigdir /etc/xsp --nonstop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/xsp/xsp.webapp b/libre/xsp/xsp.webapp
deleted file mode 100644
index a685dd171..000000000
--- a/libre/xsp/xsp.webapp
+++ /dev/null
@@ -1,8 +0,0 @@
-<apps>
-  <web-application>
-    <name>Root</name>
-      <vpath>/</vpath>
-      <path>/srv/http/html/xsp</path>
-      <vhost>localhost</vhost>
-  </web-application>
-</apps>
diff --git a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
deleted file mode 100644
index b7bd659a0..000000000
--- a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-From: Mike Hommey <mh@glandium.org>

-Date: Tue, 5 Jun 2012 08:57:06 +0200

-Subject: Bug 756390 - Make the "Reset Firefox" feature more generic

-

-diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js

-index 0e8ccf5..fa46c08 100644

---- a/browser/components/migration/content/migration.js

-+++ b/browser/components/migration/content/migration.js

-@@ -249,7 +249,7 @@ var MigrationWizard = {

-     }

- 

-     var brandBundle = document.getElementById("brandBundle");

--    // These strings don't exist when not using official branding. If that's

-+    // These strings may not exist when not using official branding. If that's

-     // the case, just skip this page.

-     try {

-       var pageTitle = brandBundle.getString("homePageMigrationPageTitle");

-@@ -281,8 +281,8 @@ var MigrationWizard = {

-       case "chrome":

-         source = "sourceNameChrome";

-         break;

--      case "firefox":

--        source = "sourceNameFirefox";

-+      case "self":

-+        source = "brand";

-         break;

-     }

- 

-@@ -292,7 +292,12 @@ var MigrationWizard = {

-     var oldHomePageURL = this._migrator.sourceHomePageURL;

- 

-     if (oldHomePageURL && source) {

--      var appName = MigrationUtils.getLocalizedString(source);

-+      var appName;

-+      if (source == "brand") {

-+        appName = brandBundle.GetStringFromName("brandFullName");

-+      } else {

-+        appName = MigrationUtils.getLocalizedString(source);

-+      }

-       var oldHomePageLabel =

-         brandBundle.getFormattedString("homePageImport", [appName]);

-       var oldHomePage = document.getElementById("oldHomePage");

-diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul

-index f030756..23e37ff 100644

---- a/browser/components/migration/content/migration.xul

-+++ b/browser/components/migration/content/migration.xul

-@@ -42,7 +42,7 @@

- #elifdef XP_UNIX

-       <radio id="chrome"    label="&importFromChrome.label;"    accesskey="&importFromChrome.accesskey;"/>

- #endif

--      <radio id="firefox"   label="&importFromFirefox.label;"   accesskey="&importFromFirefox.accesskey;"/>

-+      <radio id="self"      hidden="true"/>

-       <radio id="nothing"   label="&importFromNothing.label;"   accesskey="&importFromNothing.accesskey;" hidden="true"/>

-     </radiogroup>

-     <label id="noSources" hidden="true">&noMigrationSources.label;</label>

-diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest

-index d7fec75..d531b83 100644

---- a/browser/components/migration/src/BrowserProfileMigrators.manifest

-+++ b/browser/components/migration/src/BrowserProfileMigrators.manifest

-@@ -3,7 +3,7 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737

- component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js

- contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}

- component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js

--contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}

-+contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}

- #ifdef HAS_IE_MIGRATOR

- 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 52722e9..0448444 100644

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

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

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

- 

- 

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

--FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=firefox";

-+FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";

- FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");

- 

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

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

-index 1f60879..fc83a99 100644

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

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

-@@ -403,11 +403,6 @@ this.MigrationUtils = Object.freeze({

-    * @see nsIStringBundle

-    */

-   getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {

--    const OVERRIDES = {

--      "4_firefox": "4_firefox_history_and_bookmarks"

--    };

--    aKey = OVERRIDES[aKey] || aKey;

--

-     if (aReplacements === undefined)

-       return getMigrationBundle().GetStringFromName(aKey);

-     return getMigrationBundle().formatStringFromName(

-@@ -622,6 +617,17 @@ this.MigrationUtils = Object.freeze({

-   },

- 

-   /**

-+   * Returns whether a given migration type is supported.

-+   *

-+   * @param  aKey   Migrator key

-+   * @returns whether the migrator key is supported.

-+   */

-+  canMigrate:

-+  function MU_canMigrate(aMigratorKey) {

-+    return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;

-+  },

-+

-+  /**

-    * Cleans up references to migrators and nsIProfileInstance instances.

-    */

-   finishMigration: function MU_finishMigration() {

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

-index f67823b..36016b8 100644

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

-+++ b/browser/components/migration/src/ProfileMigrator.js

-@@ -12,6 +12,7 @@ function ProfileMigrator() {

- 

- ProfileMigrator.prototype = {

-   migrate: MigrationUtils.startupMigration.bind(MigrationUtils),

-+  canMigrate: MigrationUtils.canMigrate.bind(MigrationUtils),

-   QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIProfileMigrator]),

-   classDescription: "Profile Migrator",

-   contractID: "@mozilla.org/toolkit/profile-migrator;1",

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

-index 21cf405..f3c1a6b 100644

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

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

-@@ -17,8 +17,6 @@

- <!ENTITY importFromSafari.accesskey     "S">

- <!ENTITY importFromChrome.label         "Chrome">

- <!ENTITY importFromChrome.accesskey     "C">

--<!ENTITY importFromFirefox.label        "Firefox">

--<!ENTITY importFromFirefox.accesskey    "X">

- 

- <!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 260bc29..52b32cc 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)

- 2_ie=Cookies

- 2_safari=Cookies

- 2_chrome=Cookies

--2_firefox=Cookies

-+2_self=Cookies

- 

- 4_ie=Browsing History

- 4_safari=Browsing History

- 4_chrome=Browsing History

--4_firefox_history_and_bookmarks=Browsing History and Bookmarks

-+4_self=Browsing History and Bookmarks

- 

- 8_ie=Saved Form History

- 8_safari=Saved Form History

- 8_chrome=Saved Form History

--8_firefox=Saved Form History

-+8_self=Saved Form History

- 

- 16_ie=Saved Passwords

- 16_safari=Saved Passwords

- 16_chrome=Saved Passwords

--16_firefox=Saved Passwords

-+16_self=Saved Passwords

- 

- 32_ie=Favorites

- 32_safari=Bookmarks

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

- 64_ie=Other Data

- 64_safari=Other Data

- 64_chrome=Other Data

--64_firefox=Bookmarks Backups

-+64_self=Bookmarks Backups

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

-index 96cedd3..a0f8a75 100644

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

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

-@@ -42,7 +42,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)

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

-index dcb4065..09c1146 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);

- 

--#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);

-+    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);

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

-       dataTypes.push(typeName);

-     } catch (x) {

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

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

-index f35c227..7062886 100644

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

-+++ b/toolkit/profile/nsIProfileMigrator.idl

-@@ -37,7 +37,7 @@ interface nsIProfileStartup : nsISupports

-  * @client   Toolkit (Startup code)

-  * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1")

-  */

--[scriptable, uuid(3df284a5-2258-4d46-a664-761ecdc04c22)]

-+[scriptable, uuid(96d9ab66-082c-4a9e-82ad-f8c21b391342)]

- interface nsIProfileMigrator : nsISupports 

- {

-   /**

-@@ -60,6 +60,14 @@ interface nsIProfileMigrator : nsISupports

-    * @note The startup code ignores COM exceptions thrown from this method.

-    */

-   void migrate(in nsIProfileStartup aStartup, in ACString aKey);

-+

-+  /**

-+   * Returns whether a given migration type is supported.

-+   *

-+   * @param  aKey   Migrator key

-+   * @returns whether the migrator key is supported.

-+   */

-+  bool canMigrate(in ACString aKey);

- };

- 

- %{C++

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

-index 1045665..04bd1aa 100644

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

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

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

-         if (gDoProfileReset) {

-           // Automatically migrate from the current application if we just

-           // reset the profile.

--          aKey = MOZ_APP_NAME;

-+          aKey = "self";

-         }

-         pm->Migrate(&mDirProvider, aKey);

-       }

diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
deleted file mode 100644
index 5b21529b4..000000000
--- a/libre/xulrunner-libre/PKGBUILD
+++ /dev/null
@@ -1,98 +0,0 @@
-# $Id: PKGBUILD 180163 2013-03-18 13:29:32Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-# With many changes from iceweasel-libre.
-
-# We're getting this from Debian Experimental
-_debname=iceweasel
-_debver=19.0.2
-_debrel=1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_pkgname=xulrunner
-pkgname=xulrunner-libre
-pkgver=${_debver}.${_debrel}
-pkgrel=1
-pkgdesc="Mozilla Runtime Environment (built from Debian Iceweasel source code)"
-arch=('i686' 'x86_64' 'mips64el')
-license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
-url="http://wiki.mozilla.org/XUL:Xul_Runner"
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
-        mozconfig
-        mozilla-pkgconfig.patch
-        shared-libs.patch
-        Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-options=('!emptydirs')
-conflicts=('xulrunner')
-provides=("xulrunner=${_debver}")
-replaces=('xulrunner-oss' 'xulrunner')
-md5sums=('ceda63e01012f9940542d862fd755a65'
-         '7fa6e0fb544d01516d3232f26023c570'
-         '7f3317c25308a631ca31d8d280991bb4'
-         '27271ce647a83906ef7a24605e840d61'
-         '52e52f840a49eb1d14be1c0065b03a93'
-         '2fde2f4bc158b217f3d71b33ef0bc626')
-
-build() {
-  # WebRTC build tries to execute "python" and expects Python 2
-  # Workaround taken from chromium PKGBUILD on Archlinux
-  mkdir "$srcdir/python2-path"
-  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
-  export PATH="$srcdir/python2-path:$PATH"
-
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver::4}"
-  export PYTHON="/usr/bin/python2"
-
-  export QUILT_PATCHES=debian/patches
-  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
-  export QUILT_DIFF_ARGS='--no-timestamps'
-
-  mv mozilla-release "${_debname}-${_debver}"
-  mv debian "${_debname}-${_debver}"
-  cd "${_debname}-${_debver}"
-
-  # Doesn't apply and seems unimportant
-  rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
-
-  # This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it
-  rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true
-
-  quilt push -a
-  find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this?
-
-  cp "$srcdir/mozconfig" .mozconfig
-
-  # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
-  patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch"
-
-  # Fails, claiming the page size to have changed.
-  [ "$CARCH" = "mips64el" ] && echo 'ac_add_options --disable-jemalloc' >> .mozconfig
-
-  #fix libdir/sdkdir - fedora
-  patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
-  patch -Np1 -i "$srcdir/shared-libs.patch"
-
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-}
-
-package() {
-  cd "${_debname}-${_debver}"
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
-
-  rm -rf "$pkgdir"/usr/lib/xulrunner-${_debver::4}/{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-${_debver::4}/dictionaries"
-  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-${_debver::4}/hyphenation"
-
-  # add xulrunner library path to ld.so.conf
-  install -d $pkgdir/etc/ld.so.conf.d
-  echo "/usr/lib/xulrunner-${_debver::4}" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf
-
-  chmod +x "${pkgdir}/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/xpt.py"
-  sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \
-    "$pkgdir"/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/{xpt,header,typelib,xpidl}.py
-}
diff --git a/libre/xulrunner-libre/mozconfig b/libre/xulrunner-libre/mozconfig
deleted file mode 100644
index 7c6cd106d..000000000
--- a/libre/xulrunner-libre/mozconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-. $topsrcdir/xulrunner/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-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-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-startup-notification
-#ac_add_options --enable-gstreamer
-
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-installer
-
-# Parabola features
-ac_add_options --disable-safe-browsing
diff --git a/libre/xulrunner-libre/mozilla-pkgconfig.patch b/libre/xulrunner-libre/mozilla-pkgconfig.patch
deleted file mode 100644
index 037d4aee0..000000000
--- a/libre/xulrunner-libre/mozilla-pkgconfig.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in
---- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in	2011-12-19 22:11:38.100005674 +0000
-+++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in	2011-12-19 22:14:35.095147521 +0000
-@@ -6,5 +6,6 @@
- Name: libxul-embedding
- Description: Static library for version-independent embedding of the Mozilla runtime
- Version: %MOZILLA_VERSION%
-+Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib -lxpcomglue -ldl
- Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
-diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in
---- mozilla-release.orig/xulrunner/installer/libxul.pc.in	2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/libxul.pc.in	2011-12-19 22:14:04.375412141 +0000
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
- idldir=%idldir%
- 
-diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in
---- mozilla-release.orig/xulrunner/installer/Makefile.in	2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/Makefile.in	2011-12-19 22:18:28.743135321 +0000
-@@ -108,6 +108,7 @@
- 	-e "s|%includedir%|$(includedir)|" \
- 	-e "s|%idldir%|$(idldir)|" \
- 	-e "s|%sdkdir%|$(sdkdir)|" \
-+	-e "s|%libdir%|$(installdir)|" \
- 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
- 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
- 	-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
-diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in
---- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in	2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/mozilla-js.pc.in	2011-12-19 22:18:55.569571004 +0000
-@@ -7,4 +7,4 @@
- Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
--Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
-+Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
diff --git a/libre/xulrunner-libre/shared-libs.patch b/libre/xulrunner-libre/shared-libs.patch
deleted file mode 100644
index 1f22b2b0d..000000000
--- a/libre/xulrunner-libre/shared-libs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in
---- mozilla-release.orig/browser/installer/Makefile.in	2012-07-17 16:19:29.480356991 +0000
-+++ mozilla-release/browser/installer/Makefile.in	2012-07-17 17:32:41.250937293 +0000
-@@ -50,7 +50,7 @@
- MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
- # Some files have been already bundled with xulrunner
- ifndef SYSTEM_LIBXUL
--MOZ_PKG_FATAL_WARNINGS = 1
-+MOZ_PKG_FATAL_WARNINGS = 0
- endif
- 
- MOZ_NONLOCALIZED_PKG_LIST = \
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
deleted file mode 100644
index 6f2b209d5..000000000
--- a/libre/your-freedom/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Parabola Project <dev@list.parabolagnulinux.org>
-pkgname=your-freedom
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
-pkgrel=1
-pkgdesc="This package conflicts with every nonfree package known to date to ensure your system is free."
-arch=('any')
-url="https://parabolagnulinux.org"
-license=('GPL3')
-groups=('base')
-install=${pkgname}.install
-source=(blacklist-${pkgver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/blacklist.txt)
-
-package() {
-    conflicts=($(cut -d: -f1,2 blacklist-${pkgver}.txt | \
-      sed "s/:$//" | \
-      grep -v ":" | \
-      grep -v '^#' | \
-      sort -u
-    ))
-    cd ${srcdir}
-    install -d ${pkgdir}/usr/share/doc/${pkgname}
-    install -m644 blacklist-${pkgver}.txt ${pkgdir}/usr/share/doc/${pkgname}/
-}
-
-md5sums=('5fd14982619414fea1882b351607291e')
diff --git a/libre/your-freedom/your-freedom.install b/libre/your-freedom/your-freedom.install
deleted file mode 100644
index e0477cab9..000000000
--- a/libre/your-freedom/your-freedom.install
+++ /dev/null
@@ -1,32 +0,0 @@
-
-pre_install() {
-  cat <<EOM
-  == IMPORTANT NOTICE ==
-
-  This package will help you identify nonfree packages that are installed
-  on your system at the time of its installation, as well as protecting
-  you from (accidentally) installing them.
-
-  Also, if any other nonfree package is identified, later updates will ask
-  you for its removal.
-
-  Have in mind that, if you want to retain certain nonfree packages
-  installed on your system, you'll have to remove your-freedom :)
-
-  If you find out any of the following:
-  * Cascade package removal due to nonfree dependencies,
-  * Your-freedom conflicting with a *-libre package,
-  * Etc.
-
-  Please report back to the Parabola Project on the usual channels:
-  * https://labs.parabola.nu
-  * irc://freenode.net/#parabola
-  * mailto:dev@lists.parabolagnulinux.org
-EOM
-}
-
-pre_upgrade() {
-  pre_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/your-freedom_emu/PKGBUILD b/libre/your-freedom_emu/PKGBUILD
deleted file mode 100644
index 30ace4a38..000000000
--- a/libre/your-freedom_emu/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Parabola Project <dev@list.parabolagnulinux.org>
-pkgname=your-freedom_emu
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
-pkgrel=1
-pkgdesc="This package removes hardware emulators that emulate technically free games and/or OS (but only there are nonfree games and/or OS)."
-arch=('any')
-url="https://parabolagnulinux.org"
-license=('GPL3')
-install=${pkgname}.install
-source=(${pkgname}-blacklist-${pkgver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/${pkgname}-blacklist.txt)
-
-package() {
-    conflicts=($(cut -d: -f1,2 ${pkgname}-blacklist-${pkgver}.txt | \
-      sed "s/:$//" | \
-      grep -v ":" | \
-      grep -v '^#' | \
-      sort -u
-    ))
-    cd ${srcdir}
-    install -d ${pkgdir}/usr/share/doc/${pkgname}
-    install -m644 ${pkgname}-blacklist-${pkgver}.txt ${pkgdir}/usr/share/doc/${pkgname}/
-}
-
-md5sums=('d3c2fad6dd774c5234d42d4953d09611')
diff --git a/libre/your-freedom_emu/your-freedom_emu.install b/libre/your-freedom_emu/your-freedom_emu.install
deleted file mode 100644
index cd39eb3e8..000000000
--- a/libre/your-freedom_emu/your-freedom_emu.install
+++ /dev/null
@@ -1,27 +0,0 @@
-
-pre_install() {
-  cat <<EOM
-  == IMPORTANT NOTICE ==
-
-  This package will help you identify emulator packages that are installed
-  on your system at the time of its installation, as well as protecting
-  you from (accidentally) installing them.
-
-  Also, if any other emulator package is identified, later updates will ask
-  you for its removal.
-
-  Have in mind that, if you want to retain certain emulator packages
-  installed on your system, you'll have to remove your-freedom_emu :)
-
-  Please report back to the Parabola Project on the usual channels:
-  * https://labs.parabola.nu
-  * irc://freenode.net/#parabola
-  * mailto:dev@lists.parabolagnulinux.org
-EOM
-}
-
-pre_upgrade() {
-  pre_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/nonprism/banshee-nonprism/PKGBUILD b/nonprism/banshee-nonprism/PKGBUILD
deleted file mode 100644
index 883c7beaf..000000000
--- a/nonprism/banshee-nonprism/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $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/git-fixes.patch b/nonprism/banshee-nonprism/git-fixes.patch
deleted file mode 100644
index af83ee39e..000000000
--- a/nonprism/banshee-nonprism/git-fixes.patch
+++ /dev/null
@@ -1,8347 +0,0 @@
-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/bitlbee-libre-nonprism/PKGBUILD b/nonprism/bitlbee-libre-nonprism/PKGBUILD
deleted file mode 100644
index 02418359a..000000000
--- a/nonprism/bitlbee-libre-nonprism/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 200603 2013-11-29 19:17:58Z dreisner $
-
-# Contributor: FUBAR <mrfubar@gmail.com>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-_pkgname=bitlbee
-pkgname=bitlbee-libre-nonprism
-pkgver=3.2.1
-pkgrel=1
-pkgdesc='Brings XMPP to IRC, without support for unsafe and dangerous for privacy protocols'
-url='http://www.bitlbee.org/'
-license=('GPL')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('gnutls' 'glib2')
-makedepends=('asciidoc' 'libotr3')
-optdepends=('libotr3: for OTR encryption support'
-            'xinetd: to run bitlbee through xinetd')
-provides=$_pkgname=$pkgver
-conflicts=$_pkgname
-replaces=("$_pkgname" "$_pkgname-libre" "$_pkgname-coherence")
-source=("http://get.bitlbee.org/src/${_pkgname}-${pkgver}.tar.gz"
-        'xinetd'
-        'bitlbee.tmpfiles')
-sha1sums=('954471ab87206826c072f31b3def40a1be5a78f5'
-          '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
-          '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
-backup=('etc/bitlbee/bitlbee.conf'
-        'etc/bitlbee/motd.txt'
-        'etc/xinetd.d/bitlbee')
-install=bitlbee.install
-
-build() {
-  cd "$_pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --etcdir=/etc/bitlbee \
-    --sbindir=/usr/bin \
-    --pidfile=/run/bitlbee/bitlbee.pid \
-    --ipcsocket=/run/bitlbee/bitlbee.sock \
-    --systemdsystemunitdir=/usr/lib/systemd/system \
-    --jabber=1 \
-    --msn=0 \
-    --oscar=0 \
-    --yahoo=0 \
-    --twitter=0 \
-    --ssl=gnutls \
-    --strip=0 \
-    --otr=plugin \
-    --skype=0
-
-  # hacky: build against libotr3
-  sed -i 's,^OTRFLAGS=.*,OTRFLAGS=-lotr3,' Makefile.settings
-  sed -i 's,#include.*libotr,&3,' otr.h
-
-  make
-}
-
-package() {
-  make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev}
-
-  install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
-  install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
-  install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
-}
diff --git a/nonprism/bitlbee-libre-nonprism/bitlbee.install b/nonprism/bitlbee-libre-nonprism/bitlbee.install
deleted file mode 100644
index c8a8f93a1..000000000
--- a/nonprism/bitlbee-libre-nonprism/bitlbee.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  if ! getent group bitlbee &>/dev/null; then
-    groupadd -r -g 65 bitlbee >/dev/null
-  fi
-  if ! getent passwd bitlbee &>/dev/null; then
-    useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
-  fi
-  systemd-tmpfiles --create bitlbee.conf
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  if getent passwd bitlbee &>/dev/null; then
-    userdel bitlbee >/dev/null
-  fi
-  if getent group bitlbee &>/dev/null; then
-    groupdel bitlbee >/dev/null
-  fi
-}
diff --git a/nonprism/bitlbee-libre-nonprism/bitlbee.tmpfiles b/nonprism/bitlbee-libre-nonprism/bitlbee.tmpfiles
deleted file mode 100644
index da72a0a79..000000000
--- a/nonprism/bitlbee-libre-nonprism/bitlbee.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/bitlbee 0755 bitlbee bitlbee - -
diff --git a/nonprism/bitlbee-libre-nonprism/xinetd b/nonprism/bitlbee-libre-nonprism/xinetd
deleted file mode 100644
index d671a8cfc..000000000
--- a/nonprism/bitlbee-libre-nonprism/xinetd
+++ /dev/null
@@ -1,12 +0,0 @@
-service bitlbee
-{
-        type = UNLISTED
-        socket_type = stream
-        protocol = tcp
-        wait = no
-        user = bitlbee
-	group = bitlbee
-        server = /usr/sbin/bitlbee
-        port = 6667
-        disable = yes
-}
diff --git a/nonprism/bti-nonprism/PKGBUILD b/nonprism/bti-nonprism/PKGBUILD
deleted file mode 100644
index 378664976..000000000
--- a/nonprism/bti-nonprism/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: uvok <uvok at online dot de>
-# Contributor: Urist <9362773 at gmail.com>
-
-_pkgname=bti
-pkgname=bti-nonprism
-pkgver=033
-pkgrel=1.1
-pkgdesc='Console client for status.net, without Twitter support'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://gregkh.github.com/bti/'
-license=('GPL')
-depends=('pcre' 'libxml2' 'curl' 'liboauth' 'json-c')
-provides=$_pkgname
-conflicts=$_pkgname
-replaces=$_pkgname
-source=(http://www.kernel.org/pub/software/web/$_pkgname/$_pkgname-$pkgver.tar.xz
-        nonprism.patch)
-sha256sums=('a3d9d8a86a718a4820387c75ac2af24fecfe754ee562163d700acb7cf795d753'
-            '184f2a134d44ae4c901ffdc824f833b477148f146e23f5d3680496658c9ca393')
-
-prepare() {
-  cd ${srcdir}/$_pkgname-$pkgver
-  patch -Np1 -i ${srcdir}/nonprism.patch
-}
-
-build() {
-  cd ${srcdir}/$_pkgname-$pkgver
-  ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd ${srcdir}/$_pkgname-$pkgver
-  
-  make DESTDIR=${pkgdir} install
-}
-
diff --git a/nonprism/bti-nonprism/nonprism.patch b/nonprism/bti-nonprism/nonprism.patch
deleted file mode 100644
index 009c26d1e..000000000
--- a/nonprism/bti-nonprism/nonprism.patch
+++ /dev/null
@@ -1,443 +0,0 @@
-diff -Nur bti-033/bti.1 bti-nonprism/bti.1
---- bti-033/bti.1	2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti.1	2013-08-21 18:24:32.693871946 -0300
-@@ -28,23 +28,23 @@
- .\" * MAIN CONTENT STARTS HERE *
- .\" -----------------------------------------------------------------
- .SH "NAME"
--bti \- send a tweet to twitter\&.com or identi\&.ca from the command line
-+bti \- send a tweet to status\&.net from the command line
- .SH "SYNOPSIS"
- .HP \w'\fBbti\fR\ 'u
- \fBbti\fR [\fB\-\-account\ account\fR] [\fB\-\-password\ password\fR] [\fB\-\-action\ action\fR] [\fB\-\-user\ screenname\fR] [\fB\-\-host\ HOST_NAME\fR] [\fB\-\-proxy\ PROXY:PORT\fR] [\fB\-\-logfile\ LOGFILE\fR] [\fB\-\-config\ CONFIGFILE\fR] [\fB\-\-replyto\ ID\fR] [\fB\-\-retweet\ ID\fR] [\fB\-\-page\ PAGENUMBER\fR] [\fB\-\-bash\fR] [\fB\-\-shrink\-urls\fR] [\fB\-\-debug\fR] [\fB\-\-dry\-run\fR] [\fB\-\-verbose\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
- .SH "DESCRIPTION"
- .PP
--bti sends a tweet message to twitter\&.com or identi\&.ca\&.
-+bti sends a tweet message to status\&.net\&.
- .SH "OPTIONS"
- .PP
- \fB\-\-account account\fR
- .RS 4
--Specify the twitter\&.com or identi\&.ca account name\&.
-+Specify the status\&.net account name\&.
- .RE
- .PP
- \fB\-\-password password\fR
- .RS 4
--Specify the password of your twitter\&.com or identi\&.ca account\&.
-+Specify the password of your status\&.net account\&.
- .RE
- .PP
- \fB\-\-action action\fR
-@@ -59,9 +59,9 @@
- .PP
- \fB\-\-host HOST_NAME\fR
- .RS 4
--Specify the host which you want to send your message to\&. Valid options are "twitter" to send to twitter\&.com and "identica" to send to identi\&.ca\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example identi\&.ca\*(Aqs URI is: https://identi\&.ca/api/statuses
-+Specify the host which you want to send your message to\&. Valid options are "statusnet" to send to status\&.net\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example status\&.net\*(Aqs URI is: https://status\&.net/api/statuses
- .sp
--If no host is specified, the default is to send to twitter\&.com\&.
-+If no host is specified, the default is to send to status\&.net\&.
- .RE
- .PP
- \fB\-\-proxy PROXY:PORT\fR
-@@ -85,8 +85,6 @@
- .RS 4
- Status ID of a single post to which you want to create a threaded reply to\&.
- .sp
--For twitter, this is ignored unless the message starts with the @name of the owner of the post with the status ID\&.
--.sp
- For status\&.net, this can link any two messages into context with each other\&. Status\&.net will also link a message that contains an @name without this without regard to context\&.
- .RE
- .PP
-@@ -167,12 +165,12 @@
- .PP
- \fBaccount\fR
- .RS 4
--The twitter\&.com or identi\&.ca account name you wish to use to send this message with\&.
-+The status\&.net account name you wish to use to send this message with\&.
- .RE
- .PP
- \fBpassword\fR
- .RS 4
--The twitter\&.com or identi\&.ca password for the account you wish to use to send this message with\&.
-+The status\&.net password for the account you wish to use to send this message with\&.
- .RE
- .PP
- \fB\-\-action action\fR
-@@ -187,7 +185,7 @@
- .PP
- \fBhost\fR
- .RS 4
--The host you want to use to send the message to\&. Valid options are either "twitter" or "identica" to send to twitter\&.com or identi\&.ca respectively\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example identi\&.ca\*(Aqs URI is: https://identi\&.ca/api/statuses\&.
-+The host you want to use to send the message to\&. Valid options are either "statusnet" to send to status\&.net respectively\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example status\&.net\*(Aqs URI is: https://status\&.net/api/statuses\&.
- .RE
- .PP
- \fBproxy\fR
-diff -Nur bti-033/bti-bashcompletion bti-nonprism/bti-bashcompletion
---- bti-033/bti-bashcompletion	2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti-bashcompletion	2013-08-21 18:19:46.889928804 -0300
-@@ -12,7 +12,7 @@
- 	fi
- 
- 	if [[ "${prev}" == "--host" ]] ; then
--		COMPREPLY=( $(compgen -W "twitter identica" -- ${cur} ) )
-+		COMPREPLY=( $(compgen -W "statusnet" -- ${cur} ) )
- 	fi
- 
- 	if [[ "${prev}" == "--action" ]] ; then
-diff -Nur bti-033/bti.c bti-nonprism/bti.c
---- bti-033/bti.c	2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti.c	2013-08-21 18:31:54.013583020 -0300
-@@ -53,7 +53,7 @@
- 
- static void display_help(void)
- {
--	fprintf(stdout, "bti - send tweet to twitter or identi.ca\n"
-+	fprintf(stdout, "bti - send tweet to status.net\n"
- 		"Version: %s\n"
- 		"Usage:\n"
- 		"  bti [options]\n"
-@@ -258,19 +258,12 @@
- 	free(buffer);
- }
- 
--const char twitter_host[]  = "http://api.twitter.com/1.1/statuses";
--const char twitter_host_stream[]  = "https://stream.twitter.com/1.1/statuses"; /*this is not reset, and doesnt work */
--const char twitter_host_simple[]  = "http://api.twitter.com/1.1";
--const char identica_host[] = "https://identi.ca/api/statuses";
--const char twitter_name[]  = "twitter";
--const char identica_name[] = "identi.ca";
--
--static const char twitter_request_token_uri[]  = "https://twitter.com/oauth/request_token";
--static const char twitter_access_token_uri[]   = "https://twitter.com/oauth/access_token";
--static const char twitter_authorize_uri[]      = "https://twitter.com/oauth/authorize?oauth_token=";
--static const char identica_request_token_uri[] = "https://identi.ca/api/oauth/request_token?oauth_callback=oob";
--static const char identica_access_token_uri[]  = "https://identi.ca/api/oauth/access_token";
--static const char identica_authorize_uri[]     = "https://identi.ca/api/oauth/authorize?oauth_token=";
-+const char statusnet_host[] = "https://status.net/api/statuses";
-+const char statusnet_name[] = "status.net";
-+
-+static const char statusnet_request_token_uri[] = "https://status.net/api/oauth/request_token?oauth_callback=oob";
-+static const char statusnet_access_token_uri[]  = "https://status.net/api/oauth/access_token";
-+static const char statusnet_authorize_uri[]     = "https://status.net/api/oauth/authorize?oauth_token=";
- static const char custom_request_token_uri[]   = "/../oauth/request_token?oauth_callback=oob";
- static const char custom_access_token_uri[]    = "/../oauth/access_token";
- static const char custom_authorize_uri[]       = "/../oauth/authorize?oauth_token=";
-@@ -855,14 +848,9 @@
- 	if (!session)
- 		return -EINVAL;
- 
--	if (session->host == HOST_TWITTER)
--		request_url = oauth_sign_url2(
--				twitter_request_token_uri, NULL,
--				OA_HMAC, NULL, session->consumer_key,
--				session->consumer_secret, NULL, NULL);
--	else if (session->host == HOST_IDENTICA)
-+	if (session->host == HOST_STATUSNET)
- 		request_url = oauth_sign_url2(
--				identica_request_token_uri, NULL,
-+				statusnet_request_token_uri, NULL,
- 				OA_HMAC, NULL, session->consumer_key,
- 				session->consumer_secret, NULL, NULL);
- 	else {
-@@ -893,16 +881,11 @@
- 		"Please open the following link in your browser, and "
- 		"allow 'bti' to access your account. Then paste "
- 		"back the provided PIN in here.\n");
--	if (session->host == HOST_TWITTER) {
--		fprintf(stdout, "%s%s\nPIN: ", twitter_authorize_uri, at_key);
-+	if (session->host == HOST_STATUSNET) {
-+		fprintf(stdout, "%s%s\nPIN: ", statusnet_authorize_uri, at_key);
- 		verifier = session->readline(NULL);
- 		sprintf(at_uri, "%s?oauth_verifier=%s",
--			twitter_access_token_uri, verifier);
--	} else if (session->host == HOST_IDENTICA) {
--		fprintf(stdout, "%s%s\nPIN: ", identica_authorize_uri, at_key);
--		verifier = session->readline(NULL);
--		sprintf(at_uri, "%s?oauth_verifier=%s",
--			identica_access_token_uri, verifier);
-+			statusnet_access_token_uri, verifier);
- 	} else {
- 		fprintf(stdout, "%s%s%s\nPIN: ",
- 			session->hosturl, custom_authorize_uri, at_key);
-@@ -956,7 +939,7 @@
- 		return -EINVAL;
- 
- 	if (!session->hosturl)
--		session->hosturl = strdup(twitter_host);
-+		session->hosturl = strdup(statusnet_host);
- 
- 	if (session->no_oauth || session->guest) {
- 		curl_buf = bti_curl_buffer_alloc(session->action);
-@@ -971,7 +954,7 @@
- 		}
- 
- 		if (!session->hosturl)
--			session->hosturl = strdup(twitter_host);
-+			session->hosturl = strdup(statusnet_host);
- 
- 		switch (session->action) {
- 		case ACTION_UPDATE:
-@@ -1032,7 +1015,7 @@
- 
- 		case ACTION_PUBLIC:
- 			/*snprintf(endpoint, endpoint_size, "%s%s?page=%d", session->hosturl,*/
--			snprintf(endpoint, endpoint_size, "%s%s", twitter_host_stream,
-+			snprintf(endpoint, endpoint_size, "%s%s", statusnet_host,
- 				public_uri);
- 			curl_easy_setopt(curl, CURLOPT_URL, endpoint);
- 			break;
-@@ -1045,7 +1028,6 @@
- 			break;
- 
- 		case ACTION_DIRECT:
--		    /* NOT IMPLEMENTED - twitter requires authentication anyway */
- 			break;
- 
- 		default:
-@@ -1125,7 +1107,6 @@
- 	} else {
- 		switch (session->action) {
- 		case ACTION_UPDATE:
--			/* dont test it here, let twitter return an error that we show */
- 			if (strlen_utf8(session->tweet) > 140 + 1000 ) {
- 				printf("E: tweet is too long!\n");
- 				goto skip_tweet;
-@@ -1156,7 +1137,7 @@
- 				mentions_uri, session->page);
- 			break;
- 		case ACTION_PUBLIC:
--			sprintf(endpoint, "%s%s", twitter_host_stream,
-+			sprintf(endpoint, "%s%s", statusnet_host,
- 				public_uri);
- 			break;
- 		case ACTION_GROUP:
-@@ -1175,7 +1156,7 @@
- 			break;
- 		case ACTION_DIRECT:
- 			escaped_tweet = oauth_url_escape(session->tweet);
--			sprintf(endpoint, "%s%s?user=%s&text=%s", twitter_host_simple,
-+			sprintf(endpoint, "%s%s?user=%s&text=%s", statusnet_host,
- 				direct_uri, session->user, escaped_tweet);
- 			is_post = 1;
- 			break;
-@@ -1766,14 +1747,10 @@
- 				free(session->hosturl);
- 			if (session->hostname)
- 				free(session->hostname);
--			if (strcasecmp(optarg, "twitter") == 0) {
--				session->host = HOST_TWITTER;
--				session->hosturl = strdup(twitter_host);
--				session->hostname = strdup(twitter_name);
--			} else if (strcasecmp(optarg, "identica") == 0) {
--				session->host = HOST_IDENTICA;
--				session->hosturl = strdup(identica_host);
--				session->hostname = strdup(identica_name);
-+			if (strcasecmp(optarg, "statusnet") == 0) {
-+				session->host = HOST_STATUSNET;
-+				session->hosturl = strdup(statusnet_host);
-+				session->hostname = strdup(statusnet_name);
- 			} else {
- 				session->host = HOST_CUSTOM;
- 				session->hosturl = strdup(optarg);
-@@ -1829,31 +1806,8 @@
- 	if (debug)
- 		display_version();
- 
--	if (session->host == HOST_TWITTER) {
--		if (!session->consumer_key || !session->consumer_secret) {
--			if (session->action == ACTION_USER ||
--					session->action == ACTION_PUBLIC) {
--				/*
--				 * Some actions may still work without
--				 * authentication
--				 */
--				session->guest = 1;
--			} else {
--				fprintf(stderr,
--						"Twitter no longer supports HTTP basic authentication.\n"
--						"Both consumer key, and consumer secret are required"
--						" for bti in order to behave as an OAuth consumer.\n");
--				goto exit;
--			}
--		}
--		if (session->action == ACTION_GROUP) {
--			fprintf(stderr, "Groups only work in Identi.ca.\n");
--			goto exit;
--		}
--	} else {
--		if (!session->consumer_key || !session->consumer_secret)
--			session->no_oauth = 1;
--	}
-+	if (!session->consumer_key || !session->consumer_secret)
-+		session->no_oauth = 1;
- 
- 	if (session->no_oauth) {
- 		if (!session->account) {
-diff -Nur bti-033/bti.example bti-nonprism/bti.example
---- bti-033/bti.example	2012-06-22 18:45:42.000000000 -0300
-+++ bti-nonprism/bti.example	2013-08-21 18:24:54.398011375 -0300
-@@ -5,7 +5,7 @@
- # a message.
- account=twitmaster
- password=icanhascheezburger
--host=identica
-+host=statusnet
- # Example of a custom StatusNet installation
- #host=http://army.twit.tv/api/statuses
- logfile=.bti.log
-diff -Nur bti-033/bti.h bti-nonprism/bti.h
---- bti-033/bti.h	2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti.h	2013-08-21 18:19:22.865702111 -0300
-@@ -17,8 +17,7 @@
- #define __BTI_H
- 
- enum host {
--	HOST_TWITTER  = 0,
--	HOST_IDENTICA = 1,
-+	HOST_STATUSNET = 1,
- 	HOST_CUSTOM   = 2
- };
- 
-@@ -76,10 +75,8 @@
- 	int length;
- };
- 
--extern const char twitter_host[];
--extern const char identica_host[];
--extern const char twitter_name[];
--extern const char identica_name[];
-+extern const char statusnet_host[];
-+extern const char statusnet_name[];
- extern int debug;
- 
- extern void bti_parse_configfile(struct session *session);
-diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
---- bti-033/bti.xml	2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti.xml	2013-08-21 18:22:20.722310079 -0300
-@@ -21,7 +21,7 @@
- 
-       <refnamediv>
-         <refname>bti</refname>
--        <refpurpose>send a tweet to twitter.com or identi.ca from the command line</refpurpose>
-+        <refpurpose>send a tweet to status.net from the command line</refpurpose>
-       </refnamediv>
- 
-       <refsynopsisdiv>
-@@ -49,7 +49,7 @@
-       </refsynopsisdiv>
- 
-       <refsect1><title>DESCRIPTION</title>
--        <para>bti sends a tweet message to twitter.com or identi.ca.
-+        <para>bti sends a tweet message or status.net.
-         </para>
-       </refsect1>
- 
-@@ -59,7 +59,7 @@
-             <term><option>--account account</option></term>
-             <listitem>
-               <para>
--	        Specify the twitter.com or identi.ca account name.
-+	        Specify the status.net account name.
- 	      </para>
-             </listitem>
-           </varlistentry>
-@@ -67,7 +67,7 @@
-             <term><option>--password password</option></term>
-             <listitem>
-               <para>
--                Specify the password of your twitter.com or identi.ca account.
-+                Specify the password of your status.net account.
-               </para>
-             </listitem>
-           </varlistentry>
-@@ -100,15 +100,15 @@
-             <listitem>
-               <para>
- 		Specify the host which you want to send your message to.  Valid
--		options are "twitter" to send to twitter.com and "identica" to
--        send to identi.ca.
-+		options are "statusnet" to
-+        send to status.net.
- 
-         If you want to send the message to a custom StatusNet installation,
--        you should specify the API URI. For example identi.ca's URI is:
--        https://identi.ca/api/statuses
-+        you should specify the API URI. For example status.net's URI is:
-+        https://status.net/api/statuses
-               </para>
-               <para>
--		If no host is specified, the default is to send to twitter.com.
-+		If no host is specified, the default is to send to status.net.
-               </para>
-             </listitem>
-           </varlistentry>
-@@ -154,10 +154,6 @@
- 		reply to.
- 	      </para>
- 	      <para>
--	        For twitter, this is ignored unless the message starts with the
--		@name of the owner of the post with the status ID.
--	      </para>
--	      <para>
- 	        For status.net, this can link any two messages into context with
- 		each other. Status.net will also link a message that contains an
- 		@name without this without regard to context.
-@@ -306,7 +302,7 @@
-              <term><option>account</option></term>
-              <listitem>
-                <para>
--                 The twitter.com or identi.ca account name you wish to use to send this
-+                 The status.net account name you wish to use to send this
-                  message with.
-                </para>
-              </listitem>
-@@ -315,7 +311,7 @@
-              <term><option>password</option></term>
-              <listitem>
-                <para>
--                 The twitter.com or identi.ca password for the account you wish to use
-+                 The status.net password for the account you wish to use
-                  to send this message with.
-                </para>
-              </listitem>
-@@ -346,12 +342,12 @@
-              <listitem>
-                <para>
- 		 The host you want to use to send the message to.  Valid
--		 options are either "twitter" or "identica" to send to
--		 twitter.com or identi.ca respectively.
-+		 options are either "statusnet" to send to
-+		 status.net respectively.
- 
-          If you want to send the message to a custom StatusNet installation,
--         you should specify the API URI. For example identi.ca's URI is:
--         https://identi.ca/api/statuses.
-+         you should specify the API URI. For example status.net's URI is:
-+         https://status.net/api/statuses.
-                </para>
-              </listitem>
-            </varlistentry>
-diff -Nur bti-033/config.c bti-nonprism/config.c
---- bti-033/config.c	2013-04-23 20:18:04.000000000 -0300
-+++ bti-nonprism/config.c	2013-08-21 18:17:39.798533227 -0300
-@@ -219,14 +219,10 @@
- 
- static int host_callback(struct session *session, char *value)
- {
--	if (strcasecmp(value, "twitter") == 0) {
--		session->host = HOST_TWITTER;
--		session->hosturl = strdup(twitter_host);
--		session->hostname = strdup(twitter_name);
--	} else if (strcasecmp(value, "identica") == 0) {
--		session->host = HOST_IDENTICA;
--		session->hosturl = strdup(identica_host);
--		session->hostname = strdup(identica_name);
-+	if (strcasecmp(value, "statusnet") == 0) {
-+		session->host = HOST_STATUSNET;
-+		session->hosturl = strdup(statusnet_host);
-+		session->hostname = strdup(statusnet_name);
- 	} else {
- 		session->host = HOST_CUSTOM;
- 		session->hosturl = strdup(value);
diff --git a/nonprism/centerim-nonprism/PKGBUILD b/nonprism/centerim-nonprism/PKGBUILD
deleted file mode 100644
index 1863e006b..000000000
--- a/nonprism/centerim-nonprism/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: shild <sxp@bk.ru>
-
-_pkgname=centerim
-pkgname=centerim-nonprism
-pkgver=4.22.10
-pkgrel=2
-pkgdesc="Fork of CenterICQ - A text mode menu- and window-driven IM interface, without support for unsafe and dangerous for privacy protocols"
-arch=('i686' 'x86_64')
-url="http://www.centerim.org"
-license=('GPL')
-depends=('python2' 'libjpeg' 'gpgme')
-replaces=("$_pkgname" 'centericq')
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-source=("http://www.centerim.org/download/releases/$_pkgname-$pkgver.tar.gz"
-        'nonprism.patch')
-md5sums=('7565c3c8cac98a4e2d8524076a44676f'
-         '74887744683b68ea37d4d020c80fb675')
-
-prepare() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  # add patch to remove more protocols
-  patch -Np1 -i "${srcdir}/nonprism.patch"
-}
-
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  sed -i 's#python#python2#' misc/CenterIMLog2HTML.py
-  sed -i '1,1i#include <stdio.h>' libicq2000/libicq2000/sigslot.h
-  ./configure --prefix=/usr \
-              --with-ssl \
-              --with-openssl \
-              --enable-locales-fix \
-              --disable-icq \
-              --disable-yahoo \
-              --disable-aim \
-              --disable-gg \
-              --disable-msn
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/nonprism/centerim-nonprism/nonprism.patch b/nonprism/centerim-nonprism/nonprism.patch
deleted file mode 100644
index 43c732966..000000000
--- a/nonprism/centerim-nonprism/nonprism.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/firetalk/Makefile.am b/firetalk/Makefile.am
-index cf14403..dab773d 100644
---- a/firetalk/Makefile.am
-+++ b/firetalk/Makefile.am
-@@ -1,7 +1,7 @@
- noinst_LIBRARIES = libfiretalk.a
--EXTRA_DIST = aim.c irc.c toc.c firetalk.c safestring.c oscar.c aim.h toc.h firetalk-int.h firetalk.h safestring.h oscar.h toc2_uuids.h
-+EXTRA_DIST = irc.c firetalk.c safestring.c firetalk-int.h firetalk.h safestring.h
- AUTOMAKE_OPTIONS = foreign
--libfiretalk_a_SOURCES =  aim.c irc.c toc.c firetalk.c safestring.c oscar.c
-+libfiretalk_a_SOURCES =  irc.c firetalk.c safestring.c
- 
- SUBDIRS = 
- AM_CPPFLAGS = -I$(top_srcdir)/../connwrap -I$(top_srcdir)/../connwrap
diff --git a/nonprism/choqok-nonprism/PKGBUILD b/nonprism/choqok-nonprism/PKGBUILD
deleted file mode 100644
index cf5c374b0..000000000
--- a/nonprism/choqok-nonprism/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 96779 2013-09-04 22:09:55Z andrea $
-# Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Emanuele Rossi <newdna1510@yahoo.it>
-# Contributor: Bram Schoenmakers <me@bramschoenmakers.nl>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-_pkgname=choqok
-pkgname=choqok-nonprism
-pkgver=1.4
-pkgrel=1
-pkgdesc="A status.net client for KDE, without Twitter support"
-url='http://choqok.gnufolks.org/'
-license=('GPL')
-arch=('i686' 'x86_64' 'mips64el')
-optdepends=('kdebase-konqueror-libre: proxy support')
-provides=("$_pkgname=$pkgver")
-conflicts=$_pkgname
-depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl')
-makedepends=('cmake' 'automoc4')
-optdepends=('kdebase-konqueror-libre: proxy support')
-install="${_pkgname}.install"
-source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.xz")
-md5sums=('2efe34ed903b448a21d9233d8033dbdb')
-
-prepare() {
-  mkdir build
-
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  # remove twitter service and keep only twitterapi (choqok software) for status.net and open collaboration services
-  sed -i '\|add_subdirectory(twitter)|d' microblogs/CMakeLists.txt
-  sed -i 's|twitter[.]com|status.net|' microblogs/laconica/laconicamicroblog.cpp
-  sed -i 's|twitter[.]com|status.net|' microblogs/laconica/laconicasearch.cpp
-
-  # remove uploaders plugin (with only nonprivacy services)
-  sed -i '\|add_subdirectory(uploaders)|d' plugins/CMakeLists.txt
-  sed -i 's|Comment||' plugins/searchaction/choqok_searchaction.desktop
-
-  # remove twitter on docbook
-  sed -i 's| and Twitter.com||
-          s| and another with the alias|.</para>|
-          s|while a post using Twitter is called a tweet||
-          \|Twitter|d;\|twitter|d' doc/index.docbook
-}
-
-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/nonprism/choqok-nonprism/choqok.install b/nonprism/choqok-nonprism/choqok.install
deleted file mode 100644
index e70c054ec..000000000
--- a/nonprism/choqok-nonprism/choqok.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/nonprism/claws-mail-nonprism/PKGBUILD b/nonprism/claws-mail-nonprism/PKGBUILD
deleted file mode 100644
index 1e48c65bd..000000000
--- a/nonprism/claws-mail-nonprism/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 201547 2013-12-14 21:56:36Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-_pkgname=claws-mail
-pkgname=$_pkgname-nonprism
-pkgver=3.9.3
-pkgrel=1
-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' 'compface'
-         'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('spamassassin' 'bogofilter' 'valgrind' 
-             # dependencies for plugins
-             'libsoup' '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'
-	        'poppler-glib:      for pdf viewer plugin'
-	        'ghostscript:       for pdf viewer plugin')
-replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins" "$_pkgname-libre" "$_pkgname-libre-nonprism")
-conflicts=("$_pkgname" "$_pkgname-extra-plugins")
-provides=("$_pkgname=$pkgver" 'claws')
-install=$_pkgname.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$_pkgname-$pkgver.tar.bz2{,.asc})
-md5sums=('0158b5e6b6d6866f9a75fd288a4edf04'
-         '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
-
-  setarch $CARCH ./configure --prefix=/usr --disable-static \
-    --enable-enchant \
-    --enable-gnutls \
-    --enable-ldap \
-    --enable-crash-dialog \
-    --enable-pgpmime-plugin \
-    --enable-spamassassin-plugin \
-    --enable-bogofilter-plugin \
-    --disable-gdata-plugin
-    #--help
-  setarch $CARCH make
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  # build and install extra tools
-  cd tools
-  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
-  done
-}
diff --git a/nonprism/claws-mail-nonprism/claws-mail.install b/nonprism/claws-mail-nonprism/claws-mail.install
deleted file mode 100644
index 4d2f155d4..000000000
--- a/nonprism/claws-mail-nonprism/claws-mail.install
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index cf18f2ae1..000000000
--- a/nonprism/duplicity-nonprism/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $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/empathy-nonprism/PKGBUILD b/nonprism/empathy-nonprism/PKGBUILD
deleted file mode 100644
index b528dd888..000000000
--- a/nonprism/empathy-nonprism/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 195042 2013-09-24 18:47:37Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-_pkgname=empathy
-pkgname=empathy-nonprism
-pkgver=3.10.0
-pkgrel=1
-pkgdesc="A GNOME instant messaging client using the Telepathy framework, without telepathy-haze recommendation"
-arch=(i686 x86_64)
-url="http://live.gnome.org/Empathy"
-license=(GPL2)
-depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkitgtk telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control geoclue2 geocode-glib cheese libchamplain)
-makedepends=(intltool itstool docbook-xsl python2)
-optdepends=('telepathy-gabble: XMPP/Jabber support'
-            'telepathy-idle: IRC support'
-            'telepathy-salut: Link-local XMPP support'
-            'telepathy-rakia: SIP support')
-options=('!libtool' '!makeflags')
-groups=(gnome)
-install=empathy.install
-replaces=("$_pkgname" 'empathy-coherence')
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('5580bdba9faec0518b3328d5dc23f03dc0cf25ccf6c14902f306838c23d5918f')
-
-build() {
-  cd $_pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc  \
-      --libexecdir=/usr/lib/empathy \
-      --disable-static
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/nonprism/empathy-nonprism/empathy.install b/nonprism/empathy-nonprism/empathy.install
deleted file mode 100644
index 4c5b64313..000000000
--- a/nonprism/empathy-nonprism/empathy.install
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-    echo "To use Empathy you need to install at least one Telepathy connection manager."
-}
-
-post_upgrade() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_remove() {
-    post_upgrade
-}
\ No newline at end of file
diff --git a/nonprism/eog-plugins-nonprism/PKGBUILD b/nonprism/eog-plugins-nonprism/PKGBUILD
deleted file mode 100644
index 58d53cb83..000000000
--- a/nonprism/eog-plugins-nonprism/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $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.1
-pkgrel=1
-pkgdesc="Plugins for Eye of Gnome, without libgdata support"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org/"
-license=('GPL2')
-depends=('eog' 'libchamplain')
-makedepends=('intltool')
-provides=("$_pkgname=$pkgver")
-conflicts=$_pkgname
-replaces=$_pkgname
-install=eog-plugins.install
-options=('!libtool')
-source=(http://download.gnome.org/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('d5b32c49dbf1e0b6cf56c9fdc6c19186c92e98d92b71aa98805491e2bb2f8e12')
-
-build() {
-  cd $_pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/nonprism/eog-plugins-nonprism/eog-plugins.install b/nonprism/eog-plugins-nonprism/eog-plugins.install
deleted file mode 100644
index 24072f316..000000000
--- a/nonprism/eog-plugins-nonprism/eog-plugins.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/nonprism/evolution-data-server-nonprism/PKGBUILD b/nonprism/evolution-data-server-nonprism/PKGBUILD
deleted file mode 100644
index f8e78ee1a..000000000
--- a/nonprism/evolution-data-server-nonprism/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 201344 2013-12-09 08:01:08Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgname=evolution-data-server
-pkgname=evolution-data-server-nonprism
-pkgver=3.10.3
-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)
-makedepends=(intltool gperf gobject-introspection vala python2)
-install=$_pkgname.install
-url="http://www.gnome.org"
-license=(GPL)
-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=('41af5c658255230de47423fad73f19bfab15b9e0df80141b13f66b55bf295bd2')
-
-build() {
-  cd "$_pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --with-openldap=yes \
-      --libexecdir=/usr/lib/evolution-data-server \
-      --with-krb5=/usr --with-libdb=/usr \
-      --without-libgdata \
-      --disable-google \
-      --enable-vala-bindings --disable-uoa
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-  make
-}
-
-package() {
-  cd "$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/nonprism/evolution-data-server-nonprism/evolution-data-server.install b/nonprism/evolution-data-server-nonprism/evolution-data-server.install
deleted file mode 100644
index e75920e11..000000000
--- a/nonprism/evolution-data-server-nonprism/evolution-data-server.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install () {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade () {
-    post_install
-}
-
-post_remove () {
-    post_install
-}
\ No newline at end of file
diff --git a/nonprism/gnome-online-accounts-nonprism/PKGBUILD b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
deleted file mode 100644
index db313b925..000000000
--- a/nonprism/gnome-online-accounts-nonprism/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 199427 2013-11-12 16:52:35Z 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.2
-pkgrel=1
-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' 'krb5' 'gcr')
-makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
-provides=("$_pkgname=$pkgver")
-conflicts=$_pkgname
-replaces=($_pkgname $pkgname-coherence)
-install=$_pkgname.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('0b2418c1845337b6574a12d2075d319d8aaa5bbc4b0d1d123108c5da00e11b97')
-
-build() {
-  cd $_pkgname-$pkgver
-  ./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
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/nonprism/grilo-plugins-nonprism/PKGBUILD b/nonprism/grilo-plugins-nonprism/PKGBUILD
deleted file mode 100644
index 8f07b2069..000000000
--- a/nonprism/grilo-plugins-nonprism/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $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/icedove-libre-nonprism/PKGBUILD b/nonprism/icedove-libre-nonprism/PKGBUILD
deleted file mode 100644
index 36d5497dd..000000000
--- a/nonprism/icedove-libre-nonprism/PKGBUILD
+++ /dev/null
@@ -1,146 +0,0 @@
-# Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@parabola.nu>
-
-# We're getting this from Debian Experimental
-_debname=icedove
-_debver=24.1.1
-_debrel=deb1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_pkgname=${_debname}
-pkgname=${_debname}-libre-nonprism
-epoch=1
-pkgver=${_debver}.${_debrel}
-pkgrel=1
-pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird, without support for unsafe and dangerous for privacy protocols"
-arch=('i686' 'x86_64' 'mips64el')
-license=('MPL' 'GPL' 'LGPL')
-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' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
-optdepends=('libcanberra: for sound support')
-replaces=('thunderbird' "${pkgname%-nonprism}")
-conflicts=('thunderbird' "${pkgname%-nonprism}")
-provides=('thunderbird' "${pkgname%-nonprism}=$epoch:$pkgver")
-install=${_pkgname}.install
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
-        mozconfig
-        vendor.js
-        ${_pkgname}.desktop)
-options=(!emptydirs)
-md5sums=('91ddfb44481e6cb456d835a832d885c1'
-         '9f060324dbed3f8d27c896703bda6078'
-         'c46cf2a671c8fdefcabd4c87e38f3d40'
-         '5a53179d14ae9631b7afe5e4d0fc0b25'
-         'e785e0c267f4435ae1a9aa0b03bcacfb')
-
-prepare() {
-  export DEBIAN_BUILD="comm-esr24"
-
-  export QUILT_PATCHES=debian/patches
-  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
-  export QUILT_DIFF_ARGS='--no-timestamps'
-
-  mv debian "${srcdir}/${DEBIAN_BUILD}"
-  cd "${srcdir}/${DEBIAN_BUILD}"
-
-  mv debian/${_pkgname}-branding "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}"
-
-  cp -a debian/app-icons/${_pkgname}big.svg debian/app-icons/${_pkgname}_icon.svg
-  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
-      install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/mailicon${i/x*/}.png"
-  done
-  for i in 48x48 64x64; do
-      install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png"
-  done
-
-  # Fix orthographic issue ("Icdove" to "Icedove") in MOZ_APP_BASENAME line for confvars.sh.
-  sed -i 's|Icdove|Icedove|' debian/patches/debian-hacks/Icedove-branding.patch
-
-  quilt push -av
-
-  # Fix paths on makefile
-  sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/|topsrcdir = @top_srcdir@|;
-          s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|;
-          s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|;
-         ' mail/branding/icedove/Makefile.in
-
-  sed -i 's|topsrcdir      = [.][.]/[.][.]/[.][.]/[.][.]|topsrcdir      = @top_srcdir@|;
-          s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|;
-          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 -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
-
-  # Remove support for unsafe and dangerous for privacy protocols
-  sed -i '\|facebook|d
-          \|gtalk|d
-          \|twitter|d
-         ' chat/moz.build
-  sed -i '\|facebook[.]js|d
-          \|facebook[.]manifest|d
-          \|gtalk[.]js|d
-          \|gtalk[.]manifest|d
-          \|twitter[.]js|d
-          \|twitter[.]manifest|d
-         ' mail/installer/package-manifest.in
-  rm -r chat/protocols/{facebook,gtalk,twitter}
-
-  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/' mozilla/configure
-}
-
-build() {
-  export DEBIAN_BUILD="comm-esr24"
-
-  cd "${srcdir}/${DEBIAN_BUILD}"
-
-  export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}"
-  export PYTHON="/usr/bin/python2"
-
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
-}
-
-package() {
-  export DEBIAN_BUILD="comm-esr24"
-
-  cd "${srcdir}/${DEBIAN_BUILD}"
-
-  make -j1 -f client.mk DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/vendor.js"
-
-  for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do
-      install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png"
-  done
-  install -Dm644 "debian/app-icons/${_pkgname}_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
-  
-  install -Dm644 "${srcdir}/${_pkgname}.desktop" \
-      "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-  
-  rm -rf "${pkgdir}"/usr/lib/${_pkgname}/{dictionaries,hyphenation,searchplugins}
-  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/searchplugins "${pkgdir}/usr/lib/${_pkgname}/searchplugins"
-
-  # We don't want the development stuff
-  rm -r "${pkgdir}"/usr/{include,lib/${_pkgname}-devel,share/idl}
-}
diff --git a/nonprism/icedove-libre-nonprism/icedove.desktop b/nonprism/icedove-libre-nonprism/icedove.desktop
deleted file mode 100644
index ef2cd76e9..000000000
--- a/nonprism/icedove-libre-nonprism/icedove.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Icedove
-Comment=Mail & News Reader
-GenericName=Mail Client & News Reader
-Exec=icedove %u
-TryExec=icedove
-Icon=icedove
-Terminal=false
-Type=Application
-Categories=Network;Email;
-MimeType=message/rfc822;x-scheme-handler/mailto;
-StartupNotify=true
diff --git a/nonprism/icedove-libre-nonprism/icedove.install b/nonprism/icedove-libre-nonprism/icedove.install
deleted file mode 100644
index 4d4a283db..000000000
--- a/nonprism/icedove-libre-nonprism/icedove.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/nonprism/icedove-libre-nonprism/mozconfig b/nonprism/icedove-libre-nonprism/mozconfig
deleted file mode 100644
index 57c02368a..000000000
--- a/nonprism/icedove-libre-nonprism/mozconfig
+++ /dev/null
@@ -1,46 +0,0 @@
-mk_add_options MOZ_CO_PROJECT=mail
-ac_add_options --enable-application=mail
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# Icedove
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=mail/branding/icedove
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-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-pixman
-ac_add_options --with-pthreads
-
-# Features
-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
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
-# Parabola features
-ac_add_options --disable-safe-browsing
diff --git a/nonprism/icedove-libre-nonprism/vendor.js b/nonprism/icedove-libre-nonprism/vendor.js
deleted file mode 100644
index 170b505a8..000000000
--- a/nonprism/icedove-libre-nonprism/vendor.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default mailer checking.
-pref("mail.shell.checkDefaultMail", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
deleted file mode 100644
index 86a91508f..000000000
--- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=kdenetwork-kopete
-pkgname=kdenetwork-kopete-libre-nonprism
-pkgver=4.12.0
-pkgrel=1
-pkgdesc='Instant Messenger, without skype and support for unsafe and dangerous for privacy protocols'
-url='http://kde.org/applications/internet/kopete/'
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdenetwork')
-depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn'
-         'qimageblitz' 'mediastreamer' 'jsoncpp')
-makedepends=('cmake' 'automoc4' 'boost')
-install=${_pkgname}.install
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
-        'libre-nonprism.patch')
-sha1sums=('c1ef611b27079388e48e558a65e2de80db93d875'
-          'ddde6ed0b6f281512dc12cb80f712f33c6932c92')
-
-prepare() {
-  cd kopete-${pkgver}
-  # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
-  sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' protocols/CMakeLists.txt
-  rm -rf protocols/skype
-  # remove unsafe/dangerous services
-  sed -i 's/Oscar (ICQ and AIM) protocol" ON/Oscar (ICQ and AIM) protocol" OFF/g' protocols/CMakeLists.txt
-  rm -rf protocols/oscar
-  sed -i 's/Yahoo protocol" ON/Yahoo protocol" OFF/g' protocols/CMakeLists.txt
-  rm -rf protocols/yahoo
-  sed -i 's/QQ protocol" ON/QQ protocol" OFF/g' protocols/CMakeLists.txt
-  rm -rf protocols/qq
-  sed -i 's/Novell GroupWise Messenger protocol" ON/Novell GroupWise Messenger protocol" OFF/g' protocols/CMakeLists.txt
-  rm -rf protocols/groupwise
-  sed -i 's/Gadu-Gadu protocol" ON/Gadu-Gadu protocol" OFF/g' protocols/CMakeLists.txt
-  rm -rf protocols/gadu
-  sed -i 's/Google Talk support" ON/Google Talk support" OFF/g' protocols/CMakeLists.txt
-  sed -i 's/Window Live Messenger support" ON/Window Live Messenger support" OFF/g' protocols/CMakeLists.txt
-  rm -rf protocols/wlm
-  sed -i 's/Windows Live Messenger voice clip support" ON/Windows Live Messenger voice clip support" OFF/g' protocols/CMakeLists.txt
-  sed -i 's/meanwhile protocol" ON/meanwhile protocol" OFF/g' protocols/CMakeLists.txt
-  rm -rf protocols/meanwhile
-  patch -p1 -i "${srcdir}"/libre-nonprism.patch
-  cd ..
-  mkdir build
-}
-
-build() {
-  cd build
-  cmake ../kopete-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR=$pkgdir install
-}
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install
+++ /dev/null
@@ -1,12 +0,0 @@
-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/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install
deleted file mode 100644
index e70c054ec..000000000
--- a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch
deleted file mode 100644
index 6d73766cc..000000000
--- a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff --git a/doc/index.docbook b/doc/index.docbook
-index b55fd88..416de49 100644
---- a/doc/index.docbook
-+++ b/doc/index.docbook
-@@ -24,7 +24,6 @@
-   <!ENTITY kopete-chatstyle SYSTEM "chatstyle.docbook">
-   <!ENTITY kopete-pipes SYSTEM "pipes.docbook">
-   <!ENTITY kopete-jabber SYSTEM "jabber.docbook">
--  <!ENTITY kopete-icq SYSTEM "icq.docbook">
- ]>
- <!--
- Intro (1st draft, Will)
-@@ -116,15 +115,7 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
- <keyword>Messaging</keyword>
- <keyword>Jabber</keyword>
- <keyword>IRC</keyword>
--<keyword>MSN</keyword>
--<keyword>ICQ</keyword>
--<keyword>AIM</keyword>
--<keyword>Yahoo</keyword>
--<keyword>Gadu-Gadu</keyword>
--<keyword>GroupWise</keyword>
--<keyword>Novell</keyword>
- <keyword>WinPopup</keyword>
--<keyword>SMS</keyword>
- </keywordset>
- 
- </bookinfo>
-@@ -178,13 +169,13 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
- <para>To use &kopete; you need to set up one or more accounts for the instant messaging services you wish to use.</para>
- <para>You've probably already chosen a messaging service, either because you already use &im;, or you need to use the same service as your friends.  If you don't fit into either of these categories, please consider using a messaging service based on open standards, because these are designed for use by Free Software.  Other messaging services are prone to changing the underlying technology without making the details freely available, making them harder for Free Software developers to support.</para>
- <para>The messaging services that &kopete; supports that are based on open standards are Jabber and IRC.</para>
--<para>The following section assumes you are registered with an &im; service already.  If not, you can register with Gadu-Gadu, Jabber, and <trademark>MSN</trademark> from inside &kopete;; for other services, you'll have to register using their respective web site before creating an account in &kopete;.</para>
-+<para>The following section assumes you are registered with an &im; service already.  If not, you can register with Jabber from inside &kopete;; for other services, you'll have to register using their respective web site before creating an account in &kopete;.</para>
- <sect1 id="creating-accounts">
- <title>Creating Accounts</title>
- <para>To create an account, use <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure...</guimenuitem> </menuchoice> to display the Configure window.</para>
- <para>The Configure window is the main way to set up and customize &kopete;.  On the left a column of icons control which aspect of &kopete; is being configured.  Click the <guiicon>Accounts</guiicon> icon.  The main pane will change to display the account management pane.  This is currently empty, but will soon list your &im; accounts.  Click <guibutton>Add Account</guibutton> to display the <interface>Account Wizard</interface>.</para>
- <para>The <interface>Account Wizard</interface> helps you create an &im; account.  On the first page, you are asked to select the messaging service that you'd like to use.  Click one of the services shown and then click <guibutton>Next</guibutton>.  On the following page, you should enter your registration details for that instant messaging service.</para>
--<para>Most services just require you to enter a username or unique identifying number (<acronym>UIN</acronym>) and password.  The special purpose services Winpopup and <acronym>SMS</acronym> work slightly differently, so please see their specific sections.  There are a couple of other options that apply to most services that you should look at:</para>
-+<para>Most services just require you to enter a username or unique identifying number (<acronym>UIN</acronym>) and password.  The special purpose services Winpopup work slightly differently, so please see their specific sections.  There are a couple of other options that apply to most services that you should look at:</para>
- <variablelist>
- <varlistentry><term>Remember password</term><listitem><para>When this is checked, &kopete; will store the password for you, so you don't have to enter it every time you connect to the &im; service.  If you are security-conscious or want to limit access to the &im; account you can leave this unchecked.</para></listitem></varlistentry>
- <varlistentry><term>Connect at startup</term><listitem><para>When this is checked, &kopete; will try to connect to the &im; service as when it starts.  If you use a <acronym>LAN</acronym>, <acronym>DSL</acronym> or other <quote>always-on</quote> connection, this is appropriate; dial-up modem users should turn this off and connect manually when you have dialed up.</para></listitem></varlistentry>
-@@ -260,7 +251,7 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
- <listitem><para>Select Display Name and Group.  Here you can enter a Display Name (the name used for this person inside &kopete;), and choose the <link linkend="organise-contacts-grouping">groups</link> they are a member of.</para></listitem>
- <listitem><para>Select &im; Accounts.  Here you can choose which accounts you want to use to chat to the new contact.  If you only have one &im; account, you won't see this screen.</para></listitem>
- <listitem><para>Account-specific Add Contact Pages.  For each account, you'll get one page where you can enter the <acronym>UIN</acronym>, buddy name or Email address, depending on the &im; system in use.</para></listitem>
--<listitem><para>Finish Screen.  All done.  Except if the &im; system requires authorization (such as <trademark>ICQ</trademark>) to add a contact to your list - in which case, you'll be prompted after the wizard exits.</para></listitem>
-+<listitem><para>Finish Screen.  All done.  Except if the &im; system requires authorization to add a contact to your list - in which case, you'll be prompted after the wizard exits.</para></listitem>
- </orderedlist>
- 
- <para>You can add contacts to an existing Metacontact using its context menu.</para>
-@@ -705,47 +696,17 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
- 	<para>&kopete; calls different &im; systems 'Protocols'.  When you add an account, it is specific to a single protocol.  Although &kopete; tries to make instant messaging appear the same, no matter what protocol you use, there are some differences in the level of support for advanced features such as file transfer and multimedia.</para>
- 	<sect1 id="protocols-list">
- 		<title>Protocols</title>
--		<sect2 id="protocols-aim">
--			<title>AIM</title>
--			<para>AIM supports chatrooms.  Use the <guilabel>Join Chat...</guilabel> command on the AIM account menu to join a chatroom. Contact pictures and custom emoticons are also supported.</para>
--		</sect2>
--		<sect2 id="protocols-icq">
--			<title>ICQ</title>
--			<para>ICQ has an Invisibility feature which allows you to hide from selected contacts.  You may also search the ICQ user folder when adding a contact.  A wide range of contact details can be set using the <guilabel>Properties</guilabel> option.</para>
--		</sect2>
--		<sect2 id="protocols-msn">
--			<title>MSN</title> 
--			<para>File transfer and multi user chats work.  To transfer a file,  drag the file from &konqueror; or the desktop into the chat window.  To invite someone else into a chat, drag them from the Contact List into the chat window.  The <menuchoice><guimenu>File</guimenu></menuchoice> menu also contains these commands.  In addition, MSN supports custom emoticons.</para>
--			<para>To use file transfer, make sure port 6891 is forwarded to your computer.</para>
--		</sect2>
--		<sect2 id="protocols-yahoo">
--			<title>Yahoo</title>
--			<para>Yahoo can send and receive webcam video.  It also supports Yahoo mail and the Yahoo address book from the account menu.  Conferencing is also possible.</para>
--		</sect2>
- 		<sect2 id="protocols-jabber">
- 			<title>Jabber</title>
- 			<para>Jabber, also known as XMPP, supports file transfer, conferencing and any other services supplied by the Jabber server.  For example, many Jabber servers have a user directory, and some provide transports to other messaging systems.  To access services, use <menuchoice><guimenu>Services...</guimenu></menuchoice> on the account menu.  Jabber file transfer can work without port forwarding, but enjoys better performance where a direct connection is possible.  By default, port 8010 is used for port forwarding, but this is configurable in each account's settings.</para>
- 		</sect2>
--		<sect2 id="protocols-gtalk">
--			<title>Google Talk</title>
--			<para>Since Google Talk is based upon Jabber, it is well supported in &kopete; with the exception of voice chat, which is worked upon.</para>
--			<para>To configure &kopete; for Google Talk: Use your complete Google Mail address as the user name.  Check <guilabel>Use protocol encryption (SSL)</guilabel>, <guilabel>Allow plain-text password authentication</guilabel> and <guilabel>Override default server information</guilabel>.  The server is <quote>talk.google.com</quote> or <quote>gmail.com</quote> and ports 443 or 5223 should be used.</para>
--		</sect2>
--		<sect2 id="protocols-groupwise">
--			<title>Novell GroupWise</title>
--			<para>GroupWise Messenger is an enterprise messenging system from Novell Inc.  The full range of features are supported, including privacy, group chat, rich text and user search.</para>
--		</sect2>
--		<sect2 id="protocols-gadu-gadu">
--			<title>Gadu-Gadu</title>
--			<para>Gadu-Gadu is a chat system originating from Poland.  At present, &kopete; supports basic chat functions.</para>
--		</sect2>
- 		<sect2 id="protocols-winpopup">
- 			<title>WinPopup</title>
- 			<para>WinPopup is a way to use &kopete; to send and receive messages with &Windows; computers on the local network.  The WinPopup protocol only supports single, plain-text messages.</para>
- 		</sect2>
- 		<sect2 id="protocols-others">
- 			<title>Other protocols</title>
--			<para>As well as the protocols named above, &kopete; has support for several other protocols.  In most cases, this is not enabled by default or an additional plugin must be installed.  Meanwhile, SMS, Skype and SILC are provided in this way.  See &kopetewww; for details, however, the &kopete; team are not responsible for these protocols.</para>
-+			<para>As well as the protocols named above, &kopete; has support for several other protocols.  In most cases, this is not enabled by default or an additional plugin must be installed.  See &kopetewww; for details, however, the &kopete; team are not responsible for these protocols.</para>
- 		</sect2>
- 	</sect1>
- </chapter>
-@@ -1180,7 +1141,6 @@ Documentation copyright 2003,2004,2005 &Will.Stephenson; (lists at stevello free
- &kopete-chatstyle;
- &kopete-pipes;
- &kopete-jabber;
--&kopete-icq;
- 
- &documentation.index;
- </book>
diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD
deleted file mode 100644
index 0e899459f..000000000
--- a/nonprism/kdepim-runtime-nonprism/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z 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.12.0
-pkgrel=1
-pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kdepim-runtime'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'libkolab')
-makedepends=('cmake' 'automoc4' 'boost')
-install="${_pkgname}.install"
-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=('fe988ea74cf83f1dae99f81bc02eefaa834c664c')
-
-prepare() {
-  mkdir build
-}
-
-build() {
-	cd build
-	cmake ../${_pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DKDE4_BUILD_TESTS=OFF \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd build
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/nonprism/kdepim-runtime-nonprism/kdepim-runtime.install b/nonprism/kdepim-runtime-nonprism/kdepim-runtime.install
deleted file mode 100644
index c77e68041..000000000
--- a/nonprism/kdepim-runtime-nonprism/kdepim-runtime.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/nonprism/pidgin-nonprism/PKGBUILD b/nonprism/pidgin-nonprism/PKGBUILD
deleted file mode 100644
index 50bf3d05d..000000000
--- a/nonprism/pidgin-nonprism/PKGBUILD
+++ /dev/null
@@ -1,137 +0,0 @@
-# $Id: PKGBUILD 185869 2013-05-19 16:42:53Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
-
-_pkgname=pidgin
-pkgname=('pidgin-nonprism' 'libpurple-nonprism' 'finch-nonprism')
-pkgver=2.10.7
-pkgrel=4
-arch=('i686' 'x86_64' 'mips64el')
-url="http://pidgin.im/"
-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 nonprism.patch)
-sha256sums=('eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192'
-            '063723d5dc5726c43137b4b383c9d07c2c008391f6a626faaf6cedd31a2f1e8f'
-            'f7acfb852cdecfed16e8b116546b643cad1c44d28b56f28ff5485f92af68e9e2')
-
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  msg 'remove Google Talk and Facebook protocols'
-  patch -Np1 -i "$srcdir/nonprism.patch"
-  msg 'remove wrong OS term'
-  sed -i 's|on Linux|on GNU/Linux|' libpurple/valgrind.h
-  sed -i 's|On Linux|On GNU/Linux|' libpurple/connection.h
-}
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  # https://developer.pidgin.im/ticket/15517
-  patch -Np1 -i "$srcdir/pidgin-2.10.7-link-libirc-to-libsasl2.patch"
-  autoreconf -vi
-
-  # Use Python 2
-  sed -i 's/env python$/&2/' */plugins/*.py \
-    libpurple/purple-{remote,notifications-example,url-handler}
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --disable-schemas-install \
-    --disable-meanwhile \
-    --disable-gnutls \
-    --enable-cyrus-sasl \
-    --disable-doxygen \
-    --enable-nm \
-    --with-python=/usr/bin/python2 \
-    --with-system-ssl-certs=/etc/ssl/certs \
-    --with-dynamic-prpls=bonjour,irc,jabber,silc,simple,zephyr
-    make
-}
-
-package_pidgin-nonprism(){
-  pkgdesc="Multi-protocol instant messaging client, without support for unsafe and dangerous for privacy protocols"
-  depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
-           'hicolor-icon-theme')
-  optdepends=('aspell: for spelling correction')
-  provides=("$_pkgname=$pkgver")
-  conflicts=$_pkgname
-  replaces=$_pkgname
-  install=pidgin.install
-
-  cd "$srcdir/pidgin-$pkgver"
-
-  # For linking
-  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
-
-  make -C pidgin DESTDIR="$pkgdir" install
-  make -C doc DESTDIR="$pkgdir" install
-
-  # Remove files that are packaged in libpurle
-  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
-
-  install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop
-
-  rm "$pkgdir/usr/share/man/man1/finch.1"
-
-  msg "Removing PRISM images"
-  rm -v "$pkgdir"/usr/share/pixmaps/pidgin/emblems/{16/aol-client.png,scalable/aol-client.svg} 
-  rm -v "$pkgdir"/usr/share/pixmaps/pidgin/emotes/default/msn{,-away,-busy,_online}.png 
-  rm -v "$pkgdir"/usr/share/pixmaps/pidgin/protocols/{16,22}/google-talk.png 
-  rm -v "$pkgdir"/usr/share/pixmaps/pidgin/protocols/{16,22,48}/{aim,facebook,gadu-gadu,icq,meanwhile,msn,mxit,myspace,novell,yahoo}.png  
-  rm -v "$pkgdir"/usr/share/pixmaps/pidgin/protocols/scalable/{aim,gadu-gadu,google-talk,icq,meanwhile,msn,mxit,novell,yahoo}.svg 
-
-  msg "patch pidgin desktop"
-  sed -i "\|Comment\[|d
-          s|Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more|Supports Jabber/XMPP and more|
-         " "$pkgdir"/usr/share/applications/pidgin.desktop
-}
-
-package_libpurple-nonprism(){
-  pkgdesc="IM library extracted from Pidgin, without support for unsafe and dangerous for privacy protocols"
-  depends=('farstream-0.1' 'libsasl' 'libidn' 'dbus-glib' 'nss')
-  optdepends=('avahi: Bonjour protocol support'
-              'ca-certificates: SSL CA certificates'
-              'python2-dbus: for purple-remote and purple-url-handler'
-              'tk: Tcl/Tk scripting support')
-  provides=("${pkgname%-nonprism}=$pkgver")
-  conflicts=${pkgname%-nonprism}
-  replaces=${pkgname%-nonprism}
-
-  cd "$srcdir/pidgin-$pkgver"
-
-  for _dir in libpurple share/sounds share/ca-certs m4macros po; do
-    make -C "$_dir" DESTDIR="$pkgdir" install
-  done
-}
-
-package_finch-nonprism(){
-  pkgdesc="A ncurses-based messaging client, without support for unsafe and dangerous for privacy protocols"
-  depends=("libpurple=$pkgver-$pkgrel" 'libx11' 'python2')
-  provides=("${pkgname%-nonprism}=$pkgver")
-  conflicts=${pkgname%-nonprism}
-  replaces=${pkgname%-nonprism}
-
-  cd "$srcdir/pidgin-$pkgver"
-
-  # For linking
-  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
-
-  make -C finch DESTDIR="$pkgdir" install
-  make -C doc DESTDIR="$pkgdir" install
-
-  # Remove files that are packaged in libpurle
-  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
-
-  rm "$pkgdir"/usr/share/man/man1/pidgin.1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/nonprism/pidgin-nonprism/nonprism.patch b/nonprism/pidgin-nonprism/nonprism.patch
deleted file mode 100644
index 88140268e..000000000
--- a/nonprism/pidgin-nonprism/nonprism.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils.c
---- a/pidgin/gtkutils.c     2013-02-11 07:16:53.000000000 -0200
-+++ b/pidgin/gtkutils.c    2013-08-16 19:59:22.633298587 -0300
-@@ -677,7 +677,6 @@
- 	GdkPixbuf *pixbuf = NULL;
- 	GtkSizeGroup *sg;
- 	GList *p;
--	const char *gtalk_name = NULL, *facebook_name = NULL;
- 	int i;
- 
- 	aop_menu = g_malloc0(sizeof(AopMenu));
-@@ -686,55 +685,12 @@
- 	gtk_widget_show(aop_menu->menu);
- 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
- 
--	if (purple_find_prpl("prpl-jabber")) {
--		gtalk_name = _("Google Talk");
--		facebook_name = _("Facebook (XMPP)");
--	}
--
- 	for (p = purple_plugins_get_protocols(), i = 0;
- 		 p != NULL;
- 		 p = p->next, i++) {
- 
- 		plugin = (PurplePlugin *)p->data;
- 
--		if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) {
--			char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
--			                                  "16", "google-talk.png", NULL);
--			GtkWidget *item;
--
--			pixbuf = pidgin_pixbuf_new_from_file(filename);
--			g_free(filename);
--
--			gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
--				item = aop_menu_item_new(sg, pixbuf, gtalk_name, "prpl-jabber", "protocol"));
--			g_object_set_data(G_OBJECT(item), "fakegoogle", GINT_TO_POINTER(1));
--
--			if (pixbuf)
--				g_object_unref(pixbuf);
--
--			gtalk_name = NULL;
--			i++;
--		}
--
--		if (facebook_name && strcmp(facebook_name, plugin->info->name) < 0) {
--			char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
--			                                  "16", "facebook.png", NULL);
--			GtkWidget *item;
--
--			pixbuf = pidgin_pixbuf_new_from_file(filename);
--			g_free(filename);
--
--			gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
--				item = aop_menu_item_new(sg, pixbuf, facebook_name, "prpl-jabber", "protocol"));
--			g_object_set_data(G_OBJECT(item), "fakefacebook", GINT_TO_POINTER(1));
--
--			if (pixbuf)
--				g_object_unref(pixbuf);
--
--			facebook_name = NULL;
--			i++;
--		}
--
- 		pixbuf = pidgin_create_prpl_icon_from_prpl(plugin, PIDGIN_PRPL_ICON_SMALL, NULL);
- 
- 		gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
diff --git a/nonprism/pidgin-nonprism/pidgin-2.10.7-link-libirc-to-libsasl2.patch b/nonprism/pidgin-nonprism/pidgin-2.10.7-link-libirc-to-libsasl2.patch
deleted file mode 100644
index abffa20b8..000000000
--- a/nonprism/pidgin-nonprism/pidgin-2.10.7-link-libirc-to-libsasl2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am pidgin-2.10.7/libpurple/protocols/irc/Makefile.am
---- pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am	2013-02-14 02:44:47.000000000 +0200
-+++ pidgin-2.10.7/libpurple/protocols/irc/Makefile.am	2013-02-14 02:49:58.000000000 +0200
-@@ -27,7 +27,7 @@ else
- st =
- pkg_LTLIBRARIES   = libirc.la
- libirc_la_SOURCES = $(IRCSOURCES)
--libirc_la_LIBADD  = $(GLIB_LIBS)
-+libirc_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS)
- 
- endif
- 
diff --git a/nonprism/pidgin-nonprism/pidgin.install b/nonprism/pidgin-nonprism/pidgin.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/nonprism/pidgin-nonprism/pidgin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/nonprism/sylpheed-nonprism/PKGBUILD b/nonprism/sylpheed-nonprism/PKGBUILD
deleted file mode 100644
index 08b0b3c13..000000000
--- a/nonprism/sylpheed-nonprism/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $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.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' 'compface')
-makedepends=('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
deleted file mode 100644
index 50d000634..000000000
--- a/nonprism/sylpheed-nonprism/nonprism.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-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
deleted file mode 100644
index e111ef946..000000000
--- a/nonprism/sylpheed-nonprism/sylpheed.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/nonprism/your-privacy/PKGBUILD b/nonprism/your-privacy/PKGBUILD
deleted file mode 100644
index 3dbc1c733..000000000
--- a/nonprism/your-privacy/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Parabola Project <dev@list.parabolagnulinux.org>
-pkgname=your-privacy
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
-pkgrel=1
-pkgdesc="This package will remove support for unsafe/dangerous for privacy protocols/services."
-arch=('any')
-url="https://parabolagnulinux.org"
-license=('GPL3')
-install=${pkgname}.install
-replaces=your-coherence
-source=(${pkgname}-blacklist-${pkgver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/${pkgname}-blacklist.txt)
-
-package() {
-    conflicts=($(cut -d: -f1,2 ${pkgname}-blacklist-${pkgver}.txt | \
-      sed "s/:$//" | \
-      grep -v ":" | \
-      grep -v '^#' | \
-      sort -u
-    ))
-    cd ${srcdir}
-    install -d ${pkgdir}/usr/share/doc/${pkgname}
-    install -m644 ${pkgname}-blacklist-${pkgver}.txt ${pkgdir}/usr/share/doc/${pkgname}/
-}
-
-md5sums=('5fd14982619414fea1882b351607291e')
diff --git a/nonprism/your-privacy/your-privacy.install b/nonprism/your-privacy/your-privacy.install
deleted file mode 100644
index 965fdbf43..000000000
--- a/nonprism/your-privacy/your-privacy.install
+++ /dev/null
@@ -1,30 +0,0 @@
-
-pre_install() {
-  cat <<EOM
-  == IMPORTANT NOTICE ==
-
-  This package will help you identify if packages that support 
-  unsafe/dangerous for privacy protocols/services are installed on your
-  system at the time of its installation, as well as protecting you from 
-  (accidentally) installing them.
-
-  Also, if any other package that support unsafe/dangerous for privacy
-  protocols/services is identified, later updates will ask you for its 
-  removal.
-
-  Have in mind that, if you want to retain certain packages that support
-  unsafe/dangerous for privacy protocols/services installed on your system,
-  you'll have to remove your-privacy :)
-
-  Please report any issue to the Nonprism Team on the usual channels:
-  * https://labs.parabola.nu
-  * irc://freenode.net/#nonprism
-  * mailto:dev@lists.parabolagnulinux.org
-EOM
-}
-
-pre_upgrade() {
-  pre_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/9mount/PKGBUILD b/pcr/9mount/PKGBUILD
deleted file mode 100644
index 3de06c084..000000000
--- a/pcr/9mount/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): Fazlul Shahriar <fshahriar@gmail.com>
-
-pkgname=9mount
-pkgver=1.3
-pkgdesc="A set of SUID tools for mounting 9p filesystems via v9fs."
-url="http://sqweek.net/code/9mount/"
-license=('custom:ISC')
-source=("http://sqweek.net/9p/$pkgname-$pkgver.tar.gz" fix-checks.patch)
-
-pkgrel=3
-arch=('i686' 'x86_64')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -i "$srcdir/fix-checks.patch"
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  PATH=.:$PATH sh ./test.sh
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make prefix="$pkgdir/usr" install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-  ln -s 9mount.1 "$pkgdir/usr/share/man/man1/9umount.1"
-  ln -s 9mount.1 "$pkgdir/usr/share/man/man1/9bind.1"
-}
-
-md5sums=('711a0a6f4d076c8275596171b0a315d0'
-         '7961acda05c55f91f8cd6fb0d51b5c7d')
-sha256sums=('820d80b9b478d05ecb022ad658477b37cfc2414a8669c3af17d192a522064c17'
-            '69cd1be08cc13cdecf2851dd6f78efd734afa8b0b099484cd777edb0b1d36f79')
diff --git a/pcr/9mount/fix-checks.patch b/pcr/9mount/fix-checks.patch
deleted file mode 100644
index 9af711ba5..000000000
--- a/pcr/9mount/fix-checks.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- test.sh.orig	2012-10-15 11:15:07.000000000 -0400
-+++ test.sh	2012-10-15 11:15:11.000000000 -0400
-@@ -7,7 +7,7 @@
- 	shift; shift
- 	actual=$(9mount -n "$@" 2>&1)
- 	aopts=$(echo $actual |sed 's/.*-o \([^ ]*\) .*/\1/' |tr , '\n' |sort |tr '\n' , |sed 's/,$//')
--	actual=$(echo $actual |sed 's/-o [^ ]*/-o '"$aopts"'/')
-+	actual=$(echo $actual |sed -e 's/-o [^ ]*/-o '"$aopts"'/' -e 's/ ::1 / 127.0.0.1 /')
- 	if [ "$expected" != "$actual" ]; then
- 		echo '	'9mount "$@"
- 		echo $expected' #expected'
-@@ -48,6 +48,7 @@
- 	output=$(9mount -n "$@" 2>&1) && {
- 		echo '	'9mount "$@"
- 		echo $output' #should have failed!'
-+		exit 1
- 	}
- }
- 
-@@ -59,3 +60,4 @@
- shouldfail unix!/tmp/9mount!qux $mtpt
- shouldfail virtio!/dev/chan!bar $mtpt
- shouldfail tcp!localhost!564!foo $mtpt
-+exit 0
diff --git a/pcr/a2jmidid/PKGBUILD b/pcr/a2jmidid/PKGBUILD
deleted file mode 100644
index 3391d0d9a..000000000
--- a/pcr/a2jmidid/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer : Guest One <theguestone at gmail dot com>
-# patch taken from https://aur.archlinux.org/packages/a2jmidid/
-
-pkgname=a2jmidid
-pkgver=8
-pkgrel=1
-pkgdesc="A daemon for exposing legacy ALSA sequencer applications in JACK MIDI system."
-arch=('i686' 'mips64el')
-url="http://home.gna.org/$pkgname/"
-license=('GPL')
-depends=('jack' 'python2-dbus')
-source=("http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2"
-        "$pkgname-dso-pthread.patch")
-md5sums=('9cf4edbc3ad2ddeeaf6c8c1791ff3ddd'
-         '4b15e485301aee48371844cb01689ad2')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # DSO link patch
-  patch -p1 -i ../$pkgname-dso-pthread.patch
-
-  python2 waf configure --prefix=/usr
-  python2 waf
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 waf install --destdir="$pkgdir/"
-
-  # python2 fix
-  sed -i "s/python/&2/" "$pkgdir/usr/bin/a2j_control"
-}
diff --git a/pcr/a2jmidid/a2jmidid-dso-pthread.patch b/pcr/a2jmidid/a2jmidid-dso-pthread.patch
deleted file mode 100644
index 028b9d432..000000000
--- a/pcr/a2jmidid/a2jmidid-dso-pthread.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -aur a2jmidid-8/wscript a2jmidid-8.patched/wscript
---- a2jmidid-8/wscript	2012-07-05 03:14:23.000000000 +0200
-+++ a2jmidid-8.patched/wscript	2012-07-10 17:48:30.710109306 +0200
-@@ -67,6 +67,7 @@
-         conf.env['DBUS_ENABLED'] = False
- 
-     conf.env['LIB_DL'] = ['dl']
-+    conf.env['LIB_PTHREAD'] = ['pthread']
- 
-     #conf.check_header('expat.h', mandatory=True)
-     #conf.env['LIB_EXPAT'] = ['expat']
-@@ -152,7 +153,7 @@
- 
-     prog.includes = '.' # make waf dependency tracking work
-     prog.target = 'a2jmidid'
--    prog.uselib = 'ALSA JACK DL'
-+    prog.uselib = 'ALSA JACK DL PTHREAD'
-     if bld.env()['DBUS_ENABLED']:
-         prog.uselib += " DBUS-1"
-     prog = bld.create_obj('cc', 'program')
diff --git a/pcr/acr/PKGBUILD b/pcr/acr/PKGBUILD
deleted file mode 100644
index d1ba1744b..000000000
--- a/pcr/acr/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: stalker_exe <stalkerexe8@gmail.com>
-pkgname=acr
-pkgver=0.8.6
-pkgrel=1
-pkgdesc="ACR is an autoconf like tool that allows you to create configure scripts for your programs."
-arch=('any')
-url="http://nopcode.org/wk.php/Acr"
-license=('GPL2')
-depends=()
-source=("http://www.lolcathost.org/b/$pkgname-$pkgver.tar.gz")
-
-md5sums=('0981ffbd92dcb63015793a849c34465d')
-
-build() {
-  cd "${srcdir}/$pkgname-${pkgver}"
- ./configure --prefix=/usr --mandir=/usr/share/man
-}
-
-package() {
-  cd "${srcdir}/$pkgname-${pkgver}"
-  make DESTDIR=${pkgdir} install
-}
diff --git a/pcr/ahcpd/PKGBUILD b/pcr/ahcpd/PKGBUILD
deleted file mode 100644
index 52c917bbc..000000000
--- a/pcr/ahcpd/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Yann Lopez <arch at lonewulf dot net>
-pkgname=ahcpd
-pkgver=0.53
-pkgrel=2
-pkgdesc="Ad-Hoc Configuration Protocol"
-arch=(i686 x86_64 mips64el)
-url="http://www.pps.jussieu.fr/~jch/software/ahcp/"
-license=('custom')
-depends=('sh')
-source=(http://www.pps.jussieu.fr/~jch/software/files/$pkgname-$pkgver.tar.gz)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  sed -i 's/\$(PREFIX)\/man/$(PREFIX)\/share\/man/g' Makefile
-  make PREFIX="/usr"
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  
-  make install TARGET=${pkgdir} PREFIX=/usr
-
-  install -d $pkgdir/usr/share/licenses/ahcpd
-  install -m 644 LICENCE $pkgdir/usr/share/licenses/ahcpd/
-}
-md5sums=('a1a610bf20965aa522cd766bf3d5829a')
diff --git a/pcr/amsynth/PKGBUILD b/pcr/amsynth/PKGBUILD
deleted file mode 100644
index 7af465551..000000000
--- a/pcr/amsynth/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer : Guest One <theguestone at gmail dot com>
-
-pkgname=amsynth
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="Analogue Modeling SYNTHesizer"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/$pkgname/"
-license=('GPL')
-depends=('gtkmm' 'jack' 'liblo' 'ladspa')
-makedepends=('desktop-file-utils' 'dssi' 'libtool')
-install="$pkgname.install"
-source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-md5sums=('9193d334c89996cf44e98422e03318bb')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/amsynth/amsynth.install b/pcr/amsynth/amsynth.install
deleted file mode 100644
index e111ef946..000000000
--- a/pcr/amsynth/amsynth.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/pcr/android-udev/PKGBUILD b/pcr/android-udev/PKGBUILD
deleted file mode 100644
index 10fe60934..000000000
--- a/pcr/android-udev/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): M0Rf30 
-# Contributor: marlock
-
-pkgname=android-udev
-pkgver=20130911
-_gitver=8dfd1cd0002d7067d24a2ef89360212f164f3856
-url="https://github.com/M0Rf30/android-udev-rules"
-pkgdesc='Udev rules to for Android devices.'
-
-# The author is the maintainer of the AUR package, where it is listed as GPL;
-# this is the best hint to the license that we have.
-license=('GPL')
-
-pkgrel=1
-arch=('any')
-source=("51-android-$pkgver.rules::https://raw.github.com/M0Rf30/android-udev-rules/$_gitver/51-android.rules")
-depends=('systemd' 'libmtp')
-install='android-udev.install'
-
-package() {
-  cd "$srcdir"
-  install -Dm755 "$srcdir"/51-android-$pkgver.rules "$pkgdir"/usr/lib/udev/rules.d/51-android.rules
-}
-
-md5sums=('1b2033fcf52b1b0ffa807ba90b11fd14')
diff --git a/pcr/android-udev/android-udev.install b/pcr/android-udev/android-udev.install
deleted file mode 100644
index dcb1ebc20..000000000
--- a/pcr/android-udev/android-udev.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    post_upgrade
-    echo "NOTE: To use adb as a normal user you have to add yourself to the adbusers group"
-}
-
-post_upgrade() {
-    { getent group adbusers || /usr/sbin/groupadd adbusers; } &>/dev/null
-}
-
-post_remove() {
-    getent group adbusers &>/dev/null && /usr/sbin/groupdel adbusers
-}
diff --git a/pcr/anyremote/PKGBUILD b/pcr/anyremote/PKGBUILD
deleted file mode 100644
index 8bf7e00cf..000000000
--- a/pcr/anyremote/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributor: Andrea Fagiani <andfagiani_at_gmail_dot_com> 
-# Contributor: hb <hb.at.spamers.dot.net>
-# Contributor: Lisa Denia <eiffel56@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=anyremote
-pkgver=6.0
-pkgrel=1
-pkgdesc="Remote control (console-oriented) through bluetooth or IR connection"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://anyremote.sourceforge.net"
-license=('GPL')
-depends=('bluez' 'dbus-glib' 'libxtst')
-optdepends=("irda-utils: IRDA support")
-install=anyremote.install
-source=(http://downloads.sourceforge.net/sourceforge/anyremote/$pkgname-$pkgver.tar.gz)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=$pkgdir install
-}
-md5sums=('f39da5df07f3e1a0c59bc3f95347dbe7')
diff --git a/pcr/anyremote/anyremote.install b/pcr/anyremote/anyremote.install
deleted file mode 100644
index 012444ce0..000000000
--- a/pcr/anyremote/anyremote.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_install () {
-    echo "
-    >>>Download the java client for your phone at
-    >>>http://anyremote.sourceforge.net/dload.html
-    "
-}
diff --git a/pcr/aqsis/PKGBUILD b/pcr/aqsis/PKGBUILD
deleted file mode 100644
index 89998fc84..000000000
--- a/pcr/aqsis/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Former contributor: Gino Pezzin <pezzin@gmail.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=aqsis
-pkgver=1.8.2
-pkgrel=3
-pkgdesc='A high quality, photorealistic, 3D rendering solution'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url="http://www.$pkgname.org"
-license=GPL2
-optdepends=(
-  'qt4: graphical interface'
-  'mesa-libgl: ptview'
-)
-depends=(
-  'boost-libs=1.53.0'
-  desktop-file-utils
-  hicolor-icon-theme
-  openexr
-  shared-mime-info
-)
-makedepends=(
-  boost
-  cmake
-  libpng
-  mesa
-  qt4
-)
-options=(
-  '!libtool'
-)
-install=$pkgname.install
-source="http://downloads.sourceforge.net/project/$pkgname/$pkgname-source/$pkgver/$pkgname-$pkgver.tar.gz"
-md5sums='399967e99f12cfbd1a7385c4e1d39c3b'
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  mkdir -p $srcdir/$pkgname-build
-  cd $srcdir/$pkgname-build
-
-  setarch $CARCH cmake "$srcdir"/$pkgname-$pkgver\
-    -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc/$pkgname
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/$pkgname-build
-  setarch $CARCH make DESTDIR=$pkgdir install
-}
-
-# vim:set ts=2 sw=2 et:
-
diff --git a/pcr/aqsis/aqsis.install b/pcr/aqsis/aqsis.install
deleted file mode 100644
index b2086e07b..000000000
--- a/pcr/aqsis/aqsis.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor/
-  update-mime-database usr/share/mime > /dev/null
-  update-desktop-database -q
-}
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/aseprite/PKGBUILD b/pcr/aseprite/PKGBUILD
deleted file mode 100644
index bf0052363..000000000
--- a/pcr/aseprite/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Benoit Favre <benoit.favre@gmail.com>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-
-pkgname=aseprite
-pkgver=0.9.5
-pkgrel=3
-pkgdesc='Create animated sprites and pixel art'
-arch=('x86_64' 'i686')
-url='http://www.aseprite.org/'
-license=('GPL')
-depends=('allegro')
-makedepends=('cmake')
-source=("http://aseprite.googlecode.com/files/$pkgname-$pkgver.zip" aseprite.desktop)
-sha256sums=('ce4f1e011744f9a5927a5341fccc3938b67f15f6a66d5df6b4282c5498fb8fd5' 'c9e624b9fd095ebb3eec8220a58d4a9422f39d68477bafcc0047d773814ba0aa')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  cmake -DCMAKE_INSTALL_PREFIX:STRING=/usr .
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-  install -Dm644 "$srcdir/$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "data/icons/ase48.png" \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/aseprite/aseprite.desktop b/pcr/aseprite/aseprite.desktop
deleted file mode 100644
index b000fa018..000000000
--- a/pcr/aseprite/aseprite.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=Aseprite
-Comment=Pixel-art paint program
-Exec=aseprite
-Terminal=false
-Categories=Graphics;2DGraphics;RasterGraphics
-Icon=aseprite
diff --git a/pcr/asterisk/PKGBUILD b/pcr/asterisk/PKGBUILD
deleted file mode 100644
index 01bc1ae6e..000000000
--- a/pcr/asterisk/PKGBUILD
+++ /dev/null
@@ -1,95 +0,0 @@
-# Maintainer : Xavier Devlamynck <magicrhesus@ouranos.be>
-# Contributor: Alessio Biancalana <dottorblaster@gmail.com>
-# Contributor: Maik Broemme <mbroemme@libmpq.org>
-
-pkgname=asterisk
-pkgver=11.5.0
-pkgrel=2
-pkgdesc="A complete PBX solution"
-arch=('i686' 'x86_64')
-backup=('etc/asterisk/acl.conf' 'etc/asterisk/adsi.conf'
-'etc/asterisk/agents.conf' 'etc/asterisk/alarmreceiver.conf'
-'etc/asterisk/alsa.conf' 'etc/asterisk/amd.conf'
-'etc/asterisk/app_mysql.conf' 'etc/asterisk/app_skel.conf'
-'etc/asterisk/asterisk.conf' 'etc/asterisk/calendar.conf'
-'etc/asterisk/ccss.conf' 'etc/asterisk/cdr.conf'
-'etc/asterisk/cdr_adaptive_odbc.conf' 'etc/asterisk/cdr_custom.conf'
-'etc/asterisk/cdr_manager.conf' 'etc/asterisk/cdr_mysql.conf'
-'etc/asterisk/cdr_odbc.conf' 'etc/asterisk/cdr_pgsql.conf'
-'etc/asterisk/cdr_sqlite3_custom.conf' 'etc/asterisk/cdr_syslog.conf'
-'etc/asterisk/cdr_tds.conf' 'etc/asterisk/cel.conf'
-'etc/asterisk/cel_custom.conf' 'etc/asterisk/cel_odbc.conf'
-'etc/asterisk/cel_pgsql.conf' 'etc/asterisk/cel_sqlite3_custom.conf'
-'etc/asterisk/cel_tds.conf' 'etc/asterisk/chan_dahdi.conf'
-'etc/asterisk/chan_mobile.conf' 'etc/asterisk/cli.conf'
-'etc/asterisk/cli_aliases.conf' 'etc/asterisk/cli_permissions.conf'
-'etc/asterisk/codecs.conf' 'etc/asterisk/confbridge.conf'
-'etc/asterisk/config_test.conf' 'etc/asterisk/console.conf'
-'etc/asterisk/dbsep.conf' 'etc/asterisk/dnsmgr.conf'
-'etc/asterisk/dsp.conf' 'etc/asterisk/dundi.conf'
-'etc/asterisk/enum.conf' 'etc/asterisk/extconfig.conf'
-'etc/asterisk/extensions.conf' 'etc/asterisk/extensions_minivm.conf'
-'etc/asterisk/features.conf' 'etc/asterisk/festival.conf'
-'etc/asterisk/followme.conf' 'etc/asterisk/func_odbc.conf'
-'etc/asterisk/gtalk.conf' 'etc/asterisk/h323.conf'
-'etc/asterisk/http.conf' 'etc/asterisk/iax.conf'
-'etc/asterisk/iaxprov.conf' 'etc/asterisk/indications.conf'
-'etc/asterisk/jabber.conf' 'etc/asterisk/jingle.conf'
-'etc/asterisk/logger.conf' 'etc/asterisk/manager.conf'
-'etc/asterisk/meetme.conf' 'etc/asterisk/mgcp.conf'
-'etc/asterisk/minivm.conf' 'etc/asterisk/misdn.conf'
-'etc/asterisk/modules.conf' 'etc/asterisk/motif.conf'
-'etc/asterisk/musiconhold.conf' 'etc/asterisk/muted.conf'
-'etc/asterisk/ooh323.conf' 'etc/asterisk/osp.conf'
-'etc/asterisk/oss.conf' 'etc/asterisk/phone.conf'
-'etc/asterisk/phoneprov.conf' 'etc/asterisk/queuerules.conf'
-'etc/asterisk/queues.conf' 'etc/asterisk/res_config_mysql.conf'
-'etc/asterisk/res_config_sqlite.conf'
-'etc/asterisk/res_config_sqlite3.conf' 'etc/asterisk/res_corosync.conf'
-'etc/asterisk/res_curl.conf' 'etc/asterisk/res_fax.conf'
-'etc/asterisk/res_ldap.conf' 'etc/asterisk/res_odbc.conf'
-'etc/asterisk/res_pgsql.conf' 'etc/asterisk/res_pktccops.conf'
-'etc/asterisk/res_snmp.conf' 'etc/asterisk/res_stun_monitor.conf'
-'etc/asterisk/rtp.conf' 'etc/asterisk/say.conf' 'etc/asterisk/sip.conf'
-'etc/asterisk/sip_notify.conf' 'etc/asterisk/skinny.conf'
-'etc/asterisk/sla.conf' 'etc/asterisk/smdi.conf'
-'etc/asterisk/udptl.conf' 'etc/asterisk/unistim.conf'
-'etc/asterisk/users.conf' 'etc/asterisk/voicemail.conf'
-'etc/asterisk/vpb.conf' 'etc/asterisk/xmpp.conf')
-url="http://www.asterisk.org"
-license=('GPL')
-depends=('alsa-lib' 'speex' 'popt' 'libvorbis' 'curl')
-makedepends=('postgresql' 'unixodbc' 'sqlite3')
-optdepends=('libpri' 'libss7' 'openr2' 'iksemel' 'radiusclient-ng' 'dahdi')
-source=(http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-${pkgver}.tar.gz \
-	${pkgname}.service \
-	${pkgname}.logrotated \
-	${pkgname}.tmpfile)
-install=${pkgname}.install
-sha256sums=('a82c1ddd9fb1d98f0dab6e0255a127fb7c7eaa687b3d515182458244062b4194'
-	'74e0b278d553499f0c648a6e3d55c0dbb11b0c6dc93a85b020a21eafadb83783'
-	'caa24cfec5c6b4f8cea385269e39557362acad7e2a552994c3bc24080e3bdd4e'
-	'673c0c55bce8068c297f9cdd389402c2d5d5a25e2cf84732cb071198bd6fa78a')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
-  make
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  make DESTDIR=${pkgdir} samples
-  
-  sed -i -e "s/\/var\/run/\/run/" ${pkgdir}/etc/asterisk/asterisk.conf
-
-  mkdir -p ${pkgdir}/usr/share/doc/asterisk/examples
-  for i in ${pkgdir}/etc/asterisk/*; do install -D -m 644 $i ${pkgdir}/usr/share/doc/asterisk/examples/; done
-  
-  mv ${pkgdir}/var/run ${pkgdir}
-  
-  install -D -m 644 ${srcdir}/asterisk.logrotated ${pkgdir}/etc/logrotate.d/asterisk
-  install -D -m 644 ${srcdir}/asterisk.service ${pkgdir}/usr/lib/systemd/system/asterisk.service
-  install -D -m 644 ${srcdir}/asterisk.tmpfile ${pkgdir}/usr/lib/tmpfiles.d/asterisk.conf
- }
diff --git a/pcr/asterisk/asterisk.install b/pcr/asterisk/asterisk.install
deleted file mode 100644
index b7c1a71f7..000000000
--- a/pcr/asterisk/asterisk.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-	groupadd -r asterisk
-	useradd -MNr -s /bin/false -d /run/asterisk -g asterisk asterisk && passwd -l asterisk &>/dev/null
-
-	chown -R asterisk:asterisk /etc/asterisk 
-	chown -R asterisk:asterisk /var/lib/asterisk 
-	chown -R asterisk:asterisk /var/log/asterisk
-	chown -R asterisk:asterisk /run/asterisk
-	chown -R asterisk:asterisk /var/spool/asterisk
-}
-
-post_remove() {
-	userdel asterisk &>/dev/null
-	groupdel asterisk &>/dev/null
-}
diff --git a/pcr/asterisk/asterisk.logrotated b/pcr/asterisk/asterisk.logrotated
deleted file mode 100644
index f03d0acd3..000000000
--- a/pcr/asterisk/asterisk.logrotated
+++ /dev/null
@@ -1,10 +0,0 @@
-/var/log/asterisk/*_log /var/log/asterisk/messages {
-  create 640 asterisk asterisk
-  compress
-  missingok
-  notifempty
-  postrotate
-    /usr/sbin/asterisk -rx "logger reload" 1>/dev/null || true
-  endscript
-}
-
diff --git a/pcr/asterisk/asterisk.service b/pcr/asterisk/asterisk.service
deleted file mode 100644
index 789a1adda..000000000
--- a/pcr/asterisk/asterisk.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=Asterisk PBX and telephony daemon
-Documentation=man:asterisk(8)
-Wants=network.target
-After=network.target
-
-[Service]
-Type=simple
-User=asterisk
-Group=asterisk
-ExecStart=/usr/bin/asterisk -f -C /etc/asterisk/asterisk.conf
-ExecStop=/usr/bin/asterisk -rx 'core stop now'
-ExecReload=/usr/bin/asterisk -rx 'core reload'
-
-# safe_asterisk emulation
-Restart=always
-RestartSec=10
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/asterisk/asterisk.tmpfile b/pcr/asterisk/asterisk.tmpfile
deleted file mode 100644
index 6f1042e8a..000000000
--- a/pcr/asterisk/asterisk.tmpfile
+++ /dev/null
@@ -1 +0,0 @@
-d /run/asterisk 0755 asterisk asterisk -
diff --git a/pcr/audio-entropyd/PKGBUILD b/pcr/audio-entropyd/PKGBUILD
deleted file mode 100644
index c691c0128..000000000
--- a/pcr/audio-entropyd/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: fauno <fauno@parabola.nu>
-pkgname=audio-entropyd
-pkgver=2.0.3
-pkgrel=1
-pkgdesc="Feeds the /dev/random device with entropy-data read from an audio device"
-arch=('i686')
-url="http://vanheusden.com/aed/"
-license=('GPL2')
-groups=('entropy')
-depends=('alsa-lib')
-source=(http://www.vanheusden.com/aed/${pkgname}-${pkgver}.tgz
-        ${pkgname}.service)
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-  install -D -m 755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
-  install -D -m 644 ${srcdir}/${pkgname}.service \
-                    ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-}
-sha1sums=('b788559c6c01e17bb9d314ac2a7411bc30fbb8a2'
-          '6d3ad093176efaa0e5a4fe80113048aa9c4810ce')
-sha256sums=('6fbaf1c4f77e988f4656cd079309d5eb6bd36cbae89c2ee01324c5690adaf3ff'
-            '41704fac32b2c180c1fb6155b902445e2c5bc493da0191180cb3720cd72bd42c')
diff --git a/pcr/audio-entropyd/audio-entropyd.service b/pcr/audio-entropyd/audio-entropyd.service
deleted file mode 100644
index feff7cae4..000000000
--- a/pcr/audio-entropyd/audio-entropyd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Gathering entropy from audio
-After=sound.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/audio-entropyd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/aurvote/PKGBUILD b/pcr/aurvote/PKGBUILD
deleted file mode 100644
index 4dcf8d3d2..000000000
--- a/pcr/aurvote/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Maintainer: tuxce <tuxce.net@gmail.com>
-# Maintainer: Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=aurvote
-pkgver=1.4
-pkgrel=1
-pkgdesc="Tool to vote for favorite AUR packages"
-url="http://git.archlinux.fr/aurvote.git/" 
-license="GPL" 
-arch=('any')
-depends=('curl') 
-source=($pkgname) 
-
-build() { 
-  	install -D -m 755 "$srcdir/$pkgname" "$pkgdir/usr/bin/$pkgname"
-}
-
-md5sums=('57f2f0822b833f6c858526eb7c8bb85f')
diff --git a/pcr/aurvote/aurvote b/pcr/aurvote/aurvote
deleted file mode 100755
index 1b9c8f1bf..000000000
--- a/pcr/aurvote/aurvote
+++ /dev/null
@@ -1,193 +0,0 @@
-#!/bin/bash
-#
-# aurvote : Tool to vote for favorite AUR packages
-#
-# Copyright (c) 2007-2010 Julien MISCHKOWITZ <wain@archlinux.fr>
-# Copyright (c) 2011 tuxce <tuxce.net@gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Library General Public License as published
-# by the Free Software Foundation; either version 2, 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/>.
-#
-
-NAME='aurvote'
-VERSION=1.4
-
-TMPDIR=${TMPDIR:-/tmp}
-AV_TMP="$TMPDIR/aurvote-$USER"
-
-CONFIGFILE=${XDG_HOME_CONFIG:-~/.config}/aurvote
-
-AUR_URL="https://aur.archlinux.org"
-AUR_URL_LOGIN="$AUR_URL/login/"
-AUR_URL_PKG_INFO="$AUR_URL/rpc.php"
-AUR_URL_PKG_PAGE="$AUR_URL/packages/"
-AUR_DOMAIN="aur.archlinux.org"
-AUR_COOKIE="AURSID"
-AUR_COOKIE_VALUE=""
-AUR_SETLANG="?setlang=en"
-
-
-version() {
-    echo "$NAME $VERSION"
-}
-
-usage() {
-    echo "$NAME $VERSION"
-    echo
-    echo "usage: $0 <option> <pkgname1> <pkgname2> ..."
-    echo
-    echo " --version, -V       shows version"
-    echo " --help,    -h       shows this help"
-    echo " --check,   -c       check for voted packages"
-    echo " --vote,    -v       vote for packages"
-    echo " --unvote,  -u       unvote packages"
-    echo
-    echo " --configure         create $CONFIGFILE"
-    echo
-}
-
-error() {
-    echo -e "Error: $*"
-    exit 1
-}
-
-is_cookie_valid() {
-    [[ -r $COOKIE_FILE ]] || return 1
-    local expire
-    expire=$(sed -ne '/^\(#HttpOnly_\|[^#]\)/ { s/#HttpOnly_//;p }' "$COOKIE_FILE" |
-        awk "{ if (\$1==\"$AUR_DOMAIN\" && \$6==\"$AUR_COOKIE\") print \$5\" \"\$7; }")
-    AUR_COOKIE_VALUE=${expire##* }
-    expire=${expire%% *}
-    [[ $expire ]] && { ((expire==0)) || ((expire>$(date +%s))); }
-}
-
-aur_login() {
-    local args=()
-    if ((PERSIST)); then
-        is_cookie_valid && return 0
-        args=(-d "remember_me=on")
-    fi
-    if [[ ! $user || ! $pass ]]; then
-        error "$CONFIGFILE must have user name and password. Run:\n$NAME --configure"
-    fi
-    curl $CURL_OPT -L -fs -c "$COOKIE_FILE" "${args[@]}" -d "user=$user" \
-         --data-urlencode "passwd=$pass" "$AUR_URL_LOGIN" \
-         -o "$AV_TMP/login" || error "Unable to access $AUR_URL_LOGIN"
-    err=$(sed -ne 's/.*ul class="errorlist"><li>\([^<]*\)<.*/\1/p' "$AV_TMP/login")
-    [[ $err ]] && error "$err"
-}
-
-aur_check_vote() {
-    local pkg
-    for pkg in "${pkgnames[@]}"; do
-        curl $CURL_OPT -fs -b "$COOKIE_FILE" \
-             "${AUR_URL_PKG_PAGE}${pkg}${AUR_SETLANG}" \
-             -o "$AV_TMP/$pkg.$PID" ||
-                 error "Unable to get $pkg page"
-        if sed '/<div id="news">/q' "$AV_TMP/$pkg.$PID" | grep -q /unvote/; then
-            echo "already voted"
-        elif sed '/<div id="news">/q' "$AV_TMP/$pkg.$PID" | grep -q /vote/; then
-            echo "not voted"
-        else
-            echo "voted status not found"
-        fi
-    done
-}
-
-
-aur_vote() {
-    local pkg
-    (($1)) && vote="/vote/" || vote="/unvote/"
-    for pkg in "${pkgnames[@]}"; do
-        curl $CURL_OPT -fs -b "$COOKIE_FILE" \
-             "${AUR_URL_PKG_PAGE}${pkg}${vote}" -o /dev/null
-        if (($?)); then
-            echo "Error: Can't (un)vote for $pkg"
-        else
-            echo "$pkg : vote changed"
-        fi
-    done
-}
-
-create_config_file() {
-    local ans
-    if [[ -f "$CONFIGFILE" ]]; then
-        read -p "$CONFIGFILE exists. Replace ? [y/N] " ans
-        [[ $ans != 'Y' && $ans != 'y' ]] && return 0
-    fi
-    echo -n > "$CONFIGFILE"
-    if [[ ! -r "$CONFIGFILE" ]]; then
-        error "Unable to create $CONFIGFILE"
-    fi
-    echo "Creation of $CONFIGFILE"
-    read -p "AUR User : " ans
-    printf "user=%q\n" "$ans" >> "$CONFIGFILE"
-    read -p "AUR Password : " ans
-    printf "pass=%q\n" "$ans" >> "$CONFIGFILE"
-    read -p "Persistent login ? [Y/n] " ans
-    [[ $ans = 'n' || $ans = 'N' ]] && return 0
-    read -p "Path to the cookie file : [/var/tmp/aurvote-$USER.cookie] ? " ans
-    printf "COOKIE_FILE=%q\n" "${ans:-/var/tmp/aurvote-$USER.cookie}" >> "$CONFIGFILE"
-    echo
-    echo "Creation complete."
-}
-
-### MAIN PROGRAM ###
-umask 077
-[[ -d "$AV_TMP" ]] || mkdir -p "$AV_TMP"
-[[ -d "$AV_TMP" && -w "$AV_TMP" ]] || error "Cannot access to $AV_TMP"
-PID=$$
-ACTION="vote"
-pkgnames=()
-CURL_OPT=""
-PERSIST=0
-
-[[ -r "$CONFIGFILE" ]] && source "$CONFIGFILE"
-
-[[ $COOKIE_FILE ]] && PERSIST=1
-
-while [[ $1 ]]; do
-    case $1 in
-        --help|-h)    usage; exit 0;;
-        --version|-V) version; exit 0;;
-        --check|-c)   ACTION="check";;
-        --configure)  ACTION="configure";;
-        --vote|-v)    ACTION="vote";;
-        --unvote|-u)  ACTION="unvote";;
-        --id)         ;; # deprecated
-        --insecure)   CURL_OPT+=" --insecure";; 
-        -k)           PERSIST=1; shift; COOKIE_FILE="$1";;
-        --*|-*)       usage; exit 1;;
-        *)            pkgnames+=("$1");;
-    esac
-    shift
-done
-
-if [[ $ACTION = "configure" ]]; then
-    create_config_file
-    exit 0
-fi
-
-COOKIE_FILE=${COOKIE_FILE:-"$AV_TMP/cookies"}
-pkgnames=("${pkgnames[@]%/*}") # compatibility with yaourt <= 1.2.1
-[[ ! $pkgnames ]] && usage && exit 1
- 
-aur_login
-
-case "$ACTION" in
-    check)  aur_check_vote;;
-    vote)   aur_vote 1;;
-    unvote) aur_vote 0;;
-esac
-
-# vim: set ts=4 sw=4 et:
diff --git a/pcr/auto-complete/PKGBUILD b/pcr/auto-complete/PKGBUILD
deleted file mode 100755
index afa9d8691..000000000
--- a/pcr/auto-complete/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: abf <zouxiaoming@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=auto-complete
-pkgver=1.3.1
-pkgrel=1
-pkgdesc="A plugin for emacs that allows to auto-complete.Auto Complete Mode is the most intelligent auto-completion extension for GNU Emacs."
-arch=('any')
-url="http://cx4a.org/software/auto-complete/"
-license=('GPL3')
-install=$pkgname.install
-depends=()
-optdepends=('emacs')
-source=(http://cx4a.org/pub/auto-complete/$pkgname-$pkgver.tar.bz2)
-md5sums=('0ffdc1223d40b8ebc57495e33708ceea')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  mkdir -p $pkgdir/usr/share/$pkgname
-  mkdir -p $pkgdir/usr/share/emacs/site-lisp/
-  make DIR="$pkgdir/usr/share/$pkgname" install 
-  ln -s /usr/share/$pkgname $pkgdir/usr/share/emacs/site-lisp/$pkgname
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/auto-complete/auto-complete.install b/pcr/auto-complete/auto-complete.install
deleted file mode 100755
index 9687f5e43..000000000
--- a/pcr/auto-complete/auto-complete.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install()
-{
-echo " "
-echo "==================================================================="
-echo " "
-echo "Add the following code to your .emacs:"
-
-echo "(add-to-list 'load-path \"/usr/share/emacs/site-lisp/auto-complete\")"
-echo "(require 'auto-complete-config)"
-echo "(add-to-list 'ac-dictionary-directories \"/usr/share/emacs/site-lisp/auto-complete/ac-dict\")"
-echo "(ac-config-default)"
-echo " "
-echo "==================================================================="
-echo " "
-    
-}
-
-post_upgrade()
-{
-    post_install
-}
diff --git a/pcr/azr3-jack/PKGBUILD b/pcr/azr3-jack/PKGBUILD
deleted file mode 100644
index 024ed1b59..000000000
--- a/pcr/azr3-jack/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-pkgname=azr3-jack
-pkgver=1.2.3
-pkgrel=1.5
-pkgdesc="A tonewheel organ with drawbars, distortion and rotating speakers"
-arch=('i686' 'mips64el')
-url="http://ll-plugins.nongnu.org/azr3/"
-license=('GPL')
-depends=('jack' 'gtkmm' 'lash')
-source=(http://download.savannah.nongnu.org/releases-noredirect/ll-plugins/$pkgname-$pkgver.tar.bz2)
-md5sums=('aa71715e5873aea724713be5970ebfbc')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package(){
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/babeld/PKGBUILD b/pcr/babeld/PKGBUILD
deleted file mode 100644
index 20d442fd6..000000000
--- a/pcr/babeld/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer (AUR): Yann Lopez <arch at lonewulf dot net>
-# Maintainer (Parabola): fauno <fauno@parabola.nu>
-pkgname=babeld
-pkgver=1.4.1
-pkgrel=1
-pkgdesc="Loop-free distance-vector routing protocol"
-arch=(i686 x86_64 mips64el)
-url="http://www.pps.jussieu.fr/~jch/software/babel/"
-license=('custom')
-depends=(glibc)
-source=(http://www.pps.jussieu.fr/~jch/software/files/$pkgname-$pkgver.tar.gz{,.asc})
-install=babeld.install
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  sed -e "s,/man/,/share&,g" -i Makefile
-
-  make PREFIX=/usr CFLAGS="$CFLAGS"
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make PREFIX=/usr TARGET=$pkgdir install
-
-  gzip -f $pkgdir/usr/share/man/man8/$pkgname.8
-
-  install -Dm 644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENCE
-}
-md5sums=('406bbd940e3a9019d832d20e277266f2'
-         'SKIP')
diff --git a/pcr/babeld/babeld.install b/pcr/babeld/babeld.install
deleted file mode 100644
index 686153617..000000000
--- a/pcr/babeld/babeld.install
+++ /dev/null
@@ -1,18 +0,0 @@
-compatibility_warning() {
-  echo "PLEASE NOTE:"
-  echo " "
-  echo "-------------------------------------------------------------"
-  echo " This version uses the IANA-allocated UDP port and multicast"
-  echo " group and is therefore incompatible with older versions."
-  echo "-------------------------------------------------------------"
-}
-
-post_upgrade() {
-  major=$(echo $2 | cut -d '.' -f1)
-  minor=$(echo $2 | cut -d '.' -f2)
-  if [ $major -lt 1 ]; then
-    compatibility_warning
-  elif [ $major -eq 1 -a $minor -lt 1 ]; then
-    compatibility_warning
-  fi	
-}
diff --git a/pcr/bambus/PKGBUILD b/pcr/bambus/PKGBUILD
deleted file mode 100755
index 73cd77cd5..000000000
--- a/pcr/bambus/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Bambus
-# Contributor: ying <Jinoto Systems>
-# Contributor: ying <Jinoto Systems>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=bambus  
-pkgver=2.4
-pkgrel=1
-pkgdesc="A small and simple GTK Gui to change Wallpapers using feh, Esetroot, hsetroot, habak or any other command tool."
-url="http://malisch-ts.de"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL3')
-depends=('gtkmm' 'eterm') # 'eterm' can be changed in any command tool to draw the wallpaper.
-optdepends=('eterm' 'habak' 'feh' 'hsetroot' 'others')
-source=("https://downloads.sourceforge.net/project/simplebambus/bambus-${pkgver}-source.tar.gz?r=&ts=1289210369&use_mirror=master")
-md5sums=('c8001d9f837f04f4f8712729c2aa1849')
-
-build() {
-  make all
-}
-package() {
-  install -Dm755 bambus $pkgdir/usr/bin/bambus || return 
-}
-
-
-md5sums=('c8001d9f837f04f4f8712729c2aa1849')
diff --git a/pcr/bamf2/PKGBUILD b/pcr/bamf2/PKGBUILD
deleted file mode 100644
index 9afbb3c81..000000000
--- a/pcr/bamf2/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# Maintainer: Ivan de Jesús Pompa García <ivan.pompa@gmx.com>
-# Contributors: niQo ???
-
-pkgname=bamf2
-_dname=bamf
-pkgver=0.2.126
-pkgrel=2
-pkgdesc="Removes the headache of applications matching into a simple DBus daemon and c wrapper library, 0.2 branch"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/bamf"
-license=('GPL')
-depends=('dbus-glib' 'libwnck3' 'libgtop')
-makedepends=('libwnck' 'vala')
-optdepends=('gtk2: GTK+ 2 library')
-options=(!libtool)
-source=(http://launchpad.net/${_dname}/0.2/${pkgver}/+download/${_dname}-${pkgver}.tar.gz)
-md5sums=('709735137e4b028bb94f9e106bb9ac6e')
-
-conflicts=('bamf')
-provides=('bamf')
-
-build() {
-  cd "$srcdir/${_dname}-${pkgver}"
-
-  # Disable building tests
-  sed -i '/tests/ d' Makefile.in
-
-  sed -i -e 's/--c-include/--include/' lib/libbamf/Makefile.in
-  export CFLAGS="$CFLAGS -Wno-deprecated-declarations -Wno-unused-local-typedefs"
-
-  [[ -d build-gtk3 ]] || mkdir build-gtk3
-  pushd build-gtk3
-  ../configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${_dname} \
-              --disable-static
-  make
-  popd
-
-  [[ -d build-gtk2 ]] || mkdir build-gtk2
-  pushd build-gtk2
-  ../configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${_dname} \
-              --disable-static --with-gtk=2
-  make -C lib/libbamf
-  popd
-}
-
-package() {
-  cd "$srcdir/${_dname}-${pkgver}/build-gtk3"
-  make DESTDIR="${pkgdir}/" install
-
-  cd "$srcdir/${_dname}-${pkgver}/build-gtk2"
-  make -C lib/libbamf DESTDIR="${pkgdir}" install
-}
diff --git a/pcr/barnyard2/PKGBUILD b/pcr/barnyard2/PKGBUILD
deleted file mode 100644
index 178e054bc..000000000
--- a/pcr/barnyard2/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Commiebstrd<spenserreinhardt@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=barnyard2
-pkgver=1
-pkgrel=9
-pkgdesc="Barnyard2 is a fork of the original barnyard project, designed specifically for Snort's new unified2 file format. Barnyard2 is under active development and continues to adapt based on user feedback."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.securixlive.com/barnyard2/index.php"
-license=('GPLv2')
-depends=('snort' 'mysql')
-source=("http://www.securixlive.com/download/${pkgname}/${pkgname}-${pkgver}.${pkgrel}.tar.gz")
-
-package() {
-
-  #configures and makes package
-  cd "${srcdir}/${pkgname}-${pkgver}.${pkgrel}"
-  ./configure --with-mysql
-  make 
-  make DESTDIR="${pkgdir}" install
-  
-  #makes dir for /etc locations
-  mkdir "${pkgdir}/etc" -p
-
-  #makes dirs for /var locations
-  mkdir "${pkgdir}/var" -p
-  mkdir "${pkgdir}/var/log" -p
-  mkdir "${pkgdir}/var/log/$pkgname" -p
-
-  #makes /usr/bin, /usr should already be made from make\make install
-  mkdir "${pkgdir}/usr/bin"
-
-  #copy barnyard2.conf to /etc/barnyard2.conf and executable to /usr/bin/
-  cp "${pkgdir}/usr/local/etc/$pkgname.conf" "${pkgdir}/etc/"
-  cp "${pkgdir}/usr/local/bin/$pkgname" "${pkgdir}/usr/bin/"
-
-  #file permission mods and creation of initial .waldo file
-  chmod 666 "${pkgdir}/var/log/$pkgname"
-  touch "${pkgdir}/var/log/$pkgname/$pkgname.waldo"
-  chown snort.snort "${pkgdir}/var/log/$pkgname/$pkgname.waldo"
-
-  #not needed since conf is copied to /etc/ and barnyard is sent to /usr/bin
-  rm -rf "${pkgdir}/usr/local/"
-}
-md5sums=('fadb3bb25dd4cc4ed2fb674e06031ee9')
diff --git a/pcr/bashmount/PKGBUILD b/pcr/bashmount/PKGBUILD
deleted file mode 100644
index e468ab79f..000000000
--- a/pcr/bashmount/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributer: Jamie Nguyen <jamie@tomoyolinux.co.uk>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=bashmount
-pkgver=1.6.2
-pkgrel=1
-pkgdesc="A menu-driven bash script for the management of removable media with udisks"
-arch=('any')
-url='http://www.sourceforge.net/projects/bashmount/'
-license=('GPL2')
-depends=('udisks')
-install=${pkgname}.install
-backup=('etc/bashmount.conf')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-
-build()
-{
-  cd "${srcdir}/bashmount-${pkgver}"
-	
-  # install script
-  install -D -m755 bashmount "${pkgdir}/usr/bin/bashmount"
-
-  # install config file
-  install -D -m644 bashmount.conf "${pkgdir}/etc/bashmount.conf"
-
-  # install man page
-  gzip -c -9 bashmount.1 > bashmount.1.gz
-  install -D -m644 bashmount.1.gz "${pkgdir}/usr/share/man/man1/bashmount.1.gz"
-
-  # install documentation
-  install -d -m755 "${pkgdir}/usr/share/doc/bashmount"
-  install -m644 AUTHORS "${pkgdir}/usr/share/doc/bashmount/AUTHORS"
-  install -m644 COPYING "${pkgdir}/usr/share/doc/bashmount/COPYING"
-  install -m644 NEWS "${pkgdir}/usr/share/doc/bashmount/NEWS"
-}
-
-sha256sums=('10e5c8f9065e2410c5018d74a3f8cf7f30668fafa30d9ed82ff04cd64a0f7309')
diff --git a/pcr/bashmount/bashmount.install b/pcr/bashmount/bashmount.install
deleted file mode 100644
index 6e646d94b..000000000
--- a/pcr/bashmount/bashmount.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install () {
-  echo
-  echo " * dbus and consolekit/policykit need to be running. If you are not"
-  echo "   using a graphical login manager, put this in ~/.xinitrc:"
-  echo
-  echo "      source /etc/X11/xinit/xinitrc.d/30-dbus"
-  echo "      exec ck-launch-session [insert window manager here]"
-  echo
-}
diff --git a/pcr/batctl/PKGBUILD b/pcr/batctl/PKGBUILD
deleted file mode 100644
index 521537a50..000000000
--- a/pcr/batctl/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Contributor: Nathan Owe <ndowens.aur at gmail dot com>
-# Maintainer: Thomas Weißschuh <thomas_weissschuh@lavabit.com>
-pkgname=batctl
-pkgver=2012.3.0
-pkgrel=2
-pkgdesc="B.A.T.M.A.N. advanced control and management tool"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.open-mesh.net/"
-license=('GPL')
-depends=('glibc')
-source=("http://downloads.open-mesh.net/batman/releases/batman-adv-${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc})
-
-build(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make
-}
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir}  PREFIX=/usr install
-
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('fe9e6a3994539037b48afc5e3d31628c'
-         'fdc6433ebc7fe59ce9eaec56dd843eb9')
diff --git a/pcr/bibletime/PKGBUILD b/pcr/bibletime/PKGBUILD
deleted file mode 100644
index 3a2941623..000000000
--- a/pcr/bibletime/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: SanskritFritz (gmail)
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Tobias T. <OldShatterhand at gmx-topmail dot de>
-
-pkgname=bibletime
-pkgver=2.9.2
-pkgrel=10
-pkgdesc="Bible study tool for KDE4"
-arch=('x86_64' 'i686')
-url="http://www.bibletime.info/"
-license=('GPL2')
-depends=('sword' 'openssl' 'clucene' 'qtwebkit')
-makedepends=('cmake')
-install=$pkgname.install
-source=("http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	CXXFLAGS+=" -fpermissive"
-
-#	rm CMakeCache.txt
-	cmake \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DQT_QMAKE_EXECUTABLE=qmake4 \
-		-DBT_FORCE_USE_QT4=TRUE \
-		"$srcdir/$pkgname-$pkgver"
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
-sha256sums=('393c77419b0514645cf2417f52d37bdbd604f8eeb37e76355e14c38d896093c8')
diff --git a/pcr/bibletime/bibletime.install b/pcr/bibletime/bibletime.install
deleted file mode 100644
index ad97d7bab..000000000
--- a/pcr/bibletime/bibletime.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_install() {
-  post_upgrade
-}
-
-post_remove() {
-  post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/bison++/PKGBUILD b/pcr/bison++/PKGBUILD
deleted file mode 100644
index 485bff943..000000000
--- a/pcr/bison++/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Contributor: Antonio Garcia-Dominguez <antonio.garciadominguez@uca.es>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=bison++
-pkgver=1.21.11
-pkgrel=1
-pkgdesc="Parser generator in C or C++ from BNF notation"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://packages.debian.org/bison++"
-license=('GPL')
-source=('http://ftp.de.debian.org/debian/pool/main/b/bison++/bison++_1.21.11.orig.tar.gz' 'http://ftp.de.debian.org/debian/pool/main/b/bison++/bison++_1.21.11-3.diff.gz')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Apply the Debian patch
-  patch -p1 < ../*.diff
-
-  # Fix the broken Makefile.am script
-  sed -e '
-    s/datadir/DESTDIR\)\$(datadir/
-    s/bindir/DESTDIR\)\$(bindir/
-    /^pkgdata_DATA/s/ Example$//
-    /install\-exec\-hook/i\install-data-hook:\
-\tcp -r $(srcdir)/Example $(DESTDIR)$(pkgdatadir)\
-' -i Makefile.am
-
-  # Bootstrap the autotools and compile
-  aclocal
-  automake --add-missing
-  autoreconf
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-
-  # Remove or rename files that could conflict with regular Bison
-  rm "$pkgdir/usr/bin/bison"
-  mv "$pkgdir/usr/share/info/"{bison,bison++}.info
-  rm "$pkgdir/usr/share/man/man1/bison.1"
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('5cdeae3478207d5e1052e4616daa41cd'
-         'c290793fb5ff7c35ad9b424b90b167d0')
diff --git a/pcr/blender-addon-ogre/PKGBUILD b/pcr/blender-addon-ogre/PKGBUILD
deleted file mode 100644
index 5fd846220..000000000
--- a/pcr/blender-addon-ogre/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-_bldname=blender
-_bldver=2.69
-_bldep=10
-
-_pkgname=ogre
-pkgname=$_bldname-addon-$_pkgname
-pkgver=0.6.0
-pkgrel=3
-pkgdesc="${_bldname}2$_pkgname: A addon for the ${_bldname^} which allows export to ${_pkgname^}3D formats (scene/mesh/material/skeleton) (built for the $_bldname-libre package)"
-arch=any
-url=https://code.google.com/p/${_bldname}2$_pkgname
-license=LGPL2.1
-depends=(
-  "$_bldname-libre>=$_bldep:$_bldver"
-  "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))"
-)
-source=https://${_bldname}2$_pkgname.googlecode.com/files/${_bldname}2$_pkgname-$pkgver.zip
-sha512sums=15609a6dc3f5901ec59193acb6944017cc426fa12ce658715006ba781b6c39a09f38a64c858b28f7e662dff50eccf06ec6ef6efc22e0d2876c6c77fb18c04712
-
-prepare() {
-  msg 'renaming wrong OS name'
-  sed -i 's|Linux|GNU/Linux|' io_export_${_pkgname}DotScene.py
-}
-
-package() {
-  cd $srcdir
-  a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname
-  install -vd $a && cp -va io_export_${_pkgname}DotScene.py $a/__init__.py
-}
diff --git a/pcr/bristol/PKGBUILD b/pcr/bristol/PKGBUILD
deleted file mode 100644
index 6464f6b29..000000000
--- a/pcr/bristol/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-
-pkgname=bristol
-pkgver=0.60.11
-pkgrel=1
-pkgdesc="Vintage synthesizers emulator"
-arch=('i686')
-url="http://bristol.sourceforge.net"
-license=('GPL')
-makedepends=('gcc')
-depends=('jack' 'libx11')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9ea4dacdac0dba3048156e2f6a5ee4d6')
-sha256sums=('7d1f0bbd0d7d303fc77c6b9549b61708d7a83b4dc007818011b1f55d1fa922ba')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --disable-version-check --enable-jack-default-audio # --enable-jack-default-midi
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  install -v -m 0644 ChangeLog ${pkgdir}/usr/share/bristol/
-  install -v -m 0644 README ${pkgdir}/usr/share/bristol/
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/bup/PKGBUILD b/pcr/bup/PKGBUILD
deleted file mode 100644
index 98b7d12c7..000000000
--- a/pcr/bup/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: Bram Schoenmakers <me@bramschoenmakers.nl>
-# Contributor: henning mueller <henning@orgizm.net>
-# Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.io>
-
-# If you'd like to have documentation, please set the variable below to 1.
-# This implies installing pandoc, which in turn depends on many Haskell packages.
-# Which you can build if you wish.
-_havedocs=0
-
-pkgname=bup
-pkgver=0.25rc1
-_pkgver=0.25-rc1
-pkgrel=2
-pkgdesc="Backup tool using git pack files."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://github.com/apenwarr/bup"
-license=('GPL')
-depends=('python2-fuse' 'par2cmdline' 'python' 'git')
-[ $_havedocs = 1 ] && makedepends=('haskell-pandoc')
-source=("https://github.com/apenwarr/${pkgname}/archive/${pkgname}-${_pkgver}.tar.gz")
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgname}-${_pkgver}"
-
-  find . -name \*.py | xargs sed -i 's:env python:env python2:'
-  sed -i 's:PYTHON=python:PYTHON=python2:' Makefile
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgname}-${_pkgver}"
-  make DESTDIR=$pkgdir install
-}
-
-md5sums=('9d9af10900d84e2951aa64631ff4860d')
diff --git a/pcr/cambozola/PKGBUILD b/pcr/cambozola/PKGBUILD
deleted file mode 100644
index 27664f181..000000000
--- a/pcr/cambozola/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Ernie Brodeur <ebrodeur@ujami.net>
-pkgname=cambozola
-pkgver=0.92
-pkgrel=1
-pkgdesc="A java servlet for streaming JPEG's from ip Cameras."
-url="http://www.charliemouse.com:8080/code/cambozola/"
-arch=('x86_64' 'i686')
-license=('GPL')
-depends=('java-runtime')
-makedepends=('apache-ant')
-source=("${url}${pkgname}-${pkgver}.tar.gz")
-md5sums=('602daba851e726e2399445fda3ca718f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ant
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  mkdir -p ${pkgdir}/usr/share/${pkgname}
-  cp dist/* ${pkgdir}/usr/share/${pkgname}/
-}
-
-# vim:set ts=2 sw=2 et:
-
diff --git a/pcr/cegui-0.5/CEGUIString.h b/pcr/cegui-0.5/CEGUIString.h
deleted file mode 100644
index 13a61ba15..000000000
--- a/pcr/cegui-0.5/CEGUIString.h
+++ /dev/null
@@ -1,5603 +0,0 @@
-/***********************************************************************
-	filename: 	CEGUIString.h
-	created:	26/2/2004
-	author:		Paul D Turner
-	
-	purpose:	Defines string class used within the GUI system.
-*************************************************************************/
-/***************************************************************************
- *   Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team
- *
- *   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 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.
- ***************************************************************************/
-#ifndef _CEGUIString_h_
-#define _CEGUIString_h_
-
-#include "CEGUIBase.h"
-#include <string>
-#include <string.h>
-#include <stdexcept>
-
-// Start of CEGUI namespace section
-namespace CEGUI
-{
-#define STR_QUICKBUFF_SIZE	32
-	/*************************************************************************
-		Basic Types
-	*************************************************************************/
-	typedef		uint8	utf8;
-	//typedef		uint16	utf16;  // removed typedef to prevent usage, as utf16 is not supported (yet)
-	typedef		uint32	utf32;
-
-/*!
-\brief
-	String class used within the GUI system.
-
-	For the most part, this class can replace std::string in basic usage.  However, currently String does not use the
-	current locale, and also comparisons do not take into account the Unicode data tables, so are not 'correct'
-	as such.
-*/
-class CEGUIEXPORT String
-{
-public:
-	/*************************************************************************
-		Integral Types
-	*************************************************************************/
-	typedef		utf32			value_type;					//!< Basic 'code point' type used for String (utf32)
-	typedef		size_t			size_type;					//!< Unsigned type used for size values and indices
-	typedef		std::ptrdiff_t		difference_type;			//!< Signed type used for differences
-	typedef		utf32&			reference;					//!< Type used for utf32 code point references
-	typedef		const utf32&	const_reference;			//!< Type used for constant utf32 code point references
-	typedef		utf32*			pointer;					//!< Type used for utf32 code point pointers
-	typedef		const utf32*	const_pointer;				//!< Type used for constant utf32 code point pointers
-
-	static const size_type		npos;						//!< Value used to represent 'not found' conditions and 'all code points' etc.
-
-private:
-	/*************************************************************************
-		Implementation data
-	*************************************************************************/
-	size_type	d_cplength;			//!< holds length of string in code points (not including null termination)
-	size_type	d_reserve;			//!< code point reserve size (currently allocated buffer size in code points).
-
-	mutable utf8*		d_encodedbuff;		//!< holds string data encoded as utf8 (generated only by calls to c_str() and data())
-	mutable size_type	d_encodeddatlen;	//!< holds length of encoded data (in case it's smaller than buffer).
-	mutable size_type	d_encodedbufflen;	//!< length of above buffer (since buffer can be bigger then the data it holds to save re-allocations).
-
-	utf32		d_quickbuff[STR_QUICKBUFF_SIZE];	//!< This is a integrated 'quick' buffer to save allocations for smallish strings
-	utf32*		d_buffer;							//!< Pointer the the main buffer memory.  This is only valid when quick-buffer is not being used
-
-public:
-	/*************************************************************************
-		Iterator Classes
-	*************************************************************************/
-	/*!
-	\brief
-		Constant forward iterator class for String objects
-	*/
-#if defined(_MSC_VER) && (_MSC_VER <= 1200)
-	class const_iterator : public std::iterator<std::random_access_iterator_tag, utf32>
-#else
-	class const_iterator : public std::iterator<std::random_access_iterator_tag, utf32, std::ptrdiff_t, const utf32*, const utf32&>
-#endif
-	{
-
-	public:
-		//////////////////////////////////////////////////////////////////////////
-		// data
-		//////////////////////////////////////////////////////////////////////////
-		const utf32*	d_ptr;
-
-
-		//////////////////////////////////////////////////////////////////////////
-		// Methods
-		//////////////////////////////////////////////////////////////////////////
-		const_iterator(void)
-		{
-			d_ptr = 0;
-		}
-		const_iterator(const_pointer ptr)
-		{
-			d_ptr = ptr;
-		}
-
-		const_reference	operator*() const
-		{
-			return *d_ptr;
-		}
-
-#if defined(_MSC_VER) && (_MSC_VER <= 1200)
-#	pragma warning (push)
-#	pragma warning (disable : 4284)
-#endif
-		const_pointer	operator->() const		
-		{
-			return &**this;
-		}
-
-#if defined(_MSC_VER) && (_MSC_VER <= 1200)
-#	pragma warning (pop)
-#endif
-
-		const_iterator&	operator++()
-		{
-			++d_ptr;
-			return *this;
-		}
-
-		const_iterator	operator++(int)		
-		{
-			const_iterator temp = *this;
-			++*this;
-			return temp;
-		}
-
-		const_iterator&	operator--()
-		{
-			--d_ptr;
-			return *this;
-		}
-
-		const_iterator	operator--(int)		
-		{
-			const_iterator temp = *this;
-			--*this;
-			return temp;
-		}
-
-		const_iterator& operator+=(difference_type offset)
-		{
-			d_ptr += offset;
-			return *this;
-		}
-
-		const_iterator operator+(difference_type offset) const
-		{
-			const_iterator temp = *this;
-			return temp += offset;
-		}
-
-		const_iterator& operator-=(difference_type offset)
-		{
-			return *this += -offset;
-		}
-
-		const_iterator operator-(difference_type offset) const
-		{
-			const_iterator temp = *this;
-			return temp -= offset;
-		}
-
-		difference_type operator-(const const_iterator& iter) const
-		{
-			return d_ptr - iter.d_ptr;
-		}
-
-		const_reference operator[](difference_type offset) const
-		{
-			return *(*this + offset);
-		}
-
-		bool operator==(const const_iterator& iter) const
-		{
-			return d_ptr == iter.d_ptr;
-		}
-
-		bool operator!=(const const_iterator& iter) const
-		{
-			return !(*this == iter);
-		}
-
-		bool operator<(const const_iterator& iter) const
-		{
-			return d_ptr < iter.d_ptr;
-		}
-
-		bool operator>(const const_iterator& iter) const
-		{
-			return (!(iter < *this));
-		}
-
-		bool operator<=(const const_iterator& iter) const
-		{
-			return (!(iter < *this));
-		}
-
-		bool operator>=(const const_iterator& iter) const
-		{
-			return (!(*this < iter));
-		}
-
-		friend const_iterator operator+(difference_type offset, const const_iterator& iter)
-		{
-			return iter + offset;
-		}
-
-	};
-
-	/*!
-	\brief
-		Forward iterator class for String objects
-	*/
-	class iterator : public const_iterator
-	{
-	public:
-		iterator(void) {}
-		iterator(pointer ptr) : const_iterator(ptr) {}
-
-
-		reference operator*() const
-		{
-			return ((reference)**(const_iterator *)this);
-		}
-
-#if defined(_MSC_VER) && (_MSC_VER <= 1200)
-#	pragma warning (push)
-#	pragma warning (disable : 4284)
-#endif
-
-		pointer operator->() const
-		{
-			return &**this;
-		}
-
-#if defined(_MSC_VER) && (_MSC_VER <= 1200)
-#	pragma warning (pop)
-#endif
-
-		iterator& operator++()
-		{
-			++this->d_ptr;
-			return *this;
-		}
-
-		iterator operator++(int)
-		{
-			iterator temp = *this;
-			++*this;
-			return temp;
-		}
-
-		iterator& operator--()
-		{
-			--this->d_ptr;
-			return *this;
-		}
-
-		iterator operator--(int)
-		{
-			iterator temp = *this;
-			--*this;
-			return temp;
-		}
-
-		iterator& operator+=(difference_type offset)
-		{
-			this->d_ptr += offset;
-			return *this;
-		}
-
-		iterator operator+(difference_type offset) const
-		{
-			iterator temp = *this;
-			return temp + offset;
-		}
-
-		iterator& operator-=(difference_type offset)
-		{
-			return *this += -offset;
-		}
-
-		iterator operator-(difference_type offset) const
-		{
-			iterator temp = *this;
-			return temp -= offset;
-		}
-
-		difference_type operator-(const const_iterator& iter) const
-		{
-			return ((const_iterator)*this - iter);
-		}
-
-		reference operator[](difference_type offset) const
-		{
-			return *(*this + offset);
-		}
-
-		friend iterator operator+(difference_type offset, const iterator& iter)
-		{
-			return iter + offset;
-		}
-
-	};
-
-	/*!
-	\brief
-		Constant reverse iterator class for String objects
-	*/
-#if defined(_MSC_VER) && ((_MSC_VER <= 1200) || ((_MSC_VER <= 1300) && defined(_STLPORT_VERSION)))
-	typedef	std::reverse_iterator<const_iterator, const_pointer, const_reference, difference_type>	const_reverse_iterator;
-#else
-	typedef	std::reverse_iterator<const_iterator>	const_reverse_iterator;
-#endif
-
-	/*!
-	\brief
-		Reverse iterator class for String objects
-	*/
-#if defined(_MSC_VER) && ((_MSC_VER <= 1200) || ((_MSC_VER <= 1300) && defined(_STLPORT_VERSION)))
-	typedef std::reverse_iterator<iterator, pointer, reference, difference_type>			reverse_iterator;
-#else
-	typedef std::reverse_iterator<iterator>			reverse_iterator;
-#endif
-
-public:
-    /*!
-    \brief
-        Functor that can be used as comparator in a std::map with String keys.
-        It's faster than using the default, but the map will no longer be sorted alphabetically.
-    */
-    struct FastLessCompare
-    {
-        bool operator() (const String& a, const String& b) const
-        {
-            const size_t la = a.length();
-            const size_t lb = b.length();
-            if (la == lb)
-                return (memcmp(a.ptr(), b.ptr(), la*sizeof(utf32)) < 0);
-            return (la < lb);
-        }
-    };
-
-public:
-	//////////////////////////////////////////////////////////////////////////
-	// Default Construction and Destructor
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Constructs an empty string
-	*/
-	String(void)
-	{
-		init();
-	}
-
-	/*!
-	\brief
-		Destructor for String objects
-	*/
-	~String(void);
-
-	//////////////////////////////////////////////////////////////////////////
-	// Construction via CEGUI::String
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Copy constructor - Creates a new string with the same value as \a str
-
-	\param str
-		String object used to initialise the newly created string
-
-	\return
-		Nothing
-	*/
-	String(const String& str)
-	{
-		init();
-		assign(str);
-	}
-	
-
-	/*!
-	\brief
-		Constructs a new string initialised with code points from another String object.
-
-	\param str
-		String object used to initialise the newly created string
-
-	\param str_idx
-		Starting code-point of \a str to be used when initialising the new String
-
-	\param str_num
-		Maximum number of code points from \a str that are to be assigned to the new String
-
-	\return
-		Nothing
-	*/
-	String(const String& str, size_type str_idx, size_type str_num = npos)
-	{
-		init();
-		assign(str, str_idx, str_num);
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// Construction via std::string
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Constructs a new string and initialises it using the std::string std_str
-
-	\param std_str
-		The std::string object that is to be used to initialise the new String object.
-
-	\note
-		The characters of \a std_str are taken to be unencoded data which represent Unicode code points 0x00..0xFF.  No translation of
-		the provided data will occur.
-
-	\return
-		Nothing
-
-	\exception std::length_error	Thrown if resulting String object would be too big.
-	*/
-	String(const std::string& std_str)
-	{
-		init();
-		assign(std_str);
-	}
-		
-	/*!
-	\brief
-		Constructs a new string initialised with characters from the given std::string object.
-
-	\param std_str
-		std::string object used to initialise the newly created string
-
-	\param str_idx
-		Starting character of \a std_str to be used when initialising the new String
-
-	\note
-		The characters of \a std_str are taken to be unencoded data which represent Unicode code points 0x00..0xFF.  No translation of
-		the provided data will occur.
-
-	\param str_num
-		Maximum number of characters from \a std_str that are to be assigned to the new String
-
-	\return
-		Nothing
-
-	\exception std::length_error	Thrown if resulting String object would be too big.
-	*/
-	String(const std::string& std_str, size_type str_idx, size_type str_num = npos)
-	{
-		init();
-		assign(std_str, str_idx, str_num);
-	}
-
-
-	//////////////////////////////////////////////////////////////////////////
-	// Construction via UTF-8 stream (for straight ASCII use, only codes 0x00 - 0x7f are valid)
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Constructs a new String object and initialise it using the provided utf8 encoded string buffer.
-
-	\param utf8_str
-		Pointer to a buffer containing a null-terminated Unicode string encoded as utf8 data.
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\return
-		Nothing
-
-	\exception std::length_error	Thrown if resulting String object would be too big.
-	*/
-	String(const utf8* utf8_str)
-	{
-		init();
-		assign(utf8_str);
-	}
-
-	/*!
-	\brief
-		Constructs a new String object and initialise it using the provided utf8 encoded string buffer.
-
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param utf8_str
-		Pointer to a buffer containing Unicode string data encoded as utf8.
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param chars_len
-		Length of the provided utf8 string in code units (not code-points).
-
-	\return
-		Nothing
-
-	\exception std::length_error	Thrown if resulting String object would be too big.
-	*/
-	String(const utf8* utf8_str, size_type chars_len)
-	{
-		init();
-		assign(utf8_str, chars_len);
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// Construction via code-point (using a UTF-32 code unit)
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Constructs a new String that is initialised with the specified code point
-
-	\param num
-		The number of times \a code_point is to be put into new String object
-
-	\param code_point
-		The Unicode code point to be used when initialising the String object
-
-	\return
-		Nothing
-
-	\exception std::length_error	Thrown if resulting String object would be too big.
-	*/
-	String(size_type num, utf32 code_point)
-	{
-		init();
-		assign(num, code_point);
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// Construction via iterator
-	//////////////////////////////////////////////////////////////////////////
-	// Create string with characters in the range [beg, end)
-	/*!
-	\brief
-		Construct a new string object and initialise it with code-points from the range [beg, end).
-
-	\param beg
-		Iterator describing the start of the data to be used when initialising the String object
-
-	\param end
-		Iterator describing the (exclusive) end of the data to be used when initialising the String object
-
-	\return 
-		Nothing
-	*/
-	String(const_iterator iter_beg, const_iterator iter_end)
-	{
-		init();
-		append(iter_beg, iter_end);
-	}
-
-
-	//////////////////////////////////////////////////////////////////////////
-	// Construction via c-string
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Constructs a new String object and initialise it using the provided c-string.
-
-	\param c_str
-		Pointer to a c-string.
-
-	\return
-		Nothing
-
-	\exception std::length_error	Thrown if resulting String object would be too big.
-	*/
-	String(const char* cstr)
-	{
-		init();
-		assign(cstr);
-	}
-
-	/*!
-	\brief
-		Constructs a new String object and initialise it using characters from the provided char array.
-
-	\param chars
-		char array.
-
-	\param chars_len
-		Number of chars from the array to be used.
-
-	\return
-		Nothing
-
-	\exception std::length_error	Thrown if resulting String object would be too big.
-	*/
-	String(const char* chars, size_type chars_len)
-	{
-		init();
-		assign(chars, chars_len);
-	}
-
-
-	//////////////////////////////////////////////////////////////////////////
-	// Size operations
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Returns the size of the String in code points
-
-	\return
-		Number of code points currently in the String
-	*/
-	size_type	size(void) const
-	{
-		return d_cplength;
-	}
-
-	/*!
-	\brief
-		Returns the size of the String in code points
-
-	\return
-		Number of code points currently in the String
-	*/
-	size_type	length(void) const
-	{
-		return d_cplength;
-	}
-
-	/*!
-	\brief
-		Returns true if the String is empty
-
-	\return
-		true if the String is empty, else false.
-	*/
-	bool	empty(void) const
-	{
-		return	(d_cplength == 0);
-	}
-
-	/*!
-	\brief
-		Returns the maximum size of a String.
-
-		Any operation that would result in a String that is larger than this value will throw the std::length_error exception.
-
-	\return
-		The maximum number of code points that a string can contain
-	*/
-	static size_type	max_size(void)
-	{
-		return (((size_type)-1) / sizeof(utf32));
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// Capacity Operations
-	//////////////////////////////////////////////////////////////////////////
-	// return the number of code points the string could hold without re-allocation
-	// (due to internal encoding this will always report the figure for worst-case encoding, and could even be < size()!)
-	/*!
-	\brief
-		Return the number of code points that the String could hold before a re-allocation would be required.
-
-	\return
-		Size of the current reserve buffer.  This is the maximum number of code points the String could hold before a buffer
-		re-allocation would be required
-	*/
-	size_type capacity(void) const
-	{
-		return d_reserve - 1;
-	}
-
-	// reserve internal memory for at-least 'num' code-points (characters).  if num is 0, request is shrink-to-fit.
-	/*!
-	\brief
-		Specifies the amount of reserve capacity to allocate.
-
-	\param num
-		The number of code points to allocate space for.  If \a num is larger that the current reserve, then a re-allocation will occur.  If
-		\a num is smaller than the current reserve (but not 0) the buffer may be shrunk to the larger of the specified number, or the current
-		String size (operation is currently not implemented).  If \a num is 0, then the buffer is re-allocated to fit the current String size.
-
-	\return
-		Nothing
-
-	\exception std::length_error	Thrown if resulting String object would be too big.
-	*/
-	void	reserve(size_type num = 0)
-	{
-		if (num == 0)
-			trim();
-		else
-			grow(num);
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// Comparisons
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Compares this String with the String 'str'.
-
-	\note
-		This does currently not properly consider Unicode and / or the system locale.
-
-	\param str
-		The String object that is to compared with this String.
-
-	\return
-		-  0 if the String objects are equal
-		- <0 if this String is lexicographically smaller than \a str
-		- >0 if this String is lexicographically greater than \a str
-	*/
-	int		compare(const String& str) const
-	{
-		return compare(0, d_cplength, str);
-	}
-
-	/*!
-	\brief
-		Compares code points from this String with code points from the String 'str'.
-
-	\note
-		This does currently not properly consider Unicode and / or the system locale.
-
-	\param idx
-		Index of the first code point from this String to consider.
-
-	\param len
-		Maximum number of code points from this String to consider.
-
-	\param str
-		The String object that is to compared with this String.
-
-	\param str_idx
-		Index of the first code point from String \a str to consider.
-
-	\param str_len
-		Maximum number of code points from String \a str to consider
-
-	\return
-		-  0 if the specified sub-strings are equal
-		- <0 if specified sub-strings are lexicographically smaller than \a str
-		- >0 if specified sub-strings are lexicographically greater than \a str
-
-	\exception std::out_of_range	Thrown if either \a idx or \a str_idx are invalid.
-	*/
-	int		compare(size_type idx, size_type len, const String& str, size_type str_idx = 0, size_type str_len = npos) const
-	{
-		if ((d_cplength < idx) || (str.d_cplength < str_idx))
-			throw std::out_of_range("Index is out of range for CEGUI::String");
-
-		if ((len == npos) || (idx + len > d_cplength))
-			len = d_cplength - idx;
-
-		if ((str_len == npos) || (str_idx + str_len > str.d_cplength))
-			str_len = str.d_cplength - str_idx;
-
-		int val = (len == 0) ? 0 : utf32_comp_utf32(&ptr()[idx], &str.ptr()[str_idx], (len < str_len) ? len : str_len);
-
-		return (val != 0) ? ((val < 0) ? -1 : 1) : (len < str_len) ? -1 : (len == str_len) ? 0 : 1;
-	}
-
-
-	/*!
-	\brief
-		Compares this String with the std::string 'std_str'.
-
-	\note
-		This does currently not properly consider Unicode and / or the system locale.
-
-	\param std_str
-		The std::string object that is to compared with this String.
-
-	\note
-		Characters from \a std_str are considered to represent Unicode code points in the range 0x00..0xFF.  No translation of
-		the encountered data is performed.
-
-	\return
-		-  0 if the string objects are equal
-		- <0 if this string is lexicographically smaller than \a std_str
-		- >0 if this string is lexicographically greater than \a std_str
-	*/
-	int		compare(const std::string& std_str) const
-	{
-		return compare(0, d_cplength, std_str);
-	}
-
-
-	/*!
-	\brief
-		Compares code points from this String with code points from the std::string 'std_str'.
-
-	\note
-		This does currently not properly consider Unicode and / or the system locale.
-
-	\param idx
-		Index of the first code point from this String to consider.
-
-	\param len
-		Maximum number of code points from this String to consider.
-
-	\param std_str
-		The std::string object that is to compared with this String.
-
-	\note
-		Characters from \a std_str are considered to represent Unicode code points in the range 0x00..0xFF.  No translation of
-		the encountered data is performed.
-
-	\param str_idx
-		Index of the first character from std::string \a std_str to consider.
-
-	\param str_len
-		Maximum number of characters from std::string \a std_str to consider
-
-	\return
-		-  0 if the specified sub-strings are equal
-		- <0 if specified sub-strings are lexicographically smaller than \a std_str
-		- >0 if specified sub-strings are lexicographically greater than \a std_str
-
-	\exception std::out_of_range	Thrown if either \a idx or \a str_idx are invalid.
-	*/
-	int		compare(size_type idx, size_type len, const std::string& std_str, size_type str_idx = 0, size_type str_len = npos) const
-	{
-		if (d_cplength < idx)
-			throw std::out_of_range("Index is out of range for CEGUI::String");
-
-		if (std_str.size() < str_idx)
-			throw std::out_of_range("Index is out of range for std::string");
-
-		if ((len == npos) || (idx + len > d_cplength))
-			len = d_cplength - idx;
-
-		if ((str_len == npos) || (str_idx + str_len > std_str.size()))
-			str_len = (size_type)std_str.size() - str_idx;
-
-		int val = (len == 0) ? 0 : utf32_comp_char(&ptr()[idx], &std_str.c_str()[str_idx], (len < str_len) ? len : str_len);
-
-		return (val != 0) ? ((val < 0) ? -1 : 1) : (len < str_len) ? -1 : (len == str_len) ? 0 : 1;
-	}
-
-
-	/*!
-	\brief
-		Compares this String with the null-terminated utf8 encoded 'utf8_str'.
-
-	\note
-		This does currently not properly consider Unicode and / or the system locale.
-
-	\param utf8_str
-		The buffer containing valid Unicode data encoded as utf8 that is to compared with this String.
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\return
-		-  0 if the strings are equal
-		- <0 if this string is lexicographically smaller than \a utf8_str
-		- >0 if this string is lexicographically greater than \a utf8_str
-	*/
-	int		compare(const utf8* utf8_str) const
-	{
-		return compare(0, d_cplength, utf8_str, encoded_size(utf8_str));
-	}
-
-
-	/*!
-	\brief
-		Compares code points from this String with the null-terminated utf8 encoded 'utf8_str'.
-
-	\note
-		This does currently not properly consider Unicode and / or the system locale.
-
-	\param idx
-		Index of the first code point from this String to consider.
-
-	\param len
-		Maximum number of code points from this String to consider.
-
-	\param utf8_str
-		The buffer containing valid Unicode data encoded as utf8 that is to compared with this String.
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\return
-		-  0 if the specified sub-strings are equal
-		- <0 if specified sub-strings are lexicographically smaller than \a utf8_str
-		- >0 if specified sub-strings are lexicographically greater than \a utf8_str
-
-	\exception std::out_of_range	Thrown if \a idx is invalid.
-	*/
-	int		compare(size_type idx, size_type len, const utf8* utf8_str) const
-	{
-		return compare(idx, len, utf8_str, encoded_size(utf8_str));
-	}
-
-	/*!
-	\brief
-		Compares code points from this String with the utf8 encoded data in buffer 'utf8_str'.
-
-	\note
-		This does currently not properly consider Unicode and / or the system locale.
-
-	\param idx
-		Index of the first code point from this String to consider.
-
-	\param len
-		Maximum number of code points from this String to consider.
-
-	\param utf8_str
-		The buffer containing valid Unicode data encoded as utf8 that is to compared with this String.
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param str_cplen
-		The number of encoded code points in the buffer \a utf8_str (this is not the same as the number of code units).
-
-	\return
-		-  0 if the specified sub-strings are equal
-		- <0 if specified sub-strings are lexicographically smaller than \a utf8_str
-		- >0 if specified sub-strings are lexicographically greater than \a utf8_str
-
-	\exception std::out_of_range	Thrown if \a idx is invalid.
-	\exception std::length_error	Thrown if \a str_cplen is set to npos.
-	*/
-	int		compare(size_type idx, size_type len, const utf8* utf8_str, size_type str_cplen) const
-	{
-		if (d_cplength < idx)
-			throw std::out_of_range("Index is out of range for CEGUI::String");
-
-		if (str_cplen == npos)
-			throw std::length_error("Length for utf8 encoded string can not be 'npos'");
-
-		if ((len == npos) || (idx + len > d_cplength))
-			len = d_cplength - idx;
-
-		int val = (len == 0) ? 0 : utf32_comp_utf8(&ptr()[idx], utf8_str, (len < str_cplen) ? len : str_cplen);
-
-		return (val != 0) ? ((val < 0) ? -1 : 1) : (len < str_cplen) ? -1 : (len == str_cplen) ? 0 : 1;
-	}
-
-
-	/*!
-	\brief
-		Compares this String with the given c-string.
-
-	\note
-		This does currently not properly consider Unicode and / or the system locale.
-
-	\param c_str
-		The c-string that is to compared with this String.
-
-	\return
-		-  0 if the strings are equal
-		- <0 if this string is lexicographically smaller than \a c_str
-		- >0 if this string is lexicographically greater than \a c_str
-	*/
-	int		compare(const char* cstr) const
-	{
-		return compare(0, d_cplength, cstr, strlen(cstr));
-	}
-
-
-	/*!
-	\brief
-		Compares code points from this String with the given c-string.
-
-	\note
-		This does currently not properly consider Unicode and / or the system locale.
-
-	\param idx
-		Index of the first code point from this String to consider.
-
-	\param len
-		Maximum number of code points from this String to consider.
-
-	\param c_str
-		The c-string that is to compared with this String.
-
-	\return
-		-  0 if the specified sub-strings are equal
-		- <0 if specified sub-strings are lexicographically smaller than \a c_str
-		- >0 if specified sub-strings are lexicographically greater than \a c_str
-
-	\exception std::out_of_range	Thrown if \a idx is invalid.
-	*/
-	int		compare(size_type idx, size_type len, const char* cstr) const
-	{
-		return compare(idx, len, cstr, strlen(cstr));
-	}
-
-
-	/*!
-	\brief
-		Compares code points from this String with chars in the given char array.
-
-	\note
-		This does currently not properly consider Unicode and / or the system locale.
-
-	\param idx
-		Index of the first code point from this String to consider.
-
-	\param len
-		Maximum number of code points from this String to consider.
-
-	\param chars
-		The array containing the chars that are to compared with this String.
-
-	\param chars_len
-		The number of chars in the array.
-
-	\return
-		-  0 if the specified sub-strings are equal
-		- <0 if specified sub-strings are lexicographically smaller than \a chars
-		- >0 if specified sub-strings are lexicographically greater than \a chars
-
-	\exception std::out_of_range	Thrown if \a idx is invalid.
-	\exception std::length_error	Thrown if \a chars_len is set to npos.
-	*/
-	int		compare(size_type idx, size_type len, const char* chars, size_type chars_len) const
-	{
-		if (d_cplength < idx)
-			throw std::out_of_range("Index is out of range for CEGUI::String");
-
-		if (chars_len == npos)
-			throw std::length_error("Length for char array can not be 'npos'");
-
-		if ((len == npos) || (idx + len > d_cplength))
-			len = d_cplength - idx;
-
-		int val = (len == 0) ? 0 : utf32_comp_char(&ptr()[idx], chars, (len < chars_len) ? len : chars_len);
-
-		return (val != 0) ? ((val < 0) ? -1 : 1) : (len < chars_len) ? -1 : (len == chars_len) ? 0 : 1;
-	}
-
-
-	//////////////////////////////////////////////////////////////////////////
-	// Character access
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Returns the code point at the given index.
-
-	\param idx
-		Zero based index of the code point to be returned.
-
-	\note
-		- For constant strings length()/size() provide a valid index and will access the default utf32 value.
-		- For non-constant strings length()/size() is an invalid index, and acceesing (especially writing) this index could cause string corruption.
-
-	\return
-		The utf32 code point at the given index within the String.
-	*/
-	reference	operator[](size_type idx)
-	{
-		return (ptr()[idx]);
-	}
-
-	/*!
-	\brief
-		Returns the code point at the given index.
-
-	\param idx
-		Zero based index of the code point to be returned.
-
-	\note
-		- For constant strings length()/size() provide a valid index and will access the default utf32 value.
-		- For non-constant strings length()/size() is an invalid index, and acceesing (especially writing) this index could cause string corruption.
-
-	\return
-		The utf32 code point at the given index within the String.
-	*/
-	value_type	operator[](size_type idx) const
-	{
-		return ptr()[idx];
-	}
-
-	/*!
-	\brief
-		Returns the code point at the given index.
-
-	\param idx
-		Zero based index of the code point to be returned.
-
-	\return
-		The utf32 code point at the given index within the String.
-
-	\exception std::out_of_range	Thrown if \a idx is >= length().
-	*/
-	reference	at(size_type idx)
-	{
-		if (d_cplength <= idx)
-			throw std::out_of_range("Index is out of range for CEGUI::String");
-
-		return ptr()[idx];
-	}
-
-	/*!
-	\brief
-		Returns the code point at the given index.
-
-	\param idx
-		Zero based index of the code point to be returned.
-
-	\return
-		The utf32 code point at the given index within the String.
-
-	\exception std::out_of_range	Thrown if \a idx is >= length().
-	*/
-	const_reference	at(size_type idx) const
-	{
-		if (d_cplength <= idx)
-			throw std::out_of_range("Index is out of range for CEGUI::String");
-
-		return ptr()[idx];
-	}
-
-
-	//////////////////////////////////////////////////////////////////////////
-	// C-Strings and arrays
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Returns contents of the String as a null terminated string of utf8 encoded data.
-
-	\return
-		Pointer to a char buffer containing the contents of the String encoded as null-terminated utf8 data.
-
-	\note
-		The buffer returned from this function is owned by the String object.
-
-	\note
-		Any function that modifies the String data will invalidate the buffer returned by this call.
-	*/
-	const char* c_str(void) const
-	{
-		return (const char*)build_utf8_buff();
-	}
-
-	/*!
-	\brief
-		Returns contents of the String as utf8 encoded data.
-
-	\return
-		Pointer to a buffer containing the contents of the String encoded utf8 data.
-
-	\note
-		The buffer returned from this function is owned by the String object.
-
-	\note
-		Any function that modifies the String data will invalidate the buffer returned by this call.
-	*/
-	const utf8* data(void) const
-	{
-		return build_utf8_buff();
-	}
-
-    /*!
-    \brief
-        Returns a pointer to the buffer in use.
-    */
-	utf32*	ptr(void)
-	{
-		return (d_reserve > STR_QUICKBUFF_SIZE) ? d_buffer : d_quickbuff;
-	}
-
-	/*!
-    \brief
-        Returns a pointer to the buffer in use. (const version)
-    */
-	const utf32*	ptr(void) const
-	{
-		return (d_reserve > STR_QUICKBUFF_SIZE) ? d_buffer : d_quickbuff;
-	}
-
-	// copy, at most, 'len' code-points of the string, begining with code-point 'idx', into the array 'buf' as valid utf8 encoded data
-	// return number of utf8 code units placed into the buffer
-	/*!
-	\brief
-		Copies an area of the String into the provided buffer as encoded utf8 data.
-
-	\param buf
-		Pointer to a buffer that is to receive the encoded data (this must be big enough to hold the encoded data)
-
-	\param len
-		Maximum number of code points from the String that should be encoded into the buffer
-	
-	\param idx
-		Index of the first code point to be encoded into the buffer
-
-	\return
-		The number of utf8 encoded code units transferred to the buffer.
-
-		\note A code unit does not equal a code point.  A utf32 code point, when encoded as utf8, can occupy between 1 and 4 code units.
-
-	\exception std::out_of_range	Thrown if \a idx was invalid for this String.
-	*/
-	size_type	copy(utf8* buf, size_type len = npos, size_type idx = 0) const
-	{
-		if (d_cplength < idx)
-			throw std::out_of_range("Index is out of range for CEGUI::String");
-
-		if (len == npos)
-			len = d_cplength;
-
-		return encode(&ptr()[idx], buf, npos, len);
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// UTF8 Encoding length information
-	//////////////////////////////////////////////////////////////////////////
-	// return the number of bytes required to hold 'num' code-points, starting at code-point 'idx', of the the string when encoded as utf8 data.
-	/*!
-	\brief
-		Return the number of utf8 code units required to hold an area of the String when encoded as utf8 data
-
-	\param num
-		Maximum number of code points to consider when calculating utf8 encoded size.
-
-	\param idx
-		Index of the first code point to consider when calculating the utf8 encoded size
-
-	\return
-		The number of utf8 code units (bytes) required to hold the specified sub-string when encoded as utf8 data.
-
-	\exception std::out_of_range	Thrown if \a idx was invalid for this String.
-	*/
-	size_type	utf8_stream_len(size_type num = npos, size_type idx = 0) const
-	{
-		using namespace std;
-
-		if (d_cplength < idx)
-			throw out_of_range("Index was out of range for CEGUI::String object");
-
-		size_type	maxlen = d_cplength - idx;
-
-		return encoded_size(&ptr()[idx], ceguimin(num, maxlen));
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// Assignment Functions
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Assign the value of String \a str to this String
-
-	\param str
-		String object containing the string value to be assigned.
-
-	\return
-		This String after the assignment has happened
-	*/
-	String&	operator=(const String& str)
-	{
-		return assign(str);
-	}
-
-	/*!
-	\brief
-		Assign a sub-string of String \a str to this String
-
-	\param str
-		String object containing the string data to be assigned.
-
-	\param str_idx
-		Index of the first code point in \a str that is to be assigned
-
-	\param str_num
-		Maximum number of code points from \a str that are be be assigned
-
-	\return
-		This String after the assignment has happened
-
-	\exception std::out_of_range	Thrown if str_idx is invalid for \a str
-	*/
-	String&	assign(const String& str, size_type str_idx = 0, size_type str_num = npos)
-	{
-		if (str.d_cplength < str_idx)
-			throw std::out_of_range("Index was out of range for CEGUI::String object");
-
-		if (str_num == npos)
-			str_num = str.d_cplength - str_idx;
-
-		grow(str_num);
-		setlen(str_num);
-		memcpy(ptr(), &str.ptr()[str_idx], str_num * sizeof(utf32));
-		
-		return *this;
-	}
-
-	/*!
-	\brief
-		Assign the value of std::string \a std_str to this String
-
-	\note
-		The characters of \a std_str are taken to be unencoded data which represent Unicode code points 0x00..0xFF.  No translation of
-		the provided data will occur.
-
-	\param std_str
-		std::string object containing the string value to be assigned.
-
-	\return
-		This String after the assignment has happened
-
-	\exception std::length_error	Thrown if the resulting String would have been too large.
-	*/
-	String&	operator=(const std::string& std_str)
-	{
-		return assign(std_str);
-	}
-
-	/*!
-	\brief
-		Assign a sub-string of std::string \a std_str to this String
-
-	\note
-		The characters of \a std_str are taken to be unencoded data which represent Unicode code points 0x00..0xFF.  No translation of
-		the provided data will occur.
-
-	\param std_str
-		std::string object containing the string value to be assigned.
-
-	\param str_idx
-		Index of the first character of \a std_str to be assigned
-
-	\param str_num
-		Maximum number of characters from \a std_str to be assigned
-
-	\return
-		This String after the assignment has happened
-
-	\exception std::out_of_range	Thrown if \a str_idx is invalid for \a std_str
-	\exception std::length_error	Thrown if the resulting String would have been too large.
-	*/
-	String&	assign(const std::string& std_str, size_type str_idx = 0, size_type str_num = npos)
-	{
-		if (std_str.size() < str_idx)
-			throw std::out_of_range("Index was out of range for std::string object");
-
-		if (str_num == npos)
-			str_num = (size_type)std_str.size() - str_idx;
-
-		grow(str_num);
-		setlen(str_num);
-
-		while(str_num--)
-		{
-			((*this)[str_num]) = static_cast<utf32>(static_cast<unsigned char>(std_str[str_num + str_idx]));
-		}
-
-		return *this;
-	}
-
-	/*!
-	\brief
-		Assign to this String the string value represented by the given null-terminated utf8 encoded data
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param utf8_str
-		Buffer containing valid null-terminated utf8 encoded data
-
-	\return
-		This String after the assignment has happened
-
-	\exception std::length_error	Thrown if the resulting String would have been too large.
-	*/
-	String&	operator=(const utf8* utf8_str)
-	{
-		return assign(utf8_str, utf_length(utf8_str));
-	}
-
-	/*!
-	\brief
-		Assign to this String the string value represented by the given null-terminated utf8 encoded data
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param utf8_str
-		Buffer containing valid null-terminated utf8 encoded data
-
-	\return
-		This String after the assignment has happened
-
-	\exception std::length_error	Thrown if the resulting String would have been too large.
-	*/
-	String&	assign(const utf8* utf8_str)
-	{
-		return assign(utf8_str, utf_length(utf8_str));
-	}
-
-	/*!
-	\brief
-		Assign to this String the string value represented by the given utf8 encoded data
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param utf8_str
-		Buffer containing valid utf8 encoded data
-
-	\param str_num
-		Number of code units (not code points) in the buffer pointed to by \a utf8_str
-
-	\return
-		This String after the assignment has happened
-
-	\exception std::length_error	Thrown if the resulting String would have been too large, or if str_num is 'npos'.
-	*/
-	String&	assign(const utf8* utf8_str, size_type str_num)
-	{
-		if (str_num == npos)
-			throw std::length_error("Length for utf8 encoded string can not be 'npos'");
-
-		size_type enc_sze = encoded_size(utf8_str, str_num);
-
-		grow(enc_sze);
-		encode(utf8_str, ptr(), d_reserve, str_num);
-		setlen(enc_sze);
-		return *this;
-	}
-
-	/*!
-	\brief
-		Assigns the specified utf32 code point to this String.  Result is always a String 1 code point in length.
-
-	\param code_point
-		Valid utf32 Unicode code point to be assigned to the string
-
-	\return
-		This String after assignment
-	*/
-	String&	operator=(utf32 code_point)
-	{
-		return assign(1, code_point);
-	}
-
-	/*!
-	\brief
-		Assigns the specified code point repeatedly to the String
-
-	\param num
-		The number of times to assign the code point
-
-	\param code_point
-		Valid utf32 Unicode code point to be assigned to the string
-
-	\return
-		This String after assignment.
-
-	\exception std::length_error	Thrown if \a num was 'npos'
-	*/
-	String&	assign(size_type num, utf32 code_point)
-	{
-		if (num == npos)
-			throw std::length_error("Code point count can not be 'npos'");
-
-		grow(num);
-		setlen(num);
-		utf32* p = ptr();
-
-		while(num--)
-			*p++ = code_point;
-
-		return *this;
-	}
-
-
-	/*!
-	\brief
-		Assign to this String the given C-string.
-
-	\param c_str
-		Pointer to a valid C style string.
-
-	\return
-		This String after the assignment has happened
-
-	\exception std::length_error	Thrown if the resulting String would have been too large.
-	*/
-	String&	operator=(const char* cstr)
-	{
-		return assign(cstr, strlen(cstr));
-	}
-
-
-	/*!
-	\brief
-		Assign to this String the given C-string.
-
-	\param c_str
-		Pointer to a valid C style string.
-
-	\return
-		This String after the assignment has happened
-
-	\exception std::length_error	Thrown if the resulting String would have been too large.
-	*/
-	String&	assign(const char* cstr)
-	{
-		return assign(cstr, strlen(cstr));
-	}
-
-
-	/*!
-	\brief
-		Assign to this String a number of chars from a char array.
-
-	\param chars
-		char array.
-
-	\param chars_len
-		Number of chars to be assigned.
-
-	\return
-		This String after the assignment has happened
-
-	\exception std::length_error	Thrown if the resulting String would have been too large.
-	*/
-	String&	assign(const char* chars, size_type chars_len)
-	{
-		grow(chars_len);
-		utf32* pt = ptr();
-
-		for (size_type i = 0; i < chars_len; ++i)
-		{
-			*pt++ = static_cast<utf32>(static_cast<unsigned char>(*chars++));
-		}
-
-		setlen(chars_len);
-		return *this;
-	}
-
-
-	/*!
-	\brief
-		Swaps the value of this String with the given String \a str
-
-	\param str
-		String object whos value is to be swapped with this String.
-
-	\return
-		Nothing
-	*/
-	void	swap(String& str)
-	{
-		size_type	temp_len	= d_cplength;
-		d_cplength = str.d_cplength;
-		str.d_cplength = temp_len;
-
-		size_type	temp_res	= d_reserve;
-		d_reserve = str.d_reserve;
-		str.d_reserve = temp_res;
-
-		utf32*		temp_buf	= d_buffer;
-		d_buffer = str.d_buffer;
-		str.d_buffer = temp_buf;
-
-		// see if we need to swap 'quick buffer' data
-		if (temp_res <= STR_QUICKBUFF_SIZE)
-		{
-			utf32		temp_qbf[STR_QUICKBUFF_SIZE];
-
-			memcpy(temp_qbf, d_quickbuff, STR_QUICKBUFF_SIZE * sizeof(utf32));
-			memcpy(d_quickbuff, str.d_quickbuff, STR_QUICKBUFF_SIZE * sizeof(utf32));
-			memcpy(str.d_quickbuff, temp_qbf, STR_QUICKBUFF_SIZE * sizeof(utf32));
-		}
-
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// Appending Functions
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Appends the String \a str
-
-	\param str
-		String object that is to be appended
-
-	\return
-		This String after the append operation
-
-	\exception std::length_error	Thrown if resulting String would be too large.
-	*/
-	String&	operator+=(const String& str)
-	{
-		return append(str);
-	}
-
-	/*!
-	\brief
-		Appends a sub-string of the String \a str
-
-	\param str
-		String object containing data to be appended
-
-	\param str_idx
-		Index of the first code point to be appended
-
-	\param str_num
-		Maximum number of code points to be appended
-
-	\return
-		This String after the append operation
-
-	\exception std::out_of_range	Thrown if \a str_idx is invalid for \a str.
-	\exception std::length_error	Thrown if resulting String would be too large.
-	*/
-	String& append(const String& str, size_type str_idx = 0, size_type str_num = npos)
-	{
-		if (str.d_cplength < str_idx)
-			throw std::out_of_range("Index is out of range for CEGUI::String");
-
-		if (str_num == npos)
-			str_num = str.d_cplength - str_idx;
-
-		grow(d_cplength + str_num);
-		memcpy(&ptr()[d_cplength], &str.ptr()[str_idx], str_num * sizeof(utf32));
-		setlen(d_cplength + str_num);
-		return *this;
-	}
-
-
-	/*!
-	\brief
-		Appends the std::string \a std_str
-
-	\param std_str
-		std::string object that is to be appended
-
-	\note
-		The characters of \a std_str are taken to be unencoded data which represent Unicode code points 0x00..0xFF.  No translation of
-		the provided data will occur.
-
-	\return
-		This String after the append operation
-
-	\exception std::length_error	Thrown if resulting String would be too large.
-	*/
-	String&	operator+=(const std::string& std_str)
-	{
-		return append(std_str);
-	}
-
-	/*!
-	\brief
-		Appends a sub-string of the std::string \a std_str
-
-	\param std_str
-		std::string object containing data to be appended
-
-	\note
-		The characters of \a std_str are taken to be unencoded data which represent Unicode code points 0x00..0xFF.  No translation of
-		the provided data will occur.
-
-	\param str_idx
-		Index of the first character to be appended
-
-	\param str_num
-		Maximum number of characters to be appended
-
-	\return
-		This String after the append operation
-
-	\exception std::out_of_range	Thrown if \a str_idx is invalid for \a std_str.
-	\exception std::length_error	Thrown if resulting String would be too large.
-	*/
-	String& append(const std::string& std_str, size_type str_idx = 0, size_type str_num = npos)
-	{
-		if (std_str.size() < str_idx)
-			throw std::out_of_range("Index is out of range for std::string");
-
-		if (str_num == npos)
-			str_num = (size_type)std_str.size() - str_idx;
-
-		size_type newsze = d_cplength + str_num;
-
-		grow(newsze);
-		utf32* pt = &ptr()[newsze-1];
-
-		while(str_num--)
-			*pt-- = static_cast<utf32>(static_cast<unsigned char>(std_str[str_num]));
-
-		setlen(newsze);
-		return *this;
-	}
-
-
-	/*!
-	\brief
-		Appends to the String the null-terminated utf8 encoded data in the buffer utf8_str.
-
-	\param utf8_str
-		buffer holding the null-terminated utf8 encoded data that is to be appended
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\return
-		This String after the append operation
-
-	\exception std::length_error	Thrown if resulting String would be too large.
-	*/
-	String&	operator+=(const utf8* utf8_str)
-	{
-		return append(utf8_str, utf_length(utf8_str));
-	}
-
-	/*!
-	\brief
-		Appends to the String the null-terminated utf8 encoded data in the buffer utf8_str.
-
-	\param utf8_str
-		Buffer holding the null-terminated utf8 encoded data that is to be appended
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\return
-		This String after the append operation
-
-	\exception std::length_error	Thrown if resulting String would be too large.
-	*/
-	String& append(const utf8* utf8_str)
-	{
-		return append(utf8_str, utf_length(utf8_str));
-	}
-
-
-	/*!
-	\brief
-		Appends to the String the utf8 encoded data in the buffer utf8_str.
-
-	\param utf8_str
-		Buffer holding the utf8 encoded data that is to be appended
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param len
-		Number of code units (not code points) in the buffer to be appended
-
-	\return
-		This String after the append operation
-
-	\exception std::length_error	Thrown if resulting String would be too large, or if \a len was 'npos'
-	*/
-	String& append(const utf8* utf8_str, size_type len)
-	{
-		if (len == npos)
-			throw std::length_error("Length for utf8 encoded string can not be 'npos'");
-
-		size_type encsz = encoded_size(utf8_str, len);
-		size_type newsz = d_cplength + encsz;
-
-		grow(newsz);
-		encode(utf8_str, &ptr()[d_cplength], encsz, len);
-		setlen(newsz);
-
-		return *this;
-	}
-
-
-	/*!
-	\brief
-		Appends a single code point to the string
-
-	\param code_point
-		utf32 Unicode code point that is to be appended
-
-	\return
-		This String after the append operation
-
-	\exception std::length_error	Thrown if resulting String would be too long.
-	*/
-	String& operator+=(utf32 code_point)
-	{
-		return append(1, code_point);
-	}
-
-	/*!
-	\brief
-		Appends a single code point multiple times to the string
-
-	\param num
-		Number of copies of the code point to be appended
-
-	\param code_point
-		utf32 Unicode code point that is to be appended
-
-	\return
-		This String after the append operation
-
-	\exception std::length_error	Thrown if resulting String would be too long, or if \a num was 'npos'.
-	*/
-	String& append(size_type num, utf32 code_point)
-	{
-		if (num == npos)
-			throw std::length_error("Code point count can not be 'npos'");
-
-		size_type newsz = d_cplength + num;
-		grow(newsz);
-
-		utf32* p = &ptr()[d_cplength];
-
-		while(num--)
-			*p++ = code_point;
-
-		setlen(newsz);
-
-		return *this;
-	}
-
-	/*!
-	\brief
-		Appends a single code point to the string
-
-	\param code_point
-		utf32 Unicode code point that is to be appended
-
-	\return
-		Nothing
-
-	\exception std::length_error	Thrown if resulting String would be too long.
-	*/
-	void	push_back(utf32 code_point)
-	{
-		append(1, code_point);
-	}
-
-	/*!
-	\brief
-		Appends the code points in the reange [beg, end)
-
-	\param beg
-		Iterator describing the start of the range to be appended
-
-	\param end
-		Iterator describing the (exclusive) end of the range to be appended.
-
-	\return
-		This String after the append operation
-
-	\exception std::length_error	Thrown if the resulting string would be too large.
-	*/
-	String&	append(const_iterator iter_beg, const_iterator iter_end)
-	{
-		return replace(end(), end(), iter_beg, iter_end);
-	}
-
-
-	/*!
-	\brief
-		Appends to the String the given c-string.
-
-	\param c_str
-		c-string that is to be appended.
-
-	\return
-		This String after the append operation
-
-	\exception std::length_error	Thrown if resulting String would be too large.
-	*/
-	String&	operator+=(const char* cstr)
-	{
-		return append(cstr, strlen(cstr));
-	}
-
-
-	/*!
-	\brief
-		Appends to the String the given c-string.
-
-	\param c_str
-		c-string that is to be appended.
-
-	\return
-		This String after the append operation
-
-	\exception std::length_error	Thrown if resulting String would be too large.
-	*/
-	String& append(const char* cstr)
-	{
-		return append(cstr, strlen(cstr));
-	}
-
-
-	/*!
-	\brief
-		Appends to the String chars from the given char array.
-
-	\param chars
-		char array holding the chars that are to be appended
-
-	\param chars_len
-		Number of chars to be appended
-
-	\return
-		This String after the append operation
-
-	\exception std::length_error	Thrown if resulting String would be too large, or if \a chars_len was 'npos'
-	*/
-	String& append(const char* chars, size_type chars_len)
-	{
-		if (chars_len == npos)
-			throw std::length_error("Length for char array can not be 'npos'");
-
-		size_type newsz = d_cplength + chars_len;
-
-		grow(newsz);
-
-		utf32* pt = &ptr()[newsz-1];
-
-		while(chars_len--)
-			*pt-- = static_cast<utf32>(static_cast<unsigned char>(chars[chars_len]));
-
-		setlen(newsz);
-
-		return *this;
-	}
-
-
-	//////////////////////////////////////////////////////////////////////////
-	// Insertion Functions
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Inserts the given String object at the specified position.
-
-	\param idx
-		Index where the string is to be inserted.
-
-	\param str
-		String object that is to be inserted.
-
-	\return
-		This String after the insert.
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	\exception std::length_error	Thrown if resulting String would be too large.
-	*/
-	String&	insert(size_type idx, const String& str)
-	{
-		return insert(idx, str, 0, npos);
-	}
-
-	/*!
-	\brief
-		Inserts a sub-string of the given String object at the specified position.
-
-	\param idx
-		Index where the string is to be inserted.
-
-	\param str
-		String object containing data to be inserted.
-
-	\param str_idx
-		Index of the first code point from \a str to be inserted.
-
-	\param str_num
-		Maximum number of code points from \a str to be inserted.
-
-	\return
-		This String after the insert.
-
-	\exception std::out_of_range	Thrown if \a idx or \a str_idx are out of range.
-	\exception std::length_error	Thrown if resulting String would be too large.
-	*/
-	String& insert(size_type idx, const String& str, size_type str_idx, size_type str_num)
-	{
-		if ((d_cplength < idx) || (str.d_cplength < str_idx))
-			throw std::out_of_range("Index is out of range for CEGUI::String");
-
-		if (str_num == npos)
-			str_num = str.d_cplength - str_idx;
-
-		size_type newsz = d_cplength + str_num;
-		grow(newsz);
-		memmove(&ptr()[idx + str_num], &ptr()[idx], (d_cplength - idx) * sizeof(utf32));
-		memcpy(&ptr()[idx], &str.ptr()[str_idx], str_num * sizeof(utf32));
-		setlen(newsz);
-
-		return *this;
-	}
-
-	/*!
-	\brief
-		Inserts the given std::string object at the specified position.
-
-	\param idx
-		Index where the std::string is to be inserted.
-
-	\param std_str
-		std::string object that is to be inserted.
-
-	\note
-		The characters of \a std_str are taken to be unencoded data which represent Unicode code points 0x00..0xFF.  No translation of
-		the provided data will occur.
-
-	\return
-		This String after the insert.
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	\exception std::length_error	Thrown if resulting String would be too large.
-	*/
-	String&	insert(size_type idx, const std::string& std_str)
-	{
-		return insert(idx, std_str, 0, npos);
-	}
-
-	/*!
-	\brief
-		Inserts a sub-string of the given std::string object at the specified position.
-
-	\param idx
-		Index where the string is to be inserted.
-
-	\param std_str
-		std::string object containing data to be inserted.
-
-	\note
-		The characters of \a std_str are taken to be unencoded data which represent Unicode code points 0x00..0xFF.  No translation of
-		the provided data will occur.
-
-	\param str_idx
-		Index of the first character from \a std_str to be inserted.
-
-	\param str_num
-		Maximum number of characters from \a str to be inserted.
-
-	\return
-		This String after the insert.
-
-	\exception std::out_of_range	Thrown if \a idx or \a str_idx are out of range.
-	\exception std::length_error	Thrown if resulting String would be too large.
-	*/
-	String& insert(size_type idx, const std::string& std_str, size_type str_idx, size_type str_num)
-	{
-		if (d_cplength < idx)
-			throw std::out_of_range("Index is out of range for CEGUI::String");
-
-		if (std_str.size() < str_idx)
-			throw std::out_of_range("Index is out of range for std::string");
-
-		if (str_num == npos)
-			str_num = (size_type)std_str.size() - str_idx;
-
-		size_type newsz = d_cplength + str_num;
-		grow(newsz);
-
-		memmove(&ptr()[idx + str_num], &ptr()[idx], (d_cplength - idx) * sizeof(utf32));
-
-		utf32* pt = &ptr()[idx + str_num - 1];
-		
-		while(str_num--)
-			*pt-- = static_cast<utf32>(static_cast<unsigned char>(std_str[str_idx + str_num]));
-
-		setlen(newsz);
-
-		return *this;
-	}
-
-	/*!
-	\brief
-		Inserts the given null-terminated utf8 encoded data at the specified position.
-
-	\param idx
-		Index where the data is to be inserted.
-
-	\param utf8_str
-		Buffer containing the null-terminated utf8 encoded data that is to be inserted.
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\return
-		This String after the insert.
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	\exception std::length_error	Thrown if resulting String would be too large.
-	*/
-	String&	insert(size_type idx, const utf8* utf8_str)
-	{
-		return insert(idx, utf8_str, utf_length(utf8_str));
-	}
-
-	/*!
-	\brief
-		Inserts the given utf8 encoded data at the specified position.
-
-	\param idx
-		Index where the data is to be inserted.
-
-	\param utf8_str
-		Buffer containing the utf8 encoded data that is to be inserted.
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param len
-		Length of the data to be inserted in uf8 code units (not code points)
-
-	\return
-		This String after the insert.
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	\exception std::length_error	Thrown if resulting String would be too large, or if \a len is 'npos'
-	*/
-	String& insert(size_type idx, const utf8* utf8_str, size_type len)
-	{
-		if (d_cplength < idx)
-			throw std::out_of_range("Index is out of range for CEGUI::String");
-
-		if (len == npos)
-			throw std::length_error("Length of utf8 encoded string can not be 'npos'");
-
-		size_type encsz = encoded_size(utf8_str, len);
-		size_type newsz = d_cplength + encsz;
-
-		grow(newsz);
-		memmove(&ptr()[idx + encsz], &ptr()[idx], (d_cplength - idx) * sizeof(utf32));
-		encode(utf8_str, &ptr()[idx], encsz, len);
-		setlen(newsz);
-
-		return *this;
-	}
-
-	/*!
-	\brief
-		Inserts a code point multiple times into the String
-
-	\param idx
-		Index where the code point(s) are to be inserted
-
-	\param num
-		The number of times to insert the code point
-
-	\param code_point
-		The utf32 code point that is to be inserted
-
-	\return
-		This String after the insertion.
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	\exception std::length_error	Thrown if resulting String would be too large, or if \a num is 'npos'
-	*/
-	String& insert(size_type idx, size_type num, utf32 code_point)
-	{
-		if (d_cplength < idx)
-			throw std::out_of_range("Index is out of range for CEGUI::String");
-
-		if (num == npos)
-			throw std::length_error("Code point count can not be 'npos'");
-
-		size_type newsz = d_cplength + num;
-		grow(newsz);
-
-		memmove(&ptr()[idx + num], &ptr()[idx], (d_cplength - idx) * sizeof(utf32));
-
-		utf32* pt = &ptr()[idx + num - 1];
-
-		while(num--)
-			*pt-- = code_point;
-
-		setlen(newsz);
-
-		return *this;
-	}
-
-	/*!
-	\brief
-		Inserts a code point multiple times into the String
-
-	\param pos
-		Iterator describing the position where the code point(s) are to be inserted
-
-	\param num
-		The number of times to insert the code point
-
-	\param code_point
-		The utf32 code point that is to be inserted
-
-	\return
-		This String after the insertion.
-
-	\exception std::length_error	Thrown if resulting String would be too large, or if \a num is 'npos'
-	*/
-	void insert(iterator pos, size_type num, utf32 code_point)
-	{
-		insert(safe_iter_dif(pos, begin()), num, code_point);
-	}
-
-	/*!
-	\brief
-		Inserts a single code point into the String
-
-	\param pos
-		Iterator describing the position where the code point is to be inserted
-
-	\param code_point
-		The utf32 code point that is to be inserted
-
-	\return
-		This String after the insertion.
-
-	\exception std::length_error	Thrown if resulting String would be too large.
-	*/
-	iterator insert(iterator pos, utf32 code_point)
-	{
-		insert(pos, 1, code_point);
-		return pos;
-	}
-
-	/*!
-	\brief
-		Inserts code points specified by the range [beg, end).
-
-	\param pos
-		Iterator describing the position where the data is to be inserted
-
-	\param beg
-		Iterator describing the begining of the range to be inserted
-
-	\param end
-		Iterator describing the (exclusive) end of the range to be inserted.
-
-	\return
-		Nothing.
-
-	\exception std::length_error	Thrown if resulting String would be too large.
-	*/
-	void	insert(iterator iter_pos, const_iterator iter_beg, const_iterator iter_end)
-	{
-		replace(iter_pos, iter_pos, iter_beg, iter_end);
-	}
-
-
-	/*!
-	\brief
-		Inserts the given c-string at the specified position.
-
-	\param idx
-		Index where the c-string is to be inserted.
-
-	\param c_str
-		c-string that is to be inserted.
-
-	\return
-		This String after the insert.
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	\exception std::length_error	Thrown if resulting String would be too large.
-	*/
-	String&	insert(size_type idx, const char* cstr)
-	{
-		return insert(idx, cstr, strlen(cstr));
-	}
-
-
-	/*!
-	\brief
-		Inserts chars from the given char array at the specified position.
-
-	\param idx
-		Index where the data is to be inserted.
-
-	\param chars
-		char array containing the chars that are to be inserted.
-
-	\param chars_len
-		Length of the char array to be inserted.
-
-	\return
-		This String after the insert.
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	\exception std::length_error	Thrown if resulting String would be too large, or if \a chars_len is 'npos'
-	*/
-	String& insert(size_type idx, const char* chars, size_type chars_len)
-	{
-		if (d_cplength < idx)
-			throw std::out_of_range("Index is out of range for CEGUI::String");
-
-		if (chars_len == npos)
-			throw std::length_error("Length of char array can not be 'npos'");
-
-		size_type newsz = d_cplength + chars_len;
-
-		grow(newsz);
-		memmove(&ptr()[idx + chars_len], &ptr()[idx], (d_cplength - idx) * sizeof(utf32));
-
-		utf32* pt = &ptr()[idx + chars_len - 1];
-
-		while(chars_len--)
-			*pt-- = static_cast<utf32>(static_cast<unsigned char>(chars[chars_len]));
-
-		setlen(newsz);
-
-		return *this;
-	}
-
-
-	//////////////////////////////////////////////////////////////////////////
-	// Erasing characters
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Removes all data from the String
-
-	\return
-		Nothing
-	*/
-	void	clear(void)
-	{
-		setlen(0);
-		trim();
-	}
-
-	/*!
-	\brief
-		Removes all data from the String
-
-	\return
-		The empty String (*this)
-	*/
-	String& erase(void)
-	{
-		clear();
-		return *this;
-	}
-
-	/*!
-	\brief
-		Erase a single code point from the string
-
-	\param idx
-		The index of the code point to be removed.
-
-	\return
-		This String after the erase operation
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	*/
-	String&	erase(size_type idx)
-	{
-		return erase(idx, 1);
-	}
-
-	/*!
-	\brief
-		Erase a range of code points
-
-	\param idx
-		Index of the first code point to be removed.
-
-	\param len
-		Maximum number of code points to be removed.
-
-	\return
-		This String after the erase operation.
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	*/
-	String& erase(size_type idx, size_type len = npos)
-	{
-		if (d_cplength < idx)
-			throw std::out_of_range("Index is out of range foe CEGUI::String");
-
-		if (len == npos)
-			len = d_cplength - idx;
-
-		size_type newsz = d_cplength - len;
-
-		memmove(&ptr()[idx], &ptr()[idx + len], (d_cplength - idx - len) * sizeof(utf32));
-		setlen(newsz);
-		return	*this;
-	}
-
-	/*!
-	\brief
-		Erase the code point described by the given iterator
-
-	\param pos
-		Iterator describing the code point to be erased
-
-	\return
-		This String after the erase operation.
-	*/
-	String& erase(iterator pos)
-	{
-		return erase(safe_iter_dif(pos, begin()), 1);
-	}
-
-	/*!
-	\brief
-		Erase a range of code points described by the iterators [beg, end).
-
-	\param beg
-		Iterator describing the postion of the beginning of the range to erase
-
-	\param end
-		Iterator describing the postion of the (exclusive) end of the range to erase
-
-	\return
-		This String after the erase operation.
-	*/
-	String& erase(iterator iter_beg, iterator iter_end)
-	{
-		return erase(safe_iter_dif(iter_beg, begin()), safe_iter_dif(iter_end, iter_beg));
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// Resizing
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Resizes the String either by inserting default utf32 code points to make it larger, or by truncating to make it smaller
-
-	\param num
-		The length, in code points, that the String is to be made.
-
-	\return
-		Nothing.
-
-	\exception std::length_error	Thrown if the String would be too large.
-	*/
-	void	resize(size_type num)
-	{
-		resize(num, utf32());
-	}
-
-	/*!
-	\brief
-		Resizes the String either by inserting the given utf32 code point to make it larger, or by truncating to make it smaller
-
-	\param num
-		The length, in code points, that the String is to be made.
-
-	\param code_point
-		The utf32 code point that should be used when majing the String larger
-
-	\return
-		Nothing.
-
-	\exception std::length_error	Thrown if the String would be too large.
-	*/
-	void	resize(size_type num, utf32 code_point)
-	{
-		if (num < d_cplength)
-		{
-			setlen(num);
-		}
-		else
-		{
-			append(num - d_cplength, code_point);
-		}
-
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// Replacing Characters
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Replace code points in the String with the specified String object
-
-	\param idx
-		Index of the first code point to be replaced
-
-	\param len
-		Maximum number of code points to be replaced (if this is 0, operation is an insert at position \a idx)
-
-	\param str
-		The String object that is to replace the specified code points
-
-	\return
-		This String after the replace operation
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String
-	\exception std::length_error	Thrown if the resulting String would be too large.
-	*/
-	String& replace(size_type idx, size_type len, const String& str)
-	{
-		return replace(idx, len, str, 0, npos);
-	}
-
-	/*!
-	\brief
-		Replace the code points in the range [beg, end) with the specified String object
-
-	\note
-		If \a beg == \a end, the operation is a insert at iterator position \a beg
-
-	\param beg
-		Iterator describing the start of the range to be replaced
-
-	\param end
-		Iterator describing the (exclusive) end of the range to be replaced.
-
-	\param str
-		The String object that is to replace the specified range of code points
-
-	\return
-		This String after the replace operation
-
-	\exception std::length_error	Thrown if the resulting String would be too large.
-	*/
-	String& replace(iterator iter_beg, iterator iter_end, const String& str)
-	{
-		return replace(safe_iter_dif(iter_beg, begin()), safe_iter_dif(iter_end, iter_beg), str, 0, npos);
-	}
-
-	/*!
-	\brief
-		Replace code points in the String with a specified sub-string of a given String object.
-
-	\param idx
-		Index of the first code point to be replaced
-
-	\param len
-		Maximum number of code points to be replaced.  If this is 0, the operation is an insert at position \a idx.
-
-	\param str
-		String object containing the data that will replace the specified range of code points
-
-	\param str_idx
-		Index of the first code point of \a str that is to replace the specified code point range
-
-	\param str_num
-		Maximum number of code points of \a str that are to replace the specified code point range
-
-	\return
-		This String after the replace operation
-
-	\exception std::out_of_range	Thrown if either \a idx, or \a str_idx are invalid
-	\exception std::length_error	Thrown if the resulting String would have been too large.
-	*/
-	String& replace(size_type idx, size_type len, const String& str, size_type str_idx, size_type str_num)
-	{
-		if ((d_cplength < idx) || (str.d_cplength < str_idx))
-			throw std::out_of_range("Index is out of range for CEGUI::String");
-
-		if (((str_idx + str_num) > str.d_cplength) || (str_num == npos))
-			str_num = str.d_cplength - str_idx;
-
-		if (((len + idx) > d_cplength) || (len == npos))
-			len = d_cplength - idx;
-
-		size_type newsz = d_cplength + str_num - len;
-
-		grow(newsz);
-
-		if ((idx + len) < d_cplength)
-			memmove(&ptr()[idx + str_num], &ptr()[len + idx], (d_cplength - idx - len) * sizeof(utf32));
-
-		memcpy(&ptr()[idx], &str.ptr()[str_idx], str_num * sizeof(utf32));
-		setlen(newsz);
-
-		return *this;
-	}
-
-
-	/*!
-	\brief
-		Replace code points in the String with the specified std::string object
-
-	\param idx
-		Index of the first code point to be replaced
-
-	\param len
-		Maximum number of code points to be replaced (if this is 0, operation is an insert at position \a idx)
-
-	\param std_str
-		The std::string object that is to replace the specified code points
-
-	\note
-		Characters from \a std_str are considered to represent Unicode code points in the range 0x00..0xFF.  No translation of
-		the encountered data is performed.
-
-	\return
-		This String after the replace operation
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String
-	\exception std::length_error	Thrown if the resulting String would be too large.
-	*/
-	String& replace(size_type idx, size_type len, const std::string& std_str)
-	{
-		return replace(idx, len, std_str, 0, npos);
-	}
-
-	/*!
-	\brief
-		Replace the code points in the range [beg, end) with the specified std::string object
-
-	\note
-		If \a beg == \a end, the operation is a insert at iterator position \a beg
-
-	\param beg
-		Iterator describing the start of the range to be replaced
-
-	\param end
-		Iterator describing the (exclusive) end of the range to be replaced.
-
-	\param std_str
-		The std::string object that is to replace the specified range of code points
-
-	\note
-		Characters from \a std_str are considered to represent Unicode code points in the range 0x00..0xFF.  No translation of
-		the encountered data is performed.
-
-	\return
-		This String after the replace operation
-
-	\exception std::length_error	Thrown if the resulting String would be too large.
-	*/
-	String& replace(iterator iter_beg, iterator iter_end, const std::string& std_str)
-	{
-		return replace(safe_iter_dif(iter_beg, begin()), safe_iter_dif(iter_end, iter_beg), std_str, 0, npos);
-	}
-
-	/*!
-	\brief
-		Replace code points in the String with a specified sub-string of a given std::string object.
-
-	\param idx
-		Index of the first code point to be replaced
-
-	\param len
-		Maximum number of code points to be replaced.  If this is 0, the operation is an insert at position \a idx.
-
-	\param std_str
-		std::string object containing the data that will replace the specified range of code points
-
-	\note
-		Characters from \a std_str are considered to represent Unicode code points in the range 0x00..0xFF.  No translation of
-		the encountered data is performed.
-
-	\param str_idx
-		Index of the first code point of \a std_str that is to replace the specified code point range
-
-	\param str_num
-		Maximum number of code points of \a std_str that are to replace the specified code point range
-
-	\return
-		This String after the replace operation
-
-	\exception std::out_of_range	Thrown if either \a idx, or \a str_idx are invalid
-	\exception std::length_error	Thrown if the resulting String would have been too large.
-	*/
-	String& replace(size_type idx, size_type len, const std::string& std_str, size_type str_idx, size_type str_num)
-	{
-		if (d_cplength < idx)
-			throw std::out_of_range("Index is out of range for CEGUI::String");
-
-		if (std_str.size() < str_idx)
-			throw std::out_of_range("Index is out of range for std::string");
-
-		if (((str_idx + str_num) > std_str.size()) || (str_num == npos))
-			str_num = (size_type)std_str.size() - str_idx;
-
-		if (((len + idx) > d_cplength) || (len == npos))
-			len = d_cplength - idx;
-
-		size_type newsz = d_cplength + str_num - len;
-
-		grow(newsz);
-
-		if ((idx + len) < d_cplength)
-			memmove(&ptr()[idx + str_num], &ptr()[len + idx], (d_cplength - idx - len) * sizeof(utf32));
-
-		utf32* pt = &ptr()[idx + str_num - 1];
-
-		while (str_num--)
-			*pt-- = static_cast<utf32>(static_cast<unsigned char>(std_str[str_idx + str_num]));
-
-		setlen(newsz);
-
-		return *this;
-	}
-
-
-	/*!
-	\brief
-		Replace code points in the String with the specified null-terminated utf8 encoded data.
-
-	\param idx
-		Index of the first code point to be replaced
-
-	\param len
-		Maximum number of code points to be replaced (if this is 0, operation is an insert at position \a idx)
-
-	\param utf8_str
-		Buffer containing the null-terminated utf8 encoded data that is to replace the specified code points
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\return
-		This String after the replace operation
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String
-	\exception std::length_error	Thrown if the resulting String would be too large.
-	*/
-	String& replace(size_type idx, size_type len, const utf8* utf8_str)
-	{
-		return replace(idx, len, utf8_str, utf_length(utf8_str));
-	}
-
-	/*!
-	\brief
-		Replace the code points in the range [beg, end) with the specified null-terminated utf8 encoded data.
-
-	\note
-		If \a beg == \a end, the operation is a insert at iterator position \a beg
-
-	\param beg
-		Iterator describing the start of the range to be replaced
-
-	\param end
-		Iterator describing the (exclusive) end of the range to be replaced.
-
-	\param utf8_str
-		Buffer containing the null-terminated utf8 encoded data that is to replace the specified range of code points
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\return
-		This String after the replace operation
-
-	\exception std::length_error	Thrown if the resulting String would be too large.
-	*/
-	String& replace(iterator iter_beg, iterator iter_end, const utf8* utf8_str)
-	{
-		return replace(iter_beg, iter_end, utf8_str, utf_length(utf8_str));
-	}
-
-	/*!
-	\brief
-		Replace code points in the String with the specified utf8 encoded data.
-
-	\param idx
-		Index of the first code point to be replaced
-
-	\param len
-		Maximum number of code points to be replaced (if this is 0, operation is an insert at position \a idx)
-
-	\param utf8_str
-		Buffer containing the null-terminated utf8 encoded data that is to replace the specified code points
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param str_len
-		Length of the utf8 encoded data in utf8 code units (not code points).
-
-	\return
-		This String after the replace operation
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String
-	\exception std::length_error	Thrown if the resulting String would be too large, or if \a str_len was 'npos'.
-	*/
-	String& replace(size_type idx, size_type len, const utf8* utf8_str, size_type str_len)
-	{
-		if (d_cplength < idx)
-			throw std::out_of_range("Index is out of range for CEGUI::String");
-
-		if (str_len == npos)
-			throw std::length_error("Length for utf8 encoded string can not be 'npos'");
-
-		if (((len + idx) > d_cplength) || (len == npos))
-			len = d_cplength - idx;
-
-		size_type encsz = encoded_size(utf8_str, str_len);
-		size_type newsz = d_cplength + encsz - len;
-
-		grow(newsz);
-
-		if ((idx + len) < d_cplength)
-			memmove(&ptr()[idx + encsz], &ptr()[len + idx], (d_cplength - idx - len) * sizeof(utf32));
-
-		encode(utf8_str, &ptr()[idx], encsz, str_len);
-
-		setlen(newsz);
-		return *this;
-	}
-
-	/*!
-	\brief
-		Replace the code points in the range [beg, end) with the specified null-terminated utf8 encoded data.
-
-	\note
-		If \a beg == \a end, the operation is a insert at iterator position \a beg
-
-	\param beg
-		Iterator describing the start of the range to be replaced
-
-	\param end
-		Iterator describing the (exclusive) end of the range to be replaced.
-
-	\param utf8_str
-		Buffer containing the null-terminated utf8 encoded data that is to replace the specified range of code points
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param str_len
-		Length of the utf8 encoded data in utf8 code units (not code points).
-
-	\return
-		This String after the replace operation
-
-		\exception std::length_error	Thrown if the resulting String would be too large, or if \a str_len was 'npos'.
-	*/
-	String& replace(iterator iter_beg, iterator iter_end, const utf8* utf8_str, size_type str_len)
-	{
-		return replace(safe_iter_dif(iter_beg, begin()), safe_iter_dif(iter_end, iter_beg), utf8_str, str_len);
-	}
-
-	/*!
-	\brief
-		Replaces a specified range of code points with occurrences of a given code point
-
-	\param idx
-		Index of the first code point to be replaced
-
-	\param len
-		Maximum number of code points to replace.  If this is 0 the operation is an insert
-
-	\param num
-		Number of occurrences of \a code_point that are to replace the specified range of code points
-
-	\param code_point
-		Code point that is to be used when replacing the specified range of code points
-
-	\return
-		This String after the replace operation.
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String
-	\exception std::length_error	Thrown if resulting String would have been too long, or if \a num was 'npos'.
-	*/
-	String& replace(size_type idx, size_type len, size_type num, utf32 code_point)
-	{
-		if (d_cplength < idx)
-			throw std::out_of_range("Index is out of range for CEGUI::String");
-
-		if (num == npos)
-			throw std::length_error("Code point count can not be 'npos'");
-
-		if (((len + idx) > d_cplength) || (len == npos))
-			len = d_cplength - idx;
-
-		size_type newsz = d_cplength + num - len;
-
-		grow(newsz);
-
-		if ((idx + len) < d_cplength)
-			memmove(&ptr()[idx + num], &ptr()[len + idx], (d_cplength - idx - len) * sizeof(utf32));
-
-		utf32* pt = &ptr()[idx + num - 1];
-
-		while (num--)
-			*pt-- = code_point;
-
-		setlen(newsz);
-
-		return *this;
-	}
-
-	/*!
-	\brief
-		Replace the code points in the range [beg, end) with occurrences of a given code point
-
-	\note
-		If \a beg == \a end, the operation is an insert at iterator position \a beg
-
-	\param beg
-		Iterator describing the start of the range to be replaced
-
-	\param end
-		Iterator describing the (exclusive) end of the range to be replaced.
-
-	\param num
-		Number of occurrences of \a code_point that are to replace the specified range of code points
-
-	\param code_point
-		Code point that is to be used when replacing the specified range of code points
-
-	\return
-		This String after the replace operation
-
-	\exception std::length_error	Thrown if resulting String would have been too long, or if \a num was 'npos'.
-	*/
-	String& replace(iterator iter_beg, iterator iter_end, size_type num, utf32 code_point)
-	{
-		return replace(safe_iter_dif(iter_beg, begin()), safe_iter_dif(iter_end, iter_beg), num, code_point);
-	}
-
-
-	/*!
-	\brief
-		Replace the code points in the range [beg, end) with code points from the range [newBeg, newEnd).
-
-	\note
-		If \a beg == \a end, the operation is an insert at iterator position \a beg
-
-	\param beg
-		Iterator describing the start of the range to be replaced
-
-	\param end
-		Iterator describing the (exclusive) end of the range to be replaced.
-
-	\param newBeg
-		Iterator describing the beginning of the range to insert.
-
-	\param newEnd	
-		Iterator describing the (exclusive) end of the range to insert.
-
-	\return
-		This String after the insert operation.
-
-	\exception std::length_error	Thrown if the resulting string would be too long.
-	*/
-	String& replace(iterator iter_beg, iterator iter_end, const_iterator iter_newBeg, const_iterator iter_newEnd)
-	{
-		if (iter_beg == iter_end)
-		{
-			erase(safe_iter_dif(iter_beg, begin()), safe_iter_dif(iter_end, iter_beg));
-		}
-		else
-		{
-			size_type str_len = safe_iter_dif(iter_newEnd, iter_newBeg);
-			size_type idx = safe_iter_dif(iter_beg, begin());
-			size_type len = safe_iter_dif(iter_end, iter_beg);
-
-			if ((len + idx) > d_cplength)
-				len = d_cplength - idx;
-
-			size_type newsz = d_cplength + str_len - len;
-
-			grow(newsz);
-
-			if ((idx + len) < d_cplength)
-				memmove(&ptr()[idx + str_len], &ptr()[len + idx], (d_cplength - idx - len) * sizeof(utf32));
-
-			memcpy(&ptr()[idx], iter_newBeg.d_ptr, str_len * sizeof(utf32));
-			setlen(newsz);
-		}
-
-		return *this;
-	}
-
-
-	/*!
-	\brief
-		Replace code points in the String with the specified c-string.
-
-	\param idx
-		Index of the first code point to be replaced
-
-	\param len
-		Maximum number of code points to be replaced (if this is 0, operation is an insert at position \a idx)
-
-	\param c_str
-		c-string that is to replace the specified code points
-
-	\return
-		This String after the replace operation
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String
-	\exception std::length_error	Thrown if the resulting String would be too large.
-	*/
-	String& replace(size_type idx, size_type len, const char* cstr)
-	{
-		return replace(idx, len, cstr, strlen(cstr));
-	}
-
-
-	/*!
-	\brief
-		Replace the code points in the range [beg, end) with the specified c-string.
-
-	\note
-		If \a beg == \a end, the operation is a insert at iterator position \a beg
-
-	\param beg
-		Iterator describing the start of the range to be replaced
-
-	\param end
-		Iterator describing the (exclusive) end of the range to be replaced.
-
-	\param c_str
-		c-string that is to replace the specified range of code points
-
-	\return
-		This String after the replace operation
-
-	\exception std::length_error	Thrown if the resulting String would be too large.
-	*/
-	String& replace(iterator iter_beg, iterator iter_end, const char* cstr)
-	{
-		return replace(iter_beg, iter_end, cstr, strlen(cstr));
-	}
-
-
-	/*!
-	\brief
-		Replace code points in the String with chars from the given char array.
-
-	\param idx
-		Index of the first code point to be replaced
-
-	\param len
-		Maximum number of code points to be replaced (if this is 0, operation is an insert at position \a idx)
-
-	\param chars
-		char array containing the cars that are to replace the specified code points
-
-	\param chars_len
-		Number of chars in the char array.
-
-	\return
-		This String after the replace operation
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String
-	\exception std::length_error	Thrown if the resulting String would be too large, or if \a chars_len was 'npos'.
-	*/
-	String& replace(size_type idx, size_type len, const char* chars, size_type chars_len)
-	{
-		if (d_cplength < idx)
-			throw std::out_of_range("Index is out of range for CEGUI::String");
-
-		if (chars_len == npos)
-			throw std::length_error("Length for the char array can not be 'npos'");
-
-		if (((len + idx) > d_cplength) || (len == npos))
-			len = d_cplength - idx;
-
-		size_type newsz = d_cplength + chars_len - len;
-
-		grow(newsz);
-
-		if ((idx + len) < d_cplength)
-			memmove(&ptr()[idx + chars_len], &ptr()[len + idx], (d_cplength - idx - len) * sizeof(utf32));
-
-		utf32* pt = &ptr()[idx + chars_len - 1];
-
-		while (chars_len--)
-			*pt-- = static_cast<utf32>(static_cast<unsigned char>(chars[chars_len]));
-
-		setlen(newsz);
-		return *this;
-	}
-
-
-	/*!
-	\brief
-		Replace the code points in the range [beg, end) with chars from the given char array.
-
-	\note
-		If \a beg == \a end, the operation is a insert at iterator position \a beg
-
-	\param beg
-		Iterator describing the start of the range to be replaced
-
-	\param end
-		Iterator describing the (exclusive) end of the range to be replaced.
-
-	\param chars
-		char array containing the chars that are to replace the specified range of code points
-
-	\param chars_len
-		Number of chars in the char array.
-
-	\return
-		This String after the replace operation
-
-	\exception std::length_error	Thrown if the resulting String would be too large, or if \a chars_len was 'npos'.
-	*/
-	String& replace(iterator iter_beg, iterator iter_end, const char* chars, size_type chars_len)
-	{
-		return replace(safe_iter_dif(iter_beg, begin()), safe_iter_dif(iter_end, iter_beg), chars, chars_len);
-	}
-
-
-	//////////////////////////////////////////////////////////////////////////
-	// Find a code point
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Search forwards for a given code point
-
-	\param code_point
-		The utf32 code point to search for
-
-	\param idx
-		Index of the code point where the search is to start.
-
-	\return
-		- Index of the first occurrence of \a code_point travelling forwards from \a idx.
-		- npos if the code point could not be found
-	*/
-	size_type	find(utf32 code_point, size_type idx = 0) const
-	{
-		if (idx < d_cplength)
-		{
-			const utf32* pt = &ptr()[idx];
-
-			while (idx < d_cplength)
-			{
-				if (*pt++ == code_point)
-					return idx;
-
-				++idx;
-			}
-
-		}
-
-		return npos;
-	}
-
-	/*!
-	\brief
-		Search backwards for a given code point
-
-	\param code_point
-		The utf32 code point to search for
-
-	\param idx
-		Index of the code point where the search is to start.
-
-	\return
-		- Index of the first occurrence of \a code_point travelling backwards from \a idx.
-		- npos if the code point could not be found
-	*/
-	size_type	rfind(utf32 code_point, size_type idx = npos) const
-	{
-		if (idx >= d_cplength)
-			idx = d_cplength - 1;
-
-		if (d_cplength > 0)
-		{
-			const utf32* pt = &ptr()[idx];
-
-			do
-			{
-				if (*pt-- == code_point)
-					return idx;
-
-			} while (idx-- != 0);
-
-		}
-
-		return npos;
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// Find a substring
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Search forwards for a sub-string
-
-	\param str
-		String object describing the sub-string to search for
-
-	\param idx
-		Index of the code point where the search is to start
-
-	\return
-		- Index of the first occurrence of sub-string \a str travelling forwards from \a idx.
-		- npos if the sub-string could not be found
-	*/
-	size_type	find(const String& str, size_type idx = 0) const
-	{
-		if ((str.d_cplength == 0) && (idx < d_cplength))
-			return idx;
-
-		if (idx < d_cplength)
-		{
-			// loop while search string could fit in to search area
-			while (d_cplength - idx >= str.d_cplength)
-			{
-				if (0 == compare(idx, str.d_cplength, str))
-					return idx;
-
-				++idx;
-			}
-
-		}
-
-		return npos;
-	}
-
-	/*!
-	\brief
-		Search backwards for a sub-string
-
-	\param str
-		String object describing the sub-string to search for
-
-	\param idx
-		Index of the code point where the search is to start
-
-	\return
-		- Index of the first occurrence of sub-string \a str travelling backwards from \a idx.
-		- npos if the sub-string could not be found
-	*/
-	size_type	rfind(const String& str, size_type idx = npos) const
-	{
-		if (str.d_cplength == 0)
-			return (idx < d_cplength) ? idx : d_cplength;
-
-		if (str.d_cplength <= d_cplength)
-		{
-			if (idx > (d_cplength - str.d_cplength))
-				idx = d_cplength - str.d_cplength;
-
-			do
-			{
-				if (0 == compare(idx, str.d_cplength, str))
-					return idx;
-
-			} while (idx-- != 0);
-
-		}
-
-		return npos;
-	}
-
-	/*!
-	\brief
-		Search forwards for a sub-string
-
-	\param std_str
-		std::string object describing the sub-string to search for
-
-	\note
-		Characters from \a std_str are considered to represent Unicode code points in the range 0x00..0xFF.  No translation of
-		the encountered data is performed.
-
-	\param idx
-		Index of the code point where the search is to start
-
-	\return
-		- Index of the first occurrence of sub-string \a std_str travelling forwards from \a idx.
-		- npos if the sub-string could not be found
-	*/
-	size_type	find(const std::string& std_str, size_type idx = 0) const
-	{
-		std::string::size_type sze = std_str.size();
-
-		if ((sze == 0) && (idx < d_cplength))
-			return idx;
-
-		if (idx < d_cplength)
-		{
-			// loop while search string could fit in to search area
-			while (d_cplength - idx >= sze)
-			{
-				if (0 == compare(idx, (size_type)sze, std_str))
-					return idx;
-
-				++idx;
-			}
-
-		}
-
-		return npos;
-	}
-
-	/*!
-	\brief
-		Search backwards for a sub-string
-
-	\param std_str
-		std::string object describing the sub-string to search for
-
-	\note
-		Characters from \a std_str are considered to represent Unicode code points in the range 0x00..0xFF.  No translation of
-		the encountered data is performed.
-
-	\param idx
-		Index of the code point where the search is to start
-
-	\return
-		- Index of the first occurrence of sub-string \a std_str travelling backwards from \a idx.
-		- npos if the sub-string could not be found
-	*/
-	size_type	rfind(const std::string& std_str, size_type idx = npos) const
-	{
-		std::string::size_type sze = std_str.size();
-
-		if (sze == 0)
-			return (idx < d_cplength) ? idx : d_cplength;
-
-		if (sze <= d_cplength)
-		{
-			if (idx > (d_cplength - sze))
-				idx = d_cplength - sze;
-
-			do
-			{
-				if (0 == compare(idx, (size_type)sze, std_str))
-					return idx;
-
-			} while (idx-- != 0);
-
-		}
-
-		return npos;
-	}
-
-	/*!
-	\brief
-		Search forwards for a sub-string
-
-	\param utf8_str
-		Buffer containing null-terminated utf8 encoded data describing the sub-string to search for
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param idx
-		Index of the code point where the search is to start
-
-	\return
-		- Index of the first occurrence of sub-string \a utf8_str travelling forwards from \a idx.
-		- npos if the sub-string could not be found
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	*/
-	size_type	find(const utf8* utf8_str, size_type idx = 0) const
-	{
-		return find(utf8_str, idx, utf_length(utf8_str));
-	}
-
-	/*!
-	\brief
-		Search backwards for a sub-string
-
-	\param utf8_str
-		Buffer containing null-terminated utf8 encoded data describing the sub-string to search for
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param idx
-		Index of the code point where the search is to start
-
-	\return
-		- Index of the first occurrence of sub-string \a utf8_str travelling backwards from \a idx.
-		- npos if the sub-string could not be found
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	*/
-	size_type	rfind(const utf8* utf8_str, size_type idx = npos) const
-	{
-		return rfind(utf8_str, idx, utf_length(utf8_str));
-	}
-
-	/*!
-	\brief
-		Search forwards for a sub-string
-
-	\param utf8_str
-		Buffer containing utf8 encoded data describing the sub-string to search for
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param idx
-		Index of the code point where the search is to start
-
-	\param str_len
-		Length of the utf8 encoded sub-string in utf8 code units (not code points)
-
-	\return
-		- Index of the first occurrence of sub-string \a utf8_str travelling forwards from \a idx.
-		- npos if the sub-string could not be found
-
-	\exception std::length_error	Thrown if \a str_len is 'npos'
-	*/
-	size_type	find(const utf8* utf8_str, size_type idx, size_type str_len) const
-	{
-		if (str_len == npos)
-			throw std::length_error("Length for utf8 encoded string can not be 'npos'");
-
-		size_type sze = encoded_size(utf8_str, str_len);
-
-		if ((sze == 0) && (idx < d_cplength))
-			return idx;
-
-		if (idx < d_cplength)
-		{
-			// loop while search string could fit in to search area
-			while (d_cplength - idx >= sze)
-			{
-				if (0 == compare(idx, sze, utf8_str, sze))
-					return idx;
-
-				++idx;
-			}
-
-		}
-
-		return npos;
-	}
-
-	/*!
-	\brief
-		Search backwards for a sub-string
-
-	\param utf8_str
-		Buffer containing utf8 encoded data describing the sub-string to search for
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param idx
-		Index of the code point where the search is to start
-
-	\param str_len
-		Length of the utf8 encoded sub-string in utf8 code units (not code points)
-
-	\return
-		- Index of the first occurrence of sub-string \a utf8_str travelling backwards from \a idx.
-		- npos if the sub-string could not be found
-
-	\exception std::length_error	Thrown if \a str_len is 'npos'
-	*/
-	size_type	rfind(const utf8* utf8_str, size_type idx, size_type str_len) const
-	{
-		if (str_len == npos)
-			throw std::length_error("Length for utf8 encoded string can not be 'npos'");
-
-		size_type sze = encoded_size(utf8_str, str_len);
-
-		if (sze == 0)
-			return (idx < d_cplength) ? idx : d_cplength;
-
-		if (sze <= d_cplength)
-		{
-			if (idx > (d_cplength - sze))
-				idx = d_cplength - sze;
-
-			do
-			{
-				if (0 == compare(idx, sze, utf8_str, sze))
-					return idx;
-
-			} while (idx-- != 0);
-
-		}
-
-		return npos;
-	}
-
-
-	/*!
-	\brief
-		Search forwards for a sub-string
-
-	\param c_str
-		c-string describing the sub-string to search for
-
-	\param idx
-		Index of the code point where the search is to start
-
-	\return
-		- Index of the first occurrence of sub-string \a c_str travelling forwards from \a idx.
-		- npos if the sub-string could not be found
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	*/
-	size_type	find(const char* cstr, size_type idx = 0) const
-	{
-		return find(cstr, idx, strlen(cstr));
-	}
-
-
-	/*!
-	\brief
-		Search backwards for a sub-string
-
-	\param c_str
-		c-string describing the sub-string to search for
-
-	\param idx
-		Index of the code point where the search is to start
-
-	\return
-		- Index of the first occurrence of sub-string \a c_str travelling backwards from \a idx.
-		- npos if the sub-string could not be found
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	*/
-	size_type	rfind(const char* cstr, size_type idx = npos) const
-	{
-		return rfind(cstr, idx, strlen(cstr));
-	}
-
-
-	/*!
-	\brief
-		Search forwards for a sub-string
-
-	\param chars
-		char array describing the sub-string to search for
-
-	\param idx
-		Index of the code point where the search is to start
-
-	\param chars_len
-		Number of chars in the char array.
-
-	\return
-		- Index of the first occurrence of sub-string \a chars travelling forwards from \a idx.
-		- npos if the sub-string could not be found
-
-	\exception std::length_error	Thrown if \a chars_len is 'npos'
-	*/
-	size_type	find(const char* chars, size_type idx, size_type chars_len) const
-	{
-		if (chars_len == npos)
-			throw std::length_error("Length for char array can not be 'npos'");
-
-		if ((chars_len == 0) && (idx < d_cplength))
-			return idx;
-
-		if (idx < d_cplength)
-		{
-			// loop while search string could fit in to search area
-			while (d_cplength - idx >= chars_len)
-			{
-				if (0 == compare(idx, chars_len, chars, chars_len))
-					return idx;
-
-				++idx;
-			}
-
-		}
-
-		return npos;
-	}
-
-
-	/*!
-	\brief
-		Search backwards for a sub-string
-
-	\param chars
-		char array describing the sub-string to search for
-
-	\param idx
-		Index of the code point where the search is to start
-
-	\param chars_len
-		Number of chars in the char array.
-
-	\return
-		- Index of the first occurrence of sub-string \a chars travelling backwards from \a idx.
-		- npos if the sub-string could not be found
-
-	\exception std::length_error	Thrown if \a chars_len is 'npos'
-	*/
-	size_type	rfind(const char* chars, size_type idx, size_type chars_len) const
-	{
-		if (chars_len == npos)
-			throw std::length_error("Length for char array can not be 'npos'");
-
-		if (chars_len == 0)
-			return (idx < d_cplength) ? idx : d_cplength;
-
-		if (chars_len <= d_cplength)
-		{
-			if (idx > (d_cplength - chars_len))
-				idx = d_cplength - chars_len;
-
-			do
-			{
-				if (0 == compare(idx, chars_len, chars, chars_len))
-					return idx;
-
-			} while (idx-- != 0);
-
-		}
-
-		return npos;
-	}
-
-
-	//////////////////////////////////////////////////////////////////////////
-	// Find first of different code-points
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Find the first occurrence of one of a set of code points.
-
-	\param str
-		String object describing the set of code points.
-
-	\param idx
-		Index of the start point for the search
-
-	\return
-		- Index of the first occurrence of any one of the code points in \a str starting from from \a idx.
-		- npos if none of the code points in \a str were found.
-	*/
-	size_type	find_first_of(const String& str, size_type idx = 0) const
-	{
-		if (idx < d_cplength)
-		{
-			const utf32* pt = &ptr()[idx];
-
-			do
-			{
-				if (npos != str.find(*pt++))
-					return idx;
-
-			} while (++idx != d_cplength);
-
-		}
-
-		return npos;
-	}
-
-	/*!
-	\brief
-		Find the first code point that is not one of a set of code points.
-
-	\param str
-		String object describing the set of code points.
-
-	\param idx
-		Index of the start point for the search
-
-	\return
-		- Index of the first code point that does not match any one of the code points in \a str starting from from \a idx.
-		- npos if all code points matched one of the code points in \a str.
-	*/
-	size_type	find_first_not_of(const String& str, size_type idx = 0) const
-	{
-		if (idx < d_cplength)
-		{
-			const utf32* pt = &ptr()[idx];
-
-			do
-			{
-				if (npos == str.find(*pt++))
-					return idx;
-
-			} while (++idx != d_cplength);
-
-		}
-
-		return npos;
-	}
-
-
-	/*!
-	\brief
-		Find the first occurrence of one of a set of code points.
-
-	\param std_str
-		std::string object describing the set of code points.
-
-	\note
-		The characters of \a std_str are taken to be unencoded data which represent Unicode code points 0x00..0xFF.  No translation of
-		the provided data will occur.
-
-	\param idx
-		Index of the start point for the search
-
-	\return
-		- Index of the first occurrence of any one of the code points in \a std_str starting from from \a idx.
-		- npos if none of the code points in \a std_str were found.
-	*/
-	size_type	find_first_of(const std::string& std_str, size_type idx = 0) const
-	{
-		if (idx < d_cplength)
-		{
-			const utf32* pt = &ptr()[idx];
-
-			do
-			{
-				if (npos != find_codepoint(std_str, *pt++))
-					return idx;
-
-			} while (++idx != d_cplength);
-
-		}
-
-		return npos;
-	}
-
-	/*!
-	\brief
-		Find the first code point that is not one of a set of code points.
-
-	\param std_str
-		std::string object describing the set of code points.
-
-	\note
-		The characters of \a std_str are taken to be unencoded data which represent Unicode code points 0x00..0xFF.  No translation of
-		the provided data will occur.
-
-	\param idx
-		Index of the start point for the search
-
-	\return
-		- Index of the first code point that does not match any one of the code points in \a std_str starting from from \a idx.
-		- npos if all code points matched one of the code points in \a std_str.
-	*/
-	size_type	find_first_not_of(const std::string& std_str, size_type idx = 0) const
-	{
-		if (idx < d_cplength)
-		{
-			const utf32* pt = &ptr()[idx];
-
-			do
-			{
-				if (npos == find_codepoint(std_str, *pt++))
-					return idx;
-
-			} while (++idx != d_cplength);
-
-		}
-
-		return npos;
-	}
-
-
-	/*!
-	\brief
-		Find the first occurrence of one of a set of code points.
-
-	\param utf8_str
-		Buffer containing null-terminated utf8 encoded data describing the set of code points.
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param idx
-		Index of the start point for the search
-
-	\return
-		- Index of the first occurrence of any one of the code points in \a utf8_str starting from from \a idx.
-		- npos if none of the code points in \a utf8_str were found.
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	*/
-	size_type	find_first_of(const utf8* utf8_str, size_type idx = 0) const
-	{
-		return find_first_of(utf8_str, idx, utf_length(utf8_str));
-	}
-
-	/*!
-	\brief
-		Find the first code point that is not one of a set of code points.
-
-	\param utf8_str
-		Buffer containing null-terminated utf8 encoded data describing the set of code points.
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param idx
-		Index of the start point for the search
-
-	\return
-		- Index of the first code point that does not match any one of the code points in \a utf8_str starting from from \a idx.
-		- npos if all code points matched one of the code points in \a utf8_str.
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	*/
-	size_type	find_first_not_of(const utf8* utf8_str, size_type idx = 0) const
-	{
-		return find_first_not_of(utf8_str, idx, utf_length(utf8_str));
-	}
-
-	/*!
-	\brief
-		Find the first occurrence of one of a set of code points.
-
-	\param utf8_str
-		Buffer containing utf8 encoded data describing the set of code points.
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param idx
-		Index of the start point for the search
-
-	\param str_len
-		Length of the utf8 encoded data in utf8 code units (not code points).
-
-	\return
-		- Index of the first occurrence of any one of the code points in \a utf8_str starting from from \a idx.
-		- npos if none of the code points in \a utf8_str were found.
-
-	\exception std::length_error	Thrown if \a str_len was 'npos'.
-	*/
-	size_type	find_first_of(const utf8* utf8_str, size_type idx, size_type str_len) const
-	{
-		if (str_len == npos)
-			throw std::length_error("Length for utf8 encoded string can not be 'npos'");
-
-		if (idx < d_cplength)
-		{
-			size_type encsze = encoded_size(utf8_str, str_len);
-
-			const utf32* pt = &ptr()[idx];
-
-			do
-			{
-				if (npos != find_codepoint(utf8_str, encsze, *pt++))
-					return idx;
-
-			} while (++idx != d_cplength);
-
-		}
-
-		return npos;
-	}
-
-	/*!
-	\brief
-		Find the first code point that is not one of a set of code points.
-
-	\param utf8_str
-		Buffer containing utf8 encoded data describing the set of code points.
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param idx
-		Index of the start point for the search
-
-	\param str_len
-		Length of the utf8 encoded data in utf8 code units (not code points).
-
-	\return
-		- Index of the first code point that does not match any one of the code points in \a utf8_str starting from from \a idx.
-		- npos if all code points matched one of the code points in \a utf8_str.
-
-	\exception std::length_error	Thrown if \a str_len was 'npos'.
-	*/
-	size_type	find_first_not_of(const utf8* utf8_str, size_type idx, size_type str_len) const
-	{
-		if (str_len == npos)
-			throw std::length_error("Length for utf8 encoded string can not be 'npos'");
-
-		if (idx < d_cplength)
-		{
-			size_type encsze = encoded_size(utf8_str, str_len);
-
-			const utf32* pt = &ptr()[idx];
-
-			do
-			{
-				if (npos == find_codepoint(utf8_str, encsze, *pt++))
-					return idx;
-
-			} while (++idx != d_cplength);
-
-		}
-
-		return npos;
-	}
-
-
-	/*!
-	\brief
-		Search forwards for a given code point
-
-	\param code_point
-		The utf32 code point to search for
-
-	\param idx
-		Index of the code point where the search is to start.
-
-	\return
-		- Index of the first occurrence of \a code_point starting from from \a idx.
-		- npos if the code point could not be found
-	*/
-	size_type	find_first_of(utf32 code_point, size_type idx = 0) const
-	{
-		return find(code_point, idx);
-	}
-
-	/*!
-	\brief
-		Search forwards for the first code point that does not match a given code point
-
-	\param code_point
-		The utf32 code point to search for
-
-	\param idx
-		Index of the code point where the search is to start.
-
-	\return
-		- Index of the first code point that does not match \a code_point starting from from \a idx.
-		- npos if all code points matched \a code_point
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	*/
-	size_type	find_first_not_of(utf32 code_point, size_type idx = 0) const
-	{
-		if (idx < d_cplength)
-		{
-			do
-			{
-				if ((*this)[idx] != code_point)
-					return idx;
-
-			} while(idx++ < d_cplength);
-
-		}
-
-		return npos;
-	}
-
-
-	/*!
-	\brief
-		Find the first occurrence of one of a set of chars.
-
-	\param c_str
-		c-string describing the set of chars.
-
-	\param idx
-		Index of the start point for the search
-
-	\return
-		- Index of the first occurrence of any one of the chars in \a c_str starting from from \a idx.
-		- npos if none of the chars in \a c_str were found.
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	*/
-	size_type	find_first_of(const char* cstr, size_type idx = 0) const
-	{
-		return find_first_of(cstr, idx, strlen(cstr));
-	}
-
-
-	/*!
-	\brief
-		Find the first code point that is not one of a set of chars.
-
-	\param c_str
-		c-string describing the set of chars.
-
-	\param idx
-		Index of the start point for the search
-
-	\return
-		- Index of the first code point that does not match any one of the chars in \a c_str starting from from \a idx.
-		- npos if all code points matched any of the chars in \a c_str.
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	*/
-	size_type	find_first_not_of(const char* cstr, size_type idx = 0) const
-	{
-		return find_first_not_of(cstr, idx, strlen(cstr));
-	}
-
-
-	/*!
-	\brief
-		Find the first occurrence of one of a set of chars.
-
-	\param chars
-		char array containing the set of chars.
-
-	\param idx
-		Index of the start point for the search
-
-	\param chars_len
-		Number of chars in the char array.
-
-	\return
-		- Index of the first occurrence of any one of the chars in \a chars starting from from \a idx.
-		- npos if none of the chars in \a chars were found.
-
-	\exception std::length_error	Thrown if \a chars_len was 'npos'.
-	*/
-	size_type	find_first_of(const char* chars, size_type idx, size_type chars_len) const
-	{
-		if (chars_len == npos)
-			throw std::length_error("Length for char array can not be 'npos'");
-
-		if (idx < d_cplength)
-		{
-			const utf32* pt = &ptr()[idx];
-
-			do
-			{
-				if (npos != find_codepoint(chars, chars_len, *pt++))
-					return idx;
-
-			} while (++idx != d_cplength);
-
-		}
-
-		return npos;
-	}
-
-
-	/*!
-	\brief
-		Find the first code point that is not one of a set of chars.
-
-	\param chars
-		char array containing the set of chars.
-
-	\param idx
-		Index of the start point for the search
-
-	\param chars_len
-		Number of chars in the car array.
-
-	\return
-		- Index of the first code point that does not match any one of the chars in \a chars starting from from \a idx.
-		- npos if all code points matched any of the chars in \a chars.
-
-	\exception std::length_error	Thrown if \a chars_len was 'npos'.
-	*/
-	size_type	find_first_not_of(const char* chars, size_type idx, size_type chars_len) const
-	{
-		if (chars_len == npos)
-			throw std::length_error("Length for char array can not be 'npos'");
-
-		if (idx < d_cplength)
-		{
-			const utf32* pt = &ptr()[idx];
-
-			do
-			{
-				if (npos == find_codepoint(chars, chars_len, *pt++))
-					return idx;
-
-			} while (++idx != d_cplength);
-
-		}
-
-		return npos;
-	}
-
-
-	//////////////////////////////////////////////////////////////////////////
-	// Find last of different code-points
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Find the last occurrence of one of a set of code points.
-
-	\param str
-		String object describing the set of code points.
-
-	\param idx
-		Index of the start point for the search
-
-	\return
-		- Index of the last occurrence of any one of the code points in \a str starting from \a idx.
-		- npos if none of the code points in \a str were found.
-	*/
-	size_type	find_last_of(const String& str, size_type idx = npos) const
-	{
-		if (d_cplength > 0)
-		{
-			if (idx >= d_cplength)
-				idx = d_cplength - 1;
-
-			const utf32* pt = &ptr()[idx];
-
-			do
-			{
-				if (npos != str.find(*pt--))
-					return idx;
-
-			} while (idx-- != 0);
-
-		}
-
-		return npos;
-	}
-
-	/*!
-	\brief
-		Find the last code point that is not one of a set of code points.
-
-	\param str
-		String object describing the set of code points.
-
-	\param idx
-		Index of the start point for the search
-
-	\return
-		- Index of the last code point that does not match any one of the code points in \a str starting from \a idx.
-		- npos if all code points matched one of the code points in \a str.
-	*/
-	size_type	find_last_not_of(const String& str, size_type idx = npos) const
-	{
-		if (d_cplength > 0)
-		{
-			if (idx >= d_cplength)
-				idx = d_cplength - 1;
-
-			const utf32* pt = &ptr()[idx];
-
-			do
-			{
-				if (npos == str.find(*pt--))
-					return idx;
-
-			} while (idx-- != 0);
-
-		}
-
-		return npos;
-	}
-
-
-	/*!
-	\brief
-		Find the last occurrence of one of a set of code points.
-
-	\param std_str
-		std::string object describing the set of code points.
-
-	\note
-		The characters of \a std_str are taken to be unencoded data which represent Unicode code points 0x00..0xFF.  No translation of
-		the provided data will occur.
-
-	\param idx
-		Index of the start point for the search
-
-	\return
-		- Index of the last occurrence of any one of the code points in \a std_str starting from \a idx.
-		- npos if none of the code points in \a std_str were found.
-	*/
-	size_type	find_last_of(const std::string& std_str, size_type idx = npos) const
-	{
-		if (d_cplength > 0)
-		{
-			if (idx >= d_cplength)
-				idx = d_cplength - 1;
-
-			const utf32* pt = &ptr()[idx];
-
-			do
-			{
-				if (npos != find_codepoint(std_str, *pt--))
-					return idx;
-
-			} while (idx-- != 0);
-
-		}
-
-		return npos;
-	}
-
-	/*!
-	\brief
-		Find the last code point that is not one of a set of code points.
-
-	\param std_str
-		std::string object describing the set of code points.
-
-	\note
-		The characters of \a std_str are taken to be unencoded data which represent Unicode code points 0x00..0xFF.  No translation of
-		the provided data will occur.
-
-	\param idx
-		Index of the start point for the search
-
-	\return
-		- Index of the last code point that does not match any one of the code points in \a std_str starting from \a idx.
-		- npos if all code points matched one of the code points in \a std_str.
-	*/
-	size_type	find_last_not_of(const std::string& std_str, size_type idx = npos) const
-	{
-		if (d_cplength > 0)
-		{
-			if (idx >= d_cplength)
-				idx = d_cplength - 1;
-
-			const utf32* pt = &ptr()[idx];
-
-			do
-			{
-				if (npos == find_codepoint(std_str, *pt--))
-					return idx;
-
-			} while (idx-- != 0);
-
-		}
-
-		return npos;
-	}
-
-
-	/*!
-	\brief
-		Find the last occurrence of one of a set of code points.
-
-	\param utf8_str
-		Buffer containing null-terminated utf8 encoded data describing the set of code points.
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param idx
-		Index of the start point for the search
-
-	\return
-		- Index of the last occurrence of any one of the code points in \a utf8_str starting from \a idx.
-		- npos if none of the code points in \a utf8_str were found.
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	*/
-	size_type	find_last_of(const utf8* utf8_str, size_type idx = npos) const
-	{
-		return find_last_of(utf8_str, idx, utf_length(utf8_str));
-	}
-
-	/*!
-	\brief
-		Find the last code point that is not one of a set of code points.
-
-	\param utf8_str
-		Buffer containing null-terminated utf8 encoded data describing the set of code points.
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param idx
-		Index of the start point for the search
-
-	\return
-		- Index of the last code point that does not match any one of the code points in \a utf8_str starting from \a idx.
-		- npos if all code points matched one of the code points in \a utf8_str.
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	*/
-	size_type	find_last_not_of(const utf8* utf8_str, size_type idx = npos) const
-	{
-		return find_last_not_of(utf8_str, idx, utf_length(utf8_str));
-	}
-
-	/*!
-	\brief
-		Find the last occurrence of one of a set of code points.
-
-	\param utf8_str
-		Buffer containing utf8 encoded data describing the set of code points.
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param idx
-		Index of the start point for the search
-
-	\param str_len
-		Length of the utf8 encoded data in utf8 code units (not code points).
-
-	\return
-		- Index of the last occurrence of any one of the code points in \a utf8_str starting from from \a idx.
-		- npos if none of the code points in \a utf8_str were found.
-
-	\exception std::length_error	Thrown if \a str_len was 'npos'.
-	*/
-	size_type	find_last_of(const utf8* utf8_str, size_type idx, size_type str_len) const
-	{
-		if (str_len == npos)
-			throw std::length_error("Length for utf8 encoded string can not be 'npos'");
-
-		if (d_cplength > 0)
-		{
-			if (idx >= d_cplength)
-				idx = d_cplength - 1;
-
-			size_type encsze = encoded_size(utf8_str, str_len);
-
-			const utf32* pt = &ptr()[idx];
-
-			do
-			{
-				if (npos != find_codepoint(utf8_str, encsze, *pt--))
-					return idx;
-
-			} while (idx-- != 0);
-
-		}
-
-		return npos;
-	}
-
-	/*!
-	\brief
-		Find the last code point that is not one of a set of code points.
-
-	\param utf8_str
-		Buffer containing utf8 encoded data describing the set of code points.
-
-	\note
-		A basic string literal (cast to utf8*) can be passed to this function, provided that the string is
-		comprised only of code points 0x00..0x7f.  The use of extended ASCII characters (with values >0x7f)
-		would result in incorrect behaviour as the String will attempt to 'decode' the data, with unpredictable
-		results.
-
-	\param idx
-		Index of the start point for the search
-
-	\param str_len
-		Length of the utf8 encoded data in utf8 code units (not code points).
-
-	\return
-		- Index of the last code point that does not match any one of the code points in \a utf8_str starting from from \a idx.
-		- npos if all code points matched one of the code points in \a utf8_str.
-
-	\exception std::length_error	Thrown if \a str_len was 'npos'.
-	*/
-	size_type	find_last_not_of(const utf8* utf8_str, size_type idx, size_type str_len) const
-	{
-		if (str_len == npos)
-			throw std::length_error("Length for utf8 encoded string can not be 'npos'");
-
-		if (d_cplength > 0)
-		{
-			if (idx >= d_cplength)
-				idx = d_cplength - 1;
-
-			size_type encsze = encoded_size(utf8_str, str_len);
-
-			const utf32* pt = &ptr()[idx];
-
-			do
-			{
-				if (npos == find_codepoint(utf8_str, encsze, *pt--))
-					return idx;
-
-			} while (idx-- != 0);
-
-		}
-
-		return npos;
-	}
-
-
-	/*!
-	\brief
-		Search for last occurrence of a given code point
-
-	\param code_point
-		The utf32 code point to search for
-
-	\param idx
-		Index of the code point where the search is to start.
-
-	\return
-		- Index of the last occurrence of \a code_point starting from \a idx.
-		- npos if the code point could not be found
-	*/
-	size_type	find_last_of(utf32 code_point, size_type idx = npos) const
-	{
-		return rfind(code_point, idx);
-	}
-
-	/*!
-	\brief
-		Search for the last code point that does not match a given code point
-
-	\param code_point
-		The utf32 code point to search for
-
-	\param idx
-		Index of the code point where the search is to start.
-
-	\return
-		- Index of the last code point that does not match \a code_point starting from from \a idx.
-		- npos if all code points matched \a code_point
-	*/
-	size_type	find_last_not_of(utf32 code_point, size_type idx = npos) const
-	{
-		if (d_cplength > 0)
-		{
-			if (idx >= d_cplength)
-				idx = d_cplength - 1;
-
-			do
-			{
-				if ((*this)[idx] != code_point)
-					return idx;
-
-			} while(idx-- != 0);
-
-		}
-
-		return npos;
-	}
-
-
-	/*!
-	\brief
-		Find the last occurrence of one of a set of chars.
-
-	\param c_str
-		c-string describing the set of chars.
-
-	\param idx
-		Index of the start point for the search
-
-	\return
-		- Index of the last occurrence of any one of the chars in \a c_str starting from \a idx.
-		- npos if none of the chars in \a c_str were found.
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	*/
-	size_type	find_last_of(const char* cstr, size_type idx = npos) const
-	{
-		return find_last_of(cstr, idx, strlen(cstr));
-	}
-
-
-	/*!
-	\brief
-		Find the last code point that is not one of a set of chars.
-
-	\param c_str
-		c-string describing the set of chars.
-
-	\param idx
-		Index of the start point for the search
-
-	\return
-		- Index of the last code point that does not match any one of the chars in \a c_str starting from \a idx.
-		- npos if all code points matched any of the chars in \a c_str.
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	*/
-	size_type	find_last_not_of(const char* cstr, size_type idx = npos) const
-	{
-		return find_last_not_of(cstr, idx, strlen(cstr));
-	}
-
-
-	/*!
-	\brief
-		Find the last occurrence of one of a set of chars.
-
-	\param chars
-		char array containing the set of chars.
-
-	\param idx
-		Index of the start point for the search
-
-	\param chars_len
-		Number of chars in the char array.
-
-	\return
-		- Index of the last occurrence of any one of the chars in \a chars, starting from from \a idx.
-		- npos if none of the chars in \a chars were found.
-
-	\exception std::length_error	Thrown if \a chars_len was 'npos'.
-	*/
-	size_type	find_last_of(const char* chars, size_type idx, size_type chars_len) const
-	{
-		if (chars_len == npos)
-			throw std::length_error("Length for char array can not be 'npos'");
-
-		if (d_cplength > 0)
-		{
-			if (idx >= d_cplength)
-				idx = d_cplength - 1;
-
-			const utf32* pt = &ptr()[idx];
-
-			do
-			{
-				if (npos != find_codepoint(chars, chars_len, *pt--))
-					return idx;
-
-			} while (idx-- != 0);
-
-		}
-
-		return npos;
-	}
-
-
-	/*!
-	\brief
-		Find the last code point that is not one of a set of chars.
-
-	\param chars
-		char array containing the set of chars.
-
-	\param idx
-		Index of the start point for the search
-
-	\param chars_len
-		Number of chars in the char array.
-
-	\return
-		- Index of the last code point that does not match any one of the chars in \a chars, starting from from \a idx.
-		- npos if all code points matched any of the chars in \a chars.
-
-	\exception std::length_error	Thrown if \a chars_len was 'npos'.
-	*/
-	size_type	find_last_not_of(const char* chars, size_type idx, size_type chars_len) const
-	{
-		if (chars_len == npos)
-			throw std::length_error("Length for char array can not be 'npos'");
-
-		if (d_cplength > 0)
-		{
-			if (idx >= d_cplength)
-				idx = d_cplength - 1;
-
-			const utf32* pt = &ptr()[idx];
-
-			do
-			{
-				if (npos == find_codepoint(chars, chars_len, *pt--))
-					return idx;
-
-			} while (idx-- != 0);
-
-		}
-
-		return npos;
-	}
-
-
-	//////////////////////////////////////////////////////////////////////////
-	// Substring
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Returns a substring of this String.
-
-	\param idx
-		Index of the first code point to use for the sub-string.
-
-	\param len
-		Maximum number of code points to use for the sub-string
-
-	\return
-		A String object containing the specified sub-string.
-
-	\exception std::out_of_range	Thrown if \a idx is invalid for this String.
-	*/
-	String	substr(size_type idx = 0, size_type len = npos) const
-	{
-		if (d_cplength < idx)
-			throw std::out_of_range("Index is out of range for this CEGUI::String");
-
-		return String(*this, idx, len);
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// Iterator creation
-	//////////////////////////////////////////////////////////////////////////
-	/*!
-	\brief
-		Return a forwards iterator that describes the beginning of the String
-
-	\return
-		iterator object that describes the beginning of the String.
-	*/
-	iterator		begin(void)
-	{
-		return iterator(ptr());
-	}
-
-	/*!
-	\brief
-		Return a constant forwards iterator that describes the beginning of the String
-
-	\return
-		const_iterator object that describes the beginning of the String.
-	*/
-	const_iterator	begin(void) const
-	{
-		return const_iterator(ptr());
-	}
-
-	/*!
-	\brief
-		Return a forwards iterator that describes the end of the String
-
-	\return
-		iterator object that describes the end of the String.
-	*/
-	iterator		end(void)
-	{
-		return iterator(&ptr()[d_cplength]);
-	}
-
-	/*!
-	\brief
-		Return a constant forwards iterator that describes the end of the String
-
-	\return
-		const_iterator object that describes the end of the String.
-	*/
-	const_iterator	end(void) const
-	{
-		return const_iterator(&ptr()[d_cplength]);
-	}
-
-	/*!
-	\brief
-		Return a reverse iterator that describes the beginning of the String
-
-	\return
-		reverse_iterator object that describes the beginning of the String (so is actually at the end)
-	*/
-	reverse_iterator		rbegin(void)
-	{
-		return reverse_iterator(end());
-	}
-
-	/*!
-	\brief
-		Return a constant reverse iterator that describes the beginning of the String
-
-	\return
-		const_reverse_iterator object that describes the beginning of the String (so is actually at the end)
-	*/
-	const_reverse_iterator	rbegin(void) const
-	{
-		return const_reverse_iterator(end());
-	}
-
-	/*!
-	\brief
-		Return a reverse iterator that describes the end of the String
-
-	\return
-		reverse_iterator object that describes the end of the String (so is actually at the beginning)
-	*/
-	reverse_iterator		rend(void)
-	{
-		return reverse_iterator(begin());
-	}
-
-	/*!
-	\brief
-		Return a constant reverse iterator that describes the end of the String
-
-	\return
-		const_reverse_iterator object that describes the end of the String (so is actually at the beginning)
-	*/
-	const_reverse_iterator	rend(void) const
-	{
-		return const_reverse_iterator(begin());
-	}
-
-private:
-	/*************************************************************************
-		Implementation Functions
-	*************************************************************************/
-	// string management
-
-	// change size of allocated buffer so it is at least 'new_size'.
-	// May or may not cause re-allocation and copy of buffer if size is larger
-	// will never re-allocate to make size smaller.  (see trim())
-    bool	grow(size_type new_size);
-
-	// perform re-allocation to remove wasted space.
-    void	trim(void);
-
-	// set the length of the string, and terminate it, according to the given value (will not re-allocate, use grow() first).
-	void	setlen(size_type len)
-	{
-		d_cplength = len;
-		ptr()[len] = (utf32)(0);
-	}
-
-	// initialise string object
-	void	init(void)
-	{
-		d_reserve			= STR_QUICKBUFF_SIZE;
-		d_encodedbuff		= 0;
-		d_encodedbufflen	= 0;
-		d_encodeddatlen		= 0;
-		setlen(0);
-	}
-
-	// return true if the given pointer is inside the string data
-	bool	inside(utf32* inptr)
-	{
-		if (inptr < ptr() || ptr() + d_cplength <= inptr)
-			return false;
-		else
-			return true;
-	}
-
-	// compute distance between two iterators, returning a 'safe' value
-	size_type safe_iter_dif(const const_iterator& iter1, const const_iterator& iter2) const
-	{
-		return (iter1.d_ptr == 0) ? 0 : (iter1 - iter2);
-	}
-	
-	// encoding functions
-	// for all:
-	//	src_len is in code units, or 0 for null terminated string.
-	//	dest_len is in code units.
-	//	returns number of code units put into dest buffer.
-	size_type encode(const utf32* src, utf8* dest, size_type dest_len, size_type src_len = 0) const
-	{
-		// count length for null terminated source...
-		if (src_len == 0)
-		{
-			src_len = utf_length(src);
-		}
-
-		size_type destCapacity = dest_len;
-
-		// while there is data in the source buffer,
-		for (uint idx = 0; idx < src_len; ++idx)
-		{
-			utf32	cp = src[idx];
-
-			// check there is enough destination buffer to receive this encoded unit (exit loop & return if not)
-			if (destCapacity < encoded_size(cp))
-			{
-				break;
-			}
-
-			if (cp < 0x80)
-			{
-				*dest++ = (utf8)cp;
-				--destCapacity;
-			}
-			else if (cp < 0x0800)
-			{
-				*dest++ = (utf8)((cp >> 6) | 0xC0);
-				*dest++ = (utf8)((cp & 0x3F) | 0x80);
-				destCapacity -= 2;
-			}
-			else if (cp < 0x10000)
-			{
-				*dest++ = (utf8)((cp >> 12) | 0xE0);
-				*dest++ = (utf8)(((cp >> 6) & 0x3F) | 0x80);
-				*dest++ = (utf8)((cp & 0x3F) | 0x80);
-				destCapacity -= 3;
-			}
-			else
-			{
-				*dest++ = (utf8)((cp >> 18) | 0xF0);
-				*dest++ = (utf8)(((cp >> 12) & 0x3F) | 0x80);
-				*dest++ = (utf8)(((cp >> 6) & 0x3F) | 0x80);
-				*dest++ = (utf8)((cp & 0x3F) | 0x80);
-				destCapacity -= 4;
-			}
-
-		}
-
-		return dest_len - destCapacity;
-	}
-
-	size_type encode(const utf8* src, utf32* dest, size_type dest_len, size_type src_len = 0) const
-	{
-		// count length for null terminated source...
-		if (src_len == 0)
-		{
-			src_len = utf_length(src);
-		}
-
-		size_type destCapacity = dest_len;
-
-		// while there is data in the source buffer, and space in the dest buffer
-		for (uint idx = 0; ((idx < src_len) && (destCapacity > 0));)
-		{
-			utf32	cp;
-			utf8	cu = src[idx++];
-
-			if (cu < 0x80)
-			{
-				cp = (utf32)(cu);
-			}
-			else if (cu < 0xE0)
-			{
-				cp = ((cu & 0x1F) << 6);
-				cp |= (src[idx++] & 0x3F);
-			}
-			else if (cu < 0xF0)
-			{
-				cp = ((cu & 0x0F) << 12);
-				cp |= ((src[idx++] & 0x3F) << 6);
-				cp |= (src[idx++] & 0x3F);
-			}
-			else
-			{
-				cp = ((cu & 0x07) << 18);
-				cp |= ((src[idx++] & 0x3F) << 12);
-				cp |= ((src[idx++] & 0x3F) << 6);
-				cp |= (src[idx++] & 0x3F);
-			}
-
-			*dest++ = cp;
-			--destCapacity;
-		}
-
-		return dest_len - destCapacity;
-	}
-
-	// return the number of utf8 code units required to encode the given utf32 code point
-	size_type encoded_size(utf32 code_point) const
-	{
-		if (code_point < 0x80)
-			return 1;
-		else if (code_point < 0x0800)
-			return 2;
-		else if (code_point < 0x10000)
-			return 3;
-		else
-			return 4;
-	}
-
-	// return number of code units required to re-encode given null-terminated utf32 data as utf8.  return does not include terminating null.
-	size_type encoded_size(const utf32* buf) const
-	{
-		return encoded_size(buf, utf_length(buf));
-	}
-
-	// return number of code units required to re-encode given utf32 data as utf8.   len is number of code units in 'buf'.
-	size_type encoded_size(const utf32* buf, size_type len) const
-	{
-		size_type count = 0;
-
-		while (len--)
-		{
-			count += encoded_size(*buf++);
-		}
-
-		return count;
-	}
-
-	// return number of utf32 code units required to re-encode given utf8 data as utf32.  return does not include terminating null.
-	size_type encoded_size(const utf8* buf) const
-	{
-		return encoded_size(buf, utf_length(buf));
-	}
-
-	// return number of utf32 code units required to re-encode given utf8 data as utf32.  len is number of code units in 'buf'.
-	size_type encoded_size(const utf8* buf, size_type len) const
-	{
-		utf8 tcp;
-		size_type count = 0;
-
-		while (len--)
-		{
-			tcp = *buf++;
-			++count;
-
-			if (tcp < 0x80)
-			{
-			}
-			else if (tcp < 0xE0)
-			{
-				--len;
-				++buf;
-			}
-			else if (tcp < 0xF0)
-			{
-				len -= 2;
-				buf += 2;
-			}
-			else
-			{
-				len -= 2;
-				buf += 3;
-			}
-
-		}
-
-		return count;
-	}
-
-	// return number of code units in a null terminated string
-	size_type utf_length(const utf8* utf8_str) const
-	{
-		size_type cnt = 0;
-		while (*utf8_str++)
-			cnt++;
-
-		return cnt;
-	}
-
-	// return number of code units in a null terminated string
-	size_type utf_length(const utf32* utf32_str) const
-	{
-		size_type cnt = 0;
-		while (*utf32_str++)
-			cnt++;
-
-		return cnt;
-	}
-
-	// build an internal buffer with the string encoded as utf8 (remains valid until string is modified).
-    utf8* build_utf8_buff(void) const;
-
-	// compare two utf32 buffers
-	int	utf32_comp_utf32(const utf32* buf1, const utf32* buf2, size_type cp_count) const
-	{
-		if (!cp_count)
-			return 0;
-
-		while ((--cp_count) && (*buf1 == *buf2))
-			buf1++, buf2++;
-		
-		return *buf1 - *buf2;
-	}
-
-	// compare utf32 buffer with char buffer (chars are taken to be code-points in the range 0x00-0xFF)
-	int utf32_comp_char(const utf32* buf1, const char* buf2, size_type cp_count) const
-	{
-		if (!cp_count)
-			return 0;
-
-		while ((--cp_count) && (*buf1 == static_cast<utf32>(static_cast<unsigned char>(*buf2))))
-			buf1++, buf2++;
-
-		return *buf1 - static_cast<utf32>(static_cast<unsigned char>(*buf2));
-	}
-
-	// compare utf32 buffer with encoded utf8 data
-	int utf32_comp_utf8(const utf32* buf1, const utf8* buf2, size_type cp_count) const
-	{
-		if (!cp_count)
-			return 0;
-
-		utf32	cp;
-		utf8	cu;
-
-		do
-		{
-			cu = *buf2++;
-
-			if (cu < 0x80)
-			{
-				cp = (utf32)(cu);
-			}
-			else if (cu < 0xE0)
-			{
-				cp = ((cu & 0x1F) << 6);
-				cp |= (*buf2++ & 0x3F);
-			}
-			else if (cu < 0xF0)
-			{
-				cp = ((cu & 0x0F) << 12);
-				cp |= ((*buf2++ & 0x3F) << 6);
-				cp |= (*buf2++ & 0x3F);
-			}
-			else
-			{
-				cp = ((cu & 0x07) << 18);
-				cp |= ((*buf2++ & 0x3F) << 12);
-				cp |= ((*buf2++ & 0x3F) << 6);
-				cp |= (*buf2++ & 0x3F);
-			}
-
-		} while ((*buf1++ == cp) && (--cp_count));
-
-		return (*--buf1) - cp;
-	}
-
-	// return index of first occurrence of 'code_point' in std::string 'str', or npos if none
-	size_type find_codepoint(const std::string& str, utf32 code_point) const
-	{
-		size_type idx = 0, sze = (size_type)str.size();
-
-		while (idx != sze)
-		{
-			if (code_point == static_cast<utf32>(static_cast<unsigned char>(str[idx])))
-				return idx;
-
-			++idx;
-		}
-
-		return npos;
-	}
-
-	// return index of first occurrence of 'code_point' in utf8 encoded string 'str', or npos if none.  len is in code points.
-	size_type find_codepoint(const utf8* str, size_type len, utf32 code_point) const 
-	{
-		size_type idx = 0;
-
-		utf32	cp;
-		utf8	cu;
-
-		while (idx != len) {
-			cu = *str++;
-
-			if (cu < 0x80)
-			{
-				cp = (utf32)(cu);
-			}
-			else if (cu < 0xE0)
-			{
-				cp = ((cu & 0x1F) << 6);
-				cp |= (*str++ & 0x3F);
-			}
-			else if (cu < 0xF0)
-			{
-				cp = ((cu & 0x0F) << 12);
-				cp |= ((*str++ & 0x3F) << 6);
-				cp |= (*str++ & 0x3F);
-			}
-			else
-			{
-				cp = ((cu & 0x07) << 18);
-				cp |= ((*str++ & 0x3F) << 12);
-				cp |= ((*str++ & 0x3F) << 6);
-				cp |= (*str++ & 0x3F);
-			}
-
-			if (code_point == cp)
-				return idx;
-
-			++idx;
-		}
-
-		return npos;
-	}
-
-
-	// return index of first occurrence of 'code_point' in char array 'chars', or npos if none
-	size_type find_codepoint(const char* chars, size_type chars_len, utf32 code_point) const
-	{
-		for (size_type idx = 0; idx != chars_len; ++idx)
-		{
-			if (code_point == static_cast<utf32>(static_cast<unsigned char>(chars[idx])))
-				return idx;
-		}
-
-		return npos;
-	}
-
-};
-
-
-//////////////////////////////////////////////////////////////////////////
-// Comparison operators
-//////////////////////////////////////////////////////////////////////////
-/*!
-\brief
-	Return true if String \a str1 is equal to String \a str2
-*/
-bool CEGUIEXPORT	operator==(const String& str1, const String& str2);
-
-/*!
-\brief
-	Return true if String \a str is equal to std::string \a std_str
-*/
-bool CEGUIEXPORT	operator==(const String& str, const std::string& std_str);
-
-/*!
-\brief
-	Return true if String \a str is equal to std::string \a std_str
-*/
-bool CEGUIEXPORT	operator==(const std::string& std_str, const String& str);
-
-/*!
-\brief
-	Return true if String \a str is equal to null-terminated utf8 data \a utf8_str
-*/
-bool CEGUIEXPORT	operator==(const String& str, const utf8* utf8_str);
-
-/*!
-\brief
-	Return true if String \a str is equal to null-terminated utf8 data \a utf8_str
-*/
-bool CEGUIEXPORT	operator==(const utf8* utf8_str, const String& str);
-
-/*!
-\brief
-	Return true if String \a str1 is not equal to String \a str2
-*/
-bool CEGUIEXPORT	operator!=(const String& str1, const String& str2);
-
-/*!
-\brief
-	Return true if String \a str is not equal to std::string \a std_str
-*/
-bool CEGUIEXPORT	operator!=(const String& str, const std::string& std_str);
-
-/*!
-\brief
-	Return true if String \a str is not equal to std::string \a std_str
-*/
-bool CEGUIEXPORT	operator!=(const std::string& std_str, const String& str);
-
-/*!
-\brief
-	Return true if String \a str is not equal to null-terminated utf8 data \a utf8_str
-*/
-bool CEGUIEXPORT	operator!=(const String& str, const utf8* utf8_str);
-
-/*!
-\brief
-	Return true if String \a str is not equal to null-terminated utf8 data \a utf8_str
-*/
-bool CEGUIEXPORT	operator!=(const utf8* utf8_str, const String& str);
-
-/*!
-\brief
-	Return true if String \a str1 is lexicographically less than String \a str2
-*/
-bool CEGUIEXPORT	operator<(const String& str1, const String& str2);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically less than std::string \a std_str
-*/
-bool CEGUIEXPORT	operator<(const String& str, const std::string& std_str);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically less than std::string \a std_str
-*/
-bool CEGUIEXPORT	operator<(const std::string& std_str, const String& str);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically less than null-terminated utf8 data \a utf8_str
-*/
-bool CEGUIEXPORT	operator<(const String& str, const utf8* utf8_str);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically less than null-terminated utf8 data \a utf8_str
-*/
-bool CEGUIEXPORT	operator<(const utf8* utf8_str, const String& str);
-
-/*!
-\brief
-	Return true if String \a str1 is lexicographically greater than String \a str2
-*/
-bool CEGUIEXPORT	operator>(const String& str1, const String& str2);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically greater than std::string \a std_str
-*/
-bool CEGUIEXPORT	operator>(const String& str, const std::string& std_str);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically greater than std::string \a std_str
-*/
-bool CEGUIEXPORT	operator>(const std::string& std_str, const String& str);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically greater than null-terminated utf8 data \a utf8_str
-*/
-bool CEGUIEXPORT	operator>(const String& str, const utf8* utf8_str);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically greater than null-terminated utf8 data \a utf8_str
-*/
-bool CEGUIEXPORT	operator>(const utf8* utf8_str, const String& str);
-
-/*!
-\brief
-	Return true if String \a str1 is lexicographically less than or equal to String \a str2
-*/
-bool CEGUIEXPORT	operator<=(const String& str1, const String& str2);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically less than or equal to std::string \a std_str
-*/
-bool CEGUIEXPORT	operator<=(const String& str, const std::string& std_str);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically less than or equal to std::string \a std_str
-*/
-bool CEGUIEXPORT	operator<=(const std::string& std_str, const String& str);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically less than or equal to null-terminated utf8 data \a utf8_str
-*/
-bool CEGUIEXPORT	operator<=(const String& str, const utf8* utf8_str);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically less than or equal to null-terminated utf8 data \a utf8_str
-*/
-bool CEGUIEXPORT	operator<=(const utf8* utf8_str, const String& str);
-
-/*!
-\brief
-	Return true if String \a str1 is lexicographically greater than or equal to String \a str2
-*/
-bool CEGUIEXPORT	operator>=(const String& str1, const String& str2);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically greater than or equal to std::string \a std_str
-*/
-bool CEGUIEXPORT	operator>=(const String& str, const std::string& std_str);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically greater than or equal to std::string \a std_str
-*/
-bool CEGUIEXPORT	operator>=(const std::string& std_str, const String& str);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically greater than or equal to null-terminated utf8 data \a utf8_str
-*/
-bool CEGUIEXPORT	operator>=(const String& str, const utf8* utf8_str);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically greater than or equal to null-terminated utf8 data \a utf8_str
-*/
-bool CEGUIEXPORT	operator>=(const utf8* utf8_str, const String& str);
-
-/*!
-\brief
-	Return true if String \a str is equal to c-string \a c_str
-*/
-bool CEGUIEXPORT	operator==(const String& str, const char* c_str);
-
-/*!
-\brief
-	Return true if c-string \a c_str is equal to String \a str
-*/
-bool CEGUIEXPORT	operator==(const char* c_str, const String& str);
-
-/*!
-\brief
-	Return true if String \a str is not equal to c-string \a c_str
-*/
-bool CEGUIEXPORT	operator!=(const String& str, const char* c_str);
-
-/*!
-\brief
-	Return true if c-string \a c_str is not equal to String \a str
-*/
-bool CEGUIEXPORT	operator!=(const char* c_str, const String& str);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically less than c-string \a c_str
-*/
-bool CEGUIEXPORT	operator<(const String& str, const char* c_str);
-
-/*!
-\brief
-	Return true if c-string \a c_str is lexicographically less than String \a str
-*/
-bool CEGUIEXPORT	operator<(const char* c_str, const String& str);
-
-/*!
-\brief
-Return true if String \a str is lexicographically greater than c-string \a c_str
-*/
-bool CEGUIEXPORT	operator>(const String& str, const char* c_str);
-
-/*!
-\brief
-Return true if c-string \a c_str is lexicographically greater than String \a str
-*/
-bool CEGUIEXPORT	operator>(const char* c_str, const String& str);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically less than or equal to c-string \a c_str
-*/
-bool CEGUIEXPORT	operator<=(const String& str, const char* c_str);
-
-/*!
-\brief
-	Return true if c-string \a c_str is lexicographically less than or equal to String \a str
-*/
-bool CEGUIEXPORT	operator<=(const char* c_str, const String& str);
-
-/*!
-\brief
-	Return true if String \a str is lexicographically greater than or equal to c-string \a c_str
-*/
-bool CEGUIEXPORT	operator>=(const String& str, const char* c_str);
-
-/*!
-\brief
-	Return true if c-string \a c_str is lexicographically greater than or equal to String \a str
-*/
-bool CEGUIEXPORT	operator>=(const char* c_str, const String& str);
-
-//////////////////////////////////////////////////////////////////////////
-// Concatenation operator functions
-//////////////////////////////////////////////////////////////////////////
-/*!
-\brief
-	Return String object that is the concatenation of the given inputs
-
-\param str1
-	String object describing first part of the new string
-
-\param str2
-	String object describing the second part of the new string
-
-\return
-	A String object that is the concatenation of \a str1 and \a str2
-
-\exception std::length_error	Thrown if the resulting String would be too large.
-*/
-String CEGUIEXPORT	operator+(const String& str1, const String& str2);
-
-/*!
-\brief
-	Return String object that is the concatenation of the given inputs
-
-\param str
-	String object describing first part of the new string
-
-\param std_str
-	std::string object describing the second part of the new string
-
-\return
-	A String object that is the concatenation of \a str and \a std_str
-
-\exception std::length_error	Thrown if the resulting String would be too large.
-*/
-String CEGUIEXPORT	operator+(const String& str, const std::string& std_str);
-
-/*!
-\brief
-	Return String object that is the concatenation of the given inputs
-
-\param std_str
-	std::string object describing the first part of the new string
-
-\param str
-	String object describing the second part of the new string
-
-\return
-	A String object that is the concatenation of \a std_str and \a str
-
-\exception std::length_error	Thrown if the resulting String would be too large.
-*/
-String CEGUIEXPORT	operator+(const std::string& std_str, const String& str);
-
-/*!
-\brief
-	Return String object that is the concatenation of the given inputs
-
-\param str
-	String object describing first part of the new string
-
-\param utf8_str
-	Buffer containing null-terminated utf8 encoded data describing the second part of the new string
-
-\return
-	A String object that is the concatenation of \a str and \a utf8_str
-
-\exception std::length_error	Thrown if the resulting String would be too large.
-*/
-String CEGUIEXPORT	operator+(const String& str, const utf8* utf8_str);
-
-/*!
-\brief
-	Return String object that is the concatenation of the given inputs
-
-\param utf8_str
-	Buffer containing null-terminated utf8 encoded data describing the first part of the new string
-
-\param str
-	String object describing the second part of the new string
-
-\return
-	A String object that is the concatenation of \a str and \a utf8_str
-
-\exception std::length_error	Thrown if the resulting String would be too large.
-*/
-String CEGUIEXPORT	operator+(const utf8* utf8_str, const String& str);
-
-/*!
-\brief
-	Return String object that is the concatenation of the given inputs
-
-\param str
-	String object describing the first part of the new string
-
-\param code_point
-	utf32 code point describing the second part of the new string
-
-\return
-	A String object that is the concatenation of \a str and \a code_point
-
-\exception std::length_error	Thrown if the resulting String would be too large.
-*/
-String CEGUIEXPORT	operator+(const String& str, utf32 code_point);
-
-/*!
-\brief
-	Return String object that is the concatenation of the given inputs
-
-\param code_point
-	utf32 code point describing the first part of the new string
-
-\param str
-	String object describing the second part of the new string
-
-\return
-	A String object that is the concatenation of \a code_point and \a str
-
-\exception std::length_error	Thrown if the resulting String would be too large.
-*/
-String CEGUIEXPORT	operator+(utf32 code_point, const String& str);
-
-/*!
-\brief
-	Return String object that is the concatenation of the given inputs
-
-\param str
-	String object describing first part of the new string
-
-\param c_str
-	c-string describing the second part of the new string
-
-\return
-	A String object that is the concatenation of \a str and \a c_str
-
-\exception std::length_error	Thrown if the resulting String would be too large.
-*/
-String CEGUIEXPORT	operator+(const String& str, const char* c_str);
-
-/*!
-\brief
-	Return String object that is the concatenation of the given inputs
-
-\param c_str
-	c-string describing the first part of the new string
-
-\param str
-	String object describing the second part of the new string
-
-\return
-	A String object that is the concatenation of \a c_str and \a str
-
-\exception std::length_error	Thrown if the resulting String would be too large.
-*/
-String CEGUIEXPORT	operator+(const char* c_str, const String& str);
-
-
-//////////////////////////////////////////////////////////////////////////
-// Output (stream) functions
-//////////////////////////////////////////////////////////////////////////
-CEGUIEXPORT std::ostream& operator<<(std::ostream& s, const String& str);
-
-
-//////////////////////////////////////////////////////////////////////////
-// Modifying operations
-//////////////////////////////////////////////////////////////////////////
-/*!
-\brief
-	Swap the contents for two String objects
-
-\param str1
-	String object who's contents are to be swapped with \a str2
-
-\param str2
-	String object who's contents are to be swapped with \a str1
-
-\return
-	Nothing
-*/
-void CEGUIEXPORT swap(String& str1, String& str2);
-
-
-} // End of  CEGUI namespace section
-
-
-#endif	// end of guard _CEGUIString_h_
diff --git a/pcr/cegui-0.5/PKGBUILD b/pcr/cegui-0.5/PKGBUILD
deleted file mode 100644
index 60c3427cc..000000000
--- a/pcr/cegui-0.5/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Contributor: Jakub Luzny <limoto94@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=cegui-0.5
-pkgver=0.5.0b
-pkgrel=1
-pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
-arch=('i686' 'x86_64')
-url="http://crayzedsgui.sourceforge.net"
-#options=('!libtool')
-license=("MIT")
-depends=('pcre' 'glew' 'freetype2' 'libxml2' 'devil' 'freeglut' 'silly')
-conflicts=('cegui')
-source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz
-        CEGUIString.h)
-md5sums=('b42322a33c6a06eede76b15f75694a17'
-         'b0859a1316bb25ca4860a5d0052e9a04')
-
-
-build() {
-  cd $srcdir/CEGUI-0.5.0
-
-  cp $srcdir/CEGUIString.h include/
-  sed -i 's/ILvoid/void/' ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.cpp
-
-  ./configure  --prefix=/usr --enable-release --enable-shared --disable-expat --disable-tga --disable-samples --disable-xerces-c
-
-  make
-}
-
-package() {
-  cd $srcdir/CEGUI-0.5.0
- 
-  make DESTDIR=${pkgdir} install
-
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
-
-#category: lib
-md5sums=('b42322a33c6a06eede76b15f75694a17'
-         'b0859a1316bb25ca4860a5d0052e9a04')
diff --git a/pcr/cegui-0.6/PKGBUILD b/pcr/cegui-0.6/PKGBUILD
deleted file mode 100644
index fb28c2134..000000000
--- a/pcr/cegui-0.6/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Contributor: Lucio zara <pennega@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=cegui-0.6
-pkgver=0.6.2
-_pkgver=0.6.2b
-pkgrel=13
-
-pkgdesc="A free library providing windowing and widgets for graphics APIs/engines."
-arch=('i686' 'x86_64')
-url="http://www.cegui.org.uk/"
-license=('MIT')
-depends=('devil' 'freetype2' 'libxml2' 'lua' 'pcre'  'silly' 'glew' 'tinyxml' 'directfb' 'freeglut')
-makedepends=()
-options=('!libtool')
-conflicts=('cegui')
-source=("http://downloads.sourceforge.net/crayzedsgui/CEGUI-${_pkgver}.tar.gz")
-md5sums=('4fbd95e5a2ac1c7acf2a8f5df3ac6b93')
-	
-
-build() {
-  cd ${srcdir}/CEGUI-${pkgver}
-  #PATCH
-  #sed -i '1i#include <cstddef>' include/CEGUIString.h
-  sed -i '/#include <stdexcept>/a\#include <cstddef>' include/CEGUIString.h
-  sed -i '/#include "CEGUIDynamicModule.h"/a\#include <algorithm>' RendererModules/directfbRenderer/directfb-renderer.cpp
-  sed -i 's:TiXmlNode\:\::TiXmlNode\:\:TINYXML_:g' XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp
-  sed -i 's:ILvoid:void:g' ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.cpp
-
-  PYTHON=python2 \
-  ./configure --prefix=/usr \
-	      --sysconfdir=/etc \
-	      --localstatedir=/var \
-	      --disable-static \
-	      --disable-xerces-c \
-	      --disable-samples \
-	      --enable-devil \
-	      --enable-silly \
-	      --enable-lua-module \
-	      --enable-python-module \
-	      --with-default-image-codec=SILLYImageCodec
-
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/CEGUI-${pkgver}
-  install -d ${pkgdir}/usr/share/licenses/${pkgname} || return 1
-
-  make DESTDIR=${pkgdir} install || return 1
-
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
-}
-md5sums=('4fbd95e5a2ac1c7acf2a8f5df3ac6b93')
-md5sums=('4fbd95e5a2ac1c7acf2a8f5df3ac6b93')
diff --git a/pcr/cgdb/PKGBUILD b/pcr/cgdb/PKGBUILD
deleted file mode 100644
index e623d5a96..000000000
--- a/pcr/cgdb/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor: Javier ‘Phrodo_00’ Aravena <Phrodo.00@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=cgdb
-pkgver=0.6.6
-pkgrel=1
-pkgdesc="Curses-based interface to the GNU Debugger"
-arch=('i686' 'x86_64')
-url="http://cgdb.sourceforge.net/"
-license=('GPL')
-depends=('readline>=5.1' 'ncurses' 'gdb')
-source=("http://downloads.sourceforge.net/cgdb/$pkgname-$pkgver.tar.gz")
-md5sums=('394b542b495755ab8392b7e88dace744')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
-md5sums=('394b542b495755ab8392b7e88dace744')
diff --git a/pcr/cherokee/PKGBUILD b/pcr/cherokee/PKGBUILD
deleted file mode 100644
index 1d3b3d941..000000000
--- a/pcr/cherokee/PKGBUILD
+++ /dev/null
@@ -1,100 +0,0 @@
-# $Id: PKGBUILD 63849 2012-02-06 06:17:28Z foutrelis $
-# Maintainer:  Fernando Jiménez Solano <fjim@sdfeu.org>
-# Contributor: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Link Dupont <link@subpop.net>
-# Contributor: Pierre Bourdin <pierre@pi3rrot.net>
-
-pkgname=cherokee
-pkgver=1.2.103
-pkgrel=1
-pkgdesc="A very fast, flexible and easy to configure Web Server (Parabola rebranded)"
-arch=('i686' 'x86_64')
-url="http://www.cherokee-project.com/"
-license=('GPL2')
-depends=('openssl' 'pcre')
-makedepends=('python2' 'gettext' 'libldap' 'pam' 'libmysqlclient'
-             'ffmpeg' 'geoip')
-optdepends=('python2: cherokee-admin (administrative web interface)'
-            'libldap: ldap validator'
-            'pam: pam validator'
-            'libmysqlclient: mysql validator'
-            'ffmpeg: Audio/Video streaming handler'
-            'geoip: GeoIP rule module'
-            'rrdtool: RRDtool based information collector')
-backup=('etc/cherokee/cherokee.conf'
-        'etc/logrotate.d/cherokee'
-        'etc/pam.d/cherokee')
-options=('!libtool')
-source=(https://github.com/cherokee/webserver/archive/v1.2.103.zip
-        cherokee.rc
-        cherokee.logrotate
-#        fix-ctk-path-handler-match.patch
-#	cherokee-1.2.101-ffmpeg0.11.patch
-  cherokee.service)
-
-sha256sums=('0e125cba2ad2d0dc48ecca3af4894b92ec5fab422a9d7d27fd0c7a74751e5f35'
-            '4c06cebfab8b68edd4967c020bfb41b077cfff10d76596d1ed192d0b6cedbd86'
-            '20e26d633f8c1cd90eb21f41dd163b73a83846e405b1ce995e072c4efefc522e'
-#            '2bd05e0181024c9bd02d828e8329d4d96a779e4870b1fc4f18aa8667d8c6a630'
-#            '6bcdcb8eaccb5516478a0c36960fbacc3d68f8bc326b9b526c388e0607a65116'
-            '415a2e4cd7d04afe21e502dd0ad76301f85a7087cadbfdab5566bec469679a68')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Fix path matching bug in CTK apps (e.g. market)
-#  patch -Np1 -i "$srcdir/fix-ctk-path-handler-match.patch"
-  # Fix this bug : https://bugs.mageia.org/show_bug.cgi?id=6145
-#  patch -Np1 -i "$srcdir/cherokee-1.2.101-ffmpeg0.11.patch"
-
-  # Use subdirectory for logs
-  sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre
-
-  # Use Python 2 in cherokee-admin
-  sed -i 's/"python"/"python2"/' cherokee/main_admin.c
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-static \
-    --with-wwwroot=/srv/http \
-    --with-wwwuser=http \
-    --with-wwwgroup=http \
-    --with-python=python2 \
-    --enable-os-string="Parabola GNU/Linux-libre"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make -j1 DESTDIR="$pkgdir" install
-
-  # PAM configuration file for cherokee
-  install -D -m644 pam.d_cherokee "$pkgdir/etc/pam.d/$pkgname"
-
-  # Fix ownership of /var/lib/cherokee/graphs
-  chown -R http:http "$pkgdir/var/lib/$pkgname/graphs"
-
-  # Use Python 2
-  sed -i 's/env python$/&2/' \
-    "$pkgdir/usr/share/cherokee/admin/"{server,upgrade_config}.py \
-    "$pkgdir/usr/bin/"{CTK-run,cherokee-{admin-launcher,tweak}}
-  sed -i -r "s/['\"]python/&2/g" \
-    "$pkgdir/usr/share/cherokee/admin/wizards/django.py"
-
-  # Compile Python scripts
-  python2 -m compileall "$pkgdir"
-  python2 -O -m compileall "$pkgdir"
-
-  install -d -o http -g http "$pkgdir/var/log/$pkgname"
-  install -D "$srcdir/$pkgname.rc" "$pkgdir/etc/rc.d/$pkgname"
-  install -Dm644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
-  install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-
-  # Cleanup
-  rm -rf "$pkgdir/srv"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/cherokee/cherokee.logrotate b/pcr/cherokee/cherokee.logrotate
deleted file mode 100644
index 19207fd02..000000000
--- a/pcr/cherokee/cherokee.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/cherokee/*.error /var/log/cherokee/*.access {
-   daily
-   rotate 14
-   compress
-   sharedscripts
-   postrotate
-      /bin/kill -HUP `cat /var/run/cherokee.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/pcr/cherokee/cherokee.rc b/pcr/cherokee/cherokee.rc
deleted file mode 100644
index 2d413dc13..000000000
--- a/pcr/cherokee/cherokee.rc
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-daemon_name=cherokee
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-    if [ ! -f /var/run/$daemon_name.pid ] && $daemon_name -d &>/dev/null; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid
-    if kill $PID &>/dev/null; then
-      rm_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  reload)
-    stat_busy "Reloading $daemon_name daemon"
-    [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid
-    if kill -HUP $PID &>/dev/null; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    stat_busy "Restarting $daemon_name daemon"
-    [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid
-    if kill -USR1 $PID &>/dev/null; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|reload|restart|status}"
-esac
-
-exit 0
diff --git a/pcr/cherokee/cherokee.service b/pcr/cherokee/cherokee.service
deleted file mode 100644
index 7a5b95e43..000000000
--- a/pcr/cherokee/cherokee.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Cherokee web server
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/cherokee
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/chm2pdf/PKGBUILD b/pcr/chm2pdf/PKGBUILD
deleted file mode 100644
index 16586e732..000000000
--- a/pcr/chm2pdf/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor: Rodrigo Coacci <rcoacci@gmail.com>
-# Contributor: fes0
-# Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.IO>
-
-pkgname=chm2pdf
-pkgver=0.9.1
-pkgrel=1
-pkgdesc="A simple Python script that converts CHM files into PDF files."
-arch=('any')
-license=('GPL2')
-url="http://code.google.com/p/chm2pdf/"
-depends=('chmlib' 'python2' 'python2-pychm' 'htmldoc')
-optdepends=('beautiful-soup: A Python HTML/XML parser designed for quick turnaround projects like screen-scraping')
-source=('http://chm2pdf.googlecode.com/files/chm2pdf-0.9.1.tar.gz')
-
-
-build() {
-	sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $srcdir/$pkgname-$pkgver/chm2pdf
-	cd $srcdir/$pkgname-$pkgver
-	python2 setup.py install --root=$startdir/pkg
-}
-
diff --git a/pcr/cinclude2dot/PKGBUILD b/pcr/cinclude2dot/PKGBUILD
deleted file mode 100644
index bab8804d1..000000000
--- a/pcr/cinclude2dot/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=cinclude2dot
-pkgver=1.1
-pkgrel=2
-pkgdesc="A Perl script which analyses C/C++ code and produces a #include dependency graph."
-arch=('any')
-url="http://flourish.org/cinclude2dot/"
-license=('GPL')
-depends=('perl')
-source=('http://flourish.org/cinclude2dot/cinclude2dot'
-	'http://flourish.org/cinclude2dot/cinclude2dot.1')
-
-build() {
-  gzip -c cinclude2dot.1 > cinclude2dot.1.gz
-}
-
-package() {
-  cd "$srcdir"
-  install -d "$pkgdir/usr/bin"
-  install -m755 cinclude2dot "$pkgdir/usr/bin"
-  install -d "$pkgdir/usr/share/man/man1"
-  install -m644 cinclude2dot.1.gz "$pkgdir/usr/share/man/man1"
-}
-
-md5sums=('372ca2cba1170ae4e040f7f84b7b98b5'
-         'bfdc230a26db0c66b238e6380e6badbe')
diff --git a/pcr/cinepaint-lts/LICENSE b/pcr/cinepaint-lts/LICENSE
deleted file mode 100644
index 746207229..000000000
--- a/pcr/cinepaint-lts/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2005, Kai-Uwe Behrmann
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met: 
-    * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer. 
-    * Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.ntributors may be used to endorse or promote
-    products derived from this software without specific prior written
-    permission. 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
diff --git a/pcr/cinepaint-lts/PKGBUILD b/pcr/cinepaint-lts/PKGBUILD
deleted file mode 100644
index da085729f..000000000
--- a/pcr/cinepaint-lts/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id$
-# Maintainer: tobias [tobias.archlinux.org]
-# Contributor: tobias [tobias.justdreams.de]
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=cinepaint-lts
-pkgver=1.0
-pkgrel=1
-pkgdesc='Sophisticated graphics manipulation programm supporting > 8bit pictures'
-arch=(i686 x86_64 mips64el)
-license=(LGPL GPL MIT)
-url=http://www.${pkgname%-lts}.org
-depends=(gtk2 openexr lcms libxpm fltk ftgl libxxf86vm)
-makedepends=(python2 gutenprint)
-optdepends=(
-  'python2: for python plug-ins'
-  'gutenprint: for print plug-ins'
-  'ghostscript: for pdf plug-ins'
-)
-conflicts=(${pkgname%-lts})
-provides=(${pkgname%-lts})
-options=(!libtool)
-install=${pkgname%-lts}.install
-source=(
-  http://sourceforge.net/projects/${pkgname%-lts}/files/CinePaint/${pkgname%-lts}-$pkgver.tgz
-  LICENSE
-  ${pkgname%-lts}-libpng15.patch
-)
-md5sums=(
-  7dfdb005d246578392ac9bd500534804
-  169085743f667c250ea2e4022efecf5f
-  6d3f65b72e0f1569a9efe1bcab1b8124
-)
-
-build() {
-  cd $srcdir/${pkgname%-lts}
-
-  rm config.{sub,guess}
-  ln -s /usr/share/automake-1.12/config.sub   config.sub
-  ln -s /usr/share/automake-1.12/config.guess config.guess
-
-  patch -p1 -i ../${pkgname%-lts}-libpng15.patch
-  find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} +
-  sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in
-  sed -i -e '1 s/^/#include <unistd.h>\n/' plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
-
-  sh autogen.sh
-  LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \
-    --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2
-  sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \
-    plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile
-  make
-}
-
-package() {
-  cd $srcdir/${pkgname%-lts}
-  make DESTDIR=$pkgdir install
-  sed -i -e "s|-I$srcdir/${pkgname%-lts}||" -e "s|-I$srcdir/${pkgname%-lts}/lib||" -e "/lib${pkgname%-lts}.la/d" \
-    -e "s|${srcdir}/${pkgname%-lts}/lib/.libs/\$dlname||" $pkgdir/usr/bin/${pkgname%-lts}tool
-  sed -i "s/${pkgname%-lts}.png/${pkgname%-lts}/" $pkgdir/usr/share/applications/${pkgname%-lts}.desktop
-  install -D -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/pcr/cinepaint-lts/cinepaint-libpng15.patch b/pcr/cinepaint-lts/cinepaint-libpng15.patch
deleted file mode 100644
index 619d9af42..000000000
--- a/pcr/cinepaint-lts/cinepaint-libpng15.patch
+++ /dev/null
@@ -1,446 +0,0 @@
-diff -Nur a/plug-ins/png/png.c b/plug-ins/png/png.c
---- a/plug-ins/png/png.c	2006-11-24 18:52:55.000000000 -0200
-+++ b/plug-ins/png/png.c	2012-10-12 01:07:56.452245955 -0200
-@@ -390,6 +390,16 @@
-   gchar		*progress;	/* Title for progress display... */
-   guchar	alpha[256],	/* Index -> Alpha */
-   		*alpha_ptr;	/* Temporary pointer */
-+  png_byte     color_type;
-+  png_byte     bit_depth;
-+  png_colorp palette;
-+  int num_palette;
-+  png_charpp iccp_name;
-+  int compression_type;
-+  png_bytepp iccp_profile;
-+  png_uint_32 iccp_proflen;
-+  png_uint_32 width, height;
-+  png_byte channels;
- 
-  /*
-   * PNG 0.89 and newer have a sane, forwards compatible constructor.
-@@ -405,7 +415,7 @@
-   info = (png_infop)calloc(sizeof(png_info), 1);
- #endif /* PNG_LIBPNG_VER > 88 */
- 
--  if (setjmp (pp->jmpbuf))
-+  if (setjmp (png_jmpbuf(pp)))
-   {
-     g_message ("%s\nPNG error. File corrupted?", filename);
-     return image;
-@@ -442,21 +452,26 @@
-   */
- 
-   png_read_info(pp, info);
-+  color_type = png_get_color_type(pp, info);
-+  width=png_get_image_width(pp, info);
-+  height=png_get_image_height(pp, info);
- 
-  /*
-   * Latest attempt, this should be my best yet :)
-   */
- 
-+  bit_depth = png_get_bit_depth(pp, info);
-+
- #ifndef WORDS_BIGENDIAN
--  if(info->bit_depth == 16)
-+  if(bit_depth == 16)
- 	  png_set_swap(pp);
- #endif
- 
--  if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) {
-+  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
-     png_set_expand(pp);
-   }
- 
--  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) {
-+  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) {
-     png_set_packing(pp);
-   }
- 
-@@ -464,8 +479,8 @@
-   * Expand G+tRNS to GA, RGB+tRNS to RGBA
-   */
- 
--  if (info->color_type != PNG_COLOR_TYPE_PALETTE &&
--                       (info->valid & PNG_INFO_tRNS)) {
-+  if (color_type != PNG_COLOR_TYPE_PALETTE &&
-+      (png_get_valid(pp, info, PNG_INFO_tRNS))) {
-     png_set_expand(pp);
-   }
- 
-@@ -482,7 +497,7 @@
- 
- #if PNG_LIBPNG_VER > 99
-   if (png_get_valid(pp, info, PNG_INFO_tRNS) &&
--      info->color_type == PNG_COLOR_TYPE_PALETTE)
-+      color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_get_tRNS(pp, info, &alpha_ptr, &num, NULL);
-     /* Copy the existing alpha values from the tRNS chunk */
-@@ -505,9 +520,9 @@
- 
-   png_read_update_info(pp, info);
-   
--  if(info->bit_depth==16)
-+  if(bit_depth==16)
-   {
--	  switch (info->color_type)
-+	  switch (color_type)
- 	  {
- 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
- 			  bpp        = 6;
-@@ -545,7 +560,7 @@
-   }
-   else
-   {
--	  switch (info->color_type)
-+	  switch (color_type)
- 	  {
- 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
- 			  bpp        = 3;
-@@ -582,7 +597,7 @@
- 	  };
-   }
- 
--  image = gimp_image_new(info->width, info->height, image_type);
-+  image = gimp_image_new(width, height, image_type);
-   if (image == -1)
-   {
-     g_message("Can't allocate new image\n%s", filename);
-@@ -595,7 +610,7 @@
-   * Create the "background" layer to hold the image...
-   */
- 
--  layer = gimp_layer_new(image, _("Background"), info->width, info->height,
-+  layer = gimp_layer_new(image, _("Background"), width, height,
-                          layer_type, 100, NORMAL_MODE);
-   gimp_image_add_layer(image, layer, 0);
- 
-@@ -627,20 +642,21 @@
- 
-   empty= 0; /* by default assume no full transparent palette entries */
- 
--  if (info->color_type & PNG_COLOR_MASK_PALETTE) {
-+  if (color_type & PNG_COLOR_MASK_PALETTE) {
- 
- #if PNG_LIBPNG_VER > 99
-+    png_get_PLTE(pp, info, &palette, &num_palette);
-     if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
-       for (empty= 0; empty < 256 && alpha[empty] == 0; ++empty);
-         /* Calculates number of fully transparent "empty" entries */
- 
--      gimp_image_set_cmap(image, (guchar *) (info->palette + empty),
--                          info->num_palette - empty);
-+      gimp_image_set_cmap(image, (guchar *) (palette + empty),
-+                          num_palette - empty);
-     } else {
--      gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
-+      gimp_image_set_cmap(image, (guchar *)palette, num_palette);
-     }
- #else
--    gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
-+    gimp_image_set_cmap(image, (guchar *)palette, num_palette);
- #endif /* PNG_LIBPNG_VER > 99 */
- 
-   }
-@@ -659,18 +675,19 @@
-   */
- 
-   tile_height = gimp_tile_height ();
--  pixel       = g_new(guchar, tile_height * info->width * bpp);
-+  pixel       = g_new(guchar, tile_height * width * bpp);
-   pixels      = g_new(guchar *, tile_height);
-+  channels=png_get_channels(pp, info);
- 
--  if(info->bit_depth==16)
-+  if(bit_depth==16)
-   {
- 	  for (i = 0; i < tile_height; i ++)
--		  pixels[i] = pixel + info->width * info->channels * i * 2;
-+		  pixels[i] = pixel + width * channels * i * 2;
-   }
-   else
-   {
- 	  for (i = 0; i < tile_height; i ++)
--		  pixels[i] = pixel + info->width * info->channels * i;
-+		  pixels[i] = pixel + width * channels * i;
-   }
- 
-   for (pass = 0; pass < num_passes; pass ++)
-@@ -680,11 +697,11 @@
- 	   */
- 
- 	  for (begin = 0, end = tile_height;
--			  begin < info->height;
-+			  begin < height;
- 			  begin += tile_height, end += tile_height)
- 	  {
--		  if (end > info->height)
--			  end = info->height;
-+		  if (end > height)
-+			  end = height;
- 
- 		  num = end - begin;
- 
-@@ -697,20 +714,21 @@
- 		  gimp_pixel_rgn_set_rect(&pixel_rgn, pixel, 0, begin,
- 				  drawable->width, num);
- 
--		  gimp_progress_update(((double)pass + (double)end / (double)info->height) /
-+		  gimp_progress_update(((double)pass + (double)end / (double)height) /
- 				  (double)num_passes);
- 	  };
-   };
- 
- #if defined(PNG_iCCP_SUPPORTED)
-   /* set icc profile */
--  if (info->iccp_proflen > 0) {
--    gimp_image_set_icc_profile_by_mem (image, info->iccp_proflen,
--                                              info->iccp_profile,
--                                              ICC_IMAGE_PROFILE);
-+  png_get_iCCP(pp, info,  (png_charpp)iccp_name, &compression_type, iccp_profile, &iccp_proflen);
-+  if (iccp_proflen > 0) {
-+    gimp_image_set_icc_profile_by_mem (image, iccp_proflen,
-+                                      (gchar *)iccp_profile,
-+                                      ICC_IMAGE_PROFILE);
-     printf ("%s:%d %s() set embedded profile \"%s\"\n",
-              __FILE__,__LINE__,__func__,
--                                              info->iccp_name);
-+           (char *)iccp_name);
-   }
- #endif
- 
-@@ -808,6 +826,14 @@
-                 blue;           /* Used for palette background */
-   time_t	cutime;         /* Time since epoch */
-   struct tm	*gmt;		/* GMT broken down */
-+  png_byte     color_type;
-+  png_byte     bit_depth;
-+  int filter_method=0;
-+  png_colorp palette;
-+  int num_palette;
-+  png_charpp iccp_name;
-+  png_uint_32 height;
-+  int compression_type;
- 
-  /*
-   * PNG 0.89 and newer have a sane, forwards compatible constructor.
-@@ -824,7 +850,7 @@
-   info = (png_infop)calloc(sizeof(png_info), 1);
- #endif /* PNG_LIBPNG_VER > 88 */
- 
--  if (setjmp (pp->jmpbuf))
-+  if (setjmp (png_jmpbuf(pp)))
-   {
-     g_message ("%s\nPNG error. Couldn't save image", filename);
-     return 0;
-@@ -858,87 +884,75 @@
-   type     = gimp_drawable_type (drawable_ID);
- 
-  /*
--  * Set the image dimensions, bit depth, interlacing and compression
--  */
--
--  png_set_compression_level (pp, pngvals.compression_level);
--
--  info->width          = drawable->width;
--  info->height         = drawable->height;
--  info->interlace_type = pngvals.interlaced;
--
-- /*
-   * Set color type and remember bytes per pixel count 
-   */
- 
-   switch (type)
-   {
-     case RGB_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_RGB;
-+	bit_depth      = 8;
-         bpp              = 3;
-         break;
-     case RGBA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+	bit_depth      = 8;
-         bpp              = 4;
-         break;
-     case GRAY_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_GRAY;
-+	bit_depth      = 8;
-         bpp              = 1;
-         break;
-     case GRAYA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-+	bit_depth      = 8;
-         bpp              = 2;
-         break;
-     case INDEXED_IMAGE :
- 	bpp		 = 1;
--	info->bit_depth      = 8;
--        info->color_type = PNG_COLOR_TYPE_PALETTE;
--	info->valid      |= PNG_INFO_PLTE;
--        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
--        info->num_palette= num_colors;
-+	bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_PALETTE;
-+        png_get_valid(pp, info, PNG_INFO_PLTE);
-+        png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
-         break;
-     case INDEXEDA_IMAGE :
- 	bpp		 = 2;
--	info->bit_depth      = 8;
--	info->color_type = PNG_COLOR_TYPE_PALETTE;
-+	bit_depth      = 8;
-+	color_type = PNG_COLOR_TYPE_PALETTE;
- 	respin_cmap (pp, info, image_ID); /* fix up transparency */
- 	break;
-     case U16_RGB_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_RGB;
-+	bit_depth      = 16;
-         bpp              = 6;
-         break;
-     case U16_RGBA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+	bit_depth      = 16;
-         bpp              = 8;
-         break;
-     case U16_GRAY_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_GRAY;
-+	bit_depth      = 16;
-         bpp              = 2;
-         break;
-     case U16_GRAYA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-+	bit_depth      = 16;
-         bpp              = 4;
-         break;
-     case U16_INDEXED_IMAGE :
- 	bpp		 = 2;
--	info->bit_depth      = 16;
--        info->color_type = PNG_COLOR_TYPE_PALETTE;
--	info->valid      |= PNG_INFO_PLTE;
--        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
--        info->num_palette= num_colors;
-+	bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_PALETTE;
-+        png_get_valid(pp, info, PNG_INFO_PLTE);
-+        png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
-         break;
-     case U16_INDEXEDA_IMAGE :
- 	bpp		 = 4;
--	info->bit_depth      = 16;
--	info->color_type = PNG_COLOR_TYPE_PALETTE;
-+	bit_depth      = 16;
-+	color_type = PNG_COLOR_TYPE_PALETTE;
- 	respin_cmap (pp, info, image_ID); /* fix up transparency */
- 	break;
-     default:
-@@ -950,16 +964,22 @@
-   * Fix bit depths for (possibly) smaller colormap images
-   */
-   
--  if (info->valid & PNG_INFO_PLTE) {
--    if (info->num_palette <= 2)
--      info->bit_depth= 1;
--    else if (info->num_palette <= 4)
--      info->bit_depth= 2;
--    else if (info->num_palette <= 16)
--      info->bit_depth= 4;
-+  if (png_get_valid(pp, info, PNG_INFO_PLTE)) {
-+    png_get_PLTE(pp, info, &palette, &num_palette);
-+    if (num_palette <= 2)
-+      bit_depth= 1;
-+    else if (num_palette <= 4)
-+      bit_depth= 2;
-+    else if (num_palette <= 16)
-+      bit_depth= 4;
-     /* otherwise the default is fine */
-   }
- 
-+ png_set_compression_level (pp, pngvals.compression_level);
-+ png_set_IHDR(pp, info, drawable->width, drawable->height,
-+             bit_depth, color_type, pngvals.interlaced, compression_type, filter_method);
-+
-+
-   // write icc profile
- #if defined(PNG_iCCP_SUPPORTED)
-   if (gimp_image_has_icc_profile (image_ID, ICC_IMAGE_PROFILE)) {
-@@ -970,10 +990,10 @@
-                                                 ICC_IMAGE_PROFILE);
-     png_set_iCCP (pp, info,
-            gimp_image_get_icc_profile_description (image_ID, ICC_IMAGE_PROFILE),
--                  0, buffer, size);
-+                  0, (png_const_bytep)buffer, size);
-     printf ("%s:%d %s() embedd icc profile \"%s\"\n",
-              __FILE__,__LINE__,__func__,
--                                              info->iccp_name);
-+           (char *)iccp_name);
-   }
- #endif
- 
-@@ -1039,13 +1059,13 @@
-   * Convert unpacked pixels to packed if necessary
-   */
- 
--  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8)
-+  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8)
-     png_set_packing(pp);
- 
-   /* Set swapping for 16 bit per sample images */
-   
- #ifndef WORDS_BIGENDIAN
--  if (info->bit_depth == 16)
-+  if (bit_depth == 16)
- 	  png_set_swap(pp);
- #endif
-   
-@@ -1063,6 +1083,7 @@
- 
-   gimp_pixel_rgn_init(&pixel_rgn, drawable, 0, 0, drawable->width,
-                       drawable->height, FALSE, FALSE);
-+  height=png_get_image_height(pp, info);
- 
-   for (pass = 0; pass < num_passes; pass ++)
-   {
-@@ -1077,7 +1098,7 @@
- 	num = end - begin;
- 	
- 	gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num);
--        if (info->valid & PNG_INFO_tRNS) {
-+        if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
-           for (i = 0; i < num; ++i) {
- 	    fixed= pixels[i];
-             for (k = 0; k < drawable->width; ++k) {
-@@ -1085,7 +1106,7 @@
-             }
-           }
-        /* Forgot this case before, what if there are too many colors? */
--        } else if (info->valid & PNG_INFO_PLTE && bpp == 2) {
-+        } else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) {
-           for (i = 0; i < num; ++i) {
- 	    fixed= pixels[i];
-             for (k = 0; k < drawable->width; ++k) {
-@@ -1097,7 +1118,6 @@
- 	png_write_rows (pp, pixels, num);
--	
- 	gimp_progress_update (((double)pass + (double)end /
--                    (double)info->height) / (double)num_passes);
-+                    (double)height) / (double)num_passes);
-       };
-   };
- 
diff --git a/pcr/cinepaint-lts/cinepaint.install b/pcr/cinepaint-lts/cinepaint.install
deleted file mode 100644
index 5e5cfef4d..000000000
--- a/pcr/cinepaint-lts/cinepaint.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/pcr/cjdns-git/PKGBUILD b/pcr/cjdns-git/PKGBUILD
deleted file mode 100644
index 2e9646006..000000000
--- a/pcr/cjdns-git/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# Maintainer: Prurigro
-# Contributor: Prurigro
-# Contributor: Werecat
-# Contributor: Xyne
-
-_pkgname=cjdns
-pkgname=${_pkgname}-git
-pkgver=0.3.1473
-pkgrel=1
-pkgdesc="A routing engine designed for security, scalability, speed and ease of use."
-url="https://github.com/cjdelisle/${_pkgname}"
-license=('GPL3')
-makedepends=('git' 'cmake' 'python2')
-optdepends=('python2: required by the python cjdnsadmin utilities')
-arch=('i686' 'x86_64' 'armv6h' 'armv7h')
-install=${pkgname}.install
-backup=("etc/default/${_pkgname}")
-
-source=("git://github.com/cjdelisle/${_pkgname}.git#branch=master")
-sha256sums=('SKIP')
-
-pkgver() {
-    cd "${srcdir}/${_pkgname}"
-    git describe --always | sed 's|-|.|g;s|[^\.]*\.||;s|\.[^\.]*$||'
-}
-
-prepare() {
-    cd "${srcdir}/${_pkgname}"
-
-    ## Clean previous builds and resync
-    ./clean
-
-    mkdir build
-
-    ## Set occurances of python to python2 due to a naming conflict between Debian and Archlinux
-    find "${srcdir}/${_pkgname}"/contrib/python \
-         -type f \
-         -exec sed -i 's@/usr/bin/python\s*$@/usr/bin/python2@;s@/usr/bin/env\ python@/usr/bin/env\ python2@' {} \+
-}
-
-build() {
-    cd "${srcdir}"/${_pkgname}
-
-    ##  Disable Arch's generic makepkg optimizations (set via /etc/makepkg.conf) in favour of those specified by cjdns
-    unset MAKEFLAGS
-#    unset CFLAGS
-#    unset CPPFLAGS
-
-    ##  Build using the ./do script
-    export NO_DEBUG=1
-    cd build
-    cmake ..
-    make
-}
-
-## Package creation helper functions
-_package_cjdns() {
-    install -D -m755 "${srcdir}"/${_pkgname}/build/admin/angel/cjdroute2 "${pkgdir}"/usr/bin/cjdroute
-    install -D -m755 "${srcdir}"/${_pkgname}/build/admin/angel/${_pkgname} "${pkgdir}"/usr/bin/${_pkgname}
-    install -D -m644 "${srcdir}"/${_pkgname}/contrib/systemd/${_pkgname}.service "${pkgdir}"/usr/lib/systemd/system/${_pkgname}.service
-    install -D -m755 "${srcdir}"/${_pkgname}/contrib/bash/i_am_stupid.sh "${pkgdir}"/usr/bin/cjdns-recoverconfig
-}
-_package_pyutils() {
-    install -D -m644 "${srcdir}"/${_pkgname}/contrib/python/cjdnsadmin/cjdnsadmin.py "${pkgdir}"/usr/lib/$(python2-config --libs | grep -o -E python2.*)/cjdnsadmin/cjdnsadmin.py
-    install -D -m644 "${srcdir}"/${_pkgname}/contrib/python/cjdnsadmin/bencode.py "${pkgdir}"/usr/lib/$(python2-config --libs | grep -o -E python2.*)/cjdnsadmin/bencode.py
-    install -D -m644 "${srcdir}"/${_pkgname}/contrib/python/cjdnsadmin/__init__.py "${pkgdir}"/usr/lib/$(python2-config --libs | grep -o -E python2.*)/cjdnsadmin/__init__.py
-    install -D -m755 "${srcdir}"/${_pkgname}/contrib/python/cjdnslog "${pkgdir}"/usr/bin/cjdns-log
-    install -D -m755 "${srcdir}"/${_pkgname}/contrib/python/dumptable "${pkgdir}"/usr/bin/cjdns-dumptable
-    install -D -m755 "${srcdir}"/${_pkgname}/contrib/python/findnodes "${pkgdir}"/usr/bin/cjdns-findnodes
-    install -D -m755 "${srcdir}"/${_pkgname}/contrib/python/pingAll.py "${pkgdir}"/usr/bin/cjdns-pingAll
-}
-
-## Package creation function: comment out a helper function to remove its associated functionality
-package() {
-    _package_cjdns ## Core binaries (cjdns and cjdroute), a systemd service file and a config recovery script written in bash
-    _package_pyutils ## Miscellaneous python2-based cjdns admin port utility scripts and libraries
-}
diff --git a/pcr/cjdns-git/cjdns-git.install b/pcr/cjdns-git/cjdns-git.install
deleted file mode 100644
index 5e9e1a64c..000000000
--- a/pcr/cjdns-git/cjdns-git.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-    if [ $(ps -A | ps -A | grep -cE "systemd$") = 1 ]; then
-        systemctl --system daemon-reload
-    fi
-
-    if [ -z $(type -P python2) ]; then
-        echo "You don't currently have python2 installed. It isn't required to use cjdns, but some scripts have been included in the package that won't function without"
-    fi
-
-    echo "By default, the cjdns configuration file is expected to be located @ /etc/cjdroute.conf"
-}
-
-post_upgrade() {
-    if [ $(ps -A | ps -A | grep -cE "systemd$") = 1 ]; then
-        systemctl --system daemon-reload
-    fi
-
-    if [ $(grep -c cjdns /etc/passwd) = 1 ]; then
-        echo "The user 'cjdns' has been detected on your system but is no longer required by this package; if it was installed by a previous version of this package, it can now be safely deleted."
-    fi
-}
diff --git a/pcr/cl-ppcre/LICENSE b/pcr/cl-ppcre/LICENSE
deleted file mode 100644
index 8f122e6eb..000000000
--- a/pcr/cl-ppcre/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2002-2007, Dr. Edmund Weitz.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials
-    provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR 'AS IS' AND ANY EXPRESSED
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/pcr/cl-ppcre/PKGBUILD b/pcr/cl-ppcre/PKGBUILD
deleted file mode 100644
index b136c4ac9..000000000
--- a/pcr/cl-ppcre/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: mrshpot <mrshpot at gmail dot com>
-# Contributor: veox <cy at wre dot ath dot cx>
-# Contributor: joyfulgirl <joyfulgirl (at) archlinux.us>
-# Contributor: Jonathan Friedman <jonf@gojon.com>
-# Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io>
-
-pkgname=cl-ppcre
-pkgver=2.0.3
-pkgrel=2
-pkgdesc="Perl-compatible, portable regexp library for Common Lisp"
-arch=('i686' 'x86_64')
-url="http://www.weitz.de/cl-ppcre/"
-license=('BSD')
-
-depends=('common-lisp' 'cl-asdf')
-
-install=cl-ppcre.install
-source=('http://weitz.de/files/cl-ppcre.tar.gz' 'LICENSE')
-md5sums=('bd5648fd3c8b6f89eea43f5b82b99aa1'
-         'c6aa01dce26b45aa916329701a448d11')
-
-build() {
-    install -d ${pkgdir}/usr/share/common-lisp/source/${pkgname}
-    install -d ${pkgdir}/usr/share/common-lisp/systems
-    install -d ${pkgdir}/usr/share/licenses/${pkgname}
-
-    cd ${srcdir}/${pkgname}-${pkgver}
-
-    install -m 644 -t ${pkgdir}/usr/share/common-lisp/source/${pkgname} \
-        ${srcdir}/${pkgname}-${pkgver}/*.lisp
-    install -m 644 -t ${pkgdir}/usr/share/common-lisp/source/${pkgname} \
-        ${srcdir}/${pkgname}-${pkgver}/*.asd
-    install -m 644 ${srcdir}/LICENSE \
-        ${pkgdir}/usr/share/licenses/${pkgname}
-
-    cd ${pkgdir}/usr/share/common-lisp/systems
-    ln -s ../source/${pkgname}/${pkgname}.asd .
-    ln -s ../source/${pkgname}/${pkgname}-unicode.asd .
-}
-
-# vim:set ts=2 sw=4 et nospell:
diff --git a/pcr/cl-ppcre/cl-ppcre.install b/pcr/cl-ppcre/cl-ppcre.install
deleted file mode 100644
index 9ad84d1e1..000000000
--- a/pcr/cl-ppcre/cl-ppcre.install
+++ /dev/null
@@ -1,73 +0,0 @@
-_pkgname=cl-ppcre
-_compile_log=n
-_lisp=()
-
-if pacman -Qq clisp &>/dev/null ||
-   pacman -Qq clisp-gtk2 &>/dev/null ||
-   pacman -Qq clisp-new-clx &>/dev/null; then
-    _lisp=(${_lisp[@]} 'clisp')
-fi
-if pacman -Qq sbcl &>/dev/null; then
-    _lisp=(${_lisp[@]} 'sbcl')
-fi
-if pacman -Qq cmucl &> /dev/null; then
-    _lisp=(${_lisp[@]} 'cmucl')
-fi
-
-_compile_sbcl() {
-    sbcl --noinform --no-sysinit --no-userinit \
-        --eval "(require :asdf)" \
-        --eval "(pushnew #p\"/usr/share/common-lisp/systems/\" asdf:*central-registry* :test #'equal)" \
-        --eval "(asdf:operate 'asdf:compile-op '${_pkgname})" \
-        --eval "(quit)" &> ${_compile_log_file} || return 1
-}
-_compile_clisp() {
-    clisp --silent -norc -x \
-        "(load #p\"/usr/share/common-lisp/source/asdf/asdf.lisp\")
-        (pushnew #p\"/usr/share/common-lisp/systems/\" asdf:*central-registry* :test #'equal)
-        (asdf:operate 'asdf:compile-op '${_pkgname})
-        (quit)" &> ${_compile_log_file} || return 1
-}
-_compile_cmucl() {
-    cmucl -quiet -nositeinit -noinit -eval \
-        "(load #p\"/usr/share/common-lisp/source/asdf/asdf.lisp\")
-        (pushnew #p\"/usr/share/common-lisp/systems/\" asdf:*central-registry* :test #'equal)
-        (asdf:operate 'asdf:compile-op '${_pkgname})
-        (quit)" &> ${_compile_log_file} || return 1
-}
-
-post_install() {
-    for _lispiter in ${_lisp[@]}; do
-        echo "---> Compiling lisp files using ${_lispiter} <---"
-        if [ $_compile_log = 'y' ]; then
-            _compile_log_file=/tmp/${_pkgname}_${_lispiter}.log
-        else
-            _compile_log_file=/dev/null
-        fi
-        _compile_${_lispiter}
-        echo "---> Done compiling lisp files (using ${_lispiter}) <---"
-    done
-
-    cat << EOM
-
-    To load this library, load asdf and then run the following lines
-    (or their equivalent for your lisp of choice):
-
-    (push #p"/usr/share/common-lisp/systems/" asdf:*central-registry*)
-    (asdf:operate 'asdf:load-op '${_pkgname})
-EOM
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f /usr/share/common-lisp/source/${_pkgname}/{*.fas,*.fasl,*.lib,*.x86f}
-}
-
-pre_upgrade() {
-    pre_remove
-}
-
-# End of file
diff --git a/pcr/clx-git/PKGBUILD b/pcr/clx-git/PKGBUILD
deleted file mode 100644
index 6e2a3369b..000000000
--- a/pcr/clx-git/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-#Contributor: Akshay Srinivasan <akshaysrinivasan at gmail.com>
-pkgname=clx-git
-_clname=clx
-pkgver=20120421
-pkgrel=1
-pkgdesc="Xlib for common lisp systems"
-arch=('i686' 'x86_64')
-url="http://www.cliki.net/CLX"
-license=('custom')
-depends=('x-server' 'sbcl')
-makedepends=('texinfo')
-install=clx.install
-source=(README.licensing)        
-md5sums=('74858379015567928f1eee186d9db1a4')
-
-conflicts=('clx')
-provides=('clx')
-
-makedepends=('git')
-
-_gitroot="git://github.com/sharplispers/clx.git"
-_gitname="clx"
-
-
-build() {
-
-    cat << EOM
-
-	WARNING!
-
-	You are building a package using a snapshot from a repository. The
-        resulting package may be unusable or pose a security risk, since
-        the install script does not check source file hashes. Do not continue
-        if this is undesirable.
-
-EOM
-    
-    install -d ${pkgdir}/usr/share/common-lisp/systems
-    install -d ${pkgdir}/usr/share/common-lisp/source/${_clname}/{debug,demo,test}
-    install -d ${pkgdir}/usr/share/licenses/${_clname}
-    install -d ${pkgdir}/usr/share/info
-
-         ### Git checkout
-    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
-
-    cd ${pkgdir}/usr/share/common-lisp/source/${_clname}
-
-    install -m 644 -t . ${srcdir}/${_gitname}/*.lisp
-    install -m 644 -t debug ${srcdir}/${_gitname}/debug/*.lisp
-    install -m 644 -t demo ${srcdir}/${_gitname}/demo/*.lisp
-    install -m 644 -t test ${srcdir}/${_gitname}/test/*.lisp
-
-    install -m 644 -t . ${srcdir}/${_gitname}/${_clname}.asd
-    cd ${pkgdir}/usr/share/common-lisp/systems
-	ln -s ../source/${_clname}/${_clname}.asd .
-
-    cd ${srcdir}/${_gitname}/manual
-    makeinfo ${_clname}.texinfo
-    install -m 644 ${_clname}.info ${pkgdir}/usr/share/info
-
-    install -m 644 ${srcdir}/README.licensing ${pkgdir}/usr/share/licenses/${_clname}
-
-}
diff --git a/pcr/clx-git/README.licensing b/pcr/clx-git/README.licensing
deleted file mode 100644
index 669083222..000000000
--- a/pcr/clx-git/README.licensing
+++ /dev/null
@@ -1,4 +0,0 @@
-This packages uses several licenses.
-
-To see a given source file's license, please check its header. The
-lisp files are installed in /usr/share/common-lisp/source/clx.
diff --git a/pcr/clx-git/clx.install b/pcr/clx-git/clx.install
deleted file mode 100644
index 7344518a4..000000000
--- a/pcr/clx-git/clx.install
+++ /dev/null
@@ -1,76 +0,0 @@
-# arg 1:  the new package version
-
-_pkgname=clx
-_compile_log=n
-_lisp=()
-
-if pacman -Qq clisp-new-clx &>/dev/null ||
-   pacman -Qq clisp-gtk2 &>/dev/null ||
-   pacman -Qq clisp-new-clx &>/dev/null; then
-    _lisp=(${_lisp[@]} 'clisp')
-fi
-if pacman -Qq sbcl &>/dev/null; then
-    _lisp=(${_lisp[@]} 'sbcl')
-fi
-if pacman -Qq cmucl &> /dev/null; then
-    _lisp=(${_lisp[@]} 'cmucl')
-fi
-
-_compile_sbcl() {
-    sbcl --noinform --no-sysinit --no-userinit \
-        --eval "(require :asdf)" \
-        --eval "(pushnew #p\"/usr/share/common-lisp/systems/\" asdf:*central-registry* :test #'equal)" \
-        --eval "(asdf:operate 'asdf:compile-op '${_pkgname})" \
-        --eval "(quit)" &> ${_compile_log_file} || return 1
-}
-_compile_clisp() {
-    clisp --silent -norc -x \
-        "(load #p\"/usr/share/common-lisp/source/asdf/asdf\")
-        (pushnew #p\"/usr/share/common-lisp/systems/\" asdf:*central-registry* :test #'equal)
-        (asdf:operate 'asdf:compile-op '${_pkgname})
-        (quit)" &> ${_compile_log_file} || return 1
-}
-_compile_cmucl() {
-    cmucl -quiet -nositeinit -noinit -eval \
-        "(load #p\"/usr/share/common-lisp/source/asdf/asdf\")
-        (pushnew #p\"/usr/share/common-lisp/systems/\" asdf:*central-registry* :test #'equal)
-        (asdf:operate 'asdf:compile-op '${_pkgname})
-        (quit)" &> ${_compile_log_file} || return 1
-}
-
-post_install() {
-    for _lispiter in ${_lisp[@]}; do
-        echo "---> Compiling lisp files using ${_lispiter} <---"
-        if [ $_compile_log = 'y' ]; then
-            _compile_log_file=/tmp/${_pkgname}_${_lispiter}.log
-        else
-            _compile_log_file=/dev/null
-        fi
-        _compile_${_lispiter}
-        echo "---> Done compiling lisp files (using ${_lispiter}) <---"
-    done
-
-    cat << EOM
-
-    To load this library, load asdf and then run the following lines
-    (or their equivalent for your lisp of choice):
-
-    (push #p"/usr/share/common-lisp/systems/" asdf:*central-registry*)
-    (asdf:operate 'asdf:load-op '${_pkgname})
-EOM
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    rm -f /usr/share/common-lisp/source/$_pkgname/{*.fas,*.fasl,*.lib,*.x86f}
-}
-
-op=$1
-shift
-
-$op $*
-
-# End of file
\ No newline at end of file
diff --git a/pcr/coin/PKGBUILD b/pcr/coin/PKGBUILD
deleted file mode 100644
index c584949c9..000000000
--- a/pcr/coin/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Contributor: Christian Hesse <mail@eworm.de>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: mickele
-# Contributor: marcus fritzsch <fritschy@googlemail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrières <aurelien@cwb.IO>
-
-pkgname=coin
-pkgver=3.1.3
-pkgrel=9
-pkgdesc='A high-level 3D graphics toolkit on top of OpenGL'
-url='http://www.coin3d.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('mesa' 'expat')
-makedepends=('doxygen')
-optdepends=('openal: sound/dynamic linking support'
-            'fontconfig: dynamic linking support'
-            'zlib: dynamic linking support'
-            'freetype2: dynamic linking support'
-            'js: dynamic linking support'
-	    'simage: image format support')
-options=('!libtool')
-source=("https://bitbucket.org/Coin3D/coin/downloads/Coin-${pkgver}.tar.gz")
-
-build() {
-  cd Coin-${pkgver}
-
-  # fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667139
-  sed -i "/#include <Inventor\/C\/basic.h>/i #include <Inventor/C/errors/debugerror.h>" include/Inventor/SbBasic.h
-
-  ./configure \
-    --prefix=/usr \
-    --mandir=/usr/share/man \
-    --enable-optimization \
-    --enable-3ds-import \
-    --enable-javascript-api \
-    --enable-threadsafe \
-    --enable-exceptions \
-    --enable-man \
-    --with-mesa \
-    --disable-debug \
-    --enable-shared \
-    --disable-maintainer-mode \
-    --disable-dependency-tracking \
-    --enable-system-expat
-
-  make
-}
-
-package() {
-  cd Coin-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  # final adjustments
-  for _FILE in threads deprecated errors events ; do
-    mv  "${pkgdir}/usr/share/man/man3/${_FILE}.3" "${pkgdir}/usr/share/man/man3/coin-${_FILE}.3"
-  done
-}
diff --git a/pcr/collada-dom/PKGBUILD b/pcr/collada-dom/PKGBUILD
deleted file mode 100644
index 7fceb3678..000000000
--- a/pcr/collada-dom/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=collada-dom
-pkgver=2.4.0
-pkgrel=2
-pkgdesc="An API that provides a C++ object representation of a ${pkgname::7} XML instance document"
-url=http://sourceforge.net/projects/$pkgname
-license=MIT
-arch=(
-  mips64el
-  x86_64
-  i686
-)
-depends=(
-  boost-libs
-  libxml2
-  pcre
-)
-makedepends=(
-  boost
-  cmake
-)
-source=http://downloads.sf.net/$pkgname/$pkgname-$pkgver-libsrc.tgz
-sha512sums=4c8cdc159acc89564b46615a0bc73a5ba84a1a5aa41d38661cd0e33a705ce5fd032e9a308fc89f93ec10620892067d757cbff8f1b9ce53da7626ea0e27b0eda5
-
-prepare() {
-  cd $srcdir/$pkgname-$pkgver-libsrc
-
-  [[ -d build ]] && rm -vr build
-  mkdir -v build
-}
-
-build() {
-  cd $srcdir/$pkgname-$pkgver-libsrc/build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver-libsrc/build
-  make DESTDIR=$pkgdir install
-
-  a=$pkgdir/usr/share/licenses/$pkgname
-
-  install -vd $a && cp -va ../{dom/license.txt,License_Folder/license_e.txt} $a
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/command-not-found/PKGBUILD b/pcr/command-not-found/PKGBUILD
deleted file mode 100644
index e2131a3d5..000000000
--- a/pcr/command-not-found/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Aurelien Desbrieres <aurelien@cwb.io>
-# Contributor: Diogo Leal <estranho@diogoleal.com>
-# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Matthias Maennich <arch@maennich.net>
-
-pkgname=command-not-found
-pkgver=0.4.5
-pkgrel=1
-pkgdesc="In case a command could not be found this utility searches for packages containing this or a similar command (bash,zsh)."
-arch=('i686' 'x86_64')
-url="http://github.com/metti/command-not-found"
-license=('GPL3')
-depends=('boost-libs' 'tdb' 'libarchive' 'wget')
-makedepends=('boost' 'cmake')
-install='install'
-
-source=("libre://$pkgname-$pkgver.tar.gz")
-mksource=("$pkgname-$pkgver::git+https://github.com/metti/$pkgname.git#tag=v${pkgver}")
-mkmd5sums=('SKIP')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX="" src
-  make
-}
-
-package(){
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-md5sums=('c055522251b2c58b9c6e0d0f0df481c0')
diff --git a/pcr/command-not-found/install b/pcr/command-not-found/install
deleted file mode 100644
index 50e601258..000000000
--- a/pcr/command-not-found/install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  cnf-sync
-}
-
-post_upgrade() {
-  cnf-sync
-}
-
-pre_remove() {
-  rm -f /var/lib/cnf/*.{db,tbd}
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/conky-control/PKGBUILD b/pcr/conky-control/PKGBUILD
deleted file mode 100644
index c607ae86b..000000000
--- a/pcr/conky-control/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributer: giacomogiorgianni@gmail.com 
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=conky-control
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="control panel for conky"
-arch=('any')
-url="http://bbs.archbang.org/viewtopic.php?id=3017"
-license=('GPL')
-categories=()
-depends=('conky-lua')
-makedepends=()
-options=(!emptydirs)
-source=("Conky_voyager.tar.gz::http://ompldr.org/vZWoxMA" "conky_voyager.tar.gz::http://ompldr.org/vZWoxYg" "conky-control.install")
-md5sums=('6930f45eb5dd402953d306ebe8ff14da'
-         'e63ba795800ec20df912e620b423688e'
-         '0217a6bee07fb918b0c2050548103d43')
-install=$pkgname.install
-
-build() {
-  mkdir -p $pkgdir/usr/bin
-  mkdir -p $pkgdir/usr/share/applications
-  mkdir -p $pkgdir/etc/skel/.config
-  cp $startdir/conky-controlRC.desktop $pkgdir/etc/skel/.config/
-  cp $startdir/conky-control.desktop $pkgdir/usr/share/applications/
-    
-  install -m 0775 -do $LOGNAME $pkgdir/etc/skel/.scripts
-  tar xzf Conky_voyager.tar.gz -C $pkgdir/etc/skel/.scripts
-  tar xzf conky_voyager.tar.gz -C $pkgdir/etc/skel//
-  ln -s  $pkgdir/etc/skel/.scripts/Conky/conky $pkgdir/usr/bin/conky-control
-  }
-md5sums=('6930f45eb5dd402953d306ebe8ff14da'
-         'e63ba795800ec20df912e620b423688e'
-         '0217a6bee07fb918b0c2050548103d43')
diff --git a/pcr/conky-control/conky-control.install b/pcr/conky-control/conky-control.install
deleted file mode 100644
index 399672b0a..000000000
--- a/pcr/conky-control/conky-control.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  for i in `ls /home | grep -v lost+found`
-  do
-    cp -fR /etc/skel/.conky /home/$i
-    cp -fR /etc/skel/.scripts /home/$i
-    cp -fR /etc/skel/.config /home/$i
-    echo "# Overwrite this file if you want to have a permanent setting" > /home/$i/.conkyrc
-    chown $i:users -R /home/$i/{.conky,.scripts}
-    chown $i:users "/home/$i/.config/autostart/Conky Control RC.desktop"
-    chown $i:users "/home/$i/.conkyrc"
-  done
-  echo " >> Start 'conky-control' to configure conky"
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/pcr/conky-lua/PKGBUILD b/pcr/conky-lua/PKGBUILD
deleted file mode 100644
index 6d36e9c29..000000000
--- a/pcr/conky-lua/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# Contributor: Renato Garcia <fgarcia.renato@gmail.com>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: James Rayner <james@archlinux.org>
-# Contributor: Partha Chowdhury <kira.laucas@gmail.com>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=conky-lua
-_pkgname=conky
-pkgver=1.9.0
-pkgrel=1
-pkgdesc='Lightweight system monitor for X'
-url='http://conky.sourceforge.net/'
-license=('BSD' 'GPL')
-arch=('i686' 'x86_64')
-options=('!emptydirs')
-makedepends=('docbook2x' 'toluapp' 'perl-xml-libxml')
-depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2' 'lua' 'cairo')
-provides=('conky=1.9.0')
-conflicts=('conky')
-backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
-source=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.gz")
-sha1sums=('a8d26d002370c9b877ae77ad3a3bbd2566b38e5d')
-
-replaces=('torsmo')
-
-build() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
-
-	CPPFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" ./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--enable-ibm \
-		--enable-curl \
-		--enable-rss \
-		--enable-weather-xoap \
-		--enable-imlib2 \
-		--enable-wlan \
-                --enable-lua \
-                --enable-lua-cairo \
-                --enable-lua-imlib2
-
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
-	install -Dm644 extras/vim/syntax/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
-	install -Dm644 extras/vim/ftdetect/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
-}
-sha1sums=('a8d26d002370c9b877ae77ad3a3bbd2566b38e5d')
diff --git a/pcr/cpptest/PKGBUILD b/pcr/cpptest/PKGBUILD
deleted file mode 100644
index df08feb00..000000000
--- a/pcr/cpptest/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-# Contributor (aur): Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar>
-pkgname=cpptest
-pkgver=1.1.2
-pkgrel=2
-pkgdesc="CppTest is a portable and powerful unit testing framework for handling automated tests in C++. with focus on usability and extendability." 
-url="http://cpptest.sourceforge.net/" 
-depends=(gcc-libs)
-makedepends=(pkgconfig)
-source=(http://downloads.sourceforge.net/sourceforge/cpptest/$pkgname-$pkgver.tar.gz)
-md5sums=('79b9bff371d182f11a3235969f84ccb6')
-arch=('i686' 'x86_64')
-license="LGPL" 
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
-}
diff --git a/pcr/cpuminer/PKGBUILD b/pcr/cpuminer/PKGBUILD
deleted file mode 100644
index be6cd1678..000000000
--- a/pcr/cpuminer/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-## Maintainer : gee
-
-name=cpuminer
-pkgname=$name
-pkgver=2.3.2
-pkgrel=5
-pkgdesc="pooler's Litecoin cpuminer."
-arch=('i686' 'x86_64')
-url="https://github.com/pooler/cpuminer"
-depends=('curl' 'jansson')
-license=('GPL2')
-source=("${pkgname}-${pkgver}.zip::https://github.com/pooler/cpuminer/zipball/v${pkgver}"
-	"libcurl.m4")
-
-build() {
-	cpuminer_srcdir=${srcdir}/pooler-cpuminer-*
-	cd ${cpuminer_srcdir}
-	autoreconf -fi -I ..
-	./configure
-	make ${MAKEFLAGS} CXXFLAGS="-O3 -march=native"
-}
-
-
-package() {
-	cpuminer_srcdir=${srcdir}/pooler-cpuminer-*
-	mkdir -p $pkgdir/usr/bin
-
-	# get compiled binaries
-	install -D -m755 ${cpuminer_srcdir}/minerd $pkgdir/usr/bin/
-}
-md5sums=('ca3200d6574fb6463640e8891555cd12'
-         '5e22a13d29fa628c83c267cf9b4f3218')
diff --git a/pcr/cpuminer/libcurl.m4 b/pcr/cpuminer/libcurl.m4
deleted file mode 100644
index d7d5a5259..000000000
--- a/pcr/cpuminer/libcurl.m4
+++ /dev/null
@@ -1,251 +0,0 @@
-# LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION],
-#                       [ACTION-IF-YES], [ACTION-IF-NO])
-# ----------------------------------------------------------
-#      David Shaw <dshaw@jabberwocky.com>   May-09-2006
-#
-# Checks for libcurl.  DEFAULT-ACTION is the string yes or no to
-# specify whether to default to --with-libcurl or --without-libcurl.
-# If not supplied, DEFAULT-ACTION is yes.  MINIMUM-VERSION is the
-# minimum version of libcurl to accept.  Pass the version as a regular
-# version number like 7.10.1. If not supplied, any version is
-# accepted.  ACTION-IF-YES is a list of shell commands to run if
-# libcurl was successfully found and passed the various tests.
-# ACTION-IF-NO is a list of shell commands that are run otherwise.
-# Note that using --without-libcurl does run ACTION-IF-NO.
-#
-# This macro #defines HAVE_LIBCURL if a working libcurl setup is
-# found, and sets @LIBCURL@ and @LIBCURL_CPPFLAGS@ to the necessary
-# values.  Other useful defines are LIBCURL_FEATURE_xxx where xxx are
-# the various features supported by libcurl, and LIBCURL_PROTOCOL_yyy
-# where yyy are the various protocols supported by libcurl.  Both xxx
-# and yyy are capitalized.  See the list of AH_TEMPLATEs at the top of
-# the macro for the complete list of possible defines.  Shell
-# variables $libcurl_feature_xxx and $libcurl_protocol_yyy are also
-# defined to 'yes' for those features and protocols that were found.
-# Note that xxx and yyy keep the same capitalization as in the
-# curl-config list (e.g. it's "HTTP" and not "http").
-#
-# Users may override the detected values by doing something like:
-# LIBCURL="-lcurl" LIBCURL_CPPFLAGS="-I/usr/myinclude" ./configure
-#
-# For the sake of sanity, this macro assumes that any libcurl that is
-# found is after version 7.7.2, the first version that included the
-# curl-config script.  Note that it is very important for people
-# packaging binary versions of libcurl to include this script!
-# Without curl-config, we can only guess what protocols are available,
-# or use curl_version_info to figure it out at runtime.
-
-AC_DEFUN([LIBCURL_CHECK_CONFIG],
-[
-  AH_TEMPLATE([LIBCURL_FEATURE_SSL],[Defined if libcurl supports SSL])
-  AH_TEMPLATE([LIBCURL_FEATURE_KRB4],[Defined if libcurl supports KRB4])
-  AH_TEMPLATE([LIBCURL_FEATURE_IPV6],[Defined if libcurl supports IPv6])
-  AH_TEMPLATE([LIBCURL_FEATURE_LIBZ],[Defined if libcurl supports libz])
-  AH_TEMPLATE([LIBCURL_FEATURE_ASYNCHDNS],[Defined if libcurl supports AsynchDNS])
-  AH_TEMPLATE([LIBCURL_FEATURE_IDN],[Defined if libcurl supports IDN])
-  AH_TEMPLATE([LIBCURL_FEATURE_SSPI],[Defined if libcurl supports SSPI])
-  AH_TEMPLATE([LIBCURL_FEATURE_NTLM],[Defined if libcurl supports NTLM])
-
-  AH_TEMPLATE([LIBCURL_PROTOCOL_HTTP],[Defined if libcurl supports HTTP])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_HTTPS],[Defined if libcurl supports HTTPS])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_FTP],[Defined if libcurl supports FTP])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_FTPS],[Defined if libcurl supports FTPS])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_FILE],[Defined if libcurl supports FILE])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_TELNET],[Defined if libcurl supports TELNET])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_DICT],[Defined if libcurl supports DICT])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_TFTP],[Defined if libcurl supports TFTP])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_RTSP],[Defined if libcurl supports RTSP])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_POP3],[Defined if libcurl supports POP3])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_IMAP],[Defined if libcurl supports IMAP])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_SMTP],[Defined if libcurl supports SMTP])
-
-  AC_ARG_WITH(libcurl,
-     AC_HELP_STRING([--with-libcurl=PREFIX],[look for the curl library in PREFIX/lib and headers in PREFIX/include]),
-     [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])])
-
-  if test "$_libcurl_with" != "no" ; then
-
-     AC_PROG_AWK
-
-     _libcurl_version_parse="eval $AWK '{split(\$NF,A,\".\"); X=256*256*A[[1]]+256*A[[2]]+A[[3]]; print X;}'"
-
-     _libcurl_try_link=yes
-
-     if test -d "$_libcurl_with" ; then
-        LIBCURL_CPPFLAGS="-I$withval/include"
-        _libcurl_ldflags="-L$withval/lib"
-        AC_PATH_PROG([_libcurl_config],[curl-config],[],
-                     ["$withval/bin"])
-     else
-        AC_PATH_PROG([_libcurl_config],[curl-config],[],[$PATH])
-     fi
-
-     if test x$_libcurl_config != "x" ; then
-        AC_CACHE_CHECK([for the version of libcurl],
-           [libcurl_cv_lib_curl_version],
-           [libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $[]2}'`])
-
-        _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse`
-        _libcurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libcurl_version_parse`
-
-        if test $_libcurl_wanted -gt 0 ; then
-           AC_CACHE_CHECK([for libcurl >= version $2],
-              [libcurl_cv_lib_version_ok],
-              [
-              if test $_libcurl_version -ge $_libcurl_wanted ; then
-                 libcurl_cv_lib_version_ok=yes
-              else
-                 libcurl_cv_lib_version_ok=no
-              fi
-              ])
-        fi
-
-        if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then
-           if test x"$LIBCURL_CPPFLAGS" = "x" ; then
-              LIBCURL_CPPFLAGS=`$_libcurl_config --cflags`
-           fi
-           if test x"$LIBCURL" = "x" ; then
-              LIBCURL=`$_libcurl_config --libs`
-
-              # This is so silly, but Apple actually has a bug in their
-              # curl-config script.  Fixed in Tiger, but there are still
-              # lots of Panther installs around.
-              case "${host}" in
-                 powerpc-apple-darwin7*)
-                    LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'`
-                 ;;
-              esac
-           fi
-
-           # All curl-config scripts support --feature
-           _libcurl_features=`$_libcurl_config --feature`
-
-           # Is it modern enough to have --protocols? (7.12.4)
-           if test $_libcurl_version -ge 461828 ; then
-              _libcurl_protocols=`$_libcurl_config --protocols`
-           fi
-        else
-           _libcurl_try_link=no
-        fi
-
-        unset _libcurl_wanted
-     fi
-
-     if test $_libcurl_try_link = yes ; then
-
-        # we didn't find curl-config, so let's see if the user-supplied
-        # link line (or failing that, "-lcurl") is enough.
-        LIBCURL=${LIBCURL-"$_libcurl_ldflags -lcurl"}
-
-        AC_CACHE_CHECK([whether libcurl is usable],
-           [libcurl_cv_lib_curl_usable],
-           [
-           _libcurl_save_cppflags=$CPPFLAGS
-           CPPFLAGS="$LIBCURL_CPPFLAGS $CPPFLAGS"
-           _libcurl_save_libs=$LIBS
-           LIBS="$LIBCURL $LIBS"
-
-           AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curl/curl.h>]],[[
-/* Try and use a few common options to force a failure if we are
-   missing symbols or can't link. */
-int x;
-curl_easy_setopt(NULL,CURLOPT_URL,NULL);
-x=CURL_ERROR_SIZE;
-x=CURLOPT_WRITEFUNCTION;
-x=CURLOPT_FILE;
-x=CURLOPT_ERRORBUFFER;
-x=CURLOPT_STDERR;
-x=CURLOPT_VERBOSE;
-if (x) ;
-]])],libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
-
-           CPPFLAGS=$_libcurl_save_cppflags
-           LIBS=$_libcurl_save_libs
-           unset _libcurl_save_cppflags
-           unset _libcurl_save_libs
-           ])
-
-        if test $libcurl_cv_lib_curl_usable = yes ; then
-
-           # Does curl_free() exist in this version of libcurl?
-           # If not, fake it with free()
-
-           _libcurl_save_cppflags=$CPPFLAGS
-           CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
-           _libcurl_save_libs=$LIBS
-           LIBS="$LIBS $LIBCURL"
-
-           AC_CHECK_FUNC(curl_free,,
-              AC_DEFINE(curl_free,free,
-                [Define curl_free() as free() if our version of curl lacks curl_free.]))
-
-           CPPFLAGS=$_libcurl_save_cppflags
-           LIBS=$_libcurl_save_libs
-           unset _libcurl_save_cppflags
-           unset _libcurl_save_libs
-
-           AC_DEFINE(HAVE_LIBCURL,1,
-             [Define to 1 if you have a functional curl library.])
-           AC_SUBST(LIBCURL_CPPFLAGS)
-           AC_SUBST(LIBCURL)
-
-           for _libcurl_feature in $_libcurl_features ; do
-              AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_feature_$_libcurl_feature),[1])
-              eval AS_TR_SH(libcurl_feature_$_libcurl_feature)=yes
-           done
-
-           if test "x$_libcurl_protocols" = "x" ; then
-
-              # We don't have --protocols, so just assume that all
-              # protocols are available
-              _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP"
-
-              if test x$libcurl_feature_SSL = xyes ; then
-                 _libcurl_protocols="$_libcurl_protocols HTTPS"
-
-                 # FTPS wasn't standards-compliant until version
-                 # 7.11.0 (0x070b00 == 461568)
-                 if test $_libcurl_version -ge 461568; then
-                    _libcurl_protocols="$_libcurl_protocols FTPS"
-                 fi
-              fi
-
-              # RTSP, IMAP, POP3 and SMTP were added in
-              # 7.20.0 (0x071400 == 463872)
-              if test $_libcurl_version -ge 463872; then
-                 _libcurl_protocols="$_libcurl_protocols RTSP IMAP POP3 SMTP"
-              fi
-           fi
-
-           for _libcurl_protocol in $_libcurl_protocols ; do
-              AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_protocol_$_libcurl_protocol),[1])
-              eval AS_TR_SH(libcurl_protocol_$_libcurl_protocol)=yes
-           done
-        else
-           unset LIBCURL
-           unset LIBCURL_CPPFLAGS
-        fi
-     fi
-
-     unset _libcurl_try_link
-     unset _libcurl_version_parse
-     unset _libcurl_config
-     unset _libcurl_feature
-     unset _libcurl_features
-     unset _libcurl_protocol
-     unset _libcurl_protocols
-     unset _libcurl_version
-     unset _libcurl_ldflags
-  fi
-
-  if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then
-     # This is the IF-NO path
-     ifelse([$4],,:,[$4])
-  else
-     # This is the IF-YES path
-     ifelse([$3],,:,[$3])
-  fi
-
-  unset _libcurl_with
-])dnl
diff --git a/pcr/culmus-latex/PKGBUILD b/pcr/culmus-latex/PKGBUILD
deleted file mode 100644
index 8562f2fb5..000000000
--- a/pcr/culmus-latex/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-#Contributor (Arch): Dmitry Batenkov <dima dot batenkov at gmail dot com>
-# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com>
-# taken from https://aur.archlinux.org/packages/culmus-latex/
-
-pkgname=culmus-latex
-pkgver=0.7.1
-pkgrel=1
-pkgdesc="Culmus Hebrew fonts for LaTeX"
-arch=('i686' 'x86_64')
-url="http://ivritex.sourceforge.net/"
-depends=('culmus' 'texlive-core' 'texlive-bin')
-install=culmus-latex.install
-license=('GPL')
-source=(http://downloads.sourceforge.net/project/ivritex/culmus-latex/culmus-latex-0.7/culmus-latex-0.7-r1.tar.gz)
-md5sums=('0c6f6d5b9e7a0d6ba59fc55680ed48a5')
-
-build(){
-	cd ${srcdir}/${pkgname}-0.7-r1 || return 1
-	mkdir -p $pkgdir/usr/share/texmf || return 1
-	make DESTDIR=$pkgdir pkginstall
-}
diff --git a/pcr/culmus-latex/culmus-latex.install b/pcr/culmus-latex/culmus-latex.install
deleted file mode 100644
index 4c6529865..000000000
--- a/pcr/culmus-latex/culmus-latex.install
+++ /dev/null
@@ -1,22 +0,0 @@
-
-## arg 1:  the new package version
-#pre_install() {
-  # do something here
-#}
-
-## arg 1:  the new package version
-post_install() {
-	mktexlsr
-	updmap-sys --enable Map=culmus.map
-}
-
-post_upgrade() {
-	mktexlsr
-	updmap-sys --enable Map=culmus.map
-}
-
-## arg 1:  the old package version
-post_remove() {
-	mktexlsr
-	updmap-sys --disable culmus.map
-}
diff --git a/pcr/culmus/PKGBUILD b/pcr/culmus/PKGBUILD
deleted file mode 100644
index 3d1a5f567..000000000
--- a/pcr/culmus/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer (Arch): Ivan Puntiy <ivan.puntiy at gmail>
-# Contributor (Arch): <francois.archlinux.org>
-# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com>
-# taken from https://aur.archlinux.org/packages/culmus/
-
-pkgname=culmus
-pkgver=0.130
-pkgrel=1
-pkgdesc="A collection of Type1 and TrueType Hebrew fonts"
-arch=('any')
-url="http://culmus.sourceforge.net"
-license=('GPL2')
-depends=('fontconfig' 'xorg-fonts-alias' 'xorg-font-utils' 'xorg-fonts-encodings')
-install=${pkgname}.install
-source=(
-  "http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-  "$pkgname-0.121-fontconfig_fix.patch"
-)
-md5sums=('58e672defde4caeae42017cd2f9436a6'
-         '6db715a072d9602a54c69a7e31a6428f')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # fix due to fontconfig 2.10.1 update - patch mailed to upstream
-  patch culmus.conf "$srcdir/$pkgname-0.121-fontconfig_fix.patch"
-}
-
-package() {
-  # install Type1 fonts
-  install -d ${pkgdir}/usr/share/fonts/Type1
-  install -m644 ${srcdir}/culmus-$pkgver/*.{afm,pfa} \
-    ${pkgdir}/usr/share/fonts/Type1
-
-  # install ttf fonts
-  install -d ${pkgdir}/usr/share/fonts/TTF
-  install -m644 ${srcdir}/culmus-$pkgver/*.ttf \
-    ${pkgdir}/usr/share/fonts/TTF
-
-  # install provided config file with priority 61
-  install -d ${pkgdir}/etc/fonts/conf.avail/
-  install -m644 ${srcdir}/culmus-$pkgver/culmus.conf \
-    ${pkgdir}/etc/fonts/conf.avail/61-culmus.conf
-}
diff --git a/pcr/culmus/culmus-0.121-fontconfig_fix.patch b/pcr/culmus/culmus-0.121-fontconfig_fix.patch
deleted file mode 100644
index d303cbb09..000000000
--- a/pcr/culmus/culmus-0.121-fontconfig_fix.patch
+++ /dev/null
@@ -1,203 +0,0 @@
---- culmus.conf.original	2011-12-20 22:21:43.509488367 +0200
-+++ culmus.conf.fixed	2012-09-09 21:14:42.401273058 +0300
-@@ -8,6 +8,17 @@
- 	<match target="pattern" >
- 		<test name="family" >
- 			<string>Guttman Adii</string>
-+		</test>
-+		<edit mode="append" binding="same" name="family" >
-+			<string>David CLM</string>
-+		</edit>
-+		<edit mode="assign" binding="same" name="slant" >
-+			<const>italic</const>
-+		</edit>
-+	</match>
-+
-+	<match target="pattern" >
-+		<test name="family" >
- 			<string>Guttman Adii-Light</string>
- 		</test>
- 		<edit mode="append" binding="same" name="family" >
-@@ -30,6 +41,14 @@
-         <match target="pattern" >
-                 <test name="family" >
-                         <string>Guttman Stam</string>
-+                </test>
-+                <edit mode="append" binding="same" name="family" >
-+                        <string>Stam Ashkenaz CLM</string>
-+                </edit>
-+        </match>
-+
-+        <match target="pattern" >
-+                <test name="family" >
-                         <string>Guttman Stam1</string>
-                 </test>
-                 <edit mode="append" binding="same" name="family" >
-@@ -40,6 +59,14 @@
-         <match target="pattern" >
-                 <test name="family" >
-                         <string>Guttman Hodes</string>
-+                </test>
-+                <edit mode="append" binding="same" name="family" >
-+                        <string>Hadasim CLM</string>
-+                </edit>
-+        </match>
-+
-+        <match target="pattern" >
-+                <test name="family" >
-                         <string>Monotype Hadassah</string>
-                 </test>
-                 <edit mode="append" binding="same" name="family" >
-@@ -50,7 +77,23 @@
-         <match target="pattern" >
-                 <test name="family" >
-                         <string>Aharoni</string>
-+                </test>
-+                <edit mode="append" binding="same" name="family" >
-+                        <string>Aharoni CLM</string>
-+                </edit>
-+        </match>
-+
-+        <match target="pattern" >
-+                <test name="family" >
-                         <string>Guttman Aharoni</string>
-+                </test>
-+                <edit mode="append" binding="same" name="family" >
-+                        <string>Aharoni CLM</string>
-+                </edit>
-+        </match>
-+
-+        <match target="pattern" >
-+                <test name="family" >
-                         <string>Guttman-Aharoni</string>
-                 </test>
-                 <edit mode="append" binding="same" name="family" >
-@@ -61,7 +104,23 @@
-         <match target="pattern" >
-                 <test name="family" >
-                         <string>FrankRuehl</string>
-+                </test>
-+                <edit mode="append" binding="same" name="family" >
-+                        <string>Frank Ruehl CLM</string>
-+                </edit>
-+        </match>
-+
-+        <match target="pattern" >
-+                <test name="family" >
-                         <string>Guttman Frank</string>
-+                </test>
-+                <edit mode="append" binding="same" name="family" >
-+                        <string>Frank Ruehl CLM</string>
-+                </edit>
-+        </match>
-+
-+        <match target="pattern" >
-+                <test name="family" >
-                         <string>Guttman Frnew</string>
-                 </test>
-                 <edit mode="append" binding="same" name="family" >
-@@ -72,7 +131,23 @@
-         <match target="pattern" >
-                 <test name="family" >
-                         <string>David</string>
-+                </test>
-+                <edit mode="append" binding="same" name="family" >
-+                        <string>David CLM</string>
-+                </edit>
-+        </match>
-+
-+        <match target="pattern" >
-+                <test name="family" >
-                         <string>David Transparent</string>
-+                </test>
-+                <edit mode="append" binding="same" name="family" >
-+                        <string>David CLM</string>
-+                </edit>
-+        </match>
-+
-+        <match target="pattern" >
-+                <test name="family" >
-                         <string>Guttman David</string>
-                 </test>
-                 <edit mode="append" binding="same" name="family" >
-@@ -83,8 +158,32 @@
-         <match target="pattern" >
-                 <test name="family" >
-                         <string>Fixed Miriam Transparent</string>
-+                </test>
-+                <edit mode="append" binding="same" name="family" >
-+                        <string>Miriam Mono CLM</string>
-+                </edit>
-+        </match>
-+
-+        <match target="pattern" >
-+                <test name="family" >
-                         <string>Guttman Myamfix</string>
-+                </test>
-+                <edit mode="append" binding="same" name="family" >
-+                        <string>Miriam Mono CLM</string>
-+                </edit>
-+        </match>
-+
-+        <match target="pattern" >
-+                <test name="family" >
-                         <string>Guttman-CourMir</string>
-+                </test>
-+                <edit mode="append" binding="same" name="family" >
-+                        <string>Miriam Mono CLM</string>
-+                </edit>
-+        </match>
-+
-+        <match target="pattern" >
-+                <test name="family" >
-                         <string>Miriam Fixed</string>
-                 </test>
-                 <edit mode="append" binding="same" name="family" >
-@@ -95,8 +194,32 @@
-         <match target="pattern" >
-                 <test name="family" >
-                         <string>Guttman Miryam</string>
-+                </test>
-+                <edit mode="append" binding="same" name="family" >
-+                        <string>Miriam CLM</string>
-+                </edit>
-+        </match>
-+
-+        <match target="pattern" >
-+                <test name="family" >
-                         <string>Levenim MT</string>
-+                </test>
-+                <edit mode="append" binding="same" name="family" >
-+                        <string>Miriam CLM</string>
-+                </edit>
-+        </match>
-+
-+        <match target="pattern" >
-+                <test name="family" >
-                         <string>Miriam</string>
-+                </test>
-+                <edit mode="append" binding="same" name="family" >
-+                        <string>Miriam CLM</string>
-+                </edit>
-+        </match>
-+
-+        <match target="pattern" >
-+                <test name="family" >
-                         <string>Miriam Transparent</string>
-                 </test>
-                 <edit mode="append" binding="same" name="family" >
-@@ -107,6 +230,14 @@
-         <match target="pattern" >
-                 <test name="family" >
-                         <string>Guttman Drogolin</string>
-+                </test>
-+                <edit mode="append" binding="same" name="family" >
-+                        <string>Drugulin CLM</string>
-+                </edit>
-+        </match>
-+
-+        <match target="pattern" >
-+                <test name="family" >
-                         <string>Guttman Vilna</string>
-                 </test>
-                 <edit mode="append" binding="same" name="family" >
diff --git a/pcr/culmus/culmus.install b/pcr/culmus/culmus.install
deleted file mode 100644
index 1376ca5ce..000000000
--- a/pcr/culmus/culmus.install
+++ /dev/null
@@ -1,41 +0,0 @@
-configs=('61-culmus.conf')
-
-update_fontcache() {
-  fc-cache -fs
-  mkfontscale /usr/share/fonts/Type1
-  mkfontdir /usr/share/fonts/Type1
-  mkfontscale /usr/share/fonts/TTF
-  mkfontdir /usr/share/fonts/TTF
-}
-
-post_install() {
-  pushd /etc/fonts/conf.d > /dev/null
-  for config in "${configs[@]}"; do
-    ln -sf ../conf.avail/${config} .
-  done
-  popd > /dev/null
-
-  update_fontcache
-}
-
-post_upgrade() {
-  if [ "`vercmp 0.102-1 $2`" != "-1" ] || [ ! -L /etc/fonts/conf.d/61-culmus.conf ]; then
-    pushd /etc/fonts/conf.d > /dev/null
-    for config in "${configs[@]}"; do
-      ln -sf ../conf.avail/${config} .
-    done
-    popd > /dev/null
-  fi
-
-  update_fontcache
-}
-
-post_remove() {
-  pushd /etc/fonts/conf.d > /dev/null
-  for config in "${configs[@]}"; do
-    rm -f ${config}
-  done
-  popd > /dev/null
-
-  update_fontcache
-}
diff --git a/pcr/cw/PKGBUILD b/pcr/cw/PKGBUILD
deleted file mode 100644
index fb26acb4a..000000000
--- a/pcr/cw/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor: William Díaz <wdiaz[at]archlinux[dot]us>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=cw
-pkgver=1.0.16
-pkgrel=1
-pkgdesc="A non-intrusive ANSI color wrapper for common unix-based commands on GNU/linux."
-url="http://sourceforge.net/projects/cwrapper/"
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=()
-makedepends=('patch')
-install=cw.install
-source=("http://cwrapper.sourceforge.net/${pkgname}-${pkgver}.tar.bz2"
-        "${pkgname}.patch")
-md5sums=('142a1e9a25abbb01c3b90091d0bf68fd'
-         '5c54fab22fdb0601e6e4fb3fa87c435d')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  install -d ${pkgdir}/usr/bin \
-             ${pkgdir}/usr/share/man/man1 \
-             ${pkgdir}/usr/share/doc/cw
-
-  msg "Patching Files"
-  patch -Np1 -i ${srcdir}/${pkgname}.patch || return 1
-
-  ./configure --prefix=/usr || return 1
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install || return 1
-
-  # Deleting the problematic files
-  rm -R ${pkgdir}/usr/lib/${pkgname}/{file,gcc,g++,stat,du}
-
-  cp CHANGES CONTRIB INSTALL README PLATFORM \
-    ${pkgdir}/usr/share/doc/cw
-
-  ln -sf /usr/bin/cw ${pkgdir}/usr/bin/cwe 
-}
-md5sums=('142a1e9a25abbb01c3b90091d0bf68fd'
-         '5c54fab22fdb0601e6e4fb3fa87c435d')
diff --git a/pcr/cw/cw.install b/pcr/cw/cw.install
deleted file mode 100644
index bf0219bb7..000000000
--- a/pcr/cw/cw.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install () {
-  echo -e "\033[32;1m==>\033[0m \033[1mUpdating definition files...\033[0m"
-  /usr/bin/cwu /usr/lib/cw /usr/bin/cw > /dev/null 
-
-  echo -e ""
-  echo -e "Complete, definitions are stored in: /usr/lib/cw"
-  echo -e "\033[1mFor bash:\033[0m place 'export PATH=\"/usr/lib/cw:\$PATH\"'"
-  echo -e "at the end of ~/.bash_profile(or /etc/profile globally)"
-  echo  -e ""
-  echo -e "\033[1mFor tcsh:\033[0m place 'setenv PATH \"/usr/lib/cw:\$PATH\"'"
-  echo -e "at the end of ~/.login(or /etc/csh.login globally)"
-  echo -e ""
-  echo -e "\033[1mFor zsh:\033[0m place:"
-  echo -e "'export PATH=\"/usr/lib/cw:\$PATH\"'"
-  echo -e "at the end of ~/.zshrc(or /etc/zprofile globally)"
-  echo -e ""
-  echo -e "Or to automate the two lines above use the "colorcfg" command."
-  echo -e "(and add optional anti-coloring precautions)"
-  echo -e "Once the desired shell(s) are setup, use the "color" command,"
-  echo -e "or the environmental variable NOCOLOR=1 to turn"
-  echo -e "color wrapping on and off."
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/pcr/cw/cw.patch b/pcr/cw/cw.patch
deleted file mode 100644
index 2158a0d30..000000000
--- a/pcr/cw/cw.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- cw-1.0.16/Makefile.in	2007-09-25 11:10:20.000000000 -0600
-+++ cw-1.0.16/Makefile.in	2009-12-23 00:22:47.932698402 -0600
-@@ -8,7 +8,7 @@ CC=@CC@
- ECHO=echo
- LN=ln
- RM=rm
--MKDIR=mkdir
-+MKDIR=mkdir -p
- INSTALL=@INSTALL@
- 
- all:
-@@ -56,32 +56,18 @@ installlocal: cleanlocal local
- 
- install: cleanpub cw cwu
- 	@$(ECHO) "* Installing color wrapper..."
--	@for FILE in bin/*;do $(INSTALL) -o 0 -g 0 -m 755 $$FILE $(BINDIR);done
--	@$(LN) -sf $(BINDIR)/cw $(BINDIR)/cwe
-+	@for FILE in bin/*;do $(INSTALL) -m 755 $$FILE $(DESTDIR)$(BINDIR);done
-+	@$(LN) -sf $(DESTDIR)$(BINDIR)/cw $(DESTDIR)$(BINDIR)/cwe
- 	@$(ECHO) "* Installing color wrapper generic definition files..."
--	@$(MKDIR) -m 755 $(LIBDIR)/cw/
--	@for FILE in def/*;do $(INSTALL) -o 0 -g 0 -m 755 $$FILE $(LIBDIR)/cw/;done
-+	@$(MKDIR) -m 755 $(DESTDIR)$(LIBDIR)/cw/
-+	@for FILE in def/*;do $(INSTALL) -m 755 $$FILE $(DESTDIR)$(LIBDIR)/cw/;done
- 	@$(ECHO) "* Installing color wrapper generic header/footer files..."
--	@$(MKDIR) -m 755 $(LIBDIR)/cw/etc
--	@for FILE in etc/*;do $(INSTALL) -o 0 -g 0 -m 644 $$FILE $(LIBDIR)/cw/etc;done
-+	@$(MKDIR) -m 755 $(DESTDIR)$(LIBDIR)/cw/etc
-+	@for FILE in etc/*;do $(INSTALL) -m 644 $$FILE $(DESTDIR)$(LIBDIR)/cw/etc;done
- 	@$(ECHO) "* Installing manual pages..."
--	@for FILE in man/*;do $(INSTALL) -o 0 -g 0 -m 644 $$FILE $(MANDIR)/man1/;done
-+	@for FILE in man/*;do $(INSTALL) -m 644 $$FILE $(DESTDIR)$(MANDIR)/man1/;done
- 	@$(ECHO) "* Updating definition files..."
--	@$(BINDIR)/cwu $(LIBDIR)/cw $(BINDIR)/cw
--	@$(ECHO) "-----------------------------------------------------------"
--	@$(ECHO) "* Complete, definitions are stored in: $(LIBDIR)/cw"
--	@$(ECHO) "* For bash: place 'export PATH=\"$(LIBDIR)/cw:\$$PATH\"'"\
--        "at the end of ~/.bash_profile(or /etc/profile globally)"
--	@$(ECHO) "* For tcsh: place 'setenv PATH \"$(LIBDIR)/cw:\$$PATH\"'"\
--        "at the end of ~/.login(or /etc/csh.login globally)"
--	@$(ECHO) "* Or to automate the two lines above use the"\
--        "\"colorcfg\" command. (and add optional anti-coloring precautions)"
--	@$(ECHO) "* Once the desired shell(s) are setup, use the"\
--        "\"color\" command, or the environmental variable NOCOLOR=1 to turn"\
--        "color wrapping on and off."
--	@$(ECHO) ""
--	@$(ECHO) "* PLEASE view the ./README file for more information if"\
--        "you haven't already."
-+	@$(DESTDIR)$(BINDIR)/cwu $(DESTDIR)$(LIBDIR)/cw $(DESTDIR)$(BINDIR)/cw
- 
- clean:
- 	@$(ECHO) "* Cleaning compiling content..."
-@@ -94,9 +80,9 @@ cleanlocal:
- 
- cleanpub:
- 	@$(ECHO) "* Cleaning cw and cwu binaries, and definitions..."
--	@$(RM) -rf $(BINDIR)/cw $(BINDIR)/cwu $(BINDIR)/cwe\
--        $(BINDIR)/cw.exe $(BINDIR)/cwu.exe $(BINDIR)/color $(BINDIR)/colorcfg\
--        $(LIBDIR)/cw $(MANDIR)/man1/cw.1.gz $(MANDIR)/man1/cwu.1.gz\
--        $(MANDIR)/man1/cwe.1.gz
-+	@$(RM) -rf $(DESTDIR)$(BINDIR)/cw $(DESTDIR)$(BINDIR)/cwu $(DESTDIR)$(BINDIR)/cwe\
-+        $(DESTDIR)$(BINDIR)/cw.exe $(DESTDIR)$(BINDIR)/cwu.exe $(DESTDIR)$(BINDIR)/color $(DESTDIR)$(BINDIR)/colorcfg\
-+        $(DESTDIR)$(LIBDIR)/cw $(DESTDIR)$(MANDIR)/man1/cw.1.gz $(DESTDIR)$(MANDIR)/man1/cwu.1.gz\
-+        $(DESTDIR)$(MANDIR)/man1/cwe.1.gz
- 
- cleanall: clean cleanlocal cleanpub
-
---- cw-1.0.16/bin/colorcfg	2007-09-25 11:10:20.000000000 -0600
-+++ cw-1.0.16/bin/colorcfg	2009-12-23 00:29:05.105994275 -0600
-@@ -12,7 +12,7 @@ if test -x "${HOME}/.cw/bin/colorcfg";th
- else
-  SED="`which sed 2>/dev/null`"
-  if test -z "$SED";then
--  CWLIB="/usr/local/lib/cw"
-+  CWLIB="/usr/lib/cw"
-   echo "(NOTE: using static cw library path, this could be invalid)"
-  else
-   CWLIB="`echo \"$0/lib/cw\"|sed \"s/\/bin\/colorcfg//g\"`"
diff --git a/pcr/czmq/PKGBUILD b/pcr/czmq/PKGBUILD
deleted file mode 100644
index 2cb94125c..000000000
--- a/pcr/czmq/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/darcsver/PKGBUILD b/pcr/darcsver/PKGBUILD
deleted file mode 100644
index e93250680..000000000
--- a/pcr/darcsver/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Andreas B. Wagner <AndreasBWagner@pointfree.net>
-# Maintainer: Nicolas Pouillard <nicolas.pouillard@gmail.com>
-# Contributor: Peter Simons <simons@cryp.to>
-pkgname=darcsver
-pkgver=1.7.4
-pkgrel=2
-pkgdesc="generate a version number from darcs history"
-arch=('any')
-url='http://allmydata.org/trac/darcsver'
-license=('BSD')
-depends=('python2')
-makedepends=('python2-mock' 'python2-distribute')
-source=( http://pypi.python.org/packages/source/d/$pkgname/$pkgname-$pkgver.tar.gz )
-md5sums=('e38aecd1343ab8447888a479ab12cb59')
-
-build(){
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py build
-}
-
-package(){
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py install --root="$pkgdir"
-
-  install -Dm644 darcsver.egg-info/PKG-INFO $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/pcr/debhelper/PKGBUILD b/pcr/debhelper/PKGBUILD
deleted file mode 100644
index 60ff8f267..000000000
--- a/pcr/debhelper/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer (AUR): Antoine Lubineau <antoine@lubignon.info>
-# Contributor (AUR): Andrei "Garoth" Thorp <garoth@gmail.com>
-# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
-
-_debrepo=http://ftp.debian.org/debian/pool/main/ # Debian Sid
-debfile() { echo -n "$_debrepo"; echo -n "$@"|sed -r 's@(.).*@\1/&@'; }
-
-pkgname=debhelper
-pkgver=9.20120322
-pkgrel=1
-pkgdesc="A collection of programs that can be used in a debian/rules file to automate common tasks"
-arch=('any')
-url="http://packages.debian.org/${pkgname}"
-license='GPL3'
-depends=('binutils' 'dpkg' 'file' 'html2text' 'man-db' 'perl')
-makedepends=('po4a')
-source=(`debfile ${pkgname}`/${pkgname}_$pkgver.tar.gz)
-
-build() {
-  cd "$srcdir/$pkgname"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  make DESTDIR="$pkgdir" install
-}
-
-md5sums=('9ea56782e6396a59ec49f45f9c4a603f')
diff --git a/pcr/debootstrap-libre/PKGBUILD b/pcr/debootstrap-libre/PKGBUILD
deleted file mode 100644
index 47ea86d07..000000000
--- a/pcr/debootstrap-libre/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-_pkgname=debootstrap
-pkgname=debootstrap-libre
-pkgver=1.0.53
-pkgrel=3.1
-pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt (Debian support removed)"
-arch=('any')
-license=('GPL')
-url="http://packages.debian.org/sid/debootstrap"
-depends=('binutils' 'wget')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-source=("http://ftp.debian.org/debian/pool/main/d/${_pkgname}/${_pkgname}_${pkgver}_all.deb"
-        'gnewsense'
-        'trisquel')
-install="debootstrap.install"
-md5sums=('1ea9c87d54b6cf9349d602406bf43e5a'
-         '13978bdd1d877a0dd2c3c874ecd54f03'
-         'b020aa8426e70a6024c8e76312c17d78')
-
-package(){
-  tar -xzf "${srcdir}/data.tar.gz" -C "${pkgdir}/"
-  # remove Debian scripts
-  rm -v "${pkgdir}/usr/share/debootstrap/scripts"/*
-  # move the executables to /usr/bin
-  mkdir -p ${pkgdir}/usr/bin
-  mv "${pkgdir}/usr/sbin"/* "${pkgdir}/usr/bin/"
-  rmdir "${pkgdir}/usr/sbin"
-  # patch the path to use gNewSense or Trisquel defaults (prevents error in chrooted environment) 
-  sed -i 's|export PATH|export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/java/jre/bin:/usr/bin/vendor_perl:/usr/bin/core_perl"|' ${pkgdir}/usr/bin/debootstrap
-  # doesn't work with gpg 2.x, patch to point to gpg1v
-  sed 's/gpgv/gpg1v/g;' -i "${pkgdir}/usr/bin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions"  
-
-  # add gNewSense script
-  install -m644  gnewsense        "$pkgdir/usr/share/debootstrap/scripts"
-
-  # create gNewSense symlinks
-  ln -s gnewsense "$pkgdir/usr/share/debootstrap/scripts/parkes"
-
-  # add Trisquel script
-  install -m644  trisquel        "$pkgdir/usr/share/debootstrap/scripts"
-
-  # create Trisquel symlinks
-  ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/awen"
-  ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/brigantia"
-  ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/dagda"
-  ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/dwyn"
-  ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/robur"
-  ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/slaine"
-  ln -s trisquel "$pkgdir/usr/share/debootstrap/scripts/taranis"
-}
diff --git a/pcr/debootstrap-libre/debootstrap.install b/pcr/debootstrap-libre/debootstrap.install
deleted file mode 100644
index 3da2f1d22..000000000
--- a/pcr/debootstrap-libre/debootstrap.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  if [ "$(uname -m)" = "x86_64" ]; then
-    darch="amd64"
-  elif [ "$(uname -m)" = "i686" ]; then
-    darch="i386"
-  else
-    darch="mips64el"
-  fi
-  echo "$darch" > /usr/share/debootstrap/arch
-}
-
-pre_remove() {
-  rm -f /usr/share/debootstrap/arch
-}
diff --git a/pcr/debootstrap-libre/gnewsense b/pcr/debootstrap-libre/gnewsense
deleted file mode 100644
index 884ac88a0..000000000
--- a/pcr/debootstrap-libre/gnewsense
+++ /dev/null
@@ -1,194 +0,0 @@
-default_mirror http://archive.gnewsense.org/gnewsense-three/gnewsense
-mirror_style release
-download_style apt
-finddebs_style from-indices
-variants - buildd fakechroot minbase scratchbox
-
-if doing_variant fakechroot; then
-	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
-fi
-
-case $ARCH in
-	alpha|ia64) LIBC="libc6.1" ;;
-	kfreebsd-*) LIBC="libc0.1" ;;
-	hurd-*)     LIBC="libc0.3" ;;
-	*)          LIBC="libc6" ;;
-esac
-
-work_out_debs () {
-	required="$(get_debs Priority: required)"
-
-	if doing_variant - || doing_variant fakechroot; then
-		#required="$required $(get_debs Priority: important)"
-		#  ^^ should be getting debconf here somehow maybe
-		base="$(get_debs Priority: important)"
-	elif doing_variant buildd || doing_variant scratchbox; then
-		base="apt $(get_debs Build-Essential: yes)"
-	elif doing_variant minbase; then
-		base="apt"
-	fi
-
-	if doing_variant fakechroot; then
-		# ldd.fake needs binutils
-		required="$required binutils"
-	fi
-}
-
-first_stage_install () {
-	extract $required
-
-	mkdir -p "$TARGET/var/lib/dpkg"
-	: >"$TARGET/var/lib/dpkg/status"
-	: >"$TARGET/var/lib/dpkg/available"
-
-	setup_etc
-	if [ ! -e "$TARGET/etc/fstab" ]; then
-		echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab"
-		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
-	fi
-
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
-	x_feign_install () {
-		local pkg="$1"
-		local deb="$(debfor $pkg)"
-		local ver="$(extract_deb_field "$TARGET/$deb" Version)"
-
-		mkdir -p "$TARGET/var/lib/dpkg/info"
-
-		echo \
-"Package: $pkg
-Version: $ver
-Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"
-
-		touch "$TARGET/var/lib/dpkg/info/${pkg}.list"
-	}
-
-	x_feign_install dpkg
-}
-
-second_stage_install () {
-	x_core_install () {
-		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
-	}
-
-	p () {
-		baseprog="$(($baseprog + ${1:-1}))"
-	}
-
-	if doing_variant fakechroot; then
-		setup_proc_fakechroot
-	elif doing_variant scratchbox; then
-		true
-	else
-		setup_proc
-		in_target /sbin/ldconfig
-	fi
-
-	DEBIAN_FRONTEND=noninteractive
-	DEBCONF_NONINTERACTIVE_SEEN=true
-	export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
-
-	baseprog=0
-	bases=7
-
-	p; progress $baseprog $bases INSTCORE "Installing core packages" #1
-	info INSTCORE "Installing core packages..."
-
-	p; progress $baseprog $bases INSTCORE "Installing core packages" #2
-	ln -sf mawk "$TARGET/usr/bin/awk"
-	x_core_install base-files base-passwd
-	p; progress $baseprog $bases INSTCORE "Installing core packages" #3
-	x_core_install dpkg
-
-	if [ ! -e "$TARGET/etc/localtime" ]; then
-		ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime"
-	fi
-
-	if doing_variant fakechroot; then
-		install_fakechroot_tools
-	fi
-
-	p; progress $baseprog $bases INSTCORE "Installing core packages" #4
-	x_core_install $LIBC
-
-	p; progress $baseprog $bases INSTCORE "Installing core packages" #5
-	x_core_install perl-base
-
-	p; progress $baseprog $bases INSTCORE "Installing core packages" #6
-	rm "$TARGET/usr/bin/awk"
-	x_core_install mawk
-
-	p; progress $baseprog $bases INSTCORE "Installing core packages" #7
-	if doing_variant -; then
-		x_core_install debconf
-	fi
-
-	baseprog=0
-	bases=$(set -- $required; echo $#)
-
-	info UNPACKREQ "Unpacking required packages..."
-
-	exec 7>&1
-
-	smallyes '' |
-		(repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
-		dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 || echo EXITCODE $?) |
-		dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING
-
-	info CONFREQ "Configuring required packages..."
-
-	mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
-	echo \
-"#!/bin/sh
-echo
-echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon"
-	chmod 755 "$TARGET/sbin/start-stop-daemon"
-
-	setup_dselect_method apt
-
-	smallyes '' |
-		(in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
-		dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 || echo EXITCODE $?) |
-		dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING
-
-	baseprog=0
-	bases="$(set -- $base; echo $#)"
-
-	info UNPACKBASE "Unpacking the base system..."
-
-	setup_available $required $base
-	done_predeps=
-	while predep=$(get_next_predep); do
-		# We have to resolve dependencies of pre-dependencies manually because
-		# dpkg --predep-package doesn't handle this.
-		predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps")
-		# XXX: progress is tricky due to how dpkg_progress works
-		# -- cjwatson 2009-07-29
-		p; smallyes '' |
-		in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep)
-		base=$(without "$base" "$predep")
-		done_predeps="$done_predeps $predep"
-	done
-
-	smallyes '' |
-		(repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
-		dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 || echo EXITCODE $?) |
-		dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING
-
-	info CONFBASE "Configuring the base system..."
-
-	smallyes '' |
-		(repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be re-attempted up to five times." "" \
-		dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) |
-		dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING
-
-	mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
-
-	progress $bases $bases CONFBASE "Configuring base system"
-	info BASESUCCESS "Base system installed successfully."
-}
diff --git a/pcr/debootstrap-libre/trisquel b/pcr/debootstrap-libre/trisquel
deleted file mode 100644
index 7efa062f9..000000000
--- a/pcr/debootstrap-libre/trisquel
+++ /dev/null
@@ -1,199 +0,0 @@
-default_mirror http://archive.trisquel.info/trisquel
-mirror_style release
-download_style apt
-finddebs_style from-indices
-variants - buildd fakechroot minbase
-
-if doing_variant fakechroot; then
-    test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
-fi
-
-case $ARCH in
-  alpha|ia64) LIBC="libc6.1" ;;
-  *)          LIBC="libc6" ;;
-esac
-
-work_out_debs () {
-    required="$(get_debs Priority: required)"
-
-    if doing_variant -; then
-      #required="$required $(get_debs Priority: important)"
-      #  ^^ should be getting debconf here somehow maybe
-      base="$(get_debs Priority: important)"
-    elif doing_variant buildd; then
-      base="$(get_debs Build-Essential: yes)"
-    elif doing_variant fakechroot || doing_variant minbase; then
-      base="apt"
-    fi
-}
-
-first_stage_install () {
-    extract $required
-
-    mkdir -p "$TARGET/var/lib/dpkg"
-    : >"$TARGET/var/lib/dpkg/status"
-    : >"$TARGET/var/lib/dpkg/available"
-
-    setup_etc
-    if [ ! -e "$TARGET/etc/fstab" ]; then
-        echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab"
-        chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
-    fi
-
-    if doing_variant fakechroot; then
-        setup_devices_fakechroot
-    else
-        setup_devices
-    fi
-
-    x_feign_install () {
-        local pkg="$1"
-        local deb="$(debfor $pkg)"
-        local ver="$(extract_deb_field "$TARGET/$deb" Version)"
-
-        mkdir -p "$TARGET/var/lib/dpkg/info"
-
-        echo \
-"Package: $pkg
-Version: $ver
-Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"
-
-        touch "$TARGET/var/lib/dpkg/info/${pkg}.list"
-    }
-
-    x_feign_install dpkg
-}
-
-second_stage_install () {
-    x_core_install () {
-	smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
-    }
-
-    p () {
-	baseprog="$(($baseprog + ${1:-1}))"
-    }
-
-    if doing_variant fakechroot; then
-	setup_proc_fakechroot
-    else
-	setup_proc
-	in_target /sbin/ldconfig
-    fi
-
-    DEBIAN_FRONTEND=noninteractive
-    DEBCONF_NONINTERACTIVE_SEEN=true
-    export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
-
-    baseprog=0
-    bases=7
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #1
-    info INSTCORE "Installing core packages..."
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #2
-    ln -sf mawk "$TARGET/usr/bin/awk"
-    x_core_install base-files base-passwd
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #3
-    x_core_install dpkg
-
-    if [ ! -e "$TARGET/etc/localtime" ]; then
-        ln -sf /usr/share/zoneinfo/Etc/UTC "$TARGET/etc/localtime"
-    fi
-
-    if doing_variant fakechroot; then
-	install_fakechroot_tools
-    fi
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #4
-    x_core_install $LIBC
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #5
-    x_core_install perl-base
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #6
-    rm "$TARGET/usr/bin/awk"
-    x_core_install mawk
-
-    p; progress $baseprog $bases INSTCORE "Installing core packages" #7
-    if doing_variant -; then
-      x_core_install debconf
-    fi
-
-    baseprog=0
-    bases=$(set -- $required; echo $#)
-
-    info UNPACKREQ "Unpacking required packages..."
-
-    smallyes '' |
-      (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
-      dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
-
-    info CONFREQ "Configuring required packages..."
-
-    if doing_variant fakechroot; then
-	# fix initscripts postinst (no mounting possible, and wrong if condition)
-	sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' "$TARGET/var/lib/dpkg/info/initscripts.postinst"
-    fi
-
-    mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
-    echo \
-"#!/bin/sh
-echo
-echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon"
-    chmod 755 "$TARGET/sbin/start-stop-daemon"
-
-    if [ -x "$TARGET/sbin/initctl" ]; then
-      mv "$TARGET/sbin/initctl" "$TARGET/sbin/initctl.REAL"
-      echo \
-"#!/bin/sh
-echo
-echo \"Warning: Fake initctl called, doing nothing\"" > "$TARGET/sbin/initctl"
-      chmod 755 "$TARGET/sbin/initctl"
-    fi
-
-    setup_dselect_method apt
-
-    smallyes '' |
-      (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
-      dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1
-
-    baseprog=0
-    bases="$(set -- $base; echo $#)"
-
-    info UNPACKBASE "Unpacking the base system..."
-
-    setup_available $required $base
-    done_predeps=
-    while predep=$(get_next_predep); do
-      # We have to resolve dependencies of pre-dependencies manually because
-      # dpkg --predep-package doesn't handle this.
-      predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps")
-      # XXX: progress is tricky due to how dpkg_progress works
-      # -- cjwatson 2009-07-29
-      p; smallyes '' | in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep)
-      base=$(without "$base" "$predep")
-      done_predeps="$done_predeps $predep"
-    done
-
-    smallyes '' |
-      (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
-      dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
-
-    info CONFBASE "Configuring the base system..."
-
-    smallyes '' |
-      (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" \
-      dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 |
-      dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
-
-    if [ -x "$TARGET/sbin/initctl.REAL" ]; then
-      mv "$TARGET/sbin/initctl.REAL" "$TARGET/sbin/initctl"
-    fi
-    mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
-
-    progress $bases $bases CONFBASE "Configuring base system"
-    info BASESUCCESS "Base system installed successfully."
-}
diff --git a/pcr/din/PKGBUILD b/pcr/din/PKGBUILD
deleted file mode 100644
index 5f3369f0a..000000000
--- a/pcr/din/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-
-pkgname=din
-pkgver=5.2.1
-pkgrel=1
-pkgdesc="A software musical instrument and audio synthesizer using Bezier curves to draw waveforms."
-arch=('i686' 'mips64el')
-url="http://dinisnoise.org/"
-license=('GPL3')
-depends=('fftw' 'jack' 'liblo' 'libgl' 'libircclient' 'tcl')
-makedepends=('mesa')
-install="$pkgname.install"
-source=("http://din.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-md5sums=('d5a9c375b58e7652004bfcc1e3e17f88')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # remove previously generated checkdotdin
-  rm data/checkdotdin
-
-  # colourized echo in m00 script
-  sed -i "s|echo|& -e|" data/m00
-
-  # tcl 8.6 fix
-  sed -i "s/tcl8\.5/tcl8\.6/g" `grep -rl "tcl8\.5"`
-
-  ./configure --prefix=/usr \
-              --datarootdir=/usr/share
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/din/din.install b/pcr/din/din.install
deleted file mode 100644
index 810ee4bfd..000000000
--- a/pcr/din/din.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  echo ">>> If you get any trouble, remeber to clean your ~/.din folder"
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/pcr/dirt/PKGBUILD b/pcr/dirt/PKGBUILD
deleted file mode 100644
index d269b41f8..000000000
--- a/pcr/dirt/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: fauno <fauno@parabola.nu>
-pkgname=dirt
-pkgver=1.0.0a28
-pkgrel=1
-pkgdesc="Multi-platform IRC proxy that adds FiSH-compatible chat encryption (including DH1080 key exchanges) to any IRC client"
-arch=('i686')
-url="http://dirtirc.sourceforge.net/"
-license=('GPL2')
-depends=('openssl')
-source=(http://ufpr.dl.sourceforge.net/project/dirtirc/Dirt/1.0.0%20alpha%2028/${pkgname}-${pkgver}-source.tar.gz)
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make unix
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-  install -D -m 755 dirtirc ${pkgdir}/usr/bin/dirtirc
-}
-sha1sums=('0f7f407f5a3cb0f083b95d81849efde90177e7d2')
-sha256sums=('c1e8bc212a54739ba45f10a6f157f1a80052c913863e6624c434d7335fc2721b')
diff --git a/pcr/django-cms/PKGBUILD b/pcr/django-cms/PKGBUILD
deleted file mode 100644
index 9a641b7fb..000000000
--- a/pcr/django-cms/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: Baptiste Jonglez <baptiste--aur at jonglez dot org>
-# Contributor: Fabio Volpe <volpefabio@gmail.com>
-# Contributor: Apkawa <apkawa@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aur�lien Desbri�res <aurelien@cwb.io>
-
-pkgname=django-cms
-pkgver=2.2
-pkgrel=1
-pkgdesc="CMS framework based on Django"
-arch=('any')
-url="http://www.django-cms.org/"
-license=('BSD')
-depends=('python2' 'django' 'python-south' 'python-imaging' 'django-mptt' 'python2-html5lib' 'django-classy-tags' 'django-sekizai')
-source=(http://pypi.python.org/packages/source/d/$pkgname/$pkgname-$pkgver.tar.gz)
-
-build() { 
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py build
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py install --root="$pkgdir/" --install-data=/usr/share/$pkgname --optimize=1
-  #install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
-
diff --git a/pcr/django-extensions/PKGBUILD b/pcr/django-extensions/PKGBUILD
deleted file mode 100644
index 535091cfc..000000000
--- a/pcr/django-extensions/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: Alper Kanat <alperkanat@raptiye.org>
-# Contributor: Schnouki <thomas.jost@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io>
-
-pkgname=django-extensions
-pkgver=0.6
-pkgrel=1
-pkgdesc="Django Custom Management Command Extensions"
-arch=('any')
-url="http://github.com/django-extensions/django-extensions"
-license=('BSD')
-depends=('django' 'python2')
-makedepends=('setuptools' 'git')
-optdepends=('graphviz: to graph Django models'
-            'python-werkzeug: to use the Werbzeug debugger in the embedded web server')
-source=()
-
-_giturl=http://github.com/$pkgname/$pkgname.git
-
-build() {
-    cd $srcdir
-
-    if [[ ! -d $srcdir/$pkgname ]]; then
-        # downloading the whole repository
-        git clone $_giturl
-    else
-        # updating the local repository
-        cd $srcdir/$pkgname
-        git pull
-    fi
-
-    cd $srcdir/$pkgname
-
-    # checking out to the tag (version)
-    git checkout -b $pkgver $pkgver
-
-    python2 ./setup.py install --root=$pkgdir --prefix=/usr || return 1
-}
-
diff --git a/pcr/django-social-auth/PKGBUILD b/pcr/django-social-auth/PKGBUILD
deleted file mode 100644
index 379a066a2..000000000
--- a/pcr/django-social-auth/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Benjamin A. Shelton <zancarius at gmail _ com>
-# Source: https://github.com/zancarius/archlinux-pkgbuilds
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=django-social-auth
-pkgver=0.7.9
-pkgrel=1
-pkgdesc="Social authentication made simple."
-arch=(any)
-url="http://pypi.python.org/pypi/django-social-auth"
-license=(BSD)
-depends=(python2 python2-openid python2-oauth2)
-makedepends=(python2-distribute)
-conflicts=(django-socialauth-git)
-source=("http://pypi.python.org/packages/source/d/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-
-build () {
-    
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    python2 setup.py install --root="${pkgdir}/" --optimize=1
-
-}
diff --git a/pcr/django-tagging/PKGBUILD b/pcr/django-tagging/PKGBUILD
deleted file mode 100644
index ba6c0def8..000000000
--- a/pcr/django-tagging/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor: Ryan Coyner <rcoyner@gmail.com>
-# Contributor: James Pearson <james.m.pearson+arch@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aur�lien Desbri�res <aurelien@cwb.io>
-
-pkgname=django-tagging
-pkgver=0.3.1
-pkgrel=2
-pkgdesc="A generic tagging application for Django projects"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/django-tagging/"
-license=('MIT')
-depends=('python2')
-source=(http://django-tagging.googlecode.com/files/django-tagging-$pkgver.tar.gz)
-
-build() { 
-    cd $srcdir/django-tagging-$pkgver
-    python2 setup.py build || return 1
-    python2 setup.py install --root=$pkgdir || return 1
-    install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
-md5sums=('a0855f2b044db15f3f8a025fa1016ddf')
diff --git a/pcr/doxymacs/PKGBUILD b/pcr/doxymacs/PKGBUILD
deleted file mode 100644
index 2fe820376..000000000
--- a/pcr/doxymacs/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: Limao Luo <luolimao+AUR@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=doxymacs
-pkgver=1.8.0
-pkgrel=2
-pkgdesc="Use Doxygen from within {X}Emacs"
-arch=(i686 x86_64 mips64el)
-url=http://$pkgname.sourceforge.net
-license=(GPL)
-depends=('libxml2>=2.6.13')
-install=$pkgname.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('a23fd833bc3c21ee5387c62597610941e987f9d4372916f996bf6249cc495afa')
-sha512sums=('7461a8a415aadf331f856e4f122712cbedc2907eff9e452f24e6ee83b96903d9944d2cfdbcfeab8a66144a0be508eae723c29f82a081df9723560b10c444f8ac')
-
-build() {
-    cd "$srcdir"/$pkgname-$pkgver/
-    ./configure --prefix=/usr
-    make
-}
-
-package() {
-    cd "$srcdir"/$pkgname-$pkgver/
-    make DESTDIR="$pkgdir" install
-}
diff --git a/pcr/doxymacs/doxymacs.install b/pcr/doxymacs/doxymacs.install
deleted file mode 100644
index 9d8366f45..000000000
--- a/pcr/doxymacs/doxymacs.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-    cat <<__EOF__
-====> Put (require 'doxymacs) in your .emacs
-====> Invoke doxymacs-mode with M-x doxymacs-mode.
-====> To have doxymacs-mode invoked automatically when in C/C++ mode, put
-(add-hook 'c-mode-common-hook 'doxymacs-mode)
-====> in your .emacs.
-====> If you want Doxygen keywords fontified use M-x doxymacs-font-lock.
-====> To do it automatically in C and C++ modes, add the following to your .emacs:
-(defun my-doxymacs-font-lock-hook ()
-  (if (or (eq major-mode 'c-mode) (eq major-mode 'c++-mode))
-      (doxymacs-font-lock)))
-(add-hook 'font-lock-mode-hook 'my-doxymacs-font-lock-hook)
-__EOF__
-}
-
-post_upgrade() {
-    post_install
-}
diff --git a/pcr/dratmenu/PKGBUILD b/pcr/dratmenu/PKGBUILD
deleted file mode 100644
index 8d6a2b357..000000000
--- a/pcr/dratmenu/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: ivoarch <ivkuzev@gmail.com>
-# Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@replicant.io>
-
-pkgname=dratmenu
-pkgver=20121218
-pkgrel=1
-pkgdesc="ratpoison window dmenu"
-arch=('any')
-url="https://github.com/dimatura/dratmenu.git"
-license=('GPL')
-depends=('dmenu' 'python2')
-makedepends=('git')
-
-_gitroot="https://github.com/dimatura/dratmenu.git"
-_gitname="master"
-
-build() {
-        cd $srcdir
-
-        if [ -d $srcdir/$pkgname ] ; then
-                  msg "update git"
-               cd $pkgname && git pull origin
-               else
-                  msg "clone git"
-                    git clone $_gitroot
-                    fi
-}
-
-package() {
-          mkdir -p $pkgdir/usr/lib/python2.7/site-packages
-          cp -r $srcdir/$pkgname $pkgdir/usr/lib/python2.7/site-packages
-          mkdir -p $pkgdir/usr/bin
-          echo "#!/bin/bash
-          python2 /usr/lib/python2.7/site-packages/$pkgname/dratmenu.py" > $pkgdir/usr/bin/dratmenu
-          chmod +x $pkgdir/usr/bin/dratmenu
-}
diff --git a/pcr/dropbear/PKGBUILD b/pcr/dropbear/PKGBUILD
deleted file mode 100644
index 1e50534a3..000000000
--- a/pcr/dropbear/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Jason Pierce <`echo 'moc tod liamg ta nosaj tod ecreip' | rev`>
-# Contributor: Jeremy Cowgar <jeremy@cowgar.com>
-
-pkgname=dropbear
-pkgver=0.53.1
-pkgrel=2
-pkgdesc="Lightweight replacement for sshd"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://matt.ucc.asn.au/dropbear/dropbear.html"
-license=('custom:BSD' 'custom:PD')
-depends=('zlib')
-source=(http://matt.ucc.asn.au/$pkgname/releases/$pkgname-$pkgver.tar.bz2 \
-        $pkgname-conf.d \
-        $pkgname-rc.d)
-sha256sums=('e24d3cbecd3bc850b2b336b8eb50c845a285ceef8e22544938a582e163d36393'
-            'eaec8cecae4476a660351ba9079c91b7c379146a22df881bd24b81af8f50d74c'
-            '29ab5438d15bfa727620fc04ec52ff55d676577b903c9261ce00bb291ae171a8')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  sed -i 's:usr/libexec/sftp:usr/lib/ssh/sftp:' options.h
-
-  ./configure --prefix=/usr
-  LIBS="-lcrypt" make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  make prefix=${pkgdir}/usr install
-
-#man pages
-  install -D -m644 dbclient.1 ${pkgdir}/usr/share/man/man1/dbclient.1
-  install -D -m644 $pkgname.8 ${pkgdir}/usr/share/man/man8/$pkgname.8
-  install -D -m644 dropbearkey.8 ${pkgdir}/usr/share/man/man8/dropbearkey.8
-
-#configuration files
-  install -d ${pkgdir}/etc/$pkgname
-  install -D -m644 ${srcdir}/$pkgname-conf.d ${pkgdir}/etc/conf.d/$pkgname
-  install -D -m755 ${srcdir}/$pkgname-rc.d ${pkgdir}/etc/rc.d/$pkgname
-
-#license file
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/pcr/dropbear/dropbear-conf.d b/pcr/dropbear/dropbear-conf.d
deleted file mode 100644
index 6f3b8f0c5..000000000
--- a/pcr/dropbear/dropbear-conf.d
+++ /dev/null
@@ -1,15 +0,0 @@
-# the TCP port that Dropbear listens on
-DROPBEAR_PORT="127.0.0.1:22" # Default to local-only.
-
-# any additional arguments for Dropbear
-DROPBEAR_EXTRA_ARGS="-w" # Default to no-root logins.
-
-# specify an optional banner file containing a message to be
-# sent to clients before they connect, such as "/etc/issue.net"
-DROPBEAR_BANNER=""
-
-# RSA hostkey file (default: /etc/dropbear/dropbear_rsa_host_key)
-#DROPBEAR_RSAKEY="/etc/dropbear/dropbear_rsa_host_key"
-
-# DSS hostkey file (default: /etc/dropbear/dropbear_dss_host_key)
-DROPBEAR_DSSKEY="/etc/dropbear/dropbear_dss_host_key"
diff --git a/pcr/dropbear/dropbear-rc.d b/pcr/dropbear/dropbear-rc.d
deleted file mode 100644
index 011880b3b..000000000
--- a/pcr/dropbear/dropbear-rc.d
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-daemon_name=dropbear
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-. /etc/conf.d/$daemon_name
-
-for port in $DROPBEAR_PORT; do
-  daemon_args="$daemon_args -p $port"
-done
-
-[ ! -z $DROPBEAR_BANNER ] && daemon_args="$daemon_args -b $DROPBEAR_BANNER"
-[ ! -z $DROPBEAR_DSSKEY ] && daemon_args="$daemon_args -d $DROPBEAR_DSSKEY"
-[ ! -z $DROPBEAR_RSAKEY ] && daemon_args="$daemon_args -r $DROPBEAR_RSAKEY"
-[ ! -z $DROPBEAR_EXTRA_ARGS ] && daemon_args="$daemon_args $DROPBEAR_EXTRA_ARGS"
-[ -z $DROPBEAR_PIDFILE ] && DROPBEAR_PIDFILE="/var/run/$daemon_name.pid"
-daemon_args="$daemon_args -P $DROPBEAR_PIDFILE"
-
-get_pid() {
-  PID=''
-  if [ -r $DROPBEAR_PIDFILE -a -f $DROPBEAR_PIDFILE -a -w $DROPBEAR_PIDFILE ]; then
-    if kill -0 "`< $DROPBEAR_PIDFILE`" &>/dev/null; then # kill -0 == "exit code indicates if a signal may be sent"
-      PID="`< $DROPBEAR_PIDFILE`"
-    else # may not send signals to dropbear, because it's probably not running => remove pidfile
-      rm -f $DROPBEAR_PIDFILE
-    fi
-  fi
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name"
-    get_pid
-    if [ -z "$PID" ]; then
-      printhl "Checking for hostkeys"
-      if [ ! -z $DROPBEAR_DSSKEY ]; then
-        [ ! -f $DROPBEAR_DSSKEY ] && dropbearkey -t dss -f $DROPBEAR_DSSKEY
-      fi;
-      if [ ! -z $DROPBEAR_RSAKEY ]; then
-        [ ! -f $DROPBEAR_RSAKEY ] && dropbearkey -t rsa -f $DROPBEAR_RSAKEY
-      fi;
-
-      $daemon_name $daemon_args # Make it Go Joe!
-      if [ $? -gt 0 ]; then
-        stat_die
-      else
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_die
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name"
-
-    get_pid
-    [ ! -z "$PID" ] && kill $PID &> /dev/null # Be dead (please), I say!
-    if [ $? -gt 0 ]; then
-      stat_die
-    else
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  fingerprint)
-    stat_busy "Fingerprinting $daemon_name hostkeys"
-    if [ ! -z $DROPBEAR_DSSKEY ]; then
-      printhl "DSS/DSA Key $(dropbearkey -y -f $DROPBEAR_DSSKEY | grep Fingerprint)"
-    fi;
-    if [ ! -z $DROPBEAR_RSAKEY ]; then
-      printhl "RSA Key $(dropbearkey -y -f $DROPBEAR_RSAKEY | grep Fingerprint)"
-    fi;
-  ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|fingerprint}"
-esac
-exit 0
diff --git a/pcr/drumgizmo/PKGBUILD b/pcr/drumgizmo/PKGBUILD
deleted file mode 100644
index d423a6f82..000000000
--- a/pcr/drumgizmo/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-
-pkgname=drumgizmo
-pkgver=0.9.3
-pkgrel=1
-pkgdesc="A drum LV2 plugin and stand-alone application"
-arch=('i686' 'x86_64')
-url="http://www.drumgizmo.org/"
-license=('GPL')
-groups=('lv2-plugins')
-depends=('lv2' 'libsmf' 'libao' 'jack' 'qt4')
-options=('!libtool')
-source=("${url}releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz")
-md5sums=('a0aeef33f74792afd528bec21b8d0f6b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-              --enable-static=no
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/drumkv1/PKGBUILD b/pcr/drumkv1/PKGBUILD
deleted file mode 100644
index 2f2841e11..000000000
--- a/pcr/drumkv1/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-
-pkgname=drumkv1
-pkgver=0.3.4
-pkgrel=1
-pkgdesc="An old-school drum-kit sampler"
-arch=(i686 x86_64)
-url="http://$pkgname.sourceforge.net/$pkgname-index.html"
-license=('GPL')
-groups=('lv2-plugins')
-depends=('jack' 'liblo' 'lv2' 'qt4' 'shared-mime-info')
-install="$pkgname.install"
-source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('d94b9c5b21bfdbf0f57cf811273b1fcd')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # x86_64 lib path fix
-  sed -i "s/lib64/lib/" src/src_lv2.pro
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/drumkv1/drumkv1.install b/pcr/drumkv1/drumkv1.install
deleted file mode 100644
index ec1a84bbb..000000000
--- a/pcr/drumkv1/drumkv1.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  update-mime-database usr/share/mime
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/pcr/dsh/PKGBUILD b/pcr/dsh/PKGBUILD
deleted file mode 100644
index 605598100..000000000
--- a/pcr/dsh/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Contributor: SkiltZ <skiltz@free.fr>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=dsh
-pkgver=0.25.9 
-pkgrel=2
-pkgdesc="Distributed shell. Runs command through rsh or ssh on a cluster of machines."
-arch=(i686 x86_64)
-depends=('libdshconfig')
-url="http://www.netfort.gr.jp/~dancer/software/dsh.html.en"
-license=('GPL')
-source=(http://www.netfort.gr.jp/~dancer/software/downloads/dsh-$pkgver.tar.gz)
- 
-build() {
-	  cd $startdir/src/$pkgname-$pkgver
-	    ./configure --prefix=/usr --sysconfdir='/etc'
-	      make || return 1
-	        make prefix=$startdir/pkg/usr sysconfdir=$startdir/pkg/etc install
-	}
diff --git a/pcr/dswm/PKGBUILD b/pcr/dswm/PKGBUILD
deleted file mode 100644
index 122e62b9a..000000000
--- a/pcr/dswm/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-pkgname=dswm
-pkgver=0.0.5r2
-pkgrel=5
-pkgdesc="Deep Space Window Manager - tiling window manager, oriented for good usability and good emacs integration (StumpWM-based)."
-url="http://sourceforge.net/projects/dswm/"
-arch=('x86_64' 'i686')
-license=('GPLv2')
-depends=('sbcl' 'clx-git' 'cl-ppcre')
-optdepends=('emacs')
-makedepends=('autoconf')
-conflicts=()
-replaces=()
-backup=()
-install='dswm.install'
-options=(!strip)
-source=("http://sourceforge.net/projects/${pkgname}/files/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('90f95f7ecfbf964f8ed5aa629959bc1f')
-
-build() {
-  mkdir -p "${pkgdir}"/usr/share/xsessions/ # patch for specific original makefile
-  cd $startdir/src/$pkgname-$pkgver
-  sed -i 's/\@prefix\@//g' dswm.lisp.in
-  autoconf
-  ./configure --prefix=/usr \
-              --with-ppcre=/usr/share/common-lisp/source/cl-ppcre
-
-# this is necesary since the AUR packages do not modify the asdf's registry by default
-      _sbcl_bopt="sbcl_BUILDOPTS=--eval \"(require :asdf)\" \
---eval \"(pushnew #p\\\"/usr/share/common-lisp/systems/\\\" asdf:*central-registry* :test #'equal)\" \
---eval \"(asdf:operate 'asdf:load-op 'clx)\" \
---load ./make-image.lisp"
-      _sbcl_iopt="sbcl_INFOOPTS=--eval \"(require 'asdf)\" \
---eval \"(pushnew #p\\\"/usr/share/common-lisp/systems/\\\" asdf:*central-registry* :test #'equal)\" \
---eval \"(asdf:operate 'asdf:load-op 'clx)\" \
---eval \"(require 'dswm)\" \
---load ./manual.lisp \
---eval \"(progn (dswm::generate-manual) (sb-ext:quit))\""
-
-  make "$_sbcl_bopt" "$_sbcl_iopt"
-  make destdir="${pkgdir}" install
-}
diff --git a/pcr/dswm/dswm.install b/pcr/dswm/dswm.install
deleted file mode 100644
index 0077d0018..000000000
--- a/pcr/dswm/dswm.install
+++ /dev/null
@@ -1,21 +0,0 @@
-infodir=usr/share/info
-filelist=(dswm.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
diff --git a/pcr/econnman/PKGBUILD b/pcr/econnman/PKGBUILD
index a6419abc0..70d27ec71 100644
--- a/pcr/econnman/PKGBUILD
+++ b/pcr/econnman/PKGBUILD
@@ -1,24 +1,21 @@
 # Maintainer: Doug Newgard <scimmia22 at outlook dot com>
 
 pkgname=econnman
-pkgver=1
+pkgver=1.1
 pkgrel=1
 pkgdesc="Enlightenment ConnMan user interface"
 arch=('any')
 url="http://www.enlightenment.org"
 license=('LGPL3')
-depends=('python2-elementary' 'python2-e_dbus' 'python2-edje' 'python2-ecore' 'connman')
-conflicts=('econnman-svn')
-source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('cec2bd0aaf9d8975dd69ac6b5a4e638e')
+depends=('python-efl' 'connman')
+source=("http://download.enlightenment.org/rel/apps/$pkgname/$pkgname-$pkgver.tar.gz")
+sha256sums=('60f30748b2642b83763fe1e00f6a54ff27425c761633bb8cc0396fba15e7f714')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  sed -i 's:/usr/bin/python:/usr/bin/python2:g' econnman-bin.in
-
-  PYTHON=/usr/bin/python2 \
-  ./configure --prefix=/usr
+  ./configure \
+    --prefix=/usr
 
   make
 }
@@ -27,5 +24,12 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
+
+# install text files
+  install -Dm644 AUTHORS "$pkgdir/usr/share/doc/$pkgname/AUTHORS"
+  install -Dm644 ChangeLog "$pkgdir/usr/share/doc/$pkgname/ChangeLog"
+  install -Dm644 NEWS "$pkgdir/usr/share/doc/$pkgname/NEWS"
+  install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README"
 }
 
+
diff --git a/pcr/eigen3/PKGBUILD b/pcr/eigen3/PKGBUILD
deleted file mode 100644
index 240b55f8a..000000000
--- a/pcr/eigen3/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Chirantan Ekbote <chirantan.ekbote at gmail.com>
-# Contributor: Kringel
-# This PKGBUILD is a modified version of eigen 2.x in extra/eigen
-# Maintainer: Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.IO>
-
-pkgname=eigen3
-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')
-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
-    cd "$srcdir"/build
-    cmake ../eigen-eigen-* \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr
-}
-
-package() {
-    cd "$srcdir"/build
-    make DESTDIR="$pkgdir" install
-}
diff --git a/pcr/emacs-bzr/PKGBUILD b/pcr/emacs-bzr/PKGBUILD
deleted file mode 100644
index 7383e3490..000000000
--- a/pcr/emacs-bzr/PKGBUILD
+++ /dev/null
@@ -1,93 +0,0 @@
-# Contributor: Neil Santos <nsantos16+aur@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-# Compile against Gtk+ 2.x, instead of the default 3.x
-_opt_use_gtk2="n"
-# Emacs is leaking like a sieve on my box with the default values;
-# this should be the number of bytes Emacs should allocate for pure
-# storage (see Elisp manual).  Default as of writing this is 1.62 megs
-# (not the final value; there are still calculations done on it).
-_opt_puresize="2000000"
-
-pkgname=emacs-bzr
-pkgver=110380
-pkgrel=1
-pkgdesc='The extensible, customizable, self-documenting real-time display editor from its official Bzr repository'
-arch=('i686' 'x86_64')
-url='http://www.gnu.org/software/emacs/'
-license=('GPL3')
-if [[ $_opt_use_gtk2 = "y" ]]; then
-  depends=('dbus-core' 'desktop-file-utils' 'libpng' 'libtiff' 'librsvg' 'giflib' 'gtk2' 'libxpm' 'libjpeg>=7' 'hicolor-icon-theme')
-else
-  depends=('dbus-core' 'desktop-file-utils' 'libpng' 'libtiff' 'librsvg' 'giflib' 'gtk3' 'libxpm' 'libjpeg>=7' 'hicolor-icon-theme')
-fi
-
-makedepends=('bzr' 'pkgconfig' 'texinfo')
-provides=("emacs=$pkgver")
-conflicts=('emacs' 'emacs-nox' 'emacs-otf' 'emacs-cvs' 'emacs-git')
-install=$pkgname.install
-
-_bzrtrunk='http://bzr.savannah.gnu.org/r/emacs/trunk'
-_bzrmod='emacs'
-
-build() {
-  cd $srcdir
-  msg "Connecting to Savannah..."
-
-  if [[ -d $_bzrmod/.bzr ]]; then
-    (cd $_bzrmod && bzr update -v && cd ..)
-    msg "Local checkout updated or server timeout"
-  else
-    bzr co --lightweight -v $_bzrtrunk $_bzrmod
-    msg "Checkout done or server timeout"
-  fi
-
-  cp -urT $_bzrmod/ ${_bzrmod}-build
-  cd ${_bzrmod}-build
-  msg "Adjusting BASE_PURESIZE to avoid possible leaks"
-  sed -i -e "s/\(define BASE_PURESIZE\s*(*\)[0-9]*/\1${_opt_puresize}/" src/puresize.h
-
-  msg "Bootstrapping Emacs Lisp files..."
-  make bootstrap
-
-  mandir=/usr/share/man
-  msg "Starting make..."
-  if [[ $_opt_use_gtk2 = "y" ]]; then
-    ./autogen.sh && ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib \
-      --mandir=${mandir} \
-      --without-sound \
-      --with-xft \
-      --with-x-toolkit=gtk2
-  else
-    ./autogen.sh && ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib \
-      --mandir=${mandir} \
-      --without-sound \
-      --with-xft \
-      --with-x-toolkit=gtk3
-  fi
-  make
-  make DESTDIR=${pkgdir} install
-
-  msg "Cleaning up..."
-  mv $pkgdir/usr/bin/{ctags,ctags.emacs}
-  mv $pkgdir/usr/bin/{etags,etags.emacs}
-  mv $pkgdir${mandir}/man1/{etags.1,etags.emacs.1}.gz
-  mv $pkgdir${mandir}/man1/{ctags.1,ctags.emacs.1}.gz
-
-  # This is mostly superfluous, and conflicts with texinfo
-  rm $pkgdir/usr/share/info/info.info.gz
-  rm $pkgdir/usr/share/info/dir
-
-  find $pkgdir/usr/share/emacs -type d -exec chmod 755 {} \;
-  find $pkgdir/usr/share/emacs -exec chown root.root {} \;
-  chmod 775 $pkgdir/var/games
-  chmod 775 $pkgdir/var/games/emacs
-  chmod 664 $pkgdir/var/games/emacs/*
-  chown -R root:50 $pkgdir/var/games
-}
diff --git a/pcr/emacs-bzr/emacs-bzr.install b/pcr/emacs-bzr/emacs-bzr.install
deleted file mode 100644
index 35d11bd56..000000000
--- a/pcr/emacs-bzr/emacs-bzr.install
+++ /dev/null
@@ -1,32 +0,0 @@
-ICON_PATH=/usr/share/icons/hicolor
-INFO_DIR=/usr/share/info
-
-INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
-ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc ert eshell
-eudc flymake forms gnus idlwave mairix-el message mh-e newsticker
-nxml-mode org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses
-sieve smtpmail speedbar tramp url vip viper widget woman)
-
-post_install() {
-  gtk-update-icon-cache -q -t -f ${ICON_PATH}
-  update-desktop-database -q
-
-  [[ -x /usr/bin/install-info ]] || return 0
-  for f in ${INFO_FILES[@]}; do
-    install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gtk-update-icon-cache -q -t -f ${ICON_PATH}
-  update-desktop-database -q
-
-  [[ -x /usr/bin/install-info ]] || return 0
-  for f in ${INFO_FILES[@]}; do
-    install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
-  done
-}
diff --git a/pcr/emacs-color-theme/PKGBUILD b/pcr/emacs-color-theme/PKGBUILD
deleted file mode 100644
index 53ad1bf24..000000000
--- a/pcr/emacs-color-theme/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 59903 2011-12-02 11:18:13Z andrea $
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: Cesar Romero <cesar.romero@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io>
-
-pkgname=emacs-color-theme
-pkgver=6.6.0
-pkgrel=8
-arch=('any')
-pkgdesc="Emacs color themes"
-url="https://gna.org/projects/color-theme"
-license=('GPL2')
-depends=('emacs' 'xorg-fonts-100dpi')
-makedepends=('emacs')
-provides=('color-theme')
-replaces=('color-theme')
-install=$pkgname.install
-source=(http://download.savannah.gnu.org/releases/color-theme/color-theme-$pkgver.tar.gz
-        'gnus-bug.diff'
-        'fix-build.patch')
-md5sums=('a4de73c236a6af11ab378bfe18dabcca'
-         '8b7ee1c4c6f80606f22c3de448ec92e8'
-         '25b92ea246716689502ebe050322a60a')
-
-build() {
-  cd $srcdir/color-theme-$pkgver
-
-  patch -p1 -i $srcdir/gnus-bug.diff
-  patch -p0 -i $srcdir/fix-build.patch
-
-  make
-}
-
-package() {
-  cd $srcdir/color-theme-$pkgver
-  install -Dm644 color-theme.el \
-    $pkgdir/usr/share/emacs/site-lisp/color-theme.el
-  install -Dm644 themes/color-theme-library.el \
-    $pkgdir/usr/share/emacs/site-lisp/themes/color-theme-library.el
-  install -Dm644 themes/color-theme-example.el \
-    $pkgdir/usr/share/emacs/site-lisp/themes/color-theme-example.el
-  install -Dm644 color-theme.elc \
-    $pkgdir/usr/share/emacs/site-lisp/color-theme.elc
-  install -Dm644 themes/color-theme-library.elc \
-    $pkgdir/usr/share/emacs/site-lisp/themes/color-theme-library.elc
-  install -Dm644 themes/color-theme-example.elc \
-    $pkgdir/usr/share/emacs/site-lisp/themes/color-theme-example.elc
-}
diff --git a/pcr/emacs-color-theme/emacs-color-theme.install b/pcr/emacs-color-theme/emacs-color-theme.install
deleted file mode 100644
index b1de09f76..000000000
--- a/pcr/emacs-color-theme/emacs-color-theme.install
+++ /dev/null
@@ -1,9 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-echo "# To start using color-theme add this to your .emacs:"
-echo "# (require 'color-theme)"
-}
-
-post_upgrade() {
-  post_install
-}
\ No newline at end of file
diff --git a/pcr/emacs-color-theme/fix-build.patch b/pcr/emacs-color-theme/fix-build.patch
deleted file mode 100644
index cadb1ae05..000000000
--- a/pcr/emacs-color-theme/fix-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.orig	2009-05-15 18:22:49.000000000 +0200
-+++ Makefile	2009-05-16 08:59:36.000000000 +0200
-@@ -15,6 +15,7 @@
- TARGET	= $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE))
- MANUAL  = color-theme
- MISC	= AUTHORS COPYING ChangeLog Makefile.defs Makefile $(AUTOLOADFILE).in
-+LOADPATH = "$(shell pwd)" "$(shell pwd)/themes"
- #AUTHORS CREDITS HISTORY NEWS README Makefile ChangeLog \
- #ChangeLog.2005 ChangeLog.2004 ChangeLog.2003 ChangeLog.2002 \
- #ChangeLog.2001 servers.pl color-theme-auto.in color-theme.texi
-@@ -47,7 +48,7 @@
- 
- %.elc: %.el
- 	@$(EMACS) $(OPTIONCOMPILE) \
--	--eval '(setq load-path (cons "." load-path))' \
-+	--eval '(setq load-path (append load-path (list $(LOADPATH))))' \
- 	-f batch-byte-compile $<
- 
- %.info: %.texi
diff --git a/pcr/emacs-color-theme/gnus-bug.diff b/pcr/emacs-color-theme/gnus-bug.diff
deleted file mode 100644
index 9d227df56..000000000
--- a/pcr/emacs-color-theme/gnus-bug.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur color-theme-6.6.0.orig/color-theme.el color-theme-6.6.0.new/color-theme.el
---- color-theme-6.6.0.orig/color-theme.el	2011-11-18 01:17:29.000000000 +0100
-+++ color-theme-6.6.0.new/color-theme.el	2011-11-18 01:24:07.000000000 +0100
-@@ -73,9 +73,10 @@
-   "Non-nil if running XEmacs.")
- 
- ;; Add this since it appears to miss in emacs-2x
--(or (fboundp 'replace-in-string)
--    (defun replace-in-string (target old new)
--      (replace-regexp-in-string old new  target)))
-+(if (fboundp 'replace-in-string)
-+    (defalias 'color-theme-replace-in-string 'replace-in-string)
-+  (defsubst color-theme-replace-in-string (target old new &optional literal)
-+    (replace-regexp-in-string old new target nil literal)))
- 
- ;; face-attr-construct has a problem in Emacs 20.7 and older when
- ;; dealing with inverse-video faces.  Here is a short test to check
-@@ -1626,8 +1627,8 @@
-        (add-to-list 'color-themes
-                     (list ',n
-                           (upcase-initials
--                           (replace-in-string
--                            (replace-in-string 
-+                           (color-theme-replace-in-string
-+                            (color-theme-replace-in-string 
-                              (symbol-name ',n) "^color-theme-" "") "-" " "))
-                           ,author))
-        (defun ,n ()
diff --git a/pcr/emacs-elib/PKGBUILD b/pcr/emacs-elib/PKGBUILD
deleted file mode 100644
index 22946859e..000000000
--- a/pcr/emacs-elib/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# PKGBUILD for Emacs Lisp Library (elib)
-# Contributor: J. Bromley <jbromley@gmail.com>
-# $Id: PKGBUILD,v e6d455730f95 2009/12/03 05:38:28 jbromley $
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=emacs-elib
-_pkgname=elib
-pkgver=1.0
-pkgrel=3
-pkgdesc="The Emacs Lisp library"
-arch=('i686' 'x86_64')
-url="http://jdee.sourceforge.net/"
-license="GPL"
-depends=('emacs')
-makedepends=('texinfo' 'gzip')
-conflicts=()
-replaces=()
-backup=()
-install="$pkgname.install"
-source=(http://downloads.sourceforge.net/project/jdee/jdee/Dependencies/elib.tar.gz)
-md5sums=('4feb380f2e3b12eb5500dfe6714e349d')
-
-build() {
-mv $startdir/src/pub/comp/os/unix/gnu/elib/$_pkgname-$pkgver.tar.gz $startdir/src
-cd $startdir/src/
-tar -xzf $_pkgname-$pkgver.tar.gz
-cd $startdir/src/$_pkgname-$pkgver
-
-# Fix up paths and old --infodir flag.
-sed -i 's!/usr/local!/usr!' Makefile
-sed -i 's!/info!/share/info!' Makefile
-sed -i 's!--infodir!--info-dir!g' Makefile
-
-# Patch to get rid of deprecated code.
-patch -p1 < $startdir/elib-deprecation.patch
-
-# Create directories for installation
-mkdir -p $startdir/pkg/usr/share/info
-mkdir -p $startdir/pkg/usr/share/emacs/site-lisp
-make || return 1
-
-# Install the compile package and gzip info file.
-make prefix=$startdir/pkg/usr install
-find $startdir/pkg -name dir -exec rm '{}' \;
-mv $startdir/pkg/usr/share/info/elib.info $startdir/pkg/usr/share/info/elib
-gzip $startdir/pkg/usr/share/info/elib
-}
-
-# Local Variables:
-# mode: shell-script
-# End:
diff --git a/pcr/emacs-elib/elib-deprecation.patch b/pcr/emacs-elib/elib-deprecation.patch
deleted file mode 100644
index ce8aedb6f..000000000
--- a/pcr/emacs-elib/elib-deprecation.patch
+++ /dev/null
@@ -1,461 +0,0 @@
-diff -ub elib-1.0.orig/avltree.el elib-1.0/avltree.el
---- elib-1.0.orig/avltree.el	1995-12-10 16:50:53.000000000 -0800
-+++ elib-1.0/avltree.el	2008-06-22 15:31:48.000000000 -0700
-@@ -69,19 +69,19 @@
- (defmacro elib-avl-node-create (left right data balance)
- 
-   ;; Create and return an avl-tree node.
--  (` (vector (, left) (, right) (, data) (, balance))))
-+  `(vector ,left ,right ,data ,balance))
- 
- 
- (defmacro elib-avl-node-balance (node)
- 
-   ;; Return the balance field of a node.
--  (` (aref (, node) 3)))
-+  `(aref ,node 3))
- 
- 
- (defmacro elib-avl-node-set-balance (node newbal)
- 
-   ;; Set the balance field of a node.
--  (` (aset (, node) 3 (, newbal))))
-+  `(aset ,node 3 ,newbal))
- 
- 
- 
-@@ -96,20 +96,20 @@
- (defmacro elib-avl-root (tree)
- 
-   ;; Return the root node for an avl-tree.  INTERNAL USE ONLY.
--  (` (elib-node-left (car (cdr (, tree))))))
-+  `(elib-node-left (car (cdr ,tree))))
- 
- 
- (defmacro elib-avl-dummyroot (tree)
- 
-   ;; Return the dummy node of an avl-tree.  INTERNAL USE ONLY.
- 
--  (` (car (cdr (, tree)))))
-+  `(car (cdr ,tree)))
- 
- 
- (defmacro elib-avl-cmpfun (tree)
- 
-   ;; Return the compare function of AVL tree TREE.  INTERNAL USE ONLY.
--  (` (cdr (cdr (, tree)))))
-+  `(cdr (cdr ,tree)))
- 
- 
- ;; ----------------------------------------------------------------
-@@ -412,20 +412,20 @@
-   ;; INTERNAL USE ONLY.
- 
-   (let ((node root)
--	(stack (elib-stack-create))
-+        (stack (stack-create))
- 	(go-left t))
--    (elib-stack-push stack nil)
-+    (stack-push stack nil)
-     (while node
-       (if (and go-left
- 	       (elib-node-left node))
- 	  (progn				   ; Do the left subtree first.
--	    (elib-stack-push stack node)
-+            (stack-push stack node)
- 	    (setq node (elib-node-left node)))
- 	(funcall map-function node)		   ; Apply the function...
- 	(if (elib-node-right node)		   ; and do the right subtree.
- 	    (setq node (elib-node-right node)
- 		  go-left t)
--	  (setq node (elib-stack-pop stack)
-+          (setq node (stack-pop stack)
- 		go-left nil))))))
- 
- 
-diff -ub elib-1.0.orig/bintree.el elib-1.0/bintree.el
---- elib-1.0.orig/bintree.el	1995-12-10 16:50:53.000000000 -0800
-+++ elib-1.0/bintree.el	2008-06-22 15:28:45.000000000 -0700
-@@ -64,19 +64,19 @@
- (defmacro elib-bintree-root (tree)
- 
-   ;; Return the root node for a binary tree.  INTERNAL USE ONLY.
--  (` (elib-node-left (car (cdr (, tree))))))
-+  `(elib-node-left (car (cdr ,tree))))
- 
- 
- (defmacro elib-bintree-dummyroot (tree)
- 
-   ;; Return the dummy node of a binary tree.  INTERNAL USE ONLY.
--  (` (car (cdr (, tree)))))
-+  `(car (cdr ,tree)))
- 
- 
- (defmacro elib-bintree-cmpfun (tree)
- 
-   ;; Return the compare function of binary tree TREE.  INTERNAL USE ONLY."
--  (` (cdr (cdr (, tree)))))
-+  `(cdr (cdr ,tree)))
- 
- 
- 
-@@ -90,20 +90,20 @@
-   ;; INTERNAL USE ONLY."
- 
-   (let ((node root)
--	(stack (elib-stack-create))
-+        (stack (stack-create))
- 	(go-left t))
--    (elib-stack-push stack nil)
-+    (stack-push stack nil)
-     (while node
-       (if (and go-left
- 	       (elib-node-left node))
- 	  (progn				   ; Do the left subtree first.
--	    (elib-stack-push stack node)
-+            (stack-push stack node)
- 	    (setq node (elib-node-left node)))
- 	(funcall map-function node)		   ; Apply the function...
- 	(if (elib-node-right node)		   ; and do the right subtree.
- 	    (setq node (elib-node-right node)
- 		  go-left t)
--	  (setq node (elib-stack-pop stack)
-+          (setq node (stack-pop stack)
- 		go-left nil))))))
- 
- 
-diff -ub elib-1.0.orig/cookie.el elib-1.0/cookie.el
---- elib-1.0.orig/cookie.el	1995-12-10 16:50:54.000000000 -0800
-+++ elib-1.0/cookie.el	2008-06-22 15:38:55.000000000 -0700
-@@ -139,13 +139,13 @@
- 
-   (let ((old-buffer (make-symbol "old-buffer"))
- 	(hnd (make-symbol "collection")))
--    (` (let* (((, old-buffer) (current-buffer))
--	      ((, hnd) (, collection))
--	      (dll (elib-collection->dll (, hnd))))
--	 (set-buffer (elib-collection->buffer (, hnd)))
-+    `(let* ((,old-buffer (current-buffer))
-+              (,hnd ,collection)
-+              (dll (elib-collection->dll ,hnd)))
-+         (set-buffer (elib-collection->buffer ,hnd))
- 	 (unwind-protect
--	     (progn (,@ forms))
--	   (set-buffer (, old-buffer)))))))
-+             (progn ,@forms)
-+           (set-buffer ,old-buffer)))))
- 
- 
- (put 'elib-set-buffer-bind-dll-let* 'lisp-indent-hook 2)
-@@ -160,14 +160,14 @@
- 
-   (let ((old-buffer (make-symbol "old-buffer"))
- 	(hnd (make-symbol "collection")))
--    (` (let* (((, old-buffer) (current-buffer))
--	      ((, hnd) (, collection))
--	      (dll (elib-collection->dll (, hnd)))
--	      (,@ varlist))
--	 (set-buffer (elib-collection->buffer (, hnd)))
-+    `(let* ((,old-buffer (current-buffer))
-+              (,hnd ,collection)
-+              (dll (elib-collection->dll ,hnd))
-+              ,@varlist)
-+         (set-buffer (elib-collection->buffer ,hnd))
- 	 (unwind-protect
--	     (progn (,@ forms))
--	   (set-buffer (, old-buffer)))))))
-+             (progn ,@forms)
-+           (set-buffer ,old-buffer)))))
- 
- 
- (defmacro elib-filter-hf (collection tin)
-@@ -179,12 +179,12 @@
- 
-   (let ((tempvar (make-symbol "tin"))
- 	(tmpcoll (make-symbol "tmpcollection")))
--    (` (let (((, tempvar) (, tin))
--	     ((, tmpcoll) (, collection)))
--	 (if (or (eq (, tempvar) (elib-collection->header (, tmpcoll)))
--		 (eq (, tempvar) (elib-collection->footer (, tmpcoll))))
-+    `(let ((,tempvar ,tin)
-+           (,tmpcoll ,collection))
-+       (if (or (eq ,tempvar (elib-collection->header ,tmpcoll))
-+               (eq ,tempvar (elib-collection->footer ,tmpcoll)))
- 	     nil
--	   (, tempvar))))))
-+           ,tempvar))))
- 
- 
- 
-diff -ub elib-1.0.orig/dll-debug.el elib-1.0/dll-debug.el
---- elib-1.0.orig/dll-debug.el	1995-12-10 16:50:54.000000000 -0800
-+++ elib-1.0/dll-debug.el	2008-06-22 15:25:14.000000000 -0700
-@@ -74,9 +74,9 @@
- (defmacro dll-insert-after (node element)
-   (let ((node-v (make-symbol "node"))
- 	(element-v (make-symbol "element")))
--    (` (let (((, node-v) (, node))
--	     ((, element-v) (, element)))
--	 (setcdr (, node-v) (cons (, element-v) (cdr (, node-v))))))))
-+    `(let ((,node-v ,node)
-+           (,element-v ,element))
-+         (setcdr ,node-v (cons ,element-v (cdr ,node-v))))))
- 
- ;;; ===================================================================
- ;;;       The public functions which operate on doubly linked lists.
-@@ -86,7 +86,7 @@
-   "Get the element of a NODE in a doubly linked list DLL.
- Args: DLL NODE."
- 
--  (` (car (, node))))
-+  `(car ,node))
- 
- 
- (defun dll-create ()
-diff -ub elib-1.0.orig/dll.el elib-1.0/dll.el
---- elib-1.0.orig/dll.el	1995-12-10 16:50:54.000000000 -0800
-+++ elib-1.0/dll.el	2008-06-22 15:22:58.000000000 -0700
-@@ -89,7 +89,7 @@
-   "Get the element of a NODE in a doubly linked list DLL.
- Args: DLL NODE."
- 
--  (` (elib-node-data (, node))))
-+  `(elib-node-data ,node))
- 
- 
- (defun dll-create ()
-diff -ub elib-1.0.orig/elib-node.el elib-1.0/elib-node.el
---- elib-1.0.orig/elib-node.el	1995-12-10 16:50:53.000000000 -0800
-+++ elib-1.0/elib-node.el	2008-06-22 15:21:46.000000000 -0700
-@@ -49,42 +49,42 @@
- (defmacro elib-node-create (left right data)
- 
-   ;; Create a tree node from LEFT, RIGHT and DATA.
--  (` (vector (, left) (, right) (, data))))
-+  `(vector ,left ,right ,data))
- 
- 
- (defmacro elib-node-left (node)
- 
-   ;; Return the left pointer of NODE.
--  (` (aref (, node) 0)))
-+  `(aref ,node 0))
- 
- 
- (defmacro elib-node-right (node)
- 
-   ;; Return the right pointer of NODE.
--  (` (aref (, node) 1)))
-+  `(aref ,node 1))
- 
- 
- (defmacro elib-node-data (node)
- 
-   ;; Return the data of NODE.
--  (` (aref (, node) 2)))
-+  `(aref ,node 2))
- 
- 
- (defmacro elib-node-set-left (node newleft)
- 
-   ;; Set the left pointer of NODE to NEWLEFT.
--  (` (aset (, node) 0 (, newleft))))
-+  `(aset ,node 0 ,newleft))
- 
- 
- (defmacro elib-node-set-right (node newright)
- 
-   ;; Set the right pointer of NODE to NEWRIGHT.
--  (` (aset (, node) 1 (, newright))))
-+  `(aset ,node 1 ,newright))
- 
- 
- (defmacro elib-node-set-data (node newdata)
-   ;; Set the data of NODE to NEWDATA.
--  (` (aset (, node) 2 (, newdata))))
-+  `(aset ,node 2 ,newdata))
- 
- 
- 
-@@ -94,7 +94,7 @@
-   ;; 
-   ;; NODE is the node, and BRANCH is the branch.
-   ;; 0 for left pointer, 1 for right pointer and 2 for the data."
--  (` (aref (, node) (, branch))))
-+  `(aref ,node ,branch))
- 
- 
- (defmacro elib-node-set-branch (node branch newval)
-@@ -104,6 +104,6 @@
-   ;; NODE is the node, and BRANCH is the branch.
-   ;; 0 for left pointer, 1 for the right pointer and 2 for the data.
-   ;; NEWVAL is new value of the branch."
--  (` (aset (, node) (, branch) (, newval))))
-+  `(aset ,node ,branch ,newval))
- 
- ;;; elib-node.el ends here.
-Only in elib-1.0: elib.info
-diff -ub elib-1.0.orig/queue-m.el elib-1.0/queue-m.el
---- elib-1.0.orig/queue-m.el	1995-12-10 16:50:53.000000000 -0800
-+++ elib-1.0/queue-m.el	2008-06-22 15:13:41.000000000 -0700
-@@ -54,12 +54,12 @@
- 
- (defmacro queue-create ()
-   "Create an empty fifo queue."
--  (` (cons 'QUEUE (cons nil nil))))
-+  `(cons 'QUEUE (cons nil nil)))
- 
- 
- (defmacro queue-p (queue)
-   "Return t if QUEUE is a queue, otherwise return nil."
--  (` (eq (car-safe (, queue)) 'QUEUE)))
-+  `(eq (car-safe ,queue) 'QUEUE))
- 
- 
- (defun queue-enqueue (queue element)
-@@ -91,13 +91,13 @@
- 
- (defmacro queue-empty (queue)
-   "Return t if QUEUE is empty, otherwise return nil."
--  (` (null (car (cdr (, queue))))))
-+  `(null (car (cdr ,queue))))
- 
- 
- (defmacro queue-first (queue)
-   "Return the first element of QUEUE or nil if it is empty.
- The element is not removed."
--  (` (car-safe (car (cdr (, queue))))))
-+  `(car-safe (car (cdr ,queue))))
- 
- 
- (defmacro queue-nth (queue n)
-@@ -106,18 +106,18 @@
- If the length of the queue is less than N, return nil.
- 
- The oldest element (the first one) has number 0."
--  (` (nth (, n) (car (cdr (, queue))))))
-+  `(nth ,n (car (cdr ,queue))))
- 
- 
- (defmacro queue-last (queue)
-   "Return the last element of QUEUE or nil if it is empty."
--  (` (car-safe (cdr (cdr (, queue))))))
-+  `(car-safe (cdr (cdr ,queue))))
- 
- 
- (defmacro queue-all (queue)
-   "Return a list of all elements of QUEUE or nil if it is empty.
- The oldest element in the queue is the first in the list."
--  (` (car (cdr (, queue)))))
-+  `(car (cdr ,queue)))
- 
- 
- (defun queue-copy (queue)
-@@ -131,11 +131,11 @@
- 
- (defmacro queue-length (queue)
-   "Return the number of elements in QUEUE."
--  (` (length (car (cdr (, queue))))))
-+  `(length (car (cdr ,queue))))
- 
- 
- (defmacro queue-clear (queue)
-   "Remove all elements from QUEUE."
--  (` (setcdr (, queue) (cons nil nil))))
-+  `(setcdr ,queue (cons nil nil)))
- 
- ;;; queue-m.el ends here
-diff -ub elib-1.0.orig/read.el elib-1.0/read.el
---- elib-1.0.orig/read.el	1995-12-10 16:50:54.000000000 -0800
-+++ elib-1.0/read.el	2008-06-22 15:40:38.000000000 -0700
-@@ -61,7 +61,7 @@
- 		  numdefault)
- 	     (setq number numdefault))
- 	    ((string-match "\\`[0-9]+\\'" numstr)
--	     (setq number (string-to-int numstr)))
-+             (setq number (string-to-number numstr)))
- 	    (t (beep))))
-     number))
- 
-diff -ub elib-1.0.orig/stack-m.el elib-1.0/stack-m.el
---- elib-1.0.orig/stack-m.el	1995-12-10 16:50:52.000000000 -0800
-+++ elib-1.0/stack-m.el	2008-06-22 15:10:48.000000000 -0700
-@@ -51,36 +51,36 @@
- 
- (defmacro stack-create ()
-   "Create an empty lifo stack."
--  (` (cons 'STACK nil)))
-+  `(cons 'STACK nil))
- 
- 
- (defmacro stack-p (stack)
-   "Return t if STACK is a stack, otherwise return nil."
--  (` (eq (car-safe (, stack)) 'STACK)))
-+  `(eq (car-safe ,stack) 'STACK))
- 
- 
- (defmacro stack-push (stack element)
-   "Push an element onto the stack.
- Args: STACK ELEMENT"
--  (` (setcdr (, stack) (cons (, element) (cdr (, stack))))))
-+  `(setcdr ,stack (cons ,element (cdr ,stack))))
- 
- 
- (defmacro stack-pop (stack)
-   "Remove the topmost element from STACK and return it. 
- If the stack is empty, return nil."
--  (` (prog1
--	 (car-safe (cdr (, stack)))
--       (setcdr (, stack) (cdr-safe (cdr (, stack)))))))
-+  `(prog1
-+       (car-safe (cdr ,stack))
-+     (setcdr ,stack (cdr-safe (cdr ,stack)))))
- 
- 
- (defmacro stack-empty (stack)
-   "Return t if STACK is empty, otherwise return nil."
--  (` (null (cdr (, stack)))))
-+  `(null (cdr ,stack)))
- 
- 
- (defmacro stack-top (stack)
-   "Return the topmost element of STACK or nil if it is empty."
--  (` (car-safe (cdr (, stack)))))
-+  `(car-safe (cdr ,stack)))
- 
- 
- (defmacro stack-nth (stack n)
-@@ -89,28 +89,28 @@
- If the length of the stack is less than N, return nil.
- 
- The top stack element has number 0."
--  (` (nth (, n) (cdr (, stack)))))
-+  `(nth ,n (cdr ,stack)))
- 
- 
- (defmacro stack-all (stack)
-   "Return a list of all entries in STACK.
- The element last pushed is first in the list."
--  (` (cdr (, stack))))
-+  `(cdr ,stack))
- 
- 
- (defmacro stack-copy (stack)
-   "Return a copy of STACK.
- All entries in STACK are also copied."
--  (` (cons 'STACK (copy-sequence (cdr (, stack))))))
-+  `(cons 'STACK (copy-sequence (cdr ,stack))))
- 
- 
- (defmacro stack-length (stack)
-   "Return the number of elements on STACK."
--  (` (length (cdr (, stack)))))
-+  `(length (cdr ,stack)))
- 
- 
- (defmacro stack-clear (stack)
-   "Remove all elements from STACK."
--  (` (setcdr (, stack) nil)))
-+  `(setcdr ,stack nil))
- 
- ;;; stack-m.el ends here
diff --git a/pcr/emacs-elib/emacs-elib.install b/pcr/emacs-elib/emacs-elib.install
deleted file mode 100644
index 53a01f9f6..000000000
--- a/pcr/emacs-elib/emacs-elib.install
+++ /dev/null
@@ -1,34 +0,0 @@
-# emacs-elib.install
-# Install info file and show configuration info.
-# $Id: emacs-elib.install,v e6d455730f95 2008/06/23 05:55:28 jbromley $
-post_install () {
-if sh -c 'install-info --version' > /dev/nul 2>&1; then
-   if [ -f /usr/share/info/elib.gz ]; then
-       cd /usr/share/info
-       install-info --info-dir=/usr/share/info --section=Emacs --name=Elib \
-                    --description=' The Emacs Lisp Library' elib.gz
-   fi
-fi
-
-echo ""
-echo "==> To use elib, add the following Lisp to your ~/.emacs file:"
-echo "==> "
-echo "==> (setq load-path (append (list \"/usr/share/emacs/site-lisp/elib\")"
-echo "==>                         load-path))"
-echo "==> "
-echo "==> You do not need this if you have a subdirs.el in your Emacs site-lisp"
-echo "==> directory."
-echo ""
-}
-
-post_upgrade () {
-        post_install $1
-}
-
-op=$1
-shift
-$op $*
-
-# Local Variables:
-# mode: shell-script
-# End:
diff --git a/pcr/emacs-jabber/PKGBUILD b/pcr/emacs-jabber/PKGBUILD
deleted file mode 100644
index 0b2170261..000000000
--- a/pcr/emacs-jabber/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=emacs-jabber
-pkgver=0.8.91
-pkgrel=2
-pkgdesc="Jabber.el: a minimal jabber client for emacs"
-url=http://emacs-jabber.sourceforge.net
-arch=('any')
-license=('GPL')
-depends=('emacs' 'gnutls' 'gconf')
-install=jabber.el.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.lzma)
-md5sums=('739506fbc498386989590cd7733dd47a')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/emacs-jabber \
-    --with-gconf-schema-file-dir=/usr/share/gconf/schemas
-  make
-}
-package() { 
-  cd $srcdir/$pkgname-$pkgver
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install 
-}
diff --git a/pcr/emacs-jabber/jabber.el.install b/pcr/emacs-jabber/jabber.el.install
deleted file mode 100644
index 556888995..000000000
--- a/pcr/emacs-jabber/jabber.el.install
+++ /dev/null
@@ -1,27 +0,0 @@
-infodir=/usr/share/info
-filelist=(jabber.info.gz)
-pkgname=emacs-jabber
-
-pre_upgrade() {
-  /usr/sbin/gconfpkg --uninstall $pkgname
-}
-
-post_install() {
-  /usr/sbin/gconfpkg --install $pkgname
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-  echo "Please add the following line to your .emacs." 
-  echo "(require 'jabber)"
-}
-
-post_upgrade() {
-  post_install 
-}
-
-pre_remove() {
-  /usr/sbin/gconfpkg --uninstall $pkgname
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
diff --git a/pcr/emacs-js2-mode/PKGBUILD b/pcr/emacs-js2-mode/PKGBUILD
deleted file mode 100644
index f71bd6b55..000000000
--- a/pcr/emacs-js2-mode/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Contributor: Hauke Wesselmann <hauke@h-dawg.de>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=emacs-js2-mode
-pkgver=20090723b
-pkgrel=1
-pkgdesc="An improved JavaScript mode for GNU Emacs"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/js2-mode/"
-license=('GPL2')
-depends=('emacs')
-source=(http://js2-mode.googlecode.com/files/js2-$pkgver.el)
-md5sums=('9109dca8b624edb8358fb9938a03d785')
-
-build() {
-  cd $startdir/src/
-  emacs -batch -q -f batch-byte-compile js2-$pkgver.el
-  install -Dm644 $srcdir/js2-$pkgver.el $pkgdir/usr/share/emacs/site-lisp/js2.el
-  install -Dm644 $srcdir/js2-$pkgver.elc $pkgdir/usr/share/emacs/site-lisp/js2.elc
-}
diff --git a/pcr/emacs-lucid/PKGBUILD b/pcr/emacs-lucid/PKGBUILD
index f88607e0a..1c87aaef4 100644
--- a/pcr/emacs-lucid/PKGBUILD
+++ b/pcr/emacs-lucid/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id: PKGBUILD 192474 2013-08-12 20:25:41Z eric $
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Maintainer (Arch): Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
@@ -6,7 +5,7 @@
 _pkgname=emacs
 pkgname=emacs-lucid
 pkgver=24.3
-pkgrel=4
+pkgrel=5
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
diff --git a/pcr/emacs-lucid/emacs-24.3-giflib5.patch b/pcr/emacs-lucid/emacs-24.3-giflib5.patch
deleted file mode 100644
index b8571abb2..000000000
--- a/pcr/emacs-lucid/emacs-24.3-giflib5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/image.c
-+++ src/image.c	2013-05-21 15:49:41.945819346 +0000
-@@ -7192,7 +7192,11 @@ gif_load (struct frame *f, struct image
- 	}
- 
-       /* Open the GIF file.  */
-+#if GIFLIB_MAJOR < 5
-       gif = fn_DGifOpenFileName (SSDATA (file));
-+#else
-+      gif = fn_DGifOpenFileName (SSDATA (file), NULL);
-+#endif
-       if (gif == NULL)
- 	{
- 	  image_error ("Cannot open `%s'", file, Qnil);
-@@ -7213,7 +7217,11 @@ gif_load (struct frame *f, struct image
-       memsrc.len = SBYTES (specified_data);
-       memsrc.index = 0;
- 
-+#if GIFLIB_MAJOR < 5
-       gif = fn_DGifOpen (&memsrc, gif_read_from_memory);
-+#else
-+      gif = fn_DGifOpen (&memsrc, gif_read_from_memory, NULL);
-+#endif
-       if (!gif)
- 	{
- 	  image_error ("Cannot open memory source `%s'", img->spec, Qnil);
diff --git a/pcr/emacs-lucid/emacs.install b/pcr/emacs-lucid/emacs.install
deleted file mode 100644
index 6712f44ba..000000000
--- a/pcr/emacs-lucid/emacs.install
+++ /dev/null
@@ -1,32 +0,0 @@
-ICON_PATH=usr/share/icons/hicolor
-INFO_DIR=usr/share/info
-
-INFO_FILES=(ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse
-ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake
-forms gnus htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode
-org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
-speedbar srecode tramp url vip viper widget wisent woman)
-
-post_install() {
-  gtk-update-icon-cache -q -t -f ${ICON_PATH}
-  update-desktop-database -q
-
-  [[ -x usr/bin/install-info ]] || return 0
-  for f in ${INFO_FILES[@]}; do
-    install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gtk-update-icon-cache -q -t -f ${ICON_PATH}
-  update-desktop-database -q
-
-  [[ -x usr/bin/install-info ]] || return 0
-  for f in ${INFO_FILES[@]}; do
-    install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
-  done
-}
diff --git a/pcr/emacs-magit-git/PKGBUILD b/pcr/emacs-magit-git/PKGBUILD
deleted file mode 100644
index 734b13072..000000000
--- a/pcr/emacs-magit-git/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Stefan Husmann <stefan.husmann@t-online.de>
-# Contributor: Peter Simons <simons@cryp.to>
-# Contributor: Just Lest <just.lest@gmail.com>
-# Contributor: Daniel White <daniel@whitehouse.id.au>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=emacs-magit-git
-pkgver=20121104
-pkgrel=1
-pkgdesc="It's Magit! A Emacs mode for Git."
-arch=("any")
-url="http://github.com/magit/magit"
-license=('GPL3')
-depends=('emacs' 'git')
-makedepends=('automake' 'autoconf')
-provides=('emacs-magit')
-conflicts=('emacs-magit')
-install="${pkgname}.install"
-
-_gitname="master"
-_gitroot="git://github.com/magit/magit.git"
-
-build()
-{
-  cd "${srcdir}"
-  if [ -d magit ] ; then
-    cd magit
-    git pull origin
-  else
-    git clone --depth=1 "${_gitroot}"
-  fi
-  [ -d "${srcdir}/build" ] && rm -rf "${srcdir}/build"
-  cp -r "${srcdir}/magit" "${srcdir}/build"
-  cd "${srcdir}/build"
-  make
-}
-
-package()
-{
-  cd "${srcdir}/build"
-  mkdir -p "${pkgdir}/usr/bin"	# work around a bug in the makefile
-  make PREFIX="/usr" DESTDIR="${pkgdir}" install install_contrib
-  rm "${pkgdir}/etc/emacs/site-start.d/50magit.el" "${pkgdir}/usr/share/info/dir"
-  rmdir "${pkgdir}/etc/emacs/site-start.d" "${pkgdir}/etc/emacs" "${pkgdir}/etc"
-}
diff --git a/pcr/emacs-magit-git/emacs-magit-git.install b/pcr/emacs-magit-git/emacs-magit-git.install
deleted file mode 100644
index a9904739e..000000000
--- a/pcr/emacs-magit-git/emacs-magit-git.install
+++ /dev/null
@@ -1,30 +0,0 @@
-infodir=/usr/share/info
-filelist=(magit.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-
-  cat << EOF
-==> In order to use magit, add the following lines to your ~/.emacs file:
-
-(autoload 'magit-status "magit" nil t)
-EOF
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-op=$1
-shift
-$op $*
diff --git a/pcr/emacs-mailcrypt/PKGBUILD b/pcr/emacs-mailcrypt/PKGBUILD
deleted file mode 100644
index 8dad422c0..000000000
--- a/pcr/emacs-mailcrypt/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de>
-
-_pkgname=mailcrypt
-pkgname=emacs-$_pkgname
-pkgver=3.5.9
-pkgdesc="Emacs interface to PGP and GnuPG"
-url="http://mailcrypt.sourceforge.net/"
-license=('GPL')
-
-pkgrel=2.1
-arch=(any)
-depends=(emacs)
-install=$_pkgname.install
-source=(http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz
-        destdir.patch)
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/destdir.patch"
-  autoreconf
-  ./configure --prefix=/usr --infodir=/usr/share/info
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-md5sums=('18c0dea5dde0fc73168f4815df0d9db0'
-         '805f2c6bf624c946df2eefaf0edabcb3')
diff --git a/pcr/emacs-mailcrypt/destdir.patch b/pcr/emacs-mailcrypt/destdir.patch
deleted file mode 100644
index a0159cd02..000000000
--- a/pcr/emacs-mailcrypt/destdir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ruN mailcrypt-3.5.9.orig/Makefile.in mailcrypt-3.5.9/Makefile.in
---- mailcrypt-3.5.9.orig/Makefile.in	2010-03-11 08:38:05.000000000 -0500
-+++ mailcrypt-3.5.9/Makefile.in	2012-12-13 18:38:59.000000000 -0500
-@@ -77,16 +77,16 @@
- 
- install: all installdirs install-info
- 	for f in $(SOURCES); do \
--	  $(INSTALL_DATA) $(srcdir)/$$f $(lispdir); \
-+	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(lispdir); \
- 	done;
- 	for f in $(OBJECTS); do \
--	  $(INSTALL_DATA) $$f $(lispdir); \
-+	  $(INSTALL_DATA) $$f $(DESTDIR)$(lispdir); \
- 	done;
- 
- # Make sure all installation directories actually exist
- # by making them if necessary.
- installdirs: mkinstalldirs
--	$(srcdir)/mkinstalldirs $(lispdir) $(infodir)
-+	$(srcdir)/mkinstalldirs $(DESTDIR)$(lispdir) $(DESTDIR)$(infodir)
- 
- # If your install-info doesn't know how to look inside the .info file for the
- # menu entry to add, try adding
-@@ -95,14 +95,12 @@
- 
- install-info: info
- 	cd $(srcdir) && for file in $(INFOFILES); do\
--	  $(INSTALL_DATA) $$file $(infodir)/$$file; \
-+	  $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file; \
- 	done
--	-$(INSTALL_INFO) --info-dir=$(infodir) mailcrypt.info
- 
- uninstall:
--	-cd $(lispdir) && rm -f $(SOURCES) $(OBJECTS)
--	-cd $(infodir) && rm -f $(INFOFILES)
--	$(INSTALL_INFO) --remove --info-dir=$(infodir) mailcrypt.info
-+	-cd $(DESTDIR)$(lispdir) && rm -f $(SOURCES) $(OBJECTS)
-+	-cd $(DESTDIR)$(infodir) && rm -f $(INFOFILES)
- 
- info: $(INFOFILES)
- 
diff --git a/pcr/emacs-mailcrypt/mailcrypt.install b/pcr/emacs-mailcrypt/mailcrypt.install
deleted file mode 100644
index 3257b7338..000000000
--- a/pcr/emacs-mailcrypt/mailcrypt.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=usr/share/info
-filelist=(mailcrypt.info)
-
-post_install() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install "$1"
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/emacs-newlisp/PKGBUILD b/pcr/emacs-newlisp/PKGBUILD
deleted file mode 100644
index 25dcbc219..000000000
--- a/pcr/emacs-newlisp/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributor: Jan Kr��vek <wamba@centrum.cz>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@cwb.IO>
-
-pkgname=emacs-newlisp
-pkgver=0.25
-pkgrel=5
-arch=('any')
-pkgdesc="Emacs mode for Newlisp."
-url="http://artfulcode.net/projects"
-depends=('emacs')
-makedepends=('unzip')
-license=('GPL')
-source=(http://www.artfulcode.net/wp-content/uploads/2008/12/newlisp-mode.zip)
-noextract=newlisp-mode.zip
-install=emacs-newlisp.install
-
-build() {
-  cd $srcdir
-  unzip -quo newlisp-mode.zip || return 1
-  cd $srcdir/newlisp-mode || return 1
-  install -d $pkgdir/usr/share/emacs/site-lisp/newlisp-mode
-  install -Dm644  *.el $pkgdir/usr/share/emacs/site-lisp/newlisp-mode
-}
diff --git a/pcr/emacs-newlisp/emacs-newlisp.install b/pcr/emacs-newlisp/emacs-newlisp.install
deleted file mode 100644
index 640e19d16..000000000
--- a/pcr/emacs-newlisp/emacs-newlisp.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# vim: set ft=sh:
-post_install() {
-  echo "
-=> Autoloading:
-  ------------
-  In your .emacs or .init.el
-  (add-to-list 'load-path (expand-file-name \"/usr/share/emacs/site-lisp/newlisp-mode\"))
-  (add-to-list 'auto-mode-alist '(\"\\\\.lsp\\\\'\" . newlisp-mode))
-  (autoload 'newlisp-mode \"newlisp\" \"Turn on NewLisp mode\" t)
-  (turn-on-font-lock)
-
-=> Newlisp is started with the Emacs command M-x newlisp-mode."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/pcr/emacs-org-mode-ravel-git/PKGBUILD b/pcr/emacs-org-mode-ravel-git/PKGBUILD
deleted file mode 100644
index 66baa08b5..000000000
--- a/pcr/emacs-org-mode-ravel-git/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# contributor: zhuqin <zhuqin83@gmail.com>
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-# Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io>
-
-pkgname=emacs-org-mode-ravel-git
-pkgver=20120812
-pkgrel=1
-pkgdesc="R backends for Orgmode by Chas Berry"
-arch=('any')
-url="https://github.com/chasberry/orgmode-accessories"
-depends=(emacs emacs-org-mode)
-makedepends=('git')
-license=('GPL')
-source=()
-
-
-
-_gitroot="https://github.com/chasberry/orgmode-accessories.git"
-_gitname="master"
-
-build() {
-  cd $srcdir
-  msg "Connecting to the GIT server...."
-
-  if [[ -d $srcdir/$_gitname ]] ; then
-    cd $_gitname
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone $_gitroot $_gitname
-  fi
-
-  msg "GIT checkout done"
-  msg "Starting make..."
-
-  [[ -d $srcdir/$_gitname-build ]] && rm -rf $srcdir/$_gitname-build
-  git clone $srcdir/$_gitname $srcdir/$_gitname-build
-
-  cd $srcdir/$_gitname-build
-
-  emacs --batch --visit scratch --eval "(progn (require 'org) (require 'org-export) (require 'org-e-latex) (require 'org-e-html) (org-babel-load-file \"ravel.org\"))"
-}
-
-package() {
-  cd $srcdir/$_gitname-build
-
-  install -Dm 644 e-ravel.el $pkgdir/usr/share/emacs/site-lisp/e-ravel.el
-
-  mkdir -p $pkgdir/usr/share/doc/e-ravel/
-  cp *.org $pkgdir/usr/share/doc/e-ravel/
-}
-md5sums=()
diff --git a/pcr/emacs-org-mode/PKGBUILD b/pcr/emacs-org-mode/PKGBUILD
deleted file mode 100644
index 4b36a3e3b..000000000
--- a/pcr/emacs-org-mode/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: Jiyunatori <tori_LEAVETHISOUT_@0xc29.net>
-# Contributor: mdev
-# adopted by domanov <domanov_LEAVETHISOUT_@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=emacs-org-mode
-_srcname=org
-pkgver=7.9.2
-pkgrel=1
-pkgdesc="Emacs Org Mode"
-arch=('any')
-url="http://orgmode.org/"
-depends=(emacs)
-license=('GPL')
-install=emacs-org-mode.install
-source=(http://orgmode.org/$_srcname-$pkgver.tar.gz)
-md5sums=('e79441ff81c176e70230937e09f6042c')
-
-build() {
-    cd "${srcdir}/${_srcname}-${pkgver}"
-    make compile || return 1
-}
-
-package() {
-    cd "${srcdir}/${_srcname}-${pkgver}"
-    make prefix="${pkgdir}/usr/share" install || return 1
-
-    ## by default now we install also the contrib directory
-    install -d -m755 $pkgdir/usr/share/emacs/site-lisp/org_contrib || return 1
-    cp -r contrib/* $pkgdir/usr/share/emacs/site-lisp/org_contrib || return 1
-
-    ##! proper install of info files (thanks mdev)
-    ##! replace "orgmode" with "org" in the following lines if you want 
-    ##! to replace emacs own org's info files. You also need to change the .install.
-    install -D -m644 doc/org $pkgdir/usr/share/info/orgmode || return 1
-    gzip -9 $pkgdir/usr/share/info/orgmode || return 1
-    rm $pkgdir/usr/share/info/org || return 1
-}
-md5sums=('e79441ff81c176e70230937e09f6042c')
diff --git a/pcr/emacs-org-mode/emacs-org-mode.install b/pcr/emacs-org-mode/emacs-org-mode.install
deleted file mode 100644
index e8bd91185..000000000
--- a/pcr/emacs-org-mode/emacs-org-mode.install
+++ /dev/null
@@ -1,62 +0,0 @@
-## NOTE: the line commented with '##!' are needed 
-## to REPLACE the info file shipped by emacs (currently at version 6.21)
-## with the info docs from this distribution (thanks mdev)
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-INFODIR=/usr/share/info
-
-pre_install() {
-##!   for file in {org,org-?.gz} ; do
-##!      if [ -e $INFODIR/$file ] ; then
-##!         echo "Removing $INFODIR/$file"
-##!         install-info --delete $INFODIR/$file $INFODIR/dir 2> /dev/null
-##!         rm -f $INFODIR/$file
-##!      fi
-##!   done
-   cat << EOM
-To enable this version of org-mode instead of the one shipped with emacs,
-add the line:
-    (require 'org-install)
-to your .emacs file. 
-
-NOTE: info documentation for emacs-org-mode goes now as 'orgmode' in /usr/share/info,
-      It does NOT replace the 'org' info files shipped with emacs:
-        $ info orgmode ## this version 
-        $ info org     ## emacs' org version (currently 6.21)
-EOM
-}
-
-
-post_install() {
-##!  mv $INFODIR/orgmode.gz $INFODIR/org.gz
-##!  install-info $INFODIR/org.gz $INFODIR/dir 2> /dev/null 
-##! and comment out the following line:
-  install-info --name='orgmode' --description='Org Mode provided by emacs-org-mode (AUR)' $INFODIR/orgmode.gz $INFODIR/dir 2> /dev/null
-}
-
-pre_upgrade() {
-  /bin/true
-}
-
-post_upgrade() {
- post_install $1
-}
-
-
-pre_remove() {
-  install-info --delete $INFODIR/orgmode.gz $INFODIR/dir 2> /dev/null
-##! comment out the line above and uncomment the following:
-##!  install-info --delete $INFODIR/org.gz $INFODIR/dir 2> /dev/null
-##!  rm $INFODIR/org.gz 2> /dev/null
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/pcr/emacs-tuareg-mode/PKGBUILD b/pcr/emacs-tuareg-mode/PKGBUILD
deleted file mode 100644
index eba2834e0..000000000
--- a/pcr/emacs-tuareg-mode/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Limao Luo <luolimao+AUR@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=emacs-tuareg-mode
-pkgver=2.0.6
-pkgrel=2
-pkgdesc="Emacs tuareg mode for ocaml"
-arch=(any)
-url=https://forge.ocamlcore.org/projects/tuareg/
-license=(GPL)
-depends=(emacs)
-DLAGENTS=("https::/usr/bin/curl -fkLC - --retry 3 --retry-delay 3 -o %o %u")
-install=$pkgname.install
-source=(https://forge.ocamlcore.org/frs/download.php/882/tuareg-$pkgver.tar.gz)
-sha256sums=('ea79ac24623b82ab8047345f8504abca557a537e639d16ce1ac3e5b27f5b1189')
-sha512sums=('a7162daea30baa38bf1673b62ac545936a24b87b5e4d65329304ce5da68e151af1ef9f6e7720067f1f741614b3b6e1dfeab7080c4e9e7ebf14af594f3a0b0d46')
-
-build() {
-    cd "$srcdir"/tuareg-$pkgver/
-    make
-}
-
-package() {
-    cd "$srcdir"/tuareg-$pkgver/
-    for i in *.el{,c}; do
-        install -Dm644 $i "$pkgdir"/usr/share/emacs/site-lisp/tuareg/$i
-    done
-    install -Dm644 README "$pkgdir"/usr/share/doc/tuareg/README
-}
diff --git a/pcr/emacs-tuareg-mode/emacs-tuareg-mode.install b/pcr/emacs-tuareg-mode/emacs-tuareg-mode.install
deleted file mode 100644
index f9ee9c970..000000000
--- a/pcr/emacs-tuareg-mode/emacs-tuareg-mode.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-    cat <<__EOF__
-==> Put this in your $HOME/.emacs file to enable tuareg-mode autoloading
-==> and autorecognition of ocaml source files:
-
-  (setq auto-mode-alist (cons '("\\\\.ml[iylp]?\\\\'" . tuareg-mode) auto-mode-alist))
-  (autoload 'tuareg-mode "tuareg" "Major mode for editing Caml code" t)
-  (autoload 'ocamldebug "ocamldebug" "Run the Caml debugger" t)
-
-==> Note to users of previous versions: 'camldebug' is now known as 'ocamldebug'
-__EOF__
-}
-
-
-post_upgrade() {
-    post_install
-}
diff --git a/pcr/emhacks/PKGBUILD b/pcr/emhacks/PKGBUILD
deleted file mode 100644
index 66f0045e5..000000000
--- a/pcr/emhacks/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Junmin Huang <junmin(dot)h(at)gmail(dot)com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=emhacks
-pkgver=20070920
-pkgrel=4
-pkgdesc="Useful Emacs Lisp libraries, including gdiff, jjar, jmaker, swbuff and tabbar, packaged from gentoo portage"
-arch=('any')
-url="http://emhacks.sourceforge.net/"
-license=('GPL2')
-depends=(emacs)
-install=emhacks.install
-source=(http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/$pkgname-$pkgver.tar.bz2)
-md5sums=('d349c78d25ce91a6f9c3e6446b129fc8')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # remove files included in Emacs>=22 or not useful on GNU/Linux
-  rm -r findstr* overlay-fix* recentf* ruler-mode* tree-widget*
-  for _i in gdiff-setup jjar jmaker swbuff tabbar
-  do
-    [ -f ${_i}.el.gz ] && rm ${_i}.el.gz
-    emacs -batch -q -f batch-byte-compile ${_i}.el
-    gzip ${_i}.el
-  done
-}
-package() {
-  install -d $pkgdir/usr/share/emacs/site-lisp/$pkgname
-  install -Dm644 $srcdir/$pkgname-$pkgver/* \
-    $pkgdir/usr/share/emacs/site-lisp/$pkgname
-}
diff --git a/pcr/emhacks/emhacks.install b/pcr/emhacks/emhacks.install
deleted file mode 100644
index 7d2bdf2b6..000000000
--- a/pcr/emhacks/emhacks.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-cat << EOM
-
-Don't forget to add the following code into your ~/.emacs file:
----
-(add-to-list 'load-path "/usr/share/emacs/site-lisp/emhacks")
----
-
-EOM
-}
-
-post_remove() {
-cat << EOM
-
-The following code in your ~/.emacs file can be removed:
----
-(add-to-list 'load-path "/usr/share/emacs/site-lisp/emhacks")
----
-
-EOM
-}
\ No newline at end of file
diff --git a/pcr/etckeeper/PKGBUILD b/pcr/etckeeper/PKGBUILD
deleted file mode 100644
index 09a5d4d15..000000000
--- a/pcr/etckeeper/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): Buce <dmbuce@gmail.com>
-# Contributor: Danie Roux <accounts@danieroux.com>
-# Contributor: Diogo Leal <estranho@diogoleal.com>
-
-pkgname=etckeeper
-pkgver=1.4
-pkgdesc="Collection of tools to let /etc be stored in a git, hg, bzr or darcs repository."
-url="http://joeyh.name/code/etckeeper/"
-license=('GPL2')
-
-pkgrel=1
-arch=('any')
-depends=('inetutils' 'python2')
-makedepends=('bzr') # bzr must be there at compile time to have bzr support
-optdepends=('git' 'hg' 'bzr' 'darcs')
-backup=(etc/etckeeper/etckeeper.conf)
-source=("libre://$pkgname-$pkgver.tar.gz" $pkgname-pacman.patch $pkgname-archlinux.conf)
-
-mksource=("$pkgname-$pkgver::git://git.kitenet.net/$pkgname#tag=${pkgver}")
-mkmd5sums=('SKIP')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # add pacman support to `list-installed`
-  patch -p0 -i "${srcdir}/${pkgname}-pacman.patch"
-
-  # use python2
-  sed -i 's@^#!/usr/bin/python$@&2@' etckeeper-bzr/__init__.py
-  make CONFFILE="${srcdir}/${pkgname}-archlinux.conf" build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make CONFFILE="${srcdir}/${pkgname}-archlinux.conf" DESTDIR="$pkgdir" install
-}
-
-md5sums=('74be692fdb2d3352324e9332a270635d'
-         'f1f00bf9331d1ef7f29b0ac29cdfcbda'
-         '99d8d2838f49fa0f2f21c9e37948100d')
diff --git a/pcr/etckeeper/etckeeper-archlinux.conf b/pcr/etckeeper/etckeeper-archlinux.conf
deleted file mode 100644
index 83e2c577d..000000000
--- a/pcr/etckeeper/etckeeper-archlinux.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# The VCS to use.
-#VCS="hg"
-VCS="git"
-#VCS="bzr"
-#VCS="darcs"
-
-# Options passed to git commit when run by etckeeper.
-GIT_COMMIT_OPTIONS=""
-
-# Options passed to hg commit when run by etckeeper.
-HG_COMMIT_OPTIONS=""
-
-# Options passed to bzr commit when run by etckeeper.
-BZR_COMMIT_OPTIONS=""
-
-# Options passed to darcs record when run by etckeeper.
-DARCS_COMMIT_OPTIONS="-a"
-
-# Uncomment to avoid etckeeper committing existing changes
-# to /etc automatically once per day.
-#AVOID_DAILY_AUTOCOMMITS=1
-
-# Uncomment the following to avoid special file warning
-# (the option is enabled automatically by cronjob regardless).
-#AVOID_SPECIAL_FILE_WARNING=1
-
-# Uncomment to avoid etckeeper committing existing changes to 
-# /etc before installation. It will cancel the installation,
-# so you can commit the changes by hand.
-#AVOID_COMMIT_BEFORE_INSTALL=1
-
-# The high-level package manager that's being used.
-# (apt, pacman-g2, yum etc)
-HIGHLEVEL_PACKAGE_MANAGER=pacman
-
-# The low-level package manager that's being used.
-# (dpkg, rpm, pacman-g2, etc)
-LOWLEVEL_PACKAGE_MANAGER=pacman
diff --git a/pcr/etckeeper/etckeeper-pacman.patch b/pcr/etckeeper/etckeeper-pacman.patch
deleted file mode 100644
index 1fb4acb62..000000000
--- a/pcr/etckeeper/etckeeper-pacman.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- list-installed.d/50list-installed.orig	2012-10-21 23:45:30.000000000 -0400
-+++ list-installed.d/50list-installed	2012-10-21 23:45:39.000000000 -0400
-@@ -7,4 +7,6 @@
- 		egrep '(ok installed|ok config-files)' | cut -f2,3
- elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then
- 	rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort
-+elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then
-+	{ pacman -Qd|sed 's/.*/& (dep)/'; pacman -Qe|sed 's/.*/& (explicit)/'; } |sort
- fi
diff --git a/pcr/eterm/PKGBUILD b/pcr/eterm/PKGBUILD
deleted file mode 100644
index c3416f8e0..000000000
--- a/pcr/eterm/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Adam 'battlemidget' Stokes <adam.stokes@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Brad Fanella <bradfanella@archlinux.us>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=eterm
-pkgver=0.9.6
-pkgrel=1
-pkgdesc="A vt102 terminal emulator intended as a replacement for xterm."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.eterm.org/"
-license=('custom')
-depends=('freetype2>=2.3.5' 'libast>=0.7' 'libxmu' 'libxres')
-options=('!libtool')
-source=(http://www.eterm.org/download/Eterm-${pkgver}.tar.gz)
-md5sums=('90e424584c22d4050496874d14f78bb1')
-
-build() {
-	cd ${srcdir}/Eterm-${pkgver}
-	CONF=""
-	[ "${CARCH}" = "x86_64" ] && CONF="--disable-mmx"
-	./configure --prefix=/usr --mandir=/usr/share/man \
-	    --enable-trans --enable-utmp \
-        --enable-multi-charset=utf-8 \
-	    --enable-xim --with-theme-update \
-	    --with-backspace=bs --without-terminfo \
-	    --enable-multi-charset ${CONF}
-	make || return 1
-}
-
-package() {
-	cd ${srcdir}/Eterm-${pkgver}
-	make DESTDIR=${pkgdir} install
-
-	install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-
-md5sums=('90e424584c22d4050496874d14f78bb1')
diff --git a/pcr/evolution-mapi/PKGBUILD b/pcr/evolution-mapi/PKGBUILD
deleted file mode 100644
index 851bb3c4d..000000000
--- a/pcr/evolution-mapi/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Heenry78 <henry78@gmx.at>
-# Contributor: ngoonee <ngoonee.talk@gmail.com>
-# Contributor: Marco A Rojas <marquicus@gmail.com>
-pkgname=evolution-mapi
-pkgver=3.6.2
-_gnomever=3.6
-pkgrel=1
-pkgdesc="MAPI plugin for evolution."
-arch=('i686' 'x86_64')
-url="http://www.gnome.org"
-license=('GPL3')
-depends=('evolution>=3.6.2' 'openchange>=1.0-5')
-makedepends=('intltool')
-options=(!makeflags)
-source=(http://ftp.gnome.org/pub/gnome/sources/evolution-mapi/$_gnomever/${pkgname}-${pkgver}.tar.xz)
-_prefix="/opt/samba4"
-md5sums=('4b9eb953e499fca4e1bd7dbd9bf5c0c9')
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-
-    export PKG_CONFIG_PATH=${_prefix}/samba/lib/pkgconfig:${_prefix}/lib/pkgconfig
-
-    export CFLAGS="-DHAVE_MEMCTX_ON_CAST_SPROPVALUE -DHAVE_MEMCTX_ON_CAST_MAPI_SPROPVALUE ${CFLAGS}"
-    ./configure --prefix=${_prefix}
-    unset CFLAGS
-
-    make || return 1
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-
-    make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/facter/PKGBUILD b/pcr/facter/PKGBUILD
deleted file mode 100644
index 956569001..000000000
--- a/pcr/facter/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Greg Sutcliffe <facter_aur (at) emeraldreverie.orgr>
-# Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr>
-# Contributor: Thomas S Hatch <thatch45 (at) Gmail.com>
-# Contributor: Dave Simons <miouhpi (at) Gmail (dot) com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres
-
-pkgname=facter
-pkgver=1.6.14
-pkgrel=1
-pkgdesc="A library for collecting facts about your system."
-arch=("any")
-url="http://puppetlabs.com/projects/facter/"
-license=("APACHE")
-depends=("ruby" "inetutils" "net-tools")
-options=(!emptydirs)
-source=(http://puppetlabs.com/downloads/facter/facter-$pkgver.tar.gz)
-md5sums=('b6c3df8ad1781c10d30785c58a4504ef')
-
-package() {
-  cd $srcdir/facter-$pkgver
-
-  ruby ./install.rb \
-      --destdir=$pkgdir \
-      --bindir=/usr/bin \
-      --sbindir=/usr/sbin
-
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m 644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-}
diff --git a/pcr/ffingerd/PKGBUILD b/pcr/ffingerd/PKGBUILD
deleted file mode 100644
index 5b43314d3..000000000
--- a/pcr/ffingerd/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-pkgname=ffingerd
-pkgver=1.28
-pkgrel=3
-pkgdesc="Secure finger daemon"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.fefe.de/ffingerd/"
-license=('GPL2')
-depends=('glibc' 'xinetd')
-backup=('etc/xinetd.d/finger')
-source=(http://www.fefe.de/$pkgname/$pkgname-$pkgver.tar.bz2 finger.xinetd)
-md5sums=('fe207448745da07b4e393d8b8694658b' '2ca1a6b3f442a5c0c81fa03d265a203e')
-
-build() {
-   cd $srcdir/$pkgname-$pkgver
-   install -d $pkgdir/usr/sbin $pkgdir/usr/share/man/man8
-   ./configure --prefix=/usr
-
-   make
-}
-
-package(){
-   cd $srcdir/$pkgname-$pkgver
-
-   make SBINDIR=$pkgdir/usr/sbin MANDIR=$pkgdir/usr/share/man install
-
-   install -D -m644 $srcdir/finger.xinetd $pkgdir/etc/xinetd.d/ffinger
-}
diff --git a/pcr/ffingerd/finger.xinetd b/pcr/ffingerd/finger.xinetd
deleted file mode 100644
index 36cd303b4..000000000
--- a/pcr/ffingerd/finger.xinetd
+++ /dev/null
@@ -1,8 +0,0 @@
-service finger
-{
-	socket_type		= stream
-	wait			= no
-	user			= nobody
-	server			= /usr/sbin/ffingerd
-	disable			= yes
-}
diff --git a/pcr/filemq/PKGBUILD b/pcr/filemq/PKGBUILD
deleted file mode 100644
index 57f5eb69d..000000000
--- a/pcr/filemq/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-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/fpdns/PKGBUILD b/pcr/fpdns/PKGBUILD
deleted file mode 100644
index b4cff364a..000000000
--- a/pcr/fpdns/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Ermak <ermak@email.it>
-# Maintainer : Parabola GNU / Linux-libre Aur�lien Desbri�res <aurelien@cwb.io>
-
-pkgname=fpdns
-pkgver=0.9.3
-pkgrel=1
-pkgdesc="Program that remotely determines DNS server versions"
-url="http://code.google.com/p/fpdns/"
-depends=('')
-license=('BSD')
-options=('!emptydirs')
-arch=('i686' 'x86_64')
-source=('http://fpdns.googlecode.com/files/Net-DNS-Fingerprint-0.9.3.tar.gz') 
-md5sums=('16f1fbc9e5c8b935a0a48a509dc58899')
-
-build() {
-  cd  ${srcdir}/Net-DNS-Fingerprint-0.9.3
-  eval `perl -V:archname`
-  /usr/bin/perl Makefile.PL \
-      INSTALLARCHLIB=/usr/lib/perl5/current/${archname} \
-      INSTALLSITELIB=/usr/lib/perl5/site_perl/current \
-      INSTALLSITEARCH=/usr/lib/perl5/site_perl/current/${archname}
-  /usr/bin/make || return 1
-  /usr/bin/make DESTDIR=${pkgdir} install
-  /usr/bin/find ${pkgdir} -name '.packlist' -delete
-  /usr/bin/find ${pkgdir} -name '*.pod' -delete
-}
-
diff --git a/pcr/frame/PKGBUILD b/pcr/frame/PKGBUILD
deleted file mode 100644
index e46c369fc..000000000
--- a/pcr/frame/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Nicolas Quiénot < niQo at aur >
-
-pkgname=frame
-pkgver=2.5.0
-pkgrel=1
-pkgdesc="Frame handles the buildup and synchronization of a set of simultaneous touches."
-arch=(i686 x86_64 mips64el)
-url="https://launchpad.net/frame"
-license=(GPL)
-depends=('libxi' 'gcc-libs')
-makedepends=('xorg-server-devel' 'asciidoc')
-provides=('utouch-frame')
-conflicts=('utouch-frame')
-replaces=('utouch-frame')
-options=('!libtool')
-source=(http://launchpad.net/$pkgname/trunk/v$pkgver/+download/$pkgname-$pkgver.tar.gz)
-
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
-
-md5sums=('02baa941091c5d198cd1623b3ad36e68')
diff --git a/pcr/freeipmi/PKGBUILD b/pcr/freeipmi/PKGBUILD
deleted file mode 100644
index 7f2bb291c..000000000
--- a/pcr/freeipmi/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# http://github.com/fukawi2/aur-packages
-# Contributor: Nathan Owe <ndowens04 at gmail>
-# Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.IO>
-
-pkgname=freeipmi
-pkgver=1.2.3
-pkgrel=1
-pkgdesc="sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gnu.org/software/freeipmi/"
-license=('GPL')
-depends=('libgcrypt')
-options=('!libtool')
-source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz")
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --mandir=/usr/share/man \
-    --sysconfdir=/etc \
-    --localstatedir=/var/lib \
-    --infodir=/usr/share/info
-
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir/ install
-
-  # Move init scripts and config to Arch paths
-  mv $pkgdir/etc/init.d $pkgdir/etc/rc.d
-  mv $pkgdir/etc/sysconfig $pkgdir/etc/conf.d
-
-  # Fix references to 'init.d' and 'sysconfig'
-  sed -e 's|/etc/init.d/|/etc/rc.d/|g' \
-      -e 's|/etc/rc.d/init.d/functions|/etc/rc.d/functions|g' \
-      -i $pkgdir/etc/rc.d/*
-  sed -e 's|CONFFILE=/etc/sysconfig/bmc-watchdog|CONFFILE=/etc/cond.f/bmc-watchdog|g' \
-      -i $pkgdir/etc/rc.d/bmc-watchdog
-  
-  rm -Rf $pkgdir/usr/share/info/dir
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('b1e21641c31b9d3291bdfe4a2b323d03')
diff --git a/pcr/freetuxtv/PKGBUILD b/pcr/freetuxtv/PKGBUILD
deleted file mode 100644
index be9eb6759..000000000
--- a/pcr/freetuxtv/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Bernard Baeyens (berbae) <berbae52 at sfr dot fr>
-pkgname=freetuxtv
-pkgver=0.6.5
-pkgrel=3
-pkgdesc="WebTV player to watch ADSL TV on the PC."
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/freetuxtv/"
-license=('GPL3')
-depends=('vlc' 'gtk2' 'sqlite' 'curl' 'libnotify' 'dbus-glib')
-makedepends=('intltool')
-conflicts=('freetuxtv-svn')
-
-source=("http://freetuxtv.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha1sums=('f347a6fd107f9722f4f6be4ec8f530239ffe899a')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --with-gtk=2.0
-  make
-}
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/fsniper/PKGBUILD b/pcr/fsniper/PKGBUILD
deleted file mode 100644
index bf7e3a6c3..000000000
--- a/pcr/fsniper/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/fwsnort/PKGBUILD b/pcr/fwsnort/PKGBUILD
deleted file mode 100644
index 37a863822..000000000
--- a/pcr/fwsnort/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Colin Shea <colin@evaryont.me>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=fwsnort
-pkgver=1.6.2
-pkgrel=1
-pkgdesc="application layer IDS/IPS by translating snort rules into iptables"
-arch=('any')
-url="http://www.cipherdyne.org/fwsnort/"
-license=('GPL')
-depends=('perl' 'perl-net-ipv4addr' 'perl-iptables-parse' 'iptables' 'net-tools')
-makedepends=('wget')
-source=(http://www.cipherdyne.org/$pkgname/download/$pkgname-$pkgver.tar.bz2
-        'install_pl.patch')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  mkdir -p $pkgdir/var/log/fwsnort \
-           $pkgdir/usr/lib/fwsnort \
-           $pkgdir/usr/share/man/man8 \
-           $pkgdir/usr/sbin \
-           $pkgdir/etc/fwsnort/snort_rules \
-           $pkgdir/etc/fwsnort/archive \
-           $pkgdir/etc/fwsnort/snort_rules_queue
-
-  patch -p0 -i $srcdir/install_pl.patch
-  sed -e "/mpath.*man8/s|/usr|$pkgdir&|"    \
-      -e "/^my\\ \\\$sbin/s|/usr|$pkgdir&|" \
-      -i  install.pl
-
-  cp fwsnort.conf fwsnort.conf.bak
-
-  sed -e "s|/var/log/fwsnort|$pkgdir&|" \
-      -e "s|/usr/lib/fwsnort|$pkgdir&|" \
-      -e "s|/etc/fwsnort|$pkgdir&|" \
-        ./fwsnort.conf -i
-  # -S skips installing the perl modules, which we did with packages
-  echo y | ./install.pl -S
-  mv -f fwsnort.conf.bak $pkgdir/etc/fwsnort/fwsnort.conf
-  chmod 755 $pkgdir/usr/sbin/fwsnort
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/fwsnort/install_pl.patch b/pcr/fwsnort/install_pl.patch
deleted file mode 100644
index b9cfb4a33..000000000
--- a/pcr/fwsnort/install_pl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- install.pl	2011-02-05 05:02:38.845785881 -0700
-+++ install2.pl	2011-02-05 05:03:21.350360881 -0700
-@@ -120,10 +120,6 @@
- ### make sure the system binaries are where we think they are.
- &check_commands();
- 
--### check to make sure we are running as root
--$< == 0 && $> == 0 or die "You need to be root (or equivalent UID 0",
--    " account) to install/uninstall fwsnort!\n";
--
- if ($uninstall) {
-     &uninstall();
- } else {
---- install.pl	2011-01-02 18:38:51.000000000 -0700
-+++ install2.pl	2011-02-05 04:59:01.653910881 -0700
-@@ -471,8 +471,11 @@
- sub check_commands() {
-     my @path = qw(
-         /bin
-+        /sbin
-         /usr/bin
-+        /usr/sbin
-         /usr/local/bin
-+        /usr/local/sbin
-     );
-     CMD: for my $cmd (keys %cmds) {
-         unless (-x $cmds{$cmd}) {
diff --git a/pcr/galera/PKGBUILD b/pcr/galera/PKGBUILD
deleted file mode 100644
index b6ba8890c..000000000
--- a/pcr/galera/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Rustam Tsurik <rustam.tsurik@gmail.com>
-# Contributor: Nico Suarez <nicodoggie@gmail.com>
-
-pkgname=galera
-pkgver=25.3.2
-pkgrel=1
-pkgdesc='Galera WSREP provider'
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('boost>=1.41' 'openssl')
-makedepends=('check' 'scons' 'patch')
-url='http://www.codership.com'
-options=('!libtool')
-source=(https://launchpad.net/galera/3.x/$pkgver/+download/galera-$pkgver-src.tar.gz)
-sha256sums=('5dd54364720f8854088590bdfea1e3a7f3e37fda3dfe8a5f58ebcc987cc6788d')
-
-build(){
-  cd "$srcdir"
-  cd "$pkgname-$pkgver-src"
-  scons
-}
-
-package(){
-  install -Dm0644 "$srcdir"/$pkgname-$pkgver-src/libgalera_smm.so "$pkgdir"/usr/lib/libgalera_smm.so
-  install -Dm0755 "$srcdir"/$pkgname-$pkgver-src/garb/garbd "$pkgdir"/usr/bin/garbd
-  install -Dm0644 "$srcdir"/$pkgname-$pkgver-src/scripts/packages/README "$pkgdir"/usr/share/doc/galera/README
-  install -m0644 "$srcdir"/$pkgname-$pkgver-src/scripts/packages/README-MySQL "$pkgdir"/usr/share/doc/galera/README-MySQL
-  install -m0644 "$srcdir"/$pkgname-$pkgver-src/COPYING "$pkgdir"/usr/share/doc/galera/COPYING
-}
diff --git a/pcr/ganglia/PKGBUILD b/pcr/ganglia/PKGBUILD
deleted file mode 100644
index efa005071..000000000
--- a/pcr/ganglia/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=ganglia
-pkgver=3.6.0
-pkgrel=4
-pkgdesc='Scalable distributed monitoring system for high-performance computing systems such as clusters and Grids.'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url=http://$pkgname.sourceforge.net/
-license=BSD
-depends=(
-  apr
-  confuse
-  #php-embed
-  python2
-  rrdtool
-)
-install=$pkgname.install
-options=(!libtool)
-optdepends="$pkgname-web: Web frontend"
-backup=(
-  etc/ganglia/gmond.conf
-  etc/ganglia/gmetad.conf
-)
-source=(
-  http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-  gmetad.service.in
-  gmond.service.in
-)
-sha512sums=(
-  2a05d37787f1440c0c4aa91cdf0f4f4cb39c840b3b0fdcd6fe58cfb5892a75f81d36f6191c83c17558c37154298268df74fa255d2c940a8b84a7bf3ddb102394
-  a42b7dcb7dd81961cc9fef114f8c4c352375ed931dc2ae77b1139c6fde7cbd6544fcb5fe286ff6066ef37696821dc9f6fcab7c6b14d3ebaa59e895219cd89836
-  c362a383cbbaf5540b5d698f664534bd0da73bcc5ee4336c468844ed17706e05450f35e4f6cf969f1d2495c462883873b30e4575b9ee8ded74ab475afda608bb
-)
-
-prepare() {
-  cd $srcdir/$pkgname-$pkgver
-
-  #sed -i 's|sapi/embed/php_embed.h|php/sapi/embed/php_embed.h|' configure
-
-  sed -i 's|nobody|ganglia|' gmetad/gmetad.conf.in
-
-  # FIXME: Hopefully this will soon no longer be required?
-  msg2 'Copying systemd units into source as workaround for bug'
-  cp $srcdir/gmetad.service.in gmetad/gmetad.service.in
-  cp $srcdir/gmond.service.in  gmond/gmond.service.in
-}
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  setarch $CARCH ./configure --prefix=/usr\
-    --enable-gexec\
-    --enable-perl\
-    --enable-setuid=ganglia\
-    --enable-status\
-    --disable-static\
-    --libdir=/usr/lib\
-    --with-gmetad\
-    --with-python=/usr/bin/python2\
-    --sbindir=/usr/bin\
-    --sysconfdir=/etc/ganglia
-#    --enable-php\
-#    --enable-setgid=ganglia\
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  mkdir $pkgdir/usr/lib/$pkgname/python_modules
-
-  msg2 'Generating default gmond.conf'
-  ./gmond/gmond --default_config > $pkgdir/etc/ganglia/gmond.conf
-}
diff --git a/pcr/ganglia/ganglia.install b/pcr/ganglia/ganglia.install
deleted file mode 100644
index 6a196af1f..000000000
--- a/pcr/ganglia/ganglia.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  if [ "`vercmp $2 3.4.0`" -lt 0 ]; then
-    echo 'WARNING: The ganglia package has been split. If you use the' \
-         "web frontend, you'll need to install the ganglia-web package as well."
-  fi
-  id ganglia  >& /dev/null
-  if [ $? -ne 0 ]; then
-     echo 'Adding ganglia system group and user...'
-     groupadd -r ganglia && useradd -r -d /var/lib/ganglia -g ganglia -s /bin/false ganglia
-     # Lock the account to prevent logging in
-     passwd -l ganglia &> /dev/null
-  fi
-  install -d -o ganglia -g ganglia /var/lib/ganglia && install -d -o ganglia -g ganglia /var/lib/ganglia/rrds
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  echo 'Removing ganglia system group and user...'
-  userdel ganglia
-  echo 'NOTE: Please remove /var/lib/ganglia manually if it is no longer required.'
-}
diff --git a/pcr/ganglia/gmetad.service.in b/pcr/ganglia/gmetad.service.in
deleted file mode 100644
index a721c2b4c..000000000
--- a/pcr/ganglia/gmetad.service.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Ganglia Meta Daemon
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/gmetad.pid
-ExecStart=/usr/bin/gmetad -p /run/gmetad.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/ganglia/gmond.service.in b/pcr/ganglia/gmond.service.in
deleted file mode 100644
index 5cbd31629..000000000
--- a/pcr/ganglia/gmond.service.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Ganglia Monitor Daemon
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/gmond -f -p /run/gmond.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/gcc-gcj/PKGBUILD b/pcr/gcc-gcj/PKGBUILD
deleted file mode 100644
index 7ed03b889..000000000
--- a/pcr/gcc-gcj/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# Contributor: Renan Manola <rmanola@gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Based on a modified version of the gcc PKGBUILD
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=gcc-gcj
-pkgver=4.7.2
-pkgrel=2
-pkgdesc="The GNU Compiler for Java"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-url="http://gcc.gnu.org"
-depends=("gcc=$pkgver" 'gtk2' 'file' 'zip' 'libsm' 'libxtst' 'alsa-lib' 'libart-lgpl')
-makedepends=('binutils>=2.20.1' 'mpfr>=2.4.2-2' 'cloog>=0.16.2-1' 'elfutils'
-             'libmpc>=0.8.2-2' 'jack')
-options=('!libtool')
-install=$pkgname.install
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 libjava-sjlj.dpatch gcc_pure64.patch)
-md5sums=('cc308a0891e778cfda7a151ab8a6e762'
-         'afe3541abf5ce163223f94ccdbc66e30'
-         'ced48436c1b3c981d721a829f1094de1')
-
-build() {
-  cd ${srcdir}/gcc-${pkgver}
-  
-  # Do not install libiberty
-  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
-  # Do not run fixincludes
-  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
-  chmod +x ${srcdir}/*.dpatch
-  ${srcdir}/libjava-sjlj.dpatch -patch
-
-  echo ${pkgver} > gcc/BASE-VER
-
-  [ -d build ] || mkdir build
-  if [ "${CARCH}" = "x86_64" ]; then
-    patch -p1 < $srcdir/gcc_pure64.patch
-  fi
-  cd build
-
-  ../configure --prefix=/usr --enable-shared --enable-languages=java \
-      --enable-threads=posix --mandir=/usr/share/man --infodir=/usr/share/info \
-      --enable-__cxa_atexit  --disable-multilib --libdir=/usr/lib \
-      --libexecdir=/usr/lib --enable-clocale=gnu --disable-libstdcxx-pch \
-      --with-tune=generic --enable-java-awt=gtk --with-java-home="$JAVA_HOME" \
-      --enable-libgcj-multifile --disable-plugin --with-system-zlib
-  make
-}
-
-package() {
-  cd ${srcdir}/gcc-${pkgver}/build
-  make -j1 DESTDIR=${pkgdir} install-target-libjava
-
-  cd gcc
-  make -j1 DESTDIR=${pkgdir} java.install-common java.install-man
-
-  install -m755 jc1 ${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/
-  install -m755 jvgenmain ${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/
-
-  # Remove files which belong to the base gcc package
-  rm -f ${pkgdir}/usr/bin/{c,g}++
-  if [ "${CARCH}" = "x86_64" ]; then
-    rm -f ${pkgdir}/usr/bin/x86_64-unknown-linux-gnu-{c,g}++
-   else
-    rm -f ${pkgdir}/usr/bin/i686-pc-linux-gnu-{c,g}++
-  fi
-  rm -f ${pkgdir}/usr/man/man1/g++.*
-  # Rename two files to not conflict to classpath
-  mv ${pkgdir}/usr/share/info/cp-tools.info ${pkgdir}/usr/share/info/cp-tools-gcj.info
-  rm ${pkgdir}/usr/share/info/dir
-  mv ${pkgdir}/usr/share/man/man1/gjdoc.1 ${pkgdir}/usr/share/man/man1/gjdoc.gcj.1
-
-  find ${pkgdir}/usr/lib -type f -name '*.so.*' -exec strip --strip-unneeded {} \;
-
-  linkdir=`basename $pkgdir/usr/lib/gcj-${pkgver}*`
-  ln -sf $linkdir ${pkgdir}/usr/lib/gcj-${pkgver%.?}
-  ln -sf libgcj-${pkgver}.jar ${pkgdir}/usr/share/java/libgcj-${pkgver%.?}.jar
-  ln -sf libgcj-${pkgver}.jar ${pkgdir}/usr/share/java/libgcj.jar
-  ln -sf libgcj-tools-${pkgver}.jar ${pkgdir}/usr/share/java/libgcj-tools-${pkgver%.?}.jar
-  ln -sf libgcj-tools-${pkgver}.jar ${pkgdir}/usr/share/java/libgcj-tools.jar
-}
diff --git a/pcr/gcc-gcj/gcc-gcj.install b/pcr/gcc-gcj/gcc-gcj.install
deleted file mode 100644
index 916aa6a17..000000000
--- a/pcr/gcc-gcj/gcc-gcj.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cp-tools-gcj.info)
-
-post_install() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install "$1"
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
\ No newline at end of file
diff --git a/pcr/gcc-gcj/gcc_pure64.patch b/pcr/gcc-gcj/gcc_pure64.patch
deleted file mode 100644
index a9b09bbcf..000000000
--- a/pcr/gcc-gcj/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-orig/gcc/config/i386/linux64.h gcc/gcc/config/i386/linux64.h
---- gcc-orig/gcc/config/i386/linux64.h	2011-07-08 01:38:34.000000000 +1000
-+++ gcc/gcc/config/i386/linux64.h	2011-07-24 19:48:05.000000000 +1000
-@@ -28,6 +28,6 @@
- #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-diff -Naur gcc-orig/gcc/config/i386/t-linux64 gcc/gcc/config/i386/t-linux64
---- gcc-orig/gcc/config/i386/t-linux64	2011-07-08 01:38:34.000000000 +1000
-+++ gcc/gcc/config/i386/t-linux64	2011-07-24 19:49:41.000000000 +1000
-@@ -34,8 +34,8 @@
- comma=,
- MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32
- 
- LIBGCC = stmp-multilib
diff --git a/pcr/gcc-gcj/libjava-sjlj.dpatch b/pcr/gcc-gcj/libjava-sjlj.dpatch
deleted file mode 100755
index 95b4673b3..000000000
--- a/pcr/gcc-gcj/libjava-sjlj.dpatch
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/sh -e
-
-# DP: Don't try to use _Unwind_Backtrace on SJLJ targets.
-# DP: See bug #387875, #388505, GCC PR 29206.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p1 < $0
-        #cd ${dir}gcc && autoconf
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
-        #rm ${dir}gcc/configure
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
----
- libjava/sysdep/generic/backtrace.h |   17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-Index: src/libjava/sysdep/generic/backtrace.h
-===================================================================
---- src.orig/libjava/sysdep/generic/backtrace.h	2006-11-06 14:00:32.000000000 -0500
-+++ src/libjava/sysdep/generic/backtrace.h	2006-11-06 14:04:38.000000000 -0500
-@@ -13,6 +13,20 @@ details.  */
- 
- #include <java-stack.h>
- 
-+#ifdef SJLJ_EXCEPTIONS
-+
-+#undef _Unwind_GetIPInfo
-+#define _Unwind_GetIPInfo(ctx,ip_before_insn) \
-+  (abort (), (void) (ctx), *ip_before_insn = 1, 0)
-+
-+#undef _Unwind_GetRegionStart
-+#define _Unwind_GetRegionStart(ctx) \
-+  (abort (), (void) (ctx), 0)
-+
-+#undef _Unwind_Backtrace
-+#define _Unwind_Backtrace(trace_fn,state_ptr) \
-+  (fallback_backtrace (trace_fn, state_ptr))
-+
- /* Unwind through the call stack calling TRACE_FN with STATE for every stack
-    frame.  Returns the reason why the unwinding was stopped.  */
- _Unwind_Reason_Code
-@@ -20,4 +34,7 @@ fallback_backtrace (_Unwind_Trace_Fn, _J
- {
-   return _URC_NO_REASON;
- }
-+
-+#endif /* SJLJ_EXCEPTIONS */
-+
- #endif
diff --git a/pcr/gcc-lts/PKGBUILD b/pcr/gcc-lts/PKGBUILD
deleted file mode 100644
index b4ad7137d..000000000
--- a/pcr/gcc-lts/PKGBUILD
+++ /dev/null
@@ -1,299 +0,0 @@
-# $Id: PKGBUILD 186915 2013-05-31 23:25:14Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# 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
-
-#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=4
-pkgdesc="The GNU Compiler Collection"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-#makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'ppl' 'gcc-ada' 'doxygen')
-makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'ppl' 'doxygen')
-checkdepends=('dejagnu' 'inetutils')
-options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2)
-md5sums=('86f428a30379bdee0224e353ee2f999e')
-_basedir=gcc-${pkgver}
-
-prepare() {
-  cd ${srcdir}/${_basedir}
-
-  # Do not install libiberty
-  #sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
-  # Do not run fixincludes
-  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
-  # Parabola installs x86_64 libraries /lib
-  [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
-
-  echo ${pkgver} > gcc/BASE-VER
-
-  # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
-  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
-
-  # fix texinfo "@itemx" and "@item"
-  sed -i "s|[@]itemx|@item|;
-   " gcc/doc/{cppopts,generic,invoke,sourcebuild}.texi
-
-  mkdir ${srcdir}/gcc-build
-}
-
-build() {
-  cd ${srcdir}/gcc-build
-
-  # using -pipe causes spurious test-suite failures
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
-  CFLAGS=${CFLAGS/-pipe/}
-  CXXFLAGS=${CXXFLAGS/-pipe/}
-
-  ${srcdir}/${_basedir}/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --mandir=/usr/share/man --infodir=/usr/share/info \
-      --with-bugurl=https://labs.parabola.nu/ \
-      --enable-languages=c,c++,fortran,go,lto,objc,obj-c++ \
-      --enable-shared --enable-threads=posix \
-      --with-system-zlib --enable-__cxa_atexit \
-      --disable-libunwind-exceptions --enable-clocale=gnu \
-      --disable-libstdcxx-pch --enable-libstdcxx-time \
-      --enable-gnu-unique-object --enable-linker-build-id \
-      --with-ppl --enable-cloog-backend=isl \
-      --disable-ppl-version-check --disable-cloog-version-check \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --with-linker-hash-style=gnu \
-      --disable-multilib --disable-libssp \
-      --disable-build-with-cxx --disable-build-poststage1-with-cxx \
-      --disable-install-libiberty \
-      --disable-werror \
-      --enable-checking=release
-      #--enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
-  make
-  
-  # make documentation
-  cd $CHOST/libstdc++-v3
-  make doc-man-doxygen
-}
-
-check() {
-  cd ${srcdir}/gcc-build
-
-  # increase stack size to prevent test failures
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
-  ulimit -s 32768
-
-  # do not abort on error as some are "expected"
-  make -k check || true
-  ${srcdir}/${_basedir}/contrib/test_summary
-}
-
-package_gcc-lts-libs()
-{
-  pkgdesc="Runtime libraries shipped by GCC"
-  groups=('lts')
-  depends=('glibc>=2.17')
-  provides=("gcc-libs=$pkgver")
-  conflicts=('gcc-libs')
-  install=gcc-libs.install
-
-  cd ${srcdir}/gcc-build
-  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
-  #for lib in libmudflap libgomp libstdc++-v3/src libitm libsanitizer/asan; do
-  for lib in libmudflap libgomp libstdc++-v3/src libitm; do
-    make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-  done
-
-  #[[ $CARCH == "x86_64" ]] && \
-  #  make -j1 -C $CHOST/libsanitizer/tsan DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-  
-  make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
-  make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
-  make -j1 -C $CHOST/libitm DESTDIR=${pkgdir} install-info
-
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
-  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-  make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
-  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
-  rm -r ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
-  # remove static libraries
-  find ${pkgdir} -name *.a -delete
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-lts()
-{
-  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("gcc-lts-libs=$pkgver" 'binutils>=2.23' 'libmpc' 'cloog' 'ppl')
-  provides=("gcc=$pkgver")
-  conflicts=('gcc')
-  groups=('lts-devel')
-  install=gcc.install
-
-  cd ${srcdir}/gcc-build
-  
-  make -j1 DESTDIR=${pkgdir} install
-
-  install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
-  mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py
-
-  # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  #rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
-  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo}
-  rm $pkgdir/usr/lib/*.so*
-  #rm $pkgdir/usr/lib/lib{atomic,gfortran,go{,begin},iberty,objc}.a
-  rm $pkgdir/usr/lib/lib{ffi,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 -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{finclude,include/objc}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/ffi{,target}.h
-  #rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,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/info/{gccgo,gfortran,libgomp,libquadmath,libitm}.info
-  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
-  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
-  rm $pkgdir/usr/share/man/man3/ffi*
-
-  # many packages expect this symlinks
-  ln -s gcc ${pkgdir}/usr/bin/cc
-
-  # POSIX conformance launcher scripts for c89 and c99
-  cat > $pkgdir/usr/bin/c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
-  case "$opt" in
-    -ansi|-std=c89|-std=iso9899:1990) fl="";;
-    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  cat > $pkgdir/usr/bin/c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
-  case "$opt" in
-    -std=c99|-std=iso9899:1999) fl="";;
-    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  chmod 755 $pkgdir/usr/bin/c{8,9}9
-
-  # install the libstdc++ man pages
-  install -dm755 ${pkgdir}/usr/share/man/man3
-  install -m644 -t ${pkgdir}/usr/share/man/man3 \
-    ${CHOST}/libstdc++-v3/doc/doxygen/man/man3/*.3
-
-  # Install Runtime Library Exception
-  install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-lts-fortran()
-{
-  pkgdesc="Fortran front-end for GCC"
-  depends=("gcc-lts=$pkgver")
-  provides=("gcc-fortran=$pkgver")
-  conflicts=('gcc-fortran')
-  install=gcc-fortran.install
-
-  cd ${srcdir}/gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libgfortran
-  make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
-  make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
-  install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
-
-  ln -s gfortran ${pkgdir}/usr/bin/f95
-
-  # remove files included in gcc-libs or gcc
-  #rm ${pkgdir}/usr/lib/lib{gfortran,gcc_s}.so*
-  rm ${pkgdir}/usr/lib/libgfortran.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
-
-  # Install Runtime Library Exception
-  install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-lts-objc()
-{
-  pkgdesc="Objective-C front-end for GCC"
-  depends=("gcc-lts=$pkgver")
-  provides=("gcc-objc=$pkgver")
-  conflicts=('gcc-objc')
-
-  cd ${srcdir}/gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libobjc
-  install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-
-  # remove files included in gcc-libs or gcc
-  #rm ${pkgdir}/usr/lib/lib{gcc_s,objc}.so*
-  rm ${pkgdir}/usr/lib/libobjc.so*
-  #rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{*.o,lib*}
-  #rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/unwind.h
-
-  # Install Runtime Library Exception
-  install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-lts-ada()
-{
-  pkgdesc="Ada front-end for GCC (GNAT)"
-  depends=("gcc-lts=$pkgver")
-  provides=("gcc-ada=$pkgver")
-  conflicts=('gcc-ada')
-  install=gcc-ada.install
-
-  cd ${srcdir}/gcc-build/gcc
-  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
-  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
-}
-
-package_gcc-lts-go()
-{
-  pkgdesc="Go front-end for GCC"
-  depends=("gcc-lts=$pkgver")
-  provides=("gcc-go=$pkgver")
-  conflicts=('gcc-go')
-  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
-
-  # Install Runtime Library Exception
-  install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/pcr/gcc-lts/gcc-ada.install b/pcr/gcc-lts/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/pcr/gcc-lts/gcc-ada.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/pcr/gcc-lts/gcc-fortran.install b/pcr/gcc-lts/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/pcr/gcc-lts/gcc-fortran.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file="gfortran.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/pcr/gcc-lts/gcc-go.install b/pcr/gcc-lts/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/pcr/gcc-lts/gcc-go.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/pcr/gcc-lts/gcc-libs.install b/pcr/gcc-lts/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/pcr/gcc-lts/gcc-libs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/pcr/gcc-lts/gcc.install b/pcr/gcc-lts/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/pcr/gcc-lts/gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/pcr/geis/PKGBUILD b/pcr/geis/PKGBUILD
deleted file mode 100644
index f70fa9f64..000000000
--- a/pcr/geis/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Nicolas Quiénot <niQo @ AUR >
-# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
-
-pkgname=geis
-pkgver=2.2.15
-pkgrel=3
-pkgdesc="Implementation of the GEIS (Gesture Engine Interface and Support) interface."
-arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/geis"
-license=('GPL' 'LGPL')
-depends=('grail' 'dbus' 'python-gobject')
-makedepends=('xorg-server-devel')
-provides=('utouch-geis')
-conflicts=('utouch-geis')
-replaces=('utouch-geis')
-options=('!emptydirs' '!libtool')
-source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ## add -Wno-format in CFLAGS see FS#34658
-  CFLAGS="$CFLAGS -Wno-format" ./configure --prefix=/usr --disable-static
-  make 
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="${pkgdir}/" install
-}
-
-md5sums=('94c8a08497f5fc22061fb0573ca1e220')
diff --git a/pcr/gens-gs/PKGBUILD b/pcr/gens-gs/PKGBUILD
deleted file mode 100644
index 316c0af9c..000000000
--- a/pcr/gens-gs/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Maintainer: trya <tryagainprod@gmail.com>
-
-pkgname=gens-gs
-pkgver=r7
-pkgrel=5
-pkgdesc="An emulator of Sega Genesis, Sega CD and 32X, combining features from various forks of Gens"
-url="http://segaretro.org/Gens/GS"
-arch=('i686' 'x86_64')
-license=('GPL')
-if [[ $CARCH == "x86_64" ]]; then
-  depends=('lib32-gtk2' 'lib32-sdl' 'lib32-libgl')
-  makedepends=('nasm' 'gcc-multilib')
-  optdepends=('lib32-alsa-plugins: sound with Gens/GS for Pulseaudio users'
-              'lib32-libpulse: sound with Gens/GS for Pulseaudio users')
-else
-  depends=('gtk2' 'sdl' 'libgl')
-  makedepends=('nasm' 'gcc')
-fi
-replaces=('bin32-gens-gs')
-conflicts=('gens' 'gens-gs-git' 'bin32-gens-gs' 'bin32-gens')
-options=('!libtool')
-source=("http://segaretro.org/images/6/6d/Gens-gs-r7.tar.gz"
-        gens-gtk.patch)
-md5sums=('bcb17b49774aa318a224c741028aabc3'
-         '94a8ea744dee8caea73db1223ac67dcd')
-
-build() {
-  if [ $CARCH == "x86_64" ]; then
-    export CC="gcc -m32"
-    export CXX="g++ -m32"
-    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  fi
-
-  cd "$srcdir/$pkgname-$pkgver"
-  
-  patch -Np1 < ../gens-gtk.patch
-  if [ $CARCH == "x86_64" ]; then
-    i386 ./configure --prefix=/usr
-  else
-    ./configure --prefix=/usr LIBS="-ldl -lX11"
-  fi
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm -f "$pkgdir/usr/lib/mdp/*.a"
-}
diff --git a/pcr/gens-gs/gens-gtk.patch b/pcr/gens-gs/gens-gtk.patch
deleted file mode 100644
index 0bc6fd0ee..000000000
--- a/pcr/gens-gs/gens-gtk.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff -ru gens/src/gens/ui/gtk/about/about_window.cpp gens-build/src/gens/ui/gtk/about/about_window.cpp
---- gens/src/gens/ui/gtk/about/about_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/about/about_window.cpp	2010-10-11 15:46:25.000000000 +0000
-@@ -84,7 +84,7 @@
- 	gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE);
- 	gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(about_window), FALSE);
-+	g_object_set(GTK_DIALOG(about_window), "has-separator", FALSE, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)about_window, "delete_event",
-diff -ru gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp
---- gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp	2010-10-11 15:33:03.000000000 +0000
-@@ -84,7 +84,7 @@
- 	gtk_window_set_position(GTK_WINDOW(bmf_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(bmf_window), FALSE);
- 	gtk_window_set_type_hint(GTK_WINDOW(bmf_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(bmf_window), FALSE);
-+	g_object_set(GTK_DIALOG(bmf_window), "has-separator", FALSE, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)bmf_window, "delete_event",
-diff -ru gens/src/gens/ui/gtk/directory_config/dir_window.cpp gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp
---- gens/src/gens/ui/gtk/directory_config/dir_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp	2010-10-11 15:34:21.000000000 +0000
-@@ -109,7 +109,7 @@
- 	gtk_window_set_position(GTK_WINDOW(dir_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(dir_window), FALSE);
- 	gtk_window_set_type_hint(GTK_WINDOW(dir_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(dir_window), FALSE);
-+	g_object_set(GTK_DIALOG(dir_window), "has-separator", FALSE, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)(dir_window), "delete_event",
-diff -ru gens/src/gens/ui/gtk/general_options/genopt_window.cpp gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp
---- gens/src/gens/ui/gtk/general_options/genopt_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp	2010-10-11 15:36:00.000000000 +0000
-@@ -140,7 +140,7 @@
- 	gtk_window_set_position(GTK_WINDOW(genopt_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(genopt_window), false);
- 	gtk_window_set_type_hint(GTK_WINDOW(genopt_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(genopt_window), false);
-+	g_object_set(GTK_DIALOG(genopt_window), "has-separator", false, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)genopt_window, "delete_event",
-@@ -458,11 +458,11 @@
- 	gtk_box_pack_start(GTK_BOX(vboxIntroEffect), lblIntroEffect, false, false, 0);
- 	
- 	// Dropdown for intro effect.
--	cboIntroEffect = gtk_combo_box_new_text();
--	gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "None");
--	gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Gens Logo Effect");
--	gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "\"Crazy\" Effect");
--	//gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Genesis TMSS"); // TODO: Broken.
-+	cboIntroEffect = gtk_combo_box_text_new();
-+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "None");
-+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Gens Logo Effect");
-+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "\"Crazy\" Effect");
-+	//gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Genesis TMSS"); // TODO: Broken.
- 	gtk_widget_show(cboIntroEffect);
- 	gtk_box_pack_start(GTK_BOX(vboxIntroEffect), cboIntroEffect, false, false, 0);
- 	g_signal_connect((gpointer)(cboIntroEffect), "changed",
-diff -ru gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp
---- gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp	2010-10-11 15:21:28.000000000 +0000
-@@ -154,9 +154,9 @@
- 	GSFT_UNUSED_PARAMETER(y);
- 	GSFT_UNUSED_PARAMETER(user_data);
- 	
--	if (context->targets)
-+	if (gdk_drag_context_list_targets(context))
- 	{
--		GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets, 0));
-+		GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(gdk_drag_context_list_targets(context), 0));
- 		gtk_drag_get_data(widget, context, target_type, time);
- 		return true;
- 	}
-diff -ru gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp
---- gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp	2010-10-11 15:46:21.000000000 +0000
-@@ -75,7 +75,7 @@
- 	gtk_window_set_position(GTK_WINDOW(glres_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(glres_window), FALSE);
- 	gtk_window_set_type_hint(GTK_WINDOW(glres_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(glres_window), FALSE);
-+	g_object_set(GTK_DIALOG(glres_window), "has-separator", FALSE, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)(glres_window), "delete_event",
-diff -ru gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp
---- gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp	2010-10-11 15:46:29.000000000 +0000
-@@ -80,8 +80,7 @@
- // Callbacks.
- static gboolean	pmgr_window_callback_close(GtkWidget *widget, GdkEvent *event, gpointer user_data);
- static void	pmgr_window_callback_response(GtkDialog *dialog, gint response_id, gpointer user_data);
--static void	pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page,
--							       guint page_num, gpointer user_data);
-+static void	pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data);
- static void	pmgr_window_callback_lstPluginList_cursor_changed(GtkTreeView *tree_view, gpointer user_data);
- static void	pmgr_window_callback_fraPluginDesc_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data);
- 
-@@ -119,7 +118,7 @@
- 	gtk_window_set_position(GTK_WINDOW(pmgr_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(pmgr_window), FALSE);
- 	gtk_window_set_type_hint(GTK_WINDOW(pmgr_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(pmgr_window), FALSE);
-+	g_object_set(GTK_DIALOG(pmgr_window), "has-separator", FALSE, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)pmgr_window, "delete_event",
-@@ -559,11 +558,9 @@
-  * @param page_num New notebook page index.
-  * @param user_data User data.
-  */
--static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page,
--							   guint page_num, gpointer user_data)
-+static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data)
- {
- 	GSFT_UNUSED_PARAMETER(notebook);
--	GSFT_UNUSED_PARAMETER(page);
- 	GSFT_UNUSED_PARAMETER(user_data);
- 	
- 	// Activate the "cursor-changed" callback for the page.
-diff -ru gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp
---- gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp	2010-10-11 15:46:16.000000000 +0000
-@@ -94,7 +94,7 @@
- 	gtk_window_set_position(GTK_WINDOW(selcd_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(selcd_window), FALSE);
- 	gtk_window_set_type_hint(GTK_WINDOW(selcd_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(selcd_window), FALSE);
-+	g_object_set(GTK_DIALOG(selcd_window), "has-separator", FALSE, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)(selcd_window), "delete_event",
-@@ -128,7 +128,7 @@
- 	gtk_box_pack_start(GTK_BOX(hboxDeviceName), lblDeviceName, false, false, 0);
- 	
- 	// Create the dropdown for the CD-ROM device name.
--	cboDeviceName = gtk_combo_box_entry_new_text();
-+	cboDeviceName = gtk_combo_box_text_new_with_entry();
- 	gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(cboDeviceName))), 63);
- 	gtk_label_set_mnemonic_widget(GTK_LABEL(lblDeviceName), cboDeviceName);
- 	gtk_widget_show(cboDeviceName);
-@@ -156,7 +156,7 @@
- 	gtk_box_pack_start(GTK_BOX(hboxDriveSpeed), vboxDriveSpeedDropdown, true, true, 0);
- 	
- 	// Create the dropdown for the CD-ROM drive speed selection.
--	cboDriveSpeed = gtk_combo_box_new_text();
-+	cboDriveSpeed = gtk_combo_box_text_new();
- 	char tmpSpeed[16];
- 	for (unsigned int i = 0; i < ((sizeof(CD_DriveSpeed) / sizeof(CD_DriveSpeed[0])) - 1); i++)
- 	{
-@@ -167,7 +167,7 @@
- 		else
- 			szprintf(tmpSpeed, sizeof(tmpSpeed), "%dx", CD_DriveSpeed[i]);
- 
--		gtk_combo_box_append_text(GTK_COMBO_BOX(cboDriveSpeed), tmpSpeed);
-+		gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDriveSpeed), tmpSpeed);
- 	}
- 	gtk_widget_show(cboDriveSpeed);
- 	gtk_box_pack_start(GTK_BOX(vboxDriveSpeedDropdown), cboDriveSpeed, true, false, 0);
-@@ -252,7 +252,7 @@
- 				continue;
- 			
- 			// Add the device file.
--			gtk_combo_box_append_text(GTK_COMBO_BOX(cboDeviceName), tmpDeviceName);
-+			gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDeviceName), tmpDeviceName);
- 		}
- 	}
- 	
-diff -ru gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp
---- gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp	2010-10-11 15:52:05.000000000 +0000
-@@ -111,7 +111,7 @@
- 	gtk_window_set_position(GTK_WINDOW(gg_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(gg_window), TRUE);
- 	gtk_window_set_type_hint(GTK_WINDOW(gg_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(gg_window), FALSE);
-+	g_object_set(GTK_DIALOG(gg_window), "has-separator", FALSE, NULL);
- 	
- 	// Add the window icon.
- 	GList *icon_list = NULL;
diff --git a/pcr/gimp-art/PKGBUILD b/pcr/gimp-art/PKGBUILD
deleted file mode 100644
index cd38b329d..000000000
--- a/pcr/gimp-art/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=gimp-art
-pkgver=2.8.2
-pkgrel=2
-pkgdesc='GNU Image Manipulation Program (changed splash artwork)'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url=http://www.${pkgname%-art}.org/
-license=(
-  GPL
-  LGPL
-)
-depends=(
-  babl
-  dbus-glib
-  desktop-file-utils
-  gegl
-  hicolor-icon-theme
-  jasper
-  lcms
-  libexif
-  libmng
-  librsvg
-  libxmu
-  libxpm
-  libwmf
-  pygtk
-)
-makedepends=(
-  alsa-lib
-  curl
-  ghostscript
-  intltool
-  iso-codes
-  libwebkit
-  poppler-glib
-)
-optdepends=(
-  'alsa-lib: for MIDI event controller module'
-  'curl: for URI support'
-  'ghostscript: for postscript support'
-  'gutenprint: for sophisticated printing only as gimp has built-in cups print support'
-  'libwebkit: for the help browser'
-  'poppler-glib: for pdf support'
-)
-options=(
-  !libtool
-  !makeflags
-)
-conflicts=(
-  ${pkgname%-art}
-  ${pkgname%-art}-devel
-)
-provides=(
-  ${pkgname%-art}=$pkgver
-)
-install=${pkgname%-art}.install
-source=(
-  ftp://ftp.${pkgname%-art}.org/pub/${pkgname%-art}/v${pkgver%.*}/${pkgname%-art}-$pkgver.tar.bz2
-  ${pkgname%-art}-splash-artwork.png
-  ${pkgname%-art}-splash-artwork.license
-)
-sha512sums=(
-  82a15072aba97d41a7dd74920f5db4e89442ff83841ac614f6fadfd964bdb8d3ae478ac0ba2e906bcf4569c8de00a1616fd6d626032f093060f28df3655d9111
-  1a2930e612b339f49aa85f98275c24202e056f2fff5c1fda94e662bfd45ed5b6226e6ab1947f3daf758f4e5106fd3f7e4f286d63b258f008b6a5d9e5cd6f0611
-  d3f055ce278f25b33a6b11f3b031ae801206390fa1f62e3383daf35570e5f68b98ddfac30dea71d89d4916eaf3263e642ad06805c3175f620412e546784335ac
-)
-
-build() {
-  cd $srcdir/${pkgname%-art}-$pkgver
-
-  ## Add artwork splash image ##
-  install -Dm644 $srcdir/${pkgname%-art}-splash-artwork.png \
-    $srcdir/${pkgname%-art}-$pkgver/data/images/${pkgname%-art}-splash.png
-
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --enable-${pkgname%-art}-console \
-    --enable-mp \
-    --enable-python \
-    --sysconfdir=/etc \
-    --with-gif-compression=lzw \
-    --with-libcurl \
-    --without-aa \
-    --without-gvfs
-  make
-}
-
-package() {
-  cd $srcdir/${pkgname%-art}-$pkgver
-  make DESTDIR=$pkgdir install
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' $pkgdir/usr/lib/${pkgname%-art}/${pkgver::2}0/plug-ins/*.py
-
-  ## Add artwork splash license ##
-  install -Dm644 $srcdir/${pkgname%-art}-splash-artwork.license \
-    $pkgdir/usr/share/licenses/${pkgname%-art}/${pkgname%-art}-splash-artwork.license
-
-  rm $pkgdir/usr/share/man/man1/$_pkgname-console.1
-  ln -s  ${pkgname%-art}-console-${pkgver%.*}.1.gz $pkgdir/usr/share/man/man1/${pkgname%-art}-console.1.gz
-  ln -s  ${pkgname%-art}tool-${pkgver::2}0         $pkgdir/usr/bin/${pkgname%-art}tool
-  ln -sf ${pkgname%-art}tool-${pkgver::2}0.1.gz    $pkgdir/usr/share/man/man1/${pkgname%-art}tool.1.gz
-}
diff --git a/pcr/gimp-art/gimp-splash-artwork.license b/pcr/gimp-art/gimp-splash-artwork.license
deleted file mode 100644
index 22b83f32c..000000000
--- a/pcr/gimp-art/gimp-splash-artwork.license
+++ /dev/null
@@ -1,13 +0,0 @@
-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@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,
-Suite 900, Mountain View, California, 94041, USA.
-
-Sangeno Waterfall Picture is created by Abedinali from Wikimedia Commons under the Creative Commons CC0 1.0 Universal license (Public Domain).
-To the extent possible under law, Abedinali from Wikimedia Commons has waived all copyright and related or neighboring rights to Sangeno Waterfall. 
-This work is published from: United States. 
-https://upload.wikimedia.org/wikipedia/commons/8/8b/Sangeno.jpg
diff --git a/pcr/gimp-art/gimp-splash-artwork.png b/pcr/gimp-art/gimp-splash-artwork.png
deleted file mode 100644
index 76c9e8c94..000000000
--- a/pcr/gimp-art/gimp-splash-artwork.png
+++ /dev/null
diff --git a/pcr/gimp-art/gimp.install b/pcr/gimp-art/gimp.install
deleted file mode 100644
index c317fbaca..000000000
--- a/pcr/gimp-art/gimp.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/pcr/gimp-pcr/PKGBUILD b/pcr/gimp-pcr/PKGBUILD
deleted file mode 100644
index 75b54f27a..000000000
--- a/pcr/gimp-pcr/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 198811 2013-11-05 16:40:29Z bpiotrowski $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-_pkgname=gimp
-pkgname=$_pkgname-pcr
-pkgver=2.8.10
-pkgrel=1
-pkgdesc="GNU Image Manipulation Program"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gimp.org/"
-license=('GPL' 'LGPL')
-depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \
-         'libexif' 'gegl' 'jasper' 'desktop-file-utils' 'hicolor-icon-theme' 'babl')
-makedepends=('intltool' 'webkitgtk2' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl' 'ghostscript')
-optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
-            'webkitgtk2: for the help browser'
-            'poppler-glib: for pdf support'
-            'alsa-lib: for MIDI event controller module'
-            'curl: for URI support'
-            'ghostscript: for postscript support')
-options=('!makeflags')
-provides=("$_pkgname")
-conflicts=('gimp-devel' "$_pkgname")
-install=gimp.install
-source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${_pkgname}-${pkgver}.tar.bz2 gnu.gpl 
-        uri-backend-libcurl.patch)
-md5sums=('84c964aab7044489af69f7319bb59b47'
-         '2d823a7e7cd7f99b681943e42bfb7d40'
-         'e894f4b2ffa92c71448fdd350e9b78c6')
-
-prepare() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  # fixing freetype header path file
-  sed -i "s|freetype/tttables[.]h|freetype2/tttables.h|" app/text/${_pkgname}font.c
-}
-
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  #patch -p1 < ../uri-backend-libcurl.patch
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-    --enable-mp --enable-gimp-console --enable-gimp-remote \
-    --enable-python --with-gif-compression=lzw --with-libcurl \
-    --without-aa --without-hal --without-gvfs --without-gnomevfs
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py
-  install -D -m644 "${srcdir}/gnu.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/GNU.gpl"
-
-  rm "${pkgdir}/usr/share/man/man1/gimp-console.1"
-  ln -s gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz"
-  ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool"
-  ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz"
-}
diff --git a/pcr/gimp-pcr/gimp.install b/pcr/gimp-pcr/gimp.install
deleted file mode 100644
index c317fbaca..000000000
--- a/pcr/gimp-pcr/gimp.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/pcr/gimp-pcr/gnu.gpl b/pcr/gimp-pcr/gnu.gpl
deleted file mode 100644
index e7ce2b288..000000000
--- a/pcr/gimp-pcr/gnu.gpl
+++ /dev/null
@@ -1,19 +0,0 @@
-GIMP Palette
-Name: gnu
-#
-  0   0   0
-  0   0 170
-  0 170   0
-  0 170 170
-170   0   0
-170   0 170
-170  85   0
-170 170 170
- 85  85  85
- 85  85 255
- 85 255  85
- 85 255 255
-255  85  85
-255  85 255
-255 255  85
-255 255 255
diff --git a/pcr/gimp-pcr/uri-backend-libcurl.patch b/pcr/gimp-pcr/uri-backend-libcurl.patch
deleted file mode 100644
index 85da2fc7f..000000000
--- a/pcr/gimp-pcr/uri-backend-libcurl.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -aur gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c
---- gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c	2010-07-03 00:51:59.000000000 +0200
-+++ gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c	2011-06-23 19:15:30.000000000 +0200
-@@ -4,9 +4,9 @@
-  * libcurl backend for the URI plug-in
-  * Copyright (C) 2006 Mukund Sivaraman <muks@mukund.org>
-  *
-- * This program is free software; you can redistribute it and/or modify
-+ * 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
-+ * 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,
-@@ -15,8 +15,7 @@
-  * 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.
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
- #include "config.h"
-@@ -24,7 +23,6 @@
- #include <errno.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- #include <glib/gstdio.h>
-@@ -63,7 +61,7 @@
- 
-   vinfo = curl_version_info (CURLVERSION_NOW);
- 
--  protocols = g_string_new ("http:,ftp:");
-+  protocols = g_string_new ("http:,ftp:,gopher:");
- 
-   if (vinfo->features & CURL_VERSION_SSL)
-     {
-@@ -153,7 +151,7 @@
-   FILE      *out_file;
-   CURL      *curl_handle;
-   CURLcode   result;
--  gint       response_code;
-+  glong      response_code;
- 
-   gimp_progress_init (_("Connecting to server"));
- 
-@@ -195,12 +193,12 @@
- 
-   curl_easy_getinfo (curl_handle, CURLINFO_RESPONSE_CODE, &response_code);
- 
--  if (response_code != 200)
-+  if (response_code != 200 && response_code != 226 && response_code != 0)
-     {
-       fclose (out_file);
-       g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                    _("Opening '%s' for reading resulted in HTTP "
--                     "response code: %d"),
-+                     "response code: %ld"),
-                    uri, response_code);
-       curl_easy_cleanup (curl_handle);
-       return FALSE;
-@@ -224,3 +222,10 @@
- 
-   return FALSE;
- }
-+
-+gchar *
-+uri_backend_map_image (const gchar  *uri,
-+                       GimpRunMode   run_mode)
-+{
-+  return NULL;
-+}
diff --git a/pcr/ginn/PKGBUILD b/pcr/ginn/PKGBUILD
deleted file mode 100644
index 5a7588d06..000000000
--- a/pcr/ginn/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Nicolas Quiénot <niQo @ aur>
-
-pkgname=ginn
-pkgver=0.2.6
-pkgrel=2
-pkgdesc="A deamon with jinn-like wish-granting capabilities"
-url="http://launchpad.net/ginn"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('geis' 'bamf2' 'libxtst' 'libwnck')
-source=(http://launchpad.net/ginn/0.x/${pkgver}/+download/ginn-${pkgver}.tar.gz)
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-}
-
-md5sums=('008854147f0809877b3e7ccf5af5337f')
diff --git a/pcr/git-remote-mediawiki/PKGBUILD b/pcr/git-remote-mediawiki/PKGBUILD
deleted file mode 100644
index 8fb47724a..000000000
--- a/pcr/git-remote-mediawiki/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-pkgname=git-remote-mediawiki
-url=https://github.com/moy/Git-Mediawiki/wiki
-license=('GPL') # GPLv2+
-pkgdesc="Support for MediaWiki remotes in git"
-
-pkgver=1.8.5.1
-pkgrel=2
-arch=('any')
-depends=(
-  git
-  perl-datetime-format-iso8601
-  perl-html-tree
-  perl-lwp-protocol-https
-  perl-mediawiki-api
-)
-
-_symlink() {
-	local src=$1
-	local dst=$2
-	mkdir -p "${pkgdir}/${dst%/*}"
-	ln -s "$(realpath "$src" --relative-to="${dst%/*}")" "${pkgdir}/${dst}"
-}
-
-package() {
-	_mwdir=/usr/share/git/mw-to-git
-	_perldir=/usr/share/perl5/vendor_perl
-	_gitdir=/usr/lib/git-core
-	_symlink ${_mwdir}/Git/Mediawiki.pm          ${_perldir}/Git/Mediawiki.pm
-	_symlink ${_mwdir}/git-mw.perl               ${_gitdir}/git-mw
-	_symlink ${_mwdir}/git-remote-mediawiki.perl ${_gitdir}/git-remote-mediawiki
-}
diff --git a/pcr/gitflow/PKGBUILD b/pcr/gitflow/PKGBUILD
deleted file mode 100644
index b62042262..000000000
--- a/pcr/gitflow/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Techlive Zheng <techlivezheng@gmail.com>
-# Contributor: Ernie Brodeur <ebrodeur@ujami.net>
-
-pkgname=gitflow
-pkgver=0.4.1
-pkgrel=3
-pkgdesc='Extend git with the Gitflow branching model.'
-arch=('any')
-url='https://github.com/nvie/gitflow'
-license=('BSD')
-depends=('git' 'shflags')
-source=("https://github.com/nvie/gitflow/tarball/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('adc7a52512052938a9b42ac8bd7d91dd')
-
-prepare() {
-  cd $srcdir/`find . -maxdepth 1 -type d -name nvie\*`
-  sed -i "s:\$GITFLOW_DIR/gitflow-shFlags:/usr/share/lib/shflags/shflags.sh:" git-flow
-}
-
-package() {
-  cd $srcdir/`find . -maxdepth 1 -type d -name nvie\*`
-
-  install -d -m 0755 $pkgdir/usr/lib/git-core
-  install -m 0755 git-flow $pkgdir/usr/lib/git-core
-  install -m 0644 git-flow-feature \
-                  git-flow-hotfix \
-                  git-flow-release \
-                  git-flow-support \
-                  git-flow-version \
-                  git-flow-init \
-                  gitflow-common \
-                  $pkgdir/usr/lib/git-core/
-}
-md5sums=('adc7a52512052938a9b42ac8bd7d91dd')
diff --git a/pcr/glance/PKGBUILD b/pcr/glance/PKGBUILD
deleted file mode 100644
index a05e66686..000000000
--- a/pcr/glance/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# Contributor: Josh Chase <jcjoshuachase@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=glance
-pkgver=2012.1.2
-pkgrel=1
-_ostackver=essex
-_clientname=python-glanceclient
-_clientver=0.5.1
-pkgdesc="OpenStack image service"
-arch=('any')
-license=('custom')
-url="https://launchpad.net/$pkgname"
-depends=('python2'
-	 'python2-httplib2'
-	 'python2-webob'
-	 'python2-eventlet'
-	 'python2-greenlet'
-	 'python-paste'
-	 'python-paste-deploy'
-	 'python-routes'
-	 'python2-sqlalchemy'
-	 'python2-migrate'
-	 'python2-passlib'
-	 'python2-lxml'
-	 'python-anyjson'
-	 'python-wsgiref'
-	 'python2-argparse'
-	 'python2-boto'
-	 'python-xattr'
-	 'python2-kombu'
-	 'python2-crypto'
-	 'python2-sendfile'
-	 'python2-iso8601')
-makedepends=('python2-distribute')
-source=("https://launchpad.net/$pkgname/$_ostackver/$pkgver/+download/$pkgname-$pkgver.tar.gz"
-	"http://pypi.python.org/packages/source/${_clientname:0:1}/$_clientname/$_clientname-$_clientver.tar.gz")
-
-build() {
-  cd $srcdir
-
-  find . -type f -exec sed -i -e 's|^#!/usr/bin/python$|#!/usr/bin/python2|' \
-    -e 's|^#!/usr/bin/env python$|#!/usr/bin/env python2|' {} +
-
-  cd $srcdir/$_clientname-$_clientver
-  python2 setup.py build
-
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py build
-}
-
-package() {
-  cd $srcdir/$_clientname-$_clientver
-  python2 setup.py install --root=$pkgdir
-
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py install --root="$pkgdir" --optimize=1
-  
-  install -dm600 "$pkgdir"/etc/$pkgname
-  install -Dm600 etc/* "$pkgdir"/etc/$pkgname/
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/pcr/gloobus-preview-bzr/PKGBUILD b/pcr/gloobus-preview-bzr/PKGBUILD
deleted file mode 100644
index ae8a2fd87..000000000
--- a/pcr/gloobus-preview-bzr/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# Contributor: Alessio Sergi <asergi at archlinux dot us>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=gloobus-preview-bzr
-_pkgname=gloobus-preview
-pkgver=290
-pkgrel=1
-pkgdesc="A quicklook for GNU/Linux"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/gloobus-preview"
-license=('GPL3')
-depends=('desktop-file-utils' 'djvulibre' 'gstreamer0.10-base' \
-         'gtksourceview3' 'libspectre' 'poppler-glib' \
-         'python2-gconf' 'taglib')
-makedepends=('boost' 'bzr' 'intltool')
-optdepends=('gdk-pixbuf-psd: PSD images support'
-            'gdk-pixbuf-xcf: XCF images support'
-            'gloobus-sushi-bzr: nautilus 3.x support'
-            'libicns: ICNS files support'
-            'marlin-bzr: file manager integration support'
-            'nautilus-actions: nautilus menu integration'
-            'nautilus-elementary-bzr: file manager integration support'
-            'unoconv: LibO files support')
-provides=($_pkgname)
-conflicts=($_pkgname)
-options=('!libtool')
-install=$pkgname.install
-
-_bzrtrunk="https://code.launchpad.net/~gloobus-dev/$_pkgname/last_working_branch"
-_bzrmod="$pkgname"
-
-build() {
-  cd "$srcdir"
-
-  msg "Connecting to Bazaar server...."
-
-  if [[ -d "$_bzrmod" ]]; then
-    cd "$_bzrmod" && bzr --no-plugins pull "$_bzrtrunk" -r "$pkgver"
-    msg "The local files are updated."
-  else
-    bzr --no-plugins branch "$_bzrtrunk" "$_bzrmod" -q -r "$pkgver"
-  fi
-
-  msg "Bazaar checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_bzrmod-build"
-  cp -r "$srcdir/$_bzrmod" "$srcdir/$_bzrmod-build"
-  cd "$srcdir/$_bzrmod-build"
-
-  # no psd and xcf loaders
-  sed -i '/loaders/d' src/Makefile.am
-  sed -i '/src\/loaders/d' configure.ac
-
-  # automake 1.12.1 fix
-  sed -i 's/-Werror//' configure.ac
-
-  # python2 fix
-  sed -i 's_python_&2_' src/"$_pkgname"-configuration
-
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$_bzrmod-build"
-
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=()
diff --git a/pcr/gloobus-preview-bzr/gloobus-preview-bzr.install b/pcr/gloobus-preview-bzr/gloobus-preview-bzr.install
deleted file mode 100644
index 63031e5be..000000000
--- a/pcr/gloobus-preview-bzr/gloobus-preview-bzr.install
+++ /dev/null
@@ -1,28 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  update-desktop-database -q
-
-  echo ">>> To use GP instead of GNOME Sushi with Nautilus 3.x install gloobus-sushi-bzr."
-  echo ""
-  echo ">>> To use GP with marlin:"
-  echo '>>>  $ gsettings set org.gnome.marlin.preferences previewer-path "'gloobus-preview'"'
-  echo ""
-  echo ">>> To use GP with nautilus-actions:"
-  echo ">>>  Label: Quicklook"
-  echo ">>>  Path: gloobus-preview"
-  echo ">>>  Parameters: %f"
-  echo ""
-  echo ">>> For more info: http://gloobus.net/"
-  echo ">>> IRC channel: #gloobus @ irc.freenode.net"
-}
-
-post_upgrade() {
-  post_install "$1"
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/gmqcc-git/PKGBUILD b/pcr/gmqcc-git/PKGBUILD
deleted file mode 100644
index ab08b36ef..000000000
--- a/pcr/gmqcc-git/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Contributor: matthiaskrgr <matthiaskrgr _strange_curverd_character_ freedroid D0T org>
-
-pkgname=gmqcc-git
-pkgver=20130214
-pkgrel=1
-pkgdesc="An Improved Quake C Compiler"
-arch=('i686' 'x86_64')
-depends=('glibc')
-conflicts=('gmqcc')
-provides=('gmqcc=0.2.4')
-makedepends=('git')
-url="https://github.com/graphitemaster/gmqcc.git"
-license=('MIT')
-
-_gitroot="git://github.com/graphitemaster/gmqcc.git"
-_gitname="gmqcc"
-
-build() {
-	cd $srcdir
-	msg "Connecting to the GIT server..."
-	if [[ -d $srcdir/$_gitname ]] ; then
-		cd $_gitname
-		msg "Removing build files..."
-		git clean -dfx
-		msg "Updating..."
-		git pull --no-tags
-		msg "The local files are updated."
-	else
-		msg "Cloning..."
-		git clone $_gitroot $_gitname --depth 1
-		msg "Clone done."
-	fi
-
-	msg "Starting compilation..."
-	cd "$srcdir"/"$_gitname"
-
-	msg "Compiling..."
-	make
-}
-
-check() {
-	cd "$srcdir"/"$_gitname"
-	make check
-}
-
-package() {
-	cd "$srcdir"/"$_gitname"
-	msg "Compiling and installing to pkgdir this time..."
-	make install DESTDIR=$pkgdir PREFIX=/usr
-	msg "Compiling done."
-
-	install -D LICENSE ${pkgdir}/usr/share/licenses/gmqcc/LICENSE
-}
diff --git a/pcr/gmusicbrowser/PKGBUILD b/pcr/gmusicbrowser/PKGBUILD
deleted file mode 100644
index e8cec3c76..000000000
--- a/pcr/gmusicbrowser/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Spike29 <leguen.yannick@gmail.com>
-# Contributor: jsteel <mail at jsteel dot org>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-
-pkgname=gmusicbrowser
-pkgver=1.1.10
-pkgrel=3
-pkgdesc="A jukebox for large collections of mp3/ogg/flac files, written in perl"
-arch=('any')
-url="http://gmusicbrowser.org"
-license=('GPL3')
-depends=('gtk2-perl' 'hicolor-icon-theme')
-optdepends=('alsa-utils: enables the ALSA backend'
-            'flac123: flac support for the ALSA backend'
-            'mpg321: mp3 support for the ALSA backend'
-            'vorbis-tools: vorbis support for the ALSA backend'
-            'mplayer: enables the mplayer backend'
-            'perl-gstreamer: enables the gstreamer backend'
-            'gstreamer0.10-base: vorbis support for the gstreamer backend' 
-            'gstreamer0.10-good-plugins: flac support for the gstreamer backend'
-            'gstreamer0.10-bad-plugins: mpc support for the gstreamer backend'
-            'gstreamer0.10-ugly-plugins: mp3 support for the gstreamer backend'
-            'perl-gtk2-mozembed: web-based plugins support'
-            'perl-gtk2-webkit: alternative web-based plugin support'
-            'perl-html-parser: support for accented characters in lyrics plugin'
-            'perl-locale-gettext: localization support'
-            'perl-net-dbus: control gmusicbrowser through dbus and gnome hotkeys'
-            'perl-gtk2-notify: show notifications using libnotify' )
-conflicts=('gmusicbrowser-devel' 'gmusicbrowser-development' 'gmusicbrowser-git' 'gmusicbrowser-shimmer-git')
-options=('!libtool')
-install=$pkgname.install
-source=(https://github.com/shimmerproject/${pkgname}/archive/v${pkgver}.tar.gz)
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-
-  make DESTDIR="$pkgdir/" DOCS="AUTHORS COPYING README NEWS INSTALL" install
-
-  # put some images in sane locations
-  install -Dm644 pix/trayicon.png "$pkgdir"/usr/share/icons/hicolor/16x16/apps/gmusicbrowser.png
-  install -Dm644 pix/gmusicbrowser32x32.png "$pkgdir"/usr/share/icons/hicolor/32x32/apps/gmusicbrowser.png
-  install -Dm644 pix/gmusicbrowser.png "$pkgdir"/usr/share/icons/hicolor/48x48/apps/gmusicbrowser.png
-  install -Dm644 pix/gmusicbrowser.png "$pkgdir"/usr/share/pixmaps/gmusicbrowser.png
-}
-md5sums=('25cbef3bd7c6666a036dcc337adcb387')
diff --git a/pcr/gmusicbrowser/gmusicbrowser.install b/pcr/gmusicbrowser/gmusicbrowser.install
deleted file mode 100644
index f917ebdff..000000000
--- a/pcr/gmusicbrowser/gmusicbrowser.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  cat << _EOF
- 
-==> In order to play your music with gmusicbrowser, you need to install 
-	gstreamer and its perl bindings  OR  mpg321/vorbis-tools/flac123/alsa-utils  OR  mplayer
-	(look at optdepends for details)
-     
-_EOF
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/pcr/gnome-boxes-libre/PKGBUILD b/pcr/gnome-boxes-libre/PKGBUILD
deleted file mode 100644
index 91a3b41be..000000000
--- a/pcr/gnome-boxes-libre/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Daniel Milewski <niitotantei@gmail.com>
-
-_pkgname='gnome-boxes'
-pkgname="$_pkgname-libre"
-pkgver='3.10.2'
-pkgrel='1'
-pkgdesc='A simple GNOME 3 application to access remote or virtual systems, without nonfree system logos'
-arch=('i686' 'x86_64')
-url='https://wiki.gnome.org/Apps/Boxes'
-license=('LGPL')
-depends=('clutter-gtk' 'desktop-file-utils' 'gtk-vnc' 'libosinfo' 'libsoup' 'libtracker-sparql' 'libvirt-glib'
-         'spice-gtk3')
-makedepends=('gobject-introspection' 'intltool' 'itstool' 'spice-protocol' 'vala')
-optdepends=('qemu-usbredir: virtual machines support')
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-replaces=("$_pkgname")
-install='gnome-boxes.install'
-source=("http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz" 'logos.patch'
-        'free-distros.patch')
-sha256sums=('9e055627cff5f59323bc95ad65ab361fc26328854d5a421bd09c899c466f2ec4'
-            '63d8a7fb5e0d6260d56bd92e9d11f39e9f37c323a261bc822a589b85f760b254'
-            '025e56fff5ae3659abc867ef1b5739a4632c91fa7f10d54d0853e9905355a15f')
-
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  patch -Np1 -i "$srcdir/logos.patch"
-
-  patch -Np1 -i "$srcdir/free-distros.patch"
-}
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/gnome-boxes-libre/free-distros.patch b/pcr/gnome-boxes-libre/free-distros.patch
deleted file mode 100644
index d83d2ca4b..000000000
--- a/pcr/gnome-boxes-libre/free-distros.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml.original	2013-11-23 13:26:20.013010981 +0100
-+++ gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml	2013-11-23 14:29:33.237567173 +0100
-@@ -2,4 +2,8 @@
- 
-   <!-- Please read README.logos for any questions about usage of product logos in Boxes. !-->
- 
-+  <os id="https://parabolagnulinux.org">
-+    <logo>https://projects.parabolagnulinux.org/artwork.git/plain/official-2013/optimized-text/logo.svg</logo>
-+  </os>
-+
- </libosinfo>
diff --git a/pcr/gnome-boxes-libre/gnome-boxes.install b/pcr/gnome-boxes-libre/gnome-boxes.install
deleted file mode 100644
index 2ceb2ac08..000000000
--- a/pcr/gnome-boxes-libre/gnome-boxes.install
+++ /dev/null
@@ -1,17 +0,0 @@
-update() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_install() {
-  update
-}
-
-post_upgrade() {
-  update
-}
-
-post_remove() {
-  update
-}
diff --git a/pcr/gnome-boxes-libre/logos.patch b/pcr/gnome-boxes-libre/logos.patch
deleted file mode 100644
index 6fe80a2eb..000000000
--- a/pcr/gnome-boxes-libre/logos.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml.original	2013-11-16 22:30:08.198540527 +0100
-+++ gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml	2013-11-16 22:30:12.135269885 +0100
-@@ -2,36 +2,4 @@
- 
-   <!-- Please read README.logos for any questions about usage of product logos in Boxes. !-->
- 
--  <os id="http://debian.org/debian/1.0">
--    <logo>http://www.debian.org/logos/openlogo-nd.svg</logo>
--  </os>
--
--  <os id="http://fedoraproject.org/fedora/1">
--    <logo>http://people.gnome.org/~zeeshanak/logos/fedora.svg</logo>
--  </os>
--
--  <os id="http://opensuse.org/opensuse/10.2">
--    <logo>http://people.gnome.org/~zeeshanak/logos/opensuse.svg</logo>
--  </os>
--
--  <os id="http://ubuntu.com/ubuntu/4.10">
--    <logo>http://people.gnome.org/~zeeshanak/logos/ubuntu.svg</logo>
--  </os>
--
--  <os id="http://gnome.org/3.6">
--    <logo>http://people.gnome.org/~zeeshanak/logos/gnome-logo.svg</logo>
--  </os>
--
--  <os id="http://redhat.com/rhel/4.0">
--    <logo>http://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg</logo>
--  </os>
--
--  <os id="http://redhat.com/rhel/5.0">
--    <logo>http://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg</logo>
--  </os>
--
--  <os id="http://redhat.com/rhel/6.0">
--    <logo>http://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg</logo>
--  </os>
--
- </libosinfo>
diff --git a/pcr/gnome-rdp/PKGBUILD b/pcr/gnome-rdp/PKGBUILD
deleted file mode 100644
index 67a96bb7f..000000000
--- a/pcr/gnome-rdp/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor: György Balló <ballogy@freestart.hu>
-# Contributor: Hyperair <hyperair@gmail.com>
-# Contributor: kumico <norrian@gmail.com>
-# Contributor: adamruss <mail@russ.co.il>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=gnome-rdp
-pkgver=0.3.1.0
-pkgrel=1
-pkgdesc="Remote desktop client for the GNOME Desktop with RDP/VNC/SSH capabilities, written in C Sharp"
-arch=('any')
-url="http://sourceforge.net/projects/gnome-rdp/"
-license=('GPL' 'LGPL')
-depends=('gtk-sharp-2' 'gnome-keyring-sharp')
-optdepends=('openssh: SSH client'
-            'gnome-terminal: required for the SSH client'
-            'rdesktop: RDP client'
-            'tightvnc: VNC client')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-        appindicator.patch)
-md5sums=('3c1329702914f8b1c213c0bb00d078cf'
-         '7bbe98eadfe199c5664fd69a4531fb3d')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's/tight-vncviewer/vncviewer/' Sessions/SessionCollection.cs
-  patch -R -Np3 -i "$srcdir/appindicator.patch"
-  sed -i 's/pkglib_SCRIPTS/programfiles_SCRIPTS/' Makefile.include
-  sed -i 's|@expanded_libdir@|@prefix@/@libdir@|' gnome-rdp.in
-
-  autoreconf -fi
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  # Install desktop and icon files
-  install -Dm644 Menu/$pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 Menu/$pkgname.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
-}
-md5sums=('3c1329702914f8b1c213c0bb00d078cf'
-         '7bbe98eadfe199c5664fd69a4531fb3d')
diff --git a/pcr/gnome-rdp/appindicator.patch b/pcr/gnome-rdp/appindicator.patch
deleted file mode 100644
index 4cb4d7a65..000000000
--- a/pcr/gnome-rdp/appindicator.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-Index: /trunk/gnome-rdp/configure.ac

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

---- /trunk/gnome-rdp/configure.ac (revision 263)

-+++ /trunk/gnome-rdp/configure.ac (revision 264)

-@@ -50,6 +50,7 @@

- PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])

- PKG_CHECK_MODULES([GLADE_SHARP_20], [glade-sharp-2.0])

- PKG_CHECK_MODULES([GNOME_KEYRING_SHARP_10], [gnome-keyring-sharp-1.0])

-+PKG_CHECK_MODULES([APPINDICATOR_SHARP_01], [appindicator-sharp-0.1])

- 

- dnl package checks, per config

- 

-Index: /trunk/gnome-rdp/MainWindow.cs

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

---- /trunk/gnome-rdp/MainWindow.cs (revision 257)

-+++ /trunk/gnome-rdp/MainWindow.cs (revision 264)

-@@ -31,14 +31,18 @@

- using GnomeRDP.Vnc;

- 

-+using AppIndicator;

-+

- namespace GnomeRDP

- {

- 	public partial class MainWindow: Gtk.Window

- 	{			

--		private StatusIcon statusIcon;

-+		private ApplicationIndicator applicationIndicator;

- 		private Gtk.Action actionQuit;

-+		private Gtk.Action actionToggleVisible;

-+		private bool hideOnDelete = false;

- 				

- 		private const string sessionKey = "Session";

- 		

--		public MainWindow(): base (Gtk.WindowType.Toplevel)

-+		public MainWindow (): base (Gtk.WindowType.Toplevel)

- 		{

- 			Build ();

-@@ -46,72 +50,80 @@

- 			this.DeleteEvent += (s, e) =>

- 			{

--				Visible = false;

--				e.RetVal = true;

-+				if (hideOnDelete) 

-+				{

-+					Visible = false;

-+					e.RetVal = true;

-+				}

- 			};

- 			

--			this.actionQuit = new Gtk.Action("QuitAction", "Quit");

--			this.actionQuit.Activated+= (s, e) => Application.Quit();

-+			this.actionQuit = new Gtk.Action ("QuitAction", "Quit");

-+			this.actionQuit.Activated += (s, e) => Application.Quit ();

-+		

-+			this.actionToggleVisible = new Gtk.Action("ToggleVisibleAction", "Show/Hide");

-+			this.actionToggleVisible.Activated += (s, e) => { this.Visible = !this.Visible; };

-+

-+			this.applicationIndicator = new ApplicationIndicator ("gnome-rdp", "gnome-rdp", Category.ApplicationStatus);

-+			this.applicationIndicator.ConnectionChanged += (s, e) => { hideOnDelete = this.applicationIndicator.Connected; };

- 			

--			this.statusIcon = new StatusIcon(ResourceLoader.Find(ResourceLoader.Icons.gnomeRdp));

--			this.statusIcon.Visible = true;

--			this.statusIcon.Tooltip = "GnomeRDP";

--			this.statusIcon.Activate += OnStatusIcon_Activate;

--			this.statusIcon.PopupMenu += OnStatusIcon_PopupMenu;	

--

-+			this.applicationIndicator.Menu = CreateMenu();

-+			this.applicationIndicator.Status = Status.Active;

-+						

- 			this.Icon = ResourceLoader.Find(ResourceLoader.Icons.gnomeRdp);

- 		}

--		

--		private void OnStatusIcon_Activate(object sender, EventArgs e)

-+

-+		public void UpdateMenu()

- 		{

--			Visible = !Visible;

-+			Menu oldMenu = this.applicationIndicator.Menu;

-+			

-+			this.applicationIndicator.Menu = CreateMenu();

-+			

-+			oldMenu.Dispose();

- 		}

--		

--		private void OnStatusIcon_PopupMenu(object sender, PopupMenuArgs e)

-+										

-+		private Menu CreateMenu()

- 		{

--			try

--			{

--				Menu topMenu = new Menu();

--				topMenu.Popup();

-+			Menu topMenu = new Menu();

-+			

-+			topMenu.Append(actionToggleVisible.CreateMenuItem());

-+			topMenu.Append(new SeparatorMenuItem());

- 				

--				foreach (var group in Program.SessionCollection.Groups) 

--				{	

--					MenuItem groupMenu = new MenuItem(group);

--					topMenu.Append(groupMenu);

--					

--					Menu subMenu = new Menu();

--					foreach(var session in Program.SessionCollection.Items.Where(s => s.Group == group).OrderBy(s => s.Server))

--					{

--						MenuItem menuItem = new MenuItem(session.MenuFormat);

--						menuItem.TooltipText = session.Tooltip;

--						menuItem.Activated += PopupMenuItem_Activated;

--						menuItem.Data[sessionKey] = session;

--											

--						subMenu.Append(menuItem);

--					}

--					groupMenu.Submenu = subMenu;

--				}

--

--				topMenu.Append(new SeparatorMenuItem());

--

--				foreach (var session in Program.SessionCollection.Items.Where(s => string.IsNullOrEmpty(s.Group)).OrderBy(s => s.Server)) 

-+			foreach (var group in Program.SessionCollection.Groups) 

-+			{	

-+				MenuItem groupMenu = new MenuItem(group);

-+				

-+				Menu subMenu = new Menu();

-+				foreach(var session in Program.SessionCollection.Items.Where(s => s.Group == group).OrderBy(s => s.Server))

- 				{

- 					MenuItem menuItem = new MenuItem(session.MenuFormat);

- 					menuItem.TooltipText = session.Tooltip;

- 					menuItem.Activated += PopupMenuItem_Activated;

--					menuItem.Data[sessionKey] = session;					

--					

--					topMenu.Append(menuItem);

-+					menuItem.Data[sessionKey] = session;

-+										

-+					subMenu.Append(menuItem);

- 				}

-+				groupMenu.Submenu = subMenu;

-+

-+				topMenu.Append(groupMenu);

-+			}

-+

-+			topMenu.Append(new SeparatorMenuItem());

-+

-+			foreach (var session in Program.SessionCollection.Items.Where(s => string.IsNullOrEmpty(s.Group)).OrderBy(s => s.Server)) 

-+			{

-+				MenuItem menuItem = new MenuItem(session.MenuFormat);

-+				menuItem.TooltipText = session.Tooltip;

-+				menuItem.Activated += PopupMenuItem_Activated;

-+				menuItem.Data[sessionKey] = session;					

- 				

--				topMenu.Append(new SeparatorMenuItem());

--				topMenu.Append(actionQuit.CreateMenuItem());

--				topMenu.ShowAll();

--//				topMenu.Popup();

-+				topMenu.Append(menuItem);

- 			}

--			catch

--			{

--			}

--		}	

--		

-+			

-+			topMenu.Append(new SeparatorMenuItem());

-+			topMenu.Append(actionQuit.CreateMenuItem());

-+			

-+			topMenu.ShowAll();

-+			return topMenu;

-+		}

-+				

- 		private void PopupMenuItem_Activated(object sender, EventArgs e)

- 		{

-@@ -126,20 +138,4 @@

- 			}

- 		}

--		

--		protected virtual void OnNewRdpActionActivated (object sender, System.EventArgs e)

--		{

--		}

--		

--		protected virtual void OnNewVncActionActivated (object sender, System.EventArgs e)

--		{

--		}

--		

--		protected virtual void OnNewSshActionActivated (object sender, System.EventArgs e)

--		{

--		}

--		

--		

--		

--		

- 	}

- }

-Index: /trunk/gnome-rdp/ChangeLog

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

---- /trunk/gnome-rdp/ChangeLog (revision 262)

-+++ /trunk/gnome-rdp/ChangeLog (revision 264)

-@@ -1,2 +1,11 @@

-+2011-11-02  James P Michels III  <jmichels@bluefintrading.com>

-+

-+	* Program.cs:

-+	* gnome-rdp.sln:

-+	* MainWindow.cs:

-+	* gnome-rdp.csproj:

-+	* gui.stetic:

-+	* SessionsWidget.cs: Changes to support AppIndicator

-+

- 2011-05-22  James P Michels III  <james.p.michels@gmail.com>

- 

-Index: /trunk/gnome-rdp/Sessions/SessionsWidget.cs

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

---- /trunk/gnome-rdp/Sessions/SessionsWidget.cs (revision 257)

-+++ /trunk/gnome-rdp/Sessions/SessionsWidget.cs (revision 264)

-@@ -205,4 +205,5 @@

- 				}

- 				

-+				Program.UpdateMainWindowMenu();

- 			}

- 			catch (Exception ex)

-Index: /trunk/gnome-rdp/gtk-gui/gui.stetic

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

---- /trunk/gnome-rdp/gtk-gui/gui.stetic (revision 261)

-+++ /trunk/gnome-rdp/gtk-gui/gui.stetic (revision 264)

-@@ -7,5 +7,6 @@

-   <import>

-     <widget-library name="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />

--    <widget-library name="../bin/Debug/gnome-rdp.exe" internal="true" />

-+    <widget-library name="appindicator-sharp, Version=0.2.0.0, Culture=neutral, PublicKeyToken=bcae265d1c7ab4c2" />

-+    <widget-library name="../bin/Release/gnome-rdp.exe" internal="true" />

-   </import>

-   <widget class="Gtk.Window" id="GnomeRDP.MainWindow" design-size="798 565">

-Index: /trunk/gnome-rdp/Program.cs

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

---- /trunk/gnome-rdp/Program.cs (revision 261)

-+++ /trunk/gnome-rdp/Program.cs (revision 264)

-@@ -196,5 +196,14 @@

- 			});

- 		}

--				

-+		

-+		public static void UpdateMainWindowMenu()

-+		{

-+			GLib.Timeout.Add(0, () =>

-+			{

-+				mainWindow.UpdateMenu();

-+				return false;

-+			});

-+		}		

-+		

- 		public static void SetMainWindowVisible(bool visible)

- 		{

diff --git a/pcr/gnomeradio/PKGBUILD b/pcr/gnomeradio/PKGBUILD
deleted file mode 100644
index 1fa76de08..000000000
--- a/pcr/gnomeradio/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Maintainer: none
-# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): tritonas00 <tritonas00@gmail.com>
-# Contributor: Ivan Rojas <kirdux@gmail.com>
-
-# Because gnomeradio is written against ancient libraries, we must patch it to
-# compile and work on a modern system.  Let's just grab the patch series that
-# Debian uses.
-_debver=1.8-2 # which patches to grab from Debian
-_debrepo=http://ftp.debian.org/debian/pool/main
-_debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; }
-
-pkgname=gnomeradio
-pkgver=1.8
-pkgrel=6.1
-pkgdesc="An FM-radio tuner for the GNOME desktop"
-url="https://projects.gnome.org/gnomeradio/"
-license=('GPL')
-arch=('i686' 'x86_64')
-install=gnomeradio.install
-depends=(libgnome-media-profiles lirc-utils hicolor-icon-theme)
-makedepends=(gnome-doc-utils intltool gnome-vfs libgnomeui v4l-utils)
-source=(https://launchpad.net/$pkgname/stable/$pkgver/+download/$pkgname-$pkgver.tar.gz
-	$(_debfile "$pkgname" "$_debver").debian.tar.gz)
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  while read -r patchfile; do
-    patch -p1 -i "$srcdir/debian/patches/$patchfile"
-  done <"$srcdir/debian/patches/series"
-  autoconf
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  LIBS=-lm ./configure --prefix=/usr --sysconfdir=/etc --disable-scrollkeeper \
-    --disable-install-schemas
-  make
-}
-
-package () {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  mkdir "$pkgdir"/usr/share/pixmaps
-  install data/icons/scalable/gnomeradio.svg "$pkgdir"/usr/share/pixmaps/gnomeradio.svg
-}
-
-md5sums=('26f07c432dffeebec3cc904f99295427'
-         '019ce748f8463d3eaebbb3e88d18d3e0')
diff --git a/pcr/gnomeradio/gnomeradio.install b/pcr/gnomeradio/gnomeradio.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/pcr/gnomeradio/gnomeradio.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/pcr/gnucash-docs/PKGBUIDL b/pcr/gnucash-docs/PKGBUIDL
deleted file mode 100644
index 94c5d62d0..000000000
--- a/pcr/gnucash-docs/PKGBUIDL
+++ /dev/null
@@ -1 +0,0 @@
-md5sums=('38daeb3b15f296726ee8124122040f08')
diff --git a/pcr/gnucash-docs/PKGBUILD b/pcr/gnucash-docs/PKGBUILD
deleted file mode 100644
index 0895692f2..000000000
--- a/pcr/gnucash-docs/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Mark Schneider <queueRAM@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=gnucash-docs
-pkgver=2.4.1
-pkgrel=1
-pkgdesc="User documentation for gnucash"
-arch=('i686' 'x86_64')
-url="http://www.gnucash.org"
-license=('GPL')
-depends=('gnucash' 'docbook-xml' 'rarian' 'yelp')
-source=(http://downloads.sourceforge.net/gnucash/${pkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('38daeb3b15f296726ee8124122040f08')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-md5sums=('38daeb3b15f296726ee8124122040f08')
-md5sums=('38daeb3b15f296726ee8124122040f08')
diff --git a/pcr/gnucash-docs/gnucash-docs.install b/pcr/gnucash-docs/gnucash-docs.install
deleted file mode 100644
index e82d4b10b..000000000
--- a/pcr/gnucash-docs/gnucash-docs.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  echo "updating scrollkeeper catalogue ..."
-  scrollkeeper-update -q -p /var/lib/scrollkeeper
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  echo "updating scrollkeeper catalogue ..."
-  update-desktop-database -q
-  scrollkeeper-update -q -p /var/lib/scrollkeeper
-}
-
-post_remove() {
-  post_install $1
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/pcr/gnuhealth/PKGBUILD b/pcr/gnuhealth/PKGBUILD
deleted file mode 100644
index ba7639b90..000000000
--- a/pcr/gnuhealth/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-
-pkgname=gnuhealth
-pkgver=2.2.2
-pkgrel=1
-pkgdesc="A free Health and Hospital Information System"
-arch=any
-url=http://health.gnu.org/
-license=GPL3
-depends=(
-          postgresql
-          pygtk
-          python2-dateutil
-          python2-imaging
-          python2-ldap 
-          python2-pip
-          python2-psycopg2
-          python2-pytz
-          python2-pywebdav
-          python2-qrcode 
-          python2-vobject
-          "trytond>=3.0"
-          "trytond-account-invoice>=3.0"
-          "trytond-calendar>=3.0"
-          "trytond-country>=3.0"
-          "trytond-stock-lot>=3.0"
-)
-source=http://ftp.gnu.org/gnu/health/$pkgname-$pkgver.tar.gz
-sha512sums=45e6965b583c08c3a457dc733274253f5ff66fa5760509d42291271e4b6237f1b34829f0403235d8a457d1236c8ffec3f22b7495859cbe399abc8f3f71556c0e
-
-package() {
-  MODULES=(
-           health
-           health_calendar
-           health_genetics
-           health_gyneco
-           health_history
-           health_icd10
-           health_icd10pcs
-           health_icu
-           health_imaging
-           health_inpatient
-           health_inpatient_calendar
-           health_lab
-           health_lifestyle
-           health_mdg6
-           health_ntd
-           health_ntd_chagas
-           health_ntd_dengue
-           health_nursing
-           health_pediatrics
-           health_profile
-           health_qrcodes
-           health_reporting
-           health_services
-           health_socioeconomics
-           health_stock
-           health_surgery
-           health_who_essential_medicines
-  )
-
-  # build gnuhealth modules
-    for module in ${MODULES[@]}
-    do
-      cd $srcdir/$pkgname-$pkgver/$module
-      python2 setup.py install --root=$pkgdir
-    done
-
-  # put gnuhealth manual to man folder
-    cd "$srcdir/$pkgname-$pkgver"
-
-    install -Dm644 health/man/$pkgname.1 \
-      $pkgdir/usr/share/man/man1/$pkgname.1
-}
diff --git a/pcr/gnuit/PKGBUILD b/pcr/gnuit/PKGBUILD
deleted file mode 100644
index 6c1983e32..000000000
--- a/pcr/gnuit/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: James Reed <supplantr at archlinux dot info>
-# Contributor: Leslie P. Polzer <polzer at stardawn dot org>
-# Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.io>
-
-pkgname=gnuit
-pkgver=4.9.5
-pkgrel=1
-pkgdesc="A set of interactive text-mode tools."
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/gnuit/"
-license=('GPL3')
-depends=('bash')
-install=${pkgname}.install
-source=(http://ftp.gnu.org/gnu/gnuit/$pkgname-$pkgver.tar.gz)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-transition
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/gnun/PKGBUILD b/pcr/gnun/PKGBUILD
deleted file mode 100644
index 2f1cbf40f..000000000
--- a/pcr/gnun/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
-#
-
-pkgname=gnun
-pkgver=0.4
-pkgrel=2
-arch=('any')
-license=('GPL3')
-pkgdesc="Build system for gnu.org translations"
-url="http://www.gnu.org/software/gnun/"
-depends=('guile' 'po4a' 'libxml2')
-makedepends=('heirloom-mailx' 'cvs' 'svn')
-optdepends=('cvs: for CVS support'
-            'subversion: for Subversion support')
-source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('3baf8a16cc017e6335e65975c7223ac8'
-         '9bd1bada0b07154cf3e1c1cf937194e7')
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-
-    ./configure --prefix=/usr --libexecdir=/usr/lib
-
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-
-    make DESTDIR=${pkgdir} install install-info
-}
diff --git a/pcr/gnuplot-py/PKGBUILD b/pcr/gnuplot-py/PKGBUILD
deleted file mode 100644
index 315c7b695..000000000
--- a/pcr/gnuplot-py/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Contributor: Michael Krauss <hippodriver@gmx.net>
-# Contributor : Baptiste Jonglez <zerstorer at free dot fr>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=gnuplot-py
-pkgver=1.8
-pkgrel=3
-pkgdesc="Gnuplot.py is a Python package that interfaces to gnuplot."
-arch=('any')
-url="http://$pkgname.sourceforge.net/"
-license=('LGPL')
-depends=('python2-numpy' 'gnuplot')
-#options=(!emptydirs)
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('abd6f571e7aec68ae7db90a5217cd5b1')
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  python2 setup.py install --prefix=/usr --root=$pkgdir/ --optimize=1
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('abd6f571e7aec68ae7db90a5217cd5b1')
diff --git a/pcr/grail/PKGBUILD b/pcr/grail/PKGBUILD
deleted file mode 100644
index 2c8342477..000000000
--- a/pcr/grail/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Nicolas Quiénot <niQo @ aur>
-# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
-# Contributor: thn81 <root@scrat>
-
-pkgname=grail
-pkgver=3.1.0
-pkgrel=1
-pkgdesc="Gesture Recognition And Instantiation Library"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/grail"
-license=('GPL')
-depends=('frame>=2.5.0' 'libxi')
-makedepends=('inputproto')
-conflicts=('utouch-grail')
-replaces=('utouch-grail')
-options=('!libtool')
-source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Static library needed for tests
-  ./configure --prefix=/usr # --disable-static
-  MAKEFLAGS="-j1"
-  make ${MAKEFLAGS}
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}/" install
-}
-
-md5sums=('f0f8c56430ee3717778dec6452201c33')
diff --git a/pcr/grass/PKGBUILD b/pcr/grass/PKGBUILD
deleted file mode 100644
index aa32f8ca8..000000000
--- a/pcr/grass/PKGBUILD
+++ /dev/null
@@ -1,138 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: Emiliano Vavassori <syntaxerrormmm(at)gmail.com>
-
-pkgname=grass
-pkgver=6.4.2
-pkgrel=5
-pkgdesc='Geographic Information System (GIS) used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization.'
-arch=('i686' 'x86_64')
-url='http://grass.osgeo.org/'
-license=('GPL')
-depends=('cfitsio' 'fftw' 'gdal' 'glu' 'libjpeg' 'libpng' 'libtiff' 'libxmu' 'mesa' 'python2' 'postgresql' 'proj' 'tcl' 'tk' 'wxpython' 'xorg-server')
-makedepends=('freetype2')
-optdepends=('sqlite3: sqlite3 database interface'
-	    'mysql: mysql database interface'
-            'r: R language interface'
-            'blas: required for GMATH library'
-            'lapack: required for GMATH library'
-	    'cairo: cairo support'
-	    'ffmpeg: ffmpeg support'
-	    'lesstif: motif support')
-options=('!libtool' '!makeflags')
-install='grass.install'
-source=("http://grass.osgeo.org/grass64/source/${pkgname}-${pkgver}.tar.gz"
-        "grass.sh"
-        "grass.conf"
-	"grass-python2.patch"
-	"grass-tk86-fix.patch")
-md5sums=('d3398d6b1e3a2ef19cfb6e39a5ae9919'
-         '23da2e9399b3c5504851dec37821abe1'
-         '6103480c2a1adc19a50b9e925e5e6d4c'
-         '8717c73e7d262b1cff44d35ce80c50bb'
-         'b7cb69248a387f70dabd5ce20b8297dc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Replacing previous python2 fixes with a patch.
-  # Thanks to Gunther Schulz to have reported a possible bug in the patching.
-  patch -p1 -i "${srcdir}/grass-python2.patch"
-  
-  # Solves build issue reported here:
-  # http://trac.osgeo.org/grass/ticket/1843
-  patch -p1 -i "${srcdir}/grass-tk86-fix.patch"
-
-  # the following exports are probably not needed
-  export PYTHON=python2
-  export DOXNAME=python2
-  export GRASS_python=python2
-
-  # Enabling 64bit support - EGV
-  if [ "$CARCH" = "x86_64" ]; then
-	  ENABLE64BIT="--enable-64bit"
-  else
-	  ENABLE64BIT="--disable-64bit"
-  fi
-
-  # see ${srcdir}/grass-6.4.0/REQUIREMENTS.html for options
-  # GLw is hard disabled, since no package in Archlinux can provide it - EGV
-  ./configure ${ENABLE64BIT} \
-    --prefix=/opt \
-    --enable-64bit \
-    --enable-W11 \
-    --with-jpeg \
-    --with-tiff \
-    --with-png \
-    --with-tcltk \
-    --with-opengl \
-    --with-fftw \
-    --with-postgres \
-    --with-freetype \
-    --with-freetype-includes=/usr/include/freetype2 \
-    --without-glw \
-    --with-nls \
-    --with-gdal \
-    --with-geos \
-    --with-proj-includes=/usr/include \
-    --with-proj-libs=/usr/lib \
-    --with-proj-share=/usr/share/proj \
-    --with-python=/usr/bin/python2-config \
-    --with-wxwidgets=/usr/bin/wx-config
-
-    # sqlite3 support
-    # --with-sqlite \
-
-    # mysql support
-    # --with-mysql \
-    # --with-mysql-includes=/usr/include/mysql \
-
-    # blas support
-    # --with-blas \
-
-    # lapack support
-    # --with-lapack \
-
-  make
-
-  # some more potential problems nvm, works without, but save for future use if problems arrise
-  #cd ${pkgdir}/opt/grass-${pkgver}
-  #sed -i 's/PYTHON = python/PYTHON = python2/' include/Make/Python.make
-  #sed -i 's/GRASS_PYTHON=python/GRASS_PYTHON=python2/' etc/Init.sh
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make \
-    INST_DIR=${pkgdir}/opt/grass-${pkgver} \
-    BINDIR=${pkgdir}/usr/bin \
-    install
-
-  # fix $GISBASE path
-  sed -i "s|GISBASE=${pkgdir}/opt/grass-${pkgver}|GISBASE=/opt/grass-${pkgver}|g" \
-    ${pkgdir}/usr/bin/grass64
-
-  # install profile.d file
-  install -D ${srcdir}/grass.sh \
-    ${pkgdir}/etc/profile.d/grass.sh
-
-  # install some freedesktop.org compatibility
-  install -D -m644 gui/icons/grass.desktop \
-    ${pkgdir}/usr/share/applications/grass.desktop
-
-  sed -i -e 's/grass65/grass64/' -e 's_/usr/share/icons_/usr/share/pixmaps_' \
-    ${pkgdir}/usr/share/applications/grass.desktop
-
-  install -D -m644 gui/icons/grass-48x48.png \
-    ${pkgdir}/usr/share/pixmaps/grass-48x48.png
-
-  install -D -m644 ${srcdir}/grass.conf \
-    ${pkgdir}/etc/ld.so.conf.d/grass.conf
-
-  # install g.html2man which is needed for some extensions
-  # FS#25705 - [grass] g.html2man is not installed into package directory
-  # https://bugs.archlinux.org/task/25705
-  # most likely upstream problem which will be fixed in a version later than 6.4.1
-  cp -r ./tools/g.html2man ${pkgdir}/opt/${pkgname}-${pkgver}/tools
-}
diff --git a/pcr/grass/grass-python2.patch b/pcr/grass/grass-python2.patch
deleted file mode 100644
index ee35949b5..000000000
--- a/pcr/grass/grass-python2.patch
+++ /dev/null
@@ -1,327 +0,0 @@
-diff -ur grass-6.4.2/doc/python/example_ctypes.py grass-6.4.2-new/doc/python/example_ctypes.py
---- grass-6.4.2/doc/python/example_ctypes.py	2010-04-17 14:15:26.000000000 +0200
-+++ grass-6.4.2-new/doc/python/example_ctypes.py	2012-08-16 09:33:01.480497320 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import os, sys, subprocess
- from ctypes import *
- grass = CDLL("libgrass_gis.so")
-diff -ur grass-6.4.2/general/g.parser/test.py grass-6.4.2-new/general/g.parser/test.py
---- grass-6.4.2/general/g.parser/test.py	2009-07-23 23:08:41.000000000 +0200
-+++ grass-6.4.2-new/general/g.parser/test.py	2012-08-16 09:33:01.513831191 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- # g.parser demo script for python programing
- 
-diff -ur grass-6.4.2/gui/scripts/g.change.gui.py grass-6.4.2-new/gui/scripts/g.change.gui.py
---- grass-6.4.2/gui/scripts/g.change.gui.py	2009-05-30 07:36:32.000000000 +0200
-+++ grass-6.4.2-new/gui/scripts/g.change.gui.py	2012-08-16 09:33:04.353875090 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- ############################################################################
- #
-diff -ur grass-6.4.2/gui/scripts/g.extension.py grass-6.4.2-new/gui/scripts/g.extension.py
---- grass-6.4.2/gui/scripts/g.extension.py	2012-02-18 18:28:29.000000000 +0100
-+++ grass-6.4.2-new/gui/scripts/g.extension.py	2012-08-16 09:33:04.393875703 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- ############################################################################
- #
-diff -ur grass-6.4.2/gui/scripts/g.extension.rebuild.all.py grass-6.4.2-new/gui/scripts/g.extension.rebuild.all.py
---- grass-6.4.2/gui/scripts/g.extension.rebuild.all.py	2012-02-01 10:26:11.000000000 +0100
-+++ grass-6.4.2-new/gui/scripts/g.extension.rebuild.all.py	2012-08-16 09:33:04.320541242 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- ############################################################################
- #
-diff -ur grass-6.4.2/gui/scripts/v.type_wrapper.py grass-6.4.2-new/gui/scripts/v.type_wrapper.py
---- grass-6.4.2/gui/scripts/v.type_wrapper.py	2009-05-30 07:36:32.000000000 +0200
-+++ grass-6.4.2-new/gui/scripts/v.type_wrapper.py	2012-08-16 09:33:04.287207393 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- ############################################################################
- #
- # MODULE:       v.type_wrapper.py (v.type wrapper script)
-diff -ur grass-6.4.2/gui/wxpython/gui_modules/menuform.py grass-6.4.2-new/gui/wxpython/gui_modules/menuform.py
---- grass-6.4.2/gui/wxpython/gui_modules/menuform.py	2012-01-04 10:55:50.000000000 +0100
-+++ grass-6.4.2-new/gui/wxpython/gui_modules/menuform.py	2012-08-16 09:33:03.000520822 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- """
- @brief Construct simple wx.Python GUI from a GRASS command interface
- description.
-diff -ur grass-6.4.2/gui/wxpython/scripts/d.rast3d.py grass-6.4.2-new/gui/wxpython/scripts/d.rast3d.py
---- grass-6.4.2/gui/wxpython/scripts/d.rast3d.py	2010-10-17 19:15:32.000000000 +0200
-+++ grass-6.4.2-new/gui/wxpython/scripts/d.rast3d.py	2012-08-16 09:33:04.083870925 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- #
- ############################################################################
- #
-diff -ur grass-6.4.2/gui/wxpython/scripts/p.cmd.py grass-6.4.2-new/gui/wxpython/scripts/p.cmd.py
---- grass-6.4.2/gui/wxpython/scripts/p.cmd.py	2010-10-17 19:15:32.000000000 +0200
-+++ grass-6.4.2-new/gui/wxpython/scripts/p.cmd.py	2012-08-16 09:33:03.870534267 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- ############################################################################
- #
- # MODULE:       p.cmd
-diff -ur grass-6.4.2/gui/wxpython/scripts/p.db.py grass-6.4.2-new/gui/wxpython/scripts/p.db.py
---- grass-6.4.2/gui/wxpython/scripts/p.db.py	2010-10-17 19:15:32.000000000 +0200
-+++ grass-6.4.2-new/gui/wxpython/scripts/p.db.py	2012-08-16 09:33:04.047203667 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- ############################################################################
- #
- # MODULE:       p.db
-diff -ur grass-6.4.2/gui/wxpython/scripts/p.mon.py grass-6.4.2-new/gui/wxpython/scripts/p.mon.py
---- grass-6.4.2/gui/wxpython/scripts/p.mon.py	2010-10-17 19:15:32.000000000 +0200
-+++ grass-6.4.2-new/gui/wxpython/scripts/p.mon.py	2012-08-16 09:33:03.940535364 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- ############################################################################
- #
- # MODULE:       p.mon
-diff -ur grass-6.4.2/gui/wxpython/scripts/p.rast.py grass-6.4.2-new/gui/wxpython/scripts/p.rast.py
---- grass-6.4.2/gui/wxpython/scripts/p.rast.py	2010-10-17 19:15:32.000000000 +0200
-+++ grass-6.4.2-new/gui/wxpython/scripts/p.rast.py	2012-08-16 09:33:04.013869835 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- ############################################################################
- #
- # MODULE:       p.rast
-diff -ur grass-6.4.2/gui/wxpython/scripts/p.vect.py grass-6.4.2-new/gui/wxpython/scripts/p.vect.py
---- grass-6.4.2/gui/wxpython/scripts/p.vect.py	2010-10-17 19:15:32.000000000 +0200
-+++ grass-6.4.2-new/gui/wxpython/scripts/p.vect.py	2012-08-16 09:33:03.980535999 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- ############################################################################
- #
- # MODULE:       p.vect
-diff -ur grass-6.4.2/imagery/i.atcorr/create_iwave.py grass-6.4.2-new/imagery/i.atcorr/create_iwave.py
---- grass-6.4.2/imagery/i.atcorr/create_iwave.py	2010-12-22 12:09:24.000000000 +0100
-+++ grass-6.4.2-new/imagery/i.atcorr/create_iwave.py	2012-08-16 09:33:04.430542943 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- """
- Created on Sat Mar 27 11:35:32 2010
- 
-diff -ur grass-6.4.2/include/Make/Platform.make.in grass-6.4.2-new/include/Make/Platform.make.in
---- grass-6.4.2/include/Make/Platform.make.in	2010-11-08 08:23:48.000000000 +0100
-+++ grass-6.4.2-new/include/Make/Platform.make.in	2012-08-16 09:33:35.484354613 +0200
-@@ -217,7 +217,7 @@
- USE_CAIRO           = @USE_CAIRO@
- 
- #Python
--PYTHON              = python
-+PYTHON              = python2
- PYTHONINC           = @PYTHONINC@
- PYTHONCFLAGS        = @PYTHONCFLAGS@
- PYTHONLDFLAGS       = @PYTHONLDFLAGS@
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/ctypedescs.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/ctypedescs.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/ctypedescs.py	2011-04-13 14:57:46.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/ctypedescs.py	2012-08-16 09:33:04.987218247 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- '''
- ctypesgencore.ctypedescs contains classes to represent a C type. All of them
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/descriptions.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/descriptions.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/descriptions.py	2011-04-13 14:57:46.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/descriptions.py	2012-08-16 09:33:04.883883291 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- """
- ctypesgencore.descriptions contains classes to represent a description of a
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/expressions.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/expressions.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/expressions.py	2011-04-13 14:57:46.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/expressions.py	2012-08-16 09:33:05.023885450 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- '''
- The expressions module contains classes to represent an expression. The main
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/__init__.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/__init__.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/__init__.py	2011-04-13 14:57:46.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/__init__.py	2012-08-16 09:33:04.920550527 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- """
- Ctypesgencore is the module that contains the main body of ctypesgen - in fact,
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/messages.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/messages.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/messages.py	2011-04-13 14:57:46.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/messages.py	2012-08-16 09:33:04.503877428 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- """
- ctypesgencore.messages contains functions to display status, error, or warning
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/options.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/options.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/options.py	2011-04-13 14:57:46.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/options.py	2012-08-16 09:33:04.707213885 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- """
- All of the components of ctypegencore require an argument called "options".
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/cdeclarations.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/cdeclarations.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/cdeclarations.py	2011-04-13 14:57:46.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/cdeclarations.py	2012-08-16 09:33:05.393891162 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- '''
- This file contains classes that represent C declarations. cparser produces
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/cgrammar.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/cgrammar.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/cgrammar.py	2011-04-13 14:57:46.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/cgrammar.py	2012-08-16 09:33:05.433891816 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- '''This is a yacc grammar for C.
- 
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/cparser.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/cparser.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/cparser.py	2011-04-13 14:57:46.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/cparser.py	2012-08-16 09:33:05.213888390 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- '''
- Parse a C source file.
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/ctypesparser.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/ctypesparser.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/ctypesparser.py	2011-04-13 14:57:46.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/ctypesparser.py	2012-08-16 09:33:05.093886533 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- '''
- ctypesgencore.parser.ctypesparser contains a class, CtypesParser, which is a
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/datacollectingparser.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/datacollectingparser.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/datacollectingparser.py	2011-04-13 14:57:46.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/datacollectingparser.py	2012-08-16 09:33:05.473892425 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- """
- DataCollectingParser subclasses ctypesparser.CtypesParser and builds Description
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/__init__.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/__init__.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/__init__.py	2011-04-13 14:57:46.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/__init__.py	2012-08-16 09:33:05.283889499 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- """
- This package parses C header files and generates lists of functions, typedefs,
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/pplexer.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/pplexer.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/pplexer.py	2011-04-13 14:57:46.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/pplexer.py	2012-08-16 09:33:05.180554533 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- '''Preprocess a C source file using gcc and convert the result into
-    a token stream
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/preprocessor.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/preprocessor.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/parser/preprocessor.py	2011-04-13 14:57:46.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/parser/preprocessor.py	2012-08-16 09:33:05.250555640 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- '''Preprocess a C source file using gcc and convert the result into
-    a token stream
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/printer/__init__.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/printer/__init__.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/printer/__init__.py	2011-04-13 14:57:45.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/printer/__init__.py	2012-08-16 09:33:04.640546189 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- """
- This module is the backend to ctypesgen; it contains classes to
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/printer/printer.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/printer/printer.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/printer/printer.py	2011-04-13 14:57:45.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/printer/printer.py	2012-08-16 09:33:04.537211279 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import os, sys, time
- from ctypesgencore.descriptions import *
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/dependencies.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/dependencies.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/dependencies.py	2011-04-13 14:57:45.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/dependencies.py	2012-08-16 09:33:04.743881125 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- """
- The dependencies module determines which descriptions depend on which other
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/__init__.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/__init__.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/__init__.py	2011-04-13 14:57:45.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/__init__.py	2012-08-16 09:33:04.810548840 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- """
- This module contains functions to operate on the DeclarationCollection produced
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/operations.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/operations.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/operations.py	2011-04-13 14:57:45.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/operations.py	2012-08-16 09:33:04.847216053 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- """
- The operations module contains various functions to process the
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/pipeline.py grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/pipeline.py
---- grass-6.4.2/lib/python/ctypes/ctypesgencore/processor/pipeline.py	2011-04-13 14:57:45.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgencore/processor/pipeline.py	2012-08-16 09:33:04.777214964 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import ctypes, re, os
- from ctypesgencore.processor.operations import *
-diff -ur grass-6.4.2/lib/python/ctypes/ctypesgen.py grass-6.4.2-new/lib/python/ctypes/ctypesgen.py
---- grass-6.4.2/lib/python/ctypes/ctypesgen.py	2011-04-13 14:57:46.000000000 +0200
-+++ grass-6.4.2-new/lib/python/ctypes/ctypesgen.py	2012-08-16 09:33:05.573893972 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- def find_names_in_modules(modules):
-     names = set()
diff --git a/pcr/grass/grass-tk86-fix.patch b/pcr/grass/grass-tk86-fix.patch
deleted file mode 100644
index f0dbb7c2b..000000000
--- a/pcr/grass/grass-tk86-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- grass-6.4.2/visualization/nviz/src/draw.c	2008-12-19 21:29:59.000000000 +0100
-+++ grass-6.4.2/visualization/nviz/src/draw_new.c	2013-01-21 22:22:09.819456565 +0100
-@@ -32,7 +32,7 @@
- void CancelFunc_Hook(void)
- {
-     if (cancel_script != NULL) {
--	TkCopyAndGlobalEval(cancel_interp, cancel_script);
-+	Tcl_EvalEx(cancel_interp, cancel_script, -1, TCL_EVAL_GLOBAL);
-     }
- }
- 
diff --git a/pcr/grass/grass.conf b/pcr/grass/grass.conf
deleted file mode 100644
index bb4964d93..000000000
--- a/pcr/grass/grass.conf
+++ /dev/null
@@ -1 +0,0 @@
-/opt/grass/lib
diff --git a/pcr/grass/grass.install b/pcr/grass/grass.install
deleted file mode 100644
index 878ea0186..000000000
--- a/pcr/grass/grass.install
+++ /dev/null
@@ -1,26 +0,0 @@
-## arg 1:  the new package version
-post_install() {
-  pkgver=${1%-*}
-
-  # Create symlink for version workaround.
-  ln -sf /opt/grass-${pkgver} /opt/grass
-
-  echo 'Please relogin for required variables to be set from /etc/profile.d/grass.sh'
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  pkgver=${1%-*}
-
-  # Updating symlink for new version
-  ln -sf /opt/grass-${pkgver} /opt/grass
-}
-
-## arg 1: the old package version
-pre_remove() {
-  # Removing cruft symlink
-  rm -f /opt/grass
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/grass/grass.sh b/pcr/grass/grass.sh
deleted file mode 100644
index e36980c16..000000000
--- a/pcr/grass/grass.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export GISBASE=/opt/grass
-export PATH=$PATH:$GISBASE/bin:$GISBASE/scripts
-export MANPATH=$MANPATH:$GISBASE/man
-export GRASS_PYTHON=python2
diff --git a/pcr/gstreamer-hplugins/PKGBUILD b/pcr/gstreamer-hplugins/PKGBUILD
deleted file mode 100644
index c8ec92cd2..000000000
--- a/pcr/gstreamer-hplugins/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: SpepS <dreamspepser at yahoo dot it>
-
-pkgname=gstreamer-hplugins
-pkgver=0.1.2
-pkgrel=1
-pkgdesc="Gstreamer cairo image overlay plugin"
-arch=(i686 x86_64)
-url="http://landell.holoscopio.com/"
-license=('GPL3')
-depends=('cairo' 'gstreamer0.10-base-plugins')
-options=('!libtool')
-source=("$url$pkgname-$pkgver.tar.gz")
-md5sums=('3129cfe6d59ad7bcf20000d2965d8652')
-
-build() {
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/gtk-theme-numix/PKGBUILD b/pcr/gtk-theme-numix/PKGBUILD
deleted file mode 100644
index 4c4c10b20..000000000
--- a/pcr/gtk-theme-numix/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Mantainer: Diego
-# Contributor: Aleessio Sergi
-
-pkgname=gtk-theme-numix
-_theme=Numix
-pkgver=1.4
-pkgrel=1
-pkgdesc="A flat and light theme with a modern look"
-arch=('any')
-url="http://satya164.deviantart.com/art/Numix-GTK3-theme-360223962"
-license=('GPL3')
-depends=('gtk-engine-murrine')
-source=(https://github.com/shimmerproject/${_theme}/archive/v${pkgver}.tar.gz)
-md5sums=('323ce459ebf9ee30bf920d18fab3645a')
-
-package() {
-  install -d "$pkgdir/usr/share/themes/${_theme}"
-  cp -rv ${srcdir}/${_theme}-${pkgver}/* "$pkgdir/usr/share/themes/${_theme}/"
-}
-
-md5sums=('323ce459ebf9ee30bf920d18fab3645a')
diff --git a/pcr/gtkmm-utils/PKGBUILD b/pcr/gtkmm-utils/PKGBUILD
deleted file mode 100644
index e3fdfd4a0..000000000
--- a/pcr/gtkmm-utils/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: TDY <tdy@gmx.com>
-# Contributor: Michele Vascellari <michele.vascellari@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=gtkmm-utils
-pkgver=0.4.1
-pkgrel=2
-pkgdesc="High level utility functions/classes/widgets for gtkmm and glibmm"
-arch=('i686' 'x86_64')
-url="http://gtkmm-utils.googlecode.com/"
-license=('GPL')
-depends=('gtkmm')
-makedepends=('pkgconfig>=0.9.0')
-source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz
-        $pkgname-glib.diff)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/$pkgname-glib.diff"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/pcr/gtkmm-utils/gtkmm-utils-glib.diff b/pcr/gtkmm-utils/gtkmm-utils-glib.diff
deleted file mode 100644
index fbe21bb3f..000000000
--- a/pcr/gtkmm-utils/gtkmm-utils-glib.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur gtkmm-utils-0.4.1~/glibmm-utils/date.cc gtkmm-utils-0.4.1/glibmm-utils/date.cc
---- gtkmm-utils-0.4.1~/glibmm-utils/date.cc	2012-11-21 11:43:42.726346909 -0600
-+++ gtkmm-utils-0.4.1/glibmm-utils/date.cc	2012-11-21 11:44:27.172760954 -0600
-@@ -25,7 +25,7 @@
- 
- #include <sys/time.h>
- 
--#include <glib/gmessages.h>
-+#include <glib.h>
- 
- #include <glibmm/convert.h>
- #include <glibmm/date.h>
-diff -Naur gtkmm-utils-0.4.1~/glibmm-utils/ustring.cc gtkmm-utils-0.4.1/glibmm-utils/ustring.cc
---- gtkmm-utils-0.4.1~/glibmm-utils/ustring.cc	2012-11-21 11:43:42.726346909 -0600
-+++ gtkmm-utils-0.4.1/glibmm-utils/ustring.cc	2012-11-21 11:44:55.645930936 -0600
-@@ -20,8 +20,7 @@
-  */
- 
- #include <cstring> // for g++ 4.3
--#include <glib/gmem.h>
--#include <glib/gmessages.h>
-+#include <glib.h>
- #include "ustring.h"
- 
- namespace Glib {
diff --git a/pcr/gtkpacman/PKGBUILD b/pcr/gtkpacman/PKGBUILD
deleted file mode 100644
index 0e66e33e5..000000000
--- a/pcr/gtkpacman/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Tetsumaki <http://goo.gl/YMBdA>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: Stefano Esposito <ragnarok@email.it>
-# Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io>
-
-pkgname=gtkpacman
-pkgver=2.3.1
-pkgrel=4
-pkgdesc="GTK package manager for archlinux based on pacman"
-arch=('any')
-url="http://gtkpacman.berlios.de/"
-license=('GPL')
-depends=('pygtk' 'vte')
-source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha256sums=('0ee571a5b1efcf5d8594a6eb04456a598c6354301ee6300c6508999c1eb87b88')
-
-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}"
-}
diff --git a/pcr/h264enc/PKGBUILD b/pcr/h264enc/PKGBUILD
deleted file mode 100644
index 9f47c3640..000000000
--- a/pcr/h264enc/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: AlexanderR <rvacheva at nxt dot ru>
-# Contributor: Markus Heuser <markus.heuser@web.de>
-# Contributor: Stefan Clarke <fm0nk3y@yahoo.co.uk>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=h264enc
-pkgver=9.4.8
-pkgrel=1
-pkgdesc="Advanced shell script for encoding DVDs or video files to the H.264 format using the encoding utility MEncoder from MPlayer."
-arch=('any')
-url='http://h264enc.sourceforge.net/'
-license=('GPL')
-depends=('x264' 'lsdvd' 'lame' 'bc' 'mencoder')
-optdepends=('mkvtoolnix' 'gpac' 'ogmtools' 'mplayer' 'pv' 'neroaacenc' 'aacplusenc' 'tsmuxer' 'vorbis-tools' 'dcaenc')
-options=(!strip)
-install="${pkgname}.install"
-source=("http://sf.net/projects/h264enc/files/$pkgname/$pkgname-$pkgver.tar.gz")
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  sed -i -e "s|/usr/local|$pkgdir/usr|g" \
-        -e 's|usr/local/|usr/|g' \
-	-e 's|/man/man1|/share/man/man1|g' install
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./install
-  rm ${pkgdir}/usr/share/doc/h264enc/{uninstall,LICENSE}
-}
-
-sha1sums=('3d8b713c831a152994ce124a3fd4aebafcd4fd6d')
-sha1sums=('3d8b713c831a152994ce124a3fd4aebafcd4fd6d')
diff --git a/pcr/h264enc/h264enc.install b/pcr/h264enc/h264enc.install
deleted file mode 100644
index 3c17e8130..000000000
--- a/pcr/h264enc/h264enc.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
-  echo "Hint: run 'h264enc -r' after installation of optional packages."
-}
-
-post_upgrade() {
-  if [[ "$2" < "9.4.3" ]]; then
-  echo "~/.h264enc/config syntax changed since version 9.4.2. Update it by hands.";
-  fi
-}
diff --git a/pcr/hexter/PKGBUILD b/pcr/hexter/PKGBUILD
deleted file mode 100644
index e0ccbb848..000000000
--- a/pcr/hexter/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-# file 'hexter' taken from https://aur.archlinux.org/packages/hexter/
-pkgname=hexter
-pkgver=1.0.2
-pkgrel=1
-pkgdesc="A DSSI software synthesizer that models the sound generation of a Yamaha DX7"
-arch=('i686')
-url="http://dssi.sourceforge.net/hexter.html"
-license=('GPL')
-depends=('alsa-lib' 'liblo' 'gtk2' 'dssi')
-makedepends=('ladspa')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/project/dssi/hexter/${pkgver}/${pkgname}-${pkgver}.tar.gz hexter)
-md5sums=('a61765a649fcab05811c226fb5c9415b' 'ce72d4f996c17ffd72eb02af76c4dd9b')
-         
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install || return 1
-  install -D -m755 ${srcdir}/hexter ${pkgdir}/usr/bin/hexter
-}
diff --git a/pcr/hexter/hexter b/pcr/hexter/hexter
deleted file mode 100644
index 8338bfdc5..000000000
--- a/pcr/hexter/hexter
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export DSSI_PATH=/usr/lib/dssi
-exec jack-dssi-host hexter.so
diff --git a/pcr/hiawatha/PKGBUILD b/pcr/hiawatha/PKGBUILD
deleted file mode 100644
index 1ea4d6435..000000000
--- a/pcr/hiawatha/PKGBUILD
+++ /dev/null
@@ -1,117 +0,0 @@
-# Maintainer: Kurt Marasco <celilo _at_ lavabit _dot_ com>
-# Contributor: Pascal Ernster <aur at hardfalcon dot net>
-
-pkgname=hiawatha
-pkgver=9.2
-pkgrel=1
-pkgdesc="Secure and advanced webserver"
-url="https://www.hiawatha-webserver.org/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libxslt' 'polarssl')
-optdepends=('php-fpm: Provides modern PHP fast cgi support (Recommended) ')
-makedepends=('cmake')
-install=$pkgname.install
-backup=(
-        usr/lib/systemd/system/hiawatha.service
-        etc/hiawatha/hiawatha.conf
-        etc/hiawatha/hiawatha.conf.sample
-        etc/hiawatha/cgi-wrapper.conf
-        etc/hiawatha/mimetype.conf
-        srv/http/hiawatha/cdcatalog.xml
-        srv/http/hiawatha/cdcatalog.xslt
-)
-
-source=(
-        "http://hiawatha-webserver.org/files/${pkgname}-${pkgver}.tar.gz" 
-        'hiawatha.conf.sample'
-        'cdcatalog.xml'
-        'cdcatalog.xslt'
-        'hiawatha.service'
-        'hiawatha.install'
-)
-sha256sums=(
-        '5d9cdec51c618bb3efab747030e593d9bd49dfaf3236254c8e0cb60715716dbf'
-        '4671d2586cbe3cd6497b16ff422c6143cdab40641ef3c9c4988c478351a8f5e7'
-        '7757d6e5fe363b917a2823ba8b5194509ed6914e7c088d04ae72f9bd73efcb58'
-        'f28aa336da6f0fb124a1092039e695d233569cb32632223f786603ffb6ed5471'
-        'fb789b12bb6246237b15a9244f58317abdd53e5ca4eb55880e40a498b2237155'
-        '3b60a884102a6212a4963c041dd2a5a32fb18833f758e9be5d021bbc630ed627'
-)
-
-build() {
-        cd "$srcdir/${pkgname}-${pkgver}"
-        
-        cmake . -DCMAKE_INSTALL_PREFIX="/" \
-                -DCMAKE_INSTALL_BINDIR="/usr/bin" \
-                -DCMAKE_INSTALL_SBINDIR="/usr/bin" \
-                -DCMAKE_INSTALL_SYSCONFDIR="/etc/hiawatha" \
-                -DCMAKE_INSTALL_LIBDIR="/usr/lib" \
-                -DCMAKE_INSTALL_MANDIR="/usr/share/man" \
-                -DCONFIG_DIR="/etc/hiawatha" \
-                -DLOG_DIR="/var/log/hiawatha" \
-                -DPID_DIR="/run" \
-                -DENABLE_SSL=ON \
-                -DUSE_SYSTEM_POLARSSL=on \
-                -DWEBROOT_DIR="/srv/http" \
-        -DWORK_DIR="/var/lib/hiawatha"
-        make
-	
-	# The default capabilities are installed by this PKGBUILD
-	# The following build options are available to customize your installation:
-	# modify the above cmake command to customize
-	#option						description					required libraries when feature enabled
-	# cmake options
-	# -DENABLE_CACHE=ON|off		Enable internal cache support.
-	# -DENABLE_DEBUG=on|OFF		Enable debug information (for development only).
-	# -DENABLE_IPV6=ON|off		Enable IPv6 support.
-	# -DENABLE_MONITOR=on|OFF	Enable support for the Hiawatha Monitor.
-	# -DENABLE_RPROXY=ON|off	Enable reverse proxy support.
-	# -DENABLE_SSL=ON|off		Enable SSL (PolarSSL) support.
-	# -DENABLE_TOMAHAWK=on|OFF	Enable Tomahawk, Hiawatha command shell.
-	# -DENABLE_TOOLKIT=ON|off	Enable the URL Toolkit.
-	# -DENABLE_XSLT=ON|off		Enable XSLT support. libxml2, libxslt1
-        # -DUSE_SYSTEM_POLARSSL=on|OFF  Compile Hiawatha against the system's PolarSSL library (>=1.2.0).
-
-	# The following path settings are available for CMake.
-	# -DCMAKE_INSTALL_PREFIX=<path>		The prefix for all other CMAKE_INSTALL directories.	
-	# -DCMAKE_INSTALL_BINDIR=<path>		Location of the ssi-cgi binary.	
-	# -DCMAKE_INSTALL_SBINDIR=<path>		Location of the other Hiawatha binaries.
-	# -DCMAKE_INSTALL_SYSCONFDIR=<path>	The configuration files will be installed in /hiawatha.	
-	# -DCMAKE_INSTALL_LIBDIR=<path>		The PolarSSL shared library will be installed in /hiawatha.	
-	# -DCMAKE_INSTALL_MANDIR=<path>		Manual pages will be installed in /man1.	
-	# -DCONFIG_DIR=<path>					Location of the Hiawatha configuration files.	
-	# -DLOG_DIR=<path>					Log directory used in the default hiawatha.conf.	
-	# -DPID_DIR=<path>					Location of the Hiawatha and php-fcgi PID files.	
-	# -DWEBROOT_DIR=<path>				Webroot directory used in the default hiawatha.conf.	
-	# -DWORK_DIR=<path>					Path of directory where Hiawatha can write temporary files.
-}
-
-package() {
-        cd "$srcdir/$pkgname-$pkgver"	
-        make DESTDIR="$pkgdir/" install
-	
-        # Fix hiawatha.conf (formerly httpd.conf)
-        sed -e 's|#ServerId = www-data|ServerId = http|' \
-                -e 's|/var/www/|/srv/http/|g' \
-		-e 's|//|/|g' \
-                -e 's|#CGIextension = cgi|&\n#TriggerOnCGIstatus = yes|g' \
-                -e 's|ConnectTo = 127.0.0.1:2005|ConnectTo = 127.0.0.1:9000|g' \
-                -e 's|#	Extension = php|&\n#       SessionTimeout = 30|g' \
-                -e 's|#ErrorHandler = 404:/error.cgi|&\n#UseGZfile = yes|g' \
-                -i "$pkgdir/etc/hiawatha/hiawatha.conf"
-	
-        # Fix hiawatha logrotate file (/etc/logrotate.d/hiawatha)
-        sed -e 's|www-data|http|g' -i "$srcdir/$pkgname-$pkgver/logrotate.d/hiawatha"
-        mkdir "$pkgdir/etc/logrotate.d"
-        install -m644 "$srcdir/$pkgname-$pkgver/logrotate.d/hiawatha" "$pkgdir/etc/logrotate.d/hiawatha"
-	
-        # Add startup scripts
-        install -D -m755 "$srcdir/hiawatha.service" "$pkgdir/usr/lib/systemd/system/hiawatha.service"
-	
-        # Install sample configuration implementing a virtual server for phpmyadmin, php-fpm, and a default website on localhost
-        install -m644 "$srcdir/hiawatha.conf.sample" "$pkgdir/etc/hiawatha/"
-        # Install sample XSLT transformation on default website on localhost
-        install -m644 "$srcdir/cdcatalog.xml" "$pkgdir/srv/http"
-        install -m644 "$srcdir/cdcatalog.xslt" "$pkgdir/srv/http"
-}
diff --git a/pcr/hiawatha/cdcatalog.xml b/pcr/hiawatha/cdcatalog.xml
deleted file mode 100644
index efc35f9ff..000000000
--- a/pcr/hiawatha/cdcatalog.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>

-<!-- Edited with XML Spy v4.2 -->

-<catalog>

-	<cd>

-		<title>Empire Burlesque</title>

-		<artist>Bob Dylan</artist>

-		<country>USA</country>

-		<company>Columbia</company>

-		<price>10.90</price>

-		<year>1985</year>

-	</cd>

-	<cd>

-		<title>Hide your heart</title>

-		<artist>Bonnie Tyler</artist>

-		<country>UK</country>

-		<company>CBS Records</company>

-		<price>9.90</price>

-		<year>1988</year>

-	</cd>

-	<cd>

-		<title>Greatest Hits</title>

-		<artist>Dolly Parton</artist>

-		<country>USA</country>

-		<company>RCA</company>

-		<price>9.90</price>

-		<year>1982</year>

-	</cd>

-	<cd>

-		<title>Still got the blues</title>

-		<artist>Gary Moore</artist>

-		<country>UK</country>

-		<company>Virgin records</company>

-		<price>10.20</price>

-		<year>1990</year>

-	</cd>

-	<cd>

-		<title>Eros</title>

-		<artist>Eros Ramazzotti</artist>

-		<country>EU</country>

-		<company>BMG</company>

-		<price>9.90</price>

-		<year>1997</year>

-	</cd>

-	<cd>

-		<title>One night only</title>

-		<artist>Bee Gees</artist>

-		<country>UK</country>

-		<company>Polydor</company>

-		<price>10.90</price>

-		<year>1998</year>

-	</cd>

-	<cd>

-		<title>Sylvias Mother</title>

-		<artist>Dr.Hook</artist>

-		<country>UK</country>

-		<company>CBS</company>

-		<price>8.10</price>

-		<year>1973</year>

-	</cd>

-	<cd>

-		<title>Maggie May</title>

-		<artist>Rod Stewart</artist>

-		<country>UK</country>

-		<company>Pickwick</company>

-		<price>8.50</price>

-		<year>1990</year>

-	</cd>

-	<cd>

-		<title>Romanza</title>

-		<artist>Andrea Bocelli</artist>

-		<country>EU</country>

-		<company>Polydor</company>

-		<price>10.80</price>

-		<year>1996</year>

-	</cd>

-	<cd>

-		<title>When a man loves a woman</title>

-		<artist>Percy Sledge</artist>

-		<country>USA</country>

-		<company>Atlantic</company>

-		<price>8.70</price>

-		<year>1987</year>

-	</cd>

-	<cd>

-		<title>Black angel</title>

-		<artist>Savage Rose</artist>

-		<country>EU</country>

-		<company>Mega</company>

-		<price>10.90</price>

-		<year>1995</year>

-	</cd>

-	<cd>

-		<title>1999 Grammy Nominees</title>

-		<artist>Many</artist>

-		<country>USA</country>

-		<company>Grammy</company>

-		<price>10.20</price>

-		<year>1999</year>

-	</cd>

-	<cd>

-		<title>For the good times</title>

-		<artist>Kenny Rogers</artist>

-		<country>UK</country>

-		<company>Mucik Master</company>

-		<price>8.70</price>

-		<year>1995</year>

-	</cd>

-	<cd>

-		<title>Big Willie style</title>

-		<artist>Will Smith</artist>

-		<country>USA</country>

-		<company>Columbia</company>

-		<price>9.90</price>

-		<year>1997</year>

-	</cd>

-	<cd>

-		<title>Tupelo Honey</title>

-		<artist>Van Morrison</artist>

-		<country>UK</country>

-		<company>Polydor</company>

-		<price>8.20</price>

-		<year>1971</year>

-	</cd>

-	<cd>

-		<title>Soulsville</title>

-		<artist>Jorn Hoel</artist>

-		<country>Norway</country>

-		<company>WEA</company>

-		<price>7.90</price>

-		<year>1996</year>

-	</cd>

-	<cd>

-		<title>The very best of</title>

-		<artist>Cat Stevens</artist>

-		<country>UK</country>

-		<company>Island</company>

-		<price>8.90</price>

-		<year>1990</year>

-	</cd>

-	<cd>

-		<title>Stop</title>

-		<artist>Sam Brown</artist>

-		<country>UK</country>

-		<company>A and M</company>

-		<price>8.90</price>

-		<year>1988</year>

-	</cd>

-	<cd>

-		<title>Bridge of Spies</title>

-		<artist>T`Pau</artist>

-		<country>UK</country>

-		<company>Siren</company>

-		<price>7.90</price>

-		<year>1987</year>

-	</cd>

-	<cd>

-		<title>Private Dancer</title>

-		<artist>Tina Turner</artist>

-		<country>UK</country>

-		<company>Capitol</company>

-		<price>8.90</price>

-		<year>1983</year>

-	</cd>

-	<cd>

-		<title>Midt om natten</title>

-		<artist>Kim Larsen</artist>

-		<country>EU</country>

-		<company>Medley</company>

-		<price>7.80</price>

-		<year>1983</year>

-	</cd>

-	<cd>

-		<title>Pavarotti Gala Concert</title>

-		<artist>Luciano Pavarotti</artist>

-		<country>UK</country>

-		<company>DECCA</company>

-		<price>9.90</price>

-		<year>1991</year>

-	</cd>

-	<cd>

-		<title>The dock of the bay</title>

-		<artist>Otis Redding</artist>

-		<country>USA</country>

-		<company>Atlantic</company>

-		<price>7.90</price>

-		<year>1987</year>

-	</cd>

-	<cd>

-		<title>Picture book</title>

-		<artist>Simply Red</artist>

-		<country>EU</country>

-		<company>Elektra</company>

-		<price>7.20</price>

-		<year>1985</year>

-	</cd>

-	<cd>

-		<title>Red</title>

-		<artist>The Communards</artist>

-		<country>UK</country>

-		<company>London</company>

-		<price>7.80</price>

-		<year>1987</year>

-	</cd>

-	<cd>

-		<title>Unchain my heart</title>

-		<artist>Joe Cocker</artist>

-		<country>USA</country>

-		<company>EMI</company>

-		<price>8.20</price>

-		<year>1987</year>

-	</cd>

-</catalog>

diff --git a/pcr/hiawatha/cdcatalog.xslt b/pcr/hiawatha/cdcatalog.xslt
deleted file mode 100644
index db9cc35bc..000000000
--- a/pcr/hiawatha/cdcatalog.xslt
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>

-<!-- Edited with XML Spy v4.2 -->

-<xsl:stylesheet version="1.0"

-xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

-<xsl:template match="/">

-  <html>

-  <body>

-  <h2>My CD Collection</h2>

-    <table border="1">

-      <tr bgcolor="#9acd32">

-        <th align="left">Title</th>

-        <th align="left">Artist</th>

-      </tr>

-      <xsl:for-each select="catalog/cd">

-      <tr>

-        <td><xsl:value-of select="title"/></td>

-        <td><xsl:value-of select="artist"/></td>

-      </tr>

-      </xsl:for-each>

-    </table>

-  </body>

-  </html>

-</xsl:template>

-</xsl:stylesheet>
\ No newline at end of file
diff --git a/pcr/hiawatha/hiawatha.conf.sample b/pcr/hiawatha/hiawatha.conf.sample
deleted file mode 100644
index 1c1d62450..000000000
--- a/pcr/hiawatha/hiawatha.conf.sample
+++ /dev/null
@@ -1,114 +0,0 @@
-# Hiawatha main configuration file
-# This is a basic sample configuration file that sets up a:
-#   1) Default web site at /srv/http/hiawatha (Note: fast CGI is not active on default site)
-#   2) Virtual host for phpmyadmin at /srv/http/phpMyAdmin
-#      note: you must install phpmyadmin, mysql, php-mcrypt, and php-cgi separately. Be sure that extensions 
-#      mcrypt.so and mysql.so are enabled in your php.ini.
-#      Also add phpmyadmin to your hosts file  
-#   3) FastCGI server
-
-
-# GENERAL SETTINGS
-ServerId = http
-ConnectionsTotal = 150
-ConnectionsPerIP = 10
-SystemLogfile = /var/log/hiawatha/system.log
-GarbageLogfile = /var/log/hiawatha/garbage.log
-
-
-# BINDING SETTINGS
-# A binding is where a client can connect to.
-#
-Binding {
-	Port = 80
-}
-
-
-
-### The following fast CGI daemons require php-fpm using a UNIX socket and TCP port, respectively.
-# ACTIVATE a FastCGI server for php  (using UNIX socket)
-FastCGIserver {
-    FastCGIid = PHP5
-    ConnectTo = /run/php-fpm/php-fpm.sock
-    Extension = php
-    SessionTimeout = 30
-}  
-
-# ACTIVATE a FastCGI server for php (using IP-address and TCP port)
-#FastCGIserver {
-#    FastCGIid = PHP5
-#    ConnectTo = 127.0.0.1:9000
-#    Extension = php
-#    SessionTimeout = 30
-#}  
-
-
-# DEFAULT WEBSITE
-# It is wise to use your IP address as the hostname of the default website
-# and give it a blank webpage. By doing so, automated webscanners won't find
-# your possible vulnerable website.
-#
-Hostname = 127.0.0.1
-WebsiteRoot =  /srv/http/hiawatha
-StartFile = index.html
-AccessLogfile = /var/log/hiawatha/access.log
-ErrorLogfile = /var/log/hiawatha/error.log
-#ErrorHandler = 404:/error.cgi
-UseXSLT = yes
-
-
-# VIRTUAL HOSTS
-VirtualHost {
-    
-    # If you set WebsiteRoot to /usr/share/webapps/phpMyAdmin you don't need followsymlinks
-    # I symlinked the phpMyAdmin folder to '/srv/http/phpMyAdmin' so that I can easily remember where it's located but
-    # still set 'WebsiteRoot' to the real source directory. You could point WebsiteRoot to the
-    # symlinked directory, but you will have to set 'FollowSymlinks = yes' for that to function properly
-    
-    #FollowSymlinks = yes
-    #WebsiteRoot = /srv/http/phpMyAdmin
-    WebsiteRoot = /usr/share/webapps/phpMyAdmin
-    Hostname = phpmyadmin
-    AccessLogfile = /var/log/hiawatha/phpmyadmin/access.log
-    ErrorLogfile = /var/log/hiawatha/phpmyadmin/error.log
-    StartFile = index.php
-    UseFastCGI = PHP5
-    
-}
-
-# Add some more
-
-#VirtualHost {
-#	Hostname = www.my-domain.com
-#	WebsiteRoot = /svr/http/my-domain/public
-#	StartFile = index.php
-#	AccessLogfile = /svr/http/my-domain/log/access.log
-#	ErrorLogfile = /svr/http/my-domain/log/error.log
-#	TimeForCGI = 5
-#	UseFastCGI = PHP5
-#	UseToolkit = banshee
-#}
-
-
-#Additional settings for monitoring
-
-UrlToolkit {
-	ToolkitID = banshee
-	RequestURI isfile Return
-	Match ^/(css|files|images|js)/ Return
-	Match ^/(favicon.ico|robots.txt|sitemap.xml)$ Return
-	Match .*\?(.*) Rewrite /index.php?$1
-	Match .* Rewrite /index.php
-}
-
-VirtualHost {
-	Hostname = monitor.domain.com
-	WebsiteRoot = /svr/http/monitor/public
-	AccessLogfile = /svr/http/monitor/logfiles/access.log
-	ErrorLogfile = /svr/http/monitor/logfiles/error.log
-	StartFile = index.php
-#	ExecuteCGI = yes
-	UseFastCGI = PHP5 # Use if you use PHP as a FastCGI daemon
-	TimeForCGI = 15
-	UseToolkit = banshee
-}
diff --git a/pcr/hiawatha/hiawatha.install b/pcr/hiawatha/hiawatha.install
deleted file mode 100644
index 0ea96ec65..000000000
--- a/pcr/hiawatha/hiawatha.install
+++ /dev/null
@@ -1,37 +0,0 @@
-pre_install() {
-  /bin/cat <<THEENDPOSTINSTALL
-NOTE
-----
-If you are new to Hiawatha, please refer to http://www.hiawatha-webserver.org/howto
-
-!!!!! This PKGBUILD compiles against the system's PolarSSL library. You will need to install PolarSSL from the AUR.!!!!
-
-THEENDPOSTINSTALL
-}
-
-pre_upgrade() {
-  /bin/cat <<THEENDPOSTINSTALL
-NOTE
-----
-If you are new to Hiawatha, please refer to http://www.hiawatha-webserver.org/howto
-
-!!!!! This PKGBUILD compiles against the system's PolarSSL library. You will need to install PolarSSL from the AUR.!!!!
-
-THEENDPOSTINSTALL
-}
-
-post_install() {
-  /bin/cat <<THEENDPOSTINSTALL
-NOTE
-----
-If you are new to Hiawatha, please refer to http://www.hiawatha-webserver.org/howto 
-
-PHP-FPM is the prefered fastcgi server. To install.
-   pacman -Sy php-fpm
-   systemctl enable php-fpm
-
-The file hiawatha.conf.sample demonstrates syntax appropriate for use with the php-fpm fast cgi daemon.
-THEENDPOSTINSTALL
-}
-
-
diff --git a/pcr/hiawatha/hiawatha.service b/pcr/hiawatha/hiawatha.service
deleted file mode 100644
index f7daeb8c7..000000000
--- a/pcr/hiawatha/hiawatha.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Hiawatha Web Server
-After=network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=simple
-SyslogIdentifier=hiawatha
-ExecStartPre=/usr/bin/hiawatha -k ; /usr/bin/wigwam
-ExecStart= /usr/bin/hiawatha -d
-TimeoutSec=10
-#(doesn't like this setting. Can't find files) PrivateTmp=true
-LimitNOFILE=infinity
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER CAP_FSETID CAP_SETGID CAP_SETUID 
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/higan-gtk/PKGBUILD b/pcr/higan-gtk/PKGBUILD
deleted file mode 100755
index 17d7469a6..000000000
--- a/pcr/higan-gtk/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# Maintainer : Alucryd <alucryd at gmail dot com>
-
-pkgname=higan-gtk
-pkgver=092
-pkgrel=2
-pkgdesc="Nintendo multi-system emulator - GTK version"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/higan/"
-license=('GPL3')
-depends=('xdialog' 'libpulse' 'libao' 'libgl' 'libxv' 'openal' 'sdl')
-makedepends=('mesa')
-optdepends=('beat: Delta patcher')
-conflicts=('higan-qt')
-source=("http://higan.googlecode.com/files/higan_v${pkgver}-source.tar.xz" "http://higan.googlecode.com/files/purify_v03-source.tar.xz" 'higan' 'higan.desktop' 'purify.desktop')
-sha1sums=('a205005f118f6e138065af6e0d14ed990b8f1ce1'
-          '2aa16f492c879d2cc1d4ffa28f4729a5ed5bb1c3'
-          '931baedc3bbdd343d2decda72c13b7d0efdcba3c'
-          '55f4de0a65d6428840d013f9b003d88158c131c7'
-          '093643998a2fb676d795c316e35d49cf6293ce86')
-
-# Profiles (remove as needed)
-_profiles="accuracy balanced performance"
-
-build() {
-# Compile libananke
-  cd "${srcdir}"/purify_v03-source/ananke
-  make compiler=gcc platform=x phoenix=gtk
-
-# Compile purify
-  cd "${srcdir}"/purify_v03-source/purify
-  make compiler=gcc platform=x link='-s -lX11 -ldl -Wl,-export-dynamic' phoenix=gtk
-
-# Compile higan
-  cd "${srcdir}"/higan_v${pkgver}-source/higan
-  for _profile in ${_profiles} ; do
-    make compiler=gcc platform=x target=ethos phoenix=gtk profile=${_profile}
-    mv out/higan out/higan-${_profile}
-    make clean
-  done
-}
-
-package() {
-# Install common files
-  cd "${srcdir}"/higan_v${pkgver}-source
-  install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{applications,pixmaps,higan}}
-  install -m 755 "${srcdir}"/higan "${pkgdir}"/usr/bin/higan
-  install -m 644 "${srcdir}"/higan.desktop "${pkgdir}"/usr/share/applications/higan.desktop
-  install -m 644 higan/data/higan.png "${pkgdir}"/usr/share/pixmaps/higan.png
-  cp -dr --no-preserve=ownership higan/{profile/*,data/cheats.bml} "${pkgdir}"/usr/share/higan/
-  cp -dr --no-preserve=ownership shaders "${pkgdir}/usr/share/higan/Video Shaders"
-
-# Fix some permissions
-  find "${pkgdir}"/usr/share/higan/ -type d -exec chmod 755 {} +
-  find "${pkgdir}"/usr/share/higan/ -type f -exec chmod 644 {} +
-
-# Install libananke
-  cd "${srcdir}"/purify_v03-source/ananke
-  install -m 644 libananke.so "${pkgdir}"/usr/lib/libananke.so.1
-  ln -s /usr/lib/libananke.so.1 "${pkgdir}"/usr/lib/libananke.so
-
-# Install purify
-  cd "${srcdir}"/purify_v03-source/purify
-  install -m 755 purify "${pkgdir}"/usr/bin/purify
-  install -m 644 "${srcdir}"/purify.desktop "${pkgdir}"/usr/share/applications/purify.desktop
-
-# Install higan
-  cd "${srcdir}"/higan_v${pkgver}-source/higan
-  for _profile in ${_profiles} ; do
-    install -m 755 out/higan-${_profile} "${pkgdir}"/usr/bin/higan-${_profile}
-  done
-}
-
-# vim: ts=2 sw=2 et:
diff --git a/pcr/higan-gtk/higan b/pcr/higan-gtk/higan
deleted file mode 100755
index 29fc0b7bb..000000000
--- a/pcr/higan-gtk/higan
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# Shared folders workaround
-cp -ru /usr/share/higan ~/.config/
-
-# Check for profiles and prompt user with a GUI
-[ -e /usr/bin/higan-accuracy ] && tag1=accuracy
-[ -e /usr/bin/higan-balanced ] && tag2=balanced
-[ -e /usr/bin/higan-performance ] && tag3=performance
-profile="$(Xdialog --stdout --no-tags --title "higan" --radiolist "Choose a profile" 0 0 0 "$tag1" "Accuracy" off "$tag2" "Balanced" off "$tag3" "Performance" off)"
-
-# Launch selected profile
-exec higan-$profile "$@"
diff --git a/pcr/higan-gtk/higan.desktop b/pcr/higan-gtk/higan.desktop
deleted file mode 100755
index c9cd3c14b..000000000
--- a/pcr/higan-gtk/higan.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=higan
-Comment=Nintendo multi-system emulator
-Exec=higan %u
-Icon=higan
-Terminal=false
-Type=Application
-Categories=Game;Emulator;
diff --git a/pcr/higan-gtk/purify.desktop b/pcr/higan-gtk/purify.desktop
deleted file mode 100755
index 354dc2849..000000000
--- a/pcr/higan-gtk/purify.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=purify
-Comment=ROM purifier
-Exec=/usr/bin/purify
-Icon=higan
-Terminal=false
-Type=Application
-Categories=Game;Emulator;
diff --git a/pcr/higan-qt/PKGBUILD b/pcr/higan-qt/PKGBUILD
deleted file mode 100755
index 42f7dd813..000000000
--- a/pcr/higan-qt/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# Maintainer : Alucryd <alucryd at gmail dot com>
-
-pkgname=higan-qt
-pkgver=092
-pkgrel=2
-pkgdesc="Nintendo multi-system emulator - QT version"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/higan/"
-license=('GPL3')
-depends=('qt>=4.7.0' 'xdialog' 'libpulse' 'libao' 'libgl' 'libxv' 'openal' 'sdl')
-makedepends=('mesa')
-optdepends=('beat: Delta patcher')
-conflicts=('higan-gtk')
-source=("http://higan.googlecode.com/files/higan_v${pkgver}-source.tar.xz" "http://higan.googlecode.com/files/purify_v03-source.tar.xz" 'higan' 'higan.desktop' 'purify.desktop')
-sha1sums=('a205005f118f6e138065af6e0d14ed990b8f1ce1'
-          '2aa16f492c879d2cc1d4ffa28f4729a5ed5bb1c3'
-          '931baedc3bbdd343d2decda72c13b7d0efdcba3c'
-          '55f4de0a65d6428840d013f9b003d88158c131c7'
-          '093643998a2fb676d795c316e35d49cf6293ce86')
-
-# Profiles (remove as needed)
-_profiles="accuracy balanced performance"
-
-build() {
-# QT 4.8.0 fix
-  cd "${srcdir}"
-  moc -i -Ipurify_v03-source/ananke/phoenix/qt/ -o purify_v03-source/ananke/phoenix/qt/platform.moc purify_v03-source/ananke/phoenix/qt/platform.moc.hpp
-  moc -i -Ipurify_v03-source/purify/phoenix/qt/ -o purify_v03-source/purify/phoenix/qt/platform.moc purify_v03-source/purify/phoenix/qt/platform.moc.hpp
-  moc -i -Ihigan_v${pkgver}-source/higan/phoenix/qt/ -o higan_v${pkgver}-source/higan/phoenix/qt/platform.moc higan_v${pkgver}-source/higan/phoenix/qt/platform.moc.hpp
-
-# Compile libananke
-  cd "${srcdir}"/purify_v03-source/ananke
-  make compiler=gcc platform=x phoenix=qt
-
-# Compile purify
-  cd "${srcdir}"/purify_v03-source/purify
-  make compiler=gcc platform=x link='-s -lX11 -ldl -Wl,-export-dynamic' phoenix=qt
-
-# Compile higan
-  cd "${srcdir}"/higan_v${pkgver}-source/higan
-  for _profile in ${_profiles} ; do
-    make compiler=gcc platform=x target=ethos phoenix=qt profile=${_profile}
-    mv out/higan out/higan-${_profile}
-    make clean
-  done
-}
-
-package() {
-# Install common files
-  cd "${srcdir}"/higan_v${pkgver}-source
-  install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{applications,pixmaps,higan}}
-  install -m 755 "${srcdir}"/higan "${pkgdir}"/usr/bin/higan
-  install -m 644 "${srcdir}"/higan.desktop "${pkgdir}"/usr/share/applications/higan.desktop
-  install -m 644 higan/data/higan.png "${pkgdir}"/usr/share/pixmaps/higan.png
-  cp -dr --no-preserve=ownership higan/{profile/*,data/cheats.bml} "${pkgdir}"/usr/share/higan/
-  cp -dr --no-preserve=ownership shaders "${pkgdir}/usr/share/higan/Video Shader"s
-
-# Fix some permissions
-  find "${pkgdir}"/usr/share/higan -type d -exec chmod 755 {} +
-  find "${pkgdir}"/usr/share/higan -type f -exec chmod 644 {} +
-
-# Install libananke
-  cd "${srcdir}"/purify_v03-source/ananke
-  install -m 644 libananke.so "${pkgdir}"/usr/lib/libananke.so.1
-  ln -s /usr/lib/libananke.so.1 "${pkgdir}"/usr/lib/libananke.so
-
-# Install purify
-  cd "${srcdir}"/purify_v03-source/purify
-  install -m 755 purify "${pkgdir}"/usr/bin/purify
-  install -m 644 "${srcdir}"/purify.desktop "${pkgdir}"/usr/share/applications/purify.desktop
-
-# Install higan
-  cd "${srcdir}"/higan_v${pkgver}-source/higan
-  for _profile in ${_profiles} ; do
-    install -m 755 out/higan-${_profile} "${pkgdir}"/usr/bin/higan-${_profile}
-  done
-}
-
-# vim: ts=2 sw=2 et:
diff --git a/pcr/higan-qt/higan b/pcr/higan-qt/higan
deleted file mode 100755
index 29fc0b7bb..000000000
--- a/pcr/higan-qt/higan
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# Shared folders workaround
-cp -ru /usr/share/higan ~/.config/
-
-# Check for profiles and prompt user with a GUI
-[ -e /usr/bin/higan-accuracy ] && tag1=accuracy
-[ -e /usr/bin/higan-balanced ] && tag2=balanced
-[ -e /usr/bin/higan-performance ] && tag3=performance
-profile="$(Xdialog --stdout --no-tags --title "higan" --radiolist "Choose a profile" 0 0 0 "$tag1" "Accuracy" off "$tag2" "Balanced" off "$tag3" "Performance" off)"
-
-# Launch selected profile
-exec higan-$profile "$@"
diff --git a/pcr/higan-qt/higan.desktop b/pcr/higan-qt/higan.desktop
deleted file mode 100755
index c9cd3c14b..000000000
--- a/pcr/higan-qt/higan.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=higan
-Comment=Nintendo multi-system emulator
-Exec=higan %u
-Icon=higan
-Terminal=false
-Type=Application
-Categories=Game;Emulator;
diff --git a/pcr/higan-qt/purify.desktop b/pcr/higan-qt/purify.desktop
deleted file mode 100755
index 354dc2849..000000000
--- a/pcr/higan-qt/purify.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=purify
-Comment=ROM purifier
-Exec=/usr/bin/purify
-Icon=higan
-Terminal=false
-Type=Application
-Categories=Game;Emulator;
diff --git a/pcr/hiredis/ChangeLog b/pcr/hiredis/ChangeLog
deleted file mode 100644
index fbe55643a..000000000
--- a/pcr/hiredis/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2013-06-07 Vladimir Tsanev <tsachev@gamil.com>
-    
-    * 0.11.0-1 :
-    Initial PKGBUILD.
diff --git a/pcr/hiredis/PKGBUILD b/pcr/hiredis/PKGBUILD
deleted file mode 100644
index 29762e87e..000000000
--- a/pcr/hiredis/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Vladimir Tsanev <tsachev@gmail.com>
-
-pkgname=hiredis
-pkgver=0.11.0
-pkgrel=1
-pkgdesc='minimalistic C client library for Redis'
-arch=('x86_64' 'i686')
-url="https://github.com/redis/hiredis/"
-license=('BSD')
-depends=('glibc')
-changelog='ChangeLog'
-source=(https://codeload.github.com/redis/${pkgname}/tar.gz/v${pkgver})
-md5sums=('e2ac29509823ccc96990b6fe765b5d46')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make 
-}
-
-#
-#check() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-#  make test check c
-#}
-
-package() {
-  
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make PREFIX="$pkgdir/usr" clean dep install
-
-  install -Dm 644 COPYING "$pkgdir/usr/share/licenses/${pkgname}/COPYING"
-
-}
diff --git a/pcr/hunspell-pt-br/PKGBUILD b/pcr/hunspell-pt-br/PKGBUILD
index 0ae4e4e76..5c4ff0c3a 100644
--- a/pcr/hunspell-pt-br/PKGBUILD
+++ b/pcr/hunspell-pt-br/PKGBUILD
@@ -5,14 +5,14 @@
 
 pkgname=hunspell-pt-br
 pkgver=3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Portuguese (Brazil) dictionary"
 arch=(any)
 url="http://pt-br.libreoffice.org/projetos/projeto-vero-verificador-ortografico"
 license=('LGPLv3' 'MPL')
 optdepends=('hunspell:  the spell checking libraries and apps')
-source=(http://pt-br.libreoffice.org/assets/VeroptBRV320AOG.oxt)
-md5sums=('3b2f7291d486435cf6706b55e02da5b6')
+source=(http://pt-br.libreoffice.org/assets/VeroptBRV320AOC.oxt)
+md5sums=('9a9ac174c401406604bfcf101de2a7ba')
 
 package() {
   install -D -m644 ${srcdir}/pt_BR.dic ${pkgdir}/usr/share/hunspell/pt_BR.dic
diff --git a/pcr/ibus-bogo/PKGBUILD b/pcr/ibus-bogo/PKGBUILD
deleted file mode 100644
index 44652b204..000000000
--- a/pcr/ibus-bogo/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Contributor: Nguyen Ha Duong <cmpitg@gmail.com>
-# Contributor: Ngo Trung <ndtrung4419@gmail.com>
-# Contributor: Dam Tien Long <longdt90@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname="ibus-bogo"
-pkgver=0.1.0 
-pkgrel=1
-pkgdesc=" Bogo Engine for Ibus"
-
-arch=('i686' 'x86_64')
-url="https://github.com/BoGoEngine"
-license=('GPLv3')
-depends=('ibus' 'python2' 'glibmm' 'python2-gobject')
-makedepends=('git' 'cmake' 'gcc' 'python2')
-provides=('ibus-bogo')
-
-_gitpython="https://github.com/BoGoEngine/ibus-bogo-python.git"
-_gitpythonname="ibus-bogo-python"
-
-install=install
-
-build()  {
-	cd ${srcdir}
-	
-	if [ -d ${_gitpythonname} ] ; then
-		cd ${srcdir}/${_gitpythonname} && git pull 
-		msg "Local ${srcdir}/${_gitpythonname} updated" 
-		
-	else 
-		git clone ${_gitpython} ${_gitpythonname}
-		
-	fi
-	
-	
-	
-	msg "Starting make..."
-
-	mkdir ${pkgdir}/usr/
-	
-
-	# Building ibus-bogo-python
-	cd ${srcdir}/${_gitpythonname}
-	if [ -d build ]; then
-	cd build 
-        else 
-		mkdir build
-		cd build
-	fi
-	cmake -DCMAKE_INSTALL_PREFIX:PATH="${pkgdir}/usr" ..
-	make
-	make install
-	rm ${pkgdir}/usr/share/glib-2.0/schemas/gschemas.compiled
-	
-	}
diff --git a/pcr/ibus-bogo/install b/pcr/ibus-bogo/install
deleted file mode 100644
index 0ed8986d0..000000000
--- a/pcr/ibus-bogo/install
+++ /dev/null
@@ -1,40 +0,0 @@
-post_install () {
-
-	glib-compile-schemas /usr/share/glib-2.0/schemas
-	
-	}
-
-pre_upgrade () {
-	
-	cd /usr/share
-	if [ -d ibus-bogo ]; then
-		rm -rf ibus-bogo/*
-	fi
-	
-	cd /usr/share/ibus/component/
-	if [ -f bogo.xml ]; then
-		rm bogo.xml
-	fi
-	
-	cd /usr/lib/python2.7/site-packages/
-	if [ -d BoGo ]; then
-		rm -rf BoGo/*
-	fi
-	
-	for i in `ls /usr/lib | grep bogo`; do
-		rm -rf /usr/lib/$i
-	done
-	
-	}
-	
-post_upgrade () {
-
-	glib-compile-schemas /usr/share/glib-2.0/schemas
-	
-	}
-	
-post_remove () {
-
-	glib-compile-schemas /usr/share/glib-2.0/schemas
-	
-	}
diff --git a/pcr/idjc/PKGBUILD b/pcr/idjc/PKGBUILD
deleted file mode 100644
index 6834d64a6..000000000
--- a/pcr/idjc/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: M0Rf30
-# Contributor: Tobias Luther <tobias [at] tonstrom [dot] de>
-# Contributor: GraveDigger
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=idjc
-pkgver=0.8.9
-pkgrel=2
-pkgdesc='Powerful yet easy-to-use source-client for individuals interested in streaming live radio shows over the Internet'
-url='http://idjc.sourceforge.net/'
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('desktop-file-utils' 'python2' 'dbus-python' 'mutagen' 'jack' 'pygtk' 'vorbis-tools' 'libsndfile' 'libsamplerate' 'glib2' 'lame' 'libmad' 'ffmpeg-compat' 'flac' 'speex' 'libshout-idjc')
-optdepends=('patchage' 'qjackctl')
-makedepends=('pkgconfig')
-install=${pkgname}.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-
-    export PYTHON=/usr/bin/python2
-    PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig"
-    ./configure \
-        --prefix=/usr \
-        --libexecdir=/usr/lib \
-        --disable-static 
-#	--disable-libav
-  
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-
-    make DESTDIR="${pkgdir}" install
-
-    sed -i 's|#! /usr/bin/python22.7|#! /usr/bin/python2|' ${pkgdir}/usr/bin/idjc
-}
-
-md5sums=('99abfe98f13170ab6b1ed17a8f1632e1')
diff --git a/pcr/idjc/idjc.install b/pcr/idjc/idjc.install
deleted file mode 100644
index 9834cb7dd..000000000
--- a/pcr/idjc/idjc.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_upgrade() {
-	update-desktop-database -q
-}
-
-post_install() {
-	post_upgrade
-}
-
-post_remove() {
-	post_upgrade
-}
diff --git a/pcr/idjc/idjc_0.8.4_configure.patch b/pcr/idjc/idjc_0.8.4_configure.patch
deleted file mode 100644
index 9f1b3c5f0..000000000
--- a/pcr/idjc/idjc_0.8.4_configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur idjc-0.8.4/configure idjc-0.8.4.new/configure
---- idjc-0.8.4/configure	2010-10-07 15:00:07.000000000 +0200
-+++ idjc-0.8.4.new/configure	2010-10-20 19:30:48.000000000 +0200
-@@ -5349,7 +5349,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mutagen" >&5
- $as_echo_n "checking for mutagen... " >&6; }
--python -c "import mutagen" &>/dev/null
-+$PYTHON -c "import mutagen" &>/dev/null
- if test $? -ne 0 ; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
diff --git a/pcr/ii/PKGBUILD b/pcr/ii/PKGBUILD
deleted file mode 100644
index b17cc2d18..000000000
--- a/pcr/ii/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Evan Gates    <evan.gates@gmail.com>
-# Contributor: Dag  Odenhall <dag.odenhall@gmail.com>
-# Contributor: Chris Brannon <cmbrannon@cox.net>
-# Contributor: William Giokas <1007380@gmail.com>
-pkgname=ii
-pkgver=1.7
-pkgrel=2
-pkgdesc="A minimalist FIFO and filesystem-based IRC client"
-license=(MIT)
-arch=(i686 x86_64)
-url=http://tools.suckless.org/ii
-depends=(glibc)
-source=("http://dl.suckless.org/tools/${pkgname}-${pkgver}.tar.gz")
-
-md5sums=('6191008ca09770873d84f40270493d0e')
-
-prepare() {
-	cd "$srcdir/$pkgname-$pkgver"
-	sed -i "s/CFLAGS = /CFLAGS = ${CFLAGS} /" config.mk
-}
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make PREFIX=/usr MANDIR=/usr/share/man DESTDIR="$pkgdir" install
-}
diff --git a/pcr/imagemagick-srv/PKGBUILD b/pcr/imagemagick-srv/PKGBUILD
deleted file mode 100644
index 9dc9c4cb2..000000000
--- a/pcr/imagemagick-srv/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgbase=imagemagick
-pkgname=imagemagick-srv
-pkgver=6.8.6.8
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.imagemagick.org/"
-license=('custom')
-provides=("$pkgbase=$pkgver")
-conflicts=$pkgbase
-replaces=$pkgbase
-makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript-libre' \
-             'openexr-libre' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' \
-             'libwebp') # libcl opencl-headers
-#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
-source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
-        perlmagick.rpath.patch)
-sha1sums=('fe298492c6be08eb887d02b75efeb609fa6c4d61'
-          'e143cf9d530fabf3b58023899b5cc544ba93daec')
-
-prepare() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-  sed '/AC_PATH_XTRA/d' -i configure.ac
-  autoreconf --force --install
-  patch -p0 -i "${srcdir}/perlmagick.rpath.patch"
-}
-
-build() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-  ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
-    --disable-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 \
-    --disable-opencl --without-gvc --without-djvu --without-autotrace \
-    --without-jbig --without-fpx --without-dps --without-fftw 
-  make
-}
-
-check() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make check
-}
-
-package_imagemagick-srv() {
-  pkgdesc="An image viewing/manipulation program (for web servers)"
-  depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr') # 'libcl')
-  optdepends=('ghostscript-libre: for Ghostscript support' 
-              'openexr-libre: for OpenEXR support' 
-              'libwmf: for WMF support' 
-              'librsvg: for SVG support' 
-              'libxml2: for XML support' 
-              'jasper: for JPEG-2000 support' 
-              'libpng: for PNG support' 
-	      'libwebp: for WEBP support')
-  backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
-          "etc/ImageMagick-${pkgver%%.*}/colors.xml"
-          "etc/ImageMagick-${pkgver%%.*}/delegates.xml"
-          "etc/ImageMagick-${pkgver%%.*}/log.xml"
-          "etc/ImageMagick-${pkgver%%.*}/magic.xml"
-          "etc/ImageMagick-${pkgver%%.*}/mime.xml"
-          "etc/ImageMagick-${pkgver%%.*}/policy.xml"
-          "etc/ImageMagick-${pkgver%%.*}/quantization-table.xml"
-          "etc/ImageMagick-${pkgver%%.*}/thresholds.xml"
-          "etc/ImageMagick-${pkgver%%.*}/type.xml"
-          "etc/ImageMagick-${pkgver%%.*}/type-dejavu.xml"
-          "etc/ImageMagick-${pkgver%%.*}/type-ghostscript.xml"
-          "etc/ImageMagick-${pkgver%%.*}/type-windows.xml")
-  options=('!docs' 'libtool' '!emptydirs')
-
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make -j1 DESTDIR="${pkgdir}" install
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
-  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
-
-#Cleaning
-  rm -f "${pkgdir}"/usr/lib/*.la
-}
diff --git a/pcr/imagemagick-srv/perlmagick.rpath.patch b/pcr/imagemagick-srv/perlmagick.rpath.patch
deleted file mode 100644
index a5b1a82e2..000000000
--- a/pcr/imagemagick-srv/perlmagick.rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2013-02-21 03:26:56.785156600 -0500
-+++ Makefile.in	2013-02-21 03:39:03.102411457 -0500
-@@ -10469,6 +10469,8 @@
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' quantum/Makefile
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
diff --git a/pcr/inadyn-opendns/PKGBUILD b/pcr/inadyn-opendns/PKGBUILD
deleted file mode 100644
index 37c13d49a..000000000
--- a/pcr/inadyn-opendns/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Bug <Bug2000@gmail.com>
-# Maintainer: Bug <Bug2000@gmail.com>
-pkgname=inadyn-opendns
-pkgver=1.99
-pkgrel=4
-pkgdesc="Simple dynamic DNS client with SSL support"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.opendns.com/account/dynamic_dns/downloads"
-license=('GPL')
-makedepends=('unzip')
-depends=('curl')
-conflicts=('inadyn')
-provides=('inadyn')
-backup=('etc/inadyn.conf')
-install='inadyn-opendns.install'
-source=("http://www.opendns.com/support/ddns_files/inadyn.source.v$pkgver.zip"
-	'inadyn.rc-script')
-md5sums=('0f2cf9c3ea3482c03e1c42f8480f1c55'
-	 '73c61f9939546c28119242a1e12ffcff')
-
-build() {
-  cd "$srcdir/inadyn.source.v$pkgver"
-
-  make || return 1
-
-  install -Dm755 bin/linux/inadyn $pkgdir/usr/sbin/inadyn
-  install -Dm644 man/inadyn.8 $pkgdir/usr/share/man/man8/inadyn.8
-  install -Dm644 man/inadyn.conf.5 $pkgdir/usr/share/man/man5/inadyn.conf.5
-  install -Dm644 readme.html $pkgdir/usr/share/doc/inadyn/readme.html
-  install -Dm755 $srcdir/inadyn.rc-script $pkgdir/etc/rc.d/inadyn
-  install -Dm644 inadyn.conf $pkgdir/etc/inadyn.conf
-}
diff --git a/pcr/inadyn-opendns/inadyn-opendns.install b/pcr/inadyn-opendns/inadyn-opendns.install
deleted file mode 100644
index e1a842430..000000000
--- a/pcr/inadyn-opendns/inadyn-opendns.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-/bin/true
-echo Please remember to change the /etc/inadyn.conf file for your settings.
-}
-
-post_upgrade() {
-/bin/true
-}
-
-pre_remove() {
-/bin/true
-}
-
-op=$1
-shift
-
-$op "$@"
\ No newline at end of file
diff --git a/pcr/inadyn-opendns/inadyn.rc-script b/pcr/inadyn-opendns/inadyn.rc-script
deleted file mode 100644
index 2ee29d59e..000000000
--- a/pcr/inadyn-opendns/inadyn.rc-script
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/inadyn`
-case "$1" in
-  start)
-    stat_busy "Starting INADYN Daemon"
-    [ -z "$PID" ] && /usr/sbin/inadyn --background --input_file /etc/inadyn.conf >>/var/log/inadyn 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=`pidof -o %PPID /usr/sbin/inadyn`
-      echo $PID >/var/run/inadyn.pid
-      add_daemon inadyn
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping INADYN Daemon"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon inadyn
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
-
diff --git a/pcr/initng-git/PKGBUILD b/pcr/initng-git/PKGBUILD
deleted file mode 100644
index 38279ad89..000000000
--- a/pcr/initng-git/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): Jens Staal <staal1978@gmail.com>
-
-_pkgname=initng
-pkgname=initng-git
-pkgver=20120517.1043
-pkgdesc="A full replacement for the old System V Init system"
-url="http://initng.org/"
-license=('GPL3')
-
-pkgrel=1
-arch=('i686' 'x86_64')
-provides=('init')
-depends=('dbus')
-makedepends=('git' 'acr' 'ftjam' 'makepkg-git')
-optdepends=('ncurses')
-options=(!strip)
-source=('git://github.com/initng/initng.git' fixes.patch)
-backup=(etc/initng/killall5-ignore)
-
-pkgver() {
-  cd "$srcdir/$_pkgname"
-  date -u +%Y%m%d.%H%M -d "$(git log -n1 --date=iso --format=format:'%cd')"
-}
-
-build() {
-  cd "$srcdir/$_pkgname"
-  patch -Np1 -i "$srcdir/fixes.patch"
-  acr
-  ./configure --prefix="/usr" --sbindir=/sbin --sysconfdir=/etc
-  jam
-}
-
-package() {
-  cd "$srcdir/$_pkgname"
-
-  jam install DESTDIR="$pkgdir"
-  find "$pkgdir"/usr/lib -type f -name '*.so*' -exec chmod 755 {} +
-  find "$pkgdir"/sbin    -type f               -exec chmod 755 {} +
-  pushd "$pkgdir"/usr/lib
-  ln -s libngeclient.so.* libngeclient.so.0
-  ln -s libngcclient.so.* libngcclient.so.0
-  popd
-
-  install -d "$pkgdir"/usr/share/licenses/initng
-  install -m644 COPYING "$pkgdir"/usr/share/licenses/initng/
-  install -m644 AUTHORS "$pkgdir"/usr/share/licenses/initng/
-}
-
-md5sums=('SKIP'
-         'bf6d17e00c5f0d85d99b7184980528ad')
diff --git a/pcr/initng-git/fixes.patch b/pcr/initng-git/fixes.patch
deleted file mode 100644
index 397965e38..000000000
--- a/pcr/initng-git/fixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ru initng.orig/include/initng/io.h initng/include/initng/io.h
---- initng.orig/include/initng/io.h	2012-12-11 03:45:20.000000000 -0500
-+++ initng/include/initng/io.h	2012-12-11 03:44:30.000000000 -0500
-@@ -21,6 +21,7 @@
- #define INITNG_IO_H
- 
- #include <unistd.h>
-+#include <stdbool.h>
- #include <fcntl.h>
- 
- #include <initng/active_db.h>
-@@ -43,6 +44,6 @@
- 				  pipe_h * pipe);
- void initng_io_module_poll(int timeout);
- 
--int initng_io_set_cloexec(int fd);
-+/* int initng_io_set_cloexec(int fd); */
- 
- #endif /* !defined(INITNG_IO_H) */
-diff -ru initng.orig/src/main/io/open.c initng/src/main/io/open.c
---- initng.orig/src/main/io/open.c	2012-12-11 03:45:20.000000000 -0500
-+++ initng/src/main/io/open.c	2012-12-11 03:44:30.000000000 -0500
-@@ -26,8 +26,5 @@
- 	int fd;
- 
- 	fd = open(path, flags);
--	if (fd != -1) {
--		initng_io_fdtrack(fd);
--	}
- 	return fd;
- }
diff --git a/pcr/inspircd/PKGBUILD b/pcr/inspircd/PKGBUILD
deleted file mode 100644
index 3de3d5e57..000000000
--- a/pcr/inspircd/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-pkgname=inspircd
-pkgver=2.0.8
-pkgrel=2
-pkgdesc='A lightweight IRC daemon'
-arch=('x86_64' 'i686' 'mips64el')
-url='http://www.inspircd.org/'
-license=('GPL2')
-depends=('perl')
-makedepends=('pkg-config' 'libmysqlclient' 'postgresql' 'sqlite3' 'libldap' 'geoip'
-             'tre' 'gnutls' 'openssl' 'libgcrypt')
-optdepends=('gnutls: m_ssl_gnutls'
-            'libgcrypt: m_ssl_gnutls'
-            'openssl: m_ssl_openssl'
-            'libmysqlclient: m_mysql'
-            'pcre: m_regex_pcre'
-            'postgresql: m_pgsql'
-            'sqlite3: m_sqlite3'
-            'libldap: m_ldapoper and m_ldapauth'
-            'geoip: m_geoip'
-            'tre: m_regex_tre')
-install=inspircd.install
-
-source=(https://github.com/downloads/inspircd/inspircd/InspIRCd-$pkgver.tar.bz2
-        inspircd.rcd inspircd.service)
-sha1sums=('c8bcbc222df40bc8110cefdb4a1fee91ad7c73d1'
-          '59c4aa6929732fb076ca2be96a01385cae9e8484'
-          '667b28d0d086be6daad7a0c2f110c68e6526264e')
-
-build() {
-  cd "${srcdir}/inspircd"
-
-  ./configure \
-    --enable-extras=m_geoip.cpp \
-    --enable-extras=m_ldapauth.cpp \
-    --enable-extras=m_ldapoper.cpp \
-    --enable-extras=m_mysql.cpp \
-    --enable-extras=m_pgsql.cpp \
-    --enable-extras=m_regex_pcre.cpp \
-    --enable-extras=m_regex_posix.cpp \
-    --enable-extras=m_regex_tre.cpp \
-    --enable-extras=m_sqlite3.cpp
-
-  ./configure \
-    --prefix=/usr/lib/inspircd \
-    --binary-dir=/usr/sbin \
-    --module-dir=/usr/lib/inspircd/modules \
-    --config-dir=/etc/inspircd \
-    --enable-gnutls \
-    --enable-openssl \
-    --enable-epoll
-
-  make
-}
-
-package() {
-  install -Dm755 "${srcdir}"/inspircd.rcd "${pkgdir}"/etc/rc.d/inspircd
-  install -Dm644 "${srcdir}"/inspircd.service "${pkgdir}"/usr/lib/systemd/system/inspircd.service
-  install -o141 -g141 -dm750 "${pkgdir}/var/log/inspircd"
-
-  cd "${srcdir}/inspircd"
-  make DESTDIR="$pkgdir" INSTUID=141 install
-
-  mkdir -p "${pkgdir}"/usr/share/inspircd
-  mv "${pkgdir}"/etc/inspircd/examples "${pkgdir}"/usr/share/inspircd/examples
-
-  rm -rf "${pkgdir}"/usr/lib/inspircd/logs
-  rm -rf "${pkgdir}"/usr/lib/inspircd/data
-}
diff --git a/pcr/inspircd/inspircd.install b/pcr/inspircd/inspircd.install
deleted file mode 100644
index ec97113f5..000000000
--- a/pcr/inspircd/inspircd.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  getent group inspircd &>/dev/null || groupadd -r -g 141 inspircd >/dev/null
-  getent passwd inspircd &>/dev/null || useradd -r -u 141 -g inspircd -d /var/lib/inspircd -s /bin/false -c inspircd inspircd >/dev/null
-
-  echo '==> You will need to create a config file for inspircd'
-  echo '==>   cp /etc/inspircd/inspircd.conf.example /etc/inspircd/inspircd.conf'
-  echo '==> You will need to change the pidfile. To do this you can insert the following into your config.'
-  echo '==>   <pid file="/var/run/inspircd/inspircd.pid">'
-  echo '==> Remember to use absolute paths in your config directory and not relative paths like you would do with a user-based inspircd install.'
-}
-
-post_remove() {
-  getent passwd inspircd &>/dev/null && userdel inspircd >/dev/null
-  getent group inspircd &>/dev/null && groupdel inspircd >/dev/null
-}
diff --git a/pcr/inspircd/inspircd.rcd b/pcr/inspircd/inspircd.rcd
deleted file mode 100644
index 5dbd8198e..000000000
--- a/pcr/inspircd/inspircd.rcd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-  pidof /usr/sbin/inspircd
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting inspircd"
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      su -s /bin/sh -c '/usr/sbin/inspircd --logfile /var/log/inspircd/startup.log --config /etc/inspircd/inspircd.conf' 'inspircd' > /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        add_daemon inspircd
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping inspircd"
-    PID=$(get_pid)
-    [ ! -z "$PID" ] && kill $PID
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm_daemon inspircd
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-
-  rehash|reload)
-    kill -HUP $(get_pid)
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/pcr/inspircd/inspircd.service b/pcr/inspircd/inspircd.service
deleted file mode 100644
index 83230b65c..000000000
--- a/pcr/inspircd/inspircd.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=InspIRCd IRC daemon
-Requires=network.target
-After=network.target
- 
-[Service]
-Type=forking
-PIDFile=/var/lib/inspircd/inspircd.pid
-ExecStart=/usr/lib/inspircd/inspircd start
-ExecReload=/usr/lib/inspircd/inspircd rehash
-ExecStop=/usr/lib/inspircd/inspircd stop
-Restart=on-failure
-User=inspircd
-Group=inspircd
- 
-[Install]
-Alias=ircd.service
diff --git a/pcr/ipmitool/PKGBUILD b/pcr/ipmitool/PKGBUILD
deleted file mode 100644
index 38d4eb237..000000000
--- a/pcr/ipmitool/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@cwb.IO>
-
-pkgname=ipmitool
-pkgver=1.8.11
-pkgrel=1
-pkgdesc="Command-line interface to IPMI-enabled devices"
-arch=(i686 x86_64)
-url="http://ipmitool.sourceforge.net"
-depends=('glibc' 'bash' 'openssl')
-license=("BSD")
-source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --with-kerneldir
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
-} 
diff --git a/pcr/ipmiutil/PKGBUILD b/pcr/ipmiutil/PKGBUILD
deleted file mode 100644
index 132ea7c59..000000000
--- a/pcr/ipmiutil/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: goodmen <goodmenlinux@gmail.com>
-# Contributor: Gergely Imreh <imrehgATgmailDOTcom>
-# Contributors: champus, madeye, Ranguvar and ninja_pt
-# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@cwb.IO>
-
-pkgname=ipmiutil
-pkgver=2.7.5
-pkgrel=1
-pkgdesc="A simple program that lists results from the hardware detection library."
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/ipmiutil/"
-license=('BSD2.0')
-depends=('')
-makedepends=('openssl')
-options=('!emptydirs')
-source=("http://prdownloads.sourceforge.net/ipmiutil/ipmiutil-${pkgver}.tar.gz")
-
-build() {
-  cd ${srcdir}
-  tar -xf ${pkgname}-${pkgver}.tar.gz
-
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  ./configure  --enable-gpl
-  make -j1 || return 1
-  make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/pcr/ipycli-git/PKGBUILD b/pcr/ipycli-git/PKGBUILD
deleted file mode 100644
index 86f6289d1..000000000
--- a/pcr/ipycli-git/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Contributor: Francois Boulogne <fboulogne at april dot org>
-# Maintainer: Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.io>
-
-pkgname=ipycli-git
-pkgver=20121109
-pkgrel=2
-pkgdesc="IPython subapp that supports adding arbitrary notebooks from the command line"
-arch=('i686' 'x86_64')
-url="https://github.com/dalejung/ipycli/"
-license=('UNKNOWN')
-depends=('python2' 'ipython2')
-optdepends=()
-makedepends=('git' 'python2')
-install=
-provides=()
-conflicts=()
-source=()
-
-
-_gitroot="git://github.com/dalejung/ipycli.git"
-_gitname="ipycli"
-
-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 make..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd "$srcdir/$_gitname-build"
-
-  #lib
-  python2 setup.py install --root="${pkgdir}" 
-
-  #bin
-  mkdir "${pkgdir}/usr/bin"
-  cp "bin/nb" "${pkgdir}/usr/bin" 
-  sed -i -e "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" "${pkgdir}/usr/bin/nb" 
-  cp "bin/ipycli" "${pkgdir}/usr/bin" 
-  sed -i -e "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" "${pkgdir}/usr/bin/ipycli" 
-
-  #templates/statics
-  cp -r "ipycli/static" "${pkgdir}/usr/lib/python2.7/site-packages/ipycli/" 
-  cp -r "ipycli/templates" "${pkgdir}/usr/lib/python2.7/site-packages/ipycli/" 
-}
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/irssi-xmpp/PKGBUILD b/pcr/irssi-xmpp/PKGBUILD
deleted file mode 100644
index fa5d445c6..000000000
--- a/pcr/irssi-xmpp/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Yogesh Powar <yogesh.powar@gmail.com>
-pkgname=irssi-xmpp
-pkgver=0.52
-pkgrel=1
-pkgdesc="An irssi plugin to connect to the Jabber network."
-url="http://cybione.org/~irssi-xmpp"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('loudmouth>=1.4.0' 'irssi>=0.8.13')
-source=("http://cybione.org/~irssi-xmpp/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('f48d66ddf6a6d8e4d04bfc44b83dc3c7')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  export PREFIX=/usr/
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/jack-rack/PKGBUILD b/pcr/jack-rack/PKGBUILD
deleted file mode 100644
index 26330bb2b..000000000
--- a/pcr/jack-rack/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: DonVla <donvla@users.sourceforge.net>
-# Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net>
-# Contributor: Berkus <berkus@madfire.net>
-# Contributor: Daniele Paolella <danielepaolella@email.it>
-pkgname=jack-rack
-pkgver=1.4.7
-pkgrel=4
-pkgdesc="Effects rack for JACK"
-url="http://jack-rack.sourceforge.net"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('jack' 'gtk2' 'libxml2' 'ladspa')
-optdepends=('lash: LASH support'
-            'raptor1: LRDF support'
-            'liblrdf: LRDF support'
-            'python2: ecarack')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
- 
-md5sums=('a29ef4001ee2916a1b758952c936adca')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./autogen.sh
-  ./configure --prefix=/usr --enable-lash --disable-gnome
-  make LDFLAGS='-ldl -lm'
-}
- 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"  
-  make DESTDIR=${pkgdir} install
-  sed -i 's/#!\/usr\/bin\/python/#!\/usr\/bin\/python2/' "${pkgdir}/usr/bin/ecarack"
-}
- 
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/jdee/PKGBUILD b/pcr/jdee/PKGBUILD
deleted file mode 100644
index 41cddfb08..000000000
--- a/pcr/jdee/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# PKGBUILD for JDEE 2.4.0.1
-# Contributor: Brandon Ednes <brandon@as220.org>
-# $Id$
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=jdee
-_pkgname=jde
-pkgver=2.4.0.1
-pkgrel=1
-pkgdesc="The Java Development Environment for Emacs"
-arch=('i686' 'x86_64')
-url="http://jdee.sourceforge.net/"
-license="GPL"
-depends=('emacs' 'cedet' 'emacs-elib')
-makedepends=()
-conflicts=()
-replaces=()
-backup=()
-install="$pkgname.install"
-source=(http://downloads.sourceforge.net/project/jdee/jdee/2.4.0.1/jdee-bin-2.4.0.1.zip)
-md5sums=('8e1d3e764f01c6dc1e337f9c6882ec85')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  mkdir -p $startdir/pkg/usr/share/emacs/site-lisp/$_pkgname
-
-  # Fix up permissions for package files. This is nice but not required.
-  find . -type f | xargs chmod 644
-
-  # Because of the way JDEE builds, it assumes the jde directory has its
-  # dependencies in sibling directories. We set up some symlinks to fake
-  # this.
-  ln -sf /usr/share/emacs/site-lisp/elib ../elib
-  ln -sf /usr/share/emacs/site-lisp/cedet ../cedet
-  # Byte-compile everything.
-  emacs -q --no-site-file -batch -l $startdir/jdee-build.el -f jde-compile-jde
-
-  # There is no install per se, just copy everything into the pkg directory.
-  cp -R $startdir/src/$pkgname-$pkgver/* \
-        $startdir/pkg/usr/share/emacs/site-lisp/$_pkgname
-
-  # Clean up the symlinks.
-  rm ../elib
-  rm ../cedet
-}
-
-# Local Variables:
-# mode: shell-script
-# End:
diff --git a/pcr/jdee/jdee-build.el b/pcr/jdee/jdee-build.el
deleted file mode 100644
index a8ec13358..000000000
--- a/pcr/jdee/jdee-build.el
+++ /dev/null
@@ -1,8 +0,0 @@
-;;; jde-build.el
-;;; Set up the Emacs environment to byte-compile JDEE
-;;; $Id: jdee-build.el,v 99d30c485449 2008/06/23 05:38:36 jbromley $
-(add-to-list 'load-path "../elib")
-(add-to-list 'load-path "../cedet")
-(add-to-list 'load-path "./lisp")
-(load-file (expand-file-name "../cedet/common/cedet.el"))
-(require 'jde)
diff --git a/pcr/jdee/jdee.install b/pcr/jdee/jdee.install
deleted file mode 100644
index 08b6501a4..000000000
--- a/pcr/jdee/jdee.install
+++ /dev/null
@@ -1,54 +0,0 @@
-# jdee.install
-# Show Emacs configuration instructions.
-# $Id: jdee.install,v 99d30c485449 2008/06/23 05:38:36 jbromley $
-post_install () {
-echo ""
-echo "==> You may need to update your .emacs file. The following shows"
-echo "==> the minimal configuration needed. Note that it shows what is"
-echo "==> needed to configure JDEE's dependencies elib and cedet."
-echo ""
-echo "==> ;; This .emacs file illustrates the minimal setup"
-echo "==> ;; required to run the JDE."
-echo "==>"
-echo "==> ;; Update the Emacs load-path to include the path to"
-echo "==> ;; the JDE and its require packages. This code assumes"
-echo "==> ;; that you have installed the packages in the emacs/site"
-echo "==> ;; subdirectory of your home directory."
-echo "==> (add-to-list 'load-path (expand-file-name \"~/emacs/site/jde/lisp\"))"
-echo "==> (add-to-list 'load-path (expand-file-name \"~/emacs/site/cedet/common\"))"
-echo "==> (add-to-list 'load-path (expand-file-name \"~/emacs/site/elib\"))"
-echo "==>"
-echo "==> ;; Initialize CEDET."
-echo "==> (load-file (expand-file-name \"~/emacs/site/cedet/common/cedet.el\"))"
-echo "==>"
-echo "==>"
-echo "==> ;; If you want Emacs to defer loading the JDE until you open a"
-echo "==> ;; Java file, edit the following line"
-echo "==> (setq defer-loading-jde nil)"
-echo "==> ;; to read:"
-echo "==> ;;"
-echo "==> ;;  (setq defer-loading-jde t)"
-echo "==> ;;"
-echo "==>"
-echo "==> (if defer-loading-jde"
-echo "==>     (progn"
-echo "==>       (autoload 'jde-mode \"jde\" \"JDE mode.\" t)"
-echo "==>       (setq auto-mode-alist"
-echo "==>           (append"
-echo "==>            '((\"\\\\.java\\\\'\" . jde-mode))"
-echo "==>            auto-mode-alist)))"
-echo "==>   (require 'jde))"
-echo ""
-}
-
-post_upgrade () {
-        post_install $1
-}
-
-op=$1
-shift
-$op $*
-
-# Local Variables:
-# mode: shell-script
-# End:
diff --git a/pcr/jitsi/PKGBUILD b/pcr/jitsi/PKGBUILD
index e0fe27d2e..2ff97dc46 100644
--- a/pcr/jitsi/PKGBUILD
+++ b/pcr/jitsi/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=jitsi
-pkgver=2.2.4603.9615
-pkgrel=2
+pkgver=2.4.4997
+pkgrel=1
 pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://jitsi.org"
@@ -17,13 +17,13 @@ source=("http://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip"
 		jitsi.desktop
 		jitsi.sh
 		drop-open-term-on-index-jn-html.patch)
-sha256sums=('6ec46cc8f2306f5542c65fc637f70a7fe348b309ecc70a2483e05a745487ad41'
+sha256sums=('f1c2688d7d6bf1916fed3b8b105a785662980c5b297dcab3c9e7d272647ef825'
             '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d'
             '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5'
             'a862465431e9d272e00bb9aafe56edec0d5c4f3718062add53972685adb90631')
 
 prepare() {
-  cd $srcdir/$pkgname-src-$pkgver
+  cd $srcdir/$pkgname
 
   # append the build revision to the jitsi version
   sed -i "s|0.build.by.SVN|build.$pkgver|" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
@@ -66,22 +66,18 @@ prepare() {
 }
 
 build() {
-  cd $srcdir/$pkgname-src-$pkgver
+  cd $srcdir/$pkgname
   . /etc/profile.d/apache-ant.sh
   ant rebuild
 }
 
 package() {
-  cd $srcdir/$pkgname-src-$pkgver
-  find lib/ lib/bundle/ -maxdepth 1 -type f \
-    -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \;
-  find lib/os-specific/linux/ -maxdepth 1 -type f \
-    -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/"{} \;
+  cd $srcdir/$pkgname
+  find lib/ lib/bundle/ -maxdepth 1 -type f -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \;
+#  find lib/os-specific/linux/ -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/"{} \;
   shopt -sq extglob
-  find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f \
-    -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/native/"{} \;
-  find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f \
-    -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/sc-bundles/"{} \;
+  find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/native/"{} \;
+  find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/sc-bundles/"{} \;
   install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
   install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 
diff --git a/pcr/jitsi/drop-open-term-on-index-jn-html.patch b/pcr/jitsi/drop-open-term-on-index-jn-html.patch
deleted file mode 100644
index 8d4012a05..000000000
--- a/pcr/jitsi/drop-open-term-on-index-jn-html.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- www/index-jn.html	2011-01-29 08:36:48.000000000 -0200
-+++ www/index-jn.html-new	2013-05-29 01:05:48.942716248 -0300
-@@ -1,2 +1,2 @@
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
--<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />                                <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />  <table width="100%" cellpadding="0" bordercolor="#111111" border="0" style="border-collapse: collapse" id="AutoNumber2">   <tbody><tr>     <td valign="middle" style="width: 20%">     <p align="center"> 	<a href="http://sip-communicator.org"><img border="0" alt="sip-communicator.org" src="images/sip-communicator.logo.png" /></a><br />             SIP Communicator <br />Open Source  VoIP &amp; IM     </p> <br />     </td>     <td style="width: 90%">          <p align="justify">     SIP Communicator is an audio/video Internet phone and instant messenger that     support some of the most popular instant messaging and telephony protocols     such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC.     </p>     <p align="justify">     SIP Communicator is completely <a href="http://www.opensource.org/">Open Source</a> /     <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>, and is     freely available under the terms of the     <a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>.     </p>      <table width="100%" cellspacing="2" cellpadding="2" border="0" style="background-color: white">     <tbody><tr><td style="background-color: lightgray">       <p>         RESOURCES: The SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Documentation/FAQ">FAQ</a>           can usually answer most questions. You can also ask on the           <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists#users">users</a>             mailing list, or at the <a class="urllink" rel="nofollow" href="http://www.sip-communicator.org/irc/irc.cgi">irc channel</a>               #sip-communicator at irc.freenode.net.       </p>       </td></tr>     </tbody></table>     <p><em>         <strong>Note:</strong> Right now SIP Communicator is still a work in         progress and as such is still unstable. If you would like to help or         follow project progress check the <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/Roadmap">Project Roadmap</a>           or join our <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists">Mailing Lists</a>.           You can also have a look at the SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Main/Screenshots">screenshots</a> </em>      </p>      <p> <strong> Thanks for your patience and continuing support! <br /> <a href="https://sip-communicator.org/wiki/index.php/Development/TeamAndContributors"> The SIP Communicator team</a></strong></p>       </td>   </tr> </tbody></table>                                                                     
-+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />                                <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />  <table width="100%" cellpadding="0" bordercolor="#111111" border="0" style="border-collapse: collapse" id="AutoNumber2">   <tbody><tr>     <td valign="middle" style="width: 20%">     <p align="center"> 	<a href="http://sip-communicator.org"><img border="0" alt="sip-communicator.org" src="images/sip-communicator.logo.png" /></a><br />             SIP Communicator <br />Free Software  VoIP &amp; IM     </p> <br />     </td>     <td style="width: 90%">          <p align="justify">     SIP Communicator is an audio/video Internet phone and instant messenger that     support some of the most popular instant messaging and telephony protocols     such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC.     </p>     <p align="justify">     SIP Communicator is completely <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>, and is     freely available under the terms of the     <a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>.     </p>      <table width="100%" cellspacing="2" cellpadding="2" border="0" style="background-color: white">     <tbody><tr><td style="background-color: lightgray">       <p>         RESOURCES: The SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Documentation/FAQ">FAQ</a>           can usually answer most questions. You can also ask on the           <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists#users">users</a>             mailing list, or at the <a class="urllink" rel="nofollow" href="http://www.sip-communicator.org/irc/irc.cgi">irc channel</a>               #sip-communicator at irc.freenode.net.       </p>       </td></tr>     </tbody></table>     <p><em>         <strong>Note:</strong> Right now SIP Communicator is still a work in         progress and as such is still unstable. If you would like to help or         follow project progress check the <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/Roadmap">Project Roadmap</a>           or join our <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists">Mailing Lists</a>.           You can also have a look at the SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Main/Screenshots">screenshots</a> </em>      </p>      <p> <strong> Thanks for your patience and continuing support! <br /> <a href="https://sip-communicator.org/wiki/index.php/Development/TeamAndContributors"> The SIP Communicator team</a></strong></p>       </td>   </tr> </tbody></table>                                                                     
diff --git a/pcr/jitsi/jitsi.desktop b/pcr/jitsi/jitsi.desktop
deleted file mode 100644
index dd4de82a6..000000000
--- a/pcr/jitsi/jitsi.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Jitsi
-GenericName=jitsi
-Comment=VoIP and Instant Messaging client
-Icon=/usr/share/pixmaps/jitsi.svg
-Type=Application
-Categories=Network
-Exec=/usr/bin/jitsi
-Terminal=false
diff --git a/pcr/jitsi/jitsi.sh b/pcr/jitsi/jitsi.sh
deleted file mode 100644
index 6e53cdbf5..000000000
--- a/pcr/jitsi/jitsi.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-CLIENTARGS=""
-uname -m | grep i686 && CLIENTARGS="-client -Xmx256m"
-
-SCDIR=/usr/lib/jitsi
-LIBPATH="$SCDIR/lib"
-CLASSPATH="$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar"
-FELIX_CONFIG="$LIBPATH/felix.client.run.properties"
-LOG_CONFIG="$LIBPATH/logging.properties"
-COMMAND=("$JAVA_HOME/bin/java" $CLIENTARGS -classpath "$CLASSPATH" -Djna.library.path="$LIBPATH/native" -Dfelix.config.properties="file:$FELIX_CONFIG" -Djava.util.logging.config.file="$LOG_CONFIG" net.java.sip.communicator.launcher.SIPCommunicator)
-
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBPATH/native"
-
-cd "$SCDIR"
-
-exec "${COMMAND[@]}" "$@"
diff --git a/pcr/kamailio/PKGBUILD b/pcr/kamailio/PKGBUILD
deleted file mode 100644
index 3e040a495..000000000
--- a/pcr/kamailio/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be>
-
-pkgname=kamailio
-pkgver=4.0.1
-pkgrel=1
-pkgdesc="Rock solid SIP server"
-url="http://www.kamailio.org/"
-license=('GPL2')
-arch=('i686' 'x86_64')
-makedepends=('flex' 'bison' 'docbook2x' 'mariadb' 'postgresql' 'libxml2'
-             'radiusclient-ng' 'lua51' 'mono' 'hiredis' 'libpurple' 'net-snmp'
-             'libunistring' 'python2')
-optdepends=('mariadb: mysql support'
-            'expat: xmpp/jabber support'
-            'libxml2: cpl and presence modules support'
-            'radiusclient-ng: radius support'
-            'postgresql: postgresql backend')
-source=(http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz)
-sha256sums=('dd8652f47a572c0b0e1e45bdd0f6f838a14e50f2dbbeed77726ec0c7076e1769')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make cfg prefix=/usr cfg_prefix=/ bin_dir=/usr/bin
-  make PYTHON="python2" all
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make prefix=${pkgdir}/usr \
-       PYTHON="python2" \
-       cfg_prefix=${pkgdir} \
-       bind_dir=${pkgdir}/usr/bin \
-       bingroup_include="standard standard-dep stable experimental" \
-       skip_modules="iptrtpproxy osp dbtext oracle" \
-       install
-}
diff --git a/pcr/knot/PKGBUILD b/pcr/knot/PKGBUILD
deleted file mode 100644
index 4f785493a..000000000
--- a/pcr/knot/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: Otto Sabart <seberm[at]gmail[dot]com>
-# Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.io>
-
-pkgname=knot
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="high-performance authoritative-only DNS server"
-url="http://www.knot-dns.cz/setlang/?language=en"
-arch=('i686' 'x86_64')
-license=('GPLv3')
-depends=('liburcu>=0.5.4' 'flex>=2.5.3' 'libtool' 'bison>=2.3')
-optdepends=('libcap')
-makedepends=('autoconf>=2.65')
-conflicts=()
-replaces=()
-backup=()
-#install='foo.install'
-source=("http://public.nic.cz/files/knot-dns/${pkgname}-${pkgver}.tar.gz")
-
-md5sums=('b2d4a53d8e98565ebb389531c2b66690')
-
-build() {
-	
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-    #autoreconf -if
-    ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/knot
-
-	make && make install DESTDIR="${pkgdir}" || return 1
-    #ldconfig
-}
diff --git a/pcr/kompozer/NS_IMETHOD_i686.patch b/pcr/kompozer/NS_IMETHOD_i686.patch
deleted file mode 100644
index 79abc50de..000000000
--- a/pcr/kompozer/NS_IMETHOD_i686.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpcom/base/nscore.h	2009-05-02 17:43:48.000000000 +0100
-+++ xpcom/base/nscore.h	2012-08-10 23:08:07.168628118 +0100
-@@ -182,7 +182,7 @@
- #define NS_IMPORT_(type) NS_EXTERNAL_VIS_(type)
- #define NS_EXPORT NS_EXTERNAL_VIS
- #define NS_EXPORT_(type) NS_EXTERNAL_VIS_(type)
--#define NS_IMETHOD_(type) virtual IMETHOD_VISIBILITY type NS_DEFCALL
-+#define NS_IMETHOD_(type) virtual type
- #define NS_IMETHODIMP_(type) type
- #define NS_METHOD_(type) type
- #define NS_CALLBACK_(_type, _name) _type (* _name)
diff --git a/pcr/kompozer/PKGBUILD b/pcr/kompozer/PKGBUILD
deleted file mode 100644
index a65fb3e3b..000000000
--- a/pcr/kompozer/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# Maintainer: Muflone <webreg@vbsimple.net>
-# Contributor: ingamedeo <ingamedeo at gmail dot com>
-# Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io>
-
-# thanks to tadzio, and techlive for the investigation
-# work and fix included as the NS_IMETHOD_i686.patch
-
-# Sorry for not honouring makepkg.conf (!buildflags)
-# but the source doesn't compile with makepkg's default C/CXXFLAGS
-
-pkgname=kompozer
-pkgver=0.8b3
-pkgrel=12
-pkgdesc="A Dreamweaver style WYSIWYG web editor; Nvu unofficial bug-fix release"
-arch=('x86_64' 'i686')
-license=('GPL')
-url="http://www.kompozer.net"
-depends=('gtk2' 'glib2' 'pango' 'pangox-compat' 'nss' 'libxt' 'libidl2' 'gnome-vfs')
-makedepends=('zip' 'pkgconfig')
-options=('!buildflags')
-source=("http://downloads.sourceforge.net/kompozer/${pkgname}-${pkgver}-src.tar.bz2" 
-        'kompozer.desktop' 
-        'mozconfig.patch' 
-        'kompozer-libpng15.patch' 
-        'kompozer-libpng14.patch' 
-        'gcc46_default_ctors.patch' 
-        'kompozer_gcc_4.7.patch' 
-        'any_kernel_26_plus.patch'
-        'NS_IMETHOD_i686.patch')
-md5sums=('cd4664ecda908666b19ef0607010c627'
-         'ed8edf6817892a38b8b181fc9b2caaea'
-         '4778f967307cf569089daca843de1df9'
-         '4852034f99e7943071946e7eedc6c2f5'
-         'd5ba90f7fbaed76f77a6d9717e86f3a5'
-         'ad3ec5cbc6677dd712b140148398f58f'
-         '75b0e1cad65dbeb8feedac5d4f52be32'
-         '58a294356b3e17ad070e4c93180bf0ad'
-	 '186c47586bebf83b9b76d339e3a38c95')
-
-build() {
-  cd "${srcdir}/mozilla"
-  patch -Np0 -i "${srcdir}/mozconfig.patch"
-  patch -Np0 -i "${srcdir}/kompozer-libpng14.patch"
-  patch -Np0 -i "${srcdir}/kompozer-libpng15.patch"
-  patch -Np0 -i "${srcdir}/gcc46_default_ctors.patch"
-  patch -Np0 -i "${srcdir}/kompozer_gcc_4.7.patch"
-  patch -Np0 -i "${srcdir}/any_kernel_26_plus.patch"
-  patch -Np0 -i "${srcdir}/NS_IMETHOD_i686.patch"
-
-  #make -f client.mk build #If is causing a lot of problem...try to build the package as normally
-  ./configure
-  make
-}
-
-package() {
-  cd "${srcdir}/mozilla"
-
-  make DESTDIR=${pkgdir} install
-  # Remove nspr.m4 because it's now provided by nspr package
-  rm "${pkgdir}/usr/share/aclocal/nspr.m4"
-  rmdir "${pkgdir}/usr/share/aclocal"
-
-  install -m755 -dD "${pkgdir}/usr/share/applications/"
-  install -m644  "${srcdir}/kompozer.desktop" "${pkgdir}/usr/share/applications/"
-
-  install -d -m755 "${pkgdir}/usr/share/pixmaps/"
-  ln -s "/usr/lib/kompozer/icons/mozicon256.png" "${pkgdir}/usr/share/pixmaps/kompozer.png"
-  ln -s "/usr/lib/kompozer/icons/mozicon50.xpm" "${pkgdir}/usr/share/pixmaps/kompozer.xpm"
-}
diff --git a/pcr/kompozer/any_kernel_26_plus.patch b/pcr/kompozer/any_kernel_26_plus.patch
deleted file mode 100644
index 69610ef3f..000000000
--- a/pcr/kompozer/any_kernel_26_plus.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- security/coreconf/config.mk	2009-05-02 17:42:18.000000000 +0100
-+++ security/coreconf/config.mk	2012-05-22 00:08:39.000000000 +0100
-@@ -63,7 +63,7 @@
- #######################################################################
- 
- TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
--              OpenVMS AIX
-+              OpenVMS AIX Linux
- 
- ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
- include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
---- security/coreconf/Linux.mk	2009-05-02 17:42:18.000000000 +0100
-+++ security/coreconf/Linux.mk	2012-05-22 00:36:03.533374797 +0100
-@@ -176,3 +176,17 @@
- # Always set CPU_TAG on Linux, OpenVMS, WINCE.
- #
- CPU_TAG = _$(CPU_ARCH)
-+
-+#
-+#Try to compile with any kernel version 2.6 and above.
-+#
-+DSO_LDOPTS      += -Wl,-z,defs
-+
-+OS_REL_CFLAGS   += -DLINUX2_1
-+MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-+
-+ifdef MAPFILE
-+	MKSHLIB += -Wl,--version-script,$(MAPFILE)
-+endif
-+PROCESS_MAP_FILE = grep -v ';-' $< | \
-+        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
diff --git a/pcr/kompozer/gcc46_default_ctors.patch b/pcr/kompozer/gcc46_default_ctors.patch
deleted file mode 100644
index 7f3fa7810..000000000
--- a/pcr/kompozer/gcc46_default_ctors.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- intl/unicharutil/util/nsUnicharUtils.h	2011-05-10 17:02:12.472642196 +0200
-+++ intl/unicharutil/util/nsUnicharUtils.h	2011-05-10 17:02:50.656034735 +0200
-@@ -64,6 +64,9 @@
-     : public nsStringComparator
-   {
-     public:
-+      nsCaseInsensitiveStringComparator()
-+      {
-+      }
-       virtual int operator()( const PRUnichar*, const PRUnichar*, PRUint32 aLength ) const;
-       virtual int operator()( PRUnichar, PRUnichar ) const;
-   };
---- toolkit/xre/nsAppRunner.cpp	                2011-05-10 17:26:05.853608464 +0200
-+++ toolkit/xre/nsAppRunner.cpp	                2011-05-10 17:26:15.079221177 +0200
-@@ -491,6 +491,7 @@
-                      
- {
- public:
-+  nsXULAppInfo() {}
-   NS_DECL_ISUPPORTS_INHERITED
-   NS_DECL_NSIXULAPPINFO
-   NS_DECL_NSIXULRUNTIME
diff --git a/pcr/kompozer/kompozer-libpng14.patch b/pcr/kompozer/kompozer-libpng14.patch
deleted file mode 100644
index 224bc7f61..000000000
--- a/pcr/kompozer/kompozer-libpng14.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp{-,}
---- mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp-	2010-06-10 19:34:09.000000000 -0700
-+++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp	2010-06-10 19:35:13.000000000 -0700
-@@ -111,9 +111,9 @@
- 
-   // initialize
-   png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
--                                                png_voidp_NULL,
--                                                png_error_ptr_NULL,
--                                                png_error_ptr_NULL);
-+                                                NULL,
-+                                                NULL,
-+                                                NULL);
-   if (! png_ptr)
-     return NS_ERROR_OUT_OF_MEMORY;
-   png_info* info_ptr = png_create_info_struct(png_ptr);
-
diff --git a/pcr/kompozer/kompozer-libpng15.patch b/pcr/kompozer/kompozer-libpng15.patch
deleted file mode 100644
index f236e402a..000000000
--- a/pcr/kompozer/kompozer-libpng15.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -urp mozilla.orig/modules/libpr0n/decoders/png/nsPNGDecoder.cpp mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp
---- mozilla.orig/modules/libpr0n/decoders/png/nsPNGDecoder.cpp	2011-11-14 21:55:42.513856274 +0000
-+++ modules/libpr0n/decoders/png/nsPNGDecoder.cpp	2011-11-14 22:15:35.899962674 +0000
-@@ -171,7 +171,7 @@ static NS_METHOD ReadDataOut(nsIInputStr
-   }
- 
-   // we need to do the setjmp here otherwise bad things will happen
--  if (setjmp(decoder->mPNG->jmpbuf)) {
-+  if (setjmp (png_jmpbuf(decoder->mPNG))) {
-     png_destroy_read_struct(&decoder->mPNG, &decoder->mInfo, NULL);
- 
-     decoder->mError = PR_TRUE;
-@@ -227,7 +227,7 @@ info_callback(png_structp png_ptr, png_i
-   if (width > MOZ_PNG_MAX_DIMENSION || height > MOZ_PNG_MAX_DIMENSION) {
-     nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*,
-                                            png_get_progressive_ptr(png_ptr));
--    longjmp(decoder->mPNG->jmpbuf, 1);
-+    longjmp(png_jmpbuf(decoder->mPNG), 1);
-   }
- #undef MOZ_PNG_MAX_DIMENSION
- 
-@@ -307,7 +307,7 @@ info_callback(png_structp png_ptr, png_i
- 
-   decoder->mImage = do_CreateInstance("@mozilla.org/image/container;1");
-   if (!decoder->mImage)
--    longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
-+    longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
- 
-   decoder->mImageLoad->SetImage(decoder->mImage);
- 
-@@ -319,7 +319,7 @@ info_callback(png_structp png_ptr, png_i
- 
-   decoder->mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
-   if (!decoder->mFrame)
--    longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
-+    longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
- 
-   gfx_format format;
- 
-@@ -341,7 +341,7 @@ info_callback(png_structp png_ptr, png_i
-   // then initalize the frame and append it to the container
-   nsresult rv = decoder->mFrame->Init(0, 0, width, height, format, 24);
-   if (NS_FAILED(rv))
--    longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
-+    longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
- 
-   decoder->mImage->AppendFrame(decoder->mFrame);
- 
-@@ -362,7 +362,7 @@ info_callback(png_structp png_ptr, png_i
-       decoder->ibpr = bpr;
-     decoder->interlacebuf = (PRUint8 *)nsMemory::Alloc(decoder->ibpr*height);
-     if (!decoder->interlacebuf) {
--      longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
-+      longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
-     }            
-   }
- 
-@@ -555,7 +555,7 @@ void
- error_callback(png_structp png_ptr, png_const_charp error_msg)
- {
-   PR_LOG(gPNGLog, PR_LOG_ERROR, ("libpng error: %s\n", error_msg));
--  longjmp(png_ptr->jmpbuf, 1);
-+  longjmp(png_jmpbuf(png_ptr), 1);
- }
diff --git a/pcr/kompozer/kompozer.desktop b/pcr/kompozer/kompozer.desktop
deleted file mode 100644
index c395f9af7..000000000
--- a/pcr/kompozer/kompozer.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Exec=kompozer
-Icon=kompozer
-Type=Application
-Terminal=false
-Name=KompoZer
-GenericName=Web Authoring System
-Comment=WYSIWYG Web Editor
-MimeType=text/html;text/xml;text/css;text/x-javascript;text/javascript;application/xhtml+xml;
-Categories=Development;WebDevelopment;Network;
-
diff --git a/pcr/kompozer/kompozer_gcc_4.7.patch b/pcr/kompozer/kompozer_gcc_4.7.patch
deleted file mode 100644
index 196609fce..000000000
--- a/pcr/kompozer/kompozer_gcc_4.7.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- xpcom/glue/nsBaseHashtable.h	2009-05-02 17:43:39.000000000 +0100
-+++ xpcom/glue/nsBaseHashtable.h	2012-07-27 13:43:55.000000000 +0100
-@@ -123,7 +123,7 @@
-    */
-   PRBool Get(KeyType aKey, UserDataType* pData) const
-   {
--    EntryType* ent = GetEntry(aKey);
-+    EntryType* ent = this->GetEntry(aKey);
- 
-     if (!ent)
-       return PR_FALSE;
-@@ -142,7 +142,7 @@
-    */
-   PRBool Put(KeyType aKey, UserDataType aData)
-   {
--    EntryType* ent = PutEntry(aKey);
-+    EntryType* ent = this->PutEntry(aKey);
- 
-     if (!ent)
-       return PR_FALSE;
-@@ -156,7 +156,7 @@
-    * remove the data for the associated key
-    * @param aKey the key to remove from the hashtable
-    */
--  void Remove(KeyType aKey) { RemoveEntry(aKey); }
-+  void Remove(KeyType aKey) { this->RemoveEntry(aKey); }
- 
-   /**
-    * function type provided by the application for enumeration.
---- xpcom/glue/nsClassHashtable.h	2009-05-02 17:43:39.000000000 +0100
-+++ xpcom/glue/nsClassHashtable.h	2012-07-27 13:15:10.000000000 +0100
-@@ -98,7 +98,7 @@
- nsClassHashtable<KeyClass,T>::Get(KeyType aKey, T** retVal) const
- {
-   typename nsBaseHashtable<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
-@@ -126,7 +126,7 @@
-   PR_Lock(this->mLock);
- 
-   typename nsBaseHashtableMT<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
---- xpcom/glue/nsInterfaceHashtable.h	2009-05-02 17:43:39.000000000 +0100
-+++ xpcom/glue/nsInterfaceHashtable.h	2012-07-27 13:30:08.000000000 +0100
-@@ -111,7 +111,7 @@
-   (KeyType aKey, UserDataType* pInterface) const
- {
-   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
-@@ -139,7 +139,7 @@
-   (KeyType aKey, PRBool* aFound) const
- {
-   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
-@@ -167,7 +167,7 @@
-   PR_Lock(this->mLock);
- 
-   typename nsBaseHashtableMT<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
---- xpcom/glue/nsRefPtrHashtable.h	2009-05-02 17:43:39.000000000 +0100
-+++ xpcom/glue/nsRefPtrHashtable.h	2012-07-27 13:52:48.000000000 +0100
-@@ -112,7 +112,7 @@
-   (KeyType aKey, UserDataType* pRefPtr) const
- {
-   typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
-@@ -140,7 +140,7 @@
-   (KeyType aKey, PRBool* aFound) const
- {
-   typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
-@@ -168,7 +168,7 @@
-   PR_Lock(this->mLock);
- 
-   typename nsBaseHashtableMT<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
diff --git a/pcr/kompozer/mozconfig.patch b/pcr/kompozer/mozconfig.patch
deleted file mode 100644
index bebad1d20..000000000
--- a/pcr/kompozer/mozconfig.patch
+++ /dev/null
@@ -1,142 +0,0 @@
---- .mozconfig	2009-04-26 16:19:33.000000000 +0100
-+++ .mozconfig	1970-01-01 10:14:21.000000000 +0100
-@@ -1,85 +1,80 @@
--# Pulling Composer from the 1.8 Mozilla branch (cvs)
--#$ cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot co -r MOZILLA_1_8_BRANCH mozilla/client.mk
--#$ cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot co -r FIREFOX_2_0_0_20_RELEASE mozilla/client.mk
--#$ cd mozilla
--#$ make -f client.mk checkout MOZ_CO_PROJECT=composer
--#$ find . -name CVS -prune -exec rm -rf {} \;
--#$ find . -name .cvsignore -prune -exec rm -rf {} \;
--
--# Building Composer on the 1.8 Mozilla branch
--# Note: on Ubuntu 8.04, requires libgtk2-dev, libxt-dev, libidl-dev
--#                                + dbus-glib-1-dev, curl (for Mozilla 1.9+)
--#$ make -f client.mk build
--#
-+# Build configuration script for Debian
-+
-+# build in a separate directory (optional)
-+#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-@CONFIG_GUESS@
- 
--export BUILD_OFFICIAL=1
- export MOZILLA_OFFICIAL=1
-+export BUILD_OFFICIAL=1
-+
-+export MOZ_STANDALONE_COMPOSER=1
-+mk_add_options MOZ_STANDALONE_COMPOSER=1
-+
-+# if you want don't want to use gcc and g or want to use
-+# a specific version of the compilers, specify it in the
-+# two following lines and uncomment them
-+#export CC="gcc-3.0"
-+#export CXX="g-3.0"
-+
-+# Uncomment the 3 following lines on Debian
-+#export OS_LIBS="-lc -lpthread"
-+#export CFLAGS="-DDEBIAN"
-+#export CXXFLAGS="-DDEBIAN"
-+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-kompozer
- 
--mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-@CONFIG_GUESS@
--#mk_add_options MOZ_CO_PROJECT=composer
-+# build the standalone composer, obviously
-+mk_add_options MOZ_CO_PROJECT=composer
- ac_add_options --enable-application=composer
- 
-+# change these two line to build in debug mode
- ac_add_options --enable-optimize 
-+ac_add_options --with-pthreads
- ac_add_options --disable-debug
--#ac_add_options --disable-optimize 
--#ac_add_options --enable-debug
--
--#ac_add_options --disable-shared
--#ac_add_options --enable-static
--#ac_add_options --disable-libxul 
--#ac_add_options --disable-xpfe-components
--ac_add_options --enable-xpfe-components
--ac_add_options --disable-tests
--ac_add_options --disable-installer
--
--#ac_add_options --disable-libxul
- 
--#ac_add_options --disable-crashreporter 
-+# adapt the following lines according to your distribution
- 
--#ac_add_options --enable-optimize 
--#ac_add_options --enable-default-toolkit=gtk2
--##ac_add_options --enable-default-toolkit=cairo-gtk2
--#ac_add_options --enable-xft
--#ac_add_options --disable-canvas
--##ac_add_options --disable-cairo
--
--#ac_add_options --enable-extensions="default inspector venkman"
--ac_add_options --enable-extensions="default spellcheck"
--#ac_add_options --enable-inspector-apis
--
--##ac_add_options  --enable-extensions=wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck
--##ac_add_options  --enable-extensions=xml-rpc,xmlextras,pref,universalchardet
--#ac_add_options --disable-extensions
--## (now by default) ac_add_options  --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data
--ac_add_options  --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data
--##ac_add_options  --enable-mathml
--#ac_add_options  --enable-svg
--
--#ac_add_options --disable-installer
--#ac_add_options --disable-javaxpcom
--#ac_add_options --disable-activex
--#ac_add_options --disable-activex-scripting
-+ac_add_options --prefix=/usr
-+ac_add_options --libdir=/usr/lib
-+ac_add_options --disable-tests
-+ac_add_options --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data
- 
--# Ubuntu 7.10 default flags: https://wiki.mozilla.org/Linux/Compiler_Options
- ac_add_options --enable-default-toolkit=gtk2
- ac_add_options --enable-xft
- ac_add_options --enable-pango
- ac_add_options --enable-postscript
- ac_add_options --disable-xprint
- 
--ac_add_options --enable-mathml
-+#ac_add_options --enable-mathml
- ac_add_options --enable-svg
--ac_add_options --enable-svg-renderer=cairo
-+#ac_add_options --enable-svg-renderer=cairo
- ac_add_options --enable-system-cairo
- ac_add_options --enable-canvas
- 
--ac_add_options --with-system-png=/usr
--ac_add_options --with-system-jpeg=/usr
--ac_add_options --with-system-zlib=/usr
-+ac_add_options --with-system-png
-+ac_add_options --with-system-jpeg
-+ac_add_options --with-system-zlib
- 
- ac_add_options --enable-gnomevfs
--ac_add_options --enable-xinerama
- ac_add_options --enable-single-profile
- ac_add_options --disable-profilesharing
- ac_add_options --enable-system-myspell
- 
-+ac_add_options --disable-installer
-+ac_add_options --disable-xpfe-components
-+ac_add_options --with-default-mozilla-five-home=/usr/lib/kompozer
-+ac_add_options --with-distribution-id=aur.archlinux.org
-+ac_add_options --without-system-nspr
-+ac_add_options --without-system-nss
-+
-+#ac_add_options --disable-elf-dynstr-gc
-+#ac_add_options --disable-gtktest
-+ac_add_options --enable-strip
-+#ac_add_options --disable-strip-lib
-+ac_add_options --disable-updater
-+
-+ac_add_options --enable-xinerama
-+ac_add_options --enable-xpcom-fastload        
-+
-+ac_cv_visibility_pragma=no
-+
-+
-+
diff --git a/pcr/lcmc/PKGBUILD b/pcr/lcmc/PKGBUILD
deleted file mode 100644
index 6b27ff5f4..000000000
--- a/pcr/lcmc/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=lcmc
-pkgver=1.5.1
-pkgrel=1
-pkgdesc='Linux Cluster Management Console'
-arch=any
-url=http://$pkgname.sourceforge.net/
-license=GPL
-depends=(
-  java-runtime
-  libxtst
-)
-source=(
-  http://downloads.sourceforge.net/$pkgname/${pkgname^^*}-$pkgver.jar
-  $pkgname.desktop
-)
-sha512sums=(
-  7f8c68ef45078bda1bf6a811affb782e1ae440fd7d9aceca6a73fb315ffb37a4483d0a8fa80fb058c6522d2053088dd9bcfcb9a9f09b8660ab200594cb38d7af
-  232866f1fbb806edc8d2844527bb44ba5c568fa57da308e7457e1d1140113ad173c2c7c40f29eac6712e1e2601db85cfecdcca525eecda355b32f8a370f9f87e
-)
-
-package() {
-  cd $srcdir
-  install -d $pkgdir/usr/bin
-  echo "#!/bin/bash\njava -jar /usr/lib/$pkgname/${pkgname^^}-$pkgver.jar" > $pkgdir/usr/bin/lcmc
-  install -d $pkgdir/usr/lib/$pkgname
-  install -t $pkgdir/usr/lib/$pkgname ${pkgname^^}-$pkgver.jar
-  for i in 16x16 32x32 48x48 64x64 128x128 256x256; do
-    install -d $pkgdir/usr/share/icons/hicolor/$i/apps
-    install -t $pkgdir/usr/share/icons/hicolor/$i/apps\
-      $srcdir/images/Icons/$i/$pkgname.png
-  done
-  install -d $pkgdir/usr/share/applications
-  install -t $pkgdir/usr/share/applications $pkgname.desktop
-}
-
-# vim:set ts=2 sw=2 et:
-
diff --git a/pcr/lcmc/lcmc.desktop b/pcr/lcmc/lcmc.desktop
deleted file mode 100644
index 2bcd93de6..000000000
--- a/pcr/lcmc/lcmc.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.5.1
-Encoding=UTF-8
-Name=Linux Cluster Management Console
-Comment=Linux Cluster Management Console
-Exec=/usr/bin/lcmc
-Icon=/usr/share/icons/hicolor/256x256/apps/lcmc.png
-Terminal=false
-Type=Application
-Categories=Java;Network;
diff --git a/pcr/lessc/PKGBUILD b/pcr/lessc/PKGBUILD
deleted file mode 100644
index ec9f8cf90..000000000
--- a/pcr/lessc/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=lessc
-pkgver=1.3.1
-pkgrel=1
-_commit=9a46f67f44ca908f7da36036c5b3ae83ef8188dc
-pkgdesc="A standalone compiler for the LESS CSS language."
-arch=('any')
-url="http://lesscss.org/"
-license=('Apache')
-depends=('nodejs')
-source=($pkgname-$pkgver.tar.gz::https://github.com/cloudhead/less.js/archive/$_commit.tar.gz)
-
-build() {
-	cd "$srcdir/less.js-$_commit"
-	make less
-}
-
-package() {
-	cd "$srcdir/less.js-$_commit"
-	install -d "$pkgdir/usr/lib/node"
-	install -d "$pkgdir/usr/bin"
-	cp -r lib/less "$pkgdir/usr/lib/node/less"
-	ln -s "node/less" "$pkgdir/usr/lib/less"
-	install -Dm755 "bin/lessc" "$pkgdir/usr/bin/lessc"
-}
-
-sha256sums=('43a2df3466c08e6d30ae0cd847febf981ef5d15d4d9d6ce86c1b1901154bb22a')
diff --git a/pcr/libast/LICENSE.txt b/pcr/libast/LICENSE.txt
deleted file mode 100644
index 67c75f783..000000000
--- a/pcr/libast/LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 1997-2004, Michael Jennings
- *
- * 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
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies of the Software, its documentation and marketing & publicity
- * materials, and acknowledgment shall be given in the documentation, materials
- * and software packages that this Software was used.
- *
- * 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 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/libast/PKGBUILD b/pcr/libast/PKGBUILD
deleted file mode 100644
index 7d447c6e6..000000000
--- a/pcr/libast/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 40906 2011-03-01 14:45:04Z andrea $
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Adam 'battlemidget' Stokes <adam.stokes@gmail.com> 
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=libast
-pkgver=0.7
-pkgrel=3
-pkgdesc="The Library of Assorted Spiffy Things."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://eterm.sourceforge.net"
-license=('BSD')
-depends=('imlib2' 'pcre' 'libsm')
-options=('!libtool')
-source=(http://www.eterm.org/download/${pkgname}-${pkgver}.tar.gz LICENSE.txt)
-md5sums=('a9ec3b2da317f35869316e6d9571d296'
-         '97071898559acc4f900ceb6cb9579492')
-
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-
-	./configure --prefix=/usr --with-x
-	make
-}
-
-package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-
-	make prefix=${pkgdir}/usr install
-	install -Dm644 ${srcdir}/LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-md5sums=('a9ec3b2da317f35869316e6d9571d296'
-         '97071898559acc4f900ceb6cb9579492')
diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD
deleted file mode 100644
index 2d5c09ec0..000000000
--- a/pcr/libav/PKGBUILD
+++ /dev/null
@@ -1,110 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=libav
-pkgver=9.10
-pkgrel=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux"
-arch=(
-  mips64el
-  x86_64
-  i686
-)
-url=http://$pkgname.org/
-license=GPL3
-depends=(
-  alsa-lib
-  bzip2
-  freetype2
-  gnutls
-  gsm
-  lame
-  libpulse
-  libtheora
-  libva
-  libvorbis
-  libvpx
-  opencore-amr
-  #openjpeg
-  opus
-  rtmpdump
-  schroedinger
-  sdl
-  speex
-  x264
-  xvidcore
-  zlib
-)
-makedepends=(
-  yasm
-  libvdpau
-)
-source=http://$pkgname.org/releases/$pkgname-$pkgver.tar.gz
-sha512sums=88bbe82fc3edfde17339cbd5fbae5ab074e750ad750fafcabc2c1fa408f352e38f32d8c0df0ff6c926d449bff29c725fc2c219d8b6e0398e3b93d43f086c9f10
-
-build() {
-  cd $pkgname-$pkgver
-  if [[ $CARCH == x86_64 ]]; then
-    _asm='--disable-armv5te --disable-armv6 --disable-armv6t2 --disable-neon --disable-vfp --disable-vis --disable-altivec\
-          --enable-amd3dnow --enable-mmx --enable-mmxext --enable-amd3dnow --enable-amd3dnowext --enable-sse --enable-sse2 --enable-sse3\
-          --enable-avx --enable-fma4 --enable-sse3 --enable-ssse3 --enable-sse4 --enable-sse42'
-  elif [[ $CARCH == i686 ]]; then
-    _asm='--disable-armv5te --disable-armv6 --disable-armv6t2 --disable-neon --disable-vfp --disable-vis --disable-altivec\
-          --enable-amd3dnow --enable-mmx --enable-mmxext --enable-amd3dnow --enable-amd3dnowext --enable-sse --enable-sse2 --enable-sse3\
-          --disable-avx --disable-fma4 --disable-sse3 --disable-ssse3 --disable-sse4 --disable-sse42'
-  else
-    _asm='--disable-asm'
-  fi
-  ./configure\
-    $_asm\
-    --prefix=/usr\
-    --bindir=/opt/$pkgname/bin\
-    --incdir=/opt/$pkgname/include\
-    --libdir=/opt/$pkgname/lib\
-    --shlibdir=/opt/$pkgname/lib\
-    --disable-avserver\
-    --disable-debug\
-    --disable-static\
-    --enable-avresample\
-    --enable-dxva2\
-    --enable-gnutls\
-    --enable-gpl\
-    --enable-libfreetype\
-    --enable-libgsm\
-    --enable-libmp3lame\
-    --enable-libopencore-amrnb\
-    --enable-libopencore-amrwb\
-    --disable-libopenjpeg\
-    --enable-libopus\
-    --enable-libpulse\
-    --enable-librtmp\
-    --enable-libschroedinger\
-    --enable-libspeex\
-    --enable-libtheora\
-    --enable-libvorbis\
-    --enable-libvpx\
-    --enable-libx264\
-    --enable-libxvid\
-    --enable-pic\
-    --enable-runtime-cpudetect\
-    --enable-shared\
-    --enable-vdpau\
-    --enable-version3\
-    --enable-x11grab
-  make
-  make tools/qt-faststart
-  make doc/av{conv,play}.1
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install install-man
-  install -vD tools/qt-faststart $pkgdir/usr/bin/qt-faststart-$pkgname
-
-  for _bin in conv play probe; do
-    echo -e "#!/usr/bin/env bash\nLD_LIBRARY_PATH=/opt/$pkgname/lib /opt/$pkgname/bin/av$_bin \$@" > $pkgdir/usr/bin/av$_bin
-  done
-  chmod -v +x $pkgdir/usr/bin/*
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/libcacard/PKGBUILD b/pcr/libcacard/PKGBUILD
deleted file mode 100755
index 0886b9847..000000000
--- a/pcr/libcacard/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Jameson Pugh <imntreal@gmail.com> 
-# Maintainer : Parabola / GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
- 
-pkgname=libcacard
-pkgver=0.1.2
-pkgrel=3
-pkgdesc="Virtual Smart Card Emulator"
-arch=('x86_64' 'i686')
-url="http://spice-space.org"
-license=('GPL')
-options=('!libtool')
-depends=('nss')
-source=(http://spice-space.org/download/libcacard/$pkgname-$pkgver.tar.bz2)
-md5sums=('ca61fd1d7feaa09e37011daac95c0168')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('ca61fd1d7feaa09e37011daac95c0168')
diff --git a/pcr/libcgroup/PKGBUILD b/pcr/libcgroup/PKGBUILD
deleted file mode 100644
index 849a5c128..000000000
--- a/pcr/libcgroup/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# Maintainer: Christian Hesse <mail@eworm.de>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=libcgroup
-pkgver=0.40rc1
-pkgrel=1
-pkgdesc="Library that abstracts the control group file system in Linux"
-arch=('i686' 'x86_64')
-url="http://libcg.sourceforge.net"
-license=(LGPL)
-backup=('etc/cgconfig.conf'
-        'etc/cgrules.conf'
-	'etc/cgsnapshot_blacklist.conf')
-options=('!emptydirs' '!libtool')
-install=libcgroup.install
-source=("http://downloads.sourceforge.net/libcg/${pkgname}-${pkgver/rc/.rc}.tar.bz2"
-	'cgconfig.service'
-	'cgrules.service')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver/rc/.rc}"
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--sbindir=/usr/bin \
-		--enable-opaque-hierarchy=name=systemd
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver/rc/.rc}"
-
-	make DESTDIR="${pkgdir}" pkgconfigdir="/usr/lib/pkgconfig" install
-
-	install -D -m0644 samples/cgconfig.conf "${pkgdir}/etc/cgconfig.conf"
-	install -D -m0644 samples/cgrules.conf "${pkgdir}/etc/cgrules.conf"
-	install -D -m0644 samples/cgsnapshot_blacklist.conf "${pkgdir}/etc/cgsnapshot_blacklist.conf"
-
-	install -D -m0644 ${srcdir}/cgconfig.service "${pkgdir}/usr/lib/systemd/system/cgconfig.service"
-	install -D -m0644 ${srcdir}/cgrules.service "${pkgdir}/usr/lib/systemd/system/cgrules.service"
-
-	rm -f ${pkgdir}/usr/lib/security/pam_cgroup.{la,so,so.0}
-	mv ${pkgdir}/usr/lib/security/pam_cgroup.so.0.0.0 ${pkgdir}/usr/lib/security/pam_cgroup.so
-
-	rm -rf ${pkgdir}/etc/rc.d
-
-	# Make cgexec setgid cgred
-	chown root:160 ${pkgdir}/usr/bin/cgexec
-	chmod 2755 ${pkgdir}/usr/bin/cgexec
-}
-
-sha256sums=('c2fa2cfdfd1023093afb6de456fc3ac000f92a2f01b905bcdda1c3e36ad44072'
-            '808fc354abf36d7b6673dad790be275309ac57a2606d1be3732b9b3aeb5885eb'
-            '6b1340ff6717f55e5e57dacc72accc0bfaed7e50ef31439271b6ddc893cbf671')
diff --git a/pcr/libcgroup/cgconfig.service b/pcr/libcgroup/cgconfig.service
deleted file mode 100644
index 3e6689d77..000000000
--- a/pcr/libcgroup/cgconfig.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Control Group configuration service
-
-# The service should be able to start as soon as possible,
-# before any 'normal' services:
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=basic.target shutdown.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/cgconfigparser -l /etc/cgconfig.conf -s 1664
-ExecStop=/usr/bin/cgclear -l /etc/cgconfig.conf -e
-
-[Install]
-WantedBy=sysinit.target
diff --git a/pcr/libcgroup/cgrules.service b/pcr/libcgroup/cgrules.service
deleted file mode 100644
index cd0bf34fb..000000000
--- a/pcr/libcgroup/cgrules.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Control Group rules service
- 
-# The service should be able to start as soon as possible,
-# before any 'normal' services:
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=basic.target shutdown.target
-After=cgconfig.service
- 
-[Service]
-Type=simple
-ExecStart=/usr/bin/cgrulesengd -n -f -
- 
-[Install]
-WantedBy=sysinit.target
diff --git a/pcr/libcgroup/libcgroup.install b/pcr/libcgroup/libcgroup.install
deleted file mode 100644
index a78216add..000000000
--- a/pcr/libcgroup/libcgroup.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  getent group cgred &>/dev/null || groupadd -r -g 160 cgred >/dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  getent group cgred &>/dev/null && groupdel cgred >/dev/null
-}
diff --git a/pcr/libdrm-nvfx/COPYING b/pcr/libdrm-nvfx/COPYING
deleted file mode 100644
index 6e74c337c..000000000
--- a/pcr/libdrm-nvfx/COPYING
+++ /dev/null
@@ -1,48 +0,0 @@
- 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
deleted file mode 100644
index c8a08bea4..000000000
--- a/pcr/libdrm-nvfx/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $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/libdshconfig/PKGBUILD b/pcr/libdshconfig/PKGBUILD
deleted file mode 100644
index e44d11ffd..000000000
--- a/pcr/libdshconfig/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor: SkiltZ <skiltz@free.fr>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=libdshconfig
-pkgver=0.20.9 
-pkgrel=2
-pkgdesc="Library for parsing dsh-style configuration files. Required by dsh and other applications."
-arch=(i686 x86_64 mips64el)
-url="http://www.netfort.gr.jp/~dancer/software/dsh.html.en"
-license=('GPL')
-depends=('glibc')
-source=(http://www.netfort.gr.jp/~dancer/software/downloads/libdshconfig-$pkgver.tar.gz)
- 
-
-build() {
-	  cd $startdir/src/$pkgname-$pkgver
-	    ./configure --prefix=/usr
-	      make || return 1
-	        make prefix=$startdir/pkg/usr install
-	}
-md5sums=('c3fabfae1782c17ee989373c2f6a73c1')
diff --git a/pcr/libfreexl/PKGBUILD b/pcr/libfreexl/PKGBUILD
deleted file mode 100644
index 69d94ce99..000000000
--- a/pcr/libfreexl/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Bruno Gola <brunogola at gmail dot com>
-pkgname=libfreexl
-pkgver=1.0.0e
-pkgrel=1
-pkgdesc="Library to extract valid data from within an Excel (.xls) spreadsheet."
-arch=('i686' 'x86_64')
-url="https://www.gaia-gis.it/fossil/freexl/index"
-license=('MPL')
-source=("http://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-$pkgver.tar.gz")
-
-build() {
-    cd "$srcdir/freexl-$pkgver"
-    ./configure --prefix=/usr
-    make
-}
-
-package() {
-    cd "$srcdir/freexl-$pkgver"
-    make DESTDIR="$pkgdir/" install
-}
-md5sums=('9b494d42a079e63afbb9dc0915e8fb56')
diff --git a/pcr/libibus/PKGBUILD b/pcr/libibus/PKGBUILD
deleted file mode 100644
index 1a934121a..000000000
--- a/pcr/libibus/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id$
-# Contributor: Felix Yan <felixonmars@gmail.com>
-# Contributor: Rainy <rainylau(at)gmail(dot)com>
-# Contributor: Lee.MaRS <leemars at gmail dot com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Brad Fanella <bradfanella@archlinux.us>
-# Maintainer : Parabola GNU / Linux-libre Aur�lien Desbri�res <aurelien@cwb.io>
-
-_pkgbase=ibus
-pkgname=lib$_pkgbase
-pkgver=1.4.99.20121109
-pkgrel=1
-pkgdesc="Library for Next Generation Input Bus for Linux"
-arch=('i686' 'x86_64')
-url="http://ibus.googlecode.com"
-license=('LGPL')
-depends=('glib2')
-makedepends=('gobject-introspection' 'dconf' 'iso-codes' 'intltool' 'gtk2' 'gtk3')
-options=('!libtool')
-provides=("$_pkgbase=$pkgver")
-conflicts=('ibus')
-source=(http://ibus.googlecode.com/files/${_pkgbase}-${pkgver}.tar.gz)
-
-build() {
-  cd "$srcdir/${_pkgbase}-${pkgver}"
-  export PYTHON=python2
-  ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/ibus \
-    --sysconfdir=/etc \
-    --disable-gconf \
-    --enable-dconf \
-    --disable-memconf \
-    --enable-ui
-  make
-}
-
-package() {
-  cd "$srcdir/${_pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install-pkgconfigDATA
-  cd src
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('be482479357210283e91a47f43a0a0fe')
diff --git a/pcr/libixp-hg/PKGBUILD b/pcr/libixp-hg/PKGBUILD
deleted file mode 100644
index 3642535d1..000000000
--- a/pcr/libixp-hg/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname="libixp-hg"
-pkgver=148
-pkgdesc="A 9p client/server library"
-url="http://libs.suckless.org/libixp"
-license=("MIT")
-
-provides=("libixp")
-conflicts=("libixp")
-
-pkgrel=1
-arch=("i686" "x86_64")
-makedepends=("txt2tags")
-options=(staticlibs)
-
-source=("libre://${pkgname}-${pkgver}.tar.gz")
-md5sums=('5a2fd075108558b39988610d2bb184d9')
-
-mkdepends=("mercurial")
-mksource=("$pkgname-$pkgver::hg+https://code.google.com/p/libixp/#revision=${pkgver}")
-mkmd5sums=('SKIP')
-mksource() {
-	# don't include this precompiled binary (probably included by accident)
-	rm "${srcdir}/${pkgname}-${pkgver}/test/o.client"
-}
-
-_makeflags=("PREFIX=/usr" "ETC=/etc")
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make "${_makeflags[@]}"
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make "${_makeflags[@]}" DESTDIR="$pkgdir" install
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/pcr/libnatpmp-from-social-repo/PKGBUILD b/pcr/libnatpmp-from-social-repo/PKGBUILD
deleted file mode 100644
index ded1e6ca5..000000000
--- a/pcr/libnatpmp-from-social-repo/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Pierre Bourdon <delroth@gmail.com>
-
-pkgname=libnatpmp
-pkgver=20120821
-pkgrel=1
-pkgdesc="A portable and fully compliant implementation of the NAT-PMP protocol"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://miniupnp.free.fr/libnatpmp.html"
-license=('BSD')
-depends=('glibc')
-makedepends=()
-source=(libnatpmp-$pkgver.tar.gz::http://miniupnp.free.fr/files/download.php?file=libnatpmp-$pkgver.tar.gz)
-
-build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make
-}
-
-package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make INSTALLPREFIX="$pkgdir/usr" \
-         INSTALLDIRINC="$pkgdir/usr/include/libnatpmp" install
-
-    # Needed by some packages
-    install -m 644 getgateway.h declspec.h "$pkgdir/usr/include/libnatpmp"
-
-    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-md5sums=('d2b9c2dedba3a00deb0e7589982ceced')
diff --git a/pcr/libnatpmp/PKGBUILD b/pcr/libnatpmp/PKGBUILD
deleted file mode 100644
index f3306e87d..000000000
--- a/pcr/libnatpmp/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Pierre Bourdon <delroth@gmail.com>
-# Maintainer: Parabola Gnu / Linux-libre Aurélien Desbrières
-
-pkgname=libnatpmp
-pkgver=20120821
-pkgrel=2
-pkgdesc="A portable and fully compliant implementation of the NAT-PMP protocol"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://miniupnp.free.fr/libnatpmp.html"
-license=('custom:BSD')
-depends=('glibc')
-makedepends=()
-source=(http://miniupnp.free.fr/files/download.php?file=libnatpmp-$pkgver.tar.gz)
-md5sums=('d2b9c2dedba3a00deb0e7589982ceced')
-
-build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make
-}
-
-package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make INSTALLPREFIX="$pkgdir/usr" \
-         INSTALLDIRINC="$pkgdir/usr/include/libnatpmp" install
-
-    # Needed by some packages
-    install -m 644 getgateway.h declspec.h "$pkgdir/usr/include/libnatpmp"
-
-    install -Dm 644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/pcr/libosinfo-libre/PKGBUILD b/pcr/libosinfo-libre/PKGBUILD
deleted file mode 100644
index 8400558c0..000000000
--- a/pcr/libosinfo-libre/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# Contributor: Daniel Milewski <niitotantei@gmail.com>
-
-_pkgname='libosinfo'
-pkgname="$_pkgname-libre"
-pkgver='0.2.8'
-pkgrel='1'
-pkgdesc='A GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support, without support for nonfree systems'
-arch=('i686' 'x86_64')
-url='http://libosinfo.org'
-license=('LGPL')
-depends=('glib2' 'libxslt')
-makedepends=('intltool' 'libsoup')
-checkdepends=('check')
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-replaces=("$_pkgname")
-source=("https://fedorahosted.org/releases/l/i/$_pkgname/$_pkgname-$pkgver.tar.gz" 'data.patch' 'po.patch' 'test.patch'
-        'free-distros.patch')
-sha256sums=('50cbfcff4548f37b5b7d3328cbc6e96fe6c2a48696e31eec0c819d161e38c643'
-            'fdfb0753a7cf7865ac2ea5b17145f90d27d70e18c69fba0d60dfb43629ea0dac'
-            'aab885d2b3a7f91a79efd7ab6f12fe1d4b264afa0fbc200268838b353600b338'
-            'c4b328f36973931abd71a10a62ec590ef3ba1177486179bc96aa47a22a6d0a42'
-            'f4b79c44ae4a39325480c2b0af4aa7ed086cc1cab7c9ba1119f50967a9a5f4ca')
-
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  rm data/datamaps/windows-lang.xml \
-     data/hypervisors/rhel-xen.xml{,.in} \
-     data/install-scripts/*.xml \
-     data/oses/*.xml{,.in}
-  rm -r test/isodata/*
-
-  patch -Np1 -i "$srcdir/data.patch"
-  patch -Np1 -i "$srcdir/po.patch"
-  patch -Np1 -i "$srcdir/test.patch"
-
-  cd "$srcdir/$_pkgname-$pkgver/po"
-  intltool-update pl
-  intltool-update uk
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  patch -Np1 -i "$srcdir/free-distros.patch"
-}
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/libosinfo-libre/data.patch b/pcr/libosinfo-libre/data.patch
deleted file mode 100644
index d37d30671..000000000
--- a/pcr/libosinfo-libre/data.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -ruN libosinfo-0.2.8/data/datamaps/Makefile.am libosinfo-0.2.8-libre/data/datamaps/Makefile.am
---- libosinfo-0.2.8/data/datamaps/Makefile.am	2013-01-09 00:01:25.000000000 +0100
-+++ libosinfo-0.2.8-libre/data/datamaps/Makefile.am	2013-12-01 12:15:00.261131308 +0100
-@@ -1,7 +1,6 @@
- 
- datamapdir = $(pkgdatadir)/db/datamaps/
- datamap_DATA =     \
--  windows-lang.xml   \
-   x11-keyboard.xml   \
-   $(NULL)
- 
-diff -ruN libosinfo-0.2.8/data/datamaps/Makefile.in libosinfo-0.2.8-libre/data/datamaps/Makefile.in
---- libosinfo-0.2.8/data/datamaps/Makefile.in	2013-09-16 18:45:26.000000000 +0200
-+++ libosinfo-0.2.8-libre/data/datamaps/Makefile.in	2013-12-01 12:15:07.561496625 +0100
-@@ -326,7 +326,6 @@
- top_srcdir = @top_srcdir@
- datamapdir = $(pkgdatadir)/db/datamaps/
- datamap_DATA = \
--  windows-lang.xml   \
-   x11-keyboard.xml   \
-   $(NULL)
- 
-diff -ruN libosinfo-0.2.8/data/hypervisors/Makefile.am libosinfo-0.2.8-libre/data/hypervisors/Makefile.am
---- libosinfo-0.2.8/data/hypervisors/Makefile.am	2013-02-14 02:39:37.000000000 +0100
-+++ libosinfo-0.2.8-libre/data/hypervisors/Makefile.am	2013-12-01 12:18:54.718635301 +0100
-@@ -1,6 +1,6 @@
- 
- databasedir = $(pkgdatadir)/db/hypervisors/
--database_in_files = kvm.xml.in qemu.xml.in rhel-xen.xml.in xen.xml.in
-+database_in_files = kvm.xml.in qemu.xml.in xen.xml.in
- 
- database_DATA = $(database_in_files:.xml.in=.xml)
- 
-diff -ruN libosinfo-0.2.8/data/hypervisors/Makefile.in libosinfo-0.2.8-libre/data/hypervisors/Makefile.in
---- libosinfo-0.2.8/data/hypervisors/Makefile.in	2013-09-16 18:45:26.000000000 +0200
-+++ libosinfo-0.2.8-libre/data/hypervisors/Makefile.in	2013-12-01 12:20:01.822560286 +0100
-@@ -325,7 +325,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- databasedir = $(pkgdatadir)/db/hypervisors/
--database_in_files = kvm.xml.in qemu.xml.in rhel-xen.xml.in xen.xml.in
-+database_in_files = kvm.xml.in qemu.xml.in xen.xml.in
- database_DATA = $(database_in_files:.xml.in=.xml)
- EXTRA_DIST = $(database_in_files) $(database_DATA)
- all: all-am
-diff -ruN libosinfo-0.2.8/data/install-scripts/Makefile.am libosinfo-0.2.8-libre/data/install-scripts/Makefile.am
---- libosinfo-0.2.8/data/install-scripts/Makefile.am	2013-03-27 23:03:14.000000000 +0100
-+++ libosinfo-0.2.8-libre/data/install-scripts/Makefile.am	2013-12-01 12:24:10.160616083 +0100
-@@ -1,12 +1,6 @@
- 
- databasedir = $(pkgdatadir)/db/install-scripts/
- database_DATA =     \
--  fedora.xml        \
--  rhel.xml          \
--  windows-sif.xml   \
--  windows-cmd.xml   \
--  windows-reg.xml   \
--  windows-unattend.xml \
-   $(NULL)
- 
- EXTRA_DIST = $(database_DATA)
-diff -ruN libosinfo-0.2.8/data/install-scripts/Makefile.in libosinfo-0.2.8-libre/data/install-scripts/Makefile.in
---- libosinfo-0.2.8/data/install-scripts/Makefile.in	2013-09-16 18:45:26.000000000 +0200
-+++ libosinfo-0.2.8-libre/data/install-scripts/Makefile.in	2013-12-01 12:24:20.500882542 +0100
-@@ -326,12 +326,6 @@
- top_srcdir = @top_srcdir@
- databasedir = $(pkgdatadir)/db/install-scripts/
- database_DATA = \
--  fedora.xml        \
--  rhel.xml          \
--  windows-sif.xml   \
--  windows-cmd.xml   \
--  windows-reg.xml   \
--  windows-unattend.xml \
-   $(NULL)
- 
- EXTRA_DIST = $(database_DATA)
-diff -ruN libosinfo-0.2.8/data/oses/Makefile.am libosinfo-0.2.8-libre/data/oses/Makefile.am
---- libosinfo-0.2.8/data/oses/Makefile.am	2013-09-10 15:22:50.000000000 +0200
-+++ libosinfo-0.2.8-libre/data/oses/Makefile.am	2013-12-01 12:26:24.797757509 +0100
-@@ -1,26 +1,6 @@
- 
- databasedir = $(pkgdatadir)/db/oses/
- database_in_files = 	\
--	altlinux.xml.in \
--	centos.xml.in   \
--	debian.xml.in   \
--	dos.xml.in      \
--	fedora.xml.in   \
--	freebsd.xml.in  \
--	gnome.xml.in	\
--	mandriva.xml.in \
--	mandrake.xml.in \
--	netbsd.xml.in	\
--	netware.xml.in  \
--	macos.xml.in    \
--	openbsd.xml.in  \
--	opensuse.xml.in \
--	rhl.xml.in      \
--	rhel.xml.in     \
--	solaris.xml.in  \
--	suse.xml.in     \
--	ubuntu.xml.in   \
--	windows.xml.in  \
- 	$(NULL)
- 
- database_DATA = $(database_in_files:.xml.in=.xml)
-diff -ruN libosinfo-0.2.8/data/oses/Makefile.in libosinfo-0.2.8-libre/data/oses/Makefile.in
---- libosinfo-0.2.8/data/oses/Makefile.in	2013-09-16 18:45:26.000000000 +0200
-+++ libosinfo-0.2.8-libre/data/oses/Makefile.in	2013-12-01 12:26:32.557686417 +0100
-@@ -326,26 +326,6 @@
- top_srcdir = @top_srcdir@
- databasedir = $(pkgdatadir)/db/oses/
- database_in_files = \
--	altlinux.xml.in \
--	centos.xml.in   \
--	debian.xml.in   \
--	dos.xml.in      \
--	fedora.xml.in   \
--	freebsd.xml.in  \
--	gnome.xml.in	\
--	mandriva.xml.in \
--	mandrake.xml.in \
--	netbsd.xml.in	\
--	netware.xml.in  \
--	macos.xml.in    \
--	openbsd.xml.in  \
--	opensuse.xml.in \
--	rhl.xml.in      \
--	rhel.xml.in     \
--	solaris.xml.in  \
--	suse.xml.in     \
--	ubuntu.xml.in   \
--	windows.xml.in  \
- 	$(NULL)
- 
- database_DATA = $(database_in_files:.xml.in=.xml)
diff --git a/pcr/libosinfo-libre/free-distros.patch b/pcr/libosinfo-libre/free-distros.patch
deleted file mode 100644
index c69cd3fed..000000000
--- a/pcr/libosinfo-libre/free-distros.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff -ruN libosinfo-0.2.8-libre/data/oses/Makefile.am libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.am
---- libosinfo-0.2.8-libre/data/oses/Makefile.am	2013-12-01 13:14:07.267023100 +0100
-+++ libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.am	2013-12-01 13:18:29.183029813 +0100
-@@ -1,6 +1,7 @@
- 
- databasedir = $(pkgdatadir)/db/oses/
- database_in_files = 	\
-+	parabola.xml.in \
- 	$(NULL)
- 
- database_DATA = $(database_in_files:.xml.in=.xml)
-diff -ruN libosinfo-0.2.8-libre/data/oses/Makefile.in libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.in
---- libosinfo-0.2.8-libre/data/oses/Makefile.in	2013-12-01 13:14:07.267023100 +0100
-+++ libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.in	2013-12-01 13:18:48.053708302 +0100
-@@ -326,6 +326,7 @@
- top_srcdir = @top_srcdir@
- databasedir = $(pkgdatadir)/db/oses/
- database_in_files = \
-+	parabola.xml.in \
- 	$(NULL)
- 
- database_DATA = $(database_in_files:.xml.in=.xml)
-diff -ruN libosinfo-0.2.8-libre/data/oses/parabola.xml libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml
---- libosinfo-0.2.8-libre/data/oses/parabola.xml	1970-01-01 01:00:00.000000000 +0100
-+++ libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml	2013-12-01 13:26:26.128660679 +0100
-@@ -0,0 +1,42 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<libosinfo version="0.0.1">
-+
-+  <os id="https://parabolagnulinux.org">
-+    <short-id>parabola</short-id>
-+    <name>Parabola GNU/Linux-libre</name>
-+    <vendor>Parabola Project</vendor>
-+    <family>gnu/linux</family>
-+
-+    <resources arch="all">
-+      <minimum>
-+        <cpu>1000000000</cpu>
-+        <n-cpus>1</n-cpus>
-+        <ram>67108864</ram>
-+        <storage>524288000</storage>
-+      </minimum>
-+      <recommended>
-+        <cpu>1000000000</cpu>
-+        <ram>67108864</ram>
-+        <storage>524288000</storage>
-+      </recommended>
-+    </resources>
-+
-+    <media arch="x86_64">
-+      <url>https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso</url>
-+      <iso>
-+        <volume-id>PARA_201309</volume-id>
-+      </iso>
-+      <kernel>parabola/boot/x86_64/vmlinuz</kernel>
-+      <initrd>parabola/boot/x86_64/parabolaiso.img</initrd>
-+    </media>
-+    <media arch="i686">
-+      <url>https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso</url>
-+      <iso>
-+        <volume-id>PARA_201309</volume-id>
-+      </iso>
-+      <kernel>parabola/boot/i686/vmlinuz</kernel>
-+      <initrd>parabola/boot/i686/parabolaiso.img</initrd>
-+    </media>
-+  </os>
-+
-+</libosinfo>
-\ No newline at end of file
-diff -ruN libosinfo-0.2.8-libre/data/oses/parabola.xml.in libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml.in
---- libosinfo-0.2.8-libre/data/oses/parabola.xml.in	1970-01-01 01:00:00.000000000 +0100
-+++ libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml.in	2013-12-01 13:17:12.086931332 +0100
-@@ -0,0 +1,42 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<libosinfo version="0.0.1">
-+
-+  <os id="https://parabolagnulinux.org">
-+    <short-id>parabola</short-id>
-+    <_name>Parabola GNU/Linux-libre</_name>
-+    <_vendor>Parabola Project</_vendor>
-+    <family>gnu/linux</family>
-+
-+    <resources arch="all">
-+      <minimum>
-+        <cpu>1000000000</cpu>
-+        <n-cpus>1</n-cpus>
-+        <ram>67108864</ram>
-+        <storage>524288000</storage>
-+      </minimum>
-+      <recommended>
-+        <cpu>1000000000</cpu>
-+        <ram>67108864</ram>
-+        <storage>524288000</storage>
-+      </recommended>
-+    </resources>
-+
-+    <media arch="x86_64">
-+      <url>https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso</url>
-+      <iso>
-+        <volume-id>PARA_201309</volume-id>
-+      </iso>
-+      <kernel>parabola/boot/x86_64/vmlinuz</kernel>
-+      <initrd>parabola/boot/x86_64/parabolaiso.img</initrd>
-+    </media>
-+    <media arch="i686">
-+      <url>https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso</url>
-+      <iso>
-+        <volume-id>PARA_201309</volume-id>
-+      </iso>
-+      <kernel>parabola/boot/i686/vmlinuz</kernel>
-+      <initrd>parabola/boot/i686/parabolaiso.img</initrd>
-+    </media>
-+  </os>
-+
-+</libosinfo>
-diff -ruN libosinfo-0.2.8-libre/po/POTFILES.in libosinfo-0.2.8-libre-free-distros/po/POTFILES.in
---- libosinfo-0.2.8-libre/po/POTFILES.in	2013-12-01 13:14:10.297130169 +0100
-+++ libosinfo-0.2.8-libre-free-distros/po/POTFILES.in	2013-12-01 13:23:01.616209485 +0100
-@@ -1,3 +1,4 @@
-+data/oses/parabola.xml.in
- data/devices/qemu-ps2.xml.in
- data/devices/qemu-pci.xml.in
- data/devices/virtio-pci.xml.in
diff --git a/pcr/libosinfo-libre/po.patch b/pcr/libosinfo-libre/po.patch
deleted file mode 100644
index abd11cb71..000000000
--- a/pcr/libosinfo-libre/po.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ruN libosinfo-0.2.8/po/POTFILES.in libosinfo-0.2.8-libre/po/POTFILES.in
---- libosinfo-0.2.8/po/POTFILES.in	2013-09-10 15:22:50.000000000 +0200
-+++ libosinfo-0.2.8-libre/po/POTFILES.in	2013-12-01 11:54:50.441912252 +0100
-@@ -1,30 +1,9 @@
--data/oses/netware.xml.in
--data/oses/solaris.xml.in
--data/oses/dos.xml.in
--data/oses/mandrake.xml.in
--data/oses/mandriva.xml.in
--data/oses/suse.xml.in
--data/oses/gnome.xml.in
--data/oses/rhel.xml.in
--data/oses/fedora.xml.in
--data/oses/windows.xml.in
--data/oses/opensuse.xml.in
--data/oses/macos.xml.in
--data/oses/debian.xml.in
--data/oses/ubuntu.xml.in
--data/oses/centos.xml.in
--data/oses/openbsd.xml.in
--data/oses/freebsd.xml.in
--data/oses/rhl.xml.in
--data/oses/netbsd.xml.in
--data/oses/altlinux.xml.in
- data/devices/qemu-ps2.xml.in
- data/devices/qemu-pci.xml.in
- data/devices/virtio-pci.xml.in
- data/devices/qemu-usb.xml.in
- data/hypervisors/kvm.xml.in
- data/hypervisors/qemu.xml.in
--data/hypervisors/rhel-xen.xml.in
- data/hypervisors/xen.xml.in
- osinfo/osinfo_avatar_format.c
- osinfo/osinfo_deployment.c
diff --git a/pcr/libosinfo-libre/test.patch b/pcr/libosinfo-libre/test.patch
deleted file mode 100644
index 413deb1c0..000000000
--- a/pcr/libosinfo-libre/test.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -ruN libosinfo-0.2.8/test/test-isodetect.c libosinfo-0.2.8-libre/test/test-isodetect.c
---- libosinfo-0.2.8/test/test-isodetect.c	2013-09-10 15:22:50.000000000 +0200
-+++ libosinfo-0.2.8-libre/test/test-isodetect.c	2013-12-01 11:44:32.830411240 +0100
-@@ -342,66 +342,6 @@
-     g_object_unref(loader);
- }
- 
--START_TEST(test_fedora)
--{
--    test_one("fedora");
--}
--END_TEST
--
--START_TEST(test_rhel)
--{
--    test_one("rhel");
--}
--END_TEST
--
--START_TEST(test_ubuntu)
--{
--    test_one("ubuntu");
--}
--END_TEST
--
--START_TEST(test_debian)
--{
--    test_one("debian");
--}
--END_TEST
--
--START_TEST(test_windows)
--{
--    test_one("windows");
--}
--END_TEST
--
--START_TEST(test_openbsd)
--{
--    test_one("openbsd");
--}
--END_TEST
--
--START_TEST(test_opensuse)
--{
--    test_one("opensuse");
--}
--END_TEST
--
--START_TEST(test_centos)
--{
--    test_one("centos");
--}
--END_TEST
--
--START_TEST(test_gnome)
--{
--    test_one("gnome");
--}
--END_TEST
--
--START_TEST(test_altlinux)
--{
--    test_one("altlinux");
--}
--END_TEST
--
- static Suite *
- list_suite(void)
- {
-@@ -409,16 +349,6 @@
-     TCase *tc = tcase_create("Core");
-     tcase_set_timeout(tc, 20);
- 
--    tcase_add_test(tc, test_fedora);
--    tcase_add_test(tc, test_rhel);
--    tcase_add_test(tc, test_ubuntu);
--    tcase_add_test(tc, test_debian);
--    tcase_add_test(tc, test_windows);
--    tcase_add_test(tc, test_openbsd);
--    tcase_add_test(tc, test_opensuse);
--    tcase_add_test(tc, test_centos);
--    tcase_add_test(tc, test_gnome);
--    tcase_add_test(tc, test_altlinux);
-     suite_add_tcase(s, tc);
-     return s;
- }
diff --git a/pcr/libowfat/PKGBUILD b/pcr/libowfat/PKGBUILD
deleted file mode 100644
index a51638450..000000000
--- a/pcr/libowfat/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributors:
-#	Alexander Ulrich <a.ulrich@student.uni-tuebingen.de>
-# 	Mildred <silkensedai@online.fr>
-# 	henning mueller <henning@orgizm.net>
-
-pkgname=libowfat
-pkgver=0.29
-pkgrel=3
-pkgdesc='GPL reimplementation of libdjb'
-arch=(i686 x86_64 mips64el)
-url=http://www.fefe.de/libowfat/
-depends=()
-license=(GPL)
-install=libowfat.install
-source=(http://dl.fefe.de/$pkgname-$pkgver.tar.bz2)
-md5sums=(6bbee9a86506419657d87123b7a6f2c1)
-
-build() {
-	cd $srcdir/$pkgname-$pkgver
-	make
-}
-
-package() {
-	cd $srcdir/$pkgname-$pkgver
-	make prefix=$pkgdir/usr/ LIBDIR=$pkgdir/usr/lib MAN3DIR=$pkgdir/usr/share/man/man3 install
-
-	cd $pkgdir/usr/share/man/man3
-	mv buffer.3 buffer-libowfat.3
-}
-md5sums=('1187c6acf11429e7adb9ebe180f644bb')
diff --git a/pcr/libowfat/libowfat.install b/pcr/libowfat/libowfat.install
deleted file mode 100644
index a08aef10c..000000000
--- a/pcr/libowfat/libowfat.install
+++ /dev/null
@@ -1,39 +0,0 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-pre_install() {
-  /bin/true
-}
-
-# arg 1:  the new package version
-post_install() {
-  echo "The manpage buffer(3) was moved to buffer-libowfat(3) because
-        it conflicts with package openssl"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/pcr/libpng12/PKGBUILD b/pcr/libpng12/PKGBUILD
deleted file mode 100644
index df75ddeaa..000000000
--- a/pcr/libpng12/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 58551 2009-11-08 22:37:12Z eric $
-# Contributor:	dorphell			<archlinux.org: dorphell>
-# Contributor:	Travis Willard			<archlinux.org: travis>
-# Contributor:	Douglas Soares de Andrade	<archlinux.org: douglas>
-# Maintainer:	Jesse Jaara			<gmail.com: jesse.jaara>
-
-pkgname=libpng12
-_realname=libpng
-pkgver=1.2.50
-pkgrel=1
-pkgdesc="A collection of routines used to create PNG format graphics files"
-arch=('i686' 'x86_64')
-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")
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  patch -Np0 -i "${srcdir}/libpng-${pkgver}-apng.patch"
-
-  libtoolize --force --copy
-  aclocal
-  autoconf
-  automake --add-missing
-
-  ./configure --prefix=/usr
-
-  make ECHO=echo
-}
-
-package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  make ECHO=echo DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/share"
-  rm -rf "${pkgdir}/usr/bin/libpng-config"
-  rm -rf "${pkgdir}/usr/lib/"{libpng.so,libpng.a}
-  rm -fr "${pkgdir}/usr/lib/pkgconfig/libpng.pc"
-  rm -rf "${pkgdir}/usr/include/"{pngconf.h,png.h}
-}
-
-md5sums=('a3e00fccbfe356174ab515b5c00641c7'
-         'b06ac3f6a6f982abc2036359665e82a9')
diff --git a/pcr/libpurple-minimal/PKGBUILD b/pcr/libpurple-minimal/PKGBUILD
deleted file mode 100644
index 5526879d1..000000000
--- a/pcr/libpurple-minimal/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Magicking <syllaur@gmail.com>
-# Contributors: wzff BluePeppers n0nsense
-pkgname=libpurple-minimal
-pkgver=2.10.0
-pkgrel=3
-pkgdesc="minimal build of the pidgin IM library (no gstreamer, perl and X11 dependencies)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://developer.pidgin.im/wiki/WhatIsLibpurple"
-license=('GPL')
-depends=('glib2' 'gnutls' 'libxml2' 'libidn' 'nss' 'avahi')
-makedepends=('make' 'intltool')
-conflicts=('libpurple')
-provides=("libpurple=${pkgver}")
-source="http://downloads.sourceforge.net/pidgin/pidgin-${pkgver}.tar.gz"
-md5sums=('b92f83f6f075d9cd814d3ccff9fd6cac')
-
-build(){
-	cd $srcdir/pidgin-${pkgver}
-	./configure --prefix=/usr \
-		    --sysconfdir=/etc \
-		    --disable-perl \
-		    --disable-gtkui \
-		    --disable-consoleui \
-		    --disable-sm \
-		    --disable-gestures \
-		    --disable-screensaver \
-		    --disable-startup-notification \
-		    --disable-schemas-install \
-		    --disable-tcl \
-		    --disable-tk \
-		    --disable-nls \
-		    --without-x \
-		    --disable-vv \
-		    --disable-gstreamer \
-		    --disable-meanwhile \
-		    --disable-dbus \
-		    --disable-doxygen \
-            --with-system-ssl-certs=/etc/ssl/certs
-	make -C libpurple
-}
-
-package() {
-	cd $srcdir/pidgin-${pkgver}
-	make -C libpurple DESTDIR=$pkgdir install
-}
-
diff --git a/pcr/libqb/PKGBUILD b/pcr/libqb/PKGBUILD
deleted file mode 100644
index 85b3ff082..000000000
--- a/pcr/libqb/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=libqb
-pkgver=0.14.4
-pkgrel=3
-pkgdesc='Library with the primary purpose of providing high performance client server reusable features'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-makedepends=(
-  doxygen
-  splint
-)
-license=LGPL2.1
-options=(!libtool)
-url=https://github.com/asalkeld/$pkgname/wiki
-source=https://github.com/asalkeld/$pkgname/archive/v$pkgver.tar.gz
-sha512sums=1377e38d5547eb516b255c0aa0972e858048053202692d7d5ef1c746d79dee2c78eddc29e797215376990f2c776b34261f765858606b59d77f9218fb0dac5977
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  setarch $CARCH ./autogen.sh
-  setarch $CARCH ./configure --prefix=/usr\
-    --disable-fatal-warnings\
-    --disable-static\
-    --libdir=/usr/lib\
-    --sbindir=/usr/bin
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/libqinfinity/PKGBUILD b/pcr/libqinfinity/PKGBUILD
deleted file mode 100644
index fdd7ed0c4..000000000
--- a/pcr/libqinfinity/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: Antonio Rojas <nqn1976 @ gmail.com>
-# Maintainer: parabola Aurélien Desbrières <aurelien@replicant.io>
-
-pkgname=libqinfinity
-pkgver=0.5.1
-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")
-
-
-build() {
-	cd "$pkgname-v$pkgver"
-	mkdir build
-	cd build
-	cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4
-	make
-}
-
-package() {
-	cd "$pkgname-v$pkgver/build"
-	make DESTDIR="$pkgdir" install
-}
diff --git a/pcr/libquvi-scripts-current/PKGBUILD b/pcr/libquvi-scripts-current/PKGBUILD
deleted file mode 100644
index b03b2935e..000000000
--- a/pcr/libquvi-scripts-current/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $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.20131130
-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=('46ddfd887260a515199c2e1ba8c46d8a'
-         'SKIP')
diff --git a/pcr/librevpn-git/PKGBUILD b/pcr/librevpn-git/PKGBUILD
deleted file mode 100644
index 551a984e2..000000000
--- a/pcr/librevpn-git/PKGBUILD
+++ /dev/null
@@ -1,145 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
- _branch=master
-#_branch=feature/empaquetable
-
-if [[ $_branch == master ]]; then
-  # committer     Nicolás Reynolds <fauno@endefensadelsl.org>     2013-07-30 17:16:33 (GMT)
-  _srcver=20130730
-  _commit=fb7d07789398d7b68ed437db75c68a24b0c17905
-  _sha512sums=4dc77346fe6294d3bcfc47ead15f722bee628daf2a28d3fef9a15960038395140ee98918a4502ed1ed186bedbe2a83d9e68a202323523c8461476776bd3fdb2b
-fi
-
-if [[ $_branch == feature/empaquetable ]]; then
-  # committer     Nicolás Reynolds <fauno@endefensadelsl.org>     2013-07-29 02:41:53 (GMT)
-  _srcver=20130729
-  _commit=5ee3d723da187d85f8b789998f98c8aebec843f7
-  _sha512sums=f4c62b6bda67ce97eff9b35223f6c8d03c813e0151e81289006d8303e3296ed6346c2fb2b3835309d0902d9ea2ea73d4536636f544039ada5ae3d737600b0ebc
-fi
-
-_srcname=lvpn
-_pkgname=librevpn
-pkgname=$_pkgname-git
-pkgver=$_srcver
-pkgrel=3
-pkgdesc='Free Virtual Network with tinc2dot and generate-ipv6-address'
-url=http://$_pkgname.org.ar/
-license=('AGPL3:(lvpn, tinc2dot)' 'MIT:(generate-ipv6-address)')
-arch=(mips64el x86_64 i686)
-depends=(avahi bash tinc)
-optdepends=(
-  'graphviz: for graph and tinc2dot'
-  'libnatpmp: (AUR)'
-  miniupnpc
-  'python2: for avahi-publish-alias'
-  python2-bottle
-  'ruby: for graph'
-  sudo
-)
-provides=($_pkgname)
-conflicts=$_pkgname
-source=$_srcname-$_commit.tar.xz::http://repo.hackcoop.com.ar/$_pkgname.git/snapshot/$_commit.tar.xz
-sha512sums=$_sha512sums
-
-build() {
-  cd $srcdir/$_commit
-
-  if [[ $_branch == feature/empaquetable ]]; then
-    sed -i '\|generate-ipv6-address|d;\|natpmp|d;\|upnpc|d' Makefile
-    sed -i '\|LVPN_DIR=| s|${PWD}|/usr/share/lvpn|' $_srcname.in
-    sed -i 's|${LVPN_DIR}/bin|/usr/bin|;
-            s|$(uname -m)-||;
-           ' lib/common
-    make PREFIX=/usr
-  fi
-
-  cd $srcdir/$_commit/etc/generate-ipv6-address-0.1
-  sed -i 's|`uname -m`-||;s|/man/man8|/share/man/man8|' Makefile
-  make PREFIX=/usr
-}
-
-package() {
-  cd $srcdir/$_commit
-
-  if [[ $_branch == feature/empaquetable ]]; then
-    make PREFIX=$pkgdir/usr TEXTDOMAINDIR=$pkgdir/usr/share/locale install
-
-    msg 'Installing scripts files'
-    install -vm755 bin/avahi-publish-alias $pkgdir/usr/share/$_srcname
-    install -vm755 bin/graph               $pkgdir/usr/share/$_srcname # conflicts with plotutils on /usr/bin
-    install -vm755 bin/tinc2dot            $pkgdir/usr/share/$_srcname # tinc2dot 0.2.1 script
-    install -vm755 bin/cronjob             $pkgdir/usr/share/$_srcname/fauno-cronjob # fauno script
-
-    msg 'Removing dirs'
-    rmdir -v $pkgdir/usr/share/locale/pacman-scripts
-
-    msg 'Fixing beagle patch'
-    rmdir -v $pkgdir/usr/share/$_srcname/beadle
-    ln -vs hosts $pkgdir/usr/share/$_srcname/beadle
-
-    msg 'Adding doc patch'
-    install -vd $pkgdir/usr/share/doc
-    ln -vs ../$_srcname $pkgdir/usr/share/doc/$_srcname
-
-    msg 'Installing locale files'
-    _locales=(en)
-    for _po in ${_locales[@]}; do
-      install -vd $pkgdir/usr/share/locale/$_po/LC_MESSAGES
-      msgfmt -o $pkgdir/usr/share/locale/$_po/LC_MESSAGES/$_srcname.mo locale/$_po.po
-    done
-  fi
-
-  if [[ $_branch == master ]]; then
-    cd $srcdir/$_commit
-
-    msg 'Fixing patchs with sed'
-    sed -i '\|LVPN=|        s|$(readlink -f $0)|lvpn|;
-            \|LVPN_DIR=|    s|$(dirname "$LVPN")|/usr/share/lvpn|;
-            \|LVPN_BIN=|    s|${LVPN_DIR}|/usr|;
-            \|LVPN_LIBDIR=| s|${LVPN_DIR}/lib|/usr/lib/lvpn|;
-           ' $_srcname
-    sed -i 's|${LVPN_DIR}/bin|/usr/bin|;
-            s|$(uname -m)-||;
-           ' lib/{common,lvpn-init}
-
-    msg 'Copying doc, hosts and lib dirs'
-    install -vd $pkgdir/usr/{lib,share/$_srcname}
-    cp -va doc   $pkgdir/usr/share/$_srcname
-    cp -va hosts $pkgdir/usr/share/$_srcname
-    cp -va lib   $pkgdir/usr/lib/$_srcname
-
-    msg 'Installing scripts files'
-    install -vd $pkgdir/usr/bin
-    install -vm755 $_srcname               $pkgdir/usr/bin
-    install -vm755 bin/avahi-publish-alias $pkgdir/usr/share/$_srcname
-    install -vm755 bin/graph               $pkgdir/usr/share/$_srcname # conflicts with plotutils on /usr/bin
-    install -vm755 bin/tinc2dot            $pkgdir/usr/share/$_srcname # tinc2dot 0.2.1 script
-    install -vm755 bin/cronjob             $pkgdir/usr/share/$_srcname/fauno-cronjob # fauno script
-
-    msg 'Fixing beagle patch'
-    ln -vs hosts $pkgdir/usr/share/$_srcname/beadle
-
-    msg 'Adding doc patch'
-    install -vd $pkgdir/usr/share/doc
-    ln -vs ../$_srcname $pkgdir/usr/share/doc/$_srcname
-
-    msg 'Installing locale files'
-    _locales=(en)
-    for _po in ${_locales[@]}; do
-      install -vd $pkgdir/usr/share/locale/$_po/LC_MESSAGES
-      msgfmt -o $pkgdir/usr/share/locale/$_po/LC_MESSAGES/$_srcname.mo locale/$_po.po
-    done
-  fi
-
-  msg 'Creating dirs'
-  install -d $pkgdir/{usr/share/$_srcname/nodos,etc/{logrotate.d,NetworkManager/dispatcher.d}}
-
-  msg 'Installing license files'
-  install -vDm644 LICENSE $pkgdir/usr/share/licenses/$_srcname/COPYING
-
-  msg 'Installing "generate-ipv6-address" files'
-  cd etc/generate-ipv6-address-0.1
-  make PREFIX=$pkgdir/usr TEXTDOMAINDIR=$pkgdir/usr/share/locale install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/librevpn/PKGBUILD b/pcr/librevpn/PKGBUILD
deleted file mode 100644
index 71a3a2f7c..000000000
--- a/pcr/librevpn/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-_pkgname=lvpn
-pkgname=librevpn
-pkgver=0.0.3
-pkgrel=1
-pkgdesc='Free Virtual Network with tinc2dot and generate-ipv6-address'
-url=http://$pkgname.org.ar/
-license=("AGPL3:($_pkgname, tinc2dot)" 'MIT:(generate-ipv6-address)')
-arch=(mips64el x86_64 i686)
-depends=(avahi bash tinc)
-optdepends=(
-  'graphviz: for graph and tinc2dot'
-  'libnatpmp: (AUR)'
-  miniupnpc
-  networkmanager
-  'python2: for avahi-publish-alias'
-  python2-bottle
-  'ruby: for graph'
-  sudo
-)
-source=http://repo.hackcoop.com.ar/$pkgname.git/snapshot/$pkgname-$pkgver.tar.xz
-sha512sums=96a0de4e35d1fd45652c4b7ee25d7335d9b3816065b48e978274845c328b68a03623abf812119af34f1856bd05170cac8ad59f233fc3dcd63ea6c84c89a80968
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  msg "BUGFIX: Fixing Makefile with sed:"
-  msg " * Removing generate-ipv6-address, natpmp and upnpc build softwares"
-  msg " * Fixing wrong man-pages patch"
-  msg " * Removing useless pacman-scripts (or lvpn) patch (TEXTDOMAIN)"
-  sed -i '\|generate-ipv6-address|d;\|natpmp|d;\|upnpc|d;
-          s|/share/man1|/share/man/man1|;
-          s|$(TARGET)$(TEXTDOMAINDIR)/$(TEXTDOMAIN)|$(TARGET)$(TEXTDOMAINDIR)|;
-         ' Makefile
-
-  msg "Building '$pkgname'"
-  make PREFIX=/usr NETWORK=lvpn
-
-  msg "Building 'generate-ipv6-address'"
-  cd etc/generate-ipv6-address-0.1
-  sed -i 's|`uname -m`-||;s|/man/man8|/share/man/man8|' Makefile
-  make PREFIX=/usr
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make PREFIX=$pkgdir/usr TEXTDOMAINDIR=$pkgdir/usr/share/locale install
-
-  msg 'Installing scripts files'
-  msg 'Note: graph scrip conflicts with plotutils on /usr/bin'
-  install -vm755 bin/avahi-publish-alias $pkgdir/usr/bin
-  install -vm755 bin/graph               $pkgdir/usr/bin/$_pkgname-graph
-  install -vm755 bin/tinc2dot            $pkgdir/usr/bin # tinc2dot 0.2.1 script
-  install -vm755 bin/cronjob             $pkgdir/usr/bin/fauno-cronjob # fauno script
-
-  msg 'BUGFIX: Installing doc files'
-  _doc=(es)
-  for _md in ${_doc[@]};do
-    install -vd $pkgdir/usr/share/{doc,$_pkgname/doc/$_md}
-    install -vm644 doc/$_md/*.markdown $pkgdir/usr/share/$_pkgname/doc/$_md
-    ln -vs ../$_pkgname/doc $pkgdir/usr/share/doc/$_pkgname
-  done
-
-  msg 'BUGFIX: Installing locale files'
-  _locales=(en)
-  for _po in ${_locales[@]}; do
-    install -vd $pkgdir/usr/share/locale/$_po/LC_MESSAGES
-    msgfmt -o $pkgdir/usr/share/locale/$_po/LC_MESSAGES/$_pkgname.mo locale/$_po.po
-  done
-
-  #msg 'BUGFIX: Removing useless pacman-scripts dir'
-  #rmdir -v $pkgdir/usr/share/locale/pacman-scripts
-
-  msg 'BUGFIX: Creating NetworkManager dir, due which fail without NetworkManager software'
-  install -d $pkgdir/etc/NetworkManager/dispatcher.d
-
-  msg 'Installing license files'
-  install -vDm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/COPYING
-
-  msg 'Installing "generate-ipv6-address" files'
-  cd etc/generate-ipv6-address-0.1
-  make PREFIX=$pkgdir/usr TEXTDOMAINDIR=$pkgdir/usr/share/locale install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/libshout-idjc/PKGBUILD b/pcr/libshout-idjc/PKGBUILD
deleted file mode 100644
index 51578c420..000000000
--- a/pcr/libshout-idjc/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: fauno, based on the git version from
-# Mantainer: M0Rf30
-pkgname=libshout-idjc
-pkgver=2.3.0
-pkgrel=1
-pkgdesc="Libshout-idjc is libshout plus some extensions for IDJC."
-arch=(i686 x86_64)
-url="http://idjc.sourceforge.net/"
-depends=('libvorbis' 'libtheora' 'speex')
-options=('!libtool' '!emptydirs')
-source=("http://downloads.sourceforge.net/project/idjc/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-license=('LGPL')
-md5sums=('1b92ee05f42a957169a74a911cd94afc')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver/"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make LDFLAGS+=-lspeex
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/"
-  make DESTDIR="${pkgdir}" install
-}
-
diff --git a/pcr/libspatialite/PKGBUILD b/pcr/libspatialite/PKGBUILD
deleted file mode 100644
index 24c775fd8..000000000
--- a/pcr/libspatialite/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Brian Galey <bkgaley at gmail dot com>
-# Contributor: Pietro Zambelli <peter.zamb at gmail dot com>
-pkgname=libspatialite
-pkgver=4.0.0
-pkgrel=1
-pkgdesc="SQLite extension to support spatial data types and operations"
-arch=('i686' 'x86_64')
-url="https://www.gaia-gis.it/fossil/libspatialite/index"
-license=('MPL')
-depends=('geos' 'proj' 'sqlite3' 'libfreexl')
-options=('!libtool')
-source=("http://www.gaia-gis.it/gaia-sins/$pkgname-$pkgver.tar.gz")
-md5sums=('8040ce4e39913e7d284675c0f15d270d')
-
-build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    ./configure --prefix=/usr
-    make
-}
-
-package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/libspnav/Makefile.in.diff b/pcr/libspnav/Makefile.in.diff
deleted file mode 100644
index 4c93b9cb6..000000000
--- a/pcr/libspnav/Makefile.in.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.in.orig	2009-04-18 00:12:45.000000000 +0200
-+++ Makefile.in	2009-04-18 00:16:06.000000000 +0200
-@@ -4,6 +4,7 @@
- lib_a = libspnav.a
- soname = libspnav.so.0
- lib_so = $(soname).1
-+linkname = libspnav.so
- 
- CC = gcc
- AR = ar
-@@ -34,6 +35,8 @@
- install: $(lib_a) $(lib_so)
- 	cp $(lib_a) $(PREFIX)/$(libdir)/$(lib_a)
- 	cp $(lib_so) $(PREFIX)/$(libdir)/$(lib_so)
-+	ln -s $(lib_so) $(linkname)
-+	cp -d $(linkname) $(PREFIX)/$(libdir)/$(linkname)
- 	for h in $(hdr); do cp -p $(srcdir)/$$h $(PREFIX)/include/; done
- 
- .PHONY: uninstall
diff --git a/pcr/libspnav/PKGBUILD b/pcr/libspnav/PKGBUILD
deleted file mode 100644
index da0272ed7..000000000
--- a/pcr/libspnav/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributor: Jan Hambrecht <jaham at gmx dot net>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=libspnav
-pkgver=0.2.2
-pkgrel=3
-pkgdesc="The spacenav project provides a free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://spacenav.sourceforge.net/"
-license=('GPL')
-depends=('libx11')
-source=(http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz Makefile.in.diff)
-md5sums=('b85a0f4ab711e2d4f73a40e2e371f5ae'
-         'f9122ad4ca823e45bfa0538187df6270')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p0 < $srcdir/Makefile.in.diff
-  ./configure --prefix=$pkgdir/usr --disable-debug
-  make || return 1
-  install -d $pkgdir/usr/lib
-  install -d $pkgdir/usr/include
-  make DESTDIR=$pkgdir install || return 1
-}
diff --git a/pcr/libsquish-svn/LICENSE b/pcr/libsquish-svn/LICENSE
deleted file mode 100644
index dd0f22eb9..000000000
--- a/pcr/libsquish-svn/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -----------------------------------------------------------------------------
-
-	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-
-	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.
-	
-   -------------------------------------------------------------------------- */
diff --git a/pcr/libsquish-svn/PKGBUILD b/pcr/libsquish-svn/PKGBUILD
deleted file mode 100644
index 17af64a96..000000000
--- a/pcr/libsquish-svn/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-# Contributor: F0ruD<fzerorubigd{AT}gmail{DOT}com>
-pkgname=libsquish-svn
-pkgver=48
-pkgrel=5
-pkgdesc="DXT compression library - svn build"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/libsquish"
-makedepends=('subversion' )
-license=('MIT')
-provides=('libsquish')
-conflicts=('libsquish' 'kervalasquish-hg' 'kervala_libsquish-hg')
-mksource=("$pkgname-$pkgver"::svn+http://libsquish.googlecode.com/svn/trunk/#revision=$pkgver)
-mkmd5sums=('SKIP')
-
-source=("libre://$pkgname-$pkgver.tar.gz"
-  LICENSE)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  # make install
-  mkdir -p $pkgdir/usr/local/{include,lib}
-  
-  install -Dm 644 squish.h $pkgdir/usr/local/include/squish.h
-  install -Dm 644 libsquish.so.0.0 $pkgdir/usr/local/lib/libsquish.so.0.0
-  install -Dm 644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
-
-sha256sums=('d1c057bf105872f50f504584fd7b31fb980ed5e235b14a92c6cb0aa7d7758e8f'
-            'ed13029728a637f599833a68be22f3cc356a7f13be8d79284b2c415e172efd75')
diff --git a/pcr/libtool-lts/PKGBUILD b/pcr/libtool-lts/PKGBUILD
deleted file mode 100644
index 66bcc547c..000000000
--- a/pcr/libtool-lts/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $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
deleted file mode 100644
index 73cf56422..000000000
--- a/pcr/libtool-lts/libtool.install
+++ /dev/null
@@ -1,20 +0,0 @@
-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/libubox/PKGBUILD b/pcr/libubox/PKGBUILD
deleted file mode 100644
index 577eecd24..000000000
--- a/pcr/libubox/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
-pkgname=libubox
-pkgver=0.8.0
-pkgrel=2
-pkgdesc="OpenWRT's Basic Utility Library"
-arch=('i686' 'mips64el')
-url="https://openwrt.org"
-license=('BSD')
-depends=('json-c')
-makedepends=('git' 'cmake' 'lua51')
-source=(git://nbd.name/luci2/libubox.git)
-md5sums=(SKIP)
-
-pkgver() {
-  cd ${srcdir}/${pkgname}
-  local ver="$(git describe --long --tags)"
-  printf "%s" "${ver//-/.}"
-}
-
-build() {
-  cd ${srcdir}/${pkgname}
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}
-  make DESTDIR=${pkgdir}/ install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/liburcu/PKGBUILD b/pcr/liburcu/PKGBUILD
deleted file mode 100644
index ced12e005..000000000
--- a/pcr/liburcu/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer : Parabola GNU / Linux-libre Aur�lien Desbri�res <aurelien@cwb.io>
-
-pkgname=liburcu
-pkgver=0.7.5
-pkgrel=1
-pkgdesc="LGPLv2.1 userspace RCU (read-copy-update) library"
-arch=('i686' 'x86_64')
-url="http://lttng.org/urcu"
-license=('LGPL2.1')
-source=(http://lttng.org/files/urcu/userspace-rcu-${pkgver}.tar.bz2)
-md5sums=('2c5083fac662ecd38d6076dffa86259b')
-
-build() {
-	cd ${srcdir}/userspace-rcu-${pkgver}
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd ${srcdir}/userspace-rcu-${pkgver}
-	make DESTDIR=${pkgdir} install
-}
diff --git a/pcr/libwww-hg/PKGBUILD b/pcr/libwww-hg/PKGBUILD
deleted file mode 100644
index 9fc91e231..000000000
--- a/pcr/libwww-hg/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-# Maintainer (Archlinux): Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Buharev Vasilij <buharev.v.p@gmail.com>
-
-pkgname=libwww-hg
-pkgver=20130730
-_changeset=facbea79943a
-pkgrel=11
-pkgdesc="A general-purpose client side WEB API"
-arch=('i686' 'x86_64')
-url="http://hg.kervala.net/packaging/"
-license=('W3C')
-depends=()
-conflicts=("libwww")
-provides=("libwww")
-makedepends=('gcc' 'pkgconfig' 'perl' 'zlib')
-options=('!libtool')
-source=("http://hg.kervala.net/packaging/archive/${_changeset}.tar.gz")
-sha256sums=('26adbb77c4ecb3df3a074597a8dfc45b7215879fbc0447cb086199c17ae8ba8d')
-
-
-build() {
-  cd "$srcdir/packaging-${_changeset}/libwww"
-  ./autogen.sh
-  ./configure --prefix=/usr/ \
-    --with-ssl=no --with-zlib --with-expat --with-gnu-ld \
-    --enable-shared --enable-static
-  #sed -i 's#Examples##' Library/Makefile
-  make
-}
-
-package() {
-  cd "$srcdir/packaging-${_changeset}/libwww"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/pcr/lightspark/PKGBUILD b/pcr/lightspark/PKGBUILD
deleted file mode 100644
index bab26aceb..000000000
--- a/pcr/lightspark/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer : speps <speps at aur dot archlinux dot org>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=lightspark
-pkgver=0.7.2
-pkgrel=1
-pkgdesc='An alternative Flash Player for GNU/Linux.'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://lightspark.sourceforge.net'
-license=('GPL3' 'LGPL3')
-depends=('gtk2' 'ffmpeg' 'glew' 'curl' 'boost-libs' 'libxml++' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'fontconfig')
-optdepends=('gnash-gtk: fallback support')
-install="$pkgname.install"
-source=(http://launchpad.net/lightspark/trunk/lightspark-$pkgver/+download/lightspark-$pkgver.tar.gz{,.asc})
-md5sums=('f078d505a354fb66dc5b68ad09a2aa81'
-         'SKIP')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  [ -d bld ] || mkdir bld && cd bld
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
-           -DCMAKE_BUILD_TYPE=Release \
-           -DGNASH_EXE_PATH=/usr/bin/gtk-gnash
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/bld"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/lightspark/lightspark.install b/pcr/lightspark/lightspark.install
deleted file mode 100644
index bce670aff..000000000
--- a/pcr/lightspark/lightspark.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/pcr/lilo/PKGBUILD b/pcr/lilo/PKGBUILD
deleted file mode 100644
index bd2446fd4..000000000
--- a/pcr/lilo/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Connor Behan <connor.behan@gmail.com>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgname=lilo
-pkgver=24.0
-pkgrel=1
-pkgdesc="A bootloader for GNU/Linux (Parabola rebranded)"
-arch=('i686' 'x86_64')
-url="https://alioth.debian.org/projects/lilo/"
-license=('BSD')
-backup=('etc/lilo.conf')
-depends=('device-mapper' 'coreutils')
-makedepends=('bin86' 'sharutils')
-optdepends=('perl: to use keytab-lilo')
-install=lilo.install
-options=('!makeflags')
-source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz"
-        'lilo.conf')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  export LC_ALL=C
-
-  sed -i -e 's/strip lilo.static/strip lilo.static || true/' src/Makefile
-  make all
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -D -m644 "${srcdir}"/lilo.conf "${pkgdir}"/etc/lilo.conf
-  install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-
-  # All binaries in /usr/bin
-  mkdir "${pkgdir}"/usr/bin
-  mv "${pkgdir}"/sbin/lilo "${pkgdir}"/usr/bin/
-  mv "${pkgdir}"/usr/sbin/* "${pkgdir}"/usr/bin/
-  rm -rf "${pkgdir}"/sbin
-  rm -rf "${pkgdir}"/usr/sbin
-
-  # Avoid conflict with syslinux
-  mv "${pkgdir}"/usr/bin/keytab-lilo "${pkgdir}"/usr/bin/keytab-lilo.pl
-}
-md5sums=('03d7090835a5675314082847f1ac7910' 'd06b3c4655577ed01fea79ec5743b4b0')
diff --git a/pcr/lilo/lilo.conf b/pcr/lilo/lilo.conf
deleted file mode 100644
index 479390df5..000000000
--- a/pcr/lilo/lilo.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# /etc/lilo.conf
-#
-
-boot=/dev/sda
-# This line often fixes L40 errors on bootup
-# disk=/dev/sda bios=0x80
-
-default=parabola
-timeout=50
-lba32
-prompt
-
-image=/boot/vmlinuz-linux-libre
-	label=parabola
-	root=/dev/sda3
-	initrd=/boot/initramfs-linux-libre.img
-	read-only
-
-image=/boot/vmlinuz-linux-libre
-	label=parabola-fallback
-	root=/dev/sda3
-	initrd=/boot/initramfs-linux-libre-fallback.img
-	read-only
-
diff --git a/pcr/lilo/lilo.install b/pcr/lilo/lilo.install
deleted file mode 100644
index 7375fddf8..000000000
--- a/pcr/lilo/lilo.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_upgrade() {
-  echo
-  echo "If you use the LILO bootloader, you should run 'lilo' after upgrading."
-  echo
-}
diff --git a/pcr/litecoin-qt/PKGBUILD b/pcr/litecoin-qt/PKGBUILD
deleted file mode 100644
index 28aaf2c0c..000000000
--- a/pcr/litecoin-qt/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Loïc Guitaut <flink at belfalas dot eu>
-
-pkgname='litecoin-qt'
-pkgver=0.8.6.1
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.litecoin.org/"
-makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc')
-license=('MIT')
-pkgdesc="Peer-to-peer network based digital currency (QT)"
-depends=(boost-libs qt4 miniupnpc qrencode)
-conflicts=(litecoin)
-install=litecoin-qt.install
-source=("https://github.com/litecoin-project/litecoin/archive/v$pkgver.tar.gz"
-        "$pkgname.desktop")
-sha256sums=('8aef9e936b57b90d506c5dd2e350c3d0673640b69beb9975d172136eec1d8b34'
-            'cfc53dc9028745358235698ddd562d3e6b4a3ea9f896f5efc1aa8cd81f595559')
-
-build() {
-  cd "$srcdir/litecoin-$pkgver"
-
-  # and make qt gui
-  qmake-qt4 USE_QRCODE=1 USE_UPNP=1
-  make
-}
-
-
-package() {
-  install -Dm644 litecoin-qt.desktop "$pkgdir"/usr/share/applications/litecoin.desktop
-  cd "$srcdir/litecoin-$pkgver"
-  install -Dm755 litecoin-qt "$pkgdir"/usr/bin/litecoin-qt
-  install -Dm644 share/pixmaps/bitcoin128.png "$pkgdir"/usr/share/pixmaps/litecoin128.png
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
diff --git a/pcr/litecoin-qt/litecoin-qt.desktop b/pcr/litecoin-qt/litecoin-qt.desktop
deleted file mode 100644
index d3b9b365f..000000000
--- a/pcr/litecoin-qt/litecoin-qt.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Litecoin
-Comment=Litecoin P2P Cryptocurrency
-Comment[fr]=Litecoin, monnaie virtuelle cryptographique pair à pair
-Comment[tr]=Litecoin, eşten eşe kriptografik sanal para birimi
-Exec=/usr/bin/litecoin-qt
-Terminal=false
-Type=Application
-Icon=/usr/share/pixmaps/litecoin128.png
-MimeType=x-scheme-handler/litecoin;
-Categories=Office;
diff --git a/pcr/litecoin-qt/litecoin-qt.install b/pcr/litecoin-qt/litecoin-qt.install
deleted file mode 100644
index f98ba7338..000000000
--- a/pcr/litecoin-qt/litecoin-qt.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/pcr/log4c/PKGBUILD b/pcr/log4c/PKGBUILD
deleted file mode 100644
index bfcb6bb53..000000000
--- a/pcr/log4c/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor: rockerzz <rockerzz@gmail.com>
-#
-pkgname=log4c
-pkgver=1.2.1
-pkgrel=1
-pkgdesc="Logging FrameWork for C, as Log4j or Log4Cpp"
-url="http://log4c.sourceforge.net/"
-arch=('i686' 'x86_64')
-license="LGPL"
-depends=('gcc-libs')
-makedepends=( 'bash' 'make' 'gcc' )
-source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('ca5412b7515d8901714ab7892323adb6')
-options=('!libtool')
-
-build() {
-  cd $startdir/src/log4c-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
-
diff --git a/pcr/log4cxx/PKGBUILD b/pcr/log4cxx/PKGBUILD
deleted file mode 100644
index c77813e56..000000000
--- a/pcr/log4cxx/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=log4cxx
-pkgver=0.10.0
-pkgrel=2
-pkgdesc="A C++ port of Log4j"
-url="http://logging.apache.org/log4cxx"
-license="APACHE"
-depends=('apr-util' 'libxml2')
-arch=('i686' 'x86_64')
-makedepends=('autoconf' 'automake' 'libtool' 'patch' 'zip' 'gzip' 'sed')
-
-source=(http://archive.apache.org/dist/logging/$pkgname/$pkgver/apache-$pkgname-$pkgver.tar.gz
-        log4cxx-0.10.0-missing_includes.patch)
-md5sums=('b30ffb8da3665178e68940ff7a61084c'
-         'dfa17719a57b19f12cbef94419a2aac8')
-
-build() {
-  cd $startdir/src/apache-$pkgname-$pkgver
-
-  patch -p1 < $startdir/log4cxx-0.10.0-missing_includes.patch
-
-  ./configure --prefix=/usr --disable-static
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
diff --git a/pcr/log4cxx/log4cxx-0.10.0-missing_includes.patch b/pcr/log4cxx/log4cxx-0.10.0-missing_includes.patch
deleted file mode 100644
index 9f3534ccc..000000000
--- a/pcr/log4cxx/log4cxx-0.10.0-missing_includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp
---- apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp	2008-04-01 00:34:52.000000000 +0200
-+++ apache-log4cxx-0.10.0/src/examples/cpp/console.cpp	2008-05-06 05:40:52.000000000 +0200
-@@ -15,7 +15,10 @@
-  * limitations under the License.
-  */
- 
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-+#include <stdint.h>
- #include <log4cxx/logger.h>
- #include <log4cxx/consoleappender.h>
- #include <log4cxx/simplelayout.h>
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp
---- apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp	2008-04-01 00:34:09.000000000 +0200
-+++ apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp	2008-05-06 05:32:31.000000000 +0200
-@@ -21,6 +21,8 @@
- #include <log4cxx/helpers/pool.h>
- #include <log4cxx/helpers/bytebuffer.h>
- 
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
- 
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp
---- apache-log4cxx-0.10.0.orig/src/main/cpp/socketoutputstream.cpp	2008-04-01 00:34:09.000000000 +0200
-+++ apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp	2008-05-06 05:35:55.000000000 +0200
-@@ -20,6 +20,8 @@
- #include <log4cxx/helpers/socket.h>
- #include <log4cxx/helpers/bytebuffer.h>
- 
-+#include <cstring>
-+
- using namespace log4cxx;
- using namespace log4cxx::helpers;
diff --git a/pcr/lostfiles/PKGBUILD b/pcr/lostfiles/PKGBUILD
deleted file mode 100644
index acc8ddd64..000000000
--- a/pcr/lostfiles/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Contributor: graysky <graysky AT archlinux dot us>
-
-pkgname=lostfiles
-pkgver=3.07
-pkgrel=1
-pkgdesc='Find orphan files - those not owned by any Arch packages.'
-arch=('any')
-license=('GPL2')
-depends=('bash')
-url="https://github.com/graysky2/lostfiles"
-source=("https://github.com/graysky2/$pkgname/archive/v$pkgver.tar.gz")
-sha256sums=('970d35a619043471067d58a6702443d5e7b9ab9ead96c37ae0811ecb11d2424d')
-
-package() {
-	cd "$pkgname-$pkgver"
-	install -Dm755 $pkgname "$pkgdir/usr/bin/$pkgname"
-}
diff --git a/pcr/lprof/PKGBUILD b/pcr/lprof/PKGBUILD
deleted file mode 100644
index b25927937..000000000
--- a/pcr/lprof/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Branko Vukelic <bg.branko@gmail.com>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgname=lprof
-pkgver=1.11.4.1
-pkgrel=3
-arch=(i686 x86_64 mips64el)
-pkgdesc="Imaging device calibration tool"
-url="http://lprof.sourceforge.net/"
-license="GPL"
-depends=('qt3' 'lcms>=1.12' 'vigra>=1.3')
-makedepends=('python>=1.53' 'scons')
-source=(http://downloads.sourceforge.net/lprof/${pkgname}-${pkgver}.tar.gz
-        lcms-117.patch)
-md5sums=('2177c77c24aa10db9b7681d264735ea9'
-         '5ce946c711462428a10116065647c823')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p0<../lcms-117.patch
-  sed -i "s/'tiff'/'tiff','png'/" SConstruct || return 1
-  sed -i "s|'moc'|'moc-qt3'|" SConstruct || return 1
-  sed -i "s|'uic'|'uic-qt3'|" SConstruct || return 1
-  sed -i "s|qtdir, 'lib'|qtdir, 'lib', 'qt3'|
-          s|qtdir, 'include'|qtdir, 'include', 'qt3'|
-         " SConstruct || return 1
-  sed -i "s|qmake|qmake-qt3|
-          s|lrelease|lrelease-qt3|
-          s|lupdate|lupdate-qt3|
-         " {createtrans,comptrans}.sh
-  rm -rf scons*
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  scons PREFIX=/usr qt_directory=/usr || return 1
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  install -d ${pkgdir}/usr
-  scons PREFIX=${pkgdir}/usr install
-}
diff --git a/pcr/lprof/lcms-117.patch b/pcr/lprof/lcms-117.patch
deleted file mode 100644
index 55afdfbb8..000000000
--- a/pcr/lprof/lcms-117.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/liblprof/lcmsprf.h.bak	2007-08-31 15:36:20.000000000 -0700
-+++ src/liblprof/lcmsprf.h	2007-08-31 15:37:39.000000000 -0700
-@@ -67,6 +67,9 @@
- #define mmax(a,b) ((a) > (b)?(a):(b))
- #endif
- 
-+#if LCMS_VERSION > 116
-+typedef int BOOL;
-+#endif
- 
- /* Misc operations ------------------------------------------------------------------------ */
- 
diff --git a/pcr/lua-cyrussasl/PKGBUILD b/pcr/lua-cyrussasl/PKGBUILD
deleted file mode 100644
index bc2fa8a32..000000000
--- a/pcr/lua-cyrussasl/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Dwayne Bent <dbb.1@liqd.org>
-
-pkgname=lua-cyrussasl
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="Lua bindings for Cyrus SASL library."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://github.com/JorjBauer/lua-cyrussasl"
-license=('BSD')
-makedepends=('lua51' 'libsasl')
-source=(
-    "lua-cyrussasl-$pkgver.tar.gz::https://github.com/JorjBauer/lua-cyrussasl/tarball/v$pkgver"
-    "lua-cyrussasl.patch"
-)
-md5sums=('40c94c06441e1e47640d81b125742969'
-         '838d383edc30f059ddae44cd564e0b82')
-
-build() {
-    cd $srcdir/*-lua-cyrussasl-*
-    patch -Np1 -i ${srcdir}/lua-cyrussasl.patch
-    make
-}
-
-package() {
-    mkdir -p "$pkgdir/usr/lib/lua/5.1"
-    mkdir -p "$pkgdir/usr/share/licenses/lua-cyrussasl"
-	
-    cd $srcdir/*-lua-cyrussasl-*
-    
-    make DESTDIR=${pkgdir} install
-    install -m644 "LICENSE" "$pkgdir/usr/share/licenses/lua-cyrussasl/LICENSE"
-}
-
diff --git a/pcr/lua-cyrussasl/lua-cyrussasl.patch b/pcr/lua-cyrussasl/lua-cyrussasl.patch
deleted file mode 100644
index e119ccb3b..000000000
--- a/pcr/lua-cyrussasl/lua-cyrussasl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- lua-cyrussasl.orig/Makefile	2010-07-06 12:01:15.000000000 -0500
-+++ lua-cyrussasl/Makefile	2013-02-17 17:07:33.896240233 -0500
-@@ -4,12 +4,18 @@
- #LUAPATH=/usr/share/lua/5.1
- #CPATH=/usr/lib/lua/5.1
- 
-+# Linux (Arch Linux)
-+CFLAGS=-g -O2 -fpic -I/usr/include/lua5.1
-+LDFLAGS=-O -shared -fpic -lsasl2
-+LUAPATH=/usr/share/lua/5.1
-+CPATH=/usr/lib/lua/5.1
-+
- # MacOS
--CFLAGS=-g -Wall -O2
--LDFLAGS=-bundle -undefined dynamic_lookup -lsasl2
--MACOSX_VERSION=10.5
--LUAPATH=/usr/local/share/lua/5.1
--CPATH=/usr/local/lib/lua/5.1
-+#CFLAGS=-g -Wall -O2
-+#LDFLAGS=-bundle -undefined dynamic_lookup -lsasl2
-+#MACOSX_VERSION=10.5
-+#LUAPATH=/usr/local/share/lua/5.1
-+#CPATH=/usr/local/lib/lua/5.1
- 
- #########################################################
- #
-@@ -28,7 +34,7 @@
- all: $(TARGET)
- 
- install: $(TARGET)
--	cp $(TARGET) $(CPATH)
-+	cp $(TARGET) $(DESTDIR)$(CPATH)
- 
- clean:
- 	rm -f *.o *.so *~
diff --git a/pcr/lua-ldap/PKGBUILD b/pcr/lua-ldap/PKGBUILD
deleted file mode 100644
index 5443f20ab..000000000
--- a/pcr/lua-ldap/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-pkgname=lua-ldap
-_pkgname=lualdap
-pkgver=1.1.0
-pkgrel=2
-pkgdesc="Simple interface from Lua to an LDAP client"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.keplerproject.org/lualdap"
-license=('BSD')
-makedepends=('lua51' 'libldap')
-source=(http://files.luaforge.net/releases/$_pkgname/$_pkgname/LuaLDAP$pkgver/$_pkgname-$pkgver.tar.gz
-	lualdap-1.1.0-lua51.patch)
-
-build() {
-    cd $srcdir/$_pkgname-$pkgver
-    patch -Np1 -i ${srcdir}/lualdap-1.1.0-lua51.patch
-    make LUA_INC=/usr/include/lua5.1 
-
-}
-
-package() {
-    cd $srcdir/$_pkgname-$pkgver
-    make LUA_LIBDIR=${pkgdir}/usr/lib/lua/5.1 \
-         LUA_VERSION_NUM=510 \
-         install
-}
-
-md5sums=('5e104520c3f1333f38817a9fa1e76681'
-	 'a7583456b721584ef222d97e49823a81')
diff --git a/pcr/lua-ldap/lualdap-1.1.0-lua51.patch b/pcr/lua-ldap/lualdap-1.1.0-lua51.patch
deleted file mode 100644
index 07059ae08..000000000
--- a/pcr/lua-ldap/lualdap-1.1.0-lua51.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- lualdap-1.1.0.orig/config	2006-07-23 20:42:06.000000000 -0500
-+++ lualdap-1.1.0/config	2013-02-17 16:00:45.947143554 -0500
-@@ -1,10 +1,10 @@
- # Installation directories
- # System's libraries directory (where binary libraries are installed)
--LUA_LIBDIR= /usr/local/lib/lua/5.0
-+LUA_LIBDIR= /usr/lib/lua/5.1
- # Lua includes directory
--LUA_INC= /usr/local/include
-+LUA_INC= /usr/include
- # OpenLDAP includes directory
--OPENLDAP_INC= /usr/local/include
-+OPENLDAP_INC= /usr/include
- # OpenLDAP library (an optional directory can be specified with -L<dir>)
- OPENLDAP_LIB= -lldap
- 
-@@ -13,7 +13,7 @@
- #LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
- 
- # Lua version number (first and second digits of target version)
--LUA_VERSION_NUM= 500
-+LUA_VERSION_NUM= 510
- LIBNAME= $T.so.$V
- COMPAT_DIR= ../compat/src
- 
diff --git a/pcr/lua51-sql-mysql/PKGBUILD b/pcr/lua51-sql-mysql/PKGBUILD
deleted file mode 100644
index 04ffee934..000000000
--- a/pcr/lua51-sql-mysql/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sébastien Luttringer <seblu@archlinux.org>
-# Contributor: Anders Bergh <anders1@gmail.com>
-
-pkgname=lua51-sql-mysql
-pkgdesc='MySQL module for Lua 5.1'
-pkgver=2.2.0
-pkgrel=3
-arch=('i686' 'x86_64')
-url='http://www.keplerproject.org/luasql/'
-license=('MIT')
-depends=('lua51' 'libmariadbclient')
-source=("https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz")
-md5sums=('59d72db444c6369c936d4f03694db6b7')
-
-build() {
-  cd luasql-$pkgver
-  sed -i '24s,$,/lua5.1,' config
-  msg2 'Building MySQL support'
-  make T=mysql PREFIX=/usr DRIVER_LIBS="$(mysql_config --libs)" \
-    DRIVER_INCS="$(mysql_config --include) -fPIC"
-}
-
-package() {
-  cd luasql-$pkgver
-  install -Dm644 src/mysql.so "$pkgdir/usr/lib/lua/5.1/luasql/mysql.so"
-  install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/luabind/PKGBUILD b/pcr/luabind/PKGBUILD
deleted file mode 100644
index da47f927b..000000000
--- a/pcr/luabind/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
-# Maintainer: Jakob Gruber <jakob.gruber@gmail.com>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: rayte <rabyte.at.gmail.dot.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=luabind
-pkgver=0.9.1
-pkgrel=3
-pkgdesc='A library that helps you create bindings between C++ and Lua'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url="http://www.rasterbar.com/products/$pkgname.html"
-license=MIT
-makedepends=(
-  boost
-  boost-build
-  unzip
-)
-depends=(
-  gcc-libs
-  lua51
-)
-source=(
-  "http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-  ${pkgname}_boost.patch
-)
-md5sums=(
-  8a323fb51d07dad5cfdb12c432793d55
-  d62ae6fc635300bc659df9dbb587ac53
-)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  patch -Np1 -i $srcdir/${pkgname}_boost.patch
-
-  # build luabind
-  setarch $CARCH bjam release --prefix=$pkgdir/usr link=static,shared
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  setarch $CARCH bjam release --prefix=$pkgdir/usr link=static,shared install
-
-  # copy license
-  install -Dm644 $srcdir/$pkgname-$pkgver/LICENSE \
-    $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/pcr/luabind/luabind_boost.patch b/pcr/luabind/luabind_boost.patch
deleted file mode 100644
index 92e32828a..000000000
--- a/pcr/luabind/luabind_boost.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git luabind-0.9.1/luabind/detail/call_function.hpp luabind-0.9.1-fixed/luabind/detail/call_function.hpp
-index 1b45ec1..8f5afff 100644
---- luabind-0.9.1/luabind/detail/call_function.hpp
-+++ luabind-0.9.1-fixed/luabind/detail/call_function.hpp
-@@ -323,7 +323,8 @@ namespace luabind
- 
- #endif // LUABIND_CALL_FUNCTION_HPP_INCLUDED
- 
--#elif BOOST_PP_ITERATION_FLAGS() == 1
-+#else
-+#if BOOST_PP_ITERATION_FLAGS() == 1
- 
- #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n *
- #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n
-@@ -440,4 +441,5 @@ namespace luabind
- 
- 
- #endif
-+#endif
- 
-diff --git luabind-0.9.1/luabind/detail/call_member.hpp luabind-0.9.1-fixed/luabind/detail/call_member.hpp
-index de8d563..e63555b 100644
---- luabind-0.9.1/luabind/detail/call_member.hpp
-+++ luabind-0.9.1-fixed/luabind/detail/call_member.hpp
-@@ -316,7 +316,8 @@ namespace luabind
- 
- #endif // LUABIND_CALL_MEMBER_HPP_INCLUDED
- 
--#elif BOOST_PP_ITERATION_FLAGS() == 1
-+#else
-+#if BOOST_PP_ITERATION_FLAGS() == 1
- 
- #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n *
- #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n
-@@ -360,4 +361,5 @@ namespace luabind
- #undef LUABIND_TUPLE_PARAMS
- 
- #endif
-+#endif
- 
-diff --git luabind-0.9.1/luabind/wrapper_base.hpp luabind-0.9.1-fixed/luabind/wrapper_base.hpp
-index d54c668..0f88cc5 100755
---- luabind-0.9.1/luabind/wrapper_base.hpp
-+++ luabind-0.9.1-fixed/luabind/wrapper_base.hpp
-@@ -89,7 +89,8 @@ namespace luabind
- 
- #endif // LUABIND_WRAPPER_BASE_HPP_INCLUDED
- 
--#elif BOOST_PP_ITERATION_FLAGS() == 1
-+#else
-+#if BOOST_PP_ITERATION_FLAGS() == 1
- 
- #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n *
- #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n
-@@ -188,3 +189,4 @@ namespace luabind
- #undef N
- 
- #endif
-+#endif
diff --git a/pcr/lv2-c++-tools/PKGBUILD b/pcr/lv2-c++-tools/PKGBUILD
deleted file mode 100644
index de2e69578..000000000
--- a/pcr/lv2-c++-tools/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer : Guest One <theguestone at gmail dot com>
-# patch taken from https://aur.archlinux.org/packages/lv2-c%2B%2B-tools/
-pkgname=lv2-c++-tools
-pkgver=1.0.4
-pkgrel=1
-pkgdesc="Tools and libraries that may come in handy when writing LV2 plugins."
-arch=('i686')
-url="http://ll-plugins.nongnu.org/hacking.html"
-license=('GPL3')
-depends=('gtkmm')
-makedepends=('boost')
-source=("http://download.savannah.nongnu.org/releases-noredirect/ll-plugins/$pkgname-$pkgver.tar.bz2"
-        "$pkgname-boost-1.50.patch")
-md5sums=('2468f8750bae1d57300853479846e5ed'
-         '1dd1152e9ab8be15248b54546716c8c9')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # boots 1.50 patch
-  patch -p1 -i ../${source[1]}
-
-  # do not call ldconfig
-  sed -i '/ldconfig/d' Makefile.template
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/lv2-c++-tools/lv2-c++-tools-boost-1.50.patch b/pcr/lv2-c++-tools/lv2-c++-tools-boost-1.50.patch
deleted file mode 100644
index 85d3e32da..000000000
--- a/pcr/lv2-c++-tools/lv2-c++-tools-boost-1.50.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -aur lv2-c++-tools-1.0.4/libraries/paq/turtleparser.cpp lv2-c++-tools-1.0.4.patched/libraries/paq/turtleparser.cpp
---- lv2-c++-tools-1.0.4/libraries/paq/turtleparser.cpp	2011-02-27 13:34:39.000000000 +0100
-+++ lv2-c++-tools-1.0.4.patched/libraries/paq/turtleparser.cpp	2012-09-27 16:41:39.925303056 +0200
-@@ -28,7 +28,7 @@
- #include <fcntl.h>
- #include <unistd.h>
- 
--#include <boost/spirit/dynamic.hpp>
-+#include <boost/spirit/include/classic_dynamic.hpp>
- 
- #include "turtleparser.hpp"
- 
-diff -aur lv2-c++-tools-1.0.4/libraries/paq/turtleparser.hpp lv2-c++-tools-1.0.4.patched/libraries/paq/turtleparser.hpp
---- lv2-c++-tools-1.0.4/libraries/paq/turtleparser.hpp	2011-02-27 13:34:39.000000000 +0100
-+++ lv2-c++-tools-1.0.4.patched/libraries/paq/turtleparser.hpp	2012-09-27 16:41:39.925303056 +0200
-@@ -23,10 +23,10 @@
- #ifndef TURTLEPARSER_HPP
- #define TURTLEPARSER_HPP
- 
--#include <boost/spirit/core.hpp>
--#include <boost/spirit/utility.hpp>
--#include <boost/spirit/tree/parse_tree.hpp>
--#include <boost/spirit/tree/ast.hpp>
-+#include <boost/spirit/include/classic_core.hpp>
-+#include <boost/spirit/include/classic_utility.hpp>
-+#include <boost/spirit/include/classic_parse_tree.hpp>
-+#include <boost/spirit/include/classic_ast.hpp>
- 
- #include <algorithm>
- #include <iostream>
-diff -aur lv2-c++-tools-1.0.4/libraries/paq/unicode.hpp lv2-c++-tools-1.0.4.patched/libraries/paq/unicode.hpp
---- lv2-c++-tools-1.0.4/libraries/paq/unicode.hpp	2011-02-27 13:34:39.000000000 +0100
-+++ lv2-c++-tools-1.0.4.patched/libraries/paq/unicode.hpp	2012-09-27 16:42:00.818959807 +0200
-@@ -29,7 +29,7 @@
- 
- 
- using namespace std;
--using namespace boost::spirit;
-+using namespace boost::spirit::classic;
- 
- 
- template <typename ScannerT>
diff --git a/pcr/lv2-ir/PKGBUILD b/pcr/lv2-ir/PKGBUILD
deleted file mode 100644
index cdeaf7414..000000000
--- a/pcr/lv2-ir/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-
-pkgname=lv2-ir
-pkgver=1.3.2
-pkgrel=1
-pkgdesc="zero-latency, realtime, high performance signal convolver especially for creating reverb effects."
-arch=('i686' 'x86_64')
-url="http://factorial.hu/plugins/lv2/ir"
-license=('GPL')
-depends=('zita-convolver' 'libsamplerate' 'gtk2')
-provides=('ir-lv2')
-conflicts=('ir-lv2')
-groups=('lv2-plugins')
-makedepends=('lv2core' )
-
-source=("http://factorial.hu/system/files/ir.lv2-${pkgver}.tar.gz")
-md5sums=('01140e1f70e7f4949f502eafc1958bcd')
-
-build() {
-  cd "$srcdir/ir.lv2-${pkgver}"
-  make
-  make convert4chan
-}
-
-package() {
-  cd "$srcdir/ir.lv2-${pkgver}"
-  make PREFIX="$pkgdir/usr" install
-  install -Dm755 convert4chan "$pkgdir/usr/bin/convert4chan"
-  # fixed location
-  sed -i 's/, but seem like its gone://' README
-  sed -i  's@rhythminmind.net/1313@rhythminmind.net/STN@' README
-  install -Dm644 README "${pkgdir}"/usr/share/doc/$pkgname/README
-}
diff --git a/pcr/maildirproc/PKGBUILD b/pcr/maildirproc/PKGBUILD
deleted file mode 100644
index 0e3becf75..000000000
--- a/pcr/maildirproc/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): Mick Koch <kchmck@gmail.com>
-
-pkgname="maildirproc"
-pkgver="0.5.0"
-pkgrel="3"
-pkgdesc="Sorts mail based on a Python configuration file"
-arch=("any")
-url="http://joel.rosdahl.net/maildirproc/"
-license=("GPL") # GPLv2+
-depends=("python")
-source=("http://joel.rosdahl.net/maildirproc/releases/$pkgname-$pkgver.tar.bz2")
-md5sums=("eaa001f6cd1befee99528ca55da979ca")
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  python setup.py install --root="$pkgdir" --optimize=1
-
-  mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
-  cp -r doc/* "$pkgdir"/usr/share/doc/$pkgname/
-}
diff --git a/pcr/maliit-framework/PKGBUILD b/pcr/maliit-framework/PKGBUILD
deleted file mode 100644
index 995a12582..000000000
--- a/pcr/maliit-framework/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Jon Nordby <jononor@gmail.com>
-# Maintainer: Jon Nordby <jononor@gmail.com>
-# Maintainer (Parabola): Javier Barcena <javierbuilder@gmail.com>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgname=maliit-framework
-pkgver=0.99.0
-pkgrel=6
-pkgdesc="Maliit Input Methods - Framework"
-arch=('x86_64' 'i686')
-url="http://maliit.org"
-license=('LGPL')
-depends=('qt5-base' 'qt5-quick1' 'gtk2' 'gtk3' 'gconf')
-install=$pkgname.install
-source=(http://maliit.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('c5e8c67cbfb514122518d92f1edcc990')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # BUILD
-  qmake -r .
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make INSTALL_ROOT="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain maliit-framework "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-} 
diff --git a/pcr/maliit-framework/maliit-framework.install b/pcr/maliit-framework/maliit-framework.install
deleted file mode 100755
index 08c54ae1b..000000000
--- a/pcr/maliit-framework/maliit-framework.install
+++ /dev/null
@@ -1,30 +0,0 @@
-pkgname=maliit-framework
-
-post_install() {
-  echo "Updating gtk.immodules..."
-  gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-  gtk-query-immodules-3.0 --update-cache
-  echo "Done."
-
-  gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  echo "Updating gtk.immodules..."
-  gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-  gtk-query-immodules-3.0 --update-cache
-  echo "Done."
-
-}
diff --git a/pcr/maliit-plugins/PKGBUILD b/pcr/maliit-plugins/PKGBUILD
deleted file mode 100644
index cdab07003..000000000
--- a/pcr/maliit-plugins/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Jon Nordby <jononor@gmail.com>
-# Maintainer: Jon Nordby <jononor@gmail.com>
-
-pkgname=maliit-plugins
-pkgver=0.99.0
-pkgrel=1
-pkgdesc="Maliit Input Methods - Plugins"
-arch=('x86_64' 'i686')
-url="http://maliit.org"
-license=('LGPL')
-depends=('qt5-base' 'maliit-framework')
-source=(http://maliit.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        config.patch)
-md5sums=('29f07d937803a61e74301e4616d55dbb'
-         'f43d45c9917924750edf36000492bd73')
-
-build() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-
-  # fix issue on building
-  patch -Np1 -i "$srcdir/config.patch"
-
-  # BUILD
-  qmake -r . CONFIG+=notests
-  make
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-
-  make install INSTALL_ROOT="$pkgdir/"
-} 
diff --git a/pcr/mariadb-galera/PKGBUILD b/pcr/mariadb-galera/PKGBUILD
deleted file mode 100644
index 920137305..000000000
--- a/pcr/mariadb-galera/PKGBUILD
+++ /dev/null
@@ -1,107 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-
-pkgname=mariadb-galera
-pkgbase=mariadb-galera
-pkgver=5.5.33a
-_pkgver=${pkgver/.a/a}
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-url='https://mariadb.com/kb/en/galera/'
-pkgdesc='Fast SQL database server, drop-in replacement for MySQL with Galera Cluster'
-backup=('etc/mysql/my.cnf')
-install=mariadb.install
-depends=('mariadb-clients' 'inetutils' 'libaio' 'galera')
-conflicts=('mysql')
-provides=("mysql=$pkgver" "mariadb")
-options=('emptydirs')
-makedepends=('cmake' 'openssl' 'zlib' 'libaio')
-source=(http://ftp.wa.co.za/pub/mariadb/${pkgname}-${pkgver}/kvm-tarbake-jaunty-x86/${pkgname}-${pkgver}.tar.gz
-        mariadb.service
-        mariadb-post.sh
-        mariadb-tmpfile.conf)
-sha256sums=('1b49e41e677d95f7a5b548771a81c6430ec6f0ee16e7ee624fb2fe2b278183b8'
-            'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334'
-            '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
-            '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
-
-prepare() {
-  mkdir build
-}
-
-build() {
-  cd build
-
-  cmake ../mariadb-$pkgver \
-    -DBUILD_CONFIG=mysql_release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSYSCONFDIR=/etc/mysql \
-    -DMYSQL_DATADIR=/var/lib/mysql \
-    -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
-    -DDEFAULT_CHARSET=utf8 \
-    -DDEFAULT_COLLATION=utf8_general_ci \
-    -DENABLED_LOCAL_INFILE=ON \
-    -DINSTALL_INFODIR=share/mysql/docs \
-    -DINSTALL_MANDIR=share/man \
-    -DINSTALL_PLUGINDIR=lib/mysql/plugin \
-    -DINSTALL_SCRIPTDIR=bin \
-    -DINSTALL_INCLUDEDIR=include/mysql \
-    -DINSTALL_DOCREADMEDIR=share/mysql \
-    -DINSTALL_SUPPORTFILESDIR=share/mysql \
-    -DINSTALL_MYSQLSHAREDIR=share/mysql \
-    -DINSTALL_DOCDIR=share/mysql/docs \
-    -DINSTALL_SHAREDIR=share/mysql \
-    -DWITH_READLINE=ON \
-    -DWITH_ZLIB=system \
-    -DWITH_SSL=system \
-    -DWITH_LIBWRAP=OFF \
-    -DWITH_EXTRA_CHARSETS=complex \
-    -DWITH_EMBEDDED_SERVER=ON \
-    -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
-    -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
-    -DWITH_INNOBASE_STORAGE_ENGINE=1 \
-    -DWITH_PARTITION_STORAGE_ENGINE=1 \
-    -DWITH_TOKUDB_STORAGE_ENGINE=1 \
-    -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
-    -DWITHOUT_OQGRAPH_STORAGE_ENGINE=1 \
-    -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
-    -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" \
-    -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
-    -DWITH_WSREP=ON \
-    -DWITH_INNODB_DISALLOW_WRITES=1
-
-
-  make
-}
-
-package() {
-
-  cd build
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf
-  install -Dm755 ../mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post
-  install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
-  install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
-
-  # provided by libmariadbclient
-  cd "$pkgdir"
-  rm -f usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  rm -f usr/lib/libmysql*
-  rm -rf usr/include/
-  rm -f usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
-  
-  # provided by mariadb-clients
-  rm -f usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
-  rm -f usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
-
-  # provided by mytop
-  rm -f usr/bin/mytop
-
-  # not needed
-  rm -rf usr/{data,mysql-test,sql-bench}
-  rm -f usr/share/man/man1/mysql-test-run.pl.1
-}
diff --git a/pcr/mariadb-galera/mariadb-post.sh b/pcr/mariadb-galera/mariadb-post.sh
deleted file mode 100644
index c4ac18171..000000000
--- a/pcr/mariadb-galera/mariadb-post.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-while true; do
-    response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break
-    echo "$response" | grep -q "mysqld is alive" && break
-    echo "$response" | grep -q "Access denied for user" && break 
-    sleep 1
-done
diff --git a/pcr/mariadb-galera/mariadb-tmpfile.conf b/pcr/mariadb-galera/mariadb-tmpfile.conf
deleted file mode 100644
index 6883dc798..000000000
--- a/pcr/mariadb-galera/mariadb-tmpfile.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/mysqld 0755 mysql mysql -
diff --git a/pcr/mariadb-galera/mariadb.install b/pcr/mariadb-galera/mariadb.install
deleted file mode 100644
index 7d3c2ce5c..000000000
--- a/pcr/mariadb-galera/mariadb.install
+++ /dev/null
@@ -1,47 +0,0 @@
-if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then
-  datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p")
-fi
-[[ -z $datadir ]] && datadir=/var/lib/mysql
-
-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
-    chown -R mysql:mysql var/lib/mysql &>/dev/null
-  fi
-
-  usr/bin/systemd-tmpfiles --create mysql.conf
-
-  echo ">> If you are migrating from MySQL, don't forget to run 'mysql_upgrade'"
-  echo "     after mysqld.service restart." 
-}
-
-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.25-4)" -lt 0 ]] && [[ -d /data ]]; then
-    for x in data/*; do
-      cp -r $x $datadir/
-    done
-    rm -rf data
-  fi
-
-  if [[ "$(vercmp $2 5.5.25-5)" -lt 0 ]]; then
-    echo ">> mysql.service has been renamed to mysqld.service to keep"
-    echo "    consistency with MySQL package." 
-  fi
-}
-
-post_remove(){
-  if getent passwd mysql >/dev/null 2>&1; then
-    userdel mysql
-
-  fi
-  if getent group mysql >/dev/null 2>&1; then
-    groupdel mysql
-  fi
-}
diff --git a/pcr/mariadb-galera/mariadb.service b/pcr/mariadb-galera/mariadb.service
deleted file mode 100644
index dd65511d7..000000000
--- a/pcr/mariadb-galera/mariadb.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=MariaDB database server
-After=syslog.target
-
-[Service]
-User=mysql
-Group=mysql
-
-ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid 
-ExecStartPost=/usr/bin/mysqld-post
-
-Restart=always
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/mathjax/PKGBUILD b/pcr/mathjax/PKGBUILD
deleted file mode 100644
index 2bdc6ec67..000000000
--- a/pcr/mathjax/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Kevin Dodd <jesin00@gmail.com>
-# Contributor: Tianjiao Yin <ytj000@gmail.com>
-
-pkgname=mathjax
-pkgver=2.3
-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 libtool staticlibs)
-source=("https://github.com/mathjax/MathJax/archive/v${pkgver}.tar.gz")
-sha256sums=('0cd8f6de29b6c686550098119ab5301bdf60b03aeb8f9f2058e2832a0662687b')
-
-package() {
-	mkdir -p "$pkgdir/usr/share/fonts"
-	mv "$srcdir/MathJax-$pkgver" "$pkgdir/usr/share/mathjax"
-	ln -s '../mathjax/fonts' "$pkgdir/usr/share/fonts/mathjax"
-}
-
diff --git a/pcr/md5deep/PKGBUILD b/pcr/md5deep/PKGBUILD
deleted file mode 100755
index fe1acb7bd..000000000
--- a/pcr/md5deep/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: billycongo <billycongo@gmail.com>
-# Maintainer: dkaylor <dpkaylor@gmail.com>
-
-pkgname=md5deep
-pkgver=4.3
-pkgrel=2
-arch=('i686' 'x86_64')
-pkgdesc="Advanced checksum hashing tool"
-url="http://md5deep.sourceforge.net"
-license=('Public Domain')
-
-# Copyright and license stuff:
-#
-# This program is a work of the US Government.
-# In accordance with 17 USC 105, copyright protection is not available for any work of the US Government. 
-# This program is PUBLIC DOMAIN. Portions of this program contain code that is licensed under the terms of the General Public License (GPL). 
-# Those portions retain their original copyright and license. See the file COPYING for more details.
-# There is NO warranty for this program; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
-#
-# md5deep was originally developed by Jesse Kornblum <research (a t) jessekornblum ,,dot. com> during his service as a 
-# Special Agent with the United States Air Force Office of Special Investigations (AFOSI).
-# As such, md5deep exists in the public domain under 17 USC 105.
-
-depends=('glibc')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-
-md5sums=('f172e686ca1df83a53308ad90f7f706d')
-sha1sums=('b9dd6444f07c9fc344ebef201baebdf71bda337f')
-sha256sums=('905bcf8bddf0e7e2650b280d5e7af8cb8cd41dad4f299751dfec397dcb4f8d54')
-sha512sums=('fe1240e6ae039b18d35a9de0cf15fb77eaac9d5505b6b550eb32858bf6d603f8186de06114d40325d5071640f46cec70795e9c192fa7b6ca9022a12c212a9b14')
-
-
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR=$pkgdir install
-}
diff --git a/pcr/mda-lv2/PKGBUILD b/pcr/mda-lv2/PKGBUILD
deleted file mode 100644
index 500a656a5..000000000
--- a/pcr/mda-lv2/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-
-pkgname=mda-lv2
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="An LV2 port of the MDA plugins by Paul Kellett"
-arch=('i686')
-url="http://drobilla.net/2012/04/21/mda-lv2-1-0-0/"
-license=('GPL3')
-depends=('lv2')
-makedepends=('python2')
-source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('843ac4eade386034562917e95905e5d8')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 ./waf configure --prefix=/usr
-  python2 ./waf
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  DESTDIR="$pkgdir" python2 ./waf install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/mediatomb/PKGBUILD b/pcr/mediatomb/PKGBUILD
deleted file mode 100644
index f07e12748..000000000
--- a/pcr/mediatomb/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# Contributor: Peter Richard Lewis <plewis@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Nikhil Bysani <nikron@gmail.com>
-# Contributor: Mika Hynnä <igheax@gmail.com>
-# Contributor: Jonathan Conder <jonno.conder@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=mediatomb
-pkgver=0.12.1
-pkgrel=11
-pkgdesc="Free UPnP/DLNA media server"
-arch=('i686' 'x86_64')
-url="http://mediatomb.cc/"
-license=('GPL')
-depends=('file' 'curl' 'ffmpegthumbnailer' 'js' 'libexif' 'libmp4v2' 'sqlite3' 'taglib' 'libmysqlclient')
-optdepends=('mysql: to store your music database in mysql')
-backup=('etc/conf.d/mediatomb')
-install=mediatomb.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-        'mediatomb.rc'
-        'mediatomb.conf'
-        'gcc46.patch'
-        'tonewjs.patch'
-        'jsparse.patch'
-        'libav_0.7_support.patch'
-        'libmp4v2_191_p497.patch'
-        'libavformat.patch')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/gcc46.patch"
-  patch -Np1 -i "$srcdir/tonewjs.patch"
-  patch -Np1 -i "$srcdir/jsparse.patch"
-  patch -Np1 -i "$srcdir/libav_0.7_support.patch"
-  patch -Np1 -i "$srcdir/libmp4v2_191_p497.patch"
-  patch -Np1 -i "$srcdir/libavformat.patch"
-
-  ./configure --prefix=/usr \
-              --enable-mysql \
-              --enable-libmagic \
-              --enable-libjs \
-              --enable-ffmpeg
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  install -D -m0755 "$srcdir/mediatomb.rc" "$pkgdir/etc/rc.d/mediatomb"
-  install -D -m0755 "$srcdir/mediatomb.conf" "$pkgdir/etc/conf.d/mediatomb"
-  install -d "$pkgdir/var/lib/mediatomb"
-}
-sha256sums=('31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd'
-            '1a67a1deb8a41467fe9bbf66358a255f0df97b0170a5fc3d48c1f768c8d328b9'
-            'ba9753a4a380d4c717c987efec03a3c6d401d3ff93a6fced28098adbd3a44cc9'
-            '0c02a20032f0c296800b1bb9644638970c2dedbc5ab7141d66a637235e9da6ce'
-            '2cd8f5628c3a38b290526f008bae351b90211825f86e5959bf95f140748de574'
-            'd9a3062858900d32b977f0d50d168fd7d36785b6ecc038c019e661e27f7b1c17'
-            'c6523e8bf5e2da89b7475d6777ef9bffe7d089752ef2f7b27b5e39a4130fb0ff'
-            'd39c2f9aab051c5447461718fd0ec72cf5982f6c920a4a985a50831f34babe84'
-            '76b11706d70ed8f5e157d96ca441c90c46c42176102fcb651b4ab1102b61bfee')
diff --git a/pcr/mediatomb/gcc46.patch b/pcr/mediatomb/gcc46.patch
deleted file mode 100644
index 0f4fe490f..000000000
--- a/pcr/mediatomb/gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/zmm/object.h
-+++ b/src/zmm/object.h
-@@ -33,6 +33,7 @@
- #define __ZMM_OBJECT_H__
- 
- #include <new> // for size_t
-+#include <cstddef>
- #include "atomic.h"
- 
- namespace zmm
diff --git a/pcr/mediatomb/jsparse.patch b/pcr/mediatomb/jsparse.patch
deleted file mode 100644
index 9938939b0..000000000
--- a/pcr/mediatomb/jsparse.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff -rup mediatomb-0.12.1/src/scripting/js_functions.cc ../mediatomb-0.12.1/src/scripting/js_functions.cc
---- mediatomb-0.12.1/src/scripting/js_functions.cc	2011-06-29 21:51:13.641025479 -0400
-+++ ../mediatomb-0.12.1/src/scripting/js_functions.cc	2011-06-29 21:49:21.071800273 -0400
-@@ -51,15 +51,28 @@ extern "C" {
- JSBool 
- js_print(JSContext *cx, uintN argc, jsval *argv)
- {
--    uintN i;
-+    uintN i, j;
-     JSString *str;
- 
-     for (i = 0; i < argc; i++) 
-     {
--        str = JS_ValueToString(cx, argv[i]);
-+    	String fmtStr;
-+    	for (j = 0; j < argc; j++)
-+    	{
-+    		if (j == i)
-+    			fmtStr = fmtStr + "S";
-+    		else
-+    			fmtStr = fmtStr + "*";
-+    	}
-+    	if(!JS_ConvertArguments(cx, 1, JS_ARGV(cx, argv), fmtStr.c_str(), &str))
-+		{
-+			log_debug("Could not parse input arguments\n");
-+			return JS_TRUE;
-+		}
-+
-         if (!str)
-             return JS_TRUE;
--        argv[i] = STRING_TO_JSVAL(str);
-+
-         char * log_str = JS_EncodeString(cx, str);
-         log_js("%s\n", log_str);
-         JS_free(cx, log_str);
-@@ -116,24 +129,54 @@ js_addCdsObject(JSContext *cx, uintN arg
- {
-     try
-     {
--        jsval arg;
--        JSString *str;
--        String path;
--        String containerclass;
-+    	// Inputs from native code
-+        JSObject *js_cds_obj = NULL;
-+        JSString *str =  NULL;
-+        JSString *cont = NULL;
- 
--        JSObject *js_cds_obj;
-+        String path = nil;
-+        String containerclass = nil;
-+
-+        JSObject *obj = JS_THIS_OBJECT(cx, argv);
-         JSObject *js_orig_obj = NULL;
-         Ref<CdsObject> orig_object;
- 
-         Ref<StringConverter> p2i;
-         Ref<StringConverter> i2i;
-+        switch (argc)
-+        {
-+        case 0:
-+        	log_debug("No input arguments given\n");
-+        	return JS_FALSE;
-+        case 1:
-+			if(!JS_ConvertArguments(cx, 1, JS_ARGV(cx, argv), "o", &js_cds_obj))
-+			{
-+				log_debug("Could not parse input arguments\n");
-+				return JS_TRUE;
-+			}
-+			break;
-+        case 2:
-+        	if(!JS_ConvertArguments(cx, 2, JS_ARGV(cx, argv), "oS", &js_cds_obj, &str))
-+			{
-+				log_debug("Could not parse input arguments\n");
-+				return JS_TRUE;
-+			}
-+			break;
-+        default:
-+        	if(!JS_ConvertArguments(cx, 3, JS_ARGV(cx, argv), "oSS", &js_cds_obj, &str, &cont))
-+			{
-+				log_debug("Could not parse input arguments\n");
-+				return JS_TRUE;
-+			}
-+			break;
-+        }
- 
--        Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
-+        Script *self = (Script *)JS_GetPrivate(cx, obj);
- 
-         if (self == NULL)
-         {
-             log_debug("Could not retrieve class instance from global object\n");
--            return JS_FALSE;
-+            return JS_TRUE;
-         }
- 
-         if (self->whoami() == S_PLAYLIST)
-@@ -144,23 +187,14 @@ js_addCdsObject(JSContext *cx, uintN arg
-         {
-             i2i = StringConverter::i2i();
-         }
-- 
--        arg = argv[0];
--        if (!JSVAL_IS_OBJECT(arg))
--            return JS_TRUE;
--        if (!JS_ValueToObject(cx, arg, &js_cds_obj))
--            return JS_TRUE;
- 
--        // root it
--        argv[0] = OBJECT_TO_JSVAL(js_cds_obj);
- 
--        str = JS_ValueToString(cx, argv[1]);
-         if (!str)
-             path = _("/");
-         else
-             path = JS_EncodeString(cx, str);
- 
--        JSString *cont = JS_ValueToString(cx, argv[2]);
-+
-         if (cont)
-         {
-             containerclass = JS_EncodeString(cx, cont);
-@@ -169,9 +203,9 @@ js_addCdsObject(JSContext *cx, uintN arg
-         }
- 
-         if (self->whoami() == S_PLAYLIST)
--            js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("playlist"));
-+            js_orig_obj = self->getObjectProperty(obj, _("playlist"));
-         else if (self->whoami() == S_IMPORT)
--            js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("orig"));
-+            js_orig_obj = self->getObjectProperty(obj, _("orig"));
-         
-         if (js_orig_obj == NULL)
-         {
-@@ -179,9 +213,6 @@ js_addCdsObject(JSContext *cx, uintN arg
-             return JS_TRUE;
-         }
- 
--        // root it
--        argv[1] = OBJECT_TO_JSVAL(js_orig_obj);
--
-         orig_object = self->jsObject2cdsObject(js_orig_obj, self->getProcessedObject());
-         if (orig_object == nil)
-             return JS_TRUE;
diff --git a/pcr/mediatomb/libav_0.7_support.patch b/pcr/mediatomb/libav_0.7_support.patch
deleted file mode 100644
index e25697c50..000000000
--- a/pcr/mediatomb/libav_0.7_support.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-=== modified file 'src/metadata/ffmpeg_handler.cc'
---- old/src/metadata/ffmpeg_handler.cc	2010-08-25 17:07:03 +0000
-+++ new/src/metadata/ffmpeg_handler.cc	2011-05-19 04:33:32 +0000
-@@ -89,6 +89,33 @@
- 
- 	Ref<StringConverter> sc = StringConverter::m2i();
-     
-+	/* Tabs are 4 characters here */
-+	typedef struct {const char *avname; metadata_fields_t field;} mapping_t;
-+	static const mapping_t mapping[] =
-+	{
-+		{"title",   M_TITLE},
-+		{"artist",  M_ARTIST},
-+		{"album",   M_ALBUM},
-+		{"date",    M_DATE},
-+		{"genre",   M_GENRE},
-+		{"comment", M_DESCRIPTION},
-+		{"track",   M_TRACKNUMBER},
-+		{NULL,      M_MAX},
-+	};
-+
-+	if (!pFormatCtx->metadata)
-+		return;
-+	for (const mapping_t *m = mapping; m->avname != NULL; m++)
-+	{
-+		AVMetadataTag *tag = NULL;
-+		tag = av_metadata_get(pFormatCtx->metadata, m->avname, NULL, 0);
-+		if (tag && tag->value && tag->value[0])
-+		{
-+			log_debug("Added metadata %s: %s\n", m->avname, tag->value);
-+			item->setMetadata(MT_KEYS[m->field].upnp, sc->convert(tag->value));
-+		}
-+	}
-+	/* Old algorithm (doesn't work with libav >= 0.7)
- 	if (strlen(pFormatCtx->title) > 0) 
-     {
- 	    log_debug("Added metadata title: %s\n", pFormatCtx->title);
-@@ -131,6 +158,7 @@
-         item->setMetadata(MT_KEYS[M_TRACKNUMBER].upnp, 
-                           sc->convert(String::from(pFormatCtx->track)));
- 	}
-+	*/
- }
- 
- // ffmpeg library calls
-@@ -178,7 +206,7 @@
- 	for(i=0; i<pFormatCtx->nb_streams; i++) 
-     {
- 		AVStream *st = pFormatCtx->streams[i];
--		if((st != NULL) && (videoset == false) && (st->codec->codec_type == CODEC_TYPE_VIDEO))
-+		if((st != NULL) && (videoset == false) && (st->codec->codec_type == AVMEDIA_TYPE_VIDEO))
-         {
-             if (st->codec->codec_tag > 0)
-             {
-@@ -209,7 +237,7 @@
-                 *y = st->codec->height;
- 			}
- 		} 
--		if(st->codec->codec_type == CODEC_TYPE_AUDIO) 
-+		if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO) 
-         {
- 			// Increase number of audiochannels
- 			audioch++;
-
diff --git a/pcr/mediatomb/libavformat.patch b/pcr/mediatomb/libavformat.patch
deleted file mode 100644
index 96685ea15..000000000
--- a/pcr/mediatomb/libavformat.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- mediatomb-0.12.1.orig/src/metadata/ffmpeg_handler.cc	2012-06-18 02:50:35.000000000 -0400
-+++ mediatomb-0.12.1/src/metadata/ffmpeg_handler.cc	2012-06-18 02:59:02.000000000 -0400
-@@ -107,8 +107,8 @@
- 		return;
- 	for (const mapping_t *m = mapping; m->avname != NULL; m++)
- 	{
--		AVMetadataTag *tag = NULL;
--		tag = av_metadata_get(pFormatCtx->metadata, m->avname, NULL, 0);
-+		AVDictionaryEntry *tag = NULL;
-+		tag = av_dict_get(pFormatCtx->metadata, m->avname, NULL, 0);
- 		if (tag && tag->value && tag->value[0])
- 		{
- 			log_debug("Added metadata %s: %s\n", m->avname, tag->value);
-@@ -278,7 +278,7 @@
-     int x = 0;
-     int y = 0;
- 
--	AVFormatContext *pFormatCtx;
-+	AVFormatContext *pFormatCtx = avformat_alloc_context();
- 	
- 	// Suppress all log messages
- 	av_log_set_callback(FfmpegNoOutputStub);
-@@ -286,15 +286,15 @@
- 	// Register all formats and codecs
-     av_register_all();
- 
--    // Open video file
--    if (av_open_input_file(&pFormatCtx, 
--                          item->getLocation().c_str(), NULL, 0, NULL) != 0)
-+	// Open video file
-+    if (avformat_open_input(&pFormatCtx, 
-+                          item->getLocation().c_str(), NULL, NULL) != 0)
-         return; // Couldn't open file
- 
-     // Retrieve stream information
--    if (av_find_stream_info(pFormatCtx) < 0)
-+    if (avformat_find_stream_info(pFormatCtx,NULL) < 0)
-     {
--        av_close_input_file(pFormatCtx);
-+        avformat_close_input(&pFormatCtx);
-         return; // Couldn't find stream information
-     }   
- 	// Add metadata using ffmpeg library calls
-@@ -303,7 +303,7 @@
- 	addFfmpegResourceFields(item, pFormatCtx, &x, &y);
- 	
-     // Close the video file
--    av_close_input_file(pFormatCtx);
-+    avformat_close_input(&pFormatCtx);
- }
- 
- Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t *data_size)
diff --git a/pcr/mediatomb/libmp4v2_191_p497.patch b/pcr/mediatomb/libmp4v2_191_p497.patch
deleted file mode 100644
index 6a6b51e1e..000000000
--- a/pcr/mediatomb/libmp4v2_191_p497.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff -urN old/src/metadata/libmp4v2_handler.cc new/src/metadata/libmp4v2_handler.cc
---- old/src/metadata/libmp4v2_handler.cc	2012-04-05 01:46:26.000000000 +0200
-+++ new/src/metadata/libmp4v2_handler.cc	2012-04-05 02:01:24.000000000 +0200
-@@ -65,29 +65,28 @@
- static void addMetaField(metadata_fields_t field, MP4FileHandle mp4, Ref<CdsItem> item)
- {
-     String value;
--    char*  mp4_retval = NULL;
--    u_int16_t track;
--    u_int16_t total_tracks;
-- 
-     Ref<StringConverter> sc = StringConverter::i2i();
-     
-+    const MP4Tags* new_tags = MP4TagsAlloc();
-+
-+    if (!MP4TagsFetch(new_tags, mp4))
-+        return;
-+
-     switch (field)
-     {
-         case M_TITLE:
--            MP4GetMetadataName(mp4, &mp4_retval);
-+            value = new_tags->name;
-             break;
-         case M_ARTIST:
--            MP4GetMetadataArtist(mp4, &mp4_retval);
-+            value = new_tags->artist;
-             break;
-         case M_ALBUM:
--            MP4GetMetadataAlbum(mp4, &mp4_retval);
-+            value = new_tags->album;
-             break;
-         case M_DATE:
--            MP4GetMetadataYear(mp4, &mp4_retval);
--            if (mp4_retval)
-+            value = new_tags->releaseDate;
-+            if (value.length() > 0)
-             {
--                value = mp4_retval;
--                free(mp4_retval);
-                 if (string_ok(value))
-                     value = value + "-01-01";
-                 else
-@@ -95,34 +94,31 @@
-             }
-             break;
-         case M_GENRE:
--            MP4GetMetadataGenre(mp4, &mp4_retval);
-+            value = new_tags->genre;
-             break;
-         case M_DESCRIPTION:
--            MP4GetMetadataComment(mp4, &mp4_retval);
-+            value = new_tags->comments;
-             break;
-         case M_TRACKNUMBER:
--            MP4GetMetadataTrack(mp4, &track, &total_tracks);
--            if (track > 0)
-+            if (new_tags->track)
-             {
--                value = String::from(track);
--                item->setTrackNumber((int)track);
-+                value = String::from(new_tags->track->index);
-+                item->setTrackNumber((int)new_tags->track->index);
-             }
-             else
-+			{
-+			    MP4TagsFree( new_tags );
-                 return;
-+            }
-             break;
-         default:
-+			MP4TagsFree( new_tags );
-             return;
-     }
- 
--    if ((field != M_DATE) && (field != M_TRACKNUMBER) && 
--        (mp4_retval))
--    {
--        value = mp4_retval;
--        free(mp4_retval);
--    }
--    
-+	MP4TagsFree( new_tags );
-     value = trim_string(value);
--    
-+
-     if (string_ok(value))
-     {
-         item->setMetadata(MT_KEYS[field].upnp, sc->convert(value));
-@@ -190,14 +186,19 @@
-         }
- 
- #if defined(HAVE_MAGIC)
--        u_int8_t *art_data;
--        u_int32_t art_data_len;
-+        void *art_data = 0;
-+        u_int32_t art_data_len = 0;
-         String art_mimetype;
-+
-+        const MP4Tags* new_tags = MP4TagsAlloc();
-+        MP4TagsFetch(new_tags, mp4);
-+        if (new_tags->artworkCount)
-+        {
-+            art_data = new_tags->artwork->data;
-+            art_data_len = new_tags->artwork->size;
-+        }
- #ifdef HAVE_MP4_GET_METADATA_COVER_ART_COUNT
--        if (MP4GetMetadataCoverArtCount(mp4) && 
--            MP4GetMetadataCoverArt(mp4, &art_data, &art_data_len))
--#else
--            MP4GetMetadataCoverArt(mp4, &art_data, &art_data_len);
-+        if (new_tags->artworkCount && art_data_len > 0) 
- #endif
-         {
-             if (art_data)
-@@ -211,11 +212,10 @@
-                 }
-                 catch (Exception ex)
-                 {
--                    free(art_data);
-+                    MP4TagsFree(new_tags);
-                     throw ex;
-                 }
- 
--                free(art_data);
-                 if (art_mimetype != _(MIMETYPE_DEFAULT))
-                 {
-                     Ref<CdsResource> resource(new CdsResource(CH_MP4));
-@@ -225,6 +225,7 @@
-                 }
-             }
-         }
-+        MP4TagsFree(new_tags);
- #endif
-         MP4Close(mp4);
-     }
-@@ -249,26 +250,35 @@
- 
-     if (ctype != ID3_ALBUM_ART)
-         throw _Exception(_("LibMP4V2Handler: got unknown content type: ") + ctype);
-+
-+    const MP4Tags* new_tags = MP4TagsAlloc();
-+    if (MP4TagsFetch(new_tags, mp4))
-+    {
- #ifdef HAVE_MP4_GET_METADATA_COVER_ART_COUNT
--    if (!MP4GetMetadataCoverArtCount(mp4))
--        throw _Exception(_("LibMP4V2Handler: resource has no album art information"));
-+        if (!new_tags->artworkCount)
-+            throw _Exception(_("LibMP4V2Handler: resource has no album art information"));
- #endif
--    u_int8_t *art_data;
--    u_int32_t art_data_len;
--    if (MP4GetMetadataCoverArt(mp4, &art_data, &art_data_len))
--    {
--        if (art_data)
-+        void *art_data = 0;
-+        u_int32_t art_data_len;
-+
-+        const MP4TagArtwork* art = new_tags->artwork;
-+        art_data = art->data;
-+        art_data_len = art->size;
-+        if (art)
-         {
--            *data_size = (off_t)art_data_len;
--            Ref<IOHandler> h(new MemIOHandler((void *)art_data, art_data_len));
--            free(art_data);
--            return h;
-+            if (art_data)
-+            {
-+                *data_size = (off_t)art_data_len;
-+                Ref<IOHandler> h(new MemIOHandler(art_data, art_data_len));
-+                MP4TagsFree(new_tags);
-+                return h;
-+            }
-         }
-+        MP4TagsFree(new_tags);
-     }
--        
-     throw _Exception(_("LibMP4V2Handler: could not serve album art "
--                           "for file") + item->getLocation() + 
--                           " - embedded image not found");
-+            "for file") + item->getLocation() + 
-+        " - embedded image not found");
- }
- 
- #endif // HAVE_LIBMP4V2
-De binära filerna old/src/metadata/.libmp4v2_handler.cc.swp och new/src/metadata/.libmp4v2_handler.cc.swp skiljer
diff --git a/pcr/mediatomb/mediatomb.conf b/pcr/mediatomb/mediatomb.conf
deleted file mode 100644
index 798018d2a..000000000
--- a/pcr/mediatomb/mediatomb.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Parameters to be passed to mediatomb
-#
-
-# Port to listen on
-MT_PORT='50500'
-
-# User and group to run as
-MT_USER='nobody'
-MT_GROUP='nobody'
-
-# Location of the PID file
-MT_PIDFILE='/var/run/mediatomb.pid'
-
-# Location of the log file
-MT_LOGFILE='/var/log/mediatomb.log'
-
-# Location of the config file/database
-MT_HOME='/var/lib/mediatomb'
-MT_CFGDIR='.mediatomb'
-
-# User defined command line options
-MT_OPTIONS=''
diff --git a/pcr/mediatomb/mediatomb.install b/pcr/mediatomb/mediatomb.install
deleted file mode 100644
index 56f6ef92c..000000000
--- a/pcr/mediatomb/mediatomb.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
-  echo 'Warning: the MediaTomb web interface exposes your filesystem to the network'
-  echo 'For maximum security, set <ui enabled="no"> in your MediaTomb config file'
-}
-
-post_upgrade() {
-  # TODO: disable next update
-  post_install
-}
diff --git a/pcr/mediatomb/mediatomb.rc b/pcr/mediatomb/mediatomb.rc
deleted file mode 100644
index 7b93012cd..000000000
--- a/pcr/mediatomb/mediatomb.rc
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/mediatomb
-
-MT_OPTIONS="-p $MT_PORT -u $MT_USER -g $MT_GROUP -P $MT_PIDFILE \
-            -l $MT_LOGFILE -m $MT_HOME -f $MT_CFGDIR $MT_OPTIONS"
-
-case "$1" in
-    start)
-        stat_busy "Starting Mediatomb UPnP Media Server"
-
-        chown "$MT_USER:$MT_GROUP" "$MT_HOME"
-
-        if ! pidof -o %PPID /usr/bin/mediatomb &> /dev/null; then
-            rm -f "$MT_PIDFILE"
-        fi
-
-        PID="$(cat "$MT_PIDFILE" 2> /dev/null)"
-
-        if [ -z "$PID" ] && /usr/bin/mediatomb -d $MT_OPTIONS; then
-            add_daemon mediatomb
-            stat_done
-        else
-            stat_fail
-        fi
-        ;;
-
-    stop)
-        stat_busy "Stopping Mediatomb UPnP Media Server"
-
-        PID="$(cat "$MT_PIDFILE" 2> /dev/null)"
-
-        if [ -n "$PID" ] && kill "$PID" &> /dev/null; then
-            rm -f "$MT_PIDFILE"
-            rm_daemon mediatomb
-            stat_done
-        else
-            stat_fail
-        fi
-        ;;
-
-    restart)
-        "$0" stop
-        sleep 1
-        "$0" start
-        ;;
-
-    *)
-        echo "usage: $0 {start|stop|restart}"
-        ;;
-esac
-exit 0
diff --git a/pcr/mediatomb/tonewjs.patch b/pcr/mediatomb/tonewjs.patch
deleted file mode 100644
index 115968530..000000000
--- a/pcr/mediatomb/tonewjs.patch
+++ /dev/null
@@ -1,564 +0,0 @@
-diff -up mediatomb-0.12.1-back/build/Makefile.in.tonewjs mediatomb-0.12.1-back/build/Makefile.in
---- mediatomb-0.12.1-back/build/Makefile.in.tonewjs	2010-04-08 00:40:15.000000000 +0200
-+++ mediatomb-0.12.1-back/build/Makefile.in	2011-04-19 17:17:01.343509944 +0200
-@@ -257,7 +257,7 @@ CURL_LIBS = @CURL_LIBS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
--CXXFLAGS = @CXXFLAGS@
-+CXXFLAGS = -fpermissive @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@
- DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@
-diff -up mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/import_script.cc
---- mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs	2011-04-18 13:10:48.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/import_script.cc	2011-04-18 13:29:36.000000000 +0200
-@@ -53,8 +53,8 @@ ImportScript::ImportScript(Ref<Runtime> 
-     try 
-     {
-         load(scriptPath);
--        root = JS_NewScriptObject(cx, script);
--        JS_AddNamedRoot(cx, &root, "ImportScript");
-+        root = JS_NewObject(cx, NULL, script, NULL);
-+        JS_AddNamedObjectRoot(cx, &root, "ImportScript");
-     }
-     catch (Exception ex)
-     {
-@@ -117,7 +117,7 @@ ImportScript::~ImportScript()
- #endif
-     
-     if (root)
--        JS_RemoveRoot(cx, &root);
-+        JS_RemoveObjectRoot(cx, &root);
- 
- #ifdef JS_THREADSAFE
-     JS_EndRequest(cx);
-diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.cc
---- mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs	2011-04-18 13:29:55.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/js_functions.cc	2011-04-19 16:48:04.009229611 +0200
-@@ -49,7 +49,7 @@ using namespace zmm;
- extern "C" {
- 
- JSBool 
--js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+js_print(JSContext *cx, uintN argc, jsval *argv)
- {
-     uintN i;
-     JSString *str;
-@@ -60,19 +60,21 @@ js_print(JSContext *cx, JSObject *obj, u
-         if (!str)
-             return JS_TRUE;
-         argv[i] = STRING_TO_JSVAL(str);
--        log_js("%s\n", JS_GetStringBytes(str));
-+        char * log_str = JS_EncodeString(cx, str);
-+        log_js("%s\n", log_str);
-+        JS_free(cx, log_str);
-     }
-     return JS_TRUE;
- }
- 
- JSBool
--js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+js_copyObject(JSContext *cx, uintN argc, jsval *argv)
- {
-     jsval arg;
-     JSObject *js_cds_obj;
-     JSObject *js_cds_clone_obj;
- 
--    Script *self = (Script *)JS_GetPrivate(cx, obj);
-+    Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
- 
-     try
-     {
-@@ -91,7 +93,7 @@ js_copyObject(JSContext *cx, JSObject *o
- 
-         self->cdsObject2jsObject(cds_obj, js_cds_clone_obj);
- 
--        *rval = OBJECT_TO_JSVAL(js_cds_clone_obj);
-+        JS_SET_RVAL(cx, argv, OBJECT_TO_JSVAL(js_cds_clone_obj));
- 
-         return JS_TRUE;
- 
-@@ -110,7 +112,7 @@ js_copyObject(JSContext *cx, JSObject *o
- }
- 
- JSBool
--js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+js_addCdsObject(JSContext *cx, uintN argc, jsval *argv)
- {
-     try
-     {
-@@ -126,7 +128,7 @@ js_addCdsObject(JSContext *cx, JSObject 
-         Ref<StringConverter> p2i;
-         Ref<StringConverter> i2i;
- 
--        Script *self = (Script *)JS_GetPrivate(cx, obj);
-+        Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
- 
-         if (self == NULL)
-         {
-@@ -156,20 +158,20 @@ js_addCdsObject(JSContext *cx, JSObject 
-         if (!str)
-             path = _("/");
-         else
--            path = JS_GetStringBytes(str);
-+            path = JS_EncodeString(cx, str);
- 
-         JSString *cont = JS_ValueToString(cx, argv[2]);
-         if (cont)
-         {
--            containerclass = JS_GetStringBytes(cont);
-+            containerclass = JS_EncodeString(cx, cont);
-             if (!string_ok(containerclass) || containerclass == "undefined")
-                 containerclass = nil;
-         }
- 
-         if (self->whoami() == S_PLAYLIST)
--            js_orig_obj = self->getObjectProperty(obj, _("playlist"));
-+            js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("playlist"));
-         else if (self->whoami() == S_IMPORT)
--            js_orig_obj = self->getObjectProperty(obj, _("orig"));
-+            js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("orig"));
-         
-         if (js_orig_obj == NULL)
-         {
-@@ -285,8 +287,7 @@ js_addCdsObject(JSContext *cx, JSObject 
-         JSString *str2 = JS_NewStringCopyN(cx, tmp.c_str(), tmp.length());
-         if (!str2)
-             return JS_TRUE;
--        *rval = STRING_TO_JSVAL(str2);
--
-+        JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2)); 
-         return JS_TRUE;
-     }
-     catch (ServerShutdownException se)
-@@ -302,7 +303,7 @@ js_addCdsObject(JSContext *cx, JSObject 
-     return JS_TRUE;
- }
- 
--static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval, charset_convert_t chr)
-+static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, charset_convert_t chr)
- {
-     try
-     {
-@@ -321,7 +322,7 @@ static JSBool convert_charset_generic(JS
-         {
-             str = JS_ValueToString(cx, argv[0]);
-             if (str)
--                result = JS_GetStringBytes(str);
-+                result = JS_EncodeString(cx, str);
-         }
- 
-         if (result != nil)
-@@ -330,7 +331,7 @@ static JSBool convert_charset_generic(JS
-             JSString *str2 = JS_NewStringCopyN(cx, result.c_str(), result.length());
-             if (!str2)
-                 return JS_TRUE;
--            *rval = STRING_TO_JSVAL(str2);
-+            JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2));
-         }
-     }
-     catch (ServerShutdownException se)
-@@ -347,24 +348,23 @@ static JSBool convert_charset_generic(JS
- }
- 
- 
--JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv)
- {
--     return convert_charset_generic(cx, obj, argc, argv, rval, F2I);
-+     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, F2I);
- }
- 
--JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv)
- {
--     return convert_charset_generic(cx, obj, argc, argv, rval, M2I);
--}
-+     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, M2I); }
- 
--JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv)
- {
--     return convert_charset_generic(cx, obj, argc, argv, rval, P2I);
-+     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, P2I);
- }
- 
--JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv)
- {
--     return convert_charset_generic(cx, obj, argc, argv, rval, J2I);
-+     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, J2I);
- }
- 
- } // extern "C"
-diff -up mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.h
---- mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs	2010-03-25 15:58:05.000000000 +0100
-+++ mediatomb-0.12.1-back/src/scripting/js_functions.h	2011-04-18 13:59:29.000000000 +0200
-@@ -40,18 +40,18 @@
- extern "C" {
- 
- /// \brief Log output.
--JSBool js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-+JSBool js_print(JSContext *cx, uintN argc, jsval *argv);
- 
- /// \brief Adds an object to the database.
--JSBool js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-+JSBool js_addCdsObject(JSContext *cx, uintN argc, jsval *argv);
- 
- /// \brief Makes a copy of an CDS object.
--JSBool js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-+JSBool js_copyObject(JSContext *cx, uintN argc, jsval *argv);
- 
--JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
--JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
--JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
--JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-+JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv);
-+JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv);
-+JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv);
-+JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv);
- 
- } // extern "C"
- 
-diff -up mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc
---- mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs	2011-04-18 13:34:14.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc	2011-04-18 13:51:59.000000000 +0200
-@@ -46,9 +46,9 @@ using namespace zmm;
- extern "C" {
- 
- static JSBool
--js_readln(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+js_readln(JSContext *cx, uintN argc, jsval *argv)
- {
--    PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, obj);
-+    PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
- 
-     String line;
-     
-@@ -69,7 +69,7 @@ js_readln(JSContext *cx, JSObject *obj, 
- 
-     JSString *jsline = JS_NewStringCopyZ(cx, line.c_str());
- 
--    *rval = STRING_TO_JSVAL(jsline);
-+    JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(jsline));
-   
-     return JS_TRUE;
- }
-@@ -93,8 +93,8 @@ PlaylistParserScript::PlaylistParserScri
- 
-         String scriptPath = ConfigManager::getInstance()->getOption(CFG_IMPORT_SCRIPTING_PLAYLIST_SCRIPT); 
-         load(scriptPath);
--        root = JS_NewScriptObject(cx, script);
--        JS_AddNamedRoot(cx, &root, "PlaylistScript");
-+        root = JS_NewObject(cx, NULL, script, NULL);
-+        JS_AddNamedObjectRoot(cx, &root, "PlaylistScript");
-     }
-     catch (Exception ex)
-     {
-@@ -245,7 +245,7 @@ PlaylistParserScript::~PlaylistParserScr
- #endif
- 
-     if (root)
--        JS_RemoveRoot(cx, &root);
-+        JS_RemoveObjectRoot(cx, &root);
- 
- #ifdef JS_THREADSAFE
-     JS_EndRequest(cx);
-diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/script.cc
---- mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs	2011-04-18 13:53:07.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/script.cc	2011-04-19 18:26:34.460338804 +0200
-@@ -87,7 +87,7 @@ String Script::getProperty(JSObject *obj
-     str = JS_ValueToString(cx, val);
-     if (! str)
-         return nil;
--    return JS_GetStringBytes(str);
-+    return JS_EncodeString(cx, str);
- }
- 
- int Script::getBoolProperty(JSObject *obj, String name)
-@@ -427,14 +427,14 @@ static JSFunctionSpec js_global_function
-         try
-         {
-             common_script = _load(common_scr_path);
--            common_root = JS_NewScriptObject(cx, common_script);
--            JS_AddNamedRoot(cx, &common_root, "common-script");
-+            common_root = JS_NewObject(cx, NULL, common_script, NULL);
-+            JS_AddNamedObjectRoot(cx, &common_root, "common-script");
-             _execute(common_script);
-         }
-         catch (Exception e)
-         {
-             if (common_root)
--                JS_RemoveRoot(cx, &common_root);
-+                JS_RemoveObjectRoot(cx, &common_root);
- 
-             log_js("Unable to load %s: %s\n", common_scr_path.c_str(), 
-                     e.getMessage().c_str());
-@@ -460,7 +460,7 @@ Script::~Script()
-     JS_BeginRequest(cx);
- #endif
-     if (common_root)
--        JS_RemoveRoot(cx, &common_root);
-+        JS_RemoveObjectRoot(cx, &common_root);
- 
- /*
-  * scripts are unrooted and will be cleaned up by GC
-@@ -504,11 +504,11 @@ void Script::initGlobalObject()
-     static JSClass global_class =
-     {
-         "global",                                   /* name */
--        JSCLASS_HAS_PRIVATE,                        /* flags */
-+        JSCLASS_HAS_PRIVATE | JSCLASS_GLOBAL_FLAGS,/* flags */
-         JS_PropertyStub,                            /* add property */
-         JS_PropertyStub,                            /* del property */
-         JS_PropertyStub,                            /* get property */
--        JS_PropertyStub,                            /* set property */
-+        JS_StrictPropertyStub,                      /* set property */
-         JS_EnumerateStandardClasses,                /* enumerate */
-         JS_ResolveStub,                             /* resolve */
-         JS_ConvertStub,                             /* convert */
-@@ -517,7 +517,7 @@ void Script::initGlobalObject()
-     };
- 
-     /* create the global object here */
--    glob = JS_NewObject(cx, &global_class, NULL, NULL);
-+    glob = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL);
-     if (! glob)
-         throw _Exception(_("Scripting: could not initialize glboal class"));
- 
-@@ -539,12 +539,12 @@ void Script::defineFunctions(JSFunctionS
-         throw _Exception(_("Scripting: JS_DefineFunctions failed"));
- }
- 
--JSScript *Script::_load(zmm::String scriptPath)
-+JSObject *Script::_load(zmm::String scriptPath)
- {
-     if (glob == NULL)
-         initGlobalObject();
- 
--    JSScript *scr;
-+    JSObject *scr;
- 
-     String scriptText = read_text_file(scriptPath);
- 
-@@ -571,14 +571,11 @@ JSScript *Script::_load(zmm::String scri
- 
- void Script::load(zmm::String scriptPath)
- {
--    if (script)
--        JS_DestroyScript(cx, script);
--
-     script = _load((scriptPath));
- }
- 
- 
--void Script::_execute(JSScript *scr)
-+void Script::_execute(JSObject *scr)
- {
-     jsval ret_val;
- 
-@@ -662,7 +659,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec
-     JSObject *js_meta = getObjectProperty(js, _("meta"));
-     if (js_meta)
-     {
--        JS_AddNamedRoot(cx, &js_meta, "meta");
-+        JS_AddNamedObjectRoot(cx, &js_meta, "meta");
-         /// \todo: only metadata enumerated in MT_KEYS is taken
-         for (int i = 0; i < M_MAX; i++)
-         {
-@@ -687,7 +684,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec
-                 }
-             }
-         }
--        JS_RemoveRoot(cx, &js_meta);
-+        JS_RemoveObjectRoot(cx, &js_meta);
-     }
-     
-     // stuff that has not been exported to js
-diff -up mediatomb-0.12.1-back/src/scripting/script.h.tonewjs mediatomb-0.12.1-back/src/scripting/script.h
---- mediatomb-0.12.1-back/src/scripting/script.h.tonewjs	2011-04-18 12:56:14.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/script.h	2011-04-18 12:56:51.000000000 +0200
-@@ -66,8 +66,8 @@ public:
-     JSRuntime *rt;
-     JSContext *cx;
-     JSObject  *glob;
--    JSScript *script;
--    JSScript *common_script;
-+    JSObject  *script;
-+    JSObject  *common_script;
-     
- public:
-     Script(zmm::Ref<Runtime> runtime);
-@@ -115,8 +115,8 @@ private:
-     JSObject *common_root;
- 
-     void initGlobalObject();
--    JSScript *_load(zmm::String scriptPath);
--    void _execute(JSScript *scr);
-+    JSObject *_load(zmm::String scriptPath);
-+    void _execute(JSObject *scr);
-     zmm::Ref<StringConverter> _p2i;
-     zmm::Ref<StringConverter> _j2i;
-     zmm::Ref<StringConverter> _f2i;
---- mediatomb-0.12.1/configure.tonewjs	2011-07-04 20:20:00.290227110 +1200
-+++ mediatomb-0.12.1/configure	2011-07-04 20:20:28.186894644 +1200
-@@ -23784,14 +23784,14 @@ if test "x$ac_cv_lib_smjs_JS_NewObject"
- 
- else
- 
--                            LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs $ADD_PTHREAD_CFLAGS"
--                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5
--$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
--if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then
-+                            LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs185 $ADD_PTHREAD_CFLAGS"
-+                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5
-+$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; }
-+if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lmozjs  $LIBS"
-+LIBS="-lmozjs185  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23835,12 +23835,12 @@ $as_echo "$ac_try_echo") >&5
- 	 test "$cross_compiling" = yes ||
- 	 $as_test_x conftest$ac_exeext
-        }; then
--  ac_cv_lib_mozjs_JS_NewObject=yes
-+  ac_cv_lib_mozjs185_JS_NewObject=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_lib_mozjs_JS_NewObject=no
-+	ac_cv_lib_mozjs185_JS_NewObject=no
- fi
- 
- rm -rf conftest.dSYM
-@@ -23848,12 +23848,12 @@ rm -f core conftest.err conftest.$ac_obj
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
--$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
--if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5
-+$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; }
-+if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then
- 
--                                    JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs"
--                                    MOZLIB=mozjs
-+                                    JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs185"
-+                                    MOZLIB=mozjs185
- 
- else
- 
-@@ -24020,13 +24020,13 @@ if test "x$ac_cv_lib_smjs_JS_NewObject"
- else
- 
-                     unset ac_cv_lib_smjs_JS_NewObject
--                    { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5
--$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
--if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then
-+                    { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5
-+$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; }
-+if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lmozjs  $LIBS"
-+LIBS="-lmozjs185  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24070,12 +24070,12 @@ $as_echo "$ac_try_echo") >&5
- 	 test "$cross_compiling" = yes ||
- 	 $as_test_x conftest$ac_exeext
-        }; then
--  ac_cv_lib_mozjs_JS_NewObject=yes
-+  ac_cv_lib_mozjs185_JS_NewObject=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_lib_mozjs_JS_NewObject=no
-+	ac_cv_lib_mozjs185_JS_NewObject=no
- fi
- 
- rm -rf conftest.dSYM
-@@ -24083,12 +24083,12 @@ rm -f core conftest.err conftest.$ac_obj
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
--$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
--if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5
-+$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; }
-+if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then
- 
--                            MOZLIB=mozjs
--                            JS_LIBS="-lmozjs"
-+                            MOZLIB=mozjs185
-+                            JS_LIBS="-lmozjs185"
- 
- else
- 
-@@ -24239,15 +24239,15 @@ if test "x$ac_cv_lib_smjs_JS_NewObject"
- 
- else
- 
--                                            LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs"
--                                            unset ac_cv_lib_mozjs_JS_NewObject
--                                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5
--$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
--if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then
-+                                            LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs185"
-+                                            unset ac_cv_lib_mozjs185_JS_NewObject
-+                                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5
-+$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; }
-+if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lmozjs  $LIBS"
-+LIBS="-lmozjs185  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24291,12 +24291,12 @@ $as_echo "$ac_try_echo") >&5
- 	 test "$cross_compiling" = yes ||
- 	 $as_test_x conftest$ac_exeext
-        }; then
--  ac_cv_lib_mozjs_JS_NewObject=yes
-+  ac_cv_lib_mozjs185_JS_NewObject=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_lib_mozjs_JS_NewObject=no
-+	ac_cv_lib_mozjs185_JS_NewObject=no
- fi
- 
- rm -rf conftest.dSYM
-@@ -24304,12 +24304,12 @@ rm -f core conftest.err conftest.$ac_obj
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
--$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
--if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5
-+$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; }
-+if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then
- 
--                                                    JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs"
--                                                    MOZLIB=mozjs
-+                                                    JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs185"
-+                                                    MOZLIB=mozjs185
- 
- else
- 
diff --git a/pcr/mednafen-server/PKGBUILD b/pcr/mednafen-server/PKGBUILD
deleted file mode 100644
index 9968dde38..000000000
--- a/pcr/mednafen-server/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=mednafen-server
-_pkgname=${pkgname%-server}
-pkgver=0.5.0
-pkgrel=2
-pkgdesc='A server multi-system gaming emulator'
-url=http://$_pkgname.sourceforge.net/
-license=GPL2
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-backup=etc/$pkgname/standard.conf
-source=(
-  http://downloads.sourceforge.net/project/$_pkgname/${_pkgname^}-Server/$pkgver/$pkgname-$pkgver.tar.gz
-  $pkgname.service
-)
-sha512sums=(
-  700b2021e5085761b90bb5ee802ff9ccded3cdade76682fe9faa98ebbb0653c9b00baea5baa1c486f850bad606aae33a88e4d9486015babb210648aa0cd4542d
-  cd3d19b789ec7f62c4b8f5fe0f93e7836fab5406a3416434701caf6404cce02c7223dcb8b82bd1e4b00bdcf4df623f0cd44f850a7f79a7be73e04c0804972700
-)
-
-build() {
-  cd $srcdir/$pkgname
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname
-  make DESTDIR=$pkgdir install
-  install -Dm644 standard.conf            $pkgdir/etc/$pkgname/standard.conf
-  install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
-}
diff --git a/pcr/mednafen-server/mednafen-server.service b/pcr/mednafen-server/mednafen-server.service
deleted file mode 100644
index 9ee392432..000000000
--- a/pcr/mednafen-server/mednafen-server.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Mednafen Server Daemon
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/mednafen-server /etc/mednafen-server/standard.conf >/var/log/mednafen-server.log 2>/var/log/mednafen-server.log.2
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/mednafen-server/mednafen-serverd b/pcr/mednafen-server/mednafen-serverd
deleted file mode 100755
index d6033f6af..000000000
--- a/pcr/mednafen-server/mednafen-serverd
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-MED_ARGS=
-[ -f /etc/mednafen-server/standard.conf ] && . /etc/mednafen-server/standard.conf
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/mednafen-server)
-case "$1" in
-  start)
-    stat_busy "Starting Mednafen Server Daemon"
-    [ -z "$PID" ] && /usr/bin/mednafen-server ${MED_ARGS} >/var/log/mednafen-server.log 2>/var/log/mednafen-server.log.2
-    PID=$(pidof -o %PPID /usr/bin/mednafen-server)
-    if [ -z "$PID" ]; then
-      stat_fail
-    else
-      add_daemon mednafen-server
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Mednafen Server Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mednafen-server
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/pcr/mesa-nvfx/LICENSE b/pcr/mesa-nvfx/LICENSE
deleted file mode 100644
index ae33d2709..000000000
--- a/pcr/mesa-nvfx/LICENSE
+++ /dev/null
@@ -1,82 +0,0 @@
-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
deleted file mode 100644
index 4caacabf8..000000000
--- a/pcr/mesa-nvfx/PKGBUILD
+++ /dev/null
@@ -1,129 +0,0 @@
-# $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/mimms/PKGBUILD b/pcr/mimms/PKGBUILD
deleted file mode 100644
index 3697c1a3b..000000000
--- a/pcr/mimms/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com>
-# taken from https://aur.archlinux.org/packages/mimms/ 
-
-pkgname=mimms
-pkgver=3.2.1
-pkgrel=2
-pkgdesc="Download streams using the MMS protocol and save them to your 
-computer"
-arch=('any')
-url="http://savannah.nongnu.org/projects/mimms/"
-license=('GPL3')
-depends=('libmms' 'python2')
-source=(http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('ec629d8899551b4789ba15c17402c36f')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-#Python2 fix
-  sed -i "s/python/python2/g" Makefile
-
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/pcr/minaton-lv2/PKGBUILD b/pcr/minaton-lv2/PKGBUILD
deleted file mode 100644
index 797a74653..000000000
--- a/pcr/minaton-lv2/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-pkgname=minaton-lv2
-pkgver=0.0.3
-pkgrel=1
-pkgdesc="A music software synthesizer project, LV2 instrument."
-arch=('i686')
-url="http://sourceforge.net/p/minaton/home/Home/"
-license=('GPL')
-groups=('lv2-plugins')
-depends=('lv2' 'jack' 'gtkmm')
-makedepends=('lv2-c++-tools')
-provides=('lv2-minaton')
-conflicts=('lv2-minaton')
-source=("http://downloads.sourceforge.net/project/minaton/$pkgname-v.$pkgver.tar.gz")
-md5sums=('b5190a6c6942c1a1fe6b929963ad1f86')
-
-build() {
-  cd "$srcdir/$pkgname-v$pkgver"
-
-  # set bundle_path
-  sed -i "s|\(string bundle_path\);|\1 = \"/usr/lib/lv2/minaton.lv2/\";|" *.{hpp,h,cpp}
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-v$pkgver"
-  make INSTALL_DIR="$pkgdir/usr/lib/lv2" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/minetest-git/PKGBUILD b/pcr/minetest-git/PKGBUILD
deleted file mode 100644
index e322285cf..000000000
--- a/pcr/minetest-git/PKGBUILD
+++ /dev/null
@@ -1,91 +0,0 @@
-# Maintainer: Konsta Kokkinen <kray@tsundere.fi>
-# Maintainer (Parabola): Jorge Araya Navarro <jorgean@lavabit.com>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
-pkgname=minetest-git
-pkgver=20130501
-pkgrel=1
-pkgdesc="An Infiniminer/Minecraft inspired game, git version."
-arch=('i686' 'x86_64')
-url='http://minetest.net/'
-license=('LGPL2.1')
-makedepends=('git' 'cmake' 'irrlicht' 'mesa' 'bzip2' 'libjpeg' 'libpng' 'zlib' 'curl')
-depends=('sqlite3' 'libgl' 'libxxf86vm' 'openal' 'hicolor-icon-theme' 'libvorbis' 'curl')
-conflicts=('minetest' 'minetest-hg')
-
-_srcroot="https://github.com/minetest/minetest.git"
-_srcname="minetest"
-
-_gameroot="https://github.com/minetest/minetest_game.git"
-_gamename="minetest_game"
-
-_commonroot="https://github.com/minetest/common.git"
-_commonname="common"
-
-_buildroot="https://github.com/minetest/build.git"
-_buildname="build"
-
-_survivalroot="https://github.com/minetest/survival.git"
-_survivalname="survival"
-
-package() {
-	cd "$srcdir"
-
-	msg "Pulling sources..."
-
-	if [ -d $_srcname ] ; then
-		cd $_srcname && git pull origin
-		msg "The local files are updated."
-	else
-		git clone $_srcroot $_gitname
-	fi
-
-	msg "Pulling game..."
-
-	cd "$srcdir/$_srcname/games/"
-
-        if [ -d $_gamename ] ; then
-                cd $_gamename && git pull origin   
-                msg "The local files are updated."
-        else
-                git clone $_gameroot $_gamename
-        fi
-
-	msg "Pulling common mods..."
-	cd "$srcdir"/"$_srcname"/games/
-
-	 if [ -d $_commonname ] ; then
-                cd $_commonname && git pull origin   
-                msg "The local files are updated."
-        else
-                git clone $_commonroot $_commonname
-        fi
-
-	msg "Pulling build mods..."
-	cd "$srcdir"/"$_srcname"/games/
-
-	 if [ -d $_buildname ] ; then
-                cd $_buildname && git pull origin   
-                msg "The local files are updated."
-        else
-                git clone $_buildroot $_buildname
-        fi
-
-	msg "Pulling survival mods..."
-	cd "$srcdir"/"$_srcname"/games/
-
-	 if [ -d $_survivalname ] ; then
-                cd $_survivalname && git pull origin   
-                msg "The local files are updated."
-        else
-                git clone $_survivalroot $_survivalname
-        fi
-
-
-
-	msg "GIT checkout done or server timeout"
-	msg "Starting make..."
-
-	cd "$srcdir/$_srcname"
-	cmake . -DCMAKE_INSTALL_PREFIX=/usr
-	make DESTDIR=${pkgdir} install
-}
diff --git a/pcr/mini18n-git/PKGBUILD b/pcr/mini18n-git/PKGBUILD
deleted file mode 100644
index c55db7b7d..000000000
--- a/pcr/mini18n-git/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Maintainer: Gustavo alvarez <sl1pkn07@gmail.com>
-
-pkgname=mini18n-git
-pkgver=20130213
-pkgrel=1
-pkgdesc="A a small and non-intrusive translation library designed for small memory and non-GNU systems. (GIT version)"
-arch=('x86_64' 'i686')
-url="http://wiki.yabause.org/index.php5?title=Mini18n"
-license=('GPL')
-makedepends=('git' 'cmake')
-conficts=('mini18n')
-provides=('mini18n')
-
-_gitroot="git://github.com/Guillaumito/yabause.git"
-_gitname="mini18n"
-
-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 --depth=1 "${_gitroot}" "${_gitname}"
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "${srcdir}/${_gitname}-build"
-  cp -R "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
-  cd "${srcdir}/${_gitname}-build/${_gitname}"
-
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${_gitname}-build/${_gitname}"
-  make DESTDIR="${pkgdir}/" install
-}
-
diff --git a/pcr/minicomputer/PKGBUILD b/pcr/minicomputer/PKGBUILD
deleted file mode 100644
index 4888c999f..000000000
--- a/pcr/minicomputer/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-
-pkgname=minicomputer
-pkgver=1.41
-pkgrel=1
-pkgdesc="A standalone Linux softwaresynthesizer for creating experimental electronic sounds."
-arch=('i686')
-url="http://minicomputer.sourceforge.net"
-license=('GPL3')
-depends=('fltk' 'jack' 'liblo')
-makedepends=('scons')
-install="$pkgname.install"
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/MinicomputerV$pkgver.tar.gz"
-        "$pkgname.desktop")
-md5sums=('d2524f5fee7475159292e29a5bcd73d2'
-         '3cc74321d55870b1684767255c74c2f8')
-
-build() {
-  cd "$srcdir"
-
-  # installpresets.sh fix
-  sed -i "s|factory|/usr/share/$pkgname/&|g" installpresets.sh
-
-  # 'R_OK' was not declared fix
-  sed -i '/#include <cstdlib>/a#include <unistd.h>' editor/Memory.h
-
-  # DSO linking fix
-  sed -i "35aenv.Append(LINKFLAGS = ['-lm'])" -i SConstruct
-
-  # build
-  LDFLAGS="LDFLAGS -lm" scons
-}
-package() {
-  cd "$srcdir"
-
-  # bin
-  install -d "$pkgdir/usr/bin"
-  install -Dm755 "$pkgname"{,CPU} "$pkgdir/usr/bin"
-
-  # icon
-  install -Dm644 $pkgname.xpm \
-    "$pkgdir/usr/share/pixmaps/$pkgname.xpm"
-
-  # desktop file
-  install -Dm644 $pkgname.desktop \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-
-  # presets
-  install -d "$pkgdir/usr/share/$pkgname/factoryPresets"
-  install -Dm644 factoryPresets/* "$pkgdir/usr/share/$pkgname/factoryPresets"
-
-  # doc
-  install -Dm644 "$pkgname"Manual.pdf \
-    "$pkgdir/usr/share/doc/$pkgname/Manual.pdf"
-
-  # presets installer script
-  install -Dm755 installpresets.sh \
-    "$pkgdir/usr/share/$pkgname/installpresets.sh"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/minicomputer/minicomputer.desktop b/pcr/minicomputer/minicomputer.desktop
deleted file mode 100644
index 578f04ddb..000000000
--- a/pcr/minicomputer/minicomputer.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Minicomputer
-Comment=An industrial grade software synthesizer
-Exec=minicomputer
-Icon=minicomputer
-Terminal=false
-Type=Application
-Categories=Application;AudioVideo;
diff --git a/pcr/minicomputer/minicomputer.install b/pcr/minicomputer/minicomputer.install
deleted file mode 100644
index e441a6f02..000000000
--- a/pcr/minicomputer/minicomputer.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-  post_remove
-
-  cat << EOF
-
->>> For installing some sample presets in ~/.miniComputer, use
->>>   /usr/share/minicomputer/installpresets.sh
->>>
->>> Use "minicomputer" to start the engine and the GUI
->>> Documentation can be found in /usr/share/doc/minicomputer/Manual.pdf
-
-EOF
-}
-
-post_upgrade() {
-  post_remove
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/pcr/minidjvu/PKGBUILD b/pcr/minidjvu/PKGBUILD
deleted file mode 100644
index 700f3c1f6..000000000
--- a/pcr/minidjvu/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: Orivej Desh <masecretaire@gmx.fr>
-# Maintainer: Orivej Desh <masecretaire@gmx.fr>
-pkgname=minidjvu
-pkgver=0.8
-pkgrel=3
-pkgdesc="Highly efficient DjVu encoder for black-and-white images"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://minidjvu.sourceforge.net/"
-license=('GPL')
-depends=("libtiff")
-options=("!libtool" "!makeflags")
-source=("http://downloads.sourceforge.net/project/minidjvu/minidjvu/$pkgver/minidjvu-$pkgver.tar.gz")
-md5sums=('b354eb74d83c6e2d91aab2a6c2879ba7')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --libdir=/usr/lib
-  sed -i -e 's#-9 \$(MANDIR)#-9 $(DESTDIR)$(MANDIR)#' Makefile
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  mkdir -p "$pkgdir"/usr/{bin,lib,share/man/man1}
-  make DESTDIR="$pkgdir/" install
-}
-
diff --git a/pcr/miniupnpd/PKGBUILD b/pcr/miniupnpd/PKGBUILD
deleted file mode 100644
index 5e8e59fd9..000000000
--- a/pcr/miniupnpd/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: fauno <fauno@parabola.nu>
-pkgname=miniupnpd
-pkgver=1.8.20130730
-pkgrel=1
-pkgdesc="Lightweight UPnP IGD daemon"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://miniupnp.free.fr"
-license=('BSD')
-backup=(etc/miniupnpd/miniupnpd.conf)
-depends=('libnfnetlink' 'iptables>=1.4.3' 'net-tools')
-makedepends=('lsb-release')
-source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz"
-        miniupnpd.systemd)
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	CONFIG_OPTIONS="--strict --ipv6" make -f Makefile.linux config.h
-	make -f Makefile.linux
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	mkdir -p "$pkgdir/usr/share/man/man8"
-
-	make PREFIX="$pkgdir/" -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"
-        # usrmove
-        cd "$pkgdir"
-        mv usr/sbin usr/bin
-}
-sha1sums=('32eed969a6c653d6d5ccd236ee50275c933d020e'
-          '64bf27526bc830d7be98a9bb48e58911afdbe735')
-sha256sums=('919ab6ec719959fff9bdae3f1d83f6a39c43fa4a6d3f2c48077f43729d3d7d43'
-            '2707d028f28fbb28c3a9d13605c9c738e9628f828e22288a8a1492ac93f9ad7c')
diff --git a/pcr/miniupnpd/miniupnpd.systemd b/pcr/miniupnpd/miniupnpd.systemd
deleted file mode 100644
index 88973535c..000000000
--- a/pcr/miniupnpd/miniupnpd.systemd
+++ /dev/null
@@ -1,12 +0,0 @@
-[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/pcr/mit-scheme/PKGBUILD b/pcr/mit-scheme/PKGBUILD
deleted file mode 100644
index f769acfc8..000000000
--- a/pcr/mit-scheme/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# Contributor: peter feigl <peter.feigl@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=mit-scheme
-pkgver=9.1.1
-pkgrel=1
-pkgdesc="MIT/GNU Scheme"
-arch=('x86_64' i686)
-license=('GPL')
-url="http://www.gnu.org/software/mit-scheme/"
-groups=
-provides=('mit-scheme')
-depends=('libx11' 'texinfo' 'texlive-core')
-optdepends=('mhash: support for mhash' 'gdbm: support for gdbm'
-  'postgresql-libs: support for postresql' 'openssl: support for openssl'
-  'mcrypt: support for mcrypt' 'db: support for berkeley db')
-_my_arch=$(uname -m)
-if [ ${_my_arch} = "x86_64" ]
-then
-_my_arch="x86-64"
-md5sums=('268cb5ac97646f34742828ebc370586d')
-else
-_my_arch="i386"
-md5sums=('e35590a06549d71edba723a719329070')
-fi
-
-source=("http://ftp.gnu.org/gnu/mit-scheme/stable.pkg/${pkgver}/${pkgname}-${pkgver}-${_my_arch}.tar.gz")
-
-build() {
-  cd $startdir/src/${pkgname}-${pkgver}/src
-  ./configure --with-x --enable-native-code --prefix=/usr || return 1
-  make compile-microcode || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  # TODO: add indexer
-  echo Making Documentation
-  cd ../doc && ./configure --prefix=/usr && make -j 1 && make DESTDIR=${pkgdir} install && rm ${pkgdir}/usr/share/info/dir && mv ${pkgdir}/usr/share/man/man1/scheme.1 ${pkgdir}/usr/share/man/man1/mit-scheme.1 || return 0
-}
-
-
-infodir=usr/share/info
-
-filelist=(mit-scheme-ffi.info mit-scheme-imail.info mit-scheme-ref.info mit-scheme-sos.info mit-scheme-user.info)
-
-
-
-post_install() {
-
-  [[ -x usr/bin/install-info ]] || return 0
-
-  for file in "${filelist[@]}"; do
-
-    install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-
-  done
-
-}
-
-
-
-post_upgrade() {
-
-  post_install "$1"
-
-}
-
-
-
-pre_remove() {
-
-  [[ -x usr/bin/install-info ]] || return 1
-
-  for file in "${filelist[@]}"; do
-
-    install-info --delete "$infodir/$file.gz" "$infodir/dir" 2>/dev/null
-
-  done
-
-}
-
-md5sums=('e35590a06549d71edba723a719329070')
diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
deleted file mode 100644
index d8e12a3b9..000000000
--- a/pcr/mitsuba/PKGBUILD
+++ /dev/null
@@ -1,145 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-_pkgname=mitsuba
-_pkgver=0.4.4
-_pkgrel=5
-_bldname=blender
-_bldver=2.69
-_bldep=10
-_addname=$_pkgname-$_bldname
-_adddat=20130320
-_addrev=47
-_addrel=1
-_pyver=3.3
-
-# Thu May 09 22:07:37 2013 +0200 - rev:47:8689e0896cf6 ($srcdir/$_addname/$_pkgname/__init__.py:bl_info>version)
-_addver=0.2.1
-
-pkgname=(
-  $_pkgname
-  $_bldname-addon-$_pkgname
-)
-pkgver=$_pkgver
-pkgrel=$_pkgrel
-pkgdesc='A physically based renderer'
-arch=(
-  mips64el
-  x86_64
-  i686
-)
-url=https://www.$_pkgname-renderer.org/
-license=GPL3
-depends=(
-  boost-libs
-  collada-dom
-  glew
-  libxxf86vm
-  openexr-libre
-  qt4
-  xerces-c
-)
-optdepends=(
-  'python: Python bindings'
-  "${pkgname[1]}: ${_bldname^} addon exporter and renderer"
-)
-makedepends=(
-  boost
-  cmake
-  eigen3
-  mercurial
-  python
-)
-source=(
-  $_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=(
-  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,|' 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
-
-  msg 'removing Open Source term'
-  sed -i 's|free-software/open-source|free-software|
-         ' include/$_pkgname/core/quad.h
-
-  [[ -d build ]] && rm -vr build
-  mkdir -v build
-}
-
-build() {
-  cd $srcdir/$_pkgname-v$pkgver/build
-
-  [[ $CARCH == x86_64 ]] && _SSE=ON || _SSE=OFF
-  # i686: MTS_SSE disabled
-
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
-    -DBoost_PYTHON_LIBRARY=/usr/lib/libboost_python${_pyver::1}.so\
-    -DMTS_SSE=$_SSE\
-    -DPYTHON_INCLUDE_DIR=/usr/include/python${_pyver}m\
-    -DPYTHON_LIBRARY=/usr/lib/libpython${_pyver}m.so
-  make
-}
-
-package_mitsuba() {
-  cd $srcdir/$_pkgname-v$pkgver/build
-  make DESTDIR=$pkgdir install
-  install=$_pkgname.install
-
-  msg 'fixing files and folders location'
-  a=$pkgdir/usr
-  b=$srcdir/$_pkgname-v$pkgver
-  install -vd $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}$_pkgname,pixmaps}}
-  install -vm644 $b/data/linux/$_pkgname.desktop           $a/share/applications
-  install -vm644 $b/src/mtsgui/resources/${_pkgname}48.png $a/share/pixmaps
-  install -vm644 $b/doc/license.txt                        $a/share/licenses/$_pkgname/LICENSE
-  mv -v $a/{m{itsuba,ts{gui,import,srv,util}},bin}
-  mv -v $a/lib{$pkgname-{bidir,core,hw,render}.so,}
-  mv -v $a/{{data,plugins},share/$_pkgname}
-  mv -v $a/{python/mitsuba.so,lib/python$_pyver/lib-dynload}
-  mv -v $a/{sdk/include,}
-  rmdir -v $a/{python,sdk}
-}
-
-package_blender-addon-mitsuba() {
-  pkgdesc="A addon for the ${_bldname^} which allows render and export with Mitsuba (built for the $_bldname-libre package)"
-  arch=any
-  depends=(
-    $_pkgname=$pkgver
-    "$_bldname-libre>=$_bldep:$_bldver"
-    "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))"
-  )
-  _pkgver=$pkgver
-  pkgver=$_addver.r$_addrev.v$_bldver
-  pkgrel=$_addrel
-  optdepends=
-
-  cd $srcdir/$_addname-$_addrev
-
-  msg 'fixing binary path'
-  sed -i 's|'"'default'"': efutil.find_config_value('"'mitsuba', 'defaults', 'binary_path', ''"')|'"'default'"': '"'/usr/bin'"'|
-         ' $_pkgname/properties/engine.py
-
-  a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
-  b=$pkgdir/usr/share/licenses/$pkgname
-  c=$srcdir/$_pkgname-v$_pkgver/doc/license.txt
-
-  install -vd $a && cp -a $_pkgname $a
-  install -vd $b && install -m644 $c $b/LICENSE
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/mitsuba/mitsuba.install b/pcr/mitsuba/mitsuba.install
deleted file mode 100644
index 724bfce00..000000000
--- a/pcr/mitsuba/mitsuba.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/pcr/moblock/MoBlock-nfq.sh.patch b/pcr/moblock/MoBlock-nfq.sh.patch
deleted file mode 100644
index f9136c3c7..000000000
--- a/pcr/moblock/MoBlock-nfq.sh.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- MoBlock-0.8/MoBlock-nfq.sh.orig	2008-11-30 03:44:02.000000000 -0500
-+++ MoBlock-0.8/MoBlock-nfq.sh	2008-12-01 18:56:15.000000000 -0500
-@@ -3,14 +3,10 @@
- # MoBlock.sh - MoBlock start script
- # ---------------------------------
- 
--ACTIVATE_CHAINS=1
--WHITE_TCP_IN=""
--WHITE_UDP_IN=""
--WHITE_TCP_OUT=""
--WHITE_UDP_OUT=""
--WHITE_TCP_FORWARD=""
--WHITE_UDP_FORWARD=""
-+# Some configuration options have been moved to an external conf file
-+# This should make maintenance and upgrading easier
- 
-+. /etc/moblock/config
- 
- PIDF=/var/run/moblock.pid
- 
-@@ -78,6 +74,17 @@
- 	iptables -I MOBLOCK_FW -p udp --dport $PORT -j ACCEPT
- done
- 
-+# For added IP whitelisting support
-+
-+for IP in $WHITE_IP_OUT; do
-+    iptables -I MOBLOCK_OUT -p all -m iprange --dst-range $IP -j ACCEPT
-+done
-+for IP in $WHITE_IP_IN; do
-+    iptables -I MOBLOCK_IN -p all -m iprange --src-range $IP -j ACCEPT
-+done
-+for IP in $WHITE_IP_FW; do
-+    iptables -I MOBLOCK_FW -p all -m iprange --dst-range $IP -j ACCEPT
-+done
- 
- # Loopback traffic fix
- 
-@@ -85,7 +92,8 @@
- iptables -I OUTPUT -p all -o lo -j ACCEPT
- 
- # Here you can change block list and log files
--./moblock -p /etc/guarding.p2p ./moblock.log
-+#./moblock -p /etc/guarding.p2p ./moblock.log
-+/usr/bin/moblock -p /etc/moblock/banned.list /var/log/moblock.log >/dev/null 2>&1
- 
- # On exit delete the rules we added
- 
-@@ -108,3 +116,4 @@
- if [ -f $PIDF ]; then	
- 	rm $PIDF;
- fi
-+
diff --git a/pcr/moblock/PKGBUILD b/pcr/moblock/PKGBUILD
deleted file mode 100755
index 15504d1c1..000000000
--- a/pcr/moblock/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
-# Contributor: Filip Wojciechowski, filip at loka dot pl
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=moblock
-pkgver=0.9rc2
-pkgrel=8
-pkgdesc="Console application that blocks connections from/to hosts listed in a file in peerguardian format"
-arch=('i686' 'x86_64')
-url="http://moblock.berlios.de/"
-license=('GPL')
-depends=(libnetfilter_queue iptables)
-backup=(etc/moblock/config)
-install=moblock.install
-source=(http://download.berlios.de/moblock/MoBlock-0.8-i586.tar.bz2 \
-        moblock_0.9_rc2.patch \
-        MoBlock-nfq.sh.patch \
-        moblock_include.patch \
-        config \
-        moblock-update \
-        moblock \
-        moblock.logrotate)
-
-build() {
-    cd $startdir/src/MoBlock-0.8
-    
-    # patch to update moblock to the latest cvs version
-    patch -Np1 -i ../moblock_0.9_rc2.patch || return 1
-    # add IP whitelisting and move configs to a separate conf file
-    patch -Np1 -i ../MoBlock-nfq.sh.patch || return 1
-    # necessary to make moblock build with recent kernels
-    patch -Np1 -i ../moblock_include.patch || return 1
-    
-    # change the CFLAGS for both i686 and x84_64 builds
-    sed -i "s#-Wall -O.*-ffast-math#$CFLAGS#g" Makefile
-    
-    # build
-    make || return 1
-    
-    #move the files
-    install -D -m 755 ./MoBlock-nfq.sh $startdir/pkg/usr/bin/moblock-nfq || return 1
-    install -D -m 744 ./moblock $startdir/pkg/usr/bin/moblock || return 1
-    install -D -m 755 ../moblock-update $startdir/pkg/usr/bin/moblock-update || return 1
-    install -D -m 744 ../moblock $startdir/pkg/etc/rc.d/moblock || return 1
-    install -D -m 644 ../config $startdir/pkg/etc/moblock/config || return 1
-    install -D -m 644 ../moblock.logrotate $startdir/pkg/etc/logrotate.d/moblock || return 1
-}
-md5sums=('199967adb48b153be90db10fe21325c5'
-         'e4e33c515677fa53eaca4616591d4e44'
-         'e9f3c6b09f5e07dee948450780340ea3'
-         'b23b5214965df59632de5cec317ddbde'
-         '840bb52a99529305e49212a69c9ced8a'
-         '49a16feb221d4d912cc7200313517f7b'
-         '1bdc949fcff0ce751a5096e489061513'
-         'a8285fd3e68043cd8d21993d3dbbf9d4')
diff --git a/pcr/moblock/config b/pcr/moblock/config
deleted file mode 100644
index 7d7c287cc..000000000
--- a/pcr/moblock/config
+++ /dev/null
@@ -1,30 +0,0 @@
-# Original MoBlock configuration options from MoBlock-nfq.sh file
-ACTIVATE_CHAINS=1
-WHITE_TCP_IN=""
-WHITE_UDP_IN=""
-WHITE_TCP_OUT="" # Add "http https" here to prevent moblock from blocking webpages
-WHITE_UDP_OUT=""
-WHITE_TCP_FORWARD=""
-WHITE_UDP_FORWARD=""
-
-# Added IP whitelisting support
-WHITE_IP_IN=""
-WHITE_IP_OUT=""
-WHITE_IP_FW=""
-
-# Individual lists can be disabled by prefixing them with '!'
-# Bluetack blacklists (http://www.bluetack.co.uk)
-BLUETACK=(level1 level2 !level3 !edu ads-trackers-and-bad-pr0n bogon spyware spider Microsoft !proxy hijacked templist !rangetest dshield)
-
-# blocklist.org lists (currently doesn't work)
-#BLOCKLIST=(p2p gov spy ads edu)
-
-# backup lists (might be outdated)
-#PHOENIXLABS=(!p2b.p2b edu.txt spider.txt spyware.txt level1.txt !level2.txt !level3.txt)
-
-# Change to 'yes' if you want to backup up the old list before writing 
-# a new one. Only one backup copy will be kept.
-BACKUP_OLD_LIST="no"
-
-# Options passed to wget
-WGET_OPTS="-q"
diff --git a/pcr/moblock/moblock b/pcr/moblock/moblock
deleted file mode 100755
index d88bd2e8d..000000000
--- a/pcr/moblock/moblock
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-    start)
-        stat_busy "Starting MoBlock"
-        if [ ! -f /var/run/moblock.pid ]
-        then
-            /usr/bin/moblock-nfq &
-            if [ $? -gt 0 ]
-            then
-                stat_fail
-            else
-                add_daemon moblock
-                stat_done
-            fi
-        else
-            stat_fail
-        fi
-        ;;
-    update)
-        stat_busy "Updating MoBlock block list..."
-        error=0
-        /usr/bin/moblock-update || error=1
-        stat_busy "Updating MoBlock block list"
-        if [ $error -eq 1 ]; then
-            stat_fail
-        else
-            stat_done
-        fi
-        ;;
-    stats)
-        stat_busy "Logging stats to /var/log/MoBlock.stats"
-        PID=`cat /var/run/moblock.pid 2>/dev/null`
-        if [ ! -z "$PID" ]; then
-            /bin/kill -USR2 $PID
-            if [ $? -gt 0 ]; then
-                stat_fail
-            else
-                stat_done
-            fi
-        else
-            stat_fail
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping MoBlock"
-        PID=`cat /var/run/moblock.pid 2>/dev/null`
-        if [ ! -z "$PID" ]; then
-            /bin/kill $PID
-            if [ $? -gt 0 ]; then
-                stat_fail
-            else
-                rm_daemon moblock
-                stat_done
-            fi
-        else
-            stat_fail
-        fi
-        ;;
-    restart)
-        $0 stop
-        sleep 2
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart|update|stats}"
-esac
diff --git a/pcr/moblock/moblock-update b/pcr/moblock/moblock-update
deleted file mode 100755
index aae861d13..000000000
--- a/pcr/moblock/moblock-update
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/bin/bash
-
-. /etc/moblock/config
-
-CONF_DIR=/etc/moblock
-TEMP_DIR=$(/usr/bin/mktemp -t -d moblock-updateXXXXXXXX)
-LIST_FILE=banned.list
-
-USECOLOR="no"
-. /etc/rc.d/functions
-PREFIX_REG=" >"
-PREFIX_HL="::"
-
-function extract()
-{
-    /usr/bin/find $TEMP_DIR -type f -name '*.gz' -o -name '*.zip' |\
-    while read N
-    do
-        case "$N" in
-            *.zip)  /usr/bin/unzip -oqq "$N" 2>/dev/null
-                    if [ $? -gt 0 ]; then
-                        rm -f "$N"
-                        return 1
-                    else
-                        rm -f "$N"
-                    fi
-                    ;;
-            *.gz)   /bin/gunzip -f "$N" 2>/dev/null
-                    if [ $? -gt 0 ]; then
-                        rm -f "$N"
-                        return 1
-                    fi
-                    ;;
-            *)      continue
-                    ;;
-        esac
-    done
-    return 0
-}
-
-cd $TEMP_DIR
-
-printf "${C_SEPARATOR}   ------------------------------\n"
-printhl "Downloading and extracting files:\n"
-
-# Bluetack lists (with fallback)
-for i in ${BLUETACK[@]}
-do
-    if [ $(echo $i | /bin/grep '^[^\!]' | /usr/bin/wc -l) -eq 1 ]; then
-        stat_busy "BLUETACK '${i}'... " 
-        /usr/bin/wget ${WGET_OPTS} "http://www.bluetack.co.uk/config/${i}.gz" && extract
-        if [ $? -gt 0 ] || [ ! -f ${i} ]; then
-            stat_fail
-            bfile=$i
-            if [ "$bfile" = "ads-trackers-and-bad-pr0n" ]; then
-                bfile="ads"
-            elif [ "$bfile" = "Microsoft" ];then
-                bfile="microsoft"
-            fi
-            stat_busy "[!!] BLUETACK '${i}' (fallback link)... "
-            /usr/bin/wget ${WGET_OPTS} "http://list.iblocklist.com/?list=bt_${bfile%%-*}" -O "${i}.gz" && extract
-            if [ $? -gt 0 ]; then
-                stat_fail
-            else
-                stat_done
-            fi
-        else
-            stat_done
-        fi
-    fi
-done
-
-# Blocklist lists
-for i in ${BLOCKLIST[@]}
-do
-    if [ $(echo $i | /bin/grep '^[^\!]' | /usr/bin/wc -l) -eq 1 ]; then
-        stat_busy "BLOCKLIST '${i}'... "
-        /usr/bin/wget ${WGET_OPTS} "blocklist.org/${i}.p2b.gz" && extract
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            stat_done
-        fi
-    fi
-done
-
-# Old phoenixlabs.org lists
-for i in ${PHOENIXLABS[@]}
-do
-    if [ $(echo $i | /bin/grep '^[^\!]' | /usr/bin/wc -l) -eq 1 ]; then
-        stat_busy "PHOENIXLABS '${i}'... "
-        /usr/bin/wget ${WGET_OPTS} "fox.phoenixlabs.org/${i}" && extract
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            stat_done
-        fi
-    fi
-done
-
-if [ $(/bin/cat "$TEMP_DIR"/* | /usr/bin/wc -l) -eq 0 ]; then
-    printf "\n"
-    printhl "ERROR: No files were downloaded"
-    printf "${C_SEPARATOR}   ------------------------------\n"
-    exit 1
-fi
-
-# Check files
-printsep
-printhl "Checking integrity of downloaded files:\n"
-
-/usr/bin/find -type f | while read N
-do
-    stat_busy "File '$(echo $N | /bin/awk -F/ '{print $NF}')'... "
-    scan1=$(/bin/cat "$N" | /usr/bin/wc -l)
-    scan2=$(/bin/egrep -o ":[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*-[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*" "$N" | /usr/bin/wc -l)
-    if [ $scan1 -eq $scan2 ]; then
-        stat_done
-    else
-        if [ $scan2 -gt 0 ]; then
-            if [ $scan1 -gt $scan2 ]; then
-                stat_append "$(($scan1-$scan2)) of $scan1 entries failed validation; keeping the file"
-                stat_done
-            fi
-        else
-            stat_fail
-            stat_busy "[!!] Removing corrupted file... "
-            rm "$N" 2>/dev/null
-            if [ $? -gt 0 ]; then
-                stat_fail
-                exit 1
-            else
-                stat_done
-            fi
-        fi
-    fi
-done
-
-printsep
-printhl "Saving the list:\n"
-
-# Make backup
-if [ "$BACKUP_OLD_LIST" = "yes" ] && [ -f "$CONF_DIR"/"$LIST_FILE" ]; then
-    stat_busy "Backing up old list to '$CONF_DIR/$LIST_FILE.gz'... "
-    /bin/gzip -f "$CONF_DIR"/"$LIST_FILE" 2>/dev/null
-    if [ $? -gt 0 ]; then
-        stat_fail
-    else
-        stat_done
-    fi
-fi
-
-# Save the list
-stat_busy "Saving new list to '$CONF_DIR/$LIST_FILE'... "
-/bin/cat "$TEMP_DIR"/* > "$CONF_DIR"/"$LIST_FILE" 2>&1
-if [ $? -gt 0 ]; then
-    stat_fail
-    exit 1
-else
-    stat_done
-    printf "\n"
-    printhl "Saved `cat "$CONF_DIR"/"$LIST_FILE" | wc -l` ranges"
-    printf "${C_SEPARATOR}   ------------------------------\n"
-fi
-
-rm -rf "$TEMP_DIR"
-
-# Restart MoBlock
-if [ -f /var/run/moblock.pid ]; then
-    /bin/kill -HUP `cat /var/run/moblock.pid` >/dev/null 2>&1
-fi
-
-exit 0
-
diff --git a/pcr/moblock/moblock.install b/pcr/moblock/moblock.install
deleted file mode 100644
index 6afe1d5d9..000000000
--- a/pcr/moblock/moblock.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-	#clean up after an old hack
-    if [ -h /usr/lib/libnfnetlink.so.1 ]; then
-        rm /usr/lib/libnfnetlink.so.1
-    fi
-    echo ""
-    echo ">>> moblock-update script no longer uses /var/spool/moblock"
-    echo ">>> as a temporary directory.  You can safely delete it."
-    echo ""
-}
-
-post_upgrade() {
-	#clean up after an old hack
-    if [ -h /usr/lib/libnfnetlink.so.1 ]; then
-        rm /usr/lib/libnfnetlink.so.1
-    fi
-    echo ""
-    echo ">>> moblock-update script no longer uses /var/spool/moblock"
-    echo ">>> as a temporary directory.  You can safely delete it."
-    echo ""
-}
-
-op=$1
-shift
-$op $*
-
diff --git a/pcr/moblock/moblock.logrotate b/pcr/moblock/moblock.logrotate
deleted file mode 100644
index 6ed64bb81..000000000
--- a/pcr/moblock/moblock.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-"/var/log/moblock.log" /var/log/MoBlock.stats {
-  daily
-  missingok
-  notifempty
-  sharedscripts
-  postrotate
-    /usr/bin/test -f /var/run/moblock.pid && /bin/kill -HUP `cat /var/run/moblock.pid 2>/dev/null` 2>/dev/null || exit 0
-  endscript
-  compress
-}
-
diff --git a/pcr/moblock/moblock_0.9_rc2.patch b/pcr/moblock/moblock_0.9_rc2.patch
deleted file mode 100644
index 69994ffe8..000000000
--- a/pcr/moblock/moblock_0.9_rc2.patch
+++ /dev/null
@@ -1,912 +0,0 @@
-diff -Naur MoBlock-0.8_orig/Changelog MoBlock-0.8/Changelog
---- MoBlock-0.8_orig/Changelog	2006-03-22 12:44:31.000000000 -0500
-+++ MoBlock-0.8/Changelog	2008-02-10 11:56:08.000000000 -0500
-@@ -4,6 +4,23 @@
- 
- ---
- 
-+0.9: - fix for kernel 2.6.23
-+	 - support for MARKing packets instead of DROPping or
-+	   ACCEPTing
-+	 - example start script that REJECTs packets instead of
-+	   DROPping.
-+	 - Integrated a patch from David Walluck for proper loading
-+	   of p2b files (version 2)
-+	 - command line options for logging to syslog, stdout
-+	   and log timestamping
-+	 - fixed loading pg1 lists with comments (lines starting
-+	   with '#')
-+	 - fixed a bug in ranges merge
-+	 - applied patch 2223 by badfish99: "IPs logged with bytes
-+	   reversed on big-endian m/c"
-+
-+---
-+
- 0.8: - support for NFQUEUE-ing from iptables FORWARD chain (thx to
-        hyakki for suggestions and testing!)
-      - included patches from Maximilian Mehnert to support log file
-diff -Naur MoBlock-0.8_orig/Makefile MoBlock-0.8/Makefile
---- MoBlock-0.8_orig/Makefile	2006-03-22 12:44:31.000000000 -0500
-+++ MoBlock-0.8/Makefile	2007-11-22 08:10:44.000000000 -0500
-@@ -1,4 +1,3 @@
--
- # To use the old-soon-to-be-deprecated libipq interface
- # uncomment the following line and comment the NFQUEUE one,
- # then comment the gcc line with netfilter_queue and
-@@ -7,7 +6,7 @@
- #QUEUE_LIB=LIBIPQ
- QUEUE_LIB=NFQUEUE
- 
--CFLAGS=-Wall -O2 -march=i586 -mtune=i686 -fomit-frame-pointer -ffast-math \
-+CFLAGS=-Wall -O3 -march=i586 -mtune=i686 -fomit-frame-pointer -ffast-math \
- 	-D_GNU_SOURCE -D$(QUEUE_LIB) -L/usr/include/libipq
- CC=gcc
- 
-diff -Naur MoBlock-0.8_orig/MoBlock-nfq-reject.sh MoBlock-0.8/MoBlock-nfq-reject.sh
---- MoBlock-0.8_orig/MoBlock-nfq-reject.sh	1969-12-31 19:00:00.000000000 -0500
-+++ MoBlock-0.8/MoBlock-nfq-reject.sh	2007-11-22 08:10:44.000000000 -0500
-@@ -0,0 +1,104 @@
-+#!/bin/sh
-+#
-+# MoBlock.sh - MoBlock start script
-+# ---------------------------------
-+
-+ACTIVATE_CHAINS=1
-+WHITE_TCP_IN=""
-+WHITE_UDP_IN=""
-+WHITE_TCP_OUT=""
-+WHITE_UDP_OUT=""
-+WHITE_TCP_FORWARD=""
-+WHITE_UDP_FORWARD=""
-+REJECT_MARK="10"
-+
-+PIDF=/var/run/moblock.pid
-+
-+FNAME=`basename $0 .sh`
-+MODE=`echo $FNAME|awk -F-  '{print $2}'`
-+
-+if [ -f $PIDF  ]; then
-+	PID=`cat $PIDF`
-+	if [ `ps -p $PID|wc -l` -gt 1 ]; then
-+		echo "$0: $PIDF exists and processs seems to be running. Exiting."
-+		exit 1;
-+	fi;
-+fi;
-+
-+if [ $MODE == "ipq" ]; then
-+	modprobe ip_queue
-+	TARGET="QUEUE"
-+elif [ $MODE == "nfq" ]; then
-+	modprobe ipt_NFQUEUE
-+	TARGET="NFQUEUE"
-+fi;
-+
-+modprobe ipt_state
-+
-+# Filter all traffic, edit for your needs
-+
-+iptables -N MOBLOCK_IN
-+iptables -N MOBLOCK_OUT
-+iptables -N MOBLOCK_FW
-+
-+if [ $ACTIVATE_CHAINS -eq 1 ]; then
-+	iptables -I INPUT -p all -m state --state NEW -j MOBLOCK_IN
-+	iptables -I OUTPUT -p all -m state --state NEW -j MOBLOCK_OUT
-+	iptables -I FORWARD -p all -m state --state NEW -j MOBLOCK_FW	
-+fi;
-+
-+
-+iptables -I MOBLOCK_IN -p all -j $TARGET
-+
-+iptables -I MOBLOCK_OUT -p all -j $TARGET
-+
-+iptables -I MOBLOCK_FW -p all -j $TARGET
-+
-+for PORT in $WHITE_TCP_OUT; do
-+	iptables -I MOBLOCK_OUT -p tcp --dport $PORT -j ACCEPT
-+done
-+for PORT in $WHITE_UDP_OUT; do
-+	iptables -I MOBLOCK_OUT -p udp --dport $PORT -j ACCEPT
-+done
-+
-+for PORT in $WHITE_TCP_IN; do
-+	iptables -I MOBLOCK_IN -p tcp --dport $PORT -j ACCEPT
-+done
-+for PORT in $WHITE_UDP_IN; do
-+	iptables -I MOBLOCK_IN -p udp --dport $PORT -j ACCEPT
-+done
-+
-+for PORT in $WHITE_TCP_FORWARD; do
-+	iptables -I MOBLOCK_FW -p tcp --dport $PORT -j ACCEPT
-+done
-+for PORT in $WHITE_UDP_FORWARD; do
-+	iptables -I MOBLOCK_FW -p udp --dport $PORT -j ACCEPT
-+done
-+
-+iptables -I OUTPUT -p all -m state --state NEW -m mark --mark $REJECT_MARK -j REJECT
-+iptables -I FORWARD -p all -m state --state NEW -m mark --mark $REJECT_MARK -j REJECT
-+
-+# Here you can change block list and log files
-+./moblock -d /etc/ipfilter.dat -t -s -r $REJECT_MARK ./moblock.log
-+
-+# On exit delete the rules we added
-+
-+if [ $ACTIVATE_CHAINS -eq 1 ]; then
-+	iptables -D INPUT -p all -m state --state NEW -j MOBLOCK_IN
-+	iptables -D OUTPUT -p all -m state --state NEW -j MOBLOCK_OUT
-+	iptables -D FORWARD -p all -m state --state NEW -j MOBLOCK_FW
-+fi;
-+
-+iptables -D OUTPUT -p all -m state --state NEW -m mark --mark $REJECT_MARK -j REJECT
-+iptables -D FORWARD -p all -m state --state NEW -m mark --mark $REJECT_MARK -j REJECT
-+
-+iptables -F MOBLOCK_IN
-+iptables -X MOBLOCK_IN
-+iptables -F MOBLOCK_OUT
-+iptables -X MOBLOCK_OUT
-+iptables -F MOBLOCK_FW
-+iptables -X MOBLOCK_FW
-+
-+if [ -f $PIDF ]; then	
-+	rm $PIDF;
-+fi
-diff -Naur MoBlock-0.8_orig/MoBlock.c MoBlock-0.8/MoBlock.c
---- MoBlock-0.8_orig/MoBlock.c	2006-03-22 12:44:31.000000000 -0500
-+++ MoBlock-0.8/MoBlock.c	2008-02-10 11:56:08.000000000 -0500
-@@ -35,6 +35,8 @@
- #include <linux/netfilter_ipv4.h>

- #include <signal.h>

- #include <regex.h>

-+#include <time.h>

-+#include <syslog.h>

- 

- // in Makefile define LIBIPQ to use soon-to-be-deprecated ip_queue,

- // NFQUEUE for ipt_NFQUEUE (from kernel 2.6.14)

-@@ -46,7 +48,7 @@
- 	#include <libnetfilter_queue/libnetfilter_queue.h>

- #endif

- 

--#define MB_VERSION	"0.8"

-+#define MB_VERSION	"0.9rc2"

- 

- #define BUFSIZE		2048

- #define PAYLOADSIZE	21

-@@ -58,6 +60,9 @@
- #define SRC_ADDR(payload) (*(in_addr_t *)((payload)+12))

- #define DST_ADDR(payload) (*(in_addr_t *)((payload)+16))

- 

-+#define likely(x)       __builtin_expect((x),1)

-+#define unlikely(x)     __builtin_expect((x),0)

-+

- // rbt datatypes/functions

- 

- typedef enum {

-@@ -96,7 +101,8 @@
- 	char filename[100];

- } blocklist_info;

- 

--int merged_ranges=0, skipped_ranges=0;

-+u_int32_t merged_ranges=0, skipped_ranges=0, accept_mark=0, reject_mark=0;

-+u_int8_t log2syslog=0, log2file=0, log2stdout=0, timestamp=0;

- 

- #ifdef LIBIPQ

- static void die(struct ipq_handle *h)

-@@ -112,11 +118,13 @@
- 	static char buf[2][ sizeof("aaa.bbb.ccc.ddd") ];

- 	static short int index=0;

- 	

-+	ip = ntohl(ip);

-+	

- 	sprintf(buf[index],"%d.%d.%d.%d",

--			(ip) & 0xff,

--			(ip >> 8) & 0xff,

-+			(ip >> 24) & 0xff,

- 			(ip >> 16) & 0xff,

--			(ip >> 24) & 0xff);

-+			(ip >> 8) & 0xff,

-+			(ip) & 0xff);

- 	

- 	if (index) {

- 		index=0;

-@@ -134,10 +142,38 @@
- 	fflush(stdout);

- }

- 

-+void log_action(char *msg)

-+{

-+	char timestr[30];

-+	time_t tv;

-+

-+	if (timestamp) {

-+		tv = time(NULL);

-+		strncpy(timestr, ctime(&tv), 19);

-+		timestr[19] = '\0';

-+		strcat(timestr, "| ");

-+	}

-+	else strcpy(timestr, "");

-+

-+	if (log2syslog) {

-+		syslog(LOG_INFO, msg);

-+	}

-+

-+	if (log2file) {

-+		fprintf(logfile,"%s%s",timestr,msg);

-+		fflush(logfile);

-+	}

-+

-+	if (log2stdout) {

-+		fprintf(stdout,"%s%s",timestr,msg);

-+	}

-+}

-+

- inline void ranged_insert(char *name,char *ipmin,char *ipmax)

- {

-     recType tmprec;

-     int ret;

-+    char msgbuf[255];

- 

- 	if ( strlen(name) > (BNAME_LEN-1) ) {

- 		strncpy(tmprec.blockname, name, BNAME_LEN);

-@@ -149,10 +185,11 @@
-     if ( (ret=insert(ntohl(inet_addr(ipmin)),&tmprec)) != STATUS_OK  )

-         switch(ret) {

-             case STATUS_MEM_EXHAUSTED:

--                fprintf(logfile,"Error inserting range, MEM_EXHAUSTED.\n");

-+                log_action("Error inserting range, MEM_EXHAUSTED.\n");

-                 break;

-             case STATUS_DUPLICATE_KEY:

--                fprintf(logfile,"Duplicated range ( %s )\n",name);

-+                sprintf(msgbuf,"Duplicated range ( %s )\n",name);

-+                log_action(msgbuf);

-                 break;

- 			case STATUS_MERGED:

- 				merged_ranges++;

-@@ -161,8 +198,9 @@
- 				skipped_ranges++;

- 				break;

-             default:

--                fprintf(logfile,"Unexpected return value from ranged_insert()!\n");

--                fprintf(logfile,"Return value was: %d\n",ret);

-+                log_action("Unexpected return value from ranged_insert()!\n");

-+                sprintf(msgbuf,"Return value was: %d\n",ret);

-+                log_action(msgbuf);

-                 break;

-         }                

- }

-@@ -177,15 +215,19 @@
- 	regex_t regmain;

- 	regmatch_t matches[4];

- 	int i;

-+	char msgbuf[255];

- 

- 	regcomp(&regmain, "^(.*)[:]([0-9.]*)[-]([0-9.]*)$", REG_EXTENDED);

- 

- 	fp=fopen(filename,"r");

- 	if ( fp == NULL ) {

--		fprintf(logfile,"Error opening %s, aborting...\n", filename);

-+		sprintf(msgbuf,"Error opening %s, aborting...\n", filename);

-+		log_action(msgbuf);

- 		exit(-1);

- 	}

- 	while ( (count=getline(&line,&len,fp)) != -1 ) {

-+		if ( line[0] == '#' )		//comment line, skip

-+			continue;

- 		for(i=count-1; i>=0; i--) {

- 			if ((line[i] == '\r') || (line[i] == '\n') || (line[i] == ' ')) {

- 				line[i] = 0;

-@@ -207,36 +249,78 @@
- 				      line+matches[3].rm_so);

- 			ntot++;

- 		} else {

--			fprintf(logfile,"Short guarding.p2p line %s, skipping it...\n", line);

-+			sprintf(msgbuf,"Short guarding.p2p line %s, skipping it...\n", line);

-+			log_action(msgbuf);

- 		}

- 	}

- 	if (line)

- 		free(line);

- 	fclose(fp);

--	fprintf(logfile,"Ranges loaded: %d\n",ntot);

--	printf("* Ranges loaded: %d\n",ntot);

-+	sprintf(msgbuf, "* Ranges loaded: %d\n", ntot);

-+	log_action(msgbuf);

-+	if ( !log2stdout )

-+		printf(msgbuf);

- }

- 

--void loadlist_pg2(char *filename)		// experimental, no check for list sanity

-+void loadlist_pg2(char *filename)		// supports only v2 files

- {

-     FILE *fp;

--    int i,retval,ntot=0;

--    char name[100],ipmin[16];			// hope we don't have a list with longer names...

-+    int i, j, c, retval=0, ntot=0;

-+    char name[100],ipmin[16], msgbuf[255];	// hope we don't have a list with longer names...

-     uint32_t start_ip, end_ip;

-     struct in_addr startaddr,endaddr;

-+	size_t s;

- 

-     fp=fopen(filename,"r");

-     if ( fp == NULL ) {

--        fprintf(logfile,"Error opening %s, aborting...\n", filename);

-+        sprintf(msgbuf, "Error opening %s, aborting...\n", filename);

-+        log_action(msgbuf);

-         exit(-1);

-     }

- 

--    fgetc(fp);					// skip first 4 bytes, don't know what they are

--    fgetc(fp);

--    fgetc(fp);

--    retval=fgetc(fp);

-+	for (j=0; j<4; j++) {

-+		c=fgetc(fp);

-+		if ( c != 0xff ) {

-+			sprintf(msgbuf,"Byte %d: 0x%x != 0xff, aborting...\n", j+1, c);

-+			log_action(msgbuf);

-+			fclose(fp);

-+			exit(-1);

-+		}

-+	}

-+	

-+	c=fgetc(fp);

-+	if ( c != 'P' ) {

-+		sprintf(msgbuf,"Byte 5: %c != P, aborting...\n", c);

-+		log_action(msgbuf);

-+		fclose(fp);

-+		exit(-1);

-+	}

-+

-+	c=fgetc(fp);

-+	if ( c != '2' ) {

-+		sprintf(msgbuf,"Byte 6: %c != 2, aborting...\n", c);

-+		log_action(msgbuf);

-+		fclose(fp);

-+		exit(-1);

-+	}

- 

--    while ( retval != EOF ) {

-+	c=fgetc(fp);

-+	if ( c != 'B' ) {

-+		sprintf(msgbuf,"Byte 7: %c != B, aborting...\n", c);

-+		log_action(msgbuf);

-+		fclose(fp);

-+		exit(-1);

-+	}

-+

-+	c=fgetc(fp);

-+	if ( c != 0x02 ) {

-+		sprintf(msgbuf,"Byte 8: version: %d != 2, aborting...\n", c);

-+		log_action(msgbuf);

-+		fclose(fp);

-+		exit(-1);

-+	}

-+

-+	do {

-         i=0;

-         do {

-             name[i]=fgetc(fp);

-@@ -244,9 +328,22 @@
-         } while ( name[i-1] != 0x00 && name[i-1] != EOF);

-         if ( name[i-1] != EOF ) {

-             name[i-1]='\0';

--            fread(&start_ip,4,1,fp);

--            fread(&end_ip,4,1,fp);

--            startaddr.s_addr=start_ip;

-+			s=fread(&start_ip,4,1,fp);

-+			if ( s != 1 ) {

-+				sprintf(msgbuf,"Failed to read start IP: %d != 1, aborting...\n", (int)s);

-+				log_action(msgbuf);

-+                fclose(fp);

-+                exit(-1);

-+            }

-+            s=fread(&end_ip,4,1,fp);

-+            if ( s != 1 ) {

-+                sprintf(msgbuf,"Failed to read end IP: %d != 1, aborting...\n", (int)s);

-+				log_action(msgbuf);

-+                fclose(fp);

-+                exit(-1);

-+            }

-+			

-+			startaddr.s_addr=start_ip;

-             endaddr.s_addr=end_ip;

-             strcpy(ipmin,inet_ntoa(startaddr));

-             ranged_insert(name,ipmin,inet_ntoa(endaddr));

-@@ -255,22 +352,25 @@
-         else {

-             retval=EOF;

-         }

--    }

-+    } while ( retval != EOF );

-     fclose(fp);

--    fprintf(logfile,"Ranges loaded: %d\n",ntot);

--	printf("* Ranges loaded: %d\n",ntot);

-+    sprintf(msgbuf, "* Ranges loaded: %d\n",ntot);

-+    log_action(msgbuf);

-+	if ( !log2stdout )

-+		printf(msgbuf);

- }

- 

- void loadlist_dat(char *filename)

- {

-     FILE *fp;

-     int ntot=0;

--    char readbuf[200], *name, start_ip[16], end_ip[16];

-+    char readbuf[200], *name, start_ip[16], end_ip[16], msgbuf[255];

-     unsigned short ip1_0, ip1_1, ip1_2, ip1_3, ip2_0, ip2_1, ip2_2, ip2_3;

-     

-     fp=fopen(filename,"r");

-     if ( fp == NULL ) {

--        fprintf(logfile,"Error opening %s, aborting...\n", filename);

-+        sprintf(msgbuf,"Error opening %s, aborting...\n", filename);

-+        log_action(msgbuf);

-         exit(-1);

-     }

-     

-@@ -286,38 +386,45 @@
-         ntot++;

-     }

-     fclose(fp);

--    fprintf(logfile,"Ranges loaded: %d\n",ntot);

--	printf("* Ranges loaded: %d\n",ntot);

-+    sprintf(msgbuf, "* Ranges loaded: %d\n", ntot);

-+    log_action(msgbuf);

-+	if ( !log2stdout )

-+		printf(msgbuf);

- }

- 

- void reopen_logfile(void)

- {

-+	char msgbuf[255];

-+

- 	if (logfile != NULL) {

-         	fclose(logfile);

- 		logfile=NULL;

- 	}

- 	logfile=fopen(logfile_name,"a");

- 	if (logfile == NULL) {

--		fprintf(stderr, "Unable to open logfile %s\n", logfile_name);

-+		sprintf(msgbuf, "Unable to open logfile %s\n", logfile_name);

-+		log_action(msgbuf);

- 		exit(-1);

- 	}

--	fprintf(logfile, "Reopening logfile.\n");

-+	log_action("Reopening logfile.\n");

- }

- 

- void my_sahandler(int sig)

- {

-+	char msgbuf[255];

-+

- 	switch( sig ) {

-         	case SIGUSR1:

--			fprintf(logfile,"Got SIGUSR1! Dumping stats...\n");

-+			log_action("Got SIGUSR1! Dumping stats...\n");

- 			ll_show(logfile);

- 			reopen_logfile();

- 			break;

- 		case SIGUSR2:

--			fprintf(logfile,"Got SIGUSR2! Dumping stats to /var/log/MoBlock.stats\n");

-+			log_action("Got SIGUSR2! Dumping stats to /var/log/MoBlock.stats\n");

- 			ll_log();

- 			break;

- 		case SIGHUP:

--			fprintf(logfile,"\nGot SIGHUP! Dumping and resetting stats, reloading blocklist\n\n");

-+			log_action("Got SIGHUP! Dumping and resetting stats, reloading blocklist\n");

- 			ll_log();

- 			ll_clear();		// clear stats list

- 			destroy_tree();		// clear loaded ranges

-@@ -332,17 +439,18 @@
- 					loadlist_pg2(blocklist_info.filename);

- 					break;

- 				default:

--					fprintf(logfile,"Unknown blocklist type while reloading list, contact the developer!\n");

-+					log_action("Unknown blocklist type while reloading list, contact the developer!\n");

- 					break;

- 			}

- 			reopen_logfile();

- 			break;

- 		case SIGTERM:

--			fprintf(logfile,"Got SIGTERM! Dumping stats and exiting.\n");

-+			log_action("Got SIGTERM! Dumping stats and exiting.\n");

- 			ll_log();

- 			exit(0);

- 		default:

--			fprintf(logfile,"Received signal = %d but not handled\n",sig);

-+			sprintf(msgbuf,"Received signal = %d but not handled\n",sig);

-+			log_action(msgbuf);

- 			break;

- 	}

- }

-@@ -378,7 +486,7 @@
- {

- 	int id=0, status=0;

- 	struct nfqnl_msg_packet_hdr *ph;

--	char *payload;

-+	char *payload, msgbuf[255];

- 	recType tmprec;

- 

- 	ph = nfq_get_msg_packet_hdr(nfa);

-@@ -389,34 +497,78 @@
- 		switch (ph->hook) {

- 			case NF_IP_LOCAL_IN:

- 				if ( find(ntohl(SRC_ADDR(payload)),&tmprec) == STATUS_OK ) {

-+					// we drop the packet instead of rejecting

-+					// we don't want the other host to know we are alive

- 					status=nfq_set_verdict(qh, id, NF_DROP, 0, NULL);

--					fprintf(logfile,"Blocked IN: %s,hits: %d,SRC: %s\n",tmprec.blockname,tmprec.hits,ip2str(SRC_ADDR(payload)));

--				} else status = nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);

-+					sprintf(msgbuf,"Blocked IN: %s,hits: %d,SRC: %s\n",tmprec.blockname,tmprec.hits,ip2str(SRC_ADDR(payload)));

-+					log_action(msgbuf);

-+				}

-+				else if ( unlikely(accept_mark) ) {

-+					// we set the user-defined accept_mark and set NF_REPEAT verdict

-+					// it's up to other iptables rules to decide what to do with this marked packet

-+					status = nfq_set_verdict_mark(qh, id, NF_REPEAT, accept_mark, 0, NULL);

-+				     }

-+				     else {

-+				     	// no accept_mark, just NF_ACCEPT the packet

-+				     	status = nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);

-+				     }

- 				break;

- 			case NF_IP_LOCAL_OUT:

- 				if ( find(ntohl(DST_ADDR(payload)),&tmprec) == STATUS_OK ) {

--					status=nfq_set_verdict(qh, id, NF_DROP, 0, NULL);

--					fprintf(logfile,"Blocked OUT: %s,hits: %d,DST: %s\n",tmprec.blockname,tmprec.hits,ip2str(DST_ADDR(payload)));

--				} else status = nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);

-+					if ( likely(reject_mark) ) {

-+						// we set the user-defined reject_mark and set NF_REPEAT verdict

-+						// it's up to other iptables rules to decide what to do with this marked packet

-+						status = nfq_set_verdict_mark(qh, id, NF_REPEAT, reject_mark, 0, NULL);

-+					}

-+					else {

-+						status = nfq_set_verdict(qh, id, NF_DROP, 0, NULL);

-+					}

-+					sprintf(msgbuf,"Blocked OUT: %s,hits: %d,DST: %s\n",tmprec.blockname,tmprec.hits,ip2str(DST_ADDR(payload)));

-+					log_action(msgbuf);

-+				}

-+				else if ( unlikely(accept_mark) ) {

-+					// we set the user-defined accept_mark and set NF_REPEAT verdict

-+					// it's up to other iptables rules to decide what to do with this marked packet

-+ 				        status = nfq_set_verdict_mark(qh, id, NF_REPEAT, accept_mark, 0, NULL);

-+				     }

-+				     else {

-+					// no accept_mark, just NF_ACCEPT the packet

-+					status = nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);

-+				     }

- 				break;

- 			case NF_IP_FORWARD:

- 				if ( find2(ntohl(SRC_ADDR(payload)), ntohl(DST_ADDR(payload)), &tmprec) == STATUS_OK ) {

--					status=nfq_set_verdict(qh, id, NF_DROP, 0, NULL);

--					fprintf(logfile,"Blocked FWD: %s,hits: %d,SRC: %s, DST: %s\n",

-+					if ( likely(reject_mark) ) {

-+						// we set the user-defined reject_mark and set NF_REPEAT verdict

-+						// it's up to other iptables rules to decide what to do with this marked packet

-+						status = nfq_set_verdict_mark(qh, id, NF_REPEAT, reject_mark, 0, NULL);

-+					}

-+					else {

-+						status = nfq_set_verdict(qh, id, NF_DROP, 0, NULL);

-+					}

-+					sprintf(msgbuf,"Blocked FWD: %s,hits: %d,SRC: %s, DST: %s\n",

- 								tmprec.blockname, tmprec.hits, ip2str(SRC_ADDR(payload)), ip2str(DST_ADDR(payload)));

--					fflush(logfile);

--				} else status = nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);

-+					log_action(msgbuf);

-+				}

-+				else if ( unlikely(accept_mark) ) {

-+					// we set the user-defined accept_mark and set NF_REPEAT verdict

-+					// it's up to other iptables rules to decide what to do with this marked packet

-+					status = nfq_set_verdict_mark(qh, id, NF_REPEAT, accept_mark, 0, NULL);

-+				     }

-+				     else {

-+				     	// no accept_mark, just NF_ACCEPT the packet

-+					status = nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);

-+				     }

- 				break;

- 			default:

--				fprintf(logfile,"Not NF_LOCAL_IN/OUT/FORWARD packet!\n");

-+				log_action("Not NF_LOCAL_IN/OUT/FORWARD packet!\n");

- 				break;

- 		}

- 	}

- 	else {

--		fprintf(logfile,"NFQUEUE: can't get msg packet header.\n");

-+		log_action("NFQUEUE: can't get msg packet header.\n");

- 		return(1);		// from nfqueue source: 0 = ok, >0 = soft error, <0 hard error

- 	}

--	fflush(logfile);

- 	return(0);

- }

- #endif

-@@ -492,46 +644,48 @@
- 	struct nfq_q_handle *qh;

- 	struct nfnl_handle *nh;

- 	int fd,rv;

--	char buf[BUFSIZE];

-+	char buf[BUFSIZE], msgbuf[255];

- 

- 	h = nfq_open();

- 	if (!h) {

--		fprintf(logfile, "Error during nfq_open()\n");

-+		log_action("Error during nfq_open()\n");

- 		exit(-1);

- 	}

- 

- 	if (nfq_unbind_pf(h, AF_INET) < 0) {

--		fprintf(logfile, "error during nfq_unbind_pf()\n");

--		exit(-1);

-+		log_action("error during nfq_unbind_pf()\n");

-+		//exit(-1);

- 	}

- 

- 	if (nfq_bind_pf(h, AF_INET) < 0) {

--		fprintf(logfile, "Error during nfq_bind_pf()\n");

-+		log_action("Error during nfq_bind_pf()\n");

- 		exit(-1);

- 	}

- 

--	fprintf(logfile,"NFQUEUE: binding to queue '%hd'\n", queuenum);

-+	sprintf(msgbuf,"NFQUEUE: binding to queue '%hd'\n", queuenum);

-+	log_action(msgbuf);

- 	qh = nfq_create_queue(h,  queuenum, &nfqueue_cb, NULL);

- 	if (!qh) {

--		fprintf(logfile, "error during nfq_create_queue()\n");

-+		log_action("error during nfq_create_queue()\n");

- 		exit(-1);

- 	}

- 

- 	if (nfq_set_mode(qh, NFQNL_COPY_PACKET, PAYLOADSIZE) < 0) {

--		fprintf(logfile, "can't set packet_copy mode\n");

-+		log_action("can't set packet_copy mode\n");

- 		exit(-1);

- 	}

- 

- 	nh = nfq_nfnlh(h);

- 	fd = nfnl_fd(nh);

- 

--	while ((rv = recv(fd, buf, sizeof(buf), 0)) && rv >= 0) {

-+	while ((rv = recv(fd, buf, sizeof(buf), 0)) >= 0) {

- 		nfq_handle_packet(h, buf, rv);

- 	}

- 

--	printf("NFQUEUE: unbinding from queue 0\n");

-+	log_action("NFQUEUE: unbinding from queue 0\n");

- 	nfq_destroy_queue(qh);

- 	nfq_close(h);

-+	nfq_unbind_pf(h, AF_INET);

- 	return(0);

- #endif

- 

-@@ -540,11 +694,16 @@
- void print_options(void)

- {

- 	printf("\nMoBlock %s by Morpheus",MB_VERSION);

--	printf("\nSyntax: MoBlock -dnp <blocklist> [-b] [-q 0-65535] <logfile>\n\n");

-+	printf("\nSyntax: MoBlock -dnp <blocklist> [-q 0-65535] <logfile>\n\n");

- 	printf("\t-d\tblocklist is an ipfilter.dat file\n");

- 	printf("\t-n\tblocklist is a peerguardian 2.x file (.p2b)\n");

- 	printf("\t-p\tblocklist is a peerguardian file (.p2p)\n");

- 	printf("\t-q\t0-65535 NFQUEUE number (as specified in --queue-num with iptables)\n");

-+	printf("\t-r MARK\tmark packet with MARK instead of DROP\n");

-+	printf("\t-a MARK\tmark packet with MARK instead of ACCEPT\n");

-+	printf("\t-l\tlog to stdout\n");

-+	printf("\t-s\tlog to syslog\n");

-+	printf("\t-t\tlog timestamping\n\n");

- }

- 

- void on_quit()

-@@ -556,6 +715,7 @@
- {

- 	int ret=0;

- 	unsigned short int queuenum=0;

-+	char msgbuf[255];

- 

- 	if (argc < 3) {

- 		print_options();

-@@ -591,10 +751,11 @@
- 	}

- 	logfile_name=malloc(strlen(argv[argc-1])+1);

- 	strcpy(logfile_name,argv[argc-1]);

-+	log2file = 1;

- 	printf("* Logging to %s\n",logfile_name);

- 	

- 	while (1) {		//scan command line options

--		ret=getopt(argc, argv, "d:n:p:q:");

-+		ret=getopt(argc, argv, "d:n:p:q:a:r:stl");

- 		if ( ret == -1 ) break;

- 		

- 		switch (ret) {

-@@ -619,6 +780,28 @@
- 			case 'q':

- 				queuenum=(unsigned short int)atoi(optarg);

- 				break;

-+			case 'r':

-+				reject_mark=(u_int32_t)atoi(optarg);

-+				printf("* DROP MARK: %d\n", reject_mark);

-+				reject_mark=htonl(reject_mark);

-+				break;

-+			case 'a':

-+				accept_mark=(u_int32_t)atoi(optarg);

-+				printf("* ACCEPT MARK: %d\n", accept_mark);

-+				accept_mark=htonl(accept_mark);

-+				break;

-+			case 's':

-+				log2syslog = 1;

-+				printf("* Logging to syslog\n");

-+				break;

-+			case 't':

-+				timestamp = 1;

-+				printf("* Log timestamp enabled\n");

-+				break;

-+			case 'l':

-+				log2stdout = 1;

-+				printf("* Log to stdout enabled\n");

-+				break;

- 			case '?':			// unknown option

- 				print_options();

- 				exit(-1);

-@@ -626,10 +809,14 @@
- 		}

- 	}

- 	

--	printf("* Merged ranges: %d\n", merged_ranges);

--	fprintf(logfile, "Merged ranges: %d\n", merged_ranges);

--	printf("* Skipped useless ranges: %d\n", skipped_ranges);

--	fprintf(logfile,"Skipped useless ranges: %d\n", skipped_ranges);

-+	sprintf(msgbuf, "* Merged ranges: %d\n", merged_ranges);

-+	log_action(msgbuf);

-+	if ( !log2stdout )

-+		printf(msgbuf);

-+	sprintf(msgbuf,"* Skipped useless ranges: %d\n", skipped_ranges);

-+	log_action(msgbuf);

-+	if ( !log2stdout )

-+		printf(msgbuf);

- 	fflush(NULL);

- 

- 	netlink_loop(queuenum);

-diff -Naur MoBlock-0.8_orig/README MoBlock-0.8/README
---- MoBlock-0.8_orig/README	2006-03-22 12:44:31.000000000 -0500
-+++ MoBlock-0.8/README	2007-11-22 08:10:44.000000000 -0500
-@@ -1,5 +1,5 @@
- 
--MoBlock README v0.8
-+MoBlock README v0.9
- http://moblock.berlios.de
- 
- .Introduction.
-@@ -47,6 +47,22 @@
- 	ip_conntrack           40044  1 ipt_state
- 	iptable_filter          2176  1
- 	ip_tables              17600  3 ipt_NFQUEUE,ipt_state,iptable_filter
-+	
-+	...and these with kernel 2.6.23 using NFQUEUE interface:
-+	
-+	nfnetlink_queue         9344  1
-+	nfnetlink               4568  2 nfnetlink_queue
-+	ipt_REJECT              3520  2
-+	xt_mark                 1600  2
-+	nf_conntrack_ipv4      12424  5
-+	iptable_filter          2308  1
-+	ip_tables              10328  1 iptable_filter
-+	xt_state                1984  5
-+	nf_conntrack           48356  2 nf_conntrack_ipv4,xt_state
-+	xt_NFQUEUE              1664  3
-+	x_tables               11396  5 ipt_REJECT,xt_mark,ip_tables,xt_state,xt_NFQUEUE
-+	
-+	(notice that ipt_NFQUEUE has changed to xt_NFQUEUE, same thing for other modules too)
- 
- 2) A valid guarding.p2p/ipfilter.dat/p2p.p2b host file in /etc ( /etc/guarding.p2p ).
-    MoBlock tries to skip malformed or duplicate ranges but
-@@ -140,8 +156,18 @@
-    To specify a NFQUEUE queue number:
- 
- 	./moblock -p /etc/guarding.p2p -q 5 MoBlock.log
-+	
-+   From version 0.9 MoBlock supports MARKing packets and RETURN them to
-+   iptables, there's an example start script (MoBlock-nfq-reject.sh) that
-+   uses this feature to REJECT packet instead of dropping them. It can help
-+   in complex firewall configuration where you need more control of packets
-+   flow after MoBlock inspection.
-+   See the mentioned start script for reference, you can set the MARK value
-+   for packets that MoBlock would drop (ip in list) with the "-r" command line
-+   option and for packets that MoBlock would accept (ip not in list) with
-+   the "-a" command line option.
- 
--   To stop it:
-+   To stop MoBlock:
- 
-    kill -TERM <MoBlockPid>
- 
-@@ -149,7 +175,7 @@
-    To obtain stats about blocked ranges while it's running:
- 
-    kill -USR1 <MoBlockPid>	# write stats to logfile
--   kill -USR2 <MoBlockPid>      # write stats to /var/log/MoBlock.stats
-+   kill -USR2 <MoBlockPid>  # write stats to /var/log/MoBlock.stats
- 
- ** NEW: to reload the blocklist while MoBlock is running send to it the
-    HUP signal:
-@@ -168,7 +194,10 @@
-   took some code and ideas from his FTwall
- - Andrew de Quincey (adq at lidskialf dot net) for regular expressions
-   and command line args patch
--- Maximilian Mehnert (clessing at freenet dot de) for logfile rotation
-+- clessing at freenet dot de for logfile rotation
-   patches, pid file creation, start script, fixes/files for debian packaging
-+- David Walluck, patch for proper loading of p2b files
-+- jre, for continuing clessing work on debian packaging and many other
-+  contributions
- 
--Last Updated: 20/Mar/2006
-+Last Updated: 15/Oct/2007
-diff -Naur MoBlock-0.8_orig/rbt.c MoBlock-0.8/rbt.c
---- MoBlock-0.8_orig/rbt.c	2006-03-22 12:44:31.000000000 -0500
-+++ MoBlock-0.8/rbt.c	2008-02-10 11:56:08.000000000 -0500
-@@ -19,7 +19,7 @@
- #include <stdarg.h>
- #include <time.h>
- 
--#define RBT_VERSION 0.8
-+#define RBT_VERSION 0.9
- #define BNAME_LEN	80
- 
- /* implementation dependend declarations */
-@@ -421,7 +421,7 @@
- 
- statusEnum insert(keyType key, recType *rec) {
-     nodeType *current, *parent, *x;
--	keyType tmpkey;
-+	//keyType tmpkey;
- 	recType tmprec;
- 	int ret;
- 	
-@@ -433,6 +433,23 @@
-     current = root;
-     parent = 0;
-     while (current != NIL) {
-+		if (compEQ2(current->key, key, rec->ipmax)) {	// current node key is inside new range to be inserted
-+			strcpy(tmprec.blockname, rec->blockname);	// block name from new range
-+			if (compLT(current->rec.ipmax, rec->ipmax))
-+				tmprec.ipmax = rec->ipmax;
-+			else tmprec.ipmax = current->rec.ipmax;
-+			tmprec.hits = 0;
-+			//printf("deleting node :%lu\n", current->key);
-+			ret=delete(current->key);
-+			if ( ret != STATUS_OK )
-+				return(ret);
-+			ret=insert(key, &tmprec);
-+			if ( ret == STATUS_OK ) {
-+				printf("new merge\n");
-+				return(STATUS_MERGED);
-+			}
-+			else return(ret);
-+		}
-         if (compEQ(key, current->key)) {
- 			if ( rec->ipmax > current->rec.ipmax ) {
- 				current->rec.ipmax=rec->ipmax;
-@@ -458,7 +475,7 @@
- 			}
- 		}
- 		//check if higher ip (ipmax) is already in a range
--		if (compEQ2(rec->ipmax,current->key,current->rec.ipmax)) {
-+		/*if (compEQ2(rec->ipmax,current->key,current->rec.ipmax)) {
- 			fprintf(logfile,"higher ip in range\n");
- 			tmpkey=key;
- 			strcpy(tmprec.blockname,current->rec.blockname);
-@@ -470,7 +487,7 @@
- 			if ( ret == STATUS_OK )
- 				return(STATUS_MERGED);
- 			else return(ret);
--		}
-+		}*/
-         parent = current;
-         current = compLT(key, current->key) ?
-             current->left : current->right;
-@@ -495,7 +512,7 @@
-     } else {
-         root = x;
-     }
--
-+	//printf("new node, key: %lu, parent: %lu\n", x->key, parent ? parent->key : 0);
-     insertFixup(x);
-     lastFind = NULL;
- 
diff --git a/pcr/moblock/moblock_include.patch b/pcr/moblock/moblock_include.patch
deleted file mode 100644
index 644e8240e..000000000
--- a/pcr/moblock/moblock_include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- MoBlock-0.8/MoBlock.c.orig	2008-08-15 14:41:49.000000000 -0400
-+++ MoBlock-0.8/MoBlock.c	2008-08-15 14:43:45.000000000 -0400
-@@ -32,6 +32,7 @@
- #include <netinet/udp.h>

- #include <sys/socket.h>

- #include <arpa/inet.h>

-+#include <limits.h>

- #include <linux/netfilter_ipv4.h>

- #include <signal.h>

- #include <regex.h>

diff --git a/pcr/monkeysign/PKGBUILD b/pcr/monkeysign/PKGBUILD
deleted file mode 100644
index 2e4ab1f3f..000000000
--- a/pcr/monkeysign/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributor: fauno <fauno@kiwwwi.com.ar>
-pkgname=monkeysign
-pkgver=1.0
-pkgrel=1
-pkgdesc="OpenPGP Key Exchange for Humans"
-arch=('any')
-url="http://web.monkeysphere.info/monkeysign/"
-license=('GPL3')
-depends=('python2-setuptools' 'python2-qrencode' 'gtk2' 'pygtk' 'zbar' 'python2-imaging')
-source=(http://cdn.debian.net/debian/pool/main/m/${pkgname}/${pkgname}_${pkgver}.tar.gz)
-# http://cdn.debian.net/debian/pool/main/m/monkeysign/monkeysign_1.0.dsc
-sha1sums=('28e29beae7fed3c3deba236cbe8879cab5eeb4e8')
-sha256sums=('944fc4d0915236bf72390bd2dc2f5445cfb70033df438b91b1af38bd0ff9fd46')
-
-build() {
-    cd "${pkgname}-${pkgver}"
-    python2 setup.py build
-}
-
-package() {
-    cd "${pkgname}-${pkgver}"
-    python2 setup.py install --root="${pkgdir}" --prefix="/usr" --optimize=1
-}
-
diff --git a/pcr/monkeysphere/PKGBUILD b/pcr/monkeysphere/PKGBUILD
deleted file mode 100644
index 749cb0c25..000000000
--- a/pcr/monkeysphere/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: fauno <fauno@kiwwwi.com.ar>
-# Based on monkeysphere-git from
-# Contributor: Olivier Mehani <shtrom-arch@ssji.net>
-# $Id: PKGBUILD 264 2010-11-10 00:57:53Z shtrom $
-pkgname=monkeysphere
-pkgver=0.36
-pkgrel=1
-pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
-arch=('any')
-url="http://web.monkeysphere.info/"
-license=('GPL3')
-depends=('gnupg' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1')
-source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz
-        binmerge.patch)
-install=monkeysphere.install
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -Ni "${srcdir}/binmerge.patch"
-}
-
-# Checks fail
-#check() {
-#  cd "$srcdir/$pkgname-$pkgver"
-#
-#  make test
-#}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-  mkdir -p $pkgdir/var/lib/monkeysphere
-}
-sha1sums=('c4f950346040f7703cb4c6e8b32022f4361d0c9d'
-          '780c2e203980558316b0714c4b2a3ad49be3ea27')
-sha256sums=('6ae4edeff2cc29b6913346e15b61500ea7cc06d761a9f42e67de83b7d2607be7'
-            'e49a1097296b06090010ce5344588f5e4917aeb06a118de920fc58411d2a7cf7')
diff --git a/pcr/monkeysphere/binmerge.patch b/pcr/monkeysphere/binmerge.patch
deleted file mode 100644
index 48d945511..000000000
--- a/pcr/monkeysphere/binmerge.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.orig	2013-06-07 13:02:23.123944233 -0300
-+++ Makefile	2013-06-07 13:02:43.351065809 -0300
-@@ -36,17 +36,17 @@
- # this target is to be called from the tarball, not from the git
- # working dir!
- install: all installman
--	mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin
-+	mkdir -p $(DESTDIR)$(PREFIX)/bin
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/monkeysphere/m $(DESTDIR)$(PREFIX)/share/monkeysphere/mh $(DESTDIR)$(PREFIX)/share/monkeysphere/ma $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
- 	mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
- 	printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION
- 	install src/monkeysphere $(DESTDIR)$(PREFIX)/bin
- 	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere
--	install src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin
--	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host
--	install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
--	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
-+	install src/monkeysphere-host $(DESTDIR)$(PREFIX)/bin
-+	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere-host
-+	install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/bin
-+	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere-authentication
- 	install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere
- 	install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
- 	install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere
diff --git a/pcr/monkeysphere/monkeysphere.install b/pcr/monkeysphere/monkeysphere.install
deleted file mode 100644
index 2013f9f41..000000000
--- a/pcr/monkeysphere/monkeysphere.install
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-# $Id: monkeysphere.install 264 2010-11-10 00:57:53Z shtrom $
-# vim:set ts=2 sw=2 et:
-
-# arg 1:  the new package version
-pre_install() {
- /bin/true
-}
-
-# arg 1:  the new package version
-post_install() {
-  echo ">>> Creating monkeysphere user and group and setting permissions..."
-  getent group monkeysphere >/dev/null || usr/sbin/groupadd monkeysphere
-  getent passwd monkeysphere >/dev/null || usr/sbin/useradd -c 'Monkeysphere WoT server identification tool' -g monkeysphere -d '/var/lib/monkeysphere' -s /bin/bash monkeysphere
-
-# Should be root:root for sshd to work
-  chown root:root /var/lib/monkeysphere
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
- /bin/true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-# Should be root:root for sshd to work
-  chown root:root /var/lib/monkeysphere
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  usr/sbin/userdel monkeysphere &>/dev/null
-  (getent group monkeysphere >/dev/null && usr/sbin/groupdel monkeysphere &>/dev/null) || /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
- /bin/true
-}
-
diff --git a/pcr/mosquitto/PKGBUILD b/pcr/mosquitto/PKGBUILD
deleted file mode 100644
index 2f765ad13..000000000
--- a/pcr/mosquitto/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# This is the PKGBUILD for mosquitto, an MQTT broker and example clients
-# Maintainer: Alexander Rust <mail at alr dot st> 
-# Contributor: Dan Anderson <dan-anderson at cox dptnet>
-
-pkgname=mosquitto
-pkgver=1.1.3
-pkgrel=3
-pkgdesc="An Open Source MQTT v3.1 Broker"
-arch=('i686' 'x86_64' 'arm' 'armv6h' 'mips64el')
-url="http://mosquitto.org/"
-makedepends=('python')
-optdepends=('python: python support')
-license=('BSD')
-source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc} "$pkgname.service" 
-        "binmerge.patch")
-md5sums=('fd0cae17221d778b0a002c31e6c3de9e'
-         'SKIP'
-         '58af79ed48be928f91e5435cda82bb8b'
-         '27e24b672d63b797f0e026ab85c64c4b')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver/src"
-  patch -N -i ${srcdir}/binmerge.patch
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make prefix=/usr
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make prefix=/usr DESTDIR="$pkgdir/" install
-  
-  # Systemd service file
-  install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
-  
-  # License files
-  install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
-  install -Dm644 LICENSE-3rd-party.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-3rd-party
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/mosquitto/binmerge.patch b/pcr/mosquitto/binmerge.patch
deleted file mode 100644
index d6d79041d..000000000
--- a/pcr/mosquitto/binmerge.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/Makefile.orig	2013-06-03 12:23:15.288586121 -0300
-+++ src/Makefile	2013-06-03 12:23:29.455571403 -0300
-@@ -90,15 +90,15 @@
- 	${CC} $(CFLAGS) ${CPPFLAGS} -c $< -o $@
- 
- install : all
--	$(INSTALL) -d ${DESTDIR}$(prefix)/sbin
--	$(INSTALL) -s mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
-+	$(INSTALL) -d ${DESTDIR}$(prefix)/bin
-+	$(INSTALL) -s mosquitto ${DESTDIR}${prefix}/bin/mosquitto
- 	$(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h
- ifeq ($(WITH_TLS),yes)
- 	$(INSTALL) -s mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd
- endif
- 
- uninstall :
--	-rm -f ${DESTDIR}${prefix}/sbin/mosquitto
-+	-rm -f ${DESTDIR}${prefix}/bin/mosquitto
- 	-rm -f ${DESTDIR}${prefix}/include/mosquitto_plugin.h
- 	-rm -f ${DESTDIR}${prefix}/bin/mosquitto_passwd
- 
diff --git a/pcr/mosquitto/mosquitto.service b/pcr/mosquitto/mosquitto.service
deleted file mode 100644
index 9626cbc45..000000000
--- a/pcr/mosquitto/mosquitto.service
+++ /dev/null
@@ -1,22 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd 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.
-
-[Unit]
-Description=Mosquitto MQTT Broker daemon
-ConditionPathExists=/etc/mosquitto/mosquitto.conf
-Requires=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/mosquitto -c /etc/mosquitto/mosquitto.conf -d
-ExecStartPre=/usr/bin/rm -f /run/mosquitto.pid
-PIDFile=/run/mosquitto.pid
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/pcr/mozilla-devscripts/PKGBUILD b/pcr/mozilla-devscripts/PKGBUILD
deleted file mode 100644
index ef7ea7641..000000000
--- a/pcr/mozilla-devscripts/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Michał Masłowski  <mtjm@mtjm.eu>
-# Contributor: Márcio Silva <coadde@lavabit.com>
-
-pkgname=mozilla-devscripts
-pkgver=0.32
-pkgrel=1
-pkgdesc="Development scripts used by Debian Mozilla's addons packages"
-arch=("any")
-url="http://packages.debian.org/source/unstable/mozilla-devscripts"
-license=('GPL' 'custom')
-depends=("python2" "zip" "unzip")
-_debrepo=http://ftp.debian.org/debian/pool/main/
-source=("${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.dsc"
-        "${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.tar.gz")
-md5sums=("386a5854601f29dca4a293f90f6c2a69"
-         "230126afa15fa654eb254bb4e61b4a93")
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  # Adapt it to Arch's Python naming.
-  find . -type f | xargs -L1 sed -i "s:#!/usr/bin/python:#!/usr/bin/python2:"
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  # The Makefile expects the system to have standard Python name, so
-  # do this directly here.
-  python2 setup.py install --root="$pkgdir/"
-  install -Dm644 debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/copyright"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/msdl/PKGBUILD b/pcr/msdl/PKGBUILD
deleted file mode 100644
index dfcf99c03..000000000
--- a/pcr/msdl/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Nathan Owe ndowens04 at gmail dot com
-# Contributor: noonov <noonov@gmail.com>
-
-pkgname=msdl
-pkgver=1.2.7_r2
-_pkgver=${pkgver/_/-}
-pkgrel=1
-pkgdesc="A multi-protocol downloader for various streaming protocols"
-arch=('i686' 'x86_64')
-url="http://msdl.sourceforge.net/"
-license=('GPL3')
-depends=('glibc')
-source=(http://downloads.sourceforge.net/msdl/${pkgname}-${_pkgver}.tar.gz)
-
-build() {
-  cd ${srcdir}/${pkgname}-${_pkgver}
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${_pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
-
-md5sums=('a2b37162115170cc59ff6ace1d9c5ac4')
-
diff --git a/pcr/multipath-tools-git/PKGBUILD b/pcr/multipath-tools-git/PKGBUILD
deleted file mode 100644
index d1bb4ac9b..000000000
--- a/pcr/multipath-tools-git/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Miguel Revilla <yo@miguelrevilla.com>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Timothée Ravier <tim@siosm.fr>
-
-pkgname=multipath-tools-git
-pkgver=1295.81895af
-pkgrel=1
-pkgdesc="Tools to drive the Device Mapper multipathing driver (contains kpartx)"
-url="http://christophe.varoqui.free.fr/"
-arch=('x86_64' 'i686')
-license=('GPL2')
-depends=('libaio' 'device-mapper')
-makedepends=('git' 'setconf')
-options=(!emptydirs)
-source=("${pkgname}::git+http://git.opensvc.com/multipath-tools/.git")
-md5sums=('SKIP')
-
-pkgver() {
-  cd ${pkgname}
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
-}
-
-prepare() {
-  cd ${pkgname}
-  sed -i 's|/sbin|/usr/bin|g' Makefile.inc
-  sed -i 's|LIB=lib|LIB=usr/lib|g' Makefile.inc
-  sed -i 's|${prefix}/lib/udev|${prefix}/usr/lib/udev|g' Makefile.inc
-  sed -i 's|$(prefix)/lib/systemd/system|$(prefix)/usr/lib/systemd/system|g' Makefile.inc
-}
-
-build() {
-  cd ${pkgname}
-  setconf Makefile.inc GZIP '/usr/bin/gzip -9 -c'
-  make
-}
-
-package() {
-  cd ${pkgname}
-  make LIB="/usr/lib" DESTDIR="${pkgdir}" install
-  install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
-  cd "${pkgdir}"/usr/lib
-  rm libmpathpersist.so
-  ln -s libmpathpersist.so.0 libmpathpersist.so
-}
diff --git a/pcr/multiwatch/PKGBUILD b/pcr/multiwatch/PKGBUILD
deleted file mode 100644
index 2cf0bcc68..000000000
--- a/pcr/multiwatch/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Paul Dann <pdgiddie at gmail dot com>
-pkgname=multiwatch
-pkgver='1.0.0'
-pkgrel=1
-pkgdesc='Forks and watches multiple instances of a program in the same context'
-arch=('i686' 'x86_64')
-url="http://redmine.lighttpd.net/projects/multiwatch/wiki"
-license=('MIT')
-depends=('libev')
-makedepends=('cmake')
-source=("http://download.lighttpd.net/multiwatch/releases-1.x/multiwatch-$pkgver.tar.bz2")
-md5sums=('87f74dbaf5318f2b2dce3d0bf9f5025c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  rm -rf build
-  mkdir build
-  cd build
-  cmake ..
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/build"
-  install -Dm 755 multiwatch $pkgdir/usr/bin/multiwatch
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/musescore/PKGBUILD b/pcr/musescore/PKGBUILD
deleted file mode 100644
index 8acfecfeb..000000000
--- a/pcr/musescore/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de
-# Contributor: Cristian Maureira <saint [at] archlinux.cl>
-# Contributor: Dr.Egg <rwhite @ archlinux . us>
-
-pkgname=musescore
-pkgver=1.3
-pkgrel=3
-pkgdesc="A music score editor written in Qt"
-arch=('i686' 'x86_64')
-url="http://www.musescore.org/en/"
-license=('GPL')
-depends=('shared-mime-info' 'qtscriptgenerator' 'portaudio')
-makedepends=('cmake' 'doxygen')
-optdepends=('jack')
-install=musescore.install
-source=("http://downloads.sourceforge.net/mscore/mscore-${pkgver}.tar.bz2"
-paths.patch system_qscriptgenerator.patch mime.xml qmake-qt4.patch desktop.patch)
-md5sums=('e5fde2bef0d40ee7542e1f515a3919d1'
-         '28f61c298f53214adacbc8d43f9c43e9'
-         '51e590842a92cdea7efa01fd60fe715c'
-         '969696178e56de36f9af37d7da61baaa'
-         'a9e1d9c1a891810172245c6021682258'
-         'c8f37720422ae1e1a0fa02b284bd00ed')
-
-build() {
-  cd $srcdir/mscore-${pkgver}
-  export QT_PLUGINS_DIR=/usr/lib/qt4/plugins 
-  [ -d build ] && make clean
-  patch -p1 < $srcdir/system_qscriptgenerator.patch 
-  patch -p1 < $srcdir/paths.patch
-  patch -p1 < $srcdir/desktop.patch
-  patch -p1 < $srcdir/qmake-qt4.patch 
-  make PREFIX=/usr release 
-}
-
-package() {
-  cd $srcdir/mscore-${pkgver}
-  make PREFIX=/usr DESTDIR="$pkgdir" install
-  cd $pkgdir/usr/share/mscore-$pkgver/man
-  install -d $pkgdir/usr/share/doc/$pkgname
-  cp * $pkgdir/usr/share/doc/$pkgname/
-  cd ../..
-  rm -r $pkgdir/usr/share/mscore-$pkgver/man
-  install -Dm644 $srcdir/mime.xml \
-    $pkgdir/usr/share/mime/packages/x-musescore.xml
-}
diff --git a/pcr/musescore/desktop.patch b/pcr/musescore/desktop.patch
deleted file mode 100644
index 46beefc93..000000000
--- a/pcr/musescore/desktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur mscore-1.2.old/mscore/packaging/mscore.desktop mscore-1.2.new/mscore/packaging/mscore.desktop
---- mscore-1.2.old/mscore/packaging/mscore.desktop	2013-01-20 14:54:27.000000000 +0100
-+++ mscore-1.2.new/mscore/packaging/mscore.desktop	2013-01-20 14:55:11.000000000 +0100
-@@ -3,7 +3,7 @@
- Comment=WYSIWYG Music score typesetter
- Comment[ru]=Визуальный редактор нотных партитур
- Exec=mscore
--GenericName=mscore
-+GenericName=MuseScore
- GenericName[ru]=MuseScore
- Icon=mscore
- Name=MuseScore
diff --git a/pcr/musescore/mime.xml b/pcr/musescore/mime.xml
deleted file mode 100644
index a46de9f41..000000000
--- a/pcr/musescore/mime.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-<mime-type type="application/x-musescore">
-</mime-type>
-</mime-info>
diff --git a/pcr/musescore/musescore.install b/pcr/musescore/musescore.install
deleted file mode 100644
index 6da0990dc..000000000
--- a/pcr/musescore/musescore.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	      update-desktop-database -q
-	      update-mime-database /usr/share/mime/
-}
-
-post_upgrade() {
-	       post_install
-}
-
-post_remove() {
-	      post_install
-}
diff --git a/pcr/musescore/paths.patch b/pcr/musescore/paths.patch
deleted file mode 100644
index a1e43a93d..000000000
--- a/pcr/musescore/paths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur musescore-svn.orig//mscore/mscore/mscore.cpp musescore-svn.new//mscore/mscore/mscore.cpp
---- musescore-svn.orig//mscore/mscore/mscore.cpp	2010-06-16 23:10:27.000000000 +0200
-+++ musescore-svn.new//mscore/mscore/mscore.cpp	2010-06-16 23:13:59.000000000 +0200
-@@ -919,15 +919,15 @@
-       if (debugMode)
-             printf("open handbook for language <%s>\n", qPrintable(lang));
- 
--      QFileInfo mscoreHelp(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf"));
-+      QFileInfo mscoreHelp(("/usr/share/doc/musescore/MuseScore-") + lang + QString(".pdf"));
-       if (!mscoreHelp.isReadable()) {
-             if (debugMode) {
-                   printf("cannot open doc <%s>\n", qPrintable(mscoreHelp.filePath()));
-                   }
-             lang = lang.left(2);
--            mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf"));
-+            mscoreHelp.setFile(("/usr/share/doc/musescore/MuseScore-") + lang + QString(".pdf"));
-             if(!mscoreHelp.isReadable()){
--                mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-en.pdf"));
-+                mscoreHelp.setFile(("/usr/share/doc/musescore/MuseScore-en.pdf"));
-                 if (!mscoreHelp.isReadable()) {
-                       QString info(tr("MuseScore handbook not found at: \n"));
-                       info += mscoreHelp.filePath();
diff --git a/pcr/musescore/qmake-qt4.patch b/pcr/musescore/qmake-qt4.patch
deleted file mode 100644
index 27c50d8b3..000000000
--- a/pcr/musescore/qmake-qt4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur mscore-1.3.orig/Makefile mscore-1.3.new/Makefile
---- mscore-1.3.orig/Makefile	2013-03-05 18:41:00.000000000 +0100
-+++ mscore-1.3.new/Makefile	2013-03-05 18:55:46.000000000 +0100
-@@ -34,6 +34,7 @@
-             cd build;                                  \
-             cmake -DCMAKE_BUILD_TYPE=RELEASE	       \
-             	  -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-+	          -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
-             	   ../mscore; 			       \
-             make lrelease;                             \
-             make -j ${CPUS};                           \
-diff -Naur mscore-1.3.orig/mscore/CMakeLists.txt mscore-1.3.new/mscore/CMakeLists.txt
---- mscore-1.3.orig/mscore/CMakeLists.txt	2013-03-05 18:41:27.000000000 +0100
-+++ mscore-1.3.new/mscore/CMakeLists.txt	2013-03-05 18:54:35.000000000 +0100
-@@ -427,8 +427,8 @@
- 
- add_custom_target(lrelease
-    COMMAND ${PROJECT_SOURCE_DIR}/gen-qt-projectfile ${PROJECT_SOURCE_DIR} > mscore.pro
--   COMMAND lrelease ${PROJECT_SOURCE_DIR}/share/locale/*.ts
--   COMMAND lrelease ${PROJECT_SOURCE_DIR}/share/plugins/musescore.com/translations/*.ts
-+   COMMAND lrelease-qt4 ${PROJECT_SOURCE_DIR}/share/locale/*.ts
-+   COMMAND lrelease-qt4 ${PROJECT_SOURCE_DIR}/share/plugins/musescore.com/translations/*.ts
-    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-    )
- 
diff --git a/pcr/musescore/system_qscriptgenerator.patch b/pcr/musescore/system_qscriptgenerator.patch
deleted file mode 100644
index 6deef6ec9..000000000
--- a/pcr/musescore/system_qscriptgenerator.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur mscore-1.3.orig/mscore/CMakeLists.txt mscore-1.3.new/mscore/CMakeLists.txt
---- mscore-1.3.orig/mscore/CMakeLists.txt	2011-12-23 20:22:29.000000000 +0100
-+++ mscore-1.3.new/mscore/CMakeLists.txt	2011-12-23 20:36:37.000000000 +0100
-@@ -31,6 +31,6 @@
- set(GCC_VISIBILITY TRUE)                  # requires gcc 4.x?
- set(HAS_AUDIOFILE TRUE)                   # requires libsndfile
- 
--set(BUILD_SCRIPTGEN TRUE)                 #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib)
-+set(BUILD_SCRIPTGEN FALSE)                 #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib)
- set(STATIC_SCRIPT_BINDINGS FALSE)
- set(USE_SSE FALSE)
diff --git a/pcr/mx44/PKGBUILD b/pcr/mx44/PKGBUILD
deleted file mode 100644
index 6666a1405..000000000
--- a/pcr/mx44/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-pkgname=mx44
-_pkgname=Mx44
-pkgver=2
-pkgrel=1
-pkgdesc="polyphonic multi-channel MIDI software synthesizer"
-arch=('i686')
-url="http://web.comhem.se/luna/"
-license=('GPL')
-depends=('jack' 'gtk2')
-source=(http://web.comhem.se/luna/$_pkgname.$pkgver.tar.gz)
-md5sums=('8e532c78d79e189fe5b6e2dd10acf0e2')
-
-build() {
-  cd $srcdir/$_pkgname.$pkgver/src
-  make
-}
-
-package() {
-  cd $srcdir/$_pkgname.$pkgver/src
-  install -m755 -d ${pkgdir}/usr/bin
-  make PREFIX=$pkgdir/usr/ install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/mycron-git/PKGBUILD b/pcr/mycron-git/PKGBUILD
deleted file mode 100644
index 16022bc5f..000000000
--- a/pcr/mycron-git/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Contributor: Dirk Sohler <spam@0x7be.de>               
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=mycron-git
-pkgver=20121116
-pkgrel=1
-pkgdesc='A standards compliant and convenient crontab management system.'
-
-url='https://dev.0x7be.de/mycron'
-arch=('any')
-license=('GPL')
-
-depends=('python>=3.0')
-makedepends=('git')
-
-install=mycron.install
-
-source=('mycron.install')
-sha256sums=('a5406ae03412d3a1aaf6aadb902b4dd40bb6eadb21aa2ffb7c21ae95d656f598')
-
-_gitroot='https://github.com/dsohler/mycron'
-_gitname='master'
-
-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"
-}
-
-package() {
-	cd "$srcdir/$_gitname-build"
-	install -Dm 755 mycron.py $pkgdir/usr/bin/mycron
-	install -Dm 644 example-config.cfg \
-		$pkgdir/usr/share/doc/mycron/example-config.cfg
-	install -Dm 644 example.crontab \
-		$pkgdir/usr/share/doc/mycron/example.crontab
-}
diff --git a/pcr/mycron-git/mycron.install b/pcr/mycron-git/mycron.install
deleted file mode 100644
index a56c1ab97..000000000
--- a/pcr/mycron-git/mycron.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_install() {
-	echo 'Don’t forget to set up your cron service/daemon to execute mycron every minute. See https://dev.0x7be.de/mycron for setup instructions and configuration examples.' | fold -sw 70
-}
diff --git a/pcr/nagios-nrpe-plugin/PKGBUILD b/pcr/nagios-nrpe-plugin/PKGBUILD
deleted file mode 100644
index 3f2cba3c0..000000000
--- a/pcr/nagios-nrpe-plugin/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# https://github.com/mvgrimes/aur-nagios-npre-plugin
-# Contributor: Mark Grimes <mgrimes at peculier dot com>
-# Contributor: Idares <idares@seznam.cz>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=nagios-nrpe-plugin
-pkgver=2.13
-pkgrel=1
-pkgdesc="The Nagios NRPE server side plugin."
-license=('GPL')
-arch=('i686' 'x86_64')
-url="http://www.nagios.org"
-source=("http://downloads.sourceforge.net/nagios/nrpe-$pkgver.tar.gz")
-
-depends=(nagios)
-
-build() {
-    cd $startdir/src/nrpe-$pkgver
-    ./configure --prefix=/usr/share/nagios \
-        --with-nagios-user=nobody --with-nagios-group=nobody || return 1
-    make || return 1
-    make prefix=$startdir/pkg/usr/share/nagios install-plugin || return 1
-}
diff --git a/pcr/nagios-plugins/PKGBUILD b/pcr/nagios-plugins/PKGBUILD
deleted file mode 100644
index e1379d193..000000000
--- a/pcr/nagios-plugins/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: Idares <idares@seznam.cz>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=nagios-plugins
-pkgver=1.4.16
-pkgrel=1
-pkgdesc="Plugins are scripts and programs that perform host and service checks."
-license=('GPL')
-arch=('i686' 'x86_64')
-url="http://www.nagiosplugins.org"
-source=("http://downloads.sourceforge.net/nagiosplug/$pkgname-$pkgver.tar.gz"
-        "stdio.patch")
-makedepends=('net-snmp')
-optdepends=('net-snmp: for SNMP checking.')
-
-build() {
-	cd $srcdir/$pkgname-$pkgver
-	patch -p1 -i "$srcdir/stdio.patch"
-	./configure --prefix=/usr/share/nagios
-	make
-	make prefix=$startdir/pkg/usr/share/nagios install
-	make prefix=$startdir/pkg/usr/share/nagios install-root
-}
-
-sha1sums=('52db48b15572b98c6fcd8aaec2ef4d2aad7640d3'
-          '6a40a8bc8c907f5cf722e4440900d872767d465c')
-
diff --git a/pcr/nagios-plugins/stdio.patch b/pcr/nagios-plugins/stdio.patch
deleted file mode 100644
index f87d313b5..000000000
--- a/pcr/nagios-plugins/stdio.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur nagios-plugins-1.4.16-orig/gl/stdio.in.h nagios-plugins-1.4.16-patched/gl/stdio.in.h
---- nagios-plugins-1.4.16-orig/gl/stdio.in.h	2012-06-27 19:32:47.000000000 +0200
-+++ nagios-plugins-1.4.16-patched/gl/stdio.in.h	2012-08-09 06:29:26.038030953 +0200
-@@ -140,8 +140,10 @@
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#ifdef gets
- #undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/pcr/nautilus-dropbox/PKGBUILD b/pcr/nautilus-dropbox/PKGBUILD
deleted file mode 100644
index c8a81a959..000000000
--- a/pcr/nautilus-dropbox/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: josephgbr <rafael.f.f1@gmail.com>
-# Contributor: cmorlok <christianmorlok@web.de>
-# Contributor: fazibear <fazibear@gmail.com>
-# Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com>
-# Contributor: Gordin <9ordin @t gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aur�lien Desbri�res <aurelien@cwb.io>
-
-pkgname=nautilus-dropbox
-pkgver=1.4.0
-pkgrel=2
-pkgdesc="Dropbox for Linux - Nautilus extension"
-arch=('i686' 'x86_64')
-url="https://www.dropbox.com/"
-license=('custom:CC-BY-ND-3' 'GPL')
-depends=('libnotify' 'nautilus' 'dropbox' 'hicolor-icon-theme')
-makedepends=('python2-docutils' 'python2' 'pygtk')
-install=${pkgname}.install
-options=('!libtool' '!emptydirs')
-source=("https://linux.dropbox.com/packages/${pkgname}-${pkgver}.tar.bz2")
-
-build() {
-  cd "${pkgname}-${pkgver}/"
-  
-  sed "s/python/python2/" \
-  	-i configure \
-  	-i Makefile.am \
-  	-i Makefile.in \
-  	-i dropbox.in \
-  	-i rst2man.py
-  
-  # since python2-docutils, rst2man.py is named "rst2man2.py"
-  sed "s#rst2man.py#/usr/bin/rst2man2.py#" \
-  	-i configure
-  
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "${pkgname}-${pkgver}/"
-  make DESTDIR="${pkgdir}" install
-  rm "${pkgdir}/usr/bin/dropbox"
-  rm "${pkgdir}/usr/share/applications/dropbox.desktop"  
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}
diff --git a/pcr/nautilus-dropbox/nautilus-dropbox.install b/pcr/nautilus-dropbox/nautilus-dropbox.install
deleted file mode 100644
index c4f3ef960..000000000
--- a/pcr/nautilus-dropbox/nautilus-dropbox.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  cat <<-EndOfMessage
-
-==> Restart nautilus with 'nautilus -q'
-
-EndOfMessage
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/pcr/nekobee/PKGBUILD b/pcr/nekobee/PKGBUILD
deleted file mode 100644
index 4e71ae93d..000000000
--- a/pcr/nekobee/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-
-pkgname=nekobee
-pkgver=0.1.8
-pkgrel=2
-pkgdesc="A TB303-style synthesizer for DSSI"
-url="https://github.com/gordonjcp/nekobee"
-depends=('liblo' 'gtk2')
-makedepends=('dssi' 'python' 'ladspa')
-arch=('i686')
-license=('GPL')
-source=("https://github.com/gordonjcp/${pkgname}/archive/${pkgver}.tar.gz"
-        "nekobee.patch")
-md5sums=('5954ac49043bc80588be72a9b9a9b28f'
-         '8dde87ad9b2a8500c51d773b25b7984f')
-
-build() {
-cd $startdir/src/$pkgname-$pkgver
-patch -p1 -i $srcdir/$pkgname.patch
-./waf configure --prefix=/usr
-./waf
-}
-
-package() {
-cd $startdir/src/$pkgname-$pkgver
-DESTDIR=$pkgdir ./waf install
-}
diff --git a/pcr/nekobee/nekobee.patch b/pcr/nekobee/nekobee.patch
deleted file mode 100644
index dd995c357..000000000
--- a/pcr/nekobee/nekobee.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -aur nekobee-0.1.8/wscript nekobee-0.1.8.new/wscript
---- nekobee-0.1.8/wscript	2010-09-12 21:34:13.000000000 +0200
-+++ nekobee-0.1.8.new/wscript	2013-05-25 22:47:23.923441000 +0200
-@@ -31,7 +31,7 @@
-     # DSSI plugin
-     plugin_dssi = bld.new_task_gen('cc', 'shlib')
-     plugin_dssi.env['shlib_PATTERN'] = '%s.so'
--    plugin_dssi.env.append_value("LINKFLAGS", "-module -avoid-version -Wc,-nostartfiles")
-+    plugin_dssi.env.append_value("LINKFLAGS", "-lm")
-     plugin_dssi.includes = ['.', 'src']
-     plugin_dssi.defines = 'HAVE_CONFIG_H'
-     plugin_dssi.source = [
-@@ -49,6 +49,7 @@
- 
-     # DSSI UI executable
-     gui_gtk = bld.new_task_gen('cc', 'program')
-+    gui_gtk.env.append_value("LINKFLAGS", "-lm")
-     gui_gtk.includes = ['.', 'src']
-     gui_gtk.defines = 'HAVE_CONFIG_H'
-     gui_gtk.source = [
diff --git a/pcr/netatalk/PKGBUILD b/pcr/netatalk/PKGBUILD
deleted file mode 100644
index b16132dab..000000000
--- a/pcr/netatalk/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Maintainer: SJ_UnderWater
-# Based on netatalk package :
-# Maintainer: Dominik Dingel <mail at wodar dot de>
-# Contributor: William Udovich <nerdzrule7 at earthlink dot net>
-# Contributor: Farhan Yousaf <farhany at xaviya dot com>
-
-pkgname=netatalk
-pkgver=3.0.4
-pkgrel=2
-pkgdesc='A kernel-level implementation of AFP services'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://netatalk.sourceforge.net'
-license=('GPL')
-depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent' 'python' 'dbus-glib')
-replaces=('netatalk-git' 'netatalk2')
-backup=('etc/afp.conf'
-	'etc/extmap.conf')
-options=('!libtool')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('f455505884a6aea307640d46a6577fd1')
-
-prepare() {
-	cd $pkgname-$pkgver
-
-	sed -i -e 's:AX_CHECK_DOCBOOK:[AX_CHECK_DOCBOOK]:' -e 's:"/lib/systemd:"/usr/lib/systemd:' -e 's/x"linux/x"generic/' macros/netatalk.m4
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' {configure.ac,libevent/configure.in}
-	cp /usr/share/automake*/missing .
-
-	autoreconf -i
-}
-
-build() {
-	cd $pkgname-$pkgver
-
-
-  ./configure --prefix=/usr \
-              --sbindir=/usr/bin \
-              --localstatedir=/var/state \
-              --sysconfdir=/etc \
-              --with-init-style=systemd \
-              --with-cracklib \
-              --with-cnid-cdb-backend \
-              --enable-pgp-uam \
-              --with-libevent=no
-
-	make
-}
-package() {
-	cd $pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
-}
diff --git a/pcr/netatalk/netatalk.changelog b/pcr/netatalk/netatalk.changelog
deleted file mode 100644
index 8e1937a6c..000000000
--- a/pcr/netatalk/netatalk.changelog
+++ /dev/null
@@ -1,138 +0,0 @@
-2013-06-03 SJ_UnderWater
-
-	* 3.0.4-2:
-	move sbindir
-
-2013-05-26 SJ_UnderWater
-
-	* 3.0.4-1:
-	package update
-	minor fixes
-	dbus-glib dependency
-
-2013-03-27 SJ_UnderWater
-
-	* 3.0.3-1:
-	package update
-	minor fixes
-	python dependency
-
-2013-01-27 SJ_UnderWater
-
-	* 3.0.2-1:
-	package update
-	libevent fix
-	copy newer ./missing
-
-2013-01-05 SJ_UnderWater
-
-	* 3.0.1-5:
-	fixed AM deprecations
-	minor install fix
-
-2012-11-28 SJ_UnderWater
-
-	* 3.0.1-4 :
-	fixed mimic model
-
-2012-10-08 SJ_UnderWater
-
-	* 3.0.1-3 :
-	moved systemd from /etc
-	better rc.d install test
-
-2012-10-05 SJ_UnderWater
-
-	* 3.0.1-2 :
-	removed rc.d references
-
-2012-10-04 SJ_UnderWater
-
-	* 3.0.1-1 :
-	new version
-	moved to systemd
-	moved state to /var/db
-
-2012-07-14 SJ_UnderWater
-
-	* 3.0-3 :
-	moved localstate dir
-	to /etc for historical
-	reasons
-
-2012-07-12 SJ_UnderWater
-
-	* 3.0-2 :
-	disable bundled libevent
-
-2012-07-11 SJ_UnderWater
-
-	* 3.0-1 :
-	updated to new release
-	DDP moved to new pkg
-
-2012-06-12 SJ_UnderWater
-
-	* 2.2.3-4 :
-	added kill timing
-
-2012-06-04 SJ_UnderWater
-
-	* 2.2.3-3 :
-	removed conflicting files
-
-2012-06-02 SJ_UnderWater
-
-	* 2.2.3-2 :
-	Missing UAM links
-
-2012-05-29 SJ_UnderWater
-
-	* 2.2.3-1 :
-	updated package version
-	allowing headers and m4
-
-2012-05-01 SJ_UnderWater
-
-	* 2.2.2-6 :
-	moved to .rc files
-	refactored PKGBUILD
-	install rc.d files
-
-2012-04-25 SJ_UnderWater
-
-	* 2.2.2-5 :
-	init rebuild
-	fix dep check
-	fix get_pid
-	function relocation
-
-2012-04-21 SJ_UnderWater
-
-	* 2.2.2-4 :
-	moved to package()
-	added backup
-	split backup
-	moved depends
-
-2012-04-08 SJ_UnderWater
-
-	* 2.2.2-3 :
-	fixed extra dependencies
-	FHS compliance
-	NAMCAP checking
-	moved cups to optdepends
-
-2012-04-07 SJ_UnderWater
-
-	* 2.2.2-2 :
-	added Install
-	changed "conflicts" with "replace"
-	cleaned up PKGBUILD
-
-	* 2.2.2-1 :
-	added ChangeLog.
-	moved to split package format
-	bidirectional dependency-checking
-	moved to release package format
-	PKGBUILD compliance
diff --git a/pcr/netatalk/netatalk.install b/pcr/netatalk/netatalk.install
deleted file mode 100644
index b27dcd44b..000000000
--- a/pcr/netatalk/netatalk.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-	post_upgrade
-}
-post_upgrade() {
-	if [ -f /etc/rc.conf ];then
-	if [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then
-	echo '>>> Detected old netatalk daemon entries in';
-	echo '>>> /etc/rc.conf, please replace these with';
-	echo '>>> "netatalk" before restarting!';
-	else echo '>>> Add "netatalk" to your DAEMONS list';fi
-	fi
-	if [ -f /etc/avahi/services/adisk.service ] ||
-	[ -f /etc/avahi/services/afpd.service ];then
-	echo '>>> Detected old netatalk service files in';
-	echo '>>> /etc/avahi/services, please delete these';
-	echo '>>> before restarting!';fi
-	if [ -f /opt/netatalk/afp_signature.conf ] ||
-	[ -f /opt/netatalk/afp_voluuid.conf ]; then
-	echo '>>> Found *.conf in /opt/netatalk, please';
-	echo '>>> migrate these to /var/state/netatalk before restarting';fi
-}
diff --git a/pcr/networkmanager-openswan/PKGBUILD b/pcr/networkmanager-openswan/PKGBUILD
deleted file mode 100644
index 71b3802e5..000000000
--- a/pcr/networkmanager-openswan/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: Marti Raudsepp <marti@juffo.org>
-
-pkgname=networkmanager-openswan
-_pkgname=NetworkManager-openswan
-pkgver=0.9.8.0
-pkgrel=1
-pkgdesc="NetworkManager plugin for IPSec VPN tunnels"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://ftp.acc.umu.se/pub/GNOME/sources/NetworkManager-openswan/"
-license=('GPL')
-depends=('openswan' 'gtk3' 'networkmanager' 'libgnome-keyring')
-makedepends=('intltool')
-source=(http://ftp.acc.umu.se/pub/GNOME/sources/$_pkgname/0.9/$_pkgname-$pkgver.tar.xz)
-md5sums=('6a373868f85ac3b7c953f7fd6c76e637')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/networkmanager
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/pcr/networkmanager-strongswan/PKGBUILD b/pcr/networkmanager-strongswan/PKGBUILD
deleted file mode 100644
index 3c30f3615..000000000
--- a/pcr/networkmanager-strongswan/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Michael Seiwald <michael@mseiwald.at>
-# Maintainer: Dmitry Korzhevin <dkorzhevin at gmail dot com>
-pkgname=networkmanager-strongswan
-_pkgname=NetworkManager-strongswan
-pkgver=1.3.0
-pkgrel=2
-pkgdesc="strongswan NetworkManager plugin"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://wiki.strongswan.org/projects/strongswan/wiki/NetworkManager"
-license=('GPL')
-depends=(networkmanager strongswan libgnomeui)
-makedepends=(intltool)
-source=(http://download.strongswan.org/NetworkManager/$_pkgname-$pkgver.tar.gz)
-md5sums=('215f1d3b7b65be236b86bf30b6a4615b')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  ./configure --sysconfdir=/etc \
-              --prefix=/usr \
-              --libexecdir=/usr/lib \
-              --with-charon=/usr/lib/strongswan/charon \
-              CFLAGS="$CFLAGS -Wno-error=unused-local-typedefs"
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  #make install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/nevow/PKGBUILD b/pcr/nevow/PKGBUILD
deleted file mode 100644
index 956a0cd32..000000000
--- a/pcr/nevow/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Nicolas Pouillard <nicolas.pouillard@gmail.com>
-# Contributor: Peter Simons <simons@cryp.to>
-pkgname=nevow
-pkgver=0.10.0
-pkgrel=8
-pkgdesc="web application construction kit written in Python"
-arch=('any')
-url='http://pypi.python.org/pypi/Nevow'
-license=('custom')
-depends=('python2' 'twisted')
-source=( http://pypi.python.org/packages/source/N/Nevow/Nevow-$pkgver.tar.gz )
-md5sums=('66dda2ad88f42dea05911add15f4d1b2')
-
-build(){
-  cd "$srcdir/Nevow-$pkgver"
-  python2 setup.py build
-}
-
-package(){
-  cd "$srcdir/Nevow-$pkgver"
-  python2 setup.py install --prefix=/usr --root="$pkgdir" --install-data=/usr/share/"$pkgname"
-  install -D LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/pcr/newlisp/PKGBUILD b/pcr/newlisp/PKGBUILD
deleted file mode 100644
index a53106390..000000000
--- a/pcr/newlisp/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: scrawler <scrawler@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@cwb.IO>
-
-pkgname=newlisp
-pkgver=10.4.5
-pkgrel=1
-pkgdesc="newLISP is a LISP like, general purpose scripting language."
-url="http://www.newlisp.org"
-license=('GPL')
-arch=('x86_64' 'i686')
-depends=('readline')
-optdepends=('openjdk6')
-options=('docs')
-source=(http://newlisp.org/downloads/$pkgname-$pkgver.tgz)
-install=$pkgname.install
-
-build() {
-cd $srcdir/$pkgname-$pkgver
-./configure
-[ $CARCH = "x86_64" ] && make -f makefile_linuxLP64_utf8
-[ $CARCH = "i686" ] && make -f makefile_linux_utf8
-install -d $pkgdir/usr/bin
-install -d $pkgdir/usr/share/man/man1
-make bindir=$pkgdir/usr/bin mandir=$pkgdir/usr/share/man \
-datadir=$pkgdir/usr/share install
-}
diff --git a/pcr/newlisp/newlisp.install b/pcr/newlisp/newlisp.install
deleted file mode 100644
index 2c7fd8481..000000000
--- a/pcr/newlisp/newlisp.install
+++ /dev/null
@@ -1,20 +0,0 @@
-pre_install() {
-  rm /usr/bin/newlisp
-}
-
-post_install() {
-  ln -sf /usr/bin/newlisp-10.4.5 /usr/bin/newlisp
-}
-
-pre_upgrade() {
-[[ -f /usr/bin/newlisp ]] && rm /usr/bin/newlisp
-}
-
-post_upgrade() {
-  ln -sf /usr/bin/newlisp-10.4.5 /usr/bin/newlisp
-}
-
-pre_remove() {
-[[ -f /usr/bin/newlisp ]] && rm /usr/bin/newlisp
-}
-
diff --git a/pcr/newtonator/PKGBUILD b/pcr/newtonator/PKGBUILD
deleted file mode 100644
index f007a12b9..000000000
--- a/pcr/newtonator/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-
-pkgname=newtonator
-pkgver=0.5.2
-pkgrel=1
-pkgdesc="An LV2 soft synth based on velocity and acceleration"
-arch=('i686')
-url="http://newtonator.sourceforge.net/"
-license=('GPL3')
-depends=('lv2' 'gtkmm')
-makedepends=('cmake' 'lv2-c++-tools')
-source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('2a9a809e4c8a4851911cb661bcab24c0')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  [ -d build ] || mkdir build && cd build
-
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/build"
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/nexuiz-data/PKGBUILD b/pcr/nexuiz-data/PKGBUILD
deleted file mode 100644
index f6d3ba62c..000000000
--- a/pcr/nexuiz-data/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Xyne
-# Contributor: Rick Chen (stuffcorpse)
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: Camille Moncelier <pix@devlife.org>
-
-pkgname=nexuiz-data
-_pkgsourcename=nexuiz
-pkgver=2.5.2
-_zipver=252
-pkgrel=3
-arch=('any')
-pkgdesc="Nexuiz game data"
-conflicts=('nexuiz<2.5.1-3')
-url="http://www.alientrap.org/games/nexuiz"
-license=("GPL")
-source=(http://downloads.sourceforge.net/${_pkgsourcename}/${_pkgsourcename}-${_zipver}.zip)
-md5sums=('d750bc328e58df8492f8d88bdcf818cb')
-
-build() {
-  _nexdir="$pkgdir/opt/nexuiz"
-  
-  _install_dir $srcdir/Nexuiz/Docs $_nexdir/docs
-  _install_dir $srcdir/Nexuiz/data $_nexdir/data
-  _install_dir $srcdir/Nexuiz/havoc $_nexdir/havoc
-  _install_dir $srcdir/Nexuiz/server $_nexdir/server
-  
-  find $_nexdir/server -name "*_windows.bat" -exec rm {} \;
-  find $_nexdir/server -name "*_mac.sh" -exec rm {} \;
-}
-
-function _install_dir {
-  _src_dir=$1
-  _dest_dir=$2
-  _n=${#_src_dir}
-  for _file in $(find $_src_dir -type f)
-  do
-    _dest_file=${_dest_dir}${_file:$_n}
-    install -Dm644 $_file $_dest_file
-  done
-}
diff --git a/pcr/nexuiz/PKGBUILD b/pcr/nexuiz/PKGBUILD
deleted file mode 100644
index 1e3fdfbeb..000000000
--- a/pcr/nexuiz/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Xyne
-# Contributor: Rick Chen (stuffcorpse)
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: Camille Moncelier <pix@devlife.org>
-
-pkgname=nexuiz
-pkgver=2.5.2
-_zipver=252
-pkgrel=3
-arch=('i686' 'x86_64')
-pkgdesc="A free software first person shooter"
-url="http://www.alientrap.org/games/nexuiz"
-license=("GPL")
-depends=('alsa-lib' 'curl' 'libjpeg>=8' 'libmodplug' 'libvorbis' 'libxpm' 'libxxf86dga' 'libxxf86vm' 'sdl' 'nexuiz-data' 'libpng>=1.4.0')
-makedepends=('mesa')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_zipver}.zip \
-        nexuiz-dedicated nexuiz-glx nexuiz-sdl nexuiz-glx.desktop \
-        nexuiz-sdl.desktop nexuiz.png libpng14.patch)
-md5sums=('d750bc328e58df8492f8d88bdcf818cb'
-         '19bfaa6e891d3309783e8366db485474'
-         '4d0ee9282a6fe153f82f7797decfd585'
-         '3e5ea741e8d55df8e7691c797c81ffa7'
-         '310f0577c39391f2d2f17cea446ce269'
-         '4561d3c5be4801399af515faf82ebcba'
-         '442fb62670bbe0a1b5370461052051a3'
-	 '60964348924ff777a92dbb171a86a1ed')
-
-build() {
-  _nexdir="$pkgdir/opt/nexuiz"
-  _enginesource_date="20091001"
-  mkdir -p "$_nexdir" || return 1
-  
-  cd $srcdir/Nexuiz
-  bsdtar -x -f sources/enginesource${_enginesource_date}.zip || return 1
-  cd darkplaces
-  patch -Np1 -i ${srcdir}/libpng14.patch || return 1
-  # patch -p1 < "$srcdir/nexuiz-libjpeg-fix.patch" || return 1
-  
-  # here's a working kludge to build all three binaries at once but don't use it ;)
-  # make CPUOPTIMIZATIONS="${CFLAGS}" nexuiz || make CPUOPTIMIZATIONS="${CFLAGS}" nexuiz || return 1
-  
-  # build the binaries separately instead to avoid truncated files
-  make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 cl-nexuiz || return 1
-  make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 sdl-nexuiz || return 1
-  make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 sv-nexuiz || return 1
-
-  # install the compiled binaries
-  install -Dm755 nexuiz-glx nexuiz-sdl nexuiz-dedicated -t $_nexdir || return 1
-
-  install -dm755 $pkgdir/usr/{bin,share/applications} || return 1
-  install -Dm755 $srcdir/nexuiz-{glx,sdl,dedicated} -t $pkgdir/usr/bin || return 1
-  install -Dm644 $srcdir/*.desktop -t $pkgdir/usr/share/applications || return 1
-  install -Dm644 $srcdir/nexuiz.png $pkgdir/usr/share/pixmaps/nexuiz.png || return 1
-}
diff --git a/pcr/nexuiz/libpng14.patch b/pcr/nexuiz/libpng14.patch
deleted file mode 100644
index d6ce5ea76..000000000
--- a/pcr/nexuiz/libpng14.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nur darkplaces.old/image_png.c darkplaces/image_png.c
---- darkplaces.old/image_png.c	2009-09-15 06:08:02.000000000 +0300
-+++ darkplaces/image_png.c	2010-01-28 01:23:24.000000000 +0200
-@@ -36,7 +36,7 @@
- static void*			(*qpng_create_info_struct)	(void*);
- static void				(*qpng_read_info)			(void*, void*);
- static void				(*qpng_set_expand)			(void*);
--static void				(*qpng_set_gray_1_2_4_to_8)	(void*);
-+static void				(*qpng_set_expand_gray_1_2_4_to_8)	(void*);
- static void				(*qpng_set_palette_to_rgb)	(void*);
- static void				(*qpng_set_tRNS_to_alpha)	(void*);
- static void				(*qpng_set_gray_to_rgb)		(void*);
-@@ -61,7 +61,7 @@
- 	{"png_create_info_struct",	(void **) &qpng_create_info_struct},
- 	{"png_read_info",			(void **) &qpng_read_info},
- 	{"png_set_expand",			(void **) &qpng_set_expand},
--	{"png_set_gray_1_2_4_to_8",	(void **) &qpng_set_gray_1_2_4_to_8},
-+	{"png_set_expand_gray_1_2_4_to_8",	(void **) &qpng_set_expand_gray_1_2_4_to_8},
- 	{"png_set_palette_to_rgb",	(void **) &qpng_set_palette_to_rgb},
- 	{"png_set_tRNS_to_alpha",	(void **) &qpng_set_tRNS_to_alpha},
- 	{"png_set_gray_to_rgb",		(void **) &qpng_set_gray_to_rgb},
-@@ -110,7 +110,7 @@
- #elif defined(MACOSX)
- 		"libpng12.0.dylib",
- #else
--		"libpng12.so.0",
-+		"libpng14.so.0",
- 		"libpng.so", // FreeBSD
- #endif
- 		NULL
-@@ -311,7 +311,7 @@
- 	{
- 		qpng_set_gray_to_rgb(png);
- 		if (my_png.BitDepth < 8)
--			qpng_set_gray_1_2_4_to_8(png);
-+			qpng_set_expand_gray_1_2_4_to_8(png);
- 	}
- 
- 	if (qpng_get_valid(png, pnginfo, PNG_INFO_tRNS))
diff --git a/pcr/nexuiz/nexuiz-dedicated b/pcr/nexuiz/nexuiz-dedicated
deleted file mode 100644
index bf517cce7..000000000
--- a/pcr/nexuiz/nexuiz-dedicated
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt/nexuiz
-./nexuiz-dedicated $@
diff --git a/pcr/nexuiz/nexuiz-glx b/pcr/nexuiz/nexuiz-glx
deleted file mode 100644
index 5fad4db07..000000000
--- a/pcr/nexuiz/nexuiz-glx
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt/nexuiz
-./nexuiz-glx $@
diff --git a/pcr/nexuiz/nexuiz-glx.desktop b/pcr/nexuiz/nexuiz-glx.desktop
deleted file mode 100644
index 8808c16db..000000000
--- a/pcr/nexuiz/nexuiz-glx.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=2.5
-Encoding=UTF-8
-Name=Nexuiz (GLX)
-Comment=a free open-source first person shooter
-Icon=/usr/share/pixmaps/nexuiz.png
-Exec=/usr/bin/nexuiz-glx
-Terminal=false
-StartupNotify=false
-Categories=Game;
diff --git a/pcr/nexuiz/nexuiz-sdl b/pcr/nexuiz/nexuiz-sdl
deleted file mode 100644
index 36b6d5cc3..000000000
--- a/pcr/nexuiz/nexuiz-sdl
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt/nexuiz
-./nexuiz-sdl $@
diff --git a/pcr/nexuiz/nexuiz-sdl.desktop b/pcr/nexuiz/nexuiz-sdl.desktop
deleted file mode 100644
index 019970e61..000000000
--- a/pcr/nexuiz/nexuiz-sdl.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=2.5
-Encoding=UTF-8
-Name=Nexuiz (SDL)
-Comment=a free open-source first person shooter
-Icon=/usr/share/pixmaps/nexuiz.png
-Exec=/usr/bin/nexuiz-sdl
-Terminal=false
-StartupNotify=false
-Categories=Game;
diff --git a/pcr/nexuiz/nexuiz.png b/pcr/nexuiz/nexuiz.png
deleted file mode 100644
index a0ec8b3d4..000000000
--- a/pcr/nexuiz/nexuiz.png
+++ /dev/null
diff --git a/pcr/nfacct/PKGBUILD b/pcr/nfacct/PKGBUILD
deleted file mode 100644
index 88af2acb5..000000000
--- a/pcr/nfacct/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=nfacct
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="Command line tool to create/retrieve/delete accounting objects."
-arch=('i686' 'x86_64')
-url="http://www.netfilter.org/projects/nfacct/index.html"
-license=('GPL')
-depends=('libnetfilter_acct')
-options=(!libtool)
-source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/nicotine/PKGBUILD b/pcr/nicotine/PKGBUILD
deleted file mode 100644
index b0bd552b4..000000000
--- a/pcr/nicotine/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-
-pkgname=nicotine
-pkgver=1.2.16
-pkgrel=1
-pkgdesc="Soulseek music-sharing client, written in python"
-arch=('i686')
-url='http://sourceforge.net/projects/nicotine-plus/'
-license=('GPL')
-depends=('pygtk' 'mutagen' 'python2-sexy')
-makedepends=('setconf')
-optdepends=('python2-geoip: to enable Geographical blocker')
-source=("http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2")
-sha256sums=('71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d')
-
-prepare() {
-  cd "$srcdir/${pkgname}+-$pkgver"
-
-  # Fix for FS#22476
-  setconf files/nicotine.desktop Icon nicotine-plus-32px
-
-  # Python fix
-  sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \
-    -e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py
-} 
-
-build() {
-  cd "$srcdir/${pkgname}+-$pkgver/trayicon"
-
-  python2 autogen.py
-  make 
-}
-
-package() {
-  cd "$srcdir/${pkgname}+-$pkgver"
-
-  python2 setup.py install --root="$pkgdir"
-  cd trayicon
-  make DESTDIR="$pkgdir" install 
-  ln -s nicotine.py "$pkgdir/usr/bin/nicotine"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/note/PKGBUILD b/pcr/note/PKGBUILD
deleted file mode 100644
index f4b2eefe2..000000000
--- a/pcr/note/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributor: David Pflug <Viaken@Gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-_author=TLINDEN
-_perlmod=note
-pkgname=$_perlmod
-pkgver=1.3.12
-pkgrel=2
-pkgdesc="A Perl-based note taking application with multiple backends"
-arch=('i686' 'x86_64')
-url="http://www.daemon.de/NOTE"
-license=('GPL')
-depends=('perl' 'perl-yaml')
-optdepends=(
-            'perl-config-general: general db backend'
-            'perl-crypt-cbc: encryption support'
-            'perl-crypt-pwsafe3: password safe 3 backend'
-            'perl-crypt-rijndael: encryption support'
-            'perl-dbd-mysql: mysql db backend'
-            'perl-dbi: mysql db backend'
-            )
-source=(http://cpan.perl.org/modules/by-authors/id/T/TL/$_author/$_perlmod-$pkgver.tar.gz)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make install DESTDIR="$pkgdir"
-}
diff --git a/pcr/nova/PKGBUILD b/pcr/nova/PKGBUILD
deleted file mode 100644
index 181e5a626..000000000
--- a/pcr/nova/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Contributor: Josh Chase <jcjoshuachase@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=nova
-pkgver=2012.1.2
-_clientname=python-novaclient
-_clientver=2.8.0
-pkgrel=1.1
-pkgdesc="OpenStack cloud computing fabric controller"
-arch=('any')
-license=('custom')
-url="https://launchpad.net/nova"
-depends=('python2'
-         'python2-cheetah'
-	 'python2-simplejson'
-	 'python2-prettytable'
-         'python2-amqplib'
-         'python2-carrot'
-         'python2-lockfile'
-         'python2-daemon'
-         'python2-gflags'
-         'python2-netaddr'
-         'glance'
-         'python2-suds'
-         'python2-paramiko'
-         'python2-feedparser'
-         'python2-babel' )
-makedepends=('python2-distribute')
-source=("https://launchpad.net/nova/essex/2012.1.2/+download/nova-2012.1.2.tar.gz"
-        "http://pypi.python.org/packages/source/${_clientname:0:1}/$_clientname/$_clientname-$_clientver.tar.gz")
-
-build() {
-  cd $srcdir
-
-  find . -type f -exec sed -i -e 's|^#!/usr/bin/python$|#!/usr/bin/python2|' \
-    -e 's|^#!/usr/bin/env python$|#!/usr/bin/env python2|' {} +
-
-  cd $srcdir/$_clientname-$_clientver
-  python2 setup.py build
-
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py build
-}
-
-package() {
-  cd $srcdir/$_clientname-$_clientver
-  python2 setup.py install --root=$pkgdir
-
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py install --root="$pkgdir" --optimize=1
-  
-  install -dm600 "$pkgdir"/etc/$pkgname
-  install -Dm600 etc/$pkgname/* "$pkgdir"/etc/$pkgname/
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/pcr/npapi-vlc-git/PKGBUILD b/pcr/npapi-vlc-git/PKGBUILD
deleted file mode 100644
index 59b11bff6..000000000
--- a/pcr/npapi-vlc-git/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Det
-# Contributor: Pimper (M0Rf30)
-
-_pkgname=npapi-vlc
-pkgname=$_pkgname-git
-pkgver=0.2.213.gc992dba
-pkgrel=1
-pkgdesc="The modern VLC Mozilla plugin"
-arch=('i686' 'x86_64')
-url="http://git.videolan.org/?p=$_pkgname.git;a=summary"
-license=('LGPL-2.1')
-options=('!libtool')
-depends=('vlc')
-makedepends=('git' 'npapi-sdk')
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-source=("git://git.videolan.org/$_pkgname.git")
-md5sums=('SKIP')
-
-pkgver() {
-  cd $_pkgname
-  git describe --always | sed 's/-/./g'
-}
-
-build() {
-  cd $_pkgname
-  msg2 "Starting autogen.sh..."
-  sh ./autogen.sh
-  msg2 "Starting configure..."
-  ./configure --prefix=/usr
-  msg2 "Starting make..."
-  make
-}
-
-package() {
-  cd $_pkgname
-  msg2 "Starting make install..."
-  make DESTDIR="$pkgdir" install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/COPYING"
-}
\ No newline at end of file
diff --git a/pcr/nppangband-libre/PKGBUILD b/pcr/nppangband-libre/PKGBUILD
deleted file mode 100644
index eeb59f6fc..000000000
--- a/pcr/nppangband-libre/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Israfel <israfel@lavabit.com>
-# Original PKGBUILD by James Rayner <iphitus@gmail.com> 
-# The Angband "adjust-sound-dir" patch by Chris Carr <rantingman@gmail.com> served as a reference for what files to edit for sound.patch
-
-_pkgname=nppangband
-pkgname=nppangband-libre
-pkgver=6.1.2
-pkgrel=1
-pkgdesc="A variant of Angband that attempts to take popular ideas from other variants, without nonfree sound effects"
-url="http://forum.nppangband.org/"
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname
-depends=('sdl' 'sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses' 'libx11' 'freetype2')
-source=(http://download.nppangband.org/npp-6.1.2-src.zip sound.patch)
-license=('GPLv2 custom')
-arch=('i686' 'x86_64')
-
-build() {
-	cd $srcdir/npp-6.1.2-src/
-	patch -Np1 -i ../sound.patch
-	sh autogen.sh
-	./configure --enable-sdl
-	make
-}
-
-package() {  
-	cd $srcdir/npp-6.1.2-src/
-	make DESTDIR="$pkgdir/" install
-}
-
-sha512sums=('e12e05fd8944bb1d7e43b883416009a8e77198ee1ad0ea87480eaafb5f46ecdb218ef0b68876fb77cc2ab490a99f9b9303e02c7db385db6eb8d1d01a48cffdd0'
-            '820f4e678543b8f4d5092d6654bb3d4006e039fbc119d9ff5f468c01176497c25579ca2b0d6f6d302b11a3fbfaa6cfcdf89029ff586cda31d97e413cb8b91040')
diff --git a/pcr/nppangband-libre/sound.patch b/pcr/nppangband-libre/sound.patch
deleted file mode 100644
index 9de2b0177..000000000
--- a/pcr/nppangband-libre/sound.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-# Made by Israfel <israfel@lavabit.com> for the Parabola GNU/Linux-Libre "nppangband-libre" package
-# The Angband "adjust-sound-dir" patch by Chris Carr <rantingman@gmail.com> served as a reference for what files to edit
-diff -crB npp-6.1.2-src/COPYING npp-6.1.2-src-libre/COPYING
-*** npp-6.1.2-src/COPYING	2013-03-29 14:37:32.000000000 -0400
---- npp-6.1.2-src-libre/COPYING	2013-06-29 16:22:09.154804370 -0400
-***************
-*** 13,20 ****
-   * David Gervais' (32x32) graphics, including modifications and additional tiles by Jeff Greene, Thacker and Rob Fiala for NPPAngband may be redistributed, 
-  modified, and used only under the terms of the Creative Commons Attribution 3.0 licence: http://creativecommons.org/licenses/by/3.0/
-  
--  * the sounds are freeware, whatever that means.
-- 
-   * the font files are under the licences noted in lib/xtra/font/copying.txt,
-     all of which are OSI-compliant.
-  
---- 13,18 ----
-Only in npp-6.1.2-src/lib/xtra/sound: breath.wav
-Only in npp-6.1.2-src/lib/xtra/sound: clunk.wav
-Only in npp-6.1.2-src/lib/xtra/sound: death.wav
-Only in npp-6.1.2-src/lib/xtra/sound: destroy.wav
-Only in npp-6.1.2-src/lib/xtra/sound: drop.wav
-Only in npp-6.1.2-src/lib/xtra/sound: eat.wav
-Only in npp-6.1.2-src/lib/xtra/sound: flee.wav
-Only in npp-6.1.2-src/lib/xtra/sound: hallu.wav
-Only in npp-6.1.2-src/lib/xtra/sound: hit1.wav
-Only in npp-6.1.2-src/lib/xtra/sound: hit.wav
-Only in npp-6.1.2-src/lib/xtra/sound: kill1.wav
-Only in npp-6.1.2-src/lib/xtra/sound: kill.wav
-Only in npp-6.1.2-src/lib/xtra/sound: level.wav
-diff -crB npp-6.1.2-src/lib/xtra/sound/Makefile npp-6.1.2-src-libre/lib/xtra/sound/Makefile
-*** npp-6.1.2-src/lib/xtra/sound/Makefile	2013-03-29 14:37:36.000000000 -0400
---- npp-6.1.2-src-libre/lib/xtra/sound/Makefile	2013-06-29 16:21:53.525414705 -0400
-***************
-*** 1,10 ****
-  MKPATH=../../../mk/
-  include $(MKPATH)buildsys.mk
-  
-! LIBDATA = sound.cfg breath.wav clunk.wav death.wav destroy.wav \
-! drop.wav eat.wav flee.wav hallu.wav hit.wav hit1.wav kill.wav \
-! kill1.wav level.wav miss.wav miss1.wav money.wav opendoor.wav \
-! shutdoor.wav thump.wav vomit.wav \
-  
-  PACKAGE = xtra/sound
-  
---- 1,7 ----
-  MKPATH=../../../mk/
-  include $(MKPATH)buildsys.mk
-  
-! LIBDATA = sound.cfg
-  
-  PACKAGE = xtra/sound
-  
-Only in npp-6.1.2-src/lib/xtra/sound: miss1.wav
-Only in npp-6.1.2-src/lib/xtra/sound: miss.wav
-Only in npp-6.1.2-src/lib/xtra/sound: money.wav
-Only in npp-6.1.2-src/lib/xtra/sound: opendoor.wav
-Only in npp-6.1.2-src/lib/xtra/sound: shutdoor.wav
-diff -crB npp-6.1.2-src/lib/xtra/sound/sound.cfg npp-6.1.2-src-libre/lib/xtra/sound/sound.cfg
-*** npp-6.1.2-src/lib/xtra/sound/sound.cfg	2013-03-29 14:37:38.000000000 -0400
---- npp-6.1.2-src-libre/lib/xtra/sound/sound.cfg	2013-06-29 16:20:47.241336459 -0400
-***************
-*** 41,59 ****
-  #
-  
-  # The shopkeep bought a worthless item.
-! store1 = money.wav
-  
-  # The shopkeep paid too much for an item.
-! store2 = money.wav
-  
-  # The shopkeep got away with a good bargain.
-! store3 = money.wav
-  
-  # The shopkeep got away with a great bargain.
-! store4 = money.wav
-  
-  # You make a normal transaction (buying or selling).
-! store5 = money.wav
-  
-  # You enter a store.
-  store_enter =
---- 41,59 ----
-  #
-  
-  # The shopkeep bought a worthless item.
-! store1 =
-  
-  # The shopkeep paid too much for an item.
-! store2 =
-  
-  # The shopkeep got away with a good bargain.
-! store3 =
-  
-  # The shopkeep got away with a great bargain.
-! store4 =
-  
-  # You make a normal transaction (buying or selling).
-! store5 =
-  
-  # You enter a store.
-  store_enter =
-***************
-*** 69,75 ****
-  #
-  
-  # You succeed in a melee attack against a monster.
-! hit = hit.wav drop.wav hit1.wav
-  
-  # It was a good hit!
-  hit_good =
---- 69,75 ----
-  #
-  
-  # You succeed in a melee attack against a monster.
-! hit =
-  
-  # It was a good hit!
-  hit_good =
-***************
-*** 87,93 ****
-  hit_hi_superb =
-  
-  # You miss a melee attack against a monster.
-! miss = miss.wav miss1.wav
-  
-  # You fire a missile.
-  shoot =
---- 87,93 ----
-  hit_hi_superb =
-  
-  # You miss a melee attack against a monster.
-! miss =
-  
-  # You fire a missile.
-  shoot =
-***************
-*** 99,105 ****
-  hitpoint_warn =
-  
-  # You die.
-! death = death.wav
-  
-  #
-  # Player sounds - status changes
---- 99,105 ----
-  hitpoint_warn =
-  
-  # You die.
-! death =
-  
-  #
-  # Player sounds - status changes
-***************
-*** 197,206 ****
-  money3 =
-  
-  # You (or a monster) drop something on the ground.
-! drop = clunk.wav
-  
-  # You gain (or regain) a level.
-! level = level.wav
-  
-  # You successfully study a spell or prayer.
-  study =
---- 197,206 ----
-  money3 =
-  
-  # You (or a monster) drop something on the ground.
-! drop =
-  
-  # You gain (or regain) a level.
-! level =
-  
-  # You successfully study a spell or prayer.
-  study =
-***************
-*** 224,242 ****
-  hitwall =
-  
-  # You eat something.
-! eat = eat.wav
-  
-  # You successfully dig through something.
-! dig = thump.wav
-  
-  # You open a door.
-! opendoor = opendoor.wav
-  
-  # You shut a door.
-! shutdoor = shutdoor.wav
-  
-  # You teleport from a level (including via recall).
-! tplevel = teleport.wav
-  
-  # Default "bell" sound for system messages.
-  bell =
---- 224,242 ----
-  hitwall =
-  
-  # You eat something.
-! eat =
-  
-  # You successfully dig through something.
-! dig =
-  
-  # You open a door.
-! opendoor =
-  
-  # You shut a door.
-! shutdoor =
-  
-  # You teleport from a level (including via recall).
-! tplevel =
-  
-  # Default "bell" sound for system messages.
-  bell =
-***************
-*** 291,300 ****
-  #
-  
-  # A monster flees in terror.
-! flee = flee.wav
-  
-  # A monster is killed.
-! kill = kill.wav destroy.wav kill1.wav
-  
-  # A unique is killed.
-  kill_unique =
---- 291,300 ----
-  #
-  
-  # A monster flees in terror.
-! flee =
-  
-  # A monster is killed.
-! kill =
-  
-  # A unique is killed.
-  kill_unique =
-Only in npp-6.1.2-src/lib/xtra/sound: thump.wav
-Only in npp-6.1.2-src/lib/xtra/sound: vomit.wav
diff --git a/pcr/ocaml-camomile/PKGBUILD b/pcr/ocaml-camomile/PKGBUILD
deleted file mode 100644
index 48c8eb2f9..000000000
--- a/pcr/ocaml-camomile/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Serge Zirukin <ftrvxmtrx@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=ocaml-camomile
-pkgver=0.8.4
-pkgrel=2
-pkgdesc="Comprehensive Unicode library for OCaml"
-arch=('i686' 'x86_64')
-url="https://github.com/yoriyuki/Camomile"
-license=('LGPL')
-depends=('ocaml' 'ocaml-findlib>=1.2.3')
-install=
-source=(https://github.com/downloads/yoriyuki/${pkgname/ocaml-}/${pkgname/ocaml-/}-$pkgver.tar.bz2)
-md5sums=('389f1a7e5c2a634fbb3ea6f764d77bd3')
-options=(!strip !makeflags)
-
-build() {
-  cd "$srcdir/${pkgname/ocaml-/}-$pkgver"
-
-  ./configure --prefix=/usr
-  mkdir -p $pkgdir$(ocamlfind printconf destdir) || return 1
-  mkdir -p $pkgdir/usr/bin
-  sed -i -e 's|ocamlfind install|ocamlfind install -destdir '$pkgdir$(ocamlfind printconf destdir)'|' Makefile || return 1
-  make || return 1
-  make DATADIR="$pkgdir/usr/share" BINDIR="$pkgdir/usr/bin" install
-  install -Dm 644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
-
diff --git a/pcr/ocaml-pcre/PKGBUILD b/pcr/ocaml-pcre/PKGBUILD
deleted file mode 100644
index bfc214b28..000000000
--- a/pcr/ocaml-pcre/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributor: Serge Zirukin <ftrvxmtrx@gmail.com>
-# Contributor: Sergei Lebedev <superbobry@gmail.com>
-# Contributor: Magnus Therning <magnus@therning.org>
-# Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io>
-
-pkgname=ocaml-pcre
-pkgver=7.0.2
-pkgrel=2
-pkgdesc="Perl compatible regular expressions for OCaml"
-arch=('i686' 'x86_64')
-url="http://www.ocaml.info/home/ocaml_sources.html#toc18"
-license=('LGPL')
-depends=('ocaml' 'pcre>=4.5')
-makedepends=('ocaml-findlib')
-replaces=('pcre-ocaml')
-conflicts=('pcre-ocaml')
-source=("https://bitbucket.org/mmottl/pcre-ocaml/downloads/pcre-ocaml-$pkgver.tar.gz")
-md5sums=('412eec5674a8bab76ccd09e006a24e10')
-options=(!strip)
-
-build() {
-  cd "$srcdir/pcre-ocaml-$pkgver"
-
-  ./configure --disable-debug --prefix /usr --destdir "$pkgdir"
-  make all
-}
-
-package() {
-  cd "$srcdir/pcre-ocaml-$pkgver"
-  export OCAMLFIND_DESTDIR="$pkgdir$(ocamlfind printconf destdir)"
-  install -dm 755 "$OCAMLFIND_DESTDIR/stublibs"
-  make install
-  install -Dm 644 COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/pcr/ocsync/PKGBUILD b/pcr/ocsync/PKGBUILD
deleted file mode 100644
index 8da91f41d..000000000
--- a/pcr/ocsync/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
-# https://github.com/zizzfizzix/pkgbuilds
-# Maintainer: Jorge Araya Navarro <shackra@riseup.net>
-#
-##############################################################
-#### The section below can be adjusted to suit your needs ####
-##############################################################
-
-# What type of build do you want?
-# See http://techbase.kde.org/Development/CMake/Addons_for_KDE#Buildtypes to check what is supported.
-# Default is RelWithDebInfo to help with debugging.
-
-_buildtype="Release"
-
-##############################################################
-
-pkgname=ocsync
-pkgver=0.90.4
-pkgrel=1
-pkgdesc="A file synchronizer especially designed for you, the normal user. Dependency of owncloud-client."
-arch=("i686" "x86_64")
-url="http://www.csync.org"
-license=('GPL2')
-depends=('sqlite3' 'iniparser' 'neon' 'libssh')
-makedepends=('cmake')
-provides=('csync' 'csync-owncloud')
-conflicts=('csync' 'csync-owncloud')
-backup=('etc/ocsync/ocsync.conf' 'etc/ocsync/ocsync_exclude.conf')
-source=("http://download.owncloud.com/download/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('4724730cf7376983c06bc83133c06a3f')
-
-if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
-  options=(!strip)
-fi
-
-prepare() {
-  if [[ -e ${srcdir}/${pkgname}-${pkgver}-build ]]; then rm -rf ${srcdir}/${pkgname}-${pkgver}-build; fi
-  mkdir ${srcdir}/${pkgname}-${pkgver}-build
-}
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}-build
-  
-  cmake -DCMAKE_BUILD_TYPE=${_buildtype} \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DSYSCONF_INSTALL_DIR=/etc \
-        ../${pkgname}-${pkgver}
-  make
-}
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}-build
-  make DESTDIR=${pkgdir} install
-}
diff --git a/pcr/oggfwd/PKGBUILD b/pcr/oggfwd/PKGBUILD
deleted file mode 100644
index 5dd9e4680..000000000
--- a/pcr/oggfwd/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor: farid abdelnour < farid at atelier-labs.org>
-
-pkgname=oggfwd	
-pkgver=0.2
-pkgrel=2
-pkgdesc="pipes an ogg stream to an icecast server"
-arch=('i686' 'x86_64')
-url="http://v2v.cc/~j/oggfwd/"
-license=('GPL')
-source=(http://www.v2v.cc/~j/ffmpeg2theora/oggfwd/oggfwd.tar.gz)
-md5sums=('8402d26a5a8ff318ef6ea01ec146c8cc')
-depends=(libshout)
-
-build () {
-  cd $srcdir/$pkgname
-  make clean || return 1 
-  make oggfwd || return 1
-  install -d $pkgdir/usr/bin || return 1
-  install -m755 oggfwd $pkgdir/usr/bin/oggfwd || return 1
-}
-
diff --git a/pcr/oinkmaster/PKGBUILD b/pcr/oinkmaster/PKGBUILD
deleted file mode 100644
index f533e3663..000000000
--- a/pcr/oinkmaster/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributor: Robert Knauer <robert@privatdemail.net>
-# Contributor: Kessia Pinheiro <kessiapinheiro @ gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.io>
-
-pkgname=oinkmaster
-pkgver=2.0
-pkgrel=7
-pkgdesc="A script that will help you update and manage your Snort rules"
-arch=('i686' 'x86_64')
-license=('BSD')
-url="http://oinkmaster.sourceforge.net/"
-depends=('snort')
-backup=(
-  'etc/oinkmaster.conf'
-)
-source=(
-  "http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-)
-sha256sums=(
-  '3d52f0426aa7c81b122cef22b80d708d8bb8337537e48754a065804f46c46162'
-)
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -m0655 -D 'oinkmaster.pl' "${pkgdir}/usr/bin/oinkmaster.pl"
-  install -m0644 -D 'oinkmaster.conf' "${pkgdir}/etc/oinkmaster.conf"
-  install -m0644 -D 'oinkmaster.1' "${pkgdir}/usr/man/man1/oinkmaster.1"
-  install -d -m0644 "${pkgdir}/usr/share/oinkmaster/"
-  install -d -m0755 "${pkgdir}/usr/share/licenses/oinkmaster/"
-  install -m0644 -D 'template-examples.conf' "${pkgdir}/usr/share/oinkmaster/"
-  cp -R 'contrib/' "${pkgdir}/usr/share/oinkmaster/"
-  install -m0644 [[:upper:]]* "${pkgdir}/usr/share/oinkmaster/"
-  install -m0644 -D 'LICENSE' "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/pcr/olsrd/PKGBUILD b/pcr/olsrd/PKGBUILD
deleted file mode 100644
index 668e39cea..000000000
--- a/pcr/olsrd/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: William Rea <sillywilly@gmail.com>
-# Maintainer: Claudio Pisa <clauz@ninux.org>
-pkgname=olsrd
-pkgver=0.6.1
-pkgrel=2
-pkgdesc="OLSR routing daemon (RFC 3626)"
-arch=(i686 x86_64 ppc mips64el)
-url="http://www.olsr.org"
-license=('BSD')
-depends=('glibc')
-makedepends=('bison')
-backup=etc/olsrd.conf
-install=olsrd.install
-source=(http://www.olsr.org/releases/0.6/${pkgname}-${pkgver}.tar.bz2 rc.d.olsrd)
-md5sums=('a75fc9b6252df5b5f49f13418fafeff1' 'bc3e393e0179ffff0a6d6c9d6a5c4b60')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  CFLAGS+=" -fPIC " \
-  make OS=linux build_all
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install_all
-
-  install -D -m755 $srcdir/rc.d.olsrd $pkgdir/etc/rc.d/olsrd
-  install -D -m644 license.txt $pkgdir/usr/share/licenses/olsrd/LICENSE
-}
-
diff --git a/pcr/olsrd/olsrd.install b/pcr/olsrd/olsrd.install
deleted file mode 100755
index f49372538..000000000
--- a/pcr/olsrd/olsrd.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-echo "--------------------------------------------------------------------"
-echo " Remember to edit /etc/olsrd.conf to match your network settings."
-echo "--------------------------------------------------------------------"
-/bin/true
-}
-
-post_upgrade() {
-/bin/true
-}
-
-pre_remove() {
-/etc/rc.d/olsrd stop
-/bin/true
-}
-
-op=$1
-shift
-
-$op "$@"
-
diff --git a/pcr/olsrd/rc.d.olsrd b/pcr/olsrd/rc.d.olsrd
deleted file mode 100755
index d257e22ef..000000000
--- a/pcr/olsrd/rc.d.olsrd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/olsrd`
-case "$1" in
-  start)
-    stat_busy "Starting OLSR Daemon"
-    [ -z "$PID" ] && /usr/sbin/olsrd -d 0 &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon olsrd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping OLSR Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon olsrd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
-
diff --git a/pcr/openchange/PKGBUILD b/pcr/openchange/PKGBUILD
deleted file mode 100644
index c3e2c753f..000000000
--- a/pcr/openchange/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# Maintainer: Michael Hansen <zrax0111 gmail com>
-# Contributor: ngoonee <ngoonee.talk@gmail.com>
-# Contributor: Adam Russell <adamlr6+arch@gmail.com>
-pkgname=openchange
-_codename=BORG
-_dlid=180
-pkgver=1.0
-pkgrel=6
-pkgdesc="Library for MAPI connectivity with Microsoft Exchange. This package was SPECIFICALLY created to support evolution-mapi and may not work for any other purpose."
-arch=('i686' 'x86_64')
-url="http://www.openchange.org"
-license=('GPL3')
-depends=('samba4>=4.0.0B1' 'popt' 'libical' 'sqlite3' 'file' 'boost' 'zlib')
-makedepends=('ccache' 'python2' 'subversion' 'docbook-xsl' 'libxslt' 'flex' 'bison' 'autoconf' 'automake')
-options=(!makeflags)
-# Releases are mirrored at http://tracker.openchange.org/projects/openchange/files
-source=("http://tracker.openchange.org/attachments/download/${_dlid}/${pkgname}-${pkgver}-${_codename}.tar.gz"
-        "bugzilla_682449.patch")
-
-md5sums=('9b57a325e90e5ad3a702ddc6e8762ab6'
-         '7521f89f8ffaa733ed72532334951b90')
-_prefix="/opt/samba4"
-
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}-${_codename}
-
-	patch -i ../bugzilla_682449.patch
-
-	SAVEIFS=${IFS}
-	IFS=$(echo -en "\n\b")
-	PYTHON_CALLERS="$(find ${srcdir}/${pkgname}-${pkgver}-${_codename} -name '*.py')
-$(find ${srcdir}/${pkgname}-${pkgver}-${_codename}/  -type f)
-$(find ${srcdir}/${pkgname}-${pkgver}-${_codename}/ -name 'configure.ac')"
-	sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" \
-	       -e "s|python-config$|python2-config|" \
-	       -e "s|bin/python$|bin/python2|" \
-	    ${PYTHON_CALLERS}
-
-	# Patch for samba4-alpha19+
-	SRC_FILES="$(find ${srcdir}/${pkgname}-${pkgver}-${_codename} -name '*.c')"
-	sed -i -e "s|#include <samba/popt.h>|#include <popt.h>|" ${SRC_FILES}
-	IFS=${SAVEIFS}
-
-	export PYTHON=/usr/bin/python2
-
-	export PKG_CONFIG_PATH="${_prefix}/samba/lib/pkgconfig:${_prefix}/lib/pkgconfig"
-	export BOOST_LIB_SUFFIX="-mt"
-	./autogen.sh
-
-  sed -i -e "s|python-config|python2-config|g" configure
-	./configure --prefix=${_prefix} --with-samba=${_prefix}
-	make FLEX=/usr/bin/flex BISON=/usr/bin/bison || return 1
-}
-
-package() {
-	_pyver=`python2 -c 'import sys; print(sys.version[:3])'`
-
-	cd ${srcdir}/${pkgname}-${pkgver}-${_codename}
-	make DESTDIR="$pkgdir/" install
-
-	cd ${pkgdir}/${_prefix}/lib/
-	ln -s libmapi.so libmapi.so.0
-	ln -s libocpf.so libocpf.so.0
-
-	find ${pkgdir}/${_prefix}/lib/python${_pyver}/site-packages/ -name '*.py' | \
-	     xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
-}
diff --git a/pcr/openchange/bugzilla_682449.patch b/pcr/openchange/bugzilla_682449.patch
deleted file mode 100644
index e1b3f0983..000000000
--- a/pcr/openchange/bugzilla_682449.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-Index: exchange.idl
-===================================================================
---- exchange.idl	(revision 4004)
-+++ exchange.idl	(working copy)
-@@ -1039,7 +1039,7 @@
- 		[case(ActionType_OP_COPY)]		MoveCopy_Action			CopyAction;
- 		[case(ActionType_OP_REPLY)]		ReplyOOF_Action			ReplyAction;
- 		[case(ActionType_OP_OOF_REPLY)]		ReplyOOF_Action			ReplyOOFAction;
--		[case(ActionType_OP_DEFER_ACTION)][flag(NDR_REMAINING)] DATA_BLOB	DeferAction;
-+		[case(ActionType_OP_DEFER_ACTION)][flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB	DeferAction;
- 		[case(ActionType_OP_BOUNCE)]		BounceCode			BounceCode;
- 		[case(ActionType_OP_TAG)]		mapi_SPropValue_wrap	       	PropValue;
- 		[case(ActionType_OP_FORWARD)]		ForwardDelegate_Action		ForwardAction;
-@@ -1057,7 +1057,7 @@
- 
- 	typedef [flag(NDR_NOALIGN)] struct {
- 		uint16					ActionLength;
--		[subcontext(0),subcontext_size(ActionLength),flag(NDR_REMAINING)] ActionBlockData ActionBlockData;
-+		[subcontext(0),subcontext_size(ActionLength),flag(NDR_REMAINING|NDR_NOALIGN)] ActionBlockData ActionBlockData;
- 	} ActionBlock;
- 
- 	typedef [flag(NDR_NOALIGN)] struct {
-@@ -1095,7 +1095,7 @@
- 
- 	typedef [public,flag(NDR_NOALIGN)] struct {
- 		uint16					cValues;
--		[flag(NDR_REMAINING)]mapi_SPropValue	lpProps[cValues];
-+		[flag(NDR_REMAINING|NDR_NOALIGN)]mapi_SPropValue	lpProps[cValues];
- 	} mapi_SPropValue_array;
- 
- 	typedef [flag(NDR_NOALIGN)] struct {
-@@ -1281,7 +1281,7 @@
- // TODO: figure out if "layout" can go
- 		uint8									layout;
- // TODO: convert this to a proper structure - see if we already have one.
--		[flag(NDR_REMAINING)] DATA_BLOB						prop_values;
-+		[flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB						prop_values;
- 	} RecipientRow;
- 
- 	typedef [flag(NDR_NOALIGN)] struct {
-@@ -1356,7 +1356,7 @@
- 
- 	typedef [flag(NDR_NOALIGN)] struct {
- 		uint8		layout;
--		[flag(NDR_REMAINING)] DATA_BLOB prop_data;
-+		[flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB prop_data;
- 	} GetProps_repl;
- 
- 	/*************************/
-@@ -1455,7 +1455,7 @@
- 	typedef [flag(NDR_NOALIGN)]struct {
- 		uint32		idx;
- 		ulRecipClass	RecipClass;		
--		[subcontext(2),flag(NDR_REMAINING)] RecipientRow RecipientRow;
-+		[subcontext(2),flag(NDR_REMAINING|NDR_NOALIGN)] RecipientRow RecipientRow;
- 	} ModifyRecipientRow;
- 
- 	typedef [flag(NDR_NOALIGN)] struct {
-@@ -1532,7 +1532,7 @@
- 		uint8				handle_idx;
- 		MSGFLAG_READ			flags;
- 	        /* TEMP HACK for editing notes without crashing Outlook:
--		   [flag(NDR_REMAINING)] DATA_BLOB	clientdata; */
-+		   [flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB	clientdata; */
- 	} SetMessageReadFlag_req;
- 
- 	typedef [nodiscriminant, flag(NDR_NOALIGN)] union {
-@@ -1782,7 +1782,7 @@
- 	typedef [nopush,nopull,flag(NDR_NOALIGN)] struct {
- 		uint8		Origin;
- 		uint16		RowCount;
--		[flag(NDR_REMAINING)]DATA_BLOB	RowData;
-+		[flag(NDR_REMAINING|NDR_NOALIGN)]DATA_BLOB	RowData;
- 	} QueryRows_repl;
- 
- 	/**************************/
-@@ -2394,13 +2394,13 @@
- 	} ReadStream_req;
- 
- 	typedef [flag(NDR_NOALIGN)] struct {
--		[subcontext(2), flag(NDR_REMAINING)] DATA_BLOB data;
-+		[subcontext(2), flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB data;
- 	} ReadStream_repl;
- 
- 	/*************************/
- 	/* EcDoRpc Function 0x2d */
- 	typedef [flag(NDR_NOALIGN)] struct {
--		[subcontext(2), flag(NDR_REMAINING)] DATA_BLOB	data;
-+		[subcontext(2), flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB	data;
- 	} WriteStream_req;
- 
- 
-@@ -2900,7 +2900,7 @@
- 		uint16		TotalStepCount;
- 		uint8		Reserved;
- 		uint16		TransferBufferSize;
--		[subcontext(0),subcontext_size(TransferBufferSize),flag(NDR_REMAINING)] DATA_BLOB TransferBuffer;
-+		[subcontext(0),subcontext_size(TransferBufferSize),flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB TransferBuffer;
- 	} FastTransferSourceGetBuffer_repl;
- 
- 	/**************************/
-@@ -2982,7 +2982,7 @@
- 	/* EcDoRpc Function 0x54  */
- 	typedef [flag(NDR_NOALIGN)] struct {
- 		uint16		TransferBufferSize;
--		[subcontext(0),subcontext_size(TransferBufferSize),flag(NDR_REMAINING)] DATA_BLOB TransferBuffer;
-+		[subcontext(0),subcontext_size(TransferBufferSize),flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB TransferBuffer;
- 	} FastTransferDestinationPutBuffer_req;
- 
- 	typedef [flag(NDR_NOALIGN)] struct {
-@@ -3075,7 +3075,7 @@
- 	typedef [flag(NDR_NOALIGN)] struct {
- 		uint32		ExpandedRowCount;
- 		uint16		RowCount;
--		[flag(NDR_REMAINING)]DATA_BLOB  RowData;
-+		[flag(NDR_REMAINING|NDR_NOALIGN)]DATA_BLOB  RowData;
- 	} ExpandRow_repl;
- 
- 	/*************************/
-@@ -3184,7 +3184,7 @@
- 	typedef [flag(NDR_NOALIGN)] struct {
- 		boolean8	HasFinished;
- 		uint16		DataSize;
--		[subcontext(0), subcontext_size(DataSize), flag(NDR_REMAINING)] DATA_BLOB Data;
-+		[subcontext(0), subcontext_size(DataSize), flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB Data;
- 	} ReadPerUserInformation_repl;
- 
- 	/*************************/
-@@ -3194,7 +3194,7 @@
- 		boolean8	HasFinished;
- 		uint32		DataOffset;
- 		uint16		DataSize;
--		[subcontext(0), subcontext_size(DataSize), flag(NDR_REMAINING)] DATA_BLOB Data;
-+		[subcontext(0), subcontext_size(DataSize), flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB Data;
- 		GUID		ReplGuid;	/* Note: ReplGuid gets only included under specific circumstances */
- 	} WritePerUserInformation_req;
- 
-@@ -3364,7 +3364,7 @@
- 		SendOptions				SendOptions;
- 		SynchronizationFlag			SynchronizationFlag;
- 		uint16					RestrictionSize;
-- 		[subcontext(0),subcontext_size(RestrictionSize),flag(NDR_REMAINING)] DATA_BLOB	RestrictionData;
-+ 		[subcontext(0),subcontext_size(RestrictionSize),flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB	RestrictionData;
- 		SynchronizationExtraFlags		SynchronizationExtraFlags;
- 		mapi_SPropTagArray			PropertyTags;
- 	} SyncConfigure_req;
-@@ -3542,7 +3542,7 @@
- 	} MessageReadState;
- 
- 	typedef [flag(NDR_NOALIGN)] struct {
--		[subcontext(2),flag(NDR_REMAINING)] DATA_BLOB MessageReadStates;
-+		[subcontext(2),flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB MessageReadStates;
- 	} SyncImportReadStateChanges_req;
- 
- 	typedef [flag(NDR_NOALIGN)] struct {
-@@ -3617,7 +3617,7 @@
- 	/*************************/
- 	/* EcDoRpc Function 0x90 */
- 	typedef [flag(NDR_NOALIGN)] struct {
--		[subcontext(2), flag(NDR_REMAINING)] DATA_BLOB	data;
-+		[subcontext(2), flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB	data;
- 	} WriteAndCommitStream_req;
- 
- 
-@@ -4462,7 +4462,7 @@
- 		uint32		MajorVersion;
- 		uint32		MinorVersion;
- 		uint32		BuildNumber;
--		[subcontext(0), subcontext_size(132), flag(NDR_NOALIGN|NDR_REMAINING)] DATA_BLOB Reserved_1;
-+		[subcontext(0), subcontext_size(132), flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB Reserved_1;
- 		uint16		ServicePackMajor;
- 		uint16		ServicePackMinor;
- 		uint32		Reserved_2;
-@@ -4567,7 +4567,7 @@
- 		[out]				uint16					rgwServerVersion[3],
- 		[out]				uint16					rgwBestVersion[3],
- 		[in,out]			uint32					*pulTimeStamp,
--		[in,subcontext(4),flag(NDR_NOALIGN|NDR_REMAINING)] mapi2k7_AuxInfo	*rgbAuxIn,
-+		[in,subcontext(4),flag(NDR_REMAINING|NDR_NOALIGN)] mapi2k7_AuxInfo	*rgbAuxIn,
- 		[in]				uint32					cbAuxIn,
- 		[out, length_is(*pcbAuxOut), size_is(*pcbAuxOut)] mapi2k7_AuxInfo	*rgbAuxOut,
- 		[in,out][range(0,0x1008)]	uint32					*pcbAuxOut
-@@ -4588,7 +4588,7 @@
- 
- 	typedef [public,nopull] struct {
- 		RPC_HEADER_EXT							header;
--		[subcontext(0),flag(NDR_NOALIGN|NDR_REMAINING)] mapi_response	*mapi_response;
-+		[subcontext(0),flag(NDR_REMAINING|NDR_NOALIGN)] mapi_response	*mapi_response;
- 	} mapi2k7_response;
- 
- 	[public,noprint] MAPISTATUS EcDoRpcExt2(
diff --git a/pcr/opendnssec/LICENSE b/pcr/opendnssec/LICENSE
deleted file mode 100644
index 5700d408a..000000000
--- a/pcr/opendnssec/LICENSE
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2009 Nominet UK. All rights reserved.
- * Copyright (c) 2010 .SE (The Internet Infrastructure Foundation).
- * Copyright (c) 2009 NLNet Labs.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- *  Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- *  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 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.
- */
-
-/* pkcs11.h
-   Copyright 2006, 2007 g10 Code GmbH
-   Copyright 2006 Andreas Jellinghaus
-
-   This file is free software; as a special exception the author gives
-   unlimited permission to copy and/or distribute it, with or without
-   modifications, as long as this notice is preserved.
-
-   This file is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY, to the extent permitted by law; without even
-   the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-   PURPOSE.  */
\ No newline at end of file
diff --git a/pcr/opendnssec/PKGBUILD b/pcr/opendnssec/PKGBUILD
deleted file mode 100644
index 065a1ec68..000000000
--- a/pcr/opendnssec/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# Maintainer: Javier Torres <javitonino [at] gmail [dot] com>
-
-pkgname=opendnssec
-pkgver=1.4.0
-pkgrel=3
-pkgdesc="Turn-key solution for DNSSEC (sqlite3)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.opendnssec.org/"
-license=('BSD')
-depends=('libxml2' 'ldns' 'sqlite3' 'softhsm')
-backup=("etc/opendnssec/conf.xml"
-        "etc/opendnssec/kasp.xml"
-        "etc/opendnssec/zonelist.xml")
-install="opendnssec.install"
-source=("http://www.opendnssec.org/files/source/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        "pid-path.patch"
-        "ods-signer.service"
-        "ods-enforcer.service")
-sha256sums=('36d4926dcdf351a527ad7600b151ab6cc56d0a472a7eb8871eecd70afef9e101'
-            'SKIP'
-            '487a4c05a07feb97c865ddc4c13d00eea6ce8b2b1e5031983c15484f4991ebed'
-            '1a8cdec0e97a33048956268b766da570f8f7a90d05af59e547219f1381832071'
-            '75cecbfb0ece13957a68a5bc39c20a1d69b95373e7473545d70621e1732733d8')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # /var/lib/run -> /var/run
-  patch -p0 -i "${srcdir}/pid-path.patch"
-
-  aclocal
-  autoconf
-  automake --add-missing
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --datarootdir=/usr/share \
-              --localstatedir=/var/lib \
-              --sysconfdir=/etc \
-              --with-pkcs11-softhsm=/usr/lib/libsofthsm.so \
-              --sbindir=/usr/bin
-
-  # Create the correct (/var/run/opendnssec) directory
-  sed -i \
-  -e "s/\$(INSTALL) -d \$(DESTDIR)\$(localstatedir)\/run\/opendnssec/#Removed/" \
-  -e "s/\$(INSTALL) -d \$(DESTDIR)\$(localstatedir)\/run/\$(INSTALL) -d \$(DESTDIR)\$(OPENDNSSEC_PID_DIR)/" \
-  Makefile
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  install -d "${pkgdir}/var/run/opendnssec"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -d "${pkgdir}/etc/rc.d"
-  install -Dm0644 "${srcdir}/ods-signer.service" \
-        "${pkgdir}/usr/lib/systemd/system/ods-signer.service"
-  install -Dm0644 "${srcdir}/ods-enforcer.service" \
-        "${pkgdir}/usr/lib/systemd/system/ods-enforcer.service"
-  install -Dm0644 "LICENSE" \
-        "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -Dm0644 "enforcer/utils/migrate_adapters_1.sqlite3" \
-        "${pkgdir}/usr/share/opendnssec"
-
-  chown -R 227:227 "${pkgdir}/etc/opendnssec" \
-                   "${pkgdir}/var/lib/opendnssec" \
-                   "${pkgdir}/var/run/opendnssec" 
-  chmod 750 "${pkgdir}/etc/opendnssec" \
-            "${pkgdir}/var/lib/opendnssec" \
-            "${pkgdir}/var/run/opendnssec" 
-}
diff --git a/pcr/opendnssec/ods-enforcer.service b/pcr/opendnssec/ods-enforcer.service
deleted file mode 100644
index f0d0050d0..000000000
--- a/pcr/opendnssec/ods-enforcer.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=OpenDNSSEC Enforcer
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/opendnssec/enforcerd.pid
-ExecStart=/usr/bin/ods-control enforcer start
-ExecStop=/usr/bin/ods-control enforcer stop
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/pcr/opendnssec/ods-signer.service b/pcr/opendnssec/ods-signer.service
deleted file mode 100644
index 26cc03481..000000000
--- a/pcr/opendnssec/ods-signer.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=OpenDNSSEC Signer
-After=syslog.target nerwork.target
-
-[Service]
-Type=forking
-PIDFile=/run/opendnssec/signerd.pid
-ExecStart=/usr/bin/ods-control signer start
-ExecStop=/usr/bin/ods-control signer stop
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/pcr/opendnssec/opendnssec.install b/pcr/opendnssec/opendnssec.install
deleted file mode 100644
index 0c74659ee..000000000
--- a/pcr/opendnssec/opendnssec.install
+++ /dev/null
@@ -1,27 +0,0 @@
-post_install() {
-    if [ -z "`grep '^opendnssec:' /etc/group`" ]; then
-        groupadd -g 227 opendnssec
-    fi
-    if [ -z "`grep '^opendnssec:' /etc/passwd`" ]; then
-        useradd -u 227 -d /var/lib/opendnssec -g opendnssec -s /bin/false opendnssec
-    fi
-
-    echo ">> You need an HSM implementation (try softhsm)"
-}
-
-
-post_upgrade() {
-    post_install $1
-    OLD=$(echo $2 | sed "s/\(.*\)\.\(.*\)\.\(.*\)/\1\.\2/g")
-    NEW=$(echo $1 | sed "s/\(.*\)\.\(.*\)\.\(.*\)/\1\.\2/g")
-    if [ $OLD != "1.4" -a $NEW == "1.4" ]; then
-        echo ">> NOTICE: UPGRADE TO 1.4"
-        echo "This update requires upgrading the database"
-        echo "Run /usr/share/opendnssec/migrate_adapters_1.sqlite3 on your kasp database"
-	echo "e.g: sqlite3 kasp.db < /usr/share/opendnssec/migrate_adapters_1.sqlite3"
-    fi
-}
-
-post_remove() {
-    userdel opendnssec
-}
diff --git a/pcr/opendnssec/pid-path.patch b/pcr/opendnssec/pid-path.patch
deleted file mode 100644
index 88c750cf2..000000000
--- a/pcr/opendnssec/pid-path.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.am	2012-07-17 08:53:51.000000000 +0200
-+++ Makefile.am	2012-11-20 21:56:11.000000000 +0100
-@@ -30,8 +30,8 @@
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signconf
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec
-+	$(INSTALL) -d $(DESTDIR)/var/run
-+	$(INSTALL) -d $(DESTDIR)/var/run/opendnssec
- 
- docs:
- 	(cd libhsm; $(MAKE) doxygen)
---- m4/opendnssec_common.m4	2012-11-01 11:56:59.000000000 +0100
-+++ m4/opendnssec_common.m4	2012-11-20 21:52:56.000000000 +0100
-@@ -19,7 +19,7 @@
- OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
- OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
- OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec"
--OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec"
-+OPENDNSSEC_PID_DIR="/var/run/opendnssec"
- 
- AC_SUBST([OPENDNSSEC_BIN_DIR])
- AC_SUBST([OPENDNSSEC_SBIN_DIR])
diff --git a/pcr/openicc/PKGBUILD b/pcr/openicc/PKGBUILD
deleted file mode 100644
index 8db1cf82d..000000000
--- a/pcr/openicc/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-#Maintainer: M0Rf30
-
-pkgname=openicc
-pkgver=1.3.1
-pkgrel=1
-pkgdesc="Colour management projects to share ICC related implementation details"
-url="http://www.freedesktop.org/wiki/OpenIcc"
-arch=('i686' 'x86_64')   
-depends=('xorg-server')
-source=("http://downloads.sourceforge.net/project/openicc/OpenICC-Profiles/icc-profiles-$pkgname-$pkgver.tar.bz2")
-license=('GPL')
-
-build() {
-    cd $srcdir/icc-profiles-$pkgname-$pkgver
-    ./configure --prefix=/usr
-    make
-}
-package() {
-    cd $srcdir/icc-profiles-$pkgname-$pkgver
-    make DESTDIR=$pkgdir install
-}
-
-md5sums=('d18ed8dc5e3f6792d445af67d5f3b0d6')
diff --git a/pcr/openjdk6/PKGBUILD b/pcr/openjdk6/PKGBUILD
deleted file mode 100644
index 03cdba0aa..000000000
--- a/pcr/openjdk6/PKGBUILD
+++ /dev/null
@@ -1,132 +0,0 @@
-# $Id: PKGBUILD 178352 2013-02-20 17:00:42Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname='openjdk6-old'
-pkgbase="openjdk6"
-_javaver=6
-_icedteaver=1.12.3
-_openjdk_version=b27
-_openjdk_date=26_oct_2012
-pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=1.1
-url='http://icedtea.classpath.org'
-arch=('i686' 'x86_64')
-license=('custom')
-pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
-backup=(etc/profile.d/openjdk6.sh)
-depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7')
-makedepends=('alsa-lib' 'giflib' 'libxp' 'gtk2'
-	     'nspr' 'zlib' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxslt'
-	     'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6-old' 'inetutils' 'wget')
-optdepends=('alsa-lib: for sound'
-           'giflib: for gif format support')
-install=openjdk6.install
-options=('!emptydirs')
-source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz{,.sig}
-	http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	http://icedtea.classpath.org/download/drops/jaxp144_04.zip
-	http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip
-	http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip
-	fix_jdk_cmds_path.diff
-	fix_corba_cmds_path.diff
-	fontconfig-paths.diff
-	nonreparenting-wm.diff
-	disable_Werror.diff
-	openjdk6.profile
-	openjdk6.profile.csh
-	disable-openjdk-Werror.diff
-	ecj-icedtea.patch)
-noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	jaxp144_04.zip
-	jdk6-jaxws2_1_6-2011_06_13.zip
-	jdk6-jaf-b20.zip)
-sha256sums=('db9dc14fa537fb22616fcd9e5b80758aa7baa66e0b6f8adfe3d5e80414574b4c'
-            'a6cbeccc4f25f72a940b9ac0c3e05ece50edc16c1c13f7a1a82ee895563930e3'
-            '044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0'
-            '490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c'
-            '229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3'
-            '78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012'
-            'f5f59e121f7645ebc449bb13569fd924cbab3194e41db901f4fbe9dbd45720c5'
-            '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
-            '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
-            '9c3c55c30729ec44fab14c3f3f841c273730c7467d8908a72f018bc9e9f65bd9'
-            'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97'
-            '26e2cd5a6034f08a685129c9412f487b9931fb0d556f1ccceab17bdb75a372cd'
-            '0c2d9116d6e550021994d6713a93621a9df685d2182996be3249ad812712b007'
-            '3e20fdcd17d4adee1cb2ddc3b15a39fe56b9a7837067487eedd40733adfea9c6'
-            '77bafb45d67cbdac59ae27b0cc85e38d849dcf5c4c4005f5b28b33f4f5b734ab')
-
-build() {
-
-  unset CLASSPATH
-  
-    [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd ${srcdir}/icedtea6-${_icedteaver}
-
-  ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
-
-  cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
-  cp ${srcdir}/ecj-icedtea.patch ${srcdir}/icedtea6-${_icedteaver}/patches/ecj/icedtea.patch
-
-  autoreconf -i
-
-  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff patches/disable_Werror.diff patches/disable-openjdk-Werror.diff"
-
-  export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
-  export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
-  unset MAKEFLAGS
-
-  ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
-	--with-ant-home=/usr/share/java/apache-ant \
-	--with-pkgversion=Parabola-${pkgver}-${pkgrel}-$CARCH \
-	--with-jaxp-drop-zip=${srcdir}/jaxp144_04.zip \
-  	--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \
-	--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
-	--with-abs-install-dir=${_jvmdir} \
-	--with-jdk-home="$JAVA_HOME"
-
-  # Java 7 compilers give more warnings.
-  find . -name '*.gmk' -or -name 'Makefile' | xargs sed -i 's/-Werror//'
-
-  LD_PRELOAD="" make 
-}
-
-package() {
-  if [ "${CARCH}" = "x86_64" ]; then
-    _arch=amd64
-  else
-    _arch=i586
-  fi
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd ${srcdir}/icedtea6-${_icedteaver}
-  install -m755 -d ${pkgdir}/${_jvmdir}/jre
-
-  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
-
-   # Install main files.
-  cp -a bin include lib ${pkgdir}/${_jvmdir}/ 
-  cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ 
-
-  mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \
-     ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src 
-  mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \
-     ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc 
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src
-
-  # set some variables
-  install -m755 -d ${pkgdir}/etc/profile.d
-  install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh 
-  install -m755 ${srcdir}/openjdk6.profile.csh ${pkgdir}/etc/profile.d/openjdk6.csh 
-  
-  # install license
-  install -Dm644 ${srcdir}//icedtea6-${_icedteaver}/openjdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/pcr/openjdk6/disable-openjdk-Werror.diff b/pcr/openjdk6/disable-openjdk-Werror.diff
deleted file mode 100644
index 2fbecaffe..000000000
--- a/pcr/openjdk6/disable-openjdk-Werror.diff
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -ru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
---- openjdk.orig/corba/make/common/Defs-linux.gmk	2013-03-09 18:42:00.271861055 +0100
-+++ openjdk/corba/make/common/Defs-linux.gmk	2013-03-09 18:42:10.322026218 +0100
-@@ -130,13 +130,6 @@
- GCC_WARNINGS	= -W -Wall $(GCC_STYLE) $(GCC_INHIBIT)
- 
- #
--# Treat compiler warnings as errors, if warnings not allowed
--#
--ifeq ($(COMPILER_WARNINGS_FATAL),true)
--  GCC_WARNINGS += -Werror
--endif
--
--#
- # Misc compiler options
- #
- ifeq ($(ARCH),ppc)
-diff -ru openjdk.orig/corba/make/common/shared/Defs-java.gmk openjdk/corba/make/common/shared/Defs-java.gmk
---- openjdk.orig/corba/make/common/shared/Defs-java.gmk	2013-03-09 18:42:00.271861055 +0100
-+++ openjdk/corba/make/common/shared/Defs-java.gmk	2013-03-09 18:42:10.342026563 +0100
-@@ -100,9 +100,6 @@
- ifeq ($(DEBUG_CLASSFILES),true)
-   JAVACFLAGS += -g
- endif
--ifeq ($(COMPILER_WARNINGS_FATAL), true)
--  JAVACFLAGS  += -Werror
--endif
- 
- NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
- JAVACFLAGS  += $(NO_PROPRIETARY_API_WARNINGS)
-@@ -173,12 +170,6 @@
- #   can bootstrap itself.
- #
- 
--# The javac options supplied to the boot javac is limited. This compiler
--#   should only be used to build the 'make/tools' sources, which are not
--#   class files that end up in the classes directory.
--ifeq ($(COMPILER_WARNINGS_FATAL), true)
--  BOOT_JAVACFLAGS  += -Werror
--endif
- BOOT_SOURCE_LANGUAGE_VERSION = 5
- BOOT_TARGET_CLASS_VERSION = 5
- BOOT_JAVACFLAGS  += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-diff -ru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
---- openjdk.orig/jdk/make/common/Defs-linux.gmk	2013-03-09 18:42:00.891871222 +0100
-+++ openjdk/jdk/make/common/Defs-linux.gmk	2013-03-09 18:42:10.342026563 +0100
-@@ -140,13 +140,6 @@
- GCC_WARNINGS	= -W -Wall $(GCC_STYLE) $(GCC_INHIBIT)
- 
- #
--# Treat compiler warnings as errors, if warnings not allowed
--#
--ifeq ($(COMPILER_WARNINGS_FATAL),true)
--  GCC_WARNINGS += -Werror
--endif
--
--#
- # Misc compiler options
- #
- ifeq ($(ARCH),ppc)
-diff -ru openjdk.orig/jdk/make/common/shared/Defs-java.gmk openjdk/jdk/make/common/shared/Defs-java.gmk
---- openjdk.orig/jdk/make/common/shared/Defs-java.gmk	2013-03-09 18:42:00.891871222 +0100
-+++ openjdk/jdk/make/common/shared/Defs-java.gmk	2013-03-09 18:42:10.342026563 +0100
-@@ -107,9 +107,6 @@
- ifeq ($(DEBUG_CLASSFILES),true)
-   JAVACFLAGS += -g
- endif
--ifeq ($(COMPILER_WARNINGS_FATAL), true)
--  JAVACFLAGS  += -Werror
--endif
- 
- # Add the source level (currently all source is 1.5, should this be 1.6?)
- LANGUAGE_VERSION = -source 1.5
-@@ -180,13 +177,6 @@
- #   can bootstrap itself.
- #
- 
--# The javac options supplied to the boot javac is limited. This compiler
--#   should only be used to build the 'make/tools' sources, which are not
--#   class files that end up in the classes directory.
--ifeq ($(COMPILER_WARNINGS_FATAL), true)
--  BOOT_JAVACFLAGS  += -Werror
--endif
--
- BOOT_SOURCE_LANGUAGE_VERSION = 5
- BOOT_TARGET_CLASS_VERSION = 5
- BOOT_JAVACFLAGS  += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-diff -ru openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
---- openjdk.orig/jdk/make/java/nio/Makefile	2013-03-09 18:42:00.881871058 +0100
-+++ openjdk/jdk/make/java/nio/Makefile	2013-03-09 18:42:10.342026563 +0100
-@@ -31,7 +31,7 @@
- PACKAGE = java.nio
- LIBRARY = nio
- PRODUCT = java
--OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
-+OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial
- include $(BUILDDIR)/common/Defs.gmk
- 
- NIO_SRC = $(SHARE_SRC)/classes/java/nio
-diff -ru openjdk.orig/jdk/make/java/sun_nio/Makefile openjdk/jdk/make/java/sun_nio/Makefile
---- openjdk.orig/jdk/make/java/sun_nio/Makefile	2013-03-09 18:42:00.871870894 +0100
-+++ openjdk/jdk/make/java/sun_nio/Makefile	2013-03-09 18:42:10.342026563 +0100
-@@ -31,7 +31,7 @@
- PACKAGE = sun.nio
- PRODUCT = sun
- 
--OTHER_JAVACFLAGS += -Xlint:serial -Werror
-+OTHER_JAVACFLAGS += -Xlint:serial
- include $(BUILDDIR)/common/Defs.gmk
- 
- #
-diff -ru openjdk.orig/jdk/make/sun/native2ascii/Makefile openjdk/jdk/make/sun/native2ascii/Makefile
---- openjdk.orig/jdk/make/sun/native2ascii/Makefile	2013-03-09 18:42:00.891871222 +0100
-+++ openjdk/jdk/make/sun/native2ascii/Makefile	2013-03-09 18:42:10.342026563 +0100
-@@ -30,7 +30,7 @@
- BUILDDIR = ../..
- PACKAGE = sun.tools.native2ascii
- PRODUCT = sun
--OTHER_JAVACFLAGS += -Xlint:serial -Werror
-+OTHER_JAVACFLAGS += -Xlint:serial
- include $(BUILDDIR)/common/Defs.gmk
- 
- #
-diff -ru openjdk.orig/jdk/make/sun/nio/Makefile openjdk/jdk/make/sun/nio/Makefile
---- openjdk.orig/jdk/make/sun/nio/Makefile	2013-03-09 18:42:00.891871222 +0100
-+++ openjdk/jdk/make/sun/nio/Makefile	2013-03-09 18:42:10.342026563 +0100
-@@ -35,7 +35,7 @@
- # This re-directs all the class files to a separate location
- CLASSDESTDIR = $(TEMPDIR)/classes
- 
--OTHER_JAVACFLAGS += -Xlint:serial -Werror
-+OTHER_JAVACFLAGS += -Xlint:serial
- include $(BUILDDIR)/common/Defs.gmk
- 
- #
-diff -ru openjdk.orig/langtools/make/build.properties openjdk/langtools/make/build.properties
---- openjdk.orig/langtools/make/build.properties	2013-03-09 18:42:00.311861690 +0100
-+++ openjdk/langtools/make/build.properties	2013-03-09 18:43:04.542923328 +0100
-@@ -68,7 +68,7 @@
- # set the following to -version to verify the versions of javac being used
- javac.version.opt =
- # in time, there should be no exceptions to -Xlint:all
--javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -Werror
-+javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial
- 
- # options for the <javadoc> task for javac
- javadoc.jls3.url=http://java.sun.com/docs/books/jls/
diff --git a/pcr/openjdk6/disable_Werror.diff b/pcr/openjdk6/disable_Werror.diff
deleted file mode 100644
index fa8887a10..000000000
--- a/pcr/openjdk6/disable_Werror.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- openjdk/hotspot/make/linux/makefiles/gcc.make	2012-06-07 16:30:51.000000000 +0200
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make.new	2012-06-14 15:32:44.967695139 +0200
-@@ -150,7 +150,7 @@
- endif
- 
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
-+#WARNINGS_ARE_ERRORS = -Werror
- 
- # Except for a few acceptable ones
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
diff --git a/pcr/openjdk6/ecj-icedtea.patch b/pcr/openjdk6/ecj-icedtea.patch
deleted file mode 100644
index 1af1365bf..000000000
--- a/pcr/openjdk6/ecj-icedtea.patch
+++ /dev/null
@@ -1,893 +0,0 @@
-diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile openjdk-ecj/corba/make/com/sun/corba/se/Makefile
---- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile	2010-05-26 09:31:18.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile	2012-01-18 21:43:04.134185695 +0000
-@@ -42,7 +42,7 @@
- # the rmic iiop backend needs some classes that are part of the impl/util
- # package.  These classes use log wrappers, so they must be built after
- # pept and before rmi.
--SUBDIRS = sources pept corespi core spi impl rmi
-+SUBDIRS = org pept corespi core spi impl rmi
- all build clean clobber::
- 	$(SUBDIRS-loop)
- 
-diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile
---- openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile	2012-01-18 21:43:04.146185899 +0000
-@@ -0,0 +1,38 @@
-+#
-+# Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# This code is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License version 2 only, as
-+# published by the Free Software Foundation.  Sun designates this
-+# particular file as subject to the "Classpath" exception as provided
-+# by Sun in the LICENSE file that accompanied this code.
-+#
-+# This code 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
-+# version 2 for more details (a copy is included in the LICENSE file that
-+# accompanied this code).
-+#
-+# You should have received a copy of the GNU General Public License version
-+# 2 along with this work; if not, write to the Free Software Foundation,
-+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+#
-+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+# CA 95054 USA or visit www.sun.com if you need additional information or
-+# have any questions.
-+#
-+
-+BUILDDIR = ../../../../..
-+PACKAGE = com.sun.corba.se
-+PRODUCT = org
-+
-+include $(BUILDDIR)/common/Defs.gmk
-+
-+FILES_java=\
-+	com/sun/corba/se/org/omg/CORBA/ORB.java
-+
-+#
-+# Include
-+#
-+include $(BUILDDIR)/common/Classes.gmk
-diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/sources/Makefile openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile
---- openjdk-ecj.orig/corba/make/com/sun/corba/se/sources/Makefile	2010-05-26 09:31:18.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile	1970-01-01 01:00:00.000000000 +0100
-@@ -1,224 +0,0 @@
--#
--# Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
--# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--#
--# This code is free software; you can redistribute it and/or modify it
--# under the terms of the GNU General Public License version 2 only, as
--# published by the Free Software Foundation.  Oracle designates this
--# particular file as subject to the "Classpath" exception as provided
--# by Oracle in the LICENSE file that accompanied this code.
--#
--# This code 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
--# version 2 for more details (a copy is included in the LICENSE file that
--# accompanied this code).
--#
--# You should have received a copy of the GNU General Public License version
--# 2 along with this work; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--#
--# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--# or visit www.oracle.com if you need additional information or have any
--# questions.
--#
--
--BUILDDIR = ../../../../..
--
--PACKAGE = com.sun.corba.se
--PRODUCT = org
--
--include $(BUILDDIR)/common/Defs.gmk
--
--#
--# Rules
--#
--all: build
--
--build: portableactivation.idl.compile logwrapper.generate logresource.generate 
--
--clean clobber:: portableactivation.idl.clean
--
--#
--# Files
--#
--CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
--include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_PortableActivationIDL.jmk
--include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk
--
--FILES_java += com/sun/corba/se/org/omg/CORBA/ORB.java
--
--#
--# Dirs
--#
--
--SRC_DIR = $(SHARE_SRC)/classes
--CORBA_IDL_DIR = $(SRC_DIR)/org/omg/PortableServer
--PI_IDL_DIR = $(SRC_DIR)/org/omg/PortableInterceptor
--
--ACTIVATIONFILEDIR         = $(GENSRCDIR)/com/sun/corba/se/spi/activation
--PORTABLEACTIVATIONFILEDIR = $(GENSRCDIR)/com/sun/corba/se/PortableActivationIDL
--LOG_GENDIRECTORY          = $(GENSRCDIR)/com/sun/corba/se/impl/logging
--
--#
--# IDLs
--#
--
--ACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/spi/activation/activation.idl
--PORTABLEACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/PortableActivationIDL/activation.idl
--
--
--#
--# .mc files
--#
--ACTIVATION.MC   = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Activation.mc
--IOR.MC          = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/IOR.mc
--INTERCEPTORS.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Interceptors.mc
--NAMING.MC       = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Naming.mc
--OMG.MC          = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/OMG.mc
--ORBUTIL.MC      = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/ORBUtil.mc
--POA.MC          = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/POA.mc
--UTIL.MC         = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Util.mc
--
--MC_GENERATE_CLASS = make-class
--MC_GENERATE_LOG_RB = make-resource 
--
--JSCHEME_GENERATE_CLASS = $(BOOT_JAVA_CMD) com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_CLASS) 
--JSCHEME_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_LOG_RB) 
--
--
--#
--# Activation 
--#
--
--ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
--
--$(ACTIVATIONFILES): $(ACTIVATION.IDL)
--	$(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL)
--
--activation.idl.compile: $(ACTIVATIONFILES)
--
--activation.idl.clean:
--	$(RM) -f $(ACTIVATIONFILES)
--
--#
--# PortableActivationIDL
--#
--
--PORTABLEACTIVATIONFILES = $(com_sun_corba_se_PortableActivationIDL_java:%=$(GENSRCDIR)/%)
--
--PORTABLEACTIVATION_INCLUDES = -i $(CORBA_IDL_DIR) -i $(PI_IDL_DIR)
--
--PORTABLEACTIVATION_PKG_PREFIXES = -pkgPrefix PortableInterceptor org.omg \
--    -pkgPrefix PortableActivationIDL com.sun.corba.se \
--    -pkgPrefix Dynamic org.omg \
--    -pkgPrefix IOP org.omg
--
--# REVISIT: remove -oldImplBase
--$(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL)
--	$(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL)
--
--portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
--
--portableactivation.idl.clean:
--	$(RM) -f $(PORTABLEACTIVATIONFILES)
--
--#
--# Generate LogWrapper classes
--#
--logwrapper.generate: \
--	$(LOG_GENDIRECTORY)/ActivationSystemException.java \
--	$(LOG_GENDIRECTORY)/IORSystemException.java \
--	$(LOG_GENDIRECTORY)/InterceptorsSystemException.java \
--	$(LOG_GENDIRECTORY)/NamingSystemException.java \
--	$(LOG_GENDIRECTORY)/OMGSystemException.java \
--	$(LOG_GENDIRECTORY)/ORBUtilSystemException.java \
--	$(LOG_GENDIRECTORY)/POASystemException.java \
--	$(LOG_GENDIRECTORY)/UtilSystemException.java
--
--$(LOG_GENDIRECTORY)/ActivationSystemException.java : $(ACTIVATION.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/IORSystemException.java : $(IOR.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(IOR.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/InterceptorsSystemException.java : $(INTERCEPTORS.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/NamingSystemException.java : $(NAMING.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(NAMING.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/OMGSystemException.java : $(OMG.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(OMG.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/ORBUtilSystemException.java : $(ORBUTIL.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/POASystemException.java : $(POA.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(POA.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/UtilSystemException.java : $(UTIL.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(UTIL.MC) $(LOG_GENDIRECTORY)
--
--logresource.generate: $(LOG_GENDIRECTORY)/LogStrings.properties
--
--$(LOG_GENDIRECTORY)/LogStrings.properties: \
--		$(LOG_GENDIRECTORY)/ActivationSystemException.resource \
--		$(LOG_GENDIRECTORY)/IORSystemException.resource \
--		$(LOG_GENDIRECTORY)/InterceptorsSystemException.resource \
--		$(LOG_GENDIRECTORY)/NamingSystemException.resource \
--		$(LOG_GENDIRECTORY)/OMGSystemException.resource \
--		$(LOG_GENDIRECTORY)/ORBUtilSystemException.resource \
--		$(LOG_GENDIRECTORY)/POASystemException.resource \
--		$(LOG_GENDIRECTORY)/UtilSystemException.resource
--	$(CAT) $(LOG_GENDIRECTORY)/*.resource > $(LOG_GENDIRECTORY)/LogStrings.properties
--
--$(LOG_GENDIRECTORY)/ActivationSystemException.resource : $(ACTIVATION.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/IORSystemException.resource : $(IOR.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(IOR.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/InterceptorsSystemException.resource : $(INTERCEPTORS.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/NamingSystemException.resource : $(NAMING.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(NAMING.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/OMGSystemException.resource : $(OMG.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(OMG.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/ORBUtilSystemException.resource : $(ORBUTIL.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/POASystemException.resource : $(POA.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(POA.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/UtilSystemException.resource : $(UTIL.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(UTIL.MC) $(LOG_GENDIRECTORY)
--
--
--.PHONY: all build clean clobber \
--	activation.idl.compile activation.idl.clean \
--	portableactivation.idl.compile portableactivation.idl.clean
--
--#
--# Include
--#
--include $(BUILDDIR)/common/Rules.gmk
-diff -Nru openjdk-ecj.orig/corba/make/common/Defs.gmk openjdk-ecj/corba/make/common/Defs.gmk
---- openjdk-ecj.orig/corba/make/common/Defs.gmk	2011-01-10 21:21:55.000000000 +0000
-+++ openjdk-ecj/corba/make/common/Defs.gmk	2012-01-18 21:43:04.146185899 +0000
-@@ -53,6 +53,13 @@
- 
- _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
- 
-+
-+ifdef ALT_LANGTOOLS_DIST
-+  LANGTOOLS_DIST :=$(call FullPath,$(ALT_LANGTOOLS_DIST))
-+else
-+  LANGTOOLS_DIST =
-+endif 
-+
- #
- # Get platform definitions
- #
-@@ -118,8 +125,6 @@
- # for build tool jar files
- BUILDTOOLJARDIR     = $(OUTPUTDIR)/btjars
- ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars
--# for generated java source files
--GENSRCDIR           = $(OUTPUTDIR)/gensrc
- # for generated C source files (not javah)
- GENNATIVESRCDIR     = $(OUTPUTDIR)/gennativesrc
- # for imported source files
-@@ -220,7 +225,7 @@
- # We define an intermediate variable for Java files because
- # we use its value later to help define $SOURCEPATH
- 
--VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
-+VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
- VPATH.java = $(VPATH0.java)
- vpath %.java $(VPATH.java)
- vpath %.class $(CLASSBINDIR)
-diff -Nru openjdk-ecj.orig/corba/make/common/Defs-linux.gmk openjdk-ecj/corba/make/common/Defs-linux.gmk
---- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk	2012-01-18 16:50:50.977002556 +0000
-+++ openjdk-ecj/corba/make/common/Defs-linux.gmk	2012-01-18 21:43:04.146185899 +0000
-@@ -271,7 +271,7 @@
- #
- VM_NAME         = server
- JVMLIB          = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
--JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
-+JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -L$(dir $(shell $(if $(GCJ),$(GCJ),$(subst gcc,gcj,$(CC))) --print-file-name=libgcj.so)) -lgcj $(JVMLIB)
- 
- #
- # We want to privatize JVM symbols on Solaris. This is so the user can
-diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk
---- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk	2012-01-18 16:50:57.569109033 +0000
-+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk	2012-01-18 21:43:04.150185964 +0000
-@@ -116,35 +116,17 @@
- CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
- JAVACFLAGS  += $(CLASS_VERSION)
- JAVACFLAGS  += -encoding ascii
--JAVACFLAGS  += -classpath $(BOOTDIR)/lib/tools.jar
-+JAVACFLAGS  += -classpath $(LANGTOOLS_DIST)/lib/classes.jar
- JAVACFLAGS  += $(OTHER_JAVACFLAGS)
- 
- # Needed for javah
--JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
-+JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)
- 
--# Langtools
--ifdef LANGTOOLS_DIST
--  JAVAC_JAR   = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
--  JAVAH_JAR   = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
--  JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
--  DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
--  JAVAC_CMD   = $(BOOT_JAVA_CMD) \
--		"-Xbootclasspath/p:$(JAVAC_JAR)" \
--		-jar $(JAVAC_JAR) $(JAVACFLAGS)
--  JAVAH_CMD   = $(BOOT_JAVA_CMD) \
--		"-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)"  \
--		-jar $(JAVAH_JAR) $(JAVAHFLAGS)
--  JAVADOC_CMD = $(BOOT_JAVA_CMD) \
--		"-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
--		-jar $(JAVADOC_JAR)
--else
--  # If no explicit tools, use boot tools (add VM flags in this case)
--  JAVAC_CMD     = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
-+# If no explicit tools, use boot tools (add VM flags in this case)
-+JAVAC_CMD     = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
- 		  $(JAVACFLAGS)
--  JAVAH_CMD     = $(JAVA_TOOLS_DIR)/javah \
-+JAVAH_CMD     = $(JAVA_TOOLS_DIR)/javah \
- 		  $(JAVAHFLAGS)
--  JAVADOC_CMD   = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
--endif
- 
- # Override of what javac to use (see deploy workspace)
- ifdef JAVAC
-diff -Nru openjdk-ecj.orig/corba/make/org/omg/sources/Makefile openjdk-ecj/corba/make/org/omg/sources/Makefile
---- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile	2010-05-26 09:31:18.000000000 +0100
-+++ openjdk-ecj/corba/make/org/omg/sources/Makefile	2012-01-18 21:43:04.150185964 +0000
-@@ -93,8 +93,6 @@
- POAHELHOLFILES =    $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
- 
- $(POAGENERATEDFILES):: $(POA.IDL)
--	$(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -corba 3.0 -fall -pkgPrefix PortableServer org.omg $(POA.IDL)
--	$(RM) -r $(POAHELHOLFILES)
- 
- poa.compile: $(POAGENERATEDFILES)
- 
-@@ -110,10 +108,6 @@
- 
- # Generating and deleting unused files to reduce images size
- $(DYNANYFILES): $(DYNAMIC_ANY.IDL)
--	$(IDLJ) -td "$(GENSRCDIR)" $(DYNANY_IDLJ_FLAGS) $(DYNAMIC_ANY.IDL)
--	$(RM) $(DYNANY_DIR)/*POA*
--	$(RM) $(DYNANY_DIR)/*Holder*
--	$(RM) $(DYNANYDELETEFILES)
- 
- dynany.compile: $(DYNANYFILES)
- 
-@@ -125,12 +119,6 @@
- TR_IDLJ_FLAGS =-i "$(SRC_DIR)/org/omg/PortableInterceptor" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/CosTransactions"
- 
- $(TRGENERATEDFILES):: $(COSTRANSACTIONS.IDL) $(COSTSINTEROP.IDL)
--	$(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTransactions org.omg $(COSTRANSACTIONS.IDL)
--	$(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTSInteroperation org.omg $(COSTSINTEROP.IDL)
--#	$(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
--#	$(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
--#	$(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
--#	$(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
- 
- tr.compile: $(TRGENERATEDFILES)
- 
-@@ -144,7 +132,6 @@
- # _NamingContextImplBase.java and _BindingIteratorImplBase.java files
- # to GENSRC directory. Note that these two classes are deprecated.
- $(NSGENERATEDFILES): $(NAMESERVICE.IDL)
--	$(IDLJ) -td "$(GENSRCDIR)" -i $(NAMESERVICEDIR) -fall -pkgPrefix CosNaming org.omg $(NAMESERVICE.IDL)
- 
- ns.compile: $(NSGENERATEDFILES)
- 
-@@ -156,8 +143,6 @@
- IOPDELETEFILES =    $(IOP_TO_DELETE_FILES:%=$(GENSRCDIR)/%)
- 
- $(IOPGENERATEDFILES):: $(IOP.IDL)
--	$(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -D CORBA3 -pkgPrefix IOP org.omg $(IOP.IDL)
--	$(RM) -r $(IOPDELETEFILES)
- 
- iop.compile: $(IOPGENERATEDFILES)
- 
-@@ -169,8 +154,6 @@
- CORBAXDUPLICATEFILES = $(CORBA_DUPLICATE_java:%=$(GENSRCDIR)/%)
- 
- $(CORBAXGENERATEDFILES):: $(CORBAX.IDL)
--	$(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 $(CORBAX.IDL)
--	$(RM) $(CORBAXDUPLICATEFILES)
- 
- corbax.compile: $(CORBAXGENERATEDFILES)
- 
-@@ -181,7 +164,6 @@
- MESSAGINGGENERATEDFILES = $(Messaging_java:%=$(GENSRCDIR)/%)
- 
- $(MESSAGINGGENERATEDFILES):: $(MESSAGING.IDL)
--	$(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -pkgPrefix Messaging org.omg $(MESSAGING.IDL)
- 
- messaging.compile: $(MESSAGINGGENERATEDFILES)
- 
-@@ -195,8 +177,6 @@
- PIHELHOLFILES = $(PI_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
- 
- $(PIGENERATEDFILES):: $(INTERCEPTORS.IDL)
--	$(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -pkgPrefix PortableInterceptor org.omg -pkgPrefix Dynamic org.omg -pkgPrefix IOP org.omg -corba 3.0 -D CORBA3 $(INTERCEPTORS.IDL)
--	$(RM) $(PIHELHOLFILES)
- 
- pi.compile: $(PIGENERATEDFILES)
- 
-diff -Nru openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile
---- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile	2010-05-26 09:31:18.000000000 +0100
-+++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile	2012-01-18 21:43:04.150185964 +0000
-@@ -172,7 +172,6 @@
- ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
- 
- $(ACTIVATIONFILES): $(ACTIVATION.IDL)
--	$(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL)
- 
- activation.idl.compile: $(ACTIVATIONFILES)
- 
-@@ -195,7 +194,6 @@
- 
- # REVISIT: remove -oldImplBase
- $(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL)
--	$(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL)
- 
- portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
- 
-diff -Nru openjdk-ecj.orig/jaxp/build.xml openjdk-ecj/jaxp/build.xml
---- openjdk-ecj.orig/jaxp/build.xml	2011-01-10 21:21:59.000000000 +0000
-+++ openjdk-ecj/jaxp/build.xml	2012-01-18 21:43:04.150185964 +0000
-@@ -131,7 +131,8 @@
-              memoryMaximumSize="${javac.memoryMaximumSize}"
-              source="${javac.source}"
- 	     debug="${javac.debug}"
--             target="${javac.target}">
-+             target="${javac.target}"
-+	     executable="${jdk.home}/bin/javac">
-             <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
-             <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
-             <src refid="src.dir.id"/>
-diff -Nru openjdk-ecj.orig/jaxws/build.xml openjdk-ecj/jaxws/build.xml
---- openjdk-ecj.orig/jaxws/build.xml	2011-01-10 21:22:02.000000000 +0000
-+++ openjdk-ecj/jaxws/build.xml	2012-01-18 21:43:04.150185964 +0000
-@@ -131,7 +131,8 @@
-              memoryMaximumSize="${javac.memoryMaximumSize}"
-              source="${javac.source}"
- 	     debug="${javac.debug}"
--             target="${javac.target}">
-+             target="${javac.target}"
-+	     executable="${jdk.home}/bin/javac">
-             <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
-             <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
-             <src refid="src.dir.id"/>
-diff -Nru openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk openjdk-ecj/jdk/make/common/BuildToolJar.gmk
---- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk	2011-01-07 21:32:51.000000000 +0000
-+++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk	2012-01-18 21:43:04.150185964 +0000
-@@ -43,7 +43,8 @@
- 	@$(prep-target)
- 	@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
- 	$(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \
--	    -sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE)
-+	    -sourcepath $(BUILDTOOL_SOURCE_ROOT) -classpath $(ICEDTEA_RT) \
-+	    $(BUILDTOOL_MAIN_SOURCE_FILE)
- 	$(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
- 	    -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
- 	    $(JAR_JFLAGS) || $(RM) $@
-diff -Nru openjdk-ecj.orig/jdk/make/common/Release.gmk openjdk-ecj/jdk/make/common/Release.gmk
---- openjdk-ecj.orig/jdk/make/common/Release.gmk	2012-01-18 16:51:03.177199616 +0000
-+++ openjdk-ecj/jdk/make/common/Release.gmk	2012-01-18 21:43:04.150185964 +0000
-@@ -649,10 +649,23 @@
- $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
- 	$(prep-target)
- 	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
--$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
-+$(RESOURCES_JAR): \
-+    $(if $(JAR_KNOWS_ATFILE),$(RES_JAR_FILELIST),$(RES_JAR_ARGLIST)) \
-+    $(JAR_MANIFEST_FILE)
- 	$(prep-target)
-+ifneq (,$(JAR_KNOWS_ATFILE))
-+	(cd $(CLASSBINDIR) && \
- 	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
--	    @$(RES_JAR_ARGLIST) $(JAR_JFLAGS)
-+	    $(JAR_JFLAGS) @$(RES_JAR_FILELIST))
-+else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
-+	(cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \
-+	$(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
-+	    $(JAR_JFLAGS))
-+else
-+	(cd $(CLASSBINDIR) && \
-+	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
-+	    $(JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`)
-+endif
- 	@$(java-vm-cleanup)
- 
- # Create jsse.jar containing SunJSSE implementation classes
-@@ -708,10 +721,22 @@
- $(RT_JAR_ARGLIST): $(RT_JAR_FILELIST)
- 	$(prep-target)
- 	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
--$(RT_JAR): $(RT_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
-+$(RT_JAR): $(if $(JAR_KNOWS_ATFILE),$(RT_JAR_FILELIST),$(RT_JAR_ARGLIST)) \
-+    $(JAR_MANIFEST_FILE)
- 	$(prep-target)
-+ifneq (,$(JAR_KNOWS_ATFILE))
-+	(cd $(CLASSBINDIR) && \
- 	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
--	    @$(RT_JAR_ARGLIST) $(JAR_JFLAGS)
-+	    $(JAR_JFLAGS) @$(RT_JAR_FILELIST))
-+else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
-+	(cd $(CLASSBINDIR) && $(CAT) $(RT_JAR_FILELIST) | \
-+	$(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
-+	    $(JAR_JFLAGS))
-+else
-+	(cd $(CLASSBINDIR) && \
-+	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
-+	    $(JAR_JFLAGS) `$(CAT) $(RT_JAR_FILELIST)`)
-+endif
- 	@$(java-vm-cleanup)
- 
- # Meta-index construction to make core class loaders lazier
-@@ -942,19 +967,6 @@
- 	@$(java-vm-cleanup)
- 	$(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar
- 	@#
--	@# lib/ct.sym
--	@#
--	$(MKDIR) -p $(OUTPUTDIR)/symbols/META-INF/sym
--	$(JAVAC_CMD) -XDprocess.packages -proc:only \
--	    -processor com.sun.tools.javac.sym.CreateSymbols \
--	    -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \
--	    -Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
--	    $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS)
--	$(BOOT_JAR_CMD) c0f $(LIBDIR)/ct.sym \
--	    -C $(OUTPUTDIR)/symbols META-INF $(JAR_JFLAGS)
--	@$(java-vm-cleanup)
--	$(CP) $(LIBDIR)/ct.sym $(JDK_IMAGE_DIR)/lib/ct.sym
--	@#
- 	@# CORBA supported orb.idl and ir.idl should be copied to lib
- 	@#
- 	$(CP) $(LIBDIR)/orb.idl $(JDK_IMAGE_DIR)/lib/orb.idl
-@@ -1023,16 +1035,6 @@
- 	$(CP) $(PLATFORM_SRC)/bin/java_md.h $(JDK_IMAGE_DIR)/src/launcher
- 	$(CD) $(JDK_IMAGE_DIR)/src && $(ZIPEXE) -qr ../src.zip *
- 	$(RM) -r $(JDK_IMAGE_DIR)/src
--	@#
--	@# demo, include
--	@#
--	$(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR)
--	$(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR)
--	$(CP) -r $(INCLUDEDIR) $(JDK_IMAGE_DIR)
--	@#
--	@# Swing BeanInfo generation
--	@#
--	$(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans
- ifneq ($(PLATFORM), windows)
- 	$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
- endif # !windows
-diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk openjdk-ecj/jdk/make/common/Rules.gmk
---- openjdk-ecj.orig/jdk/make/common/Rules.gmk	2011-01-07 21:32:51.000000000 +0000
-+++ openjdk-ecj/jdk/make/common/Rules.gmk	2012-01-18 21:43:04.150185964 +0000
-@@ -235,8 +235,9 @@
- 	  $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
- 	  $(CAT) $(JAVA_SOURCE_LIST); \
- 	  $(ECHO) "# Running javac:"; \
--	  $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
--	  $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+	   $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" \
-+         -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+         $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
- 	fi
- 	@$(java-vm-cleanup)
- 
-@@ -302,6 +303,8 @@
- 	$(JAVAH_CMD) -d $(CLASSHDRDIR)/ \
- 		$(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner))
- 	@$(java-vm-cleanup)
-+	-mv $(CLASSHDRDIR)/java_lang_ClassLoader\$$NativeLibrary.h \
-+	  $(CLASSHDRDIR)/java_lang_ClassLoader_NativeLibrary.h
- 	@$(TOUCH) $@
- 
- classheaders.clean:
-diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk
---- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk	2012-01-18 16:50:57.569109033 +0000
-+++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk	2012-01-18 21:43:04.150185964 +0000
-@@ -124,34 +124,18 @@
- JAVACFLAGS  += $(OTHER_JAVACFLAGS)
- 
- # Needed for javah
--JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
-+JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(CLASSDESTDIR)
- 
- # Needed for JAVADOC and BOOT_JAVACFLAGS
- NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
- 
- # Langtools
--ifdef LANGTOOLS_DIST
--  JAVAC_JAR   = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
--  JAVAH_JAR   = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
--  JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
--  DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
--  JAVAC_CMD   = $(BOOT_JAVA_CMD) \
--		"-Xbootclasspath/p:$(JAVAC_JAR)" \
--		-jar $(JAVAC_JAR) $(JAVACFLAGS)
--  JAVAH_CMD   = $(BOOT_JAVA_CMD) \
--		"-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)"  \
--		-jar $(JAVAH_JAR) $(JAVAHFLAGS)
--  JAVADOC_CMD = $(BOOT_JAVA_CMD) \
--		"-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
--		-jar $(JAVADOC_JAR)
--else
--  # If no explicit tools, use boot tools (add VM flags in this case)
--  JAVAC_CMD     = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
-+# If no explicit tools, use boot tools (add VM flags in this case)
-+JAVAC_CMD     = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
- 		  $(JAVACFLAGS)
--  JAVAH_CMD     = $(JAVA_TOOLS_DIR)/javah \
-+JAVAH_CMD     = $(JAVA_TOOLS_DIR)/javah \
- 		  $(JAVAHFLAGS)
--  JAVADOC_CMD   = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
--endif
-+JAVADOC_CMD   = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
- 
- # Override of what javac to use (see deploy workspace)
- ifdef JAVAC
-diff -Nru openjdk-ecj.orig/jdk/make/java/nio/Makefile openjdk-ecj/jdk/make/java/nio/Makefile
---- openjdk-ecj.orig/jdk/make/java/nio/Makefile	2012-01-18 16:50:50.576996095 +0000
-+++ openjdk-ecj/jdk/make/java/nio/Makefile	2012-01-18 21:43:04.150185964 +0000
-@@ -31,7 +31,7 @@
- PACKAGE = java.nio
- LIBRARY = nio
- PRODUCT = java
--OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial
-+OTHER_JAVACFLAGS += -Xlint:serial
- include $(BUILDDIR)/common/Defs.gmk
- 
- NIO_SRC = $(SHARE_SRC)/classes/java/nio
-diff -Nru openjdk-ecj.orig/jdk/make/java/text/Makefile openjdk-ecj/jdk/make/java/text/Makefile
---- openjdk-ecj.orig/jdk/make/java/text/Makefile	2011-01-07 21:32:51.000000000 +0000
-+++ openjdk-ecj/jdk/make/java/text/Makefile	2012-01-18 21:43:04.150185964 +0000
-@@ -80,8 +80,8 @@
- 		-sourcepath $(TEXT_SRCDIR) \
- 		$(TEXT_SOURCES)
- 	$(MKDIR) -p  $(TEXT_CLASSDIR)
--	$(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
--		-jar $(GENERATEBREAKITERATORDATA_JARFILE) \
-+	$(BOOT_JAVA_CMD) -cp $(TEXT_CLASSES):$(GENERATEBREAKITERATORDATA_JARFILE):$(ICEDTEA_CLS_DIR) \
-+		build.tools.generatebreakiteratordata.GenerateBreakIteratorData \
- 		-o $(TEXT_CLASSDIR) \
- 		-spec $(UNICODEDATA)/UnicodeData.txt
- 	@$(java-vm-cleanup)
-diff -Nru openjdk-ecj.orig/jdk/make/Makefile openjdk-ecj/jdk/make/Makefile
---- openjdk-ecj.orig/jdk/make/Makefile	2011-01-07 21:32:51.000000000 +0000
-+++ openjdk-ecj/jdk/make/Makefile	2012-01-18 21:43:04.150185964 +0000
-@@ -247,7 +247,7 @@
- 
- all build:: sanity-all post-sanity-all
- 
--SUBDIRS    = tools java javax org sun sunw com jpda mkdemo mksample launchers
-+SUBDIRS    = tools java javax org sun sunw com jpda mksample launchers
- all build::
- 	$(SUBDIRS-loop)
- 
-diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/Makefile openjdk-ecj/jdk/make/sun/awt/Makefile
---- openjdk-ecj.orig/jdk/make/sun/awt/Makefile	2012-01-18 16:50:52.313024135 +0000
-+++ openjdk-ecj/jdk/make/sun/awt/Makefile	2012-01-18 21:43:04.150185964 +0000
-@@ -438,10 +438,9 @@
- COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
- 
- $(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \
--    $(COMPILEFONTCONFIG_JARFILE)
--	$(prep-target)
--	$(BOOT_JAVA_CMD) -jar $(COMPILEFONTCONFIG_JARFILE) $< $@
--	$(CHMOD) 444 $(@)
-+	$(COMPILEFONTCONFIG_JARFILE)
-+	$(CP) -f $(GENSRCDIR)/fontconfig/* $(LIBDIR)
-+	$(CHMOD) 444 $(LIBDIR)/*.bfc
- 	@$(java-vm-cleanup)
- 
- fontconfigs.clean :
-diff -Nru openjdk-ecj.orig/jdk/make/sun/javazic/Makefile openjdk-ecj/jdk/make/sun/javazic/Makefile
---- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile	2011-01-07 21:32:51.000000000 +0000
-+++ openjdk-ecj/jdk/make/sun/javazic/Makefile	2012-01-18 21:43:04.150185964 +0000
-@@ -62,7 +62,8 @@
- $(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
- 	$(RM) -r $(@D)
- 	$(prep-target)
--	$(BOOT_JAVA_CMD) -jar $(BUILDTOOLJARDIR)/javazic.jar -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES)
-+	$(BOOT_JAVA_CMD) -cp $(ICEDTEA_CLS_DIR):$(BUILDTOOLJARDIR)/javazic.jar \
-+		build.tools.javazic.Main -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES)
- 	@$(java-vm-cleanup)
- 
- $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE)
-diff -Nru openjdk-ecj.orig/jdk/make/sun/text/Makefile openjdk-ecj/jdk/make/sun/text/Makefile
---- openjdk-ecj.orig/jdk/make/sun/text/Makefile	2011-01-07 21:32:51.000000000 +0000
-+++ openjdk-ecj/jdk/make/sun/text/Makefile	2012-01-18 21:43:04.150185964 +0000
-@@ -85,8 +85,9 @@
- 	$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
- 		-sourcepath $(TEXT_SRCDIR) \
- 		$(BIRULES) $(BIINFO)
--	$(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
--		-jar $(GENERATEBREAKITERATORDATA_JARFILE) \
-+	$(BOOT_JAVA_CMD)  \
-+		-cp $(TEXT_CLASSES):$(ICEDTEA_CLS_DIR):$(GENERATEBREAKITERATORDATA_JARFILE) \
-+		build.tools.generatebreakiteratordata.GenerateBreakIteratorData \
- 		-o $(CLASSDESTDIR)/sun/text/resources \
- 		-spec $(UNICODEDATA)/UnicodeData.txt \
- 		-language th
-diff -Nru openjdk-ecj.orig/jdk/make/sun/xawt/Makefile openjdk-ecj/jdk/make/sun/xawt/Makefile
---- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile	2012-01-18 16:51:03.393203105 +0000
-+++ openjdk-ecj/jdk/make/sun/xawt/Makefile	2012-01-18 21:43:04.150185964 +0000
-@@ -301,11 +301,7 @@
- 
- TEMPDIR_CLASSES = $(TEMPDIR)/classes
- 
--$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java
--	@$(prep-target)
--	$(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $<
--
--$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS)
-+$(TEMPDIR)/.gen_icons: $(ICONS)
- 	$(prep-target)
- 	for i in $(ICONS); do \
-             filename=`basename $$i`; \
-@@ -315,22 +311,14 @@
- 	    $(ECHO) "package sun.awt.X11;" >> $$classname ; \
- 	    $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \
- 	    $(ECHO) "public static int[] $$name = { " >> $$classname;  \
--	    $(CAT) $$i | \
--	      $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES)  \
--		-Dawt.toolkit=sun.awt.motif.MToolkit \
--		-Djava.awt.headless=true \
--		sun.awt.X11.ToBin >> $$classname; \
-+	    $(ECHO) "0,0" >> $$classname ;  \
- 	    $(ECHO) "}; }" >> $$classname;  \
--            classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \
-+	    classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \
- 	    $(RM) $$classname; \
- 	    $(ECHO) "package sun.awt.X11;" >> $$classname ; \
- 	    $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \
- 	    $(ECHO) "public static long[] $$name = { " >> $$classname;  \
--	    $(CAT) $$i | \
--	      $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES)  \
--		-Dawt.toolkit=sun.awt.motif.MToolkit \
--		-Djava.awt.headless=true \
--		sun.awt.X11.ToBin >> $$classname; \
-+	    $(ECHO) "0,0" >> $$classname ; \
- 	    $(ECHO) "}; }" >> $$classname;  \
- 	done
- 	$(TOUCH) $@
-diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2011-01-07 21:32:51.000000000 +0000
-+++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2012-01-18 21:43:04.150185964 +0000
-@@ -647,9 +647,6 @@
-             throws FileNotFoundException, IOException {
-         BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
-         PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(theOutputFileName)));
--        out.println(commentStart +
--            " This file was generated AUTOMATICALLY from a template file " +
--            new java.util.Date() + commentEnd);
-         int marklen = commandMarker.length();
-         LOOP: while(true) {
-             try {
-@@ -876,7 +873,6 @@
-         // liu : Add a comment showing the source of this table
-         result.append(commentStart + " The following tables and code generated using:" +
-                   commentEnd + "\n  ");
--        result.append(commentStart + ' ' + commandLineDescription + commentEnd + "\n  ");
- 
-                 if (plane == 0 && bLatin1 == false) {
-             genCaseMapTableDeclaration(result);
-diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java openjdk-ecj/jdk/src/share/classes/java/lang/Double.java
---- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java	2011-01-07 21:32:53.000000000 +0000
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java	2012-01-18 21:43:04.150185964 +0000
-@@ -76,7 +76,7 @@
-      * {@code 0x1.fffffffffffffP+1023} and also equal to
-      * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
-      */
--    public static final double MAX_VALUE = 0x1.fffffffffffffP+1023; // 1.7976931348623157e+308
-+    public static final double MAX_VALUE = 1.7976931348623157e+308;
- 
-     /**
-      * A constant holding the smallest positive normal value of type
-@@ -86,7 +86,7 @@
-      *
-      * @since 1.6
-      */
--    public static final double MIN_NORMAL = 0x1.0p-1022; // 2.2250738585072014E-308
-+    public static final double MIN_NORMAL = 2.2250738585072014E-308;
- 
-     /**
-      * A constant holding the smallest positive nonzero value of type
-@@ -95,7 +95,7 @@
-      * {@code 0x0.0000000000001P-1022} and also equal to
-      * {@code Double.longBitsToDouble(0x1L)}.
-      */
--    public static final double MIN_VALUE = 0x0.0000000000001P-1022; // 4.9e-324
-+    public static final double MIN_VALUE = 4.9e-324;
- 
-     /**
-      * Maximum exponent a finite {@code double} variable may have.
-diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java openjdk-ecj/jdk/src/share/classes/java/lang/Float.java
---- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java	2011-01-07 21:32:53.000000000 +0000
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java	2012-01-18 21:43:04.150185964 +0000
-@@ -76,7 +76,7 @@
-      * {@code 0x1.fffffeP+127f} and also equal to
-      * {@code Float.intBitsToFloat(0x7f7fffff)}.
-      */
--    public static final float MAX_VALUE = 0x1.fffffeP+127f; // 3.4028235e+38f
-+    public static final float MAX_VALUE = 3.4028235e+38f;
- 
-     /**
-      * A constant holding the smallest positive normal value of type
-@@ -86,7 +86,7 @@
-      *
-      * @since 1.6
-      */
--    public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f
-+    public static final float MIN_NORMAL = 1.17549435E-38f;
- 
-     /**
-      * A constant holding the smallest positive nonzero value of type
-@@ -94,7 +94,7 @@
-      * hexadecimal floating-point literal {@code 0x0.000002P-126f}
-      * and also equal to {@code Float.intBitsToFloat(0x1)}.
-      */
--    public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f
-+    public static final float MIN_VALUE = 1.4e-45f;
- 
-     /**
-      * Maximum exponent a finite {@code float} variable may have.  It
-diff -Nru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml
---- openjdk-ecj.orig/langtools/make/build.xml	2011-02-17 23:26:23.000000000 +0000
-+++ openjdk-ecj/langtools/make/build.xml	2012-01-18 21:43:04.150185964 +0000
-@@ -523,6 +523,7 @@
-                        includeAntRuntime="no"
-                        source="@{javac.source}"
-                        target="@{javac.target}">
-+		    <compilerarg line="-bootclasspath @{classes.dir}:${boot.java.home}/jre/lib/rt.jar"/>
-                     <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
-                     <compilerarg line="${javac.version.opt}"/>
-                     <compilerarg line="-Xlint"/>
-@@ -539,6 +540,7 @@
-                        target="@{javac.target}"
-                        debug="${javac.debug}"
-                        debuglevel="${javac.debuglevel}">
-+		    <compilerarg line="-bootclasspath @{classes.dir}:${boot.java.home}/jre/lib/rt.jar"/>
-                     <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
-                     <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
-                     <compilerarg line="${javac.no.jdk.warnings}"/>
diff --git a/pcr/openjdk6/fix_corba_cmds_path.diff b/pcr/openjdk6/fix_corba_cmds_path.diff
deleted file mode 100644
index 7a3db9567..000000000
--- a/pcr/openjdk6/fix_corba_cmds_path.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- openjdk/corba/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:26:12.000000000 +0300
-+++ openjdk/corba/make/common/shared/Defs-utils.gmk	2008-04-14 15:35:13.000000000 +0300
-@@ -76,7 +76,7 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
- CUT            = $(UTILS_USR_BIN_PATH)cut
-@@ -125,7 +125,7 @@
- TAIL           = $(UTILS_USR_BIN_PATH)tail
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
--TOUCH          = $(UTILS_COMMAND_PATH)touch
-+TOUCH          = $(UTILS_USR_BIN_PATH)touch
- TR             = $(UTILS_USR_BIN_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
-@@ -176,7 +176,7 @@
-   # others have it in /usr/bin.
-   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
- 		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
--  NAWK           = $(USRBIN_PATH)gawk
-+  NAWK           = $(UTILS_COMMAND_PATH)gawk
-   # Intrinsic unix command, with backslash-escaped character interpretation
-   ECHO           = /bin/echo -e
-   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/pcr/openjdk6/fix_jdk_cmds_path.diff b/pcr/openjdk6/fix_jdk_cmds_path.diff
deleted file mode 100644
index bd37dd4ba..000000000
--- a/pcr/openjdk6/fix_jdk_cmds_path.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:33:23.000000000 +0300
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2008-04-14 15:37:34.000000000 +0300
-@@ -89,7 +89,7 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
- CUT            = $(UTILS_USR_BIN_PATH)cut
-@@ -137,7 +137,7 @@
- TAIL           = $(UTILS_USR_BIN_PATH)tail
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
--TOUCH          = $(UTILS_COMMAND_PATH)touch
-+TOUCH          = $(UTILS_USR_BIN_PATH)touch
- TR             = $(UTILS_USR_BIN_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
-@@ -178,7 +178,7 @@
-   BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
-                        $(wildcard $(UTILS_USR_BIN_PATH)basename))
- 
--  NAWK           = $(USRBIN_PATH)gawk
-+  NAWK           = $(UTILS_COMMAND_PATH)gawk
-   # Intrinsic unix command, with backslash-escaped character interpretation
-   ECHO           = /bin/echo -e
-   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/pcr/openjdk6/fontconfig-paths.diff b/pcr/openjdk6/fontconfig-paths.diff
deleted file mode 100644
index fa08db629..000000000
--- a/pcr/openjdk6/fontconfig-paths.diff
+++ /dev/null
@@ -1,134 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties	2009-05-29 22:45:23.024341869 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new	2009-05-29 22:55:13.681366890 +0000
-@@ -275,73 +275,61 @@
- 
- # Font File Names
- 
--filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
--filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
--filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
--filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
--
--filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
--filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf
--filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf
--filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf
--
--filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
--filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf
--filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf
--filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf
--
--filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf
--
--filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf
--filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
--filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf
--filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf
--filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf
--filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf
--filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf
--filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf
--filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
--filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf
--filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf
--filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf
--filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf
--
--filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf
--filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf
--filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf
--filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf
--#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
--filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf
--filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf
--filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf
--filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf
--filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf
--
--filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf
--filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf
--filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf
--filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf
--filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf
--filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf
--filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf
--filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf
--filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf
--filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf
--filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf
--filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf
--
--# AWT X11 font paths
--awtfontpath.latin-1=/usr/share/fonts/X11/Type1
--awtfontpath.umingcn=/usr/share/fonts/truetype/arphic
--awtfontpath.uminghk=/usr/share/fonts/truetype/arphic
--awtfontpath.umingtw=/usr/share/fonts/truetype/arphic
--awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic
--awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy
--awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi
--awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami
--awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
--awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
--awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
-+filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf
-+filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
-+filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf
-+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf
-+
-+filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf
-+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf
-+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf
-+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
-+
-+filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf
-+filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf
-+filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf
-+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf
-+
-+filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf
-+
-+filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf
-+filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf
-+filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf
-+filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf
-+filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf
-+filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf
-+filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf
-+filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf
-+filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf
-+filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf
-+filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf
-+filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf
-+filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf
-+
-+filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf
-+filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf
-+filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf
-+filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf
-+#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf
-+filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf
-+filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf
-+filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf
-+filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf
-+filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf
-+
-+filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf
-+filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf
-+filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf
-+filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf
-+filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf
-+filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf
-+filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf
-+filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf
-+filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf
-+filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf
-+filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf
-+filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf
-+
diff --git a/pcr/openjdk6/nonreparenting-wm.diff b/pcr/openjdk6/nonreparenting-wm.diff
deleted file mode 100644
index 65fa66e89..000000000
--- a/pcr/openjdk6/nonreparenting-wm.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWM.java b/jdk/src/solaris/classes/sun/awt/X11/XWM.java
-index 68d1ff7..878327e 100644
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java
-@@ -99,7 +99,8 @@
-         METACITY_WM = 11,
-         COMPIZ_WM = 12,
-         LG3D_WM = 13,
--        MUTTER_WM = 14;
-+        MUTTER_WM = 14,
-+        OTHER_NONREPARENTING_WM = 15;
-     public String toString() {
-         switch  (WMID) {
-           case NO_WM:
-@@ -564,7 +567,7 @@ class XWM implements MWMConstants, XUtilConstants {
-     }
- 
-     static boolean isNonReparentingWM() {
--        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM);
-+        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
-     }
- 
-     /*
-@@ -764,9 +767,17 @@ class XWM implements MWMConstants, XUtilConstants {
-              * supports WIN or _NET wm spec.
-              */
-             else if (l_net_protocol.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;
-+		}
-             } 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.
-@@ -777,6 +788,8 @@ class XWM implements MWMConstants, XUtilConstants {
-                 awt_wmgr = XWM.MOTIF_WM;
-             } else if (isOpenLook()) {
-                 awt_wmgr = XWM.OPENLOOK_WM;
-+            } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-             } else {
-                 awt_wmgr = XWM.OTHER_WM;
-             }
-@@ -1298,6 +1311,7 @@ class XWM implements MWMConstants, XUtilConstants {
-                   res = new Insets(28, 6, 6, 6);
-                   break;
-               case NO_WM:
-+              case OTHER_NONREPARENTING_WM:
-               case LG3D_WM:
-                   res = zeroInsets;
-                   break;
diff --git a/pcr/openjdk6/openjdk6.install b/pcr/openjdk6/openjdk6.install
deleted file mode 100644
index 653c8fe2f..000000000
--- a/pcr/openjdk6/openjdk6.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/sbin/init-jks-keystore
-  fi
-  echo "when you use a non-reparenting window manager"
-  echo "set _JAVA_AWT_WM_NONREPARENTING=1 in"
-  echo "/etc/profile.d/openjdk6.sh"
-#  update-desktop-database -q
-}
-
-post_upgrade() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/sbin/init-jks-keystore
-  fi
-#  update-desktop-database -q
-}
-
-
-post_remove() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-#  update-desktop-database -q
-}
diff --git a/pcr/openjdk6/openjdk6.profile b/pcr/openjdk6/openjdk6.profile
deleted file mode 100644
index 9da4421ef..000000000
--- a/pcr/openjdk6/openjdk6.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-export J2SDKDIR=/usr/lib/jvm/java-6-openjdk
-export J2REDIR=$J2SDKDIR/jre
-export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
-
-# enable this for non-reparenting window managers
-#export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/pcr/openjdk6/openjdk6.profile.csh b/pcr/openjdk6/openjdk6.profile.csh
deleted file mode 100644
index 3cb15fd49..000000000
--- a/pcr/openjdk6/openjdk6.profile.csh
+++ /dev/null
@@ -1,6 +0,0 @@
-setenv J2SDKDIR "/usr/lib/jvm/java-6-openjdk"
-setenv J2REDIR "$J2SDKDIR/jre"
-setenv JAVA_HOME "/usr/lib/jvm/java-6-openjdk"
-
-# enable this for non-reparenting window managers
-#setenv _JAVA_AWT_WM_NONREPARENTING 1
diff --git a/pcr/openswan/PKGBUILD b/pcr/openswan/PKGBUILD
deleted file mode 100644
index cb5f09b4c..000000000
--- a/pcr/openswan/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Contributor: xjpvictor Huang <ke [AT] xjpvictor [DOT] info>
-pkgname=openswan
-pkgver=2.6.38
-pkgrel=2
-pkgdesc="Open Source implementation of IPsec for the Linux operating system"
-url="http://www.openswan.org"
-license=('GPL' 'custom')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('iproute2>=2.6.8' 'gmp' 'perl')
-makedepends=('flex' 'bison')
-conflicts=('ipsec-tools')
-backup=(etc/ipsec.conf \
-        etc/ipsec.d/policies/{block,clear,clear-or-private,private,private-or-clear})
-source=(http://download.openswan.org/openswan/openswan-$pkgver.tar.gz
-        openswan
-        openswan.service)
-
-prepare() {
-  cd $srcdir/openswan-$pkgver
-  # Change install paths to Arch defaults
-  sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|;s|)/sbin|)/bin|' Makefile.inc
-}
-
-build() {
-  cd $srcdir/openswan-$pkgver
-
-  # Change install paths to Arch defaults
-  sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|;s|)/sbin|)/bin|' Makefile.inc
-
-  make USE_XAUTH=true USE_OBJDIR=true programs
-}
-
-package() {
-  cd $srcdir/openswan-$pkgver
-
-  # Create /etc/rc.d for init script, and license directory
-  mkdir -p $pkgdir/{etc/rc.d,usr/share/licenses/openswan}
-  make DESTDIR=$pkgdir install
-
-  # Change permissions in /var
-  chmod 700 $pkgdir/var/run/pluto
-
-  # Copy License
-  cp LICENSE $pkgdir/usr/share/licenses/openswan
-
-  # Install init script
-  install -Dm755 ../openswan $pkgdir/etc/rc.d/openswan
-  install -Dm644 ../openswan.service $pkgdir/usr/lib/systemd/system/openswan.service
-  mkdir $pkgdir/usr/lib/systemd/scripts/
-  cp $pkgdir/etc/rc.d/ipsec $pkgdir/usr/lib/systemd/scripts/ipsec
-  # fix manpages
-  mv $pkgdir/usr/man $pkgdir/usr/share/
-}
-md5sums=('13073eb5314b83a31be88e4117e8bbcd'
-         '543d84162761b9cc9ec319e938c4dd2a'
-         'd8b465c10838c72e31329d65011002b6')
diff --git a/pcr/openswan/compile.patch b/pcr/openswan/compile.patch
deleted file mode 100644
index 8ddff67f2..000000000
--- a/pcr/openswan/compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openswan-2.6.23/Makefile	2009-09-09 02:42:54.000000000 +0200
-+++ Makefile	2009-12-30 10:13:53.000000000 +0100
-@@ -12,6 +12,8 @@
- # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- # for more details.
- #
-+CFLAGS=-fno-strict-aliasing
-+CXXFLAGS=-fno-strict-aliasing
- 
- 
- OPENSWANSRCDIR?=$(shell pwd)
diff --git a/pcr/openswan/openswan b/pcr/openswan/openswan
deleted file mode 100755
index 30bd0d56e..000000000
--- a/pcr/openswan/openswan
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting Openswan IPsec"
-    /etc/rc.d/ipsec --start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      add_daemon openswan
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Openswan IPsec"
-    /etc/rc.d/ipsec --stop
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      rm_daemon openswan
-    fi
-    ;;
-  restart)
-    stat_busy "Restarting Openswan IPsec"
-    /etc/rc.d/ipsec --restart
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      add_daemon openswan
-    fi
-    ;;
-  status)
-    /etc/rc.d/ipsec --status
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|status}"  
-esac
-
diff --git a/pcr/openswan/openswan.rc.d b/pcr/openswan/openswan.rc.d
deleted file mode 100755
index 30bd0d56e..000000000
--- a/pcr/openswan/openswan.rc.d
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting Openswan IPsec"
-    /etc/rc.d/ipsec --start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      add_daemon openswan
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Openswan IPsec"
-    /etc/rc.d/ipsec --stop
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      rm_daemon openswan
-    fi
-    ;;
-  restart)
-    stat_busy "Restarting Openswan IPsec"
-    /etc/rc.d/ipsec --restart
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      add_daemon openswan
-    fi
-    ;;
-  status)
-    /etc/rc.d/ipsec --status
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|status}"  
-esac
-
diff --git a/pcr/openswan/openswan.service b/pcr/openswan/openswan.service
deleted file mode 100755
index 6d899705c..000000000
--- a/pcr/openswan/openswan.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Openswan daemon
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/lib/systemd/scripts/ipsec --start
-ExecStop=/usr/lib/systemd/scripts/ipsec --stop
-ExecReload=/usr/lib/systemd/scripts/ipsec --restart
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/opentracker/PKGBUILD b/pcr/opentracker/PKGBUILD
deleted file mode 100644
index d2b9a3703..000000000
--- a/pcr/opentracker/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer: Jonas Heinrich <onny@project-insanity.org>
-
-pkgname=opentracker
-pkgver=20130312
-pkgrel=1
-pkgdesc='An open and free bittorrent tracker (open mode)'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://erdgeist.org/arts/software/opentracker/'
-license=('custom:Beer' 'GPL')
-makedepends=('libowfat' 'cvs')
-depends=('bash' 'zlib')
-backup=('etc/opentracker/config')
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"{,.sig}
-'opentracker.service'
-'license.txt')
-md5sums=('64956fd9bc7b453b4862b8ba15a27511'
-         '0217a2aeaee2b75017c13cdf86a245f2'
-         '3c638b71d5ecb65fb7964796975b2078'
-         '865211941e882c0aff5d36a22ac9efaa')
-
-_cvsroot=':pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot'
-_cvsmod='opentracker'
-
-mksource() {
-    pushd "${srcdir}"
-	msg 'Connecting to CVS server....'
-	if [ -d ${_cvsmod}/CVS ]; then
-		cd ${_cvsmod}
-	    cvs -z3 update -d
-	else
-		cvs -z3 -d ${_cvsroot} co -f ${_cvsmod}
-		cd ${_cvsmod}
-	fi
-
-	msg 'CVS checkout done or server timeout'
-    popd
-
-    tar czf ${pkgname}-${pkgver}.tar.gz ${_cvsmod}/
-}
-
-build() {
-	cd "${srcdir}/${_cvsmod}"
-	msg 'Starting make...'
-
-	sed	-e 's|# tracker.rootdir /usr/local/etc/opentracker|tracker.rootdir /etc/opentracker|' \
-		-e 's|# access.stats 192.168.0.23|access.stats 127.0.0.1|' \
-		-i opentracker.conf.sample
-
-# See Makefile for available features
-	make PREFIX=/usr \
-         LIBOWFAT_HEADERS=/usr/includes \
-         LIBOWFAT_LIBRARY=/usr/lib \
-         FEATURES="-DWANT_SYSLOGS -DDEBUG_HTTPERROR"
-}
-
-package(){
-	cd "${srcdir}/${_cvsmod}"
-
-	install -D -m 755 opentracker $pkgdir/usr/bin/opentracker
-	install -D -m 644 opentracker.conf.sample $pkgdir/etc/opentracker/config
-	install -D -m 644 $srcdir/license.txt $pkgdir/usr/share/licenses/opentracker/license.txt
-
-  # Create opentracker service
-  mkdir -p "$pkgdir/usr/lib/systemd/system/"
-  install -m 644 "$srcdir/opentracker.service" "$pkgdir/usr/lib/systemd/system/"
-}
diff --git a/pcr/opentracker/license.txt b/pcr/opentracker/license.txt
deleted file mode 100644
index ff1bb40f5..000000000
--- a/pcr/opentracker/license.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This software was written by Dirk Engling <erdgeist@erdgeist.org>
-It is considered beerware. Prost. Skol. Cheers or whatever.
diff --git a/pcr/opentracker/opentracker.install b/pcr/opentracker/opentracker.install
deleted file mode 100644
index 59f6f6ebe..000000000
--- a/pcr/opentracker/opentracker.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-    cat <<EOM
-
-    Please be aware this package is built without accesslist support. Any
-    torrent announced to it will be tracked.
-
-    If you want this features you'll have to rebuild this package. There're
-    instructions on the PKGBUILD.
-
-    For more info check: http://erdgeist.org/arts/software/opentracker/
-
-EOM
-}
-
-post_upgrade() {
-    post_install
-}
diff --git a/pcr/opentracker/opentracker.rc.d b/pcr/opentracker/opentracker.rc.d
deleted file mode 100644
index b1aa34c14..000000000
--- a/pcr/opentracker/opentracker.rc.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/opentracker`
-
-case "$1" in
-  start)
-    stat_busy "Starting opentracker Daemon"
-    [ -z "$PID" ] && su nobody -s /bin/sh -c "/usr/bin/opentracker -f /etc/opentracker/config&"
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon opentracker
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping opentracker Daemon"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon opentracker
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/pcr/opentracker/opentracker.service b/pcr/opentracker/opentracker.service
deleted file mode 100644
index 5f1b887ea..000000000
--- a/pcr/opentracker/opentracker.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenTracker Daemon
-After=network.target
-
-[Service]
-User=nobody
-ExecStart=/usr/bin/opentracker -f /etc/opentracker/config
-ExecStop=/bin/kill -INT $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/otf-stix/PKGBUILD b/pcr/otf-stix/PKGBUILD
deleted file mode 100644
index 6a9b2d62c..000000000
--- a/pcr/otf-stix/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer (Arch): ezzetabi <ezzetabi at gawab dot com>
-# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com>
-# taken from https://aur.archlinux.org/packages/otf-stix/
-
-pkgname=otf-stix
-pkgver=1.1.0
-#_pkgver=${pkgver//_/-}
-pkgrel=2
-epoch=2
-pkgdesc='A comprehensive set of fonts that serve the scientific and 
-engineering community.'
-arch=('any')
-url="http://www.stixfonts.org"
-license=('Custom: OFL')
-depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
-makedepends=('unzip')
-install=otf-stix.install
-source=("http://downloads.sourceforge.net/stixfonts/STIXv$pkgver.zip"
-'http://www.stixfonts.org/STIXFontLicense2010.txt')
-
-build() {
-  /bin/true
-}
-
-package() {
-  cd "$srcdir"
-
-  install -m755 -d "$pkgdir/usr/share/fonts/OTF"
-  install -m644 Fonts/STIX-General/*.otf "$pkgdir/usr/share/fonts/OTF"
-  install -m644 Fonts/STIX-Word/*.otf "$pkgdir/usr/share/fonts/OTF"
-  install -Dm644 "$srcdir"/STIXFontLicense2010.txt \
-    "$pkgdir"/usr/share/licenses/"$pkgname"/license.txt
-}
-
-md5sums=('e5ebc8ef9b7df0f0bac0fd90bce95295'
-'b1af7bbd3cea93a60bf68cf571ad6cab')
-
diff --git a/pcr/otf-stix/otf-stix.install b/pcr/otf-stix/otf-stix.install
deleted file mode 100644
index 5d66bc226..000000000
--- a/pcr/otf-stix/otf-stix.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  echo -n "Updating font cache... "
-  fc-cache -s
-  mkfontscale /usr/share/fonts/OTF
-  mkfontdir /usr/share/fonts/OTF
-  echo "done."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
diff --git a/pcr/owncloud-client/PKGBUILD b/pcr/owncloud-client/PKGBUILD
deleted file mode 100644
index a28aae986..000000000
--- a/pcr/owncloud-client/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
-# https://github.com/zizzfizzix/pkgbuilds
-# Maintainer: Jorge Araya Navarro <shackra@riseup.net>
-#
-##############################################################
-#### The section below can be adjusted to suit your needs ####
-##############################################################
-
-# What type of build do you want?
-# See http://techbase.kde.org/Development/CMake/Addons_for_KDE#Buildtypes to check what is supported.
-# Default is RelWithDebInfo to help with debugging.
-
-_buildtype="Release"
-
-##############################################################
-
-_name=mirall
-pkgname=owncloud-client
-pkgver=1.4.2
-pkgrel=1
-pkgdesc="ownCloud client based on mirall"
-arch=('i686' 'x86_64')
-url="http://owncloud.org/"
-license=('GPL2')
-depends=('qt4' 'ocsync' 'qtkeychain' 'qtwebkit')
-makedepends=('cmake')
-provides=('mirall' 'owncloud-client')
-conflicts=('mirall-git')
-install=owncloud-client.install
-backup=('etc/ownCloud/sync-exclude.lst')
-source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2")
-md5sums=('089a9df66f31d6915a60e48ca4a027a8')
-
-
-if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
-  options=(!strip)
-fi
-
-prepare() {
-  if [[ -e ${srcdir}/${_name}-${pkgver}-build ]]; then rm -rf ${srcdir}/${_name}-${pkgver}-build; fi
-  mkdir ${srcdir}/${_name}-${pkgver}-build
-}
-
-build() {
-  cd ${srcdir}/${_name}-${pkgver}-build
-
-  cmake -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-        -DCMAKE_BUILD_TYPE=${_buildtype} \
-        -DCSYNC_INCLUDE_PATH=/usr/include/ocsync \
-        -DCMAKE_INSTALL_SYSCONFDIR=/etc/${pkgname} \
-        ../${_name}-${pkgver}
-  make
-}
-
-package() {
-  cd ${srcdir}/${_name}-${pkgver}-build
-  make DESTDIR=${pkgdir} install
-}
diff --git a/pcr/owncloud-client/owncloud-client.desktop b/pcr/owncloud-client/owncloud-client.desktop
deleted file mode 100644
index 005e52219..000000000
--- a/pcr/owncloud-client/owncloud-client.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=ownCloud 2012 client
-GenericName=File Sync
-TryExec=owncloud
-Exec=owncloud %u
-Comment=ownCloud - Your Cloud, Your Data, Your Way!
-Icon=mirall
-Terminal=false
-Categories=Qt;Utility;
diff --git a/pcr/owncloud-client/owncloud-client.install b/pcr/owncloud-client/owncloud-client.install
deleted file mode 100644
index eecc35ccd..000000000
--- a/pcr/owncloud-client/owncloud-client.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/pcr/owncloud/PKGBUILD b/pcr/owncloud/PKGBUILD
deleted file mode 100644
index 18e33afe2..000000000
--- a/pcr/owncloud/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Antonio Rojas <nqn1976 @ gmail.com>
-# Based on owncloud-git PKGBUILD by Alexander Ovsyannikov
-
-pkgname=owncloud
-pkgver=5.0.4
-pkgrel=1
-pkgdesc="A cloud server to store your files centrally on a hardware controlled by you"
-arch=('any')
-url="http://owncloud.org/"
-license=('GPL')
-depends=('php-gd' 'php-intl')
-optdepends=("php-apache: to use the Apache web server" "php-sqlite: to use the SQLite database backend" "mariadb: to use the MySQL database backend" "smbclient: to mount SAMBA shares")
-makedepends=()
-source=("http://download.owncloud.org/community/$pkgname-$pkgver.tar.bz2" 'owncloud.conf')
-backup=('etc/httpd/conf/extra/owncloud.conf')
-install=owncloud.install
-md5sums=('311c299b4aff4987a4b4c39aedafa9c0'
-         'c1d49a3c0d8433bed6bffcd21ebb0064')
-
-package() { 
-# install license
-  install -d $pkgdir/usr/share/licenses/$pkgname
-  cp $srcdir/$pkgname/COPYING-* $pkgdir/usr/share/licenses/$pkgname
-
-# install project  
-  install -d $pkgdir/usr/share/webapps/ 
-  cp -a $srcdir/$pkgname $pkgdir/usr/share/webapps/ 
-  chown -R http:http $pkgdir/usr/share/webapps/* 
- 
-# install apache .conf file 
-  install -d  $pkgdir/etc/httpd/conf/extra 
-  install -m 644 $srcdir/owncloud.conf  $pkgdir/etc/httpd/conf/extra/ 
-}
-
-
-
diff --git a/pcr/owncloud/owncloud.conf b/pcr/owncloud/owncloud.conf
deleted file mode 100644
index 5f050f134..000000000
--- a/pcr/owncloud/owncloud.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-<IfModule mod_alias.c>
-Alias /owncloud /usr/share/webapps/owncloud/
-</IfModule>
-<Directory /usr/share/webapps/owncloud/>
-   Options FollowSymlinks
-   Order allow,deny
-   AllowOverride all
-   allow from all
-   php_admin_value open_basedir "/srv/http/:/home/:/tmp/:/usr/share/pear/:/usr/share/webapps/"
-</Directory>
-<VirtualHost *:80>
-    ServerAdmin foo@foofarm.com
-    DocumentRoot /usr/share/webapps/owncloud
-    ServerName owncloud.foo.com
-    ErrorLog logs/owncloud.foo.info-error_log
-    CustomLog logs/owncloud.foo.info-access_log common
-</VirtualHost>
\ No newline at end of file
diff --git a/pcr/owncloud/owncloud.install b/pcr/owncloud/owncloud.install
deleted file mode 100644
index cde521d4b..000000000
--- a/pcr/owncloud/owncloud.install
+++ /dev/null
@@ -1,12 +0,0 @@
-pkgname=ownCloud
-
-post_install() {
-   echo "Add the following lines into /etc/httpd/conf/httpd.conf:"
-   echo "Include /etc/httpd/conf/extra/owncloud.conf"
-   echo "LoadModule php5_module modules/libphp5.so"
-   echo "Include conf/extra/php5_module.conf"
-   echo
-   echo "Uncomment extensions gd.so intl.so iconv.so openssl.so xmlrpc.so zip.so"
-   echo "and either pdo_sqlite.so sqlite3.so (for the SQLite backend) or mysqli.so pdo_mysql.so (for the MySQL backend)"
-   echo "in /etc/php/php.ini"
-}
diff --git a/pcr/package-query/PKGBUILD b/pcr/package-query/PKGBUILD
deleted file mode 100644
index 5bec58ce3..000000000
--- a/pcr/package-query/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: tuxce <tuxce.net@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io>
-
-pkgname=package-query
-pkgver=1.1
-pkgrel=2
-pkgdesc="Query ALPM and AUR"
-arch=('i686' 'x86_64' 'mips64el' 'armv6h' 'armv7h')
-url="http://gitweb.archlinux.fr/package-query.git/"
-license=('GPL')
-depends=('pacman>=4.0' 'pacman<4.1' curl 'yajl>=2.0')
-source=(http://mir.archlinux.fr/~tuxce/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --localstatedir=/var --prefix=/usr --sysconfdir=/etc --with-aur-url=https://aur.archlinux.org
-  make
-}
-
-package ()
-{
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
-
-md5sums=('becb5734dd531631cbe2e1c9cf82ae9e')
-md5sums=('becb5734dd531631cbe2e1c9cf82ae9e')
diff --git a/pcr/packer/PKGBUILD b/pcr/packer/PKGBUILD
deleted file mode 100644
index f2ea54a76..000000000
--- a/pcr/packer/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=packer
-pkgver=20120302
-pkgrel=1
-pkgdesc="Bash wrapper for pacman and aur"
-url="http://github.com/bruenig/packer"
-license="GPL"
-arch=('any')
-makedepends=('git')
-depends=('grep' 'sed' 'bash' 'curl' 'pacman' 'jshon')
-optdepends=('sudo: install and update packages as non-root'
-            'customizepkg: apply customizepkg modifications')
-_gitroot='https://github.com/bruenig/packer.git'
-_gitname='packer'
-
-# Xavion is a non-contributing idiot
-
-build() {
-    cd "$srcdir"
-  
-    msg "Connecting to github GIT server...."
-    
-    if [ -d "$srcdir/$_gitname" ] ; then
-        cd $_gitname && git pull origin
-    else
-        git clone "$_gitroot"
-        cd $_gitname
-    fi
-      
-    mkdir -p "$pkgdir/usr/bin/"
-    mkdir -p "$pkgdir/usr/share/man/man8/"
-    install -m 755 packer "$pkgdir/usr/bin/packer"
-    install -m 644 packer.8 "$pkgdir/usr/share/man/man8/packer.8"
-}
-
diff --git a/pcr/pacman-color/0001-Add-conflict-for-replacing-owned-empty-directory.patch b/pcr/pacman-color/0001-Add-conflict-for-replacing-owned-empty-directory.patch
deleted file mode 100644
index 85622aaac..000000000
--- a/pcr/pacman-color/0001-Add-conflict-for-replacing-owned-empty-directory.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From 717fdb8ee0fd23cf72fc7d2832317f513caefa2c Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Sun, 8 Jul 2012 21:36:36 +1000
-Subject: [PATCH 1/4] Add conflict for replacing owned empty directory
-
-When two packages own an empty directory, pacman finds no conflict when
-one of those packages wants to replace the directory with a file or a
-symlink.  When it comes to actually extracting the new file/symlink,
-pacman sees the directory is still there (we do not remove empty
-directories if they are owned by a package) and refuses to extract.
-
-Detect this potential conflict early and bail. Note that it is a
-_potential_ conflict and not a guaranteed one as the other package owning
-the directory could be updated or removed first which would remove
-the conflict.  However, pacman currently can not sort package installation
-order to ensure this, so this conflict requires manual upgrade ordering.
-
-Signed-off-by: Allan McRae <allan@archlinux.org>
-Signed-off-by: Dan McGee <dan@archlinux.org>
----
- lib/libalpm/conflict.c               | 32 ++++++++++++++++++++++++++------
- test/pacman/tests/fileconflict009.py | 20 ++++++++++++++++++++
- test/pacman/tests/fileconflict010.py | 20 ++++++++++++++++++++
- 3 files changed, 66 insertions(+), 6 deletions(-)
- create mode 100644 test/pacman/tests/fileconflict009.py
- create mode 100644 test/pacman/tests/fileconflict010.py
-
-diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
-index 32f6f30..efa1a87 100644
---- a/lib/libalpm/conflict.c
-+++ b/lib/libalpm/conflict.c
-@@ -328,15 +328,35 @@ const alpm_file_t *_alpm_filelist_contains(alpm_filelist_t *filelist,
- 	return NULL;
- }
- 
--static int dir_belongsto_pkg(const char *root, const char *dirpath,
-+static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath,
- 		alpm_pkg_t *pkg)
- {
-+	alpm_list_t *i;
- 	struct stat sbuf;
- 	char path[PATH_MAX];
- 	char abspath[PATH_MAX];
--	struct dirent *ent = NULL;
- 	DIR *dir;
-+	struct dirent *ent = NULL;
-+	const char *root = handle->root;
-+
-+	/* TODO: this is an overly strict check but currently pacman will not
-+	 * overwrite a directory with a file (case 10/11 in add.c). Adjusting that
-+	 * is not simple as even if the directory is being unowned by a conflicting
-+	 * package, pacman does not sort this to ensure all required directory
-+	 * "removals" happen before installation of file/symlink */
-+
-+	/* check that no other _installed_ package owns the directory */
-+	for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = i->next) {
-+		if(pkg == i->data) {
-+			continue;
-+		}
-+
-+		if(_alpm_filelist_contains(alpm_pkg_get_files(i->data), dirpath)) {
-+			return 0;
-+		}
-+	}
- 
-+	/* check all files in directory are owned by the package */
- 	snprintf(abspath, PATH_MAX, "%s%s", root, dirpath);
- 	dir = opendir(abspath);
- 	if(dir == NULL) {
-@@ -349,13 +369,13 @@ static int dir_belongsto_pkg(const char *root, const char *dirpath,
- 		if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) {
- 			continue;
- 		}
--		snprintf(path, PATH_MAX, "%s/%s", dirpath, name);
-+		snprintf(path, PATH_MAX, "%s%s", dirpath, name);
- 		snprintf(abspath, PATH_MAX, "%s%s", root, path);
- 		if(stat(abspath, &sbuf) != 0) {
- 			continue;
- 		}
- 		if(S_ISDIR(sbuf.st_mode)) {
--			if(dir_belongsto_pkg(root, path, pkg)) {
-+			if(dir_belongsto_pkg(handle, path, pkg)) {
- 				continue;
- 			} else {
- 				closedir(dir);
-@@ -529,9 +549,9 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
- 				sprintf(dir, "%s/", filestr);
- 				if(_alpm_filelist_contains(alpm_pkg_get_files(dbpkg), dir)) {
- 					_alpm_log(handle, ALPM_LOG_DEBUG,
--							"check if all files in %s belongs to %s\n",
-+							"check if all files in %s belong to %s\n",
- 							dir, dbpkg->name);
--					resolved_conflict = dir_belongsto_pkg(handle->root, filestr, dbpkg);
-+					resolved_conflict = dir_belongsto_pkg(handle, dir, dbpkg);
- 				}
- 				free(dir);
- 			}
-diff --git a/test/pacman/tests/fileconflict009.py b/test/pacman/tests/fileconflict009.py
-new file mode 100644
-index 0000000..904af4a
---- /dev/null
-+++ b/test/pacman/tests/fileconflict009.py
-@@ -0,0 +1,20 @@
-+self.description = "dir->symlink change during package upgrade (directory conflict)"
-+
-+lp1 = pmpkg("pkg1")
-+lp1.files = ["dir/"]
-+self.addpkg2db("local", lp1)
-+
-+lp2 = pmpkg("pkg2")
-+lp2.files = ["dir/"]
-+self.addpkg2db("local", lp2)
-+
-+p = pmpkg("pkg1", "1.0-2")
-+p.files = ["dir -> /usr/dir"]
-+self.addpkg2db("sync", p)
-+
-+self.args = "-S pkg1"
-+
-+self.addrule("PACMAN_RETCODE=1")
-+self.addrule("PKG_VERSION=pkg1|1.0-1")
-+self.addrule("PKG_VERSION=pkg2|1.0-1")
-+self.addrule("DIR_EXIST=dir/")
-diff --git a/test/pacman/tests/fileconflict010.py b/test/pacman/tests/fileconflict010.py
-new file mode 100644
-index 0000000..0a3ce83
---- /dev/null
-+++ b/test/pacman/tests/fileconflict010.py
-@@ -0,0 +1,20 @@
-+self.description = "dir->file change during package upgrade (directory conflict)"
-+
-+lp1 = pmpkg("pkg1")
-+lp1.files = ["dir/"]
-+self.addpkg2db("local", lp1)
-+
-+lp2 = pmpkg("pkg2")
-+lp2.files = ["dir/"]
-+self.addpkg2db("local", lp2)
-+
-+p = pmpkg("pkg1", "1.0-2")
-+p.files = ["dir"]
-+self.addpkg2db("sync", p)
-+
-+self.args = "-S pkg1"
-+
-+self.addrule("PACMAN_RETCODE=1")
-+self.addrule("PKG_VERSION=pkg1|1.0-1")
-+self.addrule("PKG_VERSION=pkg2|1.0-1")
-+self.addrule("DIR_EXIST=dir/")
--- 
-1.7.11.1
-
diff --git a/pcr/pacman-color/0002-Check-empty-subdirectory-ownership.patch b/pcr/pacman-color/0002-Check-empty-subdirectory-ownership.patch
deleted file mode 100644
index 6cf496d16..000000000
--- a/pcr/pacman-color/0002-Check-empty-subdirectory-ownership.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 44e9fdd0e848382337edb97d41e7317638a67bac Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Sun, 8 Jul 2012 23:58:37 +1000
-Subject: [PATCH 2/4] Check empty subdirectory ownership
-
-When checking if a package owns a directory, it is important to check
-not only that all the files in the directory are part of the package,
-but also if the directory is part of a package.  This catches empty
-subdirectories during conflict checking for directory to file/symlink
-replacements.
-
-Signed-off-by: Allan McRae <allan@archlinux.org>
-Signed-off-by: Dan McGee <dan@archlinux.org>
----
- lib/libalpm/conflict.c               |  5 +++++
- test/pacman/tests/fileconflict012.py | 17 +++++++++++++++++
- 2 files changed, 22 insertions(+)
- create mode 100644 test/pacman/tests/fileconflict012.py
-
-diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
-index efa1a87..d6e5d8c 100644
---- a/lib/libalpm/conflict.c
-+++ b/lib/libalpm/conflict.c
-@@ -339,6 +339,11 @@ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath,
- 	struct dirent *ent = NULL;
- 	const char *root = handle->root;
- 
-+	/* check directory is actually in package - used for subdirectory checks */
-+	if(!_alpm_filelist_contains(alpm_pkg_get_files(pkg), dirpath)) {
-+		return 0;
-+	}
-+
- 	/* TODO: this is an overly strict check but currently pacman will not
- 	 * overwrite a directory with a file (case 10/11 in add.c). Adjusting that
- 	 * is not simple as even if the directory is being unowned by a conflicting
-diff --git a/test/pacman/tests/fileconflict012.py b/test/pacman/tests/fileconflict012.py
-new file mode 100644
-index 0000000..421b739
---- /dev/null
-+++ b/test/pacman/tests/fileconflict012.py
-@@ -0,0 +1,17 @@
-+self.description = "dir->file change during package upgrade (filesystem file conflict)"
-+
-+lp1 = pmpkg("pkg1")
-+lp1.files = ["dir/"]
-+self.addpkg2db("local", lp1)
-+
-+self.filesystem = ["dir/file"]
-+
-+p = pmpkg("pkg1", "1.0-2")
-+p.files = ["dir"]
-+self.addpkg2db("sync", p)
-+
-+self.args = "-S pkg1"
-+
-+self.addrule("PACMAN_RETCODE=1")
-+self.addrule("PKG_VERSION=pkg1|1.0-1")
-+self.addrule("DIR_EXIST=dir/")
--- 
-1.7.11.1
-
diff --git a/pcr/pacman-color/PKGBUILD b/pcr/pacman-color/PKGBUILD
deleted file mode 100644
index 525f965b9..000000000
--- a/pcr/pacman-color/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: JokerBoy <jokerboy at punctweb dot ro>
-# Contributor: vogo <vogo(at)seznam(dot)cz>
-# Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io>
-
-pkgname=pacman-color
-pkgver=4.0.3
-pkgrel=3
-pkgdesc="A color patched command-line frontend for libalpm (Pacman)"
-arch=('i686' 'x86_64')
-url="http://www.archlinux.org/pacman/"
-license=('GPL')
-depends=('pacman>=4.0' 'pacman<4.1')
-backup=('etc/pacman.d/color.conf')
-source=("http://mirrors.kernel.org/archlinux/other/pacman/pacman-${pkgver}.tar.gz"
-        '0001-Add-conflict-for-replacing-owned-empty-directory.patch'
-        '0002-Check-empty-subdirectory-ownership.patch'
-        "${pkgname}-${pkgver}.patch"
-        'color.conf')
-md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
-         '1a9b79788640907a2b34e8671cacc94a'
-         'a9ddd43891bed364e1e97d27b2887bf1'
-         '185e6a488b1aa14db4a54b71eb5e5e29'
-         '47665f5054196c20ba0dd280a8d4c5e1')
-
-build() {
-  cd "pacman-${pkgver}"
-  patch -p1 -i "${srcdir}/0001-Add-conflict-for-replacing-owned-empty-directory.patch"
-  patch -p1 -i "${srcdir}/0002-Check-empty-subdirectory-ownership.patch"
-  patch -p1 -i "${srcdir}/${pkgname}-${pkgver}.patch"
-  ./configure \
-      --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-doc
-  make
-}
-
-package() {
-  # install pacman-color && color.conf
-  install -Dm755 "pacman-${pkgver}/src/pacman/.libs/pacman" "${pkgdir}/usr/bin/pacman-color"
-  install -Dm644 'color.conf' "${pkgdir}/etc/pacman.d/color.conf"
-}
diff --git a/pcr/pacman-color/color.conf b/pcr/pacman-color/color.conf
deleted file mode 100644
index 4978d4e62..000000000
--- a/pcr/pacman-color/color.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# Configuration for pacman-color
-# ------------------------------
-# in default are all colors "intensive",
-# it looks much better on black backround
-#
-# valid colors:
-#	black
-#	red
-#	green
-#	yellow
-#	blue
-#	magenta
-#	cyan
-#	white
-#	gray
-#	intensive red
-#	intensive green
-#	intensive yellow
-#	intensive blue
-#	intensive magenta
-#	intensive cyan
-#	intensive white
-#	intensive foreground
-#	none
-
-# error: prefix, fail, Remove (?):, MISSING
-#Red = intensive red
-
-# done, success, pkg version, Not Modified
-#Green = intensive green
-
-# warning: prefix, Targets (?):, MODIFIED
-#Yellow = intensive yellow
-
-# :: prefix, pkg group, counter in install proces
-#Blue = intensive blue
-
-# repo name, package file name
-#Magenta = intensive magenta
-
-# url, flag installed
-#Cyan = intensive cyan
-
-# messages with :: prefix, titles, etc
-#White = intensive foreground
-
diff --git a/pcr/pacman-color/pacman-color-4.0.3.patch b/pcr/pacman-color/pacman-color-4.0.3.patch
deleted file mode 100644
index c7b52ef04..000000000
--- a/pcr/pacman-color/pacman-color-4.0.3.patch
+++ /dev/null
@@ -1,1297 +0,0 @@
-diff -up -Npaur a/src/pacman/callback.c b/src/pacman/callback.c
---- a/src/pacman/callback.c	2012-02-03 01:19:15.000000000 +0200
-+++ b/src/pacman/callback.c	2012-07-20 21:48:20.266827634 +0300
-@@ -221,16 +221,16 @@ void cb_event(alpm_event_t event, void *
- 			printf(_("generating %s with %s... "), (char *)data1, (char *)data2);
- 			break;
- 		case ALPM_EVENT_DELTA_PATCH_DONE:
--			printf(_("success!\n"));
-+			color_printf(COLOR_GREEN_ALL, _("success!\n"));
- 			break;
- 		case ALPM_EVENT_DELTA_PATCH_FAILED:
--			printf(_("failed.\n"));
-+			color_printf(COLOR_RED_ALL, _("failed.\n"));
- 			break;
- 		case ALPM_EVENT_SCRIPTLET_INFO:
- 			printf("%s", (char *)data1);
- 			break;
- 		case ALPM_EVENT_RETRIEVE_START:
--			printf(_(":: Retrieving packages from %s...\n"), (char *)data1);
-+			color_printf(COLOR_DOUBLECOLON, _(":: Retrieving packages from %s...\n"), (char *)data1);
- 			break;
- 		case ALPM_EVENT_DISKSPACE_START:
- 			if(config->noprogressbar) {
-@@ -264,14 +264,14 @@ void cb_question(alpm_question_t event,
- 	switch(event) {
- 		case ALPM_QUESTION_INSTALL_IGNOREPKG:
- 			if(!config->op_s_downloadonly) {
--				*response = yesno(_(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"),
-+				*response = yesno(COLOR_DOUBLECOLON, _(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"),
- 								  alpm_pkg_get_name(data1));
- 			} else {
- 				*response = 1;
- 			}
- 			break;
- 		case ALPM_QUESTION_REPLACE_PKG:
--			*response = yesno(_(":: Replace %s with %s/%s?"),
-+			*response = yesno(COLOR_DOUBLECOLON, _(":: Replace %s with %s/%s?"),
- 					alpm_pkg_get_name(data1),
- 					(char *)data3,
- 					alpm_pkg_get_name(data2));
-@@ -280,12 +280,12 @@ void cb_question(alpm_question_t event,
- 			/* data parameters: target package, local package, conflict (strings) */
- 			/* print conflict only if it contains new information */
- 			if(strcmp(data1, data3) == 0 || strcmp(data2, data3) == 0) {
--				*response = noyes(_(":: %s and %s are in conflict. Remove %s?"),
-+				*response = noyes(COLOR_DOUBLECOLON, _(":: %s and %s are in conflict. Remove %s?"),
- 						(char *)data1,
- 						(char *)data2,
- 						(char *)data2);
- 			} else {
--				*response = noyes(_(":: %s and %s are in conflict (%s). Remove %s?"),
-+				*response = noyes(COLOR_DOUBLECOLON, _(":: %s and %s are in conflict (%s). Remove %s?"),
- 						(char *)data1,
- 						(char *)data2,
- 						(char *)data3,
-@@ -302,13 +302,13 @@ void cb_question(alpm_question_t event,
- 							(char *)alpm_pkg_get_name(i->data));
- 					count++;
- 				}
--				printf(_n(
-+				color_printf(COLOR_DOUBLECOLON, _n(
- 							":: The following package cannot be upgraded due to unresolvable dependencies:\n",
- 							":: The following packages cannot be upgraded due to unresolvable dependencies:\n",
- 							count));
--				list_display("     ", namelist);
-+				list_display(NULL, "     ", namelist);
- 				printf("\n");
--				*response = noyes(_n(
-+				*response = noyes(NULL, _n(
- 							"Do you want to skip the above package for this upgrade?",
- 							"Do you want to skip the above packages for this upgrade?",
- 							count));
-@@ -320,7 +320,7 @@ void cb_question(alpm_question_t event,
- 				alpm_list_t *providers = (alpm_list_t *)data1;
- 				size_t count = alpm_list_count(providers);
- 				char *depstring = alpm_dep_compute_string((alpm_depend_t *)data2);
--				printf(_(":: There are %zd providers available for %s:\n"), count,
-+				color_printf(COLOR_DOUBLECOLON, _(":: There are %zd providers available for %s:\n"), count,
- 						depstring);
- 				free(depstring);
- 				select_display(providers);
-@@ -329,7 +329,7 @@ void cb_question(alpm_question_t event,
- 			break;
- 		case ALPM_QUESTION_LOCAL_NEWER:
- 			if(!config->op_s_downloadonly) {
--				*response = yesno(_(":: %s-%s: local version is newer. Upgrade anyway?"),
-+				*response = yesno(COLOR_DOUBLECOLON, _(":: %s-%s: local version is newer. Upgrade anyway?"),
- 						alpm_pkg_get_name(data1),
- 						alpm_pkg_get_version(data1));
- 			} else {
-@@ -337,7 +337,7 @@ void cb_question(alpm_question_t event,
- 			}
- 			break;
- 		case ALPM_QUESTION_CORRUPTED_PKG:
--			*response = yesno(_(":: File %s is corrupted (%s).\n"
-+			*response = yesno(COLOR_DOUBLECOLON, _(":: File %s is corrupted (%s).\n"
- 						"Do you want to delete it?"),
- 					(char *)data1,
- 					alpm_strerror(*(enum _alpm_errno_t *)data2));
-@@ -347,7 +347,7 @@ void cb_question(alpm_question_t event,
- 				alpm_pgpkey_t *key = data1;
- 				char created[12];
- 				strftime(created, 12, "%Y-%m-%d", localtime(&(key->created)));
--				*response = yesno(_(":: Import PGP key %s, \"%s\", created %s?"),
-+				*response = yesno(COLOR_DOUBLECOLON, _(":: Import PGP key %s, \"%s\", created %s?"),
- 						key->fingerprint, key->uid, created);
- 			}
- 			break;
-@@ -481,8 +481,9 @@ void cb_progress(alpm_progress_t event,
- 
- 	}
- 
--	printf("(%*ld/%*ld) %ls%-*s", digits, (unsigned long)current,
--			digits, (unsigned long)howmany, wcstr, padwid, "");
-+	color_printf(COLOR_BLUE_ALL, "(%*ld/%*ld)", digits, (unsigned long)current,
-+			digits, (unsigned long)howmany);
-+	printf(" %ls%-*s", wcstr, padwid, "");
- 
- 	free(wcstr);
- 
-diff -up -Npaur a/src/pacman/package.c b/src/pacman/package.c
---- a/src/pacman/package.c	2012-02-03 01:18:52.000000000 +0200
-+++ b/src/pacman/package.c	2012-07-20 21:48:20.266827634 +0300
-@@ -41,7 +41,7 @@
-  * @param deps a list with items of type alpm_depend_t
-  * @return a string list, must be freed
-  */
--static void deplist_display(const char *title,
-+static void deplist_display(const colordata_t *colors_title, const char *title,
- 		alpm_list_t *deps)
- {
- 	alpm_list_t *i, *text = NULL;
-@@ -49,7 +49,7 @@ static void deplist_display(const char *
- 		alpm_depend_t *dep = alpm_list_getdata(i);
- 		text = alpm_list_add(text, alpm_dep_compute_string(dep));
- 	}
--	list_display(title, text);
-+	list_display(colors_title, title, text);
- 	FREELIST(text);
- }
- 
-@@ -102,65 +102,65 @@ void dump_pkg_full(alpm_pkg_t *pkg, int
- 
- 	/* actual output */
- 	if(from == PKG_FROM_SYNCDB) {
--		string_display(_("Repository     :"),
--				alpm_db_get_name(alpm_pkg_get_db(pkg)));
-+		color_string_display(COLOR_WHITE_ALL, _("Repository     :"),
-+				COLOR_MAGENTA_ALL, alpm_db_get_name(alpm_pkg_get_db(pkg)));
- 	}
--	string_display(_("Name           :"), alpm_pkg_get_name(pkg));
--	string_display(_("Version        :"), alpm_pkg_get_version(pkg));
--	string_display(_("URL            :"), alpm_pkg_get_url(pkg));
--	list_display(_("Licenses       :"), alpm_pkg_get_licenses(pkg));
--	list_display(_("Groups         :"), alpm_pkg_get_groups(pkg));
--	deplist_display(_("Provides       :"), alpm_pkg_get_provides(pkg));
--	deplist_display(_("Depends On     :"), alpm_pkg_get_depends(pkg));
--	list_display_linebreak(_("Optional Deps  :"), alpm_pkg_get_optdepends(pkg));
-+	color_string_display(COLOR_WHITE_ALL, _("Name           :"), COLOR_WHITE_ALL, alpm_pkg_get_name(pkg));
-+	color_string_display(COLOR_WHITE_ALL, _("Version        :"), COLOR_GREEN_ALL, alpm_pkg_get_version(pkg));
-+	color_string_display(COLOR_WHITE_ALL, _("URL            :"), COLOR_CYAN_ALL, alpm_pkg_get_url(pkg));
-+	list_display(COLOR_WHITE_ALL, _("Licenses       :"), alpm_pkg_get_licenses(pkg));
-+	list_display(COLOR_WHITE_ALL, _("Groups         :"), alpm_pkg_get_groups(pkg));
-+	deplist_display(COLOR_WHITE_ALL, _("Provides       :"), alpm_pkg_get_provides(pkg));
-+	deplist_display(COLOR_WHITE_ALL, _("Depends On     :"), alpm_pkg_get_depends(pkg));
-+	list_display_linebreak(COLOR_WHITE_ALL, _("Optional Deps  :"), alpm_pkg_get_optdepends(pkg));
- 	if(extra || from == PKG_FROM_LOCALDB) {
--		list_display(_("Required By    :"), requiredby);
-+		list_display(COLOR_WHITE_ALL, _("Required By    :"), requiredby);
- 	}
--	deplist_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg));
--	deplist_display(_("Replaces       :"), alpm_pkg_get_replaces(pkg));
-+	deplist_display(COLOR_WHITE_ALL, _("Conflicts With :"), alpm_pkg_get_conflicts(pkg));
-+	deplist_display(COLOR_WHITE_ALL, _("Replaces       :"), alpm_pkg_get_replaces(pkg));
- 
- 	size = humanize_size(alpm_pkg_get_size(pkg), 'K', 2, &label);
- 	if(from == PKG_FROM_SYNCDB) {
--		printf(_("Download Size  : %6.2f %s\n"), size, label);
-+		color_printf(COLOR_WHITE_COLON, _("Download Size  : %6.2f %s\n"), size, label);
- 	} else if(from == PKG_FROM_FILE) {
--		printf(_("Compressed Size: %6.2f %s\n"), size, label);
-+		color_printf(COLOR_WHITE_COLON, _("Compressed Size: %6.2f %s\n"), size, label);
- 	}
- 
- 	size = humanize_size(alpm_pkg_get_isize(pkg), 'K', 2, &label);
--	printf(_("Installed Size : %6.2f %s\n"), size, label);
-+	color_printf(COLOR_WHITE_COLON, _("Installed Size : %6.2f %s\n"), size, label);
- 
--	string_display(_("Packager       :"), alpm_pkg_get_packager(pkg));
--	string_display(_("Architecture   :"), alpm_pkg_get_arch(pkg));
--	string_display(_("Build Date     :"), bdatestr);
-+	string_display(COLOR_WHITE_ALL, _("Packager       :"), alpm_pkg_get_packager(pkg));
-+	string_display(COLOR_WHITE_ALL, _("Architecture   :"), alpm_pkg_get_arch(pkg));
-+	string_display(COLOR_WHITE_ALL, _("Build Date     :"), bdatestr);
- 	if(from == PKG_FROM_LOCALDB) {
--		string_display(_("Install Date   :"), idatestr);
--		string_display(_("Install Reason :"), reason);
-+		string_display(COLOR_WHITE_ALL, _("Install Date   :"), idatestr);
-+		string_display(COLOR_WHITE_ALL, _("Install Reason :"), reason);
- 	}
- 	if(from == PKG_FROM_FILE || from == PKG_FROM_LOCALDB) {
--		string_display(_("Install Script :"),
-+		string_display(COLOR_WHITE_ALL, _("Install Script :"),
- 				alpm_pkg_has_scriptlet(pkg) ?  _("Yes") : _("No"));
- 	}
- 
- 	if(from == PKG_FROM_SYNCDB) {
--		string_display(_("MD5 Sum        :"), alpm_pkg_get_md5sum(pkg));
--		string_display(_("SHA256 Sum     :"), alpm_pkg_get_sha256sum(pkg));
--		string_display(_("Signatures     :"),
-+		string_display(COLOR_WHITE_ALL, _("MD5 Sum        :"), alpm_pkg_get_md5sum(pkg));
-+		string_display(COLOR_WHITE_ALL, _("SHA256 Sum     :"), alpm_pkg_get_sha256sum(pkg));
-+		string_display(COLOR_WHITE_ALL, _("Signatures     :"),
- 				alpm_pkg_get_base64_sig(pkg) ? _("Yes") : _("None"));
- 	}
- 	if(from == PKG_FROM_FILE) {
- 		alpm_siglist_t siglist;
- 		int err = alpm_pkg_check_pgp_signature(pkg, &siglist);
- 		if(err && alpm_errno(config->handle) == ALPM_ERR_SIG_MISSING) {
--			string_display(_("Signatures     :"), _("None"));
-+			string_display(COLOR_WHITE_ALL, _("Signatures     :"), _("None"));
- 		} else if(err) {
--			string_display(_("Signatures     :"),
-+			string_display(COLOR_WHITE_ALL, _("Signatures     :"),
- 					alpm_strerror(alpm_errno(config->handle)));
- 		} else {
- 			signature_display(_("Signatures     :"), &siglist);
- 		}
- 		alpm_siglist_cleanup(&siglist);
- 	}
--	string_display(_("Description    :"), alpm_pkg_get_desc(pkg));
-+	string_display(COLOR_WHITE_ALL, _("Description    :"), alpm_pkg_get_desc(pkg));
- 
- 	/* Print additional package info if info flag passed more than once */
- 	if(from == PKG_FROM_LOCALDB && extra) {
-@@ -219,7 +219,7 @@ void dump_pkg_backups(alpm_pkg_t *pkg)
- {
- 	alpm_list_t *i;
- 	const char *root = alpm_option_get_root(config->handle);
--	printf(_("Backup Files:\n"));
-+	color_printf(COLOR_WHITE_ALL, _("Backup Files:\n"));
- 	if(alpm_pkg_get_backup(pkg)) {
- 		/* package has backup files, so print them */
- 		for(i = alpm_pkg_get_backup(pkg); i; i = alpm_list_next(i)) {
-@@ -252,7 +252,8 @@ void dump_pkg_files(alpm_pkg_t *pkg, int
- 	for(i = 0; i < pkgfiles->count; i++) {
- 		const alpm_file_t *file = pkgfiles->files + i;
- 		if(!quiet) {
--			printf("%s %s%s\n", pkgname, root, file->name);
-+			color_printf(COLOR_WHITE_ALL, "%s", pkgname);
-+			printf(" %s%s\n", root, file->name);
- 		} else {
- 			printf("%s%s\n", root, file->name);
- 		}
-diff -up -Npaur a/src/pacman/pacman.c b/src/pacman/pacman.c
---- a/src/pacman/pacman.c	2012-02-15 23:57:20.000000000 +0200
-+++ b/src/pacman/pacman.c	2012-07-20 21:48:20.266827634 +0300
-@@ -219,11 +219,23 @@ static void usage(int op, const char * c
-  */
- static void version(void)
- {
-+	color_printf(COLOR_YELLOW_ALL, " .--. ");
-+	printf("        ");
-+	color_printf(COLOR_RED_ALL, " .---. ");
-+	printf("  Pacman-color v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version());
-+	color_printf(COLOR_YELLOW_ALL, "/ _.-'");
-+	color_printf(COLOR_WHITE_ALL, " .-.  .-");
-+	color_printf(COLOR_RED_ALL, "|O O  |");
-+	printf("  Copyright (C) 2006-2012 Pacman Development Team\n");
-+	color_printf(COLOR_YELLOW_ALL, "\\  '-.");
-+	color_printf(COLOR_WHITE_ALL, " '-'  '-");
-+	color_printf(COLOR_RED_ALL, "|~~~  |");
-+	printf("  Copyright (C) 2002-2006 Judd Vinet\n");
-+	color_printf(COLOR_YELLOW_ALL, " '--' ");
-+	printf("        ");
-+	color_printf(COLOR_RED_ALL, "|.-.-.|");
-+	printf("  Colored by vogo <vogo(at)seznam(dot)cz>\n");
- 	printf("\n");
--	printf(" .--.                  Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version());
--	printf("/ _.-' .-.  .-.  .-.   Copyright (C) 2006-2012 Pacman Development Team\n");
--	printf("\\  '-. '-'  '-'  '-'   Copyright (C) 2002-2006 Judd Vinet\n");
--	printf(" '--'\n");
- 	printf(_("                       This program may be freely redistributed under\n"
- 	         "                       the terms of the GNU General Public License.\n"));
- 	printf("\n");
-@@ -795,6 +807,7 @@ int main(int argc, char *argv[])
- 
- 	/* init config data */
- 	config = config_new();
-+	parsecolorconfig();
- 
- 	/* disable progressbar if the output is redirected */
- 	if(!isatty(fileno(stdout))) {
-@@ -896,18 +909,18 @@ int main(int argc, char *argv[])
- 
- 	if(config->verbose > 0) {
- 		alpm_list_t *i;
--		printf("Root      : %s\n", alpm_option_get_root(config->handle));
--		printf("Conf File : %s\n", config->configfile);
--		printf("DB Path   : %s\n", alpm_option_get_dbpath(config->handle));
--		printf("Cache Dirs: ");
-+		string_display(COLOR_WHITE_ALL, "Root      :", alpm_option_get_root(config->handle));
-+		string_display(COLOR_WHITE_ALL, "Conf File :", config->configfile);
-+		string_display(COLOR_WHITE_ALL, "DB Path   :", alpm_option_get_dbpath(config->handle));
-+		color_printf(COLOR_WHITE_ALL, "Cache Dirs: ");
- 		for(i = alpm_option_get_cachedirs(config->handle); i; i = alpm_list_next(i)) {
- 			printf("%s  ", (char *)alpm_list_getdata(i));
- 		}
- 		printf("\n");
--		printf("Lock File : %s\n", alpm_option_get_lockfile(config->handle));
--		printf("Log File  : %s\n", alpm_option_get_logfile(config->handle));
--		printf("GPG Dir   : %s\n", alpm_option_get_gpgdir(config->handle));
--		list_display("Targets   :", pm_targets);
-+		string_display(COLOR_WHITE_ALL, "Lock File :", alpm_option_get_lockfile(config->handle));
-+		string_display(COLOR_WHITE_ALL, "Log File  :", alpm_option_get_logfile(config->handle));
-+		string_display(COLOR_WHITE_ALL, "GPG Dir   :", alpm_option_get_gpgdir(config->handle));
-+		list_display(COLOR_WHITE_ALL, "Targets   :", pm_targets);
- 	}
- 
- 	/* Log command line */
-diff -up -Npaur a/src/pacman/query.c b/src/pacman/query.c
---- a/src/pacman/query.c	2011-12-23 22:36:36.000000000 +0200
-+++ b/src/pacman/query.c	2012-07-20 21:48:20.268827634 +0300
-@@ -266,7 +266,9 @@ static int query_search(alpm_list_t *tar
- 		alpm_pkg_t *pkg = alpm_list_getdata(i);
- 
- 		if(!config->quiet) {
--			printf("local/%s %s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg));
-+			color_printf(COLOR_MAGENTA_ALL, "local/");
-+			color_printf(COLOR_WHITE_ALL, "%s ", alpm_pkg_get_name(pkg));
-+			color_printf(COLOR_GREEN_ALL, "%s", alpm_pkg_get_version(pkg));
- 		} else {
- 			printf("%s", alpm_pkg_get_name(pkg));
- 		}
-@@ -275,16 +277,11 @@ static int query_search(alpm_list_t *tar
- 		if(!config->quiet) {
- 			if((grp = alpm_pkg_get_groups(pkg)) != NULL) {
- 				alpm_list_t *k;
--				printf(" (");
-+				color_printf(COLOR_BLUE_ALL, " (");
- 				for(k = grp; k; k = alpm_list_next(k)) {
- 					const char *group = alpm_list_getdata(k);
--					printf("%s", group);
--					if(alpm_list_next(k)) {
--						/* only print a spacer if there are more groups */
--						printf(" ");
--					}
-+					color_printf(COLOR_BLUE_ALL, "%s%s", group, (alpm_list_next(k) ? " " : ")"));
- 				}
--				printf(")");
- 			}
- 
- 			/* we need a newline and initial indent first */
-@@ -315,7 +312,8 @@ static int query_group(alpm_list_t *targ
- 
- 			for(p = grp->packages; p; p = alpm_list_next(p)) {
- 				alpm_pkg_t *pkg = alpm_list_getdata(p);
--				printf("%s %s\n", grp->name, alpm_pkg_get_name(pkg));
-+				color_printf(COLOR_BLUE_ALL, "%s ", grp->name);
-+				color_printf(COLOR_WHITE_ALL, "%s\n", alpm_pkg_get_name(pkg));
- 			}
- 		}
- 	} else {
-@@ -327,8 +325,8 @@ static int query_group(alpm_list_t *targ
- 				const alpm_list_t *p;
- 				for(p = grp->packages; p; p = alpm_list_next(p)) {
- 					if(!config->quiet) {
--						printf("%s %s\n", grpname,
--								alpm_pkg_get_name(alpm_list_getdata(p)));
-+						color_printf(COLOR_BLUE_ALL, "%s ", grpname);
-+						color_printf(COLOR_WHITE_ALL, "%s\n", alpm_pkg_get_name(alpm_list_getdata(p)));
- 					} else {
- 						printf("%s\n", alpm_pkg_get_name(alpm_list_getdata(p)));
- 					}
-@@ -478,7 +476,8 @@ static int display(alpm_pkg_t *pkg)
- 	if(!config->op_q_info && !config->op_q_list
- 			&& !config->op_q_changelog && !config->op_q_check) {
- 		if(!config->quiet) {
--			printf("%s %s\n", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg));
-+			color_printf(COLOR_WHITE_ALL, "%s ", alpm_pkg_get_name(pkg));
-+			color_printf(COLOR_GREEN_ALL, "%s\n", alpm_pkg_get_version(pkg));
- 		} else {
- 			printf("%s\n", alpm_pkg_get_name(pkg));
- 		}
-diff -up -Npaur a/src/pacman/remove.c b/src/pacman/remove.c
---- a/src/pacman/remove.c	2012-02-06 13:36:22.000000000 +0200
-+++ b/src/pacman/remove.c	2012-07-20 21:48:20.268827634 +0300
-@@ -111,14 +111,14 @@ int pacman_remove(alpm_list_t *targets)
- 			case ALPM_ERR_PKG_INVALID_ARCH:
- 				for(i = data; i; i = alpm_list_next(i)) {
- 					char *pkg = alpm_list_getdata(i);
--					printf(_(":: package %s does not have a valid architecture\n"), pkg);
-+					color_printf(COLOR_DOUBLECOLON, _(":: package %s does not have a valid architecture\n"), pkg);
- 				}
- 				break;
- 			case ALPM_ERR_UNSATISFIED_DEPS:
- 				for(i = data; i; i = alpm_list_next(i)) {
- 					alpm_depmissing_t *miss = alpm_list_getdata(i);
- 					char *depstring = alpm_dep_compute_string(miss->depend);
--					printf(_(":: %s: requires %s\n"), miss->target, depstring);
-+					color_printf(COLOR_DOUBLECOLON, _(":: %s: requires %s\n"), miss->target, depstring);
- 					free(depstring);
- 				}
- 				break;
-@@ -140,7 +140,7 @@ int pacman_remove(alpm_list_t *targets)
- 			holdpkg = 1;
- 		}
- 	}
--	if(holdpkg && (noyes(_("HoldPkg was found in target list. Do you want to continue?")) == 0)) {
-+	if(holdpkg && (noyes(NULL, _("HoldPkg was found in target list. Do you want to continue?")) == 0)) {
- 		retval = 1;
- 		goto cleanup;
- 	}
-@@ -160,7 +160,7 @@ int pacman_remove(alpm_list_t *targets)
- 	/* print targets and ask user confirmation */
- 	display_targets();
- 	printf("\n");
--	if(yesno(_("Do you want to remove these packages?")) == 0) {
-+	if(yesno(NULL, _("Do you want to remove these packages?")) == 0) {
- 		retval = 1;
- 		goto cleanup;
- 	}
-diff -up -Npaur a/src/pacman/sync.c b/src/pacman/sync.c
---- a/src/pacman/sync.c	2012-03-13 15:24:11.000000000 +0200
-+++ b/src/pacman/sync.c	2012-07-20 21:48:20.269827634 +0300
-@@ -146,8 +146,8 @@ static int sync_cleandb_all(void)
- 	int ret = 0;
- 
- 	dbpath = alpm_option_get_dbpath(config->handle);
--	printf(_("Database directory: %s\n"), dbpath);
--	if(!yesno(_("Do you want to remove unused repositories?"))) {
-+	color_printf(COLOR_WHITE_COLON, _("Database directory: %s\n"), dbpath);
-+	if(!yesno(NULL, _("Do you want to remove unused repositories?"))) {
- 		return 0;
- 	}
- 	printf(_("removing unused sync repositories...\n"));
-@@ -175,7 +175,7 @@ static int sync_cleancache(int level)
- 	int ret = 0;
- 
- 	for(i = cachedirs; i; i = alpm_list_next(i)) {
--		printf(_("Cache directory: %s\n"), (char *)alpm_list_getdata(i));
-+		color_printf(COLOR_WHITE_COLON, _("Cache directory: %s\n"), (char *)alpm_list_getdata(i));
- 	}
- 
- 	if(!config->cleanmethod) {
-@@ -184,19 +184,19 @@ static int sync_cleancache(int level)
- 	}
- 
- 	if(level == 1) {
--		printf(_("Packages to keep:\n"));
-+		color_printf(COLOR_WHITE_COLON, _("Packages to keep:\n"));
- 		if(config->cleanmethod & PM_CLEAN_KEEPINST) {
- 			printf(_("  All locally installed packages\n"));
- 		}
- 		if(config->cleanmethod & PM_CLEAN_KEEPCUR) {
- 			printf(_("  All current sync database packages\n"));
- 		}
--		if(!yesno(_("Do you want to remove all other packages from cache?"))) {
-+		if(!yesno(NULL, _("Do you want to remove all other packages from cache?"))) {
- 			return 0;
- 		}
- 		printf(_("removing old packages from cache...\n"));
- 	} else {
--		if(!noyes(_("Do you want to remove ALL files from cache?"))) {
-+		if(!noyes(NULL, _("Do you want to remove ALL files from cache?"))) {
- 			return 0;
- 		}
- 		printf(_("removing all files from cache...\n"));
-@@ -345,9 +345,9 @@ static void print_installed(alpm_db_t *d
- 	if(lpkg) {
- 		const char *lpkgver = alpm_pkg_get_version(lpkg);
- 		if(strcmp(lpkgver,pkgver) == 0) {
--			printf(" [%s]", _("installed"));
-+			color_printf(COLOR_CYAN_ALL, " [%s]", _("installed"));
- 		} else {
--			printf(" [%s: %s]", _("installed"), lpkgver);
-+			color_printf(COLOR_CYAN_ALL, " [%s: %s]", _("installed"), lpkgver);
- 		}
- 	}
- }
-@@ -380,8 +380,9 @@ static int sync_search(alpm_list_t *sync
- 			alpm_pkg_t *pkg = alpm_list_getdata(j);
- 
- 			if(!config->quiet) {
--				printf("%s/%s %s", alpm_db_get_name(db), alpm_pkg_get_name(pkg),
--							 alpm_pkg_get_version(pkg));
-+				color_printf(COLOR_MAGENTA_ALL, "%s/", alpm_db_get_name(db));
-+				color_printf(COLOR_WHITE_ALL, "%s ", alpm_pkg_get_name(pkg));
-+				color_printf(COLOR_GREEN_ALL, "%s", alpm_pkg_get_version(pkg));
- 			} else {
- 				printf("%s", alpm_pkg_get_name(pkg));
- 			}
-@@ -389,16 +390,11 @@ static int sync_search(alpm_list_t *sync
- 			if(!config->quiet) {
- 				if((grp = alpm_pkg_get_groups(pkg)) != NULL) {
- 					alpm_list_t *k;
--					printf(" (");
-+					color_printf(COLOR_BLUE_ALL, " (");
- 					for(k = grp; k; k = alpm_list_next(k)) {
- 						const char *group = alpm_list_getdata(k);
--						printf("%s", group);
--						if(alpm_list_next(k)) {
--							/* only print a spacer if there are more groups */
--							printf(" ");
--						}
-+						color_printf(COLOR_BLUE_ALL, "%s%s", group, (alpm_list_next(k) ? " " : ")"));
- 					}
--					printf(")");
- 				}
- 
- 				print_installed(db_local, pkg);
-@@ -433,8 +429,8 @@ static int sync_group(int level, alpm_li
- 					/* get names of packages in group */
- 					for(k = grp->packages; k; k = alpm_list_next(k)) {
- 						if(!config->quiet) {
--							printf("%s %s\n", grpname,
--									alpm_pkg_get_name(alpm_list_getdata(k)));
-+							color_printf(COLOR_BLUE_ALL, "%s ", grpname);
-+							color_printf(COLOR_WHITE_ALL, "%s\n", alpm_pkg_get_name(alpm_list_getdata(k)));
- 						} else {
- 							printf("%s\n", alpm_pkg_get_name(alpm_list_getdata(k)));
- 						}
-@@ -451,8 +447,8 @@ static int sync_group(int level, alpm_li
- 
- 				if(level > 1) {
- 					for(k = grp->packages; k; k = alpm_list_next(k)) {
--						printf("%s %s\n", grp->name,
--								alpm_pkg_get_name(alpm_list_getdata(k)));
-+						color_printf(COLOR_BLUE_ALL, "%s ", grp->name);
-+						color_printf(COLOR_WHITE_ALL, "%s\n", alpm_pkg_get_name(alpm_list_getdata(k)));
- 					}
- 				} else {
- 					/* print grp names only, no package names */
-@@ -570,8 +566,9 @@ static int sync_list(alpm_list_t *syncs,
- 			alpm_pkg_t *pkg = alpm_list_getdata(j);
- 
- 			if(!config->quiet) {
--				printf("%s %s %s", alpm_db_get_name(db), alpm_pkg_get_name(pkg),
--						alpm_pkg_get_version(pkg));
-+				color_printf(COLOR_MAGENTA_ALL, "%s ", alpm_db_get_name(db));
-+				color_printf(COLOR_WHITE_ALL, "%s ", alpm_pkg_get_name(pkg));
-+				color_printf(COLOR_GREEN_ALL, "%s", alpm_pkg_get_version(pkg));
- 				print_installed(db_local, pkg);
- 				printf("\n");
- 			} else {
-@@ -654,7 +651,7 @@ static int process_group(alpm_list_t *db
- 
- 
- 	if(config->print == 0) {
--		printf(_(":: There are %d members in group %s:\n"), count,
-+		color_printf(COLOR_DOUBLECOLON, _(":: There are %d members in group %s:\n"), count,
- 				group);
- 		select_display(pkgs);
- 		char *array = malloc(count);
-@@ -771,7 +768,7 @@ static int sync_trans(alpm_list_t *targe
- 	}
- 
- 	if(config->op_s_upgrade) {
--		printf(_(":: Starting full system upgrade...\n"));
-+		color_printf(COLOR_DOUBLECOLON, _(":: Starting full system upgrade...\n"));
- 		alpm_logaction(config->handle, "starting full system upgrade\n");
- 		if(alpm_sync_sysupgrade(config->handle, config->op_s_upgrade >= 2) == -1) {
- 			pm_printf(ALPM_LOG_ERROR, "%s\n", alpm_strerror(alpm_errno(config->handle)));
-@@ -797,14 +794,14 @@ int sync_prepare_execute(void)
- 			case ALPM_ERR_PKG_INVALID_ARCH:
- 				for(i = data; i; i = alpm_list_next(i)) {
- 					char *pkg = alpm_list_getdata(i);
--					printf(_(":: package %s does not have a valid architecture\n"), pkg);
-+					color_printf(COLOR_DOUBLECOLON, _(":: package %s does not have a valid architecture\n"), pkg);
- 				}
- 				break;
- 			case ALPM_ERR_UNSATISFIED_DEPS:
- 				for(i = data; i; i = alpm_list_next(i)) {
- 					alpm_depmissing_t *miss = alpm_list_getdata(i);
- 					char *depstring = alpm_dep_compute_string(miss->depend);
--					printf(_(":: %s: requires %s\n"), miss->target, depstring);
-+					color_printf(COLOR_DOUBLECOLON, _(":: %s: requires %s\n"), miss->target, depstring);
- 					free(depstring);
- 				}
- 				break;
-@@ -813,11 +810,11 @@ int sync_prepare_execute(void)
- 					alpm_conflict_t *conflict = alpm_list_getdata(i);
- 					/* only print reason if it contains new information */
- 					if(conflict->reason->mod == ALPM_DEP_MOD_ANY) {
--						printf(_(":: %s and %s are in conflict\n"),
-+						color_printf(COLOR_DOUBLECOLON, _(":: %s and %s are in conflict\n"),
- 								conflict->package1, conflict->package2);
- 					} else {
- 						char *reason = alpm_dep_compute_string(conflict->reason);
--						printf(_(":: %s and %s are in conflict (%s)\n"),
-+						color_printf(COLOR_DOUBLECOLON, _(":: %s and %s are in conflict (%s)\n"),
- 								conflict->package1, conflict->package2, reason);
- 						free(reason);
- 					}
-@@ -850,9 +847,9 @@ int sync_prepare_execute(void)
- 
- 	int confirm;
- 	if(config->op_s_downloadonly) {
--		confirm = yesno(_("Proceed with download?"));
-+		confirm = yesno(NULL, _("Proceed with download?"));
- 	} else {
--		confirm = yesno(_("Proceed with installation?"));
-+		confirm = yesno(NULL, _("Proceed with installation?"));
- 	}
- 	if(!confirm) {
- 		goto cleanup;
-@@ -872,7 +869,7 @@ int sync_prepare_execute(void)
- 									conflict->file, conflict->target, conflict->ctarget);
- 							break;
- 						case ALPM_FILECONFLICT_FILESYSTEM:
--							printf(_("%s: %s exists in filesystem\n"),
-+							color_printf(COLOR_WHITE_COLON, _("%s: %s exists in filesystem\n"),
- 									conflict->target, conflict->file);
- 							break;
- 					}
-@@ -891,7 +888,7 @@ int sync_prepare_execute(void)
- 				break;
- 		}
- 		/* TODO: stderr? */
--		printf(_("Errors occurred, no packages were upgraded.\n"));
-+		color_printf(COLOR_RED_ALL, _("Errors occurred, no packages were upgraded.\n"));
- 		retval = 1;
- 		goto cleanup;
- 	}
-@@ -939,7 +936,7 @@ int pacman_sync(alpm_list_t *targets)
- 
- 	if(config->op_s_sync) {
- 		/* grab a fresh package list */
--		printf(_(":: Synchronizing package databases...\n"));
-+		color_printf(COLOR_DOUBLECOLON, _(":: Synchronizing package databases...\n"));
- 		alpm_logaction(config->handle, "synchronizing package lists\n");
- 		if(!sync_synctree(config->op_s_sync, sync_dbs)) {
- 			return 1;
-@@ -992,9 +989,9 @@ int pacman_sync(alpm_list_t *targets)
- 			alpm_list_t *tmp = NULL;
- 			if(config->op_s_upgrade || (tmp = alpm_list_diff(targets, packages, (alpm_list_fn_cmp)strcmp))) {
- 				alpm_list_free(tmp);
--				printf(_(":: The following packages should be upgraded first :\n"));
--				list_display("   ", packages);
--				if(yesno(_(":: Do you want to cancel the current operation\n"
-+				color_printf(COLOR_DOUBLECOLON, _(":: The following packages should be upgraded first :\n"));
-+				list_display(NULL, "   ", packages);
-+				if(yesno(COLOR_DOUBLECOLON2, _(":: Do you want to cancel the current operation\n"
- 								":: and upgrade these packages now?"))) {
- 					FREELIST(targs);
- 					targs = packages;
-diff -up -Npaur a/src/pacman/util.c b/src/pacman/util.c
---- a/src/pacman/util.c	2012-02-20 07:18:31.000000000 +0200
-+++ b/src/pacman/util.c	2012-07-20 21:48:20.270827634 +0300
-@@ -48,6 +48,20 @@
- #include "conf.h"
- #include "callback.h"
- 
-+#define COLOR_LEN 8
-+
-+typedef struct __colortab_t {
-+	char red[COLOR_LEN + 1];
-+	char green[COLOR_LEN + 1];
-+	char yellow[COLOR_LEN + 1];
-+	char blue[COLOR_LEN + 1];
-+	char magenta[COLOR_LEN + 1];
-+	char cyan[COLOR_LEN + 1];
-+	char white[COLOR_LEN + 1];
-+	char none[COLOR_LEN + 1];
-+} colortab_t;
-+
-+static colortab_t colortab;
- 
- int trans_init(alpm_transflag_t flags, int check_valid)
- {
-@@ -463,10 +477,10 @@ static size_t string_length(const char *
- 	return len;
- }
- 
--void string_display(const char *title, const char *string)
-+void string_display(const colordata_t *colors_title, const char *title, const char *string)
- {
- 	if(title) {
--		printf("%s ", title);
-+		color_printf(colors_title, "%s ", title);
- 	}
- 	if(string == NULL || string[0] == '\0') {
- 		printf(_("None"));
-@@ -599,14 +613,14 @@ int table_display(const char *title, con
- 	return 0;
- }
- 
--void list_display(const char *title, const alpm_list_t *list)
-+void list_display(const colordata_t *colors_title, const char *title, const alpm_list_t *list)
- {
- 	const alpm_list_t *i;
- 	size_t len = 0;
- 
- 	if(title) {
- 		len = string_length(title) + 1;
--		printf("%s ", title);
-+		color_printf(colors_title, "%s ", title);
- 	}
- 
- 	if(!list) {
-@@ -640,13 +654,13 @@ void list_display(const char *title, con
- 	}
- }
- 
--void list_display_linebreak(const char *title, const alpm_list_t *list)
-+void list_display_linebreak(const colordata_t *colors_title, const char *title, const alpm_list_t *list)
- {
- 	size_t len = 0;
- 
- 	if(title) {
- 		len = string_length(title) + 1;
--		printf("%s ", title);
-+		color_printf(colors_title, "%s ", title);
- 	}
- 
- 	if(!list) {
-@@ -867,11 +881,11 @@ static void _display_targets(alpm_list_t
- 		alpm_list_t *header = create_verbose_header(show_dl_size);
- 		if(table_display(str, header, rows) != 0) {
- 			/* fallback to list display if table wouldn't fit */
--			list_display(str, names);
-+			list_display(COLOR_YELLOW_ALL, str, names);
- 		}
- 		alpm_list_free(header);
- 	} else {
--		list_display(str, names);
-+		list_display(COLOR_YELLOW_ALL, str, names);
- 	}
- 	printf("\n");
- 
-@@ -886,21 +900,21 @@ static void _display_targets(alpm_list_t
- 
- 	if(dlsize > 0 || config->op_s_downloadonly) {
- 		size = humanize_size(dlsize, 'M', 2, &label);
--		printf(_("Total Download Size:    %.2f %s\n"), size, label);
-+		color_printf(COLOR_WHITE_COLON, _("Total Download Size:    %.2f %s\n"), size, label);
- 	}
- 	if(!config->op_s_downloadonly) {
- 		if(isize > 0) {
- 			size = humanize_size(isize, 'M', 2, &label);
--			printf(_("Total Installed Size:   %.2f %s\n"), size, label);
-+			color_printf(COLOR_WHITE_COLON, _("Total Installed Size:   %.2f %s\n"), size, label);
- 		}
- 		if(rsize > 0 && isize == 0) {
- 			size = humanize_size(rsize, 'M', 2, &label);
--			printf(_("Total Removed Size:     %.2f %s\n"), size, label);
-+			color_printf(COLOR_WHITE_COLON, _("Total Removed Size:     %.2f %s\n"), size, label);
- 		}
- 		/* only show this net value if different from raw installed size */
- 		if(isize > 0 && rsize > 0) {
- 			size = humanize_size(isize - rsize, 'M', 2, &label);
--			printf(_("Net Upgrade Size:       %.2f %s\n"), size, label);
-+			color_printf(COLOR_WHITE_COLON, _("Net Upgrade Size:       %.2f %s\n"), size, label);
- 		}
- 	}
- }
-@@ -1115,7 +1129,7 @@ void display_new_optdepends(alpm_pkg_t *
- 	alpm_list_t *optdeps = alpm_list_diff(new,old,str_cmp);
- 	if(optdeps) {
- 		printf(_("New optional dependencies for %s\n"), alpm_pkg_get_name(newpkg));
--		list_display_linebreak("   ", optdeps);
-+		list_display_linebreak(NULL, "   ", optdeps);
- 	}
- 	alpm_list_free(optdeps);
- }
-@@ -1125,7 +1139,7 @@ void display_optdepends(alpm_pkg_t *pkg)
- 	alpm_list_t *optdeps = alpm_pkg_get_optdepends(pkg);
- 	if(optdeps) {
- 		printf(_("Optional dependencies for %s\n"), alpm_pkg_get_name(pkg));
--		list_display_linebreak("   ", optdeps);
-+		list_display_linebreak(NULL, "   ", optdeps);
- 	}
- }
- 
-@@ -1133,9 +1147,9 @@ static void display_repo_list(const char
- {
- 	const char *prefix= "  ";
- 
--	printf(":: ");
--	printf(_("Repository %s\n"), dbname);
--	list_display(prefix, list);
-+	color_printf(COLOR_BLUE_ALL, ":: ");
-+	color_printf(COLOR_WHITE_ALL, _("Repository %s\n"), dbname);
-+	list_display(NULL, prefix, list);
- }
- 
- void select_display(const alpm_list_t *pkglist)
-@@ -1354,7 +1368,7 @@ int select_question(int count)
- 
- 
- /* presents a prompt and gets a Y/N answer */
--static int question(short preset, char *fmt, va_list args)
-+static int question(const colordata_t *colors, short preset, char *fmt, va_list args)
- {
- 	char response[32];
- 	FILE *stream;
-@@ -1370,7 +1384,7 @@ static int question(short preset, char *
- 	fflush(stdout);
- 	fflush(stderr);
- 
--	vfprintf(stream, fmt, args);
-+	color_vfprintf(stream, colors, fmt, args);
- 
- 	if(preset) {
- 		fprintf(stream, " %s ", _("[Y/n]"));
-@@ -1407,25 +1421,25 @@ static int question(short preset, char *
- 	return 0;
- }
- 
--int yesno(char *fmt, ...)
-+int yesno(const colordata_t *colors, char *fmt, ...)
- {
- 	int ret;
- 	va_list args;
- 
- 	va_start(args, fmt);
--	ret = question(1, fmt, args);
-+	ret = question(colors, 1, fmt, args);
- 	va_end(args);
- 
- 	return ret;
- }
- 
--int noyes(char *fmt, ...)
-+int noyes(const colordata_t *colors, char *fmt, ...)
- {
- 	int ret;
- 	va_list args;
- 
- 	va_start(args, fmt);
--	ret = question(0, fmt, args);
-+	ret = question(colors, 0, fmt, args);
- 	va_end(args);
- 
- 	return ret;
-@@ -1474,22 +1488,42 @@ int pm_vasprintf(char **string, alpm_log
- 	ret = vasprintf(&msg, format, args);
- 
- 	/* print a prefix to the message */
--	switch(level) {
--		case ALPM_LOG_ERROR:
--			pm_asprintf(string, _("error: %s"), msg);
--			break;
--		case ALPM_LOG_WARNING:
--			pm_asprintf(string, _("warning: %s"), msg);
--			break;
--		case ALPM_LOG_DEBUG:
--			pm_asprintf(string, "debug: %s", msg);
--			break;
--		case ALPM_LOG_FUNCTION:
--			pm_asprintf(string, "function: %s", msg);
--			break;
--		default:
--			pm_asprintf(string, "%s", msg);
--			break;
-+	if(isatty(fileno(stdout))) {
-+		switch(level) {
-+			case ALPM_LOG_ERROR:
-+				pm_asprintf(string, "%s%s%s%s", colortab.red, _("error: "), colortab.none, msg);
-+				break;
-+			case ALPM_LOG_WARNING:
-+				pm_asprintf(string, "%s%s%s%s", colortab.yellow, _("warning: "), colortab.none, msg);
-+				break;
-+			case ALPM_LOG_DEBUG:
-+				pm_asprintf(string, "debug: %s", msg);
-+				break;
-+			case ALPM_LOG_FUNCTION:
-+				pm_asprintf(string, "function: %s", msg);
-+				break;
-+			default:
-+				pm_asprintf(string, "%s", msg);
-+				break;
-+		}
-+	} else {
-+		switch(level) {
-+			case ALPM_LOG_ERROR:
-+				pm_asprintf(string, _("error: %s"), msg);
-+				break;
-+			case ALPM_LOG_WARNING:
-+				pm_asprintf(string, _("warning: %s"), msg);
-+				break;
-+			case ALPM_LOG_DEBUG:
-+				pm_asprintf(string, "debug: %s", msg);
-+				break;
-+			case ALPM_LOG_FUNCTION:
-+				pm_asprintf(string, "function: %s", msg);
-+				break;
-+			default:
-+				pm_asprintf(string, "%s", msg);
-+				break;
-+		}
- 	}
- 	free(msg);
- 
-@@ -1524,10 +1558,10 @@ int pm_vfprintf(FILE *stream, alpm_logle
- 	/* print a prefix to the message */
- 	switch(level) {
- 		case ALPM_LOG_ERROR:
--			fprintf(stream, _("error: "));
-+			color_fprintf(stream, COLOR_RED_ALL, _("error: "));
- 			break;
- 		case ALPM_LOG_WARNING:
--			fprintf(stream, _("warning: "));
-+			color_fprintf(stream, COLOR_YELLOW_ALL, _("warning: "));
- 			break;
- 		case ALPM_LOG_DEBUG:
- 			fprintf(stream, "debug: ");
-@@ -1566,4 +1600,310 @@ char *strndup(const char *s, size_t n)
- }
- #endif
- 
-+/* pacman-color */
-+
-+int _set_color_sequence(const char* name, char* dest)
-+{
-+	int ret = 0;
-+
-+	if(strcmp(name, "black") == 0) {
-+		strncpy(dest, "\033[0;30m", COLOR_LEN);
-+	} else if(strcmp(name, "red") == 0) {
-+		strncpy(dest, "\033[0;31m", COLOR_LEN);
-+	} else if(strcmp(name, "green") == 0) {
-+		strncpy(dest, "\033[0;32m", COLOR_LEN);
-+	} else if(strcmp(name, "yellow") == 0) {
-+		strncpy(dest, "\033[0;33m", COLOR_LEN);
-+	} else if(strcmp(name, "blue") == 0) {
-+		strncpy(dest, "\033[0;34m", COLOR_LEN);
-+	} else if(strcmp(name, "magenta") == 0) {
-+		strncpy(dest, "\033[0;35m", COLOR_LEN);
-+	} else if(strcmp(name, "cyan") == 0) {
-+		strncpy(dest, "\033[0;36m", COLOR_LEN);
-+	} else if(strcmp(name, "white") == 0) {
-+		strncpy(dest, "\033[0;37m", COLOR_LEN);
-+	} else if(strcmp(name, "gray") == 0) {
-+		strncpy(dest, "\033[1;30m", COLOR_LEN);
-+	} else if(strcmp(name, "intensive red") == 0) {
-+		strncpy(dest, "\033[1;31m", COLOR_LEN);
-+	} else if(strcmp(name, "intensive green") == 0) {
-+		strncpy(dest, "\033[1;32m", COLOR_LEN);
-+	} else if(strcmp(name, "intensive yellow") == 0) {
-+		strncpy(dest, "\033[1;33m", COLOR_LEN);
-+	} else if(strcmp(name, "intensive blue") == 0) {
-+		strncpy(dest, "\033[1;34m", COLOR_LEN);
-+	} else if(strcmp(name, "intensive magenta") == 0) {
-+		strncpy(dest, "\033[1;35m", COLOR_LEN);
-+	} else if(strcmp(name, "intensive cyan") == 0) {
-+		strncpy(dest, "\033[1;36m", COLOR_LEN);
-+	} else if(strcmp(name, "intensive white") == 0) {
-+		strncpy(dest, "\033[1;37m", COLOR_LEN);
-+	} else if(strcmp(name, "intensive foreground") == 0) {
-+		strncpy(dest, "\033[m\033[1m", COLOR_LEN);
-+	} else if(strcmp(name, "none") == 0) {
-+		strncpy(dest, "\033[m", COLOR_LEN);
-+	} else {
-+		ret = 1;
-+	}
-+	dest[COLOR_LEN] = '\0';
-+	return(ret);
-+}
-+
-+void _insert_color(FILE* stream, color_t color)
-+{
-+	switch(color) {
-+		case COLOR_RED:
-+			fprintf(stream, colortab.red);
-+			break;
-+		case COLOR_GREEN:
-+			fprintf(stream, colortab.green);
-+			break;
-+		case COLOR_YELLOW:
-+			fprintf(stream, colortab.yellow);
-+			break;
-+		case COLOR_BLUE:
-+			fprintf(stream, colortab.blue);
-+			break;
-+		case COLOR_MAGENTA:
-+			fprintf(stream, colortab.magenta);
-+			break;
-+		case COLOR_CYAN:
-+			fprintf(stream, colortab.cyan);
-+			break;
-+		case COLOR_WHITE:
-+			fprintf(stream, colortab.white);
-+			break;
-+		case COLOR_NONE:
-+			fprintf(stream, colortab.none);
-+			break;
-+		default:;
-+	}
-+}
-+
-+int _parsecolorconfig(colortab_t* colortab, char* file)
-+{
-+	_set_color_sequence("intensive red", colortab->red);
-+	_set_color_sequence("intensive green", colortab->green);
-+	_set_color_sequence("intensive yellow", colortab->yellow);
-+	_set_color_sequence("intensive blue", colortab->blue);
-+	_set_color_sequence("intensive magenta", colortab->magenta);
-+	_set_color_sequence("intensive cyan", colortab->cyan);
-+	_set_color_sequence("intensive foreground", colortab->white);
-+	_set_color_sequence("none", colortab->none);
-+
-+	FILE* fp = NULL;
-+	int linenum = 0;
-+	char line[PATH_MAX+1];
-+	char* ptr;
-+
-+	fp = fopen(file, "r");
-+	if(fp == NULL) {
-+		pm_printf(ALPM_LOG_ERROR, _("config file %s could not be read.\n"), file);
-+		return 1;
-+	}
-+	while(fgets(line, PATH_MAX, fp)) {
-+		linenum++;
-+		strtrim(line);
-+
-+		if(strlen(line) == 0 || line[0] == '#') {
-+			continue;
-+		}
-+		if((ptr = strchr(line, '#'))) {
-+			*ptr = '\0';
-+		}
-+
-+		char* key = line;
-+		ptr = line;
-+		strsep(&ptr, "=");
-+		strtrim(key);
-+		strtrim(ptr);
-+
-+		if(key == NULL) {
-+			pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: syntax error in config file- missing key.\n"),
-+					file, linenum);
-+			return 1;
-+		}
-+		if(strcmp(key, "Red") == 0) {
-+			if(_set_color_sequence(ptr, colortab->red)) {
-+				pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"),
-+							file, linenum, ptr);
-+			}
-+		} else if(strcmp(key, "Green") == 0) {
-+			if(_set_color_sequence(ptr, colortab->green)) {
-+				pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"),
-+							file, linenum, ptr);
-+			}
-+		} else if(strcmp(key, "Yellow") == 0) {
-+			if(_set_color_sequence(ptr, colortab->yellow)) {
-+				pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"),
-+							file, linenum, ptr);
-+			}
-+		} else if(strcmp(key, "Blue") == 0) {
-+			if(_set_color_sequence(ptr, colortab->blue)) {
-+				pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"),
-+							file, linenum, ptr);
-+			}
-+		} else if(strcmp(key, "Magenta") == 0) {
-+			if(_set_color_sequence(ptr, colortab->magenta)) {
-+				pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"),
-+							file, linenum, ptr);
-+			}
-+		} else if(strcmp(key, "Cyan") == 0) {
-+			if(_set_color_sequence(ptr, colortab->cyan)) {
-+				pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"),
-+							file, linenum, ptr);
-+			}
-+		} else if(strcmp(key, "White") == 0) {
-+			if(_set_color_sequence(ptr, colortab->white)) {
-+				pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"),
-+							file, linenum, ptr);
-+			}
-+		} else {
-+			pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: directive '%s' not recognized.\n"),
-+					file, linenum, key);
-+			return(1);
-+		}
-+	}
-+	return(0);
-+}
-+
-+int parsecolorconfig()
-+{
-+	return(_parsecolorconfig(&colortab, "/etc/pacman.d/color.conf"));
-+}
-+
-+int color_vfprintf(FILE* stream, const colordata_t* colors, const char* format, va_list args)
-+{
-+	int ret = 0;
-+
-+	if(isatty(fileno(stream)) && colors) {
-+		char* msg = NULL;
-+		ret = vasprintf(&msg, format, args);
-+		if(msg == NULL) {
-+			return(ret);
-+		}
-+
-+		const colordata_t* colorpos = colors;
-+		color_t colorlast = COLOR_NONE;
-+		int len = strlen(msg) + 1;
-+		wchar_t* wcstr = calloc(len, sizeof(wchar_t));
-+		len = mbstowcs(wcstr, msg, len);
-+		free(msg);
-+		const wchar_t *strpos = wcstr;
-+		
-+		while(*strpos) {
-+			if(colorpos->color != COLOR_END &&
-+				((colorpos->separator == SEP_ANY) ||
-+				 (colorpos->separator == SEP_LINE && *strpos == L'\n') ||
-+				 (colorpos->separator == SEP_COLON && (*strpos == L':' || *strpos == L'：')))) {
-+				_insert_color(stream, colorpos->color);
-+				colorlast = colorpos->color;
-+				colorpos++;
-+			}
-+			fprintf(stream, "%lc", (wint_t)*strpos);
-+			strpos++;
-+		}
-+		free(wcstr);
-+
-+		if(colorlast != COLOR_NONE) {
-+			_insert_color(stream, COLOR_NONE);
-+		}
-+	} else {
-+		ret = vfprintf(stream, format, args);
-+	}
-+	return(ret);
-+}
-+
-+int color_fprintf(FILE* stream, const colordata_t* colors, const char* format, ...)
-+{
-+	int ret;
-+	va_list args;
-+	va_start(args, format);
-+	ret = color_vfprintf(stream, colors, format, args);
-+	va_end(args);
-+	return(ret);
-+}
-+
-+int color_printf(const colordata_t* colors, const char* format, ...)
-+{
-+	int ret;
-+	va_list args;
-+	va_start(args, format);
-+	ret = color_vfprintf(stdout, colors, format, args);
-+	va_end(args);
-+	return(ret);
-+}
-+
-+void color_string_display(const colordata_t* colors_title, const char* title, const colordata_t* colors_string, const char* string)
-+{
-+	if(title) {
-+		color_printf(colors_title, "%s ", title);
-+	}
-+	if(string == NULL || string[0] == '\0') {
-+		printf(_("None"));
-+	} else {
-+		color_printf(colors_string, "%s", string);
-+	}
-+	printf("\n");
-+}
-+
-+const colordata_t COLOR_WHITE_ALL[] = {
-+	{ SEP_ANY, COLOR_WHITE },
-+	{ SEP_LINE, COLOR_NONE },
-+	{ SEP_ANY, COLOR_END } };
-+
-+const colordata_t COLOR_GREEN_ALL[] = {
-+	{ SEP_ANY, COLOR_GREEN },
-+	{ SEP_LINE, COLOR_NONE },
-+	{ SEP_ANY, COLOR_END } };
-+
-+const colordata_t COLOR_RED_ALL[] = {
-+	{ SEP_ANY, COLOR_RED },
-+	{ SEP_LINE, COLOR_NONE },
-+	{ SEP_ANY, COLOR_END } };
-+
-+const colordata_t COLOR_BLUE_ALL[] = {
-+	{ SEP_ANY, COLOR_BLUE },
-+	{ SEP_LINE, COLOR_NONE },
-+	{ SEP_ANY, COLOR_END } };
-+
-+const colordata_t COLOR_YELLOW_ALL[] = {
-+	{ SEP_ANY, COLOR_YELLOW },
-+	{ SEP_LINE, COLOR_NONE },
-+	{ SEP_ANY, COLOR_END } };
-+
-+const colordata_t COLOR_MAGENTA_ALL[] = {
-+	{ SEP_ANY, COLOR_MAGENTA },
-+	{ SEP_LINE, COLOR_NONE },
-+	{ SEP_ANY, COLOR_END } };
-+
-+const colordata_t COLOR_CYAN_ALL[] = {
-+	{ SEP_ANY, COLOR_CYAN },
-+	{ SEP_LINE, COLOR_NONE },
-+	{ SEP_ANY, COLOR_END } };
-+
-+const colordata_t COLOR_DOUBLECOLON[] = {
-+	{ SEP_ANY, COLOR_BLUE },
-+	{ SEP_ANY, COLOR_SAME },
-+	{ SEP_ANY, COLOR_WHITE },
-+	{ SEP_LINE, COLOR_NONE },
-+	{ SEP_ANY, COLOR_END } };
-+
-+const colordata_t COLOR_DOUBLECOLON2[] = {
-+	{ SEP_ANY, COLOR_BLUE },
-+	{ SEP_ANY, COLOR_SAME },
-+	{ SEP_ANY, COLOR_WHITE },
-+	{ SEP_LINE, COLOR_NONE },
-+	{ SEP_ANY, COLOR_BLUE },
-+	{ SEP_ANY, COLOR_SAME },
-+	{ SEP_ANY, COLOR_WHITE },
-+	{ SEP_LINE, COLOR_NONE },
-+	{ SEP_ANY, COLOR_END } };
-+
-+const colordata_t COLOR_WHITE_COLON[] = {
-+	{ SEP_ANY, COLOR_WHITE },
-+	{ SEP_COLON, COLOR_SAME },
-+	{ SEP_ANY, COLOR_NONE },
-+	{ SEP_ANY, COLOR_END } };
-+
- /* vim: set ts=2 sw=2 noet: */
-diff -up -Npaur a/src/pacman/util.h b/src/pacman/util.h
---- a/src/pacman/util.h	2012-02-03 16:56:16.000000000 +0200
-+++ b/src/pacman/util.h	2012-07-20 21:48:20.271827634 +0300
-@@ -45,6 +45,48 @@ typedef struct _pm_target_t {
- 	int is_explicit;
- } pm_target_t;
- 
-+/* pacman-color */
-+typedef enum _separator_t {
-+	SEP_ANY = 0,
-+	SEP_LINE,
-+	SEP_COLON,
-+} separator_t;
-+
-+typedef enum _color_t {
-+	COLOR_END = 0,
-+	COLOR_SAME,
-+	COLOR_RED,
-+	COLOR_GREEN,
-+	COLOR_YELLOW,
-+	COLOR_BLUE,
-+	COLOR_MAGENTA,
-+	COLOR_CYAN,
-+	COLOR_WHITE,
-+	COLOR_NONE,
-+} color_t;
-+
-+typedef struct _colordata_t {
-+	separator_t separator;
-+	color_t color;
-+} colordata_t;
-+
-+extern const colordata_t COLOR_WHITE_ALL[];
-+extern const colordata_t COLOR_GREEN_ALL[];
-+extern const colordata_t COLOR_RED_ALL[];
-+extern const colordata_t COLOR_BLUE_ALL[];
-+extern const colordata_t COLOR_YELLOW_ALL[];
-+extern const colordata_t COLOR_MAGENTA_ALL[];
-+extern const colordata_t COLOR_CYAN_ALL[];
-+extern const colordata_t COLOR_DOUBLECOLON[];
-+extern const colordata_t COLOR_DOUBLECOLON2[];
-+extern const colordata_t COLOR_WHITE_COLON[];
-+
-+int parsecolorconfig();
-+int color_fprintf(FILE* stream, const colordata_t* colors, const char* format, ...) __attribute__((format(printf,3,4)));
-+int color_printf(const colordata_t* colors, const char* format, ...) __attribute__((format(printf,2,3)));
-+int color_vfprintf(FILE* stream, const colordata_t* colors, const char* format, va_list args) __attribute__((format(printf,3,0)));
-+void color_string_display(const colordata_t* colors_title, const char* title, const colordata_t* colors_string, const char* string);
-+
- void trans_init_error(void);
- int trans_init(alpm_transflag_t flags, int check_valid);
- int trans_release(void);
-@@ -58,12 +100,12 @@ void indentprint(const char *str, size_t
- char *strtrim(char *str);
- char *strreplace(const char *str, const char *needle, const char *replace);
- alpm_list_t *strsplit(const char *str, const char splitchar);
--void string_display(const char *title, const char *string);
-+void string_display(const colordata_t *colors_title, const char *title, const char *string);
- double humanize_size(off_t bytes, const char target_unit, int precision,
- 		const char **label);
- int table_display(const char *title, const alpm_list_t *header, const alpm_list_t *rows);
--void list_display(const char *title, const alpm_list_t *list);
--void list_display_linebreak(const char *title, const alpm_list_t *list);
-+void list_display(const colordata_t *colors_title, const char *title, const alpm_list_t *list);
-+void list_display_linebreak(const colordata_t *colors_title, const char *title, const alpm_list_t *list);
- void signature_display(const char *title, alpm_siglist_t *siglist);
- void display_targets(void);
- int str_cmp(const void *s1, const void *s2);
-@@ -73,8 +115,8 @@ void print_packages(const alpm_list_t *p
- void select_display(const alpm_list_t *pkglist);
- int select_question(int count);
- int multiselect_question(char *array, int count);
--int yesno(char *fmt, ...);
--int noyes(char *fmt, ...);
-+int yesno(const colordata_t *colors, char *fmt, ...);
-+int noyes(const colordata_t *colors, char *fmt, ...);
- 
- int pm_printf(alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,2,3)));
- int pm_asprintf(char **string, const char *format, ...);
diff --git a/pcr/pactools/PKGBUILD b/pcr/pactools/PKGBUILD
deleted file mode 100644
index d05953b99..000000000
--- a/pcr/pactools/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Contributor: Pierluigi <pierluigi88@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=pactools
-pkgver=0.8.2
-pkgrel=1
-pkgdesc="A collection of the best tools for pacman"
-arch=('i686' 'x86_64')
-url="http://pierloz.com/pactools"
-license=("GPL")
-depends=('perl' 'bash' 'python')
-source=(pactools pt-pacman-cage pt-pacman-uncage pt-pacsize \
-pt-deptree pt-pacman-info pt-repolist pt-pacfix)
-
-build() {
-  install -d $pkgdir/usr/bin
-  install -m 755 $srcdir/* $pkgdir/usr/bin
-}
diff --git a/pcr/pactools/pactools b/pcr/pactools/pactools
deleted file mode 100755
index 1fe3ddbe8..000000000
--- a/pcr/pactools/pactools
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-green() {
-      echo -e "\033[1;32m${1}\033[1;0m"
-        }
-
-red() {
-      echo -e "\033[1;31m${1}\033[1;0m"
-      }
-
-
-echo 'pactools is a set of useful tools for pacman'
-echo
-echo 'Tools installed:'
-echo
-green ' *  pt-pacman-cage'
-echo '       by: ody'
-echo '       A script to keep the pacman db in a contiguous as possible'
-echo '       place on your hd to make reading it quicker.'
-echo '       Attention: be sure to have the module loop loaded in rc.conf'
-echo '       WEB: http://bbs.archlinux.org/viewtopic.php?id=20385'
-echo
-green ' *   pt-pacman-uncage'
-echo '       by: ody'
-echo '       To uncage your pacman db, after pt-pacman-cage.'
-echo '       Use only if you have problem with pt-pacman-cage and you'
-echo '       want to come back to standard db system'
-echo '       WEB: http://bbs.archlinux.org/viewtopic.php?id=20385'
-echo
-green ' *   pt-pacsize'
-echo '       by: hads'
-echo '       How much disk space do my installed packages use?'
-echo '       This script answers to the question.'
-echo '       WEB: http://bbs.archlinux.org/viewtopic.php?id=20971'
-echo
-green ' *   pt-deptree'
-echo '       by: skoal'
-echo '       A visual representation of packages dependencies'
-echo '       WEB: http://bbs.archlinux.org/viewtopic.php?id=10283'
-echo
-green ' *   pt-pacman-info'
-echo '       by: P�vel Varela Rodr�guez [aka NeOnsKuLL]'
-echo '       List the names of configured repos in your pacman.conf'
-echo '       Calculates the total number of available packages'
-echo '       in each repo;'
-echo '       calculates the number of installed packages.'
-echo '       WEB: http://bbs.archlinux.org/viewtopic.php?id=23124'
-echo
-green ' *   pt-repolist'
-echo '       by: dtw'
-echo '       Shows installed packages from a certain repo.'
-echo '       USAGE: pt-repolist <reponame> [all]'
-echo '       <reponame> is the repository name'
-echo '       [all] to include also NOT installed packages.'
-echo '       WEB: http://bbs.archlinux.org/viewtopic.php?id=12369'
-echo
-green ' *  pt-pacfix'
-echo '       by: pierluigi and fixed by Chris.Giles'
-echo '       A script to list all the packages currently installed,'
-echo '       according to /var/log/pacman.log'
-echo '       WEB: http://bbs.archlinux.org/viewtopic.php?pid=227510'
-echo 
-red 'Please remember: pactools comes with NO WARRANTY, use at your own risk'
diff --git a/pcr/pactools/pt-deptree b/pcr/pactools/pt-deptree
deleted file mode 100755
index edb6f538b..000000000
--- a/pcr/pactools/pt-deptree
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-# Pacman Dependency Tree
-# does NOT handle group names -> unexpected results.
-# Package names using aliases, like x-server, should work.
-# Breaks on circular dependencies -> you better hit ctrl-c.
-
-export LC_ALL=en_US
-
-progname=`basename $0`
-pacexec='pacman'
-leafnull='None'
-branch=""
-vbranch="|   "
-vprune="    "
-hbranch="+---"
-
-_showdep () {
-
-    # Try to use specific pkg req
-    if $pacexec -Qi $1 &> /dev/null ; then
-         # Grab deps list|from "Depends"|Remove Tag \| specific version req's.
-        deplist=`$pacexec -Qi $1|grep Depends|sed 's/^.*: \|>[^ ]*//g;s/ $//'`
-    else # Oops! Failed on alias, try this...
-        deplist=`$pacexec -Qs $1 | sed '1!d;s/\(^.*\/\)\(.*\)\( .*$\)/\2/'`
-    fi
-
-    [ "x$deplist" = "x$leafnull" ] && return
-
-    while [ -n "$deplist" ]
-    do
-        set -- $deplist && echo "$branch$hbranch$1"
-        if [ $# -gt 1 ] ; then
-            branch=${branch}$vbranch
-        else
-            branch=${branch}$vprune
-        fi
-
-        _showdep $1
-
-        deplist=${*:2}
-        branch=${branch:0:${#branch}-${#vprune}}
-    done
-}
-
-branch=$vprune
-
-for pkg in `$pacexec -Q $1 | sed 's/ .*//'`
-do
-    echo $pkg
-    _showdep $pkg
-done
-
-unset _showdep && set --
-exit 0 
diff --git a/pcr/pactools/pt-pacfix b/pcr/pactools/pt-pacfix
deleted file mode 100755
index cd128331e..000000000
--- a/pcr/pactools/pt-pacfix
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-#
-# pacfix.py: a script by pierluigi to list all the packages currently installed according to /var/log/pacman.log
-#            2008-07-04: Modified by Chris Giles to prevent failure when "pacman.log" has lines with only two words
-
-
-pkg=[]
-
-logfile = open("/var/log/pacman.log","r")
-log=logfile.readlines()
-for myline in log:
-    myarray = myline.strip("\n").split(" ")
-    if len(myarray) >= 3 :
-        if (myarray[2]=="installed" or myarray[2]=="upgraded"):
-            if (pkg.count(myarray[3])==0):
-                pkg.append(myarray[3])
-        if (myarray[2]=="removed"):
-            if (pkg.count(myarray[3])!=0):
-                pkg.remove(myarray[3])
-pkg.sort()
-for p in pkg:
-    print(p)
diff --git a/pcr/pactools/pt-pacman-cage b/pcr/pactools/pt-pacman-cage
deleted file mode 100755
index f9248e496..000000000
--- a/pcr/pactools/pt-pacman-cage
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/bin/bash
-#
-#   pacman-cage
-#
-#   Copyright (c) 2002-2006 by Andrew Rose <rose.andrew@gmail.com>
-#   I used Judds pacman-optimise as a framework.
-#
-#   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.
-#
-
-myver='2.9.8.1'
-dbroot="/var/lib/pacman"
-pacmandb="/var/lib/pacman.db"
-
-usage() {
-        echo "pacman-cage $myver"
-        echo "usage: $0 pacman_db_size(MB)"
-        echo
-        echo "pacman-cage creates a loopbacked filesystem in a contigious file."
-        echo "This will give better response times when using pacman"
-	echo "A safe value for pacman_db_size should be > 40"
-	echo
-	echo "If you are unsure, use this:"
-	echo " $0 60"
-        echo
-}
-
-die() {
-        echo "pacman-cage: $*" >&2
-        exit 1
-}
-
-die_r() {
-        rm -f /tmp/pacman.lck
-        die $*
-}
-
-loop_check=`zcat /proc/config.gz | grep CONFIG_BLK_DEV_LOOP | cut -d\= -f2`
-
-if [ "$loop_check" == "m" ]; then
-	if [ `lsmod | grep loop | cut -d\  -f1` != "loop" ]; then
-		echo "Error. You have to load the module 'loop' in rc.conf."
-		exit 1
-	fi
-fi
-
-if [ "$loop_check" == "CONFIG_BLK_DEV_LOOP" ]; then
-	echo "Error. Your kernel config doesn't include CONFIG_BLK_DEV_LOOP."
-	exit 1
-fi
-	
-
-if [ "$#" != "1" ]; then echo "wrong number of parameters" 1>&2 ; usage; exit 0; fi
-
-if [ "$1" != "" ]; then
-        if [ "$1" = "-h" -o "$1" = "--help" ]; then
-                usage
-                exit 0
-        fi
-        dbsize=$1
-fi
-
-if [ "`id -u`" != 0 ]; then
-        die "You must be root to cage the database"
-fi
-
-# make sure pacman isn't running
-if [ -f /tmp/pacman.lck ]; then
-        die "Pacman lockfile was found.  Cannot run while pacman is running."
-fi
-# make sure pacman.db hasnt already been made
-if [ -f $pacmandb ]; then
-        die "$pacmandb already exists!."
-fi
-
-if [ ! -d $dbroot ]; then
-        die "$dbroot does not exist or is not a directory"
-fi
-
-# don't let pacman run while we do this
-touch /tmp/pacman.lck
- 
-# step 1: sum the old db
-echo "==> md5sum'ing the old database..."
-find $dbroot -type f | sort | xargs md5sum >/tmp/pacsums.old
-
-echo "==> creating pacman.db loopback file..."
-dd if=/dev/zero of=$pacmandb bs=1M count=$dbsize > /dev/null 2>&1
-
-echo "==> creating ext2 -O dir_index -b 1024 -m 0 on $pacmandb..."
-yes | mkfs.ext2 -O dir_index -b 1024 -i 1024 -m 0 -F $pacmandb > /dev/null 2>&1
-       
-echo "==> creating temporary mount point /mnt/tmp-pacman.."
-mkdir /mnt/tmp-pacman
-
-echo "==> mounting pacman.db to temporary mount point..."
-mount -o loop $pacmandb /mnt/tmp-pacman
-
-echo "==> copying pacman database to temporary mount point..."
-cp -a /var/lib/pacman/. /mnt/tmp-pacman
-
-echo "==> unmounting temporary mount point..."
-umount /mnt/tmp-pacman
-
-echo "==> removing temporary mount point..."
-rmdir /mnt/tmp-pacman
-       
-echo "==> moving old /var/lib/pacman to /var/lib/pacman.bak..."
-mv /var/lib/pacman /var/lib/pacman.bak
-       
-echo "==> createing new pacman db mount point @ $dbroot..."
-mkdir $dbroot
-
-echo "==> Mounting new pacman db..."
-mount -o loop $pacmandb $dbroot
-
-echo "==> md5sum'ing the new database..."
-find $dbroot -type f | sort | xargs md5sum >/tmp/pacsums.new
-
-echo "==> checking integrity..."
-diff /tmp/pacsums.old /tmp/pacsums.new >/dev/null 2>&1
-if [ $? -ne 0 ]; then
-        # failed, move the old one back into place
-        umount $dbroot
-        rm $pacmandb
-        mv $dbroot.bak $dbroot
-        die_r "integrity check FAILED, reverting to old database"
-fi
-
-echo "==> Updating /etc/fstab to reflect changes..."
-echo "$pacmandb $dbroot ext2 loop,defaults 0 0" >> /etc/fstab
- 
-rm -f /tmp/pacman.lck /tmp/pacsums.old /tmp/pacsums.new
- 
-echo
-echo "Finished.  Your pacman database has been caged!.  May the speedy pacman be with you."
-echo
-
-exit 0 
diff --git a/pcr/pactools/pt-pacman-info b/pcr/pactools/pt-pacman-info
deleted file mode 100755
index c2c82f219..000000000
--- a/pcr/pactools/pt-pacman-info
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-# pacman-info
-# /usr/bin/pacman-info
-# GPL v2
-# neonskull [at] gmail.com
-
-VERSION="0.1"
-AUTHOR="P�vel Varela Rodr�guez [aka NeOnsKuLL]"
-
-usage()
-{
-echo "pacman-info v$VERSION"
-echo "usage: `basename $0` [OPTION]
-
-OPTIONS:
-  -cr|--configured-repos   List the names of configured repos in your
-            pacman.conf
-
-   -a|--all         Calculates the total number of available
-            packages in your repos
-
-  -br|--by-repo         Calculates the total number of available
-            packages in each repo
-
-   -i|--installed      Calculates the number of installed packages
-
-   -f|--full         Generates a full Report
-
-   -h|--help         Show this message
-
-   -v|--version         Show version
-"
-}
-
-[ "$#" -lt 1 ] && PARAM="-h";
-[ "$#" -gt 1 ] && PARAM="*";
-[ "$#" -eq 1 ] && PARAM="$1";
-
-case $PARAM in
-   "-a"|"--all")
-      echo -e "Repositories information (total of packages in repos): `pacman -Sl|wc -l`"
-   ;;
-   "-cr"|"--configured-repos")
-      echo "Repositories information (name of configured repos):"
-      pacman -Sl|awk '{print $1}'|cut -d"/" -f 2|uniq -c|awk '{print "* " $2}'
-   ;;
-   "-br"|"--by-repo")
-      echo "Repositories information (number of packages by repo):"
-      pacman -Sl|awk '{print $1}'|cut -d"/" -f 2|uniq -c|awk '{print ":: "$2 "\t-> " $1 "\tpkgs"}'
-   ;;
-   "-i"|"--installed")
-      echo -e "System information (total of installed packages): `pacman -Q|wc -l`"
-   ;;
-   "-f"|"--full")
-      echo -e "Full Report about Repositories and Packages for Archlinux"
-      echo -e "Node name: `uname -n`\n"
-      $0 -cr
-      echo
-      $0 -a
-      echo
-      $0 -br
-      echo
-      $0 -i
-      echo
-      echo -e "Generated using `$0 -v` by $AUTHOR"
-   ;;
-   "-h"|"--help")
-      usage
-   ;;
-   "-v"|"--version")
-      echo "`basename $0` v$VERSION"
-   ;;
-   *)
-      echo "Error! Unknown parameter."
-      usage
-   ;;
-esac 
diff --git a/pcr/pactools/pt-pacman-uncage b/pcr/pactools/pt-pacman-uncage
deleted file mode 100755
index 12b7e41d3..000000000
--- a/pcr/pactools/pt-pacman-uncage
+++ /dev/null
@@ -1,108 +0,0 @@
-
-#!/bin/bash
-#
-#   pacman-uncage
-#
-#   Copyright (c) 2002-2006 by Andrew Rose <rose.andrew@gmail.com>
-#   I used Judds pacman-optimise as a framework.
-#
-#   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.
-#
-
-myver='2.9.8'
-dbroot="/var/lib/pacman"
-tmproot="/var/lib/pacman.new"
-pacmandb="/var/lib/pacman.db"
-
-usage() {
-        echo "pacman-uncage $myver"
-        echo "usage: $0 [pacman_db_root]"
-        echo
-        echo "pacman-uncage returns your pacman db to the generic style."
-        echo
-}
-
-die() {
-        echo "pacman-uncage: $*" >&2
-        exit 1
-}
-
-die_r() {
-        rm -f /tmp/pacman.lck
-        die $*
-}
-
-if [ "$1" != "" ]; then
-        if [ "$1" = "-h" -o "$1" = "--help" ]; then
-                usage
-                exit 0
-        fi
-        dbroot=$1
-fi
-
-if [ "`id -u`" != 0 ]; then
-        die "You must be root to uncage the database"
-fi
-
-# make sure pacman isn't running
-if [ -f /tmp/pacman.lck ]; then
-        die "Pacman lockfile was found.  Cannot run while pacman is running."
-fi
-
-if [ ! -d $dbroot ]; then
-        die "$dbroot does not exist or is not a directory"
-fi
-
-# don't let pacman run while we do this
-touch /tmp/pacman.lck
-
-# step 1: sum the old db
-echo "==> md5sum'ing the old database..."
-find $dbroot -type f | sort | xargs md5sum >/tmp/pacsums.old
-
-echo "==> copying pacman.db contents back, note: the time needed to get a brew is now."
-mkdir $tmproot
-cp -a $dbroot/. $tmproot
-
-echo "==> unmounting old dbroot and moving new one in"
-umount $dbroot
-rmdir $dbroot
-mv $tmproot $dbroot
-
-echo "==> md5sum'ing the new database..."
-find $dbroot -type f | sort | xargs md5sum >/tmp/pacsums.new
-
-echo "==> checking integrity..."
-diff /tmp/pacsums.old /tmp/pacsums.new >/dev/null 2>&1
-if [ $? -ne 0 ]; then
-        # failed, move the old one back into place
-        rm -rf $dbroot
-        mkdir $dbroot
-        mount -a
-        die_r "integrity check FAILED, reverting to old database"
-fi
-
-echo "==> Removing old pacman.db"
-rm $pacmandb
-
-rm -f /tmp/pacman.lck /tmp/pacsums.old /tmp/pacsums.new
-           
-echo
-echo "Finished.  Your pacman database has been uncaged!. Welcome home."
-echo "You will need to remove the old mount line from your /etc/fstab"
-echo
-
-exit 0 
diff --git a/pcr/pactools/pt-pacsize b/pcr/pactools/pt-pacsize
deleted file mode 100755
index e70a34597..000000000
--- a/pcr/pactools/pt-pacsize
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-##AUTHOR: hads
-##See: http://bbs.archlinux.org/viewtopic.php?t=20971
-
-for i in /var/lib/pacman/local/*; do
-        PKG=`echo $i | cut -d '/' -f 6`
-        SIZE=`grep -A 1 SIZE $i/desc | tail -1`
-        if [ -x /usr/bin/bc ]; then
-                if [ $SIZE -gt 1024 ]; then
-                        if [ $SIZE -gt 1048576 ]; then
-                                SIZE=`echo "scale=1;$SIZE/1048576" | bc`M
-                        else
-                                SIZE=`echo "scale=1;$SIZE/1024" | bc`K
-                        fi
-                else
-                        SIZE={$SIZE}B
-                fi
-        fi
-        echo "$PKG | $SIZE"
-done 
diff --git a/pcr/pactools/pt-repolist b/pcr/pactools/pt-repolist
deleted file mode 100755
index 5f15fe462..000000000
--- a/pcr/pactools/pt-repolist
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-pacman -Qi >./all_files
-
-if [ -z "$1" ] ; then
-   echo -e "\033[0;37mNo repo given!"
-   echo " usage: scriptname reponame"
-fi
-
-reponame=$1
-list=$1_list
-pacman -Sl $reponame >./$list
-sed -i "s|\$reponame |g|" ./$list
-repo=`cat ./$list | cut --fields 2 --delim " "`
-
-for pkg in $repo ; do
-   if [[ $(cat ./all_files | grep -w "$pkg") ]] ; then
-      echo -e "\033[0;34m$pkg\033[0;37m is installed"
-      echo "$pkg" >>./installed_files
-   elif [ "$2" == "all" ] ; then
-      echo -e "\033[0;31m$pkg\033[0;37m is NOT installed"
-   fi
-done
-
-echo
-echo -n "Would you like to save the names of these pkgs to a file? (Y/n) "
-read choice
-if [ "$choice" == "Y" -o  "$choice" == "y" ] ; then
-   echo "Currently in `pwd`"
-   echo -n "   Save as: "
-   read filename
-   if [ -z $filename ] ; then
-      echo "No name given saved as ./installed_files_$reponame"
-      cp -u ./installed_files ./installed_files_$reponame
-   else
-      cp -u ./installed_files $filename
-   fi
-   rm ./installed_files
-else
-   rm ./installed_files
-fi
-rm ./$list ./all_files
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
deleted file mode 100644
index 49fcabcfe..000000000
--- a/pcr/pandoc/PKGBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Based on haskell-pandoc
-
-# Run `makepkg -sp SRCBUILD` if you want to update the source tarball
-
-pkgname=pandoc-static
-_pkgname=pandoc
-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}-1-any.src.tar.xz{,.sig}
-        SRCBUILD)
-replaces=('pandoc')
-provides=('pandoc')
-optdepends=('texlive-most: for pdf creation')
-
-# PKGBUILD functions
-build() {
-   mkdir -p ${srcdir}/{build,${_pkgname}-${pkgver}}
-   cd ${srcdir}/${_pkgname}-${pkgver}
-
-# pandoc-citeproc needs hsb2hs
-   export PATH=${srcdir}/build/usr/bin:$PATH
-
-   while read _hkpkg; do
-# Skip already built
-       [ -d ${srcdir}/build/usr/lib/$_hkpkg ] && continue
-
-       pushd ${srcdir}/${_pkgname}-${pkgver}/${_hkpkg} >/dev/null
-
-       msg2 "Building $_hkpkg"
-
-       case $_hkpkg in
-        $_pkgname-$pkgver)
-         HOME=${srcdir}/${_pkgname}-${pkgver} \
-         cabal configure --prefix=/usr \
-                         --libdir=${srcdir}/build/usr/lib -v
-
-         HOME=${srcdir}/${_pkgname}-${pkgver} \
-         cabal build
-
-         HOME=${srcdir}/${_pkgname}-${pkgver} \
-         cabal register --inplace
-         ;;
-
-        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 build
-         ;;
-
-        *)
-         HOME=${srcdir}/${_pkgname}-${pkgver} \
-         cabal install --prefix=${srcdir}/build/usr --flags="embed_data_files"
-         ;;
-       esac
-
-       popd >/dev/null
-   done <BUILDORDER
-
-}
-
-package() {
-  cd ${srcdir}/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}
-
-  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
-
-  find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
-  find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
-
-  msg2 "Installing licenses"
-  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
deleted file mode 100644
index 242356c89..000000000
--- a/pcr/pandoc/SRCBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Based on haskell-pandoc
-
-pkgname=pandoc
-pkgver=1.12.1
-pkgrel=1
-pkgdesc='Conversion between markup formats (no Haskell libs)'
-url='http://johnmacfarlane.net/pandoc/'
-license=('GPL')
-arch=('any')
-makedepends=('ghc' 'sh' 'cabal-install')
-source=()
-options=(!strip)
-
-# PKGBUILD functions
-build() {
-    mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}}
-    cd ${srcdir}/${pkgname}-${pkgver}
-
-    HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal --verbose=3 update
-
-    HOME=${srcdir}/${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 --flags="embed_data_files bibutils hexpat unicode_collation" --dry-run hsb2hs ${pkgname}-${pkgver} pandoc-citeproc |
-      grep "\-[0-9]\+" |
-      tee BUILDORDER
-}
-
-package() {
-  export PKGEXT=.src.tar.xz
-  export PKGDEST=${SRCDEST}
-
-  mkdir -p ${pkgdir}/${pkgname}-${pkgver}
-  cd ${pkgdir}/${pkgname}-${pkgver}
-
-  find ${srcdir}/${pkgname}-${pkgver} -iname '*.tar.?z' -a \! -iname '00-index.tar.gz' -exec \
-      bsdtar xvf '{}' \;
-
-  cp ${srcdir}/${pkgname}-${pkgver}/BUILDORDER .
-}
diff --git a/pcr/pandoc/citeproc-hs-pre-0.3.7.patch b/pcr/pandoc/citeproc-hs-pre-0.3.7.patch
deleted file mode 100644
index 754a9ac2e..000000000
--- a/pcr/pandoc/citeproc-hs-pre-0.3.7.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-Fri Nov  9 09:31:27 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
-  * fix issue #28
-  add support for generating links to the DOI database.
-Thu Nov  8 21:05:02 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
-  * fix issue #35
-Thu Nov  8 18:24:16 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
-  * a simple script for creating tests
-Thu Nov  8 18:21:56 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
-  * fix a bug in convertQuoted which was producing stack overflows with long strings
-Thu Nov  8 17:27:38 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
-  * fix editJsonInput in order to read the native JSON bibliographic data format
-Thu Nov  8 14:03:26 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
-  * fix issue #37
-Fri Oct 26 18:45:09 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
-  * bump version number
-Fri Oct 26 13:53:20 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
-  tagged 0.3.6
-diff -rN -u old-citeproc-hs/README new-citeproc-hs/README
---- old-citeproc-hs/README	2013-01-22 22:19:52.097159333 -0300
-+++ new-citeproc-hs/README	2013-01-22 22:19:52.107159567 -0300
-@@ -169,6 +169,21 @@
- 
-     Summer, 2001 (the season)
- 
-+### The DOI variable
-+
-+If the DOI variable is prefixed by a `doi:` like:
-+
-+        doi = {doi:10.1038/171737a0}
-+
-+the processor will generate a link and produce this pandoc native
-+representation:
-+
-+       Link [Str "10.1038/171737a0"] ("http://dx.doi.org/10.1038/171737a0", "10.1038/171737a0")
-+
-+that produces a link like:
-+
-+       <a href="http://dx.doi.org/10.1038/171737a0">10.1038/171737a0</a>
-+
- ### Running the test-suite
- 
- To run the test suite, you first need to grab it with [mercurial] by
-diff -rN -u old-citeproc-hs/citeproc-hs.cabal new-citeproc-hs/citeproc-hs.cabal
---- old-citeproc-hs/citeproc-hs.cabal	2013-01-22 22:19:52.103826157 -0300
-+++ new-citeproc-hs/citeproc-hs.cabal	2013-01-22 22:19:52.107159567 -0300
-@@ -1,5 +1,5 @@
- name:               citeproc-hs
--version:            0.3.6
-+version:            0.3.7
- homepage:           http://gorgias.mine.nu/repos/citeproc-hs/
- synopsis:           A Citation Style Language implementation in Haskell
- 
-diff -rN -u old-citeproc-hs/src/Text/CSL/Eval/Output.hs new-citeproc-hs/src/Text/CSL/Eval/Output.hs
---- old-citeproc-hs/src/Text/CSL/Eval/Output.hs	2013-01-22 22:19:52.097159333 -0300
-+++ new-citeproc-hs/src/Text/CSL/Eval/Output.hs	2013-01-22 22:19:52.123826603 -0300
-@@ -29,7 +29,11 @@
- appendOutput fm xs = if xs /= [] then [Output xs fm] else []
- 
- outputList :: Formatting -> Delimiter -> [Output] -> [Output]
--outputList fm d = appendOutput fm . addDelim d
-+outputList fm d = appendOutput fm . addDelim d . map cleanOutput'
-+    where
-+      cleanOutput' o
-+          | Output xs f <- o = Output (cleanOutput xs) f
-+          | otherwise        = rmEmptyOutput o
- 
- cleanOutput :: [Output] -> [Output]
- cleanOutput = flatten
-@@ -37,12 +41,16 @@
-       flatten [] = []
-       flatten (o:os)
-           | ONull       <- o     = flatten os
--          | Output [] _ <- o     = flatten os
--          | OStr []   _ <- o     = flatten os
--          | OUrl []   _ <- o     = flatten os
-           | Output xs f <- o
-           , f == emptyFormatting = flatten xs ++ flatten os
--          | otherwise            = o : flatten os
-+          | otherwise            = rmEmptyOutput o : flatten os
-+
-+rmEmptyOutput :: Output -> Output
-+rmEmptyOutput o
-+    | Output [] _ <- o = ONull
-+    | OStr []   _ <- o = ONull
-+    | OUrl t    _ <- o = if null (fst t) then ONull else o
-+    | otherwise        = o
- 
- addDelim :: String -> [Output] -> [Output]
- addDelim d = foldr (\x xs -> if length xs < 1 then x : xs else check x xs) []
-diff -rN -u old-citeproc-hs/src/Text/CSL/Eval.hs new-citeproc-hs/src/Text/CSL/Eval.hs
---- old-citeproc-hs/src/Text/CSL/Eval.hs	2013-01-22 22:19:52.093825923 -0300
-+++ new-citeproc-hs/src/Text/CSL/Eval.hs	2013-01-22 22:19:52.120493193 -0300
-@@ -25,6 +25,7 @@
- import Control.Applicative ( (<$>) )
- import Control.Monad.State
- import Data.Char
-+import Data.List
- import qualified Data.Map as M
- import Data.Maybe
- 
-@@ -153,7 +154,12 @@
-                              "title"       -> formatTitle f fm
-                              "locator"     -> getLocVar >>= formatRange fm . snd
-                              "url"         -> getStringVar "url" >>= \k ->
--                                              if null k then return [] else return [OUrl k fm]
-+                                              if null k then return [] else return [OUrl (k,k) fm]
-+                             "doi"         -> getStringVar "doi" >>= \d ->
-+                                              if "doi:" `isPrefixOf` d
-+                                                 then let d' = drop 4 d in
-+                                                      return [OUrl ("http://dx.doi.org/" ++ d', d') fm]
-+                                                 else return [OStr d  fm]
-                              _             -> gets (env >>> options &&& abbrevs) >>= \(opts,as) ->
-                                               getVar [] (getFormattedValue opts as f fm s) s >>= \r ->
-                                               consumeVariable s >> return r
-diff -rN -u old-citeproc-hs/src/Text/CSL/Input/Json.hs new-citeproc-hs/src/Text/CSL/Input/Json.hs
---- old-citeproc-hs/src/Text/CSL/Input/Json.hs	2013-01-22 22:19:52.100492747 -0300
-+++ new-citeproc-hs/src/Text/CSL/Input/Json.hs	2013-01-22 22:19:52.123826603 -0300
-@@ -106,6 +106,7 @@
-     , JSObject js <- j = (camel s      , JSArray (editDate $ fromJSObject js))
-     | "family"    <- s = ("familyName" , j)
-     | "suffix"    <- s = ("nameSuffix" , j)
-+    | "URL"       <- s = ("url"        , j)
-     | "edition"   <- s = ("edition"    , toString j)
-     | "volume"    <- s = ("volume"     , toString j)
-     | "issue"     <- s = ("issue"      , toString j)
-@@ -122,7 +123,7 @@
-       camel x
-           | '-':y:ys <- x = toUpper y : camel ys
-           | '_':y:ys <- x = toUpper y : camel ys
--          |     y:ys <- x = toLower y : camel ys
-+          |     y:ys <- x =         y : camel ys
-           | otherwise     = []
- 
-       format (x:xs) = toUpper x : xs
-diff -rN -u old-citeproc-hs/src/Text/CSL/Output/Pandoc.hs new-citeproc-hs/src/Text/CSL/Output/Pandoc.hs
---- old-citeproc-hs/src/Text/CSL/Output/Pandoc.hs	2013-01-22 22:19:52.100492747 -0300
-+++ new-citeproc-hs/src/Text/CSL/Output/Pandoc.hs	2013-01-22 22:19:52.123826603 -0300
-@@ -60,7 +60,7 @@
-     | FS str fm    <- fo = toPandoc fm $ toStr str
-     | FN str fm    <- fo = toPandoc fm $ toStr $ rmZeros str
-     | FO     fm xs <- fo = toPandoc fm $ rest xs
--    | FUrl u fm    <- fo = toPandoc fm [Link (toStr u) (u,u)]
-+    | FUrl u fm    <- fo = toPandoc fm [Link (toStr $ snd u) u]
-     | otherwise = []
-     where
-       addSuffix f i
-@@ -176,8 +176,10 @@
-     | Quoted t inls <- i
-     , b         = case headInline is of
-                     [x] -> if isPunctuation x
--                           then Quoted t (reverseQuoted t inls ++ [Str [x]]) : clean' s b (tailInline is)
--                           else Quoted t (reverseQuoted t inls             ) : clean' s b  is
-+                           then if lastInline inls `elem` [".",",",";",":","!","?"]
-+                                then Quoted t (reverseQuoted t inls             ) : clean' s b (tailInline is)
-+                                else Quoted t (reverseQuoted t inls ++ [Str [x]]) : clean' s b (tailInline is)
-+                           else Quoted t (reverseQuoted t inls) : clean' s b  is
-                     _   -> Quoted t (reverseQuoted  t inls) : clean' s b is
-     | Quoted t inls <- i = Quoted t (reverseQuoted  t inls) : clean' s b is
-     | otherwise = if lastInline [i] == headInline is && isPunct
-@@ -232,7 +234,7 @@
- startWithPunct = and . map (`elem` ".,;:!?") . headInline
- 
- convertQuoted :: Style -> [Inline] -> [Inline]
--convertQuoted s = proc convertQuoted'
-+convertQuoted s = convertQuoted'
-     where
-       locale = let l = styleLocale s in case l of [x] -> x; _   -> Locale [] [] [] [] []
-       getQuote  x y = entityToChar . fst . fromMaybe (x,[]) . lookup (y,Long) . localeTermMap $ locale
-diff -rN -u old-citeproc-hs/src/Text/CSL/Parser.hs new-citeproc-hs/src/Text/CSL/Parser.hs
---- old-citeproc-hs/src/Text/CSL/Parser.hs	2013-01-22 22:19:52.103826157 -0300
-+++ new-citeproc-hs/src/Text/CSL/Parser.hs	2013-01-22 22:19:52.120493193 -0300
-@@ -23,7 +23,6 @@
- #ifdef EMBED_DATA_FILES
- import Data.FileEmbed
- import qualified Data.ByteString as S
--import Data.ByteString.UTF8 ( toString )
- #else
- import Paths_citeproc_hs ( getDataFileName )
- import System.Directory  ( doesFileExist   )
-@@ -69,7 +68,7 @@
-   return s { styleLocale = mergeLocales (styleDefaultLocale s) l (styleLocale s)}
- 
- #ifdef EMBED_DATA_FILES
--localeFiles :: [(FilePath, L.ByteString)]
-+localeFiles :: [(FilePath, S.ByteString)]
- localeFiles = $(embedDir "locales/")
- #endif
- 
-@@ -86,7 +85,7 @@
-             | otherwise     -> case lookup ("locales-" ++ take 5 x ++ ".xml") localeFiles of
-                                  Just x' -> return x'
-                                  _       -> error "could not load the locale file"
--  return $ readXmlString xpLocale f
-+  return $ readXmlString xpLocale $ L.fromChunks [f]
- #else
-   f <- case s of
-          x | length x == 2 -> getDataFileName ("locales/locales-" ++
-diff -rN -u old-citeproc-hs/src/Text/CSL/Style.hs new-citeproc-hs/src/Text/CSL/Style.hs
---- old-citeproc-hs/src/Text/CSL/Style.hs	2013-01-22 22:19:52.093825923 -0300
-+++ new-citeproc-hs/src/Text/CSL/Style.hs	2013-01-22 22:19:52.120493193 -0300
-@@ -20,7 +20,7 @@
-                      , everywhere', everything, mkT, mkQ)
- import qualified Data.Map as M
- import Text.JSON
--import Text.Pandoc.Definition ( Inline )
-+import Text.Pandoc.Definition ( Inline, Target )
- 
- -- | The representation of a parsed CSL style.
- data Style
-@@ -309,8 +309,8 @@
-     = FO          Formatting [FormattedOutput]          -- ^ List of 'FormatOutput' items
-     | FN   String Formatting                            -- ^ Formatted number
-     | FS   String Formatting                            -- ^ Formatted string
--    | FUrl String Formatting                            -- ^ Formatted uniform resource locator (URL)
-     | FDel String                                       -- ^ Delimeter string
-+    | FUrl Target Formatting                            -- ^ Formatted URL
-     | FPan [Inline]                                     -- ^ Pandoc inline elements
-     | FNull                                             -- ^ Null formatting item
-       deriving ( Eq, Show )
-@@ -331,7 +331,7 @@
-     | OContrib String    String   [Output] [Output] [[Output]] -- ^ The citation key, the role (author, editor, etc.), the contributor(s),
-                                                         -- the output needed for year suf. disambiguation, and everything used for
-                                                         -- name disambiguation.
--    | OUrl    String              Formatting            -- ^ A uniform resource locator (URL)
-+    | OUrl    Target              Formatting            -- ^ An URL
-     | OLoc    [Output]            Formatting            -- ^ The citation's locator
-     | Output  [Output]            Formatting            -- ^ Some nested 'Output'
-       deriving ( Eq, Ord, Show, Typeable, Data )
-diff -rN -u old-citeproc-hs/src/Text/CSL/Test.hs new-citeproc-hs/src/Text/CSL/Test.hs
---- old-citeproc-hs/src/Text/CSL/Test.hs	2013-01-22 22:19:52.103826157 -0300
-+++ new-citeproc-hs/src/Text/CSL/Test.hs	2013-01-22 22:19:52.120493193 -0300
-@@ -45,7 +45,8 @@
- import Text.CSL.Style
- import Text.Pandoc.Definition
- #ifdef EMBED_DATA_FILES
--import Data.ByteString.UTF8 ( toString )
-+import qualified Data.ByteString.Lazy as L
-+import qualified Data.ByteString.UTF8 as U
- import Text.CSL.Parser ( localeFiles )
- #else
- import System.IO.Unsafe
-@@ -217,7 +218,7 @@
-                    | otherwise     -> take 5 x
- #ifdef EMBED_DATA_FILES
-   ls <- case lookup ("locales-" ++ locale ++ ".xml") localeFiles of
--          Just x' -> return $ readXmlString xpLocale (toString x')
-+          Just x' -> return $ readXmlString xpLocale $ L.fromChunks [x']
-           _       -> return $ Locale [] [] [] [] []
- #else
-   ls' <- getCachedLocale locale
-diff -rN -u old-citeproc-hs/test/createTest.hs new-citeproc-hs/test/createTest.hs
---- old-citeproc-hs/test/createTest.hs	1969-12-31 21:00:00.000000000 -0300
-+++ new-citeproc-hs/test/createTest.hs	2013-01-22 22:19:52.123826603 -0300
-@@ -0,0 +1,37 @@
-+import System.Environment
-+import Text.CSL
-+import Text.CSL.Test
-+import Text.JSON.Generic
-+
-+main :: IO ()
-+main = do
-+  args <- getArgs
-+  case args of
-+    [c,r] -> readStruff c r [] >>= putStrLn
-+    _ -> error "usage:    kljlkjljlkjlkjl"
-+
-+readStruff :: String -> String -> String -> IO String
-+readStruff c r s = do
-+  c' <- readFile c
-+  r' <- readBiblioFile r
-+  return $ mode "citation" ++ result [] ++ citationItems r' ++ csl c' ++ input r'
-+
-+mode :: String -> String
-+mode s = ">>===== MODE =====>>\n" ++ s ++ "\n<<===== MODE =====<<\n\n"
-+
-+result :: String -> String
-+result s = ">>===== RESULT =====>>\n" ++ s ++ "\n<<===== RESULT =====<<\n\n"
-+
-+citationItems :: [Reference] -> String
-+citationItems l = ">>===== CITATION-ITEMS =====>>\n[\n    [\n" ++ toId ++
-+                  "\n    ]\n]\n<<===== CITATION-ITEMS =====<<\n\n"
-+    where
-+      toId = foldr addComma [] toStringList
-+      addComma x xs = if length xs < 1 then x ++ xs else x ++ ",\n" ++ xs
-+      toStringList = flip map l $ \x -> "        {\n            \"id\": \"" ++ refId x ++ "\"\n        }"
-+
-+csl :: String -> String
-+csl s = ">>===== CSL =====>>\n" ++ s ++ "<<===== CSL =====<<\n\n"
-+
-+input :: [Reference] -> String
-+input s = ">>===== INPUT =====>>\n" ++ encodeJSON s ++ "\n<<===== INPUT =====<<\n\n"
-\ No newline at end of file
diff --git a/pcr/par/PKGBUILD b/pcr/par/PKGBUILD
deleted file mode 100644
index 24707cbba..000000000
--- a/pcr/par/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
-# Contributor: quantax -- contact via Arch Linux forum or AUR
-
-pkgname=par
-pkgver=1.52
-pkgrel=3
-pkgdesc="Paragraph reformatter"
-url="http://www.nicemice.net/par/"
-depends=('glibc')
-arch=(i686 x86_64 mips64el)
-license=('Custom')
-source=(http://www.nicemice.net/par/Par152-autoconf.tar.gz 
-        http://www.nicemice.net/par/par_1.52-i18n.3.diff.gz
-        http://www.nicemice.net/par/Par152.tar.gz )
-md5sums=('83e4d23a943ab07c44dd995b73195c70' 
-         'e79b448cb14323a39d817afce4847cdf'
-         '4ccacd824171ba2c2f14fb8aba78b9bf')
-
-prepare() {
-  cd $srcdir/Par152
-
-  patch -p1 -i $srcdir/par_1.52-i18n.3.diff
-}
-
-build() {
-  cd $srcdir/Par152
-  
-  ./configure --prefix=/usr
-  
-  make
-}
-  
-package() {
-  cd $srcdir/Par152
-  install --mode=755 -D par "${pkgdir}/usr/bin/par"
-  install --mode=644 -D par.1 "${pkgdir}/usr/share/man/man1/par.1"
-  install --mode=644 -D par.doc "${pkgdir}/usr/share/licenses/${pkgname}/par.doc"
-}
diff --git a/pcr/perl-astro-suntime/PKGBUILD b/pcr/perl-astro-suntime/PKGBUILD
deleted file mode 100644
index d615aa3af..000000000
--- a/pcr/perl-astro-suntime/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman
-# Contributor: Ross melin <rdmelin@gmail.com>
-
-# Required by zoneminder
-
-pkgname=perl-astro-suntime
-pkgver=0.01
-pkgrel=2
-pkgdesc="Calculate sun rise/set times"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/~ROBF/Astro-SunTime"
-license=('GPL' 'PerlArtistic')
-depends=('perl-time-modules')
-options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/R/RO/ROBF/Astro-SunTime-$pkgver.tar.gz) 
-md5sums=('4657927a49604494bfaaa153663b90b9')
-
-build() {
-  cd  $startdir/src/Astro-SunTime-$pkgver
-  eval `perl -V:archname`
-  PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL \
-      INSTALLDIRS=vendor || return 1
-  /usr/bin/make || return 1
-  /usr/bin/make DESTDIR=$startdir/pkg install || return 1
-  /usr/bin/find $startdir/pkg -name '.packlist' -delete
-  /usr/bin/find $startdir/pkg -name '*.pod' -delete
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/perl-crypt-dh/PKGBUILD b/pcr/perl-crypt-dh/PKGBUILD
deleted file mode 100644
index e2c9b5a3c..000000000
--- a/pcr/perl-crypt-dh/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer (AUR): Michael Witten
-#
-# Derived from perl-crypt-blowfish:
-#   Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-#   Contributor: Charles Mauch <cmauch@gmail.com>
-#
-# Contributor: Pedro Alejandro López-Valencia <palopezv@gmail.com>
-
-pkgname=perl-crypt-dh
-pkgver=0.07
-pkgrel=3
-
-pkgdesc='Perl/CPAN Module Crypt::DH: Diffie-Hellman key exchange system'
-
-_cpan_name=Crypt-DH-$pkgver
-url=http://search.cpan.org/~mithaldu/$_cpan_name/lib/Crypt/DH.pm
-
-license=(GPL PerlArtistic)
-source=("http://search.cpan.org/CPAN/authors/id/M/MI/MITHALDU/$_cpan_name.tar.gz")
-md5sums=(5494c91420bf77de4af808fcafb6c3ce)
-
-arch=(any)
-makedepends=(make)
-depends=(perl perl-math-bigint-gmp)
-
-build()
-{
-  cd "$srcdir/$_cpan_name"
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check()
-{
-  cd "$srcdir/$_cpan_name"
-  make test
-}
-
-package()
-{
-  cd "$srcdir/$_cpan_name"
-  make pure_install DESTDIR="$pkgdir"
-
-  cd "$pkgdir"
-  find . -name '.packlist' -delete
-  find . -name '*.pod'     -delete
-}
diff --git a/pcr/perl-expect/PKGBUILD b/pcr/perl-expect/PKGBUILD
deleted file mode 100644
index fefa03a0b..000000000
--- a/pcr/perl-expect/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# CPAN Name  : Expect
-# Contributor: Max Roder <maxroder@web.de>
-# Contributor: DarkHeart
-# Generator  : CPANPLUS::Dist::Arch 1.19
-# Maintainer (Parabola): Márcio Silva    <coadde@lavabit.com>
-
-pkgname='perl-expect'
-pkgver='1.21'
-pkgrel='2'
-pkgdesc="Perl version of Don Libes' Tcl-Expect"
-arch=('any')
-license=('PerlArtistic' 'GPL')
-options=('!emptydirs')
-depends=('perl-io-tty>=1.03')
-makedepends=()
-url='http://search.cpan.org/dist/Expect'
-source=('http://search.cpan.org/CPAN/authors/id/R/RG/RGIERSIG/Expect-1.21.tar.gz')
-md5sums=('a151b0dc4d1a35c73941c65b7c26da5b')
-sha512sums=('496716b9e6544e9d6809b7f704df8199291d18ec9ec9ebb4fd2b7b341aa10d9b03989335c1f22d1faddbff0974ceba5b2823685fa08ce6a75e2f3ccaeb944e74')
-_distdir="${srcdir}/Expect-1.21"
-
-build() {
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
-      PERL_AUTOINSTALL=--skipdeps                            \
-      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
-      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
-      MODULEBUILDRC=/dev/null
-
-    cd "$_distdir"
-    /usr/bin/perl Makefile.PL
-    make
-  )
-}
-
-check() {
-  cd "$_distdir"
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
-    make test
-  )
-}
-
-package() {
-  cd "$_distdir"
-  make install
-  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
-}
-
-# Local Variables:
-# mode: shell-script
-# sh-basic-offset: 2
-# End:
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/perl-file-find-rule/PKGBUILD b/pcr/perl-file-find-rule/PKGBUILD
deleted file mode 100644
index 7953217a3..000000000
--- a/pcr/perl-file-find-rule/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: Blaž Tomažič <blaz.tomazic@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=perl-file-find-rule
-_realname=File-Find-Rule
-pkgver=0.33
-pkgrel=1
-pkgdesc="Perl/CPAN Module File::Find::Rule."
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://search.cpan.org/dist/File-Find-Rule/"
-depends=('perl-text-glob' 'perl-number-compare' 'perl')
-options=(!emptydirs)
-source=(http://search.cpan.org/CPAN/authors/id/R/RC/RCLAMP/${_realname}-${pkgver}.tar.gz)
-
-build() {
-  cd $startdir/src/${_realname}-$pkgver
-  # install module in vendor directories.
-  perl Makefile.PL INSTALLDIRS=vendor || return 1
-  make  || return 1
-  make install DESTDIR=${startdir}/pkg || return 1
-
-  # remove perllocal.pod and .packlist
-  find ${startdir}/pkg -name perllocal.pod -delete
-  find ${startdir}/pkg -name .packlist -delete
-}
-
diff --git a/pcr/perl-geo-ipfree/PKGBUILD b/pcr/perl-geo-ipfree/PKGBUILD
deleted file mode 100644
index 394e38ca1..000000000
--- a/pcr/perl-geo-ipfree/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-_author=bricas
-_perlmod=Geo-IPfree
-pkgname=perl-geo-ipfree
-pkgver=1.131650
-pkgrel=1
-pkgdesc="An IPv4 to country lookup database"
-arch=('any')
-url="http://search.cpan.org/~$_author/$_perlmod-$pkgver/"
-license=('GPL' 'PerlArtistic')
-depends=('perl>=5.10.0')
-options=(!emptydirs)
-source=(http://search.cpan.org/CPAN/authors/id/B/BR/BRICAS/$_perlmod-$pkgver.tar.gz)
-md5sums=('23d71e4f9a872184d9b4c6903c5a2b98')
-
-build() {
-  cd "$srcdir/$_perlmod-$pkgver"
-
-  # Install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd "$srcdir/$_perlmod-$pkgver"
-  make install DESTDIR="$pkgdir/"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/perl-iptables-chainmgr/PKGBUILD b/pcr/perl-iptables-chainmgr/PKGBUILD
deleted file mode 100644
index e45a1faf3..000000000
--- a/pcr/perl-iptables-chainmgr/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor: Weirch Sodora <sodora@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=perl-iptables-chainmgr
-pkgver=1.2
-pkgrel=1
-pkgdesc="IPTables::ChainMgr - Perl extension for manipulating iptables and ip6tables policies"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/~mrash/IPTables-ChainMgr/"
-license=('GPL' 'PerlArtistic')
-depends=('perl' 'iptables' 'perl-iptables-parse>=0.9' 'perl-netaddr-ip>=4.0')
-options=('!emptydirs')
-source=(http://search.cpan.org/CPAN/authors/id/M/MR/MRASH/IPTables-ChainMgr-$pkgver.tar.gz)
-
-build() {
-  cd  $startdir/src/IPTables-ChainMgr-$pkgver
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 
-  make || return 1
-  make install DESTDIR=$startdir/pkg || return 1
-  find $startdir/pkg -name '.packlist' -delete
-  find $startdir/pkg -name '*.pod' -delete
-}
diff --git a/pcr/perl-iptables-parse/PKGBUILD b/pcr/perl-iptables-parse/PKGBUILD
deleted file mode 100644
index 94fe8e17a..000000000
--- a/pcr/perl-iptables-parse/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor: Weirch Sodora <sodora@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=perl-iptables-parse
-pkgver=1.1
-pkgrel=1
-pkgdesc="IPTables::Parse - Perl extension for parsing iptables and ip6tables firewall rulesets"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/~mrash/IPTables-Parse/"
-license=('GPL' 'PerlArtistic')
-depends=('perl' 'iptables')
-options=('!emptydirs')
-source=(http://search.cpan.org/CPAN/authors/id/M/MR/MRASH/IPTables-Parse-$pkgver.tar.gz)
-
-build() {
-  cd  $startdir/src/IPTables-Parse-$pkgver
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 
-  make || return 1
-  make install DESTDIR=$startdir/pkg || return 1
-  find $startdir/pkg -name '.packlist' -delete
-  find $startdir/pkg -name '*.pod' -delete
-}
diff --git a/pcr/perl-latex-encode/PKGBUILD b/pcr/perl-latex-encode/PKGBUILD
deleted file mode 100644
index ef7d98b37..000000000
--- a/pcr/perl-latex-encode/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Moritz Bunkus <moritz@bunkus.org>
-
-pkgname=perl-latex-encode
-pkgver=0.08
-pkgrel=1
-pkgdesc="Encode characters for LaTeX formatting"
-arch=(any)
-license=('PerlArtistic')
-url="http://search.cpan.org/dist/Rose-Object/"
-options=('!emptydirs')
-source=(http://search.cpan.org/CPAN/authors/id/A/AN/ANDREWF/LaTeX-Encode-${pkgver}.tar.gz)
-md5sums=('0877ff573bbacdfcd6ceb130c4282ab6')
-sha1sums=('9d11a38a4eb07c86b6cc026a2163b7299bc64631')
-
-build() {
-  cd ${srcdir}/LaTeX-Encode-${pkgver}
-
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd ${srcdir}/LaTeX-Encode-${pkgver}
-  make install DESTDIR=${pkgdir}
-
-  # remove perllocal.pod and .packlist
-  find ${pkgdir} '(' -name perllocal.pod -o -name .packlist ')' -delete
-}
diff --git a/pcr/perl-math-bigint-gmp/PKGBUILD b/pcr/perl-math-bigint-gmp/PKGBUILD
deleted file mode 100644
index 32923d432..000000000
--- a/pcr/perl-math-bigint-gmp/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer (AUR): Pedro Alejandro López-Valencia <palopezv@gmail.com>
-
-_author=PJACKLAM
-_perlmod=Math-BigInt-GMP
-pkgname=perl-math-bigint-gmp
-pkgver=1.37
-pkgrel=2
-pkgdesc="Big integer calculations using the GNU Multiple Precision Arithmetic Library."
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/~$_author/$_perlmod-$pkgver/"
-license=('GPL' 'PerlArtistic')
-depends=('perl>=5.16.2' 'gmp')
-options=(!emptydirs)
-source=(http://cpan.perl.org/modules/by-authors/id/P/PJ/$_author/$_perlmod-$pkgver.tar.gz)
-md5sums=('d11bf69c0471e38191f33144079d0373')
-
-build() {
-  cd "$srcdir/$_perlmod-$pkgver"
-  # Install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "$srcdir/$_perlmod-$pkgver"
-  make test
-}
-
-package() {
-  cd "$srcdir/$_perlmod-$pkgver"
-  make install DESTDIR="$pkgdir/"
-
-  find ${pkgdir} -name '.packlist' -delete
-  find ${pkgdir} -name '*.pod' -delete
-}
-
-# vim:set ts=2 sw=2 et ft=sh:
diff --git a/pcr/perl-mediawiki-api/PKGBUILD b/pcr/perl-mediawiki-api/PKGBUILD
deleted file mode 100644
index 7aa1fb64b..000000000
--- a/pcr/perl-mediawiki-api/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor (AUR): ryooichi <ryooichi+arch AT gmail DOT com>
-# Contributor (AUR): Uwe <keksvernichter AT gmail DOT com>
-
-_author=EXOBUZZ
-_perlmod=MediaWiki-API
-pkgname=perl-mediawiki-api
-pkgver=0.39
-pkgdesc="Perl interface to the MediaWiki API"
-license=('GPL3') # GPLv3+
-url="http://search.cpan.org/perldoc?MediaWiki::API"
-
-pkgrel=1
-
-depends=('perl-json-xs' 'perl-json')
-arch=('any')
-options=('!emptydirs')
-source=(http://search.cpan.org/CPAN/authors/id/${_author:0:1}/${_author:0:2}/${_author}/${_perlmod}-${pkgver}.tar.gz)
-md5sums=('266b8f336241fd608b7094c830a30a55')
-
-build() {
-  cd  "$srcdir/$_perlmod-$pkgver"
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd  "$srcdir/$_perlmod-$pkgver"
-  make install DESTDIR="$pkgdir/"
-}
diff --git a/pcr/perl-net-sftp-foreign/Changes b/pcr/perl-net-sftp-foreign/Changes
deleted file mode 100644
index f730a8973..000000000
--- a/pcr/perl-net-sftp-foreign/Changes
+++ /dev/null
@@ -1,839 +0,0 @@
-Revision history for Net::SFTP::Foreign
-
-1.75  Apr 2, 2013
-        - release as stable
-
-1.74_07  Mar 21, 2013
-        - seek method was returning offset instead of success value
-          (bug report by Paul Kolano).
-
-1.74_06  Mar 12, 2013
-        - disconnect may kill some unrelated process when called
-          repeatly (bug report by Douglas Wilson)
-        - debug was clobbering $!
-
-1.74_05  Feb 5, 2013
-        - error was not being set on timeouts (bug report by Kqfh
-          Jjgrn)
-
-1.74_04  Oct 25, 2012
-        - overwriting rename of a file over itself was broken (bug
-          report by Mike Wilder)
-        - stat and lstat path arguments is now optional and defaults
-          to '.' (bug report by Paul Kolano)
-        - fstat was broken
-        - add git repository and bugtracker into meta files
-
-1.74_03  Sep 21, 2012
-        - put_content was broken (bug report by Caleb Cushing)
-        - document put_content method
-        - add more tests
-
-1.74_02  Jul 11, 2012
-        - rget was dieing when trying to copy remote symbolic links
-        - add support for get method slow-start feature: when file
-          size is unknown don't start asking for $queue_size packets
-          as it slows down the transfer of small files, instead,
-          starting from a queue size of one go gradually increasing it
-          until the stated maximum is reached (bug report by David
-          R. Wagner)
-        - parse supported2 extension
-
-1.74_01
-        - add support for password_prompt (feature request by Douglas
-          Wilson)
-
-1.73  May 11, 2012
-        - password authentication was broken on Solaris (maybe also on
-          others) due to an incorrect waitpid call (bug report and
-          solution by Douglas Wilson)
-        - disconnect was dieing when used with autodie on (bug report
-          by Douglas Wilson)
-
-1.72_02  May 4, 2012
-        - add methods truncate, chmod, chown and utime
-        - make setstat, stat and statvfs accept both a path and a
-          remote file/dir handle as its first argument
-        - deprecate fsetstat, fstat and fstatvfs
-        - refactor remove and rmdir generation
-        - add support for sparse file transfer
-        - minor doc improvements
-
-1.72_01  Mar 20, 2012
-        - add support for asks_for_username_at_login feature (feature
-          request by Horea Gligan)
-        - key_path now can accept an array
-
-1.71  Mar 14, 2012
-        - release as stable
-        - add support for vendor-id extension
-
-1.70_10  Mar 2, 2012
-        - now perm and umask can be used together on get method calls
-        - more cleanups for permission handling code on get method
-
-1.70_09  Mar 2, 2012
-        - autodie was no working for chmod errors on get
-        - get was unlinking the file when chmod failed even whith
-          append or resume set
-        - get was failing when chmod failed even if copy_perms was
-          dissabled (bug report by Rich Anderson)
-        - solve bad interaction between autodie, resume and append
-        - best_effort wrapped methods were not failing ever
-        - minor put method refactoring
-        - save globals on destructor entry
-        - better put method debugging
-
-1.70_08  Feb 19, 2012
-        - queue_size defaults per backend were using the wrong key
-          name and so being ignored. That was causing connections to
-          stall on Windows with the default backend.
-
-1.70_07  Feb 19, 2012
-        - put recovers from open calls failing due to the existence of
-          a remote file with the wrong permissions
-        - do not use accessors for status and error slots internally
-        - test_d and test_e methods where broken when used with
-          autodie, this bug may also affected rget, rput and other
-          high level methods
-
-1.70_06  Feb 13, 2012
-        - add put_content method
-        - support perm option in mget, mput, rget and rput methods
-        - better umask handling, now use an object to reset it at end
-          of scope
-        - improve debugging output
-
-1.70_05  Feb 5, 2012
-        - on Compat::get $remote argument is optional
-        - make Compat::(get|put) use best_effort by default
-        - add support for best_effort feature
-
-1.70_04  Jan 22, 2012
-        - check number of arguments passed to Compat methods
-
-1.70_03  Dec 11, 2011
-        - remove uninitialized warning when using a custom transport
-          (bug report by Kay-C. Baufeld)
-        - several spelling corrections (patch contributed by Nicholas
-          Bamber)
-
-1.70_02  Dec 10, 2011
-        - syntax error, POSIX::WNOHANG was recognized as bareword in
-          perl 5.8
-
-1.70_01  Dec 9, 2011
-        - do not use Expect to handle password authentication but a
-          hand-crafted method that uses IO::Pty directly
-        - solve problem with connections stalling when using password
-          authentication and the remote host was unreachable (bug
-          report by Srini T)
-
-1.69  Dec 9, 2011
-        - release as stable
-
-1.68_08 Oct 11, 2011
-        - accept an array reference in ssh_cmd
-        - use warnings::warnif to generate warnings
-        - minor doc improvements and corrections
-        - in case of sftp-server not found test were not skipped but
-          failed
-
-1.68_07  Oct 10, 2011
-        - password authentication was not working with the new
-          IPC::Open3 replacement code (bug report by Srini T)
-        - empty password handling was also broken
-        - allow setting the backend on all the tests
-
-1.68_06  Oct 9, 2011
-        - do not use the buggy IPC::Open3 under Unix/Linux. This is a
-          mayor internal change, please report any connection problems
-          that were not happening with previous versions of the module
-        - allow testing Windows backend under Unix
-
-1.68_05  Sep 27, 2011
-        - this version is more picky about incomplete responses to
-          stat requests when copy_perms or copy_time are enabled
-          (implicetly or explicitly) on get method
-        - handle incomplete attributes in stat response inside get
-          (bug report by Gus via the Perl Guru Forums).
-
-1.68_04  Sep 7, 2011
-        - accept passing undef as second argument to put, get, rput,
-          rget, mput and mget
-        - catch invalid undefined arguments in several places
-        - custom conversion usage was broken
-        - add %DEFAULTS to Compat package for setting default options
-          for Net::SFTP::Foreign methods called under the hood.
-
-1.68_03  Aug 28, 2011
-        - atomic feature added to get, put and higher level methods
-          using them
-        - cleanup feature added to get and put
-        - support for numbered feature added to rename
-        - save final target name when a reference is passed as
-          numbered option
-        - refactor rput and rget handling of put, put_symlink, get and
-          get_symlink options using hashes
-        - remove operation inside put_symlink was clobbering error and
-          status from previous symlink call
-        - solve several minor bugs related to autodie handling
-        - do not die from inside DESTROY methods when autodie is set
-        - resume feature in get method was broken
-        - refactor numbered logic inside _inc_numbered sub
-        - refactor _gen_save_status_method using local
-
-1.68_02  Jul 20, 2011
-        - make unix2dos clever so it doesn't convert CR+LF sequences
-          into CR+CR+LF (bug report by Pavel Albertyan).
-
-1.68_01  Jul 12, 2011
-        - add workaround for crippled versions of Scalar::Util
-        - document overwrite and numbered options as accepted by the
-          put method (reported by Paul Kolano)
-
-1.67  Jul 4, 2011
-        - released as stable in order to solve critical bug:
-        - solve regresion introduced in 1.63_05 that caused ssh to
-          hang when trying to access the tty
-        - pass password to plink via -pw and generate a warning when
-          doing so
-        - support for key_path constructor argument
-        - support for autodie mode
-        - docs misspelling errors corrected (reported by Michael
-          Stevens)
-
-1.66_01  Jun 3, 2011
-        - allow using regexp objects as patterns on glob and derived
-          methods
-        - some doc improvements
-
-1.65  May 17, 2011
-        - die_on_error was broken
-
-1.64  May 09, 2011
-        - release as stable
-        - document the write_delay and read_ahead options
-        - minor doc corrections
-
-1.63_10  Apr 13, 2011
-        - workaround bug in perl 5.6 calling STORE in a tied
-          filehandle
-        - solve "not enough arguments for grep" when using an old
-          version of Scalar::Util
-
-1.63_09  Apr 12, 2011
-        - an error in the handler accessors was adding and useless
-          wrapping layer
-          
-1.63_08  Jan 22, 2011
-        - bad method call inside mkpath corrected (bug report and
-          solution by Adam Pingel)
-
-1.63_07  Jan 20, 2011
-        - do not override PreferredAuthentication when explicitly set
-          by the user (bug report and solution by Ave Wrigley)
-
-1.63_06  Dec 10, 2010
-        - redirect_stderr_to_tty was redirecting to the wrong side of
-          the tty (bug report by Russ Brewer)
-
-1.63_05  Dec 6, 2010
-        - add support for hardlink@openssh.com extension
-        - add die_on_error method
-        - create a new process group for slave ssh process so that
-          signals sent from the terminal are not propagated
-        - better error messages
-
-1.63_04	 Nov 11, 2010
-	- workaround for IPC::Open3::open3 not working with tied file
-          handles on Windows (bug report by Barnabas Bona)
-        - several spelling corrections (contributed by Philippe Bruhat)
-
-1.63_03  Nov 10, 2010
-        - On some OSs (i.e. AIX) reading/writing from non-blocking fds
-          can result in EAGAIN even when select has indicated that
-          data was available (bug report and patch by Bill Godfrey)
-
-1.63_02  Nov 2, 2010
-        - Windows backend was not pipelining requests when called from
-          put method
-
-1.63_01
-        - support for Tectia client added (bug report by Russ Brewer)
-
-1.62  Oct 5, 2010
-        - _catch_tainted_args was not being imported from helpers (bug
-          report by rfbits at PerlMonks)
-
-1.61  Sep 22, 2010
-        - remove some dead code introducing unneeded constraints that
-          cause the Net::SSH2 backend to fail (bug report by Philippe
-          Vouters)
-
-1.60  Sep 20, 2010
-        - _ensure_list was not being imported from Helpers (bug report
-          and solution by Jean-Benoît Baudens)
-
-1.59  Sep 16, 2010
-	- kill ssh subprocess with KILL signal on Windows
-
-1.58_08  Aug 22, 2010
-	- import _hexdump from Helpers.pm (bug report by Chuck Kozak)
-	- call kill passing the signal name instead of using POSIX to
-          get its number
-
-1.58_07  Aug 2, 2010
-	- dump $! on failed sysreads and syswrites
-
-1.58_06  Jul 12, 2010
-	- rput was broken under Windows (bug report by Brian
-          E. Lozier)
-	- do not use Fcntl S_IS* macro wrappers as S_ISLNK is not
-          available under Windows
-	- new FAQ about put failing because of forbidden setstat
-	- minor doc improvements
-        - use "kill $name" instead of using POSIX to get the signal
-          number
-
-1.58_05  Jun 7, 2010
-	- add support for stderr_discard also in Windows backend
-
-1.58_04  Jun 7, 2010
-	- add support for stderr_discard
-
-1.58_03  May 27, 2010
-        - even more debugging for put method and the resume feature
-
-1.58_02
-        - add FAQ about strict host key checking
-        - better debugging for put method
-
-1.58_01  Apr 19, 2010
-	- add stderr redirection feature
-	- minor doc corrections	 
-	- add donating to OpenSSH entry in docs
-
-1.57  Mar 14, 2010
-        - release as stable
-
-1.56_09  Mar 11, 2010
-	- realpath feature was broken on find and ls methods (bug
-          report by Paul Kolano)
-	- taint checks on hashes were not reporting problems properly
-	- minor doc corrections
-
-1.56_08  Jan 5, 2010
-	- put'ting a tied file handle was generating some warnings
-          (bug report and patch by Gavin Carr)
-
-1.56_07  Dec 29, 2009
-	- new methods added: mget, mput, get_symlink, put_symlink
-	- new numbered feature
-	- some minor bugs corrected
-	- glob can now also be used from Net::SFTP::Foreign::Local
-	- some doc corrections and improvements
-	- _call_on_error was not cleaning up under some conditions
-
-1.56_06  Dec 14, 2009
-	- mkpath was broken, rewritten to not use the obsolete
-          _normalize_path method (bug report by Peter Edwards).
-	- add some tests for mkpath
-	- introduce internal _clear_error_and_status method
-	- completely remove _normalize_path
-	- correct bug in _debug not printing sub name under some
-          conditions
-
-1.56_05  Dec 9, 2009
-	- add support for plugable backends ***THIS IS A MAYOR
-          INTERNAL CHANGE THAT COULD INTRODUCE NEW BUGS***
-
-1.56_04  Dec 8, 2009
-	- remote file path joining sub rewritten (note: this could
-          change the module behaviour in some corner cases)
-	- new test file with path join operations
-	- rput('.',...) was failing due to bad path joining for local
-          filesystem (bug report by Aaron Paetznick).
-	- accept keyboard-interactive authentication
-	- some docs reorganization
-	- add pointer to my wish list :-)
-
-1.56_03  Nov 14, 2009
-	- use SIGTERM to kill children also on Windows
-	- workaround Cygwin bug, fopen(..., a); ftell() does not
-          return the size of the file
-
-1.56_01  Oct 26, 2009
-	- pass PreferredAuthentication option to SSH process to force
-          password authentication (bug and solution by Stewart
-          Heckenberg)
-	- use SIGTERM instead of SIGHUP to kill slave SSH process
-
-1.55  Sep 9, 2009
-        - re-release as stable
-
-1.54_03  Sep 4, 2009
-	- add debugging to _rel2abs
-
-1.54_02  Aug 19, 2009
-	- add extra sanity check to setcwd method. It seems that some
-          servers do not report an error when realpath is called on an
-          inexistent file (bug report by Ben Szulc)
-	- password authentication broken in AIX
-        - some documentation corrections
-        - more tests added
-
-1.54_01  Jul 22, 2009
-        - yet another "Password not requested as expected" bug solved,
-          $pty->close_slave was being called too soon (bug report by
-          Tim Rayner)
-
-1.53  Jul 6, 2009
-        - re-released as stable
-
-1.52_12  Jul 2, 2009
-	- also if using password authentication, detect when the
-          remote host key doesn't match the key stored in know_hosts
-          and abort the connection (bug report by Ryan Niebur).
-	- if using password authentication, detect when the target
-          host key has not been accepted yet (bug report by Ryan
-          Niebur)
-	- work around for IPC::Open3 feature missing in old versions
-          of that module that caused password authentication to fail
-          under 5.6.x perls (bug report by Vetrivel).
-        - find method would not follow links passed as arguments to
-          the method or others found when ordered mode was selected
-          (bug report by Paul Kolano)
-        - detect bad passwords and other password authentication
-          improvements
-        - sample scripts added
-        - atomic_rename was returning the wrong error code/string
-        - Perl 5.11 changes the EOF call interface for tied file
-          handles
-        - attributes flags slot was incorrectly set on new_from_buffer
-        - get/put_int64 optimization
-        - add calling function name to debug output
-        - add debug hexdumps for sysreads and syswrites
-        - optimize some common ls usages to reduce CPU utilization
-        - implement pipelining for ls command
-	- ls bug, wanted was being called with the wrong arguments
-	- add timestamps to debugging output
-	- ensure that attribute arguments are of class
-          Net::SFTP::Foreign::Attributes (feature request by Todd
-          Rinaldo)
-	- put_attributes was broken
-	- move _hexdump to Helpers package
-	- debug subsystem cleanup
-
-1.51  Apr 7, 2009
-        - "get" corrupted the fetched files if $\ was non empty (bug
-          report and solution by Dagfinn Ilmari Mannsaker)
-	- increment default packet and queue size
-
-1.50  Mar 18, 2009
-	- rel2abs was not collapsing duplicated slashes when joining
-          paths, generating paths as '//home' that have an unexpected
-          meaning under Windows (bug report and solution by Erik
-          Weidel)
-
-1.49  Mar 17, 2009
-	- use utf8::downgrade to handle data with may have its utf8
-          flag set (bug report by Jamie Lahowetz, solution by ikegami)
-	- emulate SSH2_FXF_APPEND mode not supported by OpenSSH SFTP
-          server
-	- open flags documented
-	- minor documentation corrections
-	- follow_links option from find method was broken (bug report
-          by Paul Kolano)
-	- spurious debugging message removed from statvfs
-        - put and get now accept a file handle instead of a file name
-          for the local file (feature request by David Morel)
-        - add support for append option in put and get
-	- put and get documentation reorganized
-	- improve write caching behavior, '_write_delay' is used to
-          control the write buffer size (feature request by David
-          Morel)
-
-1.47  Feb 13, 2009
-        - add support for per object dirty cleanup flag required by
-          proper Net::OpenSSH integration
-	- add support for old SSH1
-
-1.46  Dec 18, 2008
-        - release as stable version
-	- improve synopsis documentation
-	- commercial support offering note added
-
-1.45  Nov 11, 2008
-        - reduce localized scope for $SIG{__DIE__} and $@ (bug report
-          by David Serrano and David Riosalido)
-        - workaround incomplete unicode support in perl 5.6.x
-        - new FAQ entry about how to completely disable passwd
-          authentication
-        - add support for OpenSSH protocol extensions statvfs,
-          fstatvfs and posix-rename.
-        - add overwrite feature to rename method
-        - new fs_encoding feature added ***this is a mayor internal
-          change that could introduce new bugs***
-        - when parsing status msgs, the string was not being converted
-          to utf8
-        - croak when utf8 data is written to remote files in any way.
-        - binmode ssh_in and ssh_out
-        - some minor documentation corrections
-        - add support for mkpath (feature requested by Mark Murphy)
-        - add support for late_set_attr (bug report by Oliver Dunbar)
-        - add support for extended file attributes (bug report by
-          Oliver Dunbar)
-        - add support for the autodisconnect feature (bug report by
-          Jared Watkins).
-        - add support for multiprocess debugging
-
-1.44  Oct 9, 2008
-        - put was using block sizes 4 times bigger than
-          requested, bug introduced in 1.41 (reported by Hussain
-          Syed).
-
-1.43  Sep 8, 2008
-        - readline was slurping the full file contents (bug report by
-          Sylvain Cousineau).
-
-1.42  Jul 17, 2008
-        - experimental support for resuming file transfers
-        - some typos fixed
-        - TODO added
-
-1.41  Jul 16, 2008
-        - add support for on the fly data conversions including
-          dos2unix and unix2dos
-        - copy_perm => 0 was being ignored in several methods (bug
-          report by Dave Tauzell)
-
-1.40  Jun 24, 2008
-        - work around for servers that do not include the mandatory
-          error message on SSH_FXP_STATUS responses (bug report by
-          Hugh Lampert).
-
-1.39  Jun 23, 2008
-        - suppress warning on mod_perl environments (bug and solution
-          reported by Eric Rybski).
-
-1.38  May 20, 2008
-        - add experimental support for plink command
-        - on get, don't change file size passed to callback
-        - on get, survive stat failure for servers with stat/readdir
-          disabled (bug reported by Hussain Syed)
-        - default open mode set to read
-        - add support for block_size and queue_size constructor
-          arguments
-        - limit usage of Expect and PTYs to authentication phase (bug
-          reported by Tom Warkentin)
-        - honour copy_perm option in put method (bug report by Bruce
-          Harold)
-        - copy_perms option renamed to copy_perm for consistency
-          (copy_perms still supported)
-        - glob optimization
-        - typo in Net::SFTP::Foreign::Common::_set_errno was not
-          setting $! correctly (bug report by Rafael Kitover)
-        - add debugging support to _do_io and _set_(status|error)
-
-1.36  Apr 18, 2008
-        - forbid usage of Net::SFTP::Foreign methods from Compat
-          module (bug reported by Fred Zellinger)
-        - document the password and passphrase constructor
-          options.
-
-1.35  Feb 8, 2008
-        - put method was failing for binary files under Windows
-          because binmode was not set on the local filehandler (bug
-          report and patch by Patrick Frazer).
-
-1.34  Jan 8, 2008
-        - document rput. It said it was not implemented (bug report
-          by Paul Kolano).
-        - put method was failing for binary files under Windows
-          because binmode was not set on the local filehandler (bug
-          report and patch by Patrick Frazer).
-
-1.33  Jan 6, 2008
-        - rremove was not removing dirs (bug report by Paul Kolano).
-        - require perl >= 5.6
-        - add support for open/close and DESTROY debugging
-
-1.32  Dec 8, 2007
-        - add new question to FAQ
-        - document password and passphrase options (though, not
-          completely).
-        - somo minor documentation changes
-        - on testing look for sftp-server on libexec dirs
-        - and delete temporal files
-
-1.31  Oct 8, 2007
-        - remove Win32::Socketpair loading, it is not used anymore
-        - improve debugging
-        - do not croak when invalid data from the other side appears
-
-1.30  Aug 23, 2007
-        - add support for realpath option to ls method
-        - add support for realpath and names_only to glob method
-        - improve _set_status and _set_error methods
-        - add support for password authentication and for keys with
-          passphrases
-
-1.29  Aug 14, 2007
-        - add support for names_only option to ls and find methods
-        - make ls and find methods default to '.'
-        - DESTROY was also messing with $? and $! values (bug reported
-          by Dave Haywood)
-        - better usage checking for several methods
-        - add support for cwd (experimental)
-        - symlink docs corrected
-        - several other doc corrections
-
-1.28
-        - argument checking in rename was wrong (reported by Greg
-          Howard)
-        - disable DIE custom handlers when using eval
-
-1.27  Jul 7, 2007
-	- catch insecure $ENV{PATH} under taint mode (bug reported by
-	  jmarshll).
-
-1.26  Jul 5, 2007
-        - my email was missing from the docs
-        - make it work under taint checking (experimental feature).
-        - work around bug in dualvar under taint checking
-
-1.25  Jun 19, 2007
-        - remove some obsolete tests not working on 5.9.x
-
-1.24  Jun 18, 2007
-        - DESTROY was messing up $@ (bug reported by Kai Grossjohann)
-        - set $SIG{PIPE} handler inside _do_io to catch IO errors
-        - don't execute external command when transport option is used
-          on constructor
-
-1.23  May 23, 2007
-        - release as stable!
-        - some doc improvements
-
-0.90_22 Apr 29, 2007
-        - experimental Windows support added
-
-0.90_21 Apr 25, 2007
-        - some documentation improvements
-        - check that ctor 'more' arguments are not joined
-        - eliminate "Password" prompt on passwd_auth sample (solution
-          suggested by Fletch on PerlMonks)
-
-0.90_20 Apr 20, 2007
-        - add support for "transport" options on the constructor that
-          allows to use password authentication and keys protected by
-          a passphrase
-        - add password authentication sample
-
-0.90_19 Apr 5, 2007
-        - add abort method (feature requested by Jamie Lahowetz)
-
-0.90_18 Mar 23, 2007
-        - fallback to dirty cleanup if ssh process doesn't exit cleanly in
-          8 seconds (bug reported by Brandon Schendel).
-
-0.90_17 Mar 21, 2007 
-        - add support for dont_save flag in get method, required for
-          Compat module (bug reported by Jamie Lahowetz).
-
-0.90_16 Mar 18, 2007
-        - new tests added
-        - mkdir, rmdir, remove, setstat, fsetstat and _close methods
-          argument parsing was wrong (bug #25101 reported by
-          funkonaut)
-        - wrong detection of Sort::Key corrected
-        - debug mode was broken
-        - network errors do not die anymore, documented
-
-0.90_15 Dec 19 2006
-        - messages were not being queued on get method and so,
-          performance was very bad (reported by "sched" via
-          Perlmonks).
-        - Auto reduce block size on get method.
-
-0.90_14 Nov 8 2006
-        - FAQ section added on the module documentation
-        - Net::SFTP supplant was not working, corrected
-
-0.90_13 Sep 22 2006
-        - fchmod is not available everywhere, don't use it (bug and
-          solution reported by Andre Tomt).
-
-0.90_12 Aug 21 2006
-        - syntax error on Net::SFTP::Foreign::Compat corrected
-          (reported by Hans Schligtenhorst).
-        - supplant was misspelled
-        - correct some dependency problems on Compat.
-        - add test for Compat.
-
-0.90_11 Jun 30 2006
-        - don't croak from connect on runtime errors
-        - workaround bug in IPC::Open3 that leaves two processes
-          running
-
-0.90_10 May 17 2006
-        - 0 is a valid sftp handler.
-
-0.90_09 Apr 25 2006
-	- bug on _do_io method corrected
-
-0.90_08 Apr 24 2006
-	- bug for copy_perms => 0 corrected (reported by Erik
-	  Johansen).
-	- usage checks added to most commands.
-
-0.90_07 Apr 23 2006
-	- don't use pack for quads on little-endian systems (bug
-	  reported by Mogens Hafsjold)
-
-0.90_06 Feb 24 2006
-	- implement rput
-	- use Win32::Socketpair on Windows
-	- implement API for local fs in Local
-	- move common functions to Common and Helpers packages
-
-0.90_05 Feb 23 2006
-	- convert remote file handle strings to tied file handles
-	- most methods changed to mimic perl buil-ins
-	- attach file position to file handles.
-
-0.90_04 Feb 22 2006
-	- remove bug in get that could left remote file handles open
-	- new methods readlink, symlink, rremove, rget.
-
-0.90_03 Feb 21 2006
-	- minor corrections to the docs
-	- new methods glob and join implemented.
-
-0.90_02 Feb 20 2006
-	- added new method find
-	- ls method expanded with callback
-	- contructor rewritten
-	- better docs for Constants package
-	- Compat module updated
-	- several corrections on the docs
-	
-0.90_01 Feb 16 2006
-	- almost full rewrite exposing new much improved and
-	  incompatible API!!!
-
---------------------------------------------------------------------------
-
-0.57  Nov 29 2005
-	- check sysread return value when reading from pipe (bug
-	  report and patch submited by Mina Naguib).
-
-0.56  Nov 14 2005
-	- correct bug on open2_cmd option
-
-0.55  Oct 24 2005
-	- kill ssh process when done (bug reported by Alf Carlsson).
-
-0.54  Sep 07 2005
-	- add support for transferring files bigger than 4GB
-
-0.53  May 03 2005
-	- link to SFTP draft actualised
-
-0.52  May 03 2005
-	- some typos corrected on the docs.
-	
-0.51  May 03 2005
-	- Net::SFTP::Foreign::Buffer reimplemented from scratch. It
-	  doesn't depend on Net::SSH::Perl::Buffer anymore.
-	- use foreign 'ssh' to open connections.
-
-0.50  May 02 2005
-	- Net::SFTP::Foreign FORKED !!!
-
-
---------------------------------------------------------------------------
-Previous revision history for Net::SFTP
-
-0.09  2005.01.16
-    - New co-maintainer, David Robins (DBROBINS).
-    - Adds a 'warn' argument to the constructor to allow supression or
-      redirection of warnings.
-    - Allows the 'ssh_args' constructor argument to be either a hash ref or an
-      array ref.
-    - Adds a 'status' method which returns the last SSH2_FX_* status value, or
-      (status value, text) in list context (only useful after last failure).
-    - Adds brief summary comments to some methods.
-	- Returns failure if the remote open fails for 'get' (previous code ignored
-      it); also moves the remote open before the local open so that we don't
-      create empty local files if the remote file can't be opened.
-	- Changes 'ls' to return an array reference in scalar context.
-	- Documents: the fact that we die on protocol/local errors; the new option
-      and method; changes to 'get'/'put' (formerly 'put' didn't return anything
-      useful, and 'get's actual return values are the same, just better
-      documented).
-	- Adds a comprehensive remote test, but to use it one has to manually go in
-      and configure a server a certain way, so it defaults to skipping
-      everything; I'm including it as a base since there are currently no remote
-      tests at all.
-
-0.08  2003.12.12
-    - Net::SFTP::Buffer was passing an invalid option when loading
-      Net::SSH::Perl::Buffer.
-    - Add SUPPORT section to the docs.
-
-0.07  2003.11.14
-    - Require Net::SSH::Perl 1.24, which also includes circular
-      reference fixes.
-
-0.06  2003.11.14
-    - New maintainer, Dave Rolsky.
-    - Fixed a circular reference which caused connections to be held
-      open indefinitely in a persistent environment like mod_perl.
-      This uses weak references, so Perl 5.6.0+ is now required.  This
-      work was funded by Kineticode, Inc.
-    - Added a LICENSE file.
-
-0.05  2001.05.24
-    - Added help ('h' or '?') command to psftp. Moved all shell
-      functionality into Net::SFTP::Shell.
-    - Net::SFTP::Util needed to 'use Exporter'.
-
-0.04  2001.05.16
-    - Fixed bug in put method when running fsetstat command; it
-      was trying to set the UID/GID on the remote file, which
-      was giving a permission denied message. Should not try to
-      set UID/GID, so had to adjust flags.
-    - Added eg/psftp, a working SFTP shell.
-    - Moved READ and WRITE commands into their own methods
-      (do_read and do_write, respectively).
-    - Changed semantics of get method. Returning the contents of
-      the remote file is no longer connected to whether a local
-      file is passed as an argument; it is instead based on the
-      calling context of 'get'. Updated docs to reflect this.
-
-0.03  2001.05.15
-    - Documentation for all extra classes: Attributes, Buffer,
-      Constants, and Util.
-    - Documentation for command methods in Net::SFTP.
-    - Added binmode when reading/writing from local files.
-    - Added methods for all remaining commands in SFTP protocol
-      version 3 (eg. remove, rmdir, mkdir, realpath, etc.).
-    - Added callbacks to get and put, eg. for status messages,
-      etc.
-    - Fixed typo in Net::SFTP::Buffer::get_int64 that was breaking
-      reading 64-bit ints.
-
-0.02  2001.05.14
-    - Fixed bug with SSH2 server not sending one message per
-      packet, ie. multiple packets have to be retrieved to make
-      up one SFTP message. This would show up as a "Message length
-      too long" error. Thanks to Matt Good for the spot.
-    - Fixed bug with OpenSSH and SSH2 SFTP servers where after
-      a certain amount of bytes the connection would hang. This
-      was a bug in Net::SSH::Perl (channel window sizes) that is
-      fixed in version 1.13.
-
-0.01  2001.05.13
-    - original version; created by h2xs 1.19
diff --git a/pcr/perl-net-sftp-foreign/PKGBUILD b/pcr/perl-net-sftp-foreign/PKGBUILD
deleted file mode 100644
index 5bb9a69a4..000000000
--- a/pcr/perl-net-sftp-foreign/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Alessandro Sagratini <ale_sagra at hotmail dot com>
-pkgname=perl-net-sftp-foreign
-pkgver=1.75
-pkgrel=1
-pkgdesc="Perl SFTP client using the native SSH client application"
-arch=(any)
-url=http://search.cpan.org/~salva/Net-SFTP-Foreign
-license=('GPL' 'PerlArtistic')
-depends=('perl>=5.10.0') 
-optdepends=('perl-file-which' 'perl-sort-key')
-options=(!emptydirs)
-changelog=Changes
-source=(http://search.cpan.org/CPAN/authors/id/S/SA/SALVA/Net-SFTP-Foreign-$pkgver.tar.gz)
-md5sums=('2545691cd69f8515dd9c126cc52e40c5')
-
-build() {
-	cd "$srcdir/Net-SFTP-Foreign-$pkgver"
-
-	# install module in vendor directories.
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir/Net-SFTP-Foreign-$pkgver"
-	make install DESTDIR=${pkgdir} || return 1
-	# remove perllocal.pod and .packlist
-	find "$pkgdir" -name perllocal.pod -delete
-	find "$pkgdir" -name .packlist -delete
-}
diff --git a/pcr/perl-number-compare/PKGBUILD b/pcr/perl-number-compare/PKGBUILD
deleted file mode 100644
index 64566aa10..000000000
--- a/pcr/perl-number-compare/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: Blaž Tomažič <blaz.tomazic@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io>
-
-pkgname=perl-number-compare
-_realname=Number-Compare
-pkgver=0.03
-pkgrel=1
-pkgdesc="Perl/CPAN Module Number::Compare."
-arch=('i686' 'x86_64')
-license=('unknown')
-url="http://search.cpan.org/dist/Number-Compare/"
-depends=('perl')
-options=(!emptydirs)
-source=(http://search.cpan.org/CPAN/authors/id/R/RC/RCLAMP/${_realname}-${pkgver}.tar.gz)
-
-build() {
-  cd $startdir/src/${_realname}-$pkgver
-  # install module in vendor directories.
-  perl Makefile.PL INSTALLDIRS=vendor || return 1
-  make  || return 1
-  make install DESTDIR=${startdir}/pkg || return 1
-
-  # remove perllocal.pod and .packlist
-  find ${startdir}/pkg -name perllocal.pod -delete
-  find ${startdir}/pkg -name .packlist -delete
-}
-
diff --git a/pcr/perl-php-serialization/PKGBUILD b/pcr/perl-php-serialization/PKGBUILD
deleted file mode 100644
index 5ccc64e40..000000000
--- a/pcr/perl-php-serialization/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# CPAN Name  : PHP-Serialization
-# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com>
-# Generator  : CPANPLUS::Dist::Arch 1.25
-
-pkgname='perl-php-serialization'
-pkgver='0.34'
-pkgrel='2'
-pkgdesc="simple flexible means of converting the output of PHP's serialize() into the equivalent Perl memory structure, and vice versa."
-arch=('any')
-license=('PerlArtistic' 'GPL')
-options=('!emptydirs')
-depends=('perl')
-makedepends=()
-url='http://search.cpan.org/dist/PHP-Serialization'
-source=('http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz')
-md5sums=('333af0848ad79931875a35cc61dc22e0')
-sha512sums=('72218973f21ab71419751cf818e6bd998235aa74bf8ae60ec4a6080ba169d0d7fcefde4f433ce3f6f30ed3084a651deb8aa3a5dd818fc6ebf3fb6188def4efe7')
-_distdir="PHP-Serialization-0.34"
-
-build() {
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
-      PERL_AUTOINSTALL=--skipdeps                            \
-      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
-      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
-      MODULEBUILDRC=/dev/null
-
-    cd "$srcdir/$_distdir"
-    /usr/bin/perl Makefile.PL
-    make
-  )
-}
-
-check() {
-  cd "$srcdir/$_distdir"
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
-    make test
-  )
-}
-
-package() {
-  cd "$srcdir/$_distdir"
-  make install
-
-  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
-}
-
-# Local Variables:
-# mode: shell-script
-# sh-basic-offset: 2
-# End:
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/perl-sys-mmap/PKGBUILD b/pcr/perl-sys-mmap/PKGBUILD
deleted file mode 100644
index 43540e07f..000000000
--- a/pcr/perl-sys-mmap/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# CPAN Name  : Sys-Mmap
-# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com>
-# Generator  : CPANPLUS::Dist::Arch 1.25
-
-pkgname='perl-sys-mmap'
-pkgver='0.16'
-pkgrel='3'
-pkgdesc="uses mmap to map in a file as a Perl variable"
-arch=('i686' 'x86_64')
-license=('PerlArtistic' 'GPL')
-options=('!emptydirs')
-depends=('perl')
-makedepends=()
-url='http://search.cpan.org/dist/Sys-Mmap'
-source=('http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/Sys-Mmap-0.16.tar.gz')
-md5sums=('faae869e876fa86f92e6de3f13af3aef')
-sha512sums=('9f533f8eaa2707a77fa69dc0163e5e55b13d6653ddb5f7850c3fcaa090c79069cccedb947c1b8cd5a125fd7b055803eff437697c120785f422bff0414be7cd05')
-_distdir="Sys-Mmap-0.16"
-
-build() {
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
-      PERL_AUTOINSTALL=--skipdeps                            \
-      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
-      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
-      MODULEBUILDRC=/dev/null
-
-    cd "$srcdir/$_distdir"
-    /usr/bin/perl Makefile.PL
-    make
-  )
-}
-
-check() {
-  cd "$srcdir/$_distdir"
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
-    make test
-  )
-}
-
-package() {
-  cd "$srcdir/$_distdir"
-  make install
-
-  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
-}
-
-# Local Variables:
-# mode: shell-script
-# sh-basic-offset: 2
-# End:
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/perl-text-glob/PKGBUILD b/pcr/perl-text-glob/PKGBUILD
deleted file mode 100644
index 194ab831c..000000000
--- a/pcr/perl-text-glob/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# CPAN Name  : Text-Glob
-# Contributor: Alan Young <harleypig@gmail.com>
-# Generator  : CPANPLUS::Dist::Arch 1.21
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname='perl-text-glob'
-pkgver='0.09'
-pkgrel='2'
-pkgdesc="match globbing patterns against text"
-arch=('any')
-license=('PerlArtistic' 'GPL')
-options=('!emptydirs')
-depends=('perl')
-makedepends=()
-url='http://search.cpan.org/dist/Text-Glob'
-source=('http://search.cpan.org/CPAN/authors/id/R/RC/RCLAMP/Text-Glob-0.09.tar.gz')
-md5sums=('1daa10e087f891c49b720a5c551a024b')
-sha512sums=('9b729e4ece88ad79e1b637c7f35e5e1ecae3fd7f62c408ed4f3fcac2e8e8afff32d7d805e1b0269800aada5ae609d03335d42ac54def2797d301e91fa488ae47')
-_distdir="${srcdir}/Text-Glob-0.09"
-
-build() {
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
-      PERL_AUTOINSTALL=--skipdeps                            \
-      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
-      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
-      MODULEBUILDRC=/dev/null
-
-    cd "$_distdir"
-    /usr/bin/perl Build.PL
-    /usr/bin/perl Build
-  )
-}
-
-check() {
-  cd "$_distdir"
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
-    /usr/bin/perl Build test
-  )
-}
-
-package() {
-  cd "$_distdir"
-  /usr/bin/perl Build install
-  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
-}
-
-# Local Variables:
-# mode: shell-script
-# sh-basic-offset: 2
-# End:
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/perl-unicode-map/PKGBUILD b/pcr/perl-unicode-map/PKGBUILD
deleted file mode 100644
index 1d03e867d..000000000
--- a/pcr/perl-unicode-map/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman
-# Contributor: Ross melin <rdmelin@gmail.com>
-
-# Required by zoneminder
-
-pkgname=perl-unicode-map
-pkgver=0.112
-pkgrel=2
-pkgdesc="Unicode::Map"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/~MSCHWARTZ/Unicode-Map"
-license=('GPL' 'PerlArtistic')
-depends=('perl')
-options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/M/MS/MSCHWARTZ/Unicode-Map-$pkgver.tar.gz) 
-md5sums=('edaa8fc5ddf0e5d805e274283dd0625d')
-
-build() {
-  cd  $startdir/src/Unicode-Map-$pkgver
-  eval `perl -V:archname`
-  PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL \
-      INSTALLDIRS=vendor || return 1
-  
-  /usr/bin/make || return 1
-  /usr/bin/make DESTDIR=$startdir/pkg install || return 1
-  /usr/bin/find $startdir/pkg -name '.packlist' -delete
-  /usr/bin/find $startdir/pkg -name '*.pod' -delete
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/perl-unix-syslog/PKGBUILD b/pcr/perl-unix-syslog/PKGBUILD
deleted file mode 100644
index 5f4acd962..000000000
--- a/pcr/perl-unix-syslog/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Justin Davis <jrcd83@gmail.com>
-# Generator  : CPANPLUS::Dist::Arch 1.04
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname='perl-unix-syslog'
-pkgver='1.1'
-pkgrel='1'
-pkgdesc="Interface to syslog functions in a C-library"
-arch=('any')
-license=('PerlArtistic' 'GPL')
-options=('!emptydirs')
-depends=('glibc>=2.12.1' 'perl')
-url='http://search.cpan.org/dist/Unix-Syslog'
-source=('http://search.cpan.org/CPAN/authors/id/M/MH/MHARNISCH/Unix-Syslog-1.1.tar.gz')
-
-build() {
-  PERL=/usr/bin/perl
-  DIST_DIR="${srcdir}/Unix-Syslog-1.1"
-  export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
-    PERL_AUTOINSTALL=--skipdeps                            \
-    PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
-    PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
-    MODULEBUILDRC=/dev/null
-
-  { cd "$DIST_DIR" &&
-    $PERL Makefile.PL &&
-    make &&
-    make test &&
-    make install;
-  } || return 1;
-
-  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
-}
diff --git a/pcr/perl-x10/PKGBUILD b/pcr/perl-x10/PKGBUILD
deleted file mode 100644
index 0a0d352cb..000000000
--- a/pcr/perl-x10/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# CPAN Name  : X10
-# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com>
-# Generator  : CPANPLUS::Dist::Arch 1.25
-
-pkgname='perl-x10'
-pkgver='0.03'
-pkgrel='3'
-pkgdesc=""
-arch=('any')
-license=('PerlArtistic' 'GPL')
-options=('!emptydirs')
-depends=('perl-astro-suntime>=0.01' 'perl-device-serialport' 'perl-time-modules')
-makedepends=()
-url='http://search.cpan.org/dist/X10'
-source=('http://search.cpan.org/CPAN/authors/id/R/RO/ROBF/X10-0.03.tar.gz')
-md5sums=('056b3d98fab545865148b948de6784c7')
-sha512sums=('6ed2b9526732dc5f704ceb94f3a9abb51c208aabb6f127480046ce1f01ecf763e4de2dcb5bf52ef598831dbd5ba78ff9d108238001070076b0cc05c7681dea2f')
-_distdir="X10-0.03"
-
-build() {
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
-      PERL_AUTOINSTALL=--skipdeps                            \
-      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
-      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
-      MODULEBUILDRC=/dev/null
-
-    cd "$srcdir/$_distdir"
-    /usr/bin/perl Makefile.PL
-    make
-  )
-}
-
-check() {
-  cd "$srcdir/$_distdir"
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
-    make test
-  )
-}
-
-package() {
-  cd "$srcdir/$_distdir"
-  make install
-
-  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
-}
-
-# Local Variables:
-# mode: shell-script
-# sh-basic-offset: 2
-# End:
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/petri-foo/PKGBUILD b/pcr/petri-foo/PKGBUILD
deleted file mode 100644
index 72ca1e45a..000000000
--- a/pcr/petri-foo/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-# patch taken from https://aur.archlinux.org/packages/petri-foo/
-pkgname=petri-foo
-pkgver=0.1.87
-pkgrel=1
-pkgdesc="A fork of specimen, a MIDI controllable audio sampler, for JACK."
-arch=('i686')
-url="http://petri-foo.sourceforge.net/"
-license=('GPL2')
-depends=('jack' 'libgnomecanvas')
-makedepends=('cmake')
-optdepends=('liblo: Non Session Manager support')
-install='petri-foo.install'
-source=(http://sourceforge.net/projects/${pkgname}/files/Source/${pkgname}-${pkgver}.tar.bz2
-        petri-foo-0.1.87_fix_recent_file_not_exist.patch)
-md5sums=('40f8a224368187672f9f306f8a4fa8c5'
-         '964db40cc53d77d42f6593f2201b9c40')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 < ../petri-foo-0.1.87_fix_recent_file_not_exist.patch
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DUpdateMime:BOOL=OFF .
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/petri-foo/petri-foo-0.1.87_fix_recent_file_not_exist.patch b/pcr/petri-foo/petri-foo-0.1.87_fix_recent_file_not_exist.patch
deleted file mode 100644
index 3e88487b0..000000000
--- a/pcr/petri-foo/petri-foo-0.1.87_fix_recent_file_not_exist.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur a/gui/bank-ops.c b/gui/bank-ops.c
---- a/gui/bank-ops.c	2012-08-06 05:33:34.000000000 +0200
-+++ b/gui/bank-ops.c	2012-08-07 17:57:28.580145691 +0200
-@@ -393,6 +393,8 @@
-          g_signal_connect_swapped(G_OBJECT(msg), "response",
-                                    G_CALLBACK(gtk_widget_destroy), msg);
-          gtk_widget_show (msg);
-+
-+         gtk_recent_manager_remove_item(recent_manager, filename, NULL);
-     }
-     else
-     {
-diff -Naur a/libpetrifui/dish_file.c b/libpetrifui/dish_file.c
---- a/libpetrifui/dish_file.c	2012-08-06 05:33:34.000000000 +0200
-+++ b/libpetrifui/dish_file.c	2012-08-07 17:56:09.063909801 +0200
-@@ -1440,7 +1440,7 @@
- 
-     if (stat(path, &st) != 0)
-     {
--        msg_log(MSG_ERROR, "file '%s' does not exist\n");
-+        msg_log(MSG_ERROR, "file '%s' does not exist\n", path);
-         return -1;
-     }
- 
diff --git a/pcr/petri-foo/petri-foo.install b/pcr/petri-foo/petri-foo.install
deleted file mode 100644
index 5dd24bbe5..000000000
--- a/pcr/petri-foo/petri-foo.install
+++ /dev/null
@@ -1,19 +0,0 @@
-updatedesktopdtb() {
-	[ -x /usr/bin/update-desktop-database ] \
-		&& update-desktop-database -q
-	[ -x /usr/bin/update-mime-database ] \
-		&& update-mime-database usr/share/mime > /dev/null 2>&1
-}
-
-post_install() {
-	updatedesktopdtb
-}
-
-post_upgrade() {
-	updatedesktopdtb
-}
-
-post_remove() {
-	updatedesktopdtb
-}
-
diff --git a/pcr/plowshare/PKGBUILD b/pcr/plowshare/PKGBUILD
index 11291ef4a..9856e4d7c 100644
--- a/pcr/plowshare/PKGBUILD
+++ b/pcr/plowshare/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: breakdown <breakdown(at)archlinux(dot)us>
 
 pkgname=plowshare
-pkgver=snapshot_git20131130.3c63b19
+pkgver=snapshot_git20140112.7ad41c8
 pkgrel=1
 pkgdesc="Command-line downloader and uploader for Rapidshare, Mediafire and other file sharing websites."
 arch=('any')
@@ -31,4 +31,4 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('1e2468cad043a7225c3092290d844163')
+md5sums=('9c31c7f13b41d01bf90563ed25484678')
diff --git a/pcr/pmount/PKGBUILD b/pcr/pmount/PKGBUILD
deleted file mode 100644
index 46c2b0358..000000000
--- a/pcr/pmount/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 80202 2012-11-17 15:45:28Z eric $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=pmount
-pkgver=0.9.23
-pkgrel=7
-pkgdesc="mount removable devices as normal user"
-arch=(i686 x86_64 mips64el)
-license=('GPL2')
-url="http://pmount.alioth.debian.org/"
-backup=('etc/pmount.allow')
-depends=('sysfsutils>=2.0.0-1' 'util-linux')
-makedepends=('intltool')
-source=(
-  https://alioth.debian.org/frs/download.php/3310/${pkgname}-${pkgver}.tar.bz2
-  'http://anonscm.debian.org/gitweb/?p=pmount/pmount-debian.git;a=blob_plain;f=debian/completion/pmount'
-  https://alioth.debian.org/tracker/download.php/31157/412979/313576/4753/fix-pmount-segfault.diff
-)
-
-build() {
-  export CFLAGS="${CFLAGS} -fPIE -pie"
-  export CXXFLAGS="${CXXFLAGS} -fPIE -pie"
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/fix-pmount-segfault.diff
-  ./configure --prefix=/usr --disable-hal \
-    --with-cryptsetup-prog=/usr/sbin/cryptsetup
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 ${srcdir}/pmount ${pkgdir}/usr/share/bash-completion/completions/pmount
-  mkdir -p ${pkgdir}/media
-}
-md5sums=('db19f5bf3151b1b41705ec7bafa439d3'
-         '224f24127f8ab3605de8b9bcb433882f'
-         '5b223bce1fb262bbb98c541725f5e985')
diff --git a/pcr/poco/PKGBUILD b/pcr/poco/PKGBUILD
deleted file mode 100644
index dad4788d1..000000000
--- a/pcr/poco/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Rodrigo Grumiche Silva <grumiche at integrityit dot com dot br>
-# Contributor: nozog
-# Contributor: davidhjelm
-# Contributor: Ray Kohler <ataraxia937 at gmail dot com>
-# Contributor: Nathan Owe < ndowens04 at gmail dot com>
-
-pkgname=poco
-pkgver=1.4.2p1
-pkgrel=2
-pkgdesc="C++ class libraries for network-centric, portable applications,
-complete edition"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.pocoproject.org/"
-license=('custom:boost')
-depends=('unixodbc' 'libmysqlclient' 'openssl')
-makedepends=('gcc' 'make' 'unixodbc' 'libmysqlclient' 'openssl' 'chrpath')
-options=()
-source=(http://downloads.sourceforge.net/poco/$pkgname-$pkgver-all.tar.bz2)
-
-build() {
- cd $srcdir/$pkgname-$pkgver-all
- ./configure --prefix=/usr --no-samples --no-tests
- make
-}
-
-
-package() {
- cd $srcdir/$pkgname-$pkgver-all
-
- make DESTDIR=$pkgdir install
-
- install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-
- #removing rpath information from binaries
- chrpath -d $pkgdir/usr/bin/cpspc
- chrpath -d $pkgdir/usr/bin/cpspcd
- chrpath -d $pkgdir/usr/bin/f2cpspd
- chrpath -d $pkgdir/usr/bin/f2cpsp
-
- #removing debugging libraries
- rm $pkgdir/usr/lib/libPoco*d.so*
-}
-
-md5sums=('752e5f5545377be24ee7c7b6b479fbbe')
diff --git a/pcr/polarssl/PKGBUILD b/pcr/polarssl/PKGBUILD
deleted file mode 100644
index 9d547d1d1..000000000
--- a/pcr/polarssl/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Mihai Militaru <mihai militaru at xmpp dot ro>
-
-pkgname=polarssl
-pkgver=1.2.8
-pkgrel=1
-pkgdesc="Portable cryptographic and SSL/TLS library"
-arch=('i686' 'x86_64')
-url="http://www.polarssl.org/"
-license=('GPL2')
-source=(http://www.polarssl.org/code/releases/polarssl-"$pkgver"-gpl.tgz)
-sha1sums=('a3e69d4e9302529c5006dcb7d8ecab9c99488036')
-depends=('glibc')
-
-build() {
-  cd "$pkgname"-"$pkgver"
-
-  sed -i 's^CFLAGS	+=^CFLAGS	+= -fPIC^g' library/Makefile
-  sed -i 's#all: static#all: static shared#g' library/Makefile
-
-  make
-}
-
-package() {
-	cd "$pkgname"-"$pkgver"
-	
-	make DESTDIR="$pkgdir/usr" install
-	echo "WARNING: in order to run the tests, execute in this directory, after you install the library: cd src/polarssl-$pkgver && make check"
-}
diff --git a/pcr/prboom/PKGBUILD b/pcr/prboom/PKGBUILD
deleted file mode 100644
index 03f53784e..000000000
--- a/pcr/prboom/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 77655 2012-10-13 11:44:28Z allan $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Thayer Williams <thayer@archlinux.org>
-# Contributor: dale <dale@archlinux.org>
-
-pkgname=prboom
-pkgver=2.5.0
-pkgrel=7
-pkgdesc='A game engine which provides a program to play Doom levels.'
-url='http://prboom.sourceforge.net/'
-license=('GPL2')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('libpng' 'sdl_mixer' 'sdl_net' 'glu')
-makedepends=('mesa')
-source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz"
-        'libpng-1.4.patch')
-md5sums=('a8a15f61fa2626ab98051ab2703378c4'
-         'ba53474db8e747035ca2320a445e4ae0')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -p1 < ../libpng-1.4.patch
-
-	./configure --prefix=/usr --disable-i386-asm
-	sed -i "s|/games|/bin|g" "${srcdir}/${pkgname}-${pkgver}/src/Makefile"
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}
-
diff --git a/pcr/prboom/libpng-1.4.patch b/pcr/prboom/libpng-1.4.patch
deleted file mode 100644
index a2215e37b..000000000
--- a/pcr/prboom/libpng-1.4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur prboom-2.5.0-orig/src/SDL/i_sshot.c prboom-2.5.0/src/SDL/i_sshot.c
---- prboom-2.5.0-orig/src/SDL/i_sshot.c	2010-01-24 23:26:03.000000000 -0500
-+++ prboom-2.5.0/src/SDL/i_sshot.c	2010-01-24 23:28:42.000000000 -0500
-@@ -231,7 +231,7 @@
-   if (fp)
-   {
-     png_struct *png_ptr = png_create_write_struct(
--        PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn);
-+        PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn);
- 
-     if (png_ptr)
-     {
-@@ -279,7 +279,7 @@
-             break;
-         }
-       }
--      png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
-+      png_destroy_write_struct(&png_ptr,  NULL);
-     }
-     fclose(fp);
-   }
diff --git a/pcr/psad/PKGBUILD b/pcr/psad/PKGBUILD
deleted file mode 100644
index 145625e89..000000000
--- a/pcr/psad/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# Maintainer: Artur Wojcik <xartii at gmail dot com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=psad
-pkgver=2.2
-pkgrel=2
-pkgdesc="A collection of three lightweight system daemons (two main daemons and one helper daemon) that run on Linux machines and analyze iptables log messages to detect port scans and other suspicious traffic"
-arch=('i686 x86_64')
-url="http://cipherdyne.org/psad/"
-license=('GPL')
-depends=('perl-bit-vector' 'perl-date-calc' 'perl-iptables-chainmgr' 'perl-iptables-parse' 'perl-net-ipv4addr' 'perl-storable' 'perl-unix-syslog' 'net-tools')
-source=("http://cipherdyne.org/psad/download/$pkgname-$pkgver.tar.gz" "responses" "psad-sysvinit.archlinux" "psad-systemdinit.archlinux" "psad.patch1")
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  cp $srcdir/psad-sysvinit.archlinux init-scripts/psad-init.archlinux
-  if [ ! -e responses ]; then 
-    ln $srcdir/responses responses -s; 
-  fi
-  patch -p1 -i $srcdir/psad.patch1
-
-  #Create the dirs it will need to make the program
-  mkdir -p $pkgdir/etc/psad \
-           $pkgdir/etc/rc.d \
-           $pkgdir/usr/bin \
-           $pkgdir/usr/sbin \
-           $pkgdir/usr/share/man/man8 \
-           $pkgdir/var/lib/psad \
-           $pkgdir/var/log/psad \
-           $pkgdir/var/run/psad \
-           $pkgdir/usr/lib/psad \
-           $pkgdir/usr/lib/systemd/system 
-  #Set the config dirs
-  sed -e "s|'/usr/sbin'|'$pkgdir/usr/sbin'|" \
-      -e "s|'/usr/bin'|'$pkgdir/usr/bin'|" \
-      -e "s|my \$mpath = \"/usr/share/man/man\$section\";|my \$mpath = \"$pkgdir/usr/share/man/man\$section\";|" \
-          ./install.pl -i
-  sed -e "s|/var/log/psad|$pkgdir&|" \
-      -e "s|/var/run/psad|$pkgdir&|" \
-      -e "s|/var/lib/psad|$pkgdir&|" \
-      -e "s|/usr/lib/psad|$pkgdir&|" \
-      -e "s|/etc/psad|$pkgdir&|" \
-      -e "s|/usr/bin/whois_psad|$pkgdir&|" \
-      -e "s|/usr/sbin/fwcheck_psad|$pkgdir&|" \
-      -e "s|/usr/sbin/psadwatchd|$pkgdir&|" \
-      -e "s|/usr/sbin/kmsgsd|$pkgdir&|" \
-      -e "s|/usr/sbin/psad|$pkgdir&|" \
-        ./psad.conf -i
-
-  #hope that things work
-  ./install.pl --init-dir "$pkgdir/etc/rc.d/" < responses
-
-  #add the systemd service file
-  cp $srcdir/psad-systemdinit.archlinux $pkgdir/usr/lib/systemd/system/psad.service
-
-  # Fix the config
-  sed -e "s|$pkgdir||" $pkgdir/etc/psad/psad.conf -i
-  sed -e "s|$pkgdir||" $pkgdir/var/log/psad/install.log -i
-
-  #Set correct permissions  
-  chmod 0700 $pkgdir/var/lib/psad
-   
-
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/psad/psad-systemdinit.archlinux b/pcr/psad/psad-systemdinit.archlinux
deleted file mode 100644
index 991aa7423..000000000
--- a/pcr/psad/psad-systemdinit.archlinux
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Port scan attack detector
-After=iptables.service
-
-[Service]
-ExecStart=/usr/sbin/psad
-ExecStop=/usr/sbin/psad --Kill
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/psad/psad-sysvinit.archlinux b/pcr/psad/psad-sysvinit.archlinux
deleted file mode 100644
index 6b4e76042..000000000
--- a/pcr/psad/psad-sysvinit.archlinux
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-#
-# Startup script for psad
-#
-# chkconfig: 345 99 05
-# description: The Port Scan Attack Detector (psad)
-# processname: psad
-# pidfile: /var/run/psad.pid
-# config: /etc/psad/psad.conf
-#
-# $Id: psad-init.archlinux
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sshd
-
-PID=`cat /var/run/psad.pid`
-# See how we were called.
-case "$1" in
-start)
-    stat_busy "Starting psad"
-    [ -z "$PID" ] && /usr/sbin/psad
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      #let psad take care of the pid; we don't need to
-      add_daemon psad
-      stat_done
-    fi
-    ;;
-stop)
-    stat_busy "Stopping psad"
-    /usr/sbin/psad --Kill
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      #let psad take care of the pid; we don't need to
-      rm_daemon psad
-      stat_done
-    fi
-    ;;
-status)
-    /usr/sbin/psad --Status
-    ;;
-restart)
-    $0 stop
-    $0 start
-    ;;
-*)
-    echo "Usage: psad {start|stop|status|restart}"
-    exit 1
-esac
diff --git a/pcr/psad/psad.patch1 b/pcr/psad/psad.patch1
deleted file mode 100644
index 98ddd9a60..000000000
--- a/pcr/psad/psad.patch1
+++ /dev/null
@@ -1,37 +0,0 @@
---- psad-2.2/install.pl	2012-04-21 04:43:46.000000000 +0200
-+++ psad-2.2/install.pl	2012-10-13 16:05:03.302818330 +0200
-@@ -752,6 +752,8 @@
-         $init_file = 'init-scripts/psad-init.fedora';
-     } elsif ($distro eq 'gentoo') {
-         $init_file = 'init-scripts/psad-init.gentoo';
-+    } elsif ($distro eq 'archlinux') {
-+        $init_file = 'init-scripts/psad-init.archlinux';
-     } else {
-         $init_file = 'init-scripts/psad-init.generic';
-     }
-@@ -773,13 +775,14 @@
-     if ($preserve_rv) {
-         &logr("\n[+] psad has been installed (with your original config merged).\n");
-     } else {
--        &logr("\n[+] psad has been installed.\n");
-+        &logr("\n[+] psad has been compiled.\n");
-+        &logr("\n[+] use pacman -U to install.\n");
-     }
-     if ($installed_init_script) {
-         if ($init_dir) {
--            &logr("\n[+] To start psad, run \"${init_dir}/psad start\"\n");
-+            #&logr("\n[+] To start psad, run \"${init_dir}/psad start\"\n");
-         } else {
--            &logr("\n[+] To start psad, run ${USRSBIN_DIR}/psad\"\n");
-+            #&logr("\n[+] To start psad, run ${USRSBIN_DIR}/psad\"\n");
-         }
-     }
- 
-@@ -1748,6 +1751,7 @@
- 
- sub get_distro() {
-     return 'gentoo' if -e '/etc/gentoo-release';
-+    return 'archlinux' if -e '/etc/archlinux-release';
-     if (-e '/etc/issue') {
-         ### Red Hat Linux release 6.2 (Zoot)
-         open ISSUE, '< /etc/issue' or
diff --git a/pcr/psad/responses b/pcr/psad/responses
deleted file mode 100644
index 715dfaf1a..000000000
--- a/pcr/psad/responses
+++ /dev/null
@@ -1,7 +0,0 @@
-n
-n
-y
-n
-n
-n
-
diff --git a/pcr/pulledpork/PKGBUILD b/pcr/pulledpork/PKGBUILD
deleted file mode 100644
index db7aa9d0d..000000000
--- a/pcr/pulledpork/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Contributor: Isaac C. Aronson <i@pingas.org>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=pulledpork
-pkgver=0.6.1
-pkgrel=3
-pkgdesc="Tool to automatically update rules for snort"
-arch=('any')
-url="http://code.google.com/p/pulledpork"
-license=('GPL')
-depends=('perl' 'perl-lwp-protocol-https' 'perl-crypt-ssleay' 'perl-archive-tar' 'perl-switch')
-optdepends=('snort')
-source=(http://pulledpork.googlecode.com/files/pulledpork-0.6.1.tar.gz)
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -Dm644 etc/pulledpork.conf $pkgdir/etc/pulledpork.conf
-  install -Dm755 pulledpork.pl $pkgdir/usr/sbin/pulledpork.pl
-}
diff --git a/pcr/puppet/PKGBUILD b/pcr/puppet/PKGBUILD
deleted file mode 100644
index 02e8f32c8..000000000
--- a/pcr/puppet/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# Puppet: Installer: Arch
-# Contributor: Greg Sutcliffe <puppet-aur (at) emeraldreverie (dot) org>
-# Contributor: Hyacinthe Cartiaux <hyacinthe (dot) cartiaux (at) free (dot) fr>
-# Contributor: Thomas S Hatch <thatch45 (at) Gmail (dot) com>
-# Contributor: Xavion <Xavion (dot) 0 (at) Gmail (dot) com>
-# Contributor: Miah Johnson <miah (at) chia-pet dot org>
-# Contributor: Dave Simons <miouhpi (at) Gmail (dot) com>
-# Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-# RC style, reserved for later use
-#pkgname=puppet
-#_rc=8
-#_pkgver=3.0.0
-#pkgver=${_pkgver}_rc${_rc}
-
-pkgname=puppet
-pkgver=3.0.1
-pkgrel=5
-pkgdesc="A system for automating system administration tasks."
-arch=("any")
-url="http://puppetlabs.com/projects/puppet/"
-license=("APACHE")
-depends=("ruby" "ruby-shadow" "facter" "ruby-hiera" "ruby-hiera-json")
-makedepends=('which')
-backup=("etc/puppet/puppet.conf")
-options=(emptydirs)
-provides=("puppet" "vim-puppet" "ruby-hiera-puppet")
-conflicts=("puppet3" "ruby-puppet" "vim-puppet" "ruby-hiera-puppet")
-install="puppet.install"
-source=(http://puppetlabs.com/downloads/puppet/puppet-${pkgver//_/-}.tar.gz
-        fileserver.conf
-        puppet
-        puppet.conf
-        puppetmaster)
-md5sums=('2117e3a1964ac54fcd36d926eed3db94'
-         'ffacd9bfb9c7656a3a345dbc5eb0e67a'
-         '59dbf39e251bc4877e7604a5876c642d'
-         'a7d61d20e46b411eb50ad5279987584a'
-         '4c507c580cb28d7a5adc9ea6b3626657')
-
-package() {
-  cd $srcdir/puppet-${pkgver//_/-}
-
-  # Install
-  ruby ./install.rb \
-    --destdir=$pkgdir \
-    --bindir=/usr/bin \
-    --sbindir=/usr/sbin \
-    --mandir=/usr/share/man
-
-
-  # Set up vim and emacs
-  install -Dp -m0644 ext/vim/ftdetect/puppet.vim $pkgdir/usr/share/vim/vimfiles/ftdetect/puppet.vim
-  install -Dp -m0644 ext/vim/syntax/puppet.vim $pkgdir/usr/share/vim/vimfiles/syntax/puppet.vim
-  install -Dp -m0644 ext/emacs/puppet-mode.el $pkgdir/usr/share/emacs/site-lisp/puppet-mode.el
-  install -Dp -m0644 ext/emacs/puppet-mode-init.el $pkgdir/usr/share/emacs/site-lisp/site-start.d/puppet-mode-init.el
-
-  # Configuration and rc scripts
-  install -d $pkgdir/etc/{puppet,rc.d}
-  install -m 644 $srcdir/puppet.conf $pkgdir/etc/puppet/puppet.conf
-  install -m 644 $srcdir/fileserver.conf $pkgdir/etc/puppet/fileserver.conf
-  
-  # Setup tmpfiles.d config
-  install -d $pkgdir/etc/tmpfiles.d
-  echo "D /var/run/puppet 0755 puppet puppet -" > $pkgdir/etc/tmpfiles.d/puppet.conf
-
-  # Configuration for hiera / symlink is there to use hiera within puppet.
-  ln -snf /etc/hiera.yaml ${pkgdir}/etc/puppet/hiera.yaml
-
-  # Systemd files
-  install -Dm 644 $srcdir/puppet-${pkgver//_/-}/ext/systemd/puppetagent.service $pkgdir/usr/lib/systemd/system/puppetagent.service
-  install -Dm 644 $srcdir/puppet-${pkgver//_/-}/ext/systemd/puppetmaster.service $pkgdir/usr/lib/systemd/system/puppetmaster.service
-
-  # Create puppet homedir and hieradir
-  install -d $pkgdir/var/lib/puppet
-  install -d $pkgdir/var/lib/hiera
-
-  install -D $srcdir/puppet $pkgdir/etc/rc.d/puppet
-  install -D $srcdir/puppetmaster $pkgdir/etc/rc.d/puppetmaster
-
-  # Copy the LICENSE file in the usual directory
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m 644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-}
diff --git a/pcr/puppet/fileserver.conf b/pcr/puppet/fileserver.conf
deleted file mode 100644
index 67e387ca0..000000000
--- a/pcr/puppet/fileserver.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file consists of arbitrarily named sections/modules
-# defining where files are served from and to whom
-
-# Define a section 'files'
-# Adapt the allow/deny settings to your needs. Order
-# for allow/deny does not matter, allow always takes precedence
-# over deny
-# [files]
-#  path /var/lib/puppet/files
-#  allow *.example.com
-#  deny *.evil.example.com
-#  allow 192.168.0.0/24
diff --git a/pcr/puppet/puppet b/pcr/puppet/puppet
deleted file mode 100755
index 4126be850..000000000
--- a/pcr/puppet/puppet
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-DAEMON=$(type -p puppetd)
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/puppet ] && . /etc/conf.d/puppet
-
-PID=$(pidof -xo %PPID $DAEMON)
-case "$1" in
-  start)
-    stat_busy "Starting Puppet Daemon"
-    if [ -z "$PID" ]; then 
-      [ -f /var/run/puppet.pid ] && rm -f /var/run/puppet.pid
-      $DAEMON $PUPPETD_ARGS
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=$(pidof -xo %PPID $DAEMON)
-      echo $PID > /var/run/puppet.pid
-      add_daemon puppet
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Puppet Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon puppet
-      rm -f /var/run/puppet.pid
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    if [ ! -z $PID ]; then
-      while ps -p $PID > /dev/null; do sleep 1; done
-    fi
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/pcr/puppet/puppet.conf b/pcr/puppet/puppet.conf
deleted file mode 100644
index aa5868dee..000000000
--- a/pcr/puppet/puppet.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-[main]
-    # The Puppet var directory
-    # The default value is '/var/lib/puppet'
-    vardir = /var/lib/puppet
-
-    # The Puppet log directory.
-    # The default value is '$vardir/log'.
-    logdir = /var/log/puppet
-
-    # Where Puppet PID files are kept.
-    # The default value is '$vardir/run'.
-    rundir = /var/run/puppet
-
-    # Where SSL certificates are kept.
-    # The default value is '$confdir/ssl'.
-    pluginsync=true
-
-
-[agent]
-    # The file in which puppetd stores a list of the classes
-    # associated with the retrieved configuratiion.  Can be loaded in
-    # the separate ``puppet`` executable using the ``--loadclasses``
-    # option.
-    # The default value is '$confdir/classes.txt'.
-    classfile = $vardir/classes.txt
-
-    # Where puppetd caches the local configuration.  An
-    # extension indicating the cache format is added automatically.
-    # The default value is '$confdir/localconfig'.
-    localconfig = $vardir/localconfig
-
-#[master]
diff --git a/pcr/puppet/puppet.install b/pcr/puppet/puppet.install
deleted file mode 100644
index 928df566b..000000000
--- a/pcr/puppet/puppet.install
+++ /dev/null
@@ -1,46 +0,0 @@
-# Puppet: Installer: Arch
-# Maintainer: Thomas S Hatch <thatch45 (at) Gmail (dot) com>
-# Contributor: Xavion <Xavion (dot) 0 (at) Gmail (dot) com>
-# Contributor: Miah Johnson <Miah (at) chia-pet dot org>
-
-pre_install() {
-  getent group puppet &>/dev/null || groupadd -r puppet -g 52 &>/dev/null
-  getent passwd puppet &>/dev/null || useradd -r -u 52 -g puppet -d /var/lib/puppet -s /sbin/nologin -c "Puppet" puppet &>/dev/null || :
-}
-
-pre_upgrade() {
-  pre_install
-  usermod -d /var/lib/puppet puppet &>/dev/null || :
-}
-
-post_install() {
-    :
-}
-
-pre_remove() {
-if [ -f /var/run/puppetmasterd.pid ]; then
-	PIDOF=$(pidof -xo %PPID puppetmasterd)
-	PIDFILE=$(cat /var/run/puppetmasterd.pid)
-	if [ $PIDOF -eq $PIDFILE ]; then
-		/etc/rc.d/puppetmaster stop
-	fi
-fi
-
-if [ -f /var/run/puppetd.pid ]; then
-	PIDOF=$(pidof -xo %PPID puppetd)
-	PIDFILE=$(cat /var/run/puppetd.pid)
-	if [ $PIDOF -eq $PIDFILE ]; then
-		/etc/rc.d/puppet stop
-	fi
-fi
-}
-
-post_remove() {
-	# Remove user and group
-	userdel puppet
-}
-
-op=$1
-shift
-
-$op "$@"
diff --git a/pcr/puppet/puppetmaster b/pcr/puppet/puppetmaster
deleted file mode 100755
index 8b3971053..000000000
--- a/pcr/puppet/puppetmaster
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-DAEMON=$(type -p puppetmasterd)
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/puppetmaster ] && . /etc/conf.d/puppetmaster
-
-PID=$(pidof -xo %PPID $DAEMON)
-case "$1" in
-  start)
-    stat_busy "Starting Puppet Master Daemon"
-    if [ -z "$PID" ]; then 
-      [ -f /var/run/puppetmaster.pid ] && rm -f /var/run/puppetmaster.pid
-      $DAEMON $PUPPETMASTER_ARGS
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=$(pidof -xo %PPID $DAEMON)
-      echo $PID > /var/run/puppetmaster.pid
-      add_daemon puppetmaster
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Puppet Master Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon puppetmaster
-      rm -f /var/run/puppetmaster.pid
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    if [ ! -z $PID ]; then
-      while ps -p $PID > /dev/null; do sleep 1; done
-    fi
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/pcr/pybonjour/PKGBUILD b/pcr/pybonjour/PKGBUILD
deleted file mode 100644
index cb7d6bd45..000000000
--- a/pcr/pybonjour/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Contributor: Ruben Schuller <r.schuller@orgizm.net>
-
-pkgname=pybonjour
-pkgver=1.1.1
-pkgrel=2
-pkgdesc="pybonjour provides a pure-Python interface to Apple Bonjour/Avahi"
-arch=('any')
-provides=('pybonjour')
-license=('MIT')
-url="http://code.google.com/p/pybonjour/"
-depends=('python2')
-makedepends=()
-source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('30cbfd3e9e9721b39f6aa67df1c315a2')
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/pcr/pycryptopp/PKGBUILD b/pcr/pycryptopp/PKGBUILD
deleted file mode 100644
index f95654884..000000000
--- a/pcr/pycryptopp/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Nicolas Pouillard <nicolas.pouillard@gmail.com>
-# Contributor: Peter Simons <simons@cryp.to>
-pkgname=pycryptopp
-pkgver=0.6.0
-_pkgtag=1206569328141510525648634803928199668821045408958
-pkgrel=2
-pkgdesc="Python wrappers for the Crypto++ library"
-arch=('i686' 'x86_64')
-url='http://allmydata.org/trac/pycryptopp'
-license=('GPL2' 'custom')
-depends=('python2' 'crypto++')
-makedepends=('darcsver' 'setuptools_darcs')
-source=( http://pypi.python.org/packages/source/p/$pkgname/$pkgname-$pkgver.$_pkgtag.tar.gz
-         http://pypi.python.org/packages/source/p/$pkgname/$pkgname-$pkgver.$_pkgtag.tar.gz.asc )
-md5sums=('ce38fbe03705d27da408c78b56eb1947'
-         '76fe2da5b1fc964d9e1ee4596c36d5bf')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver.$_pkgtag"
-  export PYCRYPTOPP_DISABLE_EMBEDDED_CRYPTOPP=1
-  python2 setup.py build
-  python2 setup.py test
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver.$_pkgtag"
-  python2 setup.py install --root="$pkgdir"
-
-  install -d $pkgdir/usr/share/licenses/$pkgname/
-  install -m 644 COPYING* $pkgdir/usr/share/licenses/$pkgname/
-}
diff --git a/pcr/pysheng/PKGBUILD b/pcr/pysheng/PKGBUILD
deleted file mode 100644
index 4cbdf5d38..000000000
--- a/pcr/pysheng/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributor: mutlu_inek@yahoo.de
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=pysheng
-pkgver=0.1
-pkgrel=1
-pkgdesc="CLI and GUI program to download pages from Google Books as PNG images"
-arch=(i686 x86_64)
-url="https://code.google.com/p/pysheng/"
-license=('GPL')
-depends=('python2')
-makedepends=()
-optdepends=('python2-reportlab: GUI')
-provides=()
-conflicts=()
-replaces=()
-options=()
-source=(http://pysheng.googlecode.com/files/$pkgname-$pkgver.tgz)
-
-package() {
-   cd $pkgname-$pkgver
-   python2 setup.py install --root="$pkgdir/" --optimize=1
-}
-
diff --git a/pcr/python-anyjson/PKGBUILD b/pcr/python-anyjson/PKGBUILD
deleted file mode 100644
index 8ab20d1c9..000000000
--- a/pcr/python-anyjson/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor: Benjamin A. Shelton <zancarius@gmail.com>
-# Contributor: p2k <Patrick.Schneider@uni-ulm.de>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=python-anyjson
-pkgver=0.3.3
-pkgrel=1
-pkgdesc="Wraps the best available JSON implementation available in a common interface."
-arch=('any')
-url="http://pypi.python.org/pypi/anyjson"
-license=('BSD')
-depends=('python2')
-makedepends=('python2-distribute')
-source=("http://pypi.python.org/packages/source/a/anyjson/anyjson-${pkgver}.tar.gz")
-
-build () {
-    
-    cd "${srcdir}/anyjson-${pkgver}"
-    python2 setup.py install --root="${pkgdir}/" --optimize=1
-
-}
diff --git a/pcr/python-blinker/PKGBUILD b/pcr/python-blinker/PKGBUILD
deleted file mode 100644
index 00dc3cdad..000000000
--- a/pcr/python-blinker/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=python-blinker
-pkgver=1.3
-pkgrel=1
-pkgdesc="Fast, simple object-to-object and broadcast signaling"
-arch=("any")
-url="http://pythonhosted.org/blinker/"
-license=('custom')
-depends=('python')
-options=(!emptydirs)
-source=("https://pypi.python.org/packages/source/b/blinker/blinker-$pkgver.tar.gz")
-md5sums=('66e9688f2d287593a0e698cd8a5fbc57')
-
-package() {
-  cd "$srcdir/blinker-$pkgver"
-  python setup.py install --root="$pkgdir/" --optimize=1
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/python-efl/PKGBUILD b/pcr/python-efl/PKGBUILD
new file mode 100644
index 000000000..d805e49ca
--- /dev/null
+++ b/pcr/python-efl/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Doug Newgard <scimmia22 at outlook dot com>
+
+_python=python
+pkgname=$_python-efl
+_pkgname=python-efl
+pkgver=1.8.1
+pkgrel=1
+pkgdesc="$_python bindings for the Enlightenment Foundataion Libraries"
+arch=('i686' 'x86_64')
+url="http://www.enlightenment.org"
+license=('LGPL3' 'GPL3')
+depends=('elementary' "$_python-dbus")
+provides=("$_python-ecore" "$_python-edje" "$_python-elementary" "$_python-emotion" "$_python-evas" "$_python-e_dbus")
+conflicts=("$_python-ecore" "$_python-edje" "$_python-elementary" "$_python-emotion" "$_python-evas" "$_python-e_dbus")
+source=("http://download.enlightenment.org/rel/bindings/python/$_pkgname-$pkgver.tar.bz2")
+sha1sums=('82b34b9336d517537b2a4032dff9d1e2de8b8dd8')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  $_python setup.py build
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  $_python setup.py install --root="$pkgdir"
+
+# install text files
+  install -Dm644 AUTHORS "$pkgdir/usr/share/doc/$pkgname/AUTHORS"
+  install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README"
+  install -Dm644 changes.html "$pkgdir/usr/share/doc/$pkgname/changes.html"
+}
diff --git a/pcr/python-feedgenerator/PKGBUILD b/pcr/python-feedgenerator/PKGBUILD
deleted file mode 100644
index 0f0d65952..000000000
--- a/pcr/python-feedgenerator/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-pkgname=python-feedgenerator
-pkgver=1.6
-pkgrel=1
-pkgdesc="Standalone version of django.utils.feedgenerator"
-arch=("any")
-url="https://github.com/dmdm/feedgenerator-py3k.git"
-license=('custom:BSD')
-depends=('python' 'python-distribute' 'python-pytz' 'python-six')
-options=(!emptydirs)
-source=("https://pypi.python.org/packages/source/f/feedgenerator/feedgenerator-$pkgver.tar.gz")
-md5sums=('63f6f8529a1ae877715124328edea196')
-
-package() {
-  cd "$srcdir/feedgenerator-$pkgver"
-  python setup.py install --root="$pkgdir/" --optimize=1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/python-jedi/PKGBUILD b/pcr/python-jedi/PKGBUILD
deleted file mode 100644
index d34823097..000000000
--- a/pcr/python-jedi/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Contributor: Jesus Alvarez
-# Contributor: Danilo Bargen <gezuru@gmail.com>
-# Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@replicant.io>
-pkgname=python-jedi
-pkgver=0.7.0
-pkgrel=1
-pkgdesc="Awesome autocompletion for python. Official PKGBUILD."
-arch=('any')
-url="https://github.com/davidhalter/jedi"
-license=('LGPL3')
-depends=('python')
-makedepends=('python-distribute')
-conflicts=('jedi-git' 'python3-jedi-git')
-options=(!emptydirs)
-source=("https://pypi.python.org/packages/source/j/jedi/jedi-${pkgver}.tar.gz")
-
-
-package() {
-  cd "$srcdir/jedi-$pkgver"
-  python setup.py install --root="$pkgdir/" --optimize=1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/python-paste-deploy/PKGBUILD b/pcr/python-paste-deploy/PKGBUILD
deleted file mode 100644
index 57b7ca0d3..000000000
--- a/pcr/python-paste-deploy/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributor: David Campbell <davekong@archlinux.us>
-# Contributor: Cilyan Olowen <gaknar@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=python-paste-deploy
-pkgver=1.5.0
-pkgrel=1
-pkgdesc="Load, configure, and compose WSGI applications and servers"
-arch=('any')
-url="http://pythonpaste.org/deploy/"
-license=('custom')
-depends=('python2')
-makedepends=('setuptools')
-source=(http://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-${pkgver}.tar.gz)
-
-
-build() {
-  cd $srcdir/PasteDeploy-${pkgver}
-  python2 setup.py install --root=$pkgdir --optimize=1
-  install -Dm644 docs/license.txt $pkgdir/usr/share/licenses/$pkgname/license.txt
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-	 -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find $pkgdir -name '*.py')
-}
diff --git a/pcr/python-paste/PKGBUILD b/pcr/python-paste/PKGBUILD
deleted file mode 100644
index 3ffc12ca3..000000000
--- a/pcr/python-paste/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Contributor: David Campbell <davekong@archlinux.us>
-# Contributor: Cilyan Olowen <gaknar@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=python-paste
-pkgver=1.7.5.1
-pkgrel=1
-pkgdesc="Tools for using a Web Server Gateway Interface stack."
-arch=('any')
-url="http://pythonpaste.org/index.html"
-license=('custom')
-depends=('python2')
-makedepends=('setuptools')
-source=(http://pypi.python.org/packages/source/P/Paste/Paste-${pkgver}.tar.gz)
-optdepends=('python-flup: WSGI utilities'
-            'python-openid: Support for OpenID')
-
-build() {
-  cd ${srcdir}/Paste-${pkgver}
-  python2 setup.py install --root=${pkgdir} --optimize=1
-  install -Dm644 docs/license.txt ${pkgdir}/usr/share/licenses/$pkgname/license.txt
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-         -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find $pkgdir -name '*.py')
-}
diff --git a/pcr/python-pelican/PKGBUILD b/pcr/python-pelican/PKGBUILD
deleted file mode 100644
index 6d250a014..000000000
--- a/pcr/python-pelican/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=python-pelican
-pkgver=3.2.2
-pkgrel=1
-pkgdesc="Static blog generator"
-arch=("any")
-url="http://getpelican.com/"
-license=('AGPL3')
-depends=('python' 'python-feedgenerator' 'python-jinja' 'python-pygments'
-         'python-docutils' 'python-pytz' 'python-blinker' 'python-unidecode'
-         'python-six' 'python-distribute')
-options=(!emptydirs)
-source=("https://pypi.python.org/packages/source/p/pelican/pelican-$pkgver.tar.gz")
-md5sums=('cf9af2669dbd84c3e83b546b70b1a78c')
-
-package() {
-  cd "$srcdir/pelican-$pkgver"
-  python setup.py install --root="$pkgdir/" --optimize=1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/python-prettytable/PKGBUILD b/pcr/python-prettytable/PKGBUILD
deleted file mode 100644
index 92d42f18e..000000000
--- a/pcr/python-prettytable/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
-# Contributor: Xiao Er <xia0er@gmail.com>
-# Contributor: Victor Noel <victor.noel@crazydwarves.org>
-
-# Hack for AUR
-pkgname='python2-prettytable'
-true && pkgname=('python-prettytable' 'python2-prettytable')
-
-pkgver=0.6.1
-pkgrel=2
-pkgdesc="A simple Python library for easily displaying tabular data in a visually appealing ASCII table format"
-url="http://pypi.python.org/pypi/PrettyTable"
-arch=('any')
-license=('BSD')
-makedepends=('python-distribute' 'python2-distribute')
-source=(http://pypi.python.org/packages/source/P/PrettyTable/prettytable-${pkgver}.tar.gz)
-md5sums=('8f97da999f52e47e28ec4ffe7f25c4d8')
-
-package_python-prettytable() {
-  depends=('python')
-  cd $srcdir/prettytable-$pkgver
-  python setup.py install --root="$pkgdir/"
-}
-
-package_python2-prettytable() {
-  depends=('python2')
-  cd $srcdir/prettytable-$pkgver
-  python2 setup.py install --root="$pkgdir/"
-}
diff --git a/pcr/python-pygame-hg/PKGBUILD b/pcr/python-pygame-hg/PKGBUILD
deleted file mode 100644
index c48317b19..000000000
--- a/pcr/python-pygame-hg/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-_pkgname=pygame
-_pkgver=1.9.2
-_pyname=python
-_py3ver=3.3
-_py2ver=2.7
-_pkg3name=$_pyname-$_pkgname
-_pkg2name=${_pyname}2-$_pkgname
-_srcver=pre.d$(LC_ALL=C date -u +%Y%m%d)
-
-pkgbase=$_pyname-$_pkgname
-pkgname=(
-  $_pkg3name-hg
-  $_pkg2name-hg
-)
-pkgver=$_pkgver$_srcver
-pkgrel=1
-pkgdesc="${_pyname^} game library"
-arch=(
-  mips64el
-  x86_64
-  i686
-)
-url=http://www.$_pkgname.org/
-license=LGPL2.1
-depends=(
-  ffmpeg
-  portmidi
-  python
-  python2
-  #sdl_gfx
-  sdl_image
-  sdl_mixer
-  sdl_ttf
-)
-makedepends=mercurial
-source=hg+https://bitbucket.org/$_pkgname/$_pkgname
-sha512sums=SKIP
-
-package_python-pygame-hg() {
-  # disabled, due which conflicts with $_pkg2name
-  #provides=("$_pkg3name=$_pkgver")
-  #conflicts=$_pkg3name
-
-  cd $_pkgname
-
-  msg Building
-  find . -type f -exec sed -i "s|/usr/bin/env ${_pyname}2|/usr/bin/env $_pyname|" {} +
-  $_pyname config.py -auto
-  $_pyname setup.py install --root=$pkgdir --prefix=/usr
-
-  msg 'Copying the examples and tests'
-  cp -va examples lib/* $pkgdir/usr/lib/$_pyname$_py3ver/site-packages/$_pkgname
-  cp -va test/* $pkgdir/usr/lib/$_pyname$_py3ver/site-packages/$_pkgname/tests
-}
-
-package_python2-pygame-hg() {
-  provides=("$_pkg2name=$_pkgver")
-  conflicts=$_pkg2name
-
-  cd $_pkgname
-
-  msg Building
-  find . -type f -exec sed -i "s|/usr/bin/env $_pyname|/usr/bin/env ${_pyname}2|" {} +
-  ${_pyname}2 config.py -auto
-  ${_pyname}2 setup.py install --root=$pkgdir --prefix=/usr
-
-  msg 'Copying the examples and tests'
-  cp -va examples lib/* $pkgdir/usr/lib/$_pyname$_py2ver/site-packages/$_pkgname
-  cp -va test/* $pkgdir/usr/lib/$_pyname$_py2ver/site-packages/$_pkgname/tests
-}
diff --git a/pcr/python-repoze.lru/PKGBUILD b/pcr/python-repoze.lru/PKGBUILD
deleted file mode 100644
index 844658c27..000000000
--- a/pcr/python-repoze.lru/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: speps <speps at aur dot archlinux dot org>
-# Contributor: DasIch <dasdasich@googlemail.com>
-# Maintainer : Paraobla GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-_name=repoze.lru
-pkgname=python-$_name
-pkgver=0.6
-pkgrel=1
-pkgdesc="A tiny LRU cache implementation and decorator"
-arch=('any')
-license=('custom:BSD')
-url="http://pypi.python.org/pypi/$_name"
-depends=('python')
-makedepends=('python-distribute')
-provides=(python-repoze-lru)
-conflicts=(python-repoze-lru)
-replaces=(python-repoze-lru)
-source=("http://pypi.python.org/packages/source/r/$_name/$_name-$pkgver.tar.gz")
-
-build() {
-  cd "$srcdir/$_name-$pkgver"
-  python setup.py build
-}
-
-package() {
-  cd "$srcdir/$_name-$pkgver"
-  python setup.py install --root="$pkgdir/"
-
-  # license
-  install -Dm644 LICENSE.txt \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/pcr/python-routes/PKGBUILD b/pcr/python-routes/PKGBUILD
deleted file mode 100644
index 511934ef2..000000000
--- a/pcr/python-routes/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Contributor: David Moore <davidm@sjsoft.com>
-# Contributor: Nathan Jones <nathanj@insightbb.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=python-routes
-pkgver=1.13
-pkgrel=2
-pkgdesc="A routing package for Python that matches URL's to dicts and vice versa"
-arch=('any')
-url="http://pypi.python.org/pypi/Routes"
-license=('custom:BSD')
-depends=('python-repoze.lru')
-makedepends=('python-distribute')
-source=("http://pypi.python.org/packages/source/R/Routes/Routes-$pkgver.tar.gz")
-
-build() {
-  cd "$srcdir/Routes-$pkgver"
-  python setup.py build
-}
-
-package() {
-  cd "$srcdir/Routes-$pkgver"
-
-  python setup.py install --root="$pkgdir/"
-  install -Dm644 LICENSE \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
diff --git a/pcr/python-unidecode/PKGBUILD b/pcr/python-unidecode/PKGBUILD
deleted file mode 100644
index 1a605c28e..000000000
--- a/pcr/python-unidecode/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-pkgname=python-unidecode
-pkgver=0.04.13
-pkgrel=1
-pkgdesc="ASCII transliterations of Unicode text"
-arch=("any")
-url="https://pypi.python.org/pypi/Unidecode"
-license=('GPL2')
-depends=('python')
-options=(!emptydirs)
-source=("https://pypi.python.org/packages/source/U/Unidecode/Unidecode-$pkgver.tar.gz")
-md5sums=('74fabcc0aa3c3b185181df7fce8cab09')
-
-package() {
-  cd "$srcdir/Unidecode-$pkgver"
-  python setup.py install --root="$pkgdir/" --optimize=1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/python-wsgiref/PKGBUILD b/pcr/python-wsgiref/PKGBUILD
deleted file mode 100644
index 3f3b38bd2..000000000
--- a/pcr/python-wsgiref/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Contributor: Philipp Schmidt <philschmidt at gmx dot net>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=python-wsgiref
-pkgver=0.1.2
-pkgrel=2
-pkgdesc="WSGI (PEP 333) Reference Library"
-arch=('i686' 'x86_64')
-url="http://cheeseshop.python.org/pypi/wsgiref"
-license=('PSF or ZPL')
-depends=('python2')
-makedepends=('unzip' 'setuptools')
-source=("http://pypi.python.org/packages/source/w/wsgiref/wsgiref-$pkgver.zip")
-
-build() {
-	cd "$srcdir/wsgiref-$pkgver"
-
-	python2 setup.py install --root=$pkgdir
-}
diff --git a/pcr/python-xattr/PKGBUILD b/pcr/python-xattr/PKGBUILD
deleted file mode 100644
index d6977f435..000000000
--- a/pcr/python-xattr/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=python-xattr
-pkgver=20111028
-pkgrel=1
-pkgdesc="module for manipulating filesystem extended attributes"
-arch=('i686' 'x86_64')
-url="http://undefined.org/python/#xattr"
-license=('MIT')
-conflicts=('pyattr')
-provied=('pyattr')
-makedepends=('setuptools')
-depends=('python2' 'git')
-
-_gitroot=https://github.com/xattr/xattr.git
-_gitname=xattr
-
-build() {
-  cd $srcdir/
-
-  if [ -e ${_gitname} ] ; then
-    cd ${_gitname}
-    git pull
-    cd ..
-  else
-    git clone ${_gitroot} ${_gitname}
-  fi
-
-  cd $srcdir/xattr/
-  python2 setup.py install --prefix=/usr --root=$pkgdir
-}
diff --git a/pcr/python2-amqplib/PKGBUILD b/pcr/python2-amqplib/PKGBUILD
deleted file mode 100644
index d67800a06..000000000
--- a/pcr/python2-amqplib/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor: Tevin Zhang <mail2tevin {at} gmail {dot} com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=python2-amqplib
-pkgver=1.0.2
-pkgrel=3
-pkgdesc="Python client for the Advanced Message Queuing Procotol (AMQP). Uses Python2."
-arch=('any')
-url="http://code.google.com/p/py-amqplib/"
-license=("LGPL")
-depends=('python2>=2.6' 'setuptools')
-source=(http://py-amqplib.googlecode.com/files/amqplib-$pkgver.tgz)
-
-build() {
-  cd $srcdir/amqplib-$pkgver
-  
-  # replace /usr/bin/env python with python2
-  find . -name '*.py' -exec sed -i -e '1 s/python\s*$/python2/' {} \;
-  
-  python2 ./setup.py install --root=$pkgdir --prefix=/usr || return 1
-}
- 
diff --git a/pcr/python2-argparse/PKGBUILD b/pcr/python2-argparse/PKGBUILD
deleted file mode 100644
index cda95c0e2..000000000
--- a/pcr/python2-argparse/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Contributor: Lukas Linhart <bugs@almad.net>
-# Contributor: Changaco <changaco ατ changaco δοτ net>
-# Contributor: Nicolas Pouillard <nicolas.pouillard@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=python2-argparse
-pkgver=1.2.1
-pkgrel=1
-pkgdesc="Command line parsing library for python"
-arch=('any')
-url='http://code.google.com/p/argparse/'
-conflicts=('argparse')
-license=('Apache')
-depends=('python2')
-makedepends=('setuptools')
-source=("http://argparse.googlecode.com/files/argparse-$pkgver.tar.gz")
-
-# While python 2.7 has a builtin argparse module,
-# packages built with setuptools still needs this one.
-
-build() {
-  cd ${srcdir}/argparse-$pkgver
-  python2 setup.py build || return 1
-  python2 setup.py install --root=${pkgdir} || return 1
-}
diff --git a/pcr/python2-carrot/PKGBUILD b/pcr/python2-carrot/PKGBUILD
deleted file mode 100644
index b620eca9e..000000000
--- a/pcr/python2-carrot/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor: Lukas Linhart <bugs@almad.net>
-# Contributor: Marco Elver <marco.elver AT gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=python2-carrot
-pkgver=0.10.5
-pkgrel=1
-pkgdesc="AMQP Messaging Framwork for Python"
-arch=('any')
-url='http://ask.github.com/carrot/'
-license=('BSD')
-depends=('python2' 'python2-amqplib')
-makedepends=('setuptools')
-source=("http://pypi.python.org/packages/source/c/carrot/carrot-$pkgver.tar.gz")
-options=(!emptydirs)
-
-build() {
-  cd ${srcdir}/carrot-$pkgver
-  python2 setup.py install --root=$pkgdir/ --optimize=1 || return 1
-}
-
diff --git a/pcr/python2-cheetah/Changelog b/pcr/python2-cheetah/Changelog
deleted file mode 100644
index e95e8c91f..000000000
--- a/pcr/python2-cheetah/Changelog
+++ /dev/null
@@ -1,12 +0,0 @@
-2012-03-25 Julien Nicoulaud <julien.nicoulaud@gmail.com>
-
-	* 2.4.4-5 :
-	Change dependency on 'python-markdown' to 'python2-markdown' since
-    FS#28265 is solved.
-
-2012-01-31 Julien Nicoulaud <julien.nicoulaud@gmail.com>
-
-	* 2.4.4-4 :
-	Add changelog.
-	Remove unneeded shebang modification.
-
diff --git a/pcr/python2-cheetah/PKGBUILD b/pcr/python2-cheetah/PKGBUILD
deleted file mode 100644
index ea6b1036b..000000000
--- a/pcr/python2-cheetah/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributor: Julien Nicoulaud <julien.nicoulaud@gmail.com>
-# Contributor: James Rayner <james@archlinux.org>
-# Contributor: Todd Maynard <arch@toddmaynard.com>
-# Source: https://github.com/nicoulaj/archlinux-packages
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=python2-cheetah
-pkgver=2.4.4
-pkgrel=5
-pkgdesc="A Python-powered template engine and code generator"
-arch=(i686 x86_64)
-url="http://www.cheetahtemplate.org"
-license=(custom)
-depends=(python2 python2-markdown)
-makedepends=(python2-distribute)
-optdepends=('python2-pygments: for the CodeHighlighter filter')
-provides=(cheetah python-cheetah)
-conflicts=(cheetah python-cheetah)
-changelog=Changelog
-source=(http://pypi.python.org/packages/source/C/Cheetah/Cheetah-${pkgver}.tar.gz)
-
-build() {
-  cd "${srcdir}/Cheetah-${pkgver}"
-  python2 setup.py build
-}
-
-package() {
-  msg "Install..."
-  cd "${srcdir}/Cheetah-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" || return 1
-
-  msg2 "Install copyright resources in /usr/share/licenses/${pkgname}..."
-  install -Dm644 "${srcdir}/Cheetah-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/pcr/python2-daemon/PKGBUILD b/pcr/python2-daemon/PKGBUILD
deleted file mode 100644
index 18358f9cb..000000000
--- a/pcr/python2-daemon/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=python2-daemon
-pkgver=1.6
-pkgrel=2
-pkgdesc="Library to implement a well-behaved Unix daemon process"
-license=("PSF-2+")
-url="http://pypi.python.org/pypi/python-daemon"
-depends=('python2-lockfile')
-makedepends=('python2-distribute')
-source=(http://pypi.python.org/packages/source/p/python-daemon/python-daemon-$pkgver.tar.gz)
-arch=('any')
-options=(!emptydirs)
-
-build() {
-	cd "$srcdir/python-daemon-$pkgver"
-	python2 setup.py install --root="$pkgdir"
-}
-
diff --git a/pcr/python2-e_dbus/PKGBUILD b/pcr/python2-e_dbus/PKGBUILD
deleted file mode 100644
index 0cff13210..000000000
--- a/pcr/python2-e_dbus/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Doug Newgard <scimmia22 at outlook dot com>
-
-pkgname=python2-e_dbus
-_pkgname=python-e_dbus
-pkgver=1.7.0
-pkgrel=1
-pkgdesc="Python2 bindings for E_Dbus"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('LGPL2.1')
-depends=('e_dbus' 'python2' 'python2-dbus')
-options=('!libtool' '!emptydirs')
-source=("http://download.enlightenment.org/releases/BINDINGS/python/$_pkgname-$pkgver.tar.bz2")
-md5sums=('40b479444bb06147429a276127981890')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  PYTHON=/usr/bin/python2 \
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/python2-ecore/PKGBUILD b/pcr/python2-ecore/PKGBUILD
deleted file mode 100644
index e4837c704..000000000
--- a/pcr/python2-ecore/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Doug Newgard <scimmia22 at outlook dot com>
-
-pkgname=python2-ecore
-_pkgname=python-ecore
-pkgver=1.7.0
-pkgrel=1
-pkgdesc="Python2 bindings for Ecore"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('LGPL2.1')
-depends=('ecore' 'python2-evas')
-makedepends=('cython2')
-options=('!libtool' '!emptydirs')
-source=("http://download.enlightenment.org/releases/BINDINGS/python/$_pkgname-$pkgver.tar.bz2")
-md5sums=('15dd908b71d09ef30f7e758739f3b6fd')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  PYTHON=/usr/bin/python2 \
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
diff --git a/pcr/python2-edje/PKGBUILD b/pcr/python2-edje/PKGBUILD
deleted file mode 100644
index 5a63b993f..000000000
--- a/pcr/python2-edje/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Doug Newgard <scimmia22 at outlook dot com>
-
-pkgname=python2-edje
-_pkgname=python-edje
-pkgver=1.7.0
-pkgrel=1
-pkgdesc="Python2 bindings for Edje"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('LGPL2.1')
-depends=('edje' 'python2-evas')
-makedepends=('cython2')
-options=('!libtool' '!emptydirs')
-source=("http://download.enlightenment.org/releases/BINDINGS/python/$_pkgname-$pkgver.tar.bz2")
-md5sums=('1e0d7a4a4504298caaad0cee476e4edb')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  PYTHON=/usr/bin/python2 \
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
diff --git a/pcr/python2-elementary/PKGBUILD b/pcr/python2-elementary/PKGBUILD
deleted file mode 100644
index 9372e9445..000000000
--- a/pcr/python2-elementary/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Doug Newgard <scimmia22 at outlook dot com>
-
-pkgname=python2-elementary
-_pkgname=python-elementary
-pkgver=1.7.0
-pkgrel=1
-pkgdesc="Python2 bindings for Elementary"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('LGPL2.1')
-depends=('elementary' 'python2-evas')
-makedepends=('cython2')
-options=('!libtool' '!emptydirs')
-source=("http://download.enlightenment.org/releases/BINDINGS/python/$_pkgname-$pkgver.tar.bz2")
-md5sums=('38c8b2ac508ab4e1d12f1557a12169c9')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  PYTHON=/usr/bin/python2 \
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
diff --git a/pcr/python2-empy/PKGBUILD b/pcr/python2-empy/PKGBUILD
deleted file mode 100644
index 3c4cd7bee..000000000
--- a/pcr/python2-empy/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Contributor: Andrew Conkling <andrewski@fr.st>
-# Contributor: hauptmech <hauptmech@gmail.com>
-# Maintainer : Parabola GNU / LInux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=python2-empy
-realname=empy
-pkgver=3.3
-pkgrel=2
-pkgdesc="A powerful and robust templating system for Python."
-arch=(i686 x86_64)
-url="http://www.alcyone.com/software/empy"
-depends=('python2')
-license=('LGPL')
-source=("http://www.alcyone.com/software/empy/empy-$pkgver.tar.gz")
-
-build() {
-  cd $startdir/src/empy-$pkgver
-  python2 setup.py install --prefix=$startdir/pkg/usr
-}
-
diff --git a/pcr/python2-evas/PKGBUILD b/pcr/python2-evas/PKGBUILD
deleted file mode 100644
index 7f66df658..000000000
--- a/pcr/python2-evas/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Doug Newgard <scimmia22 at outlook dot com>
-
-pkgname=python2-evas
-_pkgname=python-evas
-pkgver=1.7.0
-pkgrel=1
-pkgdesc="Python2 bindings for Evas"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('LGPL2.1')
-depends=('evas' 'python2')
-makedepends=('cython2')
-options=('!libtool' '!emptydirs')
-source=("http://download.enlightenment.org/releases/BINDINGS/python/$_pkgname-$pkgver.tar.bz2")
-md5sums=('c3fda2025171f5e3d2bc224e8bae88e5')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  PYTHON=/usr/bin/python2 \
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/python2-eventlet/PKGBUILD b/pcr/python2-eventlet/PKGBUILD
deleted file mode 100644
index d9dc41d8d..000000000
--- a/pcr/python2-eventlet/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- shell-script -*-
-#Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-python=python2
-name=eventlet
-
-pkgname=$python-$name
-pkgver=0.9.16
-pkgrel=1
-pkgdesc="Highly concurrent networking library"
-arch=(any)
-url="http://eventlet.net"
-license=(MIT)
-depends=('python2-greenlet' 'python' 'python2-distribute')
-makedepends=("$python")
-source=("http://pypi.python.org/packages/source/e/$name/$name-$pkgver.tar.gz")
-
-build() {
-  cd "$srcdir/$name-$pkgver"
-  $python setup.py install --prefix=/usr --root=$pkgdir
-}
-
diff --git a/pcr/python2-fabric/PKGBUILD b/pcr/python2-fabric/PKGBUILD
deleted file mode 100644
index 7552eaabc..000000000
--- a/pcr/python2-fabric/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Francois Boulogne <fboulogne at april dot org>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=python2-fabric
-pkgver=1.5.0
-pkgrel=2
-pkgdesc="Python library and command-line tool designed to streamline deploying applications or performing system administration tasks via the SSH protocol"
-url="http://fabfile.org/"
-license=('BSD')
-arch=('any')
-depends=('python2>=2.5' 'pycrypto' 'python2-paramiko>=1.9.0' 'python2-distribute' 'python2-ssh')
-source=("http://pypi.python.org/packages/source/F/Fabric/Fabric-${pkgver}.tar.gz")
-md5sums=('13b7b98149497fb7ab6f880e3e875f89')
-
-build() {
-  cd ${srcdir}/Fabric-${pkgver}
-  python2 setup.py install --root=${pkgdir} --optimize=1
-
-  install -D -m644 README.rst ${pkgdir}/usr/share/doc/${pkgname}/README.rst
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-md5sums=('13b7b98149497fb7ab6f880e3e875f89')
diff --git a/pcr/python2-flask-lesscss/PKGBUILD b/pcr/python2-flask-lesscss/PKGBUILD
deleted file mode 100644
index 3f2aecb73..000000000
--- a/pcr/python2-flask-lesscss/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname="python2-flask-lesscss"
-pkgver=0.9.1
-pkgrel=1
-pkgdesc="A small Flask extension that adds LessCSS support to Flask."
-arch=("any")
-url="http://pypi.python.org/pypi/flask-lesscss"
-license=("MIT")
-depends=("python2" "lessc" "python2-flask")
-makedepends=("setuptools")
-source=("http://pypi.python.org/packages/source/f/flask-lesscss/flask-lesscss-${pkgver}.tar.gz")
-
-build() {
-  cd "${srcdir}/flask-lesscss-${pkgver}"
-  python2 ./setup.py install --root="${pkgdir}" --prefix="/usr" || return 1
-}
diff --git a/pcr/python2-iso8601/PKGBUILD b/pcr/python2-iso8601/PKGBUILD
deleted file mode 100644
index 08ca49004..000000000
--- a/pcr/python2-iso8601/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Contributor: WU Jun <quark at lihdd dot net>
-# Contributor: Vsevolod Balashov <vsevolod@balashov.name>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-name=iso8601
-pkgname=python2-$name
-pkgver=0.1.4
-pkgrel=3
-pkgdesc="Simple module to parse ISO 8601 dates"
-arch=(any)
-url="http://pypi.python.org/pypi/$name"
-license=(MIT)
-depends=(python2)
-makedepends=(python2-distribute)
-source=("http://pypi.python.org/packages/source/i/$name/$name-$pkgver.tar.gz")
-build() {
-  cd "$srcdir/$name-$pkgver"
-  python2 setup.py install --prefix=/usr --root=$pkgdir || return 1
-}
diff --git a/pcr/python2-kombu/PKGBUILD b/pcr/python2-kombu/PKGBUILD
deleted file mode 100644
index ef99b0beb..000000000
--- a/pcr/python2-kombu/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Felix Yan <felixonmars@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=python2-kombu
-pkgver=2.4.10
-pkgrel=1
-pkgdesc="AMQP Messaging Framework for Python 2.x"
-arch=('any')
-url="http://pypi.python.org/pypi/kombu/"
-license=('BSD')
-depends=('python2' 'python-anyjson')
-optdepends=(
-  "python2-librabbitmq: High performance AMQP transport written in C"
-)
-makedepends=('setuptools')
-source=("http://pypi.python.org/packages/source/k/kombu/kombu-$pkgver.tar.gz")
-options=(!emptydirs)
-
-build() {
-  cd "$srcdir"/kombu-$pkgver
-  python2 setup.py build
-}
-
-package() {
-  cd "$srcdir"/kombu-$pkgver
-  python2 setup.py install --root="$pkgdir/"
-  install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
diff --git a/pcr/python2-mock/PKGBUILD b/pcr/python2-mock/PKGBUILD
deleted file mode 100644
index 5647c15d2..000000000
--- a/pcr/python2-mock/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributor: Felix Kaiser <felix.kaiser@fxkr.net>
-
-pkgname=python2-mock
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="A Python Mocking and Patching Library for Testing"
-url='http://www.voidspace.org.uk/python/mock/'
-license=('BSD')
-depends=('python2')
-arch=('i686' 'x86_64')
-source=("http://pypi.python.org/packages/source/m/mock/mock-$pkgver.tar.gz")
-md5sums=('c3971991738caa55ec7c356bbc154ee2')
-
-build() {
-  cd "$srcdir/mock-$pkgver"
-  python2 setup.py build
-}
-
-package() {
-  cd "$srcdir/mock-$pkgver"
-  python2 setup.py install --optimize=1 --root="$pkgdir"
-  install -Dm644 LICENSE* $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
-
diff --git a/pcr/python2-netaddr/PKGBUILD b/pcr/python2-netaddr/PKGBUILD
deleted file mode 100644
index 8d9f2a827..000000000
--- a/pcr/python2-netaddr/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Contributor: Sebastien LEDUC <sebastien@sleduc.fr>
-# Contributor: Gilles CHAUVIN <gcnweb at gmail dot com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=python2-netaddr
-pkgver=0.7.10
-pkgrel=1
-pkgdesc="A pure Python network address representation and manipulation library"
-arch=('i686' 'x86_64')
-license=('BSD')
-url="http://github.com/drkjam/netaddr/"
-depends=('python2')
-source=("http://github.com/downloads/drkjam/netaddr/netaddr-$pkgver.tar.gz")
-
-build() {
-    cd "$srcdir/netaddr-$pkgver/"
-    python2 setup.py install --root="$pkgdir/" --optimize=1
-}
-
diff --git a/pcr/python2-oauth2/PKGBUILD b/pcr/python2-oauth2/PKGBUILD
deleted file mode 100644
index c58e86f9c..000000000
--- a/pcr/python2-oauth2/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=python2-oauth2
-pkgver=1.5.211
-pkgrel=1
-_libname=${pkgname/python2-/}
-pkgdesc="A fully tested, abstract interface to creating OAuth clients and servers"
-arch=(any)
-url="https://github.com/simplegeo/python-oauth2"
-license=('GPL')
-depends=(python2-httplib2)
-makedepends=(python2-distribute)
-source=(http://pypi.python.org/packages/source/${_libname:0:1}/$_libname/$_libname-$pkgver.tar.gz)
-
-build() {
-	cd "$srcdir/$_libname-$pkgver"
-	python2 setup.py install --root=$pkgdir
-	rm -rf "$pkgdir"/usr/lib/python*/site-packages/tests
-}
diff --git a/pcr/python2-passlib/PKGBUILD b/pcr/python2-passlib/PKGBUILD
deleted file mode 100644
index 753677827..000000000
--- a/pcr/python2-passlib/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor: onny <onny@project-insanity.org>
-# Contributor: onny <onny@project-insanity.org>
-# Maintainer : Parabola GNU /Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=python2-passlib
-pkgver=1.6.1
-pkgrel=1
-pkgdesc="A password hashing library for Python."
-arch=('i686' 'x86_64')
-url=("https://code.google.com/p/passlib/")
-license=('custom')
-depends=('python2')
-source=("https://passlib.googlecode.com/files/passlib-${pkgver}.tar.gz")
-sha512sums=('93c047dc0a06f19a20e5da97db43c5c76e06d69baeac15cc932ef0306ae22dac5c1a3925889a140fd181ab4e00ac513ec829951e15babf5aad89bd2d08dc9907')
-
-build() {
-  cd "$srcdir/passlib-${pkgver}"
-  python2 setup.py build install --root="${pkgdir}" || return 1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/python2-pillow/PKGBUILD b/pcr/python2-pillow/PKGBUILD
deleted file mode 100644
index 5840a5f82..000000000
--- a/pcr/python2-pillow/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=python2-pillow
-_appname=Pillow
-pkgver=1.7.8
-pkgrel=2
-pkgdesc="Python Imaging Library (PIL) fork."
-arch=(i686 x86_64)
-url="https://github.com/dwaiter/django-ckeditor"
-license=('BSD')
-depends=('python2')
-provides=('python2-imaging')
-conflicts=('python2-imaging')
-makedepends=('python2-distribute')
-source=("http://pypi.python.org/packages/source/P/${_appname}/${_appname}-${pkgver}.zip")
-md5sums=('41d8688d4db72673069a6dc63b5289d6')
-
-package() {
-  cd "$srcdir/$_appname-$pkgver"
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-}
-
diff --git a/pcr/python2-pkgtools/PKGBUILD b/pcr/python2-pkgtools/PKGBUILD
deleted file mode 100644
index 7060dc416..000000000
--- a/pcr/python2-pkgtools/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Contributor: Fabien Devaux <fdev31 at gmail dot com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=python2-pkgtools
-pkgver=0.7.1
-pkgrel=1
-pkgdesc="Python packages tools"
-arch=('any')
-url="http://pkgtools.readthedocs.org/en/latest/"
-license=('MIT')
-depends=('python2')
-makedepends=('python2-distribute')
-source=(http://pypi.python.org/packages/source/p/pkgtools/pkgtools-${pkgver}.tar.gz)
-
-build() {
-   cd "${srcdir}/pkgtools-${pkgver}"
-   python2 setup.py build || exit 1
-   python2 setup.py install --root="${pkgdir}" --optimize=1 || exit 1
-}
-
diff --git a/pcr/python2-polib/PKGBUILD b/pcr/python2-polib/PKGBUILD
deleted file mode 100644
index 50047ac3e..000000000
--- a/pcr/python2-polib/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Esteban V. Carnevale <alfplayer@mailoo.com>
-
-pkgname=python2-polib
-_pkgname='polib'
-pkgver=1.0.3
-pkgrel=1
-pkgdesc='A library to manipulate gettext files'
-url='http://polib.readthedocs.org/en/latest/index.html'
-arch=('any')
-license=('MIT')
-depends=('python2')
-
-source=("https://bitbucket.org/izi/polib/downloads/polib-${pkgver}.tar.gz")
-md5sums=('dc9dc39d4053cfe030155891f3043cb1')
-
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  python2 setup.py build
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/pcr/python2-postfix-policyd-spf/PKGBUILD b/pcr/python2-postfix-policyd-spf/PKGBUILD
deleted file mode 100644
index f5b96f752..000000000
--- a/pcr/python2-postfix-policyd-spf/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# From https://aur.archlinux.org/packages.php?ID=42275
-# Maintainer: Filip S. Adamsen <fsa [at] fsadev [dot] com>
-# Contributor: Samed Beyribey <ras0ir@eventualis.org>
-pkgname=python2-postfix-policyd-spf
-_pkgname=pypolicyd-spf
-pkgver=1.1.2
-pkgrel=1
-pkgdesc="Python2 Postfix Sender Policy Framework (SPF) filter"
-arch=('any')
-url="http://www.openspf.org/Software"
-license=('GPL')
-depends=('postfix' 'python2-pyspf' 'python2')
-conflicts=('python-postfix-policyd-spf')
-options=(!emptydirs)
-backup=(etc/python-policyd-spf/policyd-spf.conf)
-source=(http://launchpad.net/pypolicyd-spf/1.1/$pkgver/+download/$_pkgname-$pkgver.tar.gz)
-sha256sums=('f8999a9febc5ccb4a66f9961e4ec2d8f81b407bdc3ac1c84563cd5085429cdea')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver" 
-  python2 setup.py build
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  python2 setup.py install --root=$pkgdir/ --optimize=1
-  install -m644 policyd-spf.conf.commented $pkgdir/etc/python-policyd-spf
-}
diff --git a/pcr/python2-potr/PKGBUILD b/pcr/python2-potr/PKGBUILD
deleted file mode 100644
index 39613ad95..000000000
--- a/pcr/python2-potr/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Michael Düll <mail@akurei.me> PGP-Key: AAAEE882
-
-pkgname=python2-potr
-pkgver=1.0.0beta6
-pkgrel=3
-pkgdesc="This is a pure Python OTR implementation; it does not bind to libotr."
-arch=(any)
-url="https://github.com/afflux/pure-python-otr"
-license=('LGPL')
-depends=('python2' 'python2-crypto')
-conflicts=('python-potr-git' 'python-potr')
-replaces=('python-potr')
-options=(!emptydirs)
-source=("https://github.com/afflux/pure-python-otr/tarball/${pkgver}")
-
-PYTHON=`which python2`
-
-build() {
-  cd $srcdir/afflux*
-  set_python2
-  $PYTHON ./setup.py build
-}
-
-package() {
-  cd $srcdir/afflux*
-  $PYTHON ./setup.py install --root=$pkgdir/
-}
-
-# To use python2 instead of default python v3.
-set_python2() {
-  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
-}
-
-
-# vim:set ts=2 sw=2 et:
-sha512sums=('323ad31e782409b7bd93539dfc0088de8b114075b88de81123b732aff609fbb2a2c06221c52266225ce54e20e9856b25759bae84c93244a1258ccba3825c8b1c')
diff --git a/pcr/python2-pycha/PKGBUILD b/pcr/python2-pycha/PKGBUILD
deleted file mode 100644
index cc6662f70..000000000
--- a/pcr/python2-pycha/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Jakub Klinkovský <kuba.klinkovsky@gmail.com>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
-pkgname=python2-pycha
-pkgver=279
-pkgrel=1
-pkgdesc="Pycha is a very simple Python package for drawing charts using the great Cairo library."
-arch=('any')
-url="http://bitbucket.org/lgs/pycha/"
-license=('LGPL')
-depends=('pycairo')
-makedepends=('mercurial' 'python2-distribute')
-
-_hgroot="https://bitbucket.org/lgs/pycha"
-_hgrepo="pycha"
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to Mercurial server...."
-
-  if [[ -d "$_hgrepo" ]]; then
-    cd "$_hgrepo"
-    hg pull -u
-    msg "The local files are updated."
-  else
-    hg clone "$_hgroot" "$_hgrepo"
-  fi
-
-  msg "Mercurial checkout done or server timeout"
-}
-
-package() {
-  cd "$srcdir/$_hgrepo"
-  msg "Starting build..."
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/pcr/python2-pydns/PKGBUILD b/pcr/python2-pydns/PKGBUILD
deleted file mode 100644
index cf5f4b388..000000000
--- a/pcr/python2-pydns/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
-# From https://aur.archlinux.org/packages.php?ID=42273
-# Maintainer: Filip S. Adamsen <fsa [at] fsadev [dot] com>
-# Contributor: Samed Beyribey <ras0ir AT eventualis DOT org>
-pkgname=python2-pydns
-_pkgname=pydns
-pkgver=2.3.6
-pkgrel=1
-pkgdesc="Python2 module for performing DNS queries"
-arch=('any')
-url="http://pydns.sourceforge.net"
-license=('custom')
-depends=('python2')
-options=(!emptydirs)
-source=(http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.gz)
-md5sums=('d12ca75251854ab6fcabbaff6909b690')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  python2 setup.py build || return 1
-  python2 setup.py install --root=$pkgdir/ --optimize=1 || return 1
-  install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname"
-  install -m644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname"
-}
diff --git a/pcr/python2-pyspf/PKGBUILD b/pcr/python2-pyspf/PKGBUILD
deleted file mode 100644
index abb3bfa5f..000000000
--- a/pcr/python2-pyspf/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
-# From https://aur.archlinux.org/packages.php?ID=42274
-# Maintainer: Filip S. Adamsen <fsa [at] fsadev [dot] com>
-# Contributor: Samed Beyribey <ras0ir AT eventualis DOT org>
-pkgname=python2-pyspf
-_pkgname=pyspf
-pkgver=2.0.7
-pkgrel=1
-pkgdesc="Python2 implementation of the Sender Policy Framework (SPF) protocol"
-arch=('any')
-url="http://pypi.python.org/pypi/pyspf"
-license=('PSF')
-depends=('python2-pydns' 'python2')
-checkdepends=('python2-yaml')
-conflicts=('python-pyspf')
-options=(!emptydirs)
-source=(http://downloads.sourceforge.net/pymilter/$_pkgname-$pkgver.tar.gz)
-md5sums=('df47e2c04054a89da8b46b7f67e704ae')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  python2 setup.py build || return 1
-  python2 setup.py install --root=$pkgdir/ --optimize=1 || return 1
-
-  # See http://allanmcrae.com/2010/10/big-python-transition-in-arch-linux/
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-         -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find $pkgdir -name '*.py') || return 1
-}
-
-check() {
-  cd "$srcdir/$_pkgname-$pkgver/test"
-  PYTHONPATH="$srcdir/$_pkgname-$pkgver:$PYTHONPATH" python2 testspf.py
-}
diff --git a/pcr/python2-pywebdav/PKGBUILD b/pcr/python2-pywebdav/PKGBUILD
deleted file mode 100644
index 994bd4c4f..000000000
--- a/pcr/python2-pywebdav/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Dan Serban (dserban01 => gmail)
-# Contributor: Gour <gour@gour-nitai.com>
-
-pkgname=python2-pywebdav
-pkgver=0.9.8
-pkgrel=2
-pkgdesc="A standards compliant WebDAV server and library written in Python"
-arch=('any')
-url="http://code.google.com/p/pywebdav/"
-license=('GPLv2')
-depends=('python2')
-conflicts=('python-pywebdav')
-makedepends=('python2-distribute')
-source=(http://pywebdav.googlecode.com/files/PyWebDAV-$pkgver.tar.gz)
-md5sums=('2fd2aca0074f0d0ac2701c9c0cadb89e')
-
-package()
-{
-  cd $srcdir/PyWebDAV-$pkgver
-  python2 setup.py install --root=$pkgdir/ 
-  install -D doc/LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/pcr/python2-qrcode/PKGBUILD b/pcr/python2-qrcode/PKGBUILD
deleted file mode 100644
index a0d2377cb..000000000
--- a/pcr/python2-qrcode/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor: Francois Boulogne <fboulogne at april dot org>
-# Maintainer: Francois Boulogne <fboulogne at april dot org>
-
-pkgname=python2-qrcode
-pkgver=2.7
-pkgrel=1
-pkgdesc="Python library to generate QR codes"
-arch=('any')
-url="https://github.com/lincolnloop/python-qrcode"
-license=('BSD')
-depends=('python2-imaging' 'python2')
-source=(http://pypi.python.org/packages/source/q/qrcode/qrcode-${pkgver}.tar.gz)
-md5sums=("9c0c3d85aae468ac5ed9a501306d00d0")
-
-package() {
-  cd "$srcdir/qrcode-$pkgver"
-
-  python2 setup.py install --root="${pkgdir}"
-}
-
-# vim:ts=2:sw=2:et:
diff --git a/pcr/python2-qrencode/PKGBUILD b/pcr/python2-qrencode/PKGBUILD
deleted file mode 100644
index dd58c1885..000000000
--- a/pcr/python2-qrencode/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: ValHue <vhuelamo at gmail dot com>
-# https://github.com/ValHue/AUR-PKGBUILDs
-#
-# Contributor: sevkin <vsevolod at balashov dot name>
-
-_python=python2
-_name=qrencode
-pkgname="${_python}-${_name}"
-pkgver=1.01
-pkgrel=4
-pkgdesc="Encodes QR-codes."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://pypi.python.org/pypi/${_name}"
-license=('Apache')
-depends=("${_python}" 'qrencode')
-makedepends=('gcc')
-source=("http://pypi.python.org/packages/source/q/${_name}/${_name}-${pkgver}.tar.gz")
-md5sums=('5a1addd4d6e6412116fcfeb9661831a9')
-
-build() {
-    cd "${_name}-${pkgver}"
-    export PYTHON="/usr/bin/${_python}"
-    ${_python} setup.py build
-}
-
-package() {
-    cd "${_name}-${pkgver}"
-    ${_python} setup.py install --root="${pkgdir}" --prefix="/usr" --optimize=1
-}
diff --git a/pcr/python2-relatorio/PKGBUILD b/pcr/python2-relatorio/PKGBUILD
deleted file mode 100644
index 888cda81d..000000000
--- a/pcr/python2-relatorio/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor: Florian Walch <florian.walch@gmx.at>
-# Maintainer: Thomas Bahn <Thomas-Bahn@gmx.net>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgname=python2-relatorio
-pkgver=0.6.0
-pkgrel=1
-pkgdesc="A templating library able to output odt and pdf files"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://relatorio.openhex.org"
-license=('GPL')
-depends=('python2-genshi>=0.7' 'python2-lxml>=3.2.1')
-makedepends=('python2-distribute')
-source=("http://pypi.python.org/packages/source/r/relatorio/relatorio-$pkgver.tar.gz")
-
-build() {
-  cd $srcdir/relatorio-$pkgver
-  chmod 644 relatorio.egg-info/*
-  python2 setup.py install --root=$pkgdir
-}
-
-md5sums=('170eeb4102a92b9ddc554799a1503cee')
diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD
deleted file mode 100644
index db2a94428..000000000
--- a/pcr/python2-renpy/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-_pkgname=renpy
-pkgname=python2-renpy
-pkgver=6.16.2
-pkgrel=1
-pkgdesc="Platform-dependant Ren'Py libraries."
-arch=(
-  mips64el
-  x86_64
-  i686
-)
-license=MIT
-url=http://www.$_pkgname.org/
-depends=(
-  ffmpeg
-  fribidi
-  glew
-  python2-pygame=1.9.1
-)
-makedepends='python2>=2.7'
-provides="python-$_pkgname=$pkgver"
-conflicts=(
-  python-$_pkgname
-  "$_pkgname<$pkgver"
-  ${_pkgname}64
-  $_pkgname-bin
-)
-renplaces=python-$_pkgname
-source=http://www.$_pkgname.org/dl/$pkgver/$_pkgname-$pkgver-source.tar.bz2
-sha512sums=fc3b40f01f2d1e820a05f90a2d85e42986aaa4840e506d18ea76a78527d2f98ca6cf832ebde3e1f996b94f4ce4b175856da913f3de7f1a9db48aba0eea84b52d
-
-build() {
-  cd $srcdir/$_pkgname-$pkgver-source
-
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|;' module/setup.py
-
-  python2 module/setup.py build
-}
-
-package(){
-  cd $srcdir/$_pkgname-$pkgver-source
-
-  msg "install $pkgname"
-  python2 module/setup.py install --root=$pkgdir/ --prefix=/usr --optimize=1
-  install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/pcr/python2-ropemacs/PKGBUILD b/pcr/python2-ropemacs/PKGBUILD
deleted file mode 100644
index 84c5661ba..000000000
--- a/pcr/python2-ropemacs/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor: Renato Garcia <fgarcia.renato@gmail.com>
-# Contributor: yescalona <yescaloan[at]ug[dot]uchile[dot]cl>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=python2-ropemacs
-_pkgname=ropemacs
-pkgver=0.7
-pkgrel=1
-pkgdesc='Emacs mode that uses rope_ library to provide features like python refactorings and code-assists.'
-url='http://bitbucket.org/agr/ropemacs'
-arch=('any')
-license=('GPL')
-depends=('python2-ropemode' 'pymacs')
-install=python2-ropemacs.install
-source=("http://bitbucket.org/agr/${_pkgname}/get/${pkgver}.tar.bz2")
-md5sums=('0034d77822728da561b8ef213eea0762')
-
-package() {
-  cd "${srcdir}/agr-ropemacs-93721bd03667"
-  python2 ./setup.py install --root="${pkgdir}" --prefix=/usr
-}
diff --git a/pcr/python2-ropemacs/python2-ropemacs.install b/pcr/python2-ropemacs/python2-ropemacs.install
deleted file mode 100644
index 4b303b8b4..000000000
--- a/pcr/python2-ropemacs/python2-ropemacs.install
+++ /dev/null
@@ -1,8 +0,0 @@
-post_install() {
-
-echo "After installing pymacs, add these lines to your ``~/.emacs`` file:"
-echo "(require 'pymacs)"
-echo "(pymacs-load \"ropemacs\" \"rope-\")"
-/bin/true
-}
-
diff --git a/pcr/python2-ropemode/PKGBUILD b/pcr/python2-ropemode/PKGBUILD
deleted file mode 100644
index bdeb58a68..000000000
--- a/pcr/python2-ropemode/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Contributor: Renato Garcia <fgarcia.renato@gmail.com>
-# Contributor: Nicolás de la Torre <ndelatorre@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io>
-
-pkgname=python2-ropemode
-_pkgname=ropemode
-pkgver=0.2
-pkgrel=1
-pkgdesc="A helper for using rope refactoring library in IDEs"
-url='http://bitbucket.org/agr/ropemode'
-arch=('any')
-license=('GPL')
-depends=('python2-rope')
-source=("http://bitbucket.org/agr/${_pkgname}/get/${pkgver}.tar.bz2")
-md5sums=('6c1cb705e360251ac4bccc33b74ae892')
-
-package() {
-  cd "${srcdir}/agr-ropemode-61c99582317d"
-  python2 ./setup.py install --root="${pkgdir}" --prefix=/usr --optimize=1
-}
diff --git a/pcr/python2-rospkg/PKGBUILD b/pcr/python2-rospkg/PKGBUILD
deleted file mode 100644
index cf6116ba0..000000000
--- a/pcr/python2-rospkg/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Contributor: Somebody <somebody[at]foo[dot]tld>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-_name=rospkg
-pkgname=python2-rospkg
-pkgver=1.0.15
-pkgrel=1
-pkgdesc="provides basic utilities for querying information about ROS packages, stacks, and distributions."
-url="http://ros.org/doc/api/rospkg/html/python_api.html"
-arch=('x86_64' 'i686')
-license=('BSD')
-depends=('python2')
-optdepends=()
-makedepends=('python2-distribute')
-conflicts=()
-replaces=()
-backup=()
-source=(http://pr.willowgarage.com/downloads/${_name}/${_name}-${pkgver}.tar.gz)
-
-build() {
-  cd ${srcdir}/${_name}-${pkgver}
-  find -type f -print0 | xargs -0 sed -i -e 's/#!\/usr\/bin\/env python/#!\/usr\/bin\/env python2/g'
-  python2 setup.py install --root="${pkgdir}" --optimize=1 || return 1
-}
diff --git a/pcr/python2-sendfile/PKGBUILD b/pcr/python2-sendfile/PKGBUILD
deleted file mode 100644
index 3de2d5a48..000000000
--- a/pcr/python2-sendfile/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor: Josh Chase <jcjoshuachase@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=python2-sendfile
-_pkgname=py-sendfile
-pkgver=1.2.3
-pkgrel=1
-pkgdesc="pysendfile"
-url="http://code.google.com/p/pysendfile"
-license=('MIT')
-arch=('i686' 'x86_64')
-depends=('python2' 'setuptools')
-conflicts=()
-replaces=()
-backup=()
-source=("http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz")
-
-build() {
-	cd $srcdir/$_pkgname-$pkgver
-	python2 setup.py build
-	python2 setup.py install --root=$pkgdir
-	}
diff --git a/pcr/python2-setuptools/PKGBUILD b/pcr/python2-setuptools/PKGBUILD
deleted file mode 100644
index 85f0caf32..000000000
--- a/pcr/python2-setuptools/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: cwchen <linuxisfun0104@gmail.com>
-# Contributor: Florian Friesdorf <archlinux@chaoflow.net>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Todd Maynard <arch@toddmaynard.com>
-
-pkgname=python2-setuptools
-_pkgname=setuptools
-pkgver=0.6c11
-pkgrel=2
-pkgdesc="A collection of enhancements to the Python distutils"
-arch=('any')
-url="http://peak.telecommunity.com/DevCenter/setuptools"
-license=('PSF')
-depends=('python2')
-provides=('setuptools')
-conflicts=('python2-distribute')
-source=(http://pypi.python.org/packages/source/s/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
-md5sums=('7df2a529a074f613b509fb44feefe74e')
-
-package() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-
-  python2 setup.py install --root=${pkgdir} --prefix=/usr
-
-# we don't provide a non-suffixed easy_install
-  echo "Removing non-suffixed easy_install"
-  rm ${pkgdir}/usr/bin/easy_install
-}
diff --git a/pcr/python2-sexy/PKGBUILD b/pcr/python2-sexy/PKGBUILD
deleted file mode 100644
index 81c4e453e..000000000
--- a/pcr/python2-sexy/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-
-pkgname=python2-sexy
-pkgver=0.1.9
-pkgrel=1
-pkgdesc="Python bindings for libsexy"
-arch=('i686')
-url='http://chipx86.com/wiki/Libsexy'
-license=('LGPL')
-depends=('libsexy' 'pygtk')
-options=(!libtool)
-source=(http://releases.chipx86.com/libsexy/sexy-python/sexy-python-$pkgver.tar.gz)
-sha256sums=('2d8d257bbfa498a89792e0405ed8cf70396648b3df3c8e32cdc3dcc9bb666f15')
-sha512sums=('e735f06efce302e10b89cfd3d6c641d523cd29517792ccaa4d022d7be6f6a350fff180f1c94d255ccbc82891cac7346520dfed2a88d828fbd7e891aa56396530')
-
-build() {
-    cd sexy-python-$pkgver/
-    ./configure --prefix=/usr
-    make
-}
-
-package() {
-    make -C sexy-python-$pkgver DESTDIR="$pkgdir" install
-}
diff --git a/pcr/python2-ssh/PKGBUILD b/pcr/python2-ssh/PKGBUILD
deleted file mode 100644
index 84005f0ac..000000000
--- a/pcr/python2-ssh/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: Your Name <youremail@domain.com>
-
-pkgname=python2-ssh
-pkgver=1.8.0
-pkgrel=1
-pkgdesc="Python SSH2 protocol library"
-arch=(any)
-url="http://pypi.python.org/pypi/ssh"
-license=('LGPL')
-depends=('python2' 'pycrypto')
-makedepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=(!emptydirs)
-install=
-source=("http://pypi.python.org/packages/source/s/ssh/ssh-$pkgver.tar.gz")
-
-package() {
-    cd "$srcdir/ssh-$pkgver"
-    python2 setup.py install --root="$pkgdir/" --optimize=1
-
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-md5sums=('bc4dd59ec0c7bdf78a3840652cac824e')
diff --git a/pcr/python2-suds/PKGBUILD b/pcr/python2-suds/PKGBUILD
deleted file mode 100644
index a45009a2b..000000000
--- a/pcr/python2-suds/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Contributor: Jonathan Liu <net147@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=python2-suds
-pkgver=0.4
-pkgrel=3
-pkgdesc="A lightweight SOAP python client."
-arch=('any')
-url="https://fedorahosted.org/suds/"
-license=('LGPL')
-depends=('python2')
-makedepends=('python2-distribute')
-source=("https://fedorahosted.org/releases/s/u/suds/python-suds-${pkgver}.tar.gz")
-
-build() {
-  cd "${srcdir}/python-suds-${pkgver}"
-  python2 setup.py build
-}
-
-package() {
-  cd "${srcdir}/python-suds-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" -O1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/python2-webob/Changelog b/pcr/python2-webob/Changelog
deleted file mode 100644
index d67f3b16b..000000000
--- a/pcr/python2-webob/Changelog
+++ /dev/null
@@ -1,26 +0,0 @@
-2012-10-30 Aaron DeVore <aaron.devore@gmail.com> (1.2.3-1)
-- Version bump to 1.2.3
-- Change WebOb-${pkgver}.zip to WebOb-${pkgver}.tar.gz
-2012-06-07 Aaron DeVore <aaron.devore@gmail.com> (1.2.2-1)
-- Version bump to 1.2.2
-2012-06-07 Aaron DeVore <aaron.devore@gmail.com> (1.2-1)
-- Version bump to 1.2
-2012-10-07 Aaron DeVore <aaron.devore@gmail.com>
-- Version bump to 1.1.1
-2011-8-8 Aaron DeVore <aaron.devore@gmail.com> (1.1b2)
-- Version bump to 1.1b2
-- Add python-sphinx to makedepends
-2011-5-14 Aaron DeVore <aaron.devore@gmail.com> (1.0.7-2)
-- Revert from split build (AUR doesn't work with split builds)
-2011-5-14 Aaron DeVore <aaron.devore@gmail.com> (1.0.7-1)
-- Version bump to 1.0.7
-- Switch to split build
-- Split Sphinx html docs into python-webob-docs package
-- Don't bundle license file (upstream has restored it)
-2011-4-13 Aaron DeVore <aaron.devore@gmail.com> (1.0.6-1)
-- Version bump to 1.0.6
-- Bundle the license file (upstream removed it from the Pypi zip file)
-2011-3-24 Aaron DeVore <aaron.devore@gmail.com> (1.0.5-1)
-- Version bump to 1.0.5
-- Fix source URL (file extension changed on Pypi)
-- Fix some recently change idioms
diff --git a/pcr/python2-webob/PKGBUILD b/pcr/python2-webob/PKGBUILD
deleted file mode 100644
index 8dd0df386..000000000
--- a/pcr/python2-webob/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributor: Aaron DeVore <aaron.devore@gmail.com>
-# Contributor: Cilyan Olowen <gaknar@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname='python2-webob'
-pkgver='1.2.3'
-pkgrel='1'
-pkgdesc="WebOb provides objects for HTTP requests and responses."
-arch=('any')
-url="http://webob.org/"
-license=('MIT')
-depends=('python2')
-makedepends=('python2-distribute')
-optdepends=('python-webob-docs: documentation')
-changelog='Changelog'
-source=("http://pypi.python.org/packages/source/W/WebOb/WebOb-${pkgver}.tar.gz")
-
-build() {
-  cd "$srcdir/WebOb-${pkgver}"
-  python2 setup.py build
-}
-
-package() {
-  cd "$srcdir/WebOb-${pkgver}"
-  python2 setup.py install "--root=$pkgdir" --optimize=1
-  install -D -m644 "docs/license.txt" \
-                   "$pkgdir/usr/share/licenses/$pkgname/license.txt"
-}
-
-check() {
-  cd "$srcdir/WebOb-${pkgver}"
-  python2 setup.py test
-}
- 
diff --git a/pcr/pyutil/PKGBUILD b/pcr/pyutil/PKGBUILD
deleted file mode 100644
index 7c3ca9f60..000000000
--- a/pcr/pyutil/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Nicolas Pouillard <nicolas.pouillard@gmail.com>
-# Contributor: Peter Simons <simons@cryp.to>
-pkgname=pyutil
-pkgver=1.9.4
-pkgrel=2
-pkgdesc="general-purpose python library (used by tahoe-lafs)"
-arch=('any')
-url='http://pypi.python.org/pypi/pyutil'
-license=('GPL2' 'custom')
-depends=('python2')
-makedepends=('setuptools' 'darcsver' 'setuptools_darcs' 'python2-simplejson') # 'zbase32') # missing: setuptools_trial
-source=( http://pypi.python.org/packages/source/p/pyutil/pyutil-$pkgver.tar.gz )
-md5sums=('af51cf296b574112e115c9dfba51464d')
-
-build(){
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py build
-  python2 setup.py trial
-}
-
-package(){
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py install --root="$pkgdir"
-
-  install -d $pkgdir/usr/share/licenses/$pkgname/
-  install -m644 COPYING* $pkgdir/usr/share/licenses/$pkgname/
-
-}
diff --git a/pcr/pyzenity/PKGBUILD b/pcr/pyzenity/PKGBUILD
deleted file mode 100644
index 364cb56a1..000000000
--- a/pcr/pyzenity/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Contributor: lang2 <wenzhi.liang@gmail.com>
-# Contributor: sylvain alborini  <sylvain dot alborini at gmail dot com>
-# Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@replicant.io>
-
-pkgname=pyzenity
-_pkg_name=PyZenity
-pkgver=0.1.7
-pkgrel=1
-pkgdesc="python bindings for zenity"
-url="http://www.brianramos.com/?page_id=38"
-depends=('python2' 'zenity')
-		  arch=('any')
-license=('GPL')
-source=(http://brianramos.com/software/${_pkg_name}/${_pkg_name}-${pkgver}.tar.gz)
-
-build() 
-{
-  cd "$srcdir/$_pkg_name-$pkgver"
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-}
diff --git a/pcr/qemu-usbredir/65-kvm.rules b/pcr/qemu-usbredir/65-kvm.rules
deleted file mode 100644
index 569ded9f9..000000000
--- a/pcr/qemu-usbredir/65-kvm.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
-KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess", OPTIONS+="static_node=vhost-net"
diff --git a/pcr/qemu-usbredir/PKGBUILD b/pcr/qemu-usbredir/PKGBUILD
deleted file mode 100644
index 35f945d0e..000000000
--- a/pcr/qemu-usbredir/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# $Id$
-# Maintainer (Arch GNU/Linux): Tobias Powalowski <tpowa@archlinux.org>
-_pkgname=qemu
-pkgname=qemu-usbredir
-pkgver=1.7.0
-pkgrel=1
-pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-url="http://wiki.qemu.org/Index.html"
-makedepends=('texi2html' 'perl' 'python2' 'spice-protocol')
-depends=('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' 'usbredir')
-backup=('etc/qemu/target-x86_64.conf')
-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'
-             'usbredir')
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-replaces=('qemu-kvm')
-options=(!strip)
-
-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 --libexecdir=/usr/lib/qemu \
-              --disable-gtk --enable-linux-aio --enable-seccomp \
-              --enable-spice --localstatedir=/var --enable-usb-redir
-  make V=99
-}
-
-package () 
-{
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install
-  # provided by seabios package
-  rm "${pkgdir}/usr/share/qemu/bios.bin"
-  rm "${pkgdir}/usr/share/qemu/acpi-dsdt.aml"
-  rm "${pkgdir}/usr/share/qemu/q35-acpi-dsdt.aml"
-  # remove conflicting /var/run directory
-  rm -r "${pkgdir}/var"
-  install -D -m644 "${srcdir}/65-kvm.rules" \
-                   "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
-  # bridge_helper needs suid
-  # https://bugs.archlinux.org/task/32565
-  chmod u+s "${pkgdir}/usr/lib/qemu/qemu-bridge-helper"
-  # add sample config
-  echo "allow br0" > ${pkgdir}/etc/qemu/bridge.conf.sample
-  # strip scripts directory
-    find "${pkgdir}/usr/src/linux-${_kernver}/scripts"  -type f -perm -u+w 2>/dev/null | while read binary ; do
-      case "$(file -bi "$binary")" in
-        *application/x-executable*) # Binaries
-        /usr/bin/strip $STRIP_BINARIES "$binary";;
-      esac
-    done
-  # remove libcacard files
-  rm -rf ${pkgdir}/usr/include/cacard
-  rm -rf ${pkgdir}/usr/lib/libcacard*
-  rm -rf ${pkgdir}/usr/lib/pkgconfig/libcacard.pc
-  rm -rf ${pkgdir}/usr/bin/vscclient
-}
-
-md5sums=('32893941d40d052a5e649efcf06aca06'
-         '33ab286a20242dda7743a900f369d68a')
diff --git a/pcr/qemu-usbredir/qemu.install b/pcr/qemu-usbredir/qemu.install
deleted file mode 100644
index 79ee83536..000000000
--- a/pcr/qemu-usbredir/qemu.install
+++ /dev/null
@@ -1,23 +0,0 @@
-# kvm:  the new package version
-post_install() {
-  #
-  groupadd kvm -f -g 78
-}
-
-post_upgrade() {
-  if [ "$(vercmp $2 0.11)" -lt 0 ]; then
-    echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module"
-    echo "is no longer supported and will be removed from the repositories. You"
-    echo "can safely uninstall it from your system."
-  fi
-  if [ "$(vercmp $2 1.3.1)" -lt 0 ]; then
-    echo "With the release of qemu 1.3.0, qemu-kvm binary is removed."
-    echo "You need to change the emulator path, if you use libvirt by using:"
-    echo "'virsh edit <vm-name>'"
-  fi
-}
-
-post_remove() {
-  #
-  groupdel kvm
-}
diff --git a/pcr/qgis/PKGBUILD b/pcr/qgis/PKGBUILD
deleted file mode 100644
index a5c6b48eb..000000000
--- a/pcr/qgis/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# Maintainer: Lantald < lantald at gmx.com
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-# Contributor: Eric Forgeot < http://esclinux.tk >
-
-pkgname=qgis
-pkgver=1.8.0
-pkgrel=6
-pkgdesc='Quantum GIS is a Geographic Information System (GIS) that supports vector, raster & database formats'
-url='http://qgis.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-# update to http://www.qgis.org/wiki/Building_QGIS_from_Source#Overview
-depends=('libmysqlclient' 'postgresql-libs' 'sqlite3' 'jasper' 'curl' 'pyqt' 'python2' 'python2-pyqt' 'giflib'  'cfitsio' 'qwt' 'gdal' 'flex' 'bison' 'libspatialite' 'spatialindex')
-makedepends=('cmake' 'grass' 'gsl' 'postgis' 'netcdf' 'fcgi' 'python2-sip')
-optdepends=('postgis: postgis support and SPIT plugin'
-            'fcgi: qgis mapserver'
-            'python2-sip: python-support'
-            'grass: grass plugin'
-            'gsl: georeferencer')
-options=('!makeflags')
-source=("http://qgis.org/downloads/qgis-${pkgver}.tar.bz2"
-        'qgis.desktop')
-
-md5sums=('1d60520f81d7763c026d0af887ac9a05'
-         '8ab66039f2aba519b92f52272ec3c13e')
-
-build() {
-  # Fix insecure RPATH is weird, but just works ;)
-  # echo "os.system(\"sed -i '/^LFLAGS/s|-Wl,-rpath,.\+ ||g' gui/Makefile core/Makefile\")" >> python/configure.py.in
-  #cd qgis-${pkgver}
-
-  rm -rf build
-  mkdir build
-  cd build
-
-  cmake ../qgis-${pkgver} \
-    -DENABLE_TESTS=OFF \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DGRASS_PREFIX=/opt/grass \
-    -DQGIS_MANUAL_SUBDIR=share/man \
-    -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-    -DPYTHON_SITE_PACKAGES_DIR=/usr/lib/python2.7/site-packages \
-    -DPYTHON_INCLUDE_PATH=/usr/include/python2.7 \
-    -DQT_QMAKE_EXECUTABLE=qmake4
-
-  make
-}
-
-package() {
-  cd build
-
-  make DESTDIR=${pkgdir} install
-  
-  # create a more user-friendly application name link
-  ln -s /usr/bin/qgis $pkgdir/usr/bin/quantum-gis
-  
-  # install some freedesktop.org compatibility
-  install -D -m644 ${srcdir}/qgis.desktop \
-    ${pkgdir}/usr/share/applications/qgis.desktop
-}
diff --git a/pcr/qgis/qgis.desktop b/pcr/qgis/qgis.desktop
deleted file mode 100644
index c3db5ad08..000000000
--- a/pcr/qgis/qgis.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Quantum GIS
-GenericName="GIS"
-Comment="Geographic Information System (GIS) that supports vector, raster & database formats"
-Exec=/usr/bin/qgis
-Icon=/usr/share/qgis/images/icons/qgis-icon.png
-Terminal=false
-MultipleArgs=false
-Type=Application
-Categories=Application;Science
diff --git a/pcr/qt-at-spi-git/PKGBUILD b/pcr/qt-at-spi-git/PKGBUILD
deleted file mode 100644
index d69e670c6..000000000
--- a/pcr/qt-at-spi-git/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): Kyle <kyle@gmx.ca>
-
-_pkgname=qt-at-spi
-pkgname=$_pkgname-git
-_pkgver=0.3.1
-pkgver=2013.02.08
-#_gitver="tag=v$pkgver"
-_gitver="commit=adb0b04d129132dcfa289184eba5b122bfd1ca52"
-pkgdesc="A Qt plugin that bridges the QAccessible API’s to the AT-SPI 2 protocol, giving blind and visually impaired users access to qt applications"
-url="http://projects.kde.org/qtatspi"
-license=('LGPL')
-
-provides=("$_pkgname=$_pkgver")
-
-pkgrel=1
-arch=('i686' 'x86_64')
-depends=('at-spi2-core' 'qt4>=4.8' 'kdelibs>=4.8')
-makedepends=('cmake' 'automoc4')
-
-source=("libre://$pkgname-$pkgver.tar.gz" 'qt-accessibility.sh')
-
-mkdepends=('git')
-mksource=("$pkgname-$pkgver::git://anongit.kde.org/qtatspi#$_gitver")
-mksource() {
-  cd "$srcdir/$pkgname-$pkgver"
-  rm -f examples/tabbar/{simple,tabbar}
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  cmake .
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-
-  install -D -m755 "$srcdir/qt-accessibility.sh" "$pkgdir/etc/profile.d/qt-accessibility.sh"
-} 
-
-mkmd5sums=('SKIP')
-md5sums=('d48fbf6d429260f7b279964972b7ab25'
-         'f0c8551ed54f5d4e5daf7ddac9189aaa')
diff --git a/pcr/qt-at-spi-git/qt-accessibility.sh b/pcr/qt-at-spi-git/qt-accessibility.sh
deleted file mode 100644
index d7c67d605..000000000
--- a/pcr/qt-at-spi-git/qt-accessibility.sh
+++ /dev/null
@@ -1 +0,0 @@
-export QT_ACCESSIBILITY=1
diff --git a/pcr/qtkeychain/PKGBUILD b/pcr/qtkeychain/PKGBUILD
deleted file mode 100644
index 152971751..000000000
--- a/pcr/qtkeychain/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
-# Maintainer: Jorge Araya Navarro <shackra@riseup.net>
-# Contributor: Teo Mrnjavac <teo@kde.org>
-# https://github.com/zizzfizzix/pkgbuilds
-
-_buildtype="Release"
-
-pkgname=qtkeychain
-pkgver=0.1
-pkgrel=3
-pkgdesc="Provides support for secure credentials storage."
-arch=('i686' 'x86_64')
-url="https://github.com/frankosterfeld/qtkeychain"
-license=('BSD2')
-depends=('qt4')
-makedepends=('cmake')
-source=("${pkgname}-${pkgver}.zip::https://github.com/frankosterfeld/qtkeychain/archive/${pkgver}.zip" 'prefer-qt4.patch')
-md5sums=('a1d11a611b27759a531896b57be15947'
-         'a2c46e61af02100a6f67487ffeb8a3d0')
-
-if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
-  options=(!strip)
-fi
-
-prepare() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    patch -Np1 -i ${srcdir}/prefer-qt4.patch
-
-    if [[ -e ${srcdir}/${pkgname}-${pkgver}-build ]]; then rm -rf ${srcdir}/${pkgname}-${pkgver}-build; fi
-    mkdir ${srcdir}/${pkgname}-${pkgver}-build
-}
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}-build
-    cmake -DBUILD_WITH_QT4=on \
-          -DCMAKE_INSTALL_PREFIX=/usr \
-          -DCMAKE_INSTALL_LIBDIR=lib \
-          -DCMAKE_INSTALL_LIBEXECDIR=lib/${pkgname} \
-          -DCMAKE_BUILD_TYPE=${_buildtype} \
-          ../${pkgname}-${pkgver}
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}-build
-    make DESTDIR=${pkgdir} install
-    install -D -m644 ${srcdir}/${pkgname}-${pkgver}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/pcr/qtkeychain/prefer-qt4.patch b/pcr/qtkeychain/prefer-qt4.patch
deleted file mode 100644
index 0e264aad1..000000000
--- a/pcr/qtkeychain/prefer-qt4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aba9032..4de64c8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,8 +11,10 @@ set(QTKEYCHAIN_SOVERSION 0)
- set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
- include(GNUInstallDirs)
- 
--# try Qt5 first, and prefer that if found
--find_package(Qt5Core QUIET)
-+# try Qt5 first, and prefer that if found, unless BUILD_WITH_QT4 is set
-+if (NOT BUILD_WITH_QT4)
-+  find_package(Qt5Core QUIET)
-+endif()
- if (Qt5Core_FOUND)
-   if(UNIX AND NOT APPLE)
-     find_package(Qt5DBus REQUIRED)
diff --git a/pcr/qtkeychain/qtkeychain-0.1.zip b/pcr/qtkeychain/qtkeychain-0.1.zip
deleted file mode 100644
index 400552c62..000000000
--- a/pcr/qtkeychain/qtkeychain-0.1.zip
+++ /dev/null
diff --git a/pcr/qtoctave/PKGBUILD b/pcr/qtoctave/PKGBUILD
deleted file mode 100644
index d84dfa3a2..000000000
--- a/pcr/qtoctave/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Michael Schubert <mschu.dev at gmail>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgname=qtoctave
-pkgver=0.10.1
-pkgrel=2
-arch=('i686' 'x86_64')
-pkgdesc="Qt4 frontend for octave"
-url="https://forja.rediris.es/projects/csl-qtoctave/"
-license=('GPL2')
-depends=('qt4' 'octave' 'hicolor-icon-theme')
-makedepends=('cmake')
-source=("http://forja.rediris.es/frs/download.php/2054/${pkgname}-${pkgver}.tar.gz")
-md5sums=('f23afd8eb850b950f51b65f256a83835')
-install="qtoctave.install"
-options=('!libtool' '!emptydirs')
-      
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i "s/lrelease/lrelease-qt4/" qtoctave/src/CMakeLists.txt
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_BUILD_TYPE=RELEASE .
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/pcr/quack/PKGBUILD b/pcr/quack/PKGBUILD
deleted file mode 100644
index 18aa1025d..000000000
--- a/pcr/quack/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: Geoffrey Teale <tealeg@member.fsf.org>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=quack  
-pkgver=0.45
-pkgrel=1
-pkgdesc="[Emacs] enhanced support for editing and running Scheme code."
-url="http://www.neilvandyke.org/quack"
-arch=('any')
-license=('GPL')
-depends=('emacs')
-makedepends=('emacs')
-install=quack.install
-source=("http://www.neilvandyke.org/${pkgname}/${pkgname}.el")
-md5sums=('40c52d0076c95c125e57ef6496ee881e')
-EMACS=emacs # or sxemacs, or xemacs
-
-build() {
-  $EMACS --batch --eval '(byte-compile-file "quack.el")'
-}
-
-package() {
-  install -Dm644 $pkgname.el $pkgdir/usr/share/$EMACS/site-lisp/$pkgname.el
-  install -Dm644 $pkgname.elc $pkgdir/usr/share/$EMACS/site-lisp/$pkgname.elc
-}
diff --git a/pcr/quack/quack.install b/pcr/quack/quack.install
deleted file mode 100644
index f92194ee6..000000000
--- a/pcr/quack/quack.install
+++ /dev/null
@@ -1,18 +0,0 @@
-### quack.install:
-post_install () {
-cat << EOF
-==> Put this in your $HOME/.emacs file to enable quack
-
-(require 'quack)
-
-EOF
-}
-
-post_upgrade () {
-	post_install $1
-}
-
-op=$1
-shift
-$op $*
-########################
diff --git a/pcr/quackle/PKGBUILD b/pcr/quackle/PKGBUILD
deleted file mode 100644
index 02f5ac568..000000000
--- a/pcr/quackle/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Guillaume ALAUX <Guillaume at ALAUX dot net>
-pkgname=quackle
-pkgver=0.97
-pkgrel=2
-pkgdesc='Free crossword game (Scrabble-like) artificial intelligence and analysis tool'
-arch=('i686' 'x86_64')
-url='http://people.csail.mit.edu/jasonkb/quackle'
-license=('GPL')
-depends=('qt4')
-makedepends=('qt4')
-source=(http://people.csail.mit.edu/jasonkb/${pkgname}/downloads/${pkgname}-${pkgver}/${pkgname}-${pkgver}-source.tar.gz
-        quacker.sh)
-md5sums=('f744484e916f4cbbcffe6c13d772aee7'
-         '0c3cf80395db58959c8ae825b917a19f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  qmake-qt4
-  make clean
-  make
-
-  cd "${srcdir}/${pkgname}-${pkgver}/quackleio"
-  qmake-qt4
-  make clean
-  make
-
-  cd "${srcdir}/${pkgname}-${pkgver}/quacker"
-  qmake-qt4
-  make clean
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -dm755 ${pkgdir}/opt/${pkgname}
-  cp -r quacker/quacker data ${pkgdir}/opt/${pkgname}
-  install -Dm755 ${srcdir}/quacker.sh ${pkgdir}/usr/bin/quacker
-}
diff --git a/pcr/quackle/quacker.sh b/pcr/quackle/quacker.sh
deleted file mode 100755
index 702c262bf..000000000
--- a/pcr/quackle/quacker.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt/quackle
-./quacker
diff --git a/pcr/quvi-current/PKGBUILD b/pcr/quvi-current/PKGBUILD
deleted file mode 100644
index 8acfc507f..000000000
--- a/pcr/quvi-current/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 98182 2013-10-07 12:06:30Z jgc $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: joyfulgirl@archlinux.us
-
-pkgname=quvi-current
-_pkgname=quvi
-provides=(quvi)
-pkgver=0.9.5
-pkgrel=1
-pkgdesc='Command-line tool for parsing video download links.'
-arch=('i686' 'x86_64')
-url='http://quvi.sourceforge.net/'
-license=('AGPL3')
-depends=('libquvi')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.xz"{,.sig})
-
-build() {
-  cd "${_pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${_pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('baa1d7b25e9fd173e952e27d4aa4b933'
-         'SKIP')
diff --git a/pcr/radicale/PKGBUILD b/pcr/radicale/PKGBUILD
deleted file mode 100644
index b4f76f6ab..000000000
--- a/pcr/radicale/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Guillaume Bouchard <guillaume.bouchard@liris.cnrs.fr>
-pkgname=radicale
-pkgver=0.7.1
-pkgrel=2
-pkgdesc="A Simple Calendar Server"
-arch=any
-url="http://www.radicale.org/"
-license=('GPL3')
-depends=('python')
-backup=('etc/radicale/config')
-source=(http://pypi.python.org/packages/source/R/Radicale/Radicale-$pkgver.tar.gz
-	radicale.service)
-
-package() {
-  cd "$srcdir/Radicale-$pkgver"
-  python setup.py install --prefix=/usr --root="$pkgdir" || return 1
-
-  install -D "$srcdir/Radicale-$pkgver/config" "$pkgdir/etc/radicale/config"
-  install -m744 -D "$srcdir/radicale.service" "$pkgdir/usr/lib/systemd/system/radicale.service"
-}
-  
-md5sums=('ab1167b1ee713a7a58d843c5921f3327'
-         'dbdfedb46af4ceed0ad0db3441b5a266')
diff --git a/pcr/radicale/radicale.install b/pcr/radicale/radicale.install
deleted file mode 100644
index 2bd33ed49..000000000
--- a/pcr/radicale/radicale.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-  useradd --create-home \
-          --home-dir /srv/cal \
-          --user-group \
-          --system \
-          --comment "Radicale" \
-          --skel /dev/null \
-          --shell /usr/bin/nologin \
-          cal
-}
diff --git a/pcr/radicale/radicale.service b/pcr/radicale/radicale.service
deleted file mode 100644
index 293cad6e2..000000000
--- a/pcr/radicale/radicale.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Radicale caldav server
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/radicale
-ExecStop=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/radiusclient-ng/PKGBUILD b/pcr/radiusclient-ng/PKGBUILD
deleted file mode 100644
index 437030401..000000000
--- a/pcr/radiusclient-ng/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: Jonathan Liu <net147@gmail.com>
-pkgname=radiusclient-ng
-pkgver=0.5.6
-pkgrel=1
-pkgdesc="Client library and basic utilities for RADIUS AAA"
-arch=(i686 x86_64)
-url="http://wiki.freeradius.org/Radiusclient"
-license=('custom:NetBSD')
-depends=('bash')
-conflicts=('freeradius-client')
-source=(http://download.berlios.de/radiusclient-ng/$pkgname-$pkgver.tar.gz)
-md5sums=('6fb7d4d0aefafaee7385831ac46a8e9c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-
-  install -D -m644 "$srcdir/$pkgname-$pkgver/COPYRIGHT" \
-                   "$pkgdir/usr/share/licenses/${pkgver}/COPYRIGHT"
-
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/rakarrack/PKGBUILD b/pcr/rakarrack/PKGBUILD
deleted file mode 100644
index 4bdfe7c94..000000000
--- a/pcr/rakarrack/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-# patch taken from https://aur.archlinux.org/packages/rakarrack/
-
-pkgname=rakarrack
-pkgver=0.6.1
-pkgrel=1
-pkgdesc="Versatile guitar multi-effects processor"
-arch=('i686')
-license=('GPL')
-url="http://rakarrack.sourceforge.net"
-depends=('alsa-utils' 'jack' 'fltk' 'libxpm')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
-        'fltk_include.patch')
-md5sums=('56b1e04779ae3d56cc8a3ad3c4e25152'
-         'd43512466f514434daaf16bd72951ea0')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # fix for latest fltk include dir name
-  patch -Np1 -i "$srcdir/fltk_include.patch"
-
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/rakarrack/fltk_include.patch b/pcr/rakarrack/fltk_include.patch
deleted file mode 100644
index 447e8d539..000000000
--- a/pcr/rakarrack/fltk_include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -baur rakarrack-0.6.1.orig/src/global.h rakarrack-0.6.1/src/global.h
---- rakarrack-0.6.1.orig/src/global.h	2011-07-12 05:13:31.367583829 +0800
-+++ rakarrack-0.6.1/src/global.h	2011-07-12 05:15:20.670325018 +0800
-@@ -99,7 +99,7 @@
- #include <X11/xpm.h>
- #include <jack/jack.h>
- #include <jack/midiport.h>
--#include <Fl/Fl_Preferences.H>
-+#include <FL/Fl_Preferences.H>
- #include "FPreset.h"
- #include "Reverb.h"
- #include "Chorus.h"
-diff -baur rakarrack-0.6.1.orig/src/process.C rakarrack-0.6.1/src/process.C
---- rakarrack-0.6.1.orig/src/process.C	2011-07-12 05:13:31.367583829 +0800
-+++ rakarrack-0.6.1/src/process.C	2011-07-12 05:15:31.293600800 +0800
-@@ -28,7 +28,7 @@
- #include <fcntl.h>
- #include <sys/types.h>
- #include <unistd.h>
--#include <Fl/Fl_Preferences.H>
-+#include <FL/Fl_Preferences.H>
- #include "global.h"
- 
- int Pexitprogram, preset;
diff --git a/pcr/re2-hg/PKGBUILD b/pcr/re2-hg/PKGBUILD
deleted file mode 100644
index 915af840b..000000000
--- a/pcr/re2-hg/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=re2-hg
-pkgver=1
-pkgrel=1
-pkgdesc='Fast, safe and thread-friendly alternative to backtracking regular expression engines'
-arch=('i686' 'x86_64')
-url='http://code.google.com/p/re2/'
-license=('GPL2')
-provides=('re2')
-makedepends=('mercurial')
-
-build() { 
-  rm -rf re2
-  hg clone https://re2.googlecode.com/hg re2
-
-  cd re2
-
-  sed -i 's_prefix=/usr/local_prefix=/usr_' Makefile
-
-  make
-}
-
-package() {
-  cd re2
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/pcr/recutils/ChangeLog b/pcr/recutils/ChangeLog
deleted file mode 100644
index 02a3a418d..000000000
--- a/pcr/recutils/ChangeLog
+++ /dev/null
@@ -1,36 +0,0 @@
-recutils (1.5-1)
-
-  * New upstream release
-    - Version 1.5 (13 January 2012)
-    - The utilities will now ask interactively for a password
-      if it was not provided with the -s command line option.
-      This avoids security problems related to shell history files.
-    - Support for octal and hexadecimal numbers has been added.
-      They can be used in both the records and selection expressions.
-    - It is now possible to select a given number of random records
-      in many of the utilities using the -m command line option.
-    - The -n option now accepts a list of indexes, supporting ranges.
-    - The new -U (uniq) option for recsel removes duplicated fields
-      in the output records.
-    - The new -q option allows to quickly search for the desired record
-      without having to provide a complete selection expression.
-    - Auto generated fields are now considered integers by default.
-      This avoids repetitive patterns involving %auto and %type.
-    - Tab characters are now allowed in blank lines betwwen records.
-    - The API in rec.h is now better documented with comments, and improved.
-    - recfix now exits with an error status
-      if there is a parse error in some input file.
-    - The usage of the internal data structures has been _vastly_ improved,
-      resulting in a much faster operation.
-    - Internal cleanup and code factorization.
-    - Many, many, many bug fixes :D 
-  * PKGBUILD
-    - commenting out "makedepends=(mdbtools)" for now
-      because the current "mdbtools" package from the AUR
-      is missing 'MDB_NOFLAGS' in the "mdbtools.h" file.
-    - all other dependencies to compile and run recutils
-      are already satisfied through the 'base' group.
-  * Added some examples
-
- -- Sven Wick <sven.wick@gmx.de>  Fri, 20 Jan 2012 16:04:02 +0100
-
diff --git a/pcr/recutils/PKGBUILD b/pcr/recutils/PKGBUILD
deleted file mode 100644
index ddf47243a..000000000
--- a/pcr/recutils/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Max Meyer <dev@fedux.org>
-# Contributor: Sven Wick <sven.wick@gmx.de>
-#
-# Please fork and send me a pull request for changes to package build file(s)
-# Url: https://github.com/maxmeyer/archlinux-recutils
-#
-
-pkgname=recutils
-pkgver=1.5
-pkgrel=2
-pkgdesc="GNU tools and libraries to access human-editable, text-based databases."
-arch=(i686 x86_64 mips64el)
-url="http://www.gnu.org/software/recutils/"
-license=('GPL3')
-depends=(libgcrypt curl)
-optdepends=("mdbtools: for processing M$ Access databases")
-#options=()
-install=recutils.install
-changelog=ChangeLog
-source=("http://ftp.gnu.org/gnu/recutils/$pkgname-$pkgver.tar.gz"
-	"recutils-1.5-glibc-2.16.patch")
-sha256sums=('7ed67e74468084f52ad9341e4b11c44e5fd9d5325b93b7eb2cb230c839ff5dec'
-	    '28c169df3573748215a78b78793d45a09aeefc6194cf1185c7c0f11881eb289a')
-options=(!libtool)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i ${srcdir}/recutils-1.5-glibc-2.16.patch
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/recutils/recutils-1.5-glibc-2.16.patch b/pcr/recutils/recutils-1.5-glibc-2.16.patch
deleted file mode 100644
index 8b4997f09..000000000
--- a/pcr/recutils/recutils-1.5-glibc-2.16.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- recutils-1.5/lib/stdio.in.h
-+++ recutils-1.5/lib/stdio.in.h
-@@ -699,22 +699,11 @@
- # endif
- #endif
- 
--#if @GNULIB_GETS@
--# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
--#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--#   undef gets
--#   define gets rpl_gets
--#  endif
--_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
--_GL_CXXALIAS_RPL (gets, char *, (char *s));
--# else
--_GL_CXXALIAS_SYS (gets, char *, (char *s));
--#  undef gets
--# endif
--_GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
-+   so any use of gets warrants an unconditional warning; besides, C11
-+   removed it.  */
-+#undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
- 
diff --git a/pcr/recutils/recutils.install b/pcr/recutils/recutils.install
deleted file mode 100644
index 245c7ae01..000000000
--- a/pcr/recutils/recutils.install
+++ /dev/null
@@ -1,36 +0,0 @@
-_infodir=/usr/share/info
-_infofiles=( recutils.info.gz )
-
-_mandir=/usr/share/man/man1
-_manfiles=( csv2rec.1.gz rec2csv.1.gz recdel.1.gz recfix.1.gz recfmt.1.gz recinf.1.gz recins.1.gz recsel.1.gz recset.1.gz)
-
-## arg 1:  the new package version
-post_install() {
-  [ -x /usr/bin/mandb ] || return 0
-  for _file in ${_manfiles[@]}; do
-    mandb -f $_mandir/$_file
-  done
-
-  [ -x /usr/bin/install-info ] || return 0
-  for _file in ${_infofiles[@]}; do
-    install-info $_infodir/$_file $_infodir/dir #2> /dev/null
-  done
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-  [ -x /usr/bin/mandb ] || return 0
-  mandb
-
-  [ -x /usr/bin/install-info ] || return 0
-  for _file in ${_infofiles[@]}; do
-    install-info --delete $_infodir/$_file $_infodir/dir #2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD
deleted file mode 100644
index 61874b5ba..000000000
--- a/pcr/renpy/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# Maintainer: AlexanderR <rvacheva at nxt dot ru>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=renpy
-pkgver=6.16.2
-pkgrel=1
-pkgdesc="Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell stories with the computer. This package contains both player and development tools."
-arch=any
-license=MIT
-url=http://www.$pkgname.org/
-depends=(
-  python2-$pkgname=$pkgver
-  ttf-dejavu
-)
-conflicts=(
-  $pkgname-bin
-  ${pkgname}64
-)
-replaces=${pkgname}64
-install=$pkgname.install
-source=(
-  http://www.$pkgname.org/dl/$pkgver/$pkgname-$pkgver-source.tar.bz2
-  $pkgname.desktop
-  $pkgname.{sh,csh}
-  $pkgname-launcher.sh
-)
-sha512sums=(
-  fc3b40f01f2d1e820a05f90a2d85e42986aaa4840e506d18ea76a78527d2f98ca6cf832ebde3e1f996b94f4ce4b175856da913f3de7f1a9db48aba0eea84b52d
-  1af85c7a0c10662bfa4c03611fed695325f5953ac0f2c913f5342b1dca22b22115f07e69d646d92a3b95f5b896283e9b1bc7fe3e0a338536b5d9d48beedae8d5
-  2a9302adbc6ff45e048d42487ac86e7501f90b2d393933af5d39d663a0b3707f795a04f65598e356a64809dfa0175a4ad860b355e5337ee149692c21caf339df
-  bcb3152a88d5f913a99855e9d6fa5d0019e310ba9d55a6288d2d8b60cb6c9ab3ddf8c772dfd23a2851d52479adc2a16bd3ffe25ff7fb50d222ec1f55eaa48b09
-  727f9f16e1cff76c279d6e1578572a92c7b21ec34c6cb2841a04ac7b5cf6d2836487293744a9541993ee2e3a8dae927feb4e78f1afd01a748f5489090453cdd7
-)
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver-source"
-
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' $pkgname.py
-
-  msg 'fonts are provided by ttf-dejavu'
-  cd $pkgname
-  rm -v common/DejaVuSans.ttf common/DejaVuSans.txt
-}
-
-package(){
-  cd $pkgname-$pkgver-source
-
-  install -vd $pkgdir/{usr/share/{$pkgname,doc/$pkgname},etc/profile.d}
-  install -vm755 $srcdir/$pkgname.{sh,csh} $pkgdir/etc/profile.d
-  install -vDm755 $srcdir/$pkgname-launcher.sh $pkgdir/usr/bin/$pkgname
-  install -vDm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
-
-  cp -va launcher $pkgname{,.py} templates the_question tutorial $pkgdir/usr/share/$pkgname
-  ln -vs $pkgname/common $pkgdir/usr/share/$pkgname/common
-  cp -va doc/* $pkgdir/usr/share/doc/$pkgname
-
-  install -vDm644 launcher/game/logo.png $pkgdir/usr/share/pixmaps/$pkgname.png
-  install -vDm644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
-
-  chgrp -vR games $pkgdir/usr/share/$pkgname/{the_question,tutorial}
-  chmod -vR g+w $pkgdir/usr/share/$pkgname/{the_question,tutorial}
-}
diff --git a/pcr/renpy/renpy-launcher.sh b/pcr/renpy/renpy-launcher.sh
deleted file mode 100644
index 605c0c1fd..000000000
--- a/pcr/renpy/renpy-launcher.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-mkdir -p ~/renpy_projects
-cd ~/renpy_projects
-exec env python2 -OO /usr/share/renpy/renpy.py "$@"
diff --git a/pcr/renpy/renpy.csh b/pcr/renpy/renpy.csh
deleted file mode 100644
index 71269b48c..000000000
--- a/pcr/renpy/renpy.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv RENPY_BASE /usr/share/renpy/
diff --git a/pcr/renpy/renpy.desktop b/pcr/renpy/renpy.desktop
deleted file mode 100644
index 5cd64ea94..000000000
--- a/pcr/renpy/renpy.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Ren'Py
-GenericName= renpy 
-GenericName[fr]= renpy
-Comment=A programming language and runtime, intended to ease the creation of visual-novel type games. 
-Comment[fr]=Un langage de programmation et un ex�cutable con�us pour faciliter la cr�ation de jeux de type "visual-novel"
-Icon=renpy.png
-Exec=renpy
-Categories=Game;AdventureGame;
-
diff --git a/pcr/renpy/renpy.install b/pcr/renpy/renpy.install
deleted file mode 100644
index bfe161cdb..000000000
--- a/pcr/renpy/renpy.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-  ln -vsf /usr/share/doc/renpy /usr/share/renpy/doc
-
-  cat << EOF
-This package sets global environment variable RENPY_BASE, forcing all RenPy
-games, including incompatible ones, to use system-wide interpreter. Undefine
-this variable to launch games, you downloaded somewhere, with their built-in
-versions of interpreter.
-
-To run two example games: The Question and RenPy Tutorial you should be
-member of "games" group.
-EOF
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  rm -v /usr/share/renpy/doc
-}
diff --git a/pcr/renpy/renpy.sh b/pcr/renpy/renpy.sh
deleted file mode 100644
index 32b2e6d29..000000000
--- a/pcr/renpy/renpy.sh
+++ /dev/null
@@ -1 +0,0 @@
-export RENPY_BASE=/usr/share/renpy/
diff --git a/pcr/retroshare/PKGBUILD b/pcr/retroshare/PKGBUILD
deleted file mode 100644
index 36bfeb18e..000000000
--- a/pcr/retroshare/PKGBUILD
+++ /dev/null
@@ -1,148 +0,0 @@
-# Maintainer: stqn
-# Contributor: JHeaton <jheaton at archlinux dot us>
-# Contributor: Tristero <tristero at online dot de>
-# Contributor: funkyou
-
-# Set this to true to build and install retroshare-nogui
-_build_nogui=false
-
-# Set this to true to build and install the plugins
-_build_linkscloud=true
-_build_feedreader=true
-_build_voip=true
-
-### Nothing to be changed below this line ###
-
-pkgname=retroshare
-pkgver=0.5.4e
-pkgrel=3
-pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail."
-arch=('i686' 'x86_64') 
-url="http://retroshare.sourceforge.net/"
-license=('LGPL' 'GPL')
-depends=('qt4' 'libupnp' 'libgnome-keyring' 'libxss')
-install="${pkgname}.install"
-
-source=(http://sourceforge.net/projects/retroshare/files/RetroShare/${pkgver}/RetroShare-v${pkgver}.tar.gz \
-	${pkgname}.install \
-	${pkgname}.desktop)
-
-sha256sums=('a1cc85327213aa3bab0eac0923b546472bb41aacd56a11f5f3be1ba2315a0bda'
-            '4b50547648612e9091536205402a4da9ddea9c18c0f71e5d6cd30b2226f206d9'
-            '70be00968f2477e368f75393f193e76f366fff2dadab869c855e92048060cf29')
-
-# Add missing dependencies if needed
-[[ $_build_nogui == true ]] && depends=(${depends[@]} 'libssh' 'protobuf')
-[[ $_build_voip == true ]] && depends=(${depends[@]} 'speex')
-[[ $_build_feedreader == true ]] && depends=(${depends[@]} 'curl' 'libxslt')
-
-build() {
-	local _srcdir="${srcdir}/retroshare-0.5.4/src"
-	local _qmake='qmake-qt4'
-
-	msg "Compiling OpenPGP-SDK..."
-	cd "${_srcdir}/openpgpsdk/src"
-	$_qmake
-	make
-
-	msg "Compiling libbitdht..."
-	cd "${_srcdir}/libbitdht/src"
-	$_qmake
-	make
-
-	msg "Compiling libretroshare..."
-	cd "${_srcdir}/libretroshare/src"
-	$_qmake
-	make
-
-	msg "Compiling retroshare-gui..."
-	cd "${_srcdir}/retroshare-gui/src"
-	$_qmake
-	make
-
-	if [[ "$_build_voip" == "true" ]] ; then
-		msg "Compiling VOIP plugin..."
-		cd "${_srcdir}/plugins/VOIP"
-		sed -i 's/lessThan.*/true {/' VOIP.pro
-		$_qmake
-		make
-	fi
-
-	if [[ "$_build_feedreader" == "true" ]] ; then
-		msg "Compiling FeedReader plugin..."
-		cd "${_srcdir}/plugins/FeedReader"
-		$_qmake
-		make
-	fi
-
-	if [[ "$_build_linkscloud" == "true" ]] ; then
-		msg "Compiling LinksCloud plugin..."
-		cd "${_srcdir}/plugins/LinksCloud"
-		$_qmake
-		make
-	fi
-
-	if [[ $_build_nogui == "true" ]] ; then
-		msg "Compiling retroshare-nogui..."
-		cd "${_srcdir}/rsctrl/src"
-		make
-		cd "${_srcdir}/retroshare-nogui/src"
-		sed -i 's/pkg-config --atleast-version 0.5.4 libssh/pkg-config --atleast-version 0.5 libssh/' retroshare-nogui.pro
-		$_qmake
-		make
-	fi
-}
-
-package() {
-	local _srcdir="${srcdir}/retroshare-0.5.4/src"
-
-	# --- Install Files ---
-
-	msg "Installing files to fakeroot-environment..."
-
-	install -D -m 755 \
-		"${_srcdir}/retroshare-gui/src/RetroShare" \
-		"${pkgdir}/usr/bin/${pkgname}"
-
-	if [[ "$_build_nogui" == "true" ]] ; then
-		install -D -m 755 \
-			"${_srcdir}/retroshare-nogui/src/retroshare-nogui" \
-			"${pkgdir}/usr/bin/${pkgname}-nogui"
-	fi
-
-	# Plugins
-	if [[ "$_build_linkscloud" == "true" ]] ; then
-		install -D -m 755 \
-			"${_srcdir}/plugins/LinksCloud/libLinksCloud.so" \
-			"${pkgdir}/usr/lib/retroshare/extensions/libLinksCloud.so"
-	fi
-	if [[ "$_build_voip" == "true" ]] ; then
-		install -D -m 755 \
-			"${_srcdir}/plugins/VOIP/libVOIP.so" \
-			"${pkgdir}/usr/lib/retroshare/extensions/libVOIP.so"
-	fi
-	if [[ "$_build_feedreader" == "true" ]] ; then
-		install -D -m 755 \
-			"${_srcdir}/plugins/FeedReader/libFeedReader.so" \
-			"${pkgdir}/usr/lib/retroshare/extensions/libFeedReader.so"
-	fi
-
-	# Icons
-	install -D -m 644 \
-		"${_srcdir}/retroshare-gui/src/gui/images/retrosharelogo2.png" \
-		"${pkgdir}/usr/share/pixmaps/retroshare.png"
-
-	# Desktop File
-	install -D -m 644 \
-		"${srcdir}/${pkgname}.desktop" \
-		"${pkgdir}/usr/share/applications/${pkgname}.desktop"
-
-	# bdboot (needed to bootstrap the DHT)
-	install -D -m 644 \
-		"${_srcdir}/libbitdht/src/bitdht/bdboot.txt" \
-		"${pkgdir}/usr/share/RetroShare/bdboot.txt"
-
-	# Skins
-	cp -r "${_srcdir}/retroshare-gui/src/qss" "${pkgdir}/usr/share/RetroShare/"
-	find "${pkgdir}/usr/share/RetroShare/" -depth -type d -name ".svn" -exec rm -r {} \;
-}
diff --git a/pcr/retroshare/retroshare.desktop b/pcr/retroshare/retroshare.desktop
deleted file mode 100644
index 0c3f56180..000000000
--- a/pcr/retroshare/retroshare.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=RetroShare
-GenericName=Sharing Network
-Comment=Secure Communication with Your Friends
-Icon=/usr/share/pixmaps/retroshare.png
-Exec=/usr/bin/retroshare
-Terminal=false
-StartupNotify=true
-Categories=Network;InstantMessaging;FileTransfer;Chat;Email;
diff --git a/pcr/retroshare/retroshare.install b/pcr/retroshare/retroshare.install
deleted file mode 100644
index e48df1361..000000000
--- a/pcr/retroshare/retroshare.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-	# Update Desktop DB
-	if [[ -x /usr/bin/update-desktop-database ]]; then
-		echo "Update desktop database..."
-		update-desktop-database -q ;
-	fi
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/pcr/rfc5766-turn-server/ChangeLog b/pcr/rfc5766-turn-server/ChangeLog
deleted file mode 100644
index 5accefa5b..000000000
--- a/pcr/rfc5766-turn-server/ChangeLog
+++ /dev/null
@@ -1,5 +0,0 @@
-2013-06-05 Vladimir Tsanev <tsachev@gamil.com>
-    
-    * 1.8.6.0-1 :
-    Initial package created.
-
diff --git a/pcr/rfc5766-turn-server/PKGBUILD b/pcr/rfc5766-turn-server/PKGBUILD
deleted file mode 100644
index c070ad309..000000000
--- a/pcr/rfc5766-turn-server/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# Maintainer: Vladimir Tsanev <tsachev@gmail.com>
-
-pkgname=rfc5766-turn-server
-_portname=turnserver
-pkgver=2.6.2.1
-pkgrel=1
-pkgdesc="STUN and TURN Relay Server for VoIP and WebRTC"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/rfc5766-turn-server/"
-license=('custom:BSDNew')
-depends=('libevent' 'postgresql-libs' 'libmysqlclient' 'hiredis')
-optdepends=('postgresql-client: to use postgresql'
-            'mariadb: mariadb backend'
-            'redis: redis backend')
-backup=("etc/turnserver.conf" "etc/turnuserdb.conf")
-changelog=ChangeLog
-source=(https://${pkgname}.googlecode.com/files/${_portname}-$pkgver.tar.gz
-        turn.service stun.service)
-
-build() {
-  cd "${srcdir}/$_portname-${pkgver}"
-  
-  ./configure --prefix=/usr \
-              --manprefix=/usr/share \
-              --examplesdir="/usr/share/$_portname/examples"
-
-  make
-}
-
-check() {
-  cd "${srcdir}/$_portname-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/$_portname-${pkgver}"
-  make DESTDIR="$pkgdir" install
-  
-  
-  install -D "$pkgdir/usr/share/$_portname/examples/etc/turnserver.conf" \
-             "$pkgdir/etc/turnserver.conf"
-  install -D "$pkgdir/usr/share/$_portname/examples/etc/turnuserdb.conf" \
-             "$pkgdir/etc/turnuserdb.conf"
-  install -D "$srcdir/stun.service" \
-             "$pkgdir/usr/lib/systemd/system/stun.service"
-  install -D "$srcdir/turn.service" \
-             "$pkgdir/usr/lib/systemd/system/turn.service"
-  rm -r "$pkgdir/usr/etc"
-
-  chmod 644 "$pkgdir/usr/lib/libturnclient.a"
-
-  install -Dm 644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-  install -dm 755 "$pkgdir/var/log/$_portname"
-
-  sed \
-          -e '/^#log-file=\/var\/tmp\/turn.log$/c log-file=\/var\/log\/turnserver\/turn.log' \
-          -i "${pkgdir}"/etc/turnserver.conf
-}
-sha1sums=('d7f01e6fadbe56fe4535d67a7d178a9cfba110b8'
-          '0c5b348e793bd52ce0ee38d420b26c9b2a2e2ca5'
-          'b12805c049787cd1433181afaba4111f89740e63')
-sha256sums=('4d131f353aadb15901d175755075af65abf2a0e820d7281c9c164285642ff9c1'
-            '319030c1916d353bfc3375626cc7f60d6eeca762fe4fce354f010212902c49dc'
-            '63198e4f802c7b4b44e671e0fcaebca36589ebb11405e51ab9f36c80327ac4d9')
diff --git a/pcr/rfc5766-turn-server/stun.service b/pcr/rfc5766-turn-server/stun.service
deleted file mode 100644
index bddb6168a..000000000
--- a/pcr/rfc5766-turn-server/stun.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=STUN Server
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/turnserver --stun-only
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/rfc5766-turn-server/turn.service b/pcr/rfc5766-turn-server/turn.service
deleted file mode 100644
index 54cc5f01a..000000000
--- a/pcr/rfc5766-turn-server/turn.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=TURN Server
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/turnserver
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/rosinstall/PKGBUILD b/pcr/rosinstall/PKGBUILD
deleted file mode 100644
index 3f91dbe6c..000000000
--- a/pcr/rosinstall/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor: Georg Bremer <pkgbuild@dschoordsch.de>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgdesc='Tool to download/boostrap the ROS stack'
-url='http://www.ros.org/'
-
-pkgname='rosinstall'
-pkgver='0.6.20'
-pkgrel='1'
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('python2' 'cmake' 'wget' 'vcstools'
-  'git' 'python2-distribute' 'python2-yaml')
-
-source=("http://pr.willowgarage.com/downloads/$pkgname/$pkgname-$pkgver.tar.gz")
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's/env python /env python2 /' src/rosinstall/setupfiles.py
-  python2 setup.py install --root=$pkgdir --optimize=1
-}
diff --git a/pcr/rstudio-desktop/PKGBUILD b/pcr/rstudio-desktop/PKGBUILD
deleted file mode 100644
index 569df2b33..000000000
--- a/pcr/rstudio-desktop/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer:  TDY <tdy@archlinux.info>
-# Contributor: Ben Ward <benjamin.ward@bathspa.org>
-
-pkgname=rstudio-desktop
-pkgver=0.97.332
-_commit=e65a459
-pkgrel=1
-pkgdesc="A powerful and productive user interface for R"
-arch=('i686' 'x86_64')
-url="http://www.rstudio.org/"
-license=('AGPL')
-depends=('r>=2.11.1' 'qtwebkit' 'boost-libs>=1.50' 'shared-mime-info')
-makedepends=('git' 'cmake>=2.8' 'boost>=1.50' 'java-environment' 'apache-ant' 'unzip' 'openssl' 'pam' 'wget')
-install=rstudio.install
-source=($pkgname-$pkgver.tgz::https://github.com/rstudio/rstudio/tarball/v$pkgver)
-md5sums=('0197506486c76ed1bff71a534072e0e9')
-
-build() {
-  cd "$srcdir/rstudio-rstudio-$_commit/dependencies/common"
-  sh install-gwt
-  sh install-dictionaries
-  sh install-mathjax
-
-  rm -rf "$srcdir/rstudio-rstudio-$_commit/build"
-  install -dm755 "$srcdir/rstudio-rstudio-$_commit/build"
-  cd "$srcdir/rstudio-rstudio-$_commit/build"
-  cmake -DRSTUDIO_TARGET=Desktop \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio ..
-}
-
-package() {
-  cd "$srcdir/rstudio-rstudio-$_commit/build"
-  make DESTDIR="$pkgdir/" install
-  install -Dm644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/rstudio-desktop/rstudio.install b/pcr/rstudio-desktop/rstudio.install
deleted file mode 100644
index d0192c8c0..000000000
--- a/pcr/rstudio-desktop/rstudio.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install "$1"
-}
-
-post_remove() {
-  post_install "$1"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/ruby-bundler/PKGBUILD b/pcr/ruby-bundler/PKGBUILD
deleted file mode 100644
index 44a1a883b..000000000
--- a/pcr/ruby-bundler/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributor: Alexsandr Pavlov <kidoz at mail dot ru>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-_pkgname=bundler
-pkgname=ruby-$_pkgname
-pkgver=1.3.5
-pkgrel=1
-pkgdesc="Is manages an application's dependencies through its entire life, across many machines, systematically and repeatably."
-arch=any
-url=http://gem$_pkgname.com
-license=MIT
-depends=ruby
-source=http://rubygems.org/downloads/$_pkgname-$pkgver.gem
-noextract=$_pkgname-$pkgver.gem
-sha256sums=08b89047f7b829f3e197a28fb1bde74c3f5cfea1552f99dfba237fee30eaffe4
-
-package() {
-  cd $srcdir
-
-  local _gemdir=$(ruby -rubygems -e'puts Gem.default_dir')
-  HOME=/tmp gem install --no-user-install --ignore-dependencies\
-  -i $pkgdir$_gemdir -n $pkgdir/usr/bin\
-  $_pkgname-$pkgver.gem
-}
diff --git a/pcr/ruby-haml/PKGBUILD b/pcr/ruby-haml/PKGBUILD
deleted file mode 100644
index 37290484a..000000000
--- a/pcr/ruby-haml/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Renzo Carbonara <gnuk0001@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=ruby-haml
-pkgver=3.1.6
-pkgrel=1
-pkgdesc="An elegant, structured XHTML/XML templating engine. Comes with Sass, a similar CSS templating engine."
-arch=('any')
-url="http://haml-lang.com/"
-license=('MIT')
-groups=()
-depends=('ruby' 'ruby-yard>=0.5.3' 'maruku>=0.5.9')
-makedepends=('rubygems')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-source=("http://gems.rubyforge.org/gems/haml-${pkgver}.gem")
-noextract=("haml-${pkgver}.gem")
-
-build() {
-  cd $srcdir
-  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-  gem install --ignore-dependencies -i "$pkgdir$_gemdir" haml-$pkgver.gem \
-              -n "$pkgdir/usr/bin"
-}
-
-md5sums=('c73b2755a56cf5461f6a5e430052f436')
-
-# vim:set ts=2 sw=2 et:
-md5sums=('c73b2755a56cf5461f6a5e430052f436')
-md5sums=('c73b2755a56cf5461f6a5e430052f436')
diff --git a/pcr/ruby-headers/PKGBUILD b/pcr/ruby-headers/PKGBUILD
deleted file mode 100644
index 7b20fc288..000000000
--- a/pcr/ruby-headers/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: fauno <fauno@kiwwwi.com.ar>
-# Contributor: Hilton Medeiros <medeiros.hilton at gmail dot com>
-
-pkgname=ruby-headers
-_pkgname=ruby
-pkgver=2.0.0_p195
-_pkgver=2.0.0-p195
-pkgrel=1
-pkgdesc="A package of all Ruby headers needed by some gems like ruby-debug."
-arch=('any')
-url="http://www.ruby-lang.org/en/"
-license=('GPL2' 'custom:Ruby')
-depends=("ruby=$pkgver")
-source=("http://ftp.ruby-lang.org/pub/ruby/2.0/$_pkgname-$_pkgver.tar.bz2")
-
-package() {
-  cd "$srcdir/$_pkgname-$_pkgver"
-
-  _hdrdir=`ruby -e "require 'rbconfig'; puts RbConfig::CONFIG['rubyhdrdir']"`
-
-  install -d "$pkgdir$_hdrdir/$_pkgname-$_pkgver"
-  install -m644 *.{h,inc} "$pkgdir$_hdrdir/$_pkgname-$_pkgver"
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-md5sums=('2f54faea6ee1ca500632ec3c0cb59cb6')
diff --git a/pcr/ruby-hiera-json/PKGBUILD b/pcr/ruby-hiera-json/PKGBUILD
deleted file mode 100644
index 4d80244c8..000000000
--- a/pcr/ruby-hiera-json/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: Jochen Schalanda <jochen+aur@schalanda.name>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-_gemname=hiera-json
-pkgname=ruby-$_gemname
-pkgver=0.4.0
-pkgrel=1
-pkgdesc='Store Hiera data in JSON'
-arch=(any)
-url='http://projects.puppetlabs.com/projects/hiera/'
-license=('MIT')
-depends=('ruby')
-makedepends=('rubygems' 'ruby-hiera')
-source=(http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem)
-noextract=($_gemname-$pkgver.gem)
-
-package() {
-  cd "$srcdir"
-  # _gemdir is defined inside package() because if ruby[gems] is not installed on
-  # the system, makepkg will exit with an error when sourcing the PKGBUILD.
-  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"
-}
-
diff --git a/pcr/ruby-hiera/PKGBUILD b/pcr/ruby-hiera/PKGBUILD
deleted file mode 100644
index c4d51fe44..000000000
--- a/pcr/ruby-hiera/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributor: Jochen Schalanda <jochen+aur@schalanda.name>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-_gemname=hiera
-pkgname=ruby-$_gemname
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="A pluggable data store for hierarcical data."
-arch=(any)
-url='http://projects.puppetlabs.com/projects/hiera/'
-license=('MIT')
-depends=('ruby')
-makedepends=('rubygems')
-source=(
-        "http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem"
-        'hiera.yaml')
-noextract=($_gemname-$pkgver.gem)
-
-package() {
-  cd "$srcdir"
-  # _gemdir is defined inside package() because if ruby[gems] is not installed on
-  # the system, makepkg will exit with an error when sourcing the PKGBUILD.
-  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"
-
-  # Create hiera default directory
-  install -d $pkgdir/var/lib/hiera
-
-  # Create hiera default configuration
-  install -d $pkgdir/etc
-  install -m 644 $srcdir/hiera.yaml $pkgdir/etc/
-}
diff --git a/pcr/ruby-hiera/hiera.yaml b/pcr/ruby-hiera/hiera.yaml
deleted file mode 100644
index cd0be3fec..000000000
--- a/pcr/ruby-hiera/hiera.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-:backend:
-  - yaml
-  - json
-:hierarchy:
-  - defaults
-  - global
-
-:yaml:
-# datadir is empty here, so hiera uses its defaults:
-# - /var/lib/hiera on *nix
-# - %CommonAppData%\PuppetLabs\hiera\var on Windows
-# When specifying a datadir, make sure the directory exists.
-  :datadir:
-
-:json:
-# datadir is empty here, so hiera uses its defaults:
-# - /var/lib/hiera on *nix
-# - %CommonAppData%\PuppetLabs\hiera\var on Windows
-# When specifying a datadir, make sure the directory exists.
-  :datadir:
diff --git a/pcr/ruby-libnotify/PKGBUILD b/pcr/ruby-libnotify/PKGBUILD
deleted file mode 100644
index f38e10d2d..000000000
--- a/pcr/ruby-libnotify/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Contributor: Luca Russo <vargolo@gmail.com>
-# Contributor: Sigitas Mazaliauskas <sigisnn@gmail.com>
-# Contributor: Andreas W. Hauser <andy-aur@splashground.de>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=ruby-libnotify
-pkgver=0.8.0
-pkgrel=1
-pkgdesc="ruby bindings for libnotify, a library for desktop notifications"
-arch=('i686' 'x86_64')
-url="http://rubygems.org/downloads"
-license=('LGPL')
-depends=('ruby' 'libnotify' 'ruby-gtk2')
-makedepends=('ruby-pkgconfig')
-source=(http://rubygems.org/downloads/${pkgname}-${pkgver}.gem)
-noextract=(${pkgname}-${pkgver}.gem)
-
-build() {
-  cd $srcdir
-  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-
-  gem install --ignore-dependencies -i "$pkgdir$_gemdir" ${pkgname}-${pkgver}.gem
-}
diff --git a/pcr/ruby-maruku/PKGBUILD b/pcr/ruby-maruku/PKGBUILD
deleted file mode 100644
index 786b03e98..000000000
--- a/pcr/ruby-maruku/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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-mustache/PKGBUILD b/pcr/ruby-mustache/PKGBUILD
deleted file mode 100644
index ddb5215d3..000000000
--- a/pcr/ruby-mustache/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: David Campbell <davekong@archlinux.us>
-pkgname=ruby-mustache
-pkgver=0.99.4
-pkgrel=3
-pkgdesc="A framework-agnostic way to render logic-free views."
-arch=('any')
-url="http://github.com/defunkt/mustache"
-license=(MIT)
-depends=('ruby>=2')
-makedepends=('rubygems')
-source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem"
-        "https://raw.github.com/defunkt/mustache/master/LICENSE")
-md5sums=('650194ec2c166feb087377647414b9dc'
-         'fbbd010314b3f1554733123ecde55a52')
-noextract=("mustache-${pkgver}.gem")
-
-build() {
-  cd $srcdir
-  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-  gem install \
-      --no-user-install \
-      --ignore-dependencies \
-      -i "$pkgdir$_gemdir" mustache-$pkgver.gem \
-      -n "$pkgdir/usr/bin"
-
-  install -Dm644 $srcdir/LICENSE \
-                 $pkgdir/usr/share/licenses/$pkgname/LICENSE
-
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/ruby-shadow/PKGBUILD b/pcr/ruby-shadow/PKGBUILD
deleted file mode 100644
index 155835a3f..000000000
--- a/pcr/ruby-shadow/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributor: Thomas S Hatch <thatch45@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=ruby-shadow
-pkgver=2.1.4
-pkgrel=5
-pkgdesc="Interface for shadow passwords for Ruby"
-arch=(i686 x86_64 arm)
-depends=('ruby')
-license=('publicdomain')
-url=('https://github.com/apalmblad/ruby-shadow.git')
-source=("https://github.com/apalmblad/ruby-shadow/archive/$pkgver.tar.gz")
-
-
-build() {
-	cd $srcdir/$pkgname-$pkgver
-	ruby extconf.rb
-	make
-}
-
-package() {
-	cd $srcdir/$pkgname-$pkgver
-	make DESTDIR=$pkgdir install
-}
diff --git a/pcr/ruby-syntax/PKGBUILD b/pcr/ruby-syntax/PKGBUILD
deleted file mode 100644
index 36d38a725..000000000
--- a/pcr/ruby-syntax/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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
-pkgdesc="A Ruby library for performing simple syntax highlighting"
-url="http://syntax.rubyforge.org/"
-license=('custom:BSD3')
-
-pkgrel=2
-arch=(any)
-depends=(ruby)
-makedepends=(rubygems)
-source=("https://rubyforge.org/frs/download.php/4952/$_gemname-$pkgver.tar.bz2" $_gemname.gemspec)
-md5sums=('bcb53b7d0847190c40a993c3fe1f1611'
-         '6e9a615fd9ba73335b16e5cc8762667d')
-
-build() {
-  cd "$srcdir/$_gemname-$pkgver"
-  gem build ../$_gemname.gemspec
-}
-
-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/ruby-yard/PKGBUILD b/pcr/ruby-yard/PKGBUILD
deleted file mode 100644
index a686f937d..000000000
--- a/pcr/ruby-yard/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Matt Harrison <matt at mistbyte dot com>
-# Contributor: Renzo Carbonara <gnuk0001@gmail.com>
-
-pkgname=ruby-yard
-_gemname=${pkgname#ruby-}
-pkgver=0.8.2.1
-pkgrel=2
-pkgdesc="Documentation tool for consistent and usable documentation in Ruby."
-arch=('any')
-url="http://yardoc.org"
-license=('MIT')
-groups=()
-depends=()
-makedepends=('rubygems')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-source=("http://gems.rubyforge.org/gems/yard-${pkgver}.gem")
-noextract=("yard-${pkgver}.gem")
-
-build() {
-  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
-  install -D "$pkgdir$_gemdir/gems/${_gemname}-$pkgver/LICENSE" \
-             "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-md5sums=('08a48d23f8729b68945011cae7d121fe')
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/ruby1-bundler/PKGBUILD b/pcr/ruby1-bundler/PKGBUILD
deleted file mode 100644
index d06f7af08..000000000
--- a/pcr/ruby1-bundler/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: Alexsandr Pavlov <kidoz at mail dot ru>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-_pkgname=bundler
-pkgname=ruby1-$_pkgname
-pkgver=1.3.5
-pkgrel=1
-pkgdesc="Is manages an application's dependencies through its entire life, across many machines, systematically and repeatably."
-arch=any
-url=http://gem$_pkgname.com
-license=MIT
-depends=ruby1
-source=http://rubygems.org/downloads/$_pkgname-$pkgver.gem
-noextract=$_pkgname-$pkgver.gem
-sha256sums=08b89047f7b829f3e197a28fb1bde74c3f5cfea1552f99dfba237fee30eaffe4
-
-package() {
-  cd $srcdir
-
-  local _gemdir=$(ruby1 -rubygems -e'puts Gem.default_dir')
-  HOME=/tmp gem1 install --no-user-install --ignore-dependencies\
-  -i $pkgdir$_gemdir -n $pkgdir/usr/bin\
-  $_pkgname-$pkgver.gem
-
-  msg "renaming $_pkgname to ${_pkgname}1"
-  mv -v $pkgdir/usr/bin/${_pkgname%r}{,1}
-}
diff --git a/pcr/ruby1/PKGBUILD b/pcr/ruby1/PKGBUILD
deleted file mode 100644
index 4a441bc1c..000000000
--- a/pcr/ruby1/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-# Contributor: Jeramy Rutley <jrutley@gmail.com>
-
-_pkgname=ruby
-pkgname=("${_pkgname}1" "${_pkgname}1-docs")
-pkgver=1.9.3_p448
-pkgrel=2
-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' '!staticlibs')
-source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
-        'gemrc')
-md5sums=('aa710d386e5903f78f0231868255e6af'
-         '6fb8e7a09955e0f64be3158fb4a27e7a')
-
-build() {
-  cd ruby-${pkgver//_/-}
-
-  msg 'use gdbm because db v6 changed the license to AGPL'
-  sed -i 's|db db2 db1 db5 db4 db3||
-          \|db[1-5]/n\{0,1\}dbm\{0,1\}[.]h|d
-          \|traditional ndbm [(]4[.]3BSD[)]|d
-         ' ext/dbm/extconf.rb
-
-  msg 'fixing gemrc to gem1rc'
-  sed -i 's|gemrc|gem1rc|g
-         ' doc/rubygems/{ChangeLog,History.txt} \
-           lib/rubygems{,/command,/commands/environment_command,/config_file}.rb \
-           test/rubygems/test_gem_{config_file,gem_runner,remote_fetcher}.rb
-
-  PKG_CONFIG=/usr/bin/pkg-config ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --enable-shared \
-    --disable-rpath \
-    --program-suffix=1
-
-  make
-}
-
-check() {
-  cd ruby-${pkgver//_/-}
-
-  make test
-}
-
-package_ruby1() {
-  pkgdesc='An object-oriented language for quick and easy programming (1.9 ver.)'
-  depends=('gdbm' 'openssl' 'libffi' 'libyaml')
-  optdepends=('tk: for Ruby/TK'
-              'ruby1-docs: Ruby documentation')
-  backup=('etc/gem1rc')
-  install='ruby.install'
-
-  cd ruby-${pkgver//_/-}
-
-  make DESTDIR="${pkgdir}" install-nodoc
-
-  install -D -m644 ${srcdir}/gemrc "${pkgdir}/etc/gem1rc"
-
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby1/LICENSE"
-  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby1/BSDL"
-
-  msg 'remove useless files'
-  rm -v "${pkgdir}/usr/lib/libruby.so"
-}
-
-package_ruby1-docs() {
-  pkgdesc='Documentation files for ruby (1.9 ver.)'
-
-  cd ruby-${pkgver//_/-}
-
-  make DESTDIR="${pkgdir}" install-doc install-capi
-
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby1-docs/LICENSE"
-  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby1-docs/BSDL"
-
-  msg 'fixing doc path'
-  mv -v ${pkgdir}/usr/share/doc/ruby{,1}
-}
diff --git a/pcr/ruby1/gemrc b/pcr/ruby1/gemrc
deleted file mode 100644
index 3d11de1ec..000000000
--- a/pcr/ruby1/gemrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/pcr/ruby1/ruby.install b/pcr/ruby1/ruby.install
deleted file mode 100644
index 21e9b98a2..000000000
--- a/pcr/ruby1/ruby.install
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-print_gem_default_target() {
-  echo 'The default location of gem installs is $HOME/.gem/ruby'
-  echo 'Add the following line to your PATH if you plan to install using gem'
-  echo '$(ruby1 -rubygems -e "puts Gem.user_dir")/bin'
-  echo 'If you want to install to the system wide location, you must either:'
-  echo 'edit /etc/gem1rc or run gem with the --no-user-install flag.'
-}
-
-# arg 1:  the new package version
-post_install() {
-  print_gem_default_target
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  if [ "$(vercmp $2 1.9.3_p125-4)" -lt 0 ]; then
-    print_gem_default_target
-  fi
-}
diff --git a/pcr/ryzom-data/PKGBUILD b/pcr/ryzom-data/PKGBUILD
deleted file mode 100644
index dfb8a116c..000000000
--- a/pcr/ryzom-data/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Mantainer: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname='ryzom-data'
-group='ryzom'
-pkgver=0.8.0
-pkgrel=1
-arch=('any')
-url="http://media.ryzom.com/"
-license=('CCPL:by-sa')
-makedepends=('rsync' 'p7zip-libre')
-conflicts=('ryzom-data')
-pkgdesc="An awesome free software 3D MMORPG game. Game data."
-source=("http://sourceforge.net/projects/ryzom/files/ryzom_client.7z/download" "updateryzomdata")
-noextract=("download")
-sha256sums=('fa9e44e1014f4ae8639f1ec092391a41f69fc343ce48dd39b55ffae06ec3291f'
-            'b42f74fd21cdbf6734214e5576dbbe7e4cf171bf5d712011fbea6529bd0123fd')
-
-package() {
-  cd "$srcdir/"
-
-  if [[ -d "data" ]]; then
-     rm -rf data
-  fi
-
-  mv "download" "ryzom_client.7z"
-  msg "Extracting game data..."
-  7z x ryzom_client.7z ryzom/data/ >& /dev/null
-  cd ryzom/data/
-
-  msg "Updating the official Ryzom game data, this can take a while..."
-  rsync -rtzvu --progress --stats --recursive --timeout=30 www.ryzom.com::ryzom/data/ ./ >& /dev/null
-  msg 'Update completed...'
-
-  cd "$srcdir/ryzom/data"
-
-  # creating directories
-  install -d -m 755 "${pkgdir}/usr/share/ryzom/data/fonts/"
-  install -d -m 755 "${pkgdir}/etc/cron.d/"
-
-  # installing files
-  install -m 644 fonts/* "${pkgdir}/usr/share/ryzom/data/fonts/"
-  rm -rf fonts
-
-  install -m 644 * "${pkgdir}/usr/share/ryzom/data/"
-  install -m 644 ${srcdir}/updateryzomdata "${pkgdir}/etc/cron.d/"
-}
diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
deleted file mode 100644
index 2aa501159..000000000
--- a/pcr/ryzom-hg/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-# Maintainer (aur): Bjoern Bidar <theodorstormgrade@gmail.com>
-
-pkgname='ryzom-hg'
-_hgver=923522b
-pkgver=20131215
-pkgrel=3
-pkgdesc="An awesome free software 3D MMORPG game"
-arch=('i686' 'x86_64')
-url="http://www.ryzom.com/"
-license=('AGPL3')
-depends=('curl' 'hicolor-icon-theme' 'libvorbis' 'libjpeg' 'libwww-hg' 'luabind' 'ryzom-data')
-conflicts=('ryzom')
-makedepends=('mercurial' 'cpptest' 'cmake' 'bison' 'freealut' 'rrdtool' 'boost' 'freetype2')
-source=("libre://$pkgname-$pkgver.tar.gz")
-
-mksource=(".$pkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=${_hgver}")
-
-mksource() {
-  rm -rf "$srcdir/$pkgname-$pkgver"
-  cp -a "$srcdir/.$pkgname-$pkgver/code" "${srcdir}/${pkgname}-${pkgver}"
-  # some patching required...
-  sed -i 's|<freetype/|<freetype2/|g' "${srcdir}/${pkgname}-${pkgver}/nel/src/3d/font_generator.cpp"
-}
-
-build() {
-  mkdir -p "$srcdir/build"
-  cd "$srcdir/build"
-  cmake -Wno-dev "$srcdir/${pkgname}-${pkgver}" -DFINAL_VERSION=ON -DWITH_STATIC=OFF -DWITH_NEL_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON  -DWITH_NEL_SAMPLES=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_NEL=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin -DFREETYPE_INCLUDE_DIRS="/usr/include;/usr/include/freetype2"
-  
-  make all
-}
-
-package() {
-  cd "$srcdir/build"
-  make DESTDIR="$pkgdir" install
-  cd "$pkgdir/etc/ryzom/"
-  # instead of the open shard, we point to the actual ryzom shard.
-  # this cannot be on prepare(), I tried that already and didn't work
-  sed -i 's|"ryzom_open"|"ryzom_live"|g' client_default.cfg
-  sed -i 's|PatchServer = "";|PatchServer = "http://dl.ryzom.com/patch_live";|g' client_default.cfg
-  sed -i 's|SignUpURL = "";|SignUpURL = "http://www.ryzom.com/subscribe";|g' client_default.cfg
-  sed -i 's|"open.ryzom.com:40916";|"shard.ryzom.com:40916";|g' client_default.cfg
-  sed -i 's|CreateAccountURL = "";|CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";|g' client_default.cfg
-  sed -i 's|InstallWebPage = "";|InstallWebPage = "http://dl.ryzom.com/installer/";|g' client_default.cfg
-  sed -i 's|"http://open.ryzom.com:50000/stats/stats.php";|"http://shard.ryzom.com:50000/stats/stats.php";|g' client_default.cfg
-  sed -i 's|atys.|app.|g' client_default.cfg
-  sed -i 's|"app.ryzom.com" |"api.ryzom.com", "app.ryzom.com" |g' client_default.cfg
-}
-
-mksha256sums=('SKIP')
-sha256sums=('187e9a508be4c3c07f768fc98497941ac4946caf2202d24311aac81d73cff5a5')
diff --git a/pcr/ryzom-hg/ryzom.desktop b/pcr/ryzom-hg/ryzom.desktop
deleted file mode 100644
index d90063593..000000000
--- a/pcr/ryzom-hg/ryzom.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Ryzom
-Type=Application
-GenericName=ryzom
-Comment=Ryzom
-Exec=/usr/bin/ryzom
-Icon=/usr/share/ryzom/data/ryzom.png
-Terminal=false
-Hidden=false
-Categories=Game;RolePlaying;
diff --git a/pcr/samba4/PKGBUILD b/pcr/samba4/PKGBUILD
deleted file mode 100644
index 09c55781d..000000000
--- a/pcr/samba4/PKGBUILD
+++ /dev/null
@@ -1,93 +0,0 @@
-# Maintainer: Michael Hansen <zrax0111 gmail com>
-# Contributor: Marco A Rojas <marquicus at gmail.com>
-# Contributor: Netanel Shine <netanel at archlinux.org.il >
-# Contributor: ngoonee <ngoonee.talk@gmail.com>
-# Contributor: Adam Russell <adamlr6+arch@gmail.com>
-# Contributor: Dhananjay Sathe <dhananjaysathe@gmail.com>
-pkgname=samba4
-pkgver=4.0.0rc5
-pkgrel=1
-pkgdesc="Samba 4.0 Release Candidate"
-arch=('i686' 'x86_64')
-url="http://www.samba.org"
-license=('GPL3')
-depends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' 'libcap>=2.16' 'pam' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb')
-makedepends=('python2' 'docbook-xsl' 'pkg-config')
-options=(!makeflags)
-source=(http://us1.samba.org/samba/ftp/rc/samba-${pkgver}.tar.gz
-        samba4.rc samba4.confd)
-md5sums=('24d4b715a46c5f111b08b87975a27b1e'
-         '01deaef9cd21dff7586a7221d1a6d300'
-         'e1b2671dc1d1371a3628235a818debab')
-_prefix="/opt/samba4"
-
-build() {
-	cd ${srcdir}/samba-${pkgver}
-
-	# change to use python2
-	SAVEIFS=${IFS}
-	IFS=$(echo -en "\n\b")
-	PYTHON_CALLERS="$(find ${srcdir}/samba-${pkgver} -name '*.py')
-$(find ${srcdir}/samba-${pkgver} -name 'wscript*')
-$(find ${srcdir}/samba-${pkgver} -name 'configure.ac')
-$(find ${srcdir}/samba-${pkgver} -name 'upgrade_from_s3')
-$(find ${srcdir}/samba-${pkgver}/buildtools -type f)
-$(find ${srcdir}/samba-${pkgver}/source4/scripting -type f)"
-	sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" \
-	       -e "s|python-config|python2-config|" \
-	       -e "s|bin/python|bin/python2|" \
-	    ${PYTHON_CALLERS}
-	IFS=${SAVEIFS}
-
-	export PYTHON=/usr/bin/python2
-
-	cd ${srcdir}/samba-${pkgver}/lib/tdb
-	./configure --prefix=${_prefix}/samba
-	make
-	make DESTDIR="$pkgdir/" install
-
-	cd ${srcdir}/samba-${pkgver}/lib/tevent
-	./configure --prefix=${_prefix}/samba
-	make
-	make DESTDIR="$pkgdir/" install
-
-	cd ${srcdir}/samba-${pkgver}/lib/ldb
-	./configure --prefix=${_prefix}/samba
-	make
-	make DESTDIR="$pkgdir/" install
-
-	cd ${srcdir}/samba-${pkgver}
-	./configure --prefix=${_prefix}
-	make
-}
-
-package() {
-	_pyver=`python2 -c 'import sys; print(sys.version[:3])'`
-
-	cd ${srcdir}/samba-${pkgver}
-	make DESTDIR="$pkgdir/" install
-
-	install -d ${pkgdir}/etc/ld.so.conf.d
-	echo "${_prefix}/samba/lib" > ${pkgdir}/etc/ld.so.conf.d/samba4.conf
-
-	cd ${pkgdir}/${_prefix}/lib/
-	ln -s samba/libldb-samba4.so.0 libldb.so
-	ln -s samba/libldb-samba4.so.0 libldb.so.0
-
-	find ${pkgdir}/${_prefix}/lib/python${_pyver}/site-packages/ -name '*.py' | \
-	     xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
-	find ${pkgdir}/${_prefix}/bin ${pkgdir}/${_prefix}/sbin -type f -executable | \
-	     xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
-
-	# Make admin scripts look in the right place for the samba python module
-	for script in sbin/samba_dnsupdate sbin/samba_kcc sbin/samba_spnupdate \
-	              sbin/samba_upgradeprovision sbin/samba_upgradedns bin/samba-tool
-	do
-		sed -i "/^sys\.path\.insert/ a\
-sys.path.insert(0, '${_prefix}/lib/python${_pyver}/site-packages')" \
-		       ${pkgdir}/${_prefix}/${script}
-	done
-
-	install -D -m755 ${srcdir}/samba4.rc ${pkgdir}/etc/rc.d/samba4
-	install -D -m644 ${srcdir}/samba4.confd ${pkgdir}/etc/conf.d/samba4
-}
diff --git a/pcr/samba4/samba4.confd b/pcr/samba4/samba4.confd
deleted file mode 100644
index 3c29c49cf..000000000
--- a/pcr/samba4/samba4.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Additional parameters to be passed to Samba4
-#
-
-SAMBA4_ARGS=""
diff --git a/pcr/samba4/samba4.rc b/pcr/samba4/samba4.rc
deleted file mode 100644
index 73d09fe30..000000000
--- a/pcr/samba4/samba4.rc
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/samba4 ] && . /etc/conf.d/samba4
-
-function call_samba4() {
-	/opt/samba4/sbin/samba -D $SAMBA4_ARGS
-}
-
-case "$1" in
-	start)
-		stat_busy "Starting Samba4 Server"
-		if [ ! -x /opt/samba4/var ] ; then
-			install -m755 -d /opt/samba4/var
-		fi
-		if [ ! -x /opt/samba4/var/run ] ; then
-			install -m755 -d /opt/samba4/var/run
-		fi
-		PID=`pidof -o %PPID /opt/samba4/sbin/samba`
-		[ -z "$PID" ] && call_samba4
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			add_daemon samba4
-			stat_done
-		fi
-		;;
-	stop)
-		stat_busy "Stopping Samba4 Server"
-		PID=`pidof -o %PPID /opt/samba4/sbin/samba`
-		[ -z "$PID" ] || kill $PID &> /dev/null
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			rm /opt/samba4/var/run/samba.pid &> /dev/null
-			rm_daemon samba4
-			stat_done
-		fi
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/pcr/samplv1/PKGBUILD b/pcr/samplv1/PKGBUILD
deleted file mode 100644
index 33be54edf..000000000
--- a/pcr/samplv1/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-
-pkgname=samplv1
-pkgver=0.3.4
-pkgrel=1
-pkgdesc="Polyphonic sampler synthesizer with stereo fx"
-arch=(i686 x86_64)
-url="http://$pkgname.sourceforge.net/$pkgname-index.html"
-license=('GPL')
-groups=('lv2-plugins')
-depends=('jack' 'liblo' 'lv2' 'qt4' 'shared-mime-info')
-install="$pkgname.install"
-source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('32e920ff8457bb94f301a657d55f90a8')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # x86_64 lib path fix
-  sed -i "s/lib64/lib/" src/src_lv2.pro
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/samplv1/samplv1.install b/pcr/samplv1/samplv1.install
deleted file mode 100644
index ec1a84bbb..000000000
--- a/pcr/samplv1/samplv1.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  update-mime-database usr/share/mime
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/pcr/seeks/PKGBUILD b/pcr/seeks/PKGBUILD
deleted file mode 100644
index 32abb13f8..000000000
--- a/pcr/seeks/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# Maintainer: Kete < kete at ninthfloor dot org >
-
-pkgname=seeks
-pkgver=0.4.1
-pkgrel=6
-pkgdesc="A social decentralized internet overlay for collaborative searches"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.seeks-project.info/site/"
-license=('AGPL3' 'LGPL' 'BSD')
-backup=('etc/logrotate.d/seeks'
-    'etc/conf.d/seeks'
-    'etc/seeks/config')
-depends=('curl' 'libevent>=2.0' 'libxml2' 'opencv' 'protobuf' 'icu' 'tokyotyrant')
-makedepends=('pkg-config' 'docbook-xml' 'docbook2x')
-source=("http://downloads.sourceforge.net/project/${pkgname}/hippy/${pkgname}-${pkgver}.tar.gz"
-'seeks.conf.d'
-	'seeks.rc.d'
-	'img_websearch.patch'
-	'conf.patch'
-	'seeks.logrotate')
-install=seeks.install
-
-build() {
-  cd  "$srcdir/$pkgname-$pkgver"
-  # replace <cxflann.h> by <cv.h>
-  patch -p1 -i "$srcdir/img_websearch.patch"
-
-  # linking issue with --as-needed linker flag, Cli not building with RC2
-  LDFLAGS="-Wl,--no-as-needed" \
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --enable-httpserv-plugin \
-              --enable-extended-host-patterns
-              #--disable-cli \
-
-  sed -i s/,--as-needed,/,/ config.status
-  make
-}
-
-check() {
-  cd  "$srcdir/$pkgname-$pkgver"
-  make -k check-local
-}
-
-package() {
-  cd  "$srcdir/$pkgname-$pkgver"
-  # Patch config file to make seeks log in /var/log instead of ./ (needed for rc.d)
-  patch -p1 -i "$srcdir/conf.patch"
-  make DESTDIR="$pkgdir/" install
-
-  install -D -m644 Licenses  "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -D -m644 ../seeks.conf.d "${pkgdir}/etc/conf.d/seeks"
-  install -D -m755 ../seeks.rc.d "${pkgdir}/etc/rc.d/seeks"
-  install -D -m600 ../seeks.logrotate  "${pkgdir}/etc/logrotate.d/seeks"
-  install -d -m755  "${pkgdir}/var/log/seeks"
-  install -d -m755  "${pkgdir}/var/lib/seeks"
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('2545192be5fa2e70d850f7395d039a0f'
-         'ed29089d43873600726d570e63a5043d'
-         '72a00a931363edd2ed11c0072bfd5b10'
-         '2554e9f9f733d83203d0926e599e66db'
-         '71a99dafa726539b9de9055468e2f56c'
-         '5fbdf9c327999605b0f124132f27a27d')
diff --git a/pcr/seeks/conf.patch b/pcr/seeks/conf.patch
deleted file mode 100644
index 93e12c311..000000000
--- a/pcr/seeks/conf.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/config	2011-11-13 15:21:14.000000000 +0100
-+++ b/src/config	2011-11-13 15:46:15.856186336 +0100
-@@ -148,7 +148,7 @@
- #
- #      No trailing "/", please.
- #
--confdir .
-+confdir /etc/seeks
- #
- #
- #  2.2. templdir
-@@ -193,7 +193,7 @@
- #
- #      No trailing "/", please.
- #
--logdir .
-+logdir /var/log/seeks
- #
- #
- #  2.4. logfile
diff --git a/pcr/seeks/docbook2man.patch b/pcr/seeks/docbook2man.patch
deleted file mode 100644
index c5de2e063..000000000
--- a/pcr/seeks/docbook2man.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- seeks/configure	2011-07-30 15:16:27.000000000 +0200
-+++ seeks/configure.patch	2011-07-30 16:04:34.000000000 +0200
-@@ -16726,10 +16726,10 @@ PCRE_CFLAGS=`$PCRE_CONFIG --cflags`
- 
- 
- #==========================================================================
--# Finding docbook2x-man
-+# Finding docbook2man
- #==========================================================================
--# Extract the first word of "docbook2x-man", so it can be a program name with args.
--set dummy docbook2x-man; ac_word=$2
-+# Extract the first word of "docbook2man", so it can be a program name with args.
-+set dummy docbook2man; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_docbook+:} false; then :
---- seeks/doc/Makefile.am	2011-07-30 16:51:14.000000000 +0200
-+++ seeks/doc/Makefile.am.patch	2011-07-30 16:55:58.000000000 +0200
-@@ -8,4 +8,4 @@ endif
- 
- EXTRA_DIST=seeks.1.docbook
- seeks.1:
--	docbook2x-man ${srcdir}/seeks.1.docbook
-+	docbook2man ${srcdir}/seeks.1.docbook
diff --git a/pcr/seeks/img_websearch.patch b/pcr/seeks/img_websearch.patch
deleted file mode 100644
index 94362e2fc..000000000
--- a/pcr/seeks/img_websearch.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/plugins/img_websearch/ocvsurf.cpp b/src/plugins/img_websearch/ocvsurf.cpp
-index 5caa9dd..c3cccb4 100644
---- a/src/plugins/img_websearch/ocvsurf.cpp
-+++ b/src/plugins/img_websearch/ocvsurf.cpp
-@@ -29,7 +29,7 @@
- #include "miscutil.h"
- #include "errlog.h"
- 
--#include <cxflann.h>
-+#include <cv.h>
- 
- #include <iostream>
- #include <fstream>
diff --git a/pcr/seeks/install b/pcr/seeks/install
deleted file mode 100644
index 35f383a3c..000000000
--- a/pcr/seeks/install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    getent group seeks  >/dev/null || groupadd -r seeks
-    getent passwd seeks >/dev/null || useradd -r -c "Seeks daemon" -g seeks -M -d /var/run/seeks -s /bin/false seeks
-    passwd -l seeks &>/dev/null
-    touch var/log/seeks.log
-    chown seeks:log var/log/seeks.log
-    mkdir -p var/lib/seeks
-    touch var/lib/seeks/seeks.db
-    chown -R seeks:seeks var/lib/seeks
-}
-
-pre_remove() {
-    getent passwd seeks &>/dev/null && userdel seeks >/dev/null
-    getent group seeks &>/dev/null && groupdel seeks >/dev/null
-    return 0
-}
-
-
diff --git a/pcr/seeks/logfile.patch b/pcr/seeks/logfile.patch
deleted file mode 100644
index 9f4ab9b02..000000000
--- a/pcr/seeks/logfile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- config	2011-10-21 10:42:20.000000000 +0200
-+++ config.patch	2011-11-17 18:48:48.914516206 +0100
-@@ -193,7 +193,7 @@
- #
- #      No trailing "/", please.
- #
--logdir .
-+logdir /var/log/
- #
- #
- #  2.4. logfile
-@@ -239,7 +239,7 @@
- #      Any log files must be writable by whatever user Seeks is
- #      being run as.
- #
--logfile logfile
-+logfile seeks.log
- #
- #
- # 2.5. plugindir
-@@ -377,7 +377,7 @@
- #      Unset. This means the db is located in $HOME/.seeks/seeks_user.db 
- #      as default location.
- #
--# user-db-file /path/to/file.db
-+user-db-file /var/lib/seeks/seeks.db
- #
- #  2.10. user-db-address
- #  =====================
diff --git a/pcr/seeks/seeks b/pcr/seeks/seeks
deleted file mode 100755
index 01f34a432..000000000
--- a/pcr/seeks/seeks
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-daemon_name="seeks"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name $SEEKS_ARGS 2> /dev/null 
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/pcr/seeks/seeks.conf.d b/pcr/seeks/seeks.conf.d
deleted file mode 100644
index c28382aca..000000000
--- a/pcr/seeks/seeks.conf.d
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Arguments to be passed to the Seeks daemon
-#
-
-# User 
-SEEKS_USER="seeks"
-# Config file (default if empty)
-SEEKS_CONFIG=""
-# Args 
-SEEKS_ARGS=""
-
diff --git a/pcr/seeks/seeks.install b/pcr/seeks/seeks.install
deleted file mode 100644
index bf9849e78..000000000
--- a/pcr/seeks/seeks.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    getent group seeks  >/dev/null || groupadd -r seeks
-    getent passwd seeks >/dev/null || useradd -r -c "Seeks daemon" -g seeks -M -d /var/lib/seeks -s /bin/false seeks
-    passwd -l seeks &>/dev/null
-    chown seeks:seeks var/log/seeks var/lib/seeks
-}
-
-pre_remove() {
-    getent passwd seeks &>/dev/null && userdel seeks >/dev/null
-    getent group seeks &>/dev/null && groupdel seeks >/dev/null
-    return 0
-}
diff --git a/pcr/seeks/seeks.logrotate b/pcr/seeks/seeks.logrotate
deleted file mode 100644
index 98b411884..000000000
--- a/pcr/seeks/seeks.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/seeks/logfile {
-    missingok
-    notifempty
-    size 30k
-    create
-}
diff --git a/pcr/seeks/seeks.rc.d b/pcr/seeks/seeks.rc.d
deleted file mode 100644
index 67de9251a..000000000
--- a/pcr/seeks/seeks.rc.d
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/seeks
-
-PIDFILE="/var/run/seeks.pid"
-
-if [[ -f $PIDFILE ]]; then
-  read -r PID < "$PIDFILE"
-
-  # prevent stale pidfiles from hanging around
-  if [[ ! -d /proc/$PID ]]; then
-    echo 'pid not found. deleteing stale pidfile'
-    unset PID
-    rm -f "$PIDFILE"
-  fi
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting Seeks"
-    if [[ $PID ]]; then
-      stat_fail
-      exit 1
-    fi
-    if /usr/bin/seeks --daemon --pidfile "$PIDFILE" --user $SEEKS_USER $SEEKS_ARGS $SEEKS_CONFIG 2>&1 > /dev/null; then
-      add_daemon seeks
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Seeks"
-    if [[ ! $PID ]]; then
-      stat_fail
-      exit 1
-    fi
-    if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then
-      rm_daemon seeks
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-
diff --git a/pcr/seeks/seeksdaemon b/pcr/seeks/seeksdaemon
deleted file mode 100644
index 551197d28..000000000
--- a/pcr/seeks/seeksdaemon
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/seeks
-
-PID=`pidof -o %PPID /usr/bin/seeks`
-
-case "$1" in
-  start)
-    stat_busy "Starting seeks daemon"
-    [ -z "$PID" ] && /usr/bin/seeks $SEEKS_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon seeks
-      stat_done
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping seeks daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null 
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon seeks
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done 
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-
-esac
-exit 0
-
diff --git a/pcr/send-to-torrent/PKGBUILD b/pcr/send-to-torrent/PKGBUILD
deleted file mode 100644
index 110ba0b1a..000000000
--- a/pcr/send-to-torrent/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=send-to-torrent
-pkgver=0.0.3
-pkgrel=1
-pkgdesc="Share files from the file browser"
-arch=('any')
-url="http://repo.hackcoop.com.ar/send-to-torrent.git/"
-license=("AGPL3")
-source=("http://repo.hackcoop.com.ar/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.xz")
-md5sums=('e9d465ebec3abd1e142731f53adf8cf2')
-depends=("bash" "mktorrent" "xdg-utils")
-optdepends=("libnotify: desktop notifications"
-            "transmission-cli: transmission support"
-            "opentracker: local sharing support")
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/"
-
-  make TARGET="${pkgdir}" PREFIX="/usr" install
-}
diff --git a/pcr/setbfree/PKGBUILD b/pcr/setbfree/PKGBUILD
deleted file mode 100644
index c17511f47..000000000
--- a/pcr/setbfree/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-
-pkgname=setbfree
-pkgver=0.7.3
-pkgrel=1
-pkgdesc="A DSP Tonewheel Organ emulator."
-arch=(i686 x86_64)
-url="http://setbfree.org/"
-license=('GPL')
-depends=('jack' 'liblo' 'tk' 'desktop-file-utils')
-makedepends=('lv2')
-install="$pkgname.install"
-source=("https://github.com/pantherb/setBfree/tarball/v$pkgver"
-        "https://raw.github.com/pantherb/setBfree/master/debian/setbfree.desktop")
-md5sums=('8b7b077dfb784927c7103948083e1f04'
-         '8c2a863562f26856dcff0a456cf36dcf')
-
-build() {
-  cd "$srcdir/pantherb"*
-  make PREFIX=/usr
-}
-
-package() {
-  cd "$srcdir/pantherb"*
-  make DESTDIR="$pkgdir/" PREFIX=/usr install
-
-  # desktop file
-  install -Dm644 ../$pkgname.desktop \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-
-  # icon
-  install -Dm644 doc/setBfree.png \
-    "$pkgdir/usr/share/icons/setBfree.png"
-
-  # man
-  install -d "$pkgdir/usr/share/man/man1"
-  install -Dm644 doc/*.1 \
-    "$pkgdir/usr/share/man/man1"
-
-  # docs
-  install -d "$pkgdir/usr/share/doc/$pkgname"
-  install -Dm644 doc/{midi.txt,signal_flow.png} \
-    "$pkgdir/usr/share/doc/$pkgname"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/setuptools_darcs/PKGBUILD b/pcr/setuptools_darcs/PKGBUILD
deleted file mode 100644
index 285214db8..000000000
--- a/pcr/setuptools_darcs/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Peter Simons <simons@cryp.to>
-# Contributor: Nicolas Pouillard <nicolas.pouillard@gmail.com>
-pkgname=setuptools_darcs
-pkgver=1.2.11
-pkgrel=3.1
-pkgdesc="Python setuptools plugin for darcs"
-arch=('any')
-url='http://pypi.python.org/pypi/setuptools_darcs'
-license=('BSD')
-depends=('python2' 'setuptools')
-makedepends=('darcsver')
-source=( http://pypi.python.org/packages/source/s/$pkgname/$pkgname-$pkgver.tar.gz )
-md5sums=('79451a8e77b9692861a655e53df094f0')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py build
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py test
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py install --root="$pkgdir"
-  install -Dm644 PKG-INFO $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/pcr/shflags/PKGBUILD b/pcr/shflags/PKGBUILD
deleted file mode 100644
index c4f3ee7a9..000000000
--- a/pcr/shflags/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-#Maintainer max_meyer
-pkgname=shflags
-pkgver=1.0.3
-pkgrel=1
-pkgdesc="Shell Flags (shFlags) is a library written to greatly simplify the handling of command-line flags"
-arch=(any)
-url="http://code.google.com/p/shflags/"
-license=('LGPL')
-depends=(sh)
-provides=(shflags)
-optdepends=(bash zsh dash ksh)
-options=(zipman)
-source=(http://shflags.googlecode.com/files/$pkgname-$pkgver.tgz{,.sig})
-md5sums=('b4d7133696ec05b71b27d8df5e278f0f'
-         'SKIP')
-
-package() {
-  src="$srcdir/$pkgname-$pkgver/src/"
-  dst="$pkgdir/usr/share/lib/shflags"
-  mkdir -p "$dst" 
-
-  if [ -f "$src/shflags" ]; then
-      cp "$src/shflags" "$dst/shflags.sh"
-  else
-      msg "Warning shflags not found"
-      exit 1
-  fi
-
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/shocco/PKGBUILD b/pcr/shocco/PKGBUILD
deleted file mode 100644
index 32baa6d2d..000000000
--- a/pcr/shocco/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname="shocco"
-pkgver=1.0
-pkgdesc="Docco-like documentation generator for POSIX shell"
-url="http://rtomayko.github.com/shocco/"
-license=('custom:MIT')
-
-pkgrel=1
-arch=('any')
-depends=('markdown' 'python2-pygments')
-optdepends=('ronn: builds man pages')
-
-source=("libre://$pkgname-$pkgver.tar.gz")
-md5sums=('edaed31d14a2c16e6303c07e24e7bc9a')
-
-mksource=("git://github.com/rtomayko/shocco.git#tag=${pkgver}")
-mkmd5sums=('SKIP')
-
-build() {
-  cd "$srcdir/$pkgname"
-  ./configure --prefix="$pkgdir"/usr
-  make -j1
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  make -j1 install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/pcr/sic/PKGBUILD b/pcr/sic/PKGBUILD
deleted file mode 100644
index b006f95b5..000000000
--- a/pcr/sic/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Dag Odenhall <dag.odenhall@gmail.com>
-# Contributor: Giorgio Lando <patroclo7@gmail.com>
-
-pkgname=sic
-pkgver=1.2
-pkgrel=1
-pkgdesc='An extremely simple IRC client.'
-license=('MIT')
-arch=('i686' 'x86_64')
-url='http://tools.suckless.org/sic'
-depends=('glibc')
-source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz")
-
-prepare() {
-  cd $pkgname-$pkgver
-  sed -i "s/CFLAGS = /CFLAGS = ${CFLAGS} /" config.mk
-}
-build() {
-  cd $pkgname-$pkgver
-
-  make PREFIX=/usr MANPREFIX=/usr/share/man
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make PREFIX=/usr MANPREFIX=/usr/share/man DESTDIR="$pkgdir" install
-
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
-sha1sums=('a91a603d536ae9cff9a806d6b2737053d262e722')
-sha256sums=('ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185')
diff --git a/pcr/sigil/PKGBUILD b/pcr/sigil/PKGBUILD
deleted file mode 100644
index 0d5802ac1..000000000
--- a/pcr/sigil/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 59836 2011-11-30 22:56:23Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
-# Contributor: Jorge Araya Navarro <jorgean@lavabit.com>
-
-pkgname=sigil
-pkgver=0.7.2
-pkgrel=1
-pkgdesc="A WYSIWYG ebook editor"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/sigil/"
-license=('GPL3')
-depends=('qt5-base' 'qt5-svg' 'qt5-webkit' 'qt5-xmlpatterns' 'qt5-tools')
-makedepends=('cmake')
-provides=('sigil')
-conflicts=('sigil')
-install=sigil.install
-source=("http://sigil.googlecode.com/files/Sigil-0.7.2-Code.zip"
-	"sigil.desktop")
-
-build() {
-    cd ${srcdir}
-    mkdir build
-    cd build
-    cmake -G "Unix Makefiles" \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
-	-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_SKIP_RPATH=ON ..
-
-    make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make install DESTDIR="${pkgdir}"
-
-  install -d -m 0755 "${pkgdir}"/usr/share/applications
-  install -m 0644 "${srcdir}"/sigil.desktop "${pkgdir}"/usr/share/applications
-
-  for _pic in 16 32 48 128 256; do
-      install -D -m 0644 ../src/Sigil/Resource_Files/icon/app_icon_${_pic}.png \
-	  "${pkgdir}"/usr/share/icons/hicolor/${_pic}x${_pic}/apps/sigil.png
-  done
-}
-sha256sums=('8a6f5fd7c59fd8524ce0f48e7d13d13bad137053c9071fe2e1653ea55d5ed940'
-            '92a1014794dbf81fa997449338ded9a0e84593e3552020eb9269039b916bea36')
diff --git a/pcr/sigil/sigil.desktop b/pcr/sigil/sigil.desktop
deleted file mode 100755
index cdb4ce1b2..000000000
--- a/pcr/sigil/sigil.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Sigil
-Comment=WYSIWYG ebook editor
-TryExec=sigil
-Exec=sigil %F
-Icon=sigil
-Terminal=false
-StartupNotify=false
-Categories=Application;Office;
-MimeType=application/epub+zip;
diff --git a/pcr/sigil/sigil.install b/pcr/sigil/sigil.install
deleted file mode 100644
index ec506fa93..000000000
--- a/pcr/sigil/sigil.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/pcr/sineshaper/PKGBUILD b/pcr/sineshaper/PKGBUILD
deleted file mode 100644
index 61560a770..000000000
--- a/pcr/sineshaper/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer : Guest One <theguestone at gmail dot com>
-# patch taken from https://aur.archlinux.org/packages/sineshaper/
-pkgname=sineshaper
-pkgver=0.4.2
-pkgrel=1
-pkgdesc="A monophonic DSSI synth plugin."
-arch=('i686')
-url="http://www.student.nada.kth.se/~d00-llu/music_dssi.php?lang=en"
-license=('GPL')
-depends=('libglademm' 'dssi')
-makedepends=('ladspa')
-source=("http://ll-plugins.sourceforge.net/release/$pkgname-$pkgver.tar.gz" gcc-4.3.patch)
-md5sums=('952cb5bde0ae4fe2274859df5ed1ee61'
-         '78c44bb7b1586917224f26aaa9545e9e')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # gcc 4.3 patch
-  patch -Np1 -i "$srcdir/${source[1]}"
-
-  # DSO link fix
-  LDFLAGS+="-lgthread-2.0" \
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-
-  # rename launcher
-  mv "$pkgdir/usr/bin/$pkgname.sh" \
-     "$pkgdir/usr/bin/$pkgname"
-}
diff --git a/pcr/sineshaper/gcc-4.3.patch b/pcr/sineshaper/gcc-4.3.patch
deleted file mode 100644
index c62220608..000000000
--- a/pcr/sineshaper/gcc-4.3.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -aur sineshaper-0.4.2/src/common/dssiplugin.hpp sineshaper-0.4.2-patched/src/common/dssiplugin.hpp
---- sineshaper-0.4.2/src/common/dssiplugin.hpp	2005-10-29 01:14:08.000000000 +0200
-+++ sineshaper-0.4.2-patched/src/common/dssiplugin.hpp	2009-01-29 15:19:40.000000000 +0100
-@@ -25,6 +25,7 @@
- #define DSSIPLUGIN_HPP
- 
- #include <unistd.h>
-+#include <cstdlib>
- 
- #include <cstring>
- #include <string>
-diff -aur sineshaper-0.4.2/src/common/dssiuiclient.hpp sineshaper-0.4.2-patched/src/common/dssiuiclient.hpp
---- sineshaper-0.4.2/src/common/dssiuiclient.hpp	2005-10-29 01:14:08.000000000 +0200
-+++ sineshaper-0.4.2-patched/src/common/dssiuiclient.hpp	2009-01-29 15:19:48.000000000 +0100
-@@ -99,13 +99,13 @@
-   // Host to UI
-   /** This signal is emitted when the host sends a new control value.
-       The parameters are the control port number and the new control value. */
--  signal<void, int, float> control_received;
-+  sigc::signal<void, int, float> control_received;
-   /** Emitted when the host sends a program change. The parameters are the 
-       bank and program numbers. */
--  signal<void, int, int> program_received;
-+  sigc::signal<void, int, int> program_received;
-   /** Emitted when the host sends a configuration value. The parameters are
-       the configuration key and the configuration value. */
--  signal<void, const string, const string> configure_received;
-+  sigc::signal<void, const string, const string> configure_received;
-   /** Emitted when the host wants the UI to be visible. A DSSI GUI should not
-       show any windows until this signal is emitted. */
-   Dispatcher show_received;
-@@ -134,7 +134,7 @@
-   void* allocate_shared_memory(int bytes);
-   
-   /** Emitted when the plugin has attached to the shared memory segment. */
--  signal<void> plugin_attached;
-+  sigc::signal<void> plugin_attached;
-   
-   /** Returns true if the plugin has attached to the shared memory segment. */
-   bool plugin_has_attached();
-diff -aur sineshaper-0.4.2/src/sineshaper/sineshapergui.hpp sineshaper-0.4.2-patched/src/sineshaper/sineshapergui.hpp
---- sineshaper-0.4.2/src/sineshaper/sineshapergui.hpp	2005-10-29 01:14:08.000000000 +0200
-+++ sineshaper-0.4.2-patched/src/sineshaper/sineshapergui.hpp	2009-01-29 15:20:31.000000000 +0100
-@@ -31,11 +31,11 @@
-   void program_selected(int bank, int program);
-   
-   /** This signal is emitted when the user selects a program in the GUI. */
--  signal<void, unsigned long, unsigned long> signal_select_program;
-+  sigc::signal<void, unsigned long, unsigned long> signal_select_program;
-   
-   /** This signal is emitted when the user has edited the programs and 
-       the plugin needs to reload the file with the user presets. */
--  signal<void> signal_programs_changed;
-+  sigc::signal<void> signal_programs_changed;
-   
- protected:
-   
diff --git a/pcr/sipwitch/PKGBUILD b/pcr/sipwitch/PKGBUILD
deleted file mode 100644
index fbaf88141..000000000
--- a/pcr/sipwitch/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Dan Serban
-# Contributors: David Zaragoza, Andrea Scarpino
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgname=sipwitch
-pkgver=1.2.4
-pkgrel=2
-pkgdesc="A call and registration server for the SIP protocol"
-arch=(i686 x86_64 mips64el)
-url=http://www.gnutelephony.org/index.php/GNU_SIP_Witch
-license=(GPL)
-depends=(libexosip2 ucommon)
-makedepends=(lynx)
-options=('!libtool')
-source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('6119cecb062ba4d0af18b427b01c41e2')
-
-build()
-{
-  cd "${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package()
-{
-  cd "${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  mkdir -p "${pkgdir}"/etc/rc.d
-  touch "${pkgdir}"/etc/rc.d/"${pkgname}"
-}
-
diff --git a/pcr/sltv/PKGBUILD b/pcr/sltv/PKGBUILD
deleted file mode 100644
index 0669c5110..000000000
--- a/pcr/sltv/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: farid abdelnour <farid at archlinux-br.org>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Contributor: Wille Marcel <wille at wille.blog.br>
- 
-pkgname=sltv
-pkgver=0.91
-pkgrel=1
-pkgdesc="An audio and video streamer that receives streams from several sources (V4L2, Firewire, ALSA, Pulseaudio, files...) and sends a stream using Icecast or to files (Vorbis+Theora)."
-arch=('any')
-url="http://sltv.holoscopio.com"
-license=('GPL')
-depends=('pygtk' 'python2-configobj' 'gstreamer0.10-python' 'gstreamer-hplugins' 'gstreamer0.10-bad' 'gstreamer0.10-good' 'gstreamer0.10-ffmpeg' 'python2' 'gstreamer0.10' 'gstreamer0.10-base' )
-install="$pkgname.install"
-source=("http://sltv.holoscopio.com/$pkgname-$pkgver.tar.gz")
-md5sums=(b5f9b2d7102ca0a4068ebe1783699764)
- 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
- 
-  # Python2 fix
-  sed -i "s#python#python2#" src/sltv.in
- 
-  ./configure --prefix=/usr
-  make
-}
- 
-package() {
- 
-  cd "$srcdir/$pkgname-$pkgver"
- 
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/sltv/PKGBUILD.new b/pcr/sltv/PKGBUILD.new
deleted file mode 100644
index 9a3f6b6a8..000000000
--- a/pcr/sltv/PKGBUILD.new
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: farid abdelnour <farid at archlinux-br.org>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Contributor: Wille Marcel <wille at wille.blog.br>
- 
-pkgname=sltv
-pkgver=0.92
-pkgrel=1
-pkgdesc="An audio and video streamer that receives streams from several sources (V4L2, Firewire, ALSA, Pulseaudio, files...) and sends a stream using Icecast or to files (Vorbis+Theora)."
-arch=('any')
-url="http://sltv.holoscopio.com"
-license=('GPL')
-depends=('pygtk' 'python2-configobj' 'gstreamer0.10-python' 'gstreamer-hplugins' 'gstreamer0.10-bad' 'gstreamer0.10-good' 'gstreamer0.10-ffmpeg' 'python2' 'gstreamer0.10' 'gstreamer0.10-base' )
-install="$pkgname.install"
-source=("http://sltv.holoscopio.com/$pkgname-$pkgver.tar.gz")
-md5sums=(a1dc9a09b29b817e74f87d673aff2310)
- 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
- 
-  # Python2 fix
-  sed -i "s#python#python2#" src/landell.in
- 
-  ./configure --prefix=/usr
-  make
-}
- 
-package() {
- 
-  cd "$srcdir/$pkgname-$pkgver"
- 
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/sltv/sltv.install b/pcr/sltv/sltv.install
deleted file mode 100644
index 16b4ff953..000000000
--- a/pcr/sltv/sltv.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
- 
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/pcr/snort/PKGBUILD b/pcr/snort/PKGBUILD
deleted file mode 100644
index c8a49678f..000000000
--- a/pcr/snort/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
-# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-# Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=snort
-pkgver=2.9.3.1
-pkgrel=1.1
-pkgdesc='A lightweight network intrusion detection system.'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.snort.org'
-license=('GPL')
-depends=('libdaq' 'libdnet' 'libpcap' 'pcre' 'zlib')
-makedepends=('ca-certificates')
-backup=('etc/conf.d/snort'
-        'etc/snort/snort.conf'
-        'etc/snort/threshold.conf'
-        'etc/snort/confreference.config'
-        'etc/snort/classification.config')
-options=('!makeflags' '!libtool')
-install='snort.install'
-source=("http://www.snort.org/dl/snort-current/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        'snort'
-        'snort.conf.d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc/snort --with-libpcap-includes=/usr/include/pcap \
-              --without-mysql --without-postgresql --without-oracle --without-odbc --enable-zlib \
-              --enable-ipv6
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  mkdir -p "${pkgdir}/"{etc/rc.d,etc/snort/rules}
-
-  install -d -m755 "${pkgdir}/var/log/snort"
-  install -D -m644 etc/{*.conf*,*.map} "${pkgdir}/etc/snort/"
-  install -D -m644 "${srcdir}/snort.conf.d" "${pkgdir}/etc/conf.d/snort"
-  install -D -m755 "${srcdir}/snort" "${pkgdir}/etc/rc.d/snort"
-
-  sed -i 's#/usr/local/lib/#/usr/lib/#' "${pkgdir}/etc/snort/snort.conf"
-}
-md5sums=('b2102605a7ca023ad6a2429821061c29'
-         'SKIP'
-         '361b8b9e40b9af0164f6b3e3da2e8277'
-         'b4fb8a68490589cd34df93de7609bfac')
diff --git a/pcr/snort/snort b/pcr/snort/snort
deleted file mode 100644
index 5dfa72fbf..000000000
--- a/pcr/snort/snort
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/snort ] && . /etc/conf.d/snort
-
-PID=`pidof -o %PPID /usr/bin/snort`
-case "$1" in
-  start)
-    stat_busy "Starting Intrusion Database System: SNORT"
-    [ -z "$PID" ] && /usr/bin/snort ${SNORT_OPTIONS} -u ${USER} -g ${GROUP} \
-                    -i ${INTERFACE} -c ${SNORT_CONF}
-	 if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon snort
-      stat_done
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Intrusion Database System: SNORT"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon snort
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/pcr/snort/snort.conf.d b/pcr/snort/snort.conf.d
deleted file mode 100644
index 86b566abc..000000000
--- a/pcr/snort/snort.conf.d
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Parameters to be passed to snort
-#
-
-# options taken from Fedora
-# http://cvs.fedoraproject.org/viewcvs/devel/snort/sysconfig.snort?rev=1.2&view=markup
-
-# Where is the snort.conf file.
-SNORT_CONF="/etc/snort/snort.conf"
-
-# What user account should we run under.
-USER="snort"
-
-# What group account should we run under. 
-GROUP="snort"
-
-# define the interface we listen on
-INTERFACE="eth0"
-
-# If you are using prelude, delete the '-A fast' option
-SNORT_OPTIONS="-A fast -b -l /var/log/snort -D -p"
diff --git a/pcr/snort/snort.install b/pcr/snort/snort.install
deleted file mode 100644
index 673f22c6c..000000000
--- a/pcr/snort/snort.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-  getent group snort >/dev/null || usr/sbin/groupadd -g 29 snort
-  getent passwd snort >/dev/null || usr/sbin/useradd -c 'Snort user' -u 29 -g snort -d /var/log/snort -s /bin/false snort
-  usr/bin/passwd -l snort &>/dev/null
-
-  [ -f var/log/snort/alert ] || : >var/log/snort/alert
-  chown snort.snort var/log/snort/ -R
-
-cat << _EOF  
-
->>> You have to edit the HOME_NET variable in the /etc/snort/snort.conf file to reflect your local network.
->>> If you do not change it, snort may not work.
-
-_EOF
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/userdel snort &>/dev/null
-  usr/sbin/groupdel snort &>/dev/null
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/sobby/PKGBUILD b/pcr/sobby/PKGBUILD
deleted file mode 100644
index 892d88cee..000000000
--- a/pcr/sobby/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Thomas Jost <schnouki@schnouki.net>
-pkgname=sobby
-pkgver=0.4.8
-pkgrel=2
-pkgdesc="Standalone obby server"
-url="http://gobby.0x539.de/trac/"
-license="GPL"
-depends=('obby=0.4.8' 'libxml++')
-makedepends=('pkgconfig' 'net6>=1.3.12')
-arch=('i686' 'x86_64' 'mips64el')
-source=(http://releases.0x539.de/sobby/sobby-$pkgver.tar.gz{,.sig})
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
-md5sums=('1f7cf8c09cdeddbf2152843b28f73ce1'
-         '96822427ab95289ebb1520e6353c5d3c')
diff --git a/pcr/softhsm/PKGBUILD b/pcr/softhsm/PKGBUILD
deleted file mode 100644
index f3fbcecaf..000000000
--- a/pcr/softhsm/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Javier Torres <javitonino [at] gmail [dot] com>
-
-pkgname=softhsm
-pkgver=1.3.4
-pkgrel=1
-pkgdesc="Software PKCS11 store"
-arch=('i686' 'x86_64')
-url="http://www.opendnssec.org/softhsm/"
-license=('custom' 'BSD')
-depends=('botan' 'sqlite3')
-backup=("etc/softhsm.conf")
-source=("http://www.opendnssec.org/files/source/${pkgname}-${pkgver}.tar.gz"{,.sig})
-sha1sums=('f09b6828776bcf9fef1dd46cfa7a495da01c7747'
-          'SKIP')
-sha256sums=('f10319dfa651023dad3d0845d284ec08ef982c1fc1bdb55cf8a725f762961e97'
-            'SKIP')
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # /usr/lib/softhsm -> /usr/bin (no subdirectory)
-  sed -i \
-  -e "s/full_libdir=\"\$full_libdir\/softhsm\"/#full_libdir=\"\$full_libdir\/softhsm\"/" \
-  -e "s/libdir=\$full_libdir/#libdir=\$full_libdir/" \
-  configure
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --sbindir=/usr/bin \
-              --datarootdir=/usr/share \
-              --localstatedir=/var/lib \
-              --sysconfdir=/etc \
-              --with-botan=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}/" install
-
-  install -Dm0644 "LICENSE" \
-        "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/pcr/spacenav-daemon/PKGBUILD b/pcr/spacenav-daemon/PKGBUILD
deleted file mode 100644
index fb1229ae4..000000000
--- a/pcr/spacenav-daemon/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=spacenav-daemon
-_pkgname=${pkgname%-daemon}
-pkgver=0.5
-pkgrel=3
-pkgdesc="Free Spacenav Daemon is a free alternative to the 3Dconnexion device driver, for their 3D input devices."
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-conflicts=${_pkgname}d
-replaces=${_pkgname}d
-url=http://$_pkgname.sourceforge.net/
-license=GPL2
-depends=libx11
-backup=etc/spnavrc
-source=(
-  http://downloads.sourceforge.net/$_pkgname/${_pkgname}d-$pkgver.tar.gz
-  $_pkgname.service
-  spnavrc
-)
-sha512sums=(
-  908f598e4ba5febbc1191cc32cd444817acd40c22e79b1f139c50787e1e25d4cd8328dc3fd6d9dde09bb80232b52f0e75ae429fb3345eb51fbe5a47577b038e2
-  61397646f7dda23b2cef5168f23e21c017801f156374c7fab7bae650cd3cee0ea173d3cb65ae2f0be580aa399999a388df2d804b9d00c01db430c820dbc60160
-  f97866a77fe9e6bee8df046ad62576a1cdbba26323218cd6336de66e0898f403bb33da12666fe75f00bb9bf078f895e8e7de360196079f83082fc94a23f71728
-)
-
-build() {
-  cd $srcdir/${_pkgname}d-$pkgver
-  ./configure --prefix=$pkgdir/usr
-  make
-}
-
-package() {
-  cd $srcdir/${_pkgname}d-$pkgver
-  make DESTDIR=$pkgdir install
-
-  install -Dm644 $srcdir/$_pkgname.service $pkgdir/usr/lib/systemd/system/$_pkgname.service
-  install -Dm644 $srcdir/spnavrc $pkgdir/etc/spnavrc
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/spacenav-daemon/spacenav.service b/pcr/spacenav-daemon/spacenav.service
deleted file mode 100644
index 30e8019e9..000000000
--- a/pcr/spacenav-daemon/spacenav.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Spacenavigator Daemon Service
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/spacenavd
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/pcr/spacenav-daemon/spnavrc b/pcr/spacenav-daemon/spnavrc
deleted file mode 100644
index 7d19ae03b..000000000
--- a/pcr/spacenav-daemon/spnavrc
+++ /dev/null
@@ -1,8 +0,0 @@
-# sensitivity is multiplied with every motion (1.0 normal).
-sensitivity = 1.000
-
-# dead zone; any motion less than this number, is discarded as noise.
-dead-zone = 2
-
-# disable led
-led = 0
diff --git a/pcr/spatialindex/LICENSE b/pcr/spatialindex/LICENSE
deleted file mode 100644
index 888f4e789..000000000
--- a/pcr/spatialindex/LICENSE
+++ /dev/null
@@ -1,9 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining acopy of this software and associated documentation files (the "Software"),to deal in the Software without restriction, including without limitationthe rights to use, copy, modify, merge, publish, distribute, sublicense,and/or sell copies of the Software, and to permit persons to whom theSoftware is furnished to do so, subject to the following conditions:The above copyright notice and this permission notice shall be included inall 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.
diff --git a/pcr/spatialindex/PKGBUILD b/pcr/spatialindex/PKGBUILD
deleted file mode 100644
index ac2e1122e..000000000
--- a/pcr/spatialindex/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Lantald  <lantald at Gmx dot com>
-pkgname=spatialindex
-pkgver=1.8.0
-pkgrel=1
-pkgdesc="An extensible framework that supports robust spatial indexing methods and sophisticated spatial queries."
-arch=('i686' 'x86_64')
-url="http://libspatialindex.github.com/"
-license=('MIT')
-depends=(gcc-libs)
-provides=(spatialindex)
-conflicts=(libspatialindex-git)
-source=("http://download.osgeo.org/libspatialindex/$pkgname-src-$pkgver.tar.gz"
-        'LICENSE')
-md5sums=('aa78e2c641c472df257f49cd140669c4'
-         '6a9a7d8158edbf1529ca46aae5a76752')
-
-build() {
-  cd "$srcdir/$pkgname-src-$pkgver/"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-src-$pkgver/"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-src-$pkgver/"
-  make DESTDIR="$pkgdir/" install
-  install -D -m644 ${srcdir}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/spectrum/PKGBUILD b/pcr/spectrum/PKGBUILD
deleted file mode 100644
index 250840fb7..000000000
--- a/pcr/spectrum/PKGBUILD
+++ /dev/null
@@ -1,81 +0,0 @@
-# Maintainer: Clément Démoulins <clement@archivel.fr>
-# Contributor: Sonny Piers <sonny.piers@gmail.com>
-# Contributor: Tim Besard <tim.besard@gmail.com>
-# Contributor: miniature <miniature@archlinux.us>
-
-pkgname=spectrum
-pkgver=1.4.8
-pkgrel=4
-pkgdesc="XMPP libpurple transport/gateway."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://spectrum.im"
-license=('GPL')
-depends=('gloox' 'libpurple-minimal' 'poco' 'python2' libev)
-replaces=('spectrum-git')
-makedepends=('cmake' 'gettext')
-optdepends=('mysql: MySQL database backend support'
-            'postgresql-libs: PostgreSQL database backend support'
-            'sqlite3: SQLite database backend support'
-            'libevent: support for libevent'
-            'imagemagick: support for avatars synchronization with legacy networks'
-
-            # Protocols plugins
-            'mbpurple-svn: microblogging services support like Twitter or identi.ca/StatusNet'
-            'msn-pecan: a different implementation of the MSN protocol for libpurple'
-            'pidgin-facebookchat: Facebook support, with more features than Facebook XMPP server'
-            'pidgin-sipe: SIPE protocol support'
-)
-backup=('etc/conf.d/spectrum')
-install='spectrum.install'
-
-source=('https://github.com/downloads/hanzz/libtransport/spectrum-1.4.8.tar.gz'
-        'logrotate.spectrum'
-        'gcc47.patch'
-        'spectrum@.service'
-        'spectrum.tmpfiles')
-md5sums=('edd88e1e70f86fe9aa4b43d787529a47'
-         '4f9cbfe3878fe5f4137d1bb5acc9e850'
-         '7a3de7e91d581b6c9119965ac34b9510'
-         '8abfd4926fec074847c4d28465af22bb'
-         '21dc715b3b2fb90c5349a12966277bc6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  msg "Starting make..."
-
-  sed -i -e 's/${PYTHON_EXECUTABLE}/python2/g' CMakeLists.txt
-  patch -p1 < ../gcc47.patch
-  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .
-  make
-
-  cd spectrumctl
-  python2 setup.py build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Various needed folders -- correct permissions are set in spectrum.install
-  install -d "${pkgdir}/etc/spectrum"
-  install -d "${pkgdir}/var/log/spectrum"
-  install -d "${pkgdir}/var/lib/spectrum"
-
-  # Install binaries and Python control script
-  make DESTDIR="${pkgdir}" install
-
-  cd spectrumctl
-  python2 setup.py install --root="${pkgdir}"
-
-  # Install initscript and logrotate config
-  install -Dm755 "${srcdir}/${pkgname}-${pkgver}/initscripts/archlinux/spectrum-rc.d"   "${pkgdir}/etc/rc.d/spectrum"
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/initscripts/archlinux/spectrum-conf.d" "${pkgdir}/etc/conf.d/spectrum"
-  install -Dm644 "${srcdir}/logrotate.spectrum"                                      "${pkgdir}/etc/logrotate.d/spectrum"
-
-  # Install systemd related files
-  install -Dm644 "${srcdir}/spectrum@.service" "${pkgdir}/usr/lib/systemd/system/spectrum@.service"
-  install -Dm644 "${srcdir}/spectrum.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/spectrum.conf"
-
-  # Patch to use python2
-  sed -i -e "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "${pkgdir}/usr/bin/spectrumctl"
-}
diff --git a/pcr/spectrum/gcc47.patch b/pcr/spectrum/gcc47.patch
deleted file mode 100644
index 82cc58677..000000000
--- a/pcr/spectrum/gcc47.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -rupN spectrum-1.4.8/src/configinterface.cpp spectrum-1.4.8_gcc47/src/configinterface.cpp
---- spectrum-1.4.8/src/configinterface.cpp	2011-06-11 15:17:44.000000000 +0200
-+++ spectrum-1.4.8_gcc47/src/configinterface.cpp	2012-04-14 18:27:14.000000000 +0200
-@@ -18,6 +18,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
-  */
- 
-+#include <unistd.h>
- #include "configinterface.h"
- #include "sys/un.h"
- #include "sys/socket.h"
-diff -rupN spectrum-1.4.8/src/spectrum_util.cpp spectrum-1.4.8_gcc47/src/spectrum_util.cpp
---- spectrum-1.4.8/src/spectrum_util.cpp	2011-06-11 15:17:44.000000000 +0200
-+++ spectrum-1.4.8_gcc47/src/spectrum_util.cpp	2012-04-14 18:26:33.000000000 +0200
-@@ -28,6 +28,7 @@
- #include "protocols/abstractprotocol.h"
- #include "transport.h"
- #include <sys/param.h>
-+#include <unistd.h>
- #ifdef BSD
- #include <sys/types.h>
- #include <sys/sysctl.h>
-diff -rupN spectrum-1.4.8/src/utf8/checked.h spectrum-1.4.8_gcc47/src/utf8/checked.h
---- spectrum-1.4.8/src/utf8/checked.h	2010-10-08 09:15:22.000000000 +0200
-+++ spectrum-1.4.8_gcc47/src/utf8/checked.h	2012-04-14 18:26:31.000000000 +0200
-@@ -65,6 +65,35 @@ namespace utf8
- 
-     /// The library API - functions intended to be called by the users
- 
-+    template <typename octet_iterator>
-+    octet_iterator append(uint32_t cp, octet_iterator result)
-+    {
-+        if (!internal::is_code_point_valid(cp))
-+            throw invalid_code_point(cp);
-+
-+        if (cp < 0x80)                        // one octet
-+            *(result++) = static_cast<uint8_t>(cp);
-+        else if (cp < 0x800) {                // two octets
-+            *(result++) = static_cast<uint8_t>((cp >> 6)            | 0xc0);
-+            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
-+        }
-+        else if (cp < 0x10000) {              // three octets
-+            *(result++) = static_cast<uint8_t>((cp >> 12)           | 0xe0);
-+            *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)     | 0x80);
-+            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
-+        }
-+        else if (cp <= internal::CODE_POINT_MAX) {      // four octets
-+            *(result++) = static_cast<uint8_t>((cp >> 18)           | 0xf0);
-+            *(result++) = static_cast<uint8_t>(((cp >> 12)& 0x3f)     | 0x80);
-+            *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)     | 0x80);
-+            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
-+        }
-+        else
-+            throw invalid_code_point(cp);
-+
-+        return result;
-+    }
-+
-     template <typename octet_iterator, typename output_iterator>
-     output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, uint32_t replacement)
-     {
-@@ -104,35 +133,6 @@ namespace utf8
-     }
- 
-     template <typename octet_iterator>
--    octet_iterator append(uint32_t cp, octet_iterator result)
--    {
--        if (!internal::is_code_point_valid(cp))
--            throw invalid_code_point(cp);
--
--        if (cp < 0x80)                        // one octet
--            *(result++) = static_cast<uint8_t>(cp);
--        else if (cp < 0x800) {                // two octets
--            *(result++) = static_cast<uint8_t>((cp >> 6)            | 0xc0);
--            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
--        }
--        else if (cp < 0x10000) {              // three octets
--            *(result++) = static_cast<uint8_t>((cp >> 12)           | 0xe0);
--            *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)     | 0x80);
--            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
--        }
--        else if (cp <= internal::CODE_POINT_MAX) {      // four octets
--            *(result++) = static_cast<uint8_t>((cp >> 18)           | 0xf0);
--            *(result++) = static_cast<uint8_t>(((cp >> 12)& 0x3f)     | 0x80);
--            *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)     | 0x80);
--            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
--        }
--        else
--            throw invalid_code_point(cp);
--
--        return result;
--    }
--
--    template <typename octet_iterator>
-     uint32_t next(octet_iterator& it, octet_iterator end)
-     {
-         uint32_t cp = 0;
diff --git a/pcr/spectrum/logrotate.spectrum b/pcr/spectrum/logrotate.spectrum
deleted file mode 100644
index ae52ff156..000000000
--- a/pcr/spectrum/logrotate.spectrum
+++ /dev/null
@@ -1,10 +0,0 @@
-/var/log/spectrum/*.log {
-   notifempty
-   missingok
-   sharedscripts
-   postrotate
-      for P in /var/run/spectrum/*.pid; do
-         /bin/kill -HUP `cat "$P" 2>/dev/null` 2>/dev/null || true
-      done
-   endscript
-}
diff --git a/pcr/spectrum/spectrum.install b/pcr/spectrum/spectrum.install
deleted file mode 100644
index d3e0449fc..000000000
--- a/pcr/spectrum/spectrum.install
+++ /dev/null
@@ -1,45 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-    if [ -z "`grep '^spectrum:' /etc/group`" ]; then
-        groupadd -g 417 spectrum
-    fi
-    if [ -z "`grep '^spectrum:' /etc/passwd`" ]; then
-        useradd -u 417 -d /etc/spectrum -g spectrum -s /bin/false spectrum
-    fi
-
-    chown spectrum:spectrum var/lib/spectrum
-    chown spectrum:spectrum var/log/spectrum
-
-cat << EOF
-
-==> Documentation: http://spectrum.im/
-
-==> You must now customize the configuration file located in /etc/spectrum/.  Copy and reconfigure for each seperate protocol.
-
-EOF
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-    post_install $1
-}
-
-# arg 1: the old package version
-post_remove() {
-    userdel spectrum
-
-    paths=(/etc/spectrum /var/lib/spectrum /var/log/spectrum)
-
-    first=true
-    for path in ${paths[@]}; do
-        if [ -d $path ]; then
-            if $first; then
-                first=false
-                echo "==> Leftover Paths:"
-            fi
-            echo "==> $path"
-        fi
-    done
-}
diff --git a/pcr/spectrum/spectrum.tmpfiles b/pcr/spectrum/spectrum.tmpfiles
deleted file mode 100644
index cabe97bc5..000000000
--- a/pcr/spectrum/spectrum.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/spectrum 0750 spectrum spectrum -
diff --git a/pcr/spectrum/spectrum@.service b/pcr/spectrum/spectrum@.service
deleted file mode 100644
index 8e1338543..000000000
--- a/pcr/spectrum/spectrum@.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Spectrum XMPP transport for %i
-After=network.service prosody.service ejabberd.service
-
-[Service]
-Type=forking
-PIDFile=/run/spectrum/%i.pid
-ExecStart=/usr/bin/spectrumctl --su=spectrum -c /etc/spectrum/%i.cfg start
-ExecStop=/usr/binspectrumctl --su=spectrum -c /etc/spectrum/%i.cfg stop
-ExecReload=/usr/binspectrumctl --su=spectrum -c /etc/spectrum/%i.cfg reload
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/pcr/spice-gtk3/PKGBUILD b/pcr/spice-gtk3/PKGBUILD
deleted file mode 100644
index 903b9b56b..000000000
--- a/pcr/spice-gtk3/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Stefano Facchini <stefano.facchini@gmail.com>
-# Contributor: Jonathan Lestrelin <zanko@daemontux.org>
-# Derived from the spice-gtk PKGBUILD by
-# Contributor: Lucio Zara <pennega@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=spice-gtk3
-_pkgname=spice-gtk
-pkgver=0.14
-pkgrel=1
-pkgdesc="A Gtk client and libraries for SPICE remote desktop servers (gtk3 version)."
-arch=('x86_64' 'i686')
-url="http://spice-space.org"
-license=('GPL')
-makedepends=('intltool' 'vala' 'python2-pyparsing')
-depends=('libpulse' 'gtk3' 'spice' 'libusb' 'usbredir')
-conflicts=('spice-gtk')
-options=('!libtool')
-source=("http://www.spice-space.org/download/gtk/$_pkgname-$pkgver.tar.bz2")
-sha256sums=('a16fa27364541493b886cc943f72c8f96ec251083af0a29d405a2c4f490274f5')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  sed -i 's,/usr/bin/env python,/usr/bin/python2,' spice-common/spice_codegen.py
-
-  ./configure --prefix=/usr \
-              --with-gtk=3.0 \
-              --enable-vala \
-              --enable-smartcard=no
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/spice-protocol/PKGBUILD b/pcr/spice-protocol/PKGBUILD
deleted file mode 100644
index 03c122275..000000000
--- a/pcr/spice-protocol/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: Parabola GNU / Linux-libre <aurelien@cwb.io>
-     
-    pkgname=spice-protocol
-    pkgver=0.12.2
-    pkgrel=1
-    pkgdesc="SPICE protocol"
-    arch=('x86_64' 'i686')
-    url="http://spice-space.org"
-    license=('GPL')
-    makedepends=(python2-pyparsing)
-    depends=(pixman celt cegui alsa-utils libxrandr libxinerama libsasl 
-libcacard)
-
-    source=(http://spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2)     
-    
-    build() {
-      cd "$srcdir/$pkgname-$pkgver"
-      sed -i 's,/usr/bin/env python,/usr/bin/python2,' spice-common/spice_codegen.py
-      PYTHON=python2 \
-      ./configure --prefix=/usr \
-            --enable-gui \
-            --enable-opengl \
-      --enable-smartcard \
-    #       --enable-tunnel
-      make
-    }
-     
-    package() {
-      cd "$srcdir/$pkgname-$pkgver"
-     
-      make DESTDIR="$pkgdir/" install
-    }
-     
-    # vim:set ts=2 sw=2 et:
-md5sums=('8bab5b67a00ec8429334963d361692ab')
-md5sums=('8bab5b67a00ec8429334963d361692ab')
diff --git a/pcr/spice/PKGBUILD b/pcr/spice/PKGBUILD
deleted file mode 100644
index d54f1657d..000000000
--- a/pcr/spice/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Lucio Zara <pennega@gmail.com>
-# Contributor: Jameson Pugh <imntreal@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io>
-     
-    pkgname=spice
-    pkgver=0.12.0
-    pkgrel=1
-    pkgdesc="SPICE client and server"
-    arch=('x86_64' 'i686')
-    url="http://spice-space.org"
-    license=('GPL')
-    makedepends=(python2-pyparsing)
-    depends=(pixman celt cegui alsa-utils libxrandr libxinerama libsasl 
-libcacard )
-
-    source=(http://spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2)
-    md5sums=('12c6ea4938215f8f9f10d2925f7bec9b')     
-    
-    build() {
-      cd "$srcdir/$pkgname-$pkgver"
-      sed -i 's,/usr/bin/env python,/usr/bin/python2,' spice-common/spice_codegen.py
-      PYTHON=python2 \
-      ./configure --prefix=/usr \
-            --enable-gui \
-            --enable-opengl \
-      --enable-smartcard \
-    #       --enable-tunnel
-      make
-    }
-     
-    package() {
-      cd "$srcdir/$pkgname-$pkgver"
-     
-      make DESTDIR="$pkgdir/" install
-    }
-     
-    # vim:set ts=2 sw=2 et:
-
diff --git a/pcr/spnavcfg/PKGBUILD b/pcr/spnavcfg/PKGBUILD
deleted file mode 100644
index cbea06d01..000000000
--- a/pcr/spnavcfg/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor: Jan Hambrecht <jaham at gmx dot net>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=spnavcfg
-pkgver=0.2.1
-pkgrel=1
-pkgdesc='A libre version of 3Dconnexion'\''s 3D input device drivers configuration'
-arch=(i686 x86_64 mips64el)
-url=http://spacenav.sourceforge.net/
-license=(GPL)
-depends=(gtk2)
-source=(http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz)
-sha512sums=(8cda7e8c9c2aa0875c6cf19e96ec47b9492acdcb110e9845f278ede44bee733876a56e2aa2d1198f54d8fecb978fcfe0a61e8f7b7fe19c2754eceec957172e34)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i -e 's/$(LDFLAGS)/$(LDFLAGS) -lX11/' Makefile.in
-  ./configure --prefix=$pkgdir/usr
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-}
diff --git a/pcr/sqlcipher/PKGBUILD b/pcr/sqlcipher/PKGBUILD
deleted file mode 100644
index 45a3efbe9..000000000
--- a/pcr/sqlcipher/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-pkgname=sqlcipher
-pkgver=2.2.1
-pkgrel=1
-pkgdesc="SQLite extension that provides transparent 256-bit AES encryption of database files"
-arch=('i686' 'x86_64')
-url="http://sqlcipher.net/"
-license=('BSD')
-makedepends=('tcl' 'openssl' 'sqlite3' 'git')
-source=($pkgname-$pkgver::git+https://github.com/sqlcipher/sqlcipher#tag=v${pkgver})
-sha1sums=('SKIP')
-sha256sums=('SKIP')
-
-pkgver() {
-  echo $pkgver
-}
-
-build() {
-	cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr \
-              --disable-tcl \
-              --enable-tempstore=yes \
-              CFLAGS="$CFLAGS -DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto"
-    make
-}
-
-package() {
-	cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR="$pkgdir/" install
-  install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-} 
diff --git a/pcr/squirm/PKGBUILD b/pcr/squirm/PKGBUILD
deleted file mode 100644
index a1249c39d..000000000
--- a/pcr/squirm/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Spider.007 <archPackage@spider007.net>
-# Contributor: Spider.007 <archPackage@spider007.net>
-pkgname=squirm
-pkgver=1.26
-pkgrel=2
-pkgdesc="Fast & configurable proxy redirector"
-url="http://squirm.foote.com.au/"
-source=("$url/$pkgname-$pkgver.tgz")
-md5sums=('54ac1d208620ec1e4419f97315d38848')
-license=('GPL2')
-arch=('i686' 'x86_64' 'mips64el')
-
-build() {
-	cd $srcdir/$pkgname-$pkgver
-
-	make PREFIX=/usr
-}
-
-package() {
-	cd $srcdir/$pkgname-$pkgver
-
-# make install uses a weird prefix
-    install -d $pkgdir/etc/squirm $pkgdir/var/log/squirm
-    install -Dm755 squirm $pkgdir/usr/bin/squirm
-    install -m644 squirm.conf.dist $pkgdir/etc/squirm/squirm.conf
-    install -m644 squirm.patterns.dist $pkgdir/etc/squirm/squirm.patterns
-
-# use absolute path files
-    sed -e "s,logs,/var/log/squirm,g" \
-        -e "s,pattern ,& /etc/squirm/,g" \
-        -i $pkgdir/etc/squirm/squirm.conf
-}
diff --git a/pcr/startupmanager/PKGBUILD b/pcr/startupmanager/PKGBUILD
deleted file mode 100644
index 4b33f36a9..000000000
--- a/pcr/startupmanager/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Chris Giles <Chris.G.27 (at) Gmail.com>
-# Contributor: fernando < arch at liquuid dot net>
-# Contributor: Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar>
-# Maintainer : Parabola GNU / Linux-libre Aur�lien Desbri�res <aurelien@cwb.io>
-
-pkgname=startupmanager
-pkgver=1.9.13
-pkgrel=4
-pkgdesc="GUI app for changing the settings of GRUB, GRUB2, Usplash and Splashy"
-arch=("any")
-url="http://sourceforge.net/projects/startup-manager/"
-license=("MIT")
-depends=("gnome-python" "imagemagick" "yelp" "python2" "xorg-xrandr>=1.3.3")
-makedepends=("intltool" "setconf")
-source=("http://downloads.sourceforge.net/sourceforge/startup-manager/${pkgname}_${pkgver}.tar.gz")
-sha1sums=('b82a65ac6ec488ca7fe16fd3ea277cd15a3627c6')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Make the startup script use python2
-  echo "#!/usr/bin/env python2" > pyfix
-  tail -n +2 startupmanager >> pyfix
-  cat pyfix > startupmanager
-
-  # Change the grub2 detection to be Arch-friendly
-  setconf bootconfig/grub.py self.update_grub_command \'/sbin/grub-mkconfig\'
-  setconf bootconfig/grub.py self.grub_install_command \'/sbin/grub-install\'
-
-  # TIP: bug-workaround: If you have problems with resolution-detection when starting
-  # startupmanager, try changing line 159 in /usr/lib/python2.7/site-packages/bootconfig/utils.py to:
-  #
-  # try:
-  #     return matches.group(1) + 'x' + matches.group(2)
-  # except:
-  #     return "640x480"
-  # 
-  # Where "640x480" is just an example (but should make it work)
-
-  python2 setup.py install --prefix="$pkgdir/usr/"
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/steadyflow/PKGBUILD b/pcr/steadyflow/PKGBUILD
deleted file mode 100644
index a9381448e..000000000
--- a/pcr/steadyflow/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer:  M0Rf30
-# Contributor: Dan Serban
-# Contributor: zbito <ztokarczyk at gmail dot com
-
-pkgname=steadyflow
-pkgver=0.2.0
-pkgrel=3
-pkgdesc="A download manager that aims for minimalism, ease of use, and a 
-clean, malleable codebase"
-arch=('i686' 'x86_64')
-url=https://launchpad.net/steadyflow
-license=('GPL3')
-install=steadyflow.install 
-depends=('desktop-file-utils' 'glib2' 'gtk3' 'gvfs' 'libgee' 'libnotify' 
-'libunique' 'libgee06')
-makedepends=('cmake' 'vala')
-conflicts=('steadyflow-bzr')
-source=(http://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.xz https://launchpadlibrarian.net/55910801/steadyflow-64px.png)
-md5sums=('16b9907c1d681e7f0a861f066d4fda0e' 'bbe025886f071ebfffa5fed350cced0c')
-
-build() {
-  cd $pkgname-$pkgver
-  cmake -DCMAKE_INSTALL_PREFIX='/usr' -DCOMPILE_GSETTINGS_ON_INSTALL=NO -DWANT_AYATANA=NO
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make install DESTDIR="$pkgdir"
-  mkdir -p "$pkgdir"/usr/share/pixmaps
-  cp "$srcdir"/steadyflow-64px.png "$pkgdir"/usr/share/pixmaps/steadyflow.png
-}
-
diff --git a/pcr/steadyflow/steadyflow.install b/pcr/steadyflow/steadyflow.install
deleted file mode 100644
index 01434bc04..000000000
--- a/pcr/steadyflow/steadyflow.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install()
-{
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade()
-{
-  post_install $1
-}
-
-post_remove()
-{
-  post_install $1
-}
-
diff --git a/pcr/stow/PKGBUILD b/pcr/stow/PKGBUILD
deleted file mode 100644
index a3024b7e9..000000000
--- a/pcr/stow/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=stow
-pkgver=2.2.0
-pkgrel=1
-pkgdesc="A program for managing the installation of software packages, keeping them separate while making them appear to be installed in the same place."
-arch=(any)
-url="https://www.gnu.org/software/$pkgname/"
-license=('GPL2')
-depends=('perl>=5.6.1')
-source=(https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
-md5sums=('902564d502975f353d3b0514a21863b1')
diff --git a/pcr/strongswan/CHANGELOG b/pcr/strongswan/CHANGELOG
deleted file mode 100644
index a798a08c4..000000000
--- a/pcr/strongswan/CHANGELOG
+++ /dev/null
@@ -1,20 +0,0 @@
-strongswan-5.0.4
-----------------
-
-- Fixed a security vulnerability in the openssl plugin which was reported by
-  Kevin Wojtysiak. The vulnerability has been registered as CVE-2013-2944.
-  Before the fix, if the openssl plugin's ECDSA signature verification was used,
-  due to a misinterpretation of the error code returned by the OpenSSL
-  ECDSA_verify() function, an empty or zeroed signature was accepted as a
-  legitimate one.
-
-- The handling of a couple of other non-security relevant openssl return codes
-  was fixed as well.
-
-- The tnc_ifmap plugin now publishes virtual IPv4 and IPv6 addresses via its
-  TCG TNC IF-MAP 2.1 interface.
-
-- The charon.initiator_only option causes charon to ignore IKE initiation
-  requests.
-
-- The openssl plugin can now use the openssl-fips library.
diff --git a/pcr/strongswan/PKGBUILD b/pcr/strongswan/PKGBUILD
deleted file mode 100644
index eebb804fa..000000000
--- a/pcr/strongswan/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Contributor: nikicat <develniks at gmail dot com>
-# Contributor: danilo <gezuru at gmail dot com>
-# Contributor: Jason Begley <jayray at digitalgoat dot com>
-# Contributor: Ray Kohler <ataraxia937 at gmail dot com>
-# Contributor: Daniel Riedemann <daniel.riedemann [at] googlemail [dot] com>
-# Contributor: 458italia <svenskaparadox [at] gmail dot com>
-# Maintainer: dkorzhevin <dkorzhevin at gmail dot com>
-
-pkgname=strongswan
-pkgver=5.1.0
-pkgrel=2
-pkgdesc="open source IPsec implementation"
-url='http://www.strongswan.org'
-license=("GPL")
-arch=('i686' 'x86_64' 'mips64el')
-depends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite')
-conflicts=('openswan')
-options=(!libtool)
-backup=(etc/ipsec.conf etc/strongswan.conf)
-source=(http://download.strongswan.org/${pkgname}-${pkgver}.tar.bz2 strongswan.rc::https://gist.github.com/raw/3106703/96d2ce9683f1e33ef14c679880ddc298e9673508/strongswan.rc)
-changelog='CHANGELOG'
-md5sums=('c1cd0a3ba9960f590cae28c8470800e8'
-         'cf815adef48a1ffee34517380c731277')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr \
-        --sbindir=/usr/bin \
-        --sysconfdir=/etc \
-        --libexecdir=/usr/lib \
-        --with-ipsecdir=/usr/lib/strongswan \
-        --enable-sqlite \
-        --enable-openssl --enable-curl \
-        --enable-sql --enable-attr-sql \
-        --enable-farp --enable-dhcp \
-        --enable-eap-sim --enable-eap-sim-file --enable-eap-simaka-pseudonym \
-        --enable-eap-simaka-reauth --enable-eap-identity --enable-eap-md5 \
-        --enable-eap-gtc --enable-eap-aka --enable-eap-aka-3gpp2 \
-        --enable-eap-mschapv2 --enable-eap-radius --enable-xauth-eap \
-        --enable-ha \
-        --disable-mysql --disable-ldap \
-        --enable-cmd
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install
-}
diff --git a/pcr/stumpwm-git/PKGBUILD b/pcr/stumpwm-git/PKGBUILD
deleted file mode 100644
index 986a8f740..000000000
--- a/pcr/stumpwm-git/PKGBUILD
+++ /dev/null
@@ -1,151 +0,0 @@
-# Contributor: M Rawash <mrawash@gmail.com>
-# Contributor: olvar <beren dot olvar (at) gmail dot com>
-# Contributor: Andrew Antle <andrew dot antle at gmail dot com>
-# Contributor: joyfulgirl <joyfulgirl (at) archlinux.us>
-# Contributor: Jonathan Friedman <jonf@gojon.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=stumpwm-git
-pkgver=20110924
-pkgrel=1
-pkgdesc="A tiling, keyboard-driven window manager written in common lisp"
-arch=('i686' 'x86_64')
-url="http://www.nongnu.org/stumpwm/"
-license=('GPL2')
-provides=('stumpwm')
-
-if pacman -Qq sbcl &>/dev/null; then
-    depends=('sbcl' 'clx' 'cl-ppcre')
-    _lisp=sbcl
-elif pacman -Qq clisp-new-clx &>/dev/null; then
-  # If somebody compiled this specially, chances are they want to use it
-  depends=('clisp-new-clx' 'cl-ppcre' 'cl-asdf')
-  _lisp=clisp
-  source=(http://common-lisp.net/project/asdf/asdf.lisp)
-  md5sums=('0f172cc814e11054c37c29fa2acfbfae')
-else
-  # No, this isn't redundant.  
-  depends=('sbcl' 'clx' 'cl-ppcre')
-  _lisp=sbcl
-fi
-
-makedepends=('git' 'texinfo' 'autoconf')
-optdepends=('emacs: Edit and eval stumpwm code with M-x stumpwm-mode'
-            'alsa-utils: Use contrib/amixer.lisp to control audio volume'
-            'aumix: Use contrib/aumix.lisp to control audio volume'
-            'mpd: Use contrib/mpd.lisp to control the mpd'
-            'surfraw: Use contrib/surfraw.lisp to surf the Internet')
-install=stumpwm.install
-options=(!strip)  # Thanks to sidereus for pointing this out
-
-_gitroot="git://git.savannah.nongnu.org/stumpwm.git"
-_gitname="stumpwm"
-
-build() {
-  msg "Connecting to ${_gitroot}..."
-
-  if [ -d ${srcdir}/${_gitname} ] ; then
-    cd ${srcdir}/${_gitname} && git pull origin master
-  else
-    git clone $_gitroot
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf ${srcdir}/${_gitname}-build
-  cp -a ${srcdir}/${_gitname} ${srcdir}/${_gitname}-build
-  cd ${srcdir}/${_gitname}-build
-
-  autoconf
-  if [ "$_lisp" = "sbcl" ]; then
-
-    ./configure --prefix=/usr \
-                --with-lisp=$_lisp \
-                --with-ppcre=/usr/share/common-lisp/source/cl-ppcre
-
-    # this is necesary since the AUR packages do not modify the asdf's registry by default
-    _sbcl_bopt="sbcl_BUILDOPTS=--eval \"(require :asdf)\" \
-                --eval \"(pushnew #p\\\"/usr/share/common-lisp/systems/\\\" asdf:*central-registry* :test #'equal)\" \
-                --eval \"(asdf:operate 'asdf:load-op 'clx)\" \
-                --load ./make-image.lisp"
-    _sbcl_iopt="sbcl_INFOOPTS=--eval \"(require 'asdf)\" \
-                --eval \"(pushnew #p\\\"/usr/share/common-lisp/systems/\\\" asdf:*central-registry* :test #'equal)\" \
-                --eval \"(asdf:operate 'asdf:load-op 'clx)\" \
-                --eval \"(require 'stumpwm)\" \
-                --load ./manual.lisp \
-                --eval \"(progn (stumpwm::generate-manual) (sb-ext:quit))\""
-
-    make "$_sbcl_bopt" "$_sbcl_iopt"
-
-  elif [ "$_lisp" = "clisp" ]; then
-    _lisp_source=/usr/share/common-lisp/source/
-    _ppcre_source=${_lisp_source}cl-ppcre/
-    
-    # Sometimes there are no compiled versions of ppcre.
-    # in this case we need to compile and use our own, and then we install them
-    if [ ! -f ${_ppcre_source}/api.fas ]; then
-    
-      _own_fas=1
-
-      mkdir ${srcdir}/cl-ppcre_temp
-      mkdir ${srcdir}/cl-ppcre_temp/systems
-      mkdir ${srcdir}/cl-ppcre_temp/source
-      
-      export ASDF_OUTPUT_TRANSLATIONS="/usr/share/common-lisp/source/:${srcdir}/cl-ppcre_temp/source/"
-      # for compiling we use the asdf source we donwloaded
-      clisp -norc -K full -on-error exit \
-            -x "(require 'asdf '(\"${srcdir}/asdf.lisp\"))" \
-            -x "(pushnew #p\"/usr/share/common-lisp/systems/\" asdf:*central-registry* :test #'equal)" \
-            -x "(asdf:operate 'asdf:compile-op 'cl-ppcre)"
-      
-      # once we have cl-ppcre compiled we copy the necesary files to 
-      # this new location, and set the necessary options for make
-      cp $_ppcre_source/cl-ppcre.asd ${srcdir}/cl-ppcre_temp/source/cl-ppcre/
-      cp $_ppcre_source/*.lisp ${srcdir}/cl-ppcre_temp/source/cl-ppcre/
-      _ppcre_source=${srcdir}/cl-ppcre_temp/source/cl-ppcre/
-      
-      _clisp_bopt="clisp_BUILDOPTS=-K full -on-error exit \
-                  -x \"(require 'asdf '(\\\"asdf.lisp\\\"))\" \
-                  -x \"(pushnew \\\"${srcdir}/cl-ppcre_temp/systems/\\\" \
-                  asdf:*central-registry* \
-                  :test #'equal)\" \
-                  -x \"(load \\\"./make-image.lisp\\\")\""
-    fi
-
-    ./configure --prefix=/usr \
-	              --with-lisp=$_lisp \
-                --with-ppcre=$_ppcre_source
-      
-    if [ -z "$_clisp_bopt" ]; then
-		  make
-    else
-		  make "$_clisp_bopt"
-    fi  
-  fi
-      
-  make destdir=$pkgdir install
-
-  rm -f ${pkgdir}/usr/share/info/dir
-
-  # Installation of stumpish, the contributed lisp,
-  # and the emacs stumpwm mode.
-  install -m 755 ${srcdir}/${_gitname}-build/contrib/stumpish ${pkgdir}/usr/bin
-
-  install -Dm 644 sample-stumpwmrc.lisp ${pkgdir}/etc/stumpwmrc.sample
-  install -d ${pkgdir}/usr/share/${_gitname}
-  install -m 644 ${srcdir}/${_gitname}-build/contrib/*.lisp ${pkgdir}/usr/share/${_gitname}
-
-  install -Dm 644 ${srcdir}/${_gitname}-build/contrib/stumpwm-mode.el \
-    ${pkgdir}/usr/share/emacs/site-lisp/stumpwm-mode.el
-    
-
-  # if we had to compile our own fas files, then we need to install them too.
-  if [ "x$_own_fas" = "x1" ]; then
-    install -d ${pkgdir}/usr/share/common-lisp/source/cl-ppcre
-    install -m 644 ${srcdir}/cl-ppcre_temp/source/cl-ppcre/*.fas \
-      ${pkgdir}/usr/share/common-lisp/source/cl-ppcre/
-  fi
-}
-
-# vim:sw=2 ts=2 et si:
diff --git a/pcr/stumpwm-git/stumpwm.install b/pcr/stumpwm-git/stumpwm.install
deleted file mode 100644
index 3661fa6e3..000000000
--- a/pcr/stumpwm-git/stumpwm.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-    cd /usr/share/info
-    install-info stumpwm.info dir
-    cat << "EOM"
-    To load contrib/ modules, put the following line in your ~/.stumpwmrc:
-        (set-contrib-dir "/usr/share/stumpwm")
-EOM
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    cd /usr/share/info
-    install-info --remove stumpwm.info dir
-}
diff --git a/pcr/supermodel/PKGBUILD b/pcr/supermodel/PKGBUILD
deleted file mode 100644
index fd22bea59..000000000
--- a/pcr/supermodel/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Anton Shestakov <engored*ya.ru>
-
-pkgname=supermodel
-pkgver=0.2a
-pkgrel=1
-pkgdesc='A Sega Model 3 Arcade Emulator'
-arch=('i686' 'x86_64')
-url='http://www.supermodel3.com/'
-license=('GPL3')
-depends=('mesa' 'glu' 'sdl' 'zlib')
-install=supermodel.install
-source=('multiuser.patch' 'supermodel.sh' 
-        "http://www.supermodel3.com/Files/Supermodel_${pkgver}_Src.zip")
-md5sums=('a7cf136e412a0d927b099c15793b658d' 'ea8274c2a37acddd026fce9c831530cc'
-        'd22359fbe277fe8f6fe0a06524350fc1')
-
-MAKEFLAGS="-j1"
-
-build() {
-  cd "$srcdir/Supermodel_${pkgver}_Src"
-  sed -e "s/-Wall -O3/$CFLAGS/" -i 'Makefiles/Makefile.SDL.UNIX.GCC'
-  patch -p1 < ../multiuser.patch
-  make -f 'Makefiles/Makefile.SDL.UNIX.GCC'
-}
-
-package() {
-  cd "$srcdir/Supermodel_${pkgver}_Src"
-
-  install -Dm755 "$srcdir/supermodel.sh" "$pkgdir/usr/bin/supermodel"
-
-  install -Dm755 "bin/Supermodel" "$pkgdir/usr/share/supermodel/Supermodel"
-
-  install -Dm644 "Docs/LICENSE.txt" "$pkgdir/usr/share/licenses/supermodel/LICENSE"
-  install -Dm644 "Docs/README.txt" "$pkgdir/usr/share/doc/supermodel/README"
-
-  install -d "$pkgdir/usr/share/supermodel/Config"
-  install -m644 Config/* "$pkgdir/usr/share/supermodel/Config/"
-}
diff --git a/pcr/supermodel/multiuser.patch b/pcr/supermodel/multiuser.patch
deleted file mode 100644
index 9cb93e02c..000000000
--- a/pcr/supermodel/multiuser.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git a/Src/OSD/SDL/Main.cpp b/Src/OSD/SDL/Main.cpp
---- a/Src/OSD/SDL/Main.cpp
-+++ b/Src/OSD/SDL/Main.cpp
-@@ -307,7 +307,6 @@
-  Configuration file management and input settings.

- ******************************************************************************/

- 

--#define CONFIG_FILE_PATH	"Config/Supermodel.ini"

- #define CONFIG_FILE_COMMENT	";\n" \

- 							"; Supermodel Configuration File\n" \

- 							";\n"

-@@ -315,9 +314,13 @@
- // Create and configure inputs

- static bool ConfigureInputs(CInputs *Inputs, bool configure)

- {

-+	char		configFilePath[512];

-+	

-+	sprintf(configFilePath, "%s/.supermodel/supermodel.ini", getenv("HOME"));

-+	

- 	// Open and parse configuration file

- 	CINIFile INI;

--	INI.Open(CONFIG_FILE_PATH);	// doesn't matter if it exists or not, will get overwritten

-+	INI.Open(configFilePath);	// doesn't matter if it exists or not, will get overwritten

- 	INI.SetDefaultSectionName("Global");

- 	INI.Parse();

- 	

-@@ -338,9 +341,9 @@
- 			Inputs->WriteToINIFile(&INI, "Global");

- 		

- 			if (OKAY != INI.Write(CONFIG_FILE_COMMENT))

--				ErrorLog("Unable to save configuration to '%s'.", CONFIG_FILE_PATH);

-+				ErrorLog("Unable to save configuration to '%s'.", configFilePath);

- 			else

--				printf("Configuration successfully saved to '%s'.\n", CONFIG_FILE_PATH);

-+				printf("Configuration successfully saved to '%s'.\n", configFilePath);

- 		}

- 		else

- 			puts("Configuration aborted...");

-@@ -412,9 +415,13 @@
- // Read settings (from a specific section) from the config file

- static void ReadConfigFile(const char *section)

- {

-+	char		configFilePath[512];

-+	

-+	sprintf(configFilePath, "%s/.supermodel/supermodel.ini", getenv("HOME"));

-+	

- 	CINIFile	INI;	

- 	

--	INI.Open(CONFIG_FILE_PATH);

-+	INI.Open(configFilePath);

- 	INI.SetDefaultSectionName("Global");	// required to read settings not associated with a specific section

- 	INI.Parse();

- 	ApplySettings(&INI, section);

-@@ -498,10 +505,10 @@
- static void SaveState(CModel3 *Model3)

- {

- 	CBlockFile	SaveState;

--	char		filePath[24];

-+	char		filePath[512];

- 	int			fileVersion = STATE_FILE_VERSION;

- 	

--	sprintf(filePath, "Saves/%s.st%d", Model3->GetGameInfo()->id, saveSlot);

-+	sprintf(filePath, "%s/.supermodel/saves/%s.st%d", getenv("HOME"), Model3->GetGameInfo()->id, saveSlot);

- 	if (OKAY != SaveState.Create(filePath, "Supermodel Save State", "Supermodel Version " SUPERMODEL_VERSION))

- 	{

- 		ErrorLog("Unable to save state to '%s'.", filePath);

-@@ -522,11 +529,11 @@
- static void LoadState(CModel3 *Model3)

- {

- 	CBlockFile	SaveState;

--	char		filePath[24];

-+	char		filePath[512];

- 	int			fileVersion;

- 	

- 	// Generate file path

--	sprintf(filePath, "Saves/%s.st%d", Model3->GetGameInfo()->id, saveSlot);

-+	sprintf(filePath, "%s/.supermodel/saves/%s.st%d", getenv("HOME"), Model3->GetGameInfo()->id, saveSlot);

- 	

- 	// Open and check to make sure format is correct

- 	if (OKAY != SaveState.Load(filePath))

-@@ -558,10 +565,10 @@
- static void SaveNVRAM(CModel3 *Model3)

- {

- 	CBlockFile	NVRAM;

--	char		filePath[24];

-+	char		filePath[512];

- 	int			fileVersion = NVRAM_FILE_VERSION;

- 	

--	sprintf(filePath, "NVRAM/%s.nv", Model3->GetGameInfo()->id);

-+	sprintf(filePath, "%s/.supermodel/NVRAM/%s.nv", getenv("HOME"), Model3->GetGameInfo()->id);

- 	if (OKAY != NVRAM.Create(filePath, "Supermodel NVRAM State", "Supermodel Version " SUPERMODEL_VERSION))

- 	{

- 		ErrorLog("Unable to save NVRAM to '%s'. Make sure directory exists!", filePath);

-@@ -581,11 +588,11 @@
- static void LoadNVRAM(CModel3 *Model3)

- {

- 	CBlockFile	NVRAM;

--	char		filePath[24];

-+	char		filePath[512];

- 	int			fileVersion;

- 	

- 	// Generate file path

--	sprintf(filePath, "NVRAM/%s.nv", Model3->GetGameInfo()->id);

-+	sprintf(filePath, "%s/.supermodel/NVRAM/%s.nv", getenv("HOME"), Model3->GetGameInfo()->id);

- 	

- 	// Open and check to make sure format is correct

- 	if (OKAY != NVRAM.Load(filePath))

diff --git a/pcr/supermodel/supermodel.install b/pcr/supermodel/supermodel.install
deleted file mode 100644
index 94ef82c48..000000000
--- a/pcr/supermodel/supermodel.install
+++ /dev/null
@@ -1,12 +0,0 @@
-# Message displayed for a fresh install.
-post_install() { 
-  echo ""
-  echo "***************************************************************"
-  echo " Supermodel has been installed in /usr/share/supermodel."
-  echo " However, Supermodel can be run by typing supermodel and it's options:"
-  echo " supermodel <romset> [options]"
-  echo ""
-  echo " Note: You need to provide the full path to the romset."
-  echo "***************************************************************"
-  echo ""
-}
diff --git a/pcr/supermodel/supermodel.sh b/pcr/supermodel/supermodel.sh
deleted file mode 100644
index 992dd406d..000000000
--- a/pcr/supermodel/supermodel.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-mkdir -p ~/.supermodel/NVRAM
-mkdir -p ~/.supermodel/saves
-
-cd /usr/share/supermodel
-
-if [[ ! -f ~/.supermodel/supermodel.ini ]]; then
-    cp ./Config/Supermodel.ini ~/.supermodel/supermodel.ini
-fi
-
-./Supermodel "$@"
diff --git a/pcr/swig1/PKGBUILD b/pcr/swig1/PKGBUILD
deleted file mode 100644
index 4cb83afd2..000000000
--- a/pcr/swig1/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Hilton Medeiros <medeiros.hilton at gmail dot com>
-# Contributor: Jason Chu <jason@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=swig1
-_pkgname=swig
-pkgver=1.3.40
-pkgrel=1
-pkgdesc="A compiler that integrates C and C++ code with scripting languages (legacy version)"
-arch=('i686' 'x86_64')
-url="http://www.swig.org/"
-license=('custom')
-depends=('gcc-libs' 'zlib')
-conflicts=('swig' 'swig-pantheon')
-provides=('swig')
-source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
-
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/pcr/sword-svn/PKGBUILD b/pcr/sword-svn/PKGBUILD
deleted file mode 100644
index 8e29cdab8..000000000
--- a/pcr/sword-svn/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-pkgname=sword-svn
-pkgver=2793
-pkgrel=1
-pkgdesc="Libraries for Bible programs - svn -version"
-arch=('i686' 'x86_64')
-url="http://www.crosswire.org/sword/"
-license=('GPL')
-depends=('curl' 'clucene' 'swig')
-makedepends=('subversion')
-provides=('sword')
-conflicts=('sword')
-source=('sword::svn+https://www.crosswire.org/svn/sword/trunk/' 'automake.patch')
-md5sums=('SKIP' '24a4821088da78725b9374807d0d3508')
-options=('!makeflags')
-_svnmod=sword
-
-pkgver() {
-  cd $SRCDEST/${_svnmod}
-  svnversion
-}
-
-prepare() {
-  cd "$srcdir/$_svnmod"
-  patch -p1 < $srcdir/automake.patch
-}
-
-build() {
-  cd "$srcdir/$_svnmod"  
-  ./autogen.sh
-  CPPFLAGS+="-fpermissive" ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "$srcdir/$_svnmod"
-  make DESTDIR="$pkgdir/" install
-  make DESTDIR="$pkgdir/" install_config
-}
diff --git a/pcr/sword-svn/automake.patch b/pcr/sword-svn/automake.patch
deleted file mode 100644
index 3cfd5eb44..000000000
--- a/pcr/sword-svn/automake.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Naur sword.orig/configure.ac sword.new/configure.ac
---- sword.orig/configure.ac	2013-01-13 12:46:13.000000000 +0100
-+++ sword.new/configure.ac	2013-01-13 12:47:34.000000000 +0100
-@@ -13,7 +13,7 @@
- AC_CANONICAL_TARGET
- AM_INIT_AUTOMAKE
- 
--AM_CONFIG_HEADER(include/config.h)
-+AC_CONFIG_HEADERS(include/config.h)
- 
- AC_CONFIG_MACRO_DIR([m4])
- 
-diff -Naur sword.orig/examples/cmdline/Makefile.am sword.new/examples/cmdline/Makefile.am
---- sword.orig/examples/cmdline/Makefile.am	2013-01-13 12:46:13.000000000 +0100
-+++ sword.new/examples/cmdline/Makefile.am	2013-01-13 12:53:55.000000000 +0100
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = 1.6
--INCLUDES = -I $(top_srcdir)/include
-+AM_CPPFLAGS = -I $(top_srcdir)/include
- if USE_INTERNAL_REGEX
--INCLUDES += -I$(top_srcdir)/include/internal/regex
-+AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
- endif
- LDADD = $(top_builddir)/lib/libsword.la
- 
-diff -Naur sword.orig/tests/Makefile.am sword.new/tests/Makefile.am
---- sword.orig/tests/Makefile.am	2013-01-13 12:46:14.000000000 +0100
-+++ sword.new/tests/Makefile.am	2013-01-13 12:54:33.000000000 +0100
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = 1.6
--INCLUDES = -I $(top_srcdir)/include
-+AM_CPPFLAGS = -I $(top_srcdir)/include
- if USE_INTERNAL_REGEX
--INCLUDES += -I$(top_srcdir)/include/internal/regex
-+AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
- endif
- LDADD = $(top_builddir)/lib/libsword.la
- 
-diff -Naur sword.orig/utilities/Makefile.am sword.new/utilities/Makefile.am
---- sword.orig/utilities/Makefile.am	2013-01-13 12:46:13.000000000 +0100
-+++ sword.new/utilities/Makefile.am	2013-01-13 12:56:12.000000000 +0100
-@@ -1,8 +1,8 @@
- AUTOMAKE_OPTIONS = 1.6
- SUBDIRS = diatheke
--INCLUDES = -I $(top_srcdir)/include
-+AM_CPPFLAGS = -I $(top_srcdir)/include
- if USE_INTERNAL_REGEX
--INCLUDES += -I$(top_srcdir)/include/internal/regex
-+AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
- endif
- LDADD = $(top_builddir)/lib/libsword.la
- noinst_PROGRAMS = cipherraw lexdump \
diff --git a/pcr/sword/PKGBUILD b/pcr/sword/PKGBUILD
deleted file mode 100644
index 78ab4e646..000000000
--- a/pcr/sword/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Maintainer:
-# Contributor: Alexander Rødseth
-# Contributor: Andrea Scarpino
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: TripleE <eric1548@yahoo.com>
-# Contributor: Dominic Tubach
-
-pkgname=sword
-pkgver=1.6.2
-pkgrel=9
-pkgdesc="Library for Bible study programs"
-arch=('x86_64' 'i686')
-url="http://www.crosswire.org/sword/"
-license=('GPL')
-depends=('curl' 'clucene' 'swig')
-makedepends=('cmake')
-backup=('etc/sword.conf')
-source=("http://www.crosswire.org/ftpmirror/pub/$pkgname/source/v1.6/$pkgname-$pkgver.tar.gz"
-        "curl.patch"
-        "multimap.patch")
-sha256sums=('af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9'
-            '3c2676b6dc1d56b08b2532f46af32c54e91ea71ed92a5d7a30ee29ed7ff09124'
-            'ddcde54fbd9b29585c03565bff7891622cb2cc0a6381047d5f566987a7cb1b8c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -p1 -i ../curl.patch
-  patch -p1 -i ../multimap.patch
-
-  [[ -d ../build ]] || mkdir ../build
-  cd ../build
-
-  CXXFLAGS=-fpermissive cmake "../$pkgname-$pkgver" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DSWORD_GLOBAL_CONF_DIR=/etc
-  make
-}
-
-package() {
-  cd "$srcdir/build"
-
-  make DESTDIR="$pkgdir" install
-
-  install -d "$pkgdir/usr/lib/sword"
-  mv "$pkgdir"/usr/lib/${pkgver}_icu_* \
-    "$pkgdir/usr/lib/sword/"
-
-  cd "$srcdir/$pkgname-$pkgver/locales.d/"
-  for file in *.conf; do
-    install -Dm644 "$file" \
-      "$pkgdir/usr/share/sword/locales.d/$file"
-  done
-
-  cd ../include
-  install -d "$pkgdir/usr/include/sword"
-  install -Dm644 canon_{catholic{,2},synodalp}.h \
-    "$pkgdir/usr/include/sword"
-
-  cd ../samples
-  install -Dm644 mods.d/globals.conf \
-    "$pkgdir/usr/share/sword/mods.d/globals.conf"
-  install -Dm644 recommended/sword.conf \
-    "$pkgdir/etc/sword.conf"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/sword/curl.patch b/pcr/sword/curl.patch
deleted file mode 100644
index 63fd4433c..000000000
--- a/pcr/sword/curl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur sword-1.6.2.orig/src/mgr/curlftpt.cpp sword-1.6.2.new/src/mgr/curlftpt.cpp
---- sword-1.6.2.orig/src/mgr/curlftpt.cpp	2011-07-27 00:41:40.000000000 +0200
-+++ sword-1.6.2.new/src/mgr/curlftpt.cpp	2011-07-27 00:42:05.000000000 +0200
-@@ -26,7 +26,6 @@
- #include <fcntl.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- #include <swlog.h>
-diff -Naur sword-1.6.2.orig/src/mgr/curlhttpt.cpp sword-1.6.2.new/src/mgr/curlhttpt.cpp
---- sword-1.6.2.orig/src/mgr/curlhttpt.cpp	2011-07-27 00:41:40.000000000 +0200
-+++ sword-1.6.2.new/src/mgr/curlhttpt.cpp	2011-07-27 00:42:45.000000000 +0200
-@@ -25,7 +25,6 @@
- #include <cctype>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- #include <swlog.h>
diff --git a/pcr/sword/multimap.patch b/pcr/sword/multimap.patch
deleted file mode 100644
index 7957ab2d8..000000000
--- a/pcr/sword/multimap.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- sword-1.6.2/include/multimapwdef.h	2004-05-04 23:01:39.000000000 +0200
-+++ /usr/include/sword/multimapwdef.h	2012-06-02 13:37:47.816457345 +0200
-@@ -7,26 +7,26 @@
- 
- // multmap that still lets you use [] to reference FIRST
- // entry of a key if multiples exist
--template <class Key, class T, class Compare>
--class multimapwithdefault : public std::multimap<Key, T, Compare> {
-+template < class Key, class T, class Compare >
-+class multimapwithdefault : public std::multimap< Key, T, Compare > {
- public:
--	typedef std::pair<const Key, T> value_type;
-+	typedef std::pair< const Key, T > value_type;
- 	T& getWithDefault(const Key& k, const T& defaultValue) {
--		if (find(k) == this->end()) {
--			insert(value_type(k, defaultValue));
-+		if (this->find(k) == this->end()) {
-+			this->insert(value_type(k, defaultValue));
- 		}
- 		return (*(find(k))).second;
- 	}
- 
- 	T& operator[](const Key& k) {
--		if (find(k) == this->end()) {
--			insert(value_type(k, T()));
-+		if (this->find(k) == this->end()) {
-+			this->insert(value_type(k, T()));
- 		}
--		return (*(find(k))).second;
-+		return (*(this->find(k))).second;
- 	}
- 	bool has(const Key& k, const T &val) const {
--		typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k);
--		typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k);
-+		typename std::multimap< Key, T, Compare >::const_iterator start = this->lower_bound(k);
-+		typename std::multimap< Key, T, Compare >::const_iterator end = this->upper_bound(k);
- 		for (; start!=end; start++) {
- 			if (start->second == val)
- 				return true;
diff --git a/pcr/synthv1/PKGBUILD b/pcr/synthv1/PKGBUILD
deleted file mode 100644
index 2cce2ef0b..000000000
--- a/pcr/synthv1/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-
-pkgname=synthv1
-pkgver=0.3.4
-pkgrel=1
-pkgdesc="An old-school all-digital 4-oscillator subtractive polyphonic synthesizer with stereo fx"
-arch=(i686 x86_64)
-url="http://$pkgname.sourceforge.net/$pkgname-index.html"
-license=('GPL')
-groups=('lv2-plugins')
-depends=('jack' 'liblo' 'lv2' 'qt4' 'shared-mime-info')
-install="$pkgname.install"
-source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('63ca2f7961bbc708928d2f792e32d166')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # x86_64 lib path fix
-  sed -i "s/lib64/lib/" src/src_lv2.pro
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/synthv1/synthv1.install b/pcr/synthv1/synthv1.install
deleted file mode 100644
index ec1a84bbb..000000000
--- a/pcr/synthv1/synthv1.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  update-mime-database usr/share/mime
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/pcr/tahoe-lafs/PKGBUILD b/pcr/tahoe-lafs/PKGBUILD
deleted file mode 100644
index 8ace70679..000000000
--- a/pcr/tahoe-lafs/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Peter Simons <simons@cryp.to>
-# Contributor: Nicolas Pouillard <nicolas.pouillard@gmail.com>
-pkgname=tahoe-lafs
-pkgver=1.10.0
-pkgrel=1
-pkgdesc="a secure, decentralized, fault-tolerant filesystem"
-arch=('any')
-url='http://tahoe-lafs.org/'
-license=('GPL')
-# net-tools is needed because Tahoe-LAFS uses /sbin/ifconfig
-depends=('net-tools' 'python2' 'python2-zope-interface>=3.6.5'
-         'twisted' 'python2-pyasn1' 'python2-crypto' 'pycryptopp' 'nevow'
-         'python2-foolscap' 'python2-simplejson' 'zfec' 'python2-pyopenssl'
-         'pyutil' 'python2-argparse' 'zbase32' 'python2-mock>=0.8.0')
-source=(nodaemon.patch https://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-$pkgver.tar.bz2)
-sha256sums=('7fb13a50bdca729b9c78f12369e56fccf55594b646bddb270d55c08c83ce3449'
-            '9c5516700fe95fdf8c57eca1e2a7b4aebf2de9a4d327d50afd684ebf833ccfe2')
-
-build(){
-  cd "$srcdir/allmydata-tahoe-$pkgver"
-  patch -p0 < ../nodaemon.patch
-  python2 setup.py build
-  # disabled due to the nodaemon patch and the test_filesystem* tests
-  #python2 setup.py test || return 1
-}
-
-package(){
-  cd "$srcdir/allmydata-tahoe-$pkgver"
-  python2 setup.py install --root="$pkgdir"
-}
diff --git a/pcr/tahoe-lafs/nodaemon.patch b/pcr/tahoe-lafs/nodaemon.patch
deleted file mode 100644
index dfcc0b8ae..000000000
--- a/pcr/tahoe-lafs/nodaemon.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/allmydata/scripts/startstop_node.py	2011-10-30 22:54:34.000000000 +0100
-+++ src/allmydata/scripts/startstop_node.py	2011-11-10 15:22:21.432711365 +0100
-@@ -10,6 +10,7 @@
-     optFlags = [
-         ["profile", "p", "Run under the Python profiler, putting results in 'profiling_results.prof'."],
-         ["syslog", None, "Tell the node to log to syslog, not a file."],
-+        ["nodaemon", "n", "Do not daemonize."],
-         ]
- 
-     def getSynopsis(self):
-@@ -70,6 +71,8 @@
-         args.extend(["--logfile", os.path.join("logs", "twistd.log")])
-     if opts["profile"]:
-         args.extend(["--profile=profiling_results.prof", "--savestats",])
-+    if opts["nodaemon"]:
-+        args.extend(["--nodaemon", "--umask=0077"])
-     # now we're committed
-     os.chdir(basedir)
-     from twisted.scripts import twistd
diff --git a/pcr/tanglet/PKGBUILD b/pcr/tanglet/PKGBUILD
deleted file mode 100644
index a8114ba62..000000000
--- a/pcr/tanglet/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer (AUR): Graeme Gott <graeme@gottcode.org>
-# Maintainer: Alon Ivtsan <alonivtsan@lavabit.com>
-# Based on https://aur.archlinux.org/packages.php?ID=32311
-
-pkgname=tanglet
-pkgver=1.2.2
-pkgrel=1
-pkgdesc="A single player word finding game based on Boggle."
-arch=('i686' 'x86_64')
-url="http://gottcode.org/${pkgname}/"
-license=('GPL3')
-depends=('qt5-base')
-install=${pkgname}.install
-source=(http://gottcode.org/${pkgname}/${pkgname}-${pkgver}-src.tar.bz2)
-md5sums=('584e50d01323c0686ff094195eba4341')
-sha256sums=('c90d5c36b7e6cca54cdc001c7eecfb333795add16e6ae01f100026c61f4a84da')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  qmake-qt5 PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make INSTALL_ROOT="${pkgdir}/" install
-}
-
diff --git a/pcr/tanglet/tanglet.install b/pcr/tanglet/tanglet.install
deleted file mode 100644
index 81f2ba659..000000000
--- a/pcr/tanglet/tanglet.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/pcr/ted/PKGBUILD b/pcr/ted/PKGBUILD
deleted file mode 100644
index aa085dc62..000000000
--- a/pcr/ted/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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
deleted file mode 100644
index f98ba7338..000000000
--- a/pcr/ted/ted.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/pcr/textext/LICENSE.txt b/pcr/textext/LICENSE.txt
deleted file mode 100644
index 69f5d4720..000000000
--- a/pcr/textext/LICENSE.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2007-2008 Pauli Virtanen.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  a. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-  b. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-  c. Neither the name of the copyright holder nor the names of the contributors
-     may be used to endorse or promote products derived from this software
-     without specific prior written permission.
-
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/pcr/textext/PKGBUILD b/pcr/textext/PKGBUILD
deleted file mode 100644
index 8a1897dc4..000000000
--- a/pcr/textext/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor: Joel Schaerer <joel.schaerer@laposte.net>
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-pkgname=textext
-pkgver=0.4.4
-pkgrel=3
-pkgdesc="An inkscape extension which lets you add LaTeX equations to your drawings"
-arch=('i686' 'x86_64')
-license=('BSD')
-url="http://pav.iki.fi/software/textext/"
-depends=('inkscape' 'texlive-core' 'python2-lxml' 'pdf2svg')
-source=(http://pav.iki.fi/software/textext/$pkgname-$pkgver.tar.gz LICENSE.txt)
-md5sums=('5dbb18bf762565196f8ac1f68f8607e3'
-         '91da7de463147c1c78b1c2e6f24da380')
-build() {
-      cd "$srcdir"
-      install -Dm 644 LICENSE.txt \
-	"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
-      install -Dm 755 textext.py \
-	"${pkgdir}/usr/share/inkscape/extensions/textext.py"
-      install -Dm 644 textext.inx \
-	"${pkgdir}/usr/share/inkscape/extensions/textext.inx"
-    }
diff --git a/pcr/theide/PKGBUILD b/pcr/theide/PKGBUILD
deleted file mode 100644
index 26dc34f0f..000000000
--- a/pcr/theide/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# Contributor: Jan Dolinar <dolik.rce@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=theide
-pkgver=5485
-pkgrel=1
-pkgdesc="Modern IDE designed for developping large U++/C++ applications"
-arch=('i686' 'x86_64')
-url="http://www.ultimatepp.org"
-license=('BSD')
-groups=()
-depends=('gtk2' 'libnotify' 'desktop-file-utils')
-makedepends=()
-provides=('theide')
-conflicts=('theide')
-replaces=()
-backup=()
-options=(!makeflags emptydirs)
-install='theide.install'
-source=('http://downloads.sourceforge.net/project/upp/upp/'$pkgver'/upp-x11-src-'$pkgver'.tar.gz'
-        'http://upp-mirror.googlecode.com/svn-history/r'$pkgver'/trunk/uppbox/lpbuild2/mkfile'
-        'http://upp-mirror.googlecode.com/svn-history/r'$pkgver'/trunk/uppbox/lpbuild2/theide.1'
-        'http://upp-mirror.googlecode.com/svn-history/r'$pkgver'/trunk/uppbox/lpbuild2/umk.1'
-        'license.txt')
-noextract=()
-
-build() {
-  cd "$srcdir/upp-x11-src-$pkgver"
-  #build
-  echo "#define IDE_VERSION \"$pkgver-Arch-$(uname -m)\"" > "uppsrc/ide/version.h"
-  msg2 "Building $pkgname..."
-  make -f "$srcdir/mkfile" PKG=umk FLAGS="GCC" NESTS="uppsrc" TIME= COLOR=0 USEMAINCFG=0 JOBS=5 ECHO=0 TARGET="$srcdir/umk"
-  make -f "$srcdir/mkfile" PKG=ide FLAGS="GCC GUI" NESTS="uppsrc" TIME= COLOR=0 USEMAINCFG=0 JOBS=5 ECHO=0 TARGET="$srcdir/theide"
-}
-
-package(){
-  #license
-  install -D "$srcdir/license.txt" "$pkgdir/usr/share/licenses/$pkgname/license.txt"
-  #man pagess
-  install -D "$srcdir/theide.1" "$pkgdir/usr/share/man/man1/theide.1"
-  install -D "$srcdir/umk.1" "$pkgdir/usr/share/man/man1/umk.1"
-  #desktop entry
-  install -D "$srcdir/upp-x11-src-$pkgver/uppsrc/ide/theide.desktop" "$pkgdir/usr/share/applications/theide.desktop"
-  #icon
-  install -D "$srcdir/upp-x11-src-$pkgver/uppsrc/ide/theide-48.png" "$pkgdir/usr/share/pixmaps/theide.png"
-  #fix permissions
-  find "$pkgdir/usr/" -print0 | xargs -0 chown root:root
-  find "$pkgdir/usr/" -type f -print0 | xargs -0 chmod 644
-  find "$pkgdir/usr/" -type d -print0 | xargs -0 chmod 755
-  #install applications
-  install -D "$srcdir/umk" "$pkgdir/usr/bin/umk"
-  install -D "$srcdir/theide" "$pkgdir/usr/bin/theide"
-}
-
diff --git a/pcr/theide/license.txt b/pcr/theide/license.txt
deleted file mode 100644
index 6cea058a6..000000000
--- a/pcr/theide/license.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Copyright (C) 2010 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
- 
-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 of the Software and its Copyright notices. In addition publicly documented acknowledgment must be given that this software has been used if no source code of this software is made available publicly. This includes
-acknowledgments in either Copyright notices, Manuals, Publicity and Marketing documents or any documentation provided with any product containing this software. This License does not apply to any software that links to the libraries provided by this software (statically or dynamically), but only to
-the software provided.
- 
-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 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/theide/theide.install b/pcr/theide/theide.install
deleted file mode 100644
index 5e16c038a..000000000
--- a/pcr/theide/theide.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_install() {
-   update-desktop-database -q
-}
diff --git a/pcr/thinkfan/PKGBUILD b/pcr/thinkfan/PKGBUILD
deleted file mode 100644
index 18a97754f..000000000
--- a/pcr/thinkfan/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: nblock <nblock [/at\] archlinux DOT us>
-# Contributor: Frederik Alkærsig (FALKER) <havnelisten AT gmail.com>
-
-pkgname=thinkfan
-pkgver=0.8.1
-pkgrel=3
-pkgdesc="A minimalist fan control program. Supports the sysfs hwmon interface and thinkpad_acpi"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        "thinkfan" "thinkfan.service")
-url="http://thinkfan.sourceforge.net/"
-md5sums=('aaa6c88bab3b43756ac5a1638622828c'
-         '16fc3a83a1468e3ccaeba67e14ab2177'
-         '7639b82035fcee712753e05de6b0601d')
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make
-    install -D -m755 ${pkgname} ${pkgdir}/usr/sbin/${pkgname}
-    install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-    install -D -m644 README ${pkgdir}/usr/share/doc/${pkgname}/README
-    install -D -m644 ${srcdir}/thinkfan.service ${pkgdir}/usr/lib/systemd/system/thinkfan.service
-    cp -r examples ${pkgdir}/usr/share/doc/${pkgname}/
-}
-
-# vim:set ts=2 sw=2 noet:
diff --git a/pcr/thinkfan/thinkfan b/pcr/thinkfan/thinkfan
deleted file mode 100644
index d37c81424..000000000
--- a/pcr/thinkfan/thinkfan
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-test -f /usr/sbin/thinkfan || exit 0
-
-case "$1" in
-  start)
-    stat_busy "Starting thinkfan"
-    /usr/sbin/thinkfan -- -q -s5 >/dev/null 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon thinkfan
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping thinkfan"
-    PID=$(</var/run/thinkfan.pid)
-    kill $PID
-    rm -f /var/run/thinkfan.pid
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon thinkfan
-      stat_done
-    fi
-    ;;
-  restart)
-    stat_busy "Restarting thinkfan"
-
-    PID=$(</var/run/thinkfan.pid)
-    kill $PID
-    rm -f /var/run/thinkfan.pid
-    if [ $? -gt 0 ]; then
-      stat_fail
-      rm_daemon thinkfan
-    else
-    /usr/sbin/thinkfan -- -q -s5 >/dev/null 2>&1
-      if [ $? -gt 0 ]; then
-        stat_fail
-        rm_daemon thinkfan
-      else
-        stat_done
-      fi
-    fi
-    ;;
-  *)
-      echo "Usage: $0 {stop|start|restart}"
-    ;;
-esac
-exit 0
diff --git a/pcr/thinkfan/thinkfan.service b/pcr/thinkfan/thinkfan.service
deleted file mode 100644
index 7895b8d3a..000000000
--- a/pcr/thinkfan/thinkfan.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Thinkfan Daemon - simple and lightweight fan control program
-After=basic.target
-
-[Service]
-ExecStart=/usr/sbin/thinkfan -n -s5 -q
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/timekpr/Initializes_lastNotified_before_it_is_used.patch b/pcr/timekpr/Initializes_lastNotified_before_it_is_used.patch
deleted file mode 100644
index 870a2670a..000000000
--- a/pcr/timekpr/Initializes_lastNotified_before_it_is_used.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/timekpr-client.py	2011-04-15 13:17:59.000000000 +0200
-+++ b/timekpr-client.py	2011-04-15 13:19:06.000000000 +0200
-@@ -40,6 +40,7 @@
-         self.conffile = self.VAR['TIMEKPRDIR'] + '/' + self.username
-         self.limits, self.bfrom, self.bto = readusersettings(self.username, self.conffile)
-         self.timer = None
-+        self.lastNotified = datetime.datetime.fromtimestamp(0);
-         self.checkLimits()
-         #Add a gobject loop to check limits:
-         self.timer = gobject.timeout_add(self.checkInterval * 1000, self.checkLimits)
diff --git a/pcr/timekpr/PKGBUILD b/pcr/timekpr/PKGBUILD
deleted file mode 100644
index 4d2af3bfd..000000000
--- a/pcr/timekpr/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# Contributor: SanskritFritz (gmail)
-
-pkgname=timekpr
-pkgver=0.3.2
-pkgrel=9
-pkgdesc="Control the computer usage of your user accounts. You can limit their daily usage based on a timed access duration and configure periods of day when they can log in."
-arch=('i686' 'x86_64')
-url=https://launchpad.net/timekpr
-license=('GPL')
-depends=('python2')
-source=(http://launchpad.net/$pkgname/trunk/$pkgver/+download/${pkgname}_${pkgver}~ppa1~ubuntu2.tar.gz
-        timekprd.sh
-	timekpr.service
-	Initializes_lastNotified_before_it_is_used.patch)
-backup=('etc/timekpr.conf')
-install='timekpr.install'
-md5sums=('0626ee6b6b6d218dfdd6e79331f789a2'
-         'ab37e469034200c19b46a31d586bfe3e'
-         '9e88ee02b5b8cb6b5e0730e3847c4217'
-         '23848ef2578571d7dc4871fbd15f41ed')
-
-
-build() {
-	cd ${srcdir}/stable/gui/client
-	# https://bugs.launchpad.net/timekpr/+bug/761647
-	patch -p1 < ${srcdir}/Initializes_lastNotified_before_it_is_used.patch
-}
-
-package() {
-	install -dm755 $pkgdir/etc/{rc.d,timekpr,logrotate.d,xdg/autostart}
-	install -dm755 $pkgdir/usr/{bin,share/{doc/timekpr,timekpr,python-support/timekpr,pixmaps,applications,man/man8}}
-	install -dm755 $pkgdir/usr/share/locale/{da,de,fr,hu,nb,sv,fi}/LC_MESSAGES
-	install -dm755 $pkgdir/var/lib/timekpr
-
-	cd $srcdir/stable
-	install -m644 etc/timekpr.conf $pkgdir/etc/
-	install -m644 etc/logrotate.d/timekpr $pkgdir/etc/logrotate.d/
-	sed -i "s/python/python2/" timekpr
-	install -m755 timekpr $pkgdir/usr/bin/
-	sed -i "s/python/python2/" timekpr-gui
-	install -m755 timekpr-gui $pkgdir/usr/bin/
-	sed -i "s/python/python2/" timekpr-client
-	install -m755 timekpr-client $pkgdir/usr/bin/
-	install -m755 timekprpam.py $pkgdir/usr/share/python-support/timekpr/
-	install -m755 timekpr.py $pkgdir/usr/share/python-support/timekpr/
-	install -m755 timekpr-gui.py $pkgdir/usr/share/python-support/timekpr/
-	install -m755 gui/client/timekpr-client.py $pkgdir/usr/share/python-support/timekpr/
-	install -m755 timekprpam.py $pkgdir/usr/share/python-support/timekpr/
-	install -m755 timekprcommon.py $pkgdir/usr/share/python-support/timekpr/
-	install -m644 gui/padlock-green.png $pkgdir/usr/share/timekpr/
-	install -m644 gui/padlock-red.png $pkgdir/usr/share/timekpr/
-	install -m644 gui/timekpr.glade $pkgdir/usr/share/timekpr/
-	install -m644 gui/timekpr100x100.png $pkgdir/usr/share/timekpr/
-	install -m644 gui/timekpr32x32.png $pkgdir/usr/share/timekpr/
-	install -m644 gui/timekpr.xpm $pkgdir/usr/share/pixmaps/
-	install -m644 debian/timekpr.desktop $pkgdir/usr/share/applications/
-	install -m644 debian/timekpr-client.desktop $pkgdir/etc/xdg/autostart
-	install -m644 locale/da/LC_MESSAGES/timekpr.mo $pkgdir/usr/share/locale/da/LC_MESSAGES/
-	install -m644 locale/de/LC_MESSAGES/timekpr.mo $pkgdir/usr/share/locale/de/LC_MESSAGES/
-	install -m644 locale/fr/LC_MESSAGES/timekpr.mo $pkgdir/usr/share/locale/fr/LC_MESSAGES/
-	install -m644 locale/hu/LC_MESSAGES/timekpr.mo $pkgdir/usr/share/locale/hu/LC_MESSAGES/
-	install -m644 locale/nb/LC_MESSAGES/timekpr.mo $pkgdir/usr/share/locale/nb/LC_MESSAGES/
-	install -m644 locale/sv/LC_MESSAGES/timekpr.mo $pkgdir/usr/share/locale/sv/LC_MESSAGES/
-	install -m644 locale/fi/LC_MESSAGES/timekpr.mo $pkgdir/usr/share/locale/fi/LC_MESSAGES/
-	install -m644 TODO.txt $pkgdir/usr/share/doc/timekpr
-	install -m644 README.txt $pkgdir/usr/share/doc/timekpr
-	install -m644 COPYRIGHT.txt $pkgdir/usr/share/doc/timekpr
-	install -m644 CONTRIBUTORS.txt $pkgdir/usr/share/doc/timekpr
-	install -m644 debian/changelog $pkgdir/usr/share/doc/timekpr
-	install -m644 doc/timekpr.8 $pkgdir/usr/share/man/man8
-
-	install -m755 debian/timekpr.postrm $pkgdir/usr/bin/
-	install -m755 debian/timekpr.postinst $pkgdir/usr/bin/
-
-	cd $srcdir
-	install -m755 timekprd.sh $pkgdir/etc/rc.d/timekprd
-
-	install -Dm0644 "${srcdir}/timekpr.service" "${pkgdir}/usr/lib/systemd/system/timekpr.service"
-}
diff --git a/pcr/timekpr/timekpr.install b/pcr/timekpr/timekpr.install
deleted file mode 100644
index b01769c48..000000000
--- a/pcr/timekpr/timekpr.install
+++ /dev/null
@@ -1,24 +0,0 @@
-
-post_install() {
-	/usr/bin/timekpr.postinst
-
-	echo "Your su command (gksu|gksudo|kdesu|kdesudo etc) for starting timekpr-gui as root: "
-	read su_command;
-	sed -i "s/gksu/${su_command}/" "/usr/share/applications/timekpr.desktop"
-
-	echo
-	echo "Start the timekpr daemon with '/etc/rc.d/timekprd start'"
-	echo "For permanent use put 'timekprd' into your DAEMONS array."
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-	/usr/bin/timekpr.postrm purge
-}
-
-post_remove() {
-	echo "Remove the timekprd entry from your DAEMONS array."
-}
diff --git a/pcr/timekpr/timekpr.service b/pcr/timekpr/timekpr.service
deleted file mode 100644
index b3ea6e211..000000000
--- a/pcr/timekpr/timekpr.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Keep control of computer usage
-After=syslog.target systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/timekpr
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/timekpr/timekprd.sh b/pcr/timekpr/timekprd.sh
deleted file mode 100755
index 19e4a3af4..000000000
--- a/pcr/timekpr/timekprd.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -x -o %PPID /etc/rc.d/timekprd`
-case "$1" in
-  start)
-    stat_busy "Starting timekpr"
-    [ -z "$PID" ] && /usr/bin/timekpr &
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon timekprd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping timekpr"
-    [ ! -z "$PID" ] && killall --user root timekpr &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon timekprd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0			
diff --git a/pcr/timer_entropyd/PKGBUILD b/pcr/timer_entropyd/PKGBUILD
deleted file mode 100644
index 4d5f4437e..000000000
--- a/pcr/timer_entropyd/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: fauno <fauno@parabola.nu>
-pkgname=timer_entropyd
-pkgver=0.2
-pkgrel=1
-pkgdesc="Feeds the /dev/random device with entropy-data (random values) read from timers."
-arch=('i686')
-url="http://www.vanheusden.com/te/"
-license=('GPL2')
-groups=('entropy')
-source=(http://www.vanheusden.com/te/${pkgname}-${pkgver}.tgz
-        ${pkgname}.service)
-sha1sums=('61b82128bf4df483271a475a0cc772a7fd80a804'
-          '96ff193aef61088759cf9d9c9d0e881fd1174824')
-sha256sums=('0cf2b976b78c1b1169a4bec5a6fc71d8b118de927bc05002686376a61f73989a'
-            'a22d33d99ab7c511902a37225e83476466840bd4c0ee3ffece1e4094511414de')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-  install -D -m 755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
-  install -D -m 644 ${srcdir}/${pkgname}.service \
-                    ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-}
diff --git a/pcr/timer_entropyd/timer_entropyd.service b/pcr/timer_entropyd/timer_entropyd.service
deleted file mode 100644
index 0bea7398b..000000000
--- a/pcr/timer_entropyd/timer_entropyd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Gathering entropy from system timers
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/timer_entropyd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/tinc-pre/PKGBUILD b/pcr/tinc-pre/PKGBUILD
deleted file mode 100644
index ebbd4cc3f..000000000
--- a/pcr/tinc-pre/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-pkgname=tinc-pre
-pkgver=1.1pre7
-pkgrel=2
-pkgdesc="VPN (Virtual Private Network) daemon (Pre-release)"
-arch=(i686 x86_64)
-url="http://www.tinc-vpn.org/"
-license=('GPL')
-depends=('lzo2' 'zlib' 'openssl')
-optdepends=('wxpython: gui support')
-provides=('tinc-pre')
-conflicts=('tinc')
-source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig}
-        tincd@.service)
-
-build() {
-  cd "$srcdir/tinc-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
-  make
-}
-
-package() {
-  cd "$srcdir/tinc-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  install -dm755 "$pkgdir"/usr/share/tinc/examples
-  tar xozvf doc/sample-config.tar.gz -C $pkgdir/usr/share/tinc/examples
-  find "$pkgdir"/usr/share/tinc/examples -type f -exec chmod 644 {} +
-  find "$pkgdir"/usr/share/tinc/examples -type d -exec chmod 755 {} +
-
-  install -Dm644 "$srcdir/tincd@.service" \
-                 "$pkgdir/usr/lib/systemd/system/tincd@.service"
-
-  sed -e 's,#!/usr/bin/python,#!/usr/bin/python2,' \
-      -i $pkgdir/usr/bin/tinc-gui
-}
-sha1sums=('62a014356864c3a5204edd6e934f3ee575760cfc'
-          'SKIP'
-          '6ab485732bb6c59e7e0e162f22251a0f554ec69c')
-sha256sums=('ff330627ad0d6ce1233408bb75b11d7506be13eb0c802ff1657866d97545074b'
-            'SKIP'
-            '43d086b76e2a6ff6d91a2ace2d6d048fc7109fefecd5047ab6c437ba0e9252ed')
diff --git a/pcr/tinc-pre/tincd@.service b/pcr/tinc-pre/tincd@.service
deleted file mode 100644
index 069bf4570..000000000
--- a/pcr/tinc-pre/tincd@.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Tinc daemon for net %i
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/tincd -n %i
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/tokyotyrant/PKGBUILD b/pcr/tokyotyrant/PKGBUILD
deleted file mode 100644
index ea5c94e30..000000000
--- a/pcr/tokyotyrant/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# # Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Paul Sadauskas <psadauskas@gmail.com>
-
-pkgname=tokyotyrant
-pkgver=1.1.41
-pkgrel=3
-pkgdesc="Network interface to TokyoCabinet"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.fallabs.com"
-license=('LGPL')
-makedepends=('gcc>=3.1' 'make' 'pkgconfig')
-depends=('zlib' 'bzip2' 'tokyocabinet>=1.4.27')
-source=("http://fallabs.com/$pkgname/$pkgname-$pkgver.tar.gz"
-        "tokyotyrant.rc"
-        "tokyotyrant.conf")
-
-md5sums=('a47e58897bd1cbbac173d5a66cc32ae3'
-         '3ed9229c9cfb8e1b3055b814d5038799'
-         '2558846ece69d1f265ee1ba5728c39cd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr  
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="$pkgdir" install
-  install -m 644 -D ${srcdir}/tokyotyrant.conf $pkgdir/etc/conf.d/ttserver
-  install -m 755 -D ${srcdir}/tokyotyrant.rc $pkgdir/etc/rc.d/ttserver
-}
-
diff --git a/pcr/tokyotyrant/tokyotyrant.conf b/pcr/tokyotyrant/tokyotyrant.conf
deleted file mode 100644
index 77c299a81..000000000
--- a/pcr/tokyotyrant/tokyotyrant.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# /etc/conf.d/ttserver: config file for /etc/init.d/ttserver
-
-# TCP port TokyoTyrant server should listen on
-TYRANT_PORT="1978"
-
-# Location of the TokyoTyrant server database
-# Also put addional options here, eg, #bnum
-# See 'ttserver' man page
-TYRANT_DB="/var/lib/tokyotyrant/tokyotyrant.tch"
-
-# Location of the TokyoTyrant server log file
-TYRANT_LOG_FILE="/var/log/ttserver.log"
-
-# Location of the TokyoTyrant server PID file
-TYRANT_PID_FILE="/var/run/ttserver.pid"
-
-# Pass extra options to TokyoTyrant server
-# Example: TYRANT_EXTRA_OPTS="-ld" - enables logging of debug messages
-# See the 'ttserver' man page for more
-TYRANT_EXTRA_OPTS=""
-
diff --git a/pcr/tokyotyrant/tokyotyrant.rc b/pcr/tokyotyrant/tokyotyrant.rc
deleted file mode 100644
index eaecb0af0..000000000
--- a/pcr/tokyotyrant/tokyotyrant.rc
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# source config
-[ -f /etc/conf.d/ttserver ] && . /etc/conf.d/ttserver
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting TokyoTyrant Server"
-    /usr/bin/ttserver ${TYRANT_EXTRA_OPTS} -dmn -pid ${TYRANT_PID_FILE} -log ${TYRANT_LOG_FILE} -port ${TYRANT_PORT} ${TYRANT_DB}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ttserver
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping TokyoTyrant Server"
-    if [ -f $TYRANT_PID_FILE ]; then
-      pid=`cat "$TYRANT_PID_FILE"`
-      kill -TERM "$pid"
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        rm_daemon ttserver
-        stat_done
-      fi
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/pcr/toluapp/PKGBUILD b/pcr/toluapp/PKGBUILD
deleted file mode 100644
index fa8c841c6..000000000
--- a/pcr/toluapp/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Stéphane Gaudreault <stephane.gaudreault@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=toluapp
-pkgver=1.0.93
-pkgrel=5
-pkgdesc="Tool to integrate C/C++ code with Lua"
-url="http://www.codenix.com/~tolua"
-depends=('lua')
-makedepends=('scons')
-license=('MIT')
-arch=('i686' 'x86_64')
-source=(http://www.codenix.com/~tolua/tolua++-${pkgver}.tar.bz2 config_linux.py)
-md5sums=('100aa6907b8108582080b37d79c0afd7' 'f85232adfa873ea012088dd4d7fb63d7')
-
-build() {
-   cd "${srcdir}/tolua++-${pkgver}"
-   cp ../config_linux.py ${srcdir}/tolua++-${pkgver}
-
-   scons all
-}
-
-package() {
-   cd "${srcdir}/tolua++-${pkgver}"
-   scons prefix=${pkgdir}/usr install
-}
-md5sums=('100aa6907b8108582080b37d79c0afd7'
-         'f85232adfa873ea012088dd4d7fb63d7')
diff --git a/pcr/toluapp/config_linux.py b/pcr/toluapp/config_linux.py
deleted file mode 100755
index 0a5fbcfeb..000000000
--- a/pcr/toluapp/config_linux.py
+++ /dev/null
@@ -1,22 +0,0 @@
-## This is the linux configuration file
-# This file was adapted to be used with ArchLinux
-# Use 'scons -h' to see the list of command line options available
-
-# Compiler flags (based on ArchLinux's installation of lua)
-#LINKFLAGS = ['-g']
-CCFLAGS = ['-O2', '-ansi', '-Wall', '-fPIC']
-#CCFLAGS = ['-g']
-
-# this is the default directory for installation. Files will be installed on
-# <prefix>/bin, <prefix>/lib and <prefix>/include when you run 'scons install'
-#
-# You can also specify this directory on the command line with the 'prefix'
-# option
-#
-# You can see more 'generic' options for POSIX systems on config_posix.py
-
-prefix = '/usr'
-
-# libraries (based on ArchLinux's installation of lua)
-LIBS = ['lua', 'dl', 'm']
-
diff --git a/pcr/tomb/PKGBUILD b/pcr/tomb/PKGBUILD
deleted file mode 100644
index 66945cb41..000000000
--- a/pcr/tomb/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-## PKGBUILD [bash]
-# Maintainer: nignux <nignux@freaknet.org>
-
-pkgbase=tomb
-pkgname=(tomb python2-tomb tomb-gui)
-pkgver=1.4
-pkgrel=1
-pkgdesc="Crypto Undertaker, simple tool to manage encrypted storage"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.dyne.org/software/tomb/"
-license=('GPL3')
-depends=('bc' 'cryptsetup' 'gnupg' 'sudo' 'zsh' 'steghide'
-         'dcfldd' 'wipe')
-makedepends=('python2-pyqt' 'python2-distribute')
-install=${pkgname}.install
-source=(https://files.dyne.org/tomb/releases/Tomb-${pkgver}.tar.gz{,.sha{,.asc}})
-# The first hash comes from the .sha file
-sha256sums=('2621ac6b9180321e69743dc899645449b2b958c6aa46e4b2601c2e89131bbf29'
-            'fc8b168f991d5b9c1135ceec6e55ac94f494ac4bed7e104e14c7f9ee787591e5'
-            'SKIP')
-
-build() {
-  cd ${srcdir}/Tomb-${pkgver}/extras/qt
-
-  python2 setup.py build_ui
-}
-
-# The checks require root access
-#check() {
-#  cd ${srcdir}/Tomb-${pkgver}
-#  make test
-#}
-
-package_tomb() {
-  pkgdesc="Crypto Undertaker, simple tool to manage encrypted storage, from the hashes of the dyne:bolic nesting mechanism."
-  cd ${srcdir}/Tomb-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
-
-package_python2-tomb() {
-  pkgdesc="Crypto Undertaker library"
-
-  cd ${srcdir}/Tomb-${pkgver}/extras/pytomb
-  python2 setup.py install --root="${pkgdir}/" --optimize=1
-}
-
-package_tomb-gui() {
-  pkgdesc="Crypto Undertaker GUI for open and create tombs"
-  depends=('python2-tomb' 'python2-pyqt')
-
-  cd ${srcdir}/Tomb-${pkgver}/extras/qt
-  python2 setup.py install --root="${pkgdir}/" --optimize=1
-}
diff --git a/pcr/tomb/tomb.install b/pcr/tomb/tomb.install
deleted file mode 100644
index c1ee8b339..000000000
--- a/pcr/tomb/tomb.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
diff --git a/pcr/torque/PKGBUILD b/pcr/torque/PKGBUILD
deleted file mode 100644
index 850aa3b7d..000000000
--- a/pcr/torque/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=torque
-pkgver=4.2.2
-_pkgver=1065
-pkgrel=2
-pkgdesc='An open source resource manager providing control over batch jobs and distributed compute nodes.'
-url=http://www.adaptivecomputing.com/products/open-source/$pkgname/
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-license=custom
-depends=(
-  libxml2
-  openssh
-)
-install=$pkgname.install
-options=(!libtool)
-backup=(
-  var/spool/$pkgname/mom_priv/config
-  var/spool/$pkgname/serv_priv/nodes
-  var/spool/$pkgname/serv_priv/serverdb
-  var/spool/$pkgname/server_name
-)
-source=(
-  $pkgname-$pkgver.tar.gz::http://www.adaptivecomputing.com/index.php?wpfb_dl=$_pkgver
-  $pkgname-{node,scheduler,server}.service
-)
-sha512sums=(
-  d53af8dc05e2d1ffa699da2a79e2c82247a882d868784c38d685fc77c3bb8a334e036e835bac2988d39675c5df7a04c2b567b826df4bf6975b437a9955164ae2
-  532c007cf3fcf171d071b67438fca430cdda4ec19d5e6c51ff5388b73610817825dd4cc86866c3d8a9411b6fdee6f76c64cd764dbd2277c1e7ca48e843ff9221
-  290620b00b2bd636b47c3c60158a4e6cff06e9a764ac7fc7d4996f9be1aace58ee248a075b4c3cf84951af9013a655b29ea6adec789fe6e170df62b07b05cc85
-  2977fbd4d7b7241a2aadef4bc5575483a882a62dd65b74cfb26958530ce99030ee0c3e6c8a093d1e2ccc2bfe4ebed4f90bc7b52aaece7fd43ea2f9af08781fed
-)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  setarch $CARCH ./configure --prefix=/usr\
-    --disable-gui\
-    --disable-gcc-warnings\
-    --mandir=/usr/share/man\
-    --with-default-server=localhost\
-    --with-rcp=scp\
-    --with-server-home=/var/spool/$pkgname\
-    --with-tcl=no
-  mv src/resmom/Makefile src/resmom/Makefile.old
-  cat src/resmom/Makefile.old | sed 's/$(MOMLIBS) $(PBS_LIBS)/$(PBS_LIBS) $(MOMLIBS)/g' > src/resmom/Makefile
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  install -d $pkgdir/usr/lib/systemd/system
-  install -Dm644 $srcdir/*.service $pkgdir/usr/lib/systemd/system
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/torque/torque-node.service b/pcr/torque/torque-node.service
deleted file mode 100644
index 67edef4f5..000000000
--- a/pcr/torque/torque-node.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=TORQUE node
-Wants=basic.target
-After=basic.target network.target
-
-[Service]
-Type=forking
-PIDFile=/var/spool/torque/mom_priv/mom.lock
-ExecStart=/usr/sbin/pbs_mom
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/torque/torque-scheduler.service b/pcr/torque/torque-scheduler.service
deleted file mode 100644
index 97ec6a093..000000000
--- a/pcr/torque/torque-scheduler.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=TORQUE scheduler
-Wants=torque-server.service
-After=torque-server.service
-
-[Service]
-Type=forking
-PIDFile=/var/spool/torque/sched_priv/sched.lock
-ExecStart=/usr/sbin/pbs_sched
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/torque/torque-server.service b/pcr/torque/torque-server.service
deleted file mode 100644
index 80fcb1860..000000000
--- a/pcr/torque/torque-server.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=TORQUE server
-Wants=basic.target
-After=basic.target network.target
-
-[Service]
-Type=forking
-PIDFile=/var/spool/torque/server_priv/server.lock
-ExecStart=/usr/sbin/pbs_server
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/torque/torque.install b/pcr/torque/torque.install
deleted file mode 100644
index 2e90bd1ba..000000000
--- a/pcr/torque/torque.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
-  pbs_server -f -t create
-  systemctl stop torque-server
-  echo 'Change the server name in /var/spool/torque/server_name to your needs.
-You may add your clients to /var/spool/torque/server_priv/nodes if your are the server.
-Enable torque-server.service or torque-node.service depending on whether you are the server or a node.'
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/transmission-remote-cli/PKGBUILD b/pcr/transmission-remote-cli/PKGBUILD
deleted file mode 100644
index dcabaa642..000000000
--- a/pcr/transmission-remote-cli/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: fauno <fauno@kiwwwi.com.ar>
-pkgname=transmission-remote-cli
-pkgver=1.5.0
-pkgrel=1
-pkgdesc="Curses interface for the daemon of the BitTorrent client Transmission"
-arch=('any')
-url="https://github.com/fagga/transmission-remote-cli"
-license=('GPL3')
-depends=('python2')
-optdepends=('transmission-daemon: for local transmission management'
-            'adns-python: Resolve IPs to host names'
-            'python2-geoip: Guess which country peers come from')
-conflicts=('transmission-remote-cli-git' "transmission-remote-cli<=20111013")
-replaces=('transmission-remote-cli-git')
-source=(https://github.com/fagga/${pkgname}/archive/v${pkgver}.tar.gz)
-
-package() {
-    cd "${srcdir}/${pkgname}"
-    msg "Starting make..."
-
-	install -d ${pkgdir}/usr/bin/
-	install -Dm755 transmission-remote-cli.py ${pkgdir}/usr/bin/transmission-remote-cli
-
-}
-md5sums=('4c13aa8596d35ce5793ea65affa8a6e5')
diff --git a/pcr/transmission-remote-cli/python2.patch b/pcr/transmission-remote-cli/python2.patch
deleted file mode 100644
index 256b676f0..000000000
--- a/pcr/transmission-remote-cli/python2.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Nur transmission-remote-cli/transmission-remote-cli.py transmission-remote-cli-python2//transmission-remote-cli.py
---- transmission-remote-cli/transmission-remote-cli.py	2010-10-19 10:33:49.544594708 -0300
-+++ transmission-remote-cli-python2//transmission-remote-cli.py	2010-10-19 10:42:51.278983745 -0300
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- ########################################################################
- # This is transmission-remote-cli, whereas 'cli' stands for 'Curses    #
- # Luminous Interface', a client for the daemon of the BitTorrent       #
diff --git a/pcr/triceratops-lv2/PKGBUILD b/pcr/triceratops-lv2/PKGBUILD
deleted file mode 100644
index db8b7b101..000000000
--- a/pcr/triceratops-lv2/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-
-pkgname=triceratops-lv2
-pkgver=0.1.7
-pkgrel=1
-pkgdesc="Polyphonic synthesizer LV2 plugin"
-arch=('i686' 'x86_64')
-url="http://deliriumdecrypted.blogspot.com/"
-license=('GPL')
-groups=('lv2-plugins')
-depends=('gtkmm' 'lv2')
-makedepends=('python2')
-source=("http://downloads.sourceforge.net/project/${pkgname/-lv2}/$pkgname-v$pkgver.tar.gz")
-md5sums=('b4f058c30b3b218bd21dbaa04430dd8b')
-
-build() {
-  cd "$srcdir/$pkgname-v$pkgver"
-  python2 waf configure --prefix=/usr
-  python2 waf
-}
-
-package() {
-  cd "$srcdir/$pkgname-v$pkgver"
-  DESTDIR="$pkgdir/" python2 waf install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/trisquel-themes/PKGBUILD b/pcr/trisquel-themes/PKGBUILD
deleted file mode 100644
index 69aad1870..000000000
--- a/pcr/trisquel-themes/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: fauno <fauno@kiwwwi.com.ar>
-
-pkgname=trisquel-themes
-pkgver=6.0
-_miniver="5.99-3"
-pkgrel=2
-pkgdesc="Themes from Trisquel, including GTK2, Metacity, XFWM and Openbox themes"
-arch=('any')
-url=http://trisquel.info
-license=('GPL')
-depends=()
-optdepends=('gtk-engine-equinox: for Trisquel GTK2 theme')
-source=(http://archive.trisquel.info/trisquel/pool/main/t/trisquel-gtk-theme/trisquel-gtk-theme_${pkgver}.tar.gz
-http://archive.trisquel.info/trisquel/pool/main/t/trisquel-mini-data/trisquel-mini-data_${_miniver}.tar.gz)
-md5sums=('8d81a535adade0e52a0c584c07f87a2a'
-         'e448057b6e2d933916511c2c3d3585e1')
-
-build() {
-	:
-}
-
-package() {
-	install -d ${pkgdir}/usr/share/themes
-
-    for trisquelsrc in trisquel-gtk-theme/data trisquel-mini-data; do
-	    cp -R ${srcdir}/${trisquelsrc}/usr/share/themes/* \
-              ${pkgdir}/usr/share/themes/
-    done
-}
diff --git a/pcr/trytond-account-invoice/PKGBUILD b/pcr/trytond-account-invoice/PKGBUILD
deleted file mode 100644
index c1f3a4636..000000000
--- a/pcr/trytond-account-invoice/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-pkgname=trytond-account-invoice
-_pkgname=trytond_account_invoice
-pkgver=3.0.0
-_pkgdir=3.0
-pkgrel=2
-pkgdesc="The account_invoice module of the Tryton application platform"
-arch=('any')
-url='http://www.tryton.org/'
-license=('GPL3')
-groups=('trytond-modules')
-depends=('trytond>=3.0' 'trytond-account>=3.0' 'trytond-account-product>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0' 'trytond-product>=3.0')
-makedepends=('python2-distribute')
-source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("d225505a8ba66bfd95f22a454951dd15")
-
-build() {
-  cd $srcdir/$_pkgname-$pkgver
-  python2 setup.py build
-}
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/pcr/trytond-account-product/PKGBUILD b/pcr/trytond-account-product/PKGBUILD
deleted file mode 100644
index 5a780d1dd..000000000
--- a/pcr/trytond-account-product/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-pkgname=trytond-account-product
-_pkgname=trytond_account_product
-pkgver=3.0.0
-_pkgdir=3.0
-pkgrel=2
-pkgdesc="The account_product module of the Tryton application platform"
-arch=('any')
-url='http://www.tryton.org/'
-license=('GPL3')
-groups=('trytond-modules')
-depends=('trytond>=3.0' 'trytond-account>=3.0' 'trytond-company>=3.0' 'trytond-product>=3.0')
-makedepends=('python2-distribute')
-source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("16b9dee1238310a9809fcdef64cbf8a8")
-
-build() {
-  cd $srcdir/$_pkgname-$pkgver
-  python2 setup.py build
-}
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/pcr/trytond-account/PKGBUILD b/pcr/trytond-account/PKGBUILD
deleted file mode 100644
index 319f7c872..000000000
--- a/pcr/trytond-account/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-pkgname=trytond-account
-_pkgname=trytond_account
-pkgver=3.0.0
-_pkgdir=3.0
-pkgrel=2
-pkgdesc="The account module of the Tryton application platform"
-arch=('any')
-url='http://www.tryton.org/'
-license=('GPL3')
-groups=('trytond-modules')
-depends=('trytond>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0'
-         'trytond-party>=3.0')
-makedepends=('python2-distribute')
-source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("33e28b72249e97891e00fccb5a588ea8")
-
-build() {
-  cd $srcdir/$_pkgname-$pkgver
-  python2 setup.py build
-}
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/pcr/trytond-calendar/PKGBUILD b/pcr/trytond-calendar/PKGBUILD
deleted file mode 100644
index 67db70dfa..000000000
--- a/pcr/trytond-calendar/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-pkgname=trytond-calendar
-_pkgname=trytond_calendar
-pkgver=3.0.0
-_pkgdir=3.0
-pkgrel=1
-pkgdesc="The calendar module of the Tryton application platform"
-arch=('any')
-url='http://www.tryton.org/'
-license=('GPL3')
-groups=('trytond-modules')
-depends=('trytond>=3.0')
-makedepends=('python2-distribute')
-source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("fad4dee756bbf97ce9aef47bed185704")
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/pcr/trytond-company/PKGBUILD b/pcr/trytond-company/PKGBUILD
deleted file mode 100644
index 8c9b4dd47..000000000
--- a/pcr/trytond-company/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-pkgname=trytond-company
-_pkgname=trytond_company
-pkgver=3.0.0
-_pkgdir=3.0
-pkgrel=1
-pkgdesc="The company module of the Tryton application platform"
-arch=('any')
-url='http://www.tryton.org/'
-license=('GPL3')
-groups=('trytond-modules')
-depends=('trytond>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0')
-makedepends=('python2-distribute')
-source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("87623bc65e2c629c0c5541877bfec8cb")
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/pcr/trytond-country/PKGBUILD b/pcr/trytond-country/PKGBUILD
deleted file mode 100644
index 7a0108996..000000000
--- a/pcr/trytond-country/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-pkgname=trytond-country
-_pkgname=trytond_country
-pkgver=3.0.0
-_pkgdir=3.0
-pkgrel=1
-pkgdesc="The country module of the Tryton application platform"
-arch=('any')
-url='http://www.tryton.org/'
-license=('GPL3')
-groups=('trytond-modules')
-depends=('trytond>=3.0')
-makedepends=('python2-distribute')
-source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("c365bd0ac6e04a88427cb5366c1ce493")
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/pcr/trytond-currency/PKGBUILD b/pcr/trytond-currency/PKGBUILD
deleted file mode 100644
index 21386024b..000000000
--- a/pcr/trytond-currency/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-pkgname=trytond-currency
-_pkgname=trytond_currency
-pkgver=3.0.0
-_pkgdir=3.0
-pkgrel=1
-pkgdesc="The currency module of the Tryton application platform"
-arch=('any')
-url='http://www.tryton.org/'
-license=('GPL3')
-groups=('trytond-modules')
-depends=('trytond>=3.0')
-makedepends=('python2-distribute')
-source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("5507619d11d186fc041d1de7c0eea012")
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/pcr/trytond-party/PKGBUILD b/pcr/trytond-party/PKGBUILD
deleted file mode 100644
index 61de6605b..000000000
--- a/pcr/trytond-party/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-pkgname=trytond-party
-_pkgname=trytond_party
-pkgver=3.0.0
-_pkgdir=3.0
-pkgrel=1
-pkgdesc="The party module of the Tryton application platform"
-arch=('any')
-url='http://www.tryton.org/'
-license=('GPL3')
-groups=('trytond-modules')
-depends=('trytond>=3.0' 'trytond-country>=3.0')
-makedepends=('python2-distribute')
-source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("43c6d17fbe723beec0339da27f3e188e")
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/pcr/trytond-product/PKGBUILD b/pcr/trytond-product/PKGBUILD
deleted file mode 100644
index 4dc09354d..000000000
--- a/pcr/trytond-product/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-pkgname=trytond-product
-_pkgname=trytond_product
-pkgver=3.0.0
-_pkgdir=3.0
-pkgrel=1
-pkgdesc="The product module of the Tryton application platform"
-arch=('any')
-url='http://www.tryton.org/'
-license=('GPL3')
-groups=('trytond-modules')
-depends=('trytond>=3.0')
-makedepends=('python2-distribute')
-source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("756dabade95f67f49a253af1bd5513a6")
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/pcr/trytond-stock-lot/PKGBUILD b/pcr/trytond-stock-lot/PKGBUILD
deleted file mode 100644
index ae39373f7..000000000
--- a/pcr/trytond-stock-lot/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-pkgname=trytond-stock-lot
-_pkgname=trytond_stock_lot
-pkgver=3.0.0
-_pkgdir=3.0
-pkgrel=1
-pkgdesc="The stock_lot module of the Tryton application platform"
-arch=('any')
-url='http://www.tryton.org/'
-license=('GPL3')
-groups=('trytond-modules')
-depends=('trytond>=3.0' 'trytond-product>=3.0' 'trytond-stock>=3.0')
-makedepends=('python2-distribute')
-source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("b8424f738dc5e98d0a1de8643315e605")
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/pcr/trytond-stock/PKGBUILD b/pcr/trytond-stock/PKGBUILD
deleted file mode 100644
index 31f1fc9e9..000000000
--- a/pcr/trytond-stock/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-pkgname=trytond-stock
-_pkgname=trytond_stock
-pkgver=3.0.0
-_pkgdir=3.0
-pkgrel=1
-pkgdesc="The stock module of the Tryton application platform"
-arch=('any')
-url='http://www.tryton.org/'
-license=('GPL3')
-groups=('trytond-modules')
-depends=('trytond>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0' 'trytond-product>=3.0')
-makedepends=('python2-distribute')
-source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("ec0d35080f68f7fa3218d8a30729ed22")
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/pcr/trytond/PKGBUILD b/pcr/trytond/PKGBUILD
deleted file mode 100644
index eaa9d6f7b..000000000
--- a/pcr/trytond/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Florian Walch <florian.walch@gmx.at>
-# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-pkgname=trytond
-pkgver=3.0.0
-_pkgdir=3.0
-pkgrel=2
-pkgdesc="A three-tiers high-level general purpose application platform (server application)"
-arch=('any')
-url="http://www.tryton.org/"
-license=('GPL3')
-depends=('python2>=2.7' 'python2-lxml' 'python2-relatorio>=0.6.0' 'python2-genshi>=0.7' 'python2-polib')
-optdepends=('python2-psycopg2: support for PostgreSQL database'
-  'python-pywebdav: support for WebDAV feature'
-  'pydot: support for displaying workflow graphs'
-  'python-pytz: timezone support'
-  'pyopenssl: support for SSL connection')
-makedepends=('python2-distribute')
-install="trytond.install"
-source=("http://downloads.tryton.org/$_pkgdir/$pkgname-$pkgver.tar.gz"
-        'trytond.service')
-md5sums=('812daa29409881adc4001c1c810bc8e8'
-         'b1535a8528dfd8f655624bf6faea6985')
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  python2 setup.py install --root=$pkgdir
-  install -D -m644 etc/trytond.conf $pkgdir/etc/trytond.conf
-  install -D -m755 $srcdir/trytond.service $pkgdir/usr/lib/systemd/system/trytond.service
-}
diff --git a/pcr/trytond/trytond.install b/pcr/trytond/trytond.install
deleted file mode 100644
index 46d6daaba..000000000
--- a/pcr/trytond/trytond.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  echo
-  echo "Adding tryton group... "
-  groupadd  tryton
-  echo
-  echo "Adding tryton user... "
-  useradd -c "Tryton Server Daemon" -g tryton -s /bin/false tryton
-
-  echo "Note:"
-  echo "==> Please don't forget to configure your PostgreSQL database for the program."
-}
-
-post_remove() {
-  echo "Removing tryton system user... "
-  userdel tryton && echo "trytond [done]"
-}
-
-op=$1
-shift
-[ "$(type -t "$op")" = "function" ] && $op "$@"
diff --git a/pcr/trytond/trytond.service b/pcr/trytond/trytond.service
deleted file mode 100644
index 7d85691b3..000000000
--- a/pcr/trytond/trytond.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Tryton Server Daemon
-
-[Service]
-Type=simple
-User=tryton
-ExecStart=/usr/bin/trytond
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/ttf-asana-math/PKGBUILD b/pcr/ttf-asana-math/PKGBUILD
deleted file mode 100644
index 8b0169d83..000000000
--- a/pcr/ttf-asana-math/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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.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"
-arch=('any')
-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")
-install=$pkgname.install
-
-package()
-{
-  mkdir -p $pkgdir/usr/share/fonts/TTF
-  mkdir -p $pkgdir/usr/share/fonts/OTF
-  cp *.ttf $pkgdir/usr/share/fonts/TTF
-  cp *.otf $pkgdir/usr/share/fonts/OTF
-  mkdir -p $pkgdir/usr/share/licenses/custom/ttf-asana-math/
-  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/ttf-asana-math/ttf-asana-math.install b/pcr/ttf-asana-math/ttf-asana-math.install
deleted file mode 100644
index 506595662..000000000
--- a/pcr/ttf-asana-math/ttf-asana-math.install
+++ /dev/null
@@ -1,11 +0,0 @@
- post_install() {
-  echo -n "Updating font cache... "
-  fc-cache -fs >/dev/null
-  mkfontscale /usr/share/fonts/TTF /usr/share/fonts/Type1
-  mkfontdir /usr/share/fonts/TTF /usr/share/fonts/Type1
-  echo "done"
-}
-
-post_upgrade() {
-  post_install
-}
\ No newline at end of file
diff --git a/pcr/ttf-beteckna/PKGBUILD b/pcr/ttf-beteckna/PKGBUILD
deleted file mode 100644
index 3bbe41397..000000000
--- a/pcr/ttf-beteckna/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# From https://aur.archlinux.org/packages.php?ID=22483
-# Maintainer: TDY <tdy@gmx.com>
-
-pkgname=ttf-beteckna
-pkgver=0.4
-pkgrel=1.1
-pkgdesc="A geometric sans serif typeface inspired by the popular Futura"
-arch=('any')
-url="http://gnu.ethz.ch/linuks.mine.nu/beteckna/"
-license=('GPL')
-depends=('fontconfig' 'xorg-font-utils')
-makedepends=('fontforge')
-install=ttf.install
-source=(http://gnu.ethz.ch/linuks.mine.nu/${pkgname/*-}/${pkgname/*-}-$pkgver.tar.gz)
-md5sums=('01c12138e0f689f4acdacb105f4350a7')
-
-build() {
-  cd "$srcdir/${pkgname/*-}-$pkgver"
-  install -dm755 "$pkgdir/usr/share/fonts/TTF"
-  fontforge -script sfd2ttf.ff *.sfd &> /dev/null || return 1
-  install -Dm644 *.ttf "$pkgdir/usr/share/fonts/TTF"
-}
diff --git a/pcr/ttf-beteckna/ttf.install b/pcr/ttf-beteckna/ttf.install
deleted file mode 100644
index 33b7d6549..000000000
--- a/pcr/ttf-beteckna/ttf.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo -n "==> Rebuilding font cache... "
-  fc-cache -f &> /dev/null
-  mkfontscale /usr/share/fonts/TTF
-  mkfontdir /usr/share/fonts/TTF
-  echo "done"
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/pcr/ttf-font-awesome/PKGBUILD b/pcr/ttf-font-awesome/PKGBUILD
deleted file mode 100644
index abb63b8a6..000000000
--- a/pcr/ttf-font-awesome/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-#Contributer: UNKNOWN o_O
-#Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@replicant.io>
-
-pkgname=ttf-font-awesome
-pkgver=3.2.1
-pkgrel=2
-pkgdesc="Iconic font designed for Bootstrap"
-url="http://fortawesome.github.io/Font-Awesome/"
-license=('CCPL')
-depends=('fontconfig' 'xorg-font-utils')
-options=("!strip")
-install=$pkgname.install
-arch=('any')
-source=('http://fortawesome.github.io/Font-Awesome/assets/font-awesome.zip')
-
-package() {
-  install -d "$pkgdir/usr/share/fonts/TTF"
-  cp -dpr --no-preserve=ownership "$srcdir/font-awesome/font/"*.ttf "$pkgdir/usr/share/fonts/TTF/"
-}
diff --git a/pcr/ttf-font-awesome/ttf-font-awesome.install b/pcr/ttf-font-awesome/ttf-font-awesome.install
deleted file mode 100644
index 56632d242..000000000
--- a/pcr/ttf-font-awesome/ttf-font-awesome.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  echo -n "Updating font cache..."
-  fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/TTF
-  mkfontdir /usr/share/fonts/TTF
-  echo "done."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/pcr/ttf-roboto/PKGBUILD b/pcr/ttf-roboto/PKGBUILD
deleted file mode 100644
index 9085985d7..000000000
--- a/pcr/ttf-roboto/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Michael Düll <mail@akurei.me> PGP-Key: D6777412 - Fingerprint: C972 8B50 9411 BBE1 5CA5  9906 5103 71F3 D677 7412
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=ttf-roboto
-pkgver=20121102
-pkgrel=1
-pkgdesc='The new system font of Android 4, Codename "Ice Cream Sandwich".'
-arch=('any')
-license=('APACHE')
-url="https://developer.android.com/design/style/typography.html"
-depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
-install=$pkgname.install
-source=(
-  "https://developer.android.com/downloads/design/Roboto_Hinted_20120823.zip"
-)
-
-package()
-{
-  install -d $pkgdir/usr/share/fonts/TTF/ 
-  install -m644 *.ttf $pkgdir/usr/share/fonts/TTF/ 
-  install -d $pkgdir/usr/share/licenses/$pkgname/
-  install -m644 $srcdir/COPYING.txt $pkgdir/usr/share/licenses/$pkgname/
-}
-
-sha512sums=('ce4af34d0a23dd4076d033dcb03f17335eb83317da72b45257291be3aa34ff589405bfdfb768faca769d401a9091b63e5f195704ed69874d7d17289ca436a785')
diff --git a/pcr/ttf-roboto/ttf-roboto.install b/pcr/ttf-roboto/ttf-roboto.install
deleted file mode 100644
index 7dde94b45..000000000
--- a/pcr/ttf-roboto/ttf-roboto.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo -n "Updating font cache... "
-  fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/TTF
-  mkfontdir /usr/share/fonts/TTF
-  echo "done."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/pcr/twinkle/PKGBUILD b/pcr/twinkle/PKGBUILD
deleted file mode 100644
index b9e8fc537..000000000
--- a/pcr/twinkle/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 68598 2012-03-29 08:03:13Z arodseth $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Jeff Mickey <jeff@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-
-pkgname=twinkle
-pkgver=1.4.2
-pkgrel=20
-pkgdesc="Softphone for voice over IP and IM communication using SIP"
-arch=('x86_64' 'i686')
-url="http://www.twinklephone.com/"
-license=('GPL')
-depends=('file' 'speex' 'boost-libs' 'libsndfile' 'qt3' 'libzrtpcpp' 
-'commoncpp2' 'libxml2')
-makedepends=('pkg-config' 'boost')
-source=("http://www.xs4all.nl/~mfnboer/$pkgname/download/$pkgname-$pkgver.tar.gz"
- twinkle-1.4.2-ccrtp.patch)
-md5sums=('d70c8972f296ffd998c7fb698774705b'
-         '934f59ff60a8ae29a152feb8bf131ae2')
-
-build() {
-  cd "$srcdir"
-  patch -p0 < ./twinkle-1.4.2-ccrtp.patch || return 1
-
-  cd "$pkgname-$pkgver"
-  aclocal
-  autoconf
-  automake -a
-  export QTDIR=/usr/lib/qt3
-  export PATH=$QTDIR/bin:$PATH
-  CPPFLAGS="$CPPFLAGS -I/usr/include/qt3" \
-  ./configure --prefix=/usr \
-	--without-kde \
-	--with-speex \
-	--without-ilbc \
-	--mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-  install -Dm644 "$pkgdir/usr/share/twinkle/twinkle48.png" \
-    "$pkgdir/usr/share/pixmaps/twinkle.png"
-  install -Dm644 twinkle.desktop \
-    "$pkgdir/usr/share/applications/twinkle.desktop"
-}
diff --git a/pcr/twinkle/twinkle-1.4.2-ccrtp.patch b/pcr/twinkle/twinkle-1.4.2-ccrtp.patch
deleted file mode 100644
index fdb5f6260..000000000
--- a/pcr/twinkle/twinkle-1.4.2-ccrtp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -pruN twinkle-1.4.2-o/configure.in twinkle-1.4.2/configure.in
---- twinkle-1.4.2-o/configure.in	2009-02-24 11:49:20.000000000 -0800
-+++ twinkle-1.4.2/configure.in	2012-05-19 09:20:51.151778516 -0700
-@@ -66,7 +66,7 @@ fi
- 
- export PKG_CONFIG_PATH
- 
--PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.6.0)
-+PKG_CHECK_MODULES(CCRTP, libccrtp >= 2.0.0)
- 
- PKG_CHECK_MODULES(XML2, libxml-2.0)
- # AC_CHECK_HEADER(libxml/tree.h, [],
-diff -pruN twinkle-1.4.2-o/src/log.cpp twinkle-1.4.2/src/log.cpp
---- twinkle-1.4.2-o/src/log.cpp	2009-01-18 06:35:28.000000000 -0800
-+++ twinkle-1.4.2/src/log.cpp	2012-05-19 09:21:11.071594114 -0700
-@@ -161,7 +161,7 @@ void t_log::write_header(const string &f
- 
- 	gettimeofday(&t, NULL);
- 	date = t.tv_sec;
--	localtime_r(&date, &tm);
-+	::localtime_r(&date, &tm);
- 
- 	*log_stream << "+++ ";
- 	*log_stream << tm.tm_mday;
diff --git a/pcr/ubus/PKGBUILD b/pcr/ubus/PKGBUILD
deleted file mode 100644
index 80e14eaf0..000000000
--- a/pcr/ubus/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
-pkgname=ubus
-pkgver=0.8.0
-pkgrel=1
-pkgdesc="OpenWRT's RPC client utility"
-arch=('i686' 'mips64el')
-url="https://openwrt.org"
-license=('LGPL2.1')
-depends=('libubox' 'json-c')
-makedepends=('git' 'cmake' 'lua51')
-source=(git://nbd.name/luci2/ubus.git)
-md5sums=(SKIP)
-
-pkgver() {
-  cd ${srcdir}/${pkgname}
-  local ver="$(git describe --long --tags)"
-  printf "%s" "${ver//-/.}"
-}
-
-build() {
-  cd ${srcdir}/${pkgname}
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}
-  make DESTDIR=${pkgdir}/ install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/uci/PKGBUILD b/pcr/uci/PKGBUILD
deleted file mode 100644
index 80194f162..000000000
--- a/pcr/uci/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
-pkgname=uci
-pkgver=v0.8.0.43.g2fcc6d7
-pkgrel=2
-pkgdesc="OpenWRT's Unified Configuration Interface"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://openwrt.org"
-license=('GPL2')
-depends=('libubox')
-makedepends=('git' 'cmake' 'lua51')
-source=(git://nbd.name/uci.git)
-md5sums=(SKIP)
-
-pkgver() {
-  cd ${srcdir}/${pkgname}
-  local ver="$(git describe --long --tags)"
-  printf "%s" "${ver//-/.}"
-}
-
-build() {
-  cd ${srcdir}/${pkgname}
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}
-  make DESTDIR=${pkgdir}/ install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/uci/uci-0.8.0-lua5.1.patch b/pcr/uci/uci-0.8.0-lua5.1.patch
deleted file mode 100644
index d3e486f87..000000000
--- a/pcr/uci/uci-0.8.0-lua5.1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- uci-0.8.0.orig/lua/CMakeLists.txt	2011-07-19 15:39:56.000000000 -0500
-+++ uci-0.8.0/lua/CMakeLists.txt	2013-02-12 21:16:02.583984374 -0500
-@@ -4,7 +4,18 @@
- 
- SET(CMAKE_INSTALL_PREFIX /)
- 
--ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -I..)
-+IF(NOT LUA_CFLAGS)
-+	FIND_PROGRAM(PKG_CONFIG pkg-config)
-+	IF(PKG_CONFIG)
-+		EXECUTE_PROCESS(
-+			COMMAND pkg-config --silence-errors --cflags lua5.1
-+			OUTPUT_VARIABLE LUA_CFLAGS
-+			OUTPUT_STRIP_TRAILING_WHITESPACE
-+		)
-+	ENDIF()
-+ENDIF()
-+
-+ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -I.. ${LUA_CFLAGS})
- LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..)
- 
- IF(APPLE)
-@@ -13,7 +24,7 @@
- 
- IF(NOT LUAPATH)
- 	EXECUTE_PROCESS(
--		COMMAND  lua -e "for k in string.gmatch(package.cpath .. \";\", \"([^;]+)/..so;\") do if k:sub(1,1) == \"/\" then print(k) break end end"
-+		COMMAND  lua5.1 -e "for k in string.gmatch(package.cpath .. \";\", \"([^;]+)/..so;\") do if k:sub(1,1) == \"/\" then print(k) break end end"
- 		OUTPUT_VARIABLE LUAPATH
- 		RESULT_VARIABLE LUA_CHECK_RES
- 		OUTPUT_STRIP_TRAILING_WHITESPACE
diff --git a/pcr/uftp/PKGBUILD b/pcr/uftp/PKGBUILD
deleted file mode 100644
index 3aef7d164..000000000
--- a/pcr/uftp/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Markus Jochim <ich@markusjochim.de>
-pkgname=uftp
-pkgver=4.0
-pkgrel=1
-pkgdesc="Multicast FTP software"
-arch=('i686' 'x86_64' 'mips64el')
-depends=('openssl')
-url="http://www.tcnj.edu/~bush/uftp.html"
-license=('GPL')
-source=(http://www.tcnj.edu/~bush/downloads/${pkgname}-${pkgver}.tar)
-md5sums=('475918421c000b59bfced1a3c21e3035')
-
-build() {
-	cd "$srcdir/${pkgname}-${pkgver}/"
-	make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-}
-
-package() {
-	cd "$srcdir/${pkgname}-${pkgver}/"
-	make DESTDIR="${pkgdir}" install
-}
-
diff --git a/pcr/ulogd2/PKGBUILD b/pcr/ulogd2/PKGBUILD
deleted file mode 100644
index c00c462e5..000000000
--- a/pcr/ulogd2/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: Andrzej Boreczko <0rion@wp.pl>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=ulogd2
-pkgver=2.0.0
-pkgrel=6
-pkgdesc="Userspace Packet Logging for netfilter"
-arch=(i686 x86_64)
-url="http://www.netfilter.org/projects/ulogd/index.html"
-license=('GPL')
-depends=('libnetfilter_conntrack>=1.0.0' 'libnetfilter_log>=1.0.0' 'libnfnetlink>=1.0.0' 'libmnl>=1.0.0' 'libnetfilter_acct>=1.0.0')
-optdepends=('ulogd2_output_mysql: MySQL output' 'ulogd2_output_pgsql: PostgreSQL output' \
-            'ulogd2_output_sqlite3: Sqlite3 output' 'ulogd2_output_pcap: libpcap-style logfiles output' \
-            'ulogd2_output_dbi: Libdbi framework output')
-conflicts=('ulogd>1.24')
-backup=('etc/ulogd2.conf')
-source=("http://www.netfilter.org/projects/ulogd/files/ulogd-${pkgver}.tar.bz2" 'ulogd2' 'logrotate')
-
-build() {
-  export MAKEFLAGS="-j1"
-  cd $startdir/src/ulogd-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --with-mysql \
-    --with-pgsql --with-dbi  --program-suffix=2
-  make || return 1
-}
-
-package() {
-  cd $startdir/src/ulogd-${pkgver}
-  make DESTDIR=$startdir/pkg install || return 1
-  rm $startdir/pkg/usr/lib/ulogd/*.la
-  [ -f $startdir/pkg/usr/lib/ulogd/ulogd_output_MYSQL.so ] && rm $startdir/pkg/usr/lib/ulogd/ulogd_output_MYSQL.* 
-  [ -f $startdir/pkg/usr/lib/ulogd/ulogd_output_PGSQL.so ] && rm $startdir/pkg/usr/lib/ulogd/ulogd_output_PGSQL.*
-  [ -f $startdir/pkg/usr/lib/ulogd/ulogd_output_SQLITE3.so ] && rm $startdir/pkg/usr/lib/ulogd/ulogd_output_SQLITE3.* 
-  [ -f $startdir/pkg/usr/lib/ulogd/ulogd_output_PCAP.so ] && rm $startdir/pkg/usr/lib/ulogd/ulogd_output_PCAP.*
-  [ -f $startdir/pkg/usr/lib/ulogd/ulogd_output_DBI.so ] && rm $startdir/pkg/usr/lib/ulogd/ulogd_output_DBI.*
-  install -D -m755 $startdir/src/ulogd2 $startdir/pkg/etc/rc.d/ulogd2
-  sed 's/\/var\/log\/ulogd.log/\/var\/log\/ulogd2.log/' ulogd.conf > $startdir/pkg/etc/ulogd2.conf
-  mkdir -p $startdir/pkg/usr/share/ulogd2
-  install -m644 doc/*.table $startdir/pkg/usr/share/ulogd2
-  install -m644 doc/*.sql $startdir/pkg/usr/share/ulogd2
-  install -D -m644 ${srcdir}/logrotate $pkgdir/etc/logrotate.d/ulogd2
-}
diff --git a/pcr/ulogd2/logrotate b/pcr/ulogd2/logrotate
deleted file mode 100644
index 7a53c4d52..000000000
--- a/pcr/ulogd2/logrotate
+++ /dev/null
@@ -1,10 +0,0 @@
-/var/log/ulogd2.log {
-  missingok
-  notifempty
-  sharedscripts
-  create 0640 root root
-
-  postrotate
-    [ -e /var/run/ulogd2.pid ] && /etc/rc.d/ulogd2 restart > /dev/null
-  endscript
-}
diff --git a/pcr/ulogd2/ulogd2 b/pcr/ulogd2/ulogd2
deleted file mode 100644
index 09ef2756f..000000000
--- a/pcr/ulogd2/ulogd2
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	pidof /usr/sbin/ulogd2
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting ulogd2"
-
-    [ -f /var/run/ulogd2.pid ] && rm -f /var/run/ulogd2.pid
-    PID=`get_pid`
-    if [ -z "$PID" ]; then
-       /usr/sbin/ulogd2 -d -c /etc/ulogd2.conf
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo `get_pid` > /var/run/ulogd2.pid
-        add_daemon ulogd2
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping ulogd2"
-    PID=`get_pid`
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/ulogd2.pid &> /dev/null
-      rm_daemon ulogd2
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/pcr/unittestpp/PKGBUILD b/pcr/unittestpp/PKGBUILD
deleted file mode 100644
index 3918f98a2..000000000
--- a/pcr/unittestpp/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Jorge Araya Navarro <elcorreo@deshackra.com>
-# Contributor: Piotr Beling <qwak@w8.pl>
-# Contributor: Vianney le Clément <vleclement AT gmail · com>
-pkgname=unittestpp
-pkgver=1.4
-pkgrel=3
-pkgdesc="A lightweight unit testing framework for C++"
-arch=('i686' 'x86_64')
-url="http://unittest-cpp.sourceforge.net/"
-depends=('gcc-libs')
-source=("http://downloads.sourceforge.net/project/unittest-cpp/UnitTest%2B%2B/$pkgver/unittest-cpp-${pkgver}.zip")
-sha1sums=('dad944159e2e135aea74039987490eaaee00f2ad')
-license=('MIT')
-
-build() {
-  cd "$srcdir/UnitTest++"
-  make all
-}
-
-package() {
-  cd "$srcdir/UnitTest++"
-  
-  install -dm755 "$pkgdir/usr/include/unittest++/Posix"
-  install -m644 src/*.h "$pkgdir/usr/include/unittest++"
-  install -m644 src/Posix/*.h "$pkgdir/usr/include/unittest++/Posix"
-  
-  install -dm755 "$pkgdir/usr/lib"
-  install -m644 libUnitTest++.a "$pkgdir/usr/lib"
-
-  install -dm755 "$pkgdir/usr/share/licenses/unittest++"
-  install -m644 COPYING "$pkgdir/usr/share/licenses/unittest++/LICENSE"
-  install -dm755 "$pkgdir/usr/share/doc/unittest++"
-  install -m644 README "$pkgdir/usr/share/doc/unittest++/README"
-  install -m644 docs/UnitTest++.html "$pkgdir/usr/share/doc/unittest++/UnitTest++.html"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/upp-svn/GCC.bm b/pcr/upp-svn/GCC.bm
deleted file mode 100644
index bfcb09c1d..000000000
--- a/pcr/upp-svn/GCC.bm
+++ /dev/null
@@ -1,23 +0,0 @@
-BUILDER = "GCC";
-COMPILER = "";
-DEBUG_INFO = "2";
-DEBUG_BLITZ = "1";
-DEBUG_LINKMODE = "1";
-DEBUG_OPTIONS = "-O0";
-DEBUG_FLAGS = "";
-DEBUG_LINK = "";
-RELEASE_BLITZ = "0";
-RELEASE_LINKMODE = "1";
-RELEASE_OPTIONS = "-O3 -ffunction-sections -fdata-sections";
-RELEASE_SIZE_OPTIONS = "-Os -finline-limit=20 -ffunction-sections -fdata-sections";
-RELEASE_FLAGS = "";
-RELEASE_LINK = "-Wl,--gc-sections";
-DEBUGGER = "gdb";
-PATH = "";
-INCLUDE = "/usr/include/freetype2;/usr/include/gtk-2.0;/usr/include/glib-2.0;/usr/lib/glib-2.0/include;/usr/lib/gtk-2.0/include;/usr/include/cairo;/usr/include/pango-1.0;/usr/include/atk-1.0;/usr/X11R6/include;/usr/X11R6/include/freetype2;/usr/X11R6/include/gtk-2.0;/usr/X11R6/include/glib-2.0;/usr/X11R6/lib/glib-2.0/include;/usr/X11R6/lib/gtk-2.0/include;/usr/X11R6/include/cairo;/usr/X11R6/include/pango-1.0;/usr/X11R6/include/atk-1.0;/usr/include/c++/4.5.0;/usr/include/c++/4.5.0/i686-pc-linux-gnu;/usr/include/webkit-1.0;/usr/include/libsoup-2.4;/usr/include/libxml2";
-LIB = "/usr/X11R6/lib;/usr/lib;/usr/local/lib";
-REMOTE_HOST = "";
-REMOTE_OS = "";
-REMOTE_TRANSFER = "";
-REMOTE_MAP = "";
-LINKMODE_LOCK = "0";
diff --git a/pcr/upp-svn/PKGBUILD b/pcr/upp-svn/PKGBUILD
deleted file mode 100644
index 1a5a50d4b..000000000
--- a/pcr/upp-svn/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# Contributor: Jan Dolinar <dolik.rce@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=upp-svn
-pkgver=5554
-pkgrel=1
-pkgdesc="Radical and innovative multiplatform C++ framework (known as U++)"
-arch=('any')
-url="http://www.ultimatepp.org"
-license=('BSD')
-groups=()
-depends=('gcc-libs' 'libpng' 'libxft' 'theide')
-makedepends=('subversion')
-optdepends=('libnotify: Enables compiling gtk-styled apps')
-provides=('upp')
-conflicts=('upp')
-replaces=()
-backup=()
-options=(emptydirs !strip)
-install=
-source=('GCC.bm' 'license.txt')
-noextract=()
-
-_svntrunk="http://upp-mirror.googlecode.com/svn/trunk/"
-# many users have already working copy of U++ on their system, so they
-# can use it for building (e.g. to save network traffic or to speed up
-# things) by setting $UPPSVN environment variable
-if [ "x$UPPSVN" != "x" ]
-then
-  _svnmod=$UPPSVN
-else
-  _svnmod="$srcdir/uppsvn"
-fi
-
-build() {
-  cd "$srcdir"
-  #get sources
-  msg "Downloading sources from svn..."
-  for n in bazaar reference examples tutorial uppsrc
-  do
-    msg2 "$n"
-    if [ -d $_svnmod/.svn ]; then
-      (cd $_svnmod/$n && svn up -r $pkgver)
-    else
-      svn co $_svntrunk$n/ --config-dir ./ -r $pkgver $_svnmod/$n
-    fi
-  done
-  msg "SVN checkout done (or server timeout)"
-}
-
-package() {
-  #copy source files
-  mkdir -p "$pkgdir/usr/share/upp"
-  msg2 "Copying the source codes..."
-  cp -r "$_svnmod/"{bazaar,examples,reference,tutorial,uppsrc} "$pkgdir/usr/share/upp/"
-  echo "#define IDE_VERSION \"$pkgver-Arch-$(uname -m)\"" > "$pkgdir/usr/share/upp/uppsrc/ide/version.h"
-  msg2 "Removing the .svn directories..."
-  find "$pkgdir/" -type d -name ".svn" -exec rm -rf {} \; -prune
-  #license
-  mkdir -p "$pkgdir/usr/share/licenses/upp-svn"
-  cp "$srcdir/license.txt" "$pkgdir/usr/share/licenses/upp-svn"
-  #build method
-  cp "$srcdir/GCC.bm" "$pkgdir/usr/share/upp"
-  #fix permissions
-  msg2 "Setting permissions..."
-  find "$pkgdir/usr/" -type f -exec chown root:root {} \; -exec chmod 644 {} \;
-}
diff --git a/pcr/upp-svn/license.txt b/pcr/upp-svn/license.txt
deleted file mode 100644
index 6cea058a6..000000000
--- a/pcr/upp-svn/license.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Copyright (C) 2010 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
- 
-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 of the Software and its Copyright notices. In addition publicly documented acknowledgment must be given that this software has been used if no source code of this software is made available publicly. This includes
-acknowledgments in either Copyright notices, Manuals, Publicity and Marketing documents or any documentation provided with any product containing this software. This License does not apply to any software that links to the libraries provided by this software (statically or dynamically), but only to
-the software provided.
- 
-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 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/vcstools/PKGBUILD b/pcr/vcstools/PKGBUILD
deleted file mode 100644
index 3eb123ffa..000000000
--- a/pcr/vcstools/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Georg Bremer <pkgbuild@dschoordsch.de>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=('vcstools')
-pkgver=0.1.24
-pkgrel=1
-pkgdesc=""
-arch=('any')
-url="http://ros.org/"
-license=('BSD')
-groups=()
-depends=('python2' 'python2-yaml' 'python2-distribute')
-makedepends=()
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-source=("http://pr.willowgarage.com/downloads/vcstools/vcstools-$pkgver.tar.gz")
-
-noextract=()
-
-build() {
-  echo ""
-}
-
-package() {
-    cd "$srcdir/vcstools-$pkgver"
-    python2 setup.py install --root "$pkgdir"
-}
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/video_entropyd/PKGBUILD b/pcr/video_entropyd/PKGBUILD
deleted file mode 100644
index e096aabdd..000000000
--- a/pcr/video_entropyd/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: fauno <fauno@parabola.nu>
-pkgname=video_entropyd
-pkgver=2.0
-pkgrel=1
-pkgdesc="Feeds the /dev/random device with entropy-data read from a video device"
-arch=('i686')
-url="http://vanheusden.com/ved/"
-license=('GPL2')
-groups=('entropy')
-source=(http://www.vanheusden.com/ved/${pkgname}-${pkgver}.tgz
-        ${pkgname}.service)
-sha1sums=('9d566bce8d0f0fa4e8be24b481ffdba0d0c70406'
-          '30cfb694ee886e36ab97329d575a8b9437a30bb2')
-sha256sums=('aba6255ddb32cd376c785128a7e850fb51b6c1d7fe3f4ba765abc0c50ec67d7a'
-            'b6988df79823a29ab04bfa0fe6d8f2e14f3176398eb220fa1248c6728e8be27f')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-  install -D -m 755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
-  install -D -m 644 ${srcdir}/${pkgname}.service \
-                    ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-}
diff --git a/pcr/video_entropyd/video_entropyd.service b/pcr/video_entropyd/video_entropyd.service
deleted file mode 100644
index 1dfef410a..000000000
--- a/pcr/video_entropyd/video_entropyd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Gathering entropy from video
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/video_entropyd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/vim-ifdef/PKGBUILD b/pcr/vim-ifdef/PKGBUILD
deleted file mode 100644
index 1fb983cb3..000000000
--- a/pcr/vim-ifdef/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Contributor: Manuel Mendez <mmendez534 at gmail dot com>
-# Author: Laszlo Papp <djszapi @ gmail at com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=vim-ifdef
-pkgver=3.2
-_scriptid=16097
-pkgrel=1
-pkgdesc="C Preprocessor Highlighting"
-arch=(any)
-url="http://www.vim.org/scripts/script.php?script_id=7"
-license=('custom')
-depends=(vim)
-install=vimdoc.install
-source=(ifdef.vim::http://www.vim.org/scripts/download_script.php?src_id=${_scriptid})
-
-build() {
-    cd "$srcdir"
-    install -Dm644 ifdef.vim "$pkgdir"/usr/share/vim/syntax/ifdef.vim
-    sed -n '/^" Copyright/,/^\s*$/ p' ifdef.vim |
-    	sed -e 's|^" ||' -e '/^\s*$/ d' > extracted-license.txt
-    install -Dm644 extracted-license.txt "$pkgdir"/usr/share/licenses/$pkgname/license.txt
-}
diff --git a/pcr/vim-ifdef/vimdoc.install b/pcr/vim-ifdef/vimdoc.install
deleted file mode 100644
index 61c4b3a81..000000000
--- a/pcr/vim-ifdef/vimdoc.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-    echo -n "Updating vim help tags..."
-    /usr/bin/vim --noplugins -u NONE -U NONE \
-        --cmd ":helptags /usr/share/vim/doc" --cmd ":q" > /dev/null 2>&1
-    echo "done."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install
-}
diff --git a/pcr/vuurmuur/PKGBUILD b/pcr/vuurmuur/PKGBUILD
deleted file mode 100644
index 8aed82655..000000000
--- a/pcr/vuurmuur/PKGBUILD
+++ /dev/null
@@ -1,139 +0,0 @@
-# vim:set ts=2 sw=2 et ft=sh tw=100: expandtab
-# Contributor: Piotr Rogoża <rogoza dot piotr at gmail dot com>
-# Contributor: skydrome <skydrome@i2pmail.org>
-# Contributor: Valere Monseur <valere_monseur@hotmail.com>
-# Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com>
-# Contributor: (asper, noob
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=vuurmuur
-_pkgname=Vuurmuur
-pkgver=0.7
-pkgrel=1
-pkgdesc='powerful front-end for iptables aimed at system-administrators who need a decent firewall, but dont have netfilter specific knowledge'
-arch=('i686' 'x86_64')
-url='http://www.vuurmuur.org'
-license=('GPL')
-install='vuurmuur.install'
-depends=('iptables' 'ncurses' 'libjpeg')
-optdepends=('conntrack-tools: for connection tracking'
-            'iproute2: for traffic shapping'
-            'iptrafvol: for traffic volume logging')
-conflicts=(vuurmuur-devel)
-backup=('etc/vuurmuur/config.conf'
-        'etc/vuurmuur/modules.conf'
-        'etc/vuurmuur/vuurmuur_conf.conf'
-        'etc/vuurmuur/plugins/textdir.conf'
-        'etc/logrotate.d/vuurmuur')
-source=(
-ftp://ftp.vuurmuur.org/releases/$pkgver/${_pkgname}-$pkgver.tar.gz
-modules.conf
-vuurmuur.rc
-vuurmuur.service
-vuurmuur.script
-)
-build() {
-    cd ${srcdir}/${_pkgname}-${pkgver}
-
-    for archive in libvuurmuur vuurmuur vuurmuur_conf; do
-        [[ ! -d "$archive" ]] &&
-            tar xzf ${archive}-${pkgver}.tar.gz
-    done
-
-    msg "building vuurmuur libraries..."
-    pushd libvuurmuur-${pkgver}
-    ./configure --prefix=/usr --sysconfdir=/etc
-    make
-    popd
-
-    msg "building vuurmuur..."
-    pushd vuurmuur-${pkgver}
-    sed -i 's|-rpath|-rpath-link|' configure
-    LDFLAGS+="-L${srcdir}/${_pkgname}-${pkgver}/lib${pkgname}-${pkgver}/src \
-              -L${srcdir}/${_pkgname}-${pkgver}/lib${pkgname}-${pkgver}/src/.libs \
-              -Wl,-rpath=/usr/lib/${pkgname}/plugins" \
-    ./configure --prefix=/usr --sysconfdir=/etc \
-                --with-libvuurmuur-includes="${srcdir}/${_pkgname}-${pkgver}/lib${pkgname}-${pkgver}/src" \
-                --with-libvuurmuur-libraries="${srcdir}/${_pkgname}-${pkgver}/lib${pkgname}-${pkgver}/src"
-    make
-    popd
-
-    msg "building vuurmuur_conf..."
-    pushd vuurmuur_conf-${pkgver}
-    sed -i 's|-rpath|-rpath-link|' configure
-    LDFLAGS+="-L${srcdir}/${_pkgname}-${pkgver}/lib${pkgname}-${pkgver}/src \
-               -L${srcdir}/${_pkgname}-${pkgver}/lib${pkgname}-${pkgver}/src/.libs \
-               -Wl,-rpath=/usr/lib/${pkgname}/plugins" \
-    ./configure --prefix=/usr --sysconfdir=/etc \
-                --with-libvuurmuur-includes="${srcdir}/${_pkgname}-${pkgver}/lib${pkgname}-${pkgver}/src" \
-                --with-libvuurmuur-libraries="${srcdir}/${_pkgname}-${pkgver}/lib${pkgname}-${pkgver}/src"
-    make
-    popd
-}
-
-package() {
-    cd ${srcdir}/${_pkgname}-${pkgver}
-
-    pushd libvuurmuur-${pkgver}
-    make DESTDIR=${pkgdir} install
-    popd
-
-    pushd vuurmuur-${pkgver}
-    make DESTDIR=${pkgdir} install
-    popd
-
-    pushd vuurmuur_conf-${pkgver}
-    make DESTDIR=${pkgdir} install
-    popd
-
-    # make directory structure
-    install -dm700 ${pkgdir}/etc/${pkgname}
-    install -dm700 ${pkgdir}/etc/${pkgname}/plugins
-    install -dm700 ${pkgdir}/etc/logrotate.d/
-    install -dm755 ${pkgdir}/usr/share/${pkgname}/textdir/{interfaces,services,zones,rules}
-    install -dm700 ${pkgdir}/var/log/${pkgname}
-
-    # install daemon and log
-    install -Dm755 ${srcdir}/vuurmuur.rc ${pkgdir}/etc/rc.d/${pkgname}
-    install -Dm644 ${pkgdir}/usr/share/${pkgname}/scripts/vuurmuur-logrotate ${pkgdir}/etc/logrotate.d/${pkgname}
-
-    # install systemd's files
-    install -Dm755 $srcdir/vuurmuur.script $pkgdir/usr/lib/systemd/scripts/vuurmuur
-    install -Dm644 $srcdir/vuurmuur.service $pkgdir/usr/lib/systemd/system/vuurmuur.service
-
-    # install configuration
-    install -Dm600 ${pkgdir}/usr/share/vuurmuur/config/config.conf.sample \
-                    ${pkgdir}/etc/${pkgname}/config.conf
-    install -Dm600 ${srcdir}/modules.conf ${pkgdir}/etc/${pkgname}/modules.conf
-    install -Dm600 ${pkgdir}/usr/share/vuurmuur/config/vuurmuur_conf.conf.sample \
-                    ${pkgdir}/etc/${pkgname}/${pkgname}_conf.conf
-
-    sed -i ${pkgdir}/etc/${pkgname}/config.conf \
-        -e 's|"/sbin/tc|"/usr/sbin/tc|' \
-        -e 's|"/sbin/ip6tables|"/usr/sbin/ip6tables|' \
-        -e 's|"/sbin/iptables|"/usr/sbin/iptables|' \
-        -e 's|"/sbin/ip6tables-restore|"/usr/sbin/ip6tables-restore|' \
-        -e 's|"/sbin/iptables-restore|"/usr/sbin/iptables-restore|' \
-        -e 's|"/var/log/messages|"/var/log/iptables.log|'
-
-    sed -i ${pkgdir}/etc/${pkgname}/${pkgname}_conf.conf \
-        -e 's|"/usr/bin/iptrafvol.pl|"/usr/sbin/iptrafvol.pl|'
-
-
-    echo "LOCATION=\"/etc/${pkgname}/textdir\"" > ${pkgdir}/etc/${pkgname}/plugins/textdir.conf
-
-    # default firewall setup in /usr/share
-    touch ${pkgdir}/usr/share/${pkgname}/textdir/rules/rules.conf
-    touch ${pkgdir}/usr/share/${pkgname}/textdir/rules/blocklist.conf
-
-    cp -R ${srcdir}/${_pkgname}-${pkgver}/zones/*   ${pkgdir}/usr/share/${pkgname}/textdir/zones/
-    mv    ${pkgdir}/usr/share/${pkgname}/services/* ${pkgdir}/usr/share/${pkgname}/textdir/services/
-
-    # install licenses
-    install -Dm644 ${srcdir}/${_pkgname}-${pkgver}/lib${pkgname}-${pkgver}/COPYING \
-                    ${pkgdir}/usr/share/licenses/lib${pkgname}/COPYING
-    install -Dm644 ${srcdir}/${_pkgname}-${pkgver}/${pkgname}-${pkgver}/COPYING \
-                    ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-    install -Dm644 ${srcdir}/${_pkgname}-${pkgver}/${pkgname}_conf-${pkgver}/COPYING \
-                    ${pkgdir}/usr/share/licenses/${pkgname}_conf/COPYING
-}
diff --git a/pcr/vuurmuur/modules.conf b/pcr/vuurmuur/modules.conf
deleted file mode 100644
index eda78a036..000000000
--- a/pcr/vuurmuur/modules.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# modules loaded by vuurmuur daemon
-# ip_queue => not found
-MODULES_TO_LOAD="ip_tables iptable_filter iptable_mangle iptable_nat ip_conntrack ipt_state ip_conntrack_ftp ip_nat_ftp"
diff --git a/pcr/vuurmuur/vuurmuur.install b/pcr/vuurmuur/vuurmuur.install
deleted file mode 100644
index 0f596b8c9..000000000
--- a/pcr/vuurmuur/vuurmuur.install
+++ /dev/null
@@ -1,27 +0,0 @@
-post_install() {
-  if [[ ! -d /etc/vuurmuur/textdir ]]; then
-    # copy default firewall setup
-    cp -R /usr/share/vuurmuur/textdir /etc/vuurmuur/
-
-    # set permissions and ownership
-    chown -R root:root /etc/vuurmuur
-    chmod -R o=rwX,go= /etc/vuurmuur
-    chown -R root:root /var/log/vuurmuur
-    chmod -R o=rwX,go= /var/log/vuurmuur
-
-    echo
-    echo "Default firewall setup has been installed in /etc/vuurmuur/textdir"
-    echo
-    echo "You can now setup your network topology and firewall rules using vuurmuur_conf"
-    echo "Don't forget to add 'vuurmuur' in /etc/rc.conf"
-    echo
-    echo "Usefull documentation can be found at http://www.vuurmuur.org"
-    echo
-  fi
-}
-
-post_remove () {
-  echo
-  echo "Your firewall setup has been left unchanged in /etc/vuurmuur/textdir"
-  echo
-}
diff --git a/pcr/vuurmuur/vuurmuur.rc b/pcr/vuurmuur/vuurmuur.rc
deleted file mode 100644
index 3b4d3e99e..000000000
--- a/pcr/vuurmuur/vuurmuur.rc
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash
-# vi: ft=sh
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# PID file
-VUURMUURPID='/run/vuurmuur.pid'
-VUURMUURLOGPID='/run/vuurmuur_log.pid'
-case $1 in
-start)
-    # initialize
-    stat_busy "Starting Vuurmuur Firewall"
-    STATUS="ok"
-
-    # check if vuurmuur is configured
-    IFNUM=`/usr/bin/vuurmuur_script --list --interface any | wc -l`
-    if [ $IFNUM = 0 ]; then
-        stat_busy "Please configure Vuurmuur first by defining at least one interface."
-        stat_fail
-        exit 1
-    fi
-
-    # load modules
-    . /etc/vuurmuur/modules.conf
-    for MODULE in `echo $MODULES_TO_LOAD`; do
-        /sbin/modprobe $MODULE &>/dev/null
-        if [ $? != 0 ]; then
-            stat_busy "Error when loading module $MODULE. Check log files."
-            stat_fail
-            exit 1
-        fi
-    done
-
-    # start vuurmuur daemon
-    if [ ! -f $VUURMUURPID ]; then
-        /usr/bin/vuurmuur -l
-        if [ $? != 0 ]; then
-            stat_busy "Error when starting Vuurmuur daemon. Check log files."
-            STATUS="failed"
-        fi
-    else
-        PID=`cat $VUURMUURPID | cut -d " " -f 1`
-        stat_busy "Error when starting Vuurmuur daemon. Already running at pid $PID."
-        STATUS="failed"
-    fi
-
-    # start vuurmuur log parsing daemon
-    if [ ! -f $VUURMUURLOGPID ]; then
-        /usr/bin/vuurmuur_log
-        if [ $? != 0 ]; then
-            stat_busy "Error when starting Vuurmuur log parsing daemon. Check log files."
-            STATUS="failed"
-        fi
-    else
-        PID=`cat $VUURMUURLOGPID | cut -d " " -f 1`
-        stat_busy "Error when starting Vuurmuur log parsing daemon. Already running at pid $PID."
-        STATUS="failed"
-    fi
-
-    # finalize
-    if [ $STATUS = "ok" ]; then
-        add_daemon vuurmuur
-        stat_done
-    else
-        stat_fail
-        exit 1
-    fi
-    ;;
-
-stop)
-    # initialize
-    stat_busy "Stopping Vuurmuur Firewall"
-    STATUS="ok"
-
-    # stop vuurmuur log parsing daemon
-    PID=`cat $VUURMUURLOGPID | cut -d " " -f 1`
-    if [[ ! -z $PID ]] && kill "$PID" &>/dev/null; then
-        rm -f $VUURMUURLOGPID
-    else
-        stat_busy "Error when stopping Vuurmuur log parsing daemon. Check log files."
-        STATUS="failed"
-    fi
-
-    # stop vuurmuur daemon
-    PID=`cat $VUURMUURPID | cut -d " " -f 1`
-    if [[ ! -z $PID ]] && kill "$PID" &>/dev/null; then
-        rm -f $VUURMUURPID
-    else
-        stat_busy "Error when stopping Vuurmuur daemon. Check log files."
-        STATUS="failed"
-    fi
-
-    # finalize
-    if [ $STATUS = "ok" ]; then
-        rm_daemon vuurmuur
-        stat_done
-    else
-        stat_fail
-        exit 1
-    fi
-    ;;
-
-restart)
-    $0 stop
-    $0 start
-    ;;
-
-*)
-    echo "Usage: $0 {start|stop|restart}" >&2
-    exit 1
-
-esac
-exit 0
diff --git a/pcr/vuurmuur/vuurmuur.script b/pcr/vuurmuur/vuurmuur.script
deleted file mode 100644
index a643d6fbd..000000000
--- a/pcr/vuurmuur/vuurmuur.script
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-
-VUURMUURPID='/run/vuurmuur.pid'
-VUURMUURLOGPID='/run/vuurmuur_log.pid'
-start() {
-    IFNUM=`/usr/bin/vuurmuur_script --list --interface any | wc -l`
-    if [ $IFNUM = 0 ]; then
-        echo "Please configure Vuurmuur first by defining at least one interface."
-        exit 1
-    fi
-
-    # load modules
-    . /etc/vuurmuur/modules.conf
-    for MODULE in `echo $MODULES_TO_LOAD`; do
-        /sbin/modprobe $MODULE &>/dev/null
-        if [ $? != 0 ]; then
-            echo "Error when loading module $MODULE. Check log files."
-            exit 1
-        fi
-    done
-
-    # start vuurmuur daemon
-    if [ ! -f $VUURMUURPID ]; then
-        /usr/bin/vuurmuur -l
-        if [ $? != 0 ]; then
-            echo "Error when starting Vuurmuur daemon. Check log files."
-            STATUS="failed"
-        fi
-    else
-        PID=`cat $VUURMUURPID | cut -d " " -f 1`
-        echo "Error when starting Vuurmuur daemon. Already running at pid $PID."
-        STATUS="failed"
-    fi
-
-    # start vuurmuur log parsing daemon
-    if [ ! -f $VUURMUURLOGPID ]; then
-        /usr/bin/vuurmuur_log
-        if [ $? != 0 ]; then
-            echo "Error when starting Vuurmuur log parsing daemon. Check log files."
-            STATUS="failed"
-        fi
-    else
-        PID=`cat $VUURMUURLOGPID | cut -d " " -f 1`
-        echo "Error when starting Vuurmuur log parsing daemon. Already running at pid $PID."
-        STATUS="failed"
-    fi
-
-    # finalize
-    if [ $STATUS = "failed" ]; then
-        exit 1
-    fi
-}
-stop() {
-    # initialize
-    echo "Stopping Vuurmuur Firewall"
-    STATUS="ok"
-
-    # stop vuurmuur log parsing daemon
-    PID=`cat $VUURMUURLOGPID | cut -d " " -f 1`
-    if [[ ! -z $PID ]] && kill "$PID" &>/dev/null; then
-        rm -f $VUURMUURLOGPID
-    else
-        echo "Error when stopping Vuurmuur log parsing daemon. Check log files."
-        STATUS="failed"
-    fi
-
-    # stop vuurmuur daemon
-    PID=`cat $VUURMUURPID | cut -d " " -f 1`
-    if [[ ! -z $PID ]] && kill "$PID" &>/dev/null; then
-        rm -f $VUURMUURPID
-    else
-        echo "Error when stopping Vuurmuur daemon. Check log files."
-        STATUS="failed"
-    fi
-
-    # finalize
-    if [ $STATUS = "false" ]; then
-        exit 1
-    fi
-}
-restart() {
-    $0 stop
-    $0 start
-}
-
-case $1 in
-    start|stop|restart) "$1" ;;
-esac
diff --git a/pcr/vuurmuur/vuurmuur.service b/pcr/vuurmuur/vuurmuur.service
deleted file mode 100644
index 3defcaa82..000000000
--- a/pcr/vuurmuur/vuurmuur.service
+++ /dev/null
@@ -1,13 +0,0 @@
-# vi: ft=systemd
-[Unit]
-Description=Powerful front-end for iptables 
-After=syslog.target network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/lib/systemd/scripts/vuurmuur start
-ExecStop=/usr/lib/systemd/scripts/vuurmuur stop
-ExecReload=/usr/lib/systemd/scripts/vuurmuur restart
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/wallchange/PKGBUILD b/pcr/wallchange/PKGBUILD
deleted file mode 100755
index f8465bda5..000000000
--- a/pcr/wallchange/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Wallchange
-# Contributor: ying <Jinoto Systems>
-# Contributor: ying <Jinoto Systems>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=wallchange
-pkgver=1.2
-pkgrel=1
-pkgdesc="A small and simple command tool which is changing the wallpaper on a switch to the next virtual desktop."
-url="https://sourceforge.net/projects/wallchange-slim/files/"
-arch=('i686' 'x86_64')
-install=wallchange.install
-license=('GPL2')
-depends=('eterm' 'archlinux-wallpaper') # 'eterm' can be changed in any command tool to draw the wallpaper.
-optdepends=('eterm' 'habak' 'feh' 'hsetroot' 'others')
-source=("https://downloads.sourceforge.net/project/wallchange-slim/wallchange-${pkgver}.tar.gz?r=&ts=1289391543&use_mirror=master" wallchange.conf)
-
-
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	make all
-}
-package() {
-	install -Dm755 ${pkgname}-${pkgver}/wallchange $pkgdir/usr/bin/wallchange || return
-	install -Dm755 wallchange.conf $pkgdir/usr/share/wallchange/wallchange.conf || return 
-}
-
-
-
-
-md5sums=('840425f1c724aea198b7cd378fba708d'
-         'd4a9b5c9b341eee1651269139e1f91c9')
-md5sums=('840425f1c724aea198b7cd378fba708d'
-         'd4a9b5c9b341eee1651269139e1f91c9')
diff --git a/pcr/wallchange/wallchange.conf b/pcr/wallchange/wallchange.conf
deleted file mode 100644
index 9deda3c92..000000000
--- a/pcr/wallchange/wallchange.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# Wallchange configuration file
-
-# specify the command to draw the wallpaper
-command=Esetroot -s
-
-
-# specify the wallpapers which will be used on a desktop switch.
-
-
-# Wallpaper for the first desktop
-wallpaper=/usr/share/archlinux/wallpaper/archlinux-simplyblack.png
-
-# Wallpaper for the second desktop
-wallpaper=/usr/share/archlinux/wallpaper/archlinux-poolclouds.jpg
-
-# Wallpaper for the third desktop
-wallpaper=/usr/share/archlinux/wallpaper/archlinux-carbonite-knight.jpg
-
-# Wallpaper for the fourth desktop
-wallpaper=/usr/share/archlinux/wallpaper/archlinux-burn.jpg
-
-
-
diff --git a/pcr/wallchange/wallchange.install b/pcr/wallchange/wallchange.install
deleted file mode 100644
index ceb90e348..000000000
--- a/pcr/wallchange/wallchange.install
+++ /dev/null
@@ -1,13 +0,0 @@
-
-post_install() {
-    echo ""
-  echo -e "\033[37;41;1m Read First \033[0m"  
-  echo "Please copy the /usr/share/wallchange/wallchange.conf configuration file to you home folder(~/.wallchange.conf). Enjoy!"
-  echo ""
-}
-
-op=$1
-shift
-$op "$@"
-
-
diff --git a/pcr/wdiff/PKGBUILD b/pcr/wdiff/PKGBUILD
deleted file mode 100644
index 41bee9679..000000000
--- a/pcr/wdiff/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=wdiff
-pkgver=1.2.1
-pkgrel=1
-pkgdesc="A front end to diff for comparing files on a word per word basis."
-arch=('i686' 'x86_64')
-url="https://www.gnu.org/software/$pkgname/"
-license=('GPL3')
-depends=('diffutils')
-source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
-md5sums=('fc54e044b229a23c1cfa8e5689196f24')
diff --git a/pcr/whysynth/PKGBUILD b/pcr/whysynth/PKGBUILD
deleted file mode 100644
index 8d2895984..000000000
--- a/pcr/whysynth/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-pkgname=whysynth
-pkgver=20120903
-pkgrel=1
-pkgdesc="A versatile softsynth plugin for the DSSI Soft Synth Interface"
-arch=('i686')
-url="http://www.smbolton.com/whysynth.html"
-depends=('alsa-lib' 'liblo' 'gtk2' 'fftw')
-makedepends=('dssi' 'ladspa')
-license=('GPL')
-source=(http://www.smbolton.com/whysynth/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b521b63ade13b09062a64c46d2eabee2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install || return 1
-  find ${pkgdir}/usr/lib -name '*.la' -exec rm {} \; || return 1
-}
diff --git a/pcr/wikipediafs/PKGBUILD b/pcr/wikipediafs/PKGBUILD
deleted file mode 100644
index d70dd2f6f..000000000
--- a/pcr/wikipediafs/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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/wmii-hg/PKGBUILD b/pcr/wmii-hg/PKGBUILD
deleted file mode 100644
index c556a1b88..000000000
--- a/pcr/wmii-hg/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-# Maintainer (AUR): N30N <archlinux@alunamation.com>
-# Contributor: Anthony Martin <ality@pbrane.org>
-# Contributer: thomasd <thdahms@gmx.de>
-# Contributer: karnath <karnath@pop3.ru>
-# Contributer: MrBougo <bougospam@gmail.com>
-# Contributor: Wolf Ramovsky <wolf.ramovsky@gmail.com>
-
-pkgname=wmii-hg
-pkgver=2813
-pkgdesc="A small, dynamic window manager for X11"
-url="https://code.google.com/p/wmii/"
-license=("MIT")
-
-provides=("wmii")
-conflicts=("wmii")
-
-pkgrel=1
-arch=("i686" "x86_64")
-depends=('libxft' 'libxrandr' 'libxinerama')
-makedepends=('txt2tags' 'libixp') # libixp is statically linked
-
-source=("libre://${pkgname}-${pkgver}.tar.gz")
-md5sums=('74eb9f91000321b587e7826be999d4de')
-
-mkdepends=('mercurial')
-mksource=("$pkgname-$pkgver::hg+https://code.google.com/p/wmii/#revision=${pkgver}")
-mkmd5sums=('SKIP')
-mksource() {
-	# don't include this precompiled binary (probably included by accident)
-	rm "${srcdir}/${pkgname}-${pkgver}/lib/libutf/libutf.a"
-}
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	export LDFLAGS+=',--no-as-needed'
-	sed -i 's|PREFIX = /usr/local|PREFIX = /usr|' config.mk
-	sed -i 's|ETC = $(PREFIX)/etc|ETC = /etc|' config.mk
-	sed -i 's|PYTHON = .*|PYTHON = python2|' config.mk
-	echo 'CFLAGS += -O2' >> config.mk
-	sed -i 's# !=#!=#' mk/hdr.mk
-
-	export MAKEFLAGS="-j1"
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-
-	install -Dm644 img/wmii.png "${pkgdir}"/usr/share/pixmaps/wmii.png
-	install -Dm644 debian/file/wmii.desktop "${pkgdir}"/usr/share/xsessions/wmii.desktop
-	install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/pcr/xcftools/PKGBUILD b/pcr/xcftools/PKGBUILD
deleted file mode 100644
index 414149f85..000000000
--- a/pcr/xcftools/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Jonathan Frawley <jonathanfrawley@gmail.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-pkgname=xcftools
-pkgver=1.0.7
-pkgrel=2
-pkgdesc="Miscellaneous command line tools for use with the open ${pkgname::3} format used by The GIMP."
-url=http://henning.makholm.net/software
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-license=(
-  GPL2
-  perl
-)
-depends=(
-  libpng
-  perl
-)
-optdepends=gimp
-makedepends=libpng
-source=(
-  http://henning.makholm.net/$pkgname/$pkgname-$pkgver.tar.gz
-  $pkgname.patch
-)
-md5sums=(
-  fd960b6470fb23520fc4b1ade6cf6e25
-  7439f6a8369a12913243ded6c93d31e1
-)
-
-build() {
-    cd $srcdir/$pkgname-$pkgver
-    patch -i ../$pkgname.patch
-    /bin/bash configure --prefix=/usr
-    setarch $CARCH make
-}
-
-package() {
-    cd $srcdir/$pkgname-$pkgver
-    setarch $CARCH make DESTDIR=$pkgdir install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/xcftools/xcftools.patch b/pcr/xcftools/xcftools.patch
deleted file mode 100644
index 1a2d88c14..000000000
--- a/pcr/xcftools/xcftools.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -rupN xcftools-1.0.7.old/Makefile.in xcftools-1.0.7/Makefile.in
---- xcftools-1.0.7.old/Makefile.in	2009-07-03 11:31:56.000000000 +0100
-+++ xcftools-1.0.7/Makefile.in	2012-01-03 13:03:51.152358830 +0000
-@@ -79,7 +79,7 @@ xcf2pnm$e: xcf2pnm.$o $(FILEIO).$o enums
- 
- xcf2png$e: xcf2png.$o $(FILEIO).$o enums.$o xcf-general.$o utils.$o nlsini.$o \
- 	   pixels.$o flatten.$o flatspec.$o scaletab.$o table.$o palette.$o
--	$(CC) $(LDFLAGS) $(LIBS) -lpng $^ -o $@
-+	$(CC) $(LDFLAGS) $(LIBS) $^ -lpng -o $@
- 
- xcfview: xcfview.in Makefile
- 	sed '1s,/usr/bin/perl,@PERL@,' < $< > $@
-diff -rupN xcftools-1.0.7.old/xcf2png.c xcftools-1.0.7/xcf2png.c
---- xcftools-1.0.7.old/xcf2png.c	2009-07-03 11:31:52.000000000 +0100
-+++ xcftools-1.0.7/xcf2png.c	2012-01-03 13:03:36.262509165 +0000
-@@ -71,9 +71,9 @@ init_output(void)
-   
-   outfile = openout(flatspec.output_filename);
-   libpng = png_create_write_struct(PNG_LIBPNG_VER_STRING,
--                                   png_voidp_NULL,
-+                                   (png_voidp)NULL,
-                                    my_error_callback,
--                                   png_error_ptr_NULL);
-+                                   (png_voidp)NULL);
-   if( !libpng )
-     FatalUnexpected(_("Couldn't initialize libpng library"));
-   
diff --git a/pcr/xchat-otr/PKGBUILD b/pcr/xchat-otr/PKGBUILD
deleted file mode 100644
index 7bc6e8c41..000000000
--- a/pcr/xchat-otr/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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/xf86-input-wizardpen/PKGBUILD b/pcr/xf86-input-wizardpen/PKGBUILD
deleted file mode 100644
index dfad17f34..000000000
--- a/pcr/xf86-input-wizardpen/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=xf86-input-wizardpen
-_pkgname=${pkgname:11}
-pkgver=0.8.1
-pkgrel=4
-pkgdesc="X.Org ${_pkgname^}/Genius tablet driver for GNU/Linux-libre"
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url=https://launchpad.net/$_pkgname
-license=GPL2
-depends=glibc
-makedepends=xorg-server-devel
-conflicts=(
-  $_pkgname
-  $_pkgname-driver
-)
-replaces=(
-  $_pkgname
-  $_pkgname-driver
-)
-source=http://launchpad.net/$_pkgname/trunk/${pkgver::3}/+download/${pkgname/xf86/xorg}-$pkgver.tar.bz2
-sha512sums=8830febe579231a2990dd31fad7db1d16424ad01b7226e0b09bd6287070f8099338f2f3e4d715772ed6616d7e13b52e83e816c400b638d47f1f92c30ec677d59
-
-prepare() {
-  cd $srcdir/${pkgname/xf86/xorg}-$pkgver
-  sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' configure.ac
-}
-
-build() {
-  cd $srcdir/${pkgname/xf86/xorg}-$pkgver
-  setarch $CARCH ./autogen.sh --prefix=/usr\
-     --with-xorg-conf-dir=/etc/X11/xorg.conf.d
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/${pkgname/xf86/xorg}-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-}
diff --git a/pcr/xfce-theme-greybird/PKGBUILD b/pcr/xfce-theme-greybird/PKGBUILD
deleted file mode 100644
index 74f21775e..000000000
--- a/pcr/xfce-theme-greybird/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Maintainer: Limao Luo <luolimao+AUR@gmail.com>
-# Contributor: flan_suse
-
-# This suite contains the following:
-#        * xfwm4 theme
-#        * xfwm4 compact theme
-#        * metacity theme
-#        * emerald theme
-#        * gtk2 theme
-#        * gtk2 theme (classic)
-#        * gtk3 theme
-#        * gtk3 theme (classic)
-#        * unity theme
-#        * xfce4-notify theme
-#        * lightdm theme
-#        * wallpaper (found in the shimmer-wallpapers package; optdepends)
-
-# There have been some drastic changes as of July 22nd, 2012!
-# Please read through the AUR page comments if you wish to learn more.
-# I have modified this PKGBUILD to compensate for the drastic changes.
-
-pkgname=xfce-theme-greybird
-_pkgname=Greybird
-pkgver=1.1.1
-_pkgverclassic=0.8.2
-pkgrel=1
-pkgdesc="A grey and blue Xfce theme, used by default in Xubuntu 12.04; includes the classic low saturation theme"
-arch=(any)
-url=http://shimmerproject.org/projects/greybird/
-license=(CCPL:by-sa-3.0 GPL)
-groups=(xfce-themes-shimmer-collection)
-depends=(gtk-engine-murrine)
-optdepends=('elementary-xfce-icons: matching icon set; use the dark icon theme'
-    'gtk-engine-unico: required for gtk3 support for the classic theme; not required for the current theme'
-    'gtk3: required for CSS/GTK3 theme'
-    'lightdm-gtk-greeter: required for the LightDM GTK theme'
-    'lightdm-unity-greeter: required for the LightDM Unity theme'
-    'shimmer-wallpapers: contains the Greybird wallpaper, among others')
-conflicts=($pkgname-git)
-source=($pkgname-$pkgver.tar.gz::https://github.com/shimmerproject/$_pkgname/archive/v$pkgver.tar.gz
-    $pkgname-$_pkgverclassic.tar.gz::https://github.com/shimmerproject/$_pkgname/archive/v$_pkgverclassic.tar.gz)
-sha256sums=('374bc55d6af98ca6052cc5dd6c55db3b1ce9002fe81d3fde3e9b72febe697878'
-    'b63da3527760c194bb7299c1cb45297268439740e52e2c5e1f39fc31dce6293a')
-sha512sums=('1e4f7dea5e0206972d7d4a5bf42b353abf21e40d215fc1b0e7b546a4c95c7ce0604a37e9f2ad6c272fedf4720d0a5eee732a6b89d83c635c24082c24711c9e5e'
-    '09f19bbfe02a477de6635198736897d143a5eec8ed13e6d1863c80f5d78b341ecdf2b2cf48bffddead25082eeadde475d360fc7bee773307c5cc10fb3ff90034')
-
-package() {
-    local _themedir="$pkgdir/usr/share/themes"
-    install -d "$_themedir/$_pkgname "{Classic,Compact}
-
-    cp -rf $_pkgname-$pkgver/ "$_themedir"/$_pkgname/
-    rm "$_themedir"/$_pkgname/.gitignore
-    cp -rf $_pkgname-$_pkgverclassic/gtk-{2,3}.0 "$_themedir/$_pkgname Classic"
-    ln -s /usr/share/themes/$_pkgname/xfwm4_compact "$_themedir/$_pkgname Compact/xfwm4"
-}
diff --git a/pcr/xfwm4-titleless/PKGBUILD b/pcr/xfwm4-titleless/PKGBUILD
deleted file mode 100644
index dd80d287d..000000000
--- a/pcr/xfwm4-titleless/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor: Christian Hesse <mail@eworm.de>
-# Contributor: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-# Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@replicant.io>
-
-pkgname=xfwm4-titleless
-pkgver=4.10.1
-pkgrel=1
-pkgdesc="Xfce window manager - patched with option to hide titlebar when maximized"
-arch=('i686' 'x86_64')
-url="https://bitbucket.org/thesame/xfwm4-titleless"
-license=('GPL2')
-depends=('libxfce4ui' 'libwnck' 'hicolor-icon-theme')
-makedepends=('intltool')
-options=('!libtool')
-conflicts=('xfwm4')
-provides=('xfwm4')
-install=${pkgname%%-*}.install
-source=("http://archive.xfce.org/src/xfce/${pkgname%%-*}/4.10/${pkgname%%-*}-${pkgver}.tar.bz2"
-	"xfwm4-hide-titlebar-when-maximized.patch")
-
-build() {
-	cd "${srcdir}/${pkgname%%-*}-${pkgver}"
-
-	patch -Np1 < ${srcdir}/xfwm4-hide-titlebar-when-maximized.patch
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static \
-		--enable-startup-notification \
-		--enable-randr \
-		--enable-compositor \
-		--enable-xsync \
-		--disable-debug
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname%%-*}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-}
-
diff --git a/pcr/xfwm4-titleless/xfwm4-hide-titlebar-when-maximized.patch b/pcr/xfwm4-titleless/xfwm4-hide-titlebar-when-maximized.patch
deleted file mode 100644
index fa43b6b8e..000000000
--- a/pcr/xfwm4-titleless/xfwm4-hide-titlebar-when-maximized.patch
+++ /dev/null
@@ -1,1456 +0,0 @@
-From 999c375f5342947525813584fbdc92f3b63dced6 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <eworm@leda.eworm.de>
-Date: Wed, 25 Sep 2013 15:16:57 +0200
-Subject: [PATCH 1/1] xfwm4: hide titlebar when maximized
-
----
- defaults/defaults                          |   1 +
- settings-dialogs/tweaks-settings.c         |   5 +
- settings-dialogs/xfwm4-tweaks-dialog.glade |  25 +-
- settings-dialogs/xfwm4-tweaks-dialog_ui.h  | 612 +++++++++++++++--------------
- src/client.c                               |   6 +
- src/client.h                               |   1 +
- src/display.c                              |   3 +-
- src/display.h                              |   1 +
- src/events.c                               |   5 +
- src/frame.c                                | 366 ++++++++++-------
- src/netwm.c                                |  38 ++
- src/placement.c                            |   4 +-
- src/settings.c                             |   8 +
- src/settings.h                             |   1 +
- 14 files changed, 616 insertions(+), 460 deletions(-)
-
-diff --git a/defaults/defaults b/defaults/defaults
-index 6db210a..1582fc1 100644
---- a/defaults/defaults
-+++ b/defaults/defaults
-@@ -1,5 +1,6 @@
- activate_action=bring
- borderless_maximize=true
-+titleless_maximize=false
- box_move=false
- box_resize=false
- button_layout=O|SHMC
-diff --git a/settings-dialogs/tweaks-settings.c b/settings-dialogs/tweaks-settings.c
-index f60b606..2532733 100644
---- a/settings-dialogs/tweaks-settings.c
-+++ b/settings-dialogs/tweaks-settings.c
-@@ -180,6 +180,7 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder)
-     GtkWidget *easy_click_combo_box = GTK_WIDGET (gtk_builder_get_object (builder, "easy_click_combo_box"));
-     GtkWidget *raise_with_any_button_check = GTK_WIDGET (gtk_builder_get_object (builder, "raise_with_any_button_check"));
-     GtkWidget *borderless_maximize_check = GTK_WIDGET (gtk_builder_get_object (builder, "borderless_maximize_check"));
-+    GtkWidget *titleless_maximize_check = GTK_WIDGET (gtk_builder_get_object (builder, "titleless_maximize_check"));
-     GtkWidget *restore_on_move_check = GTK_WIDGET (gtk_builder_get_object (builder, "restore_on_move_check"));
-     GtkWidget *tile_on_move_check = GTK_WIDGET (gtk_builder_get_object (builder, "tile_on_move_check"));
-     GtkWidget *snap_resist_check = GTK_WIDGET (gtk_builder_get_object (builder, "snap_resist_check"));
-@@ -336,6 +337,10 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder)
-                             G_TYPE_BOOLEAN,
-                             (GObject *)borderless_maximize_check, "active");
-     xfconf_g_property_bind (xfwm4_channel,
-+                            "/general/titleless_maximize",
-+                            G_TYPE_BOOLEAN,
-+                            (GObject *)titleless_maximize_check, "active");
-+    xfconf_g_property_bind (xfwm4_channel,
-                             "/general/restore_on_move",
-                             G_TYPE_BOOLEAN,
-                             (GObject *)restore_on_move_check, "active");
-diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade b/settings-dialogs/xfwm4-tweaks-dialog.glade
-index bd2a86f..7d604c6 100644
---- a/settings-dialogs/xfwm4-tweaks-dialog.glade
-+++ b/settings-dialogs/xfwm4-tweaks-dialog.glade
-@@ -343,6 +343,21 @@ or "skip taskbar" properties set</property>
-                   </packing>
-                 </child>
-                 <child>
-+                  <object class="GtkCheckButton" id="titleless_maximize_check">
-+                    <property name="label" translatable="yes">Hide _title of windows when maximized</property>
-+                    <property name="visible">True</property>
-+                    <property name="can_focus">True</property>
-+                    <property name="receives_default">False</property>
-+                    <property name="use_underline">True</property>
-+                    <property name="draw_indicator">True</property>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="fill">False</property>
-+                    <property name="position">3</property>
-+                  </packing>
-+                </child>
-+                <child>
-                   <object class="GtkCheckButton" id="restore_on_move_check">
-                     <property name="label" translatable="yes">Restore original _size of maximized windows when moving</property>
-                     <property name="visible">True</property>
-@@ -354,7 +369,7 @@ or "skip taskbar" properties set</property>
-                   <packing>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
--                    <property name="position">3</property>
-+                    <property name="position">4</property>
-                   </packing>
-                 </child>
-                 <child>
-@@ -369,7 +384,7 @@ or "skip taskbar" properties set</property>
-                   <packing>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
--                    <property name="position">4</property>
-+                    <property name="position">5</property>
-                   </packing>
-                 </child>
-                 <child>
-@@ -384,7 +399,7 @@ or "skip taskbar" properties set</property>
-                   <packing>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
--                    <property name="position">5</property>
-+                    <property name="position">6</property>
-                   </packing>
-                 </child>
-                 <child>
-@@ -399,7 +414,7 @@ or "skip taskbar" properties set</property>
-                   <packing>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
--                    <property name="position">5</property>
-+                    <property name="position">7</property>
-                   </packing>
-                 </child>
-                 <child>
-@@ -414,7 +429,7 @@ or "skip taskbar" properties set</property>
-                   <packing>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
--                    <property name="position">6</property>
-+                    <property name="position">8</property>
-                   </packing>
-                 </child>
-               </object>
-diff --git a/settings-dialogs/xfwm4-tweaks-dialog_ui.h b/settings-dialogs/xfwm4-tweaks-dialog_ui.h
-index a6121dd..8ddbf30 100644
---- a/settings-dialogs/xfwm4-tweaks-dialog_ui.h
-+++ b/settings-dialogs/xfwm4-tweaks-dialog_ui.h
-@@ -177,332 +177,340 @@ static const char tweaks_dialog_ui[] =
-   "y><property name=\"draw_indicator\">True</property></object><packing><p"
-   "roperty name=\"expand\">False</property><property name=\"fill\">False</"
-   "property><property name=\"position\">2</property></packing></child><chi"
--  "ld><object class=\"GtkCheckButton\" id=\"restore_on_move_check\"><prope"
--  "rty name=\"label\" translatable=\"yes\">Restore original _size of maxim"
--  "ized windows when moving</property><property name=\"visible\">True</pro"
--  "perty><property name=\"can_focus\">True</property><property name=\"rece"
--  "ives_default\">False</property><property name=\"use_underline\">True</p"
--  "roperty><property name=\"draw_indicator\">True</property></object><pack"
--  "ing><property name=\"expand\">False</property><property name=\"fill\">F"
--  "alse</property><property name=\"position\">3</property></packing></chil"
--  "d><child><object class=\"GtkCheckButton\" id=\"tile_on_move_check\"><pr"
--  "operty name=\"label\" translatable=\"yes\">Automatically _tile windows "
--  "when moving toward the screen edge</property><property name=\"visible\""
--  ">True</property><property name=\"can_focus\">True</property><property n"
--  "ame=\"receives_default\">False</property><property name=\"use_underline"
--  "\">True</property><property name=\"draw_indicator\">True</property></ob"
--  "ject><packing><property name=\"expand\">False</property><property name="
--  "\"fill\">False</property><property name=\"position\">4</property></pack"
--  "ing></child><child><object class=\"GtkCheckButton\" id=\"snap_resist_ch"
--  "eck\"><property name=\"label\" translatable=\"yes\">Use _edge resistanc"
--  "e instead of window snapping</property><property name=\"visible\">True<"
--  "/property><property name=\"can_focus\">True</property><property name=\""
--  "receives_default\">False</property><property name=\"use_underline\">Tru"
--  "e</property><property name=\"draw_indicator\">True</property></object><"
--  "packing><property name=\"expand\">False</property><property name=\"fill"
--  "\">False</property><property name=\"position\">5</property></packing></"
--  "child><child><object class=\"GtkCheckButton\" id=\"urgent_blink\"><prop"
--  "erty name=\"label\" translatable=\"yes\">Notify of _urgency by making w"
--  "indow\'s decoration blink</property><property name=\"visible\">True</pr"
-+  "ld><object class=\"GtkCheckButton\" id=\"titleless_maximize_check\"><pr"
-+  "operty name=\"label\" translatable=\"yes\">Hide _title of windows when "
-+  "maximized</property><property name=\"visible\">True</property><property"
-+  " name=\"can_focus\">True</property><property name=\"receives_default\">"
-+  "False</property><property name=\"use_underline\">True</property><proper"
-+  "ty name=\"draw_indicator\">True</property></object><packing><property n"
-+  "ame=\"expand\">False</property><property name=\"fill\">False</property>"
-+  "<property name=\"position\">3</property></packing></child><child><objec"
-+  "t class=\"GtkCheckButton\" id=\"restore_on_move_check\"><property name="
-+  "\"label\" translatable=\"yes\">Restore original _size of maximized wind"
-+  "ows when moving</property><property name=\"visible\">True</property><pr"
-+  "operty name=\"can_focus\">True</property><property name=\"receives_defa"
-+  "ult\">False</property><property name=\"use_underline\">True</property><"
-+  "property name=\"draw_indicator\">True</property></object><packing><prop"
-+  "erty name=\"expand\">False</property><property name=\"fill\">False</pro"
-+  "perty><property name=\"position\">4</property></packing></child><child>"
-+  "<object class=\"GtkCheckButton\" id=\"tile_on_move_check\"><property na"
-+  "me=\"label\" translatable=\"yes\">Automatically _tile windows when movi"
-+  "ng toward the screen edge</property><property name=\"visible\">True</pr"
-   "operty><property name=\"can_focus\">True</property><property name=\"rec"
-   "eives_default\">False</property><property name=\"use_underline\">True</"
-   "property><property name=\"draw_indicator\">True</property></object><pac"
-   "king><property name=\"expand\">False</property><property name=\"fill\">"
-   "False</property><property name=\"position\">5</property></packing></chi"
--  "ld><child><object class=\"GtkCheckButton\" id=\"repeat_urgent_blink\"><"
--  "property name=\"label\" translatable=\"yes\">Keep urgent windows _blink"
--  "ing repeatedly</property><property name=\"visible\">True</property><pro"
-+  "ld><child><object class=\"GtkCheckButton\" id=\"snap_resist_check\"><pr"
-+  "operty name=\"label\" translatable=\"yes\">Use _edge resistance instead"
-+  " of window snapping</property><property name=\"visible\">True</property"
-+  "><property name=\"can_focus\">True</property><property name=\"receives_"
-+  "default\">False</property><property name=\"use_underline\">True</proper"
-+  "ty><property name=\"draw_indicator\">True</property></object><packing><"
-+  "property name=\"expand\">False</property><property name=\"fill\">False<"
-+  "/property><property name=\"position\">6</property></packing></child><ch"
-+  "ild><object class=\"GtkCheckButton\" id=\"urgent_blink\"><property name"
-+  "=\"label\" translatable=\"yes\">Notify of _urgency by making window\'s "
-+  "decoration blink</property><property name=\"visible\">True</property><p"
-+  "roperty name=\"can_focus\">True</property><property name=\"receives_def"
-+  "ault\">False</property><property name=\"use_underline\">True</property>"
-+  "<property name=\"draw_indicator\">True</property></object><packing><pro"
-+  "perty name=\"expand\">False</property><property name=\"fill\">False</pr"
-+  "operty><property name=\"position\">7</property></packing></child><child"
-+  "><object class=\"GtkCheckButton\" id=\"repeat_urgent_blink\"><property "
-+  "name=\"label\" translatable=\"yes\">Keep urgent windows _blinking repea"
-+  "tedly</property><property name=\"visible\">True</property><property nam"
-+  "e=\"can_focus\">True</property><property name=\"receives_default\">Fals"
-+  "e</property><property name=\"use_underline\">True</property><property n"
-+  "ame=\"draw_indicator\">True</property></object><packing><property name="
-+  "\"expand\">False</property><property name=\"fill\">False</property><pro"
-+  "perty name=\"position\">8</property></packing></child></object><packing"
-+  "><property name=\"position\">2</property></packing></child><child type="
-+  "\"tab\"><object class=\"GtkLabel\" id=\"label3\"><property name=\"visib"
-+  "le\">True</property><property name=\"label\" translatable=\"yes\">_Acce"
-+  "ssibility</property><property name=\"use_underline\">True</property></o"
-+  "bject><packing><property name=\"position\">2</property><property name=\""
-+  "tab_fill\">False</property></packing></child><child><object class=\"Gtk"
-+  "VBox\" id=\"vbox5\"><property name=\"visible\">True</property><property"
-+  " name=\"border_width\">12</property><property name=\"orientation\">vert"
-+  "ical</property><property name=\"spacing\">6</property><child><object cl"
-+  "ass=\"GtkCheckButton\" id=\"scroll_workspaces_check\"><property name=\""
-+  "label\" translatable=\"yes\">Use the _mouse wheel on the desktop to swi"
-+  "tch workspaces</property><property name=\"visible\">True</property><pro"
-   "perty name=\"can_focus\">True</property><property name=\"receives_defau"
-   "lt\">False</property><property name=\"use_underline\">True</property><p"
-   "roperty name=\"draw_indicator\">True</property></object><packing><prope"
-   "rty name=\"expand\">False</property><property name=\"fill\">False</prop"
--  "erty><property name=\"position\">6</property></packing></child></object"
--  "><packing><property name=\"position\">2</property></packing></child><ch"
--  "ild type=\"tab\"><object class=\"GtkLabel\" id=\"label3\"><property nam"
--  "e=\"visible\">True</property><property name=\"label\" translatable=\"ye"
--  "s\">_Accessibility</property><property name=\"use_underline\">True</pro"
--  "perty></object><packing><property name=\"position\">2</property><proper"
--  "ty name=\"tab_fill\">False</property></packing></child><child><object c"
--  "lass=\"GtkVBox\" id=\"vbox5\"><property name=\"visible\">True</property"
--  "><property name=\"border_width\">12</property><property name=\"orientat"
--  "ion\">vertical</property><property name=\"spacing\">6</property><child>"
--  "<object class=\"GtkCheckButton\" id=\"scroll_workspaces_check\"><proper"
--  "ty name=\"label\" translatable=\"yes\">Use the _mouse wheel on the desk"
--  "top to switch workspaces</property><property name=\"visible\">True</pro"
--  "perty><property name=\"can_focus\">True</property><property name=\"rece"
--  "ives_default\">False</property><property name=\"use_underline\">True</p"
--  "roperty><property name=\"draw_indicator\">True</property></object><pack"
--  "ing><property name=\"expand\">False</property><property name=\"fill\">F"
--  "alse</property><property name=\"position\">0</property></packing></chil"
--  "d><child><object class=\"GtkCheckButton\" id=\"toggle_workspaces_check\""
--  "><property name=\"label\" translatable=\"yes\">_Remember and recall pre"
--  "vious workspace\nwhen switching via keyboard shortcuts</property><prope"
--  "rty name=\"visible\">True</property><property name=\"can_focus\">True</"
--  "property><property name=\"receives_default\">False</property><property "
--  "name=\"use_underline\">True</property><property name=\"draw_indicator\""
--  ">True</property></object><packing><property name=\"expand\">False</prop"
--  "erty><property name=\"fill\">False</property><property name=\"position\""
--  ">1</property></packing></child><child><object class=\"GtkCheckButton\" "
--  "id=\"wrap_layout_check\"><property name=\"label\" translatable=\"yes\">"
--  "Wrap workspaces depending on the actual desktop _layout</property><prop"
--  "erty name=\"visible\">True</property><property name=\"can_focus\">True<"
--  "/property><property name=\"receives_default\">False</property><property"
--  " name=\"use_underline\">True</property><property name=\"draw_indicator\""
--  ">True</property></object><packing><property name=\"expand\">False</prop"
--  "erty><property name=\"fill\">False</property><property name=\"position\""
--  ">2</property></packing></child><child><object class=\"GtkCheckButton\" "
--  "id=\"wrap_cycle_check\"><property name=\"label\" translatable=\"yes\">W"
--  "rap workspaces when the _first or the last workspace is reached</proper"
--  "ty><property name=\"visible\">True</property><property name=\"can_focus"
--  "\">True</property><property name=\"receives_default\">False</property><"
--  "property name=\"use_underline\">True</property><property name=\"draw_in"
--  "dicator\">True</property></object><packing><property name=\"expand\">Fa"
--  "lse</property><property name=\"fill\">False</property><property name=\""
--  "position\">3</property></packing></child></object><packing><property na"
--  "me=\"position\">3</property></packing></child><child type=\"tab\"><obje"
--  "ct class=\"GtkLabel\" id=\"label4\"><property name=\"visible\">True</pr"
--  "operty><property name=\"label\" translatable=\"yes\">_Workspaces</prope"
--  "rty><property name=\"use_underline\">True</property></object><packing><"
--  "property name=\"position\">3</property><property name=\"tab_fill\">Fals"
--  "e</property></packing></child><child><object class=\"GtkVBox\" id=\"vbo"
--  "x6\"><property name=\"visible\">True</property><property name=\"border_"
--  "width\">12</property><property name=\"orientation\">vertical</property>"
--  "<property name=\"spacing\">6</property><child><object class=\"GtkLabel\""
--  " id=\"label8\"><property name=\"visible\">True</property><property name"
--  "=\"xalign\">0</property><property name=\"label\" translatable=\"yes\">_"
--  "Minimum size of windows to trigger smart placement:</property><property"
--  " name=\"use_underline\">True</property><property name=\"mnemonic_widget"
--  "\">placement_ratio_scale</property></object><packing><property name=\"e"
--  "xpand\">False</property><property name=\"fill\">False</property><proper"
--  "ty name=\"position\">0</property></packing></child><child><object class"
--  "=\"GtkAlignment\" id=\"alignment4\"><property name=\"visible\">True</pr"
--  "operty><property name=\"bottom_padding\">6</property><property name=\"l"
--  "eft_padding\">12</property><child><object class=\"GtkHBox\" id=\"hbox2\""
--  "><property name=\"visible\">True</property><property name=\"spacing\">1"
--  "2</property><child><object class=\"GtkLabel\" id=\"label9\"><property n"
--  "ame=\"visible\">True</property><property name=\"label\" translatable=\""
--  "yes\" comments=\"Smart placement size\">&lt;i&gt;Small&lt;/i&gt;</prope"
--  "rty><property name=\"use_markup\">True</property></object><packing><pro"
--  "perty name=\"expand\">False</property><property name=\"fill\">False</pr"
--  "operty><property name=\"position\">0</property></packing></child><child"
--  "><object class=\"GtkHScale\" id=\"placement_ratio_scale\"><property nam"
--  "e=\"visible\">True</property><property name=\"can_focus\">True</propert"
--  "y><property name=\"adjustment\">adjustment1</property><property name=\""
--  "restrict_to_fill_level\">False</property><property name=\"draw_value\">"
--  "False</property></object><packing><property name=\"position\">1</proper"
--  "ty></packing></child><child><object class=\"GtkLabel\" id=\"label10\"><"
--  "property name=\"visible\">True</property><property name=\"label\" trans"
--  "latable=\"yes\" comments=\"Smart placement size\">&lt;i&gt;Large&lt;/i&"
--  "gt;</property><property name=\"use_markup\">True</property></object><pa"
--  "cking><property name=\"expand\">False</property><property name=\"positi"
--  "on\">2</property></packing></child></object></child></object><packing><"
--  "property name=\"expand\">False</property><property name=\"fill\">False<"
--  "/property><property name=\"position\">1</property></packing></child><ch"
--  "ild><object class=\"GtkVBox\" id=\"default_placement_box\"><property na"
--  "me=\"visible\">True</property><property name=\"orientation\">vertical</"
--  "property><property name=\"spacing\">6</property><child><object class=\""
--  "GtkLabel\" id=\"label27\"><property name=\"visible\">True</property><pr"
--  "operty name=\"xalign\">0</property><property name=\"label\" translatabl"
--  "e=\"yes\">By default, place windows:</property></object><packing><prope"
--  "rty name=\"position\">0</property></packing></child><child><object clas"
--  "s=\"GtkAlignment\" id=\"alignment10\"><property name=\"visible\">True</"
--  "property><property name=\"bottom_padding\">6</property><property name=\""
--  "left_padding\">12</property><child><object class=\"GtkVBox\" id=\"vbox1"
--  "8\"><property name=\"visible\">True</property><property name=\"border_w"
--  "idth\">6</property><property name=\"orientation\">vertical</property><p"
--  "roperty name=\"spacing\">6</property><child><object class=\"GtkRadioBut"
--  "ton\" id=\"placement_center_option\"><property name=\"label\" translata"
--  "ble=\"yes\">At the _center of the screen</property><property name=\"vis"
--  "ible\">True</property><property name=\"can_focus\">True</property><prop"
--  "erty name=\"receives_default\">False</property><property name=\"use_und"
--  "erline\">True</property><property name=\"draw_indicator\">True</propert"
--  "y></object><packing><property name=\"position\">0</property></packing><"
--  "/child><child><object class=\"GtkRadioButton\" id=\"placement_mouse_opt"
--  "ion\"><property name=\"label\" translatable=\"yes\">Under the mouse _po"
--  "inter</property><property name=\"visible\">True</property><property nam"
--  "e=\"can_focus\">True</property><property name=\"receives_default\">Fals"
--  "e</property><property name=\"use_underline\">True</property><property n"
--  "ame=\"active\">True</property><property name=\"draw_indicator\">True</p"
--  "roperty><property name=\"group\">placement_center_option</property></ob"
--  "ject><packing><property name=\"position\">1</property></packing></child"
--  "></object></child></object><packing><property name=\"position\">1</prop"
--  "erty></packing></child></object><packing><property name=\"expand\">Fals"
--  "e</property><property name=\"fill\">False</property><property name=\"po"
--  "sition\">2</property></packing></child></object><packing><property name"
--  "=\"position\">4</property></packing></child><child type=\"tab\"><object"
--  " class=\"GtkLabel\" id=\"label5\"><property name=\"visible\">True</prop"
--  "erty><property name=\"label\" translatable=\"yes\">_Placement</property"
--  "><property name=\"use_underline\">True</property></object><packing><pro"
--  "perty name=\"position\">4</property><property name=\"tab_fill\">False</"
--  "property></packing></child><child><object class=\"GtkVBox\" id=\"vbox7\""
--  "><property name=\"visible\">True</property><property name=\"border_widt"
--  "h\">12</property><property name=\"orientation\">vertical</property><pro"
--  "perty name=\"spacing\">6</property><child><object class=\"GtkCheckButto"
--  "n\" id=\"use_compositing_check\"><property name=\"label\" translatable="
--  "\"yes\">_Enable display compositing</property><property name=\"visible\""
--  ">True</property><property name=\"can_focus\">True</property><property n"
--  "ame=\"receives_default\">False</property><property name=\"use_underline"
--  "\">True</property><property name=\"draw_indicator\">True</property></ob"
--  "ject><packing><property name=\"expand\">False</property><property name="
--  "\"fill\">False</property><property name=\"position\">0</property></pack"
--  "ing></child><child><object class=\"GtkScrolledWindow\" id=\"use_composi"
--  "ting_box\"><property name=\"visible\">True</property><property name=\"s"
--  "ensitive\">False</property><property name=\"can_focus\">True</property>"
--  "<property name=\"hscrollbar_policy\">never</property><property name=\"v"
--  "scrollbar_policy\">automatic</property><child><object class=\"GtkViewpo"
--  "rt\" id=\"viewport1\"><property name=\"visible\">True</property><proper"
--  "ty name=\"resize_mode\">queue</property><property name=\"shadow_type\">"
--  "none</property><child><object class=\"GtkAlignment\" id=\"alignment3\">"
--  "<property name=\"visible\">True</property><property name=\"bottom_paddi"
--  "ng\">6</property><property name=\"left_padding\">12</property><child><o"
--  "bject class=\"GtkVBox\" id=\"vbox8\"><property name=\"visible\">True</p"
--  "roperty><property name=\"orientation\">vertical</property><property nam"
--  "e=\"spacing\">6</property><child><object class=\"GtkCheckButton\" id=\""
--  "unredirect_overlays_check\"><property name=\"label\" translatable=\"yes"
--  "\">Display _fullscreen overlay windows directly</property><property nam"
-+  "erty><property name=\"position\">0</property></packing></child><child><"
-+  "object class=\"GtkCheckButton\" id=\"toggle_workspaces_check\"><propert"
-+  "y name=\"label\" translatable=\"yes\">_Remember and recall previous wor"
-+  "kspace\nwhen switching via keyboard shortcuts</property><property name="
-+  "\"visible\">True</property><property name=\"can_focus\">True</property>"
-+  "<property name=\"receives_default\">False</property><property name=\"us"
-+  "e_underline\">True</property><property name=\"draw_indicator\">True</pr"
-+  "operty></object><packing><property name=\"expand\">False</property><pro"
-+  "perty name=\"fill\">False</property><property name=\"position\">1</prop"
-+  "erty></packing></child><child><object class=\"GtkCheckButton\" id=\"wra"
-+  "p_layout_check\"><property name=\"label\" translatable=\"yes\">Wrap wor"
-+  "kspaces depending on the actual desktop _layout</property><property nam"
-   "e=\"visible\">True</property><property name=\"can_focus\">True</propert"
-   "y><property name=\"receives_default\">False</property><property name=\""
-   "use_underline\">True</property><property name=\"draw_indicator\">True</"
-   "property></object><packing><property name=\"expand\">False</property><p"
--  "roperty name=\"position\">0</property></packing></child><child><object "
--  "class=\"GtkCheckButton\" id=\"show_frame_shadow_check\"><property name="
--  "\"label\" translatable=\"yes\">Show shadows under _regular windows</pro"
--  "perty><property name=\"visible\">True</property><property name=\"can_fo"
--  "cus\">True</property><property name=\"receives_default\">False</propert"
--  "y><property name=\"use_underline\">True</property><property name=\"draw"
--  "_indicator\">True</property></object><packing><property name=\"expand\""
--  ">False</property><property name=\"position\">1</property></packing></ch"
--  "ild><child><object class=\"GtkCheckButton\" id=\"show_popup_shadow_chec"
--  "k\"><property name=\"label\" translatable=\"yes\">Show shadows under po"
--  "p_up windows</property><property name=\"visible\">True</property><prope"
--  "rty name=\"can_focus\">True</property><property name=\"receives_default"
--  "\">False</property><property name=\"use_underline\">True</property><pro"
--  "perty name=\"draw_indicator\">True</property></object><packing><propert"
--  "y name=\"expand\">False</property><property name=\"position\">2</proper"
--  "ty></packing></child><child><object class=\"GtkCheckButton\" id=\"show_"
--  "dock_shadow_check\"><property name=\"label\" translatable=\"yes\">Show "
--  "shadows under _dock windows</property><property name=\"visible\">True</"
--  "property><property name=\"can_focus\">True</property><property name=\"r"
--  "eceives_default\">False</property><property name=\"use_underline\">True"
--  "</property><property name=\"draw_indicator\">True</property></object><p"
--  "acking><property name=\"expand\">False</property><property name=\"posit"
--  "ion\">3</property></packing></child><child><object class=\"GtkLabel\" i"
--  "d=\"label12\"><property name=\"visible\">True</property><property name="
--  "\"xalign\">0</property><property name=\"label\" translatable=\"yes\">Op"
--  "aci_ty of window decorations:</property><property name=\"use_underline\""
--  ">True</property><property name=\"mnemonic_widget\">frame_opacity_scale<"
--  "/property></object><packing><property name=\"expand\">False</property><"
--  "property name=\"position\">4</property></packing></child><child><object"
--  " class=\"GtkAlignment\" id=\"alignment5\"><property name=\"visible\">Tr"
--  "ue</property><property name=\"top_padding\">2</property><property name="
--  "\"left_padding\">12</property><child><object class=\"GtkHBox\" id=\"hbo"
--  "x3\"><property name=\"visible\">True</property><child><object class=\"G"
--  "tkLabel\" id=\"label17\"><property name=\"visible\">True</property><pro"
--  "perty name=\"label\" translatable=\"yes\">&lt;i&gt;Transparent&lt;/i&gt"
--  ";</property><property name=\"use_markup\">True</property></object><pack"
--  "ing><property name=\"expand\">False</property><property name=\"fill\">F"
--  "alse</property><property name=\"position\">0</property></packing></chil"
--  "d><child><object class=\"GtkHScale\" id=\"frame_opacity_scale\"><proper"
-+  "roperty name=\"fill\">False</property><property name=\"position\">2</pr"
-+  "operty></packing></child><child><object class=\"GtkCheckButton\" id=\"w"
-+  "rap_cycle_check\"><property name=\"label\" translatable=\"yes\">Wrap wo"
-+  "rkspaces when the _first or the last workspace is reached</property><pr"
-+  "operty name=\"visible\">True</property><property name=\"can_focus\">Tru"
-+  "e</property><property name=\"receives_default\">False</property><proper"
-+  "ty name=\"use_underline\">True</property><property name=\"draw_indicato"
-+  "r\">True</property></object><packing><property name=\"expand\">False</p"
-+  "roperty><property name=\"fill\">False</property><property name=\"positi"
-+  "on\">3</property></packing></child></object><packing><property name=\"p"
-+  "osition\">3</property></packing></child><child type=\"tab\"><object cla"
-+  "ss=\"GtkLabel\" id=\"label4\"><property name=\"visible\">True</property"
-+  "><property name=\"label\" translatable=\"yes\">_Workspaces</property><p"
-+  "roperty name=\"use_underline\">True</property></object><packing><proper"
-+  "ty name=\"position\">3</property><property name=\"tab_fill\">False</pro"
-+  "perty></packing></child><child><object class=\"GtkVBox\" id=\"vbox6\"><"
-+  "property name=\"visible\">True</property><property name=\"border_width\""
-+  ">12</property><property name=\"orientation\">vertical</property><proper"
-+  "ty name=\"spacing\">6</property><child><object class=\"GtkLabel\" id=\""
-+  "label8\"><property name=\"visible\">True</property><property name=\"xal"
-+  "ign\">0</property><property name=\"label\" translatable=\"yes\">_Minimu"
-+  "m size of windows to trigger smart placement:</property><property name="
-+  "\"use_underline\">True</property><property name=\"mnemonic_widget\">pla"
-+  "cement_ratio_scale</property></object><packing><property name=\"expand\""
-+  ">False</property><property name=\"fill\">False</property><property name"
-+  "=\"position\">0</property></packing></child><child><object class=\"GtkA"
-+  "lignment\" id=\"alignment4\"><property name=\"visible\">True</property>"
-+  "<property name=\"bottom_padding\">6</property><property name=\"left_pad"
-+  "ding\">12</property><child><object class=\"GtkHBox\" id=\"hbox2\"><prop"
-+  "erty name=\"visible\">True</property><property name=\"spacing\">12</pro"
-+  "perty><child><object class=\"GtkLabel\" id=\"label9\"><property name=\""
-+  "visible\">True</property><property name=\"label\" translatable=\"yes\" "
-+  "comments=\"Smart placement size\">&lt;i&gt;Small&lt;/i&gt;</property><p"
-+  "roperty name=\"use_markup\">True</property></object><packing><property "
-+  "name=\"expand\">False</property><property name=\"fill\">False</property"
-+  "><property name=\"position\">0</property></packing></child><child><obje"
-+  "ct class=\"GtkHScale\" id=\"placement_ratio_scale\"><property name=\"vi"
-+  "sible\">True</property><property name=\"can_focus\">True</property><pro"
-+  "perty name=\"adjustment\">adjustment1</property><property name=\"restri"
-+  "ct_to_fill_level\">False</property><property name=\"draw_value\">False<"
-+  "/property></object><packing><property name=\"position\">1</property></p"
-+  "acking></child><child><object class=\"GtkLabel\" id=\"label10\"><proper"
-+  "ty name=\"visible\">True</property><property name=\"label\" translatabl"
-+  "e=\"yes\" comments=\"Smart placement size\">&lt;i&gt;Large&lt;/i&gt;</p"
-+  "roperty><property name=\"use_markup\">True</property></object><packing>"
-+  "<property name=\"expand\">False</property><property name=\"position\">2"
-+  "</property></packing></child></object></child></object><packing><proper"
-+  "ty name=\"expand\">False</property><property name=\"fill\">False</prope"
-+  "rty><property name=\"position\">1</property></packing></child><child><o"
-+  "bject class=\"GtkVBox\" id=\"default_placement_box\"><property name=\"v"
-+  "isible\">True</property><property name=\"orientation\">vertical</proper"
-+  "ty><property name=\"spacing\">6</property><child><object class=\"GtkLab"
-+  "el\" id=\"label27\"><property name=\"visible\">True</property><property"
-+  " name=\"xalign\">0</property><property name=\"label\" translatable=\"ye"
-+  "s\">By default, place windows:</property></object><packing><property na"
-+  "me=\"position\">0</property></packing></child><child><object class=\"Gt"
-+  "kAlignment\" id=\"alignment10\"><property name=\"visible\">True</proper"
-+  "ty><property name=\"bottom_padding\">6</property><property name=\"left_"
-+  "padding\">12</property><child><object class=\"GtkVBox\" id=\"vbox18\"><"
-+  "property name=\"visible\">True</property><property name=\"border_width\""
-+  ">6</property><property name=\"orientation\">vertical</property><propert"
-+  "y name=\"spacing\">6</property><child><object class=\"GtkRadioButton\" "
-+  "id=\"placement_center_option\"><property name=\"label\" translatable=\""
-+  "yes\">At the _center of the screen</property><property name=\"visible\""
-+  ">True</property><property name=\"can_focus\">True</property><property n"
-+  "ame=\"receives_default\">False</property><property name=\"use_underline"
-+  "\">True</property><property name=\"draw_indicator\">True</property></ob"
-+  "ject><packing><property name=\"position\">0</property></packing></child"
-+  "><child><object class=\"GtkRadioButton\" id=\"placement_mouse_option\">"
-+  "<property name=\"label\" translatable=\"yes\">Under the mouse _pointer<"
-+  "/property><property name=\"visible\">True</property><property name=\"ca"
-+  "n_focus\">True</property><property name=\"receives_default\">False</pro"
-+  "perty><property name=\"use_underline\">True</property><property name=\""
-+  "active\">True</property><property name=\"draw_indicator\">True</propert"
-+  "y><property name=\"group\">placement_center_option</property></object><"
-+  "packing><property name=\"position\">1</property></packing></child></obj"
-+  "ect></child></object><packing><property name=\"position\">1</property><"
-+  "/packing></child></object><packing><property name=\"expand\">False</pro"
-+  "perty><property name=\"fill\">False</property><property name=\"position"
-+  "\">2</property></packing></child></object><packing><property name=\"pos"
-+  "ition\">4</property></packing></child><child type=\"tab\"><object class"
-+  "=\"GtkLabel\" id=\"label5\"><property name=\"visible\">True</property><"
-+  "property name=\"label\" translatable=\"yes\">_Placement</property><prop"
-+  "erty name=\"use_underline\">True</property></object><packing><property "
-+  "name=\"position\">4</property><property name=\"tab_fill\">False</proper"
-+  "ty></packing></child><child><object class=\"GtkVBox\" id=\"vbox7\"><pro"
-+  "perty name=\"visible\">True</property><property name=\"border_width\">1"
-+  "2</property><property name=\"orientation\">vertical</property><property"
-+  " name=\"spacing\">6</property><child><object class=\"GtkCheckButton\" i"
-+  "d=\"use_compositing_check\"><property name=\"label\" translatable=\"yes"
-+  "\">_Enable display compositing</property><property name=\"visible\">Tru"
-+  "e</property><property name=\"can_focus\">True</property><property name="
-+  "\"receives_default\">False</property><property name=\"use_underline\">T"
-+  "rue</property><property name=\"draw_indicator\">True</property></object"
-+  "><packing><property name=\"expand\">False</property><property name=\"fi"
-+  "ll\">False</property><property name=\"position\">0</property></packing>"
-+  "</child><child><object class=\"GtkScrolledWindow\" id=\"use_compositing"
-+  "_box\"><property name=\"visible\">True</property><property name=\"sensi"
-+  "tive\">False</property><property name=\"can_focus\">True</property><pro"
-+  "perty name=\"hscrollbar_policy\">never</property><property name=\"vscro"
-+  "llbar_policy\">automatic</property><child><object class=\"GtkViewport\""
-+  " id=\"viewport1\"><property name=\"visible\">True</property><property n"
-+  "ame=\"resize_mode\">queue</property><property name=\"shadow_type\">none"
-+  "</property><child><object class=\"GtkAlignment\" id=\"alignment3\"><pro"
-+  "perty name=\"visible\">True</property><property name=\"bottom_padding\""
-+  ">6</property><property name=\"left_padding\">12</property><child><objec"
-+  "t class=\"GtkVBox\" id=\"vbox8\"><property name=\"visible\">True</prope"
-+  "rty><property name=\"orientation\">vertical</property><property name=\""
-+  "spacing\">6</property><child><object class=\"GtkCheckButton\" id=\"unre"
-+  "direct_overlays_check\"><property name=\"label\" translatable=\"yes\">D"
-+  "isplay _fullscreen overlay windows directly</property><property name=\""
-+  "visible\">True</property><property name=\"can_focus\">True</property><p"
-+  "roperty name=\"receives_default\">False</property><property name=\"use_"
-+  "underline\">True</property><property name=\"draw_indicator\">True</prop"
-+  "erty></object><packing><property name=\"expand\">False</property><prope"
-+  "rty name=\"position\">0</property></packing></child><child><object clas"
-+  "s=\"GtkCheckButton\" id=\"show_frame_shadow_check\"><property name=\"la"
-+  "bel\" translatable=\"yes\">Show shadows under _regular windows</propert"
-+  "y><property name=\"visible\">True</property><property name=\"can_focus\""
-+  ">True</property><property name=\"receives_default\">False</property><pr"
-+  "operty name=\"use_underline\">True</property><property name=\"draw_indi"
-+  "cator\">True</property></object><packing><property name=\"expand\">Fals"
-+  "e</property><property name=\"position\">1</property></packing></child><"
-+  "child><object class=\"GtkCheckButton\" id=\"show_popup_shadow_check\"><"
-+  "property name=\"label\" translatable=\"yes\">Show shadows under pop_up "
-+  "windows</property><property name=\"visible\">True</property><property n"
-+  "ame=\"can_focus\">True</property><property name=\"receives_default\">Fa"
-+  "lse</property><property name=\"use_underline\">True</property><property"
-+  " name=\"draw_indicator\">True</property></object><packing><property nam"
-+  "e=\"expand\">False</property><property name=\"position\">2</property></"
-+  "packing></child><child><object class=\"GtkCheckButton\" id=\"show_dock_"
-+  "shadow_check\"><property name=\"label\" translatable=\"yes\">Show shado"
-+  "ws under _dock windows</property><property name=\"visible\">True</prope"
-+  "rty><property name=\"can_focus\">True</property><property name=\"receiv"
-+  "es_default\">False</property><property name=\"use_underline\">True</pro"
-+  "perty><property name=\"draw_indicator\">True</property></object><packin"
-+  "g><property name=\"expand\">False</property><property name=\"position\""
-+  ">3</property></packing></child><child><object class=\"GtkLabel\" id=\"l"
-+  "abel12\"><property name=\"visible\">True</property><property name=\"xal"
-+  "ign\">0</property><property name=\"label\" translatable=\"yes\">Opaci_t"
-+  "y of window decorations:</property><property name=\"use_underline\">Tru"
-+  "e</property><property name=\"mnemonic_widget\">frame_opacity_scale</pro"
-+  "perty></object><packing><property name=\"expand\">False</property><prop"
-+  "erty name=\"position\">4</property></packing></child><child><object cla"
-+  "ss=\"GtkAlignment\" id=\"alignment5\"><property name=\"visible\">True</"
-+  "property><property name=\"top_padding\">2</property><property name=\"le"
-+  "ft_padding\">12</property><child><object class=\"GtkHBox\" id=\"hbox3\""
-+  "><property name=\"visible\">True</property><child><object class=\"GtkLa"
-+  "bel\" id=\"label17\"><property name=\"visible\">True</property><propert"
-+  "y name=\"label\" translatable=\"yes\">&lt;i&gt;Transparent&lt;/i&gt;</p"
-+  "roperty><property name=\"use_markup\">True</property></object><packing>"
-+  "<property name=\"expand\">False</property><property name=\"fill\">False"
-+  "</property><property name=\"position\">0</property></packing></child><c"
-+  "hild><object class=\"GtkHScale\" id=\"frame_opacity_scale\"><property n"
-+  "ame=\"visible\">True</property><property name=\"can_focus\">True</prope"
-+  "rty><property name=\"update_policy\">discontinuous</property><property "
-+  "name=\"adjustment\">adjustment2</property><property name=\"restrict_to_"
-+  "fill_level\">False</property><property name=\"draw_value\">False</prope"
-+  "rty></object><packing><property name=\"position\">1</property></packing"
-+  "></child><child><object class=\"GtkLabel\" id=\"label18\"><property nam"
-+  "e=\"visible\">True</property><property name=\"label\" translatable=\"ye"
-+  "s\">&lt;i&gt;Opaque&lt;/i&gt;</property><property name=\"use_markup\">T"
-+  "rue</property></object><packing><property name=\"expand\">False</proper"
-+  "ty><property name=\"fill\">False</property><property name=\"position\">"
-+  "2</property></packing></child></object></child></object><packing><prope"
-+  "rty name=\"expand\">False</property><property name=\"fill\">False</prop"
-+  "erty><property name=\"position\">5</property></packing></child><child><"
-+  "object class=\"GtkLabel\" id=\"label13\"><property name=\"visible\">Tru"
-+  "e</property><property name=\"xalign\">0</property><property name=\"labe"
-+  "l\" translatable=\"yes\">Opacity of _inactive windows:</property><prope"
-+  "rty name=\"use_underline\">True</property><property name=\"mnemonic_wid"
-+  "get\">inactive_opacity_scale</property></object><packing><property name"
-+  "=\"expand\">False</property><property name=\"fill\">False</property><pr"
-+  "operty name=\"position\">6</property></packing></child><child><object c"
-+  "lass=\"GtkAlignment\" id=\"alignment6\"><property name=\"visible\">True"
-+  "</property><property name=\"top_padding\">2</property><property name=\""
-+  "left_padding\">12</property><child><object class=\"GtkHBox\" id=\"hbox4"
-+  "\"><property name=\"visible\">True</property><child><object class=\"Gtk"
-+  "Label\" id=\"label19\"><property name=\"visible\">True</property><prope"
-+  "rty name=\"label\" translatable=\"yes\">&lt;i&gt;Transparent&lt;/i&gt;<"
-+  "/property><property name=\"use_markup\">True</property></object><packin"
-+  "g><property name=\"expand\">False</property><property name=\"fill\">Fal"
-+  "se</property><property name=\"position\">0</property></packing></child>"
-+  "<child><object class=\"GtkHScale\" id=\"inactive_opacity_scale\"><prope"
-+  "rty name=\"visible\">True</property><property name=\"can_focus\">True</"
-+  "property><property name=\"update_policy\">discontinuous</property><prop"
-+  "erty name=\"adjustment\">adjustment3</property><property name=\"restric"
-+  "t_to_fill_level\">False</property><property name=\"draw_value\">False</"
-+  "property></object><packing><property name=\"position\">1</property></pa"
-+  "cking></child><child><object class=\"GtkLabel\" id=\"label20\"><propert"
-+  "y name=\"visible\">True</property><property name=\"label\" translatable"
-+  "=\"yes\">&lt;i&gt;Opaque&lt;/i&gt;</property><property name=\"use_marku"
-+  "p\">True</property></object><packing><property name=\"expand\">False</p"
-+  "roperty><property name=\"fill\">False</property><property name=\"positi"
-+  "on\">2</property></packing></child></object></child></object><packing><"
-+  "property name=\"expand\">False</property><property name=\"fill\">False<"
-+  "/property><property name=\"position\">7</property></packing></child><ch"
-+  "ild><object class=\"GtkLabel\" id=\"label14\"><property name=\"visible\""
-+  ">True</property><property name=\"xalign\">0</property><property name=\""
-+  "label\" translatable=\"yes\">Opacity of windows during _move:</property"
-+  "><property name=\"use_underline\">True</property><property name=\"mnemo"
-+  "nic_widget\">move_opacity_scale</property></object><packing><property n"
-+  "ame=\"expand\">False</property><property name=\"fill\">False</property>"
-+  "<property name=\"position\">8</property></packing></child><child><objec"
-+  "t class=\"GtkAlignment\" id=\"alignment7\"><property name=\"visible\">T"
-+  "rue</property><property name=\"top_padding\">2</property><property name"
-+  "=\"left_padding\">12</property><child><object class=\"GtkHBox\" id=\"hb"
-+  "ox5\"><property name=\"visible\">True</property><child><object class=\""
-+  "GtkLabel\" id=\"label21\"><property name=\"visible\">True</property><pr"
-+  "operty name=\"label\" translatable=\"yes\">&lt;i&gt;Transparent&lt;/i&g"
-+  "t;</property><property name=\"use_markup\">True</property></object><pac"
-+  "king><property name=\"expand\">False</property><property name=\"fill\">"
-+  "False</property><property name=\"position\">0</property></packing></chi"
-+  "ld><child><object class=\"GtkHScale\" id=\"move_opacity_scale\"><proper"
-   "ty name=\"visible\">True</property><property name=\"can_focus\">True</p"
-   "roperty><property name=\"update_policy\">discontinuous</property><prope"
--  "rty name=\"adjustment\">adjustment2</property><property name=\"restrict"
-+  "rty name=\"adjustment\">adjustment4</property><property name=\"restrict"
-   "_to_fill_level\">False</property><property name=\"draw_value\">False</p"
-   "roperty></object><packing><property name=\"position\">1</property></pac"
--  "king></child><child><object class=\"GtkLabel\" id=\"label18\"><property"
-+  "king></child><child><object class=\"GtkLabel\" id=\"label22\"><property"
-   " name=\"visible\">True</property><property name=\"label\" translatable="
-   "\"yes\">&lt;i&gt;Opaque&lt;/i&gt;</property><property name=\"use_markup"
-   "\">True</property></object><packing><property name=\"expand\">False</pr"
-   "operty><property name=\"fill\">False</property><property name=\"positio"
-   "n\">2</property></packing></child></object></child></object><packing><p"
-   "roperty name=\"expand\">False</property><property name=\"fill\">False</"
--  "property><property name=\"position\">5</property></packing></child><chi"
--  "ld><object class=\"GtkLabel\" id=\"label13\"><property name=\"visible\""
-+  "property><property name=\"position\">9</property></packing></child><chi"
-+  "ld><object class=\"GtkLabel\" id=\"label15\"><property name=\"visible\""
-   ">True</property><property name=\"xalign\">0</property><property name=\""
--  "label\" translatable=\"yes\">Opacity of _inactive windows:</property><p"
--  "roperty name=\"use_underline\">True</property><property name=\"mnemonic"
--  "_widget\">inactive_opacity_scale</property></object><packing><property "
--  "name=\"expand\">False</property><property name=\"fill\">False</property"
--  "><property name=\"position\">6</property></packing></child><child><obje"
--  "ct class=\"GtkAlignment\" id=\"alignment6\"><property name=\"visible\">"
--  "True</property><property name=\"top_padding\">2</property><property nam"
--  "e=\"left_padding\">12</property><child><object class=\"GtkHBox\" id=\"h"
--  "box4\"><property name=\"visible\">True</property><child><object class=\""
--  "GtkLabel\" id=\"label19\"><property name=\"visible\">True</property><pr"
--  "operty name=\"label\" translatable=\"yes\">&lt;i&gt;Transparent&lt;/i&g"
--  "t;</property><property name=\"use_markup\">True</property></object><pac"
--  "king><property name=\"expand\">False</property><property name=\"fill\">"
--  "False</property><property name=\"position\">0</property></packing></chi"
--  "ld><child><object class=\"GtkHScale\" id=\"inactive_opacity_scale\"><pr"
--  "operty name=\"visible\">True</property><property name=\"can_focus\">Tru"
--  "e</property><property name=\"update_policy\">discontinuous</property><p"
--  "roperty name=\"adjustment\">adjustment3</property><property name=\"rest"
--  "rict_to_fill_level\">False</property><property name=\"draw_value\">Fals"
--  "e</property></object><packing><property name=\"position\">1</property><"
--  "/packing></child><child><object class=\"GtkLabel\" id=\"label20\"><prop"
--  "erty name=\"visible\">True</property><property name=\"label\" translata"
--  "ble=\"yes\">&lt;i&gt;Opaque&lt;/i&gt;</property><property name=\"use_ma"
--  "rkup\">True</property></object><packing><property name=\"expand\">False"
--  "</property><property name=\"fill\">False</property><property name=\"pos"
--  "ition\">2</property></packing></child></object></child></object><packin"
--  "g><property name=\"expand\">False</property><property name=\"fill\">Fal"
--  "se</property><property name=\"position\">7</property></packing></child>"
--  "<child><object class=\"GtkLabel\" id=\"label14\"><property name=\"visib"
--  "le\">True</property><property name=\"xalign\">0</property><property nam"
--  "e=\"label\" translatable=\"yes\">Opacity of windows during _move:</prop"
--  "erty><property name=\"use_underline\">True</property><property name=\"m"
--  "nemonic_widget\">move_opacity_scale</property></object><packing><proper"
-+  "label\" translatable=\"yes\">Opacity of windows during resi_ze:</proper"
-+  "ty><property name=\"use_underline\">True</property><property name=\"mne"
-+  "monic_widget\">resize_opacity_scale</property></object><packing><proper"
-   "ty name=\"expand\">False</property><property name=\"fill\">False</prope"
--  "rty><property name=\"position\">8</property></packing></child><child><o"
--  "bject class=\"GtkAlignment\" id=\"alignment7\"><property name=\"visible"
--  "\">True</property><property name=\"top_padding\">2</property><property "
--  "name=\"left_padding\">12</property><child><object class=\"GtkHBox\" id="
--  "\"hbox5\"><property name=\"visible\">True</property><child><object clas"
--  "s=\"GtkLabel\" id=\"label21\"><property name=\"visible\">True</property"
--  "><property name=\"label\" translatable=\"yes\">&lt;i&gt;Transparent&lt;"
--  "/i&gt;</property><property name=\"use_markup\">True</property></object>"
--  "<packing><property name=\"expand\">False</property><property name=\"fil"
--  "l\">False</property><property name=\"position\">0</property></packing><"
--  "/child><child><object class=\"GtkHScale\" id=\"move_opacity_scale\"><pr"
--  "operty name=\"visible\">True</property><property name=\"can_focus\">Tru"
--  "e</property><property name=\"update_policy\">discontinuous</property><p"
--  "roperty name=\"adjustment\">adjustment4</property><property name=\"rest"
--  "rict_to_fill_level\">False</property><property name=\"draw_value\">Fals"
--  "e</property></object><packing><property name=\"position\">1</property><"
--  "/packing></child><child><object class=\"GtkLabel\" id=\"label22\"><prop"
--  "erty name=\"visible\">True</property><property name=\"label\" translata"
--  "ble=\"yes\">&lt;i&gt;Opaque&lt;/i&gt;</property><property name=\"use_ma"
--  "rkup\">True</property></object><packing><property name=\"expand\">False"
--  "</property><property name=\"fill\">False</property><property name=\"pos"
--  "ition\">2</property></packing></child></object></child></object><packin"
--  "g><property name=\"expand\">False</property><property name=\"fill\">Fal"
--  "se</property><property name=\"position\">9</property></packing></child>"
--  "<child><object class=\"GtkLabel\" id=\"label15\"><property name=\"visib"
--  "le\">True</property><property name=\"xalign\">0</property><property nam"
--  "e=\"label\" translatable=\"yes\">Opacity of windows during resi_ze:</pr"
--  "operty><property name=\"use_underline\">True</property><property name=\""
--  "mnemonic_widget\">resize_opacity_scale</property></object><packing><pro"
--  "perty name=\"expand\">False</property><property name=\"fill\">False</pr"
--  "operty><property name=\"position\">10</property></packing></child><chil"
--  "d><object class=\"GtkAlignment\" id=\"alignment8\"><property name=\"vis"
--  "ible\">True</property><property name=\"top_padding\">2</property><prope"
--  "rty name=\"left_padding\">12</property><child><object class=\"GtkHBox\""
--  " id=\"hbox6\"><property name=\"visible\">True</property><child><object "
--  "class=\"GtkLabel\" id=\"label23\"><property name=\"visible\">True</prop"
--  "erty><property name=\"label\" translatable=\"yes\">&lt;i&gt;Transparent"
--  "&lt;/i&gt;</property><property name=\"use_markup\">True</property></obj"
--  "ect><packing><property name=\"expand\">False</property><property name=\""
--  "fill\">False</property><property name=\"position\">0</property></packin"
--  "g></child><child><object class=\"GtkHScale\" id=\"resize_opacity_scale\""
--  "><property name=\"visible\">True</property><property name=\"can_focus\""
--  ">True</property><property name=\"update_policy\">discontinuous</propert"
--  "y><property name=\"adjustment\">adjustment5</property><property name=\""
--  "restrict_to_fill_level\">False</property><property name=\"draw_value\">"
--  "False</property></object><packing><property name=\"position\">1</proper"
--  "ty></packing></child><child><object class=\"GtkLabel\" id=\"label24\"><"
--  "property name=\"visible\">True</property><property name=\"label\" trans"
--  "latable=\"yes\">&lt;i&gt;Opaque&lt;/i&gt;</property><property name=\"us"
--  "e_markup\">True</property></object><packing><property name=\"expand\">F"
--  "alse</property><property name=\"fill\">False</property><property name=\""
-+  "rty><property name=\"position\">10</property></packing></child><child><"
-+  "object class=\"GtkAlignment\" id=\"alignment8\"><property name=\"visibl"
-+  "e\">True</property><property name=\"top_padding\">2</property><property"
-+  " name=\"left_padding\">12</property><child><object class=\"GtkHBox\" id"
-+  "=\"hbox6\"><property name=\"visible\">True</property><child><object cla"
-+  "ss=\"GtkLabel\" id=\"label23\"><property name=\"visible\">True</propert"
-+  "y><property name=\"label\" translatable=\"yes\">&lt;i&gt;Transparent&lt"
-+  ";/i&gt;</property><property name=\"use_markup\">True</property></object"
-+  "><packing><property name=\"expand\">False</property><property name=\"fi"
-+  "ll\">False</property><property name=\"position\">0</property></packing>"
-+  "</child><child><object class=\"GtkHScale\" id=\"resize_opacity_scale\">"
-+  "<property name=\"visible\">True</property><property name=\"can_focus\">"
-+  "True</property><property name=\"update_policy\">discontinuous</property"
-+  "><property name=\"adjustment\">adjustment5</property><property name=\"r"
-+  "estrict_to_fill_level\">False</property><property name=\"draw_value\">F"
-+  "alse</property></object><packing><property name=\"position\">1</propert"
-+  "y></packing></child><child><object class=\"GtkLabel\" id=\"label24\"><p"
-+  "roperty name=\"visible\">True</property><property name=\"label\" transl"
-+  "atable=\"yes\">&lt;i&gt;Opaque&lt;/i&gt;</property><property name=\"use"
-+  "_markup\">True</property></object><packing><property name=\"expand\">Fa"
-+  "lse</property><property name=\"fill\">False</property><property name=\""
-   "position\">2</property></packing></child></object></child></object><pac"
-   "king><property name=\"expand\">False</property><property name=\"fill\">"
-   "False</property><property name=\"position\">11</property></packing></ch"
-@@ -568,5 +576,5 @@ static const char tweaks_dialog_ui[] =
-   "et></action-widgets></object></interface>"
- };
- 
--static const unsigned tweaks_dialog_ui_length = 37803u;
-+static const unsigned tweaks_dialog_ui_length = 38338u;
- 
-diff --git a/src/client.c b/src/client.c
-index 4e86808..b92c264 100644
---- a/src/client.c
-+++ b/src/client.c
-@@ -64,6 +64,8 @@
- #include "xsync.h"
- #include "event_filter.h"
- 
-+//#define TRACE(fmt, ...) printf(fmt"\n", ##__VA_ARGS__); fflush(stdout);
-+
- /* Event mask definition */
- 
- #define POINTER_EVENT_MASK \
-@@ -173,6 +175,7 @@ clientCreateTitleName (Client *c, gchar *name, gchar *hostname)
-     gchar *title;
- 
-     g_return_val_if_fail (c != NULL, NULL);
-+
-     TRACE ("entering clientCreateTitleName");
- 
-     screen_info = c->screen_info;
-@@ -1729,6 +1732,7 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
-     clientGetInitialNetWmDesktop (c);
-     /* workarea will be updated when shown, no need to worry here */
-     clientGetNetStruts (c);
-+    clientGetExtra (c);
- 
-     /* Once we know the type of window, we can initialize window position */
-     if (!FLAG_TEST (c->xfwm_flags, XFWM_FLAG_SESSION_MANAGED))
-@@ -3137,6 +3141,8 @@ clientNewMaxSize (Client *c, XWindowChanges *wc, GdkRectangle *rect, tilePositio
-         wc->width = full_w - frameLeft (c) - frameRight (c);
-         wc->height = full_h - frameTop (c) - frameBottom (c);
- 
-+        TRACE ("clientNewMaxSize %d %d %d %d", wc->x, wc->y, wc->width, wc->height);
-+
-         return ((wc->width <= c->size->max_width) && (wc->height <= c->size->max_height));
-     }
- 
-diff --git a/src/client.h b/src/client.h
-index e8bc4e3..b5e54df 100644
---- a/src/client.h
-+++ b/src/client.h
-@@ -161,6 +161,7 @@
- #define CLIENT_FLAG_DEMANDS_ATTENTION   (1L<<17)
- #define CLIENT_FLAG_HAS_SHAPE           (1L<<18)
- #define CLIENT_FLAG_FULLSCREN_MONITORS  (1L<<19)
-+#define CLIENT_FLAG_TITLELESS_MAXIMIZE  (1L<<20)
- 
- #define WM_FLAG_DELETE                  (1L<<0)
- #define WM_FLAG_INPUT                   (1L<<1)
-diff --git a/src/display.c b/src/display.c
-index 00318d5..4f847f4 100644
---- a/src/display.c
-+++ b/src/display.c
-@@ -169,7 +169,8 @@ myDisplayInitAtoms (DisplayInfo *display_info)
-         "XFWM4_COMPOSITING_MANAGER",
-         "XFWM4_TIMESTAMP_PROP",
-         "_XROOTPMAP_ID",
--        "_XSETROOT_ID"
-+        "_XSETROOT_ID",
-+        "_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED"
-     };
- 
-     g_assert (ATOM_COUNT == G_N_ELEMENTS (atom_names));
-diff --git a/src/display.h b/src/display.h
-index 8797237..a297cf2 100644
---- a/src/display.h
-+++ b/src/display.h
-@@ -265,6 +265,7 @@ enum
-     XFWM4_TIMESTAMP_PROP,
-     XROOTPMAP,
-     XSETROOT,
-+    _GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED,
-     ATOM_COUNT
- };
- 
-diff --git a/src/events.c b/src/events.c
-index 4b49171..044cd11 100644
---- a/src/events.c
-+++ b/src/events.c
-@@ -1921,6 +1921,11 @@ handlePropertyNotify (DisplayInfo *display_info, XPropertyEvent * ev)
-             TRACE ("Window 0x%lx has NET_WM_SYNC_REQUEST_COUNTER set to 0x%lx", c->window, c->xsync_counter);
-         }
- #endif /* HAVE_XSYNC */
-+        else if (ev->atom == display_info->atoms[_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED])
-+        {
-+            TRACE ("Client \"%s\" Window 0x%lx has received GTK CRAP\n", c->name, c->window);
-+            clientUpdateExtra (c);
-+        }
- 
-         return status;
-     }
-diff --git a/src/frame.c b/src/frame.c
-index 7f4cbd3..23c01cd 100644
---- a/src/frame.c
-+++ b/src/frame.c
-@@ -39,6 +39,8 @@
- #include "frame.h"
- #include "compositor.h"
- 
-+//#define TRACE(fmt, ...) printf(fmt"\n", ##__VA_ARGS__); fflush(stdout);
-+
- typedef struct
- {
-     xfwmPixmap pm_title;
-@@ -121,7 +123,14 @@ frameTop (Client * c)
- 
-     g_return_val_if_fail (c != NULL, 0);
-     if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
--        && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
-+        && !(FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
-+            || (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_VERT)
-+                && (c->screen_info->params->titleless_maximize
-+                    || FLAG_TEST (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE))
-+                && c->screen_info->params->borderless_maximize
-+                )
-+            )
-+        )
-     {
-         return c->screen_info->title[TITLE_3][ACTIVE].height;
-     }
-@@ -136,8 +145,13 @@ frameBottom (Client * c)
-     g_return_val_if_fail (c != NULL, 0);
-     if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
-         && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
--        && (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
--            || !(c->screen_info->params->borderless_maximize)))
-+        && !(FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
-+            && (c->screen_info->params->borderless_maximize))
-+        && !(FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_VERT)
-+            && (c->screen_info->params->borderless_maximize)
-+            && (c->screen_info->params->titleless_maximize
-+                || FLAG_TEST (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE)))
-+        )
-     {
-         return c->screen_info->sides[SIDE_BOTTOM][ACTIVE].height;
-     }
-@@ -203,7 +217,14 @@ frameHeight (Client * c)
-         return frameTop (c) + frameBottom (c);
-     }
-     else if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
--             && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
-+             && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
-+             && !(
-+                FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_VERT)
-+                && (c->screen_info->params->borderless_maximize)
-+                && (c->screen_info->params->titleless_maximize
-+                    || FLAG_TEST (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE))
-+             ))
-+
-     {
-         return c->height + frameTop (c) + frameBottom (c);
-     }
-@@ -882,6 +903,7 @@ frameDrawWin (Client * c)
-     gboolean requires_clearing;
-     gboolean width_changed;
-     gboolean height_changed;
-+    gboolean vert_only;
- 
-     TRACE ("entering frameDraw");
-     TRACE ("drawing frame for \"%s\" (0x%lx)", c->name, c->window);
-@@ -955,128 +977,152 @@ frameDrawWin (Client * c)
-     }
- 
-     if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
--        && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
-+        && !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
-+        && !(FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
-+            && (c->screen_info->params->borderless_maximize)
-+            && (c->screen_info->params->titleless_maximize
-+                || FLAG_TEST (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE))
-+            ))
-     {
--        /* First, hide the buttons that we don't have... */
--        for (i = 0; i < BUTTON_COUNT; i++)
-+        vert_only = FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_VERT)
-+                    && (c->screen_info->params->borderless_maximize) //only vertical decorations shown (titleless vertical maximize)
-+                    && (c->screen_info->params->titleless_maximize
-+                        || FLAG_TEST (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE));
-+
-+        if (vert_only)
-         {
--            char b = getLetterFromButton (i, c);
--            if ((!b) || !strchr (screen_info->params->button_layout, b))
-+            //hide all buttons
-+            for (i = 0; i < BUTTON_COUNT; i++)
-             {
-                 xfwmWindowHide (&c->buttons[i]);
-             }
-+            xfwmWindowHide (&c->title);
-+            xfwmWindowHide (&c->sides[SIDE_BOTTOM]);
-+            xfwmWindowHide (&c->sides[SIDE_TOP]);
-+            xfwmWindowHide (&c->corners[CORNER_TOP_LEFT]);
-+            xfwmWindowHide (&c->corners[CORNER_TOP_RIGHT]);
-+            xfwmWindowHide (&c->corners[CORNER_BOTTOM_LEFT]);
-+            xfwmWindowHide (&c->corners[CORNER_BOTTOM_RIGHT]);
-         }
--
--        /* Then, show the ones that we do have on left... */
--        x = frameLeft (c) + frameButtonOffset (c);
--        if (x < 0)
--        {
--            x = 0;
--        }
--        right = frameWidth (c) - frameRight (c) - frameButtonOffset (c);
--        for (i = 0; i < strlen (screen_info->params->button_layout); i++)
-+        else
-         {
--            button = getButtonFromLetter (screen_info->params->button_layout[i], c);
--            if (button == TITLE_SEPARATOR)
-+            /* First, hide the buttons that we don't have... */
-+            for (i = 0; i < BUTTON_COUNT; i++)
-             {
--                break;
--            }
--            else if (button >= 0)
--            {
--                if (x + screen_info->buttons[button][state].width + screen_info->params->button_spacing < right)
--                {
--                    my_pixmap = clientGetButtonPixmap (c, button, clientGetButtonState (c, button, state));
--                    if (!xfwmPixmapNone(my_pixmap))
--                    {
--                        xfwmWindowSetBG (&c->buttons[button], my_pixmap);
--                    }
--                    xfwmWindowShow (&c->buttons[button], x,
--                        (frameTop (c) - screen_info->buttons[button][state].height + 1) / 2,
--                        screen_info->buttons[button][state].width,
--                        screen_info->buttons[button][state].height, TRUE);
--                    button_x[button] = x;
--                    x = x + screen_info->buttons[button][state].width +
--                        screen_info->params->button_spacing;
--                }
--                else
-+                char b = getLetterFromButton (i, c);
-+                if ((!b) || !strchr (screen_info->params->button_layout, b))
-                 {
--                    xfwmWindowHide (&c->buttons[button]);
-+                    xfwmWindowHide (&c->buttons[i]);
-                 }
-             }
--        }
--        left = x + screen_info->params->button_spacing;
- 
--        /* and those that we do have on right... */
--        x = frameWidth (c) - frameRight (c) + screen_info->params->button_spacing -
--            frameButtonOffset (c);
--        for (j = strlen (screen_info->params->button_layout) - 1; j >= i; j--)
--        {
--            button = getButtonFromLetter (screen_info->params->button_layout[j], c);
--            if (button == TITLE_SEPARATOR)
-+            /* Then, show the ones that we do have on left... */
-+            x = frameLeft (c) + frameButtonOffset (c);
-+            if (x < 0)
-             {
--                break;
-+                x = 0;
-             }
--            else if (button >= 0)
-+            right = frameWidth (c) - frameRight (c) - frameButtonOffset (c);
-+            for (i = 0; i < strlen (screen_info->params->button_layout); i++)
-             {
--                if (x - screen_info->buttons[button][state].width - screen_info->params->button_spacing > left)
-+                button = getButtonFromLetter (screen_info->params->button_layout[i], c);
-+                if (button == TITLE_SEPARATOR)
-                 {
--                    my_pixmap = clientGetButtonPixmap (c, button, clientGetButtonState (c, button, state));
--                    if (!xfwmPixmapNone(my_pixmap))
-+                    break;
-+                }
-+                else if (button >= 0)
-+                {
-+                    if (x + screen_info->buttons[button][state].width + screen_info->params->button_spacing < right)
-+                    {
-+                        my_pixmap = clientGetButtonPixmap (c, button, clientGetButtonState (c, button, state));
-+                        if (!xfwmPixmapNone(my_pixmap))
-+                        {
-+                            xfwmWindowSetBG (&c->buttons[button], my_pixmap);
-+                        }
-+                        xfwmWindowShow (&c->buttons[button], x,
-+                            (frameTop (c) - screen_info->buttons[button][state].height + 1) / 2,
-+                            screen_info->buttons[button][state].width,
-+                            screen_info->buttons[button][state].height, TRUE);
-+                        button_x[button] = x;
-+                        x = x + screen_info->buttons[button][state].width +
-+                            screen_info->params->button_spacing;
-+                    }
-+                    else
-                     {
--                        xfwmWindowSetBG (&c->buttons[button], my_pixmap);
-+                        xfwmWindowHide (&c->buttons[button]);
-                     }
--                    x = x - screen_info->buttons[button][state].width -
--                        screen_info->params->button_spacing;
--                    xfwmWindowShow (&c->buttons[button], x,
--                        (frameTop (c) - screen_info->buttons[button][state].height + 1) / 2,
--                        screen_info->buttons[button][state].width,
--                        screen_info->buttons[button][state].height, TRUE);
--                    button_x[button] = x;
-                 }
--                else
-+            }
-+            left = x + screen_info->params->button_spacing;
-+
-+            /* and those that we do have on right... */
-+            x = frameWidth (c) - frameRight (c) + screen_info->params->button_spacing -
-+                frameButtonOffset (c);
-+            for (j = strlen (screen_info->params->button_layout) - 1; j >= i; j--)
-+            {
-+                button = getButtonFromLetter (screen_info->params->button_layout[j], c);
-+                if (button == TITLE_SEPARATOR)
-                 {
--                    xfwmWindowHide (&c->buttons[button]);
-+                    break;
-+                }
-+                else if (button >= 0)
-+                {
-+                    if (x - screen_info->buttons[button][state].width - screen_info->params->button_spacing > left)
-+                    {
-+                        my_pixmap = clientGetButtonPixmap (c, button, clientGetButtonState (c, button, state));
-+                        if (!xfwmPixmapNone(my_pixmap))
-+                        {
-+                            xfwmWindowSetBG (&c->buttons[button], my_pixmap);
-+                        }
-+                        x = x - screen_info->buttons[button][state].width -
-+                            screen_info->params->button_spacing;
-+                        xfwmWindowShow (&c->buttons[button], x,
-+                            (frameTop (c) - screen_info->buttons[button][state].height + 1) / 2,
-+                            screen_info->buttons[button][state].width,
-+                            screen_info->buttons[button][state].height, TRUE);
-+                        button_x[button] = x;
-+                    }
-+                    else
-+                    {
-+                        xfwmWindowHide (&c->buttons[button]);
-+                    }
-                 }
-             }
-+            left = left - 2 * screen_info->params->button_spacing;
-+            right = x;
-+            xfwmPixmapInit (screen_info, &frame_pix.pm_title);
-+            xfwmPixmapInit (screen_info, &frame_pix.pm_sides[SIDE_TOP]);
-+            xfwmPixmapInit (screen_info, &frame_pix.pm_sides[SIDE_BOTTOM]);
-+
-+            top_width = frameWidth (c) - frameTopLeftWidth (c, state) - frameTopRightWidth (c, state);
-+            bottom_width = frameWidth (c) -
-+                screen_info->corners[CORNER_BOTTOM_LEFT][state].width -
-+                screen_info->corners[CORNER_BOTTOM_RIGHT][state].width;
-+
-+            /* The title is almost always visible */
-+            frameCreateTitlePixmap (c, state, left, right, &frame_pix.pm_title, &frame_pix.pm_sides[SIDE_TOP]);
-+            xfwmWindowSetBG (&c->title, &frame_pix.pm_title);
-+            xfwmWindowShow (&c->title,
-+                frameTopLeftWidth (c, state), 0, top_width,
-+                frameTop (c), (requires_clearing | width_changed));
-+
-+            /* Corners are never resized, we need to update them separately */
-+            if (requires_clearing)
-+            {
-+                xfwmWindowSetBG (&c->corners[CORNER_TOP_LEFT],
-+                    &screen_info->corners[CORNER_TOP_LEFT][state]);
-+                xfwmWindowSetBG (&c->corners[CORNER_TOP_RIGHT],
-+                    &screen_info->corners[CORNER_TOP_RIGHT][state]);
-+                xfwmWindowSetBG (&c->corners[CORNER_BOTTOM_LEFT],
-+                    &screen_info->corners[CORNER_BOTTOM_LEFT][state]);
-+                xfwmWindowSetBG (&c->corners[CORNER_BOTTOM_RIGHT],
-+                    &screen_info->corners[CORNER_BOTTOM_RIGHT][state]);
-+            }
-         }
--        left = left - 2 * screen_info->params->button_spacing;
--        right = x;
--
--        top_width = frameWidth (c) - frameTopLeftWidth (c, state) - frameTopRightWidth (c, state);
--        bottom_width = frameWidth (c) -
--            screen_info->corners[CORNER_BOTTOM_LEFT][state].width -
--            screen_info->corners[CORNER_BOTTOM_RIGHT][state].width;
--        left_height = frameHeight (c) - frameTop (c) -
--            screen_info->corners[CORNER_BOTTOM_LEFT][state].height;
--        right_height = frameHeight (c) - frameTop (c) -
--            screen_info->corners[CORNER_BOTTOM_RIGHT][state].height;
--
--        xfwmPixmapInit (screen_info, &frame_pix.pm_title);
--        xfwmPixmapInit (screen_info, &frame_pix.pm_sides[SIDE_TOP]);
--        xfwmPixmapInit (screen_info, &frame_pix.pm_sides[SIDE_BOTTOM]);
-+
-         xfwmPixmapInit (screen_info, &frame_pix.pm_sides[SIDE_LEFT]);
-         xfwmPixmapInit (screen_info, &frame_pix.pm_sides[SIDE_RIGHT]);
- 
--        /* The title is always visible */
--        frameCreateTitlePixmap (c, state, left, right, &frame_pix.pm_title, &frame_pix.pm_sides[SIDE_TOP]);
--        xfwmWindowSetBG (&c->title, &frame_pix.pm_title);
--        xfwmWindowShow (&c->title,
--            frameTopLeftWidth (c, state), 0, top_width,
--            frameTop (c), (requires_clearing | width_changed));
--
--        /* Corners are never resized, we need to update them separately */
--        if (requires_clearing)
--        {
--            xfwmWindowSetBG (&c->corners[CORNER_TOP_LEFT],
--                &screen_info->corners[CORNER_TOP_LEFT][state]);
--            xfwmWindowSetBG (&c->corners[CORNER_TOP_RIGHT],
--                &screen_info->corners[CORNER_TOP_RIGHT][state]);
--            xfwmWindowSetBG (&c->corners[CORNER_BOTTOM_LEFT],
--                &screen_info->corners[CORNER_BOTTOM_LEFT][state]);
--            xfwmWindowSetBG (&c->corners[CORNER_BOTTOM_RIGHT],
--                &screen_info->corners[CORNER_BOTTOM_RIGHT][state]);
--        }
--
-         if (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
-             && (c->screen_info->params->borderless_maximize))
-         {
-@@ -1091,6 +1137,18 @@ frameDrawWin (Client * c)
-         }
-         else
-         {
-+            if (vert_only)
-+            {
-+                left_height = right_height = c->height;
-+            }
-+            else
-+            {
-+                left_height = frameHeight (c) - frameTop (c)
-+                    - screen_info->corners[CORNER_BOTTOM_LEFT][state].height;
-+                right_height = frameHeight (c) - frameTop (c)
-+                    - screen_info->corners[CORNER_BOTTOM_RIGHT][state].height;
-+            }
-+
-             if (FLAG_TEST (c->flags, CLIENT_FLAG_SHADED))
-             {
-                 xfwmWindowHide (&c->sides[SIDE_LEFT]);
-@@ -1120,63 +1178,69 @@ frameDrawWin (Client * c)
-                     right_height, (requires_clearing | height_changed));
-             }
- 
--            xfwmPixmapCreate (screen_info, &frame_pix.pm_sides[SIDE_BOTTOM],
--                bottom_width, frameBottom (c));
--            xfwmPixmapFill (&screen_info->sides[SIDE_BOTTOM][state],
--                &frame_pix.pm_sides[SIDE_BOTTOM],
--                0, 0, bottom_width, frameBottom (c));
--            xfwmWindowSetBG (&c->sides[SIDE_BOTTOM],
--                &frame_pix.pm_sides[SIDE_BOTTOM]);
--            xfwmWindowShow (&c->sides[SIDE_BOTTOM],
--                screen_info->corners[CORNER_BOTTOM_LEFT][state].width,
--                frameHeight (c) - frameBottom (c), bottom_width, frameBottom (c),
--                (requires_clearing | width_changed));
--
--            if (!xfwmPixmapNone(&frame_pix.pm_sides[SIDE_TOP]))
-+            if (!vert_only)
-             {
--                xfwmWindowSetBG (&c->sides[SIDE_TOP], &frame_pix.pm_sides[SIDE_TOP]);
--                xfwmWindowShow (&c->sides[SIDE_TOP],
--                    screen_info->corners[CORNER_TOP_LEFT][state].width,
--                    0, top_width, frame_pix.pm_sides[SIDE_TOP].height,
-+                xfwmPixmapCreate (screen_info, &frame_pix.pm_sides[SIDE_BOTTOM],
-+                    bottom_width, frameBottom (c));
-+                xfwmPixmapFill (&screen_info->sides[SIDE_BOTTOM][state],
-+                    &frame_pix.pm_sides[SIDE_BOTTOM],
-+                    0, 0, bottom_width, frameBottom (c));
-+                xfwmWindowSetBG (&c->sides[SIDE_BOTTOM],
-+                    &frame_pix.pm_sides[SIDE_BOTTOM]);
-+                xfwmWindowShow (&c->sides[SIDE_BOTTOM],
-+                    screen_info->corners[CORNER_BOTTOM_LEFT][state].width,
-+                    frameHeight (c) - frameBottom (c), bottom_width, frameBottom (c),
-                     (requires_clearing | width_changed));
--            }
--            else
--            {
--                xfwmWindowHide (&c->sides[SIDE_TOP]);
--            }
- 
--            xfwmWindowShow (&c->corners[CORNER_TOP_LEFT], 0, 0,
--                frameTopLeftWidth (c, state),
--                screen_info->corners[CORNER_TOP_LEFT][state].height,
--                requires_clearing);
--
--            xfwmWindowShow (&c->corners[CORNER_TOP_RIGHT],
--                frameWidth (c) - frameTopRightWidth (c, state),
--                0, frameTopRightWidth (c, state),
--                screen_info->corners[CORNER_TOP_RIGHT][state].height,
--                requires_clearing);
--
--            xfwmWindowShow (&c->corners[CORNER_BOTTOM_LEFT], 0,
--                frameHeight (c) -
--                screen_info->corners[CORNER_BOTTOM_LEFT][state].height,
--                screen_info->corners[CORNER_BOTTOM_LEFT][state].width,
--                screen_info->corners[CORNER_BOTTOM_LEFT][state].height,
--                requires_clearing);
--
--            xfwmWindowShow (&c->corners[CORNER_BOTTOM_RIGHT],
--                frameWidth (c) -
--                screen_info->corners[CORNER_BOTTOM_RIGHT][state].width,
--                frameHeight (c) -
--                screen_info->corners[CORNER_BOTTOM_RIGHT][state].height,
--                screen_info->corners[CORNER_BOTTOM_RIGHT][state].width,
--                screen_info->corners[CORNER_BOTTOM_RIGHT][state].height,
--                requires_clearing);
-+                if (!xfwmPixmapNone(&frame_pix.pm_sides[SIDE_TOP]))
-+                {
-+                    xfwmWindowSetBG (&c->sides[SIDE_TOP], &frame_pix.pm_sides[SIDE_TOP]);
-+                    xfwmWindowShow (&c->sides[SIDE_TOP],
-+                        screen_info->corners[CORNER_TOP_LEFT][state].width,
-+                        0, top_width, frame_pix.pm_sides[SIDE_TOP].height,
-+                        (requires_clearing | width_changed));
-+                }
-+                else
-+                {
-+                    xfwmWindowHide (&c->sides[SIDE_TOP]);
-+                }
-+
-+                xfwmWindowShow (&c->corners[CORNER_TOP_LEFT], 0, 0,
-+                    frameTopLeftWidth (c, state),
-+                    screen_info->corners[CORNER_TOP_LEFT][state].height,
-+                    requires_clearing);
-+
-+                xfwmWindowShow (&c->corners[CORNER_TOP_RIGHT],
-+                    frameWidth (c) - frameTopRightWidth (c, state),
-+                    0, frameTopRightWidth (c, state),
-+                    screen_info->corners[CORNER_TOP_RIGHT][state].height,
-+                    requires_clearing);
-+
-+                xfwmWindowShow (&c->corners[CORNER_BOTTOM_LEFT], 0,
-+                    frameHeight (c) -
-+                    screen_info->corners[CORNER_BOTTOM_LEFT][state].height,
-+                    screen_info->corners[CORNER_BOTTOM_LEFT][state].width,
-+                    screen_info->corners[CORNER_BOTTOM_LEFT][state].height,
-+                    requires_clearing);
-+
-+                xfwmWindowShow (&c->corners[CORNER_BOTTOM_RIGHT],
-+                    frameWidth (c) -
-+                    screen_info->corners[CORNER_BOTTOM_RIGHT][state].width,
-+                    frameHeight (c) -
-+                    screen_info->corners[CORNER_BOTTOM_RIGHT][state].height,
-+                    screen_info->corners[CORNER_BOTTOM_RIGHT][state].width,
-+                    screen_info->corners[CORNER_BOTTOM_RIGHT][state].height,
-+                    requires_clearing);
-+            }
-         }
-         frameSetShape (c, state, &frame_pix, button_x);
- 
--        xfwmPixmapFree (&frame_pix.pm_title);
--        xfwmPixmapFree (&frame_pix.pm_sides[SIDE_TOP]);
--        xfwmPixmapFree (&frame_pix.pm_sides[SIDE_BOTTOM]);
-+        if (!vert_only)
-+        {
-+            xfwmPixmapFree (&frame_pix.pm_title);
-+            xfwmPixmapFree (&frame_pix.pm_sides[SIDE_TOP]);
-+            xfwmPixmapFree (&frame_pix.pm_sides[SIDE_BOTTOM]);
-+        }
-         xfwmPixmapFree (&frame_pix.pm_sides[SIDE_LEFT]);
-         xfwmPixmapFree (&frame_pix.pm_sides[SIDE_RIGHT]);
-     }
-diff --git a/src/netwm.c b/src/netwm.c
-index 1352f08..9e3647c 100644
---- a/src/netwm.c
-+++ b/src/netwm.c
-@@ -136,6 +136,44 @@ clientSetNetState (Client * c)
- }
- 
- void
-+clientGetExtra (Client *c)
-+{
-+    long val;
-+    DisplayInfo *display_info;
-+
-+    display_info = c->screen_info->display_info;
-+
-+    getHint (display_info, c->window, _GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED, &val);
-+    if (val)
-+        FLAG_SET (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE);
-+}
-+
-+void
-+clientUpdateExtra (Client *c)
-+{
-+    long val;
-+    unsigned long maximization_flags = 0L;
-+    DisplayInfo *display_info;
-+
-+    display_info = c->screen_info->display_info;
-+
-+    getHint (display_info, c->window, _GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED, &val);
-+    if (val)
-+        FLAG_SET (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE);
-+    else
-+        FLAG_UNSET (c->flags, CLIENT_FLAG_TITLELESS_MAXIMIZE);
-+
-+    if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED))
-+    {
-+        maximization_flags = c->flags & CLIENT_FLAG_MAXIMIZED;
-+
-+        /* Force an update by clearing the internal flags */
-+        FLAG_UNSET (c->flags, CLIENT_FLAG_MAXIMIZED_HORIZ | CLIENT_FLAG_MAXIMIZED_VERT);
-+        clientToggleMaximized (c, maximization_flags, TRUE);
-+    }
-+}
-+
-+void
- clientGetNetState (Client * c)
- {
-     ScreenInfo *screen_info;
-diff --git a/src/placement.c b/src/placement.c
-index 01f2590..64719a7 100644
---- a/src/placement.c
-+++ b/src/placement.c
-@@ -38,7 +38,6 @@
- #include "frame.h"
- #include "netwm.h"
- 
--
- /* Compute rectangle overlap area */
- 
- static inline unsigned long
-@@ -108,6 +107,8 @@ clientMaxSpace (ScreenInfo *screen_info, int *x, int *y, int *w, int *h)
-     g_return_if_fail (w != NULL);
-     g_return_if_fail (h != NULL);
- 
-+    TRACE ("entering clientMaxSpace");
-+
-     screen_width = 0;
-     screen_height = 0;
-     delta = 0;
-@@ -157,6 +158,7 @@ clientMaxSpace (ScreenInfo *screen_info, int *x, int *y, int *w, int *h)
-             }
-         }
-     }
-+    TRACE ("clientMaxSpace result %d %d %d %d", *x, *y, *w, *h);
- }
- 
- gboolean
-diff --git a/src/settings.c b/src/settings.c
-index 607bb7b..37b6c2a 100644
---- a/src/settings.c
-+++ b/src/settings.c
-@@ -667,6 +667,7 @@ loadSettings (ScreenInfo *screen_info)
-         /* You can change the order of the following parameters */
-         {"activate_action", NULL, G_TYPE_STRING, TRUE},
-         {"borderless_maximize", NULL, G_TYPE_BOOLEAN, TRUE},
-+        {"titleless_maximize", NULL, G_TYPE_BOOLEAN, TRUE},
-         {"box_move", NULL, G_TYPE_BOOLEAN, TRUE},
-         {"box_resize", NULL, G_TYPE_BOOLEAN, TRUE},
-         {"button_layout", NULL, G_TYPE_STRING, TRUE},
-@@ -753,6 +754,8 @@ loadSettings (ScreenInfo *screen_info)
- 
-     screen_info->params->borderless_maximize =
-         getBoolValue ("borderless_maximize", rc);
-+    screen_info->params->titleless_maximize =
-+        getBoolValue ("titleless_maximize", rc);
-     screen_info->params->box_resize =
-         getBoolValue ("box_resize", rc);
-     screen_info->params->box_move =
-@@ -1261,6 +1264,11 @@ cb_xfwm4_channel_property_changed(XfconfChannel *channel, const gchar *property_
-                     screen_info->params->borderless_maximize = g_value_get_boolean (value);
-                     reloadScreenSettings (screen_info, UPDATE_MAXIMIZE);
-                 }
-+                else if (!strcmp (name, "titleless_maximize"))
-+                {
-+                    screen_info->params->titleless_maximize = g_value_get_boolean (value);
-+                    reloadScreenSettings (screen_info, UPDATE_MAXIMIZE);
-+                }
-                 else if (!strcmp (name, "cycle_minimum"))
-                 {
-                     screen_info->params->cycle_minimum = g_value_get_boolean (value);
-diff --git a/src/settings.h b/src/settings.h
-index be01b6b..ea8b79b 100644
---- a/src/settings.h
-+++ b/src/settings.h
-@@ -197,6 +197,7 @@ struct _XfwmParams
-     int title_shadow[2];
-     int wrap_resistance;
-     gboolean borderless_maximize;
-+    gboolean titleless_maximize;
-     gboolean box_move;
-     gboolean box_resize;
-     gboolean click_to_focus;
--- 
-1.8.4
-
diff --git a/pcr/xfwm4-titleless/xfwm4.install b/pcr/xfwm4-titleless/xfwm4.install
deleted file mode 100644
index e4f8fd06c..000000000
--- a/pcr/xfwm4-titleless/xfwm4.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/xonotic-git/PKGBUILD b/pcr/xonotic-git/PKGBUILD
deleted file mode 100644
index 0a2ec7dca..000000000
--- a/pcr/xonotic-git/PKGBUILD
+++ /dev/null
@@ -1,197 +0,0 @@
-# Maintainer: MrBougo <bougospam at gmail dot com>
-# Contributor: wido <widomaker2k7@gmail.com>
-# Contributor: Alexander Suhoverhov <cy at ngs dot ru>
-
-pkgname=xonotic-git
-pkgver=20130214
-pkgrel=1
-pkgdesc="A free, fast-paced crossplatform first-person shooter"
-arch=('i686' 'x86_64')
-url="http://xonotic.org"
-license=('GPL')
-depends=(
-	'd0_blind_id-git'
-	'libxpm'
-	'libjpeg>=8'
-	'libpng>=1.4.0'
-	'libmodplug'
-	'libvorbis'
-	'libxxf86dga'
-	'libxxf86vm'
-	'alsa-lib'
-	'sdl'
-	'curl'
-)
-makedepends=('git' 'p7zip' 'zip' 'unzip' 'vorbis-tools' 'sdl' 'mesa' 'imagemagick' 'gmqcc-git')
-optdepends=(
-	'libtheora: recording in ogv'
-	#'d0_blind_id-git: crypto libraries for player authentification'
-)
-provides=('xonotic')
-conflicts=('xonotic')
-
-_gitroot="git://git.xonotic.org/xonotic/xonotic.git"
-_gitname="xonotic"
-_releasename="git-PCR"
-_compression=5
-
-# the jpeg and ogg variables can be modified, the function may also be skipped for raw data
-# the values here are also used in the official -low builds
-_compress() {
-	find $1 -type f -print0 |
-		git_src_repo=$2              \
-		CACHEDIR="$srcdir"/datacache \
-		do_jpeg=true                 \
-		jpeg_qual_rgb=80             \
-		jpeg_qual_a=97               \
-		do_dds=false                 \
-		do_ogg=true                  \
-		ogg_qual=1                   \
-		del_src=true                 \
-		xargs -0 "$srcdir"/$_gitname/misc/tools/cached-converter.sh
-}
-
-_git_extract() {
-	_from=$1
-	_to=$2
-	shift 2
-	{ cd "$_from"; git archive --format=tar HEAD -- "$@"; } \
-		| {
-			cd "$_to"
-			tar xvf -
-		}
-}
-
-# 7z compresses nicely but can't deal with flags and symlinks
-_mkzip() {
-	_archive=$1
-	shift
-	_ziplist=`mktemp`
-	find "$@" -xtype f \( -executable -or -type l \) -print > "$_ziplist"
-	7za a -tzip -mx=$_compression -x@"$_ziplist" "$_archive" "$@" || true
-	zip         -$_compression -y -@<"$_ziplist" "$_archive"      || true
-	rm -f "$_ziplist"
-}
-
-#credit goes to omgwizard for the shallow clone idea
-_update() {
-	cd "$srcdir"/$_gitname
-	sed 's/git clone/git clone --depth 1/g' --in-place=".PKGBUILD_BU" ./all
-	./all update
-	mv -f ./all.PKGBUILD_BU ./all
-	cd "$OLDPWD"
-}
-
-build() {
-	cd "$srcdir"
-	msg "Connecting to GIT server...."
-
-	if [ -d $_gitname ] ; then
-		#future updates might introduce new subrepos, use shallow cloning anyway
-		cd $_gitname && _update
-		msg "The local files are updated."
-	else
-		git clone --depth 1 $_gitroot $_gitname
-		cd $_gitname
-		touch d0_blind_id.no
-		touch netradiant.no
-		_update
-	fi
-
-	msg "GIT checkout done or server timeout"
-
-	# BUILD
-
-	msg "Copying sources..."
-
-	rm -rf "$srcdir"/src
-	mkdir -p "$srcdir"/src/darkplaces "$srcdir"/src/fteqcc
-	_git_extract "$srcdir"/$_gitname/fteqcc "$srcdir"/src/fteqcc
-	_git_extract "$srcdir"/$_gitname/darkplaces "$srcdir"/src/darkplaces
-	_git_extract "$srcdir"/$_gitname/data/xonotic-data.pk3dir "$srcdir"/src \
-		qcsrc Makefile check-cvars.sh
-
-	msg "Fetching map binaries..."
-	cd "$srcdir"/$_gitname
-	./all update-maps
-
-	msg "Compiling the engine..."
-	cd "$srcdir"/src/darkplaces
-	CC="${CC:-gcc} -g -DSUPPORTIPV6" make release
-
-	msg "Compiling fteqcc..."
-	cd "$srcdir"/src/fteqcc
-	make all
-
-	msg "Compiling the game code"
-	cd "$srcdir"/src/
-	make FTEQCC="../../fteqcc/fteqcc.bin" # relative to the directories containing progs.src
-
-	msg "Building data pk3's..."
-	rm -rf "$srcdir"/temp # just in case it was interrupted previously
-	mkdir "$srcdir"/temp
-	cd "$srcdir"/temp
-	for _subrepo in font-nimbussansl font-xolonium xonotic-data xonotic-music xonotic-maps; do
-		mkdir $_subrepo
-		_git_extract "$srcdir"/$_gitname/data/$_subrepo.pk3dir "$srcdir"/temp/$_subrepo
-	done
-
-	rm -rf "$srcdir"/temp/xonotic-data/qcsrc
-	mv "$srcdir"/src/progs.dat "$srcdir"/src/csprogs.dat "$srcdir"/src/menu.dat "$srcdir"/temp/xonotic-data
-
-	cd "$srcdir"/temp/xonotic-maps
-	#2x40 question marks. That's as many as eight tens. And that's terrible.
-	for X in "$srcdir"/$_gitname/data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
-		if [ -f "$X" ]; then
-			unzip "$X"
-			rm -f maps/*.log maps/*.irc maps/*.lin
-		fi
-	done
-
-	msg "Compressing data..."
-	cd "$srcdir"/temp/
-	# don't compress the font files
-	for _subrepo in xonotic-data xonotic-music xonotic-maps; do
-		_compress $_subrepo "$srcdir"/$_gitname/data/$_subrepo.pk3dir
-	done
-
-	msg "Packing data..."
-	for _subrepo in font-nimbussansl font-xolonium xonotic-data xonotic-music xonotic-maps; do
-		cd "$srcdir"/temp/$_subrepo
-		_mkzip "$srcdir"/$_subrepo.pk3 * # this wildcard excludes dot files
-	done
-
-	msg "Removing temporary files..."
-	rm -rf "$srcdir"/temp
-}
-
-package() {
-	msg "Installing..."
-	mkdir -p "$pkgdir"/opt/$pkgname/
-	_git_extract "$srcdir"/$_gitname/ "$pkgdir"/opt/$pkgname \
-		Docs \
-		server \
-		xonotic-linux-glx.sh xonotic-linux-sdl.sh \
-		key_0.d0pk
-	chmod 755 "$pkgdir"/opt/$pkgname/xonotic-linux-glx.sh \
-	          "$pkgdir"/opt/$pkgname/xonotic-linux-sdl.sh
-
-	# Binaries -- those names are needed by the launcher script
-	case "$CARCH" in
-		x86_64)  _arch="linux64" ;;
-		*)       _arch="linux32" ;;
-	esac
-	install -m755 "$srcdir"/src/darkplaces/darkplaces-glx "$pkgdir"/opt/$pkgname/xonotic-$_arch-glx
-	install -m755 "$srcdir"/src/darkplaces/darkplaces-glx "$pkgdir"/opt/$pkgname/xonotic-$_arch-sdl
-	install -m755 "$srcdir"/src/darkplaces/darkplaces-dedicated "$pkgdir"/opt/$pkgname/xonotic-$_arch-dedicated
-
-	mkdir -p "$pkgdir"/opt/$pkgname/data/
-	mv -f "$srcdir"/*.pk3 "$pkgdir"/opt/$pkgname/data || true # those files are too big to be copied
-
-	# Launch scripts
-	mkdir -p "$pkgdir"/usr/bin
-	mv -f "$pkgdir"/opt/$pkgname/server/server_linux.sh "$pkgdir"/opt/$pkgname/
-	ln -sf /opt/$pkgname/xonotic-linux-glx.sh "$pkgdir"/usr/bin/xonotic-glx
-	ln -sf /opt/$pkgname/xonotic-linux-sdl.sh "$pkgdir"/usr/bin/xonotic-sdl
-	ln -sf /opt/$pkgname/server_linux.sh "$pkgdir"/usr/bin/xonotic-dedicated
-}
diff --git a/pcr/xrdp/PKGBUILD b/pcr/xrdp/PKGBUILD
deleted file mode 100644
index 1cf561115..000000000
--- a/pcr/xrdp/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: Tomasz Zok <tomasz.zok [at] gmail.com>
-# Maintainer: techryda <techryda at silentdome dot com>
-# Contributor: Mathias R. <pu154r@overlinux.org>
-# Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
-
-pkgname=xrdp
-pkgver=0.6.1
-pkgrel=1
-pkgdesc="An open source remote desktop protocol (RDP) server"
-url="http://xrdp.sourceforge.net/"
-arch=('i686' 'x86_64' 'armv6h')
-license=('GPL')
-depends=('tigervnc')
-source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-v$pkgver.tar.gz"
-        'xrdp.service'
-        'xrdp-sesman.service')
-md5sums=('26099c6588943262023607c1b4e774d8'
-         '0cb760b3e8a34f9bdf4daa871444d74c'
-         '58eb44bdc7ca5bb436d6fd66826f9b0f')
-
-prepare() {
-    cd "${pkgname}-v${pkgver}"
-    # Fix path in xrdp.sh file
-    sed -i 's|/usr/local/sbin|/usr/bin|' instfiles/xrdp.sh
-}
-
-build() {
-    cd "${pkgname}-v${pkgver}"
-    ./bootstrap
-    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
-    make
-}
-
-package() {
-    cd "${pkgname}-v${pkgver}"
-    make DESTDIR="$pkgdir" install
-    cd ${pkgdir}
-    # Install systemd service files
-    mkdir -p usr/lib/systemd/system
-    cp ${srcdir}/*.service usr/lib/systemd/system
-}
diff --git a/pcr/xrdp/xrdp-sesman.service b/pcr/xrdp/xrdp-sesman.service
deleted file mode 100644
index 8222069b9..000000000
--- a/pcr/xrdp/xrdp-sesman.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=xrdp session manager
-After=syslog.target network.target
-StopWhenUnneeded=true
-
-[Service]
-Type=forking
-PIDFile=/var/run/xrdp-sesman.pid
-EnvironmentFile=/etc/xrdp/xrdp.ini
-ExecStart=/usr/bin/xrdp-sesman $SESMAN_OPTIONS
-ExecStop=/usr/bin/xrdp-sesman $SESMAN_OPTIONS --kill
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/pcr/xrdp/xrdp.service b/pcr/xrdp/xrdp.service
deleted file mode 100644
index 269dff87b..000000000
--- a/pcr/xrdp/xrdp.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=xrdp daemon
-Requires=xrdp-sesman.service
-After=syslog.target network.target xrdp-sesman.service
-
-[Service]
-Type=forking
-PIDFile=/var/run/xrdp.pid
-EnvironmentFile=/etc/xrdp/xrdp.ini
-ExecStart=/usr/bin/xrdp $XRDP_OPTIONS
-ExecStop=/usr/bin/xrdp $XRDP_OPTIONS --kill
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/xsynth-dssi/PKGBUILD b/pcr/xsynth-dssi/PKGBUILD
deleted file mode 100644
index f353b9bfa..000000000
--- a/pcr/xsynth-dssi/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-
-pkgname=xsynth-dssi
-pkgver=0.9.4
-pkgrel=1
-pkgdesc="An analog-style (VCOs-VCF-VCA) synth plugin for DSSI"
-arch=('i686')
-url="http://dssi.sourceforge.net/download.html#Xsynth-DSSI"
-license=('GPL')
-depends=('gtk2' 'liblo')
-makedepends=('dssi' 'ladspa')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/project/dssi/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
-        xsynth-dssi)
-md5sums=('3432ecdac06407a992f80eb1c1ecf7cd'
-         'c346e6a944f202fccb2278b77a5e184b')
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make || return 1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install || return 1
-  install -D -m755 ${srcdir}/xsynth-dssi ${pkgdir}/usr/bin/xsynth-dssi
-}
-
diff --git a/pcr/xsynth-dssi/xsynth-dssi b/pcr/xsynth-dssi/xsynth-dssi
deleted file mode 100644
index 5503b12ba..000000000
--- a/pcr/xsynth-dssi/xsynth-dssi
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export DSSI_PATH=/usr/lib/dssi
-exec jack-dssi-host xsynth-dssi.so
diff --git a/pcr/xtables-addons/PKGBUILD b/pcr/xtables-addons/PKGBUILD
deleted file mode 100644
index 0b652408a..000000000
--- a/pcr/xtables-addons/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Vladimir Kutyavin <vlkut@bk.ru>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
-
-pkgname=xtables-addons
-pkgver=1.46
-pkgrel=1
-pkgdesc="Successor to patch-o-matic(-ng). Additional extensions for iptables, ip6tables, etc. CHAOS, TARPIT, TEE, DELUDE and other targets; condition, geoip, ipp2p and other matches. Includes ipset package."
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://xtables-addons.sourceforge.net/"
-depends=('iptables>=1.4.3' 'glibc')
-makedepends=('linux-api-headers' 'linux-headers')
-conflicts=(ipset)
-replaces=(ipset)
-provides=(ipset)
-source=(http://download.sourceforge.net/project/xtables-addons/Xtables-addons/$pkgver/$pkgname-$pkgver.tar.xz)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
- ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/iptables \
-    --sysconfdir=/etc \
-    --with-xtlibdir=/usr/lib/iptables \
-    --mandir=/usr/share/man
-    make || return 1
-    make DESTDIR=$pkgdir install || return 1 
-    chmod a-x $pkgdir/usr/lib/iptables/*.so
-    #remove ipset there is a ipset package
-#    rm \
-#    $pkgdir/usr/lib/iptables/libipset_* \
-#    $pkgdir/usr/sbin/ipset
-#    $pkgdir/usr/share/man/man8/ipset.8
-#    rmdir $pkgdir/usr/sbin
-}
diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD
deleted file mode 100644
index 1db06b6a9..000000000
--- a/pcr/yafaray/PKGBUILD
+++ /dev/null
@@ -1,112 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-_pkgname=yafaray
-_pkgver=1.5
-_pkgrel=1
-_pkgdate=20130921
-_bldname=blender
-_bldver=2.69
-_bldep=10
-_gitname=Core
-_addname=${_bldname^}-Exporter
-_addrel=1
-_adddate=20130918
-_pyver=3.3
-
-# 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
-  $_bldname-addon-$_pkgname
-)
-pkgver=$_pkgver.$_pkgdate
-pkgrel=$_pkgrel
-pkgdesc='A free software raytracing engine'
-arch=(
-  mips64el
-  x86_64
-  i686
-)
-url=http://www.$_pkgname.org
-license=LGPL2.1
-depends=(
-  freetype2
-  libjpeg
-  libxml2
-  openexr-libre
-)
-optdepends=(
-  'python: Python bindings'
-  'qt4: QT GUI'
-  "${pkgname[1]}: ${_bldname^} addon renderer"
-)
-makedepends=(
-  cmake
-  git
-  python
-  qt4
-  swig
-)
-source=(
-  $_gitname-$_srcver.tar.gz::https://github.com/YafaRay/$_gitname/archive/$_srcver.tar.gz
-  $_addname-$_addver.tar.gz::https://github.com/YafaRay/$_addname/archive/$_addver.tar.gz
-)
-sha512sums=(
-  0470e26e2c7956f2d2dc18888cffaf7c2916df42c8208d6e0f4e1d5c438660dd6ae99a1e5f06a118175a8b2a97c89e482b1b069ced2abf3916bbfc60fac54e75
-  3c2207dbca7a70ba82ea6d835785401a24c7813d65380bf8c46a527fff6e65a0a7c101b60b5e8b88163ab07d3d42ec9f9aacbcf090f73062d3643c1c314c97d8
-)
-
-prepare() {
-  cd $srcdir/$_gitname-$_srcver
-
-  msg 'Renaming addon dir'
-  mv -v $srcdir/$_addname-$_addver $srcdir/$_pkgname
-
-  msg 'renaming wrong OS name'
-  sed -i 's|Linux|GNU/Linux|
-         ' $srcdir/$_pkgname/prop/yaf_scene.py
-
-  [[ -d build ]] && rm -vr build
-  mkdir -v build
-}
-
-build() {
-  cd $srcdir/$_gitname-$_srcver/build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
-    -DYAF_PY_VERSION=$_pyver\
-    -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver
-  make
-}
-
-package_yafaray() {
-  cd $srcdir/$_gitname-$_srcver/build
-  make DESTDIR=$pkgdir install
-}
-
-package_blender-addon-yafaray() {
-  pkgdesc="A addon for the ${_bldname^} which allows render with YafaRay (built for the $_bldname-libre package)"
-  arch=any
-  depends=(
-    $_pkgname=$pkgver
-    "$_bldname-libre>=$_bldep:$_bldver"
-    "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))"
-  )
-  pkgver=$_pkgver.$_adddate.v$_bldver
-  pkgrel=$_addrel
-  optdepends=
-
-  cd $srcdir
-
-  a=/usr/lib
-  b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin
-
-  install -vd $b && cp -a $_pkgname ${b%$_pkgname/bin}
-  ln -vsf $a/lib${_pkgname}core.so   $b/lib${_pkgname}core.so
-  ln -vsf $a/lib${_pkgname}plugin.so $b/lib${_pkgname}plugin.so
-  ln -vsf $a/$_pkgname               $b/plugins
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/yate/PKGBUILD b/pcr/yate/PKGBUILD
deleted file mode 100644
index e668cd3ae..000000000
--- a/pcr/yate/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-    # Maintainer: said
-    # Contributor: Yejun Yang <yejunx AT gmail DOT com>
-    # Contributor: Biru Ionut <ionut@archlinux.ro>
-    pkgname=yate
-    pkgver=4.2.0
-    pkgrel=1
-    pkgdesc="next-generation telephony engine"
-    arch=('i686' 'x86_64')
-    url="http://yate.null.ro"
-    license=('GPL')
-    depends=('speex' 'gsm' 'postgresql-libs' 'libmysqlclient' \
-             'alsa-lib' 'qt')
-    makedepends=('pkgconfig')
-    source=(http://yate.null.ro/tarballs/yate4/${pkgname}-${pkgver}-2.tar.gz yate.init)
-    options=(!makeflags)
-    
-    md5sums=('e6fd37f26ff5c50aa3fa16f6b2803d68'
-	     'c0d344607046c47c1d75ac23d323817a')
-
-         
-    build() {
-      cd $srcdir/${pkgname}
-      export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
-      ./configure --prefix=/usr \
-                  --sysconfdir=/etc \
-                  --with-libpq \
-                  --with-mysql \
-                  --without-openh323   
-      make    
-    }
-    
-    package(){
-      cd $srcdir/${pkgname}
-      make DESTDIR=$pkgdir install
-      install -D -m755 $srcdir/yate.init $pkgdir/etc/rc.d/yate
-    }
-    
\ No newline at end of file
diff --git a/pcr/yate/yate.init b/pcr/yate/yate.init
deleted file mode 100755
index 762fff8c7..000000000
--- a/pcr/yate/yate.init
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-OPTS="-rs -vvv -l /var/log/yate"
-
-# Source function library.
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-RETVAL=0
-
-# See how we were called.
-case "$1" in
-    start)
-	stat_busy "Starting YATE"
-        unset DISPLAY
-
-	yate -d -p /var/run/yate.pid $OPTS
-        RETVAL=$?
-	if [ $RETVAL -gt 0 ]; then
-	    stat_fail
-	else
-	    add_daemon yate
-	    touch /var/lock/yate
-	    stat_done
-	fi
-	;;
-    stop)
-	stat_busy "Stopping YATE"
-	[ -f /var/run/yate.pid ] && kill $(cat /var/run/yate.pid) > /dev/null 2>&1
-	RETVAL=$?
-	if [ $RETVAL -gt 0 ]; then
-	    stat_fail
-	else
-	    rm -f /var/run/yate.pid
-	    rm -f /var/lock/yate
-	    rm_daemon yate
-	    stat_done
-	fi
-	;;
-    status)
-        [ -f /var/run/yate.pid ]  && echo -e "Yate is running" || echo -e "Yate is not running"
-        ;;
-    restart)
-	$0 stop
-	sleep 1
-	$1 start
-	;;
-    condrestart)
-	if [ -f /var/lock/yate ]; then
-	    $0 stop
-	    $0 start
-	fi
-	;;
-    reload)
-  	pkill yate -HUP
-	RETVAL=$?
-        ;;
-    *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
-	;;
-esac
-exit $RETVAL
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 96a493b25..ac9e45365 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.12.26
+pkgver=2014.01.23.4
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -28,5 +28,5 @@ package() {
     "${pkgdir}/usr/share/bash-completion/completions/youtube-dl"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
-md5sums=('ae343ec6785e6bed333aa2fe2eaed31c'
+md5sums=('d9e89ffc9ff572317151e22cac4b3a00'
          'SKIP')
diff --git a/pcr/zbar/PKGBUILD b/pcr/zbar/PKGBUILD
deleted file mode 100644
index 199fc2bb8..000000000
--- a/pcr/zbar/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Marti Raudsepp <marti@juffo.org>
-# Contributor: Radu Andries <admiral0@tuxfamily.org>
-# Contributor: Andy Weidenbaum <archbaum@gmail.com>
-
-pkgname=zbar
-pkgver=0.10
-pkgrel=3
-pkgdesc="Application and library for reading bar codes from various sources"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://zbar.sourceforge.net/"
-license=('LGPL')
-depends=('imagemagick' 'libxv')
-makedepends=('gtk2' 'qt4' 'pygtk' 'v4l-utils')
-source=("http://downloads.sourceforge.net/project/zbar/zbar/$pkgver/zbar-$pkgver.tar.bz2"
-        v4l1.patch)
-optdepends=('pygtk: python2 widget'
-            'gtk2: gtk2 widget'
-            'qt4: qt4 widget')
-
-prepare() {
-  cd "$srcdir/zbar-$pkgver"
-  patch -p1 < ${srcdir}/v4l1.patch
-}
-
-build() {
-  cd "$srcdir/zbar-$pkgver"
-
-  ./configure --prefix=/usr CFLAGS="$CFLAGS -DNDEBUG"
-
-  make
-}
-
-package() {
-  cd "$srcdir/zbar-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('0fd61eb590ac1bab62a77913c8b086a5'
-         '284f11ca2a5e009744c4a1b9e92d6953')
diff --git a/pcr/zbar/v4l1.patch b/pcr/zbar/v4l1.patch
deleted file mode 100644
index 150b0e695..000000000
--- a/pcr/zbar/v4l1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Thanks to Andy Weidenbaum <archbaum@gmail.com> for providing this patch!
-
---- ./zbar/video/v4l1.c	2013-03-06 23:24:22.996336417 -0800
-+++ ./zbar/video/v4l1.c	2013-03-06 23:29:29.789662369 -0800
-@@ -41,7 +41,7 @@
- #ifdef HAVE_SYS_MMAN_H
- # include <sys/mman.h>
- #endif
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- 
- #include "video.h"
- #include "image.h"
---- ./configure	2009-10-23 11:17:24.000000000 -0700
-+++ ./configure	2013-03-06 23:47:33.902966990 -0800
-@@ -18709,7 +18709,7 @@
- if test "x$enable_video" != "xno"; then
-   if test "x$win32" = "xno"; then
- 
--for ac_header in linux/videodev.h
-+for ac_header in libv4l1-videodev.h
- do
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
diff --git a/pcr/zbase32/PKGBUILD b/pcr/zbase32/PKGBUILD
deleted file mode 100644
index b4373abb8..000000000
--- a/pcr/zbase32/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Contributor: Peter Simons <simons@cryp.to>
-# Contributor: Nicolas Pouillard <nicolas.pouillard@gmail.com>
-pkgname=zbase32
-pkgver=1.1.5
-pkgrel=1
-pkgdesc="alternate base32 encoder (not RFC 3548 compliant)"
-arch=('i686' 'x86_64')
-url='http://pypi.python.org/pypi/zbase32'
-license=('BSD')
-depends=('python2')
-makedepends=('setuptools' 'darcsver' 'setuptools_darcs' 'pyutil')
-source=( http://pypi.python.org/packages/source/z/zbase32/zbase32-$pkgver.tar.gz )
-md5sums=('4dba0be4ac6d66968de8e5173f51d65d')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py build
-  python2 setup.py test
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py install --root="$pkgdir"
-  install -Dm644 PKG-INFO* $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/pcr/zenity-gtk2/PKGBUILD b/pcr/zenity-gtk2/PKGBUILD
deleted file mode 100644
index f66bd21ec..000000000
--- a/pcr/zenity-gtk2/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $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/zeroinstall-injector/PKGBUILD b/pcr/zeroinstall-injector/PKGBUILD
deleted file mode 100644
index 120355775..000000000
--- a/pcr/zeroinstall-injector/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: Lone_Wolf <lonewolf@xs4all.nl>
-# Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io>
-
-pkgname=zeroinstall-injector
-pkgver=1.8
-pkgrel=1
-pkgdesc="A decentralised loosly-coupled secure installation system"
-arch=('any')
-url="http://zero-install.sourceforge.net/"
-license=('GPL2' 'LGPL')
-depends=('pygtk' 'dbus-python' 'gnupg' 'hicolor-icon-theme' 'desktop-file-utils')
-optdepends=('xdg-utils: desktop integration'
-            'packagekit: packagekit integration')
-install="$pkgname.install"
-source=("http://downloads.sourceforge.net/zero-install/$pkgname-$pkgver.tar.bz2")
-md5sums=('00b3e8b3cbfbe8ed55f81842a4d2c386')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # man path fix
-  sed -i "s|man/|share/&|" setup.py
-
-  python2 setup.py build
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py install --prefix=/usr --root="$pkgdir/"
-
-  # python2 fix
-  sed -i "s/env python/&2/" `grep -rl "env python" "$pkgdir"`
-}
-md5sums=('00b3e8b3cbfbe8ed55f81842a4d2c386')
diff --git a/pcr/zeroinstall-injector/zeroinstall-injector.install b/pcr/zeroinstall-injector/zeroinstall-injector.install
deleted file mode 100644
index 293ff852a..000000000
--- a/pcr/zeroinstall-injector/zeroinstall-injector.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install 
-}
diff --git a/pcr/zfec/PKGBUILD b/pcr/zfec/PKGBUILD
deleted file mode 100644
index 0c2487c6b..000000000
--- a/pcr/zfec/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Nicolas Pouillard <nicolas.pouillard@gmail.com>
-# Contributor: Peter Simons <simons@cryp.to>
-pkgname=zfec
-pkgver=1.4.24
-pkgrel=2
-pkgdesc="a fast erasure codec which can be used with the command-line, C, Python, or Haskell"
-arch=('i686' 'x86_64')
-url='http://pypi.python.org/pypi/zfec'
-license=('GPL' 'custom')
-depends=('python2' 'pyutil' 'zbase32')
-makedepends=('darcsver' 'setuptools_darcs')
-source=( http://pypi.python.org/packages/source/z/zfec/zfec-$pkgver.tar.gz )
-md5sums=('e1bca3a1f18374f72bdf8cd42ea9c919')
-
-build(){
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py build
-  python2 setup.py test
-}
-
-package(){
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 setup.py install --root="$pkgdir"
-  install -d $pkgdir/usr/share/licenses/$pkgname/
-  install -m644 COPYING* $pkgdir/usr/share/licenses/$pkgname/
-}
diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD
deleted file mode 100644
index 29cf5ae8c..000000000
--- a/pcr/zoneminder/PKGBUILD
+++ /dev/null
@@ -1,202 +0,0 @@
-# Maintainer:  Jacek Burghardt           <jacek@hebe.us>
-# Maintainer:  Vojtech Aschenbrenner     <v@asch.cz>
-# 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@parabola.nu>
-
-# based of debian squeeze package
-
-_automake=1.14
-
-pkgname=zoneminder
-pkgver=1.25.0
-pkgrel=28
-pkgdesc='Capture, analyse, record and monitor video security cameras'
-arch=(
-  mips64el
-  x86_64
-  i686
-)
-backup=etc/zm.conf
-url=http://www.$pkgname.com
-license=GPL2
-depends=(
-  apache
-  cambozola
-  ffmpeg
-  gnutls
-  mariadb
-  perl-archive-zip
-  perl-date-manip
-  perl-dbd-mysql
-  perl-dbi
-  perl-expect
-  perl-libwww
-  perl-mime-lite
-  perl-mime-tools
-  perl-php-serialization
-  perl-net-sftp-foreign
-  perl-sys-mmap
-  perl-time-modules
-  perl-x10
-  php
-  php-apache
-  php-gd
-  php-mcrypt
-)
-makedepends=netpbm
-optdepends=netpbm
-options=(!libtool)
-install=$pkgname.install
-source=(
-  http://www.$pkgname.com/downloads/ZoneMinder-$pkgver.tar.gz
-  httpd-$pkgname.conf
-  $pkgname.service
-  sysctl-$pkgname.conf
-  $pkgname-$pkgver-ffmpeg.patch
-  $pkgname-$pkgver-gcrypt.patch
-)
-sha512sums=(
-  3e18993b0539729491052c97d8c94227ccc089eb40277c2f07682f30049033303c7cfe9734fdac6d33ae67df29c76eb72bf7fbb5dae8227e8831fa603b61c375
-  4ce0d8eba9d006d258f5b8a83920fc17f1f602b96518d37b7a47cd9b6eb84ef2587641a6ba839a469c3f0e33b46475866187279ae3f8be0d4054b074ee5d6b08
-  cfb0eb87a989236c72741a496ddc6a73aa2696e5beaaca4836d3c231ddb24c7ef5e9f65e7afa49674f2115cbfa4a07c75486e1947ce294c816ddbb875f3b99cf
-  7330c179f1e2db815a675560d3d84648be02f7d0292f8cbe21d6033577fe688ed71ad23b5b8c9dc309395b45ebb554f9499e7a4b57091959b69679011fa59044
-  7fc2a4663c3103bef641be065bd7992a2b3dc0699f1b99dc2fdb34c1c48e58686e490d3ade523ef7c8e29b3f04109658eef652c26ff6ee3fb9aee65453bdb6c4
-  8c9e7debcaf60be1c2dda656f95e497f6812d704edc3ca4a1c915a3b3c9dc1749c91d96bc2d60db7d90d5edfd9e2dfc39010dfe4feabfecfffd27f1fffc3d675
-)
-
-prepare() {
-  cd $srcdir/ZoneMinder-$pkgver
-
-  # Patch for automake
-  sed -i "\|^am__api_version=| s|1[.]11|$_automake|;
-         " configure
-
-  # Patch for GCC
-  sed -i 's|^#include [<]errno[.]h[>]$|#include <errno.h>\n#include <unistd.h>|;
-         ' src/zm_logger.cpp
-  sed -i 's|^#include [<]pthread[.]h[>]$|#include <pthread.h>\n#include <unistd.h>|;
-         ' src/zm_thread.h
-  sed -i 's|^#include [<]fcntl[.]h[>]$|#include <fcntl.h>\n#include <limits.h>|;
-         ' src/zm_local_camera.cpp
-
-  # Patch for type cast in linux-libre kernel 3.5 and for wrong type "suppported"
-  sed -i 's|enum v4l2_buf_type type = v4l2_data[.]fmt[.]type|enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type|; 
-          s|suppported|supported|;
-         ' src/zm_local_camera.cpp
-
-  # configure crash on i686
-  [[ $CARCH != i686 ]] && {
-    # Patch for fixing warning
-    sed -i 's|pdest[+][+] = ([*]blend_ptr)\[[*]pdest]\[[*]psrc[+][+]]|pdest = (*blend_ptr)[*pdest][*psrc++];\n			pdest++|;
-           ' src/zm_image.cpp
-  }
-
-  # Patch for support ffmpeg with <libavutil/mathematics.h>
-  #sed -i 's|^extern "C" {|extern "C" {\n#ifdef _STDINT_H\n#undef _STDINT_H\n#endif\n#include <stdint.h>|;
-  #        s|^#include <libavutil/avutil[.]h>|#include <libavutil/avutil.h>\n#include <libavutil/mathematics.h>|;
-  #       ' src/zm_ffmpeg.h
-
-  # Patch for support C library
-  #sed -i 's|^AM_CONFIG_HEADER(config[.]h)|AM_CONFIG_HEADER(config.h)\n\nAC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])|;
-  #        s|^AC_CHECK_HEADERS(mysql/mysql[.]h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)|AC_CHECK_HEADERS(mysql/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)\nAC_LANG_PUSH([C])|;
-  #        s|^AC_CHECK_HEADERS(libswscale/swscale[.]h,,,)|AC_CHECK_HEADERS(libswscale/swscale.h,,,)\nAC_LANG_POP([C])|;
-  #       ' configure.ac
-
-  # Patch for disable ZM_CHECK_FOR_UPDATES
-  sed -i '\|ZM_CHECK_FOR_UPDATES|,+1 s|yes|no|;
-         ' scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
-
-  # Patch for support html5 video and flv
-  sed -i '\|ZM_MPEG_LIVE_FORMAT|,+1 s|swf|webm|;
-          \|ZM_MPEG_REPLAY_FORMAT|,+1 s|swf|webm|;
-          \|ZM_FFMPEG_FORMATS|,+1 s|mpg mpeg wmv asf avi[*] mov swf 3gp[*][*]|mpg mpeg wmv asf avi* mov flv swf 3gp** webm ogg h264|;
-         ' scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
-
-  # Patch for change path run dir and for change ZM name to ZoneMinder
-  sed -i '\|ZM_PATH_SOCKS|,+1 s|TMP|RUN|;
-          \|ZM_WEB_TITLE_PREFIX|,+1 s|"ZM"|"ZoneMinder"|;
-         ' scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
-
-  # Patch for v4l2 convert support
-  sed -i 's|^$ENV{SHELL} = '"'/bin/sh'"' if exists $ENV{SHELL}|$ENV{SHELL} = '"'/bin/sh'"' if exists $ENV{SHELL};\n$ENV{LD_PRELOAD} = '"'/usr/lib/libv4l/v4l2convert.so'"' |;
-         ' scripts/zmdc.pl.in
-
-  # Patch for add more socket tries
-  sed -i '\|^$max_socket_tries = | s|3|15|;
-         ' web/ajax/stream.php
-
-  # Patch for text
-  sed -i 's|if ( fwrite( buffer, n_bytes, 1, stdout ) )|if ( fwrite( buffer, n_bytes, 1, stdout ) != 1 )|;
-         ' src/zm_stream.cpp
-
-  # Patch for remove HACK in Makefile.*
-  sed -i '\|This is a HACK|d;
-          \|^install-data-hook:$|,+5 d;
-          s| install-data-hook||;
-          \|^uninstall-hook:$|,+5 d;
-          s| uninstall-hook||;
-         ' Makefile.{am,in}
-
-  # Patch
-  for _patch in ffmpeg gcrypt; do
-    patch -Np1 -F99 -i $srcdir/$pkgname-$pkgver-$_patch.patch
-  done
-}
-
-build() {
-  cd $srcdir/ZoneMinder-$pkgver
-
-  # ZM_RUNDIR need change to run dir
-  export CPPFLAGS="$CPPFLAGS -D__STDC_CONSTANT_MACROS"\
-    OPT_FFMPEG=yes\
-    PATH_FFMPEG=/usr/bin/ffmpeg\
-    ZM_LOGDIR=/var/log/$pkgname\
-    ZM_RUNDIR=/tmp/$pkgname\
-    ZM_SSL_LIB=libgcrypt\
-    ZM_TMPDIR=/tmp/$pkgname
-
-  ./configure --prefix=/usr\
-    --enable-crashtrace=no\
-    --enable-debug=no\
-    --enable-mmap=yes\
-    --sysconfdir=/etc\
-    --with-cgidir=/srv/http/cgi-bin\
-    --with-extralibs='-L/usr/lib -L/usr/lib/mysql'\
-    --with-ffmpeg=/usr\
-    --with-libarch=lib\
-    --with-mysql=/usr\
-    --with-webdir=/srv/http/$pkgname\
-    --with-webgroup=http\
-    --with-webhost=localhost\
-    --with-webuser=http
-  make V=0
-}
-
-package() {
-  cd $srcdir/ZoneMinder-$pkgver
-  make DESTDIR=$pkgdir install
-
-  mkdir -vp $pkgdir/{etc/{httpd/conf/extra,sysctl.d},srv/http/{cgi-bin,$pkgname/socks},usr/{lib/systemd/system,share/{licenses/$pkgname,$pkgname/db}},var/{cache/$pkgname,log/$pkgname}}
-  chown -vR http.http $pkgdir/{etc/zm.conf,srv/http/$pkgname/socks,var/{cache/$pkgname,log/$pkgname}}
-  chmod -v 0700 $pkgdir/etc/zm.conf
-
-  for i in events images temp; do
-    mv -v  $pkgdir/srv/http/$pkgname/$i $pkgdir/var/cache/$pkgname/$i
-    ln -vs /var/cache/$pkgname/$i       $pkgdir/srv/http/$pkgname/$i
-    chown -vh http.http                 $pkgdir/srv/http/$pkgname/$i
-  done
-
-  ln -vs /srv/http/cgi-bin                  $pkgdir/srv/http/$pkgname
-  chown -vh http.http                       $pkgdir/srv/http/{cgi-bin,$pkgname,$pkgname/cgi-bin}
-
-  ln -vs /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgname
-
-  install -vDm644 $srcdir/httpd-$pkgname.conf  $pkgdir/etc/httpd/conf/extra
-  install -vDm644 $srcdir/$pkgname.service     $pkgdir/usr/lib/systemd/system
-  install -vDm644 $srcdir/sysctl-$pkgname.conf $pkgdir/etc/sysctl.d
-  install -vDm644 $srcdir/sysctl-$pkgname.conf $pkgdir/srv/http/$pkgname
-  install -vDm644 COPYING                      $pkgdir/usr/share/licenses/$pkgname
-  install -vDm644 db/zm*.sql                   $pkgdir/usr/share/$pkgname/db
-}
diff --git a/pcr/zoneminder/httpd-zoneminder.conf b/pcr/zoneminder/httpd-zoneminder.conf
deleted file mode 100644
index aeb089bc1..000000000
--- a/pcr/zoneminder/httpd-zoneminder.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# /etc/httpd/conf/extra/httpd-zm.conf
-# Config for zoneminder web app
-
-Alias /zm "/srv/http/zoneminder"
-<Directory "/srv/http/zoneminder">
-  Options -Indexes MultiViews FollowSymLinks
-  AllowOverride None
-  Order allow,deny
-  Allow from all
-  # The code unfortunately uses short tags in many places
-  php_value short_open_tag On
-</Directory>
-
-ScriptAlias /cgi-bin "/srv/http/cgi-bin"
-<Directory "/srv/http/cgi-bin">
-  AllowOverride None
-  Options ExecCGI FollowSymLinks
-  Order allow,deny
-  Allow from all
-</Directory>
diff --git a/pcr/zoneminder/sysctl-zoneminder.conf b/pcr/zoneminder/sysctl-zoneminder.conf
deleted file mode 100644
index ec1407dee..000000000
--- a/pcr/zoneminder/sysctl-zoneminder.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# For Zoneminder Monitor
-#kernel.shmall = 524288000
-#kernel.shmmax = 524288000
diff --git a/pcr/zoneminder/zoneminder b/pcr/zoneminder/zoneminder
deleted file mode 100644
index c4cbf4d3f..000000000
--- a/pcr/zoneminder/zoneminder
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-daemon_name=zm
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting Zoneminder"
-    /usr/bin/zmfix -a
-    if /usr/bin/zmpkg.pl start >/dev/null ; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Zoneminder"
-    if /usr/bin/zmpkg.pl stop >/dev/null ; then
-      rm_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  reload)
-    stat_busy "Reloading Zoneminder"
-    if /usr/bin/zmpkg.pl graceful >/dev/null ; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    stat_busy "Restarting Zoneminder"
-    if /usr/bin/zmpkg.pl restart >/dev/null ; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  status)
-    stat_busy "Checking Zoneminder status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|reload|restart|status}"
-esac
-
-exit 0
diff --git a/pcr/zoneminder/zoneminder-1.25-fixwarning.patch b/pcr/zoneminder/zoneminder-1.25-fixwarning.patch
deleted file mode 100644
index 0d151d139..000000000
--- a/pcr/zoneminder/zoneminder-1.25-fixwarning.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -U 3 -H -d -r -N -- ZoneMinder-1.24.2/src/zm_image.cpp ZoneMinder-1.24.2-patch/src/zm_image.cpp
---- ZoneMinder-1.24.2/src/zm_image.cpp	2009-05-25 20:04:00.000000000 +0200
-+++ ZoneMinder-1.24.2-patch/src/zm_image.cpp	2009-07-04 16:31:45.000000000 +0200
-@@ -776,7 +776,8 @@
- 
- 		while( pdest < (buffer+size) )
- 		{
--			*pdest++ = (*blend_ptr)[*pdest][*psrc++];
-+			*pdest = (*blend_ptr)[*pdest][*psrc++];
-+			pdest++;
- 		}
- 	}
- 	else
-
diff --git a/pcr/zoneminder/zoneminder-1.25-text.patch b/pcr/zoneminder/zoneminder-1.25-text.patch
deleted file mode 100644
index 90885f1b5..000000000
--- a/pcr/zoneminder/zoneminder-1.25-text.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ZoneMinder-1.25.0/src/zm_stream.cpp	2009-05-08 09:47:27.000000000 -0400
-+++ ZoneMinder-1.25.0.ajs/src/zm_stream.cpp	2013-01-14 16:52:18.000000000 -0500
-@@ -262,7 +262,7 @@ bool StreamBase::sendTextFrame( const ch
-         fprintf( stdout, "--ZoneMinderFrame\r\n" );
-         fprintf( stdout, "Content-Length: %d\r\n", n_bytes );
-         fprintf( stdout, "Content-Type: image/jpeg\r\n\r\n" );
--        if ( fwrite( buffer, n_bytes, 1, stdout ) )
-+        if ( fwrite( buffer, n_bytes, 1, stdout ) != 1 )
-         {
-             Error( "Unable to send stream text frame: %s", strerror(errno) );
-             return( false );
-
diff --git a/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch b/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch
deleted file mode 100644
index 99d41ee33..000000000
--- a/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -Naur ZoneMinder-1.25.0-a/configure.ac ZoneMinder-1.25.0-b/configure.ac
---- ZoneMinder-1.25.0-a/configure.ac	2011-08-23 09:10:32.000000000 -0600
-+++ ZoneMinder-1.25.0-b/configure.ac	2013-05-06 11:17:33.860608307 -0600
-@@ -95,7 +95,7 @@
- 
- LDFLAGS="${FFMPEG_LIBS} $LDFLAGS"
- CFLAGS="${FFMPEG_CFLAGS} $CFLAGS"
--CPPFLAGS="${FFMPEG_CFLAGS} $CPPFLAGS"
-+CPPFLAGS="${FFMPEG_CFLAGS} $CPPFLAGS -D__STDC_CONSTANT_MACROS"
- 
- EXTRA_LIBS=
- AC_ARG_WITH(extralibs,
-@@ -275,8 +275,7 @@
- AC_CHECK_LIB(x264,x264_predict_16x16_init)
- AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
- # Don't bother to warn about this one
--AC_CHECK_LIB(avcore,av_image_copy,,)
--AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
-+AC_CHECK_LIB(avcodec,avcodec_register_all,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
- AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
- AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
- AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
-diff -Naur ZoneMinder-1.25.0-a/src/zm_ffmpeg.h ZoneMinder-1.25.0-b/src/zm_ffmpeg.h
---- ZoneMinder-1.25.0-a/src/zm_ffmpeg.h	2011-06-24 10:05:07.000000000 -0600
-+++ ZoneMinder-1.25.0-b/src/zm_ffmpeg.h	2013-05-06 18:11:49.327274977 -0600
-@@ -43,6 +43,11 @@
- }
- #endif
- 
-+#include <libavutil/avutil.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libswscale/swscale.h>
-+
- #if FFMPEG_VERSION_INT == 0x000408
- #define ZM_FFMPEG_048	1
- #elif FFMPEG_VERSION_INT == 0x000409
-diff -Naur ZoneMinder-1.25.0-a/src/zm_ffmpeg_camera.cpp ZoneMinder-1.25.0-b/src/zm_ffmpeg_camera.cpp
---- ZoneMinder-1.25.0-a/src/zm_ffmpeg_camera.cpp	2011-06-21 01:40:13.000000000 -0600
-+++ ZoneMinder-1.25.0-b/src/zm_ffmpeg_camera.cpp	2013-05-06 19:57:08.453941643 -0600
-@@ -91,7 +91,7 @@
-     Info( "Priming capture from %s", mPath.c_str() );
- 
-     // Open the input, not necessarily a file
--    if ( av_open_input_file( &mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 )
-+    if ( avformat_open_input( &mFormatContext, mPath.c_str(), NULL, NULL ) !=0 )
-         Fatal( "Unable to open input %s due to: %s", mPath.c_str(), strerror(errno) );
- 
-     // Locate stream info from input
-@@ -122,7 +122,7 @@
-         Fatal( "Can't find codec for video stream from %s", mPath.c_str() );
- 
-     // Open the codec
--    if ( avcodec_open( mCodecContext, mCodec ) < 0 )
-+    if ( avcodec_open2( mCodecContext, mCodec, NULL ) < 0 )
-         Fatal( "Unable to open codec for video stream from %s", mPath.c_str() );
- 
-     // Allocate space for the native video frame
-diff -Naur ZoneMinder-1.25.0-a/src/zm_mpeg.cpp ZoneMinder-1.25.0-b/src/zm_mpeg.cpp
---- ZoneMinder-1.25.0-a/src/zm_mpeg.cpp	2011-05-15 14:39:06.000000000 -0600
-+++ ZoneMinder-1.25.0-b/src/zm_mpeg.cpp	2013-05-06 20:00:08.923941640 -0600
-@@ -130,7 +130,7 @@
- {
- 	/* set the output parameters (must be done even if no
- 	   parameters). */
--	if ( av_set_parameters(ofc, NULL) < 0 )
-+	if ( avformat_write_header(ofc, NULL) < 0 )
- 	{
- 		Panic( "Invalid output format parameters" );
- 	}
-@@ -176,7 +176,7 @@
- 		}
- 
- 		/* open the codec */
--		if ( avcodec_open(c, codec) < 0 )
-+		if ( avcodec_open2(c, codec, NULL) < 0 )
- 		{
- 			Panic( "Could not open codec" );
- 		}
-@@ -222,7 +222,7 @@
- 	if ( !(of->flags & AVFMT_NOFILE) )
- 	{
- #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
--		if ( avio_open(&ofc->pb, filename, URL_WRONLY) < 0 )
-+		if ( avio_open(&ofc->pb, filename, AVIO_FLAG_WRITE) < 0 )
- #else
- 		if ( url_fopen(&ofc->pb, filename, URL_WRONLY) < 0 )
- #endif
-@@ -241,7 +241,7 @@
- 	}
- 
- 	/* write the stream header, if any */
--	av_write_header(ofc);
-+	avformat_write_header(ofc, NULL);
- }
- 
- VideoStream::VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int width, int height )
-diff -Naur ZoneMinder-1.25.0-a/src/zm_remote_camera_rtsp.cpp ZoneMinder-1.25.0-b/src/zm_remote_camera_rtsp.cpp
---- ZoneMinder-1.25.0-a/src/zm_remote_camera_rtsp.cpp	2011-06-21 03:19:10.000000000 -0600
-+++ ZoneMinder-1.25.0-b/src/zm_remote_camera_rtsp.cpp	2013-05-06 20:07:40.797274975 -0600
-@@ -145,7 +145,7 @@
-         Panic( "Unable to locate codec %d decoder", codecContext->codec_id );
- 
-     // Open codec
--    if ( avcodec_open( codecContext, codec ) < 0 )
-+    if ( avcodec_open2( codecContext, codec, NULL ) < 0 )
-         Panic( "Can't open codec" );
- 
-     picture = avcodec_alloc_frame();
-diff -Naur ZoneMinder-1.25.0-a/src/zm_sdp.h ZoneMinder-1.25.0-b/src/zm_sdp.h
---- ZoneMinder-1.25.0-a/src/zm_sdp.h	2011-05-15 14:39:06.000000000 -0600
-+++ ZoneMinder-1.25.0-b/src/zm_sdp.h	2013-05-06 20:23:28.237274974 -0600
-@@ -41,7 +41,7 @@
-         int payloadType;
-         const char payloadName[6];
-         enum AVMediaType codecType;
--        enum CodecID codecId;
-+        enum AVCodecID codecId;
-         int clockRate;
-         int autoChannels;
-     };
-@@ -50,7 +50,7 @@
-     {
-         const char payloadName[32];
-         enum AVMediaType codecType;
--        enum CodecID codecId;
-+        enum AVCodecID codecId;
-         //int clockRate;
-         //int autoChannels;
-     };
diff --git a/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch b/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch
deleted file mode 100644
index a083c6dbc..000000000
--- a/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up ./src/zm_local_camera.cpp.gcc47 ./src/zm_local_camera.cpp
---- ./src/zm_local_camera.cpp.gcc47	2011-06-21 04:19:10.000000000 -0500
-+++ ./src/zm_local_camera.cpp	2012-01-19 13:43:49.142440717 -0600
-@@ -26,6 +26,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <limits.h>
- #include <unistd.h>
- #include <sys/mman.h>
- #include <errno.h>
-diff -up ./src/zm_logger.cpp.gcc47 ./src/zm_logger.cpp
---- ./src/zm_logger.cpp.gcc47	2011-06-28 06:07:35.000000000 -0500
-+++ ./src/zm_logger.cpp	2012-01-19 13:43:49.142440717 -0600
-@@ -33,6 +33,7 @@
- #include <signal.h>
- #include <stdarg.h>
- #include <errno.h>
-+#include <unistd.h>
- 
- bool Logger::smInitialised = false;
- Logger *Logger::smInstance = 0;
-diff -up ./src/zm_thread.h.gcc47 ./src/zm_thread.h
---- ./src/zm_thread.h.gcc47	2012-01-19 13:44:43.082766722 -0600
-+++ ./src/zm_thread.h	2012-01-19 13:44:56.966335869 -0600
-@@ -21,6 +21,7 @@
- #define ZM_THREAD_H
- 
- #include <pthread.h>
-+#include <unistd.h>
- #include "zm_exception.h"
- #include "zm_utils.h"
- 
diff --git a/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch b/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch
deleted file mode 100644
index 21f197ec6..000000000
--- a/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -up ./configure.ac.gcrypt ./configure.ac
---- ./configure.ac.gcrypt	2012-01-19 12:58:20.647123209 -0600
-+++ ./configure.ac	2012-01-19 13:12:34.186669577 -0600
-@@ -13,7 +13,7 @@ AC_ARG_VAR(ZM_DB_HOST,[Hostname where Zo
- AC_ARG_VAR(ZM_DB_NAME,[Name of ZoneMinder database, default zm])
- AC_ARG_VAR(ZM_DB_USER,[Name of ZoneMinder database user, default zmuser])
- AC_ARG_VAR(ZM_DB_PASS,[Password of ZoneMinder database user, default zmpass])
--AC_ARG_VAR(ZM_SSL_LIB,[Library to use for ssl functions, default gnutls])
-+AC_ARG_VAR(ZM_SSL_LIB,[Library to use for MD5 function, default libgcrypt])
- AC_ARG_VAR(ZM_MYSQL_ENGINE,[MySQL engine to use with database, default MyISAM])
- AC_ARG_VAR(ZM_RUNDIR,[Location of transient process files, default /var/run/zm])
- AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /tmp/zm])
-@@ -32,7 +32,7 @@ if test "$ZM_DB_PASS" == ""; then
- 	AC_SUBST(ZM_DB_PASS,[zmpass])
- fi
- if test "$ZM_SSL_LIB" == ""; then
--	AC_SUBST(ZM_SSL_LIB,gnutls)
-+	AC_SUBST(ZM_SSL_LIB,libgcrypt)
- fi
- if test "$ZM_MYSQL_ENGINE" == ""; then
- 	AC_SUBST(ZM_MYSQL_ENGINE,MyISAM)
-@@ -264,11 +264,10 @@ AC_CHECK_LIB(jpeg,jpeg_start_compress,,A
- AC_CHECK_LIB(pthread,pthread_create,,AC_MSG_ERROR(zm requires libpthread.a))
- AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
- if test "$ZM_SSL_LIB" == "openssl"; then
--AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select gnutls instead]))
-+AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select libgcrypt instead]))
- else
--AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed for gnutls),)
-+AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed),)
- AC_CHECK_LIB(gcrypt,gcry_check_version,,AC_MSG_WARN([libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
--AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
- fi
- AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
- AC_CHECK_LIB(z,zlibVersion)
-@@ -320,9 +319,6 @@ AC_CHECK_DECLS(round,,,[#include <math.h
- if test "$ZM_SSL_LIB" == "openssl"; then
- AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include <stdlib.h>
- #include <openssl/md5.h>])
--else
--AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
--#include <gnutls/openssl.h>])
- fi
- AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>])
- 
-diff -up ./src/zm_user.cpp.gcrypt ./src/zm_user.cpp
---- ./src/zm_user.cpp.gcrypt	2011-08-03 06:31:06.000000000 -0500
-+++ ./src/zm_user.cpp	2012-01-19 12:58:20.654122992 -0600
-@@ -140,6 +140,18 @@ User *zmLoadUser( const char *username, 
- 	return( user );
- }
- 
-+#ifdef HAVE_GCRYPT_H
-+#define HAVE_DECL_MD5 1
-+#define MD5_DIGEST_LENGTH 16
-+static unsigned char *MD5(const unsigned char *data, unsigned long len,
-+                         unsigned char *md)
-+{
-+    gcry_md_hash_buffer(GCRY_MD_MD5, md, data, len);
-+
-+    return md;
-+}
-+#endif
-+
- // Function to validate an authentication string
- User *zmLoadAuthUser( const char *auth, bool use_remote_addr )
- {
-diff -up ./src/zm_user.h.gcrypt ./src/zm_user.h
---- ./src/zm_user.h.gcrypt	2010-11-11 06:11:07.000000000 -0600
-+++ ./src/zm_user.h	2012-01-19 13:14:11.200654694 -0600
-@@ -23,14 +23,11 @@
- #ifndef ZM_USER_H

- #define ZM_USER_H

- 

--#if HAVE_LIBGNUTLS_OPENSSL

--#include <gnutls/openssl.h>

- #if HAVE_GCRYPT_H

- #include <gcrypt.h>

--#endif // HAVE_GCRYPT_H

- #elif HAVE_LIBCRYPTO

- #include <openssl/md5.h>

--#endif // HAVE_LIBGNUTLS_OPENSSL || HAVE_LIBCRYPTO

-+#endif // HAVE_GCRYPT_H || HAVE_LIBCRYPTO

- 

- class User

- {

diff --git a/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch
deleted file mode 100644
index 51bc1288d..000000000
--- a/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up ./src/zm_local_camera.cpp.kernel35 ./src/zm_local_camera.cpp
---- ./src/zm_local_camera.cpp.kernel35	2012-07-16 15:01:22.182614878 -0500
-+++ ./src/zm_local_camera.cpp	2012-07-16 15:02:16.491941730 -0500
-@@ -740,7 +740,7 @@ void LocalCamera::Terminate()
-     {
-         Debug( 3, "Terminating video stream" );
-         //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
--        enum v4l2_buf_type type = v4l2_data.fmt.type;
-+        enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
-         if ( vidioctl( vid_fd, VIDIOC_STREAMOFF, &type ) < 0 )
-             Error( "Failed to stop capture stream: %s", strerror(errno) );
- 
-@@ -1520,7 +1520,7 @@ int LocalCamera::PrimeCapture()
- 
-         Debug( 3, "Starting video stream" );
-         //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
--        enum v4l2_buf_type type = v4l2_data.fmt.type;
-+        enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
-         if ( vidioctl( vid_fd, VIDIOC_STREAMON, &type ) < 0 )
-             Fatal( "Failed to start capture stream: %s", strerror(errno) );
-     }
diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install
deleted file mode 100644
index 66109d5fa..000000000
--- a/pcr/zoneminder/zoneminder.install
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/usr/bin/bash
-pre_install() {
-  set -e
-  abort=false
-  if [ -L /srv/http/zoneminder/events ]; then
-    l=$(readlink /srv/http/zoneminder/events)
-    if [ $l != /var/cache/zoneminder/events ]; then
-        abort=true
-    fi
-  fi
-  if [ -L /srv/http/zoneminder/images ]; then
-    l=$(readlink /srv/http/zoneminder/images)
-    if [ $l != /var/cache/zoneminder/images ]; then
-        abort=true
-    fi
-  fi
-  if [ $abort = true ]; then
-    cat >&2 << EOF
-Aborting installation of zoneminder due to non-default symlinks in
-/srv/http/zoneminder for the images and/or events directory, which could
-result in loss of data. Please move your data in each of these directories to
-/var/cache/zoneminder before installing zoneminder from the package.
-EOF
-    exit 1
-  fi
-  exit 0
-}
-
-post_install() {
-  if [[ -d /var/log/zoneminder ]]; then
-    chmod -v 0755      /var/log/zoneminder
-    chown -v http.http /var/log/zoneminder
-  else
-    mkdir -vm 0755      /var/log/zoneminder
-    chown -v  http.http /var/log/zoneminder
-  fi
-  if [[ -d /tmp/zoneminder ]]; then
-    chmod -v 0700      /tmp/zoneminder
-    chown -v http.http /tmp/zoneminder
-  else
-    mkdir -vm 0700      /tmp/zoneminder
-    chown -v  http.http /tmp/zoneminder
-  fi
-  sed -i '
-    /^;extension=mysql.so/ s/^;//;
-    /^#extension=mysql.so/ s/^#//;
-    /^;extension=mysqli.so/ s/^;//;
-    /^#extension=mysqli.so/ s/^#//;
-    /^;extension=gd.so/ s/^;//;
-    /^#extension=gd.so/ s/^#//;
-    /^;extension=gettext.so/ s/^;//;
-    /^#extension=gettext.so/ s/^#//;
-    /^;extension=mcrypt.so/ s/^;//;
-    /^#extension=mcrypt.so/ s/^#//;
-    /^;extension=session.so/ s/^;//;
-    /^#extension=session.so/ s/^#//;
-    /^;extension=sockets.so/ s/^;//;
-    /^#extension=sockets.so/ s/^#//;
-    /^;extension=openssl.so/ s/^;//;
-    /^#extension=openssl.so/ s/^#//;
-    /^;extension=ftp.so/ s/^;//;
-    /^#extension=ftp.so/ s/^#//;
-    /^;extension=zip.so/ s/^;//;
-    /^#extension=zip.so/ s/^#//;
-    /^;open_basedir/ s/^;//;
-    /^#open_basedir/ s/^#//;
-    /^open_basedir/ s/:\/etc//;
-    /^open_basedir/ s/:\/etc\///;
-    /^open_basedir/ s/$/:\/etc/;
-    /^open_basedir/ s/:\/srv\/http\/zoneminder//;
-    /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
-    /^open_basedir/ s/$/:\/srv\/http\/zoneminder/;
-    /^open_basedir/ s/:\/var\/cache\/zoneminder//;
-    /^open_basedir/ s/:\/var\/cache\/zoneminder\///;
-    /^open_basedir/ s/$/:\/var\/cache\/zoneminder/;
-    ' /etc/php/php.ini
-  sed -i '
-    /^LoadModule php5_module modules\/libphp5.so/d;
-    /^LoadModule rewrite_module modules\/mod_rewrite.so/ s/$/\nLoadModule php5_module modules\/libphp5.so/;
-    /^# PHP 5/d;
-    /^# ZoneMinder/d;
-    /^Include \/etc\/httpd\/conf\/extra\/php5_module.conf/d;
-    /^Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d;
-    /^Include conf\/extra\/httpd-default.conf/ s/$/\n\n# PHP 5\n\Include \/etc\/httpd\/conf\/extra\/php5_module.conf\n\n# ZoneMinder\nInclude \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/;
-    ' /etc/httpd/conf/httpd.conf
-  gpasswd -a http video
-  cat << EOF
-Note for mysql:
-==> To run Zoneminder, you must install the database running mysql service (as root):
-==> "systemctl start mysqld.service"
-==> and add Zoneminder database typing (with passsword):
-==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f reload"
-==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf -p"
-==> "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql"
-==> (or without passsword):
-==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -f reload"
-==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf"
-==> "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf mysql"
-
-Note for sysctl:
-==> You must uncomment that line in /etc/sysctl.d/sysctl-zoneminder.conf:
-==> "kernel.shmall = 524288000"
-==> "kernel.shmmax = 524288000"
-
-Note for php:
-==> You must uncomment that line in /etc/php/php.ini:
-==> "extension=mysql.so"
-==> check and make sure these are uncommented:
-==> "extension=gd.so"
-==> "extension=gettext.so"
-==> "extension=mcrypt.so"
-==> "extension=mysqli.so"
-==> "extension=session.so"
-==> "extension=sockets.so"
-==> "extension=openssl.so"
-==> "extension=ftp.so"
-==> "extension=zip.so"
-==> check and add to open_basedir "/etc", 
-==> "/srv/http/zoneminder" and "/var/cache/zoneminder" like so
-==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder:/var/cache/zoneminder"
-==> and set your timezone in php.ini:
-==> "date.timezone = <your_zone>/<your_city>"
-
-Note for apache:
-==> You must edit /etc/httpd/conf/httpd.conf and add the line:
-==> "LoadModule php5_module modules/libphp5.so"
-==> and:
-==> "Include /etc/httpd/conf/extra/php5_module.conf"
-==> "Include /etc/httpd/conf/extra/httpd-zoneminder.conf"
-EOF
-}
-
-post_upgrade() {
-  post_install
-  _mysqld=$(systemctl status mysqld.service | grep -o 'inactive (dead)')
-  [[ _mysqld == 'inactive (dead)' ]] && systemctl start mysqld.service
-  /usr/bin/zmupdate.pl -f >/dev/null
-  [[ _mysqld == 'inactive (dead)' ]] && systemctl stop mysqld.service
-}
-
-post_remove() {
-  _zms=$(systemctl status zoneminder.service | grep -o 'active (running)')
-  [[ _zms == 'active (running)' ]] && systemctl stop zoneminder.service
-  [[ -d /tmp/zoneminder ]] && rm -vr /tmp/zoneminder
-  sed -i '
-    /^open_basedir/ s/:\/srv\/http\/zoneminder//;
-    /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
-    /^open_basedir/ s/:\/var\/cache\/zoneminder\///
-    ' /etc/php/php.ini
-  sed -i '
-    /^# ZoneMinder/d;
-    /Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d;
-    ' /etc/httpd/conf/httpd.conf
-  cat << EOF
-Note:
-==> To clean Zoneminder mysql database, run as root (with password):
-==> "echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql"
-==> "echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql"
-==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f drop zm"
-==> (or without password):
-==> "echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf mysql"
-==> "echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf mysql"
-==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -f drop zm"
-
-==> Disable http with php if it isn't needed with others servers, 
-==> comment or remove that lines in /etc/httpd/conf/httpd.conf:
-==> "LoadModule php5_module modules/libphp5.so"
-==> "Include /etc/httpd/conf/extra/php5_module.conf"
-
-==> Remove line in /etc/httpd/conf/httpd.conf:
-==> "Include /etc/httpd/conf/extra/httpd-zoneminder.conf"
-
-==> Disable php with mysql if it isn't needed with others servers, 
-==> comment that lines in /etc/php/php.ini:
-==> "extension=mysql.so"
-==> "extension=gd.so"
-==> "extension=gettext.so"
-==> "extension=mcrypt.so"
-==> "extension=mysqli.so"
-==> "extension=session.so"
-==> "extension=sockets.so"
-==> "date.timezone = <my_zone>/<my_city>"
-
-==> Drop http user on video group if it isn't needed with others servers:
-==> gpasswd -d http video
-
-==> Edit /etc/php/php.ini and remove "/etc", "/srv/http/zoneminder" and "/var/cache/zoneminder"
-==> in the "open_basedir".
-
-==> Remove log files and "zonemider" directory in "/var/log/zoneminder".
-
-==> Backup and remove "events", "images" and "temp" dirs in "/var/cache/zoneminder".
-EOF
-}
diff --git a/pcr/zoneminder/zoneminder.service b/pcr/zoneminder/zoneminder.service
deleted file mode 100644
index 05cae6f91..000000000
--- a/pcr/zoneminder/zoneminder.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Capture, analyse, record and monitor video security cameras
-After=network.target remote-fs.target
-Required=mysqld.service
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/zmpkg.pl start
-ExecRestart=/usr/bin/zmpkg.pl restart
-ExecStop=/usr/bin/zmpkg.pl stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/zsh-yaourt/PKGBUILD b/pcr/zsh-yaourt/PKGBUILD
deleted file mode 100644
index af6541183..000000000
--- a/pcr/zsh-yaourt/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor: Jakub Ruzicka <yaccobb@centrum.cz>
-# Contributor: Javier `Phrodo_00' Aravena <phrodo.00@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=zsh-yaourt
-pkgver=20110403
-_laststablerev=497acb78fe6b
-pkgrel=3
-pkgdesc="ZSH functions to tab-complete repo package names for yaourt"
-url="http://bitbucket.org/Phrodo_00/zsh-yaourt"
-depends=(zsh)
-source=("https://bitbucket.org/Phrodo_00/${pkgname}/get/${_laststablerev}.tar.gz")
-arch=('i686' 'x86_64')
-license=('GPL')
-md5sums=('ac80ec05fa12e53fc8c58e5178609a6b')
-
-package() {
-    cd ${srcdir}/Phrodo_00-${pkgname}-${_laststablerev}
-    install -d -m755 ${pkgdir}/usr/share/zsh/site-functions/
-    install -m644 _yaourt $startdir/pkg/usr/share/zsh/site-functions/_yaourt
-}
diff --git a/radio/idjc/PKGBUILD b/radio/idjc/PKGBUILD
deleted file mode 100644
index 0de01f4e3..000000000
--- a/radio/idjc/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Tobias Luther <tobias [at] tonstrom [dot] de>
-# Contributor: GraveDigger
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=idjc
-pkgver=0.8.8
-pkgrel=1
-pkgdesc='Powerful yet easy-to-use source-client for individuals interested in streaming live radio shows over the Internet'
-url='http://idjc.sourceforge.net/'
-license=('GPL2')
-arch=('i686' 'x86_64')
-#depends=('python2' 'jack' 'pygtk' 'lame' 'mutagen' 'flac' 'faad2' 'libsamplerate' 'vorbis-tools' 'libsndfile' 'ffmpeg' 'libmad' 'speex' 'dbus-python' 'imagemagick' 'twolame' 'libshout-idjc-git' 'mpg123')
-depends=('desktop-file-utils' 'python2' 'dbus-python' 'mutagen' 'jack' 'pygtk' 'vorbis-tools' 'libsndfile' 'libsamplerate' 'glib2' 'lame' 'libmad' 'ffmpeg' 'flac' 'speex' 'libshout-idjc')
-optdepends=('patchage' 'qjackctl')
-makedepends=('pkgconfig')
-install=${pkgname}.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a14ce4cc8c789fce55c7b98081743a4a')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-
-    ./configure --prefix=/usr PYTHON="/usr/bin/python2" --disable-libav
-
-    make PYTHON="/usr/bin/python2"
-
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-
-    make DESTDIR="${pkgdir}" PYTHON="/usr/bin/python2" install
-
-    sed -i 's|#! /usr/bin/python22.7|#! /usr/bin/python2|' ${pkgdir}/usr/bin/idjc
-}
diff --git a/radio/idjc/idjc.install b/radio/idjc/idjc.install
deleted file mode 100644
index 9834cb7dd..000000000
--- a/radio/idjc/idjc.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_upgrade() {
-	update-desktop-database -q
-}
-
-post_install() {
-	post_upgrade
-}
-
-post_remove() {
-	post_upgrade
-}
diff --git a/radio/idjc/idjc_0.8.4_configure.patch b/radio/idjc/idjc_0.8.4_configure.patch
deleted file mode 100644
index 9f1b3c5f0..000000000
--- a/radio/idjc/idjc_0.8.4_configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur idjc-0.8.4/configure idjc-0.8.4.new/configure
---- idjc-0.8.4/configure	2010-10-07 15:00:07.000000000 +0200
-+++ idjc-0.8.4.new/configure	2010-10-20 19:30:48.000000000 +0200
-@@ -5349,7 +5349,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mutagen" >&5
- $as_echo_n "checking for mutagen... " >&6; }
--python -c "import mutagen" &>/dev/null
-+$PYTHON -c "import mutagen" &>/dev/null
- if test $? -ne 0 ; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
diff --git a/radio/jack-rack/PKGBUILD b/radio/jack-rack/PKGBUILD
deleted file mode 100644
index 26330bb2b..000000000
--- a/radio/jack-rack/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: DonVla <donvla@users.sourceforge.net>
-# Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net>
-# Contributor: Berkus <berkus@madfire.net>
-# Contributor: Daniele Paolella <danielepaolella@email.it>
-pkgname=jack-rack
-pkgver=1.4.7
-pkgrel=4
-pkgdesc="Effects rack for JACK"
-url="http://jack-rack.sourceforge.net"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('jack' 'gtk2' 'libxml2' 'ladspa')
-optdepends=('lash: LASH support'
-            'raptor1: LRDF support'
-            'liblrdf: LRDF support'
-            'python2: ecarack')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
- 
-md5sums=('a29ef4001ee2916a1b758952c936adca')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./autogen.sh
-  ./configure --prefix=/usr --enable-lash --disable-gnome
-  make LDFLAGS='-ldl -lm'
-}
- 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"  
-  make DESTDIR=${pkgdir} install
-  sed -i 's/#!\/usr\/bin\/python/#!\/usr\/bin\/python2/' "${pkgdir}/usr/bin/ecarack"
-}
- 
-# vim:set ts=2 sw=2 et:
diff --git a/radio/libshout-idjc/PKGBUILD b/radio/libshout-idjc/PKGBUILD
deleted file mode 100644
index 51578c420..000000000
--- a/radio/libshout-idjc/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: fauno, based on the git version from
-# Mantainer: M0Rf30
-pkgname=libshout-idjc
-pkgver=2.3.0
-pkgrel=1
-pkgdesc="Libshout-idjc is libshout plus some extensions for IDJC."
-arch=(i686 x86_64)
-url="http://idjc.sourceforge.net/"
-depends=('libvorbis' 'libtheora' 'speex')
-options=('!libtool' '!emptydirs')
-source=("http://downloads.sourceforge.net/project/idjc/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-license=('LGPL')
-md5sums=('1b92ee05f42a957169a74a911cd94afc')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver/"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make LDFLAGS+=-lspeex
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/"
-  make DESTDIR="${pkgdir}" install
-}
-
diff --git a/social/ahcpd/PKGBUILD b/social/ahcpd/PKGBUILD
deleted file mode 100644
index a2f1e336f..000000000
--- a/social/ahcpd/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Yann Lopez <arch at lonewulf dot net>
-pkgname=ahcpd
-pkgver=0.53
-pkgrel=1
-pkgdesc="Ad-Hoc Configuration Protocol"
-arch=(i686 x86_64 mips64el)
-url="http://www.pps.jussieu.fr/~jch/software/ahcp/"
-license=('custom')
-depends=('sh')
-source=(http://www.pps.jussieu.fr/~jch/software/files/$pkgname-$pkgver.tar.gz)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  sed -i 's/\$(PREFIX)\/man/$(PREFIX)\/share\/man/g' Makefile
-  make PREFIX="/usr"
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  
-  make install TARGET=${pkgdir} PREFIX=/usr
-
-  install -d $pkgdir/usr/share/licenses/ahcpd
-  install -m 644 LICENCE $pkgdir/usr/share/licenses/ahcpd/
-}
-md5sums=('a1a610bf20965aa522cd766bf3d5829a')
diff --git a/social/aiccu/PKGBUILD b/social/aiccu/PKGBUILD
deleted file mode 100644
index 5fc4cb086..000000000
--- a/social/aiccu/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-pkgname=aiccu
-pkgver=20070115
-pkgrel=7
-pkgdesc="SixXS Automatic IPv6 Connectivity Client Utility - AICCU"
-arch=('i686' 'x86_64')
-url="http://www.sixxs.net/tools/aiccu/"
-license=('BSD')
-depends=('gnutls' 'iproute2')
-makedepends=('glibc' 'libgpg-error' 'libtasn1' 'libgcrypt' 'zlib')
-backup=(etc/aiccu.conf)
-source=(http://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.gz
-        aiccu.rc.d)
-md5sums=('c9bcc83644ed788e22a7c3f3d4021350'
-         '9eb63ae132d4835a822ea925c6440b04')
-
-build() {
-  cd "$srcdir/$pkgname"
-
-  sed -i 's|Installing Debian-style init.d||' Makefile
-
-  LDFLAGS="" make
-  make DESTDIR="$pkgdir" install
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-
-  install -D -m600 doc/aiccu.conf "$pkgdir/etc/aiccu.conf"
-  install -D -m755 "$srcdir/aiccu.rc.d" "$pkgdir/etc/rc.d/aiccu"
-  install -D -m444 doc/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  rm -fr "$pkgdir/etc/init.d"
-}
diff --git a/social/aiccu/aiccu.rc.d b/social/aiccu/aiccu.rc.d
deleted file mode 100644
index b0ca08fce..000000000
--- a/social/aiccu/aiccu.rc.d
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-daemon_name=aiccu
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	pidof $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=`get_pid`
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name start > /dev/null
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo `get_pid` > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=`get_pid`
-    # RUN
-    $daemon_name stop
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/social/anubis/PKGBUILD b/social/anubis/PKGBUILD
deleted file mode 100644
index 8835d2275..000000000
--- a/social/anubis/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
-# Contributor: Nathan Owe <ndowens04 at gmail>
-pkgname=anubis
-pkgver=4.1.1
-pkgrel=2
-pkgdesc="An SMTP message submission daemon. "
-arch=('i686')
-url="http://www.gnu.org/software/anubis/"
-license=('GPL3')
-depends=('guile' 'gpgme' 'gnutls' 'gsasl' 'pam' 'pcre' 'tcp_wrappers')
-source=(ftp://ftp.gnu.org/gnu/anubis/$pkgname-$pkgver.tar.gz)
-md5sums=('28df4daee11bc74a9e4b19b425d8a196') 
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure --prefix=/usr \
-              --with-pam \
-              --with-pcre \
-              --with-tcp-wrappers \
-              --with-socks-proxy
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir/ install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/social/babeld/PKGBUILD b/social/babeld/PKGBUILD
deleted file mode 100644
index 5aa25f07f..000000000
--- a/social/babeld/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer (AUR): Yann Lopez <arch at lonewulf dot net>
-# Maintainer (Parabola): fauno <fauno@parabola.nu>
-pkgname=babeld
-pkgver=1.3.4
-pkgrel=1
-pkgdesc="Loop-free distance-vector routing protocol"
-arch=(i686 x86_64 mips64el)
-url="http://www.pps.jussieu.fr/~jch/software/babel/"
-license=('custom')
-depends=(glibc)
-source=(http://www.pps.jussieu.fr/~jch/software/files/$pkgname-$pkgver.tar.gz{,.asc})
-install=babeld.install
-md5sums=('37be1cbcc23cd00ee47efc9157c58795'
-         'e2dfae49b497ba70c0c1014feae80f3a')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  sed -e "s,/man/,/share&,g" -i Makefile
-
-  make PREFIX=/usr CFLAGS="$CFLAGS"
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make PREFIX=/usr TARGET=$pkgdir install
-
-  gzip -f $pkgdir/usr/share/man/man8/$pkgname.8
-
-  install -Dm 644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENCE
-}
diff --git a/social/babeld/babeld.install b/social/babeld/babeld.install
deleted file mode 100644
index 686153617..000000000
--- a/social/babeld/babeld.install
+++ /dev/null
@@ -1,18 +0,0 @@
-compatibility_warning() {
-  echo "PLEASE NOTE:"
-  echo " "
-  echo "-------------------------------------------------------------"
-  echo " This version uses the IANA-allocated UDP port and multicast"
-  echo " group and is therefore incompatible with older versions."
-  echo "-------------------------------------------------------------"
-}
-
-post_upgrade() {
-  major=$(echo $2 | cut -d '.' -f1)
-  minor=$(echo $2 | cut -d '.' -f2)
-  if [ $major -lt 1 ]; then
-    compatibility_warning
-  elif [ $major -eq 1 -a $minor -lt 1 ]; then
-    compatibility_warning
-  fi	
-}
diff --git a/social/batctl/PKGBUILD b/social/batctl/PKGBUILD
deleted file mode 100644
index 33df8ca41..000000000
--- a/social/batctl/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Contributor: Nathan Owe <ndowens.aur at gmail dot com>
-# Maintainer: Thomas Weißschuh <thomas_weissschuh@lavabit.com>
-pkgname=batctl
-pkgver=2012.3.0
-pkgrel=1
-pkgdesc="B.A.T.M.A.N. advanced control and management tool"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.open-mesh.net/"
-license=('GPL')
-depends=('glibc')
-source=("http://downloads.open-mesh.net/batman/releases/batman-adv-${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc})
-
-build(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make
-}
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir}  PREFIX=/usr install
-
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('fe9e6a3994539037b48afc5e3d31628c'
-         'fdc6433ebc7fe59ce9eaec56dd843eb9')
diff --git a/social/bip/PKGBUILD b/social/bip/PKGBUILD
deleted file mode 100644
index 1a1a75705..000000000
--- a/social/bip/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
-pkgname=bip
-pkgver=0.8.8
-pkgrel=1
-pkgdesc="Multiuser IRC proxy that supports replaying of logged irc conversations"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://bip.milkypond.org/"
-license=('GPL')
-depends=('openssl' 'perl')
-makedepends=('bison' 'flex')
-backup=('etc/bip.conf')
-source=(https://projects.duckcorp.org/attachments/download/39/$pkgname-$pkgver.tar.gz)
-sha256sums=('7ca3fb96f5ee6b76eb398d7ea45344ea24855344ced11632241a33353bba05d7')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  make DESTDIR=${pkgdir} install
-
-  install -D -m755 ${srcdir}/$pkgname-$pkgver/scripts/bipgenconfig \
-    ${pkgdir}/usr/bin/bipgenconfig
-  install -D -m644 ${srcdir}/$pkgname-$pkgver/samples/$pkgname.conf \
-    ${pkgdir}/usr/share/$pkgname/$pkgname.conf.sample
-  install -D -m644 ${srcdir}/$pkgname-$pkgver/samples/$pkgname.vim \
-    ${pkgdir}/usr/share/vim/syntax/$pkgname.vim
-}
diff --git a/social/bitcoin-daemon/PKGBUILD b/social/bitcoin-daemon/PKGBUILD
deleted file mode 100644
index bd2b1d30d..000000000
--- a/social/bitcoin-daemon/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Maintainer: fauno <fauno@kiwwwi.com.ar>
-# Contributor: Artefact2 <artefact2@gmail.com>
-# Contributor: shahid <helllamer@gmail.com>
-# Based on bitcoin by
-# Maintainer : shahid <helllamer@gmail.com>
-
-pkgname=bitcoin-daemon
-_pkgname=bitcoin
-pkgver=0.5.2
-pkgrel=1
-pkgdesc="Bitcoin is a peer-to-peer network based digital currency (daemon with JSON-RPC interface)."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.bitcoin.org/"
-depends=('expat' 'boost-libs>=1.46' 'miniupnpc>=1.6' 'openssl')
-makedepends=('boost' 'gcc' 'make')
-conflicts=('bitcoin')
-license=('MIT')
-install="bitcoin-daemon.install"
-source=("http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}-linux.tar.gz"
-        bitcoin-daemon.install
-        rc.bitcoind)
-
-s1=$srcdir/${_pkgname}-${pkgver}-linux
-src=$s1/src/src
-makefile_unix=makefile.unix
-md5sums=('6d40f645ddc042de26d64e83656f38e0'
-         '0375ba4d6c3425eee350dc8b7575403d'
-         '7faa439885f3adbba5847ae75aac5484')
-
-build() {
-	cd $src
-
-	msg "Patching $makefile_unix..."
-	sed -i $makefile_unix \
-		-e 's/\(-DNOPCH\)/\1 -DBOOST_FILESYSTEM_VERSION=2/' \
-		-e 's/-Bstatic/--as-needed ${LDFLAGS}/g' \
-		-e 's/\(USE_UPNP:=\)0/\11/' \
-		-e 's/$(DEBUGFLAGS)//g' \
-		-e 's/CXXFLAGS/CPPFLAGS/g' \
-		-e 's/-O[0-3]/${CXXFLAGS}/g'
-
-	# make bitcoind
-	make $MAKEFLAGS -f $makefile_unix bitcoind
-}
-
-package() {
-	# get compiled binaries
-	mkdir -p ${pkgdir}/{var/lib/${pkgname},usr/{share/licenses/${pkgname},bin},etc/rc.d}
-
-	install -D -m755 ${src}/bitcoind ${pkgdir}/usr/bin/
-
-    install -D -m755 ${srcdir}/rc.bitcoind ${pkgdir}/etc/rc.d/
-
-    install -D -m 644 ${s1}/COPYING \
-                      ${pkgdir}/usr/share/licenses/${pkgname}/
-}
diff --git a/social/bitcoin-daemon/bitcoin-daemon.install b/social/bitcoin-daemon/bitcoin-daemon.install
deleted file mode 100644
index 5b2ffec92..000000000
--- a/social/bitcoin-daemon/bitcoin-daemon.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-	echo "==> Creating the bitcoin user…"
-	groupadd -g 8333 bitcoin
-	useradd -d /var/lib/bitcoin-daemon -g 8333 -u 8333 -s /bin/false -N bitcoin
-
-	pw="$RANDOM$RANDOM$RANDOM"
-	echo "==> Setting the default RPC password to $pw"
-	echo "rpcpassword=$pw" >> /var/lib/bitcoin-daemon/bitcoin.conf
-
-	chown 8333:8333 /var/lib/bitcoin-daemon/bitcoin.conf
-	chmod 400 /var/lib/bitcoin-daemon/bitcoin.conf
-	echo "==> You can add bitcoind to your DAEMONS array in rc.conf."
-}
-
-post_remove() {
-	echo "==> Deleting the bitcoin user…"
-	groupdel bitcoin
-	userdel bitcoin
-	echo "==> Your configuration file and wallet is still in /opt/bitcoin-daemon."
-}
diff --git a/social/bitcoin-daemon/makefile.parabola b/social/bitcoin-daemon/makefile.parabola
deleted file mode 100644
index 984750982..000000000
--- a/social/bitcoin-daemon/makefile.parabola
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright (c) 2009-2010 Satoshi Nakamoto
-# Rewritten for Archlinux by shahid
-# Distributed under the MIT/X11 software license, see the accompanying
-# file license.txt or http://www.opensource.org/licenses/mit-license.php.
-
-CXX=g++
-
-INCLUDEPATHS= \
- -I"/usr/include" \
-
-LIBPATHS= \
- -L"/usr/lib" \
- -L"/usr/local/lib"
-
-DEFS=-DNOPCH -DFOURWAYSSE2 -DUSE_SSL
-
-USE_UPNP:=1
-
-# --as-needed lazy linking set as default behavior of ld because i guess, there are useless libs here
-# Of couse, this may be overriden by LDFLAGS in makepkg.conf
-LIBS= \
-  -Wl,--as-needed \
-   ${LDFLAGS} \
-   -l boost_system \
-   -l boost_filesystem \
-   -l boost_program_options \
-   -l boost_thread \
-   -l db_cxx \
-
-ifdef USE_UPNP
-    LIBS += -l miniupnpc
-    DEFS += -DUSE_UPNP=$(USE_UPNP)
-endif
-
-LIBS+= \
-   -l gthread-2.0 \
-   -l z \
-   -l dl \
-   -l ssl \
-   -l crypto 
-
-#DEBUGFLAGS=-g -D__WXDEBUG__
-CCFLAGS=${CXXFLAGS} -DBOOST_FILESYSTEM_DEPRECATED -Wno-invalid-offsetof -Wformat $(WXDEFS) $(INCLUDEPATHS) $(DEFS)
-HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
-    script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h
-
-OBJS= \
-    obj/util.o \
-    obj/script.o \
-    obj/db.o \
-    obj/net.o \
-    obj/irc.o \
-    obj/main.o \
-    obj/rpc.o \
-    obj/init.o \
-    cryptopp/obj/sha.o \
-    cryptopp/obj/cpu.o
-
-
-all: bitcoin
-
-
-headers.h.gch: headers.h $(HEADERS)
-	$(CXX) -c $(CCFLAGS) -DGUI -o $@ $<
-
-obj/%.o: %.cpp $(HEADERS) headers.h.gch
-	$(CXX) -c $(CCFLAGS) -DGUI -o $@ $<
-
-# -DCRYPTOPP_DISABLE_SSE2
-cryptopp/obj/%.o: cryptopp/%.cpp
-	$(CXX) -c $(CCFLAGS) -O3 -o $@ $<
-
-bitcoin: $(OBJS) obj/ui.o obj/uibase.o
-	$(CXX) $(CCFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(WXLIBS)
-
-obj/nogui/%.o: %.cpp $(HEADERS)
-	$(CXX) -c $(CCFLAGS) -o $@ $<
-
-bitcoind: $(OBJS:obj/%=obj/nogui/%)
-	$(CXX) $(CCFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
-
-clean:
-	-rm -f obj/*.o
-	-rm -f obj/nogui/*.o
-	-rm -f cryptopp/obj/*.o
-	-rm -f headers.h.gch
diff --git a/social/bitcoin-daemon/rc.bitcoind b/social/bitcoin-daemon/rc.bitcoind
deleted file mode 100644
index be09251d1..000000000
--- a/social/bitcoin-daemon/rc.bitcoind
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting bitcoind"
-    su -s /bin/bash -c "nohup bitcoind -gen=0 -datadir=/var/lib/bitcoin-daemon &" bitcoin > /dev/null 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon bitcoind
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping bitcoind"
-    su -s /bin/bash -c "bitcoind -datadir=/var/lib/bitcoin-daemon stop" bitcoin &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon bitcoind
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/social/bitcoin/PKGBUILD b/social/bitcoin/PKGBUILD
deleted file mode 100644
index 64810db4b..000000000
--- a/social/bitcoin/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-## Maintainer : shahid <helllamer@gmail.com>
-## Long PKGBUILD description, todo, wiki:
-## * https://bitbucket.org/helllamer/archlinux-pkgbuild/wiki/pkgbuild/bitcoin
-
-## Wanna take part on development my PKGBUILDs? Feel welcome on my repo:
-## * https://bitbucket.org/helllamer/archlinux-pkgbuild/
-
-name=bitcoin
-pkgname=$name
-pkgver=0.5.2
-pkgrel=1
-pkgdesc="Bitcoin is a peer-to-peer network based digital currency."
-arch=('i686' 'x86_64')
-url="http://www.bitcoin.org/"
-depends=('qt>=4.6' 'libpng>=1.4' 'expat' 'gcc-libs' 'boost-libs>=1.46' 'miniupnpc>=1.6' 'openssl')
-makedepends=('boost' 'gcc' 'make' 'automoc4')
-conflicts=('bitcoin-bin' 'bitcoin-git' 'bitcoin-daemon')
-license=('MIT')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}-linux.tar.gz"
-	"${pkgname}.desktop")
-md5sums=('6d40f645ddc042de26d64e83656f38e0'
-	 '77139ce8a40f46bd7d7ad0a743672113')
-s1=$srcdir/${pkgname}-${pkgver}-linux
-src_qt=$s1/src
-src_d=$s1/src/src/
-makefile_unix=makefile.unix
-
-build() {
-	cd $src_d
-
-	msg "Patching $makefile_unix..."
-	sed -i $makefile_unix \
-		-e 's/\(-DNOPCH\)/\1 -DBOOST_FILESYSTEM_VERSION=2/' \
-		-e 's/-Bstatic/--as-needed ${LDFLAGS}/g' \
-		-e 's/\(USE_UPNP:=\)0/\11/' \
-		-e 's/$(DEBUGFLAGS)//g' \
-		-e 's/CXXFLAGS/CPPFLAGS/g' \
-		-e 's/-O[0-3]/${CXXFLAGS}/g'
-
-	# make bitcoind
-	make $MAKEFLAGS -f $makefile_unix bitcoind
-
-	# and make qt gui
-	cd $src_qt
-	qmake
-	make $MAKEFLAGS
-}
-
-
-package() {
-	mkdir -p $pkgdir/usr/bin
-	mkdir -p $pkgdir/usr/share/pixmaps
-	mkdir -p $pkgdir/usr/share/applications
-
-	# get compiled binaries
-	install -D -m755 $src_qt/bitcoin-qt $pkgdir/usr/bin/
-	install -D -m755 $src_d/bitcoind $pkgdir/usr/bin/
-	
-	# add icon and .desktop file to pkg
-	install -D -m644 $src_qt/src/qt/res/icons/bitcoin.png $pkgdir/usr/share/pixmaps/
-	install -D -m644 $srcdir/$name.desktop $pkgdir/usr/share/applications/ 
-}
diff --git a/social/bitcoin/bitcoin.desktop b/social/bitcoin/bitcoin.desktop
deleted file mode 100644
index f27429060..000000000
--- a/social/bitcoin/bitcoin.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Bitcoin
-GenericName=P2P network based digital currency
-Comment=P2P network based digital currency
-Exec=bitcoin-qt
-Icon=/usr/share/pixmaps/bitcoin.png
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Office;Finance;P2P
diff --git a/social/dropbear/PKGBUILD b/social/dropbear/PKGBUILD
deleted file mode 100644
index ac1ed366a..000000000
--- a/social/dropbear/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Jason Pierce <`echo 'moc tod liamg ta nosaj tod ecreip' | rev`>
-# Contributor: Jeremy Cowgar <jeremy@cowgar.com>
-
-pkgname=dropbear
-pkgver=0.53.1
-pkgrel=1
-pkgdesc="Lightweight replacement for sshd"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://matt.ucc.asn.au/dropbear/dropbear.html"
-license=('custom:BSD' 'custom:PD')
-depends=('zlib')
-source=(http://matt.ucc.asn.au/$pkgname/releases/$pkgname-$pkgver.tar.bz2 \
-        $pkgname-conf.d \
-        $pkgname-rc.d)
-sha256sums=('e24d3cbecd3bc850b2b336b8eb50c845a285ceef8e22544938a582e163d36393'
-            'eaec8cecae4476a660351ba9079c91b7c379146a22df881bd24b81af8f50d74c'
-            '29ab5438d15bfa727620fc04ec52ff55d676577b903c9261ce00bb291ae171a8')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  sed -i 's:usr/libexec/sftp:usr/lib/ssh/sftp:' options.h
-
-  ./configure --prefix=/usr
-  LIBS="-lcrypt" make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  make prefix=${pkgdir}/usr install
-
-#man pages
-  install -D -m644 dbclient.1 ${pkgdir}/usr/share/man/man1/dbclient.1
-  install -D -m644 $pkgname.8 ${pkgdir}/usr/share/man/man8/$pkgname.8
-  install -D -m644 dropbearkey.8 ${pkgdir}/usr/share/man/man8/dropbearkey.8
-
-#configuration files
-  install -d ${pkgdir}/etc/$pkgname
-  install -D -m644 ${srcdir}/$pkgname-conf.d ${pkgdir}/etc/conf.d/$pkgname
-  install -D -m755 ${srcdir}/$pkgname-rc.d ${pkgdir}/etc/rc.d/$pkgname
-
-#license file
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/social/dropbear/dropbear-conf.d b/social/dropbear/dropbear-conf.d
deleted file mode 100644
index 6f3b8f0c5..000000000
--- a/social/dropbear/dropbear-conf.d
+++ /dev/null
@@ -1,15 +0,0 @@
-# the TCP port that Dropbear listens on
-DROPBEAR_PORT="127.0.0.1:22" # Default to local-only.
-
-# any additional arguments for Dropbear
-DROPBEAR_EXTRA_ARGS="-w" # Default to no-root logins.
-
-# specify an optional banner file containing a message to be
-# sent to clients before they connect, such as "/etc/issue.net"
-DROPBEAR_BANNER=""
-
-# RSA hostkey file (default: /etc/dropbear/dropbear_rsa_host_key)
-#DROPBEAR_RSAKEY="/etc/dropbear/dropbear_rsa_host_key"
-
-# DSS hostkey file (default: /etc/dropbear/dropbear_dss_host_key)
-DROPBEAR_DSSKEY="/etc/dropbear/dropbear_dss_host_key"
diff --git a/social/dropbear/dropbear-rc.d b/social/dropbear/dropbear-rc.d
deleted file mode 100644
index 011880b3b..000000000
--- a/social/dropbear/dropbear-rc.d
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-daemon_name=dropbear
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-. /etc/conf.d/$daemon_name
-
-for port in $DROPBEAR_PORT; do
-  daemon_args="$daemon_args -p $port"
-done
-
-[ ! -z $DROPBEAR_BANNER ] && daemon_args="$daemon_args -b $DROPBEAR_BANNER"
-[ ! -z $DROPBEAR_DSSKEY ] && daemon_args="$daemon_args -d $DROPBEAR_DSSKEY"
-[ ! -z $DROPBEAR_RSAKEY ] && daemon_args="$daemon_args -r $DROPBEAR_RSAKEY"
-[ ! -z $DROPBEAR_EXTRA_ARGS ] && daemon_args="$daemon_args $DROPBEAR_EXTRA_ARGS"
-[ -z $DROPBEAR_PIDFILE ] && DROPBEAR_PIDFILE="/var/run/$daemon_name.pid"
-daemon_args="$daemon_args -P $DROPBEAR_PIDFILE"
-
-get_pid() {
-  PID=''
-  if [ -r $DROPBEAR_PIDFILE -a -f $DROPBEAR_PIDFILE -a -w $DROPBEAR_PIDFILE ]; then
-    if kill -0 "`< $DROPBEAR_PIDFILE`" &>/dev/null; then # kill -0 == "exit code indicates if a signal may be sent"
-      PID="`< $DROPBEAR_PIDFILE`"
-    else # may not send signals to dropbear, because it's probably not running => remove pidfile
-      rm -f $DROPBEAR_PIDFILE
-    fi
-  fi
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name"
-    get_pid
-    if [ -z "$PID" ]; then
-      printhl "Checking for hostkeys"
-      if [ ! -z $DROPBEAR_DSSKEY ]; then
-        [ ! -f $DROPBEAR_DSSKEY ] && dropbearkey -t dss -f $DROPBEAR_DSSKEY
-      fi;
-      if [ ! -z $DROPBEAR_RSAKEY ]; then
-        [ ! -f $DROPBEAR_RSAKEY ] && dropbearkey -t rsa -f $DROPBEAR_RSAKEY
-      fi;
-
-      $daemon_name $daemon_args # Make it Go Joe!
-      if [ $? -gt 0 ]; then
-        stat_die
-      else
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_die
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name"
-
-    get_pid
-    [ ! -z "$PID" ] && kill $PID &> /dev/null # Be dead (please), I say!
-    if [ $? -gt 0 ]; then
-      stat_die
-    else
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  fingerprint)
-    stat_busy "Fingerprinting $daemon_name hostkeys"
-    if [ ! -z $DROPBEAR_DSSKEY ]; then
-      printhl "DSS/DSA Key $(dropbearkey -y -f $DROPBEAR_DSSKEY | grep Fingerprint)"
-    fi;
-    if [ ! -z $DROPBEAR_RSAKEY ]; then
-      printhl "RSA Key $(dropbearkey -y -f $DROPBEAR_RSAKEY | grep Fingerprint)"
-    fi;
-  ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|fingerprint}"
-esac
-exit 0
diff --git a/social/ffingerd/PKGBUILD b/social/ffingerd/PKGBUILD
deleted file mode 100644
index 560d6b618..000000000
--- a/social/ffingerd/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-pkgname=ffingerd
-pkgver=1.28
-pkgrel=2.1
-pkgdesc="Secure finger daemon"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.fefe.de/ffingerd/"
-license=('GPL2')
-depends=('glibc' 'xinetd')
-backup=('etc/xinetd.d/finger')
-source=(http://www.fefe.de/$pkgname/$pkgname-$pkgver.tar.bz2 finger.xinetd)
-md5sums=('fe207448745da07b4e393d8b8694658b' '2ca1a6b3f442a5c0c81fa03d265a203e')
-
-build() {
-   cd $srcdir/$pkgname-$pkgver
-   install -d $pkgdir/usr/sbin $pkgdir/usr/share/man/man8
-   ./configure --prefix=/usr
-
-   make
-}
-
-package(){
-   cd $srcdir/$pkgname-$pkgver
-
-   make SBINDIR=$pkgdir/usr/sbin MANDIR=$pkgdir/usr/share/man install
-
-   install -D -m644 $srcdir/finger.xinetd $pkgdir/etc/xinetd.d/ffinger
-}
diff --git a/social/ffingerd/finger.xinetd b/social/ffingerd/finger.xinetd
deleted file mode 100644
index 36cd303b4..000000000
--- a/social/ffingerd/finger.xinetd
+++ /dev/null
@@ -1,8 +0,0 @@
-service finger
-{
-	socket_type		= stream
-	wait			= no
-	user			= nobody
-	server			= /usr/sbin/ffingerd
-	disable			= yes
-}
diff --git a/social/haveged/PKGBUILD b/social/haveged/PKGBUILD
deleted file mode 100644
index 74d53a602..000000000
--- a/social/haveged/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: kfgz <kfgz at interia dot pl>
-# Contributor: pootzko <pootzko at gmail dot com>
-
-pkgname=haveged
-pkgver=1.1
-pkgrel=1
-pkgdesc="A simple entropy daemon."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.issihosts.com/haveged"
-license="GPL"
-source=(${url}/${pkgname}-${pkgver}.tar.gz
-        haveged)
-md5sums=('f7752f0355a0e89d8f196658db5f6884'
-         '264b725be5271288b40f363d7cfc6b68')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/etc/init.d
-  cd ${srcdir}
-  install -D -m755 haveged ${pkgdir}/etc/rc.d/haveged
-}
diff --git a/social/haveged/haveged b/social/haveged/haveged
deleted file mode 100644
index c0e13b40d..000000000
--- a/social/haveged/haveged
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-##
-# chkconfig: 2345 75 25
-# description: havege entropy daemon
-#
-# source function library
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-RETVAL=0
-prog="haveged"
-
-case "$1" in
-start)
-  stat_busy $"Starting $prog"
-  /usr/sbin/$prog -w 1024 -v 1
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    add_daemon $prog
-    stat_done
-  fi
-  ;;
-
-stop)
-  stat_busy $"Stopping $prog"
-  kill `cat /var/run/$prog.pid`
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    rm_daemon $prog
-    stat_done
-    rm -f /var/lock/$prog
-  fi
-  ;;
-  
-restart)
-  $0 stop
-  $0 start
-  ;;
-
-*)
-  echo "usage: $prog [start|stop|restart]"
-esac
diff --git a/social/inadyn-opendns/PKGBUILD b/social/inadyn-opendns/PKGBUILD
deleted file mode 100644
index 647a5d876..000000000
--- a/social/inadyn-opendns/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Bug <Bug2000@gmail.com>
-# Maintainer: Bug <Bug2000@gmail.com>
-pkgname=inadyn-opendns
-pkgver=1.99
-pkgrel=3
-pkgdesc="Simple dynamic DNS client with SSL support"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.opendns.com/account/dynamic_dns/downloads"
-license=('GPL')
-makedepends=('unzip')
-depends=('curl')
-conflicts=('inadyn')
-provides=('inadyn')
-backup=('etc/inadyn.conf')
-install='inadyn-opendns.install'
-source=("http://www.opendns.com/support/ddns_files/inadyn.source.v$pkgver.zip"
-	'inadyn.rc-script')
-md5sums=('0f2cf9c3ea3482c03e1c42f8480f1c55'
-	 '73c61f9939546c28119242a1e12ffcff')
-
-build() {
-  cd "$srcdir/inadyn.source.v$pkgver"
-
-  make || return 1
-
-  install -Dm755 bin/linux/inadyn $pkgdir/usr/sbin/inadyn
-  install -Dm644 man/inadyn.8 $pkgdir/usr/share/man/man8/inadyn.8
-  install -Dm644 man/inadyn.conf.5 $pkgdir/usr/share/man/man5/inadyn.conf.5
-  install -Dm644 readme.html $pkgdir/usr/share/doc/inadyn/readme.html
-  install -Dm755 $srcdir/inadyn.rc-script $pkgdir/etc/rc.d/inadyn
-  install -Dm644 inadyn.conf $pkgdir/etc/inadyn.conf
-}
diff --git a/social/inadyn-opendns/inadyn-opendns.install b/social/inadyn-opendns/inadyn-opendns.install
deleted file mode 100644
index e1a842430..000000000
--- a/social/inadyn-opendns/inadyn-opendns.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-/bin/true
-echo Please remember to change the /etc/inadyn.conf file for your settings.
-}
-
-post_upgrade() {
-/bin/true
-}
-
-pre_remove() {
-/bin/true
-}
-
-op=$1
-shift
-
-$op "$@"
\ No newline at end of file
diff --git a/social/inadyn-opendns/inadyn.rc-script b/social/inadyn-opendns/inadyn.rc-script
deleted file mode 100644
index 2ee29d59e..000000000
--- a/social/inadyn-opendns/inadyn.rc-script
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/inadyn`
-case "$1" in
-  start)
-    stat_busy "Starting INADYN Daemon"
-    [ -z "$PID" ] && /usr/sbin/inadyn --background --input_file /etc/inadyn.conf >>/var/log/inadyn 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=`pidof -o %PPID /usr/sbin/inadyn`
-      echo $PID >/var/run/inadyn.pid
-      add_daemon inadyn
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping INADYN Daemon"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon inadyn
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
-
diff --git a/social/inspircd/PKGBUILD b/social/inspircd/PKGBUILD
deleted file mode 100644
index 6165f7c31..000000000
--- a/social/inspircd/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-pkgname=inspircd
-pkgver=2.0.5
-pkgrel=2
-pkgdesc='A lightweight IRC daemon'
-arch=('x86_64' 'i686')
-url='http://www.inspircd.org/'
-license=('GPL2')
-depends=('perl' 'gnutls' 'openssl' 'libgcrypt')
-makedepends=('pkg-config' 'mysql' 'postgresql' 'sqlite3' 'libldap' 'geoip' 'tre')
-optdepends=('mysql: m_mysql'
-            'pcre: m_regex_pcre'
-            'postgresql: m_pgsql'
-            'sqlite3: m_sqlite3'
-            'libldap: m_ldapoper and m_ldapauth'
-            'geoip: m_geoip'
-            'tre: m_regex_tre')
-install=inspircd.install
-backup=('etc/inspircd/inspircd.conf')
-
-source=(http://www.inspircd.org/downloads/InspIRCd-$pkgver.tar.bz2 inspircd.rcd gnutls.patch)
-md5sums=('60dec04bdc8f8c473f3c7bd774a1f153'
-         'f4f32d944401b1602ab6716476892afd'
-         '6312154e759e5d71b85c7dca71b7a4fd')
-
-build() {
-  cd "${srcdir}/inspircd"
-  patch -Np1 -i "${srcdir}/gnutls.patch"
-
-  ./configure \
-    --enable-extras=m_geoip.cpp \
-    --enable-extras=m_ldapauth.cpp \
-    --enable-extras=m_ldapoper.cpp \
-    --enable-extras=m_mysql.cpp \
-    --enable-extras=m_pgsql.cpp \
-    --enable-extras=m_regex_pcre.cpp \
-    --enable-extras=m_regex_posix.cpp \
-    --enable-extras=m_regex_tre.cpp \
-    --enable-extras=m_sqlite3.cpp
-
-  ./configure \
-    --prefix=/usr/lib/inspircd \
-    --binary-dir=/usr/sbin \
-    --module-dir=/usr/lib/inspircd/modules \
-    --config-dir=/etc/inspircd \
-    --enable-gnutls \
-    --enable-openssl \
-    --enable-epoll
-
-  make
-}
-
-package() {
-  install -Dm755 "${srcdir}"/inspircd.rcd "${pkgdir}"/etc/rc.d/inspircd
-  install -o141 -g141 -dm750 "${pkgdir}/var/log/inspircd"
-  install -o141 -g141 -dm750 "${pkgdir}/var/run/inspircd"
-
-  cd "${srcdir}/inspircd"
-  make DESTDIR="$pkgdir" INSTUID=141 install
-
-  rm -rf "${pkgdir}"/usr/lib/inspircd/logs
-  rm -rf "${pkgdir}"/usr/lib/inspircd/data
-}
diff --git a/social/inspircd/gnutls.patch b/social/inspircd/gnutls.patch
deleted file mode 100644
index 3975c418c..000000000
--- a/social/inspircd/gnutls.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-ff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
-index b8c4815..d58caa8 100644
---- a/src/modules/extra/m_ssl_gnutls.cpp
-+++ b/src/modules/extra/m_ssl_gnutls.cpp
-@@ -20,7 +20,7 @@
- 
- /* $ModDesc: Provides SSL support for clients */
- /* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") */
--/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") */
-+/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") -lgcrypt */
- 
- enum issl_status { ISSL_NONE, ISSL_HANDSHAKING_READ, ISSL_HANDSHAKING_WRITE, ISSL_HANDSHAKEN, ISSL_CLOSING, ISSL_CLOSED };
diff --git a/social/inspircd/inspircd.install b/social/inspircd/inspircd.install
deleted file mode 100644
index ec97113f5..000000000
--- a/social/inspircd/inspircd.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  getent group inspircd &>/dev/null || groupadd -r -g 141 inspircd >/dev/null
-  getent passwd inspircd &>/dev/null || useradd -r -u 141 -g inspircd -d /var/lib/inspircd -s /bin/false -c inspircd inspircd >/dev/null
-
-  echo '==> You will need to create a config file for inspircd'
-  echo '==>   cp /etc/inspircd/inspircd.conf.example /etc/inspircd/inspircd.conf'
-  echo '==> You will need to change the pidfile. To do this you can insert the following into your config.'
-  echo '==>   <pid file="/var/run/inspircd/inspircd.pid">'
-  echo '==> Remember to use absolute paths in your config directory and not relative paths like you would do with a user-based inspircd install.'
-}
-
-post_remove() {
-  getent passwd inspircd &>/dev/null && userdel inspircd >/dev/null
-  getent group inspircd &>/dev/null && groupdel inspircd >/dev/null
-}
diff --git a/social/inspircd/inspircd.rcd b/social/inspircd/inspircd.rcd
deleted file mode 100644
index a041b9be4..000000000
--- a/social/inspircd/inspircd.rcd
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-  pidof /usr/sbin/inspircd
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting inspircd"
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      su -s /bin/sh -c '/usr/sbin/inspircd --logfile /var/log/inspircd/startup.log --config /etc/inspircd/inspircd.conf' 'inspircd' > /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        add_daemon inspircd
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping inspircd"
-    PID=$(get_pid)
-    [ ! -z "$PID" ] && kill $PID
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm_daemon inspircd
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/social/liblockfile/PKGBUILD b/social/liblockfile/PKGBUILD
deleted file mode 100644
index 8d7c70484..000000000
--- a/social/liblockfile/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
-
-pkgname=liblockfile
-pkgver=1.08_4
-pkgrel=1
-pkgdesc="a library with NFS-safe locking functions"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://packages.debian.org/unstable/libs/liblockfile1"
-depends=('glibc')
-makedepends=()
-source=(http://ftp.debian.org/debian/pool/main/libl/$pkgname/${pkgname}_1.08.orig.tar.gz
-	http://ftp.debian.org/debian/pool/main/libl/$pkgname/${pkgname}_${pkgver/_/-}.debian.tar.bz2)
-
-build() {
-    cd $startdir/src/$pkgname-1.08
-
-    for p in `cat ../debian/patches/series` ; do
-	patch -p1 < ../debian/patches/$p
-    done
-
-    ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared --disable-static
-    sed -i "/ldconfig/d" Makefile
-    make
-
-    mkdir -p $pkgdir/usr/{lib,bin,include,share/man/man1,share/man/man3} 
-    make install prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man
-}
-
-md5sums=('c24e2dfb4a2aab0263fe5ac1564d305e'
-         '50c0c049d2838704f5720f5fd9eaddac')
diff --git a/social/libowfat/PKGBUILD b/social/libowfat/PKGBUILD
deleted file mode 100644
index e4726762b..000000000
--- a/social/libowfat/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributors:
-#	Alexander Ulrich <a.ulrich@student.uni-tuebingen.de>
-# 	Mildred <silkensedai@online.fr>
-# 	henning mueller <henning@orgizm.net>
-
-pkgname=libowfat
-pkgver=0.29
-pkgrel=1
-pkgdesc='GPL reimplementation of libdjb'
-arch=(i686 x86_64 mips64el)
-url=http://www.fefe.de/libowfat/
-depends=()
-license=(GPL)
-install=libowfat.install
-source=(http://dl.fefe.de/$pkgname-$pkgver.tar.bz2)
-md5sums=(6bbee9a86506419657d87123b7a6f2c1)
-
-build() {
-	cd $srcdir/$pkgname-$pkgver
-	make
-}
-
-package() {
-	cd $srcdir/$pkgname-$pkgver
-	make prefix=$pkgdir/usr/ LIBDIR=$pkgdir/usr/lib MAN3DIR=$pkgdir/usr/share/man/man3 install
-
-	cd $pkgdir/usr/share/man/man3
-	mv buffer.3 buffer-libowfat.3
-}
-md5sums=('1187c6acf11429e7adb9ebe180f644bb')
diff --git a/social/libowfat/libowfat.install b/social/libowfat/libowfat.install
deleted file mode 100644
index a08aef10c..000000000
--- a/social/libowfat/libowfat.install
+++ /dev/null
@@ -1,39 +0,0 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-pre_install() {
-  /bin/true
-}
-
-# arg 1:  the new package version
-post_install() {
-  echo "The manpage buffer(3) was moved to buffer-libowfat(3) because
-        it conflicts with package openssl"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/social/libpurple-minimal/PKGBUILD b/social/libpurple-minimal/PKGBUILD
deleted file mode 100644
index b0adfd46d..000000000
--- a/social/libpurple-minimal/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Magicking <syllaur@gmail.com>
-# Contributors: wzff BluePeppers n0nsense
-pkgname=libpurple-minimal
-pkgver=2.10.0
-pkgrel=2
-pkgdesc="minimal build of the pidgin IM library (no gstreamer, perl and X11 dependencies)"
-arch=('i686' 'x86_64')
-url="http://developer.pidgin.im/wiki/WhatIsLibpurple"
-license=('GPL')
-depends=('glib2' 'gnutls' 'libxml2' 'libidn' 'nss' 'avahi')
-makedepends=('make' 'intltool')
-conflicts=('libpurple')
-provides=("libpurple=${pkgver}")
-source="http://downloads.sourceforge.net/pidgin/pidgin-${pkgver}.tar.gz"
-md5sums=('b92f83f6f075d9cd814d3ccff9fd6cac')
-
-build(){
-	cd $srcdir/pidgin-${pkgver}
-	./configure --prefix=/usr \
-		    --sysconfdir=/etc \
-		    --disable-perl \
-		    --disable-gtkui \
-		    --disable-consoleui \
-		    --disable-sm \
-		    --disable-gestures \
-		    --disable-screensaver \
-		    --disable-startup-notification \
-		    --disable-schemas-install \
-		    --disable-tcl \
-		    --disable-tk \
-		    --disable-nls \
-		    --without-x \
-		    --disable-vv \
-		    --disable-gstreamer \
-		    --disable-meanwhile \
-		    --disable-dbus \
-		    --disable-doxygen \
-            --with-system-ssl-certs=/etc/ssl/certs
-	make -C libpurple
-}
-
-package() {
-	cd $srcdir/pidgin-${pkgver}
-	make -C libpurple DESTDIR=$pkgdir install
-}
-
diff --git a/social/lockfile-progs/PKGBUILD b/social/lockfile-progs/PKGBUILD
deleted file mode 100644
index 5e404c684..000000000
--- a/social/lockfile-progs/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
-
-pkgname=lockfile-progs
-pkgver=0.1.15
-pkgrel=1
-pkgdesc="programs for locking and unlocking files and mailboxes"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://packages.debian.org/unstable/misc/lockfile-progs"
-depends=('glibc')
-makedepends=('liblockfile')
-source=(http://ftp.debian.org/debian/pool/main/l/lockfile-progs/${pkgname}_${pkgver}.tar.gz)
-
-build() {
-    cd $srcdir/sid
-
-    [ "$CARCH" = "mips64el" ] && sed -i "s/-Werror//" Makefile
-
-    make
-
-    mkdir -p $startdir/pkg/usr/bin
-    install -s bin/* $startdir/pkg/usr/bin
-
-    mkdir -p $startdir/pkg/usr/share/man/man1
-    install man/*.1 $startdir/pkg/usr/share/man/man1
-}
-
-md5sums=('abfcda83a1868073673f4d78066b8f8a')
diff --git a/social/lua-cyrussasl/PKGBUILD b/social/lua-cyrussasl/PKGBUILD
deleted file mode 100644
index d37eacc1c..000000000
--- a/social/lua-cyrussasl/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Dwayne Bent <dbb.1@liqd.org>
-
-pkgname=lua-cyrussasl
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="Lua bindings for Cyrus SASL library."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://github.com/JorjBauer/lua-cyrussasl"
-license=('BSD')
-depends=('lua>=5.1' 'libsasl')
-source=(
-    "lua-cyrussasl-$pkgver.tar.gz::https://github.com/JorjBauer/lua-cyrussasl/tarball/v$pkgver"
-    "lua-cyrussasl.patch"
-)
-md5sums=('40c94c06441e1e47640d81b125742969'
-         '5b5c15e4cba63d05a5bfd1cc3ddcba0f')
-
-build() {
-    cd $srcdir/*-lua-cyrussasl-*
-
-    patch -p1 < "$srcdir/lua-cyrussasl.patch"
-	make
-}
-
-package() {
-    mkdir -p "$pkgdir/usr/lib/lua/5.1"
-    mkdir -p "$pkgdir/usr/share/licenses/lua-cyrussasl"
-	
-    cd $srcdir/*-lua-cyrussasl-*
-    
-    make DESTDIR=${pkgdir} install
-    install -m644 "LICENSE" "$pkgdir/usr/share/licenses/lua-cyrussasl/LICENSE"
-}
-
diff --git a/social/lua-cyrussasl/lua-cyrussasl.patch b/social/lua-cyrussasl/lua-cyrussasl.patch
deleted file mode 100644
index 5309e5af1..000000000
--- a/social/lua-cyrussasl/lua-cyrussasl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 9c696ab..37057da 100644
---- a/Makefile
-+++ b/Makefile
-@@ -4,12 +4,18 @@
- #LUAPATH=/usr/share/lua/5.1
- #CPATH=/usr/lib/lua/5.1
- 
-+# Linux (Arch Linux)
-+CFLAGS=-g -O2 -fpic -I/usr/include
-+LDFLAGS=-O -shared -fpic -lsasl2
-+LUAPATH=/usr/share/lua/5.1
-+CPATH=/usr/lib/lua/5.1
-+
- # MacOS
--CFLAGS=-g -Wall -O2
--LDFLAGS=-bundle -undefined dynamic_lookup -lsasl2
--MACOSX_VERSION=10.5
--LUAPATH=/usr/local/share/lua/5.1
--CPATH=/usr/local/lib/lua/5.1
-+#CFLAGS=-g -Wall -O2
-+#LDFLAGS=-bundle -undefined dynamic_lookup -lsasl2
-+#MACOSX_VERSION=10.5
-+#LUAPATH=/usr/local/share/lua/5.1
-+#CPATH=/usr/local/lib/lua/5.1
- 
- #########################################################
- #
-@@ -26,7 +32,7 @@ OBJS=cyrussasl.o luaabstract.o context.o
- all: $(TARGET)
- 
- install: $(TARGET)
--	cp $(TARGET) $(CPATH)
-+	cp $(TARGET) $(DESTDIR)$(CPATH)
- 
- clean:
- 	rm -f *.o *.so *~
diff --git a/social/lua-ldap/PKGBUILD b/social/lua-ldap/PKGBUILD
deleted file mode 100644
index a2ca1c830..000000000
--- a/social/lua-ldap/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-pkgname=lua-ldap
-_pkgname=lualdap
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="Simple interface from Lua to an LDAP client"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.keplerproject.org/lualdap"
-license=('BSD')
-depends=('lua' 'libldap')
-source=(http://files.luaforge.net/releases/$_pkgname/$_pkgname/LuaLDAP$pkgver/$_pkgname-$pkgver.tar.gz)
-
-build() {
-    cd $srcdir/$_pkgname-$pkgver
-
-    make CFLAGS="$CFLAGS" \
-         LUA_LIBDIR=/usr/lib/lua/5.1 \
-         LUA_VERSION_NUM=510 \
-         LUA_INC=/usr/include 
-
-}
-
-package() {
-    cd $srcdir/$_pkgname-$pkgver
-    make LUA_LIBDIR=${pkgdir}/usr/lib/lua/5.1 \
-         LUA_VERSION_NUM=510 \
-         install
-}
-
-md5sums=('5e104520c3f1333f38817a9fa1e76681')
diff --git a/social/miniupnpd/PKGBUILD b/social/miniupnpd/PKGBUILD
deleted file mode 100644
index b0d67c09e..000000000
--- a/social/miniupnpd/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-pkgname=miniupnpd
-pkgver=1.7.20120824
-pkgrel=2
-pkgdesc="Lightweight UPnP IGD daemon"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://miniupnp.free.fr"
-license=('BSD')
-backup=(etc/miniupnpd/miniupnpd.conf)
-depends=('libnfnetlink')
-
-eval $(wget "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/iptables" -O - | awk -F= '
-	$1 == "pkgver" { pkgver=$2 } 
-	$1 == "source" { sub(/\${pkgname}/, "iptables"); sub(/\${pkgver}/, pkgver); print $0 "); " } 
-	$1 == "sha1sums" { print $0 ");" }
-	END { print "_iptables=iptables-" pkgver }')
-
-source+=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz" miniupnpd.init miniupnpd.systemd)
-sha1sums+=('7abca8ecbcd8596392175eb312941083ed5faf21'
-          'c84031d7af122c5bede8609bcfa80bc31f2a5e61'
-          'bc0ae02a88eceef4f172b07f6f67d5fd54cc6ae0')
-
-build() {
-	cd "$srcdir/$_iptables"
-	./configure --enable-static
-	make
-	
-	cd "$srcdir/$pkgname-$pkgver"
-	make -f Makefile.linux config.h
-	IPTABLESPATH="$srcdir/$_iptables" make -f Makefile.linux
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	mkdir -p "$pkgdir/usr/share/man/man8"
-	make PREFIX="$pkgdir/" -f Makefile.linux install
-	rm -r "${pkgdir}/etc/init.d"
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -Dm755 "${srcdir}/miniupnpd.init" "${pkgdir}/etc/rc.d/miniupnpd"
-	install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service"
-}
-
diff --git a/social/miniupnpd/miniupnpd.init b/social/miniupnpd/miniupnpd.init
deleted file mode 100644
index e09ac3ade..000000000
--- a/social/miniupnpd/miniupnpd.init
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-MINIUPNPD=/usr/sbin/miniupnpd
-ARGS='-f /etc/miniupnpd/miniupnpd.conf'
-PIDFILE='/var/run/miniupnpd.pid'
-IPTABLES_CREATE=/etc/miniupnpd/iptables_init.sh
-IPTABLES_REMOVE=/etc/miniupnpd/iptables_removeall.sh
-
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-        stat_busy "Starting MiniUPNPd"
-
-        if ! pidof -o %PPID $MINIUPNPD &> /dev/null; then
-            rm -f "$PIDFILE"
-        fi
-
-        $IPTABLES_CREATE > /dev/null 2>&1
-
-		PID="$(cat "$PIDFILE" 2> /dev/null)"
-
-        if [ -z "$PID" ] && $MINIUPNPD $ARGS; then
-            add_daemon miniupnpd
-            stat_done
-        else
-            stat_fail
-        fi
-        ;;
-  stop)
-        stat_busy "Stopping MiniUPNPd"
-		PID="$(cat "$PIDFILE" 2> /dev/null)"
-        if [ -n "$PID" ] && kill "$PID" &> /dev/null; then
-            rm -f "$PIDFILE"
-            rm_daemon miniupnpd
-            stat_done
-        else
-            stat_fail
-        fi
-        ;;
-  restart)
-        "$0" stop
-        sleep 1
-        "$0" start
-        ;;
-  *)
-        echo "Usage: /etc/rc.d/miniupnpd {start|stop|restart}"
-        exit 2
-        ;;
-esac
-exit 0
diff --git a/social/miniupnpd/miniupnpd.systemd b/social/miniupnpd/miniupnpd.systemd
deleted file mode 100644
index 0449e8a69..000000000
--- a/social/miniupnpd/miniupnpd.systemd
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Lightweight UPnP IGD daemon
-
-[Service]
-ExecStart=/usr/sbin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d
-
-[Install]
-WantedBy=network.target
diff --git a/social/monkeysphere/PKGBUILD b/social/monkeysphere/PKGBUILD
deleted file mode 100644
index 3c5c590b8..000000000
--- a/social/monkeysphere/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor: fauno <fauno@kiwwwi.com.ar>
-# Based on monkeysphere-git from
-# Contributor: Olivier Mehani <shtrom-arch@ssji.net>
-# $Id: PKGBUILD 264 2010-11-10 00:57:53Z shtrom $
-pkgname=monkeysphere
-pkgver=0.35
-pkgrel=3
-pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
-arch=('any')
-url="http://web.monkeysphere.info/"
-license=('GPL3')
-depends=('gnupg' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1')
-source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz)
-install=monkeysphere.install
-md5sums=('481ac14c9fdef0ccd1944c593bd4f517')
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-  mkdir -p $pkgdir/var/lib/monkeysphere
-} 
diff --git a/social/monkeysphere/monkeysphere.install b/social/monkeysphere/monkeysphere.install
deleted file mode 100644
index 2013f9f41..000000000
--- a/social/monkeysphere/monkeysphere.install
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-# $Id: monkeysphere.install 264 2010-11-10 00:57:53Z shtrom $
-# vim:set ts=2 sw=2 et:
-
-# arg 1:  the new package version
-pre_install() {
- /bin/true
-}
-
-# arg 1:  the new package version
-post_install() {
-  echo ">>> Creating monkeysphere user and group and setting permissions..."
-  getent group monkeysphere >/dev/null || usr/sbin/groupadd monkeysphere
-  getent passwd monkeysphere >/dev/null || usr/sbin/useradd -c 'Monkeysphere WoT server identification tool' -g monkeysphere -d '/var/lib/monkeysphere' -s /bin/bash monkeysphere
-
-# Should be root:root for sshd to work
-  chown root:root /var/lib/monkeysphere
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
- /bin/true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-# Should be root:root for sshd to work
-  chown root:root /var/lib/monkeysphere
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  usr/sbin/userdel monkeysphere &>/dev/null
-  (getent group monkeysphere >/dev/null && usr/sbin/groupdel monkeysphere &>/dev/null) || /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
- /bin/true
-}
-
diff --git a/social/netatalk/PKGBUILD b/social/netatalk/PKGBUILD
deleted file mode 100644
index 44394b460..000000000
--- a/social/netatalk/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# Maintainer: SJ_UnderWater
-# Maintainer (Parabola): fauno@parabola.nu
-# Based on netatalk package :
-# Maintainer: Dominik Dingel <mail at wodar dot de>
-# Contributor: William Udovich <nerdzrule7 at earthlink dot net>
-# Contributor: Farhan Yousaf <farhany at xaviya dot com>
-
-pkgname=netatalk
-pkgver=3.0.1
-pkgrel=3
-pkgdesc='Open Source AFP fileserver'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://netatalk.sourceforge.net'
-license=('GPL')
-depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent')
-backup=('etc/afp.conf')
-options=('!libtool')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('b4f5c932b2ca99f5292bd6b6d69b3ebc')
-
-build() {
-  cd $pkgname-$pkgver
-
-# TODO what does this fix?
-  msg2 'Fixing...'
-  sed -i 's/x"linux/x"generic/' macros/netatalk.m4
-  sed -i 's:/lib:/usr/lib:' distrib/initscripts/Makefile.{am,in}
-
-  autoreconf
-
-  CFLAGS="-Wno-unused-result" \
-  ./configure --prefix=/usr \
-              --disable-static \
-              --localstatedir=/var/state \
-              --sysconfdir=/etc \
-              --with-init-style=systemd \
-              --with-cracklib \
-              --with-cnid-cdb-backend \
-              --enable-pgp-uam \
-              --without-libevent-header \
-              --without-libevent-lib
-
-  sed -i -e s/-Ino// -e s/-Lno// etc/netatalk/Makefile
-  make 
-}
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/social/netatalk/netatalk.changelog b/social/netatalk/netatalk.changelog
deleted file mode 100644
index b1ada018b..000000000
--- a/social/netatalk/netatalk.changelog
+++ /dev/null
@@ -1,101 +0,0 @@
-2012-10-08 SJ_UnderWater
-
-	* 3.0.1-3 :
-	moved systemd from /etc
-	better rc.d install test
-
-2012-10-05 SJ_UnderWater
-
-	* 3.0.1-2 :
-	removed rc.d references
-
-2012-10-04 SJ_UnderWater
-
-	* 3.0.1-1 :
-	new version
-	moved to systemd
-	moved state to /var/db
-
-2012-07-14 SJ_UnderWater
-
-	* 3.0-3 :
-	moved localstate dir
-	to /etc for historical
-	reasons
-
-2012-07-12 SJ_UnderWater
-
-	* 3.0-2 :
-	disable bundled libevent
-
-2012-07-11 SJ_UnderWater
-
-	* 3.0-1 :
-	updated to new release
-	DDP moved to new pkg
-
-2012-06-12 SJ_UnderWater
-
-	* 2.2.3-4 :
-	added kill timing
-
-2012-06-04 SJ_UnderWater
-
-	* 2.2.3-3 :
-	removed conflicting files
-
-2012-06-02 SJ_UnderWater
-
-	* 2.2.3-2 :
-	Missing UAM links
-
-2012-05-29 SJ_UnderWater
-
-	* 2.2.3-1 :
-	updated package version
-	allowing headers and m4
-
-2012-05-01 SJ_UnderWater
-
-	* 2.2.2-6 :
-	moved to .rc files
-	refactored PKGBUILD
-	install rc.d files
-
-2012-04-25 SJ_UnderWater
-
-	* 2.2.2-5 :
-	init rebuild
-	fix dep check
-	fix get_pid
-	function relocation
-
-2012-04-21 SJ_UnderWater
-
-	* 2.2.2-4 :
-	moved to package()
-	added backup
-	split backup
-	moved depends
-
-2012-04-08 SJ_UnderWater
-
-	* 2.2.2-3 :
-	fixed extra dependencies
-	FHS compliance
-	NAMCAP checking
-	moved cups to optdepends
-
-2012-04-07 SJ_UnderWater
-
-	* 2.2.2-2 :
-	added Install
-	changed "conflicts" with "replace"
-	cleaned up PKGBUILD
-
-	* 2.2.2-1 :
-	added ChangeLog.
-	moved to split package format
-	bidirectional dependency-checking
-	moved to release package format
-	PKGBUILD compliance
diff --git a/social/netatalk/netatalk.install b/social/netatalk/netatalk.install
deleted file mode 100644
index 629586531..000000000
--- a/social/netatalk/netatalk.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-	post_upgrade
-}
-post_upgrade() {
-	if [ -f /etc/rc.conf ] && [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then
-	echo '>>> Detected old netatalk daemon entries in';
-	echo '>>> /etc/rc.conf, please replace these with';
-	echo '>>> "netatalk" before restarting!';
-	else echo '>>> Add "netatalk" to your DAEMONS list';fi
-	echo '>>>';
-	if [ -f /etc/avahi/services/adisk.service ] ||
-	[ -f /etc/avahi/services/afpd.service ];then
-	echo '>>> Detected old netatalk service files in';
-	echo '>>> /etc/avahi/services, please delete these';
-	echo '>>> before restarting!';fi
-	if [ -f /opt/netatalk/afp_signature.conf ] ||
-	[ -f /opt/netatalk/afp_voluuid.conf ]; then
-	echo '>>> Found *.conf in /opt/netatalk, please';
-	echo '>>> migrate these to /etc/netatalk before restarting';fi
-}
diff --git a/social/nitroshare/PKGBUILD b/social/nitroshare/PKGBUILD
deleted file mode 100644
index 7896a356e..000000000
--- a/social/nitroshare/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Sid Karunaratne <sid at karunaratne dot net>
-# Contributor: Nathan Osman <https://launchpad.net/~george-edison55>
-
-pkgname=nitroshare
-pkgver=0.2
-pkgrel=2
-pkgdesc="Makes sending a file to another machine on the local network as easy as dragging-and-dropping"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/nitroshare"
-license=('GPL3')
-depends=('qt' 'qjson' 'qxmlrpc')
-makedepends=()
-options=()
-source=(https://launchpad.net/${pkgname}/${pkgver}/${pkgver}/+download/${pkgname}_${pkgver}.tar.gz nitroshare.install)
-md5sums=('00f670fadf385ee2a920b67a4120295d'
-         '0e8cd7761d04a45d22d28ac7b98fa234')
-
-build () {
-	cd "${srcdir}/${pkgname}"
-	sed -i "s_target.path = /opt/extras.ubuntu.com/nitroshare_target.path = ${pkgdir}/usr/bin_g" nitroshare.pro
-	sed -i "s_Exec=/opt/extras.ubuntu.com/nitroshare/nitroshare_Exec=/usr/bin/${pkgname}_g" resource/other/extras-${pkgname}.desktop
-	qmake
-	make
-}
-
-package (){
-	cd "${srcdir}/${pkgname}"
-	make install
-	mkdir -p ${pkgdir}/usr/share/applications
-	install -Dm644 resource/other/extras-${pkgname}.desktop ${pkgdir}/usr/share/applications/
-	install -Dm644 resource/images/logo.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png
-	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/social/nitroshare/nitroshare.install b/social/nitroshare/nitroshare.install
deleted file mode 100644
index d6519a6e8..000000000
--- a/social/nitroshare/nitroshare.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor
- update-desktop-database -q
-}
diff --git a/social/olsrd/PKGBUILD b/social/olsrd/PKGBUILD
deleted file mode 100644
index b6a45e576..000000000
--- a/social/olsrd/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: William Rea <sillywilly@gmail.com>
-# Maintainer: Claudio Pisa <clauz@ninux.org>
-pkgname=olsrd
-pkgver=0.6.1
-pkgrel=1
-pkgdesc="OLSR routing daemon (RFC 3626)"
-arch=(i686 x86_64 ppc mips64el)
-url="http://www.olsr.org"
-license=('BSD')
-depends=('glibc')
-makedepends=('bison')
-backup=etc/olsrd.conf
-install=olsrd.install
-source=(http://www.olsr.org/releases/0.6/${pkgname}-${pkgver}.tar.bz2 rc.d.olsrd)
-md5sums=('a75fc9b6252df5b5f49f13418fafeff1' 'bc3e393e0179ffff0a6d6c9d6a5c4b60')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  CFLAGS+=" -fPIC " \
-  make OS=linux build_all
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install_all
-
-  install -D -m755 $srcdir/rc.d.olsrd $pkgdir/etc/rc.d/olsrd
-  install -D -m644 license.txt $pkgdir/usr/share/licenses/olsrd/LICENSE
-}
-
diff --git a/social/olsrd/olsrd.install b/social/olsrd/olsrd.install
deleted file mode 100755
index f49372538..000000000
--- a/social/olsrd/olsrd.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-echo "--------------------------------------------------------------------"
-echo " Remember to edit /etc/olsrd.conf to match your network settings."
-echo "--------------------------------------------------------------------"
-/bin/true
-}
-
-post_upgrade() {
-/bin/true
-}
-
-pre_remove() {
-/etc/rc.d/olsrd stop
-/bin/true
-}
-
-op=$1
-shift
-
-$op "$@"
-
diff --git a/social/olsrd/rc.d.olsrd b/social/olsrd/rc.d.olsrd
deleted file mode 100755
index d257e22ef..000000000
--- a/social/olsrd/rc.d.olsrd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/olsrd`
-case "$1" in
-  start)
-    stat_busy "Starting OLSR Daemon"
-    [ -z "$PID" ] && /usr/sbin/olsrd -d 0 &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon olsrd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping OLSR Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon olsrd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
-
diff --git a/social/poco/PKGBUILD b/social/poco/PKGBUILD
deleted file mode 100644
index e9d074f97..000000000
--- a/social/poco/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Rodrigo Grumiche Silva <grumiche at integrityit dot com dot br>
-# Contributor: nozog
-# Contributor: davidhjelm
-# Contributor: Ray Kohler <ataraxia937 at gmail dot com>
-# Contributor: Nathan Owe < ndowens04 at gmail dot com>
-
-pkgname=poco
-pkgver=1.4.2p1
-pkgrel=1
-pkgdesc="C++ class libraries for network-centric, portable applications,
-complete edition"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.pocoproject.org/"
-license=('custom:boost')
-depends=('unixodbc' 'libmysqlclient' 'openssl')
-makedepends=('gcc' 'make' 'unixodbc' 'libmysqlclient' 'openssl' 'chrpath')
-options=()
-source=(http://downloads.sourceforge.net/poco/$pkgname-$pkgver-all.tar.bz2)
-
-build() {
- cd $srcdir/$pkgname-$pkgver-all
- ./configure --prefix=/usr --no-samples --no-tests
- make
-}
-
-
-package() {
- cd $srcdir/$pkgname-$pkgver-all
-
- make DESTDIR=$pkgdir install
-
- install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-
- #removing rpath information from binaries
- chrpath -d $pkgdir/usr/bin/cpspc
- chrpath -d $pkgdir/usr/bin/cpspcd
- chrpath -d $pkgdir/usr/bin/f2cpspd
- chrpath -d $pkgdir/usr/bin/f2cpsp
-
- #removing debugging libraries
- rm $pkgdir/usr/lib/libPoco*d.so*
-}
-
-md5sums=('752e5f5545377be24ee7c7b6b479fbbe')
diff --git a/social/python-relatorio/PKGBUILD b/social/python-relatorio/PKGBUILD
deleted file mode 100644
index 6255eeee5..000000000
--- a/social/python-relatorio/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor: Florian Walch <florian.walch@gmx.at>
-# Maintainer: Thomas Bahn <Thomas-Bahn@gmx.net>
-pkgname=python-relatorio
-pkgver=0.5.6
-pkgrel=1
-pkgdesc="A templating library able to output odt and pdf files"
-arch=('i686' 'x86_64')
-url="http://relatorio.openhex.org"
-license=('GPL')
-depends=('python-genshi>=0.5' 'python-lxml>=1.3.6')
-makedepends=('python2-distribute')
-source=("http://pypi.python.org/packages/source/r/relatorio/relatorio-$pkgver.tar.gz")
-
-build() {
-  cd $srcdir/relatorio-$pkgver
-  chmod 644 relatorio.egg-info/*
-  python2 setup.py install --root=$pkgdir
-}
-
-
-md5sums=('944fb60fadaff451ab6ee8818de516ad')
diff --git a/social/python2-polib/PKGBUILD b/social/python2-polib/PKGBUILD
deleted file mode 100644
index fc346ec97..000000000
--- a/social/python2-polib/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Esteban V. Carnevale <evcarnevale@gmail.com>
-
-pkgname=python2-polib
-_pkgname='polib'
-pkgver=0.7.0
-pkgrel=1
-pkgdesc='A library to manipulate gettext files'
-url='http://polib.readthedocs.org/en/latest/index.html'
-arch=('any')
-license=('MIT')
-depends=('python2')
-
-source=("https://bitbucket.org/izi/polib/downloads/polib-${pkgver}.tar.gz")
-md5sums=('958f8f81ade7d2484edc25b3989fe247')
-
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  python2 setup.py build
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/social/qxmlrpc/01_build_targets.patch b/social/qxmlrpc/01_build_targets.patch
deleted file mode 100644
index bee6d5167..000000000
--- a/social/qxmlrpc/01_build_targets.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: qxmlrpc-0.0.svn6/qxmlrpc.pro
-===================================================================
---- qxmlrpc-0.0.svn6.orig/qxmlrpc.pro	2010-06-04 14:39:33.000000000 +0400
-+++ qxmlrpc-0.0.svn6/qxmlrpc.pro	2010-06-04 14:39:44.000000000 +0400
-@@ -1,3 +1,3 @@
- TEMPLATE = subdirs
--SUBDIRS = xmlrpc test/unit examples/client examples/server
-+SUBDIRS = xmlrpc
- CONFIG += ordered
diff --git a/social/qxmlrpc/02_staticlib_removed.patch b/social/qxmlrpc/02_staticlib_removed.patch
deleted file mode 100644
index 58f1d68d1..000000000
--- a/social/qxmlrpc/02_staticlib_removed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: qxmlrpc-0.0.svn6/xmlrpc/xmlrpc.pro
-===================================================================
---- qxmlrpc-0.0.svn6.orig/xmlrpc/xmlrpc.pro	2010-06-04 18:18:24.000000000 +0400
-+++ qxmlrpc-0.0.svn6/xmlrpc/xmlrpc.pro	2010-06-04 18:23:23.000000000 +0400
-@@ -4,7 +4,6 @@
- win32:TARGET = ../qxmlrpc
- 
- CONFIG += warn_on
--CONFIG += staticlib
- CONFIG += debug_and_release
- CONFIG += precompile_header
- 
diff --git a/social/qxmlrpc/03_client.h_include_fix.patch b/social/qxmlrpc/03_client.h_include_fix.patch
deleted file mode 100644
index 6f174cb95..000000000
--- a/social/qxmlrpc/03_client.h_include_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qxmlrpc-0.0.svn6/xmlrpc/client.h
-===================================================================
---- qxmlrpc-0.0.svn6.orig/xmlrpc/client.h	2010-06-04 18:18:24.000000000 +0400
-+++ qxmlrpc-0.0.svn6/xmlrpc/client.h	2010-06-04 18:20:21.000000000 +0400
-@@ -7,7 +7,7 @@
- #include <qobject.h>
- #include <QHttp>
- 
--#include "xmlrpc/variant.h"
-+#include "variant.h"
- class QAuthenticator;
- 
- namespace  xmlrpc {
diff --git a/social/qxmlrpc/04_do_not_link_gui.patch b/social/qxmlrpc/04_do_not_link_gui.patch
deleted file mode 100644
index c086d4990..000000000
--- a/social/qxmlrpc/04_do_not_link_gui.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: qxmlrpc-0.0.svn6/xmlrpc/stable.h
-===================================================================
---- qxmlrpc-0.0.svn6.orig/xmlrpc/stable.h	2010-06-04 18:23:58.000000000 +0400
-+++ qxmlrpc-0.0.svn6/xmlrpc/stable.h	2010-06-04 18:24:20.000000000 +0400
-@@ -2,7 +2,6 @@
- #ifndef STABLE_H
- #define STABLE_H
- 	#if defined(__cplusplus) and not defined(__OBJC__)		
--		#include <QtGui>
- 		#include <QtXml>
- 		#include <QtCore>
- 		#include <QtNetwork>
-Index: qxmlrpc-0.0.svn6/xmlrpc/xmlrpc.pro
-===================================================================
---- qxmlrpc-0.0.svn6.orig/xmlrpc/xmlrpc.pro	2010-06-04 18:23:54.000000000 +0400
-+++ qxmlrpc-0.0.svn6/xmlrpc/xmlrpc.pro	2010-06-04 18:24:12.000000000 +0400
-@@ -10,6 +10,7 @@
- DEPENDPATH += .
- INCLUDEPATH += . ..
- 
-+QT -= gui
- QT += xml
- QT += network 
- 
diff --git a/social/qxmlrpc/PKGBUILD b/social/qxmlrpc/PKGBUILD
deleted file mode 100644
index 2e23c0a47..000000000
--- a/social/qxmlrpc/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Sid Karunaratne <sid at karunaratne dot net>
-pkgname=qxmlrpc
-pkgver=6
-pkgrel=1
-pkgdesc="a full Qt4 based implementation of XML-RPC protocol"
-arch=('i686' 'x86_64')
-url="https://code.google.com/p/qxmlrpc"
-license=('LGPL')
-depends=('qt')
-makedepends=('subversion')
-source=("https://repo.parabolagnulinux.org/other/$pkgname-$pkgver-$pkgrel-any.src.tar.xz"{,.sig}
-        "01_build_targets.patch"
-        "02_staticlib_removed.patch"
-        "03_client.h_include_fix.patch"
-        "04_do_not_link_gui.patch")
-md5sums=("87a89cc118e816265989a87a2b3c9321"
-        "7f10b0f33b6d0a67136838740b4b7c72"
-        "7d997d9fc0f8ec08e7b0c640480eb941"
-        "ee1a3d2a284c93f41d3c76c163ee734d"
-        "c5cacf7e13b93abb3e8e223118c5abbb"
-        "8ff188be390bcd1966b354d7159fd0e6")
-
-build () {
-    cd "${srcdir}/${pkgname}"
-    msg "Starting build..."
-
-    patch -p1 < ../01_build_targets.patch
-    patch -p1 < ../02_staticlib_removed.patch
-    patch -p1 < ../03_client.h_include_fix.patch
-    patch -p1 < ../04_do_not_link_gui.patch
-
-    qmake
-    make
-}
-
-package() {
-    install -Dm 755 "$srcdir/$pkgname/libqxmlrpc.so" "$pkgdir/usr/lib/libqxmlrpc.so"
-    install -Dm 755 "$srcdir/$pkgname/xmlrpc/client.h" "$pkgdir/usr/include/qxmlrpc/client.h"
-    install -Dm 755 "$srcdir/$pkgname/xmlrpc/request.h" "$pkgdir/usr/include/qxmlrpc/request.h"
-    install -Dm 755 "$srcdir/$pkgname/xmlrpc/response.h" "$pkgdir/usr/include/qxmlrpc/response.h"
-    install -Dm 755 "$srcdir/$pkgname/xmlrpc/server.h" "$pkgdir/usr/include/qxmlrpc/server.h"
-    install -Dm 755 "$srcdir/$pkgname/xmlrpc/serverintrospection.h" "$pkgdir/usr/include/qxmlrpc/serverintrospection.h"
-    install -Dm 755 "$srcdir/$pkgname/xmlrpc/variant.h" "$pkgdir/usr/include/qxmlrpc/variant.h"
-}
diff --git a/social/qxmlrpc/SRCBUILD b/social/qxmlrpc/SRCBUILD
deleted file mode 100644
index b5fe17ebf..000000000
--- a/social/qxmlrpc/SRCBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-pkgname=qxmlrpc
-pkgver=6
-pkgrel=1
-pkgdesc="a full Qt4 based implementation of XML-RPC protocol"
-arch=('any')
-url="https://code.google.com/p/qxmlrpc"
-license=('LGPL')
-makedepends=('subversion')
-_svntrunk="http://qxmlrpc.googlecode.com/svn/trunk/"
-_svnmod="qxmlrpc"
-
-build() {
-    msg "Connecting to SVN server...."
-
-    if [[ -d "$_svnmod/.svn" ]]; then
-        (cd "$_svnmod" && svn up -r "$pkgver")
-    else
-        svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod"
-    fi
-
-    msg "SVN checkout done or server timeout"
-}
-
-package() {
-  export PKGEXT=.src.tar.xz
-  export PKGDEST=${SRCDEST}
-
-  mv ${srcdir}/${_svnmod} ${pkgdir}/
-
-}
diff --git a/social/ruby-headers/PKGBUILD b/social/ruby-headers/PKGBUILD
deleted file mode 100644
index d68e97781..000000000
--- a/social/ruby-headers/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: fauno <fauno@kiwwwi.com.ar>
-# Contributor: Hilton Medeiros <medeiros.hilton at gmail dot com>
-
-pkgname=ruby-headers
-_pkgname=ruby
-pkgver=1.9.3_p392
-_pkgver=1.9.3-p392
-pkgrel=1
-pkgdesc="A package of all Ruby headers needed by some gems like ruby-debug."
-arch=('any')
-url="http://www.ruby-lang.org/en/"
-license=('GPL2' 'custom:Ruby')
-depends=("ruby=$pkgver")
-source=("http://ftp.ruby-lang.org/pub/ruby/1.9/$_pkgname-$_pkgver.tar.bz2")
-
-build() {
-  :
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$_pkgver"
-
-  # Just to make sure, since currently we have /usr/include/ruby-1.9.1 for ruby 1.9.2
-  _hdrdir=`ruby -e "require 'rbconfig'; puts Config::CONFIG['rubyhdrdir']"`
-
-  install -d "$pkgdir$_hdrdir/$_pkgname-$_pkgver"
-  install -m644 *.{h,inc} "$pkgdir$_hdrdir/$_pkgname-$_pkgver"
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-md5sums=('a810d64e2255179d2f334eb61fb8519c')
diff --git a/social/seeks/PKGBUILD b/social/seeks/PKGBUILD
deleted file mode 100644
index f686a2fc9..000000000
--- a/social/seeks/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# Maintainer: Kete < kete at ninthfloor dot org >
-
-pkgname=seeks
-pkgver=0.4.1
-pkgrel=5
-pkgdesc="A social decentralized internet overlay for collaborative searches"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.seeks-project.info/site/"
-license=('AGPL3' 'LGPL' 'BSD')
-backup=('etc/logrotate.d/seeks'
-    'etc/conf.d/seeks'
-    'etc/seeks/config')
-depends=('curl' 'libevent>=2.0' 'libxml2' 'opencv' 'protobuf' 'icu' 'tokyotyrant')
-makedepends=('pkg-config' 'docbook-xml' 'docbook2x')
-source=("http://downloads.sourceforge.net/project/${pkgname}/hippy/${pkgname}-${pkgver}.tar.gz"
-'seeks.conf.d'
-	'seeks.rc.d'
-	'img_websearch.patch'
-	'conf.patch'
-	'seeks.logrotate')
-install=seeks.install
-
-build() {
-  cd  "$srcdir/$pkgname-$pkgver"
-  # replace <cxflann.h> by <cv.h>
-  patch -p1 -i "$srcdir/img_websearch.patch"
-
-  # linking issue with --as-needed linker flag, Cli not building with RC2
-  LDFLAGS="-Wl,--no-as-needed" \
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --enable-httpserv-plugin \
-              --enable-extended-host-patterns
-              #--disable-cli \
-
-  sed -i s/,--as-needed,/,/ config.status
-  make
-}
-
-check() {
-  cd  "$srcdir/$pkgname-$pkgver"
-  make -k check-local
-}
-
-package() {
-  cd  "$srcdir/$pkgname-$pkgver"
-  # Patch config file to make seeks log in /var/log instead of ./ (needed for rc.d)
-  patch -p1 -i "$srcdir/conf.patch"
-  make DESTDIR="$pkgdir/" install
-
-  install -D -m644 Licenses  "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -D -m644 ../seeks.conf.d "${pkgdir}/etc/conf.d/seeks"
-  install -D -m755 ../seeks.rc.d "${pkgdir}/etc/rc.d/seeks"
-  install -D -m600 ../seeks.logrotate  "${pkgdir}/etc/logrotate.d/seeks"
-  install -d -m755  "${pkgdir}/var/log/seeks"
-  install -d -m755  "${pkgdir}/var/lib/seeks"
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('2545192be5fa2e70d850f7395d039a0f'
-         'ed29089d43873600726d570e63a5043d'
-         '72a00a931363edd2ed11c0072bfd5b10'
-         '2554e9f9f733d83203d0926e599e66db'
-         '71a99dafa726539b9de9055468e2f56c'
-         '5fbdf9c327999605b0f124132f27a27d')
diff --git a/social/seeks/conf.patch b/social/seeks/conf.patch
deleted file mode 100644
index 93e12c311..000000000
--- a/social/seeks/conf.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/config	2011-11-13 15:21:14.000000000 +0100
-+++ b/src/config	2011-11-13 15:46:15.856186336 +0100
-@@ -148,7 +148,7 @@
- #
- #      No trailing "/", please.
- #
--confdir .
-+confdir /etc/seeks
- #
- #
- #  2.2. templdir
-@@ -193,7 +193,7 @@
- #
- #      No trailing "/", please.
- #
--logdir .
-+logdir /var/log/seeks
- #
- #
- #  2.4. logfile
diff --git a/social/seeks/docbook2man.patch b/social/seeks/docbook2man.patch
deleted file mode 100644
index c5de2e063..000000000
--- a/social/seeks/docbook2man.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- seeks/configure	2011-07-30 15:16:27.000000000 +0200
-+++ seeks/configure.patch	2011-07-30 16:04:34.000000000 +0200
-@@ -16726,10 +16726,10 @@ PCRE_CFLAGS=`$PCRE_CONFIG --cflags`
- 
- 
- #==========================================================================
--# Finding docbook2x-man
-+# Finding docbook2man
- #==========================================================================
--# Extract the first word of "docbook2x-man", so it can be a program name with args.
--set dummy docbook2x-man; ac_word=$2
-+# Extract the first word of "docbook2man", so it can be a program name with args.
-+set dummy docbook2man; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_docbook+:} false; then :
---- seeks/doc/Makefile.am	2011-07-30 16:51:14.000000000 +0200
-+++ seeks/doc/Makefile.am.patch	2011-07-30 16:55:58.000000000 +0200
-@@ -8,4 +8,4 @@ endif
- 
- EXTRA_DIST=seeks.1.docbook
- seeks.1:
--	docbook2x-man ${srcdir}/seeks.1.docbook
-+	docbook2man ${srcdir}/seeks.1.docbook
diff --git a/social/seeks/img_websearch.patch b/social/seeks/img_websearch.patch
deleted file mode 100644
index 94362e2fc..000000000
--- a/social/seeks/img_websearch.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/plugins/img_websearch/ocvsurf.cpp b/src/plugins/img_websearch/ocvsurf.cpp
-index 5caa9dd..c3cccb4 100644
---- a/src/plugins/img_websearch/ocvsurf.cpp
-+++ b/src/plugins/img_websearch/ocvsurf.cpp
-@@ -29,7 +29,7 @@
- #include "miscutil.h"
- #include "errlog.h"
- 
--#include <cxflann.h>
-+#include <cv.h>
- 
- #include <iostream>
- #include <fstream>
diff --git a/social/seeks/install b/social/seeks/install
deleted file mode 100644
index 35f383a3c..000000000
--- a/social/seeks/install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    getent group seeks  >/dev/null || groupadd -r seeks
-    getent passwd seeks >/dev/null || useradd -r -c "Seeks daemon" -g seeks -M -d /var/run/seeks -s /bin/false seeks
-    passwd -l seeks &>/dev/null
-    touch var/log/seeks.log
-    chown seeks:log var/log/seeks.log
-    mkdir -p var/lib/seeks
-    touch var/lib/seeks/seeks.db
-    chown -R seeks:seeks var/lib/seeks
-}
-
-pre_remove() {
-    getent passwd seeks &>/dev/null && userdel seeks >/dev/null
-    getent group seeks &>/dev/null && groupdel seeks >/dev/null
-    return 0
-}
-
-
diff --git a/social/seeks/logfile.patch b/social/seeks/logfile.patch
deleted file mode 100644
index 9f4ab9b02..000000000
--- a/social/seeks/logfile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- config	2011-10-21 10:42:20.000000000 +0200
-+++ config.patch	2011-11-17 18:48:48.914516206 +0100
-@@ -193,7 +193,7 @@
- #
- #      No trailing "/", please.
- #
--logdir .
-+logdir /var/log/
- #
- #
- #  2.4. logfile
-@@ -239,7 +239,7 @@
- #      Any log files must be writable by whatever user Seeks is
- #      being run as.
- #
--logfile logfile
-+logfile seeks.log
- #
- #
- # 2.5. plugindir
-@@ -377,7 +377,7 @@
- #      Unset. This means the db is located in $HOME/.seeks/seeks_user.db 
- #      as default location.
- #
--# user-db-file /path/to/file.db
-+user-db-file /var/lib/seeks/seeks.db
- #
- #  2.10. user-db-address
- #  =====================
diff --git a/social/seeks/seeks b/social/seeks/seeks
deleted file mode 100755
index 01f34a432..000000000
--- a/social/seeks/seeks
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-daemon_name="seeks"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name $SEEKS_ARGS 2> /dev/null 
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/social/seeks/seeks.conf.d b/social/seeks/seeks.conf.d
deleted file mode 100644
index c28382aca..000000000
--- a/social/seeks/seeks.conf.d
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Arguments to be passed to the Seeks daemon
-#
-
-# User 
-SEEKS_USER="seeks"
-# Config file (default if empty)
-SEEKS_CONFIG=""
-# Args 
-SEEKS_ARGS=""
-
diff --git a/social/seeks/seeks.install b/social/seeks/seeks.install
deleted file mode 100644
index bf9849e78..000000000
--- a/social/seeks/seeks.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    getent group seeks  >/dev/null || groupadd -r seeks
-    getent passwd seeks >/dev/null || useradd -r -c "Seeks daemon" -g seeks -M -d /var/lib/seeks -s /bin/false seeks
-    passwd -l seeks &>/dev/null
-    chown seeks:seeks var/log/seeks var/lib/seeks
-}
-
-pre_remove() {
-    getent passwd seeks &>/dev/null && userdel seeks >/dev/null
-    getent group seeks &>/dev/null && groupdel seeks >/dev/null
-    return 0
-}
diff --git a/social/seeks/seeks.logrotate b/social/seeks/seeks.logrotate
deleted file mode 100644
index 98b411884..000000000
--- a/social/seeks/seeks.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/seeks/logfile {
-    missingok
-    notifempty
-    size 30k
-    create
-}
diff --git a/social/seeks/seeks.rc.d b/social/seeks/seeks.rc.d
deleted file mode 100644
index 67de9251a..000000000
--- a/social/seeks/seeks.rc.d
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/seeks
-
-PIDFILE="/var/run/seeks.pid"
-
-if [[ -f $PIDFILE ]]; then
-  read -r PID < "$PIDFILE"
-
-  # prevent stale pidfiles from hanging around
-  if [[ ! -d /proc/$PID ]]; then
-    echo 'pid not found. deleteing stale pidfile'
-    unset PID
-    rm -f "$PIDFILE"
-  fi
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting Seeks"
-    if [[ $PID ]]; then
-      stat_fail
-      exit 1
-    fi
-    if /usr/bin/seeks --daemon --pidfile "$PIDFILE" --user $SEEKS_USER $SEEKS_ARGS $SEEKS_CONFIG 2>&1 > /dev/null; then
-      add_daemon seeks
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Seeks"
-    if [[ ! $PID ]]; then
-      stat_fail
-      exit 1
-    fi
-    if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then
-      rm_daemon seeks
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-
diff --git a/social/seeks/seeksdaemon b/social/seeks/seeksdaemon
deleted file mode 100644
index 551197d28..000000000
--- a/social/seeks/seeksdaemon
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/seeks
-
-PID=`pidof -o %PPID /usr/bin/seeks`
-
-case "$1" in
-  start)
-    stat_busy "Starting seeks daemon"
-    [ -z "$PID" ] && /usr/bin/seeks $SEEKS_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon seeks
-      stat_done
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping seeks daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null 
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon seeks
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done 
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-
-esac
-exit 0
-
diff --git a/social/sipwitch/PKGBUILD b/social/sipwitch/PKGBUILD
deleted file mode 100644
index 769757df4..000000000
--- a/social/sipwitch/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Dan Serban
-# Contributors: David Zaragoza, Andrea Scarpino
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgname=sipwitch
-pkgver=1.2.4
-pkgrel=1
-pkgdesc="A call and registration server for the SIP protocol"
-arch=(i686 x86_64 mips64el)
-url=http://www.gnutelephony.org/index.php/GNU_SIP_Witch
-license=(GPL)
-depends=(libexosip2 ucommon)
-makedepends=(lynx)
-options=('!libtool')
-source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('6119cecb062ba4d0af18b427b01c41e2')
-
-build()
-{
-  cd "${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package()
-{
-  cd "${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  mkdir -p "${pkgdir}"/etc/rc.d
-  touch "${pkgdir}"/etc/rc.d/"${pkgname}"
-}
-
diff --git a/social/sobby/PKGBUILD b/social/sobby/PKGBUILD
deleted file mode 100644
index 50f847db9..000000000
--- a/social/sobby/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Thomas Jost <schnouki@schnouki.net>
-pkgname=sobby
-pkgver=0.4.8
-pkgrel=1
-pkgdesc="Standalone obby server"
-url="http://gobby.0x539.de/trac/"
-license="GPL"
-depends=('obby=0.4.8' 'libxml++')
-makedepends=('pkgconfig' 'net6>=1.3.12')
-arch=('i686' 'x86_64' 'mips6el')
-source=(http://releases.0x539.de/sobby/sobby-$pkgver.tar.gz{,.sig})
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
-md5sums=('1f7cf8c09cdeddbf2152843b28f73ce1'
-         '96822427ab95289ebb1520e6353c5d3c')
diff --git a/social/spectrum/PKGBUILD b/social/spectrum/PKGBUILD
deleted file mode 100644
index 50559f90d..000000000
--- a/social/spectrum/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Maintainer: Sonny Piers <sonny.piers@gmail.com>
-# Contributor: Tim Besard <tim.besard@gmail.com>
-
-pkgname=spectrum
-pkgver=1.4.8
-pkgrel=1
-pkgdesc="XMPP libpurple transport/gateway."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://spectrum.im"
-license=('GPL')
-depends=('gloox' 'libpurple' 'poco' 'python2' 'libev')
-makedepends=('cmake' 'gettext' 'pkg-config')
-optdepends=('mysql: MySQL database backend support'
-            'postgresql-libs: PostgreSQL database backend support'
-            'sqlite3: SQLite database backend support'
-            'libevent: support for libevent'
-            'imagemagick: support for avatars synchronization with legacy networks'
-
-            # Protocols plugins
-            'mbpurple-svn: microblogging services support (like Twitter or identi.ca/StatusNet)'
-            'msn-pecan: a different implementation of the MSN protocol for libpurple'
-            'pidgin-facebookchat: Facebook support, with more features than Facebook XMPP server'
-            'pidgin-sipe: SIPE protocol support'
-)
-backup=('etc/conf.d/spectrum')
-source=('http://spectrum.im/attachments/download/43/spectrum-1.4.8.tar.gz'
-        'logrotate.spectrum')
-md5sums=('edd88e1e70f86fe9aa4b43d787529a47'
-	'4f9cbfe3878fe5f4137d1bb5acc9e850')
-
-install='spectrum.install'
-
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  msg "Starting make..."
-  
-  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .
-  make
-
-  cd spectrumctl
-  python2 setup.py build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Various needed folders -- correct permissions are set in spectrum.install
-  install -d "${pkgdir}/etc/spectrum"
-  install -d "${pkgdir}/var/log/spectrum"
-  install -d "${pkgdir}/var/run/spectrum"
-  install -d "${pkgdir}/var/lib/spectrum"
-
-  # Install binaries and Python control script
-  make DESTDIR="${pkgdir}" install
-
-  cd spectrumctl
-  python2 setup.py install --root="${pkgdir}"
-
-  # Install initscript and logrotate config
-  install -Dm755 "${srcdir}/${pkgname}-${pkgver}/initscripts/archlinux/spectrum-rc.d"   "${pkgdir}/etc/rc.d/spectrum"
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/initscripts/archlinux/spectrum-conf.d" "${pkgdir}/etc/conf.d/spectrum"
-  install -Dm644 "${srcdir}/logrotate.spectrum"                                      "${pkgdir}/etc/logrotate.d/spectrum"
-
-  # Patch to use python2
-  sed -i -e "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "${pkgdir}/usr/bin/spectrumctl"
-}
diff --git a/social/spectrum/logrotate.spectrum b/social/spectrum/logrotate.spectrum
deleted file mode 100644
index ae52ff156..000000000
--- a/social/spectrum/logrotate.spectrum
+++ /dev/null
@@ -1,10 +0,0 @@
-/var/log/spectrum/*.log {
-   notifempty
-   missingok
-   sharedscripts
-   postrotate
-      for P in /var/run/spectrum/*.pid; do
-         /bin/kill -HUP `cat "$P" 2>/dev/null` 2>/dev/null || true
-      done
-   endscript
-}
diff --git a/social/spectrum/spectrum.install b/social/spectrum/spectrum.install
deleted file mode 100644
index 738fc5bbe..000000000
--- a/social/spectrum/spectrum.install
+++ /dev/null
@@ -1,47 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-    if [ -z "`grep '^spectrum:' /etc/group`" ]; then
-        groupadd -g 417 spectrum
-    fi
-    if [ -z "`grep '^spectrum:' /etc/passwd`" ]; then
-        useradd -u 417 -d /etc/spectrum -g spectrum -s /bin/false spectrum
-    fi
-
-    chown spectrum:spectrum var/lib/spectrum
-    chown spectrum:spectrum var/log/spectrum
-    chown spectrum:spectrum var/run/spectrum
-
-cat << EOF
-
-==> Documentation: http://spectrum.im/
-
-==> You must now customize the configuration file located in /etc/spectrum/.  Copy and reconfigure for each seperate protocol.
-
-EOF
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-    post_install $1
-}
-
-# arg 1: the old package version
-post_remove() {
-    userdel spectrum
-
-    paths=(/etc/spectrum /var/lib/spectrum /var/log/spectrum
-           /var/run/spectrum)
-    
-    first=true
-    for path in ${paths[@]}; do
-        if [ -d $path ]; then
-            if $first; then
-                first=false
-                echo "==> Leftover Paths:"
-            fi
-            echo "==> $path"
-        fi
-    done
-}
diff --git a/social/squirm/PKGBUILD b/social/squirm/PKGBUILD
deleted file mode 100644
index 679ec020c..000000000
--- a/social/squirm/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Spider.007 <archPackage@spider007.net>
-# Contributor: Spider.007 <archPackage@spider007.net>
-pkgname=squirm
-pkgver=1.26
-pkgrel=3
-pkgdesc="Fast & configurable proxy redirector"
-url="http://squirm.foote.com.au/"
-source=("$url/$pkgname-$pkgver.tgz")
-md5sums=('54ac1d208620ec1e4419f97315d38848')
-license=('GPL2')
-arch=('i686' 'x86_64' 'mips64el')
-
-build() {
-	cd $srcdir/$pkgname-$pkgver
-
-	make PREFIX=/
-}
-
-package() {
-	cd $srcdir/$pkgname-$pkgver
-
-# make install uses a weird prefix
-    install -d $pkgdir/etc/squirm 
-    install -d -o nobody $pkgdir/var/log/squirm
-    install -Dm755 squirm $pkgdir/usr/bin/squirm
-    install -m644 squirm.conf.dist $pkgdir/etc/squirm/squirm.conf
-    install -m644 squirm.patterns.dist $pkgdir/etc/squirm/squirm.patterns
-
-# use absolute path files
-    sed -e "s,logs,/var/log/squirm,g" \
-        -e "s,pattern ,& /etc/squirm/,g" \
-        -i $pkgdir/etc/squirm/squirm.conf
-}
diff --git a/social/statusnet/PKGBUILD b/social/statusnet/PKGBUILD
deleted file mode 100644
index 998751df5..000000000
--- a/social/statusnet/PKGBUILD
+++ /dev/null
@@ -1,131 +0,0 @@
-# Contributor: fauno <fauno@kiwwwi.com.ar>
-pkgbase=statusnet
-pkgname=statusnet-base
-pkgver=0.9.9
-
-# find available plugins and locales
-srcfile=${SRCDEST}/${pkgbase}-${pkgver}.tar.gz
-if [ -e ${srcfile} ]; then
-plugins=($(bsdtar -tf ${srcfile} \
-                      ${pkgbase}-${pkgver}/plugins | \
-                      cut -d'/' -f3 | sort -u))
-locales=($(bsdtar -tf ${srcfile} \
-                      ${pkgbase}-${pkgver}/locale | \
-                      cut -d'/' -f3 | sort -u))
-fi
-
-# looping avoids having "statusnet-plugin-" package
-pkgname=(${pkgname}
-         $(for plugin in ${plugins[@]}; do
-             echo ${plugin} | tr [A-Z] [a-z] | \
-             sed "s/^/statusnet-plugin-/"
-         done)
-         $(for locale in ${locales[@]}; do
-             echo ${locale} | tr [A-Z] [a-z] | \
-             sed "s/^/statusnet-i18n-/"
-         done))
-pkgrel=1
-arch=('any')
-pkgdesc="StatusNet is a Free and Open Source microblogging platform."
-url="http://status.net"
-license=('AGPL')
-depends=('php>=5.2.3' 'mysql>=5' 'php-gd' 'php-curl' 'php-gmp')
-source=("http://status.net/${pkgbase}-${pkgver}.tar.gz"
-        statusnet.install)
-install=statusnet.install
-md5sums=('766c9d42825fc99d8ad6c554a959568b'
-         'c638cb36b7da7eb67a67e031f59e6068')
-options=(!strip !zipman emptydirs)
-
-build() {
-    /bin/true
-}
-
-package_statusnet-base() {
-  provides=('statusnet')
-  optdepends=('memcache: for caching database queries'
-              'php-xcache: for accelerating PHP code execution'
-              'php-apc: for accelerating PHP code execution'
-              'php-ldap: for the LDAP plugin'
-              'statusnet-plugin-ostatus: for federation')
-
-  cd "$srcdir/$pkgbase-${pkgver}"
-
-  etc_dir="${pkgdir}/etc/webapps/${pkgbase}"
-  usr_dir="${pkgdir}/usr/share/webapps/${pkgbase}"
-
-  install -d ${usr_dir}
-  install -d ${etc_dir}
-  install -d ${pkgdir}/usr/share/doc/${pkgbase}/
-  install -d ${pkgdir}/usr/share/licenses/${pkgbase}
-
-  install -m644 ./{config.php,htaccess}.sample \
-      ${pkgdir}/usr/share/doc/${pkgbase}/
-
-  install -m644 ./{README,EVENTS.txt,lighttpd.conf.example} \
-      ${pkgdir}/usr/share/doc/${pkgbase}/
-
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgbase}/
-
-  rm -f *.sample README COPYING README EVENTS.txt *.example
-
-  cp -ra * ${usr_dir}/
-  chmod a+w ${usr_dir}/{avatar,background,file}
-
-  msg2 "Install bogus config.php"
-  touch ${etc_dir}/config.php
-  chmod a+w ${etc_dir}/config.php
-  ln -s /etc/webapps/statusnet/config.php ${usr_dir}/config.php
-
-  msg2 "Remove locale and plugins in favor of split packages"
-  rm -rf ${usr_dir}/{locale,plugins}
-
-  install -d ${usr_dir}/plugins
-  install -d ${usr_dir}/locale
-
-  install -d ${pkgdir}/srv/http
-  ln -s /usr/share/webapps/${pkgbase} ${pkgdir}/srv/http/
-} 
-
-# Helper for creating i18n packages
-statusnet-i18n-helper() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  install -d "${pkgdir}/usr/share/webapps/statusnet/locale/${1}"
-  cp -ra "./locale/${1}" "${pkgdir}/usr/share/webapps/statusnet/locale/${1}/"
-}
-
-# Helper for creating plugin packages
-statusnet-plugin-helper() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  install -d "${pkgdir}/usr/share/webapps/statusnet/plugins/${1}"
-  cp -ra "./plugins/${1}" "${pkgdir}/usr/share/webapps/statusnet/plugins/${1}/"
-}
-
-
-for plugin in ${plugins[@]}; do
-    plugin_lower=$(echo ${plugin} | tr [A-Z] [a-z])
-
-    eval "
-package_statusnet-plugin-${plugin_lower}() {
-    pkgdesc='${plugin} plugin for StatusNet'
-    depends=('statusnet-base')
-    groups=('statusnet-plugins')
-
-    statusnet-plugin-helper ${plugin}
-}"
-done
-
-for locale in ${locales[@]}; do
-    locale_lower=$(echo ${locale} | tr [A-Z] [a-z])
-
-    eval "
-package_statusnet-i18n-${locale_lower}() {
-    pkgdesc='${locale} locale for StatusNet'
-    depends=('statusnet-base')
-    groups=('statusnet-locales')
-
-    statusnet-i18n-helper ${locale}
-}"
-done
diff --git a/social/statusnet/statusnet.install b/social/statusnet/statusnet.install
deleted file mode 100644
index 5ec72e7c2..000000000
--- a/social/statusnet/statusnet.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install(){
-    cat <<EOM
-StatusNet is now installed on your system.
-
-Start MySQL and your prefered webserver and visit
-http://yoursite.tld/statusnet/install.php 
-
-Write permissions of /usr/share/webapps/statusnet has been granted to ensure the
-installation process can write the config file.
-EOM
-}
diff --git a/social/strongswan/PKGBUILD b/social/strongswan/PKGBUILD
deleted file mode 100644
index 8c5e42885..000000000
--- a/social/strongswan/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Contributor: Jason Begley <jayray at digitalgoat dot com>
-# Contributor: Ray Kohler <ataraxia937 at gmail dot com>
-# Maintainer: Daniel Riedemann <daniel.riedemann [at] googlemail [dot] com>
-# Maintainer: Dhruv Desai <svenskaparadox [at] gmail dot com>
-
-pkgname=strongswan
-pkgver=4.5.3
-pkgrel=1
-pkgdesc="open source IPsec implementation"
-url='http://www.strongswan.org'
-license=("GPL")
-arch=('i686' 'x86_64')
-depends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite3' 'networkmanager')
-conflicts=('openswan')
-options=(!libtool)
-backup=(etc/ipsec.conf etc/strongswan.conf)
-source=(http://download.strongswan.org/${pkgname}-${pkgver}.tar.bz2
-        strongswan.rc)
-md5sums=('ee7c50a90c91307b111e8085f2479890'
-         '667ea2367cbe07c57721696e6b7e39df')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver} 
-
-  ./configure  	--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-        --with-ipsecdir=/usr/lib/strongswan \
-		--enable-sqlite --enable-smartcard --enable-cisco-quirks \
-		--enable-openssl --enable-nm --enable-curl \
-		--enable-sql --enable-attr-sql \
-		--enable-farp --enable-dhcp \
-		--enable-eap-sim --enable-eap-sim-file --enable-eap-simaka-pseudonym \
-		--enable-eap-simaka-reauth --enable-eap-identity --enable-eap-md5 \
-		--enable-eap-gtc --enable-eap-aka --enable-eap-aka-3gpp2 \
-		--enable-eap-mschapv2 --enable-eap-radius \
-		--enable-ha \
-		--disable-mysql --disable-ldap \
-		--disable-static --enable-shared 
-
-  make 
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver} 
-  make DESTDIR=${pkgdir} install 
-
-  install -d ${pkgdir}/etc/rc.d 
-  ln -s /usr/sbin/ipsec ${pkgdir}/etc/rc.d/ipsec 
-  install -Dm755 ${srcdir}/strongswan.rc ${pkgdir}/etc/rc.d/strongswan 
-}
-
diff --git a/social/strongswan/strongswan.rc b/social/strongswan/strongswan.rc
deleted file mode 100755
index 58c99c092..000000000
--- a/social/strongswan/strongswan.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting strongSwan IPsec"
-    /usr/sbin/ipsec start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      add_daemon strongswan
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping strongSwan IPsec"
-    /usr/sbin/ipsec stop
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      rm_daemon strongswan
-    fi
-    ;;
-  restart)
-    stat_busy "Restarting strongSwan IPsec"
-    /usr/sbin/ipsec restart
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      add_daemon strongswan
-    fi
-    ;;
-  status)
-    /usr/sbin/ipsec status
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|status}"  
-esac
-
diff --git a/social/tinc/PKGBUILD b/social/tinc/PKGBUILD
deleted file mode 100644
index 87d3415e9..000000000
--- a/social/tinc/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-pkgname=tinc
-pkgver=1.0.16
-pkgrel=3
-pkgdesc="VPN (Virtual Private Network) daemon"
-arch=(i686 x86_64 mips64el)
-url="http://www.tinc-vpn.org/"
-license=('GPL')
-depends=('lzo2' 'zlib' 'openssl')
-backup=(etc/conf.d/tincd.conf)
-source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz
-        tincd.conf
-        tincd.rcd)
-md5sums=('f1c7ed94878725fb2cf4efb02bf160da'
-         'd4a42b4a474448c64dc8f5100480f569'
-         '89a91a80c1dee4b365958bd9e6242d5a')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  install -d $pkgdir/etc/{tinc,rc.d,conf.d}
-
-  install -Dm755 $srcdir/tincd.rcd $pkgdir/etc/rc.d/tincd
-  install -Dm755 $srcdir/tincd.conf $pkgdir/etc/conf.d/tincd.conf
-}
diff --git a/social/tinc/tincd.conf b/social/tinc/tincd.conf
deleted file mode 100644
index e86139b44..000000000
--- a/social/tinc/tincd.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-NETNAME=yournetname
-OPTIONS="-R -U nobody -L"
diff --git a/social/tinc/tincd.rcd b/social/tinc/tincd.rcd
deleted file mode 100644
index 16f39f8ca..000000000
--- a/social/tinc/tincd.rcd
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-daemon_name=tincd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${daemon_name}.conf
-
-PIDFILE=/var/run/tinc.${NETNAME}
-[ -f "${PIDFILE}" ] && PID=$(<${PIDFILE})
-
-case "$1" in
-    start)
-        stat_busy "Starting ${daemon_name}"
-        [ -z "$PID" ] && \
-            /usr/sbin/tincd -n ${NETNAME} \
-                            ${OPTIONS} \
-                            --pidfile=${PIDFILE} &> /dev/null
-
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon ${daemon_name}
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping ${daemon_name}"
-        [ ! -z "$PID" ] && /usr/sbin/tincd -n ${NETNAME} -k
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon ${daemon_name}
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-        sleep 3
-        $0 start
-        ;;
-    reload)
-        [ ! -z "$PID" ] && /usr/sbin/tincd -n ${NETNAME} -k HUP
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart|reload}"
-esac
-exit 0
diff --git a/social/tokyotyrant/PKGBUILD b/social/tokyotyrant/PKGBUILD
deleted file mode 100755
index 245082c61..000000000
--- a/social/tokyotyrant/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# # Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Paul Sadauskas <psadauskas@gmail.com>
-
-pkgname=tokyotyrant
-pkgver=1.1.41
-pkgrel=2
-pkgdesc="Network interface to TokyoCabinet"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.fallabs.com"
-license=('LGPL')
-makedepends=('gcc>=3.1' 'make' 'pkgconfig')
-depends=('zlib' 'bzip2' 'tokyocabinet>=1.4.27')
-source=("http://fallabs.com/$pkgname/$pkgname-$pkgver.tar.gz"
-        "tokyotyrant.rc"
-        "tokyotyrant.conf")
-
-md5sums=('a47e58897bd1cbbac173d5a66cc32ae3'
-         '3ed9229c9cfb8e1b3055b814d5038799'
-         '2558846ece69d1f265ee1ba5728c39cd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr  
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="$pkgdir" install
-  install -m 644 -D ${srcdir}/tokyotyrant.conf $pkgdir/etc/conf.d/ttserver
-  install -m 755 -D ${srcdir}/tokyotyrant.rc $pkgdir/etc/rc.d/ttserver
-}
-
diff --git a/social/tokyotyrant/tokyotyrant.conf b/social/tokyotyrant/tokyotyrant.conf
deleted file mode 100755
index 77c299a81..000000000
--- a/social/tokyotyrant/tokyotyrant.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# /etc/conf.d/ttserver: config file for /etc/init.d/ttserver
-
-# TCP port TokyoTyrant server should listen on
-TYRANT_PORT="1978"
-
-# Location of the TokyoTyrant server database
-# Also put addional options here, eg, #bnum
-# See 'ttserver' man page
-TYRANT_DB="/var/lib/tokyotyrant/tokyotyrant.tch"
-
-# Location of the TokyoTyrant server log file
-TYRANT_LOG_FILE="/var/log/ttserver.log"
-
-# Location of the TokyoTyrant server PID file
-TYRANT_PID_FILE="/var/run/ttserver.pid"
-
-# Pass extra options to TokyoTyrant server
-# Example: TYRANT_EXTRA_OPTS="-ld" - enables logging of debug messages
-# See the 'ttserver' man page for more
-TYRANT_EXTRA_OPTS=""
-
diff --git a/social/tokyotyrant/tokyotyrant.rc b/social/tokyotyrant/tokyotyrant.rc
deleted file mode 100755
index eaecb0af0..000000000
--- a/social/tokyotyrant/tokyotyrant.rc
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# source config
-[ -f /etc/conf.d/ttserver ] && . /etc/conf.d/ttserver
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting TokyoTyrant Server"
-    /usr/bin/ttserver ${TYRANT_EXTRA_OPTS} -dmn -pid ${TYRANT_PID_FILE} -log ${TYRANT_LOG_FILE} -port ${TYRANT_PORT} ${TYRANT_DB}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ttserver
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping TokyoTyrant Server"
-    if [ -f $TYRANT_PID_FILE ]; then
-      pid=`cat "$TYRANT_PID_FILE"`
-      kill -TERM "$pid"
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        rm_daemon ttserver
-        stat_done
-      fi
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/social/tomoyo-tools/PKGBUILD b/social/tomoyo-tools/PKGBUILD
deleted file mode 100644
index 9ca0e3181..000000000
--- a/social/tomoyo-tools/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
-
-pkgname=tomoyo-tools
-_basever=2.3.0
-_timestamp=20110211
-pkgver=${_basever}.${_timestamp}
-pkgrel=4
-pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernel 2.6.36 and later'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://tomoyo.sourceforge.jp'
-license=('GPL')
-depends=('ncurses')
-makedepends=('help2man')
-conflicts=('ccs-tools')
-install=tomoyo-tools.install
-source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/48663/${pkgname}-${_basever}-${_timestamp}.tar.gz")
-
-build() {
-    cd "${srcdir}/${pkgname}"
-    make -j1 || return 1
-}
-
-package() {
-    cd "${srcdir}/${pkgname}"
-    make INSTALLDIR="${pkgdir}" install || return 1
-}
-
-sha256sums=('3144bbd6056528c85f63889c8b977b994d5596611b74afdc9a3924162cf94db0')
diff --git a/social/tomoyo-tools/tomoyo-tools.install b/social/tomoyo-tools/tomoyo-tools.install
deleted file mode 100644
index 6fb5e16d2..000000000
--- a/social/tomoyo-tools/tomoyo-tools.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install () {
-	echo
-	echo " * To enable TOMOYO Linux, append 'security=tomoyo' to the kernel"
-	echo "   boot options and initialize policy with this command:"
-	echo "     /usr/lib/tomoyo/init_policy"
-	echo
-}
-
-post_upgrade () {
-    post_install $1
-}
diff --git a/social/uci/PKGBUILD b/social/uci/PKGBUILD
deleted file mode 100644
index 5a14ac2c0..000000000
--- a/social/uci/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
-pkgname=uci
-pkgver=0.8.0
-pkgrel=1
-pkgdesc="OpenWRT's Unified Configuration Interface"
-arch=('i686' 'mips64el')
-url="https://openwrt.org"
-license=('GPL2')
-makedepends=('git' 'cmake' 'lua51')
-source=(git://nbd.name/uci.git)
-md5sums=(SKIP)
-
-pkgver() {
-  cd ${srcdir}/${pkgname}
-  local ver="$(git describe --long --tags)"
-  printf "%s" "${ver//-/.}"
-}
-
-build() {
-  cd ${srcdir}/${pkgname}
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}
-  make DESTDIR=${pkgdir}/ install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/social/ucommon/PKGBUILD b/social/ucommon/PKGBUILD
deleted file mode 100644
index 240fcc3db..000000000
--- a/social/ucommon/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Dan Serban
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: David Zaragoza <david@zaragoza.com.ve>
-
-pkgname=ucommon
-pkgver=5.0.6
-pkgrel=1
-pkgdesc="A light-weight C++ library to facilitate using C++ design patterns"
-arch=(i686 x86_64)
-url="http://www.gnutelephony.org/index.php/GNU_uCommon_C%2B%2B"
-license=(GPL)
-depends=(openssl)
-options=('!libtool')
-source=("http://ftp.gnu.org/gnu/commoncpp/${pkgname}-${pkgver}.tar.gz")
-
-build()
-{
-  cd "${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package()
-{
-  cd "${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('86958df511e66bb6ea099b6ca3c3b582')
diff --git a/social/uftp/PKGBUILD b/social/uftp/PKGBUILD
deleted file mode 100644
index 1dea3b5ba..000000000
--- a/social/uftp/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Markus Jochim <ich@markusjochim.de>
-# Maintainer (Parabola): fauno <fauno@parabola.nu>
-pkgname=uftp
-pkgver=3.7.1
-pkgrel=2
-pkgdesc="Multicast FTP software"
-arch=(i686 x86_64 mips64el)
-url="http://www.tcnj.edu/~bush/uftp.html"
-license=('GPL3')
-depends=('openssl')
-source=(http://www.tcnj.edu/~bush/downloads/uftp-${pkgver}.tar)
-md5sums=('0d3aa7d3e57251e8abf34027afa1e321')
-
-build() {
-	cd "$srcdir/uftp-${pkgver}/"
-
-  sed "s,/bin,/usr&,g" -i makefile
-
-	make CFLAGS="$CFLAGS"
-}
-
-package() {
-	cd "$srcdir/uftp-${pkgver}/"
-	make DESTDIR="${pkgdir}" install
-}
-
diff --git a/~aurelien/README b/~aurelien/README
deleted file mode 100644
index 7fe764c4c..000000000
--- a/~aurelien/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Hello Parabolers of the World ;-)
-
-Have fun & be free!
-
-Thanks to Fauno!
diff --git a/~aurelien/aurelien b/~aurelien/aurelien
deleted file mode 100644
index 3bda9d20a..000000000
--- a/~aurelien/aurelien
+++ /dev/null
@@ -1,19 +0,0 @@
-Hi!
-
-I am or was aurelien.
-
-An happy free thinker that have find his way in Parabola!
-
-All the packages i had build are in pcr, why pcr?
-Because Parabola Community Repository
-
-And so that community need from my point of view to offer
-cool software to offer cool ways.
-
-All the packages have build are free as in freedom, so,
-you are free to build them too, to get care of them.
-
-PKGBUILDs are great way to discover Parabola, BASH and much
-more.
-
-Have fun & be free!
\ No newline at end of file
diff --git a/~coadde/cross-binutils/PKGBUILD b/~coadde/cross-binutils/PKGBUILD
deleted file mode 100644
index 9c22f62af..000000000
--- a/~coadde/cross-binutils/PKGBUILD
+++ /dev/null
@@ -1,406 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Contributor: André Silva <emulatorman@parabola.nu>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-
-# +-------------+-------------+-----------------------------------------------------------+-----------+---------+
-# | -march      | CARCH       | CHOST (_target)                                           | Multilib  | QEMU    |
-# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
-# | _arch       | _CARCH      | _host       | _machine | _system (GNU/*)                  | _multilib | -       |
-# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
-# | mips64el    | mips64el    | mips64el    | unknown  | linux-gnu|elf                    | yes       | sys     |
-# | mips64      | mips64      | mips64      | unknown  | linux-gnu|elf                    | yes       | sys     |
-# | *           | mipsel      | mipsel      | unknown  | elf                              | no        | bin/sys |
-# | *           | mips        | mips        | unknown  | elf                              | no        | bin/sys |
-# | x86_64      | x86_64      | x86_64      | unknown  | linux-gnu|gnu<|elf               | yes       | bin/sys |
-# | i[5-7]86    | i[5-7]86    | i[5-7]86    | pc       | linux-gnu|gnu|                   | no        | bin/sys |
-# | *           | i386        | i386        | unknown  | elf                              | no        | bin/sys |
-# | armv8-a     | aarch64     | aarch64     | unknown  | linux-gnu|elf                    | yes       | -       |
-# | armv8-a     | aarch64_be  | aarch64_be  | unknown  | linux-gnu|elf                    | yes       | -       |
-# | armv7-a     | armv7h      | armv7l      | unknown  | linux-gnueabihf                  | no        | bin/sys |
-# | armv6       | armv6h      | armv6l      | unknown  | linux-gnueabihf                  | no        | bin/sys |
-# | armv5te     | arm         | armv5tel    | unknown  | linux-gnueabi                    | no        | bin/sys |
-# | *           | arm         | arm         | unknown  | eabi                             | no        | bin/sys |
-# | arm         | armeb       | armeb       | unknown  | linux-gnueabi|eabi               | no        | bin     |
-# | sparc64     | sparc64     | sparc64     | unknown  | linux-gnu                        | yes       | bin/sys |
-# | sparc       | sparc       | sparc       | unknown  | linux-gnu                        | no        | bin/sys |
-# | -           | ia64        | ia64        | unknown  | linux-gnu                        | yes       | -       |
-# | -           | s390        | s390        | unknown  | linux-gnu                        | no        | -       |
-# | -           | s390x       | s390x       | unknown  | linux-gnu                        | no        | bin/sys |
-# | powerpc64   | powerpc64   | powerpc64   | unknown  | linux-gnu|linux-gnueabi|elf|eabi | yes       | bin/sys |
-# | powerpc64le | powerpc64le | powerpc64le | unknown  | linux-gnu|linux-gnueabi|elf|eabi | yes       | -       |
-# | powerpc     | powerpc     | powerpc     | unknown  | linux-gnu|linux-gnueabi|elf|eabi | no        | bin/sys |
-# | powerpcle   | powerpcle   | powerpcle   | unknown  | linux-gnu|linux-gnueabi|elf|eabi | no        | -       |
-# | -           | spu         | spu         | unknown  | elf                              | no        | -       |
-# | -           | sh64        | sh64        | unknown  | linux-gnu|elf                    | yes       | -       |
-# | -           | sh64l       | sh64l       | unknown  | linux-gnu|elf                    | yes       | -       |
-# | -           | sh4         | sh4         | unknown  | linux-gnu                        | no        | bin/sys |
-# | -           | sh4l        | sh4l        | unknown  | linux-gnu                        | no        | bin/sys |
-# | -           | sh          | sh          | unknown  | elf                              | no        | - @     |
-# | -           | shl         | shl         | unknown  | elf                              | no        | - @     |
-# | -           | xtensa      | xtensa      | unknown  | elf                              | no        | sys     |
-# | *           | m68k        | m68k        | unknown  | elf                              | no        | bin/sys |
-# | -           | lm32        | lm32        | unknown  | linux-gnu|elf                    | no        | sys     |
-# | -           | or32        | or32        | unknown  | linux-gnu<|elf<                  | no        | bin/sys |
-# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
-
-# For "DOSBox"
-# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
-# | *           | i386        | i386        | pc       | msdosdjgpp                       | no        | bin/sys |
-# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
-
-# For "Wine"
-# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
-# | *           | x86_64      | x86_64      | unknown  | mingw64                          | yes       | bin/sys |
-# | *           | i386        | i386        | unknown  | mingw32                          | no        | bin/sys |
-# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
-
-# * : Any supported by architecture.
-# - : None.
-# @ : bin/sys (Only sh4 and sh4l support)
-# < : I will support it. (future)
-
-_carch_list=('mips64el' 'mips64' 'x86_64' 'i786' 'i686' 'i586' 'i486' 'i386' 'aarch64' 'aarch64_be'
-             'armv7l' 'armv6l' 'armv5tel' 'armeb' 'sparc64' 'sparc' 'ia64' 's390' 's390x'
-             'powerpc64' 'powerpc64le' 'powerpc' 'powerpcle' 'sh64' 'sh64l' 'sh4' 'sh4l' 'lm32' 'or32')
-_multilib_list=('mips64el' 'mips64' 'x86_64' 'aarch64' 'aarch64_be' 'sparc64' 'ia64' 'powerpc64' 'powerpc64le''sh64' 'sh64l')
-
-#---------------------------------------------------------------------------------------------------------------------------------------------
-
-### Base FLAGS: ###
-# For custom name.
-_pkgname="binutils"
-_pkgver="2.23.2"
-_pkgrel="2"
-# For binutils-common ("${_pkgname}-common${_pkgflag}${_verflag}") release.
-_pkgrelb="2"
-# For _target-binutils ("${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}${_pkgflag}${_verflag}") release.
-_pkgrelc="2"
-# For older version.
-_add_version_name="no"
-# For custom pkg.
-_pkgflag=""
-
-### Architecture FLAGS: ###
-# CARCH flag 
-_CARCH="mips64"
-# CHOST flags
-_host="${_CARCH}"
-_machine="unknown"
-_system="linux-gnu"
-# Multilib flag
-_multilib="yes"
-
-### Patch FLAGS: ###
-_patch_ath9k_htc_fw="no"
-
-#---------------------------------------------------------------------------------------------------------------------------------------------
-
-# For older version.
-[[ ${_add_version_name} == yes ]] && _verflag="-v${_pkgver}"
-
-# For Architecture.
-_target="${_host}-${_machine}-${_system}"
-
-# For "_patch_ath9k_htc_fw"
-[[ ${_CARCH} != xtensa ]] && _patch_ath9k_htc_fw="no"
-[[ ${_patch_ath9k_htc_fw} == "yes" ]] && {
-  _ath9k_htc_name="-ath9k-htc"
-  _ath9k_htc_desc=" adapted for ath9k-htc firmware"
-  _multilib="no"
-}
-
-# For "_multilib"
-[[ ${_CARCH} != $(echo ${_multilib_list[@]} | sed 's| |\n|g' | grep -x ${_CARCH}) ]] && _multilib="no"
-[[ ${_multilib} == "yes" ]] && {
-  _multilib_name="-multilib"
-  _multilib_desc=" for multilib"
-}
-
-#---------------------------------------------------------------------------------------------------------------------------------------------
-
-pkgname=(
-  "${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}${_pkgflag}${_verflag}"
-  "${_pkgname}-common${_pkgflag}${_verflag}"
-)
-pkgver=${_pkgver}
-pkgrel=${_pkgrel}
-arch=("${_carch_list[@]}")
-url="http://www.gnu.org/software/${_pkgname}/"
-license=('GPL2')
-groups=('cross-devel')
-checkdepends=('dejagnu' 'bc')
-# Make sure we compile this with {$CHOST-,}gcc-multilib
-[[ ${_multilib} == "yes" ]] && makedepends=('gcc-multilib') # makedepends=("$CHOST-gcc-multilib")
-options=('!libtool' '!distcc' '!ccache')
-source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2{,.sig}
-        ${_pkgname}-2.23.2-texinfo-5.0.patch)
-md5sums=('4f8fa651e35ef262edc01d60fb45702e'
-         'dfde4428f08d91f309cdcfe92bf28d08'
-         '34e439ce23213a91e2af872dfbb5094c')
-
-[[ ${_patch_ath9k_htc_fw} == "yes" ]] && {
-  source+=("_patch_ath9k_htc_fw.patch::https://raw.github.com/qca/open-ath9k-htc-firmware/1.3.2/local/patches/${_pkgname}.patch")
-  md5sums+=('7077126d96e9a755a0eaddb5505efe68')
-}
-
-#---------------------------------------------------------------------------------------------------------------------------------------------
-
-prepare() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-
-  msg "http://sourceware.org/git/?p=${_pkgname}.git;a=patch;h=e02bf935"
-  msg "http://sourceware.org/git/?p=${_pkgname}.git;a=patch;h=935f8542"
-  patch -p1 -i ${srcdir}/${_pkgname}-2.23.2-texinfo-5.0.patch
-
-  [[ ${_patch_ath9k_htc_fw} == "yes" ]] && {
-    patch -p1 -i ${srcdir}/_patch_ath9k_htc_fw.patch
-  }
-
-  msg "hack! - libiberty configure tests for header files using" "$CPP $CPPFLAGS"
-  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
-
-  mkdir -v ${srcdir}/${_pkgname}-build
-}
-
-#---------------------------------------------------------------------------------------------------------------------------------------------
-
-build() {
-  cd ${srcdir}/${_pkgname}-build
-
-  [[ $CARCH != ${_CARCH} ]] && _TARGET="--target=${_target}"
-  if [[ ${_CARCH} == $(echo ${_multilib_list[@]} | sed 's| |\n|g' | grep -x ${_CARCH}) ]]; then
-    _LIB_PATH="--with-lib-path=/usr/lib:/usr/lib32:/usr/local/lib:/usr/local/lib32:/usr/${_target}/lib:/usr/${_target}/lib32"
-  else
-    _LIB_PATH="--with-lib-path=/usr/lib:/usr/local/lib:/usr/${_target}/lib"
-  fi
-
-  if [[ ${_multilib} == "yes" ]]; then
-    _MULTILIB='--enable-multilib'
-  else
-    _MULTILIB='--disable-multilib'
-  fi
-
-  ${srcdir}/${_pkgname}-${pkgver}/configure --prefix=/opt/${pkgname[0]/${_verflag}/}/${pkgver} \
-    $_TARGET $_LIB_PATH \
-    --program-prefix=${_target}- \
-    --program-suffix=${_multilib_name}${_ath9k_htc_name}-${pkgver} \
-    --with-bugurl=https://labs.parabola.nu/ \
-    --enable-ld=default --enable-gold \
-    --enable-plugins --enable-threads \
-    --with-pic --enable-shared \
-    --disable-werror ${_MULTILIB}
-    # !!! Disabled, due which problematic libretools (prepare() and build() with --bindir, --includedir and --datarootdir)" !!!
-    #--bindir=/usr/bin --includedir=/usr/include --datarootdir=/usr/share \
-
-  msg "Check the host environment and makes sure all the necessary tools are available"
-  make configure-host
-
-  make tooldir=/opt/${pkgname[0]/${_verflag}/}/${pkgver}
-}
-
-#---------------------------------------------------------------------------------------------------------------------------------------------
-
-check() {
-  cd ${srcdir}/${_pkgname}-build
-  
-  msg "Unset LDFLAGS as testsuite makes assumptions about which ones are active"
-  msg "do not abort on errors - manually check log files"
-  make LDFLAGS="" -k check || true
-}
-
-#---------------------------------------------------------------------------------------------------------------------------------------------
-
-_target-binutils() {
-  pkgrel=${_pkgrelc}
-  pkgdesc="A set of programs to assemble and manipulate binary and object files${_multilib_desc}${_ath9k_htc_desc}. (${_target} architecture)"
-  depends=('glibc>=2.17' 'zlib' "${_pkgname}-common")
-  [[ $CHOST == ${_target} ]] && provides=("${_pkgname}=${pkgver}")
-  if [[ ${_multilib} == "yes" ]]; then
-    groups+=('multilib-devel')
-  else
-    groups+=('base-devel')
-  fi
-  groups+=("${_target}-devel")
-  install="${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}.install"
-
-  cd ${srcdir}/${_pkgname}-build
-  make prefix=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} tooldir=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} install
-
-  # temp #
-  msg "!!! Move 'bin', 'include' and 'share' dir to /usr, !!!"
-  msg "!!! due which problematic libretools ('prepare()' and 'build()' with --bindir, --includedir and --datarootdir) !!!"
-  install -vd ${pkgdir}/usr
-  if [[ $CARCH == ${_CARCH} ]]; then
-    mv -v ${pkgdir}/{opt/${pkgname}/${pkgver}/{bin,include,share},usr}
-  else
-    mv -v ${pkgdir}/{opt/${pkgname}/${pkgver}/{bin,$CHOST/${_target}/include,share},usr}
-  fi
-  # temp #
-
-  [[ $CARCH != ${_CARCH} ]] && {
-    msg "Move 'lib' files and directories, and remove architecture directories"
-    mv -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/{$CHOST/${_target}/lib/*,lib}
-    rmdir -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/$CHOST/{${_target}/{lib,},}
-  }
-
-  msg "Change lib-path on ldscripts files"
-  sed -i "/^SEARCH_DIR/ s|/${pkgver}/${_target}/lib|/${pkgver}/lib|g;
-          /^SEARCH_DIR/ s|/${pkgver}/lib|/${pkgver}/lib32|g;
-          /^SEARCH_DIR/ s|/${pkgver}/lib3264|/${pkgver}/lib|g;
-          /^SEARCH_DIR/ s|/${pkgver}/lib32x32|/${pkgver}/lib|g;
-         " ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/lib/ldscripts/*
-
-  _removebin=(ar as nm objcopy objdump ranlib strip)
-  for _rbin in ${_removebin[@]}; do
-    msg "Remove conflicting binaries"
-    rm -v ${pkgdir}/usr/bin/${_rbin[@]}
-  done
-
-  msg "Create links for libraries"
-  install -vd ${pkgdir}/{usr/${_target},etc/ld.so.conf.d}
-  ln -vs ../lib ${pkgdir}/usr/${_target}/lib
-  echo /opt/${pkgname/${_verflag}/}/${pkgver}/lib > ${pkgdir}/etc/ld.so.conf.d/${pkgname}-${pkgver}.conf
-
-  msg "Install PIC libiberty.a"
-  install -vm644 libiberty/pic/libiberty.a ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/lib
-
-  msg "Remove unnecessaries manuals and create links for manuals"
-  _man=$(ls -1A ${pkgdir}/usr/share/man/man1)
-  for _man_stage1 in ${_man[@]}; do
-    _man_stage2=${_man_stage1/${_multilib_name}${_ath9k_htc_name}-${pkgver}/}
-    _manuals=${_man_stage2/${_target}-/}
-    rm -v ${pkgdir}/usr/share/man/man1/${_man_stage1}
-    ln -vs ${_manuals}.gz ${pkgdir}/usr/share/man/man1/${_man_stage1}.gz
-  done
-
-  msg "Remove unnecessaries files and directories"
-  rm -vr ${pkgdir}/usr/{include,share/{info,locale}}
-}
-
-#---------------------------------------------------------------------------------------------------------------------------------------------
-
-# GNU/Linux-libre
-package_mips64el-unknown-linux-gnu-binutils() { _target-binutils; }
-package_mips64el-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
-package_mips64-unknown-linux-gnu-binutils() { _target-binutils; }
-package_mips64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
-package_x86_64-unknown-linux-gnu-binutils() { _target-binutils; }
-package_x86_64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
-package_i786-pc-linux-gnu-binutils() { _target-binutils; }
-package_i686-pc-linux-gnu-binutils() { _target-binutils; }
-package_i586-pc-linux-gnu-binutils() { _target-binutils; }
-package_aarch64-unknown-linux-gnu-binutils() { _target-binutils; }
-package_aarch64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
-package_aarch64_be-unknown-linux-gnu-binutils() { _target-binutils; }
-package_aarch64_be-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
-package_arm7l-unknown-linux-gnueabi-binutils() { _target-binutils; }
-package_arm6l-unknown-linux-gnueabi-binutils() { _target-binutils; }
-package_arm5tel-unknown-linux-gnueabi-binutils() { _target-binutils; }
-package_armeb-unknown-linux-gnueabi-binutils() { _target-binutils; }
-package_sparc64-unknown-linux-gnu-binutils() { _target-binutils; }
-package_sparc64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
-package_sparc-unknown-linux-gnu-binutils() { _target-binutils; }
-package_ia64-unknown-linux-gnu-binutils() { _target-binutils; }
-package_ia64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
-package_s390-unknown-linux-gnu-binutils() { _target-binutils; }
-package_s390x-unknown-linux-gnu-binutils() { _target-binutils; }
-package_sparc64-unknown-linux-gnu-binutils() { _target-binutils; }
-package_sparc64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
-package_powerpc64-unknown-linux-gnu-binutils() { _target-binutils; }
-package_powerpc64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
-package_powerpc64le-unknown-linux-gnu-binutils() { _target-binutils; }
-package_powerpc64le-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
-package_powerpc-unknown-linux-gnu-binutils() { _target-binutils; }
-package_powerpcle-unknown-linux-gnu-binutils() { _target-binutils; }
-package_sh64-unknown-linux-gnu-binutils() { _target-binutils; }
-package_sh64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
-package_sh64l-unknown-linux-gnu-binutils() { _target-binutils; }
-package_sh64l-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
-package_sh4-unknown-linux-gnu-binutils() { _target-binutils; }
-package_sh4l-unknown-linux-gnu-binutils() { _target-binutils; }
-package_lm32-unknown-linux-gnu-binutils() { _target-binutils; }
-package_or32-unknown-linux-gnu-binutils() { _target-binutils; }
-
-# GNU
-package_x86_64-unknown-gnu-binutils() { _target-binutils; }
-package_x86_64-unknown-gnu-binutils-multilib() { _target-binutils; }
-package_i786-pc-gnu-binutils() { _target-binutils; }
-package_i686-pc-gnu-binutils() { _target-binutils; }
-package_i586-pc-gnu-binutils() { _target-binutils; }
-
-# ELF or EABI only
-package_mips64el-unknown-elf-binutils() { _target-binutils; }
-package_mips64el-unknown-elf-binutils-multilib() { _target-binutils; }
-package_mips64-unknown-elf-binutils() { _target-binutils; }
-package_mips64-unknown-elf-binutils-multilib() { _target-binutils; }
-package_mipsel-unknown-elf-binutils() { _target-binutils; }
-package_mips-unknown-elf-binutils() { _target-binutils; }
-package_x86_64-unknown-elf-binutils() { _target-binutils; }
-package_x86_64-unknown-elf-binutils-multilib() { _target-binutils; }
-package_i386-unknown-elf-binutils() { _target-binutils; }
-package_aarch64-unknown-elf-binutils() { _target-binutils; }
-package_aarch64-unknown-elf-binutils-multilib() { _target-binutils; }
-package_aarch64_be-unknown-elf-binutils() { _target-binutils; }
-package_aarch64_be-unknown-elf-binutils-multilib() { _target-binutils; }
-package_arm-unknown-eabi-binutils() { _target-binutils; }
-package_armeb-unknown-eabi-binutils() { _target-binutils; }
-package_powerpc64-unknown-elf-binutils() { _target-binutils; }
-package_powerpc64-unknown-elf-binutils-multilib() { _target-binutils; }
-package_powerpc64-unknown-eabi-binutils() { _target-binutils; }
-package_powerpc64-unknown-eabi-binutils-multilib() { _target-binutils; }
-package_powerpc64le-unknown-elf-binutils() { _target-binutils; }
-package_powerpc64le-unknown-elf-binutils-multilib() { _target-binutils; }
-package_powerpc64le-unknown-eabi-binutils() { _target-binutils; }
-package_powerpc64le-unknown-eabi-binutils-multilib() { _target-binutils; }
-package_powerpc-unknown-elf-binutils() { _target-binutils; }
-package_powerpc-unknown-eabi-binutils() { _target-binutils; }
-package_powerpcle-unknown-elf-binutils() { _target-binutils; }
-package_powerpcle-unknown-eabi-binutils() { _target-binutils; }
-package_spu-unknown-elf-binutils() { _target-binutils; }
-package_sh64-unknown-elf-binutils() { _target-binutils; }
-package_sh64-unknown-elf-binutils-multilib() { _target-binutils; }
-package_sh64l-unknown-elf-binutils() { _target-binutils; }
-package_sh64l-unknown-elf-binutils-multilib() { _target-binutils; }
-package_sh-unknown-elf-binutils() { _target-binutils; }
-package_shl-unknown-elf-binutils() { _target-binutils; }
-package_xtensa-unknown-elf-binutils() { _target-binutils; }
-package_xtensa-unknown-elf-binutils-ath9k_htc() { _target-binutils; }
-package_m68k-unknown-elf-binutils() { _target-binutils; }
-package_lm32-unknown-elf-binutils() { _target-binutils; }
-package_or32-unknown-elf-binutils() { _target-binutils; }
-
-#---------------------------------------------------------------------------------------------------------------------------------------------
-
-package_binutils-common() {
-  pkgrel=${_pkgrelb}
-  pkgdesc="A set of programs to assemble and manipulate binary and object files. (headers, docs and locales files only)"
-  arch=('any')
-  depends=('linktools')
-  install="${_pkgname}.install"
-
-  cd ${srcdir}/${_pkgname}-build
-  make prefix=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} tooldir=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} install
-
-  [[ $CARCH != ${_CARCH} ]] && {
-    msg "Move 'include' files and directories"
-    mv -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/{$CHOST/${_target}/include,}
-  }
-
-  msg "Add some useful headers"
-  install -vm644 ${srcdir}/${_pkgname}-${pkgver}/include/{demangle,libiberty}.h ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/include
-
-  msg "Remove unnecessaries files and directories"
-  rm -vr ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/{bin,lib}
-  [[ $CARCH != ${_CARCH} ]] && {
-    rm -vr ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/$CHOST
-  }
-
-  msg "Rename manuals"
-  _man=$(ls -1A ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/share/man/man1)
-  for _man_stage1 in ${_man[@]}; do
-    _man_stage2=${_man_stage1/${_multilib_name}${_ath9k_htc_name}-${pkgver}/}
-    _manuals=${_man_stage2/${_target}-/}
-    mv -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/share/man/man1/{${_man_stage1},${_manuals}}
-  done
-}
diff --git a/~coadde/cross-binutils/aarch64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/aarch64-unknown-elf-binutils-multilib.install
deleted file mode 100644
index e2cb3892c..000000000
--- a/~coadde/cross-binutils/aarch64-unknown-elf-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=aarch64-unknown-elf-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/aarch64-unknown-elf-binutils.install b/~coadde/cross-binutils/aarch64-unknown-elf-binutils.install
deleted file mode 100644
index 7546e29a1..000000000
--- a/~coadde/cross-binutils/aarch64-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=aarch64-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils-multilib.install
deleted file mode 100644
index 6f986cd41..000000000
--- a/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=aarch64-unknown-linux-gnu-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils.install
deleted file mode 100644
index 96d20da4a..000000000
--- a/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=aarch64-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils-multilib.install
deleted file mode 100644
index ae71b8f32..000000000
--- a/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=aarch64_be-unknown-elf-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils.install b/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils.install
deleted file mode 100644
index 886d38ddc..000000000
--- a/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=aarch64_be-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils-multilib.install
deleted file mode 100644
index 21e87d4a6..000000000
--- a/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=aarch64_be-unknown-linux-gnu-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils.install
deleted file mode 100644
index 7c040a1d1..000000000
--- a/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=aarch64_be-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/arm-unknown-eabi-binutils.install b/~coadde/cross-binutils/arm-unknown-eabi-binutils.install
deleted file mode 100644
index 2a5ac8d12..000000000
--- a/~coadde/cross-binutils/arm-unknown-eabi-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=arm-unknown-eabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/arm5tel-unknown-linux-gnueabi.install b/~coadde/cross-binutils/arm5tel-unknown-linux-gnueabi.install
deleted file mode 100644
index f1053cd1e..000000000
--- a/~coadde/cross-binutils/arm5tel-unknown-linux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=arm5tel-unknown-linux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/arm6l-unknown-linux-gnueabi.install b/~coadde/cross-binutils/arm6l-unknown-linux-gnueabi.install
deleted file mode 100644
index fa11d3f92..000000000
--- a/~coadde/cross-binutils/arm6l-unknown-linux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=arm6l-unknown-linux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/arm7l-unknown-linux-gnueabi.install b/~coadde/cross-binutils/arm7l-unknown-linux-gnueabi.install
deleted file mode 100644
index 4e9ca080f..000000000
--- a/~coadde/cross-binutils/arm7l-unknown-linux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=arm7l-unknown-linux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/armeb-unknown-eabi-binutils.install b/~coadde/cross-binutils/armeb-unknown-eabi-binutils.install
deleted file mode 100644
index 363e4b477..000000000
--- a/~coadde/cross-binutils/armeb-unknown-eabi-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=armeb-unknown-eabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/armeb-unknown-linux-gnueabi.install b/~coadde/cross-binutils/armeb-unknown-linux-gnueabi.install
deleted file mode 100644
index 75fa9f797..000000000
--- a/~coadde/cross-binutils/armeb-unknown-linux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=armeb-unknown-linux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/binutils.install b/~coadde/cross-binutils/binutils.install
deleted file mode 100644
index 9de0533ee..000000000
--- a/~coadde/cross-binutils/binutils.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-filelist=(as.info bfd.info binutils.info gprof.info ld.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
diff --git a/~coadde/cross-binutils/i386-unknown-elf-binutils.install b/~coadde/cross-binutils/i386-unknown-elf-binutils.install
deleted file mode 100644
index 572ecca6e..000000000
--- a/~coadde/cross-binutils/i386-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=i386-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/i586-pc-gnu-binutils.install b/~coadde/cross-binutils/i586-pc-gnu-binutils.install
deleted file mode 100644
index 6e4dac15d..000000000
--- a/~coadde/cross-binutils/i586-pc-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=i586-pc-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/i586-pc-linux-gnu-binutils.install b/~coadde/cross-binutils/i586-pc-linux-gnu-binutils.install
deleted file mode 100644
index f14abdfaa..000000000
--- a/~coadde/cross-binutils/i586-pc-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=i586-pc-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/i686-pc-gnu-binutils.install b/~coadde/cross-binutils/i686-pc-gnu-binutils.install
deleted file mode 100644
index 1fbfac209..000000000
--- a/~coadde/cross-binutils/i686-pc-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=i686-pc-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/i686-pc-linux-gnu-binutils.install b/~coadde/cross-binutils/i686-pc-linux-gnu-binutils.install
deleted file mode 100644
index a0498ff51..000000000
--- a/~coadde/cross-binutils/i686-pc-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=i686-pc-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/i786-pc-gnu-binutils.install b/~coadde/cross-binutils/i786-pc-gnu-binutils.install
deleted file mode 100644
index f77927c8d..000000000
--- a/~coadde/cross-binutils/i786-pc-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=i786-pc-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/i786-pc-linux-gnu-binutils.install b/~coadde/cross-binutils/i786-pc-linux-gnu-binutils.install
deleted file mode 100644
index b6422d2ce..000000000
--- a/~coadde/cross-binutils/i786-pc-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=i786-pc-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils-multilib.install
deleted file mode 100644
index a31a76a41..000000000
--- a/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=ia64-unknown-linux-gnu-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils.install
deleted file mode 100644
index 9853a7dce..000000000
--- a/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=ia64-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/lm32-unknown-elf-binutils.install b/~coadde/cross-binutils/lm32-unknown-elf-binutils.install
deleted file mode 100644
index c2481ba1f..000000000
--- a/~coadde/cross-binutils/lm32-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=lm32-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/lm32-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/lm32-unknown-linux-gnu-binutils.install
deleted file mode 100644
index e59746dd4..000000000
--- a/~coadde/cross-binutils/lm32-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=lm32-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/m68k-unknown-elf-binutils.install b/~coadde/cross-binutils/m68k-unknown-elf-binutils.install
deleted file mode 100644
index b45dcea38..000000000
--- a/~coadde/cross-binutils/m68k-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=m68k-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/mips-unknown-elf-binutils.install b/~coadde/cross-binutils/mips-unknown-elf-binutils.install
deleted file mode 100644
index f8dd9a4ad..000000000
--- a/~coadde/cross-binutils/mips-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=mips-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/mips64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/mips64-unknown-elf-binutils-multilib.install
deleted file mode 100644
index e24e260f6..000000000
--- a/~coadde/cross-binutils/mips64-unknown-elf-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=mips64-unknown-elf-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/mips64-unknown-elf-binutils.install b/~coadde/cross-binutils/mips64-unknown-elf-binutils.install
deleted file mode 100644
index 8e5e0a192..000000000
--- a/~coadde/cross-binutils/mips64-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=mips64-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils-multilib.install
deleted file mode 100644
index 7ae20c93c..000000000
--- a/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=mips64-unknown-linux-gnu-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils.install
deleted file mode 100644
index 3da7b37e3..000000000
--- a/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=mips64-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/mips64el-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/mips64el-unknown-elf-binutils-multilib.install
deleted file mode 100644
index 201c805dd..000000000
--- a/~coadde/cross-binutils/mips64el-unknown-elf-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=mips64el-unknown-elf-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/mips64el-unknown-elf-binutils.install b/~coadde/cross-binutils/mips64el-unknown-elf-binutils.install
deleted file mode 100644
index ab338a443..000000000
--- a/~coadde/cross-binutils/mips64el-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=mips64el-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils-multilib.install
deleted file mode 100644
index cff96a72a..000000000
--- a/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=mips64el-unknown-linux-gnu-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils.install
deleted file mode 100644
index 21b4a2af2..000000000
--- a/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=mips64el-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/mipsel-unknown-elf-binutils.install b/~coadde/cross-binutils/mipsel-unknown-elf-binutils.install
deleted file mode 100644
index 87c99efcf..000000000
--- a/~coadde/cross-binutils/mipsel-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=mipsel-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/or32-unknown-elf-binutils.install b/~coadde/cross-binutils/or32-unknown-elf-binutils.install
deleted file mode 100644
index 92833bd5d..000000000
--- a/~coadde/cross-binutils/or32-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=or32-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/or32-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/or32-unknown-linux-gnu-binutils.install
deleted file mode 100644
index 8427c5c91..000000000
--- a/~coadde/cross-binutils/or32-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=or32-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpc-unknown-eabi-binutils.install
deleted file mode 100644
index eed9a2c98..000000000
--- a/~coadde/cross-binutils/powerpc-unknown-eabi-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc-unknown-eabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpc-unknown-elf-binutils.install
deleted file mode 100644
index fbd5f0556..000000000
--- a/~coadde/cross-binutils/powerpc-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/powerpc-unknown-linux-gnu-binutils.install
deleted file mode 100644
index b7e544e48..000000000
--- a/~coadde/cross-binutils/powerpc-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc-unknown-linux-gnueabi-binutils.install b/~coadde/cross-binutils/powerpc-unknown-linux-gnueabi-binutils.install
deleted file mode 100644
index 5667c84e2..000000000
--- a/~coadde/cross-binutils/powerpc-unknown-linux-gnueabi-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc-unknown-linux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils-multilib.install b/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils-multilib.install
deleted file mode 100644
index 0c1b1d7b8..000000000
--- a/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc64-unknown-eabi-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils.install
deleted file mode 100644
index 2e3ca0474..000000000
--- a/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc64-unknown-eabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/powerpc64-unknown-elf-binutils-multilib.install
deleted file mode 100644
index 4000bde4f..000000000
--- a/~coadde/cross-binutils/powerpc64-unknown-elf-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc64-unknown-elf-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc64-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpc64-unknown-elf-binutils.install
deleted file mode 100644
index f9d4ff394..000000000
--- a/~coadde/cross-binutils/powerpc64-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc64-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/powerpc64-unknown-linux-gnu-binutils.install
deleted file mode 100644
index 15a8c37c5..000000000
--- a/~coadde/cross-binutils/powerpc64-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc64-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc64-unknown-linux-gnueabi-binutils.install b/~coadde/cross-binutils/powerpc64-unknown-linux-gnueabi-binutils.install
deleted file mode 100644
index 28e4914c6..000000000
--- a/~coadde/cross-binutils/powerpc64-unknown-linux-gnueabi-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc64-unknown-linux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils-multilib.install b/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils-multilib.install
deleted file mode 100644
index 0b6f6c848..000000000
--- a/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc64le-unknown-eabi-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils.install
deleted file mode 100644
index 3798f1bfe..000000000
--- a/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc64le-unknown-eabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils-multilib.install
deleted file mode 100644
index 1e30719bf..000000000
--- a/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc64le-unknown-elf-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils.install
deleted file mode 100644
index 891b7f85b..000000000
--- a/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc64le-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/powerpc64le-unknown-linux-gnu-binutils.install
deleted file mode 100644
index f8872d8e1..000000000
--- a/~coadde/cross-binutils/powerpc64le-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc64le-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-linux-gnueabi-binutils.install b/~coadde/cross-binutils/powerpc64le-unknown-linux-gnueabi-binutils.install
deleted file mode 100644
index ae20ca33c..000000000
--- a/~coadde/cross-binutils/powerpc64le-unknown-linux-gnueabi-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc64le-unknown-linux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpcle-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-eabi-binutils.install
deleted file mode 100644
index 850610fc6..000000000
--- a/~coadde/cross-binutils/powerpcle-unknown-eabi-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpcle-unknown-eabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpcle-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-elf-binutils.install
deleted file mode 100644
index 24e07a7ec..000000000
--- a/~coadde/cross-binutils/powerpcle-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpcle-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpcle-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-linux-gnu-binutils.install
deleted file mode 100644
index b681acc4b..000000000
--- a/~coadde/cross-binutils/powerpcle-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpcle-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpcle-unknown-linux-gnueabi-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-linux-gnueabi-binutils.install
deleted file mode 100644
index 6559cdd29..000000000
--- a/~coadde/cross-binutils/powerpcle-unknown-linux-gnueabi-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpcle-unknown-linux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/s390-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/s390-unknown-linux-gnu-binutils.install
deleted file mode 100644
index 0a583f543..000000000
--- a/~coadde/cross-binutils/s390-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=s390-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/s390x-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/s390x-unknown-linux-gnu-binutils.install
deleted file mode 100644
index dc576d75e..000000000
--- a/~coadde/cross-binutils/s390x-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=s390x-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/sh-unknown-elf-binutils.install b/~coadde/cross-binutils/sh-unknown-elf-binutils.install
deleted file mode 100644
index 20d123559..000000000
--- a/~coadde/cross-binutils/sh-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=sh-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/sh4-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh4-unknown-linux-gnu-binutils.install
deleted file mode 100644
index 5843ac274..000000000
--- a/~coadde/cross-binutils/sh4-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=sh4-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/sh4l-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh4l-unknown-linux-gnu-binutils.install
deleted file mode 100644
index f97168df0..000000000
--- a/~coadde/cross-binutils/sh4l-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=sh4l-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/sh64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/sh64-unknown-elf-binutils-multilib.install
deleted file mode 100644
index 1f11dabbb..000000000
--- a/~coadde/cross-binutils/sh64-unknown-elf-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=sh64-unknown-elf-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/sh64-unknown-elf-binutils.install b/~coadde/cross-binutils/sh64-unknown-elf-binutils.install
deleted file mode 100644
index 04ee63c8c..000000000
--- a/~coadde/cross-binutils/sh64-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=sh64-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils-multilib.install
deleted file mode 100644
index 451eedb44..000000000
--- a/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=sh64-unknown-linux-gnu-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils.install
deleted file mode 100644
index 2af6a7268..000000000
--- a/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=sh64-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/sh64l-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/sh64l-unknown-elf-binutils-multilib.install
deleted file mode 100644
index 6e01ac61e..000000000
--- a/~coadde/cross-binutils/sh64l-unknown-elf-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=sh64l-unknown-elf-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/sh64l-unknown-elf-binutils.install b/~coadde/cross-binutils/sh64l-unknown-elf-binutils.install
deleted file mode 100644
index ab95b36ec..000000000
--- a/~coadde/cross-binutils/sh64l-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=sh64l-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils-multilib.install
deleted file mode 100644
index 71c191e1c..000000000
--- a/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=sh64l-unknown-linux-gnu-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils.install
deleted file mode 100644
index cbe5c788a..000000000
--- a/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=sh64l-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/shl-unknown-elf-binutils.install b/~coadde/cross-binutils/shl-unknown-elf-binutils.install
deleted file mode 100644
index cdb30916b..000000000
--- a/~coadde/cross-binutils/shl-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=shl-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/sparc-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sparc-unknown-linux-gnu-binutils.install
deleted file mode 100644
index f3dfca2d3..000000000
--- a/~coadde/cross-binutils/sparc-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=sparc-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils-multilib.install
deleted file mode 100644
index d0aff2a85..000000000
--- a/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=sparc64-unknown-linux-gnu-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils.install
deleted file mode 100644
index 2d24404e5..000000000
--- a/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=sparc64-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/spu-unknown-elf-binutils.install b/~coadde/cross-binutils/spu-unknown-elf-binutils.install
deleted file mode 100644
index 204d4bfb2..000000000
--- a/~coadde/cross-binutils/spu-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=spu-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/x86_64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/x86_64-unknown-elf-binutils-multilib.install
deleted file mode 100644
index dcf66e30a..000000000
--- a/~coadde/cross-binutils/x86_64-unknown-elf-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=x86_64-unknown-elf-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/x86_64-unknown-elf-binutils.install b/~coadde/cross-binutils/x86_64-unknown-elf-binutils.install
deleted file mode 100644
index 779e65ab3..000000000
--- a/~coadde/cross-binutils/x86_64-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=x86_64-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/x86_64-unknown-gnu-binutils-multilib.install b/~coadde/cross-binutils/x86_64-unknown-gnu-binutils-multilib.install
deleted file mode 100644
index 7c682ba82..000000000
--- a/~coadde/cross-binutils/x86_64-unknown-gnu-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=x86_64-unknown-gnu-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/x86_64-unknown-gnu-binutils.install b/~coadde/cross-binutils/x86_64-unknown-gnu-binutils.install
deleted file mode 100644
index 102a11fd0..000000000
--- a/~coadde/cross-binutils/x86_64-unknown-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=x86_64-unknown-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils-multilib.install
deleted file mode 100644
index 96140638c..000000000
--- a/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=x86_64-unknown-linux-gnu-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils.install
deleted file mode 100644
index 299a9675f..000000000
--- a/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=x86_64-unknown-linux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/xtensa-unknown-elf-binutils-ath9k-htc.install b/~coadde/cross-binutils/xtensa-unknown-elf-binutils-ath9k-htc.install
deleted file mode 100644
index 643379261..000000000
--- a/~coadde/cross-binutils/xtensa-unknown-elf-binutils-ath9k-htc.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=xtensa-unknown-elf-binutils-ath9k-htc
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/xtensa-unknown-elf-binutils.install b/~coadde/cross-binutils/xtensa-unknown-elf-binutils.install
deleted file mode 100644
index 120b40b1b..000000000
--- a/~coadde/cross-binutils/xtensa-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=xtensa-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/mariadb/PKGBUILD b/~coadde/mariadb/PKGBUILD
deleted file mode 100644
index 256b6e9ae..000000000
--- a/~coadde/mariadb/PKGBUILD
+++ /dev/null
@@ -1,141 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-falsename=mysql
-_falsename=MySQL
-pkgbase=mariadb
-_pkgbase=MariaDB
-pkgname=("lib${pkgbase}client" "${pkgbase}-clients" "${pkgbase}")
-pkgver=5.5.23
-pkgrel=1.5
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.${pkgbase}.org/"
-makedepends=('cmake' 'openssl' 'zlib')
-options=('!libtool')
-source=("http://mirror.aarnet.edu.au/pub/${_pkgbase}/${pkgbase}-${pkgver}/kvm-tarbake-jaunty-x86/${pkgbase}-${pkgver}.tar.gz"
-        "${falsename}d"
-        'my.cnf')
-md5sums=('7074fa091b3c1489f45a5ddf12cd5e6f'
-         '2234207625baa29b2ff7d7b4f088abce'
-         '1c949c0dbea5206af0db14942d9927b6')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-
-  # CFLAGS/CXXFLAGS as suggested upstream
-  CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
-  CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
-
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSYSCONFDIR=/etc/${falsename} \
-    -DMYSQL_DATADIR=/var/lib/${falsename} \
-    -DMYSQL_UNIX_ADDR=/var/run/${falsename}/${falsename}.sock \
-    -DDEFAULT_CHARSET=utf8 \
-    -DDEFAULT_COLLATION=utf8_unicode_ci \
-    -DENABLED_LOCAL_INFILE=ON \
-    -DINSTALL_INFODIR=share/${falsename}/docs \
-    -DINSTALL_MANDIR=share/man \
-    -DINSTALL_PLUGINDIR=/usr/lib/${falsename}/plugin \
-    -DINSTALL_SCRIPTDIR=bin \
-    -DINSTALL_INCLUDEDIR=include/${falsename} \
-    -DINSTALL_DOCREADMEDIR=share/${falsename} \
-    -DINSTALL_SUPPORTFILESDIR=share/${falsename} \
-    -DINSTALL_MYSQLSHAREDIR=share/${falsename} \
-    -DINSTALL_DOCDIR=share/${falsename}/docs \
-    -DINSTALL_SHAREDIR=share/${falsename} \
-    -DWITH_READLINE=ON \
-    -DWITH_ZLIB=system \
-    -DWITH_SSL=system \
-    -DWITH_LIBWRAP=OFF \
-    -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
-    -DWITH_EXTRA_CHARSETS=complex \
-    -DWITH_EMBEDDED_SERVER=ON \
-    -DWITH_INNOBASE_STORAGE_ENGINE=1 \
-    -DWITH_PARTITION_STORAGE_ENGINE=1 \
-    -DWITH_PBXT_STORAGE_ENGINE=1 \
-    -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
-    -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-
-  make
-}
-
-package_libmariadbclient(){
-  pkgdesc="${_pkgbase} client libraries (branch of ${_falsename})"
-  depends=('openssl')
-  conflicts=("lib${falsename}client")
-  provides=("lib${falsename}client=${pkgver}")
-  
-  cd "${srcdir}"/build
-  for dir in include lib${falsename} lib${falsename}d libservices; do
-    make -C ${dir} DESTDIR="${pkgdir}" install
-  done
-
-  install -d "${pkgdir}"/usr/bin
-  install -m755 scripts/${falsename}_config "${pkgdir}"/usr/bin/
-  install -d "${pkgdir}"/usr/share/man/man1
-  for man in ${falsename}_config ${falsename}_client_test_embedded ${falsename}test_embedded; do
-    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
-  done
-}
-
-package_mariadb-clients(){
-  pkgdesc="${_pkgbase} client tools (branch of ${_falsename})"
-  depends=("lib${pkgbase}client")
-  conflicts=("${falsename}-clients")
-  provides=("${falsename}-clients=${pkgver}")
-
-  cd "${srcdir}"/build
-  make -C client DESTDIR="${pkgdir}" install
-
-  # install man pages
-  install -d "${pkgdir}"/usr/share/man/man1
-  for man in ${falsename} ${falsename}admin ${falsename}check ${falsename}dump ${falsename}import ${falsename}show ${falsename}slap; do
-    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
-  done
-
-  # provided by mariadb
-  rm "${pkgdir}"/usr/bin/{${falsename}_{plugin,upgrade},${falsename}binlog,${falsename}test}
-}
-
-package_mariadb(){
-  pkgdesc="A fast SQL database server branch of ${_falsename} - ${_pkgbase}"
-  backup=("etc/${pkgbase}/my.cnf")
-  install=${falsename}.install
-  depends=("${pkgbase}-clients")
-  optdepends=('perl-dbi' "perl-dbd-${falsename}")
-  conflicts=("${falsename}")
-  provides=("${falsename}=${pkgver}")
-  options=('emptydirs')
-
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/${falsename}/my.cnf
-  install -Dm755 "${srcdir}"/${falsename}d "${pkgdir}"/etc/rc.d/${falsename}d
-
-  # provided by libmariadbclient
-  rm "${pkgdir}"/usr/bin/{${falsename}_config,${falsename}_client_test_embedded,${falsename}test_embedded}
-  rm "${pkgdir}"/usr/lib/lib${falsename}*
-  rm -r "${pkgdir}"/usr/include/
-  rm "${pkgdir}"/usr/share/man/man1/{${falsename}_config,${falsename}_client_test_embedded,${falsename}test_embedded}.1
-  
-  # provided by mariadb-clients
-  rm "${pkgdir}"/usr/bin/{${falsename},${falsename}admin,${falsename}check,${falsename}dump,${falsename}import,${falsename}show,${falsename}slap}
-  rm "${pkgdir}"/usr/share/man/man1/{${falsename},${falsename}admin,${falsename}check,${falsename}dump,${falsename}import,${falsename}show,${falsename}slap}.1
-
-  # not needed
-  rm -r "${pkgdir}"/usr/{data,${falsename}-test,sql-bench}
-  rm "${pkgdir}"/usr/share/man/man1/${falsename}-test-run.pl.1
-
-  install -dm700 "${pkgdir}"/var/lib/${falsename}
-}
diff --git a/~coadde/mariadb/mariadb.install b/~coadde/mariadb/mariadb.install
deleted file mode 100644
index f56a0dcaa..000000000
--- a/~coadde/mariadb/mariadb.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install(){
-  groupadd -g 89 mysql &>/dev/null
-  useradd -u 89 -g mysql -d /var/lib/mariadb -s /bin/false mysql &>/dev/null
-  /usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mariadb
-  chown -R mysql:mysql /var/lib/mariadb &>/dev/null
-}
-
-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 /var/lib/mariadb -s /bin/false mysql &>/dev/null
-
-  if [ "$(vercmp $2 5.5)" -lt 0 ]; then
-    echo " >> "
-    echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it."
-    echo " >> "
-  fi
-}
-
-post_remove(){
-  if getent passwd mysql >/dev/null 2>&1; then
-    userdel mysql 
-  fi
-  if getent group mysql >/dev/null 2>&1; then
-    groupdel mysql 
-  fi
-}
diff --git a/~coadde/mariadb/mariadbd b/~coadde/mariadb/mariadbd
deleted file mode 100755
index 3ae612096..000000000
--- a/~coadde/mariadb/mariadbd
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-getPID() {
-   echo $(pgrep -u mysql mysqld 2>/dev/null);
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting MariaDB Server"
-    [ ! -d /var/run/mariadb ] && install -d -g mysql -o mysql /var/run/mariadb &>/dev/null
-    if [ -z "$(getPID)" ]; then
-       /usr/bin/mysqld_safe --user=mysql &>/dev/null &
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        timeo=30
-        while [ $timeo -gt 0 ]; do
-          response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
-          echo "$response" | grep -q "mysqld is alive" && break
-          sleep 1
-          let timeo=${timeo}-1
-        done
-        if [ $timeo -eq 0 ]; then
-          stat_fail
-          exit 1
-        else
-          echo $(getPID) > /var/run/mariadb/mariadb.pid
-          add_daemon mysqld
-          stat_done
-        fi
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping MariaDB Server"
-    if [ ! -z "$(getPID)" ]; then
-      timeo=30
-      kill $(getPID) &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      fi
-      while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do
-        sleep 1
-        let timeo=${timeo}-1
-      done
-      if [ -z "$(getPID)" ]; then
-        rm -f /var/run/mariadb/mariadb.pid &>/dev/null
-        rm_daemon mysqld
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/~coadde/mariadb/my.cnf b/~coadde/mariadb/my.cnf
deleted file mode 100644
index 9a41b4fc3..000000000
--- a/~coadde/mariadb/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		= /var/run/mysqld/mysqld.sock
-
-# Here follows entries for some specific programs
-
-# The MySQL server
-[mysqld]
-port		= 3306
-socket		= /var/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/~coadde/mariadb/mysql.install b/~coadde/mariadb/mysql.install
deleted file mode 100644
index 9a4479215..000000000
--- a/~coadde/mariadb/mysql.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install(){
-  groupadd -g 89 mysql &>/dev/null
-  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-  usr/bin/mysql_install_db --user=mysql --basedir=/usr
-  chown -R mysql:mysql var/lib/mysql &>/dev/null
-}
-
-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 /var/lib/mysql -s /bin/false mysql &>/dev/null
-
-  if [ "$(vercmp $2 5.5)" -lt 0 ]; then
-    echo " >> "
-    echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it."
-    echo " >> "
-  fi
-}
-
-post_remove(){
-  if getent passwd mysql >/dev/null 2>&1; then
-    userdel mysql
-  fi
-  if getent group mysql >/dev/null 2>&1; then
-    groupdel mysql
-  fi
-}
diff --git a/~coadde/mariadb/mysqld b/~coadde/mariadb/mysqld
deleted file mode 100644
index 1ac88a7cc..000000000
--- a/~coadde/mariadb/mysqld
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-getPID() {
-   echo $(pgrep -u mysql mysqld 2>/dev/null);
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting MySQL Server"
-    [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null
-    if [ -z "$(getPID)" ]; then
-       /usr/bin/mysqld_safe --user=mysql &>/dev/null &
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        timeo=30
-        while [ $timeo -gt 0 ]; do
-          response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
-          echo "$response" | grep -q "mysqld is alive" && break
-          sleep 1
-          let timeo=${timeo}-1
-        done
-        if [ $timeo -eq 0 ]; then
-          stat_fail
-          exit 1
-        else
-          echo $(getPID) > /var/run/mysqld/mysqld.pid
-          add_daemon mysqld
-          stat_done
-        fi
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping MySQL Server"
-    if [ ! -z "$(getPID)" ]; then
-      timeo=30
-      kill $(getPID) &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      fi
-      while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do
-        sleep 1
-        let timeo=${timeo}-1
-      done
-      if [ -z "$(getPID)" ]; then
-        rm -f /var/run/mysqld/mysqld.pid &>/dev/null
-        rm_daemon mysqld
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/~drtan/parabola-artwork/PKGBUILD b/~drtan/parabola-artwork/PKGBUILD
deleted file mode 100644
index bbb6337aa..000000000
--- a/~drtan/parabola-artwork/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Maintainer: Drtan Samos <lashdu@drtan.twilightparadox.com>
-
-pkgname=parabola-artwork
-pkgver=1.0
-pkgrel=2
-pkgdesc="The artwork for Parabola GNU/Linux-libre."
-arch=('any')
-url="https://parabolagnulinux.org"
-license=('CCPL:cc-by-sa-3.0')
-source=("http://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}-${pkgrel}.tar.gz")
-sha256sums=('9a20cd3e725adc89dc9165452919316c69331d10e2f6a278a810075c9f006e31')
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-${pkgrel}"
-  install -d "${pkgdir}/usr/share/parabola/artwork"
-  install -m644 *.bmp "${pkgdir}/usr/share/parabola/artwork/"
-  install -m644 *.png "${pkgdir}/usr/share/parabola/artwork/"
-}
diff --git a/~drtan/parabola-gnome/PKGBUILD b/~drtan/parabola-gnome/PKGBUILD
deleted file mode 100644
index c0f9d3e97..000000000
--- a/~drtan/parabola-gnome/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Drtan Samos <lashdu@drtan.twilightparadox.com>
-
-pkgname=parabola-gnome
-pkgver=1.0
-pkgrel=4
-pkgdesc="The GNOME configuration for Parabola GNU/Linux-libre"
-arch=('any')
-url="https://parabolagnulinux.org"
-license=('GPL3')
-install=$pkgname.install
-depends=('dbus-glib' 'parabola-artwork>=1.0-2')
-source=('parabola.xml')
-sha256sums=('7d9e3d67663f5b8f1ce9edf47bd74e3ea70d3a33c37318d08f5939a75b9efb23')
-
-package() {
-  install -d "${pkgdir}/usr/share/gnome-background-properties"
-  install -m644 parabola.xml "${pkgdir}/usr/share/gnome-background-properties/"
-}
-
diff --git a/~drtan/parabola-gnome/parabola-gnome.install b/~drtan/parabola-gnome/parabola-gnome.install
deleted file mode 100644
index 8d87c609a..000000000
--- a/~drtan/parabola-gnome/parabola-gnome.install
+++ /dev/null
@@ -1,29 +0,0 @@
-post_install() {
-  # Change default wallpaper
-  dbus-launch gsettings set org.gnome.desktop.background picture-uri file:///usr/share/parabola/artwork/stripes.png
-  dbus-launch gsettings set org.gnome.desktop.background picture-options zoom
-  
-  # Change default lock screen wallpaper.
-  dbus-launch gsettings set org.gnome.desktop.screensaver picture-uri file:///usr/share/parabola/artwork/stripes-desaturated.png
-  dbus-launch gsettings set org.gnome.desktop.screensaver picture-options zoom
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  # Reset default wallpaper to default for GNOME (if the user didn't choose some other).
-  if [ $(dbus-launch gsettings get org.gnome.desktop.background picture-uri) == "file:///usr/share/parabola/artwork/stripes.png" ]
-  then
-    dbus-launch gsettings reset org.gnome.desktop.background picture-uri
-    dbus-launch gsettings reset org.gnome.desktop.background picture-options
-  fi
-
-  # Reset default lock screen wallpaper to default for GNOME (if the user didn't choose some other).
-  if [ $(dbus-launch gsettings get org.gnome.desktop.screensaver picture-uri) == "file:///usr/share/parabola/artwork/stripes.png" ]
-  then
-    dbus-launch gsettings reset org.gnome.desktop.screensaver picture-uri
-    dbus-launch gsettings reset org.gnome.desktop.screensaver picture-options
-  fi
-}
diff --git a/~drtan/parabola-gnome/parabola.xml b/~drtan/parabola-gnome/parabola.xml
deleted file mode 100644
index ca0b5f9ff..000000000
--- a/~drtan/parabola-gnome/parabola.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-<wallpapers>
-  <wallpaper deleted="false">
-    <name>Stripes</name>
-    <filename>/usr/share/parabola/wallpapers/stripes.png</filename>
-    <options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#ffffff</scolor>
-    <shade_type>solid</shade_type>
-  </wallpaper>
-  <wallpaper deleted="false">
-    <name>Stripes Desaturated</name>
-    <filename>/usr/share/parabola/wallpapers/stripes-desaturated.png</filename>
-    <options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#ffffff</scolor>
-    <shade_type>solid</shade_type>
-  </wallpaper>
-</wallpapers>
diff --git a/~emulatorman/hunspell-gl/PKGBUILD b/~emulatorman/hunspell-gl/PKGBUILD
deleted file mode 100644
index e3de55b8d..000000000
--- a/~emulatorman/hunspell-gl/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>, 2009-2010.
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgname=hunspell-gl
-pkgver=2.9b
-pkgrel=1
-pkgdesc="Galician spellchecker for Hunspell"
-arch=('any')
-url="http://trasno.net/"
-license=('GPL3')
-depends=('hunspell')
-source=("http://webs.uvigo.es/miguelsolla/gl_ES.zip")
-md5sums=('209fd16dd47e5cb334fa39563d23c79f')
-
-lang="gl"
-lang2="gl_ES"
-
-build() {
-
-  # Creation of necesary folders...
-  mkdir -p $pkgdir/usr/share/myspell
-  mkdir -p $pkgdir/usr/share/enchant
-    
-  # Fix so Enchant can use dictionaries for Hunspell too.  
-  ln -s /usr/share/myspell $pkgdir/usr/share/enchant/hunspell
-  
-  # Actual installation...
-  install -D -m644 "$srcdir/$lang2.aff"	"$pkgdir/usr/share/myspell/$lang.aff" || return 1
-  install -D -m644 "$srcdir/$lang2.dic"	"$pkgdir/usr/share/myspell/$lang.dic" || return 1
-}
diff --git a/~emulatorman/iceape-l10n/PKGBUILD b/~emulatorman/iceape-l10n/PKGBUILD
deleted file mode 100644
index 227467123..000000000
--- a/~emulatorman/iceape-l10n/PKGBUILD
+++ /dev/null
@@ -1,100 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: fauno <fauno@kiwwwi.com.ar>
-# Contributor: Figue <ffigue@gmail.com>
-# Maintainer: Márcio Silva <coadde@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:
-# - Edit variables in in Makefile.
-# - (optionally) edit PKGBUILD.in
-# - Run 'make'. It will take care of everything else for you.
-
-_debname=iceape
-_debver=2.7.12
-_debrel=1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_langpacks=(be ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN)
-
-pkgbase=iceape-l10n
-pkgname=($(for lang in ${_langpacks[@]}
-        do echo $pkgbase-$lang | tr A-Z a-z
-        done))
-pkgver=${_debver}.${_debrel}
-pkgrel=1
-
-pkgdesc="Language packs for Debian Iceape."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://packages.debian.org/source/sid/iceape"
-license=('MPL')
-depends=("iceape-libre>=$pkgver")
-makedepends=('unzip' 'zip')
-source=('region.properties')
-for lang in ${_langpacks[@]}
-do
-    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
-done
-
-_path="/usr/lib/iceape/extensions"
-
-build() {
-  cd "${srcdir}"
-  for f in *.deb
-  do
-      bsdtar xf $f
-      bsdtar xf data.tar.gz
-  done
-
-  cd $srcdir/$_path
-
-  for i in ${_langpacks[@]}
-  do
-    cd $srcdir/$_path
-    unzip -q langpack-$i@iceape.mozilla.org.xpi -d $i
-    rm langpack-$i@iceape.mozilla.org.xpi
-    install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region
-    cd $i
-    zip -q -r $srcdir/$_path/langpack-$i@iceape.mozilla.org.xpi .
-  done
-
-  cd $srcdir
-}
-
-for lang in ${_langpacks[@]}
-do
-    eval "
-package_iceape-l10n-$(echo $lang | tr A-Z a-z)() {
-  replaces=(iceape-i18n-$(echo $lang | tr A-Z a-z))
-  conflicts=(iceape-i18n-$(echo $lang | tr A-Z a-z))
-  provides=(iceape-i18n-$(echo $lang | tr A-Z a-z))
-  install -Dm644 \"\$srcdir$_path/langpack-$lang@iceape.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceape.mozilla.org.xpi\"
-}
-"
-done
-
-md5sums=('428246ef3fb64103ff2cf5eaae2a92ca'
-         '22a14a6a2f03d0004a1fa990892094ef'
-         'af2379ea50672fe37ff8550d5c9e20a0'
-         'e5975c3b1ffaa5fcb3f5203cdfe8e0fb'
-         '21fcbd011acc382f5ec7a32aa04562ef'
-         '8fbf821c811c55514a100ae5d5e9e844'
-         'bd8f18e0d0f233e0a1c1a518537798a5'
-         '037cbb6fe0576f7f5bbbf956928f01e1'
-         '56964b577fcb077a9b81d07c59cc5af3'
-         'd2fb622717114a921efb37f028f31c6c'
-         '6abe2dbab7fcbdaf43e77290ca6853c9'
-         '558a2d29be749f6506f774703c58952f'
-         '7abdc6eb4154b88509a6c4f119c943a7'
-         '5a4fad9c23c8d19833ac5c76ad9aca4a'
-         '8d45110acc90f388923f01fb9cfca947'
-         'd1acbe2ef1120e70d5365476aa8679f9'
-         '604de00ea6ee06565212804b0d499df3'
-         'ceee78a29bd2f947558f04489ee50f54'
-         'afc6e343f0635a3ee5b7a22af947e8b8'
-         '455bab7a596cb43ac4ad80cb89a78b25'
-         '92a985b40aec8b3726ba22f45667994d'
-         'bc8c98f0518617ed2220fb3bfb03e165'
-         '449c91720751538f09ad3d555dbe2fce'
-         '8843be8937963d094d4272ac33019082')
diff --git a/~emulatorman/iceape-l10n/region.properties b/~emulatorman/iceape-l10n/region.properties
deleted file mode 100644
index 4399d8db7..000000000
--- a/~emulatorman/iceape-l10n/region.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Default search engine
-browser.search.defaultenginename=DuckDuckGo HTML
-
-# Search engine order (order displayed in the search bar dropdown)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://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
-# 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
-
-# The default set of protocol handlers for irc:
-gecko.handlerService.schemes.irc.0.name=Freenode
-gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
-
-# The default set of protocol handlers for ircs:
-gecko.handlerService.schemes.ircs.0.name=Freenode
-gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
diff --git a/~emulatorman/iceape-libre/PKGBUILD b/~emulatorman/iceape-libre/PKGBUILD
deleted file mode 100644
index db650ddff..000000000
--- a/~emulatorman/iceape-libre/PKGBUILD
+++ /dev/null
@@ -1,117 +0,0 @@
-# Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@parabola.nu>
-
-# We're getting this from Debian Sid
-_debname=iceape
-_debver=2.7.12
-_debrel=1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_pkgname=${_debname}
-pkgname=${_debname}-libre
-pkgver=${_debver}.${_debrel}
-pkgrel=1
-pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey."
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2' 'MPL' 'LGPL')
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-ply' 'librsvg' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
-replaces=('mozilla' 'seamonkey')
-conflicts=('seamonkey')
-provides=('seamonkey')
-install=$_pkgname.install
-url="http://packages.debian.org/source/sid/${_pkgname}"
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
-        mozconfig
-        ${_pkgname}.desktop
-        ${_pkgname}-2.0-lang.patch
-        clrf.patch
-        libre.patch)
-md5sums=('1ee82aa6ec73c13e2099b4cb6f16a908'
-         '1fb9c4affad5f030c4e3544aadeaeea2'
-         '60ba9e8f2fafd20e41268af534a55ea7'
-         '7266333e31731af8bb50c2eca8d0bd26'
-         '25b6fe16ac24cd5c852213e5c1adb272'
-         'c395d443a8c4c16880c7322bcf174743'
-         '3e0a275b57e5ccfeb7573e716693441a')
-
-build() {
-  export QUILT_PATCHES=debian/patches
-  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
-  export QUILT_DIFF_ARGS='--no-timestamps'
-  export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}"
-  export PYTHON="/usr/bin/python2"
-  export DEBIAN_BUILD="comm-release"
-  export DEBIAN_BRANDING_DIR="debian/branding" 
-  export ICEAPE_ICONS_BRANDING="suite/branding/nightly"
-  mv comm-esr10 "${DEBIAN_BUILD}"
-  mv debian "${srcdir}/${DEBIAN_BUILD}"
-  cd "${srcdir}/${DEBIAN_BUILD}"
-  quilt push -av
-
-  patch -Np1 -i "$srcdir/$_pkgname-2.0-lang.patch"
-  patch -Np1 -i "$srcdir/clrf.patch"
-  patch -Np1 -i "$srcdir/libre.patch"
-
-  # set up a simple non-animated throbber from the icon
-  install -m644 debian/extras/Throbber-small.gif suite/themes/classic/communicator/brand/throbber-anim.png
-  install -m644 debian/extras/Throbber-small.png suite/themes/classic/communicator/brand/throbber-single.png
-  install -m644 debian/extras/Throbber-small.gif suite/themes/classic/communicator/brand/throbber16-anim.png
-  install -m644 debian/extras/Throbber-small.png suite/themes/classic/communicator/brand/throbber16-single.png
-  install -m644 debian/extras/Throbber-small.gif suite/themes/modern/communicator/brand/throbber-anim.png
-  install -m644 debian/extras/Throbber-small.png suite/themes/modern/communicator/brand/throbber-single.png
-  install -m644 debian/extras/Throbber-small.gif suite/themes/modern/communicator/brand/throbber16-anim.png
-  install -m644 debian/extras/Throbber-small.png suite/themes/modern/communicator/brand/throbber16-single.png
-
-  install -m644 debian/extras/preview.png suite/themes/classic/preview.png
-
-  # Converting svg file to png and replacing seamonkey by iceape icons
-  rsvg-convert -w 300 -h 280 -o ${ICEAPE_ICONS_BRANDING}/content/about.png ${DEBIAN_BRANDING_DIR}/iceape_logo_plain.svg
-  rsvg-convert -w 64 -h 64 -o ${ICEAPE_ICONS_BRANDING}/content/icon64.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 128 -h 128 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/iceape.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 32 -h 32 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/default.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 32 -h 32 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/main-window.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 16 -h 16 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/default16.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 16 -h 16 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/main-window16.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 48 -h 48 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/default48.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 48 -h 48 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/main-window48.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  
-  # Creating app-icons Folder for iceape*.png icons
-
-  install -m755 -d "${DEBIAN_BRANDING_DIR}/app-icons"
-
-  # Icons for /usr/share/icons/hicolor
-  rsvg-convert -w 16 -h 16 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape16.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 32 -h 32 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape32.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 48 -h 48 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape48.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 64 -h 64 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape64.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-  rsvg-convert -w 128 -h 128 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape128.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
-
-  cp "${srcdir}/mozconfig" .mozconfig
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
-}
-
-package() {
-  cd "${srcdir}/${DEBIAN_BUILD}"
-
-  make -j1 -f client.mk DESTDIR="${pkgdir}" install
-
-  rm -rf "$pkgdir"/usr/lib/$_pkgname/{dictionaries,hyphenation,searchplugins}
-  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/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins"
-
-  install -m755 -d "$pkgdir/usr/share/applications"
-  install -m755 -d "$pkgdir/usr/share/pixmaps"
-  install -m644 ${ICEAPE_ICONS_BRANDING}/icons/gtk/iceape.png \
-                "$pkgdir/usr/share/pixmaps/"
-
-  for i in 16x16 32x32 48x48 64x64 128x128; do
-      install -Dm644 "${DEBIAN_BRANDING_DIR}/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png"
-  done
-  install -Dm644 "${DEBIAN_BRANDING_DIR}/${_pkgname}_icon_plain.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
-
-  install -m644 "$srcdir/$_pkgname.desktop" "$pkgdir/usr/share/applications/"
-}
diff --git a/~emulatorman/iceape-libre/clrf.patch b/~emulatorman/iceape-libre/clrf.patch
deleted file mode 100644
index 375708ac4..000000000
--- a/~emulatorman/iceape-libre/clrf.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-diff -Nur comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
---- comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp	2012-03-12 23:37:12.000000000 -0300
-+++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp	2012-05-07 12:33:58.517612453 -0300
-@@ -688,7 +688,7 @@
-     PL_strcat(encoding, "{");
-     lengthStr.AppendInt((PRInt32) strlen(value));
-     PL_strcat(encoding, lengthStr.get());
--    PL_strcat(encoding, "}"CRLF);
-+    PL_strcat(encoding, "}" CRLF);
-     PL_strcat(encoding, value);
-     return NS_OK;
-   }
-diff -Nur comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
---- comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp	2012-05-07 12:41:08.003264793 -0300
-@@ -753,7 +753,7 @@
-           }
-         }
-       }
--#define EXTRA_KEYWORD_HDR "                                                                                 "MSG_LINEBREAK
-+#define EXTRA_KEYWORD_HDR "                                                                                 " MSG_LINEBREAK
- 
-        // if status offset isn't in the first block, this code won't work. There's no good reason
-       // for the status offset not to be at the beginning of the message anyway.
-@@ -1203,7 +1203,7 @@
-         // check if there's an envelope header; if not, write one.
-         if (strncmp(m_dataBuffer, "From ", 5))
-         {
--          m_fileStream->Write("From "CRLF, 7, &bytesWritten);
-+          m_fileStream->Write("From " CRLF, 7, &bytesWritten);
-           m_offlineMsgSize += bytesWritten;
-         }
-       }
-diff -Nur comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
---- comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp	2012-05-07 12:44:43.127347489 -0300
-@@ -1722,7 +1722,7 @@
- {
-   m_sendDone = PR_TRUE;
-   nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
--  SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server.
-+  SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server.
-   m_nextState = SMTP_RESPONSE;
-   m_nextStateAfterResponse = SMTP_DONE;
-   return(0);
-@@ -1969,7 +1969,7 @@
-     {
-       nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
-       // send a quit command to close the connection with the server.
--      if (SendData(url, "QUIT"CRLF) == NS_OK)
-+      if (SendData(url, "QUIT" CRLF) == NS_OK)
-       {
-         m_nextState = SMTP_RESPONSE;
-         m_nextStateAfterResponse = SMTP_ERROR_DONE;
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp comm-release/mailnews/imap/src/nsImapMailFolder.cpp
---- comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp	2012-05-07 12:48:29.417179064 -0300
-@@ -8298,7 +8298,7 @@
-           bool needMoreData = false;
-           char * newLine = nsnull;
-           PRUint32 numBytesInLine = 0;
--          const char *envelope = "From "CRLF;
-+          const char *envelope = "From " CRLF;
-           offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
-           fileSize += bytesWritten;
-           do
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp comm-release/mailnews/imap/src/nsImapProtocol.cpp
---- comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/imap/src/nsImapProtocol.cpp	2012-05-07 15:45:58.551202719 -0300
-@@ -1410,7 +1410,7 @@
- {
-   // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
-   nsCAutoString commandBuffer(GetServerCommandTag());
--  commandBuffer.Append(" IDLE"CRLF);
-+  commandBuffer.Append(" IDLE" CRLF);
- 
-   do
-   {
-@@ -3290,7 +3290,7 @@
-     commandString.Append(messageIds);
-     commandString.Append(" (");
-     commandString.Append(attribute);
--    commandString.Append(")"CRLF);
-+    commandString.Append(")" CRLF);
-     nsresult rv = SendData(commandString.get());
- 
-     if (NS_SUCCEEDED(rv))
-@@ -5283,7 +5283,7 @@
- 
-   IncrementCommandTagNumber();
-   nsCAutoString command(GetServerCommandTag());
--  command.Append(" expunge"CRLF);
-+  command.Append(" expunge" CRLF);
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -5359,7 +5359,7 @@
-   command.Append(gAppName);
-   command.Append("\" \"version\" \"");
-   command.Append(gAppVersion);
--  command.Append("\")"CRLF);
-+  command.Append("\")" CRLF);
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -5816,7 +5816,7 @@
-     nsCAutoString correctedPassword;
-     EscapeUserNamePasswordString(password.get(), &correctedPassword);
-     command.Append(correctedPassword);
--    command.Append("\""CRLF);
-+    command.Append("\"" CRLF);
-     rv = SendData(command.get(), PR_TRUE /* suppress logging */);
-     NS_ENSURE_SUCCESS(rv, rv);
-     ParseIMAPandCheckForNewMail();
-@@ -7446,7 +7446,7 @@
-   nsCString command(GetServerCommandTag());
-   command += " create \"";
-   command += escapedName;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   nsresult rv = SendData(command.get());
-   if(NS_SUCCEEDED(rv))
-@@ -7549,7 +7549,7 @@
-   nsCString command (GetServerCommandTag());
-   command += " lsub \"\" \"";
-   command += escapedPattern;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   PR_Free(boxnameWithOnlineDirectory);
- 
-@@ -7578,7 +7578,7 @@
-   command += useXLIST ?
-     " xlist \"\" \"" : " list \"\" \"";
-   command += escapedPattern;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   PR_Free(boxnameWithOnlineDirectory);
- 
-@@ -7599,7 +7599,7 @@
-   nsCString command (GetServerCommandTag());
-   command += " subscribe \"";
-   command += escapedName;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -7617,7 +7617,7 @@
-   nsCString command (GetServerCommandTag());
-   command += " unsubscribe \"";
-   command += escapedName;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -7631,7 +7631,7 @@
-   if (m_urlInProgress)
-     return;
-   nsCAutoString command (GetServerCommandTag());
--  command += " IDLE"CRLF;
-+  command += " IDLE" CRLF;
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-   {
-@@ -7658,7 +7658,7 @@
-   nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream);
-   if (asyncInputStream)
-     asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
--  nsresult rv = SendData("DONE"CRLF);
-+  nsresult rv = SendData("DONE" CRLF);
-   // set a short timeout if we don't want to wait for a response
-   if (m_transport && !waitForResponse)
-     m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5);
-@@ -7727,8 +7727,8 @@
-   PRUint32 msgsHandled = 0;
-   const char *formatString;
-   formatString = (idsAreUid)
--      ? "%s uid store %s %s"CRLF
--      : "%s store %s %s"CRLF;
-+      ? "%s uid store %s %s" CRLF
-+      : "%s store %s %s" CRLF;
- 
-   do
-   {
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
---- comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp	2012-05-07 12:57:22.050615120 -0300
-@@ -185,7 +185,7 @@
-   
-   NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' && 
-     *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string");
--  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
-+  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
-   if (sendingIdleDone)
-     fWaitingForMoreClientInput = PR_FALSE;
- 
-diff -Nur comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp comm-release/mailnews/local/src/nsPop3Protocol.cpp
---- comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/local/src/nsPop3Protocol.cpp	2012-05-07 12:59:45.857182813 -0300
-@@ -2483,7 +2483,7 @@
-         return(MK_OUT_OF_MEMORY);
-     m_pop3ConData->next_state_after_response = POP3_GET_LIST;
-     m_listpos = 0;
--    return SendData(m_url, "LIST"CRLF);
-+    return SendData(m_url, "LIST" CRLF);
- }
- 
- 
-diff -Nur comm-release.orig/mailnews/mime/src/mimedrft.cpp comm-release/mailnews/mime/src/mimedrft.cpp
---- comm-release.orig/mailnews/mime/src/mimedrft.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/mime/src/mimedrft.cpp	2012-05-07 13:01:42.912022177 -0300
-@@ -1473,7 +1473,7 @@
-                 *newbody = 0;
-                 PL_strcatn(newbody, newbodylen, "<PRE>");
-                 PL_strcatn(newbody, newbodylen, body);
--                PL_strcatn(newbody, newbodylen, "</PRE>"CRLF);
-+                PL_strcatn(newbody, newbodylen, "</PRE>" CRLF);
-                 PR_Free(body);
-                 body = newbody;
-               }
-diff -Nur comm-release.orig/mailnews/mime/src/mimemult.cpp comm-release/mailnews/mime/src/mimemult.cpp
---- comm-release.orig/mailnews/mime/src/mimemult.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/mime/src/mimemult.cpp	2012-05-07 13:04:41.511265477 -0300
-@@ -280,7 +280,7 @@
-             MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
-             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\""));
-             MimeWriteAString(obj, fileName);
--            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
-+            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
-             MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: "));
-             MimeWriteAString(obj, obj->options->state->detachedFilePath);
-             MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
-@@ -293,10 +293,10 @@
-             status = MimeWriteAString(obj, header);
-             if (status < 0) 
-               return status;
--            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding: 8bit"MSG_LINEBREAK));
-+            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "Content-Transfer-Encoding: 8bit" MSG_LINEBREAK));
-             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: inline; filename=\"Deleted: "));
-             MimeWriteAString(obj, fileName);
--            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\""));
-+            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "X-Mozilla-Altered: AttachmentDeleted; date=\""));
-           }
-           nsCString result;
-           char timeBuffer[128];
-@@ -306,8 +306,8 @@
-                                  "%a %b %d %H:%M:%S %Y",
-                                  &now);
-           MimeWriteAString(obj, nsDependentCString(timeBuffer));
--          MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
--          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK));
-+          MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
-+          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK));
-           MimeHeaders_write_raw_headers(mult->hdrs, obj->options, PR_FALSE);
-         }
-         PRInt32 old_nchildren = container->nchildren;
diff --git a/~emulatorman/iceape-libre/gcc47.patch b/~emulatorman/iceape-libre/gcc47.patch
deleted file mode 100644
index 115d65131..000000000
--- a/~emulatorman/iceape-libre/gcc47.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc comm-release/mozilla/ipc/chromium/src/base/file_util.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:38:11.474783536 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:43:29.218995578 +0000
-@@ -8,7 +8,7 @@
- #include <io.h>
- #endif
- #include <stdio.h>
--#if defined(ANDROID)
-+#if defined(ANDROID) || defined(OS_POSIX)
- #include <unistd.h>
- #endif
- 
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-03 18:38:11.381450924 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-03 18:43:29.218995578 +0000
-@@ -5,6 +5,9 @@
- #include "base/file_util.h"
- 
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
- 
- #include <string>
- #include <vector>
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-03 18:38:11.438117153 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-03 18:43:29.218995578 +0000
-@@ -6,6 +6,9 @@
- 
- #include <errno.h>
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
- 
- #include "eintr_wrapper.h"
- #include "base/logging.h"
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc comm-release/mozilla/ipc/chromium/src/base/time_posix.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-03 18:38:11.418117308 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-03 18:43:29.218995578 +0000
-@@ -14,6 +14,8 @@
- #include <time.h>
- #endif
- 
-+#include <unistd.h>
-+
- #include <limits>
- 
- #include "base/basictypes.h"
-diff -Nur comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in comm-release/mozilla/toolkit/crashreporter/client/Makefile.in
---- comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:38:56.101105510 +0000
-+++ comm-release/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:43:29.218995578 +0000
-@@ -69,6 +69,9 @@
- $(STDCXX_COMPAT) \
- $(NULL)
- 
-+# Needed for moz_free
-+LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
-+
- ifeq ($(OS_ARCH),WINNT)
- CPPSRCS += crashreporter_win.cpp
- LIBS += \
diff --git a/~emulatorman/iceape-libre/iceape-2.0-lang.patch b/~emulatorman/iceape-libre/iceape-2.0-lang.patch
deleted file mode 100644
index b9f4a5cde..000000000
--- a/~emulatorman/iceape-libre/iceape-2.0-lang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-10-11 02:12:44.000000000 +0200
-+++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-09-16 02:56:45.000000000 +0200
-@@ -890,7 +890,7 @@
- pref("intl.charset.detector",               "chrome://global/locale/intl.properties");
- pref("intl.charset.default",                "chrome://global-platform/locale/intl.properties");
- pref("intl.ellipsis",                       "chrome://global-platform/locale/intl.properties");
--pref("intl.locale.matchOS",                 false);
-+pref("intl.locale.matchOS",                 true);
- // fallback charset list for Unicode conversion (converting from Unicode)
- // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
- // for ISO-8859-1
diff --git a/~emulatorman/iceape-libre/iceape.desktop b/~emulatorman/iceape-libre/iceape.desktop
deleted file mode 100644
index 0868e5058..000000000
--- a/~emulatorman/iceape-libre/iceape.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=iceape %u
-Icon=iceape
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=Iceape Internet Suite
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;message/rfc822;x-scheme-handler/mailto;
-StartupNotify=false
-Categories=Application;Network;
diff --git a/~emulatorman/iceape-libre/iceape.install b/~emulatorman/iceape-libre/iceape.install
deleted file mode 100644
index 709ad81f2..000000000
--- a/~emulatorman/iceape-libre/iceape.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/~emulatorman/iceape-libre/libre.patch b/~emulatorman/iceape-libre/libre.patch
deleted file mode 100644
index e316dbf4c..000000000
--- a/~emulatorman/iceape-libre/libre.patch
+++ /dev/null
@@ -1,285 +0,0 @@
---- comm-release.orig/mozilla/browser/locales/en-US/chrome/browser-region/region.properties	2012-02-16 12:08:39.000000000 -0200
-+++ comm-release/mozilla/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-29 22:19:37.998383034 -0200
-@@ -1,23 +1,16 @@
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo HTML
- 
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
--browser.search.order.2=Yahoo
--browser.search.order.3=Bing
--
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
--browser.contentHandlers.types.0.title=Google
--browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
--browser.contentHandlers.types.1.title=My Yahoo!
--browser.contentHandlers.types.1.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=http://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 
-@@ -26,20 +19,10 @@
- # don't make any spelling errors here.
- gecko.handlerService.defaultHandlersVersion=3
- 
--# 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=http://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
-+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
- 
- # 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
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
---- comm-release.orig/mozilla/modules/libpref/src/init/all.js	2012-03-16 04:46:09.000000000 -0300
-+++ comm-release/mozilla/modules/libpref/src/init/all.js	2012-05-12 04:03:52.163831535 -0300
-@@ -47,7 +47,7 @@
- // SYNTAX HINTS:  dashes are delimiters.  Use underscores instead.
- //  The first character after a period must be alphabetic.
- 
--pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "https://duckduckgo.com/html/?q=");
- pref("keyword.enabled", false);
- pref("general.useragent.locale", "chrome://global/locale/intl.properties");
- pref("general.useragent.compatMode.firefox", false);
---- comm-release.orig/mozilla/toolkit/content/plugins.html	2012-02-16 12:09:35.000000000 -0200
-+++ comm-release/mozilla/toolkit/content/plugins.html	2012-05-12 03:56:16.599192244 -0300
-@@ -98,18 +98,6 @@
-   else
-     document.writeln("<h1 id=\"noplugs\">" + pluginsbundle.GetStringFromName("nopluginsareenabled_label") + "<\/h1>");
- 
--  document.writeln("<div id=\"findmore\">" + pluginsbundle.GetStringFromName("findmore_label") + " ");
--  document.writeln("<a href=\"" + regionbundle.GetStringFromName("more_plugins_url") + "\">" + regionbundle.GetStringFromName("more_plugins_label") + "<\/a>.");
--  document.writeln("<\/div>");
--
--  document.writeln("<div id=\"findpluginupdates\">" + pluginsbundle.GetStringFromName("findpluginupdates_label") + " ");
--  document.writeln("<a href=\"" + regionbundle.GetStringFromName("pluginupdates_url") + "\">" + regionbundle.GetStringFromName("pluginupdates_label") + "<\/a>.");
--  document.writeln("<\/div>");
--
--  document.writeln("<div id=\"installhelp\">" + pluginsbundle.GetStringFromName("installhelp_label") + " ");
--  document.writeln("<a href=\"" + regionbundle.GetStringFromName("plugindoc_url") + "\">" + regionbundle.GetStringFromName("plugindoc_label") + "<\/a>.");
--  document.writeln("<\/div><hr>");
--
-   for (var i = 0; i < numPlugins; i++)
-   {
-     var plugin = navigator.plugins[i];
---- comm-release.orig/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.js	2012-02-16 12:09:38.000000000 -0200
-+++ comm-release/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.js	2012-05-12 03:59:11.639451163 -0300
-@@ -107,6 +107,7 @@
-     this.mPluginInfoArrayLength++;
-   } else {
-     this.mPluginNotFoundArray[aPluginRequestItem.mimetype] = aPluginRequestItem;
-+    this.mPluginNotFoundArray[aPluginRequestItem.mimetype].pluginsPage = null;
-     this.mPluginNotFoundArrayLength++;
-   }
- 
---- comm-release.orig/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.xul	2012-02-16 12:09:38.000000000 -0200
-+++ comm-release/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.xul	2012-05-12 04:01:29.208462907 -0300
-@@ -138,10 +138,6 @@
- 
-     <description id="pluginSummaryRestartNeeded" style="padding-top:10px;"
-                  value="&pluginWizard.finalPage.restart.label;"/>
--    <spacer flex="1" />
--    <description id="moreInfoLink"
--      style="color:rgb(0, 0, 255); cursor:pointer; text-decoration:underline;"
--      value="&pluginWizard.finalPage.moreInfo.label;"/>
-   </wizardpage>
- 
- </wizard>
---- comm-release.orig/suite/locales/en-US/chrome/browser/region.properties	2012-11-29 21:25:41.879931999 -0200
-+++ comm-release/suite/locales/en-US/chrome/browser/region.properties	2012-11-29 22:25:15.125790092 -0200
-@@ -4,18 +4,11 @@
- #
- browser.startup.homepage=about:
- browser.throbber.url=about:
--browser.search.defaulturl=http://www.google.com/search?q=
-+browser.search.defaulturl=https://duckduckgo.com/html/?q=
- 
--browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
--browser.translation.serviceDomain=translate.google.com
-+browser.translation.service=about:
-+browser.translation.serviceDomain=
- 
- #config.js
- #
- startup.homepage_override_url=about:
--
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
--browser.contentHandlers.types.0.title=Google
--browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
--browser.contentHandlers.types.1.title=My Yahoo!
--browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
---- comm-release.orig/suite/locales/en-US/chrome/common/region.properties	2012-02-16 11:59:54.000000000 -0200
-+++ comm-release/suite/locales/en-US/chrome/common/region.properties	2012-11-29 22:26:25.271781371 -0200
-@@ -1,10 +1,10 @@
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo HTML
- 
- # Search engine order (order displayed in the search bar dropdown)
--browser.search.order.1=Google
--browser.search.order.2=Yahoo
-+browser.search.order.1=DuckDuckGo HTML
-+browser.search.order.2=DuckDuckGo Lite
- 
- # More information about this update link available in the update wizard.
- # Only change this if you are providing localized release notes.
--app.update.url.details=http://www.seamonkey-project.org/releases/
-+app.update.url.details=about:
---- comm-release.orig/suite/locales/en-US/chrome/mailnews/region.properties	2012-02-16 11:59:54.000000000 -0200
-+++ comm-release/suite/locales/en-US/chrome/mailnews/region.properties	2012-05-12 04:28:05.202481512 -0300
-@@ -2,9 +2,9 @@
- # messenger.properties
- # mailnews.js
- mailnews.start_page.url=chrome://messenger/content/start.xhtml
--messenger.throbber.url=http://www.seamonkey-project.org/
--compose.throbber.url=http://www.seamonkey-project.org/
--addressbook.throbber.url=http://www.seamonkey-project.org/
-+messenger.throbber.url=about:
-+compose.throbber.url=about:
-+addressbook.throbber.url=about:
- # To make mapit buttons to disappear in the addressbook, specify empty string.  For example:
- # mail.addr_book.mapit_url.format=
- # The format for "mail.addr_book.mapit_url.format" is:
---- comm-release.orig/suite/locales/en-US/profile/bookmarks.extra	2012-02-16 11:59:54.000000000 -0200
-+++ comm-release/suite/locales/en-US/profile/bookmarks.extra	2012-05-12 04:34:50.172992393 -0300
-@@ -9,9 +9,7 @@
- 
-     <DT><H3>Search the Web</H3>
-     <DL><p>
--        <DT><A HREF="http://www.google.com/">Google</A>
--        <DT><A HREF="http://groups.google.com/">Google Groups</A>
--        <DT><A HREF="http://news.google.com/">Google News</A>
-+        <DT><A HREF="https://duckduckgo.com/html/">Duck Duck Go (HTML)</A>
-     </DL><p>
- 
- #unfilter emptyLines
---- comm-release.orig/suite/browser/browser-prefs.js	2012-10-17 11:29:38.687716662 -0200
-+++ comm-release/suite/browser/browser-prefs.js	2012-10-17 11:39:01.778002338 -0200
-@@ -110,7 +110,7 @@
- pref("browser.doorhanger.enabled", true);
- 
- // search engines URL
--pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search-engines/");
-+pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
- 
- // pointer to the default engine name
- pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties");
-@@ -587,10 +587,10 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);  // also toggles personalized recommendations
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/discovery/pane/%VERSION%/%OS%");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
- 
- // getMoreThemes is used by our UI under our switch theme menu
- pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties");
-@@ -715,7 +715,7 @@
- #endif
- 
- // plugin finder service url
--pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%");
-+pref("pfs.datasource.url", "http://www.gnu.org/software/gnuzilla/addons.html");
- pref("plugins.update.url", "http://www.mozilla.com/%LOCALE%/plugincheck/");
- pref("plugins.update.notifyUser", false);
- pref("plugins.hide_infobar_for_outdated_plugin", false);
---- comm-release.orig/suite/locales/en-US/chrome/branding/brand.dtd	2012-05-12 05:14:55.000000000 -0300
-+++ comm-release/suite/locales/en-US/chrome/branding/brand.dtd	2012-05-12 05:32:18.992033502 -0300
-@@ -1,4 +1,4 @@
- <!ENTITY  brandFullName         "Iceape">
- <!ENTITY  brandShortName        "Iceape">
--<!ENTITY  vendorShortName       "Debian">
-+<!ENTITY  vendorShortName       "Parabola">
- <!ENTITY  sidebarName           "Sidebar">
---- comm-release.orig/suite/locales/en-US/chrome/branding/brand.properties	2012-05-12 05:14:55.000000000 -0300
-+++ comm-release/suite/locales/en-US/chrome/branding/brand.properties	2012-05-12 05:36:38.640803397 -0300
-@@ -1,9 +1,9 @@
- brandFullName=Iceape
- brandShortName=Iceape
--vendorShortName=Debian
-+vendorShortName=Parabola
- sidebarName=Sidebar
--extensions.getMoreThemesURL=https://addons.mozilla.org/%LOCALE%/%APP%/themes
-+extensions.getMoreThemesURL=http://www.gnu.org/software/gnuzilla/addons.html#themes
- extensions.getPersonasURL=https://addons.mozilla.org/%LOCALE%/%APP%/personas
- spellchecker.dictionaries.download.url=https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries
--app.releaseNotesURL=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
--app.vendorURL=http://www.seamonkey-project.org/
-+app.releaseNotesURL=about:
-+app.vendorURL=about:
---- comm-release.orig/suite/locales/generic/profile/bookmarks.html.in	2012-02-16 11:59:54.000000000 -0200
-+++ comm-release/suite/locales/generic/profile/bookmarks.html.in	2012-05-12 04:40:19.221095752 -0300
-@@ -11,37 +11,14 @@
- <DL><p>
-     <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">@personal_toolbarfolder@</H3>
-     <DL><p>
--        <DT><A HREF="http://www.seamonkey-project.org/">@seamonkey@</a>
--        @seamonkey_l10n@
--        <DT><A HREF="http://www.mozilla.org/">@mozilla_org@</A>
--        <DT><A HREF="http://www.mozillazine.org/">@mozillazine@</A>
--        <DT><A HREF="http://www.mozdev.org/">@mozdev@</A>
-+        <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre</a>
-+        <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A>
-+        <DT><A HREF="http://libreplanet.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC/v78AAAAAAPLy9ABsbakA/f3+APn5+QC6ur0A6urqAEpLbQACBLQApKW3AAULuQDMzMwAGBiDAL29vQCgocsAgnzJALu82QA+PpsAAQOvAOjo6ADZ2dkAysrKALS0zwD5+foAAgKRAAYGdQD19fUADhOjAAQJyACrnqIAxMTLAOnp7gDm5uYAzczNACgobwDg2dEAQkaeAA0RkAAUFnEA0MvQAIBzgAANDYsAk5OyAOTk5ADy8vYA1dXVAD8/cADGxsYA+fn7AAMHvgBzZnQApqauAAEGuQDExMQAAAGmAAoLmgADCMQAxMTdAAwPlwD+/v4ABg7MAF5ehADg4OAA0dHRAAAAoQAYEXAAwsLCALCxwQBnadkAAQGWAPz8/ACgoLgAbm6RANvb5wDr6+sA0dHSALe3uQADB8AAzc3NAGFhbAABAZcAOTtlALi4xwAAAJoA/Pz9AAQHnwADBJcACQl4AFVa3AChl6EAAgW2ABscdAABAq4A2NjYAAAAmwDAwMoAAQKmAAcMswDR0eQAAQSxANvX2wB4aXcAAQGpAAAAkwDW1tYAAgSpACIZZAAAAaEA+vr8AKuirAACBbcA8vLyALOztgADBZYAAACcAAACpwAEA6QAAQKnAPT09QD///8AvL3UADIpigDw8PAABwWOAK6dogBub4kAiozDANLS0gAFC8gAAgW4AP39/QAAAJ0A0NDQAMHBwQDp6ewACg2RAAIFqAAKCokA+/v7AAkOnwAAAaMA7OzsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4eHh4eHh4eHh4eHh4AXh4eHhlbikzZlooeHh4eAF4eHh4hX1JVFweInh4eHgBeHh4XmlAGXNGSB8VeHh4AXg8LhaGcV9zKg0wQF54eAF4K0NNOGthjXNCUwAMS3gBPC82iW+CCRN2Iz4wTwx4AW0GgCc5OU41VnSKTBoOiwEFTz8hHIF5RANdQVRfNIMBeBUhe0o9jB0Pcjdzc1E8AXgsB3AbUlkQRVtnhHNoeAF4i45wJCAlYjJbdYRfY3gBeDwmEn4XMToKZDd6WDx4AXh4VTsIfwt3FGpsfAR4eAF4eHgEEYhQAodXYDx4eHgBeHh4eHg8GC1HPHh4eHh4AQABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAA%3D">LibrePlanet</A>
-     </DL><p>
--    <DT><H3>@seamonkey_and_mozilla@</H3>
-+    <DT><H3>GNUzilla</H3>
-     <DL><p>
--        <DT><A HREF="http://www.seamonkey-project.org/">@seamonkey_long@</a>
--        @seamonkey_l10n_long@
--        <DT><H3>@mozilla_org@</H3>
--        <DL><p>
--            <DT><A HREF="http://www.mozilla.org/">@mozilla_org_long@</A>
--            <DT><A HREF="http://www.mozilla.org/projects/">@mozilla_projects@</A>
--            <DT><A HREF="http://www.mozilla.org/about/">@mozilla_about@</A>
--        </DL><p>
--        <DT><H3>@extend_seamonkey@</H3>
--        <DL><p>
--            <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/">@seamonkey_addons@</a>
--            <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/themes">@seamonkey_themes@</a>
--            <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/dictionaries">@seamonkey_dictionaries@</a>
--            <DT><A HREF="https://addons.mozilla.org/@AB_CD@/seamonkey/plugins">@seamonkey_plugins@</a>
--            <DT><A HREF="http://www.mozdev.org/">@mozdev@</A>
--            <DT><A HREF="http://www.mozdev.org/projects/applications/SeaMonkey.html">@mozdev_seamonkey@</A>
--        </DL><p>
--        <DT><H3>@community_support@</H3>
--        <DL><p>
--            <DT><A HREF="http://www.seamonkey-project.org/community">@seamonkey_community@</a>
--            <DT><A HREF="http://www.mozillazine.org/">@mozillazine@</A>
--            <DT><A HREF="http://forums.mozillazine.org/viewforum.php?f=40">@seamonkey_support@</A>
--        </DL><p>
-+        <DT><A HREF="http://www.gnu.org/software/gnuzilla/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">GNUzilla and IceCat</a>
-+        <DT><a href="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</a>
-     </DL><p>
- #include bookmarks.extra
-     <HR>
diff --git a/~emulatorman/iceape-libre/mozconfig b/~emulatorman/iceape-libre/mozconfig
deleted file mode 100644
index 5227d77a5..000000000
--- a/~emulatorman/iceape-libre/mozconfig
+++ /dev/null
@@ -1,61 +0,0 @@
-mk_add_options MOZ_CO_PROJECT=suite
-ac_add_options --enable-application=suite
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-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 --with-pthreads
-
-# Features
-ac_add_options --enable-startup-notification
-ac_add_options --disable-safe-browsing
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
-# Parabola
-export BUILD_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-
-# Debian
-ac_add_options --with-default-mozilla-five-home=/usr/lib/iceape
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=debian/branding
-ac_add_options --enable-pango
-ac_add_options --enable-svg
-ac_add_options --enable-mathml
-ac_add_options --disable-pedantic
-ac_add_options --disable-long-long-warning
-ac_add_options --disable-debug
-ac_add_options --enable-canvas
-ac_add_options --enable-extensions="default,-venkman,-inspector"
-ac_add_options --disable-elf-dynstr-gc
-ac_add_options --disable-strip
-ac_add_options --disable-install-strip
-ac_add_options --enable-crypto
-ac_add_options --disable-javaxpcom
diff --git a/~emulatorman/icecat-l10n/Makefile b/~emulatorman/icecat-l10n/Makefile
deleted file mode 100644
index d1aaf7bff..000000000
--- a/~emulatorman/icecat-l10n/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/make -f
-# Use this script to update the PKGBUILD's list of langpacks.
-# This script depends on:
-#  - coreutils
-#  - grep
-#  - pacman
-#  - sed
-#  - wget
-
-# Variables:
-_pkgver=10.0
-pkgver=10.0
-pkgrel=1
-
-# Guts: ##############################################################
-
-default: PHONY all
-all: PHONY PKGBUILD
-
-index.html: Makefile
-	rm -f $@
-	wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/
-langpacks.txt: index.html Makefile
-	egrep -o '[^>".]+\.xpi' $< | sort -u | sed 's/\.xpi//' > $@
-PKGBUILD: PKGBUILD.in langpacks.txt Makefile
-	sed \
-	  -e 's/@_PKGVER@/$(_pkgver)/' \
-	  -e 's/@PKGVER@/$(pkgver)/' \
-	  -e 's/@PKGREL@/$(pkgrel)/' \
-	  -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \
-	  -e '/md5sums/,$$d' \
-	  PKGBUILD.in > $@
-	makepkg -dg >> $@
-
-clean: PHONY
-	rm -f index.html langpacks.txt *.xpi
-
-.PHONY: PHONY FORCE
diff --git a/~emulatorman/icecat-l10n/PKGBUILD b/~emulatorman/icecat-l10n/PKGBUILD
deleted file mode 100644
index bb3d47c32..000000000
--- a/~emulatorman/icecat-l10n/PKGBUILD
+++ /dev/null
@@ -1,259 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: fauno <fauno@kiwwwi.com.ar>
-# Contributor: Figue <ffigue@gmail.com>
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Based on firefox-i18n package
-
-# When updating to a newer upstream release:
-# - Edit variables in in Makefile.
-# - (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
-)
-
-pkgbase=icecat-l10n
-pkgname=(
-  $(for lang in ${_langpacks[@]}
-  do echo icecat-l10n-$lang | tr A-Z a-z
-  done)
-)
-pkgver=17.0.1
-pkgrel=1
-pkgdesc='Language packs for GNUzilla IceCat.'
-arch=(
-  any
-)
-license=(
-  MPL
-)
-url=http://www.gnu.org/software/gnuzilla/
-depends=(
-  ${pkgbase%-l10n}=$pkgver
-)
-makedepends=(
-  unzip
-  zip
-)
-source=('region.properties')
-  for lang in ${_langpacks[@]}
-  do 
-      source+=(http://ftp.gnu.org/gnu/gnuzilla/lang/${pkgver::4}/$lang.xpi)
-  done
-
-noextract=(
-  $(for lang in ${_langpacks[@]}
-  do echo $lang.xpi
-  done)
-)
-
-
-_path=/usr/lib/${pkgbase%-l10n}/extensions/
-
-build() {
-  cd $srcdir
-
-  for i in ${_langpacks[@]}
-  do
-      cd $srcdir
-      unzip -q $i.xpi -d $i
-      install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region
-      cd $i
-      zip -q -r $srcdir/langpack-$i@firefox.mozilla.org.xpi .
-  done
-
-  cd $srcdir
-}
-
-for lang in ${_langpacks[@]}
-do
-    eval "
-package_icecat-l10n-$(echo $lang | tr A-Z a-z) () {
-  replaces=(icecat-i18n-$(echo $lang | tr A-Z a-z))
-  conflicts=(icecat-i18n-$(echo $lang | tr A-Z a-z))
-  provides=(icecat-i18n-$(echo $lang | tr A-Z a-z))
-  install -Dm644 \"\$srcdir/langpack-$lang@firefox.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@firefox.mozilla.org.xpi\"
-}
-"
-done
-
-sha512sums=(
-  20064992e694b3fed0f75bee9d54af3427c01ae0048e0ec220895e58127954ceb4db47ea85627e86d9ea6614ce3feaf30f652d87f7c2e896fc00774a757a640a
-  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
-)
diff --git a/~emulatorman/icecat-l10n/region.properties b/~emulatorman/icecat-l10n/region.properties
deleted file mode 100644
index 4399d8db7..000000000
--- a/~emulatorman/icecat-l10n/region.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Default search engine
-browser.search.defaultenginename=DuckDuckGo HTML
-
-# Search engine order (order displayed in the search bar dropdown)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://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
-# 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
-
-# The default set of protocol handlers for irc:
-gecko.handlerService.schemes.irc.0.name=Freenode
-gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
-
-# The default set of protocol handlers for ircs:
-gecko.handlerService.schemes.ircs.0.name=Freenode
-gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
diff --git a/~emulatorman/icecat/PKGBUILD b/~emulatorman/icecat/PKGBUILD
deleted file mode 100644
index 6e5bddfe6..000000000
--- a/~emulatorman/icecat/PKGBUILD
+++ /dev/null
@@ -1,165 +0,0 @@
-# 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@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:
-# Contributor: evr <evanroman at gmail>
-# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
-
-# If you are updating this package, don't forget to update the version number in
-# the value for 'browser.dictionaries.download.url' in 'libre.patch'
-
-_pgo=false
-pkgname=icecat
-pkgver=17.0.1
-pkgrel=4
-pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
-arch=(i686 x86_64 mips64el)
-license=(GPL2 MPL LGPL)
-depends=(
-  alsa-lib
-  dbus-glib
-  desktop-file-utils
-  gtk2
-  hicolor-icon-theme
-  hunspell
-  libevent
-  libnotify
-  libvpx
-  libxt
-  mime-types
-  mozilla-common
-  mozilla-searchplugins
-  'nss>=3.13.3'
-  sqlite3
-  startup-notification
-)
-makedepends=(
-  autoconf2.13
-  diffutils
-  imagemagick
-  libidl2
-  librsvg
-  libxslt
-  mesa
-  pkg-config
-  python2
-  unzip
-  wireless_tools
-  zip
-)
-optdepends=(
-  'wireless_tools: Location detection via available WiFi networks'
-)
-if $_pgo; then
-  makedepends+=(xorg-server-xvfb)
-  options=(!ccache)
-fi
-options=(!emptydirs)
-url=http://www.gnu.org/software/gnuzilla/
-install=$pkgname.install
-source=(
-  ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz
-  mozconfig
-  mozconfig.pgo
-  xulrunner-copy-stub.patch
-  libre.patch
-  $pkgname.desktop
-  $pkgname-safe.desktop
-  $pkgname-install-dir.patch
-  vendor.js
-  #cairo.patch
-)
-md5sums=(
-  c88a29aa92fc41a07e777a0e63ac5f7e
-  a22327391a1995703436ed42fe703d3f
-  ac29b01c189f20abae2f3eef1618ffc0
-  3009b176cc5f9b1e416b1bf7c45b064b
-  fcd2d895a0335c1b5fb652401e9da0d5
-  b41f82994fa056ffa5f8e6d99570e27a
-  b30ba2b5562558d510fdd09d626d0faa
-  64826fcf48816b13090042eefddbaa58
-  e7b54d4bd68b2af4cfdef074e3ed08a2
-  #c8552d030494443218d88792f4dbbd0f
-)
-
-build() {
-  mv $pkgname-$pkgver $srcdir/gnuzilla-build
-  cd $srcdir/gnuzilla-build
-
-  cp $srcdir/mozconfig .mozconfig # Load our build config, disable SafeSearch
-  if $_pgo; then
-    cat $srcdir/mozconfig.pgo >> .mozconfig
-  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
-
-  # Fix for use nspr, sqlite and nss external
-  sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
-    browser/installer/Makefile.in
-
-  # Fix PRE_RELEASE_SUFFIX
-  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
-    browser/base/Makefile.in
-
-  # This is a bug, we should fix it.
-  if [ $CARCH = mips64el ]; then
-      # Fix MIPS N32 support.
-      sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
-          js/src/assembler/wtf/Platform.h
-      # Disable JIT.
-      sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
-          js/src/assembler/wtf/Platform.h
-      sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in
-      echo 'ac_add_options --disable-methodjit' >> .mozconfig
-      echo 'ac_add_options --disable-tracejit' >> .mozconfig
-      echo 'ac_add_options --disable-jemalloc' >> .mozconfig
-  fi
-
-  chmod +x build/unix/run-icecat.sh # fix bug for bad file permition
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
-  export PYTHON=/usr/bin/python2
-
-  if $_pgo; then
-    LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
-    LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS=$MAKEFLAGS
-    kill $! || true
-  else
-    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS
-  fi
-}
-
-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"
-
-  brandingdir=browser/branding/unofficial
-  icondir=$pkgdir/usr/share/icons/hicolor
-  for i in 16x16 32x32 48x48; do
-    install -Dm644 $brandingdir/default${i/x*/}.png $icondir/$i/apps/$pkgname.png
-  done
-
-  for d in $pkgname $pkgname-safe; do
-    install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop
-  done
-
-  rm -rf $pkgdir/usr/lib/$pkgname/{dictionaries,hyphenation,searchplugins,plugins}
-  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
-
-  # We don't want the development stuff
-  rm -rf $pkgdir/usr/{include,lib/$pkgname-devel,share/idl}
-
-  # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $pkgname $pkgdir/usr/lib/$pkgname/$pkgname-bin
-}
diff --git a/~emulatorman/icecat/cairo.patch b/~emulatorman/icecat/cairo.patch
deleted file mode 100644
index a1fabee90..000000000
--- a/~emulatorman/icecat/cairo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/gfx/thebes/gfxPlatform.cpp
-+++ b/gfx/thebes/gfxPlatform.cpp
-@@ -459,11 +459,9 @@ void SourceBufferDestroy(void *srcBuffer)
-   static_cast<SourceSurface*>(srcBuffer)->Release();
- }
- 
--void SourceSnapshotDetached(cairo_surface_t *nullSurf)
-+void SourceSnapshotDetached(void *nullSurf)
- {
--  gfxImageSurface* origSurf =
--    static_cast<gfxImageSurface*>(cairo_surface_get_user_data(nullSurf, &kSourceSurface));
--
-+  gfxImageSurface *origSurf = static_cast<gfxImageSurface*>(nullSurf);
-   origSurf->SetData(&kSourceSurface, NULL, NULL);
- }
- 
-@@ -535,14 +533,8 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa
-                                                      imgSurface->Stride(),
-                                                      format);
- 
--    cairo_surface_t *nullSurf =
--	cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
--    cairo_surface_set_user_data(nullSurf,
--				&kSourceSurface,
--				imgSurface,
--				NULL);
--    cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
--    cairo_surface_destroy(nullSurf);
-+    cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
-+		(const unsigned char *) "data", 4, SourceSnapshotDetached, imgSurface.get());
-   }
- 
-   srcBuffer->AddRef();
diff --git a/~emulatorman/icecat/gcc47.patch b/~emulatorman/icecat/gcc47.patch
deleted file mode 100644
index 829d59510..000000000
--- a/~emulatorman/icecat/gcc47.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-
-# HG changeset patch
-# User Martin Stránský <stransky@redhat.com>
-# Date 1328886461 -3600
-# Node ID 87a5ed480992788832387ba91a77c69fbe9fe349
-# Parent  67017dd3b7f6650e6bcd5b6f545e0309e8de7049
-Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin
-
-diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc
---- a/ipc/chromium/src/base/file_util_linux.cc
-+++ b/ipc/chromium/src/base/file_util_linux.cc
-@@ -1,15 +1,18 @@
- // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
- #include "base/file_util.h"
-
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include <string>
- #include <vector>
-
- #include "base/eintr_wrapper.h"
- #include "base/file_path.h"
- #include "base/string_util.h"
-
-diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc
---- a/ipc/chromium/src/base/message_pump_libevent.cc
-+++ b/ipc/chromium/src/base/message_pump_libevent.cc
-@@ -1,16 +1,19 @@
- // Copyright (c) 2008 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
- #include "base/message_pump_libevent.h"
-
- #include <errno.h>
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include "eintr_wrapper.h"
- #include "base/logging.h"
- #include "base/scoped_nsautorelease_pool.h"
- #include "base/scoped_ptr.h"
- #include "base/time.h"
- #include "third_party/libevent/event.h"
-
-diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc
---- a/ipc/chromium/src/base/time_posix.cc
-+++ b/ipc/chromium/src/base/time_posix.cc
-@@ -8,16 +8,19 @@
- #include <mach/mach_time.h>
- #endif
- #include <sys/time.h>
- #ifdef ANDROID
- #include <time64.h>
- #else
- #include <time.h>
- #endif
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include <limits>
-
- #include "base/basictypes.h"
- #include "base/logging.h"
-
- namespace base {
diff --git a/~emulatorman/icecat/icecat-install-dir.patch b/~emulatorman/icecat/icecat-install-dir.patch
deleted file mode 100644
index 7a72b9c9d..000000000
--- a/~emulatorman/icecat/icecat-install-dir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk
---- a/config/baseconfig.mk
-+++ b/config/baseconfig.mk
-@@ -1,9 +1,9 @@
- INCLUDED_AUTOCONF_MK = 1
- 
--includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+includedir := $(includedir)/$(MOZ_APP_NAME)
-+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- DIST = $(DEPTH)/dist
- 
- # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff -Nur a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk
---- a/js/src/config/baseconfig.mk
-+++ b/js/src/config/baseconfig.mk
-@@ -1,7 +1,7 @@
- INCLUDED_AUTOCONF_MK = 1
- 
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- 
- ifneq (,$(filter /%,$(TOP_DIST)))
- DIST = $(TOP_DIST)
diff --git a/~emulatorman/icecat/icecat-safe.desktop b/~emulatorman/icecat/icecat-safe.desktop
deleted file mode 100644
index e33d75469..000000000
--- a/~emulatorman/icecat/icecat-safe.desktop
+++ /dev/null
@@ -1,78 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/lib/icecat/icecat -safe-mode %u
-Icon=icecat
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=GNU IceCat - Safe Mode
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Прелистувач на Интернет 
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb 
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
-MimeType=text/html
-StartupNotify=false
-Categories=Application;Network;
diff --git a/~emulatorman/icecat/icecat.desktop b/~emulatorman/icecat/icecat.desktop
deleted file mode 100644
index 72666a5b8..000000000
--- a/~emulatorman/icecat/icecat.desktop
+++ /dev/null
@@ -1,78 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/lib/icecat/icecat %u
-Icon=icecat
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=GNU IceCat
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Прелистувач на Интернет 
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb 
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
-MimeType=text/html
-StartupNotify=false
-Categories=Application;Network;
diff --git a/~emulatorman/icecat/icecat.install b/~emulatorman/icecat/icecat.install
deleted file mode 100644
index c1fe8284a..000000000
--- a/~emulatorman/icecat/icecat.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
diff --git a/~emulatorman/icecat/libre.patch b/~emulatorman/icecat/libre.patch
deleted file mode 100644
index 496c6b983..000000000
--- a/~emulatorman/icecat/libre.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-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
---- a/browser/locales/en-US/chrome/browser-region/region.properties
-+++ b/browser/locales/en-US/chrome/browser-region/region.properties
-@@ -3,30 +3,18 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- # Default search engine
--browser.search.defaultenginename=DuckDuckGo
-+browser.search.defaultenginename=DuckDuckGo HTML
- 
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=DuckDuckGo
--browser.search.order.2=Google
--browser.search.order.3=Yahoo
--
--# 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.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 
- # don't make any spelling errors here.
- gecko.handlerService.defaultHandlersVersion=3
-+
-+# The default set of protocol handlers for irc:
-+gecko.handlerService.schemes.irc.0.name=Freenode
-+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
-+
-+# The default set of protocol handlers for ircs:
-+gecko.handlerService.schemes.ircs.0.name=Freenode
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
-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
---- a/browser/locales/generic/profile/bookmarks.html.in
-+++ b/browser/locales/generic/profile/bookmarks.html.in
-@@ -11,13 +11,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://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D" ID="rdf:#$GvPhC3">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://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre</A>
-+        <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Packages</A>
-+        <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Wiki</A>
-+        <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Labs</A>
-+    </DL><p>
-+    <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3>
-+    <DL><p>
-+        <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A>
-+        <DT><A HREF="http://libreplanet.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC/v78AAAAAAPLy9ABsbakA/f3+APn5+QC6ur0A6urqAEpLbQACBLQApKW3AAULuQDMzMwAGBiDAL29vQCgocsAgnzJALu82QA+PpsAAQOvAOjo6ADZ2dkAysrKALS0zwD5+foAAgKRAAYGdQD19fUADhOjAAQJyACrnqIAxMTLAOnp7gDm5uYAzczNACgobwDg2dEAQkaeAA0RkAAUFnEA0MvQAIBzgAANDYsAk5OyAOTk5ADy8vYA1dXVAD8/cADGxsYA+fn7AAMHvgBzZnQApqauAAEGuQDExMQAAAGmAAoLmgADCMQAxMTdAAwPlwD+/v4ABg7MAF5ehADg4OAA0dHRAAAAoQAYEXAAwsLCALCxwQBnadkAAQGWAPz8/ACgoLgAbm6RANvb5wDr6+sA0dHSALe3uQADB8AAzc3NAGFhbAABAZcAOTtlALi4xwAAAJoA/Pz9AAQHnwADBJcACQl4AFVa3AChl6EAAgW2ABscdAABAq4A2NjYAAAAmwDAwMoAAQKmAAcMswDR0eQAAQSxANvX2wB4aXcAAQGpAAAAkwDW1tYAAgSpACIZZAAAAaEA+vr8AKuirAACBbcA8vLyALOztgADBZYAAACcAAACpwAEA6QAAQKnAPT09QD///8AvL3UADIpigDw8PAABwWOAK6dogBub4kAiozDANLS0gAFC8gAAgW4AP39/QAAAJ0A0NDQAMHBwQDp6ewACg2RAAIFqAAKCokA+/v7AAkOnwAAAaMA7OzsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4eHh4eHh4eHh4eHh4AXh4eHhlbikzZlooeHh4eAF4eHh4hX1JVFweInh4eHgBeHh4XmlAGXNGSB8VeHh4AXg8LhaGcV9zKg0wQF54eAF4K0NNOGthjXNCUwAMS3gBPC82iW+CCRN2Iz4wTwx4AW0GgCc5OU41VnSKTBoOiwEFTz8hHIF5RANdQVRfNIMBeBUhe0o9jB0Pcjdzc1E8AXgsB3AbUlkQRVtnhHNoeAF4i45wJCAlYjJbdYRfY3gBeDwmEn4XMToKZDd6WDx4AXh4VTsIfwt3FGpsfAR4eAF4eHgEEYhQAodXYDx4eHgBeHh4eHg8GC1HPHh4eHh4AQABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAA%3D">LibrePlanet</A>
-+        <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</A>
-+        <DT><A HREF="http://www.h-node.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC7zrYAWYhNANjj1QA9fEcAEEwBAHTQkwAeVRkAPXMvALvOtwASVQEAHFcUAH/bpgB60p8AKnQmAGO1fgAjaRwALmA1AA5EAQDM2sgAN3ApAG7EjgC5zbQAVJxrAChwIgC0ya8ALmczAHXJmQBNf0EAgd6oADhwKgC8z7cA7vPtANTg0QANPwAARIhSADtyLQBzzpQAus21AEeKVQDC070AieyzALzPuAB93qEALGYvAO/z7gBEiVAAasWFAFuJTwBKil4AXotSAEuKXgAORQEAD0gBABlDFwBWpmoALGYwAGCNVQAbYBAAHGAQABBOAQCI6rIAjPG3AB1bDgAaXg4A////AGaRWwB/2qYAUYJEAEx+PwAZXAwAm7eUAD51MADN28oAJmwhACRiFAAzeTYAasaFAB9eDwBkt34Aus62AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPT09PT09PT09PT09PT09PT09PT0OIjALPRQmMkI9PT09PT09OkcHNQU+Q0oQPT09PT09PToVGDQtI0ABKz09PT09PT06JRg0Nh1ALxk9PT09PT09OiUYIS4TQC83PT09PT09PTpPSDsGG0BEAz09PT09PT06T0BGMRIsTRY9PT09PT09OgACJx8gQwooPT09PT09PToICAkJCUkkPT09PT09PT05HggETio9PT09PT09PT09Px4IERw9PT09PT09PT09PUUpCDMMPT09PT09PT09PT0NOEEEGj09PT09PT09PT09TBcPSzw9PT09PT09PT09PT09PT09PT09PT09PQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%3D">h-node</A>
-     </DL><p>
- </DL><p>
diff --git a/~emulatorman/icecat/mozconfig b/~emulatorman/icecat/mozconfig
deleted file mode 100644
index 5df8547f7..000000000
--- a/~emulatorman/icecat/mozconfig
+++ /dev/null
@@ -1,60 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-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 --disable-system-cairo
-ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
-
-# Icecat
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
-
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.gnuzilla
-
-# ConnochaetOS
-#ac_add_options --build=i586-pc-linux-gnu
-#ac_add_options --host=i586-pc-linux-gnu
-#export USE_SHORT_LIBNAME=1
-#mk_add_options USE_SHORT_LIBNAME=1
-
-# Parabola
-ac_add_options --disable-safe-browsing
-export BUILD_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-
-# Build-generated
diff --git a/~emulatorman/icecat/mozconfig.pgo b/~emulatorman/icecat/mozconfig.pgo
deleted file mode 100644
index b0c249ebf..000000000
--- a/~emulatorman/icecat/mozconfig.pgo
+++ /dev/null
@@ -1,4 +0,0 @@
-# PGO
-ac_add_options --enable-profile-guided-optimization
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
-mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
diff --git a/~emulatorman/icecat/vendor.js b/~emulatorman/icecat/vendor.js
deleted file mode 100644
index 3fbf3d7b7..000000000
--- a/~emulatorman/icecat/vendor.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default browser checking.
-pref("browser.shell.checkDefaultBrowser", false);
-
-// Don't disable our bundled extensions in the application directory
-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);
diff --git a/~emulatorman/icecat/xulrunner-copy-stub.patch b/~emulatorman/icecat/xulrunner-copy-stub.patch
deleted file mode 100644
index 8ccf127df..000000000
--- a/~emulatorman/icecat/xulrunner-copy-stub.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/browser/app/Makefile.in
-+++ b/browser/app/Makefile.in
-@@ -233,7 +233,7 @@
- else
- ifdef LIBXUL_SDK
- libs::
--	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
-+	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX)
- endif
- endif
- 
diff --git a/~emulatorman/icedove-l10n/PKGBUILD b/~emulatorman/icedove-l10n/PKGBUILD
deleted file mode 100644
index 9ed01c353..000000000
--- a/~emulatorman/icedove-l10n/PKGBUILD
+++ /dev/null
@@ -1,98 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-pkgbase=icedove-l10n
-pkgver=17.0.2.1
-
-_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)
-
-pkgname=($(for lang in ${_langpacks[@]}
-        do echo $pkgbase-$lang | tr A-Z a-z
-        done))
-
-pkgrel=2
-pkgdesc="Language packs for Debian Icedove."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://packages.debian.org/source/experimental/icedove"
-license=('MPL' 'GPL')
-depends=("icedove-libre>=$pkgver")
-_url=http://repo.parabolagnulinux.org/other/$pkgbase/releases/$pkgver
-
-source=()
-for lang in ${_langpacks[@]}
-do
-    source+=("langpack-$lang@icedove.mozilla.org.xpi::$_url/$lang.xpi")
-done
-
-# Don't extract anything
-noextract=(${source[@]##*/})
-
-_path="/usr/lib/icedove/extensions/"
-
-for lang in ${_langpacks[@]}
-do
-    eval "
-package_icedove-l10n-$(echo $lang | tr A-Z a-z)() {
-  replaces=(icedove-i18n-$(echo $lang | tr A-Z a-z))
-  conflicts=(icedove-i18n-$(echo $lang | tr A-Z a-z))
-  provides=(icedove-i18n-$(echo $lang | tr A-Z a-z))
-  install -Dm644 \"\$srcdir/langpack-$lang@icedove.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@icedove.mozilla.org.xpi\"
-}
-"
-done
-
-md5sums=('2586db5adf22dd42ae272d9fdc1b230e'
-         '20c25addb6e2cb3ffec146c1aca81848'
-         'b067b93b7f8adaf83fb8ea72d58b6581'
-         'ec62aaa9fff666c7071869cf45d2d113'
-         '12b0e70965d7317a31d7d7b35195ee67'
-         'ff10849757b8157b73707ccfe572edf4'
-         '89c7ea5ca764a2a4e4fbb9a720b8bd97'
-         'bf5cf9401ac5b10fa65a1e37a69b134d'
-         'fc97d1b7c0a209351d00e48075715986'
-         '9439304cb4c13fbebb24872904df98f9'
-         'cc6f97d63af3686e08a8624930c7784b'
-         '35a840226d1b8b3a0484f6327bd43b64'
-         '26bf1309ee516fd183eb6afdaf3d703f'
-         '9885394265e334d5026430c70d83669e'
-         'd39ac07026e6fea2b6e8cf9420cdae3c'
-         'c3154fd92db6387052b67154eee2c6cb'
-         '5cd99e7414eebcc92724752d569ae18f'
-         '48517d7a3295cab360e102945c4724f0'
-         '27dfcf129c0e1e752149f1065e7683e2'
-         '0f24e9851e14537f2d245ff7e0aae9e1'
-         '839ffc54ae6593ec4d170957750bd2f2'
-         '1a16c57b85ab9805bb7bc9afe8438efb'
-         '1481869608ec96bdd2867ff3d507010b'
-         '4e9633d016998af326fb0d759e4c03ce'
-         'bcf6664cf8667f5425bad0c4e261f5f8'
-         'a625dd60dffacfff6adab1a764f57721'
-         '5c7b974dfc964abc0625ac770c558f08'
-         '4c40f6e2da31675609b8fd6473f255a3'
-         'd57c319232421f43638b1af551704464'
-         '155143f28edcb18cc39b1ad2b36e4945'
-         'f54217af7efb23324012d1bb3510a17d'
-         'd55d65f2c2b813da2a005beb751d3a8d'
-         '23b699906a9ddae4589b2bf69bc40d66'
-         'b5c87362efedd884a5dbecff2f5c5dad'
-         'bec280e6279fb279143a99e348ce610f'
-         'd2eed0961cf3f684b20b4eb0a1d89189'
-         'ef85215d35b1e76e0058b98a9885e09d'
-         '821d982f3c859b90615cefc321854fee'
-         '03d7b26f8a60a1172b7dad3b45870b0f'
-         '78b1830da6f93d87a491704c03bca2f3'
-         'da602151f86db7d701b1806ad0972734'
-         '2db261b975a9c1199ef707c96a3ee677'
-         'b04a05cb6e66c2cdf9893954fd8dae49'
-         'c3d3969d4f590dfad0def596d1f5521f'
-         '4892a9c3e0554815448d604de3857b37'
-         'b6250637b5beacec9ae6223b9878a53a'
-         '987f9765fd6ee3d080533c071dff6492'
-         '07e375fb25b3bd39ada11b6e18e7a836'
-         '204ad4b577b3b23c664a442766e88cc1'
-         '40b03dd5114095fbd15c943e7da3abfc'
-         'e14c994576b6824ff36b3e0e2bba6157'
-         '4d1674a0f9d106c5a05c422742802add'
-         '0c13d6c651ae5cca046d976df7576119'
-         'fd6da709c6937c419d2962275e3efdf1'
-         '8fc2d9cb6724cd6fa010c5870d4d3122')
diff --git a/~emulatorman/icedove-libre/Icedove-branding.patch b/~emulatorman/icedove-libre/Icedove-branding.patch
deleted file mode 100644
index 751305147..000000000
--- a/~emulatorman/icedove-libre/Icedove-branding.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Sat, 24 Nov 2012 11:36:16 +0100
-Subject: Icedove branding
-
----
- mail/app/application.ini |    2 +-
- mail/confvars.sh         |    4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mail/app/application.ini b/mail/app/application.ini
-index 8380eb7..12902c2 100644
---- a/mail/app/application.ini
-+++ b/mail/app/application.ini
-@@ -4,7 +4,7 @@
- 
- #filter substitution
- [App]
--Name=Thunderbird
-+Name=Icedove
- Version=@APP_VERSION@
- BuildID=@GRE_BUILDID@
- #ifdef MOZ_SOURCE_REPO
-diff --git a/mail/confvars.sh b/mail/confvars.sh
-index 5c34d70..395bb87 100755
---- a/mail/confvars.sh
-+++ b/mail/confvars.sh
-@@ -3,8 +3,8 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
--MOZ_APP_BASENAME=Thunderbird
--MOZ_APP_NAME=thunderbird
-+MOZ_APP_BASENAME=Icedove
-+MOZ_APP_NAME=icedove
- MOZ_UPDATER=1
- MOZ_THUNDERBIRD=1
- MOZ_CHROME_FILE_FORMAT=omni
diff --git a/~emulatorman/icedove-libre/PKGBUILD b/~emulatorman/icedove-libre/PKGBUILD
deleted file mode 100644
index 43cf38f18..000000000
--- a/~emulatorman/icedove-libre/PKGBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@parabola.nu>
-
-# We're getting this from Debian Experimental
-_debname=icedove
-_debver=17.0.2
-_debrel=1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_pkgname=${_debname}
-pkgname=${_debname}-libre
-pkgver=${_debver}.${_debrel}
-pkgrel=1
-pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla Thunderbird."
-arch=('i586' 'i686' 'x86_64' 'mips64el')
-license=('GPL2' 'MPL' 'LGPL')
-url="http://packages.debian.org/source/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' '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"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
-        mozconfig
-        channel-prefs.js
-        vendor.js
-        makefile.patch
-        branding.patch
-        ${_pkgname}.desktop
-        Icedove-branding.patch)
-options=(!emptydirs)
-md5sums=('3f7679bb98ae99be5adf73fd0025b00e'
-         '7440def324766bcc61b91185226f8824'
-         'd6d58d3104a44624e0a3d227cdf1c211'
-         '476ec205162340fb0679f522c9d31c3b'
-         '4eecc4fc5aafaf0da651a09eadc90bee'
-         'c4ed43e85945e180a89cce03e45ec62c'
-         '126b1446212396c33220936c01d9592d'
-         'e785e0c267f4435ae1a9aa0b03bcacfb'
-         'ea5f7a06967f561d47d7e5c35b23de6f')
-
-build() {
-  export QUILT_PATCHES=debian/patches
-  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
-  export QUILT_DIFF_ARGS='--no-timestamps'
-  export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}"
-  export PYTHON="/usr/bin/python2"
-  export DEBIAN_BUILD="comm-release"
-  mv debian "${srcdir}/${DEBIAN_BUILD}"
-  cd "${srcdir}/${DEBIAN_BUILD}"
-  mv debian/${_pkgname}-branding "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}"
-  cp -a debian/app-icons/${_pkgname}big.svg debian/app-icons/${_pkgname}_icon.svg
-  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
-      install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/mailicon${i/x*/}.png"
-  done
-  for i in 48x48 64x64; do
-      install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png"
-  done
-
-  # This patch has a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh
-  rm -v debian/patches/debian-hacks/Icedove-branding.patch || true
-
-  quilt push -av
-
-  patch -Np1 -i "${srcdir}/makefile.patch" # small fix
-  patch -Np1 -i "${srcdir}/branding.patch" # fixing branding
-  patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version
-
-  cp "${srcdir}/mozconfig" .mozconfig
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
-}
-
-package() {
-  cd "${srcdir}/${DEBIAN_BUILD}"
-
-  make -j1 -f client.mk DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/vendor.js"
-
-  # Recommend free addons
-  install -m644 "${srcdir}/channel-prefs.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref/channel-prefs.js"
-
-  for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do
-      install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png"
-  done
-  install -Dm644 "debian/app-icons/${_pkgname}_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
-  
-  install -Dm644 "${srcdir}/${_pkgname}.desktop" \
-      "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-  
-  rm -rf "${pkgdir}"/usr/lib/${_pkgname}/{dictionaries,hyphenation,searchplugins}
-  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/searchplugins "${pkgdir}/usr/lib/${_pkgname}/searchplugins"
-  # We don't want the development stuff
-  rm -r "${pkgdir}"/usr/{include,lib/$_pkgname-devel,share/idl}
-}
diff --git a/~emulatorman/icedove-libre/branding.patch b/~emulatorman/icedove-libre/branding.patch
deleted file mode 100644
index d84b8075a..000000000
--- a/~emulatorman/icedove-libre/branding.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd comm-release/mail/branding/icedove/locales/en-US/brand.dtd
---- comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd	2012-10-30 16:41:16.000000000 -0200
-+++ comm-release/mail/branding/icedove/locales/en-US/brand.dtd	2012-10-31 22:35:04.203666114 -0200
-@@ -1,4 +1,4 @@
- <!ENTITY  brandShortName        "Icedove">
--<!ENTITY  brandFullName         "Icedove Mail/News">
--<!ENTITY  vendorShortName       "Icedove">
-+<!ENTITY  brandFullName         "Icedove">
-+<!ENTITY  vendorShortName       "Mozilla">
- <!ENTITY  trademarkInfo.part1   " ">
-diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties comm-release/mail/branding/icedove/locales/en-US/brand.properties
---- comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties	2012-10-30 10:13:50.000000000 -0200
-+++ comm-release/mail/branding/icedove/locales/en-US/brand.properties	2012-10-31 22:35:14.786423732 -0200
-@@ -1,3 +1,3 @@
- brandShortName=Icedove
--brandFullName=Icedove Mail/News
--vendorShortName=Icedove
-+brandFullName=Icedove
-+vendorShortName=Mozilla
diff --git a/~emulatorman/icedove-libre/channel-prefs.js b/~emulatorman/icedove-libre/channel-prefs.js
deleted file mode 100644
index 13b1ba388..000000000
--- a/~emulatorman/icedove-libre/channel-prefs.js
+++ /dev/null
@@ -1,9 +0,0 @@
-//@line 2 "/build/src/comm-release/mail/app/profile/channel-prefs.js"
-pref("app.update.channel", "default");
-
-//Recommend free addons
-pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
diff --git a/~emulatorman/icedove-libre/icedove.desktop b/~emulatorman/icedove-libre/icedove.desktop
deleted file mode 100644
index ef2cd76e9..000000000
--- a/~emulatorman/icedove-libre/icedove.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Icedove
-Comment=Mail & News Reader
-GenericName=Mail Client & News Reader
-Exec=icedove %u
-TryExec=icedove
-Icon=icedove
-Terminal=false
-Type=Application
-Categories=Network;Email;
-MimeType=message/rfc822;x-scheme-handler/mailto;
-StartupNotify=true
diff --git a/~emulatorman/icedove-libre/icedove.install b/~emulatorman/icedove-libre/icedove.install
deleted file mode 100644
index 4d4a283db..000000000
--- a/~emulatorman/icedove-libre/icedove.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/~emulatorman/icedove-libre/makefile.patch b/~emulatorman/icedove-libre/makefile.patch
deleted file mode 100644
index 8f8137bec..000000000
--- a/~emulatorman/icedove-libre/makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Nur comm-release.orig/mail/branding/icedove/Makefile.in comm-release/mail/branding/icedove/Makefile.in
---- comm-release.orig/mail/branding/icedove/Makefile.in	2012-04-18 15:42:15.000000000 -0300
-+++ comm-release/mail/branding/icedove/Makefile.in	2012-05-08 04:03:25.680643202 -0300
-@@ -38,11 +38,11 @@
- # Branding Makefile for Icedove branding
- 
- DEPTH = ../../..
--topsrcdir = ../../../
-+topsrcdir = @top_srcdir@
- srcdir = @srcdir@
- VPATH = @srcdir@
- 
--include $(topsrcdir)/config/autoconf.mk
-+include $(DEPTH)/config/autoconf.mk
- 
- DIRS = \
- 	locales \
-@@ -50,7 +50,7 @@
- 
- PREF_JS_EXPORTS += $(srcdir)/thunderbird-branding.js
- 
--include $(DEPTH)/config/rules.mk
-+include $(topsrcdir)/config/rules.mk
- 
- export::
- 	$(NSINSTALL) -D $(DIST)/branding
-diff -Nur comm-release.orig/mail/branding/icedove/locales/Makefile.in comm-release/mail/branding/icedove/locales/Makefile.in
---- comm-release.orig/mail/branding/icedove/locales/Makefile.in	2012-04-18 15:42:15.000000000 -0300
-+++ comm-release/mail/branding/icedove/locales/Makefile.in	2012-05-08 05:32:57.481620942 -0300
-@@ -36,13 +36,13 @@
- # ***** END LICENSE BLOCK *****
- 
- DEPTH          = ../../../..
--topsrcdir      = ../../../..
-+topsrcdir      = @top_srcdir@
- srcdir         = @srcdir@
- VPATH          = @srcdir@
- relativesrcdir = mail/branding/icedove/locales
- 
--include $(topsrcdir)/config/autoconf.mk
-+include $(DEPTH)/config/autoconf.mk
- 
- DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
- 
--include $(DEPTH)/config/rules.mk
-+include $(topsrcdir)/config/rules.mk
diff --git a/~emulatorman/icedove-libre/mozconfig b/~emulatorman/icedove-libre/mozconfig
deleted file mode 100644
index 58f8ce24f..000000000
--- a/~emulatorman/icedove-libre/mozconfig
+++ /dev/null
@@ -1,64 +0,0 @@
-mk_add_options MOZ_CO_PROJECT=mail
-ac_add_options --enable-application=mail
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-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-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
-# Parabola
-export BUILD_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-
-# Debian
-export MAIL_PKG_SHARED=1
-mk_add_options MAIL_PKG_SHARED=1
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=mail/branding/icedove
-ac_add_options --enable-extensions=default
-ac_add_options --with-default-mozilla-five-home=/usr/lib/icedove
-ac_add_options --disable-javaxpcom
-ac_add_options --disable-elf-dynstr-gc
-ac_add_options --disable-strip
-ac_add_options --disable-strip-libs
-ac_add_options --disable-install-strip
-ac_add_options --enable-pango
-ac_add_options --enable-xft
-ac_add_options --enable-xinerama
-ac_add_options --enable-svg
-ac_add_options --enable-svg-renderer=cairo
-ac_add_options --enable-canvas
-ac_add_options --enable-crypto
-ac_add_options --enable-shared-js
-ac_add_options --enable-readline
diff --git a/~emulatorman/icedove-libre/vendor.js b/~emulatorman/icedove-libre/vendor.js
deleted file mode 100644
index 279bdc158..000000000
--- a/~emulatorman/icedove-libre/vendor.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Forbid application updates
-lockPref("app.update.enabled", false);
-
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default mailer checking.
-pref("mail.shell.checkDefaultMail", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);
diff --git a/~emulatorman/iceweasel-l10n/Makefile b/~emulatorman/iceweasel-l10n/Makefile
deleted file mode 100644
index d596111f3..000000000
--- a/~emulatorman/iceweasel-l10n/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/make -f
-# Use this script to update the PKGBUILD's list of langpacks.
-# This script depends on:
-#  - coreutils
-#  - pacman
-#  - sed
-
-# Variables:
-# This is to get it from Debian Sid
-debname=iceweasel-l10n
-debver=9.0+debian
-debrel=1
-debrepo=http://ftp.debian.org/debian/pool/main/
-
-pkgver=9.0
-pkgrel=2.1
-
-# Guts: ##############################################################
-
-default: PHONY all
-all: PHONY
-	$(MAKE) clean
-	$(MAKE) PKGBUILD
-.PRECIOUS: PKGBUILD
-
-PKGBUILD.list: Makefile
-	sed \
-	  -e 's/@DEBNAME@/$(debname)/' \
-	  -e 's/@DEBVER@/$(debver)/' \
-	  -e 's/@DEBREL@/$(debrel)/' \
-	  -e 's%@DEBREPO@%$(debrepo)%' \
-	  -e 's/@PKGVER@/$(pkgver)/' \
-	  -e 's/@PKGREL@/$(pkgrel)/' \
-	  -e "s/@LANGPACKS@/(phony)/" \
-	  -e '/CUT HERE/,$$d' \
-	  PKGBUILD.in > $@
-	echo 'package() { exit 0; }' >> $@
-	makepkg -gp $@ >> $@
-langpacks.txt: PKGBUILD.list Makefile
-	makepkg -dp $<
-	ls src/*/upstream | sed 's/\.xpi//' > $@
-PKGBUILD: PKGBUILD.in langpacks.txt Makefile
-	sed \
-	  -e 's/@DEBNAME@/$(debname)/' \
-	  -e 's/@DEBVER@/$(debver)/' \
-	  -e 's/@DEBREL@/$(debrel)/' \
-	  -e 's%@DEBREPO@%$(debrepo)%' \
-	  -e 's/@PKGVER@/$(pkgver)/' \
-	  -e 's/@PKGREL@/$(pkgrel)/' \
-	  -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \
-	  -e '/CUT HERE/d' \
-	  -e '/md5sums/,$$d' \
-	  PKGBUILD.in > $@
-	makepkg -dg >> $@
-
-clean: PHONY
-	rm -f PKGBUILD.list langpacks.txt
-
-.PHONY: PHONY FORCE
diff --git a/~emulatorman/iceweasel-l10n/PKGBUILD b/~emulatorman/iceweasel-l10n/PKGBUILD
deleted file mode 100644
index 988892cbc..000000000
--- a/~emulatorman/iceweasel-l10n/PKGBUILD
+++ /dev/null
@@ -1,165 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: fauno <fauno@kiwwwi.com.ar>
-# Contributor: Figue <ffigue@gmail.com>
-# Maintainer: Márcio Silva <coadde@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:
-# - Edit variables in in Makefile.
-# - (optionally) edit PKGBUILD.in
-# - Run 'make'. It will take care of everything else for you.
-
-_debname=iceweasel
-_debver=18.0.1
-_debrel=1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_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=iceweasel-l10n
-pkgname=($(for lang in ${_langpacks[@]}
-        do echo $pkgbase-$lang | tr A-Z a-z
-        done))
-pkgver=$_debver.$_debrel
-pkgrel=1
-
-pkgdesc="Language packs for Debian Iceweasel."
-arch=('any')
-url="http://www.geticeweasel.org/"
-license=('MPL')
-depends=("iceweasel-libre>=$pkgver")
-makedepends=('unzip' 'zip')
-source=('region.properties')
-for lang in ${_langpacks[@]}
-do
-    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
-done
-
-_path="/usr/lib/iceweasel/extensions"
-
-build() {
-  cd "${srcdir}"
-  for f in *.deb
-  do
-      bsdtar xf $f
-      bsdtar xf data.tar.xz
-  done
-
-  cd $srcdir/$_path
-
-  for i in ${_langpacks[@]}
-  do
-    cd $srcdir/$_path
-    unzip -q langpack-$i@iceweasel.mozilla.org.xpi -d $i
-    rm langpack-$i@iceweasel.mozilla.org.xpi
-    install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region
-    cd $i
-    zip -q -r $srcdir/$_path/langpack-$i@iceweasel.mozilla.org.xpi .
-  done
-
-  cd $srcdir
-}
-
-for lang in ${_langpacks[@]}
-do
-    eval "
-package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
-  replaces=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
-  conflicts=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
-  provides=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
-  install -Dm644 \"\$srcdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\"
-}
-"
-done
-
-md5sums=('428246ef3fb64103ff2cf5eaae2a92ca'
-         '5bff9acef5bdfd10fff5e3f36ff7c8bc'
-         '5ada703cfdc40e32c5c145380e979e1a'
-         'e8b198ad4673ef12538f17e73529f9f8'
-         'ba77a8937f6d0bc84ad789950ef42c70'
-         'd940e1ccb7f501555500b17f5ea28e74'
-         '7325a84d999c3ea5f884cff15e1a4210'
-         'f35c32e53f07774efa39bec386aa35c6'
-         '2d2a628958c5ad0f66077ae1703f61ba'
-         '458c5cee205f12ced09f8baab1605e11'
-         '7271c461eb02608d193208c5da94280e'
-         'a505e69bf7cbb4caadcd5dfa67da1b78'
-         '0b0e10b39d115aedc1dfc0967068df95'
-         '09153faa23ca0a953aa22cc3989eba5e'
-         'da9779d4a64f1bbab1195c9801fb678c'
-         '1815468f85d1eea9f018a72bb83889d3'
-         '6103d52fb61b4bb7e921870ff05c98af'
-         'c3f0e46e2cfb68bf30363c92dcd9934d'
-         '5214d31f5cd5c077f09a0c275f936c25'
-         'ad4f664710dfa896b969f25b824d7086'
-         'ba2339dce1b84f0e7c0b77331572d6f5'
-         '28fb3e3e873cf5d03207e220eebf2ab0'
-         'a6f6ea487f6577ddf4cb2ef10ed5e401'
-         '8143ba212c6ef5f1dfc311ce84861450'
-         '5a6db78ee5cd6b41c02b7f65e666a045'
-         '63869ca68431ee4c7d3769f4ef8b68e1'
-         '5e87285fa518d1a95a7a63a2587497b7'
-         '969c213166c8ecd7cc752c557a1c056d'
-         '0c47f76ca2fb3d747be170fd61fa36cb'
-         '01f67291435616996e968f41259b91bd'
-         'f785b30e48ea4ee4af286325b020c545'
-         '58684c98cfc9d35d3d37f827268e72ac'
-         '2ec870106c72d0772f65f6a129547cb1'
-         '98d5cec52877790042830e8be41db1ca'
-         '654ee0ebb10cfbfe9b8b6540548f08e7'
-         '5a60a9cd96e0900a6cfbf37f7a68b715'
-         'e6e276eb4b8b7c1eb5a3593b07b9a84a'
-         '0c788fece8760fb61509c0fe1ac7eff4'
-         '98cba049bae024ae7dc7426f6adf09d2'
-         '2d37f79f57d38008e64c9a52a05c91a4'
-         'aeffb314945de717ef8a417653bcba3d'
-         '910b595a09b98f4eae1f4e6ddcae6ad5'
-         '9c5babdcd0ecbac8e487bed05cf5fe1a'
-         'f94018f378dcd11d8d63ebbd4a595ca1'
-         'bb4cc3cdb7995333babe6462d1aaef06'
-         '7a3d8e89625858fea797f33e7a426c25'
-         'd1fbf396db41d77da0b3f9f2528c8c96'
-         'cfa20a918d3adad42313fc2db86c63b8'
-         'fa213ce6abfa19a6067e64c149e90b27'
-         '8c2a0ec2e38504c6f4657d9f00c3b4f0'
-         '3ff17d0759b40c4d308b8f28b698dba1'
-         '2fc7cc5a0d2d0794c7f08156fd65619d'
-         'ed57c5f168e53cec827695ac4c18ec10'
-         'c8b05f70068e8a8255d8f28f3171df5f'
-         'adc1d1e78c6c42624b1e312be7dec90c'
-         '1f667156cd0b9e23effcbf8e26d01839'
-         'dd112d0dbbcc45b38036694e5c82a6aa'
-         'f37be06f19a3e6e60727466896bc6b65'
-         'ec947261ee12d58c1a9998ea8136f744'
-         'a3434e5da7b65559de7c4adcb14906d3'
-         'b8984e5ab770cd3f0fd70cbc33ba1150'
-         'a06634264be552d2e64189a761c7cc3c'
-         '417246fb8b66c806bdb903801f975627'
-         'b9e367b2d4f96ea111ae46c22801b0bf'
-         '0a245b319c1dc40ef95a24ca5b0fca9d'
-         '7a08d4e4d7a10f12a4d79fe96e2c1f51'
-         'f4d71f4e0a1794ccc25463cced9457d4'
-         '778089e056b6e8b1aaef1a4769153059'
-         'c3855b0c99342acddca0a7e6d9dc126f'
-         '9bbd6dbf2df859fcbbf366e753dfcdd6'
-         '338ea8d0681d2df2409a2398c3ae3694'
-         'e783a6e96d080413a60d1200fa0ac8a7'
-         'd1af3e947fc8a8aca39bec88aaeda708'
-         'e53c6a92a5533a706abb6abbe761508e'
-         '5d139a83f2b5e1625142f06a63147a28'
-         'd671a0fd8a4f8eb08d4b9ab52372d667'
-         'af9bf9f8a04dc898fad49083824fea6a'
-         '78184aa445a574ed6f57e926c7ab25c4'
-         '62f54d64f86204a45fc12557a4a76eb0'
-         '0ee43e97979aff7b7e2bb3d9e42a6e00'
-         '6fe3c2ed768593d942461f462fadd508'
-         '469ff3256c7322f15a71e0fd81e09f57'
-         '74bb076c39c409d9c795722d692561dc'
-         'fc439b2e9dfff5111d0fea9fdeef30de'
-         '546c8cac927262e9166e01f4634a22cb'
-         '1009936f51fad91899c6f0144040f174'
-         '700322fdfe534fa47579895c87a93808'
-         'fbdd5acbff2ef4d73665766d1f0cd815'
-         'b3cc9c95ce6146453c8929213b04d9fe')
diff --git a/~emulatorman/iceweasel-l10n/region.properties b/~emulatorman/iceweasel-l10n/region.properties
deleted file mode 100644
index 4399d8db7..000000000
--- a/~emulatorman/iceweasel-l10n/region.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Default search engine
-browser.search.defaultenginename=DuckDuckGo HTML
-
-# Search engine order (order displayed in the search bar dropdown)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://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
-# 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
-
-# The default set of protocol handlers for irc:
-gecko.handlerService.schemes.irc.0.name=Freenode
-gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
-
-# The default set of protocol handlers for ircs:
-gecko.handlerService.schemes.ircs.0.name=Freenode
-gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
diff --git a/~emulatorman/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/~emulatorman/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
deleted file mode 100644
index f59454192..000000000
--- a/~emulatorman/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-From: Mike Hommey <mh@glandium.org>

-Date: Tue, 5 Jun 2012 08:57:06 +0200

-Subject: Bug 756390 - Make the "Reset Firefox" feature more generic

-

-diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js

-index 0e8ccf5..fa46c08 100644

---- a/browser/components/migration/content/migration.js

-+++ b/browser/components/migration/content/migration.js

-@@ -249,7 +249,7 @@ var MigrationWizard = {

-     }

- 

-     var brandBundle = document.getElementById("brandBundle");

--    // These strings don't exist when not using official branding. If that's

-+    // These strings may not exist when not using official branding. If that's

-     // the case, just skip this page.

-     try {

-       var pageTitle = brandBundle.getString("homePageMigrationPageTitle");

-@@ -281,8 +281,8 @@ var MigrationWizard = {

-       case "chrome":

-         source = "sourceNameChrome";

-         break;

--      case "firefox":

--        source = "sourceNameFirefox";

-+      case "self":

-+        source = "brand";

-         break;

-     }

- 

-@@ -292,7 +292,12 @@ var MigrationWizard = {

-     var oldHomePageURL = this._migrator.sourceHomePageURL;

- 

-     if (oldHomePageURL && source) {

--      var appName = MigrationUtils.getLocalizedString(source);

-+      var appName;

-+      if (source == "brand") {

-+        appName = brandBundle.GetStringFromName("brandFullName");

-+      } else {

-+        appName = MigrationUtils.getLocalizedString(source);

-+      }

-       var oldHomePageLabel =

-         brandBundle.getFormattedString("homePageImport", [appName]);

-       var oldHomePage = document.getElementById("oldHomePage");

-diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul

-index f030756..23e37ff 100644

---- a/browser/components/migration/content/migration.xul

-+++ b/browser/components/migration/content/migration.xul

-@@ -42,7 +42,7 @@

- #elifdef XP_UNIX

-       <radio id="chrome"    label="&importFromChrome.label;"    accesskey="&importFromChrome.accesskey;"/>

- #endif

--      <radio id="firefox"   label="&importFromFirefox.label;"   accesskey="&importFromFirefox.accesskey;"/>

-+      <radio id="self"      hidden="true"/>

-       <radio id="nothing"   label="&importFromNothing.label;"   accesskey="&importFromNothing.accesskey;" hidden="true"/>

-     </radiogroup>

-     <label id="noSources" hidden="true">&noMigrationSources.label;</label>

-diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest

-index d7fec75..d531b83 100644

---- a/browser/components/migration/src/BrowserProfileMigrators.manifest

-+++ b/browser/components/migration/src/BrowserProfileMigrators.manifest

-@@ -3,7 +3,7 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737

- component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js

- contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}

- component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js

--contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}

-+contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}

- #ifdef HAS_IE_MIGRATOR

- 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 52722e9..0448444 100644

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

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

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

- 

- 

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

--FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=firefox";

-+FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";

- FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");

- 

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

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

-index 1f60879..fc83a99 100644

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

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

-@@ -403,11 +403,6 @@ this.MigrationUtils = Object.freeze({

-    * @see nsIStringBundle

-    */

-   getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {

--    const OVERRIDES = {

--      "4_firefox": "4_firefox_history_and_bookmarks"

--    };

--    aKey = OVERRIDES[aKey] || aKey;

--

-     if (aReplacements === undefined)

-       return getMigrationBundle().GetStringFromName(aKey);

-     return getMigrationBundle().formatStringFromName(

-@@ -622,6 +617,17 @@ this.MigrationUtils = Object.freeze({

-   },

- 

-   /**

-+   * Returns whether a given migration type is supported.

-+   *

-+   * @param  aKey   Migrator key

-+   * @returns whether the migrator key is supported.

-+   */

-+  canMigrate:

-+  function MU_canMigrate(aMigratorKey) {

-+    return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;

-+  },

-+

-+  /**

-    * Cleans up references to migrators and nsIProfileInstance instances.

-    */

-   finishMigration: function MU_finishMigration() {

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

-index f67823b..36016b8 100644

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

-+++ b/browser/components/migration/src/ProfileMigrator.js

-@@ -12,6 +12,7 @@ function ProfileMigrator() {

- 

- ProfileMigrator.prototype = {

-   migrate: MigrationUtils.startupMigration.bind(MigrationUtils),

-+  canMigrate: MigrationUtils.canMigrate.bind(MigrationUtils),

-   QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIProfileMigrator]),

-   classDescription: "Profile Migrator",

-   contractID: "@mozilla.org/toolkit/profile-migrator;1",

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

-index 21cf405..f3c1a6b 100644

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

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

-@@ -17,8 +17,6 @@

- <!ENTITY importFromSafari.accesskey     "S">

- <!ENTITY importFromChrome.label         "Chrome">

- <!ENTITY importFromChrome.accesskey     "C">

--<!ENTITY importFromFirefox.label        "Firefox">

--<!ENTITY importFromFirefox.accesskey    "X">

- 

- <!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 260bc29..52b32cc 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)

- 2_ie=Cookies

- 2_safari=Cookies

- 2_chrome=Cookies

--2_firefox=Cookies

-+2_self=Cookies

- 

- 4_ie=Browsing History

- 4_safari=Browsing History

- 4_chrome=Browsing History

--4_firefox_history_and_bookmarks=Browsing History and Bookmarks

-+4_self=Browsing History and Bookmarks

- 

- 8_ie=Saved Form History

- 8_safari=Saved Form History

- 8_chrome=Saved Form History

--8_firefox=Saved Form History

-+8_self=Saved Form History

- 

- 16_ie=Saved Passwords

- 16_safari=Saved Passwords

- 16_chrome=Saved Passwords

--16_firefox=Saved Passwords

-+16_self=Saved Passwords

- 

- 32_ie=Favorites

- 32_safari=Bookmarks

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

- 64_ie=Other Data

- 64_safari=Other Data

- 64_chrome=Other Data

--64_firefox=Bookmarks Backups

-+64_self=Bookmarks Backups

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

-index 687c8d8..203d8cf 100644

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

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

-@@ -39,7 +39,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)

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

-index dcb4065..09c1146 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);

- 

--#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);

-+    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);

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

-       dataTypes.push(typeName);

-     } catch (x) {

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

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

-index f35c227..7062886 100644

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

-+++ b/toolkit/profile/nsIProfileMigrator.idl

-@@ -37,7 +37,7 @@ interface nsIProfileStartup : nsISupports

-  * @client   Toolkit (Startup code)

-  * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1")

-  */

--[scriptable, uuid(3df284a5-2258-4d46-a664-761ecdc04c22)]

-+[scriptable, uuid(96d9ab66-082c-4a9e-82ad-f8c21b391342)]

- interface nsIProfileMigrator : nsISupports 

- {

-   /**

-@@ -60,6 +60,14 @@ interface nsIProfileMigrator : nsISupports

-    * @note The startup code ignores COM exceptions thrown from this method.

-    */

-   void migrate(in nsIProfileStartup aStartup, in ACString aKey);

-+

-+  /**

-+   * Returns whether a given migration type is supported.

-+   *

-+   * @param  aKey   Migrator key

-+   * @returns whether the migrator key is supported.

-+   */

-+  bool canMigrate(in ACString aKey);

- };

- 

- %{C++

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

-index e3dd0df..ef7bb74 100644

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

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

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

-         if (gDoProfileReset) {

-           // Automatically migrate from the current application if we just

-           // reset the profile.

--          aKey = MOZ_APP_NAME;

-+          aKey = "self";

-         }

-         pm->Migrate(&mDirProvider, aKey);

-       }

diff --git a/~emulatorman/iceweasel-libre/PKGBUILD b/~emulatorman/iceweasel-libre/PKGBUILD
deleted file mode 100644
index b3cf15f28..000000000
--- a/~emulatorman/iceweasel-libre/PKGBUILD
+++ /dev/null
@@ -1,190 +0,0 @@
-# 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@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:
-# Contributor: evr <evanroman at gmail>
-# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
-
-_pgo=false
-
-# We're getting this from Debian Experimental
-_debname=iceweasel
-_debver=18.0.1
-_debrel=1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_pkgname=iceweasel
-pkgname=iceweasel-libre
-pkgver=$_debver.$_debrel
-pkgrel=1
-
-if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
-if $_pgo; then
-  pkgname+='-pgo'
-fi
-
-pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox."
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2' 'MPL' 'LGPL')
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.14.1' 'sqlite3' 'startup-notification')
-makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'zip')
-[ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
-if $_pgo; then
-  makedepends+=('xorg-server-xvfb')
-  options=(!ccache)
-fi
-
-optdepends=('networkmanager: Location detection via available WiFi networks')
-url="http://www.geticeweasel.org/"
-install=iceweasel.install
-source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
-        "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz"
-        mozconfig
-        mozconfig.pgo
-        libre.patch
-        iceweasel.desktop
-        iceweasel-install-dir.patch
-        vendor.js
-        shared-libs.patch
-        replace-urls.txt
-        Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('5d481dd35a304702d1f311eeb3f1149f'
-         '6a4781e8ddc1b166f36930c4864e095f'
-         '619e8f7c8596838a7daf2b7ce2e54cd3'
-         'ac29b01c189f20abae2f3eef1618ffc0'
-         '1ee2d4bcacee73d671b9ffa17a02abaa'
-         '7b9e5996dd9fe0b186a43a297db1c6b5'
-         'abf5ecb74caa857abb42bcfbb3442d9c'
-         '6dd547c72bb875a3101135a1c32d4783'
-         '52e52f840a49eb1d14be1c0065b03a93'
-         'a8fc4658d45b6bf9350023e5c3f34e56'
-         '46a4b19b414065b99b870ea79b454f6e')
-
-if [ "$_pkgname" != "$pkgname" ]; then
-  provides+=("$_pkgname=$pkgver")
-  conflicts+=("$_pkgname")
-fi
-
-build() {
-  # WebRTC build tries to execute "python" and expects Python 2
-  # Workaround taken from chromium PKGBUILD on Archlinux
-  mkdir "$srcdir/python2-path"
-  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
-  export PATH="$srcdir/python2-path:$PATH"
-
-  export QUILT_PATCHES=debian/patches
-  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
-  export QUILT_DIFF_ARGS='--no-timestamps'
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
-  export PYTHON="/usr/bin/python2"
-  export DEBIAN_BUILD="mozilla-release"
-  mv debian "$srcdir/$DEBIAN_BUILD"
-  cd "$srcdir/$DEBIAN_BUILD"
-
-  # Doesn't apply and seems unimportant
-  rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
-
-  # This patch doesn't works in some parts due that has patches for others locales languages, source code hasn't it
-  rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true
-
-  quilt push -a
-
-  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
-  patch -Np1 -i "$srcdir/shared-libs.patch"
-
-  # 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 -Np1 -i "$srcdir/libre.patch"
-
-  cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
-
-  if $_pgo; then
-    cat "$srcdir/mozconfig.pgo" >> .mozconfig
-  fi
-
-  # From js on abslibre-mips64el.git
-  if [ "$CARCH" = "mips64el" ]; then
-      msg "Force disabling JIT."
-      sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
-          js/src/assembler/wtf/Platform.h
-      sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.{in,ref}
-
-      echo "ac_add_options --disable-methodjit" >> .mozconfig
-      echo "ac_add_options --disable-tracejit" >> .mozconfig
-  fi
-
-  # Fix PRE_RELEASE_SUFFIX
-  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
-    browser/base/Makefile.in
-
-  # This is a bug, we should fix it
-  if [ "$CARCH" = "mips64el" ]; then
-      # Fix MIPS N32 support.
-      sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
-          js/src/assembler/wtf/Platform.h
-      # Disable JIT.
-      sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
-          js/src/assembler/wtf/Platform.h
-      sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in
-      echo 'ac_add_options --disable-methodjit' >> .mozconfig
-      echo 'ac_add_options --disable-tracejit' >> .mozconfig
-      echo 'ac_add_options --disable-jemalloc' >> .mozconfig
-  fi
-
-  if $_pgo; then
-    LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
-    LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
-    kill $! || true
-  else
-    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-  fi
-}
-
-package() {
-  cd "$srcdir/$DEBIAN_BUILD"
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
-
-  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js"
-
-  # I don't even know why we're hitting the objdir, and ConnOS didn't
-  _brandingdir=debian/branding
-  brandingdir=moz-objdir/$_brandingdir
-  icondir="$pkgdir/usr/share/icons/hicolor"
-  for i in 16x16 32x32 48x48 64x64; do
-    install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png"
-  done
-  install -Dm644 "$brandingdir/mozicon128.png"      "$icondir/128x128/apps/$_pkgname.png"
-  install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg"
-
-  install -d                                        "$pkgdir/usr/share/applications"
-  install -m644  "$srcdir/iceweasel.desktop"        "$pkgdir/usr/share/applications"
-
-  rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins}
-  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"
-
-  # We don't want the development stuff
-  rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl}
-
-  # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
-}
diff --git a/~emulatorman/iceweasel-libre/bug677092.patch b/~emulatorman/iceweasel-libre/bug677092.patch
deleted file mode 100644
index aee09b451..000000000
--- a/~emulatorman/iceweasel-libre/bug677092.patch
+++ /dev/null
@@ -1,330 +0,0 @@
-exporting patch:
-# HG changeset patch
-# User Axel Hecht <axel@pike.org>
-# Date 1348128099 -7200
-# Node ID 812d0ba8317507c4026958a740960384eac1507a
-# Parent  97e49e7a33266a0680e5af59289264a07e4321f8
-bug 677092, make language packs restartless, r=Unfocused
-Make language packs just trigger the chrome registration hooks, and
-disable picking up bootstrap.js, and declare them restartless.
-
-diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/XPIProvider.jsm
---- a/toolkit/mozapps/extensions/XPIProvider.jsm	Wed Sep 26 13:08:50 2012 +0200
-+++ b/toolkit/mozapps/extensions/XPIProvider.jsm	Thu Sep 20 10:01:39 2012 +0200
-@@ -740,8 +740,8 @@
-     }
-   }
-   else {
--    // spell check dictionaries never require a restart
--    if (addon.type == "dictionary")
-+    // spell check dictionaries and language packs never require a restart
-+    if (addon.type == "dictionary" || addon.type == "locale")
-       addon.bootstrap = true;
-
-     // Only extensions are allowed to provide an optionsURL, optionsType or aboutURL. For
-@@ -3695,6 +3695,11 @@
-       Components.manager.addBootstrappedManifestLocation(aFile);
-
-     try {
-+      // Don't call bootstrap.js methods for language packs,
-+      // they only contain chrome.
-+      if (aType == "locale")
-+         return;
-+
-       // Load the scope if it hasn't already been loaded
-       if (!(aId in this.bootstrapScopes))
-         this.loadBootstrapScope(aId, aFile, aVersion, aType);
-diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest	Thu Sep 20 10:01:39 2012 +0200
-@@ -0,0 +1,1 @@
-+locale test-langpack    x-testing locale/x-testing
-diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf	Thu Sep 20 10:01:39 2012 +0200
-@@ -0,0 +1,23 @@
-+<?xml version="1.0"?>
-+
-+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-+
-+  <Description about="urn:mozilla:install-manifest">
-+    <em:id>langpack-x-testing@tests.mozilla.org</em:id>
-+    <em:type>8</em:type>
-+    <em:version>1.0</em:version>
-+
-+    <!-- Front End MetaData -->
-+    <em:name>Language Pack x-testing</em:name>
-+
-+    <em:targetApplication>
-+      <Description>
-+        <em:id>xpcshell@tests.mozilla.org</em:id>
-+        <em:minVersion>1</em:minVersion>
-+        <em:maxVersion>2</em:maxVersion>
-+      </Description>
-+    </em:targetApplication>
-+
-+  </Description>
-+</RDF>
-diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/xpcshell/test_langpack.js
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/toolkit/mozapps/extensions/test/xpcshell/test_langpack.js	Thu Sep 20 10:01:39 2012 +0200
-@@ -0,0 +1,247 @@
-+/* Any copyright is dedicated to the Public Domain.
-+ * http://creativecommons.org/publicdomain/zero/1.0/
-+ */
-+
-+// This verifies that language packs can be used without restarts.
-+Components.utils.import("resource://gre/modules/Services.jsm");
-+
-+// Enable loading extensions from the user scopes
-+Services.prefs.setIntPref("extensions.enabledScopes",
-+                          AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_USER);
-+
-+createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
-+
-+const profileDir = gProfD.clone();
-+profileDir.append("extensions");
-+const userExtDir = gProfD.clone();
-+userExtDir.append("extensions2");
-+userExtDir.append(gAppInfo.ID);
-+registerDirectory("XREUSysExt", userExtDir.parent);
-+
-+var chrome = Components.classes["@mozilla.org/chrome/chrome-registry;1"]
-+  .getService(Components.interfaces.nsIXULChromeRegistry);
-+
-+function do_check_locale_not_registered(provider) {
-+  let didThrow = false;
-+  try {
-+    chrome.getSelectedLocale(provider);
-+  } catch (e) {
-+    didThrow = true;
-+  }
-+  do_check_true(didThrow);
-+}
-+
-+function run_test() {
-+  do_test_pending();
-+
-+  startupManager();
-+
-+  run_test_1();
-+}
-+
-+// Tests that installing doesn't require a restart
-+function run_test_1() {
-+  prepare_test({ }, [
-+    "onNewInstall"
-+  ]);
-+
-+  AddonManager.getInstallForFile(do_get_addon("test_langpack"), function(install) {
-+    ensure_test_completed();
-+
-+    do_check_neq(install, null);
-+    do_check_eq(install.type, "locale");
-+    do_check_eq(install.version, "1.0");
-+    do_check_eq(install.name, "Language Pack x-testing");
-+    do_check_eq(install.state, AddonManager.STATE_DOWNLOADED);
-+    do_check_true(install.addon.hasResource("install.rdf"));
-+    do_check_false(install.addon.hasResource("bootstrap.js"));
-+    do_check_eq(install.addon.operationsRequiringRestart &
-+                AddonManager.OP_NEEDS_RESTART_INSTALL, 0);
-+
-+    let addon = install.addon;
-+    prepare_test({
-+      "langpack-x-testing@tests.mozilla.org": [
-+        ["onInstalling", false],
-+        "onInstalled"
-+      ]
-+    }, [
-+      "onInstallStarted",
-+      "onInstallEnded",
-+    ], function() {
-+      do_check_true(addon.hasResource("install.rdf"));
-+      check_test_1();
-+    });
-+    install.install();
-+  });
-+}
-+
-+function check_test_1() {
-+  AddonManager.getAllInstalls(function(installs) {
-+    // There should be no active installs now since the install completed and
-+    // doesn't require a restart.
-+    do_check_eq(installs.length, 0);
-+
-+    AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
-+      do_check_neq(b1, null);
-+      do_check_eq(b1.version, "1.0");
-+      do_check_false(b1.appDisabled);
-+      do_check_false(b1.userDisabled);
-+      do_check_true(b1.isActive);
-+      // check chrome reg that language pack is registered
-+      do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing");
-+      do_check_true(b1.hasResource("install.rdf"));
-+      do_check_false(b1.hasResource("bootstrap.js"));
-+
-+      let dir = do_get_addon_root_uri(profileDir, "langpack-x-testing@tests.mozilla.org");
-+
-+      AddonManager.getAddonsWithOperationsByTypes(null, function(list) {
-+        do_check_eq(list.length, 0);
-+
-+        run_test_2();
-+      });
-+    });
-+  });
-+}
-+
-+// Tests that disabling doesn't require a restart
-+function run_test_2() {
-+  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
-+    prepare_test({
-+      "langpack-x-testing@tests.mozilla.org": [
-+        ["onDisabling", false],
-+        "onDisabled"
-+      ]
-+    });
-+
-+    do_check_eq(b1.operationsRequiringRestart &
-+                AddonManager.OP_NEEDS_RESTART_DISABLE, 0);
-+    b1.userDisabled = true;
-+    ensure_test_completed();
-+
-+    do_check_neq(b1, null);
-+    do_check_eq(b1.version, "1.0");
-+    do_check_false(b1.appDisabled);
-+    do_check_true(b1.userDisabled);
-+    do_check_false(b1.isActive);
-+    // check chrome reg that language pack is not registered
-+    do_check_locale_not_registered("test-langpack");
-+
-+    AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) {
-+      do_check_neq(newb1, null);
-+      do_check_eq(newb1.version, "1.0");
-+      do_check_false(newb1.appDisabled);
-+      do_check_true(newb1.userDisabled);
-+      do_check_false(newb1.isActive);
-+
-+      run_test_3();
-+    });
-+  });
-+}
-+
-+// Test that restarting doesn't accidentally re-enable
-+function run_test_3() {
-+  shutdownManager();
-+  startupManager(false);
-+  // check chrome reg that language pack is not registered
-+  do_check_locale_not_registered("test-langpack");
-+
-+  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
-+    do_check_neq(b1, null);
-+    do_check_eq(b1.version, "1.0");
-+    do_check_false(b1.appDisabled);
-+    do_check_true(b1.userDisabled);
-+    do_check_false(b1.isActive);
-+
-+    run_test_4();
-+  });
-+}
-+
-+// Tests that enabling doesn't require a restart
-+function run_test_4() {
-+  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
-+    prepare_test({
-+      "langpack-x-testing@tests.mozilla.org": [
-+        ["onEnabling", false],
-+        "onEnabled"
-+      ]
-+    });
-+
-+    do_check_eq(b1.operationsRequiringRestart &
-+                AddonManager.OP_NEEDS_RESTART_ENABLE, 0);
-+    b1.userDisabled = false;
-+    ensure_test_completed();
-+
-+    do_check_neq(b1, null);
-+    do_check_eq(b1.version, "1.0");
-+    do_check_false(b1.appDisabled);
-+    do_check_false(b1.userDisabled);
-+    do_check_true(b1.isActive);
-+    // check chrome reg that language pack is registered
-+    do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing");
-+
-+    AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) {
-+      do_check_neq(newb1, null);
-+      do_check_eq(newb1.version, "1.0");
-+      do_check_false(newb1.appDisabled);
-+      do_check_false(newb1.userDisabled);
-+      do_check_true(newb1.isActive);
-+
-+      run_test_5();
-+    });
-+  });
-+}
-+
-+// Tests that a restart shuts down and restarts the add-on
-+function run_test_5() {
-+  shutdownManager();
-+  startupManager(false);
-+  // check chrome reg that language pack is registered
-+  do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing");
-+
-+  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
-+    do_check_neq(b1, null);
-+    do_check_eq(b1.version, "1.0");
-+    do_check_false(b1.appDisabled);
-+    do_check_false(b1.userDisabled);
-+    do_check_true(b1.isActive);
-+    do_check_false(isExtensionInAddonsList(profileDir, b1.id));
-+
-+    run_test_7();
-+  });
-+}
-+
-+// Tests that uninstalling doesn't require a restart
-+function run_test_7() {
-+  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
-+    prepare_test({
-+      "langpack-x-testing@tests.mozilla.org": [
-+        ["onUninstalling", false],
-+        "onUninstalled"
-+      ]
-+    });
-+
-+    do_check_eq(b1.operationsRequiringRestart &
-+                AddonManager.OP_NEEDS_RESTART_UNINSTALL, 0);
-+    b1.uninstall();
-+
-+    check_test_7();
-+  });
-+}
-+
-+function check_test_7() {
-+  ensure_test_completed();
-+  // check chrome reg that language pack is not registered
-+  do_check_locale_not_registered("test-langpack");
-+
-+  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
-+    do_check_eq(b1, null);
-+
-+    restartManager();
-+
-+    AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) {
-+      do_check_eq(newb1, null);
-+
-+      do_test_finished();
-+    });
-+  });
-+}
-diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
---- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	Wed Sep 26 13:08:50 2012 +0200
-+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	Thu Sep 20 10:01:39 2012 +0200
-@@ -139,6 +139,7 @@
- [test_corrupt_strictcompat.js]
- [test_db_sanity.js]
- [test_dictionary.js]
-+[test_langpack.js]
- [test_disable.js]
- [test_distribution.js]
- [test_dss.js]
diff --git a/~emulatorman/iceweasel-libre/iceweasel-install-dir.patch b/~emulatorman/iceweasel-libre/iceweasel-install-dir.patch
deleted file mode 100644
index a44aef496..000000000
--- a/~emulatorman/iceweasel-libre/iceweasel-install-dir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/baseconfig.mk
---- iceweasel-16.0.1.orig/config/baseconfig.mk	2012-10-10 19:42:45.000000000 -0200
-+++ iceweasel-16.0.1/config/baseconfig.mk	2012-10-12 05:40:32.346949927 -0200
-@@ -1,10 +1,10 @@
- INCLUDED_AUTOCONF_MK = 1
- 
- MOZ_APP_BASE_VERSION = $(firstword $(subst ., ,$(MOZ_APP_VERSION))).$(word 2,$(subst ., ,$(MOZ_APP_VERSION)))
--includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION)
-+includedir := $(includedir)/$(MOZ_APP_NAME)
-+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- DIST = $(DEPTH)/dist
- 
- # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff -Nur iceweasel-16.0.1.orig/js/src/config/baseconfig.mk iceweasel-16.0.1/js/src/config/baseconfig.mk
---- iceweasel-16.0.1.orig/js/src/config/baseconfig.mk	2012-10-10 19:43:05.000000000 -0200
-+++ iceweasel-16.0.1/js/src/config/baseconfig.mk	2012-10-12 05:08:23.064066227 -0200
-@@ -1,7 +1,7 @@
- INCLUDED_AUTOCONF_MK = 1
- 
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- 
- ifneq (,$(filter /%,$(TOP_DIST)))
- DIST = $(TOP_DIST)
diff --git a/~emulatorman/iceweasel-libre/iceweasel.desktop b/~emulatorman/iceweasel-libre/iceweasel.desktop
deleted file mode 100644
index c4a338cc6..000000000
--- a/~emulatorman/iceweasel-libre/iceweasel.desktop
+++ /dev/null
@@ -1,105 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Iceweasel
-Name[bg]=Iceweasel
-Name[ca]=Iceweasel
-Name[cs]=Iceweasel
-Name[el]=Iceweasel
-Name[es]=Iceweasel
-Name[fa]=Iceweasel
-Name[fi]=Iceweasel
-Name[fr]=Iceweasel
-Name[hu]=Iceweasel
-Name[it]=Iceweasel
-Name[ja]=Iceweasel
-Name[ko]=Iceweasel
-Name[nb]=Iceweasel
-Name[nl]=Iceweasel
-Name[nn]=Iceweasel
-Name[no]=Iceweasel
-Name[pl]=Iceweasel
-Name[pt]=Iceweasel
-Name[pt_BR]=Iceweasel
-Name[ru]=Iceweasel
-Name[sk]=Iceweasel
-Name[sv]=Iceweasel
-Comment=Browse the World Wide Web
-Comment[bg]=Сърфиране в Мрежата
-Comment[ca]=Navegueu per el web
-Comment[cs]=Prohlížení stránek World Wide Webu
-Comment[de]=Im Internet surfen
-Comment[el]=Περιηγηθείτε στον παγκόσμιο ιστό
-Comment[es]=Navegue por la web
-Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
-Comment[fi]=Selaa Internetin WWW-sivuja
-Comment[fr]=Navigue sur Internet
-Comment[hu]=A világháló böngészése
-Comment[it]=Esplora il web
-Comment[ja]=ウェブを閲覧します
-Comment[ko]=웹을 돌아 다닙니다
-Comment[nb]=Surf på nettet
-Comment[nl]=Verken het internet
-Comment[nn]=Surf på nettet
-Comment[no]=Surf på nettet
-Comment[pl]=Przeglądanie stron WWW 
-Comment[pt]=Navegue na Internet
-Comment[pt_BR]=Navegue na Internet
-Comment[ru]=Обозреватель Всемирной Паутины
-Comment[sk]=Prehliadanie internetu
-Comment[sv]=Surfa på webben
-GenericName=Web Browser
-GenericName[bg]=Интернет браузър
-GenericName[ca]=Navegador web
-GenericName[cs]=Webový prohlížeč
-GenericName[de]=Webbrowser
-GenericName[el]=Περιηγητής ιστού
-GenericName[es]=Navegador web
-GenericName[fa]=مرورگر اینترنتی
-GenericName[fi]=WWW-selain
-GenericName[fr]=Navigateur Web
-GenericName[hu]=Webböngésző
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブ・ブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[nb]=Nettleser
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[no]=Nettleser
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ru]=Интернет-браузер
-GenericName[sk]=Internetový prehliadač
-GenericName[sv]=Webbläsare
-X-GNOME-FullName=Iceweasel Web Browser
-X-GNOME-FullName[bg]=Интернет браузър (Iceweasel)
-X-GNOME-FullName[ca]=Navegador web Iceweasel
-X-GNOME-FullName[cs]=Iceweasel Webový prohlížeč
-X-GNOME-FullName[el]=Περιηγήτης Ιστού Iceweasel
-X-GNOME-FullName[es]=Navegador web Iceweasel
-X-GNOME-FullName[fa]=مرورگر اینترنتی Iceweasel
-X-GNOME-FullName[fi]=Iceweasel-selain
-X-GNOME-FullName[fr]=Navigateur Web Iceweasel
-X-GNOME-FullName[hu]=Iceweasel webböngésző
-X-GNOME-FullName[it]=Iceweasel Browser Web
-X-GNOME-FullName[ja]=Iceweasel ウェブ・ブラウザ
-X-GNOME-FullName[ko]=Iceweasel 웹 브라우저
-X-GNOME-FullName[nb]=Iceweasel Nettleser
-X-GNOME-FullName[nl]=Iceweasel webbrowser
-X-GNOME-FullName[nn]=Iceweasel Nettlesar
-X-GNOME-FullName[no]=Iceweasel Nettleser
-X-GNOME-FullName[pl]=Przeglądarka WWW Iceweasel
-X-GNOME-FullName[pt]=Iceweasel Navegador Web
-X-GNOME-FullName[pt_BR]=Navegador Web Iceweasel
-X-GNOME-FullName[ru]=Интернет-браузер Iceweasel
-X-GNOME-FullName[sk]=Internetový prehliadač Iceweasel
-X-GNOME-FullName[sv]=Webbläsaren Iceweasel
-Exec=/usr/lib/iceweasel/iceweasel %u
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Icon=iceweasel
-Categories=Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;
-StartupWMClass=Iceweasel
-StartupNotify=true
diff --git a/~emulatorman/iceweasel-libre/iceweasel.install b/~emulatorman/iceweasel-libre/iceweasel.install
deleted file mode 100644
index c1fe8284a..000000000
--- a/~emulatorman/iceweasel-libre/iceweasel.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
diff --git a/~emulatorman/iceweasel-libre/libre.patch b/~emulatorman/iceweasel-libre/libre.patch
deleted file mode 100644
index f80295e55..000000000
--- a/~emulatorman/iceweasel-libre/libre.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-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-01-10 20:20:02.000000000 -0500
-+++ mozilla-release/browser/app/profile/firefox.js	2013-01-10 17:47:34.000000000 -0500
-@@ -1168,11 +1168,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 -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-01-04 18:44:27.000000000 -0500
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2013-01-10 18:26:10.000000000 -0500
-@@ -5,70 +5,41 @@
- // If a definition requires additional params, check that the final search url
- // is handled correctly by the engine.
- const SEARCH_ENGINES = {
--  "Google": {
-+  "DuckDuckGo HTML": {
-     image: "data:image/png;base64," +
--           "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
--           "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
--           "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" +
--           "Vivt6Ztzz5y5b+7yf//3f/9/38PoW7gYY+i7uDDG39heJfT/q91LGTiTIcWJkCxzxDmCCBGCkBEO" +
--           "FDCm5CPs+CGWYvcliRxEzDwgu9I/IzZClonQgT/jC9Eu3GFTz6sdKc57kIzHWKaFjIA2wz++Zhkn" +
--           "yblMIDkAFIcDDFcQ+vtjGJuaOlKPkB2G4V4U9kcu8zfWlPtPVX/g9zZ7QwE03jDTqzWVndBUc57a" +
--           "Up91gToce0cf3R05El5u6gYyNQ0BKK/x/nNmjKwwxBmx8/eSNHiWsVLXlBJ/7UdTazcN3gn3bYEw" +
--           "FmG3pvOobRuScoc+ibEyF6GsUugrgEYuMGD4nqltmJjqFBkt+gcJ/ed0SZIA5crZ+gumrpQ0H319" +
--           "ogBFh6aJFoGmQguf2n7tu62HnvgJ1cPBcN3m6dAnX4CM4QAQigmxdQthm9EEJ58bY3bOl/CQ2YE5" +
--           "pu24LdBwZE7De+M+4gBAs/IntETphOHD4FOzNoNPbjuzBkn+48/9qKXywWPcM99Edvh2siPfHeyc" +
--           "nH8mU/pM2pJLsfshI0KCNRv7viiYYXW7sRnmxTFQhCp3G9/CTqzLsht3jtkrmGJdgGF0xmYpQx5G" +
--           "KBEInWdWSs4pnm6bLD3i95WJsDG7jmtiXFYwlmF2WXATmCPROE05IGa3G33sxPrsL014tGRMVo5D" +
--           "uVdirD/8zJBluQgC9qSF2JKcV9cuPwudsbq1YLqCydjYGOkSngYtKq36vJUs6jqhuqXtgCvursty" +
--           "uHOnSZIMWROnc/dR2J5pYAZO3tF0rOwvAXI/jvKZ/vN6zVNuHQGWjYNx/SWGiohtH9R1Y17HDRvf" +
--           "4XtUCEoaQwyGbEOr5QZ3HeeLbRwrosnRNB5lHNwpuBn+HK2KWFsLcd34scWpGJd5g6Ener61faoQ" +
--           "bOXk6OsWpycnP98yYdzMrLINxYks+3h1fvZlHfE6M6LXu0oa4mPko8s7TL70kuSnOmVIMxvW5n2v" +
--           "00111fF1htzXWiwpnrJAw8FbD60qXtHn9o9LUrJ6r2CUBoOnDpQeKxu0ncPhntgRwKLRcErUVd9t" +
--           "k1falinlvLLmLr7WHfndsh/t0WOdg9Dt1cOHTyrctWutRGzH5ZbNjcQ0FpEce+lMQwCnpMRqnSQ3" +
--           "Qu50hFIzMXJnSsjt+aI+fG/kiOwUStcFQuG9AMor0GUI0da6btoyKxIKnWKaXlR/zajFCYWlXNBB" +
--           "WslMKz+tpOEezkIxJtJzuvfl5ia1DCiQnuki6+MiXzRlR47s9Lwdaa1bCKAc4uscXnX5mwFvzdO6" +
--           "JnlQSv8lgiOUERZ1QYLG4PqJE+ZItl2y4MDB3wjma8/XnGiuavSuUMNhKNOshdyZkmViD7EAGBrX" +
--           "K9gzA1CYqPZEfEoAEK91eN3jTELIlRT7jnuhm9M5mxrmJZVNvjUio0VEC3Exr2ryLTbVCJI0/ZfL" +
--           "e/TI5ZusfbXbKAcjP2706msTQRHiH3pxa2ghgIlkU+9b91zqRA6OK6MIQh+nG8HP6wT4PPzD3n3z" +
--           "lxoRiohl5eVd/1G/qC2Ug8LBOcMYh5PYd6mqemTRJ8d88axb3r//NTkYT2tQ1e27W3yzo+aamh0k" +
--           "NoWIcfeJ1Ss8A2EU0xgqflEkYQBGBuYAe3hByAHiNVBcqyRdLzEjYLhpEGFk/CaHXFtZX79RD4WR" +
--           "Bl4plOWR3MhkbI0DMOHfFhNjaEK6Neas1D9Rg3qVHQFwLHIV9DkN01miaxD6LNUjQpKPMQLHl522" +
--           "jWAVtQxELTM7agBN+AdcGwYNvJREtDwjrOL5hQWpVf36TTtcVFRhGMaAlxsbpw+prCwt/fRTHoZE" +
--           "MVS1Sna5r5CUpKExisc0RVFix4BoKEFHlDES78dIcYjdf0FRhapqH5tQxAyTtiOwZHVTk3dWdnaV" +
--           "zFgv27a5RzfKlt6PAiOZFQWmrUTy2Y3WFntPdgruhXVWxIFRA2ZIBq9QqeP18PvlBPAtRq0gHGNQ" +
--           "uHbN4ej+qJDDmMZIaaZZYASC/MzTe1RScmmdqlZce/z4CLFfW7RoppWsSP1Wy7R5NeTpfMNnU+s2" +
--           "pGIZ2KC4oEGoOOCb/7aNpkKbWKsswhhoUrQZBmPdp/hXcWDUQCjIGZFByLB2Su9ogaUaRhAa8hsG" +
--           "DxXFCmlB8CBKleyhZynXiWkwv6VRpEVYkBtnBGq28bMPZcmjC0rKCxPLFqy4GDWbVwSOPemLGhvP" +
--           "SMJNlc2+es0fQGYo5HnH59sCoMQLWVU0LV4ISqHjf/obtbQQxCbMnPngRcM25MbCB5giDo+Hl6Xg" +
--           "qtVd6yqWeu7e91RyR++Rd28OthAUaLZRa+0Rrg+SNxQqD0dDyRx9lmqY6brOVDi7HFHV9/mWvV5z" +
--           "r63aSCF0yDOlcla7NZrFmA3AeH2E1052/ebi1ZZ6ej3oh8eZ2fe1vtPqOTi495SaHygOOc1/dOFj" +
--           "QnsYhdMw44lFaMysU6dOBCBvRcCB35fl+0X4am3COCaakdoVjVaoZgW1dESJnSd5hiz/7NU02Qbd" +
--           "4dpDYdLL7wizOLW5OGoRTAM+G0VCBrg0yDOMXRGJPB8GNpim2efF7Ozi9hgA4Hfxm0b53NbW/Zyy" +
--           "i7bQlyJBFjIjDF1ViKe29xhEJizP0Flw6S76klhfrX+j8C7dt/8BPRxpsGnGyqKfGRQ7O20OVr80" +
--           "NVT9bIMIBwhrygMsLr7RcKvT9bUq1zXLumVtdvaAs56V+GK+3UMXEK15HzU1jvANHa47/YIGJ2cT" +
--           "DmAWSIZtUdT9tiDpNjEQpZ1pJpumqiKih0AfSHTB2X7/2w2GsT4CNM8k5NlnPJ7Eyg+vT0+faVqW" +
--           "Z2tEu1cYaC3fQxsPnaS/swAYN2K/qnhQHpgAKC6/Xx6Qgtmkilo2Z9WHrFHQnO/Bf/rtoctPlOVM" +
--           "az35/pKIyhCAh6SUQre4H/M+L7lAqJl+RvKsVeHw0pBlntJME2VQunVzRsaERCfuyMzMfyszMzN+" +
--           "ak52XTQ2333prxdJzuyRXGSw7KjFEnlUwYF1zrROLbxO4umwcVOWkjV0z51YyXqaEQsR9djYQMX4" +
--           "TTwVQst8NiVlPqS+Upj0EAyZB9+tcB4ZByJ71V5C7ntcj550Q4KBTl7pvjFVmtbnYvSQ7ACcEZoD" +
--           "fTUwbgDE490fN6B5o5fRjdAXiDNBGKLwNVMLZnTJLPrDh1hypAFHAkTzXnNqc+GHfG75oYxVYN0k" +
--           "YEwQXPEAcuF9ZIH/01ku1/ChivJHkNCeMk8sCNXChCdhQr7+6uvC4RU4d8RJ1PRuV64JKdDSU3su" +
--           "HuHMuKJUcuWMhMU4QHwflWBHgFEb4tXuSs3gEaLV7bdDlXvU6rm7hKH8SobmmawohUNkeSDUghdD" +
--           "0vfXMrbnYdOoSij6Eg108TFje6EOMwbjwZ0zUHeXA5GGANoz6jm2VwCotikBcN7YpvHEtvrDnoqh" +
--           "t58kuzpDJcoPhQDO6YGn3+pTK/007QYUoClgOUHpWAUuldPV4VYYn8rXfMDpHN4NS4McOBpsJ7fZ" +
--           "9utrbNvLWYdzrq5H3PO+Hfmy8GCKaI7U7o/3wq6ObklOIkhykcD+sbuFMeKAcKYos8RvSczhEgLM" +
--           "EioJknDoTEznWLDNJb5RO2POPBfqf2frdFN3LAz6Im+agU9e+Xzn8HLod+dcueXnDk/vX2DZlQaK" +
--           "/ebpLV0miPmcCXs1xZySWC9JMA/Fz3/CeXZbgcTCIEVMqiSAkFguxQ0mX06IX9KueIuPpV/xPCS+" +
--           "ttQGnDMs6Tej8SaseF4LN9c9cnxNj6VxI8Q+3em9Hx+c3PmW1UDztMZtXVLEfdymbGAJ60kJGZQm" +
--           "tH99bE8YGN/wd/mgxdG7NFDb8/ZohryYA5HguHhI5uYO27vyoqtrmAiXr31JX/V48CuY8R8FJhxE" +
--           "eeEAQWk9HnYlFmMJoRKG03QLtUJ7/93FvpXXJ7wM/6Za4l71UEu5pWkoucv0Be0tm95vmUdy5t5k" +
--           "tpbPbe8B2vmsi7+rl2Nf4yVaUlLHSQXu7r8tw1JyT+ivhQBaAhZUxBSC5EPpPtMKVDzi3z/+HZHJ" +
--           "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" +
--           "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC"
--#ifdef XP_MACOSX
--  , imageHD: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIwAAAA4CAYAAAAvmxBdAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAGrFJREFUeNrtfHt4VdW172+utZOASLJ5+BaIFrUeXkFsa0Fl++gDnznVVlvFxt7aqvUUarXtse3Bau35ak/rZ9XT26NtfOvV6wFET+FYCQEKWqsQIT5RCAgSXnlnrzXneNw/1lphJSSQ8BB7bub3zW+LO3uN+fiNMcf4jTEX0N/6W3/rb/2tv30smtnXB3zmRi2FQakxQNKX3WkW9S/tgW3HLpmQM543A0BWVSHMYGIwOTDxzxrOf3/RQQfMZ2/SLAvKhTFVBGUqKFONH2QAzwOMF38awHhYZAxWAqhe/iszp3+b970d/sInc57vz/J8L2eMB2MAEYkBQ6DQ3dRw4dq7AUjcP3rAfPZmLWXCLHKoIAcQAUxaB5EaEfc6AEBhjDEwmcx43/fO9HxT4vkReBIAAZgjgodW3NcPnn1sHgD/iHknn+0d6s8XEUhsXXac/34WAAGw8afuT8GZ3X055YeSJcIsG+pMZwFn0UihezRofPt3G54f/0E8cNMN+Myo8jVTCgYd823PLzrPeIBnABiUQ1F+UoWsVOYb33mkoKp/7/dKyT0AGc47X4s0sjBEoLxbBqAQAMfWRfe38B4BM+VHUkYOs8mi1FrABbK4dcvK73zwp1M3xYPOxANKBqbpCdXNGb0UwPKRF74xpfDQ0t+K54+IvlKoahmAhaO/mv/ZmicG3tqPgT61ZM2dZMQJOYhIdByRM/F3dCCOox4Bc3oEliqyyNoQCPPusXceKZqRsigu7pwaWBowiRb46+f9Q1V2wl1nDx09/R7jF30x9adNlN8yPx4DHwht+B/cBIBoRqeIE4hE/oshTcB0wNbT6/o/zrhFyohR5ZxmrVWE+fDxdx4puhGAH4OkPe5B6pykeJAc/7cDEMZ/095Y870P339m+BXs2v4kbCFsm9u2vnpJ3bzR7wAo2B/R2v+PjSnyXcRxtOLUSXFxwAFz5i2SZUIVO82SBWye/vLOIwNvjL8OYqCEfXCmJAZPHkC7sK1REbj2+lmbq86qTVmmfuuyN2cTiREWKCvACgml9kDL7HQksehsZmSdA6yVpsa6P38v3swg7m4vN1dGXrThKGP8yS5fP33j/LEvxKDbl2f2A0YFCtkZQDOaPjLAnP4jrmBGjh1AVhG2ttxfX33++vjY2eeNXf/siLUAzgEwMJZrY2vF/Vu/t4BRqCqgCmj07wMVHXUCzJQfUlZE72ICnANcqNj21h8eiK1AX46gXh29KT9H+rd9XxBjYGCgig7QHOgjPgMAKigXQZYpsi4uCOc3v35zY2wF9ufGSgxA7fdd9g8ho9ol4P4ojiQWnSUMMANECrJNy1NWYH8eGfsEvJbLv1IK1XIAUwEtA0xplJMwjcaYlTDeShg8dOgjj6/cJxNYfWIWkHJoh5yyjkSZ8RbB89YBZq4/pXafGeuzb9WciXJxo2B2houqgAjABJCLOwFMqFv57+bBxMIAJm1det3avnl1OYCLAeSgWhofaY1QXQSRuYc+/OiD3QLmUzNdqTBKhRVMADsF5beuToXJB90KtFz+lVIVniXOVUAUqjpXVB4WwPjGTPB8/0zjeTnjezl43szmKy6vNkDF4MeeXNc3oJyUhfAMkJsJkSxUVrLos6o6z/O8Ucb3phrPzyHKeVTwkpPXseg3Cqe+1SfG+swfaw6KGTAoJ5eyGF3IBeEIJB2AcXxb0FI/L45uFQBMGiu6Z3ai9eqrclBUClFWVatV5GERNT5wEVQnQLUcIuVNX75kFjn60rA5c1d0AoywlkcxfdwZ2LSgbOmBZAv70povu7RcyFUqcZYdPbxix44fnLv8pbYUOWh+P3ZM9uJRo34xoLDgq8b3YTxvqhqsaPzyJTdmn36msjdyqPqkMhWqBFGZMtV8uDX4zMjp2zemyEoPgGn4zyOvGzy48A54GcD3Sz1jFrqqE+4uOOvdmb0ASlYEs5mQE9afUdhy0yv3lHzwya/8ZcjgI0+5yssU3QKYkgQ4Ivp60LL1n8kBQfOWuvdnj6uLldgHQKoKxU7HV/eg2y1XXXmXEs1U0ZVb29o//4k5c5P5eQB+s+68aVeUFBTcCxUoS6kRWfjhueecc9SfX3ytA9QTr7eVACqYFDYEwnbB2qcHHg6gLY6ODhpomi77coUyVaojhKH9+ZHzF/wqXiztEg34APxNX/jCvQOLCi83fpy8UsCJXHLYnGdn785S0uKTyyBUBXJZcW5x4bSN56ciyLQcD4Bf/+ThVwwbUvRb+JkoswqAWX5b9Lm1M3uSM/UnUiaCKiZk2blvvnxX0ePxuBNAmpMur51wyLBPzjVeBBoVwIXBk6vuP+SG+LkcuwkWAA96/JjZKnKxkACkkFb5Nztz220xX9bJlWi+6opKFalQlpqlmzZNu6B6SaJ0knKJ/DW5qd8p8TO3x6ABqza1EE06cdmy9wDAY5LjmBTMkQnUnZ42H0ywNF52aU6FK4UY5NySI+cv+E3MCnMM5HyqtwFoO3rBgmuDMFjGjiCOIEQwzH9c+7lzju+JTaYlJ2ehUqXMWWFqeurFxqsAFMVf25Ss9kTOEZdvebClJbxTyUGZoEzwlL/b9tzRX+pOztSfSBZApSqyIrL45buKnkaUJEzLCN5+csxr+ab6fyILkI2OIZYBlx9/2bYvpLgw2+EqKLKdwoceVKJp+tfuEpYKZcaW1tZbLqheEsbj3GV+oxdV3x0GwQZrHUIiWKIST3VmDG54zFrKrBBWiGgSyx9Uv6Xh0n/MKlGlOII4h80trQ+kuJt8HGklZHg6FZF/Y/uOb7O1YOvAzkGtKxmoehe6SYNEpkErwZIFC4I2fuLKf2tLtDOPzumPhA6wAPJDLt1yuzjaAEcAMUCMApXfvPP7IcO6gkYFs4RRpgy49qanUsAPu/T8W48e/YwL6S/kYtBYwM8U/yu6KVlQUShr9CkKyK7b1vDVy0qVeaYygaxbdeK85/8a/z7sYR3zgXM1gXUInEPoCEw8PR6z8YQxaidQPh6RrgrPEOZS4chKjFuydEEKFD1xQgrAnfO3V98Jw/B5dhFgmByU+MK/nnrq6K6gcQtPyqlIubJAibCxPv/fsVVNgCI9yGEAQdBq71NHUEdQIoBo5PBBeklazuQfSpYFM0UAFsDmd2yMf9+1XkUT3otc8AiRwpFChCBCI0detGbSLtYr5uw6tk26XctZwgxhRt65ZSmr1t389M1Jk85wzKcHRAiJkCfasDnI/0sMGN+jlLMrAigMhp0+f+TBBIw4milEYOcQBHZZAoZeEIgKgIIgeJbD2MqEFhxaDAFmdAWMisxQFigzlAUnX9e4rA9yeHuTna3koBQBRogxwOPvxNbQAAA7VHQEFKSQKEFIu4lA5d3HiiuFNB4XQZlhUHBK11QO0oRdD7ouROVCkeJZG7ak/KBOYHlz4sTy1WVlVY5oYego2+bs82+3tFw6YcVrp01dteqpxNfyhKQuGlxCMSsKBh570ABT/8XP5dhRVpyDWAd2Ns0O9yrhWdfcMpvCEByEoNCCwhBgvgBdM+PM5TH5FPW+1ZLo8de2viehe12dhVoHOAtDPO61O4o+kYCTnE5wVuGsxlzKHul7BUDKdomKgwpB2QHAyNiP2Dl+0Z2WRXZ9YP0F55WJczvX0jp09U3fLiurWD1+/NqQaHZIVNbu3O1vt7aM+fSqVRWXvPvu0pRldwAkQ5brjO+NMh0kgMIvGjYZwIKETPxIrYt1U5M8iThKJil9yZGc++ab298dP36Jb8wZohqhQHRErKEeAA6fG5FT5yIlYYI6tzfOvtiQni3MYDw0ChqEgUMyejyAdwGwDeW4ZI9FAGQOmwzgv/cERmZbDXhnKBNUGMJkUhGVduSSJJ1P6rw8HIalJo7ilBkchgCgL48fVzLceDc4kZnWUdap1AQi10x+660n4jXyk1M7ZXEZgHhMUkMO4NjphQGMf8h56Fx++ZE1a+1xZC2Szjs3sk9uUEhUbSMvP3LeyOGZ0tKJiearo1J1DHVRPYmS7JUcG2g1pxxUsooBnpmQWAOb10YbKGygcKFCZOC0XqxrRKokCBQG5euX77In2k1P+2hhWEZBAAoCuCCEcW7E2xMn/m6oYo0jyjnmuc3Off6UN96YMvmtt5LILSmQ61r3xAA0I+xqPBiIejAd1f7e2MPPfvm4LQs/89a+bP6nZuSzfsaU+T7g+UBixYQVRFGS01kFO22srRy0EgA4CEvFRHS3MANMY/fGbybmlQqAFSBVsCp8kWwCGA5dqefFShnnRV77ecHYU37iXuqLoB0tsuIo34v3NfJR1GlJsrnOuiXGy1y8k+rwxh573srSD/6rbLdra7yMqgjUCGAULR8uWr0LJPYAGApCeCbKNygLPKIxJ65YOSU+YpLUUCYGiqBzQVy3Ft1zbevnJl60UARqACgcVDo9ZZr63Mqua68QxlpmrWJC1FmrmLSKCFVktcpZrbKhzg4D26E5Lgjg8vnoMwwh1hU/dvTRo/qcDyJqcESw5Dp6o3XNHVrqLDSubAdFjuXwwWZcX+Wc9APboKxQUoiLurXaIYfCpjlCDsoxZ6OCouLRt+xpbY3nA8aDMR6E2+9vffOWxl02cQ+Bbdjevt7l83D5ABRaKNHYO484YmgMkoJ4jElCOL8Lz9NN87YumrRDxc2DElQZKgIVhZcZcO1hZ74wtK/H0thvtuXGXdM2S0S/ziQ1FPJiG7pHwvbgDhtKnQ0VNhCEeUHQLmiuf2fymieGvJGY8DCfX+yCEC5xWIlwtO+P6+s4VESJGS4+liwxKjZ/2FGRZvPhYgktxEZdHWOAr2P34ihWIQWTgJ2CnWJbo9Ymz1g/5+h1QsF9wgKJ19Z4hV874fKNE3cnx8v4V8H4UOjqhvce+zW6qdWVlOvSjQsDlw/WUT4A5QNQGIJDizMPHXR+CiRBb4GSzlYr26Z7vYKSC42nUOPBqA9VU1I0ZOJPEYWj1NvVW/3AoEUAFgO4IzZ1hYk2jf9WUw7IjCIXHUVhXrFp/sQtKZPIoXXr/PjoSkZeoHo6gP/bFyeciECqcHG3IrXp37a2SF3xQNPxRAXgq5nS1bHsDWCYALYAu+h0W/impI8Pad9ec/vAoWVTjV84Nsn5FAwcvmDMN5rOqf1jyatdHzjuGjvThloKYH3b5qVXt77544ZuN1QEKknF3a6ImfDee4tWjBrV6R5Qoeq1AP6Avaxx8gDolhdPXAh2qzQmZFQ4ZhALrj/mvLpT+qhxya0BP5VVZQBkA6jNR0AJ2xUUcjKGjsx4k3PVYUwaJU6rJ3reLiHlHppjBjF3fLYSzU/noEZ83611VusoVJBVsFWAdezim/3jemSFe+SNIsvCpAhCXf7TBZI+PnTr4nO2t2xcME3ZroYKIouEEqDoxfHfav/GxOttFgBOucGWll0XVqrqXYDWNLz3aG7bsovWp4i2TvkhScLqNBezq/M/zxLBxV2Yx/75yCPP6usc04CJ+B3bcLMwQTiK+0UIwgz1ip8+4pyaYX0x0SnWMkjnYGygkm9nBO0MGzoI2TTDyQBw7ubNawPmeZYZNt5wZhrxX8OHX9yXSTJzGcVgIWasbs8/hc7XRzXM670cg0Vs5H+MHm6u74ucrb/KlAlFPoySoqFFn+rm+OCGV762df2cYWe4fP0M5qDWhoowRIm1/h+s1YZx3wrVOV1LDhXMaGzfXntF46vXtMQRS/clsqRRT9SNd0GMBo6edRStZbKeg4D//ciQIcP2CTDbqsdVKQePq1JMFkXxv4qO9AaMfPGoaeuG9kXp0LkU0wGgMFC1gYAdAeyg0m3IrE3W3mtTvodjRpHq9X3xL4h5Qsq63P/z9ra6LqScvvmBPkwOTex2lnf4wNee/47fa99NGGVJ8Zl1qP3UPfwkdr15mDDV+Y3Pf+Kh9c9kz9pee89J7dvevaRt+7qLbVv47y5UUKggp3BB/okNz0/aHI8332OaIgELxWDpptQtt6X+Qcu03nVYGQYxjxzl+7/eGyvjdYrCtv31JiW7QTjy6qWj83jF4AeP/MLaodiHRtZBXAihEEIWkq4eSgGmvKGhqpX5d1YEVhiWBaI6Zf6QITN7s5ELhw4tZZavkwhIZMOC1rZfo5s64nPv4+1NzXot2/hYiqKckglH4/7eRojCOospSt6u2ijfS1Hv3I0SdVy5aam9ecumBeOqN8w7aRkxSlMVdRDmRHa4m5xWPKPEusUA6maIrcy/cCKwInASKaCoXrlo2LAH+xpMpAEjLauu2ObaNnxVmZqUHaI8SaR+KnIhTPHCo6ZtOn6vk4qUPNNGnV2PJ0ptENweMq92zHBMcMwwIrfMLS6etKdJEnMlCYOZm9YE4dUPkWvsIUckJ/+SZwd5PCEOEBc5rh7jgrqf+VfvSc7mO/xZSihVAra3YMY/PqqrUhZVe7C8yRHTBqAVQJuQN5idgJ2ASQAz4PJjptWevKc0RZQ0TQATRWDd/dmFDQ2VeaLH0z4dRVTK9EXZ7IqFJSXH7W6eLw0blntp2NAydGOSqPGVs/5mW9ZcJGKbRSxELIRDCFuIuAmiBa8eMW37rcdc1JDtM+3PYdSp43k9/ulPgmDrsnz+vFBktRWBZYEVKSlUfeH5wYPP7u5Hfy4uzi4oLq50IjkSaXrf2vIfBPnV6PlKiwKg0XfyNe2BPkmJ8+oUGeh/bLjNu7En0Gy+w5sppLcyKRra9IZJ98hTvciop9MPSSFUwGTnEjHICsgpyKHYHzjquWMvrJ+wewUENPFjCIAxk3uStyIMbw5FVieWJvJpBE5kgqq+X1VcPGdRcfHMxSUluSUlJbmlUZ+1tKRkLRGVnrZ9Rw12rSLtsDpFg8vmfbpw0HH3wcuMMSaiao2XAbwMjPFhPL/ReN6DfsY8tHHekN0WXR929vqsCpWruFshPEqFo3IyADuWTxgea1rYTbRVeEMmc+SnCwp+OcB4l3kmLq0D4BnzkA/MMUBjvDMXC1DBqlkCFr9N9E//HIZpPyDsQVuTFwsMfP273k8GFeLbvo9izwe8DGA8VMPgIc/D2piALlPFDGWUMqNuazOun/RbeQU7L/zl0cfC+SPOXjG84NBRawCvJNoSE7PiBgr5Xx/MKf7jLnzIbUPKlHVF5C11KgJfD9+shY8Vxjd30780rEvP8bFDDvnVQGO+lU5MeTDwzM5aTbOzNyrw/XNbWx9JFLknk+sjqjobUHJq9XS/cNj3jZcZAc9PwBIDyAeMD2O8RhhvpTFYqYpGqMQOM2UhlFOhsvjfgNJ6ofxyoZaXbHPt8mDNjDU9ACYBbyGAAT/KZEZ/MpO5qciYyRlgROeJGSh0nQCL21Ufmx4EL8dMpqScRt4DFVAAYMCtORx+0Rhz7aFF+GJBBmNM/JKklGo1KlBtHZ474U79P9hZOZcQYb0unD/mwu05qADCZwE4C8Y7I3kTk4kFx+mUuzfMKf5e+rn+rUMq4PR4hFII0gw0xpdvGAWGoDqHf9m8IuV8m2Qtf1pQMPok37+50JhpHlC8EzwRcAzwOqs+Vkv06I+da04nInd3RvuxgCIAhcUTF5zvFQ79oucP+Cy8zIjE6qQnt5Pviu5IqAogVKNCNSrBUte6blnrqi/Vo3O9rI3Pc7cbP6sgGQcAf7rvl3zK908uBKjAGK5jrrmNKKHj/RS3E6L3V2USLUzkZAB4i75pTivwwQMyoKYQ685+QOtScvzUHPbIlJ54ZVsuDPTrZDmnQqUQggo1qkoNRDyFeJ6XGQfjF0fW3O9YWxW6adNzw36Dzm/JKEJ0k7QgtfiSygd1vSrkdZ3jlb6fneT7Y+MN1xrmVX9gbkw9q1MdsemFU5wkpwqSRSw49gfZAcPPHOsVlIww/sBjjPEVnqfGZEQlWKVCjWK31TW/dv56pCruU126TGxPl+USIrAgNQ7TQ+pNukQqfalLNimApvMt6CZMTvsiu3VOJ17XnrNWZ9m85oK8Qmz4sFB+CeXrF29dfOqG1PwKs6fOKyvKjrnb8wrHGD8TWfCOEoX85zb96dgXY9leN2NM+y3SJZG4u7XsSldIykFPz09NHxbRT2U3M11AsKf8aRqtnBqQoG91oWkGOS0/XaQo2Pf3u5mUDK9LukD7Mv5Tv9teSQ4VzipsINUtW9Zct/mFiRu7WbcOuQNP+MXQ4hGX3mEKBl1mjB9bbwAqSz6cf+TZ8Qaabta/u6hM92ItpZs5dvyor5R/dwvp9QAa6eFzfxRlpVMk2mXh93czeyPn1Bn5ShWtYAJsyEve+OPgC7Hzmgx3USDtejQedlbtDX7h0Ns6HChV5LcvP7rpb1+qx/690dHrtewL05c2c7ZLtrM91fOpDGjXyvT9+WYBPQAg3NPcey1n4vVtFUJSIfGNjJZNy2ekkqzpazIJOefSoTaA9q1VY+5Wbvs9NAoYVBkFh5Sesi9lJ/u6lt5+WETpoi2MPpZU/k9szmKGtVGRWBjQ6g3zP78pxfSGKb+tJ4LPAsi31S/+uXCUlVZmCIc+DlI15L4Cpr/1FA1d0VLqAilzgcCGChdQc5eoTXqpkNS66hv1YLsUElURiG1sOZj7lunf3v3fwlBKjRfX9EjEHKcscV98D40zRKIqgEpz4yvTVnfjU/VbmL/r4yhwTTbPCNsZNi8g50/OnvbCsXu5wQqVURCBuOb7seu98n7A/L23Tc8NX8mW6pL73UoOhYPH/GJv/I7Dzlqbg5pRUG1q++A//+Ng+4f9gDlATVzLHfErZiHioKrnH37uhgeG597sdYnIYeeszypQqQawre9dHNbd0Yj9/5KnfsB8DJpuXXj8Q+ryj3dUZglD1Uz3MsWvHX7uh1fv6QGHn7upAmrWQpEV2zSt+bVptamw+6C9VaP/hcoHrvkABgydUjPLywy6Oboh6HW6PgLjLYqStqYRQHKDMQflMhXOQrnata27tvGvufrEn8ZBfmdPP2AO7NpmAAw85B8qTyjKlt1svAHTjPGLk4w0jAcTAyllnBoh9Kxw/tEdS8cuT0WyH4vX1PYD5qMBzQDE2eFDxz09zsscWuwVHX6a8YwaFAiMNAkHr4vdUdf82rQN6JwnSl4N4vAxeKdxP2A+mjXuKTvcXcY9TdOnyxPk4zKZ/vbRAqe75C3QfZZY0P/y6/7299z+H4QrdGsoib8JAAAAAElFTkSuQmCC"
--#endif
--  , params: "source=hp&channel=np"
-+           "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" +
-+           "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" +
-+           "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" +
-+           "RRQFY4gWaQZQUJFwCUhISHLzuo9zzj67Hy4Cd+RD6XDBD90z59uZdX5rrf96nC24xkd7jtlb/7VS" +
-+           "da6jQEYKQiA8nUwlzcm39oWfXnvuWn5LXCtDyk6V9N6x4FGvu2ceydQw7amA8PsNAO04rvD7E8KQ" +
-+           "HxlTqncWbnnu0c8MfM+C+mfVh8fv144jfXPuwJoxA5QLUoJS4Gm0cnF27cY52IKsGOFas2ofDP/q" +
-+           "yT/cMPieurmjvb7BfdhOuTl1CtbM27FfehnnjTdB6+yXLQv/nfMwqqqwd7+COtWGHDKkMfit+xYH" +
-+           "V349fl3hu2fPne6dOv26UXWL36qdjtO4H/ffLWBZYBgIkW1aaw1KIQwTY9IEzPFjcfY1opXXWdS8" +
-+           "t0wI4V03+PPjqm1z0kTLml5D4hdrIBRC5ueh471opUDKTzlw0QlABAIEVq4gtXELsqT4fNH+vaVX" +
-+           "yyD/F/Cu22a2GUOHWOb4sQw+9jhCCNwVy8k/2Exh6zEiL2zBP6cOhMg4cnm0hEAIgU6lSG36I8EH" +
-+           "v4Pu6y/pqZu/PueR75k5Z40biz2ct3oVid+tg1QK7XlQ+XkYNZLQN+4lWDcbPA/7zztIbdmK09SM" +
-+           "yAt9OgtKIaNRAl9dSnLbdl18+J2wEGIgJ/D9q38UTv1pR8z/pTmFWinsV19DSIl2XOTSeoqeWpsl" +
-+           "j09kM/DIT0lt3IQwzSvKyJo0AW3bYPnejv69oSYnskm/uHsWEPEvXYK98x9gGBmAihFEn3yMWDxN" +
-+           "v62ywPvTinP3fRsqKtBXip4QqLPtyLIyvFNt07TWMifwwm8u9dXOEKmGv4A/gAA0IKtvpVsZ9KYV" +
-+           "QTO7UC1DUHZTOaG7F2d6/hWO19GJMfxzeL29xO9e/uOcwOu0PducUo29Zy/CMi/qTuWFKMz3Ma4k" +
-+           "wJneNN5lPT5gSp7Z20bnvEXgumg0WpP14HlopTKySiTrcwM/mChGCoTnwWXRdfv60I7L0XMJxjze" +
-+           "RMLObtnn+9OoqjGgTUhIZL7CrEohIypjRgjUqVPIMaPxunvK/lse86pkEwrlXRBqdtrbTqNTKaqG" +
-+           "5nP8J7cT8sks3f980U1AF/0L41izbMzKNKJAkdxcTLohkmmpPXFkaSnuB8fNnMBj2y5CWGid5YBx" +
-+           "tp1ET5xIOExFNPDJeonu24n38SqEHQMg72EDr89AfeQj9fxQnJYQWBrQiEAAkkkIBr3cwLtuHMMM" +
-+           "ak8jjMuKsqOTwY4OIiMrLkksdQgduwvdaZHYPgwZcfE6LJzDQVSrD2FqxAVO7WmM4cOxm5qRxUWD" +
-+           "uek20Wird+YMxpjKi5NTC4FQCrvlUNb4xyiBYCXCL7D35ZPcWEz6n2GwBf76OP5FvWhHZEpea0RJ" +
-+           "MbqrC5Rqygm81xPfYL/+BoEV90A6fWnKmSbqrX+hL/RtAOEbTnrPQ6RfihD+dRuR52IUvnCCyLMx" +
-+           "Aov6UCf8F78u8vLQA4MgJb6vLN2WE9kYI0c0qw8+tIXf5zMqKlAdHQgpQUqCh48woBQFFwYXgE4G" +
-+           "SawvRmwqQg51EHkeXp+B126B1AhDAwI5rAwViyFLSwbyf/C93TmJfFHjniOypORo4olfEvjuA5d2" +
-+           "dinxn4zRf64jOzITxyJ8mYKk3cQ94cc7b4KpEUYmb9p28N85D/e9Y1g1U1fmdKs0J0/+snYc7R46" +
-+           "jDV9Gtp1M51HStz9zbTbJzkaf4/OdC/p2qkMhH0cmhhm/iOjcE0QaITI1IZ2HPzLl+G+exRhmrGC" +
-+           "36zdcVUsVwsfeX7Dma6pMx+wX35lXWjVQ2DbOM1vIywLeeAg79c6bDj+NzpUlFHBCAM/HI0oD/KO" +
-+           "GKS11MfYM2mUASiFf9kSdFc3duObnlU9+R5a3sr9Pl98oHG9CATWDf7sCXwLF+BbOB8MA1/LYVwv" +
-+           "YzKW+Ji23pO0lucjTYnlaoS+tEn6Fi4A18VuasJXM21lYcPW5uv6D3t+0m3biceX+ZbUC1GQj9vV" +
-+           "w7HVc9iXfpfKwhqmRW+hPFRG1zNP07Dr9yxr9RMYPwFj/FjUsfexG/e71heqv1nYsHXzDbk96K6u" +
-+           "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" +
-+           "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" +
-+           "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="
-   }
- };
- 
-@@ -78,7 +49,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 = [
--  "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1"
-+  "http://packages.debian.org/experimental/iceweasel"
- , "https://www.gnu.org/software/gnuzilla/addons.html"
- ];
- 
-@@ -141,10 +112,6 @@
-   if (searchEngineInfo.image) {
-     let logoElt = document.getElementById("searchEngineLogo");
-     logoElt.src = searchEngineInfo.image;
--#ifdef XP_MACOSX
--    if (searchEngineInfo.imageHD && window.matchMedia("(min-resolution: 2dppx)"))
--      logoElt.src = searchEngineInfo.imageHD;
--#endif
-     logoElt.alt = searchEngineName;
-   }
- 
-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	2012-11-20 00:45:50.000000000 -0200
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-28 21:45:00.486713730 -0200
-@@ -3,25 +3,18 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo HTML
- 
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
--browser.search.order.2=Yahoo
--browser.search.order.3=Bing
--
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
--browser.contentHandlers.types.0.title=Google
--browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
--browser.contentHandlers.types.1.title=My Yahoo!
--browser.contentHandlers.types.1.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 
-@@ -30,20 +23,10 @@
- # don't make any spelling errors here.
- gecko.handlerService.defaultHandlersVersion=3
- 
--# 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=http://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
-+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
- 
- # 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
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
-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	2012-06-01 09:03:48.000000000 -0300
-+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in		2012-06-15 22:54:08.446274144 -0300
-@@ -11,13 +11,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://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D" ID="rdf:#$GvPhC3">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://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre</A>
-+        <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Packages</A>
-+        <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Wiki</A>
-+        <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Labs</A>
-+    </DL><p>
-+    <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3>
-+    <DL><p>
-+        <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A>
-+        <DT><A HREF="http://libreplanet.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC/v78AAAAAAPLy9ABsbakA/f3+APn5+QC6ur0A6urqAEpLbQACBLQApKW3AAULuQDMzMwAGBiDAL29vQCgocsAgnzJALu82QA+PpsAAQOvAOjo6ADZ2dkAysrKALS0zwD5+foAAgKRAAYGdQD19fUADhOjAAQJyACrnqIAxMTLAOnp7gDm5uYAzczNACgobwDg2dEAQkaeAA0RkAAUFnEA0MvQAIBzgAANDYsAk5OyAOTk5ADy8vYA1dXVAD8/cADGxsYA+fn7AAMHvgBzZnQApqauAAEGuQDExMQAAAGmAAoLmgADCMQAxMTdAAwPlwD+/v4ABg7MAF5ehADg4OAA0dHRAAAAoQAYEXAAwsLCALCxwQBnadkAAQGWAPz8/ACgoLgAbm6RANvb5wDr6+sA0dHSALe3uQADB8AAzc3NAGFhbAABAZcAOTtlALi4xwAAAJoA/Pz9AAQHnwADBJcACQl4AFVa3AChl6EAAgW2ABscdAABAq4A2NjYAAAAmwDAwMoAAQKmAAcMswDR0eQAAQSxANvX2wB4aXcAAQGpAAAAkwDW1tYAAgSpACIZZAAAAaEA+vr8AKuirAACBbcA8vLyALOztgADBZYAAACcAAACpwAEA6QAAQKnAPT09QD///8AvL3UADIpigDw8PAABwWOAK6dogBub4kAiozDANLS0gAFC8gAAgW4AP39/QAAAJ0A0NDQAMHBwQDp6ewACg2RAAIFqAAKCokA+/v7AAkOnwAAAaMA7OzsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4eHh4eHh4eHh4eHh4AXh4eHhlbikzZlooeHh4eAF4eHh4hX1JVFweInh4eHgBeHh4XmlAGXNGSB8VeHh4AXg8LhaGcV9zKg0wQF54eAF4K0NNOGthjXNCUwAMS3gBPC82iW+CCRN2Iz4wTwx4AW0GgCc5OU41VnSKTBoOiwEFTz8hHIF5RANdQVRfNIMBeBUhe0o9jB0Pcjdzc1E8AXgsB3AbUlkQRVtnhHNoeAF4i45wJCAlYjJbdYRfY3gBeDwmEn4XMToKZDd6WDx4AXh4VTsIfwt3FGpsfAR4eAF4eHgEEYhQAodXYDx4eHgBeHh4eHg8GC1HPHh4eHh4AQABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAA%3D">LibrePlanet</A>
-+        <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</A>
-+        <DT><A HREF="http://www.h-node.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC7zrYAWYhNANjj1QA9fEcAEEwBAHTQkwAeVRkAPXMvALvOtwASVQEAHFcUAH/bpgB60p8AKnQmAGO1fgAjaRwALmA1AA5EAQDM2sgAN3ApAG7EjgC5zbQAVJxrAChwIgC0ya8ALmczAHXJmQBNf0EAgd6oADhwKgC8z7cA7vPtANTg0QANPwAARIhSADtyLQBzzpQAus21AEeKVQDC070AieyzALzPuAB93qEALGYvAO/z7gBEiVAAasWFAFuJTwBKil4AXotSAEuKXgAORQEAD0gBABlDFwBWpmoALGYwAGCNVQAbYBAAHGAQABBOAQCI6rIAjPG3AB1bDgAaXg4A////AGaRWwB/2qYAUYJEAEx+PwAZXAwAm7eUAD51MADN28oAJmwhACRiFAAzeTYAasaFAB9eDwBkt34Aus62AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPT09PT09PT09PT09PT09PT09PT0OIjALPRQmMkI9PT09PT09OkcHNQU+Q0oQPT09PT09PToVGDQtI0ABKz09PT09PT06JRg0Nh1ALxk9PT09PT09OiUYIS4TQC83PT09PT09PTpPSDsGG0BEAz09PT09PT06T0BGMRIsTRY9PT09PT09OgACJx8gQwooPT09PT09PToICAkJCUkkPT09PT09PT05HggETio9PT09PT09PT09Px4IERw9PT09PT09PT09PUUpCDMMPT09PT09PT09PT0NOEEEGj09PT09PT09PT09TBcPSzw9PT09PT09PT09PT09PT09PT09PT09PQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%3D">h-node</A>
-     </DL><p>
- </DL><p>
diff --git a/~emulatorman/iceweasel-libre/mozconfig b/~emulatorman/iceweasel-libre/mozconfig
deleted file mode 100644
index 8b5e52d9e..000000000
--- a/~emulatorman/iceweasel-libre/mozconfig
+++ /dev/null
@@ -1,49 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-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-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-startup-notification
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
-
-# Iceweasel
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=debian/branding
-
-# ConnochaetOS
-#ac_add_options --build=i586-pc-linux-gnu
-#ac_add_options --host=i586-pc-linux-gnu
-#export USE_SHORT_LIBNAME=1
-#mk_add_options USE_SHORT_LIBNAME=1
-
-# Parabola
-ac_add_options --disable-safe-browsing
-export BUILD_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-
-# Build-generated
diff --git a/~emulatorman/iceweasel-libre/mozconfig.pgo b/~emulatorman/iceweasel-libre/mozconfig.pgo
deleted file mode 100644
index b0c249ebf..000000000
--- a/~emulatorman/iceweasel-libre/mozconfig.pgo
+++ /dev/null
@@ -1,4 +0,0 @@
-# PGO
-ac_add_options --enable-profile-guided-optimization
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
-mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
diff --git a/~emulatorman/iceweasel-libre/replace-urls.txt b/~emulatorman/iceweasel-libre/replace-urls.txt
deleted file mode 100644
index fc13e32fb..000000000
--- a/~emulatorman/iceweasel-libre/replace-urls.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-# These are replaced in order, so if one is a subset of another, the smaller one should be last
-# 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/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html
-
-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?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             https://gnuzilla.gnu.org/plugins/PluginFinderService.php
-#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"
-
-# hack: these aren't URLs, per se
-(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html
diff --git a/~emulatorman/iceweasel-libre/shared-libs.patch b/~emulatorman/iceweasel-libre/shared-libs.patch
deleted file mode 100644
index 1f22b2b0d..000000000
--- a/~emulatorman/iceweasel-libre/shared-libs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in
---- mozilla-release.orig/browser/installer/Makefile.in	2012-07-17 16:19:29.480356991 +0000
-+++ mozilla-release/browser/installer/Makefile.in	2012-07-17 17:32:41.250937293 +0000
-@@ -50,7 +50,7 @@
- MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
- # Some files have been already bundled with xulrunner
- ifndef SYSTEM_LIBXUL
--MOZ_PKG_FATAL_WARNINGS = 1
-+MOZ_PKG_FATAL_WARNINGS = 0
- endif
- 
- MOZ_NONLOCALIZED_PKG_LIST = \
diff --git a/~emulatorman/iceweasel-libre/vendor.js b/~emulatorman/iceweasel-libre/vendor.js
deleted file mode 100644
index 865bfaec7..000000000
--- a/~emulatorman/iceweasel-libre/vendor.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default browser checking.
-pref("browser.shell.checkDefaultBrowser", false);
-
-// Don't disable our bundled extensions in the application directory
-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);
-
-pref("keyword.URL", "");
-pref("app.update.enabled", false);
-pref("app.update.auto", false);
-pref("dom.storage.enabled", false);
diff --git a/~emulatorman/raider/PKGBUILD b/~emulatorman/raider/PKGBUILD
deleted file mode 100644
index 360c3248e..000000000
--- a/~emulatorman/raider/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: M.Carreira <arch@carreira.com.pt>
-# Contributor: M.Carreira <arch@carreira.com.pt>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
-pkgname=raider
-pkgver=0.10.0
-pkgrel=1
-pkgdesc="Converts a single linux system disk in to a software raid 1, 4, 5, 6 or 10"
-arch=('any')
-url="http://sourceforge.net/projects/raider/"
-license=('GPL2')
-changelog=ChangeLog
-depends=('mdadm>=2.6' 'parted>=2.0' 'bash>=3.0' 'coreutils' 'util-linux' 'hdparm' 'cpio' 'inetutils')
-install=INSTALL
-
-source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('9150128c1cd5c58709aa0a5dd0e4c6b0')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	install -d ${pkgdir}/usr/lib/raider
-	install -d ${pkgdir}/usr/sbin
-	install -m 755 -t ${pkgdir}/usr/lib/raider src/lib/*
-	install -p -o 0 -g 0 -m 755 src/sbin/raider ${pkgdir}/usr/sbin
-	install -p -o 0 -g 0 -m 755 src/sbin/raiderl ${pkgdir}/usr/sbin
-	install -p -o 0 -g 0 -m 755 src/sbin/raiderld ${pkgdir}/usr/sbin
-	install -d ${pkgdir}/var/lib/raider
-	install -d ${pkgdir}/var/log/raider -m 777
-	DOCDIR_INST=${pkgdir}/usr/share/doc/${pkgname}-${pkgver}
-	install -d ${DOCDIR_INST}
-	install -m 644 AUTHORS COPYING ChangeLog FAQ INSTALL README TODO ${DOCDIR_INST}
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD
deleted file mode 100644
index 42b5e9a46..000000000
--- a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Contributor: Gökmen Görgen <gkmngrgn_gmail.com>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
-pkgname=xchat-xsys-noaudacious
-pkgver=2.2.0
-pkgrel=3
-pkgdesc="Sysinfo plugin without audacious for X-Chat"
-url="http://dev.gentoo.org/~chainsaw/xsys"
-depends=('xchat-libre' 'pciutils')
-arch=('i686' 'x86_64')
-source=(http://dev.gentoo.org/~chainsaw/xsys/download/xsys-$pkgver.tar.bz2 xchat-xsys-parabola.patch no-audacious.patch)
-md5sums=('d57def00f96c7389ab593c009595f6f4' '4d22883f24606dbab588d685c553e5a1' '588e5f6d9037a07385079a5cf6ee2dbe')
-license=('GPL')
-
-build() {
-  cd $srcdir/xsys-$pkgver
-  patch -p1 -i ../no-audacious.patch || return 1
-  sed -i -e "s:/usr/share/misc/:/usr/share/hwdata/:" Makefile
-  sed -i -e "s:-O2 -Wall:${CFLAGS} -Wall:" Makefile
-  sed -i -e "s:#BUTTON:BUTTON:" Makefile
-  sed -i -e "s:# FOR AUDACIOUS # ::g" Makefile
-  patch -p1 -i ../xchat-xsys-parabola.patch || return 1
-  make || return 1
-  mkdir -p $pkgdir/usr/lib/xchat/plugins
-  cp xsys-$pkgver.so $pkgdir/usr/lib/xchat/plugins
-}
diff --git a/~emulatorman/xonotic-data/PKGBUILD b/~emulatorman/xonotic-data/PKGBUILD
deleted file mode 100644
index 9ed60c78b..000000000
--- a/~emulatorman/xonotic-data/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $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@parabola.nu>
-
-pkgname=xonotic-data
-pkgver=0.5.0
-pkgrel=1
-pkgdesc="A free, fast-paced crossplatform first-person shooter (data files)"
-arch=('any')
-url="http://xonotic.org"
-license=('GPL')
-depends=()
-makedepends=('unzip')
-source=("http://dl.xonotic.org/xonotic-${pkgver}.zip")
-md5sums=('cdadb384ccf9cad926bb377312832c2f')
-
-build() {
-  cd $srcdir/Xonotic/source/darkplaces
-}
-
-package() {
-  cd $srcdir/Xonotic
-  
-  # data
-  mkdir -p $pkgdir/usr/share/xonotic/
-  mv $srcdir/Xonotic/data $pkgdir/usr/share/xonotic/
-}
-# vim: ts=2:sw=2 et:
diff --git a/~emulatorman/xonotic/PKGBUILD b/~emulatorman/xonotic/PKGBUILD
deleted file mode 100644
index 22b0fa4ac..000000000
--- a/~emulatorman/xonotic/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Alexander Suhoverhov <cy at ngs dot ru>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgname=xonotic
-pkgver=0.5.0
-pkgrel=1
-pkgdesc="A free, fast-paced crossplatform first-person shooter"
-arch=('i686' 'x86_64')
-url="http://xonotic.org"
-license=('GPL')
-depends=('alsa-lib' 'curl' 'libjpeg>=8' 'libmodplug' 'libvorbis' 'libxpm' 'libxxf86dga' 'libxxf86vm' 'sdl' 'libpng>=1.4.0' 'xonotic-data')
-makedepends=('unzip' 'mesa')
-source=("http://dl.xonotic.org/xonotic-${pkgver}-source.zip"
-        "xonotic-glx.desktop"
-        "xonotic-sdl.desktop")
-md5sums=('7382f195386b8e51df65e57e6be413e5'
-         '914c7b9163e92b35f0ab57fdb1653ac5'
-         'da7d812ff231c9332cd694b39757adda')
-
-build() {
-  # compile Xonotic-flavored fteqcc
-  #make -C Xonotic/source/fteqcc
-
-  # compile QuakeC game code
-  #( cd Xonotic/source/qcsrc/server && ../../fteqcc/fteqcc.bin -O3 -Ono-c -Ono-cs )
-  #( cd Xonotic/source/qcsrc/client && ../../fteqcc/fteqcc.bin -O3 -Ono-c -Ono-cs )
-  #( cd Xonotic/source/qcsrc/menu && ../../fteqcc/fteqcc.bin -O3 -Ono-c -Ono-cs )
-
-  # compile engine
-	make -C Xonotic/source/darkplaces CPUOPTIMIZATIONS="${CFLAGS}" DP_FS_BASEDIR=/usr/share/xonotic/ DP_LINK_TO_LIBJPEG=1 cl-release
-	make -C Xonotic/source/darkplaces CPUOPTIMIZATIONS="${CFLAGS}" DP_FS_BASEDIR=/usr/share/xonotic/ DP_LINK_TO_LIBJPEG=1 sdl-release
-	make -C Xonotic/source/darkplaces CPUOPTIMIZATIONS="${CFLAGS}" DP_FS_BASEDIR=/usr/share/xonotic/ DP_LINK_TO_LIBJPEG=1 sv-release
-}
-
-package() {
-	cd $srcdir/Xonotic
-
-	# binaries
-	install -Dm755 source/darkplaces/darkplaces-dedicated $pkgdir/usr/bin/xonotic-dedicated
-	install -Dm755 source/darkplaces/darkplaces-glx $pkgdir/usr/bin/xonotic-glx
-	install -Dm755 source/darkplaces/darkplaces-sdl $pkgdir/usr/bin/xonotic-sdl
-
-	# convenience files
-	mkdir -p $pkgdir/usr/share/applications
-	install -Dm644 $srcdir/*.desktop -t $pkgdir/usr/share/applications
-	install -Dm644 $srcdir/Xonotic/misc/logos/icons_png/xonotic_512.png $pkgdir/usr/share/pixmaps/xonotic.png
-}
-
-# vim: ts=2:sw=2 et:
diff --git a/~lukeshu/git-svn-abandon-git/PKGBUILD b/~lukeshu/git-svn-abandon-git/PKGBUILD
deleted file mode 100644
index 8df4de38e..000000000
--- a/~lukeshu/git-svn-abandon-git/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=git-svn-abandon
-pkgname=$_pkgname-git
-
-pkgver=20100319
-_gitver=42014bf555fdac67c8c82ed69c4733ab9dba0c8a
-
-provides=($_pkgname)
-conflicts=($_pkgname)
-
-epoch=1
-pkgrel=1
-
-pkgdesc="History preserving svn to git migration using git-svn."
-arch=('any')
-url="http://blog.woobling.org/2009/06/git-svn-abandon.html"
-license=('MIT')
-depends=('git')
-makedepends=('git' 'python-markdown')
-
-source=("libre://git-svn-abandon-$_gitver.tar.gz")
-mksource=("git+https://github.com/nothingmuch/git-svn-abandon.git#commit=$_gitver")
-
-build() {
-  cd "$srcdir/$_pkgname"
-  markdown README.mkdn > README.html
-}
-
-package() {
-  cd "$srcdir/$_pkgname"
-  install -d "$pkgdir/usr/lib/git-core"
-  install -m755 git-* "$pkgdir/usr/lib/git-core"
-
-  install -D -m644 README.mkdn "$pkgdir/usr/doc/$_pkgname/README.md"
-  install -D -m644 README.html "$pkgdir/usr/doc/$_pkgname/README.html"
-  install -D -m644 LICENSE     "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
-}
-
-mkmd5sums=('SKIP')
-md5sums=('c5dfb150c2613d963b17c1e0d80eb115')
diff --git a/~lukeshu/openni-all/openni-git/PKGBUILD b/~lukeshu/openni-all/openni-git/PKGBUILD
deleted file mode 100644
index 7ac6abb87..000000000
--- a/~lukeshu/openni-all/openni-git/PKGBUILD
+++ /dev/null
@@ -1,286 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
-# Contributor: bugix
-# Contributor: Lubosz Sarnecki <lubosz at gmail>
-
-# unfortunately we can't use $_suf in function names, but sed makes it ok
-_suf='-git'
-pkgname=(
-    openni$_suf
-    openni$_suf-docs
-
-    openni$_suf-core
-    openni$_suf-core-samples
-    openni$_suf-core-samples-source
-    
-    openni$_suf-mono
-    openni$_suf-mono-samples
-    openni$_suf-mono-samples-source
-
-    openni$_suf-java
-    openni$_suf-java-samples
-    openni$_suf-java-samples-source
-    )
-pkgver=20111121
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://www.openni.org/"
-license=('GPL')
-makedepends=('git' 'doxygen' 'graphviz')
-source=()
-md5sums=()
-
-_gitroot="git://github.com/OpenNI/OpenNI.git"
-_gitname="openni"
-#_gitbranch="unstable"
-_gitbranch="master"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x86;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-export MAKEFLAGS+=' -j1 '
-
-build() {
-  cd "${srcdir}"
-  msg "Connecting to GIT server...."
-
-  if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-    git checkout master
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone ${_gitroot} ${_gitname}
-    cd ${_gitname}
-  fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "${srcdir}/${_gitname}-build"
-  git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
-  cd "${srcdir}/${_gitname}-build"
-
-  # PATCH
-  sed -i 's/python /python2 /' "Platform/${_platform}/CreateRedist/RedistMaker"
-  echo '
-abs_core: $(ALL_MODULES) $(ALL_UTILS)
-abs_core_samples: $(CORE_SAMPLES)
-abs_java: $(ALL_JAVA_PROJS)
-abs_java_samples: $(JAVA_SAMPLES)
-abs_mono: $(ALL_MONO_PROJS)
-abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
-' >> "Platform/${_platform}/Build/Makefile"
-
-  
-  # BUILD
-  cd "Platform/${_platform}/Build"
-  make -j1 \
-      abs_core abs_core_samples \
-      abs_java abs_java_samples \
-      abs_mono abs_mono_samples || return 1
-
-  cd '../../../Source/DoxyGen'
-  mkdir html
-  doxygen Doxyfile
-  rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp
-}
-
-package_openni-git() {
-  pkgdesc="Open Natural Interface framework"
-  depends=("openni$_suf-core")
-  optdepends=("openni$_suf-docs: programmer documentation")
-  provides=('openni')
-  conflicts=('openni')
-}
-
-package_openni-git-docs() {
-  pkgdesc="OpenNI programmer documentation"
-  arch=('any')
-  provides=('openni-docs')
-  conflicts=('openni-docs')
-
-  cd "${srcdir}/${_gitname}-build/Source/DoxyGen/"
-  install -d "${pkgdir}/usr/share/openni"
-  cp -r html "${pkgdir}/usr/share/openni"
-}
-
-package_openni-git-core() {
-  pkgdesc="OpenNI core libraries"
-  depends=('libusb' 'freeglut')
-  install="openni.install"
-  provides=('openni-core')
-  conflicts=('openni-core')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-
-  LIB_FILES='
-    libnimCodecs.so
-    libnimMockNodes.so
-    libnimRecorder.so
-    libOpenNI.so
-    '
-  install -d "${pkgdir}/usr/lib"
-  install -m755 $LIB_FILES "${pkgdir}/usr/lib"
-
-  BIN_FILES='niReg niLicense'
-  install -d "${pkgdir}/usr/bin"
-  install -m755 $BIN_FILES "${pkgdir}/usr/bin"
-
-  cd "${srcdir}/${_gitname}-build/Include"
-  install -d "${pkgdir}/usr/include/ni"
-  install -m644 *.h "${pkgdir}/usr/include/ni"
-  cp -r "${_platform}" "${pkgdir}/usr/include/ni"
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Build"
-  install -d "${pkgdir}/usr/share"
-  cp -r Common "${pkgdir}/usr/share/common"
-}
-
-package_openni-git-java() {
-  pkgdesc="OpenNI java wrapper"
-  depends=("openni$_suf" 'java-environment')
-  provides=('openni-java')
-  conflicts=('openni-java')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-
-  install -d "${pkgdir}/usr/lib"
-  install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib"
-  
-  install -d "${pkgdir}/usr/share/openni/java"
-  install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java"
-}
-
-package_openni-git-mono() {
-  pkgdesc="OpenNI mono wrapper"
-  depends=("openni$_suf" 'mono')
-  provides=('openni-mono')
-  conflicts=('openni-mono')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  
-  install -d "${pkgdir}/usr/share/openni/mono"
-  install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono"
-}
-
-# SAMPLES
-
-_install_sample_source() {
-  sample=$1
-  makefile="Platform/${_platform}/Build/Samples/$sample/Makefile"
-  install -d                "${pkgdir}/usr/share/openni/samples"
-  cp -r "Samples/$sample"   "${pkgdir}/usr/share/openni/samples/$sample"
-  install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample"
-}
-
-# Leave out NiViewer, it's set up wrong
-CORE_SAMPLES='
-  AudioSample
-  BackRecorder
-  CRead
-  ConvertXToONI
-  RecordSynthetic
-  SimpleCreate
-              SimpleRead SimpleViewer UserTracker'
-MONO_SAMPLES='SimpleRead SimpleViewer UserTracker'
-JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker'
-
-package_openni-git-core-samples() {
-  pkgdesc="OpenNI sample programs"
-  depends=("openni$_suf-core")
-  optdepends=('openni-core-samples-source: source code for the samples')
-  provides=('openni-core-samples')
-  conflicts=('openni-core-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer"
-  for sample in $CORE_SAMPLES; do
-    install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
-  done
-}
-package_openni-git-core-samples-source() {
-  pkgdesc="OpenNI sample programs source code"
-  depends=("openni$_suf-core")
-  provides=('openni-core-samples-source')
-  conflicts=('openni-core-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in Viewer $CORE_SAMPLES; do
-    _install_sample_source Ni$sample
-  done
-}
-
-package_openni-git-java-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-java")
-  optdepends=("openni$_suf-java-samples-source: source code for the samples")
-  arch=('any')
-  provides=('openni-java-samples')
-  conflicts=('openni-java-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/java"
-  for sample in $JAVA_SAMPLES; do
-    install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java"
-    echo "#/bin/sh
-java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@
-" > "${pkgdir}/usr/bin/niSample-$sample.jar"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar"
-  done
-}
-package_openni-git-java-samples-source() {
-  pkgdesc="OpenNI java wrapper sample programs source code"
-  depends=("openni$_suf-java")
-  provides=('openni-java-samples-source')
-  conflicts=('openni-java-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $JAVA_SAMPLES; do
-    _install_sample_source $sample.java
-  done
-}
-
-package_openni-git-mono-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-mono")
-  optdepends=("openni$_suf-mono-samples-source: source code for the samples")
-  provides=('openni-mono-samples')
-  conflicts=('openni-mono-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/mono"
-  for sample in $MONO_SAMPLES; do
-    install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono"
-    echo "#/bin/sh
-cd /usr/share/openni/mono
-mono $sample.net.exe $@
-" > "${pkgdir}/usr/bin/niSample-$sample.net"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net"
-  done
-}
-package_openni-git-mono-samples-source() {
-  pkgdesc="OpenNI mono wrapper sample programs source code"
-  depends=("openni$_suf-mono")
-  provides=('openni-mono-samples-source')
-  conflicts=('openni-mono-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $MONO_SAMPLES; do
-    _install_sample_source $sample.net
-  done
-}
diff --git a/~lukeshu/openni-all/openni-git/openni.install b/~lukeshu/openni-all/openni-git/openni.install
deleted file mode 100644
index 8470f4512..000000000
--- a/~lukeshu/openni-all/openni-git/openni.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
-	for module in $MODULES
-	do 
-		/usr/bin/niReg /usr/lib/$module
-	done
-}
-
-pre_remove() {
-	rm /var/lib/ni/modules.xml
-}
diff --git a/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD b/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD
deleted file mode 100644
index 0ebfac2e5..000000000
--- a/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: pallegro from the AUR
-
-_pkgname=openni-module-primesensor
-pkgname=${_pkgname}-git
-pkgver=20111115
-pkgrel=1
-pkgdesc="OpenNI PrimeSensor harware modules for the PrimeSense sensor device"
-arch=('i686')
-url="http://www.primesense.com/"
-license=('GPL')
-depends=('openni')
-makedepends=('git')
-provides=($_pkgname)
-conflicts=($_pkgname)
-install="sensorkinect.install"
-source=()
-md5sums=()
-
-_gitroot="https://github.com/PrimeSense/Sensor.git"
-_gitname="primesensor"
-_gitbranch="unstable"
-#_gitbranch="master"
-
-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 -b $_gitbranch $_gitroot $_gitname
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd $srcdir/$_gitname-build
-
-  # BUILD
-  cd Platform/Linux-x86/Build
-  make NI_CONF_DIR=/etc || return 1
-}
-
-package() {
-  install -d -m755 ${pkgdir}/usr/{lib,bin}
-
-  cd $srcdir/$_gitname-build/Platform/Linux-x86/Bin/Release
-  install XnSensorServer ${pkgdir}/usr/bin
-  install libXnCore.so libXnDDK.so libXnDeviceFile.so libXnDeviceSensorV2KM.so libXnFormats.so ${pkgdir}/usr/lib
-  chmod +s ${pkgdir}/usr/bin/XnSensorServer
-
-  cd $srcdir/$_gitname-build/Platform/Linux-x86/Install
-  install -d -m755 ${pkgdir}/etc/udev/rules.d
-  install 55-primesense-usb.rules ${pkgdir}/etc/udev/rules.d
-
-  cd $srcdir/$_gitname-build/Data
-  install -d -m755 ${pkgdir}/etc/primesense
-  install GlobalDefaultsKinect.ini ${pkgdir}/etc/primesense
-
-  install -d -m777 ${pkgdir}/var/log/primesense/XnSensorServer 
-}
diff --git a/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD b/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD
deleted file mode 100644
index 2a2abbdc5..000000000
--- a/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: pallegro from the AUR
-
-pkgname=openni-module-sensorkinect-git
-pkgver=20111211
-pkgrel=2
-pkgdesc="OpenNI SensorKinect harware modules for the Xbox Kinect device"
-arch=('i686' 'x86_64')
-url="https://github.com/avin2/SensorKinect"
-license=('GPL')
-depends=('openni-unstable' 'kinect-udev')
-makedepends=('git')
-provides=('openni-module-sensorkinect')
-conflicts=('openni-module-sensorkinect' 'openni-module-primesensor')
-install="sensorkinect.install"
-source=()
-md5sums=()
-
-_gitroot="https://github.com/avin2/SensorKinect.git"
-_gitname="sensorkinect"
-_gitbranch="master"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x86;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-    git checkout master
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone ${_gitroot} ${_gitname}
-    cd ${_gitname}
-  fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  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
-
-  # BUILD
-  cd Platform/${_platform}/Build
-  make
-  make redist
-}
-
-package() {
-  cd $srcdir/$_gitname-build
-  cd Platform/${_platform}/Redist
-
-  # This is all cloned from ./install.sh, which can't be used for a number
-  # of reasons.
-  install -d $pkgdir/usr/{lib,bin}
-  install -m755 Lib/* $pkgdir/usr/lib
-  install -m755 Bin/* $pkgdir/usr/bin
-
-  install -d $pkgdir/etc/primesense
-  install -m644 Config/GlobalDefaultsKinect.ini $pkgdir/etc/primesense
-
-  chmod +s $pkgdir/usr/bin/XnSensorServer
-
-  install -m777 -d $pkgdir/var/log/primesense/XnSensorServer
-}
diff --git a/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install b/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install
deleted file mode 100644
index d62d263d1..000000000
--- a/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-export MODULES="libXnDeviceSensorV2KM.so libXnDeviceFile.so"
-
-post_install() {
-	for module in $MODULES; do
-		/usr/bin/niReg -r /usr/lib/$module /etc/primesense
-	done
-}
-
-pre_remove() {
-	for module in $MODULES;	do 
-		/usr/bin/niReg -u /usr/lib/$module
-	done
-}
diff --git a/~lukeshu/openni-all/openni-unstable-git/PKGBUILD b/~lukeshu/openni-all/openni-unstable-git/PKGBUILD
deleted file mode 100644
index 07f276b02..000000000
--- a/~lukeshu/openni-all/openni-unstable-git/PKGBUILD
+++ /dev/null
@@ -1,286 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
-# Contributor: bugix
-# Contributor: Lubosz Sarnecki <lubosz at gmail>
-
-# unfortunately we can't use $_suf in function names, but sed makes it ok
-_suf='-unstable-git'
-pkgname=(
-    openni$_suf
-    openni$_suf-docs
-
-    openni$_suf-core
-    openni$_suf-core-samples
-    openni$_suf-core-samples-source
-    
-    openni$_suf-mono
-    openni$_suf-mono-samples
-    openni$_suf-mono-samples-source
-
-    openni$_suf-java
-    openni$_suf-java-samples
-    openni$_suf-java-samples-source
-    )
-pkgver=20111121
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://www.openni.org/"
-license=('GPL')
-makedepends=('git' 'doxygen' 'graphviz')
-source=()
-md5sums=()
-
-_gitroot="git://github.com/OpenNI/OpenNI.git"
-_gitname="openni"
-_gitbranch="unstable"
-#_gitbranch="master"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x86;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-export MAKEFLAGS+=' -j1 '
-
-build() {
-  cd "${srcdir}"
-  msg "Connecting to GIT server...."
-
-  if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-    git checkout master
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone ${_gitroot} ${_gitname}
-    cd ${_gitname}
-  fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "${srcdir}/${_gitname}-build"
-  git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
-  cd "${srcdir}/${_gitname}-build"
-
-  # PATCH
-  sed -i 's/python /python2 /' "Platform/${_os}/CreateRedist/RedistMaker"
-  echo '
-abs_core: $(ALL_MODULES) $(ALL_UTILS)
-abs_core_samples: $(CORE_SAMPLES)
-abs_java: $(ALL_JAVA_PROJS)
-abs_java_samples: $(JAVA_SAMPLES)
-abs_mono: $(ALL_MONO_PROJS)
-abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
-' >> "Platform/${_os}/Build/Makefile"
-
-  
-  # BUILD
-  cd "Platform/${_os}/Build"
-  make -j1 \
-      abs_core abs_core_samples \
-      abs_java abs_java_samples \
-      abs_mono abs_mono_samples || return 1
-
-  cd '../../../Source/DoxyGen'
-  mkdir html
-  doxygen Doxyfile
-  rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp
-}
-
-package_openni-unstable-git() {
-  pkgdesc="Open Natural Interface framework"
-  depends=("openni$_suf-core")
-  optdepends=("openni$_suf-docs: programmer documentation")
-  provides=('openni' 'openni-unstable')
-  conflicts=('openni' 'openni-unstable')
-}
-
-package_openni-unstable-git-docs() {
-  pkgdesc="OpenNI programmer documentation"
-  arch=('any')
-  provides=('openni-docs' 'openni-unstable-docs')
-  conflicts=('openni-docs' 'openni-unstable-docs')
-
-  cd "${srcdir}/${_gitname}-build/Source/DoxyGen/"
-  install -d "${pkgdir}/usr/share/openni"
-  cp -r html "${pkgdir}/usr/share/openni"
-}
-
-package_openni-unstable-git-core() {
-  pkgdesc="OpenNI core libraries"
-  depends=('libusb' 'freeglut')
-  install="openni.install"
-  provides=('openni-core' 'openni-unstable-core')
-  conflicts=('openni-core' 'openni-unstable-core')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-
-  LIB_FILES='
-    libnimCodecs.so
-    libnimMockNodes.so
-    libnimRecorder.so
-    libOpenNI.so
-    '
-  install -d "${pkgdir}/usr/lib"
-  install -m755 $LIB_FILES "${pkgdir}/usr/lib"
-
-  BIN_FILES='niReg niLicense'
-  install -d "${pkgdir}/usr/bin"
-  install -m755 $BIN_FILES "${pkgdir}/usr/bin"
-
-  cd "${srcdir}/${_gitname}-build/Include"
-  install -d "${pkgdir}/usr/include/ni"
-  install -m644 *.h "${pkgdir}/usr/include/ni"
-  cp -r "${_platform}" "${pkgdir}/usr/include/ni"
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Build"
-  install -d "${pkgdir}/usr/share"
-  cp -r Common "${pkgdir}/usr/share/common"
-}
-
-package_openni-unstable-git-java() {
-  pkgdesc="OpenNI java wrapper"
-  depends=("openni$_suf" 'java-environment')
-  provides=('openni-java' 'openni-unstable-java')
-  conflicts=('openni-java' 'openni-unstable-java')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-
-  install -d "${pkgdir}/usr/lib"
-  install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib"
-  
-  install -d "${pkgdir}/usr/share/openni/java"
-  install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java"
-}
-
-package_openni-unstable-git-mono() {
-  pkgdesc="OpenNI mono wrapper"
-  depends=("openni$_suf" 'mono')
-  provides=('openni-mono' 'openni-unstable-mono')
-  conflicts=('openni-mono' 'openni-unstable-mono')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  
-  install -d "${pkgdir}/usr/share/openni/mono"
-  install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono"
-}
-
-# SAMPLES
-
-_install_sample_source() {
-  sample=$1
-  makefile="Platform/${_os}/Build/Samples/$sample/Makefile"
-  install -d                "${pkgdir}/usr/share/openni/samples"
-  cp -r "Samples/$sample"   "${pkgdir}/usr/share/openni/samples/$sample"
-  install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample"
-}
-
-# Leave out NiViewer, it's set up wrong
-CORE_SAMPLES='
-  AudioSample
-  BackRecorder
-  CRead
-  ConvertXToONI
-  RecordSynthetic
-  SimpleCreate
-              SimpleRead SimpleViewer UserTracker'
-MONO_SAMPLES='SimpleRead SimpleViewer UserTracker'
-JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker'
-
-package_openni-unstable-git-core-samples() {
-  pkgdesc="OpenNI sample programs"
-  depends=("openni$_suf-core")
-  optdepends=('openni-core-samples-source: source code for the samples')
-  provides=('openni-core-samples' 'openni-unstable-core-samples')
-  conflicts=('openni-core-samples' 'openni-unstable-core-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer"
-  for sample in $CORE_SAMPLES; do
-    install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
-  done
-}
-package_openni-unstable-git-core-samples-source() {
-  pkgdesc="OpenNI sample programs source code"
-  depends=("openni$_suf-core")
-  provides=('openni-core-samples-source' 'openni-unstable-core-samples-source')
-  conflicts=('openni-core-samples-source' 'openni-unstable-core-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in Viewer $CORE_SAMPLES; do
-    _install_sample_source Ni$sample
-  done
-}
-
-package_openni-unstable-git-java-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-java")
-  optdepends=("openni$_suf-java-samples-source: source code for the samples")
-  arch=('any')
-  provides=('openni-java-samples' 'openni-unstable-java-samples')
-  conflicts=('openni-java-samples' 'openni-unstable-java-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/java"
-  for sample in $JAVA_SAMPLES; do
-    install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java"
-    echo "#/bin/sh
-java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@
-" > "${pkgdir}/usr/bin/niSample-$sample.jar"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar"
-  done
-}
-package_openni-unstable-git-java-samples-source() {
-  pkgdesc="OpenNI java wrapper sample programs source code"
-  depends=("openni$_suf-java")
-  provides=('openni-java-samples-source' 'openni-unstable-java-samples-source')
-  conflicts=('openni-java-samples-source' 'openni-unstable-java-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $JAVA_SAMPLES; do
-    _install_sample_source $sample.java
-  done
-}
-
-package_openni-unstable-git-mono-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-mono")
-  optdepends=("openni$_suf-mono-samples-source: source code for the samples")
-  provides=('openni-mono-samples' 'openni-unstable-mono-samples')
-  conflicts=('openni-mono-samples' 'openni-unstable-mono-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/mono"
-  for sample in $MONO_SAMPLES; do
-    install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono"
-    echo "#/bin/sh
-cd /usr/share/openni/mono
-mono $sample.net.exe $@
-" > "${pkgdir}/usr/bin/niSample-$sample.net"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net"
-  done
-}
-package_openni-unstable-git-mono-samples-source() {
-  pkgdesc="OpenNI mono wrapper sample programs source code"
-  depends=("openni$_suf-mono")
-  provides=('openni-mono-samples-source' 'openni-unstable-mono-samples-source')
-  conflicts=('openni-mono-samples-source' 'openni-unstable-mono-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $MONO_SAMPLES; do
-    _install_sample_source $sample.net
-  done
-}
diff --git a/~lukeshu/openni-all/openni-unstable-git/openni.install b/~lukeshu/openni-all/openni-unstable-git/openni.install
deleted file mode 100644
index 8470f4512..000000000
--- a/~lukeshu/openni-all/openni-unstable-git/openni.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
-	for module in $MODULES
-	do 
-		/usr/bin/niReg /usr/lib/$module
-	done
-}
-
-pre_remove() {
-	rm /var/lib/ni/modules.xml
-}
diff --git a/~lukeshu/openni-all/openni-unstable/PKGBUILD b/~lukeshu/openni-all/openni-unstable/PKGBUILD
deleted file mode 100644
index 19d1575a1..000000000
--- a/~lukeshu/openni-all/openni-unstable/PKGBUILD
+++ /dev/null
@@ -1,294 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
-# Contributor: bugix
-# Contributor: Lubosz Sarnecki <lubosz at gmail>
-
-# unfortunately we can't use $_suf in function names, but sed makes it ok
-_suf='-unstable'
-pkgname=(
-    openni$_suf
-    openni$_suf-docs
-
-    openni$_suf-core
-    openni$_suf-core-samples
-    openni$_suf-core-samples-source
-    
-    openni$_suf-mono
-    openni$_suf-mono-samples
-    openni$_suf-mono-samples-source
-
-    openni$_suf-java
-    openni$_suf-java-samples
-    openni$_suf-java-samples-source
-    )
-pkgver=1.4.0.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.openni.org/"
-license=('GPL')
-makedepends=('git' 'doxygen' 'graphviz')
-options+=('!strip')
-source=()
-md5sums=()
-
-__gitroot="git://github.com/OpenNI/OpenNI.git"
-_gitname="openni"
-_gitbranch="Unstable-$pkgver"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x64;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-export MAKEFLAGS+=' -j1 '
-
-build() {
-  cd "${srcdir}"
-  msg "Connecting to GIT server...."
-
-  #if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-  #  git checkout master
-  #  git pull origin
-  #  msg "The local files are updated."
-  #else
-  #  git clone ${__gitroot} ${_gitname}
-  #  cd ${_gitname}
-  #fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  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"
-
-  # PATCH
-  sed -i 's/python /python2 /' "Platform/${_os}/CreateRedist/RedistMaker"
-
-  for sample in NiViewer NiSimpleViewer NiUserTracker NiUserSelection NiHandTracker; do
-      echo 'USED_LIBS += GL' >> "Platform/${_os}/Build/Samples/${sample}/Makefile"
-  done
-
-  echo '
-abs_core: $(ALL_MODULES) $(ALL_UTILS)
-abs_core_samples: $(CORE_SAMPLES)
-abs_java: $(ALL_JAVA_PROJS)
-abs_java_samples: $(JAVA_SAMPLES)
-abs_mono: $(ALL_MONO_PROJS)
-abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
-' >> "Platform/${_os}/Build/Makefile"
-
-  
-  # BUILD
-  cd "Platform/${_os}/Build"
-  make -j1 \
-      abs_core abs_core_samples \
-      abs_java abs_java_samples \
-      abs_mono abs_mono_samples
-  cd "../Bin/${_arch}-Release"
-  ln NiViewer Sample-NiViewer
-
-  cd '../../../Source/DoxyGen'
-  mkdir html
-  doxygen Doxyfile
-  rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp
-}
-
-package_openni-unstable() {
-  pkgdesc="Open Natural Interface framework"
-  depends=("openni$_suf-core")
-  optdepends=("openni$_suf-docs: programmer documentation")
-  provides=('openni')
-  conflicts=('openni')
-}
-
-package_openni-unstable-docs() {
-  pkgdesc="OpenNI programmer documentation"
-  arch=('any')
-  provides=('openni-docs')
-  conflicts=('openni-docs')
-
-  cd "${srcdir}/${_gitname}-build/Source/DoxyGen/"
-  install -d "${pkgdir}/usr/share/openni"
-  cp -r html "${pkgdir}/usr/share/openni"
-}
-
-package_openni-unstable-core() {
-  pkgdesc="OpenNI core libraries"
-  depends=('libusb' 'freeglut')
-  install="openni-core.install"
-  provides=('openni-core')
-  conflicts=('openni-core')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-
-  LIB_FILES='
-    libnimCodecs.so
-    libnimMockNodes.so
-    libnimRecorder.so
-    libOpenNI.so
-    '
-  install -d "${pkgdir}/usr/lib"
-  install -m755 $LIB_FILES "${pkgdir}/usr/lib"
-
-  BIN_FILES='niReg niLicense'
-  install -d "${pkgdir}/usr/bin"
-  install -m755 $BIN_FILES "${pkgdir}/usr/bin"
-
-  cd "${srcdir}/${_gitname}-build/Include"
-  install -d "${pkgdir}/usr/include/ni"
-  install -m644 *.h "${pkgdir}/usr/include/ni"
-  cp -r "${_platform}" "${pkgdir}/usr/include/ni"
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Build"
-  install -d "${pkgdir}/usr/share"
-  cp -r Common "${pkgdir}/usr/share/common"
-
-  install -d "${pkgdir}/var/lib/ni"
-}
-
-package_openni-unstable-java() {
-  pkgdesc="OpenNI java wrapper"
-  depends=("openni$_suf" 'java-environment')
-  provides=('openni-java')
-  conflicts=('openni-java')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-
-  install -d "${pkgdir}/usr/lib"
-  install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib"
-  
-  install -d "${pkgdir}/usr/share/openni/java"
-  install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java"
-}
-
-package_openni-unstable-mono() {
-  pkgdesc="OpenNI mono wrapper"
-  depends=("openni$_suf" 'mono')
-  install="openni-mono.install"
-  provides=('openni-mono')
-  conflicts=('openni-mono')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  
-  install -d "${pkgdir}/usr/share/openni/mono"
-  install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono"
-}
-
-# SAMPLES
-
-_install_sample_source() {
-  sample=$1
-  makefile="Platform/${_os}/Build/Samples/$sample/Makefile"
-  install -d                "${pkgdir}/usr/share/openni/samples"
-  cp -r "Samples/$sample"   "${pkgdir}/usr/share/openni/samples/$sample"
-  install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample"
-}
-
-CORE_SAMPLES='
-  AudioSample
-  BackRecorder
-  CRead
-  ConvertXToONI
-  HandTracker
-  RecordSynthetic
-  SimpleCreate
-  UserSelection
-  Viewer
-              SimpleRead SimpleViewer UserTracker'
-MONO_SAMPLES='SimpleRead SimpleViewer UserTracker'
-JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker'
-
-package_openni-unstable-core-samples() {
-  pkgdesc="OpenNI sample programs"
-  depends=("openni$_suf-core")
-  optdepends=('openni-core-samples-source: source code for the samples')
-  provides=('openni-core-samples')
-  conflicts=('openni-core-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  for sample in $CORE_SAMPLES; do
-    install -m755 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
-  done
-}
-package_openni-unstable-core-samples-source() {
-  pkgdesc="OpenNI sample programs source code"
-  depends=("openni$_suf-core")
-  provides=('openni-core-samples-source')
-  conflicts=('openni-core-samples-source')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in Viewer $CORE_SAMPLES; do
-    _install_sample_source Ni$sample
-  done
-}
-
-package_openni-unstable-java-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-java")
-  optdepends=("openni$_suf-java-samples-source: source code for the samples")
-  arch=('any')
-  provides=('openni-java-samples')
-  conflicts=('openni-java-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/java"
-  for sample in $JAVA_SAMPLES; do
-    install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java"
-    echo "#/bin/sh
-java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@
-" > "${pkgdir}/usr/bin/niSample-$sample.jar"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar"
-  done
-}
-package_openni-unstable-java-samples-source() {
-  pkgdesc="OpenNI java wrapper sample programs source code"
-  depends=("openni$_suf-java")
-  provides=('openni-java-samples-source')
-  conflicts=('openni-java-samples-source')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $JAVA_SAMPLES; do
-    _install_sample_source $sample.java
-  done
-}
-
-package_openni-unstable-mono-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-mono")
-  optdepends=("openni$_suf-mono-samples-source: source code for the samples")
-  provides=('openni-mono-samples')
-  conflicts=('openni-mono-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/mono"
-  for sample in $MONO_SAMPLES; do
-    install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono"
-    echo "#/bin/sh
-cd /usr/share/openni/mono
-mono $sample.net.exe $@
-" > "${pkgdir}/usr/bin/niSample-$sample.net"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net"
-  done
-}
-package_openni-unstable-mono-samples-source() {
-  pkgdesc="OpenNI mono wrapper sample programs source code"
-  depends=("openni$_suf-mono")
-  provides=('openni-mono-samples-source')
-  conflicts=('openni-mono-samples-source')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $MONO_SAMPLES; do
-    _install_sample_source $sample.net
-  done
-}
diff --git a/~lukeshu/openni-all/openni-unstable/openni-core.install b/~lukeshu/openni-all/openni-unstable/openni-core.install
deleted file mode 100644
index 8470f4512..000000000
--- a/~lukeshu/openni-all/openni-unstable/openni-core.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
-	for module in $MODULES
-	do 
-		/usr/bin/niReg /usr/lib/$module
-	done
-}
-
-pre_remove() {
-	rm /var/lib/ni/modules.xml
-}
diff --git a/~lukeshu/openni-all/openni-unstable/openni-mono.install b/~lukeshu/openni-all/openni-unstable/openni-mono.install
deleted file mode 100644
index 72a6fb23d..000000000
--- a/~lukeshu/openni-all/openni-unstable/openni-mono.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-	gacutil -i /usr/share/openni/mono/OpenNI.net.dll -gacdir /usr
-}
-
-post_remove() {
-	gacutil -u OpenNI.net -gacdir /usr
-}
diff --git a/~lukeshu/openni-all/openni/PKGBUILD b/~lukeshu/openni-all/openni/PKGBUILD
deleted file mode 100644
index 2cdc2fd7d..000000000
--- a/~lukeshu/openni-all/openni/PKGBUILD
+++ /dev/null
@@ -1,288 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
-# Contributor: bugix
-# Contributor: Lubosz Sarnecki <lubosz at gmail>
-
-# unfortunately we can't use $_suf in function names, but sed makes it ok
-_suf=''
-pkgname=(
-    openni$_suf
-    openni$_suf-docs
-
-    openni$_suf-core
-    openni$_suf-core-samples
-    openni$_suf-core-samples-source
-    
-    openni$_suf-mono
-    openni$_suf-mono-samples
-    openni$_suf-mono-samples-source
-
-    openni$_suf-java
-    openni$_suf-java-samples
-    openni$_suf-java-samples-source
-    )
-pkgver=1.3.3.6
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://www.openni.org/"
-license=('GPL')
-makedepends=('git' 'doxygen' 'graphviz')
-source=()
-md5sums=()
-
-__gitroot="git://github.com/OpenNI/OpenNI.git"
-_gitname="openni"
-#_gitbranch="unstable"
-#_gitbranch="master"
-_gitbranch="Stable-$pkgver"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x86;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-export MAKEFLAGS+=' -j1 '
-
-build() {
-  cd "${srcdir}"
-  msg "Connecting to GIT server...."
-
-  if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-    git checkout master
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone ${__gitroot} ${_gitname}
-    cd ${_gitname}
-  fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "${srcdir}/${_gitname}-build"
-  git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
-  cd "${srcdir}/${_gitname}-build"
-
-  # PATCH
-  sed -i 's/python /python2 /' "Platform/${_platform}/CreateRedist/RedistMaker"
-  mv Wrappers/OpenNI.java/src/org/OpenNI/AlternativeView{p,P}ointCapability.java
-  echo '
-abs_core: $(ALL_MODULES) $(ALL_UTILS)
-abs_core_samples: $(CORE_SAMPLES)
-abs_java: $(ALL_JAVA_PROJS)
-abs_java_samples: $(JAVA_SAMPLES)
-abs_mono: $(ALL_MONO_PROJS)
-abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
-' >> "Platform/${_platform}/Build/Makefile"
-
-  
-  # BUILD
-  cd "Platform/${_platform}/Build"
-  make -j1 \
-      abs_core abs_core_samples \
-      abs_java abs_java_samples \
-      abs_mono abs_mono_samples || return 1
-
-  cd '../../../Source/DoxyGen'
-  mkdir html
-  doxygen Doxyfile
-  rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp
-}
-
-package_openni() {
-  pkgdesc="Open Natural Interface framework"
-  depends=("openni$_suf-core")
-  optdepends=("openni$_suf-docs: programmer documentation")
-  provides=('openni')
-  conflicts=('openni')
-}
-
-package_openni-docs() {
-  pkgdesc="OpenNI programmer documentation"
-  arch=('any')
-  provides=('openni-docs')
-  conflicts=('openni-docs')
-
-  cd "${srcdir}/${_gitname}-build/Source/DoxyGen/"
-  install -d "${pkgdir}/usr/share/openni"
-  cp -r html "${pkgdir}/usr/share/openni"
-}
-
-package_openni-core() {
-  pkgdesc="OpenNI core libraries"
-  depends=('libusb' 'freeglut')
-  install="openni.install"
-  provides=('openni-core')
-  conflicts=('openni-core')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-
-  LIB_FILES='
-    libnimCodecs.so
-    libnimMockNodes.so
-    libnimRecorder.so
-    libOpenNI.so
-    '
-  install -d "${pkgdir}/usr/lib"
-  install -m755 $LIB_FILES "${pkgdir}/usr/lib"
-
-  BIN_FILES='niReg niLicense'
-  install -d "${pkgdir}/usr/bin"
-  install -m755 $BIN_FILES "${pkgdir}/usr/bin"
-
-  cd "${srcdir}/${_gitname}-build/Include"
-  install -d "${pkgdir}/usr/include/ni"
-  install -m644 *.h "${pkgdir}/usr/include/ni"
-  cp -r "${_platform}" "${pkgdir}/usr/include/ni"
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Build"
-  install -d "${pkgdir}/usr/share"
-  cp -r Common "${pkgdir}/usr/share/common"
-}
-
-package_openni-java() {
-  pkgdesc="OpenNI java wrapper"
-  depends=("openni$_suf" 'java-environment')
-  provides=('openni-java')
-  conflicts=('openni-java')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-
-  install -d "${pkgdir}/usr/lib"
-  install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib"
-  
-  install -d "${pkgdir}/usr/share/openni/java"
-  install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java"
-}
-
-package_openni-mono() {
-  pkgdesc="OpenNI mono wrapper"
-  depends=("openni$_suf" 'mono')
-  provides=('openni-mono')
-  conflicts=('openni-mono')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  
-  install -d "${pkgdir}/usr/share/openni/mono"
-  install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono"
-}
-
-# SAMPLES
-
-_install_sample_source() {
-  sample=$1
-  makefile="Platform/${_platform}/Build/Samples/$sample/Makefile"
-  install -d                "${pkgdir}/usr/share/openni/samples"
-  cp -r "Samples/$sample"   "${pkgdir}/usr/share/openni/samples/$sample"
-  install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample"
-}
-
-# Leave out NiViewer, it's set up wrong
-CORE_SAMPLES='
-  AudioSample
-  BackRecorder
-  CRead
-  ConvertXToONI
-  RecordSynthetic
-  SimpleCreate
-              SimpleRead SimpleViewer UserTracker'
-MONO_SAMPLES='SimpleRead SimpleViewer UserTracker'
-JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker'
-
-package_openni-core-samples() {
-  pkgdesc="OpenNI sample programs"
-  depends=("openni$_suf-core")
-  optdepends=('openni-core-samples-source: source code for the samples')
-  provides=('openni-core-samples')
-  conflicts=('openni-core-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer"
-  for sample in $CORE_SAMPLES; do
-    install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
-  done
-}
-package_openni-core-samples-source() {
-  pkgdesc="OpenNI sample programs source code"
-  depends=("openni$_suf-core")
-  provides=('openni-core-samples-source')
-  conflicts=('openni-core-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in Viewer $CORE_SAMPLES; do
-    _install_sample_source Ni$sample
-  done
-}
-
-package_openni-java-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-java")
-  optdepends=("openni$_suf-java-samples-source: source code for the samples")
-  arch=('any')
-  provides=('openni-java-samples')
-  conflicts=('openni-java-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/java"
-  for sample in $JAVA_SAMPLES; do
-    install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java"
-    echo "#/bin/sh
-java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@
-" > "${pkgdir}/usr/bin/niSample-$sample.jar"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar"
-  done
-}
-package_openni-java-samples-source() {
-  pkgdesc="OpenNI java wrapper sample programs source code"
-  depends=("openni$_suf-java")
-  provides=('openni-java-samples-source')
-  conflicts=('openni-java-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $JAVA_SAMPLES; do
-    _install_sample_source $sample.java
-  done
-}
-
-package_openni-mono-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-mono")
-  optdepends=("openni$_suf-mono-samples-source: source code for the samples")
-  provides=('openni-mono-samples')
-  conflicts=('openni-mono-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/mono"
-  for sample in $MONO_SAMPLES; do
-    install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono"
-    echo "#/bin/sh
-cd /usr/share/openni/mono
-mono $sample.net.exe $@
-" > "${pkgdir}/usr/bin/niSample-$sample.net"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net"
-  done
-}
-package_openni-mono-samples-source() {
-  pkgdesc="OpenNI mono wrapper sample programs source code"
-  depends=("openni$_suf-mono")
-  provides=('openni-mono-samples-source')
-  conflicts=('openni-mono-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $MONO_SAMPLES; do
-    _install_sample_source $sample.net
-  done
-}
diff --git a/~lukeshu/openni-all/openni/openni.install b/~lukeshu/openni-all/openni/openni.install
deleted file mode 100644
index 8470f4512..000000000
--- a/~lukeshu/openni-all/openni/openni.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
-	for module in $MODULES
-	do 
-		/usr/bin/niReg /usr/lib/$module
-	done
-}
-
-pre_remove() {
-	rm /var/lib/ni/modules.xml
-}
diff --git a/~lukeshu/thingutils-git/PKGBUILD b/~lukeshu/thingutils-git/PKGBUILD
deleted file mode 100644
index 23683bc52..000000000
--- a/~lukeshu/thingutils-git/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=thingutils
-pkgname=$_pkgname-git
-
-pkgver=20131203
-_gitver=aa2d5a3a4363ff4f4ca23f4c6716613c4be66ecd
-pkgdesc=""
-url="https://gitorious.org/thingutils"
-license=('MIT')
-
-provides=($_pkgname)
-conflicts=($_pkgname)
-pkgrel=1
-arch=('i686' 'x86_64')
-
-depends=(
-    'php' # urldecode
-    'bash' # daemon, newegg, sysfiles
-    'emacs' # emacsmail, emacsterm, e
-    'wget' # whatismyip
-    'findutils' # maildups, whatismyip
-    'sysstat' # sysfiles
-    'offlineimap' # offlineimap-runner
-    'wdiff' # chardiff
-    'acpi' # batterymon, tempmon
-)
-makedepends=('go')
-
-source=("libre://$pkgname-$pkgver.tar.gz")
-
-mkdepends=('git')
-mksource=("$pkgname-$pkgver::git://gitorious.org/$_pkgname/$_pkgname.git#commit=$_gitver")
-mkmd5sums=('SKIP')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make prefix=/usr
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make install prefix=/usr DESTDIR="$pkgdir"
-}
-
-md5sums=('7991e689263698f3d9a6470184f97ed1')
diff --git a/~lukeshu/xcalib/PKGBUILD b/~lukeshu/xcalib/PKGBUILD
deleted file mode 100644
index 0a8fda0ea..000000000
--- a/~lukeshu/xcalib/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor (AUR): Frank Ickstadt <frank.ickstadt@gmail.com>
-# Contributor (AUR): mOLOk
-
-pkgname=xcalib
-pkgver=0.8
-pkgrel=4
-pkgdesc="A tiny monitor calibration loader for X.org"
-arch=(i686 x86_64)
-url="http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/"
-license=('GPL')
-depends=(libxxf86vm)
-source=(http://downloads.sourceforge.net/xcalib/xcalib-source-$pkgver.tar.gz
-        makefile-ldflags.patch)
-md5sums=('1fbcae44ad8d754512fdd1e5f1b3a7e7'
-         '6c74457011515dd1cc7f2474af761142')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver/"
-  patch -p0 < ../makefile-ldflags.patch
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/"
-  install -Dm755 xcalib $pkgdir/usr/bin/xcalib
-
-  for i in README *.icc *.icm; do
-      install -Dm644 $i $pkgdir/usr/share/xcalib/$i
-  done
-}
diff --git a/~lukeshu/xcalib/makefile-ldflags.patch b/~lukeshu/xcalib/makefile-ldflags.patch
deleted file mode 100644
index 275c4c3ea..000000000
--- a/~lukeshu/xcalib/makefile-ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile	2007-08-26 23:30:34.000000000 +0200
-+++ Makefile.new	2012-08-20 10:50:27.000000000 +0200
-@@ -50,16 +50,16 @@
- # low overhead version (internal parser)
- xcalib: xcalib.c
- 	$(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\"
--	$(CC) $(CFLAGS) -L$(XLIBDIR) -lm -o xcalib xcalib.o -lX11 -lXxf86vm -lXext
-+	$(CC) $(LDFLAGS) -L$(XLIBDIR) -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lm
- 
- fglrx_xcalib: xcalib.c
- 	$(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -I$(FGLRXINCLUDEDIR) -DFGLRX
--	$(CC) $(CFLAGS) -L$(XLIBDIR) -L$(FGLRXLIBDIR) -lm -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lfglrx_gamma
-+	$(CC) $(LDFLAGS) -L$(XLIBDIR) -L$(FGLRXLIBDIR) -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lfglrx_gamma -lm
- 
- win_xcalib: xcalib.c
- 	$(CC) $(CFLAGS) -c xcalib.c -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -DWIN32GDI
- 	windres.exe resource.rc resource.o
--	$(CC) $(CFLAGS) -mwindows -lm resource.o -o xcalib xcalib.o
-+	$(CC) $(LDFLAGS) -mwindows -lm resource.o -o xcalib xcalib.o
- 
- install:
- 	cp ./xcalib $(DESTDIR)/usr/local/bin/
diff --git a/~smv/sword-svn/PKGBUILD b/~smv/sword-svn/PKGBUILD
deleted file mode 100644
index b5ddc53f4..000000000
--- a/~smv/sword-svn/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-# Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@ceata.org>
-pkgname=sword-svn
-pkgver=2904
-pkgrel=1
-pkgdesc="Libraries for Bible programs -- svn version"
-arch=('i686' 'x86_64')
-url="http://www.crosswire.org/sword/"
-license=('GPL')
-depends=('curl' 'clucene' 'swig')
-makedepends=('subversion')
-provides=('sword')
-conflicts=('sword')
-source=('sword::svn+https://www.crosswire.org/svn/sword/trunk/')
-md5sums=('SKIP')
-options=('!makeflags')
-_svnmod=sword
-
-pkgver() {
-  cd $SRCDEST/${_svnmod}
-  svnversion
-}
-
-build() {
-  cd "$srcdir/$_svnmod"  
-  ./autogen.sh
-  CPPFLAGS+="-fpermissive" ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "$srcdir/$_svnmod"
-  make DESTDIR="$pkgdir/" install
-  make DESTDIR="$pkgdir/" install_config
-}
diff --git a/~smv/xiphos-svn/PKGBUILD b/~smv/xiphos-svn/PKGBUILD
deleted file mode 100644
index 699990fec..000000000
--- a/~smv/xiphos-svn/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@ceata.org>
-pkgname=xiphos-svn
-pkgver=4482
-pkgrel=1
-pkgdesc="A Bible study tool -- svn version"
-arch=('i686' 'x86_64')
-url="http://xiphos.org"
-license=('GPL')
-depends=('webkitgtk' 'libgsf' 'gconf' 'sword-svn' 'gtkhtml4')
-makedepends=('gnome-common' 'gnome-doc-utils' 'intltool' 'subversion')
-provides=('gnomesword' 'xiphos')
-conflicts=('gnomesword' 'xiphos')
-install=xiphos-svn.install
-source=('xiphos::svn://svn.code.sf.net/p/gnomesword/code/trunk')
-md5sums=('SKIP')
-_svnmod=xiphos
-
-pkgver() {
-  cd $SRCDEST/${_svnmod}
-  svnversion
-}
-
-build() {
-  cd "$srcdir/$_svnmod"
-  sed -i 's+/usr/bin/env python+/usr/bin/env python2+' waf
-
-  ./waf --prefix=/usr --gtk=3 configure 
-  ./waf --prefix=/usr build 
-}
-
-package() {
-  cd "$srcdir/$_svnmod"
-  ./waf --destdir=$pkgdir --no-post-install install 
-}
diff --git a/~smv/xiphos-svn/xiphos-svn.install b/~smv/xiphos-svn/xiphos-svn.install
deleted file mode 100644
index 0cbac7465..000000000
--- a/~smv/xiphos-svn/xiphos-svn.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-}